Changeset c2f3ca2 in sasview for src/sas

Timestamp:

Sep 7, 2018 8:20:46 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

f0365a2e

Parents:

fb560d2

git-author:

Piotr Rozyczko <rozyczko@…> (09/07/18 08:19:44)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/07/18 08:20:46)

Message:

Improvements to fitting→plotting process SASVIEW-1029

Location:

src/sas/qtgui

Files:

• Perspectives/Fitting/FittingWidget.py (modified) (12 diffs)
• Plotting/Plotter.py (modified) (5 diffs)

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

@@ -1507 +1507 @@
         # update charts
         self.onPlot()
+        #self.recalculatePlotData()
+
 
         # Read only value - we can get away by just printing it here
@@ -1594 +1596 @@
             param_repr = GuiUtils.formatNumber(param_dict[param_name][0], high=True)
             self._model_model.item(row, 1).setText(param_repr)
+            self.kernel_module.setParam(param_name, param_dict[param_name][0])
             if self.has_error_column:
                 error_repr = GuiUtils.formatNumber(param_dict[param_name][1], high=True)
@@ -1635 +1638 @@
             poly_item.insertColumn(2, [QtGui.QStandardItem("")])
 
-        # block signals temporarily, so we don't end up
-        # updating charts with every single model change on the end of fitting
-        self._model_model.blockSignals(True)
-
         if not self.has_error_column:
             # create top-level error column
@@ -1645 +1644 @@
             self.iterateOverModel(createErrorColumn)
 
-            # we need to enable signals for this, otherwise the final column mysteriously disappears (don't ask, I don't
-            # know)
-            self._model_model.blockSignals(False)
             self._model_model.insertColumn(2, error_column)
-            self._model_model.blockSignals(True)
 
             FittingUtilities.addErrorHeadersToModel(self._model_model)
@@ -1658 +1653 @@
             self.has_error_column = True
 
+        # block signals temporarily, so we don't end up
+        # updating charts with every single model change on the end of fitting
+        self._model_model.itemChanged.disconnect()
         self.iterateOverModel(updateFittedValues)
         self.iterateOverModel(updatePolyValues)
-
-        self._model_model.blockSignals(False)
+        self._model_model.itemChanged.connect(self.onMainParamsChange)
 
         # Adjust the table cells width.
@@ -1696 +1693 @@
             param_repr = GuiUtils.formatNumber(param_dict[param_name][0], high=True)
             self._poly_model.item(row_i, 1).setText(param_repr)
+            self.kernel_module.setParam(param_name, param_dict[param_name][0])
             if self.has_poly_error_column:
                 error_repr = GuiUtils.formatNumber(param_dict[param_name][1], high=True)
                 self._poly_model.item(row_i, 2).setText(error_repr)
-
 
         def createErrorColumn(row_i):
@@ -1720 +1717 @@
         # block signals temporarily, so we don't end up
         # updating charts with every single model change on the end of fitting
-        self._poly_model.blockSignals(True)
+        self._poly_model.itemChanged.disconnect()
         self.iterateOverPolyModel(updateFittedValues)
-        self._poly_model.blockSignals(False)
+        self._poly_model.itemChanged.connect(self.onPolyModelChange)
 
         if self.has_poly_error_column:
@@ -1732 +1729 @@
 
         # switch off reponse to model change
-        self._poly_model.blockSignals(True)
         self._poly_model.insertColumn(2, error_column)
-        self._poly_model.blockSignals(False)
         FittingUtilities.addErrorPolyHeadersToModel(self._poly_model)
 
@@ -1767 +1762 @@
             param_repr = GuiUtils.formatNumber(param_dict[param_name][0], high=True)
             self._magnet_model.item(row, 1).setText(param_repr)
+            self.kernel_module.setParam(param_name, param_dict[param_name][0])
             if self.has_magnet_error_column:
                 error_repr = GuiUtils.formatNumber(param_dict[param_name][1], high=True)
@@ -1786 +1782 @@
         # block signals temporarily, so we don't end up
         # updating charts with every single model change on the end of fitting
-        self._magnet_model.blockSignals(True)
+        self._magnet_model.itemChanged.disconnect()
         self.iterateOverMagnetModel(updateFittedValues)
-        self._magnet_model.blockSignals(False)
+        self._magnet_model.itemChanged.connect(self.onMagnetModelChange)
 
         if self.has_magnet_error_column:
@@ -1798 +1794 @@
 
         # switch off reponse to model change
-        self._magnet_model.blockSignals(True)
         self._magnet_model.insertColumn(2, error_column)
-        self._magnet_model.blockSignals(False)
         FittingUtilities.addErrorHeadersToModel(self._magnet_model)
 
@@ -1812 +1806 @@
         self.cmdPlot.setText("Show Plot")
         # Force data recalculation so existing charts are updated
+        self.showPlot()
         self.recalculatePlotData()
-        self.showPlot()
 
     def onSmearingOptionsUpdate(self):

src/sas/qtgui/Plotting/Plotter.py

@@ -30 +30 @@
         # Dictionary of {plot_id:Data1d}
         self.plot_dict = {}
-
+        # Dictionaty of {plot_id:line}
+
+        self.plot_lines = {}
         # Window for text add
         self.addText = AddText(self)
@@ -182 +184 @@
         self.plot_dict[self._data.id] = self.data
 
+        self.plot_lines[self._data.id] = line
+
         # Now add the legend with some customizations.
 
@@ -196 +200 @@
 
         # refresh canvas
-        self.canvas.draw_idle()
+        self.canvas.draw()
         # This is an important processEvent.
         # This allows charts to be properly updated in order
@@ -416 +420 @@
         This effectlvely refreshes the chart with changes to one of its plots
         """
+        import logging
         self.removePlot(id)
         self.plot(data=new_plot)
@@ -470 +475 @@
         """
         selected_plot = self.plot_dict[id]
-
+        selected_line = self.plot_lines[id]
         # Old style color - single integer for enum color
         # New style color - #hhhhhh