Changeset 6e58f2f in sasview

Timestamp:

Feb 14, 2018 2:34:31 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:

06234fc

Parents:

c736154

Message:

Code review fixes for FittingWidget?

File:

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

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

@@ -558 +558 @@
         """
         selected_rows = self.lstParams.selectionModel().selectedRows()
+        # There have to be only two rows selected. The caller takes care of that
+        # but let's check the correctness.
         assert(len(selected_rows)==2)
 
@@ -573 +575 @@
         # Function should have the model name preamble
         constraint.func = c_text
-
-        # Create a new item and add the Constraint object as a child
-        item = QtGui.QStandardItem()
-        item.setData(constraint)
-
         # Which row is the constrained parameter in?
         row = self.getRowFromName(constraint.param)
-        self._model_model.item(row, 1).setChild(0, item)
-        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)
-
-        # Notify the user
-        self.communicate.statusBarUpdateSignal.emit('Constraints added')
+
+        # Create a new item and add the Constraint object as a child
+        self.addConstraintToRow(constraint=constraint, row=row)
 
     def getRowFromName(self, name):
@@ -679 +668 @@
             self.modifyViewOnRow(row, font=font, brush=brush)
         self.communicate.statusBarUpdateSignal.emit('Constraint added')
-        pass
 
     def deleteConstraint(self):
@@ -718 +706 @@
 
         self.communicate.statusBarUpdateSignal.emit('Constraint removed')
-        pass
-
 
     def getConstraintForRow(self, row):
@@ -791 +777 @@
         for row in self.selectedParameters():
             self._model_model.item(row, 0).setCheckState(status)
-        pass # debugger hook
 
     def getConstraintsForModel(self):
@@ -799 +784 @@
         e.g. [('sld','5*sld_solvent')]
         """
-        model_name = self.kernel_module.name
         param_number = self._model_model.rowCount()
         params = [(self._model_model.item(s, 0).text(),
@@ -813 +797 @@
         Only for constraints with defined VALUE
         """
-        model_name = self.kernel_module.name
         param_number = self._model_model.rowCount()
         params = [(self._model_model.item(s, 0).text(),
@@ -900 +883 @@
                     new_func = func.replace(old_name, new_name)
                     self._model_model.item(row, 1).child(0).data().func = new_func
-
-        pass
 
     def updateData(self):