Changeset b9ab979 in sasview

Timestamp:

Nov 6, 2018 3:17:08 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

1942f63

Parents:

a0ad146

Message:

Automatically show sector/annulus/box plots SASVIEW-980

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (3 diffs)
• Plotting/Plotter2D.py (modified) (1 diff)
• Plotting/Slicers/AnnulusSlicer.py (modified) (1 diff)
• Plotting/Slicers/BoxSlicer.py (modified) (1 diff)
• Plotting/Slicers/SectorSlicer.py (modified) (2 diffs)
• Utilities/GuiUtils.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -99 +99 @@
         self.communicator.extMaskEditorSignal.connect(self.extShowEditDataMask)
         self.communicator.changeDataExplorerTabSignal.connect(self.changeTabs)
+        self.communicator.forcePlotDisplaySignal.connect(self.displayData)
 
         self.cbgraph.editTextChanged.connect(self.enableGraphCombo)
@@ -636 +637 @@
             # Try the current item
             main_data = GuiUtils.dataFromItem(plot_item)
+        # 1D dependent plots of 2D sets - special treatment
+        if isinstance(main_data, Data2D) and isinstance(plot_to_show, Data1D):
+            main_data = None
 
         # Make sure main data for 2D is always displayed
-        if main_data and not self.isPlotShown(main_data):
+        if main_data is not None and not self.isPlotShown(main_data):
             if isinstance(main_data, Data2D):
                 self.plotData([(plot_item, main_data)])
@@ -656 +660 @@
             # Plots with main data points on the same chart
             # Get the main data plot
-            if main_data and not self.isPlotShown(main_data):
+            if main_data is not None and not self.isPlotShown(main_data):
                 new_plots.append((plot_item, main_data))
             new_plots.append((plot_item, plot_to_show))

src/sas/qtgui/Plotting/Plotter2D.py

@@ -288 +288 @@
         self.manager.communicator.plotUpdateSignal.emit([new_plot])
 
+        self.manager.communicator.forcePlotDisplaySignal.emit([item, new_plot])
+
+        # Show the plot
+
     def setSlicer(self, slicer):
         """

src/sas/qtgui/Plotting/Slicers/AnnulusSlicer.py

@@ -148 +148 @@
         GuiUtils.updateModelItemWithPlot(item, new_plot, new_plot.id)
         self.base.manager.communicator.plotUpdateSignal.emit([new_plot])
+        self.base.manager.communicator.forcePlotDisplaySignal.emit([item, new_plot])
 
         if self.update_model:

src/sas/qtgui/Plotting/Slicers/BoxSlicer.py

@@ -188 +188 @@
         new_plot.id = (self.averager.__name__) + self.base.data.name
         new_plot.is_data = True
+        item = self._item
         if self._item.parent() is not None:
             item = self._item.parent()
         GuiUtils.updateModelItemWithPlot(item, new_plot, new_plot.id)
+        self.base.manager.communicator.forcePlotDisplaySignal.emit([item, new_plot])
 
         if self.update_model:

src/sas/qtgui/Plotting/Slicers/SectorSlicer.py

@@ -167 +167 @@
         new_plot.id = "SectorQ" + self.base.data.name
         new_plot.is_data = True
+        item = self._item
         if self._item.parent() is not None:
             item = self._item.parent()
@@ -172 +173 @@
 
         self.base.manager.communicator.plotUpdateSignal.emit([new_plot])
+        self.base.manager.communicator.forcePlotDisplaySignal.emit([item, new_plot])
 
         if self.update_model:

src/sas/qtgui/Utilities/GuiUtils.py

@@ -286 +286 @@
     # Plot fitting results (FittingWidget->GuiManager)
     resultPlotUpdateSignal = QtCore.pyqtSignal(list)
+
+    # show the plot as a regular in-workspace object
+    forcePlotDisplaySignal = QtCore.pyqtSignal(list)
 
 def updateModelItemWithPlot(item, update_data, name=""):