Changeset b281210 in sasview for invariantview/perspectives/invariant

Timestamp:

Jul 26, 2010 7:27:38 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:

cb274d9e

Parents:

cef847c

Message:

added save as text and added png saves, improved the behavior

Location:

invariantview/perspectives/invariant

Files:

• invariant_state.py (modified) (5 diffs)
• report_dialog.py (modified) (10 diffs)

invariantview/perspectives/invariant/invariant_state.py

@@ -102 +102 @@
         self.template_str = html_template.read()
         self.report_str = self.template_str
+        #self.report_str_save = None
         html_template.close()
         
@@ -211 +212 @@
                 except:
                     pass
-                state += "(%s %s)"%(format_number(value),'%')
+                state += "(%s %s)"%(format_number(value),'o/o')
             # Outputs
             else:
@@ -464 +465 @@
                     bool_0 = extra[0].split("=")
                     bool_1 = extra[1].split("=")
-                    s_7 = " "+bool_0[0]+" = "+bool_0[1]
-                    s_8 = " "+bool_1[0]+" = "+bool_1[1]
+                    s_7 = " "+bool_0[0]+"Q region = "+bool_0[1]
+                    s_8 = " "+bool_1[0]+"Q region = "+bool_1[1]
                 elif item[0]=="npts low":
                     s_9 = item[1]
@@ -491 +492 @@
         # make plot image
         self.set_plot_state(extra_high=bool_0[1],extra_low=bool_1[1])
-        
         # get ready for report with setting all the html strings
-        self.report_str = str(self.template_str)% (s_1,s_2,s_3,s_4,s_5,s_6,s_7,s_8,s_9,s_10,s_11,s_12,s_13,s_14,s_15,s_16,s_17,s_18,self.file,self.wximbmp)
-    
-    
+        self.report_str =  str(self.template_str)% (s_1,s_2,s_3,s_4,s_5,s_6,s_7,s_8,s_9,s_10,s_11,s_12,s_13,s_14,s_15,s_16,s_17,s_18,self.file,"%s")
+
+
     def set_saved_state(self, name, value):
         """
@@ -577 +577 @@
         
         self.wximbmp = 'memory:img_inv.png'
-            
+        self.image = img
 
 class Reader(CansasReader):

invariantview/perspectives/invariant/report_dialog.py

@@ -19 +19 @@
 import wx.html as html
 import Image
+
 if sys.platform.count("win32")>0:
     _STATICBOX_WIDTH = 450
@@ -37 +38 @@
     """
     
-    def __init__(self,  string, *args, **kwds):
+    def __init__(self,  list, *args, **kwds):
         """
         Initialization. The parameters added to Dialog are:
         
-        :param string: report_string  from invariant_state
+        :param list: report_list (list of html_str, text_str, image) from invariant_state
         """
         kwds["style"] = wx.RESIZE_BORDER|wx.DEFAULT_DIALOG_STYLE
@@ -53 +54 @@
         self.SetWindowVariant(variant=FONT_VARIANT)
         # report string
-        self.report_string =string
+        self.report_list =list
+        # put image path in the report string
+        self.report_html = self.report_list[0]% "memory:img_inv.png"
         # layout
         self._setup_layout()
@@ -61 +64 @@
         Set up layout
         """
-        # panel for buttons
-        bpanel = wx.Panel(self, -1)
         hbox = wx.BoxSizer(wx.HORIZONTAL)
         
         # buttons
         id = wx.NewId()
-        button_save = wx.Button(self, id, "Save")
+        button_save = wx.Button(self, id, "Save" )
         button_save.SetToolTipString("Save this report.")
         button_save.Bind(wx.EVT_BUTTON, self.onSave, id = button_save.GetId()) 
@@ -84 +85 @@
         hbox.Add(button_print)
         
+        id = wx.ID_OK
+        button_close = wx.Button(self, id, "Close")
+        button_close.SetToolTipString("Close this report window.") 
+        hbox.Add((5,10), 1 , wx.EXPAND|wx.ADJUST_MINSIZE,0)
+        hbox.Add(button_close)
+        button_close.SetFocus()
+        
         
         # panel for report page
@@ -91 +99 @@
         self.hwindow = html.HtmlWindow(panel, -1,style=wx.BORDER,size=(700,500))
         # set the html page with the report string
-        self.hwindow.SetPage(self.report_string)
+        self.hwindow.SetPage(self.report_html)
         # add panels to boxsizers
-        hbox.Add(bpanel)
-        vbox.Add(hbox,40, wx.EXPAND)
+        #hbox.Add(bpanel)
+        vbox.Add(hbox,30, wx.EXPAND)
         vbox.Add(panel,500, wx.EXPAND)
 
@@ -109 +117 @@
                             wildcard ='HTML files (*.html)|*.html|'+
                             'Text files (*.txt)|*.txt',
+                            #'PDF files (*.pdf)|*.pdf',
                             style = wx.SAVE|wx.OVERWRITE_PROMPT|wx.CHANGE_DIR)
         dlg.SetFilterIndex(0) #Set .html files to be default
@@ -115 +124 @@
           dlg.Destroy()
           return
+        
         fName = dlg.GetPath()
-        fName = os.path.splitext(fName)[0] + '.html'
-        dlg.Destroy()
-    
-        html = self.report_string
-        f = open(fName, 'w')
-        f.write(html)
-        f.close()
-
-    
+        
+        if dlg.GetFilterIndex()== 0:
+            fName = os.path.splitext(fName)[0] + '.html'
+            dlg.Destroy()
+            
+            #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].save(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()
+            
+        else:
+            dlg.Destroy()
+            
     def onPreview(self,event=None):
         """
@@ -132 +159 @@
         """
         previewh=html.HtmlEasyPrinting(name="Printing", parentWindow=self)
-        previewh.PreviewText(self.report_string)
+        previewh.PreviewText(self.report_html)
     
     def onPrint(self,event=None):
@@ -141 +168 @@
         """
         printh=html.HtmlEasyPrinting(name="Printing", parentWindow=self)
-        printh.PrintText(self.report_string)
+        printh.PrintText(self.report_html)
 
+
+    def OnClose(self,event=None):
+        """
+        Close the Dialog
         
+        : event: Close button event
+        """
         
+        self.Close()
+          
+