Changeset 855e7ad in sasview

Timestamp:

Sep 13, 2018 7:58:43 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:

9d23e4c, 768387e0

Parents:

557fc498

Message:

Visibility of P® and I(Q) charts for inversion SASVIEW-995

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (2 diffs)
• Perspectives/Inversion/InversionPerspective.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -574 +574 @@
         new_plots = []
         for item, plot in plots.items():
-            if self.updatePlot(plot) or filename not in plot.name:
+            if self.updatePlot(plot):
+                # Don't create plots which are already displayed
                 continue
             # Don't plot intermediate results, e.g. P(Q), S(Q)
@@ -582 +583 @@
                 continue
             # Don't include plots from different fitpages, but always include the original data
-            if fitpage_name in plot.name or filename == plot.name:
+            if fitpage_name in plot.name or filename in plot.name or filename == plot.filename:
                 # Residuals get their own plot
                 if plot.plot_role == Data1D.ROLE_RESIDUAL:

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -14 +14 @@
 # pr inversion calculation elements
 from sas.sascalc.pr.invertor import Invertor
+from sas.qtgui.Plotting.PlotterData import Data1D
 # Batch calculation display
 from sas.qtgui.Utilities.GridPanel import BatchInversionOutputPanel
@@ -544 +545 @@
         if self.prPlot is not None:
             title = self.prPlot.name
+            self.prPlot.plot_role = Data1D.ROLE_RESIDUAL
             GuiUtils.updateModelItemWithPlot(self._data, self.prPlot, title)
-            self.communicate.plotRequestedSignal.emit([self.prPlot], None)
         if self.dataPlot is not None:
             title = self.dataPlot.name
+            self.dataPlot.plot_role = Data1D.ROLE_DEFAULT
             GuiUtils.updateModelItemWithPlot(self._data, self.dataPlot, title)
-            self.communicate.plotRequestedSignal.emit([self.dataPlot], None)
+        if self.dataPlot is not None or self.prPlot is not None:
+            self.communicate.plotRequestedSignal.emit([self.logic.data], None)
         self.enableButtons()