Changeset 24

Timestamp:

Feb 4, 2010 5:21:18 PM (12 years ago)

Author:

toby

Message:

add error mesages, fix import by making relative to source location, not working dir

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIIO.py (modified) (1 diff)
• GSASIIcomp.py (modified) (1 diff)

trunk/GSASII.py

@@ -15 +15 @@
 else:
     import wxmpl as wxmpl
-
-# determine a binary path pased on the host OS and the python version
+import pylab
+
+# determine a binary path pased on the host OS and the python version, path is relative to 
+# location of this file
 if sys.platform == "win32":
     bindir = 'binwin%d.%d' % sys.version_info[0:2]
@@ -23 +25 @@
 else:
     bindir = 'bin'
-if ospath.exists(ospath.abspath(bindir)): sys.path.insert(0,ospath.abspath(bindir))
-import pylab
-
+if ospath.exists(ospath.join(sys.path[0],bindir)): sys.path.insert(0,ospath.join(sys.path[0],bindir))
+# load the GSAS routines
 import GSASIIIO as G2IO
 import GSASIIcomp as G2cmp

trunk/GSASIIIO.py

@@ -443 +443 @@
     import array as ar
     import struct as st
-    import pack_f as pf
+    try:
+        import pack_f as pf
+    except:
+        msg = wx.MessageDialog(None, message="Unable to load the GSAS MAR image decompression, pack_f",
+                               caption="Import Error",
+                               style=wx.ICON_ERROR | wx.OK | wx.STAY_ON_TOP)
+        msg.ShowModal()
+        return None,None,None,None
+
     print 'Read Mar345 file: ',filename
     File = open(filename,'rb')

trunk/GSASIIcomp.py

@@ -7 +7 @@
 import numpy.linalg as nl
 import GSASIIgrid as G2gd
-import pypowder as pyp
+try: 
+    import pypowder as pyp
+except:
+    # create an app to display the error, since we are still loading routines at this point 
+    app = wx.App()
+    app.MainLoop()
+    msg = wx.MessageDialog(None, message="Unable to load the GSAS powder computation module, pypowder",
+                     caption="Import Error",
+                     style=wx.ICON_ERROR | wx.OK | wx.STAY_ON_TOP)
+    msg.ShowModal()
+    # this error is non-recoverable, so just quit
+    exit()
 
 # trig functions in degrees