Changeset 4766

Timestamp:

Jan 14, 2021 11:15:32 AM (4 years ago)

Author:

vondreele

Message:

modify atom labeling routine to allow specified offset as wx.RealPoint? - now only used for MapPeaks? plotting

Location:

trunk

Files:

• GSASIIplot.py (modified) (3 diffs)
• gltext.py (modified) (3 diffs)

trunk/GSASIIplot.py ¶

@@ -9153 +9153 @@
         GL.glDisable(GL.GL_COLOR_MATERIAL)
         
-    def RenderLabel(x,y,z,label,r,color,matRot):
+    def RenderLabel(x,y,z,label,r,color,matRot,offset=wx.RealPoint(0.,0.)):
         '''
         color wx.Colour object
@@ -9165 +9165 @@
         GL.glRotate(180,1,0,0)             #fix to flip about x-axis
         text = gltext.Text(text='   '+label,font=Font,foreground=color)
-        text.draw_text(scale=0.025)
+        text.draw_text(scale=0.025,position=offset)
         GL.glEnable(GL.GL_LIGHTING)
         GL.glPopMatrix()
@@ -9250 +9250 @@
                         RenderLabel(lx,ly,lz,lbl,radius,wxGreen,matRot)
                         ax,ay,az = xyz
-                        RenderLabel(ax,ay,az,'  '+atomB[0],radius,wxGreen,matRot)
+                        RenderLabel(ax,ay,az,atomB[0],radius,wxGreen,matRot,offset=wx.RealPoint(0.,-.5))
         # find bonds
         bondData = [[] for i in range(len(Atoms))]

trunk/gltext.py ¶

@@ -99 +99 @@
     #---Functions
     
-    def draw_text(self, position = wx.Point(0,0), scale = 1.0, rotation = 0):
-        """
-        position (wx.Point)    - x/y Position to draw in scene
+    def draw_text(self, position = wx.RealPoint(0.,0.), scale = 1.0, rotation = 0):
+        """
+        position (wx.RealPoint)    - x/y Position to draw in scene
         scale    (float)       - Scale
         rotation (int)         - Rotation in degree
@@ -121 +121 @@
         #Perform transformations
         GL.glPushMatrix()
-        GL.glTranslated(position.x, position.y, 0)
+        GL.glTranslatef(position.x, position.y, 0)
         GL.glRotate(-rotation, 0, 0, 1)
         GL.glScaled(scale, scale, scale)
@@ -415 +415 @@
     #---Functions
         
-    def draw_text(self, position = wx.Point(0,0), scale = 1.0, rotation = 0):
-        """
-        position (wx.Point)    - x/y Position to draw in scene
+    def draw_text(self, position = wx.RealPoint(0.,0.), scale = 1.0, rotation = 0):
+        """
+        position (wx.RealPoint)    - x/y Position to draw in scene
         scale    (float)       - Scale
         rotation (int)         - Rotation in degree