Changeset be8f4b0 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Jan 16, 2018 4:50:31 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:

47d7d2d

Parents:

676f137

Message:

Context menus for tab and constraint list widgets.
Dynamic bindings of add/remove for FPs and the C&S widget

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (11 diffs)

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

@@ -82 +82 @@
     Main widget for selecting form and structure factor models
     """
-    #constraintAddedSignal = QtCore.pyqtSignal(list)
+    constraintAddedSignal = QtCore.pyqtSignal(list)
+    newModelSignal = QtCore.pyqtSignal()
     def __init__(self, parent=None, data=None, tab_id=1):
 
@@ -574 +575 @@
         row = self.rowFromName(constraint.param)
         self._model_model.item(row, 1).setChild(0, item)
-        #self.constraintAddedSignal.emit([row])
+        self.constraintAddedSignal.emit([row])
 
         # Show visual hints for the constraint
@@ -626 +627 @@
             max = self._model_model.item(row, max_col).text()
             # Create a Constraint object
-            constraint = Constraint(param=param, value=value, min=min, max=max)
+            constraint = Constraint(param=param, value=value, min=min, max=max, func=value)
             # Create a new item and add the Constraint object as a child
             item = QtGui.QStandardItem()
@@ -634 +635 @@
             self._model_model.item(row, min_col).setText(value)
             self._model_model.item(row, max_col).setText(value)
-            #self.constraintAddedSignal.emit([row])
+            self.constraintAddedSignal.emit([row])
             # Show visual hints for the constraint
             font = QtGui.QFont()
@@ -647 +648 @@
         Delete constraints from selected parameters.
         """
+        self.deleteConstraintOnParameter(param=None)
+
+    def deleteConstraintOnParameter(self, param=None):
+        """
+        Delete the constraint on model parameter 'param'
+        """
         min_col = self.lstParams.itemDelegate().param_min
         max_col = self.lstParams.itemDelegate().param_max
-        for row in self.selectedParameters():
+        for row in range(self._model_model.rowCount()):
             # Get the Constraint object from of the model item
             item = self._model_model.item(row, 1)
@@ -659 +666 @@
             if not isinstance(constraint, Constraint):
                 continue
+            if param and constraint.param != param:
+                continue
+            # Now we got the right row. Delete the constraint and clean up
             # Retrieve old values and put them on the model
             if constraint.min is not None:
@@ -666 +676 @@
             # Remove constraint item
             item.removeRow(0)
-            #self.constraintAddedSignal.emit([row])
+            self.constraintAddedSignal.emit([row])
             self.modifyViewOnRow(row)
+            break
+
         self.communicate.statusBarUpdateSignal.emit('Constraint removed')
         pass
+
 
     def getConstraintForRow(self, row):
@@ -687 +700 @@
         """
         item = self._model_model.item(row,1)
-        return True if (item.hasChildren() and isinstance(item.child(0).data(), Constraint)) else False
+        if item.hasChildren():
+            c = item.child(0).data()
+            if isinstance(c, Constraint) and c.func:
+                return True
+        return False
+        #return True if (item.hasChildren() and isinstance(item.child(0).data(), Constraint)) else False
 
     def selectParameters(self):
@@ -726 +744 @@
         self.kernel_module.name = model_name
         param_number = self._model_model.rowCount()
+        def preamble(s):
+            func = self._model_model.item(s, 1).child(0).data().func
+            value = self._model_model.item(s, 1).child(0).data().value
+            if func == value:
+                return ""
+            return model_name + "."
         params = [(self._model_model.item(s, 0).text(),
-                    model_name+"."+self._model_model.item(s, 1).child(0).data().func)
+                    preamble(s) +self._model_model.item(s, 1).child(0).data().func)
                     for s in range(param_number) if self.rowHasConstraint(s)]
         return params
@@ -806 +830 @@
         # Update state stack
         self.updateUndo()
+
+        # Let others know
+        self.newModelSignal.emit()
 
     def onSelectCategory(self):
@@ -1523 +1550 @@
         # Now we claim the model has been loaded
         self.model_is_loaded = True
+        # Change the model name to a monicker
+        self.kernel_module.name = self.modelName()
 
         # (Re)-create headers