Changeset 93c79b5 in sasview for src/sas

Timestamp:

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

Files:

• MainWindow/MainWindow.py (modified) (2 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (7 diffs)
• Utilities/TabbedModelEditor.py (modified) (1 diff)
• 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/UI/AddMultEditorUI.ui (added)
• Utilities/UnitTesting/AddMultEditorTest.py (added)

src/sas/qtgui/MainWindow/MainWindow.py

@@ -50 +50 @@
     return splashScreen
 
-def run():
+def run_sasview():
     app = QApplication([])
 
@@ -85 +85 @@
 
 if __name__ == "__main__":
-    run()
+    run_sasview()

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -191 +191 @@
         self.is_batch_fitting = False
         self.is_chain_fitting = False
+        # Is the fit job running?
+        self.fit_started=False
+        # The current fit thread
+        self.calc_fit = None
         # Current SasModel in view
         self.kernel_module = None
@@ -1200 +1204 @@
         Perform fitting on the current data
         """
+        if self.fit_started:
+            self.stopFit()
+            return
+
         # initialize fitter constants
         fit_id = 0
@@ -1226 +1234 @@
         completefn = self.batchFittingCompleted if self.is_batch_fitting else self.fittingCompleted
 
-        calc_fit = FitThread(handler=handler,
+        self.calc_fit = FitThread(handler=handler,
                             fn=fitters,
                             batch_inputs=batch_inputs,
@@ -1237 +1245 @@
         if LocalConfig.USING_TWISTED:
             # start the trhrhread with twisted
-            calc_thread = threads.deferToThread(calc_fit.compute)
+            calc_thread = threads.deferToThread(self.calc_fit.compute)
             calc_thread.addCallback(completefn)
             calc_thread.addErrback(self.fitFailed)
         else:
             # Use the old python threads + Queue
-            calc_fit.queue()
-            calc_fit.ready(2.5)
+            self.calc_fit.queue()
+            self.calc_fit.ready(2.5)
 
         self.communicate.statusBarUpdateSignal.emit('Fitting started...')
+        self.fit_started = True
         # Disable some elements
         self.setFittingStarted()
 
+    def stopFit(self):
+        """
+        Attempt to stop the fitting thread
+        """
+        if self.calc_fit is None or not self.calc_fit.isrunning():
+            return
+        self.calc_fit.stop()
+        #self.fit_started=False
+        #re-enable the Fit button
+        self.setFittingStopped()
+
+        msg = "Fitting cancelled."
+        self.communicate.statusBarUpdateSignal.emit(msg)
+
     def updateFit(self):
         """
@@ -1258 +1281 @@
         """
         """
-        print("FIT FAILED: ", reason)
-        pass
+        self.setFittingStopped()
+        msg = "Fitting failed with: "+ str(reason)
+        self.communicate.statusBarUpdateSignal.emit(msg)
 
     def batchFittingCompleted(self, result):
@@ -1309 +1333 @@
 
         elapsed = result[1]
-        msg = "Fitting completed successfully in: %s s.\n" % GuiUtils.formatNumber(elapsed)
+        if self.calc_fit._interrupting:
+            msg = "Fitting cancelled by user after: %s s." % GuiUtils.formatNumber(elapsed)
+            logging.warning("\n"+msg+"\n")
+        else:
+            msg = "Fitting completed successfully in: %s s." % GuiUtils.formatNumber(elapsed)
         self.communicate.statusBarUpdateSignal.emit(msg)
 
@@ -2386 +2414 @@
     def setFittingStarted(self):
         """
-        Set item enablement on fitting start
-        """
-        #disable the Fit button
-        self.cmdFit.setText('Running...')
-        self.cmdFit.setEnabled(False)
+        Set buttion caption on fitting start
+        """
+        # Notify the user that fitting is being run
+        # Allow for stopping the job
+        self.cmdFit.setStyleSheet('QPushButton {color: red;}')
+        self.cmdFit.setText('Stop fit')
 
     def setFittingStopped(self):
         """
-        Set item enablement on fitting stop
-        """
-        #enable the Fit button
+        Set button caption on fitting stop
+        """
+        # Notify the user that fitting is available
+        self.cmdFit.setStyleSheet('QPushButton {color: black;}')
         self.cmdFit.setText("Fit")
-        self.cmdFit.setEnabled(True)
+        self.fit_started = False
 
     def readFitPage(self, fp):

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/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)