Changes in src/sas/qtgui/Utilities/TabbedModelEditor.py [3b8cc00:38f838e] in sasview

File:

• src/sas/qtgui/Utilities/TabbedModelEditor.py (modified) (5 diffs)

src/sas/qtgui/Utilities/TabbedModelEditor.py

@@ -11 +11 @@
 from sas.sascalc.fit import models
 
-import sas.qtgui.Utilities.GuiUtils as GuiUtils
 from sas.qtgui.Utilities.UI.TabbedModelEditor import Ui_TabbedModelEditor
 from sas.qtgui.Utilities.PluginDefinition import PluginDefinition
@@ -24 +23 @@
     # Signals for intertab communication plugin -> editor
     def __init__(self, parent=None, edit_only=False):
-        super(TabbedModelEditor, self).__init__(parent._parent)
+        super(TabbedModelEditor, self).__init__()
 
         self.parent = parent
@@ -126 +125 @@
         self.editor_widget.setEnabled(True)
         self.editor_widget.blockSignals(False)
-        self.filename, _ = os.path.splitext(os.path.basename(filename))
-
-        self.setWindowTitle(self.window_title + " - " + self.filename)
+        self.filename = filename
+        display_name, _ = os.path.splitext(os.path.basename(filename))
+
+        self.setWindowTitle(self.window_title + " - " + display_name)
 
     def onModifiedExit(self):
@@ -239 +239 @@
         # Run the model test in sasmodels
         try:
-            _ = GuiUtils.checkModel(full_path)
+            _ = self.checkModel(full_path)
         except Exception as ex:
             msg = "Error building model: "+ str(ex)
@@ -406 +406 @@
 
     @classmethod
+    def checkModel(cls, path):
+        """
+        Check that the model save in file 'path' can run.
+        """
+        # try running the model
+        from sasmodels.sasview_model import load_custom_model
+        Model = load_custom_model(path)
+        model = Model()
+        q =  np.array([0.01, 0.1])
+        _ = model.evalDistribution(q)
+        qx, qy =  np.array([0.01, 0.01]), np.array([0.1, 0.1])
+        _ = model.evalDistribution([qx, qy])
+
+        # check the model's unit tests run
+        from sasmodels.model_test import run_one
+        # TestSuite module in Qt5 now deletes tests in the suite after running,
+        # so suite[0] in run_one() in sasmodels/model_test.py will contain [None] and
+        # test.info.tests will raise.
+        # Not sure how to change the behaviour here, most likely sasmodels will have to
+        # be modified
+        result = run_one(path)
+
+        return result
+
+    @classmethod
     def getParamHelper(cls, param_str):
         """