Changeset 1942f63 in sasview for src

Timestamp:

Nov 6, 2018 7:38:02 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:

5584dee

Parents:

b9ab979

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (10/20/18 17:16:40)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (11/06/18 07:38:02)

Message:

Merged ESS_GUI_image_viewer

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (3 diffs)
• MainWindow/GuiManager.py (modified) (3 diffs)
• Plotting/Plotter2D.py (modified) (1 diff)
• Utilities/ImageViewer.py (added)
• Utilities/UI/ImageViewerOptionsUI.ui (added)
• Utilities/UI/ImageViewerUI.ui (added)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -100 +100 @@
         self.communicator.changeDataExplorerTabSignal.connect(self.changeTabs)
         self.communicator.forcePlotDisplaySignal.connect(self.displayData)
+        self.communicator.updateModelFromPerspectiveSignal.connect(self.updateModelFromPerspective)
 
         self.cbgraph.editTextChanged.connect(self.enableGraphCombo)
@@ -369 +370 @@
         Send selected item data to the current perspective and set the relevant notifiers
         """
-        # Set the signal handlers
-        self.communicator.updateModelFromPerspectiveSignal.connect(self.updateModelFromPerspective)
-
         def isItemReady(index):
             item = self.model.item(index)
@@ -1443 +1441 @@
             raise AttributeError(msg)
 
-        # TODO: Assert other properties
-
-        # Reset the view
-        ##self.model.reset()
-        # Pass acting as a debugger anchor
+        # send in the new item
+        self.model.appendRow(model_item)
         pass
 

src/sas/qtgui/MainWindow/GuiManager.py

@@ -51 +51 @@
 
 from sas.qtgui.Utilities.AddMultEditor import AddMultEditor
+from sas.qtgui.Utilities.ImageViewer import ImageViewer
 
 logger = logging.getLogger(__name__)
@@ -458 +459 @@
         self._workspace.actionReset.setVisible(False)
         self._workspace.actionStartup_Settings.setVisible(False)
-        self._workspace.actionImage_Viewer.setVisible(False)
+        #self._workspace.actionImage_Viewer.setVisible(False)
         self._workspace.actionCombine_Batch_Fit.setVisible(False)
         # orientation viewer set to invisible SASVIEW-1132
@@ -781 +782 @@
         """
         """
-        print("actionImage_Viewer TRIGGERED")
-        pass
+        try:
+            self.image_viewer = ImageViewer(self)
+            if sys.platform == "darwin":
+                self.image_viewer.menubar.setNativeMenuBar(False)
+            self.image_viewer.show()
+        except Exception as ex:
+            logging.error(str(ex))
+            return
 
     #============ FITTING =================

src/sas/qtgui/Plotting/Plotter2D.py

@@ -513 +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()