Changeset f310316 in sasview for invariantview/perspectives

Timestamp:

Jul 29, 2010 6:54:04 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

178bfea

Parents:

0881f51

Message:

conficts between PIL and py2exe found, fixed report display, and removed the saving as pdf file

Location:

invariantview/perspectives/invariant

Files:

• invariant_state.py (modified) (4 diffs)
• report_dialog.py (modified) (3 diffs)

invariantview/perspectives/invariant/invariant_state.py

@@ -5 +5 @@
 from xml.dom.minidom import parse
 from lxml import etree
+"""
+try:
+    import PIL.Image as Image
+    import PIL.PngImagePlugin as PngImagePlugin
+    Image._initialized = 2
+except:
+    try:
+        import Image 
+        import PngImagePlugin
+        Image._initialized = 2
+    except:
+        Image = None    
+"""
+
 
 from DataLoader.readers.cansas_reader import Reader as CansasReader
@@ -537 +551 @@
         import cStringIO
         import matplotlib,wx
-        matplotlib.use('Agg')
         import matplotlib.pyplot as plt
-        import Image
-        
+        from matplotlib.backends.backend_agg import FigureCanvasAgg
+
         #we use simple plot, not plotpanel
         #make matlab figure
         fig = plt.figure()
+        fig.set_facecolor('w')
         graph = fig.add_subplot(111)
-        
+
         #data plot
         graph.errorbar(self.data.x, self.data.y, yerr=self.data.dy, fmt='o')
@@ -556 +570 @@
         graph.set_xscale("log", nonposx='clip')
         graph.set_yscale("log", nonposy='clip')
-        plt.xlabel('$\\rm{Q}(\\AA^{-1})$', fontsize = 12)
-        plt.ylabel('$\\rm{Intensity}(cm^{-1})$', fontsize = 12)
-
-        #make python.Image object
-        imagedata = cStringIO.StringIO()
-        fig.savefig(imagedata,format='png')
-        imagedata.seek(0)
-        img = Image.open(imagedata) 
+        graph.set_xlabel('$\\rm{Q}(\\AA^{-1})$', fontsize = 12)
+        graph.set_ylabel('$\\rm{Intensity}(cm^{-1})$', fontsize = 12)
+        canvas = FigureCanvasAgg(fig)
+        #actually make image
+        canvas.draw()
+        
+        #make python.Image object 
+        #size
+        w,h =canvas.get_width_height()
         #convert to wx.Image
-        wxim = wx.EmptyImage(img.size[0],img.size[1])
-        wxim.SetData(img.convert("RGB").tostring())  
+        wximg = wx.EmptyImage(w,h)
+        #wxim.SetData(img.convert('RGB').tostring() ) 
+        wximg.SetData(canvas.tostring_rgb()) 
         #get the dynamic image for the htmlwindow
-        wximbmp = wx.BitmapFromImage(wxim)
+        wximgbmp = wx.BitmapFromImage(wximg)
         #store the image in wx.FileSystem Object 
         wx.FileSystem.AddHandler(wx.MemoryFSHandler())
@@ -574 +590 @@
         self.imgRAM = wx.MemoryFSHandler()
         #AddFile, image can be retrieved with 'memory:filename'
-        self.imgRAM.AddFile('img_inv.png',wximbmp, wx.BITMAP_TYPE_PNG)
-        
-        self.wximbmp = 'memory:img_inv.png'
-        self.image = img
+        self.imgRAM.AddFile('img_inv.png',wximgbmp, wx.BITMAP_TYPE_PNG)
+        
+        self.wximgbmp = 'memory:img_inv.png'
+        self.image = fig
 
 class Reader(CansasReader):

invariantview/perspectives/invariant/report_dialog.py

@@ -113 +113 @@
         dlg = wx.FileDialog(self, "Choose a file",\
                             wildcard ='HTML files (*.html)|*.html|'+
-                            'Text files (*.txt)|*.txt|'+
-                            'PDF files (*.pdf)|*.pdf',
+                            'Text files (*.txt)|*.txt',
                             style = wx.SAVE|wx.OVERWRITE_PROMPT|wx.CHANGE_DIR)
         dlg.SetFilterIndex(0) #Set .html files to be default
@@ -136 +135 @@
             f.close()
             #save png file using pic_fname
-            self.report_list[2].save(pic_fname)
+            self.report_list[2].savefig(pic_fname)
             
         elif dlg.GetFilterIndex()== 1:
@@ -146 +145 @@
             f.write(text)
             f.close()
-            
-        elif dlg.GetFilterIndex()== 2:
-            fName = os.path.splitext(fName)[0] + '.pdf'
-            dlg.Destroy()
-
-            #pic (png) file path/name
-            pic_fname = os.path.splitext(fName)[0] + '_img.png'
-            # save the image for use with pdf writer
-            self.report_list[2].save(pic_fname)
-            
-            # put the image file path in the html data
-            html = self.report_list[0] % str(pic_fname)
-            
-            open_pdf = True
-            # make/open file in case of absence
-            f = open(fName, 'w')
-            f.close()
-            # write pdf as a pdf file
-            pdf = self.HTML2PDF(data=html, filename=fName)
-            
-            #open pdf
-            if open_pdf and pdf:
-                os.startfile(str(fName))
-
-            #delete image file
-            os.remove(pic_fname)
-            
+ 
     def onPreview(self,event=None):
         """