Changeset 0cd98a1 in sasview

Timestamp:

Sep 8, 2018 6:28:16 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:

c0de493, 309fa1b

Parents:

c4b23dd

git-author:

Piotr Rozyczko <rozyczko@…> (09/08/18 06:26:54)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/08/18 06:28:16)

Message:

Stability fixes implemented after discussing with Ingo.
Changed indexing of active plots from .id to .name to fix SASVIEW-1006

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (4 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• Plotting/Plotter.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -598 +598 @@
         plot2D.plot(plot_set)
         self.addPlot(plot2D)
-        self.active_plots[plot2D.data.id] = plot2D
+        self.active_plots[plot2D.data.name] = plot2D
         #============================================
         # Experimental hook for silx charts
@@ -626 +626 @@
                 new_plot.plot(plot_set, transform=transform)
                 # active_plots may contain multiple charts
-                self.active_plots[plot_set.id] = new_plot
+                self.active_plots[plot_set.name] = new_plot
             elif isinstance(plot_set, Data2D):
                 self.addDataPlot2D(plot_set, item)
@@ -697 +697 @@
                 old_plot.plot()
                 # need this for lookup - otherwise this plot will never update
-                self.active_plots[plot_set.id] = old_plot
+                self.active_plots[plot_set.name] = old_plot
 
     def updatePlot(self, data):
@@ -711 +711 @@
 
         ids_keys = list(self.active_plots.keys())
-        ids_vals = [val.data.id for val in self.active_plots.values()]
-
-        data_id = data.id
+        ids_vals = [val.data.name for val in self.active_plots.values()]
+
+        data_id = data.name
         if data_id in ids_keys:
             self.active_plots[data_id].replacePlot(data_id, data)

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

@@ -1814 +1814 @@
         # Force data recalculation so existing charts are updated
         self.showPlot()
+        # This is an important processEvent.
+        # This allows charts to be properly updated in order
+        # of plots being applied.
+        QtWidgets.QApplication.processEvents()
         self.recalculatePlotData()
 

src/sas/qtgui/Plotting/Plotter.py

@@ -182 +182 @@
 
         # Update the list of data sets (plots) in chart
-        self.plot_dict[self._data.id] = self.data
-
-        self.plot_lines[self._data.id] = line
+        self.plot_dict[self._data.name] = self.data
+
+        self.plot_lines[self._data.name] = line
 
         # Now add the legend with some customizations.
@@ -201 +201 @@
         # refresh canvas
         self.canvas.draw()
-        # This is an important processEvent.
-        # This allows charts to be properly updated in order
-        # of plots being applied.
-        QtWidgets.QApplication.processEvents()
 
     def createContextMenu(self):