Changeset 5a81885 in sasview for src/sas/sasgui/guiframe/report_dialog.py

Timestamp:

Sep 26, 2017 5:18:30 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b916afa

Parents:

0a3c740 (diff), 69a6897 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ticket-853-fit-gui-to-calc' into py3

File:

• src/sas/sasgui/guiframe/report_dialog.py (modified) (9 diffs)

src/sas/sasgui/guiframe/report_dialog.py

@@ -13 +13 @@
 if sys.platform == "win32":
     _STATICBOX_WIDTH = 450
-    PANEL_WIDTH = 500 
+    PANEL_WIDTH = 500
     PANEL_HEIGHT = 700
     FONT_VARIANT = 0
@@ -26 +26 @@
 
 class BaseReportDialog(wx.Dialog):
-    
+
     def __init__(self, report_list, *args, **kwds):
         """
         Initialization. The parameters added to Dialog are:
-        
+
         :param report_list: list of html_str, text_str, image for report
         """
@@ -48 +48 @@
         self.report_list = report_list
         # wild card
-        # pdf supporting only on MAC
-        if self.is_pdf:
-            self.wild_card = ' PDF files (*.pdf)|*.pdf|'
+        if self.is_pdf:  # pdf writer is available
+            self.wild_card = 'PDF files (*.pdf)|*.pdf|'
             self.index_offset = 0
         else:
@@ -63 +62 @@
         """
         hbox = wx.BoxSizer(wx.HORIZONTAL)
-        
+
         # buttons
         button_close = wx.Button(self, wx.ID_OK, "Close")
@@ -75 +74 @@
                           id=button_print.GetId())
         hbox.Add(button_print)
-        
+
         button_save = wx.Button(self, wx.NewId(), "Save")
         button_save.SetToolTipString("Save this report.")
         button_save.Bind(wx.EVT_BUTTON, self.onSave, id=button_save.GetId())
         hbox.Add(button_save)
-        
+
         # panel for report page
         vbox = wx.BoxSizer(wx.VERTICAL)
@@ -87 +86 @@
         # set the html page with the report string
         self.hwindow.SetPage(self.report_html)
-        
+
         # add panels to boxsizers
         vbox.Add(hbox)
@@ -103 +102 @@
         previewh = html.HtmlEasyPrinting(name="Printing", parentWindow=self)
         previewh.PreviewText(self.report_html)
-        
+
     def onPrint(self, event=None):
         """
@@ -118 +117 @@
         """
         self.Close()
-    
+
     def HTML2PDF(self, data, filename):
         """
         Create a PDF file from html source string.
-        Returns True is the file creation was successful. 
+        Returns True is the file creation was successful.
         : data: html string
         : filename: name of file to be saved
@@ -136 +135 @@
             self.Update()
             return pisaStatus.err
-        except:
+        except Exception:
             logger.error("Error creating pdf: %s" % sys.exc_value)
         return False
-