Changeset 178bfea in sasview for invariantview

Timestamp:

Jul 30, 2010 11:09:58 AM (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:

0399c78

Parents:

f310316

Message:

cleaned up report codes

Location:

invariantview/perspectives/invariant

Files:

• invariant_panel.py (modified) (1 diff)
• invariant_state.py (modified) (1 diff)
• report_dialog.py (modified) (1 diff)

invariantview/perspectives/invariant/invariant_panel.py

@@ -666 +666 @@
         if float(next_state_num)+2 > len(self.state.state_list):
             self._redo_disable()
-        elif not self.button_redo.Enabled:
+        else:
             self._redo_enable()
         

invariantview/perspectives/invariant/invariant_state.py

@@ -549 +549 @@
         """
         # some imports
-        import cStringIO
+        #import cStringIO
         import matplotlib,wx
         import matplotlib.pyplot as plt

invariantview/perspectives/invariant/report_dialog.py

@@ -122 +122 @@
         
         fName = dlg.GetPath()
+        ext_num = dlg.GetFilterIndex()     
+
+        #set file extensions  
+        if ext_num == 0:
+            ext = '.html'
+            img_ext= '_img4html.png'
+            report_frame = self.report_list[0]
+        elif ext_num == 1:
+            ext = '.txt'   
+            # changing the image extension actually changes the image format on saving
+            img_ext= '_img4txt.pdf'
+            report = self.report_list[1]
+        else:
+            return
         
-        if dlg.GetFilterIndex()== 0:
-            fName = os.path.splitext(fName)[0] + '.html'
-            dlg.Destroy()
+        #file name     
+        fName = os.path.splitext(fName)[0] + ext
+        dlg.Destroy()
+        #pic (png) file path/name
+        pic_fname = os.path.splitext(fName)[0] + img_ext
+        #put the image path in html string
+        if ext_num == 0: report = report_frame % pic_fname
+        f = open(fName, 'w')
+        f.write(report)
+        f.close()
+        #save png file using pic_fname
+        self.report_list[2].savefig(pic_fname)
+        
             
-            #pic (png) file path/name
-            pic_fname = os.path.splitext(fName)[0] + '_img.png'
-            #put the path in html string
-            html = self.report_list[0] % pic_fname
-            f = open(fName, 'w')
-            f.write(html)
-            f.close()
-            #save png file using pic_fname
-            self.report_list[2].savefig(pic_fname)
-            
-        elif dlg.GetFilterIndex()== 1:
-            fName = os.path.splitext(fName)[0] + '.txt'
-            dlg.Destroy()
-            
-            text = self.report_list[1]
-            f = open(fName, 'w')
-            f.write(text)
-            f.close()
- 
     def onPreview(self,event=None):
         """