Changeset 4507

Timestamp:

Jun 22, 2020 7:55:35 PM (3 years ago)

Author:

vondreele

Message:

alow plotting of non integer HKL planes
make planes partially transparent so one can see what's behind.

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (4 diffs)
• GSASIIplot.py (modified) (2 diffs)

trunk/GSASIIphsGUI.py

@@ -2404 +2404 @@
             pawleySizer.Add(wx.StaticText(General,label=' Pawley neg. wt.: '),0,WACV)
             pawlNegWt = G2G.ValidatedTxtCtrl(General,generalData,'Pawley neg wt',size=(65,25),
-                xmin=0.,xmax=1.,nDig=(10,4))
+                xmin=0.,xmax=1.,nDig=(10,3,'g'))
             pawleySizer.Add(pawlNegWt,0,WACV)
             return pawleySizer
@@ -8787 +8787 @@
             showSizer.Add(line3Sizer)
             
-            
             if generalData['Map']['rhoMax']:
                 line3Sizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -8837 +8836 @@
                 vals = plane.GetValue().split()
                 try:
-                    hkl = [int(vals[i]) for i in range(3)]
-                    if not np.any(np.array(hkl)):       #can't be all zeros!
+                    hkl = [float(vals[i]) for i in range(3)]
+                    if not any(hkl):       #can't be all zeros!
                         raise ValueError
                 except (ValueError,IndexError):
                     hkl = drawingData['Plane'][0]
                 drawingData['Plane'][0] = hkl
-                plane.SetValue('%3d %3d %3d'%(hkl[0],hkl[1],hkl[2]))
+                plane.SetValue('%5.3f %5.3f %5.3f'%(hkl[0],hkl[1],hkl[2]))
                 G2plt.PlotStructure(G2frame,data)
                 
@@ -8865 +8864 @@
             planeSizer1.Add(wx.StaticText(drawOptions,label=' Plane: '),0,WACV)
             H = drawingData['Plane'][0]
-#            Zstep = G2G.ValidatedTxtCtrl(drawOptions,drawingData,'Zstep',nDig=(10,2),xmin=0.01,xmax=4.0)
-            plane = wx.TextCtrl(drawOptions,value='%3d %3d %3d'%(H[0],H[1],H[2]),
+            plane = wx.TextCtrl(drawOptions,value='%5.3f %5.3f %5.3f'%(H[0],H[1],H[2]),
                 style=wx.TE_PROCESS_ENTER)
             plane.Bind(wx.EVT_TEXT_ENTER,OnPlane)

trunk/GSASIIplot.py

@@ -9065 +9065 @@
         GL.glTranslate(-Tx,-Ty,-Tz)
         drawingData['modelView'] = GL.glGetDoublev(GL.GL_MODELVIEW_MATRIX)
-        if drawingData['unitCellBox']:
-            RenderBox()
-            if drawingData['Plane'][1]:
-                H,phase,stack,phase,color = drawingData['Plane']
-                Planes = G2lat.PlaneIntercepts(Amat,H,phase,stack)
-                for plane in Planes:
-                    RenderPlane(plane,color)
+        # if drawingData['unitCellBox']:
+        #     if drawingData['Plane'][1]:
+        #         H,phase,stack,phase,color = drawingData['Plane']
+        #         Planes = G2lat.PlaneIntercepts(Amat,H,phase,stack)
+        #         for plane in Planes:
+        #             RenderPlane(plane,color)
+        #     RenderBox()
         if drawingData['showABC']:
             x,y,z = drawingData['viewPoint'][0]
@@ -9257 +9257 @@
             for x,y,z in drawingData['Voids']:
                 RenderFadeSphere(x,y,z,.05,(0.,0.,1.))
+        if drawingData['unitCellBox']:
+            RenderBox()
+            if drawingData['Plane'][1]:
+                H,phase,stack,phase,color = drawingData['Plane']
+                Planes = G2lat.PlaneIntercepts(Amat,H,phase,stack)
+                for plane in Planes:
+                    RenderPlane(plane,color)
         if drawingData.get('showSlice',False):      #must be done last to properly show things behind as faded
             global contourSet,Zslice