Changeset a54bbf2b in sasview for src/sas/qtgui/MainWindow

Timestamp:

Sep 11, 2018 10:00:45 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:

2d47985

Parents:

343d7fd

Message:

Added plot roles to Data1D/Data2D structures to allow for smoother plot logic.

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (4 diffs)
• DataManager.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -574 +574 @@
         new_plots = []
         for item, plot in plots.items():
-            if self.updatePlot(plot) and filename != plot.name:
+            if self.updatePlot(plot) or filename not in plot.name:
                 continue
             # Don't plot intermediate results, e.g. P(Q), S(Q)
@@ -583 +583 @@
             # Don't include plots from different fitpages, but always include the original data
             if fitpage_name in plot.name or filename == plot.name:
-                # 'sophisticated' test to generate standalone plot for residuals
-                if 'esiduals' in plot.title:
+                # Residuals get their own plot
+                if plot.plot_role == Data1D.ROLE_RESIDUAL:
                     plot.yscale='linear'
                     self.plotData([(item, plot)])
@@ -686 +686 @@
 
         # Update the active chart list
-        #self.active_plots[new_plot.data.id] = new_plot
+        self.active_plots[new_plot.data.name] = new_plot
 
     def appendPlot(self):
@@ -729 +729 @@
         data_id = data.name
         if data_id in ids_keys:
-            self.active_plots[data_id].replacePlot(data_id, data)
+            # We have data, let's replace data that needs replacing
+            if data.plot_role != Data1D.ROLE_DATA:
+                self.active_plots[data_id].replacePlot(data_id, data)
             return True
         elif data_id in ids_vals:
-            list(self.active_plots.values())[ids_vals.index(data_id)].replacePlot(data_id, data)
+            if data.plot_role != Data1D.ROLE_DATA:
+                list(self.active_plots.values())[ids_vals.index(data_id)].replacePlot(data_id, data)
             return True
         return False

src/sas/qtgui/MainWindow/DataManager.py

@@ -118 +118 @@
         new_plot.path = path
         new_plot.list_group_id = []
+        # Assign the plot role to data
+        new_plot.plot_role = Data1D.ROLE_DATA
         ##post data to plot
         # plot data