Changeset 93c79b5 in sasview for src/sas/qtgui/Utilities

Timestamp:

Apr 25, 2018 6:08:35 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:

d4dac80

Parents:

27689dc (diff), 38f838e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' into ESS_GUI_sum_editor

Location:

src/sas/qtgui/Utilities

Files:

• TabbedModelEditor.py (modified) (1 diff)
• AddMultEditor.py (added)
• GuiUtils.py (modified) (2 diffs)
• PluginDefinition.py (modified) (1 diff)
• PluginManager.py (modified) (1 diff)
• UI/AddMultEditorUI.ui (added)
• UnitTesting/AddMultEditorTest.py (added)

src/sas/qtgui/Utilities/TabbedModelEditor.py

@@ -126 +126 @@
         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):

src/sas/qtgui/Utilities/GuiUtils.py

@@ -10 +10 @@
 import webbrowser
 import urllib.parse
+
+import numpy as np
 
 warnings.simplefilter("ignore")
@@ -926 +928 @@
         input = input.replace(",", "")
 
+def checkModel(path):
+    """
+    Check that the model save in file 'path' can run.
+    """
+    # The following return needs to be removed once
+    # the unittest related changes in Sasmodels are commited
+    return True
+    # 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
+
 
 def enum(*sequential, **named):

src/sas/qtgui/Utilities/PluginDefinition.py

@@ -58 +58 @@
 
         # Validators
-        #rx = QtCore.QRegExp(r'^[\w,\s-]+$')
-        #rx = QtCore.QRegExp("[a-z-A-Z_]+")
         rx = QtCore.QRegExp("^[A-Za-z0-9_]*$")
 

src/sas/qtgui/Utilities/PluginManager.py

@@ -19 +19 @@
     """
     def __init__(self, parent=None):
-        super(PluginManager, self).__init__()
+        super(PluginManager, self).__init__(parent._parent)
         self.setupUi(self)