Changeset d7ff531 in sasview for src/sas

Timestamp:

Apr 6, 2017 2:47:31 PM (8 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:

9c391946

Parents:

2155824

Message:

Minor improvements to the fitting widget

File:

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

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

@@ -143 +143 @@
         if data is not None:
             self.data = data
-        # Update Q Ranges
-        #self.updateQRange()
 
     @property
@@ -166 +164 @@
         self.updateQRange()
         self.cmdFit.setEnabled(True)
-        print "set to ", self.cmdFit.isEnabled()
 
     def acceptsData(self):
@@ -259 +256 @@
         # Reset parameters to fit
         self.parameters_to_fit = None
+        self.has_error_column = False
 
         # SasModel -> QModel
@@ -397 +395 @@
 
         #disable the Fit button
-        self.cmdFit.setText("Calculating...")
+        self.cmdFit.setText('Calculating...')
+        self.communicate.statusBarUpdateSignal.emit('Fitting started...')
         self.cmdFit.setEnabled(False)
 
@@ -414 +413 @@
         self.cmdFit.setText("Fit")
         self.cmdFit.setEnabled(True)
+
+        assert result is not None
+
         res_list = result[0]
         res = res_list[0]
@@ -440 +442 @@
         self.updateModelFromList(param_dict)
 
+        # update charts
+        self.onPlot()
+
         # Read only value - we can get away by just printing it here
         chi2_repr = GuiUtils.formatNumber(fitness, high=True)
         self.lblChi2Value.setText(chi2_repr)
 
-        # Generate charts
-
     def iterateOverModel(self, func):
         """
@@ -462 +465 @@
             return
 
-        def updateValues(row_i):
+        def updateFittedValues(row_i):
             # 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())
             if param_name not in param_dict.keys():
@@ -474 +478 @@
                 self._model_model.item(row_i, 2).setText(error_repr)
 
-        def createColumn(row_i):
+        def createErrorColumn(row_i):
             # Utility function for error column update
             item = QtGui.QStandardItem()
@@ -484 +488 @@
             error_column.append(item)
 
-        self.iterateOverModel(updateValues)
+        self.iterateOverModel(updateFittedValues)
 
         if self.has_error_column:
@@ -490 +494 @@
 
         error_column = []
-        self.iterateOverModel(createColumn)
+        self.iterateOverModel(createErrorColumn)
+
+        # switch off reponse to model change
+        self._model_model.blockSignals(True)
+        self._model_model.insertColumn(2, error_column)
+        self._model_model.blockSignals(False)
+        FittingUtilities.addErrorHeadersToModel(self._model_model)
+        # Adjust the table cells width.
+        # TODO: find a way to dynamically adjust column width while resized expanding
+        self.lstParams.resizeColumnToContents(0)
+        self.lstParams.resizeColumnToContents(4)
+        self.lstParams.resizeColumnToContents(5)
+        self.lstParams.setSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Expanding)
 
         self.has_error_column = True
-        self._model_model.insertColumn(2, error_column)
-        FittingUtilities.addErrorHeadersToModel(self._model_model)
 
     def onPlot(self):
@@ -710 +724 @@
 
         self.kernel_module.params[parameter_name] = value
+        print "UPDATED %s / %s with %0.3f." %(parameter_name, property_name, value)
 
         # min/max to be changed in self.kernel_module.details[parameter_name] = ['Ang', 0.0, inf]
@@ -715 +730 @@
         # multishell params in self.kernel_module.details[??] = value
 
-        # Force the chart update
-        self.onPlot()
+        # Force the chart update when actual parameters changed
+        if model_column == 1:
+            self.onPlot()
 
     def checkboxSelected(self, item):
@@ -860 +876 @@
         # Update the control
         chi2_repr = "---" if chi2 is None else GuiUtils.formatNumber(chi2, high=True)
-        #self.lblChi2Value.setText(GuiUtils.formatNumber(chi2, high=True))
         self.lblChi2Value.setText(chi2_repr)