Changeset 3890

Timestamp:

Apr 12, 2019 9:30:04 AM (4 years ago)

Author:

vondreele

Message:

contour maps finished

Location:

trunk

Files:

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

trunk/GSASIIphsGUI.py

@@ -6240 +6240 @@
                 drawingData['unitCellBox'] = unitCellBox.GetValue()
                 G2plt.PlotStructure(G2frame,data)
+                wx.CallAfter(UpdateDrawOptions)
     
             def OnShowHyd(event):
@@ -6344 +6345 @@
             showSizer.Add(line2Sizer)
             
-            line3Sizer = wx.BoxSizer(wx.HORIZONTAL)
-            
-            showCS = wx.CheckBox(drawOptions,-1,label=' Show contour slice?')
-            showCS.Bind(wx.EVT_CHECKBOX, OnShowSlice)
-            showCS.SetValue(drawingData['showSlice'])            
-            line3Sizer.Add(showCS,0,WACV)
-            
-            showSizer.Add(line3Sizer)
+            if generalData['Map']['rhoMax'] and drawingData['unitCellBox']:
+                line3Sizer = wx.BoxSizer(wx.HORIZONTAL)
+            
+                showCS = wx.CheckBox(drawOptions,-1,label=' Show contour slice? NB: can be very slow for large structures!')
+                showCS.Bind(wx.EVT_CHECKBOX, OnShowSlice)
+                showCS.SetValue(drawingData['showSlice'])            
+                line3Sizer.Add(showCS,0,WACV)
+                
+                showSizer.Add(line3Sizer)
             
             return showSizer

trunk/GSASIIplot.py

@@ -7558 +7558 @@
     wxOrange = wx.Colour(255,128,0)
     uBox = np.array([[0,0,0],[1,0,0],[1,1,0],[0,1,0],[0,0,1],[1,0,1],[1,1,1],[0,1,1]])
-    eBox = np.array([[.125,.875],[.125,.125],[.9,.125],[.9,.875],])
+    eBox = np.array([[0,1],[0,0],[1,0],[1,1],])
     eplane = np.array([[-1,-1,0],[-1,1,0],[1,1,0],[1,-1,0]])
     uEdges = np.array([
@@ -8232 +8232 @@
         GL.glBindTexture(GL.GL_TEXTURE_2D, txID)
         GL.glPixelStorei(GL.GL_UNPACK_ALIGNMENT,1)
+        GL.glEnable(GL.GL_BLEND)
         GL.glBlendFunc(GL.GL_SRC_ALPHA,GL.GL_ONE_MINUS_SRC_ALPHA)
-        GL.glEnable(GL.GL_BLEND)
         GL.glEnable(GL.GL_TEXTURE_2D)
         GL.glPushMatrix()
@@ -8241 +8241 @@
         GL.glFrontFace(GL.GL_CW)
         GL.glTexEnvf(GL.GL_TEXTURE_ENV, GL.GL_TEXTURE_ENV_MODE, GL.GL_REPLACE)
-#        GL.glTexEnvf(GL.GL_TEXTURE_ENV, GL.GL_ALPHA_SCALE, 1.0)
+        GL.glTexEnvf(GL.GL_TEXTURE_ENV, GL.GL_ALPHA_SCALE, 1.0)
         GL.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_BASE_LEVEL, 0)
         GL.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAX_LEVEL, 0)
@@ -8680 +8680 @@
                     RenderPlane(plane,color)
             if drawingData['showSlice']:
-                rho = generalData['Map']['rho']
-                if not len(rho):
+                if len(D4mapData.get('rho',[])):        #preferentially select 4D map if there
+                    rho = D4mapData['rho'][:,:,:,int(G2frame.tau*10)]   #pick current tau 3D slice
+                elif len(mapData['rho']):               #ordinary 3D map
+                    rho = mapData['rho']
+                else:
                     return
                 from matplotlib.backends.backend_agg import FigureCanvasAgg
@@ -8697 +8700 @@
                 plt.contour(Z,colors='k',linewidths=1)
                 plt.axis("off")
+                plt.subplots_adjust(bottom=0.,top=1.,left=0.,right=1.,wspace=0.,hspace=0.)
                 canvas = plt.get_current_fig_manager().canvas
                 agg = canvas.switch_backends(FigureCanvasAgg)
@@ -8702 +8706 @@
                 img, (width, height) = agg.print_to_buffer()
                 Zimg = np.frombuffer(img, np.uint8).reshape((height, width, 4))
+                Zimg[:,:,3] = 64            #sets alpha to 25%
                 RenderViewPlane(msize*eplane,Zimg,width,height)