Changes in src/sas/qtgui/Utilities/TabbedModelEditor.py [38f838e:3b8cc00] in sasview
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Utilities/TabbedModelEditor.py
r38f838e r3b8cc00 11 11 from sas.sascalc.fit import models 12 12 13 import sas.qtgui.Utilities.GuiUtils as GuiUtils 13 14 from sas.qtgui.Utilities.UI.TabbedModelEditor import Ui_TabbedModelEditor 14 15 from sas.qtgui.Utilities.PluginDefinition import PluginDefinition … … 23 24 # Signals for intertab communication plugin -> editor 24 25 def __init__(self, parent=None, edit_only=False): 25 super(TabbedModelEditor, self).__init__( )26 super(TabbedModelEditor, self).__init__(parent._parent) 26 27 27 28 self.parent = parent … … 125 126 self.editor_widget.setEnabled(True) 126 127 self.editor_widget.blockSignals(False) 127 self.filename = filename 128 display_name, _ = os.path.splitext(os.path.basename(filename)) 129 130 self.setWindowTitle(self.window_title + " - " + display_name) 128 self.filename, _ = os.path.splitext(os.path.basename(filename)) 129 130 self.setWindowTitle(self.window_title + " - " + self.filename) 131 131 132 132 def onModifiedExit(self): … … 239 239 # Run the model test in sasmodels 240 240 try: 241 _ = self.checkModel(full_path)241 _ = GuiUtils.checkModel(full_path) 242 242 except Exception as ex: 243 243 msg = "Error building model: "+ str(ex) … … 406 406 407 407 @classmethod 408 def checkModel(cls, path):409 """410 Check that the model save in file 'path' can run.411 """412 # try running the model413 from sasmodels.sasview_model import load_custom_model414 Model = load_custom_model(path)415 model = Model()416 q = np.array([0.01, 0.1])417 _ = model.evalDistribution(q)418 qx, qy = np.array([0.01, 0.01]), np.array([0.1, 0.1])419 _ = model.evalDistribution([qx, qy])420 421 # check the model's unit tests run422 from sasmodels.model_test import run_one423 # TestSuite module in Qt5 now deletes tests in the suite after running,424 # so suite[0] in run_one() in sasmodels/model_test.py will contain [None] and425 # test.info.tests will raise.426 # Not sure how to change the behaviour here, most likely sasmodels will have to427 # be modified428 result = run_one(path)429 430 return result431 432 @classmethod433 408 def getParamHelper(cls, param_str): 434 409 """
Note: See TracChangeset
for help on using the changeset viewer.