Changeset 26d6e045 in sasview for src/sas/sasgui/perspectives/calculator/model_editor.py

Timestamp:

May 20, 2016 8:37:21 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

5dfbb24

Parents:

cd54205

Message:

make sure compiler/test errors on custom models are reported to the user

File:

• src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (8 diffs)

src/sas/sasgui/perspectives/calculator/model_editor.py

@@ -30 +30 @@
 from wx.py.editwindow import EditWindow
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
+from .pyconsole import show_model_output, check_model
 
 
@@ -45 +46 @@
 PANEL_WIDTH = 500
 _BOX_WIDTH = 55
-
-
-def _compile_file(path):
-    """
-    Compile the file in the path
-    """
-    try:
-        import py_compile
-        py_compile.compile(file=path, doraise=True)
-        return ''
-    except:
-        _, value, _ = sys.exc_info()
-        return value
 
 def _delete_file(path):
@@ -384 +372 @@
             name2 = label[1]
             self.write_string(fname, name1, name2)
-            self.compile_file(fname)
-            self.parent.update_custom_combo()
+            success = show_model_output(self, fname)
+            if success:
+                self.parent.update_custom_combo()
             msg = self._notes
             info = 'Info'
@@ -618 +607 @@
         """
         path = self.fname
-        _compile_file(path)
+        show_model_output(self, path)
 
     def delete_file(self, path):
@@ -954 +943 @@
         info = 'Info'
         msg = ''
+        result, check_err = '', ''
         # Sort out the errors if occur
         # First check for valid python name then if the name already exists
@@ -969 +959 @@
                     self.write_file(self.fname, name, description, param_str,
                                     pd_param_str, func_str)
+                    try:
+                        result, msg = check_model(self.fname), None
+                    except Exception:
+                        import traceback
+                        result, msg = None, "error building model"
+                        check_err = "\n"+traceback.format_exc(limit=2)
+
                     # Modified compiling test, as it will fail for sasmodels.sasview_model class
                     # Should add a test to check that the class is correctly built 
@@ -1031 +1028 @@
             color = 'red'
         else:
-            msg = "Successful! "
+            self._notes = result
+            msg = "Successful! Please look for %s in Customized Models."%name
             msg += "  " + self._notes
-            msg += " Please look for it in the Customized Models."
             info = 'Info'
             color = 'blue'
@@ -1041 +1038 @@
         if self.base != None:
             from sas.sasgui.guiframe.events import StatusEvent
-            wx.PostEvent(self.base.parent, StatusEvent(status=msg, info=info))
+            wx.PostEvent(self.base.parent,
+                         StatusEvent(status=msg+check_err, info=info))
         self.warning = msg