Changeset 83d6249 in sasview for src/sas/qtgui/GuiManager.py

Timestamp:

Feb 16, 2017 6:06:17 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

2bb20a5, fca1f50

Parents:

4c7dd9f

Message:

Perspectives are now switchable and can be added "dynamically"

File:

• src/sas/qtgui/GuiManager.py (modified) (6 diffs)

src/sas/qtgui/GuiManager.py

@@ -29 +29 @@
 
 # Perspectives
+import Perspectives
 from sas.qtgui.Perspectives.Invariant.InvariantPerspective import InvariantWindow
+from sas.qtgui.Perspectives.Fitting.FittingPerspective import FittingWindow
 from sas.qtgui.DataExplorer import DataExplorerWindow
 
@@ -98 +100 @@
                                               "_downloads",
                                               "Tutorial.pdf"))
-
-        #==========================================================
-        # TEMP PROTOTYPE
-        # Add InvariantWindow to the workspace.
-        self.invariantWidget = InvariantWindow(self)
-        self._workspace.workspace.addWindow(self.invariantWidget)
-
-        # Default perspective
-        self._current_perspective = self.invariantWidget
+        # Current displayed perspective
+        self._current_perspective = None
+
+        # Invoke the initial perspective
+        self.perspectiveChanged("Fitting")
 
     def addWidgets(self):
@@ -120 +118 @@
         self.dockedFilesWidget = QtGui.QDockWidget("Data Explorer", self._workspace)
         self.dockedFilesWidget.setWidget(self.filesWidget)
+
         # Disable maximize/minimize and close buttons
         self.dockedFilesWidget.setFeatures(QtGui.QDockWidget.NoDockWidgetFeatures)
@@ -143 +142 @@
         self.KIESSIGCalculator = KiessigPanel(self)
         self.SlitSizeCalculator = SlitSizeCalculator(self)
+
     def statusBarSetup(self):
         """
@@ -173 +173 @@
         """
         return self._workspace.workspace
+
+    def perspectiveChanged(self, perspective_name):
+        """
+        Respond to change of the perspective signal
+        """
+        # Close the previous perspective
+        if self._current_perspective:
+            self._current_perspective.close()
+        # Default perspective
+        self._current_perspective = Perspectives.PERSPECTIVES[str(perspective_name)](self)
+        self._workspace.workspace.addWindow(self._current_perspective)
+        self._current_perspective.show()
 
     def updatePerspective(self, data):
@@ -322 +334 @@
         self.communicate.updatePerspectiveWithDataSignal.connect(self.updatePerspective)
         self.communicate.progressBarUpdateSignal.connect(self.updateProgressBar)
+        self.communicate.perspectiveChangedSignal.connect(self.perspectiveChanged)
 
     def addTriggers(self):