Changeset 21e71f1 in sasview for src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

Timestamp:

Nov 21, 2018 6:39:24 AM (5 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

f2e199e

Parents:

44c15fc (diff), fb39f28 (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_project_save' into ESS_GUI

File:

• src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py (modified) (19 diffs)

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

@@ -23 +23 @@
     Constraints Dialog to select the desired parameter/model constraints.
     """
+    fitCompleteSignal = QtCore.pyqtSignal(tuple)
+    batchCompleteSignal = QtCore.pyqtSignal(tuple)
+    fitFailedSignal = QtCore.pyqtSignal(tuple)
 
     def __init__(self, parent=None):
@@ -32 +35 @@
         # To keep with previous SasView values, use 300 as the start offset
         self.page_id = 301
+        self.tab_id = self.page_id
 
         # Are we chain fitting?
@@ -60 +64 @@
         Set up various widget states
         """
+        # disable special cases until properly defined
+        self.label.setVisible(False)
+        self.cbCases.setVisible(False)
+
         labels = ['FitPage', 'Model', 'Data', 'Mnemonic']
         # tab widget - headers
@@ -79 +87 @@
         self.tblConstraints.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.Stretch)
         self.tblConstraints.setEnabled(False)
+        header = self.tblConstraints.horizontalHeaderItem(0)
+        header.setToolTip("Double click a row below to edit the constraint.")
 
         self.tblConstraints.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
@@ -93 +103 @@
         self.cmdFit.clicked.connect(self.onFit)
         self.cmdHelp.clicked.connect(self.onHelp)
+        self.cmdAdd.clicked.connect(self.showMultiConstraint)
         self.chkChain.toggled.connect(self.onChainFit)
 
@@ -100 +111 @@
         self.tblConstraints.cellChanged.connect(self.onConstraintChange)
 
+        # Internal signals
+        self.fitCompleteSignal.connect(self.fitComplete)
+        self.batchCompleteSignal.connect(self.batchComplete)
+        self.fitFailedSignal.connect(self.fitFailed)
+
         # External signals
         self.parent.tabsModifiedSignal.connect(self.initializeFitList)
@@ -156 +172 @@
         fitter = Fit()
         fitter.fitter_id = self.page_id
-
-        # Notify the parent about fitting started
-        self.parent.fittingStartedSignal.emit(tabs_to_fit)
 
         # prepare fitting problems for each tab
@@ -168 +181 @@
         try:
             for tab in tabs_to_fit:
+                if not self.isTabImportable(tab): continue
                 tab_object = ObjectLibrary.getObject(tab)
                 if tab_object is None:
@@ -177 +191 @@
         except ValueError:
             # No parameters selected in one of the tabs
-            no_params_msg = "Fitting can not be performed.\n" +\
+            no_params_msg = "Fitting cannot be performed.\n" +\
                             "Not all tabs chosen for fitting have parameters selected for fitting."
             QtWidgets.QMessageBox.warning(self,
@@ -200 +214 @@
         batch_inputs = {}
         batch_outputs = {}
+
+        # Notify the parent about fitting started
+        self.parent.fittingStartedSignal.emit(tabs_to_fit)
 
         # new fit thread object
@@ -223 +240 @@
 
         #disable the Fit button
+        self.cmdFit.setStyleSheet('QPushButton {color: red;}')
         self.cmdFit.setText('Running...')
         self.parent.communicate.statusBarUpdateSignal.emit('Fitting started...')
@@ -292 +310 @@
         """
         item = self.tblConstraints.item(row, column)
-        if column == 0:
-            # Update the tabs for fitting list
-            constraint = self.available_constraints[row]
-            constraint.active = (item.checkState() == QtCore.Qt.Checked)
+        if column != 0: return
+        # Update the tabs for fitting list
+        constraint = self.available_constraints[row]
+        constraint.active = (item.checkState() == QtCore.Qt.Checked)
+        # Update the constraint formula
+        constraint = self.available_constraints[row]
+        function = item.text()
+        # remove anything left of '=' to get the constraint
+        function = function[function.index('=')+1:]
+        # No check on function here - trust the user (R)
+        if function != constraint.func:
+            # This becomes rather difficult to validate now.
+            # Turn off validation for Edit Constraint
+            constraint.func = function
+            constraint.validate = False
 
     def onTabCellEntered(self, row, column):
@@ -308 +337 @@
     def onFitComplete(self, result):
         """
+        Send the fit complete signal to main thread
+        """
+        self.fitCompleteSignal.emit(result)
+
+    def fitComplete(self, result):
+        """
         Respond to the successful fit complete signal
         """
         #re-enable the Fit button
+        self.cmdFit.setStyleSheet('QPushButton {color: black;}')
         self.cmdFit.setText("Fit")
         self.cmdFit.setEnabled(True)
@@ -347 +383 @@
     def onBatchFitComplete(self, result):
         """
+        Send the fit complete signal to main thread
+        """
+        self.batchCompleteSignal.emit(result)
+
+    def batchComplete(self, result):
+        """
         Respond to the successful batch fit complete signal
         """
         #re-enable the Fit button
+        self.cmdFit.setStyleSheet('QPushButton {color: black;}')
         self.cmdFit.setText("Fit")
         self.cmdFit.setEnabled(True)
@@ -375 +418 @@
     def onFitFailed(self, reason):
         """
+        Send the fit failed signal to main thread
+        """
+        self.fitFailedSignal.emit(result)
+
+    def fitFailed(self, reason):
+        """
         Respond to fitting failure.
         """
         #re-enable the Fit button
+        self.cmdFit.setStyleSheet('QPushButton {color: black;}')
         self.cmdFit.setText("Fit")
         self.cmdFit.setEnabled(True)
@@ -386 +436 @@
         msg = "Fitting failed: %s s.\n" % reason
         self.parent.communicate.statusBarUpdateSignal.emit(msg)
- 
+
     def isTabImportable(self, tab):
         """
@@ -599 +649 @@
             # Show the text in the constraint table
             item = self.uneditableItem(label)
+            item = QtWidgets.QTableWidgetItem(label)
             item.setFlags(item.flags() ^ QtCore.Qt.ItemIsUserCheckable)
             item.setCheckState(QtCore.Qt.Checked)
@@ -667 +718 @@
         return None
 
+    def onAcceptConstraint(self, con_tuple):
+        """
+        Receive constraint tuple from the ComplexConstraint dialog and adds contraint
+        """
+        #"M1, M2, M3" etc
+        model_name, constraint = con_tuple
+        constrained_tab = self.getObjectByName(model_name)
+        if constrained_tab is None:
+            return
+
+        # Find the constrained parameter row
+        constrained_row = constrained_tab.getRowFromName(constraint.param)
+
+        # Update the tab
+        constrained_tab.addConstraintToRow(constraint, constrained_row)
+
+        # Select this parameter for adjusting/fitting
+        constrained_tab.selectCheckbox(constrained_row)
+
+
     def showMultiConstraint(self):
         """
@@ -672 +743 @@
         """
         selected_rows = self.selectedParameters(self.tblTabList)
-        assert(len(selected_rows)==2)
+        if len(selected_rows)!=2:
+            msg = "Please select two fit pages from the Source Choice table."
+            msgbox = QtWidgets.QMessageBox(self.parent)
+            msgbox.setIcon(QtWidgets.QMessageBox.Warning)
+            msgbox.setText(msg)
+            msgbox.setWindowTitle("2 fit page constraints")
+            retval = msgbox.exec_()
+            return
 
         tab_list = [ObjectLibrary.getObject(self.tblTabList.item(s, 0).data(0)) for s in selected_rows]
         # Create and display the widget for param1 and param2
         cc_widget = ComplexConstraint(self, tabs=tab_list)
+        cc_widget.constraintReadySignal.connect(self.onAcceptConstraint)
+
         if cc_widget.exec_() != QtWidgets.QDialog.Accepted:
             return
 
-        constraint = Constraint()
-        model1, param1, operator, constraint_text = cc_widget.constraint()
-
-        constraint.func = constraint_text
-        # param1 is the parameter we're constraining
-        constraint.param = param1
-
-        # Find the right tab
-        constrained_tab = self.getObjectByName(model1)
-        if constrained_tab is None:
-            return
-
-        # Find the constrained parameter row
-        constrained_row = constrained_tab.getRowFromName(param1)
-
-        # Update the tab
-        constrained_tab.addConstraintToRow(constraint, constrained_row)
+    def getFitPage(self):
+        """
+        Retrieves the state of this page
+        """
+        param_list = []
+
+        param_list.append(['is_constraint', 'True'])
+        param_list.append(['data_id', "cs_tab"+str(self.page_id)])
+        param_list.append(['current_type', self.currentType])
+        param_list.append(['is_chain_fitting', str(self.is_chain_fitting)])
+        param_list.append(['special_case', self.cbCases.currentText()])
+
+        return param_list
+
+    def getFitModel(self):
+        """
+        Retrieves current model
+        """
+        model_list = []
+
+        checked_models = {}
+        for row in range(self.tblTabList.rowCount()):
+            model_name = self.tblTabList.item(row,1).data(0)
+            active = self.tblTabList.item(row,0).checkState()# == QtCore.Qt.Checked
+            checked_models[model_name] = str(active)
+
+        checked_constraints = {}
+        for row in range(self.tblConstraints.rowCount()):
+            model_name = self.tblConstraints.item(row,0).data(0)
+            active = self.tblConstraints.item(row,0).checkState()# == QtCore.Qt.Checked
+            checked_constraints[model_name] = str(active)
+
+        model_list.append(['checked_models', checked_models])
+        model_list.append(['checked_constraints', checked_constraints])
+        return model_list
+
+    def createPageForParameters(self, parameters=None):
+        """
+        Update the page with passed parameter values
+        """
+        # checked models
+        if not 'checked_models' in parameters:
+            return
+        models = parameters['checked_models'][0]
+        for model, check_state in models.items():
+            for row in range(self.tblTabList.rowCount()):
+                model_name = self.tblTabList.item(row,1).data(0)
+                if model_name != model:
+                    continue
+                # check/uncheck item
+                self.tblTabList.item(row,0).setCheckState(int(check_state))
+
+        if not 'checked_constraints' in parameters:
+            return
+        # checked constraints
+        models = parameters['checked_constraints'][0]
+        for model, check_state in models.items():
+            for row in range(self.tblConstraints.rowCount()):
+                model_name = self.tblConstraints.item(row,0).data(0)
+                if model_name != model:
+                    continue
+                # check/uncheck item
+                self.tblConstraints.item(row,0).setCheckState(int(check_state))
+
+        # fit/batch radio
+        isBatch = parameters['current_type'][0] == 'BatchPage'
+        if isBatch:
+            self.btnBatch.toggle()
+
+        # chain
+        is_chain = parameters['is_chain_fitting'][0] == 'True'
+        if isBatch:
+            self.chkChain.setChecked(is_chain)