Changeset 919d47c in sasview for src

Timestamp:

Jun 8, 2017 9:11:37 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:

8eaa101

Parents:

70080a0

Message:

Fixed main model update on polydisp. parameter change, code cleanup, minor refactoring

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (15 diffs)
• ViewDelegate.py (modified) (1 diff)

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

@@ -44 +44 @@
 
 DEFAULT_POLYDISP_FUNCTION = 'gaussian'
-
-# Mapping between column index and relevant parameter name extension
-POLY_COL_NAME = 0
-POLY_COL_WIDTH = 1
-POLY_COL_MIN = 2
-POLY_COL_MAX = 3
-POLY_COL_NPTS = 4
-POLY_COL_NSIGMAS = 5
-POLY_COL_FUNCTION = 6
-POLY_COLUMN_DICT = {
-    POLY_COL_WIDTH:   'width',
-    POLY_COL_MIN:     'min',
-    POLY_COL_MAX:     'max',
-    POLY_COL_NPTS:    'npts',
-    POLY_COL_NSIGMAS: 'nsigmas'}
 
 class FittingWidget(QtGui.QWidget, Ui_FittingWidgetUI):
@@ -499 +484 @@
 
         # Extract changed value.
-        if model_column == POLY_COL_NAME:
+        if model_column == self.lstPoly.itemDelegate().POLY_PARAMETER:
             # Is the parameter checked for fitting?
             value = item.checkState()
@@ -509 +494 @@
                     self.parameters_to_fit.remove(parameter_name)
             return
-        elif model_column in [POLY_COL_MIN, POLY_COL_MAX]:
+        elif model_column in [self.lstPoly.itemDelegate().POLY_MIN, self.lstPoly.itemDelegate().POLY_MAX]:
             try:
                 value = float(item.text())
@@ -520 +505 @@
             current_details = self.kernel_module.details[parameter_name]
             current_details[model_column-1] = value
+        elif model_column == self.lstPoly.itemDelegate().POLY_FUNCTION:
+            # name of the function - just pass
+            return
         else:
             try:
@@ -526 +514 @@
                 # Can't be converted properly, bring back the old value and exit
                 return
-
             property_name = str(self._poly_model.headerData(model_column, 1).toPyObject()).lower() # Value, min, max, etc.
-            # print "%s(%s) => %d" % (parameter_name, property_name, value)
 
             # Update the sasmodel
             # PD[ratio] -> width, npts -> npts, nsigs -> nsigmas
-            self.kernel_module.setParam(parameter_name + '.' + POLY_COLUMN_DICT[model_column], value)
-
-        # Reload the main model - may not be required if no variable is shown in main view
-        #model = str(self.cbModel.currentText())
-        #self.SASModelToQModel(model)
-
-        pass # debug anchor
+            self.kernel_module.setParam(parameter_name + '.' + \
+                                        self.lstPoly.itemDelegate().POLY_COLUMN_DICT[model_column], value)
 
     def onHelp(self):
@@ -697 +678 @@
             return
 
-        def updateFittedValues(row_i):
+        def updateFittedValues(row):
             # Utility function for main model update
             # internal so can use closure for param_dict
-            param_name = str(self._model_model.item(row_i, 0).text())
+            param_name = str(self._model_model.item(row, 0).text())
             if param_name not in param_dict.keys():
                 return
             # modify the param value
             param_repr = GuiUtils.formatNumber(param_dict[param_name][0], high=True)
-            self._model_model.item(row_i, 1).setText(param_repr)
+            self._model_model.item(row, 1).setText(param_repr)
             if self.has_error_column:
                 error_repr = GuiUtils.formatNumber(param_dict[param_name][1], high=True)
-                self._model_model.item(row_i, 2).setText(error_repr)
-
-        def createErrorColumn(row_i):
+                self._model_model.item(row, 2).setText(error_repr)
+
+        def updatePolyValues(row):
+            # 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 param_dict.keys():
+                return
+            # modify the param value
+            param_repr = GuiUtils.formatNumber(param_dict[param_name][0], high=True)
+            self._model_model.item(row, 0).child(0).child(0,1).setText(param_repr)
+
+        def createErrorColumn(row):
             # Utility function for error column update
             item = QtGui.QStandardItem()
-            for param_name in param_dict.keys():
-                if str(self._model_model.item(row_i, 0).text()) != param_name:
-                    continue
+            def createItem(param_name):
                 error_repr = GuiUtils.formatNumber(param_dict[param_name][1], high=True)
                 item.setText(error_repr)
+            def curr_param():
+                return str(self._model_model.item(row, 0).text())
+
+            [createItem(param_name) for param_name in param_dict.keys() if curr_param() == param_name]
+
             error_column.append(item)
 
@@ -724 +717 @@
         self._model_model.blockSignals(True)
         self.iterateOverModel(updateFittedValues)
+        self.iterateOverModel(updatePolyValues)
         self._model_model.blockSignals(False)
 
@@ -769 +763 @@
                 self._poly_model.item(row_i, 2).setText(error_repr)
 
+
         def createErrorColumn(row_i):
             # Utility function for error column update
@@ -774 +769 @@
                 return
             item = QtGui.QStandardItem()
-            for param_name in param_dict.keys():
-                if str(self._poly_model.item(row_i, 0).text()).rsplit()[-1] + '.width' != param_name:
-                    continue
+
+            def createItem(param_name):
                 error_repr = GuiUtils.formatNumber(param_dict[param_name][1], high=True)
                 item.setText(error_repr)
+
+            def poly_param():
+                return str(self._poly_model.item(row_i, 0).text()).rsplit()[-1] + '.width'
+
+            [createItem(param_name) for param_name in param_dict.keys() if poly_param() == param_name]
+
             error_column.append(item)
 
@@ -786 +786 @@
         self.iterateOverModel(updateFittedValues)
         self._poly_model.blockSignals(False)
-
-        #return
 
         if self.has_poly_error_column:
@@ -798 +796 @@
         self.lstPoly.itemDelegate().POLY_NSIGS = 6
         self.lstPoly.itemDelegate().POLY_FUNCTION = 7
+        self.lstPoly.itemDelegate().POLY_COLUMN_DICT = {
+            2: 'width',
+            3: 'min',
+            4: 'max',
+            5: 'npts',
+            6: 'nsigmas'}
 
         error_column = []
@@ -1332 +1336 @@
         param = self.model_parameters.form_volume_parameters[row_index]
 
+        def updateFunctionCaption(row):
+            # Utility function for update of polydispersity function name in the main model
+            param_name = str(self._model_model.item(row, 0).text())# +'.width'
+            if param_name !=  param.name:
+                return
+            # modify the param value
+            self._model_model.item(row, 0).child(0).child(0,4).setText(combo_string)
+
         if combo_string == 'array':
             try:
                 self.loadPolydispArray()
+                # Update main model for display
+                self.iterateOverModel(updateFunctionCaption)
             except (ValueError, IOError):
                 # Don't do anything if file lookup failed
@@ -1343 +1357 @@
 
         # Enable the row in case it was disabled by Array
-        #[self._poly_model.item(row_index, i).setEnabled(True) for i in xrange(6)]
-
-        npts_index = self._poly_model.index(row_index, POLY_COL_NPTS)
-        nsigs_index = self._poly_model.index(row_index, POLY_COL_NSIGMAS)
+        self._poly_model.blockSignals(True)
+        [self._poly_model.item(row_index, i).setEnabled(True) for i in xrange(6)]
+        self._poly_model.blockSignals(False)
+
+        npts_index = self._poly_model.index(row_index, self.lstPoly.itemDelegate().POLY_NPTS)
+        nsigs_index = self._poly_model.index(row_index, self.lstPoly.itemDelegate().POLY_NSIGS)
 
         npts = POLYDISPERSITY_MODELS[str(combo_string)].default['npts']
@@ -1353 +1369 @@
         self._poly_model.setData(npts_index, QtCore.QVariant(npts))
         self._poly_model.setData(nsigs_index, QtCore.QVariant(nsigs))
+
+        self.iterateOverModel(updateFunctionCaption)
 
     def loadPolydispArray(self):
@@ -1365 +1383 @@
         values = []
         weights = []
+        def appendData(data_tuple):
+            """
+            Fish out floats from a tuple of strings
+            """
+            try:
+                values.append(float(data_tuple[0]))
+                weights.append(float(data_tuple[1]))
+            except (ValueError, IndexError):
+                # just pass through if line with bad data
+                return
+
         with open(datafile, 'r') as column_file:
             column_data = [line.rstrip().split() for line in column_file.readlines()]
-            for line in column_data:
-                try:
-                    values.append(float(line[0]))
-                    weights.append(float(line[1]))
-                except (ValueError, IndexError):
-                    # just pass through if line with bad data
-                    pass
+            [appendData(line) for line in column_data]
 
         self.disp_model = POLYDISPERSITY_MODELS['array']()

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

@@ -93 +93 @@
     POLY_FUNCTION=6
     POLY_EDITABLE_PARAMS = [POLY_MIN, POLY_MAX, POLY_NPTS, POLY_NSIGS]
+    POLY_COLUMN_DICT = {
+        POLY_PD:    'width',
+        POLY_MIN:   'min',
+        POLY_MAX:   'max',
+        POLY_NPTS:  'npts',
+        POLY_NSIGS: 'nsigmas'}
 
     combo_updated = QtCore.pyqtSignal(str, int)