Changeset d8e3f7c in sasview

Timestamp:

Aug 16, 2012 3:12:59 PM (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:

5401f2a

Parents:

f866fb5

Message:

mac open file fixes

Files:

• fittingview/src/sans/perspectives/fitting/report_dialog.py (modified) (3 diffs)
• invariantview/src/sans/perspectives/invariant/report_dialog.py (modified) (4 diffs)

fittingview/src/sans/perspectives/fitting/report_dialog.py

@@ -23 +23 @@
 FONT_VARIANT = 1
 ISMAC = False
-
+ISPDF = False
 if sys.platform == "win32":
     _STATICBOX_WIDTH = 450
@@ -30 +30 @@
     FONT_VARIANT = 0
     ISMAC = False
+    ISPDF = True
 elif sys.platform == "darwin":
     ISMAC = True
-ISPDF = True
+    ISPDF = True
 
         
@@ -199 +200 @@
             #open pdf
             if pdf:
-                os.startfile(str(fName))
+                try:
+                    #Windows
+                    os.startfile(str(fName))
+                except:
+                    try:
+                        #Mac
+                        os.system("open %s"% fName)
+                    except:
+                        #DO not open
+                        pass
             #delete image file
             for num in range(self.nimages):

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

@@ -18 +18 @@
 import os
 import wx.html as html
-
-if sys.platform.count("win32") > 0:
+ISPDF = False
+if sys.platform == "win32":
     _STATICBOX_WIDTH = 450
     PANEL_WIDTH = 500 
@@ -25 +25 @@
     FONT_VARIANT = 0
     ISMAC = False
-else:
+    ISPDF = True
+elif sys.platform == "darwin":
     _STATICBOX_WIDTH = 480
     PANEL_WIDTH = 530
@@ -31 +32 @@
     FONT_VARIANT = 1
     ISMAC = True
-ISPDF = True
+    ISPDF = True
   
 class ReportDialog(wx.Dialog):
@@ -171 +172 @@
             #open pdf
             if pdf:
-                os.startfile(str(fName))
+                try:
+                    #Windows
+                    os.startfile(str(fName))
+                except:
+                    try:
+                        #Mac
+                        os.system("open %s"% fName)
+                    except:
+                        #DO not open
+                        pass
             #delete image file
             os.remove(pic_fname)