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

Timestamp:

Sep 20, 2017 2:19:54 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:

adc49fc

Parents:

e694f0f

Message:

Fix fitting table behaviour for when the error column is added

File:

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

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

@@ -871 +871 @@
 
         error_column = []
+        self.lstParams.itemDelegate().addErrorColumn()
         self.iterateOverModel(createErrorColumn)
 
@@ -1269 +1270 @@
             return
         parameter_name = str(self._model_model.data(name_index).toPyObject()) # sld, background etc.
-        property_index = self._model_model.headerData(1, model_column).toInt()[0]-1 # Value, min, max, etc.
 
         # Update the parameter value - note: this supports +/-inf as well
@@ -1275 +1275 @@
 
         # Update the parameter value - note: this supports +/-inf as well
-        if model_column == 0:
+        param_column = self.lstParams.itemDelegate().param_value
+        min_column = self.lstParams.itemDelegate().param_min
+        max_column = self.lstParams.itemDelegate().param_max
+        if model_column == param_column:
             self.kernel_module.setParam(parameter_name, value)
+        elif model_column == min_column:
+            # min/max to be changed in self.kernel_module.details[parameter_name] = ['Ang', 0.0, inf]
+            self.kernel_module.details[parameter_name][1] = value
+        elif model_column == max_column:
+            self.kernel_module.details[parameter_name][2] = value
         else:
-            # min/max to be changed in self.kernel_module.details[parameter_name] = ['Ang', 0.0, inf]
-            self.kernel_module.details[parameter_name][property_index] = value
+            # don't update the chart
+            return
 
         # TODO: magnetic params in self.kernel_module.details['M0:parameter_name'] = value