Changeset 4786 for trunk

Timestamp:

Jan 28, 2021 1:05:18 PM (2 years ago)

Author:

vondreele

Message:

use set_box_aspect to make 3D plot scales correct. one in four places. A test routine (RenderLabel2) is being tried to improve atom labelling speed (doesn't work).

File:

• trunk/GSASIIplot.py (modified) (5 diffs)

trunk/GSASIIplot.py

@@ -977 +977 @@
             Page.Choice += ('w: select |DFsq|/sig','1: select |DFsq|>sig','3: select |DFsq|>3sig',)
     try:
-        Plot.set_aspect(aspect='equal')
-    except:  #broken in mpl 3.1.1; worked in mpl 3.0.3
+        Plot.set_box_aspect((1,1,1))
+#                Plot.set_aspect('equal')
+    except: #broken in mpl 3.1.1; worked in mpl 3.0.3
         pass
     
@@ -5330 +5331 @@
             Plot.set_ylabel(labelY)
             Plot.set_zlabel(labelZ)
-            Plot.set_aspect('equal')
+            try:
+                Plot.set_box_aspect((1,1,1))
+#                Plot.set_aspect('equal')
+            except: #broken in mpl 3.1.1; worked in mpl 3.0.3
+                pass
         # except:
         #     print('Plot3dXYZ failure')
@@ -6017 +6022 @@
             Plot.set_zlim3d(XYZlim)
             try:
-                Plot.set_aspect('equal')
+                Plot.set_box_aspect((1,1,1))
+#                Plot.set_aspect('equal')
             except: #broken in mpl 3.1.1; worked in mpl 3.0.3
                 pass
@@ -6292 +6298 @@
                 Plot.set_zlim3d(XYZlim)
                 try:
-                    Plot.set_aspect('equal')
+                    Plot.set_box_aspect((1,1,1))
+    #                Plot.set_aspect('equal')
                 except: #broken in mpl 3.1.1; worked in mpl 3.0.3
-                    pass                       
+                    pass
                 Plot.set_title('%d %d %d Pole distribution for %s'%(h,k,l,pName))
                 Plot.set_xlabel(r'X, MRD')
@@ -9166 +9173 @@
         GL.glPopMatrix()
         
+    def RenderLabel2(x,y,z,label,r,color,matRot,offset=wx.RealPoint(0.,0.)):
+        '''
+        color wx.Colour object - doesn't work
+        '''                     
+        figure = mpl.figure.Figure(figsize=(1.,1.),facecolor=(0.,0.,0.,0.))
+        figure.clf()
+        canvas = hcCanvas(figure)
+        ax0 = figure.add_subplot(111)
+        ax0.text(0.,0.,label)
+        ax0.axis("off")
+        figure.subplots_adjust(bottom=0.,top=1.,left=0.,right=1.,wspace=0.,hspace=0.)
+        agg = canvas.switch_backends(hcCanvas)
+        agg.draw()
+        img, (width, height) = agg.print_to_buffer()
+        Timg = np.frombuffer(img, np.uint8).reshape((height, width, 4))
+        RenderViewPlane(1.0*eplane,Timg,width,height)
+        
+        
     def RenderMap(rho,rhoXYZ,indx,Rok):
         GL.glShadeModel(GL.GL_FLAT)