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

Timestamp:

Jan 18, 2018 9:44:26 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:

ba01ad1

Parents:

2d466e4

Message:

Complex constraint widget updating the main constraint widget and fitting tabs

File:

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

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

@@ -601 +601 @@
         Return list of all parameters for the current model
         """
-        #params = []
-        #for row in range(self._model_model.rowCount()):
-        #    params.append(self._model_model.item(row).text())
-        #return params
         return [self._model_model.item(row).text() for row in range(self._model_model.rowCount())]
 
@@ -625 +621 @@
             self._model_model.item(row, column).setEditable(fields_enabled)
         self._model_model.blockSignals(False)
+
+    def addConstraintToRow(self, constraint=None, row=0):
+        """
+        Adds the constraint object to requested row
+        """
+        # Create a new item and add the Constraint object as a child
+        assert(isinstance(constraint, Constraint))
+        assert(0<=row<=self._model_model.rowCount())
+
+        item = QtGui.QStandardItem()
+        item.setData(constraint)
+        self._model_model.item(row, 1).setChild(0, item)
+        # Set min/max to the value constrained
+        self.constraintAddedSignal.emit([row])
+        # Show visual hints for the constraint
+        font = QtGui.QFont()
+        font.setItalic(True)
+        brush = QtGui.QBrush(QtGui.QColor('blue'))
+        self.modifyViewOnRow(row, font=font, brush=brush)
+        self.communicate.statusBarUpdateSignal.emit('Constraint added')
 
     def addSimpleConstraint(self):
@@ -759 +775 @@
             if func == value:
                 return ""
+
             return model_name + "."
         params = [(self._model_model.item(s, 0).text(),
-                    preamble(s) +self._model_model.item(s, 1).child(0).data().func)
+                    #preamble(s) +self._model_model.item(s, 1).child(0).data().func)
+                    self._model_model.item(s, 1).child(0).data().func)
                     for s in range(param_number) if self.rowHasConstraint(s)]
         return params