Changes in / [38f838e:93c79b5] in sasview

Location:

src/sas/qtgui

Files:

• GUITests.py (modified) (2 diffs)
• MainWindow/GuiManager.py (modified) (3 diffs)
• MainWindow/UI/MainWindowUI.ui (modified) (3 diffs)
• Utilities/AddMultEditor.py (added)
• Utilities/GuiUtils.py (modified) (2 diffs)
• Utilities/PluginDefinition.py (modified) (1 diff)
• Utilities/PluginManager.py (modified) (1 diff)
• Utilities/TabbedModelEditor.py (modified) (4 diffs)
• Utilities/UI/AddMultEditorUI.ui (added)
• Utilities/UnitTesting/AddMultEditorTest.py (added)

src/sas/qtgui/GUITests.py

@@ -48 +48 @@
 from Utilities.UnitTesting import PluginDefinitionTest
 from Utilities.UnitTesting import TabbedModelEditorTest
+from Utilities.UnitTesting import AddMultEditorTest
 
 # Unit Testing
@@ -107 +108 @@
         unittest.makeSuite(PluginDefinitionTest.PluginDefinitionTest,  'test'),
         unittest.makeSuite(TabbedModelEditorTest.TabbedModelEditorTest,'test'),
+        unittest.makeSuite(AddMultEditorTest.AddMultEditorTest, 'test'),
 
         # Calculators

src/sas/qtgui/MainWindow/GuiManager.py

@@ -39 +39 @@
 from sas.qtgui.Perspectives.Fitting.FittingPerspective import FittingWindow
 from sas.qtgui.MainWindow.DataExplorer import DataExplorerWindow, DEFAULT_PERSPECTIVE
+
+from sas.qtgui.Utilities.AddMultEditor import AddMultEditor
 
 class Acknowledgements(QDialog, Ui_Acknowledgements):
@@ -407 +409 @@
         self._workspace.actionEdit_Custom_Model.triggered.connect(self.actionEdit_Custom_Model)
         self._workspace.actionManage_Custom_Models.triggered.connect(self.actionManage_Custom_Models)
+        self._workspace.actionAddMult_Models.triggered.connect(self.actionAddMult_Models)
         # Window
         self._workspace.actionCascade.triggered.connect(self.actionCascade)
@@ -681 +684 @@
         self.model_manager.show()
 
+    def actionAddMult_Models(self):
+        """
+        """
+        # Add Simple Add/Multiply Editor
+        self.add_mult_editor = AddMultEditor(self)
+        self.add_mult_editor.show()
+
     #============ ANALYSIS =================
     def actionFitting(self):

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -25 +25 @@
      <y>0</y>
      <width>915</width>
-     <height>26</height>
+     <height>22</height>
     </rect>
    </property>
@@ -111 +111 @@
     <addaction name="actionEdit_Custom_Model"/>
     <addaction name="actionManage_Custom_Models"/>
+    <addaction name="actionAddMult_Models"/>
    </widget>
    <widget class="QMenu" name="menuWindow">
@@ -526 +527 @@
    </property>
   </action>
+  <action name="actionAddMult_Models">
+   <property name="text">
+    <string>Add/Multiply Models</string>
+   </property>
+  </action>
  </widget>
  <resources/>

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)
 

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
@@ -239 +240 @@
         # 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)
@@ -406 +407 @@
 
     @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):
         """