Changeset dec793e in sasview for invariantview

Timestamp:

Apr 5, 2011 7:32:45 PM (13 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:

4b470cf

Parents:

8da09f4

Message:

fixed the html report doc

Location:

invariantview

Files:

• media/report_template.html (modified) (1 diff)
• perspectives/invariant/report_dialog.py (modified) (9 diffs)

invariantview/media/report_template.html

@@ -43 +43 @@
  <tr>
   <td width=170 valign=top >
-  <p class=MsoNormal > porod  constant</p>
+  <p class=MsoNormal > porod constant</p>
   </td>
   <td width=213 valign=top >

invariantview/perspectives/invariant/report_dialog.py

@@ -24 +24 @@
     PANEL_HEIGHT = 700
     FONT_VARIANT = 0
+    ISMAC = False
 else:
     _STATICBOX_WIDTH = 480
@@ -29 +30 @@
     PANEL_HEIGHT = 700
     FONT_VARIANT = 1
-    
-
-        
+    ISMAC = True
+  
 class ReportDialog(wx.Dialog):
     """
@@ -53 +53 @@
         # font size 
         self.SetWindowVariant(variant=FONT_VARIANT)
+
+        # check if tit is MAC
+        self.is_mac = ISMAC
+        
         # report string
         self.report_list = list
@@ -59 +63 @@
         # layout
         self._setup_layout()
+        # wild card
+        # pdf supporting only on MAC
+        if self.is_mac:
+                self.wild_card = ' PDF files (*.pdf)|*.pdf|'
+        else:
+                self.wild_card = ''
+        self.wild_card += 'HTML files (*.html)|*.html|'
+        self.wild_card += 'Text files (*.txt)|*.txt'
+  
+        
         
     def _setup_layout(self):
@@ -109 +123 @@
         self.Centre()
         self.Show(True)
-
+                
 
     def onSave(self, event=None):
@@ -117 +131 @@
         #todo: complete saving fig file and as a txt file
         dlg = wx.FileDialog(self, "Choose a file",
-                            wildcard='HTML files (*.html)|*.html|'+
-                            'Text files (*.txt)|*.txt',
+                            wildcard=self.wild_card,
                             style=wx.SAVE|wx.OVERWRITE_PROMPT|wx.CHANGE_DIR)
         dlg.SetFilterIndex(0) #Set .html files to be default
@@ -125 +138 @@
             dlg.Destroy()
             return
-        
+
         fName = dlg.GetPath()
-        ext_num = dlg.GetFilterIndex()     
-
+        ext_num = dlg.GetFilterIndex()  
+        # index correction 
+        if not self.is_mac:
+                ind_cor = 1 
+        else:
+                ind_cor = 0 
         #set file extensions  
-        if ext_num == 0:
+        if ext_num == (0 + 2 * ind_cor):
+                        # TODO: Sort this case out
+            ext = '.pdf'
+            img_ext = '_img.png'
+            fName = os.path.splitext(fName)[0] + ext
+            dlg.Destroy()
+
+            #pic (png) file path/name
+            pic_fname = os.path.splitext(fName)[0] + img_ext
+            # save the image for use with pdf writer
+            self.report_list[2].savefig(pic_fname)
+
+            # put the image file path in the html data
+            html = self.report_list[0] % str(pic_fname)
+            
+            # 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 pdf:
+                os.startfile(str(fName))
+            #delete image file
+            os.remove(pic_fname)
+            return
+        elif ext_num == (1 - ind_cor):
             ext = '.html'
             img_ext = '_img4html.png'
             report_frame = self.report_list[0]
-        elif ext_num == 1:
+        elif ext_num == (2 - ind_cor):
             ext = '.txt'   
             # changing the image extension actually changes the image
@@ -142 +186 @@
         else:
             return
-        
+
         #file name     
         fName = os.path.splitext(fName)[0] + ext
@@ -149 +193 @@
         pic_fname = os.path.splitext(fName)[0] + img_ext
         #put the image path in html string
-        if ext_num == 0:
+        if ext_num == (1 - ind_cor):
             report = report_frame % pic_fname
+
         f = open(fName, 'w')
         f.write(report)