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

Timestamp:

Oct 26, 2018 4:44:15 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

b1b71ad

Parents:

a3c59503 (diff), 75906a1 (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' into ESS_GUI_project_save

File:

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

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

@@ -1573 +1573 @@
         if param_dict is None:
             return
+        if hasattr(res, 'convergence') and len(res.convergence)>0:
+            self.communicate.resultPlotUpdateSignal.emit(result[0])
 
         elapsed = result[1]
@@ -2333 +2335 @@
         max_column = self.lstParams.itemDelegate().param_max
         if model_column == param_column:
-            self.kernel_module.setParam(parameter_name, value)
+            # don't try to update multiplicity counters if they aren't there.
+            # Note that this will fail for proper bad update where the model
+            # doesn't contain multiplicity parameter
+            if parameter_name != self.kernel_module.multiplicity_info.control:
+                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]
@@ -3373 +3379 @@
         else:
             index = self.theory_item
+        params = FittingUtilities.getStandardParam(self._model_model)
         report_logic = ReportPageLogic(self,
                                        kernel_module=self.kernel_module,
                                        data=self.data,
                                        index=index,
-                                       model=self._model_model)
+                                       params=params)
 
         return report_logic.reportList()