Changeset 3900 for trunk/GSASIIphsGUI.py

Timestamp:

Apr 15, 2019 4:15:37 PM (4 years ago)

Author:

vondreele

Message:

cursor now reports position/density on contour slice. Contour control has slide bar for setting max; renames the other contour slide bar as Rho max for the green density point plots
contours grid set to match map grid resolution.

File:

• trunk/GSASIIphsGUI.py (modified) (7 diffs)

trunk/GSASIIphsGUI.py

@@ -5193 +5193 @@
             'backColor':[0,0,0],'depthFog':False,'Zclip':50.0,'cameraPos':50.,'Zstep':0.5,
             'radiusFactor':0.85,'contourLevel':1.,'bondRadius':0.1,'ballScale':0.33,
-            'vdwScale':0.67,'ellipseProb':50,'sizeH':0.50,'unitCellBox':True,
+            'vdwScale':0.67,'ellipseProb':50,'sizeH':0.50,'unitCellBox':True,'contourMax':1.0,
             'showABC':True,'selectedAtoms':[],'Atoms':[],'oldxy':[],'magMult':1.0,
             'bondList':{},'viewDir':[1,0,0],'Plane':[[0,0,1],False,False,0.0,[255,255,0]]}
@@ -5212 +5212 @@
         if 'contourLevel' not in drawingData:
             drawingData['contourLevel'] = 1.
+        if 'contourMax' not in drawingData:
+            drawingData['contourMax'] = 1.
         if 'viewDir' not in drawingData:
             drawingData['viewDir'] = [0,0,1]
@@ -6130 +6132 @@
             def OnContourLevel(event):
                 drawingData['contourLevel'] = contourLevel.GetValue()/100.
-                contourLevelTxt.SetLabel(' Contour level: '+'%.2f'%(drawingData['contourLevel']*generalData['Map']['rhoMax']))
+                contourLevelTxt.SetLabel(' Rho maximum: '+'%.2f'%(drawingData['contourLevel']*generalData['Map']['rhoMax']))
                 G2plt.PlotStructure(G2frame,data)
 
@@ -6209 +6211 @@
             
             if generalData['Map']['rhoMax']:
-                contourLevelTxt = wx.StaticText(drawOptions,-1,' Contour level: '+'%.2f'%(drawingData['contourLevel']*generalData['Map']['rhoMax']))
+                contourLevelTxt = wx.StaticText(drawOptions,-1,' Rho maximum: '+'%.2f'%(drawingData['contourLevel']*generalData['Map']['rhoMax']))
                 slideSizer.Add(contourLevelTxt,0,WACV)
                 contourLevel = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=int(100*drawingData['contourLevel']))
@@ -6256 +6258 @@
                 G2plt.PlotStructure(G2frame,data)
                 
+            def OnContourMax(event):
+                drawingData['contourMax'] = contourMax.GetValue()/100.
+                contourMaxTxt.SetLabel(' Max.: '+'%.2f'%(drawingData['contourMax']*generalData['Map']['rhoMax']))
+                G2plt.PlotStructure(G2frame,data)
+
             def OnViewPoint(event):
                 event.Skip()
@@ -6345 +6352 @@
             showSizer.Add(line2Sizer)
             
-            if generalData['Map']['rhoMax'] and drawingData['unitCellBox']:
+            if generalData['Map']['rhoMax']:
                 line3Sizer = wx.BoxSizer(wx.HORIZONTAL)
             
@@ -6352 +6359 @@
                 showCS.SetValue(drawingData['showSlice'])            
                 line3Sizer.Add(showCS,0,WACV)
+                contourMaxTxt = wx.StaticText(drawOptions,-1,' Max.: '+'%.2f'%(drawingData['contourMax']*generalData['Map']['rhoMax']))
+                line3Sizer.Add(contourMaxTxt,0,WACV)
+                contourMax = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,size=(150,25),value=int(100*drawingData['contourMax']))
+                contourMax.SetRange(1,100)
+                contourMax.Bind(wx.EVT_SLIDER, OnContourMax)
+                line3Sizer.Add(contourMax,1,wx.EXPAND|wx.RIGHT)
                 
                 showSizer.Add(line3Sizer)