Changeset 161

Timestamp:

Oct 5, 2010 3:31:16 PM (12 years ago)

Author:

vondreele

Message:

implement hardcopy (jpeg, tiff & bmp) output of structure drawings

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (8 diffs)

trunk/GSASII.py

@@ -194 +194 @@
     def _init_ctrls(self, parent):
         wx.Frame.__init__(self, name='GSASII', parent=parent,
-            size=wx.Size(300, 250),style=wx.DEFAULT_FRAME_STYLE, title='GSAS-II')
+            size=wx.Size(300, 250),style=wx.DEFAULT_FRAME_STYLE, title='GSAS-II data tree')
         screenSize = wx.DisplaySize()
         Size = self.GetSize()

trunk/GSASIIphsGUI.py

@@ -127 +127 @@
     self.SelectedRow = 0
 
-    def BookResize(event):
-        w,h = self.GetSize()
-        self.dataDisplay.SetSize(wx.Size(w,h))
-        
+#    def BookResize(event):
+#        w,h = self.GetSize()
+#        self.dataDisplay.SetSize(wx.Size(w,h))
+#        
     def UpdateGeneral():
         generalData = data['General']
@@ -141 +141 @@
         generalData['AtomMass'] = []
         generalData['Color'] = []
+        generalData['Myself'] = self
         colType = 1
         colSS = 7

trunk/GSASIIplot.py

@@ -110 +110 @@
             return      
         
-    def OnPageChanged(self,event):
+    def OnPageChanged(self,event):        
+        if self.plotList:
+            self.status.SetStatusText('Better to select this from GSAS-II data tree',1)
         self.status.DestroyChildren()                           #get rid of special stuff on status bar
         
@@ -1120 +1122 @@
 def PlotStructure(self,data):
     generalData = data['General']
+    Myself = generalData['Myself']
     atomData = data['Atoms']
     drawingData = data['Drawing']
@@ -1133 +1136 @@
         [uBox[4],uBox[5]],[uBox[5],uBox[6]],[uBox[6],uBox[7]],[uBox[7],uBox[4]]])
     uColors = [Rd,Gr,Bl,Wt, Wt,Wt,Wt,Wt, Wt,Wt,Wt,Wt]
+    
+    def OnKeyBox(event):
+        import Image
+        Draw()
+        mode = cb.GetValue()
+        dirname = Myself.dirname
+        Fname = dirname+'\\'+generalData['Name']+'.'+mode
+        size = Page.canvas.GetSize()
+        glPixelStorei(GL_UNPACK_ALIGNMENT, 1)
+        if mode in ['jpeg',]:
+            Pix = glReadPixels(0,0,size[0],size[1],GL_RGBA, GL_UNSIGNED_BYTE)
+            im = Image.new("RGBA", (size[0],size[1]))
+        else:
+            Pix = glReadPixels(0,0,size[0],size[1],GL_RGB, GL_UNSIGNED_BYTE)
+            im = Image.new("RGB", (size[0],size[1]))
+        im.fromstring(Pix)
+        im.save(Fname,mode)
+        cb.SetValue(' save as:')
+        Draw()
     
     def OnMouseDown(event):
@@ -1298 +1320 @@
     def RenderBox():
         glEnable(GL_COLOR_MATERIAL)
+        glLineWidth(3)
+        glEnable(GL_BLEND)
+        glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA)
+        glEnable(GL_LINE_SMOOTH)
         glBegin(GL_LINES)
         for line,color in zip(uEdges,uColors):
@@ -1305 +1331 @@
         glEnd()
         glColor4ubv([0,0,0,0])
+        glDisable(GL_LINE_SMOOTH)
+        glDisable(GL_BLEND)
         glDisable(GL_COLOR_MATERIAL)
         
@@ -1310 +1338 @@
         xyz = np.array([x,y,z])
         glEnable(GL_COLOR_MATERIAL)
+        glLineWidth(1)
         glPushMatrix()
         glTranslate(x,y,z)
@@ -1367 +1396 @@
         xyz = np.array([x,y,z])
         glEnable(GL_COLOR_MATERIAL)
+        glLineWidth(1)
         glColor4fv(color)
         glPushMatrix()
@@ -1556 +1586 @@
         view = False
     Page.SetFocus()
+    cb = wx.ComboBox(self.G2plotNB.status,style=wx.CB_DROPDOWN|wx.CB_READONLY,
+        choices=(' save as:','jpeg','tiff','bmp'))
+    cb.Bind(wx.EVT_COMBOBOX, OnKeyBox)
+    cb.SetValue(' save as:')
     Page.canvas.Bind(wx.EVT_MOUSEWHEEL, OnMouseWheel)
     Page.canvas.Bind(wx.EVT_LEFT_DOWN, OnMouseDown)