Changeset 63467b6 in sasview for src/sas/qtgui/Plotting

Timestamp:

Sep 27, 2018 2:20:24 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:

4f8c17f

Parents:

dce68f6

Message:

Improved handling of 2d plot children. Refactored model tree search.

Location:

src/sas/qtgui/Plotting

Files:

• Plotter2D.py (modified) (1 diff)
• Slicers/AnnulusSlicer.py (modified) (1 diff)
• Slicers/BoxSlicer.py (modified) (1 diff)
• Slicers/SectorSlicer.py (modified) (1 diff)

src/sas/qtgui/Plotting/Plotter2D.py

@@ -284 +284 @@
         new_plot.id = "Circ avg " + self.data.name
         new_plot.is_data = True
-        GuiUtils.updateModelItemWithPlot(self._item, new_plot, new_plot.id)
+        if self._item.parent() is not None:
+            item = self._item.parent()
+        GuiUtils.updateModelItemWithPlot(item, new_plot, new_plot.id)
 
         self.manager.communicator.plotUpdateSignal.emit([new_plot])

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

@@ -143 +143 @@
         new_plot.xtransform = "x"
         new_plot.ytransform = "y"
-        GuiUtils.updateModelItemWithPlot(self._item, new_plot, new_plot.id)
+        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.plotUpdateSignal.emit([new_plot])
 

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

@@ -188 +188 @@
         new_plot.id = (self.averager.__name__) + self.base.data.name
         new_plot.is_data = True
-        GuiUtils.updateModelItemWithPlot(self._item, new_plot, new_plot.id)
+        if self._item.parent() is not None:
+            item = self._item.parent()
+        GuiUtils.updateModelItemWithPlot(item, new_plot, new_plot.id)
 
         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
-        GuiUtils.updateModelItemWithPlot(self._item, new_plot, new_plot.id)
+        if self._item.parent() is not None:
+            item = self._item.parent()
+        GuiUtils.updateModelItemWithPlot(item, new_plot, new_plot.id)
 
         self.base.manager.communicator.plotUpdateSignal.emit([new_plot])