Changeset 8f2548c in sasview

Timestamp:

Sep 20, 2017 4: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

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (3 diffs)
• ViewDelegate.py (modified) (5 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

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

@@ -8 +8 @@
     Custom delegate for appearance and behavior control of the model view
     """
-    # Main parameter table view columns
-    PARAM_PROPERTY=0
-    PARAM_VALUE=1
-    PARAM_MIN=2
-    PARAM_MAX=3
-    PARAM_UNIT=4
+    def __init__(self, parent=None):
+        """
+        Overwrite generic constructor to allow for some globals
+        """
+        super(QtGui.QStyledItemDelegate, self).__init__()
+
+        # Main parameter table view columns
+        self.param_error=-1
+        self.param_property=0
+        self.param_value=1
+        self.param_min=2
+        self.param_max=2
+        self.param_unit=2
+
+    def editableParameters(self):
+        return [self.param_value, self.param_min, self.param_max]
+
+    def addErrorColumn(self):
+        """
+        Modify local column pointers
+        Note: the reverse is never required!
+        """
+        self.param_property=0
+        self.param_value=1
+        self.param_error=2
+        self.param_min=3
+        self.param_max=4
+        self.param_unit=5
 
     def paint(self, painter, option, index):
@@ -19 +41 @@
         Overwrite generic painter for certain columns
         """
-        if index.column() in (self.PARAM_UNIT, self.PARAM_MIN, self.PARAM_MAX):
+        if index.column() in self.editableParameters():
             # Units - present in nice HTML
             options = QtGui.QStyleOptionViewItemV4(option)
@@ -56 +78 @@
         if not index.isValid():
             return 0
-        if index.column() == self.PARAM_VALUE: #only in the value column
+        if index.column() == self.param_value: #only in the value column
             editor = QtGui.QLineEdit(widget)
             validator = QtGui.QDoubleValidator()
             editor.setValidator(validator)
             return editor
-        if index.column() in [self.PARAM_PROPERTY, self.PARAM_UNIT]:
+        if index.column() in [self.param_property, self.param_error]:
             # Set some columns uneditable
             return None
@@ -71 +93 @@
         Overwrite generic model update method for certain columns
         """
-        if index.column() in (self.PARAM_MIN, self.PARAM_MAX):
+        if index.column() in (self.param_min, self.param_max):
             try:
                 value_float = float(editor.text())
@@ -86 +108 @@
     """
     POLYDISPERSE_FUNCTIONS = ['rectangle', 'array', 'lognormal', 'gaussian', 'schulz']
-    #POLYDISPERSE_FUNCTIONS = ['rectangle', 'lognormal', 'gaussian', 'schulz']
 
     combo_updated = QtCore.pyqtSignal(str, int)