Changeset 3b8cc00 in sasview for src/sas/qtgui/Utilities/TabbedModelEditor.py

Timestamp:

Apr 25, 2018 2:32:11 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

27689dc

Parents:

01ef3f7

Message:

Code review changes

File:

• src/sas/qtgui/Utilities/TabbedModelEditor.py (modified) (4 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
@@ -23 +24 @@
     # Signals for intertab communication plugin -> editor
     def __init__(self, parent=None, edit_only=False):
-        super(TabbedModelEditor, self).__init__()
+        super(TabbedModelEditor, self).__init__(parent._parent)
 
         self.parent = parent
@@ -238 +239 @@
         # Run the model test in sasmodels
         try:
-            _ = self.checkModel(full_path)
+            _ = GuiUtils.checkModel(full_path)
         except Exception as ex:
             msg = "Error building model: "+ str(ex)
@@ -405 +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):
         """