Changeset 133812c7 in sasview for src/sas/qtgui/Plotting

Timestamp:

Nov 12, 2018 6:47:59 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:

e5ae812

Parents:

ebcdb02

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (10/31/18 06:34:14)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (11/12/18 06:47:59)

Message:

Merged ESS_GUI

Location:

src/sas/qtgui/Plotting

Files:

• MaskEditor.py (modified) (1 diff)
• Plotter2D.py (modified) (3 diffs)
• Slicers/AnnulusSlicer.py (modified) (1 diff)
• Slicers/BoxSlicer.py (modified) (1 diff)
• Slicers/SectorSlicer.py (modified) (2 diffs)
• UI/MaskEditorUI.ui (modified) (1 diff)

src/sas/qtgui/Plotting/MaskEditor.py

@@ -42 +42 @@
         layout.setContentsMargins(0, 0, 0, 0)
         self.frame.setLayout(layout)
+
+        self.plotter.plot()
         layout.addWidget(self.plotter)
-
-        self.plotter.plot()
         self.subplot = self.plotter.ax
 

src/sas/qtgui/Plotting/Plotter2D.py

@@ -281 +281 @@
         new_plot.id = "Circ avg " + self.data.name
         new_plot.is_data = True
+        item = self._item
         if self._item.parent() is not None:
             item = self._item.parent()
@@ -286 +287 @@
 
         self.manager.communicator.plotUpdateSignal.emit([new_plot])
+
+        self.manager.communicator.forcePlotDisplaySignal.emit([item, new_plot])
+
+        # Show the plot
 
     def setSlicer(self, slicer):
@@ -508 +513 @@
             self.figure.canvas.draw()
 
+    def imageShow(self, img, origin=None):
+        """
+        Show background image
+        :Param img: [imread(path) from matplotlib.pyplot]
+        """
+        if origin is not None:
+            im = self.ax.imshow(img, origin=origin)
+        else:
+            im = self.ax.imshow(img)
+
     def update(self):
         self.figure.canvas.draw()

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/Plotting/UI/MaskEditorUI.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>687</width>
-    <height>507</height>
+    <width>824</width>
+    <height>453</height>
    </rect>
   </property>