Changeset a54bbf2b in sasview for src

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

Files:

• MainWindow/DataExplorer.py (modified) (4 diffs)
• MainWindow/DataManager.py (modified) (1 diff)
• Perspectives/Fitting/FittingLogic.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• Plotting/PlotterData.py (modified) (3 diffs)
• Utilities/GuiUtils.py (modified) (2 diffs)

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

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

@@ -154 +154 @@
         new_plot.xaxis(_xaxis, _xunit)
         new_plot.yaxis(_yaxis, _yunit)
+
+        if component is not None:
+            new_plot.plot_role = Data1D.ROLE_DELETABLE #deletable
 
         return new_plot

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

@@ -2481 +2481 @@
         residuals_plot = FittingUtilities.plotResiduals(self.data, weighted_data)
         residuals_plot.id = "Residual " + residuals_plot.id
+        residuals_plot.plot_role = Data1D.ROLE_RESIDUAL
         self.createNewIndex(residuals_plot)
         return residuals_plot

src/sas/qtgui/Plotting/PlotterData.py

@@ -17 +17 @@
     """
     """
+    ROLE_DATA=0
+    ROLE_DEFAULT=1
+    ROLE_DELETABLE=2
+    ROLE_RESIDUAL=3
     def __init__(self, x=None, y=None, dx=None, dy=None):
         """
@@ -35 +39 @@
         self.title = ""
         self.scale = None
+        # plot_role:
+        # 0: data - no reload on param change
+        # 1: normal lifecycle (fit)
+        # 2: deletable on model change (Q(I), S(I)...)
+        # 3: separate chart on Show Plot (residuals)
+        self.plot_role = Data1D.ROLE_DEFAULT
         
     def copy_from_datainfo(self, data1d):
@@ -184 +194 @@
         self.title = ""
         self.scale = None
+        # Always default
+        self.plot_role = Data1D.ROLE_DEFAULT
         
     def copy_from_datainfo(self, data2d):

src/sas/qtgui/Utilities/GuiUtils.py

@@ -322 +322 @@
     assert isinstance(item, QtGui.QStandardItem)
 
+    # lists of plots names/ids for all deletable plots on item
     names = [p.name for p in new_plots if p.name is not None]
     ids = [p.id for p in new_plots if p.id is not None]
@@ -329 +330 @@
     for index in range(item.rowCount()):
         plot_item = item.child(index)
-        if plot_item.isCheckable():
-            plot_data = plot_item.child(0).data()
-            if (plot_data.id is not None) and (plot_data.id not in ids) and (plot_data.name not in names):
-                items_to_delete.append(plot_item)
+        if not plot_item.isCheckable():
+            continue
+        plot_data = plot_item.child(0).data()
+        if (plot_data.id is not None) and \
+            (plot_data.id not in ids) and \
+            (plot_data.name not in names) and \
+            (plot_data.plot_role == Data1D.ROLE_DELETABLE):
+            items_to_delete.append(plot_item)
 
     for plot_item in items_to_delete: