Changeset b87dc1a in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Aug 2, 2018 5:53:51 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:

c0de493

Parents:

18d5c94a

Message:

keep non-fittable rows selectable, to not break layout

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (2 diffs)
• FittingWidget.py (modified) (1 diff)

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

@@ -151 +151 @@
 
 def markParameterDisabled(model, row):
-    """Given the QModel row number, format to show it is not available for
-    fitting"""
-    items = [model.item(row, c) for c in range(5)]
+    """Given the QModel row number, format to show it is not available for fitting"""
+
+    # If an error column is present, there are a total of 6 columns.
+    items = [model.item(row, c) for c in range(6)]
 
     model.blockSignals(True)
@@ -161 +162 @@
             continue
         item.setEditable(False)
-        item.setSelectable(False)
         item.setCheckable(False)
 

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

@@ -1970 +1970 @@
         for row in new_rows:
             self._model_model.appendRow(row)
-            # disable fitting of parameters not listed in self.kernel_module
-            # (probably radius_effective)
+            # disable fitting of parameters not listed in self.kernel_module (probably radius_effective)
             if row[0].text() not in self.kernel_module.params.keys():
                 row_num = self._model_model.rowCount() - 1