Changeset 3ba060e1 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Nov 28, 2018 5:31:19 AM (5 years ago)

Author:

wojciech

Branches:

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

Children:

ce67f35

Parents:

531dd64 (diff), ba8046c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

File:

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

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

@@ -270 +270 @@
         self.custom_models = self.customModels()
         # Polydisp widget table default index for function combobox
-        self.orig_poly_index = 3
+        self.orig_poly_index = 4
         # copy of current kernel model
         self.kernel_module_copy = None
@@ -3022 +3022 @@
         file_index = self._poly_model.index(row_index, self.lstPoly.itemDelegate().poly_function)
         combo_box = self.lstPoly.indexWidget(file_index)
+        try:
+            self.disp_model = POLYDISPERSITY_MODELS[combo_string]()
+        except IndexError:
+            logger.error("Error in setting the dispersion model. Reverting to Gaussian.")
+            self.disp_model = POLYDISPERSITY_MODELS['gaussian']()
 
         def updateFunctionCaption(row):
@@ -3027 +3032 @@
             if not self.isCheckable(row):
                 return
-            self._model_model.blockSignals(True)
-            param_name = str(self._model_model.item(row, 0).text())
-            self._model_model.blockSignals(False)
+            param_name = self._model_model.item(row, 0).text()
             if param_name !=  param.name:
                 return
@@ -3043 +3046 @@
         if combo_string == 'array':
             try:
+                # assure the combo is at the right index
+                combo_box.blockSignals(True)
+                combo_box.setCurrentIndex(combo_box.findText(combo_string))
+                combo_box.blockSignals(False)
+                # Load the file
                 self.loadPolydispArray(row_index)
                 # Update main model for display
                 self.iterateOverModel(updateFunctionCaption)
+                self.kernel_module.set_dispersion(param.name, self.disp_model)
+                # uncheck the parameter
+                self._poly_model.item(row_index, 0).setCheckState(QtCore.Qt.Unchecked)
                 # disable the row
-                lo = self.lstPoly.itemDelegate().poly_pd
+                lo = self.lstPoly.itemDelegate().poly_parameter
                 hi = self.lstPoly.itemDelegate().poly_function
+                self._poly_model.blockSignals(True)
                 [self._poly_model.item(row_index, i).setEnabled(False) for i in range(lo, hi)]
+                self._poly_model.blockSignals(False)
                 return
             except IOError:
@@ -3055 +3068 @@
                 # Pass for cancel/bad read
                 pass
+        else:
+            self.kernel_module.set_dispersion(param.name, self.disp_model)
 
         # Enable the row in case it was disabled by Array
@@ -3106 +3121 @@
 
         # If everything went well - update the sasmodel values
-        self.disp_model = POLYDISPERSITY_MODELS['array']()
         self.disp_model.set_weights(np.array(values), np.array(weights))
         # + update the cell with filename