Changeset 9463ca2 in sasview

Timestamp:

Aug 30, 2018 10:47:39 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

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:

eef298d4

Parents:

b8080e1

Message:

plotting fixes: appended plots now update; Show Plot no longer breaks if file's plot(s) have been appended to

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (3 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (3 diffs)
• Utilities/GuiUtils.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -526 +526 @@
         # Now query the model item for available plots
         plots = GuiUtils.plotsFromFilename(filename, model)
-        ids = [list(self.active_plots.values())[id].data.id for id in range(len(self.active_plots))]
-        ids2 = [list(self.active_plots.keys())[id] for id in range(len(self.active_plots))]
+        ids_keys = list(self.active_plots.keys())
+        ids_vals = [val.data.id for val in self.active_plots.values()]
 
         new_plots = []
         for item, plot in plots.items():
             plot_id = plot.id
-            if plot_id in ids or plot_id in ids2:
+            if plot_id in ids_keys:
                 self.active_plots[plot_id].replacePlot(plot_id, plot)
+            elif plot_id in ids_vals:
+                list(self.active_plots.values())[ids_vals.index(plot_id)].replacePlot(plot_id, plot)
             else:
                 # Don't plot intermediate results, e.g. P(Q), S(Q)
@@ -666 +668 @@
                 old_plot.data = plot_set
                 old_plot.plot()
+                # need this for lookup - otherwise this plot will never update
+                self.active_plots[plot_set.id] = old_plot
 
     def updatePlot(self, new_data):
@@ -674 +678 @@
         assert type(data).__name__ in ['Data1D', 'Data2D']
 
-        id = data.id
-        if data.id in list(self.active_plots.keys()):
-            self.active_plots[id].replacePlot(id, data)
+        ids_keys = list(self.active_plots.keys())
+        ids_vals = [val.data.id for val in self.active_plots.values()]
+
+        data_id = data.id
+        if data_id in ids_keys:
+            self.active_plots[data_id].replacePlot(data_id, data)
+        elif data_id in ids_vals:
+            list(self.active_plots.values())[ids_vals.index(data_id)].replacePlot(data_id, data)
 
     def chooseFiles(self):

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

@@ -2275 +2275 @@
             pq_data.symbol = "Line"
             self.createNewIndex(pq_data)
+            # self.communicate.plotUpdateSignal.emit([pq_data])
             new_plots.append(pq_data)
         if sq_data is not None:
             sq_data.symbol = "Line"
             self.createNewIndex(sq_data)
+            # self.communicate.plotUpdateSignal.emit([sq_data])
             new_plots.append(sq_data)
 
         if self.data_is_loaded:
             GuiUtils.deleteRedundantPlots(self.all_data[self.data_index], new_plots)
+
+        for plot in new_plots:
+            if hasattr(plot, "id") and "esidual" in plot.id:
+                # TODO: fix updates to residuals plot
+                pass
+            else:
+                self.communicate.plotUpdateSignal.emit([plot])
 
     def complete2D(self, return_data):
@@ -2294 +2303 @@
     def calculateResiduals(self, fitted_data):
         """
-        Calculate and print Chi2 and display chart of residuals
+        Calculate and print Chi2 and display chart of residuals. Returns residuals plot object.
         """
         # Create a new index for holding data
@@ -2309 +2318 @@
         self.lblChi2Value.setText(chi2_repr)
 
-        self.communicate.plotUpdateSignal.emit([fitted_data])
+        # self.communicate.plotUpdateSignal.emit([fitted_data])
 
         # Plot residuals if actual data

src/sas/qtgui/Utilities/GuiUtils.py

@@ -335 +335 @@
         clone.__hash__ = self.__hash__
         return clone
-
 
 def getMonospaceFont():