Changeset 3857 for trunk/GSASIIscriptable.py

Timestamp:

Mar 18, 2019 12:09:57 PM (3 years ago)

Author:

toby

Message:

Fix scriptable to work w/o wx & mpl; reorg of docs

File:

• trunk/GSASIIscriptable.py (modified) (2 diffs)

trunk/GSASIIscriptable.py

@@ -1068 +1068 @@
     gsasii_version = str(GSASIIpath.GetVersionNumber())
     LoadG2fil()
-    import matplotlib as mpl
-    python_library_versions = G2fil.get_python_versions([mpl, np, sp])
+    try:
+        import matplotlib as mpl
+        python_library_versions = G2fil.get_python_versions([mpl, np, sp])
+    except ModuleNotFoundError:
+        python_library_versions = G2fil.get_python_versions([np, sp])
 
     controls_data = dict(G2obj.DefaultControls)
@@ -2812 +2815 @@
         try:
             import matplotlib.pyplot as plt
-            data = self.data['data'][1]
-            if Yobs:
-                plt.plot(data[0], data[1], label='Yobs')
-            if Ycalc:
-                plt.plot(data[0], data[3], label='Ycalc')
-            if Background:
-                plt.plot(data[0], data[4], label='Background')
-            if Residual:
-                plt.plot(data[0], data[5], label="Residual")
         except ImportError:
-            pass
+            print('Unable to import matplotlib, skipping plot')
+            return
+        data = self.data['data'][1]
+        if Yobs:
+            plt.plot(data[0], data[1], label='Yobs')
+        if Ycalc:
+            plt.plot(data[0], data[3], label='Ycalc')
+        if Background:
+            plt.plot(data[0], data[4], label='Background')
+        if Residual:
+            plt.plot(data[0], data[5], label="Residual")
 
     def get_wR(self):