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

Timestamp:

Sep 4, 2018 5:51:03 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

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

Children:

700b03b

Parents:

ef3494b3

git-author:

Torin Cooper-Bennun <torin.cooper-bennun@…> (07/25/18 12:01:03)

git-committer:

Torin Cooper-Bennun <torin.cooper-bennun@…> (09/04/18 05:51:03)

Message:

[CHERRY-PICK FROM 4f80a834f] put sub-heading creation into FittingUtilities?; fix a couple of caused issues; fix affected tests

File:

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

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

@@ -669 +669 @@
         Return list of all parameters for the current model
         """
-        return [self._model_model.item(row).text() for row in range(self._model_model.rowCount())]
+        return [self._model_model.item(row).text()
+                for row in range(self._model_model.rowCount())
+                if self.isCheckable(row)]
 
     def modifyViewOnRow(self, row, font=None, brush=None):
@@ -697 +699 @@
         assert isinstance(constraint, Constraint)
         assert 0 <= row <= self._model_model.rowCount()
+        assert self.isCheckable(row)
 
         item = QtGui.QStandardItem()
@@ -717 +720 @@
         max_col = self.lstParams.itemDelegate().param_max
         for row in self.selectedParameters():
+            assert(self.isCheckable(row))
             param = self._model_model.item(row, 0).text()
             value = self._model_model.item(row, 1).text()
@@ -759 +763 @@
         max_col = self.lstParams.itemDelegate().param_max
         for row in range(self._model_model.rowCount()):
+            if not self.isCheckable(row):
+                continue
             if not self.rowHasConstraint(row):
                 continue
@@ -787 +793 @@
         For the given row, return its constraint, if any
         """
-        try:
+        if self.isCheckable(row):
             item = self._model_model.item(row, 1)
-            return item.child(0).data()
-        except AttributeError:
-            # return none when no constraints
-            return None
+            try:
+                return item.child(0).data()
+            except AttributeError:
+                # return none when no constraints
+                pass
+        return None
 
     def rowHasConstraint(self, row):
@@ -798 +806 @@
         Finds out if row of the main model has a constraint child
         """
-        item = self._model_model.item(row, 1)
-        if item.hasChildren():
-            c = item.child(0).data()
-            if isinstance(c, Constraint):
-                return True
+        if self.isCheckable(row):
+            item = self._model_model.item(row, 1)
+            if item.hasChildren():
+                c = item.child(0).data()
+                if isinstance(c, Constraint):
+                    return True
         return False
 
@@ -809 +818 @@
         Finds out if row of the main model has an active constraint child
         """
-        item = self._model_model.item(row, 1)
-        if item.hasChildren():
-            c = item.child(0).data()
-            if isinstance(c, Constraint) and c.active:
-                return True
+        if self.isCheckable(row):
+            item = self._model_model.item(row, 1)
+            if item.hasChildren():
+                c = item.child(0).data()
+                if isinstance(c, Constraint) and c.active:
+                    return True
         return False
 
@@ -820 +830 @@
         Finds out if row of the main model has an active, nontrivial constraint child
         """
-        item = self._model_model.item(row, 1)
-        if item.hasChildren():
-            c = item.child(0).data()
-            if isinstance(c, Constraint) and c.func and c.active:
-                return True
+        if self.isCheckable(row):
+            item = self._model_model.item(row, 1)
+            if item.hasChildren():
+                c = item.child(0).data()
+                if isinstance(c, Constraint) and c.func and c.active:
+                    return True
         return False
 
@@ -1556 +1567 @@
             # internal so can use closure for param_dict
             param_name = str(self._model_model.item(row, 0).text())
-            if param_name not in list(param_dict.keys()):
+            if not self.isCheckable(row) or param_name not in list(param_dict.keys()):
                 return
             # modify the param value
@@ -1568 +1579 @@
             # Utility function for updateof polydispersity part of the main model
             param_name = str(self._model_model.item(row, 0).text())+'.width'
-            if param_name not in list(param_dict.keys()):
+            if not self.isCheckable(row) or param_name not in list(param_dict.keys()):
                 return
             # modify the param value
@@ -1711 +1722 @@
         """
         for row_i in range(self._magnet_model.rowCount()):
-            func(row_i)
+            if self.isCheckable(row_i):
+                func(row_i)
 
     def updateMagnetModelFromList(self, param_dict):
@@ -2031 +2043 @@
         self.shell_names = self.shellNamesList()
 
-        # Add a header
-        header_row = [QtGui.QStandardItem() for i in range(5)]
-        header_row[0].setText(self.kernel_module.name)
-        font = header_row[0].font()
-        font.setBold(True)
-        header_row[0].setFont(font)
-        for item in header_row:
-            item.setEditable(False)
-            item.setCheckable(False)
-            item.setSelectable(False)
-
-        self._model_model.appendRow(header_row)
-
-        # Update the QModel
+        # Get new rows for QModel
         new_rows = FittingUtilities.addParametersToModel(self.model_parameters, self.kernel_module, self.is2D)
 
+        # Add heading row
+        FittingUtilities.addHeadingRowToModel(self._model_model, model_name)
+
+        # Update QModel
         for row in new_rows:
             self._model_model.appendRow(row)
@@ -2064 +2067 @@
         self.kernel_module = MultiplicationModel(form_kernel, structure_kernel)
 
-        # Add a header
-        header_row = [QtGui.QStandardItem() for i in range(5)]
-        header_row[0].setText(structure_kernel._model_info.name)
-        font = header_row[0].font()
-        font.setBold(True)
-        header_row[0].setFont(font)
-        for item in header_row:
-            item.setEditable(False)
-            item.setCheckable(False)
-            item.setSelectable(False)
-
-        self._model_model.appendRow(header_row)
-
+        # Get new rows for QModel
         new_rows = FittingUtilities.addSimpleParametersToModel(structure_parameters, self.is2D)
+
+        # Add heading row
+        FittingUtilities.addHeadingRowToModel(self._model_model, structure_factor)
+
+        # Update QModel
         for row in new_rows:
             self._model_model.appendRow(row)
@@ -2517 +2513 @@
         def updateFunctionCaption(row):
             # Utility function for update of polydispersity function name in the main model
+            if not self.isCheckable(row):
+                return
             param_name = str(self._model_model.item(row, 0).text())
             if param_name !=  param.name: