Changeset 4d5c42f in sasview

Timestamp:

Feb 17, 2015 9:30:24 AM (9 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

66f21cd

Parents:

61c93b3

Message:

Move tutorial display to xhtml2pdf

File:

• src/sas/guiframe/gui_manager.py (modified) (2 diffs)

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')