Changes in / [3ef5b2f:25f223b] in sasview

Files:

• check_packages.py (modified) (1 diff)
• sasview/setup_exe.py (modified) (1 diff)
• src/sas/guiframe/gui_manager.py (modified) (2 diffs)
• src/sas/perspectives/fitting/report_dialog.py (modified) (2 diffs)
• src/sas/perspectives/invariant/report_dialog.py (modified) (2 diffs)

check_packages.py

@@ -24 +24 @@
     'wx':{'version':'2.8.12.1','import_name':'wx','test':'__version__'},
     'matplotlib':{'version':'1.1.0','import_name':'matplotlib','test':'__version__'},
-    'xhtml2pdf':{'version':'3.0.33','import_name':'xhtml2pdf','test':'__version__'},
+    'pisa':{'version':'3.0.28','import_name':'ho.pisa','test':'__version__'},
     'sphinx':{'version':'1.2.1','import_name':'sphinx','test':'__version__'},
     'unittest-xml-reporting':{'version':'1.10.0','import_name':'xmlrunner','test':'__version__'},

sasview/setup_exe.py

@@ -308 +308 @@
 packages = [
     'matplotlib', 'scipy', 'encodings', 'comtypes',
-    'win32com', 'xhtml2pdf', 'bumps',
+    'win32com', 'ho.pisa', 'bumps',
     ]
 packages.extend([

src/sas/guiframe/gui_manager.py

@@ -2129 +2129 @@
                     logging.error("Error in _onTutorial: %s" % sys.exc_value)
                     try:
-                        # Try an alternate method
-                        logging.error("Could not open the tutorial pdf, trying xhtml2pdf")
-                        from xhtml2pdf import pisa
+                        #in case when the pdf default set other than acrobat
+                        import ho.pisa as pisa
                         pisa.startViewer(path)
                     except:
-                        logging.error("Could not open the tutorial pdf with xhtml2pdf")
                         msg = "This feature requires 'PDF Viewer'\n"
+                        msg += "Please install it first (Free)..."
                         wx.MessageBox(msg, 'Error')
             else:
@@ -2143 +2142 @@
                 except:
                     try:
-                        # Try an alternate method
-                        logging.error("Could not open the tutorial pdf, trying xhtml2pdf")
-                        from xhtml2pdf import pisa
+                        #in case when the pdf default set other than preview
+                        import ho.pisa as pisa
                         pisa.startViewer(path)
                     except:
-                        logging.error("Could not open the tutorial pdf with xhtml2pdf")
-                        msg = "This feature requires the 'Preview' application\n"
+                        msg = "This feature requires 'Preview' Application\n"
+                        msg += "Please install it first..."
                         wx.MessageBox(msg, 'Error')
 

src/sas/perspectives/fitting/report_dialog.py

@@ -17 +17 @@
 import os
 import wx.html as html
-import logging
 
 _STATICBOX_WIDTH = 480
@@ -298 +297 @@
         """
         Create a PDF file from html source string.
-        Returns True is the file creation was successful. 
         
         : data: html string
         : filename: name of file to be saved
         """
-        try:
-            from xhtml2pdf import pisa
-            # open output file for writing (truncated binary)
-            resultFile = open(filename, "w+b")
-            # convert HTML to PDF
-            pisaStatus = pisa.CreatePDF(data, dest=resultFile)
-            # close output file
-            resultFile.close()
-            self.Update()
-            return pisaStatus.err
-        except:
-            logging.error("Error creating pdf: %s" % sys.exc_value)
-        return False
+        import ho.pisa as pisa
+        f = file(filename, "wb")
+        # pisa requires some extra packages, see their web-site
+        pdf = pisa.CreatePDF(data, f)
+
+        # close the file here otherwise it will be open until quitting
+        #the application.
+        f.close()
+        self.Update()
+        return not pdf.err

src/sas/perspectives/invariant/report_dialog.py

@@ -18 +18 @@
 import os
 import wx.html as html
-import logging
 ISPDF = False
 if sys.platform == "win32":
@@ -247 +246 @@
     def HTML2PDF(self, data, filename):
         """
-        Create a PDF file from html source string.
-        Returns True is the file creation was successful. 
+        Create a PDF file from html source string. 
         
         : data: html string
         : filename: name of file to be saved
         """
-        try:
-            from xhtml2pdf import pisa
-            # open output file for writing (truncated binary)
-            resultFile = open(filename, "w+b")
-            # convert HTML to PDF
-            pisaStatus = pisa.CreatePDF(data, dest=resultFile)
-            # close output file
-            resultFile.close()
-            self.Update()
-            return pisaStatus.err
-        except:
-            logging.error("Error creating pdf: %s" % sys.exc_value)
-        return False
+        import ho.pisa as pisa
+        f = file(filename, "wb")
+        # pisa requires some extra packages, see their web-site
+        pdf = pisa.CreatePDF(data, f)
+        # close the file here otherwise it will be open until quitting
+        #the application.
+        f.close()
+
+        return not pdf.err
+
+        
+