Changeset 3d29cab0 in sasview

Timestamp:

Feb 17, 2015 12:00:41 PM (10 years ago)

Author:

smk78

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:

c147870

Parents:

6f10243 (diff), 3ef5b2f (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 'master' of ​https://github.com/SasView/sasview.git

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)
• docs/sphinx-docs/source/user/user.rst (modified) (3 diffs)
• src/sas/guiframe/media/data_formats_help.rst (added)
• src/sas/models/media/model_functions.rst (modified) (1 diff)

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__'},
-    'pisa':{'version':'3.0.28','import_name':'ho.pisa','test':'__version__'},
+    'xhtml2pdf':{'version':'3.0.33','import_name':'xhtml2pdf','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', 'ho.pisa', 'bumps',
+    'win32com', 'xhtml2pdf', 'bumps',
     ]
 packages.extend([

src/sas/guiframe/gui_manager.py

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

src/sas/perspectives/invariant/report_dialog.py

@@ -18 +18 @@
 import os
 import wx.html as html
+import logging
 ISPDF = False
 if sys.platform == "win32":
@@ -246 +247 @@
     def HTML2PDF(self, data, filename):
         """
-        Create a PDF file from html source string. 
+        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
         """
-        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
-
-        
-        
+        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

docs/sphinx-docs/source/user/user.rst

@@ -4 +4 @@
 .. toctree::
    :maxdepth: 1
-
+   
    Model Documentation <models/model_functions>
    
+   Data Formats <guiframe/data_formats_help>
    
    Loading Data <guiframe/data_explorer_help>
    
    Plotting Data/Models <guiframe/graph_help>
-   
    
    Fitting Perspective <perspectives/fitting/fitting_help>
@@ -19 +19 @@
    Invariant Calculation Perspective <perspectives/invariant/invariant_help>
    
-  
    Data Operations Tool <perspectives/calculator/data_operator_help>
       
@@ -36 +35 @@
    SANS Resolution Estimator Tool <perspectives/calculator/resolution_calculator_help>
    
-   
    Python Shell Tool <perspectives/calculator/python_shell_help>

src/sas/models/media/model_functions.rst

@@ -87 +87 @@
 
  2.1 Shape-based_ Functions
+ 
  2.2 Shape-independent_ Functions
+ 
  2.3 Structure-factor_ Functions
+ 
  2.4 Customised_ Functions