Changeset 7954acd in sasview

Timestamp:

Apr 5, 2012 8:12:43 AM (12 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:

b53414b

Parents:

213b445

Message:

try to fix tutorial view problem on MAC when the default pdf viewer was set other than the Preview

Files:

• invariantview/src/sans/perspectives/invariant/report_dialog.py (modified) (4 diffs)
• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (2 diffs)

invariantview/src/sans/perspectives/invariant/report_dialog.py

@@ -31 +31 @@
     FONT_VARIANT = 1
     ISMAC = True
+ISPDF = True
   
 class ReportDialog(wx.Dialog):
@@ -55 +56 @@
 
         # check if tit is MAC
-        self.is_mac = ISMAC
+        self.is_pdf = ISPDF
         
         # report string
@@ -65 +66 @@
         # wild card
         # pdf supporting only on MAC
-        if self.is_mac:
+        if self.is_pdf:
                 self.wild_card = ' PDF files (*.pdf)|*.pdf|'
         else:
@@ -142 +143 @@
         ext_num = dlg.GetFilterIndex()  
         # index correction 
-        if not self.is_mac:
+        if not self.is_pdf:
                 ind_cor = 1 
         else:

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -2192 +2192 @@
                     dialog.Show(True) 
                 except:
-                    msg = "This feature requires 'Adobe pdf Reader'\n"
-                    msg += "Please install it first (Free)..."
-                    wx.MessageBox(msg, 'Error')
+                    try:
+                        #in case when the pdf default set other than acrobat
+                        import ho.pisa as pisa
+                        pisa.startViewer(path)
+                    except:
+                        msg = "This feature requires 'PDF Viewer'\n"
+                        msg += "Please install it first (Free)..."
+                        wx.MessageBox(msg, 'Error')
             else:
                 try:
@@ -2200 +2205 @@
                     os.system(command)
                 except:
-                    msg = "This feature requires 'Preview' Application\n"
-                    msg += "Please install it first..."
-                    wx.MessageBox(msg, 'Error')
+                    try:
+                        #in case when the pdf default set other than preview
+                        import ho.pisa as pisa
+                        pisa.startViewer(path)
+                    except:
+                        msg = "This feature requires 'Preview' Application\n"
+                        msg += "Please install it first..."
+                        wx.MessageBox(msg, 'Error')