Changeset 9e54199 in sasview

Timestamp:

Oct 26, 2017 8:47:30 AM (7 years ago)

Author:

Tim Snow <tim.snow@…>

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:

749b715

Parents:

02c11b04

Message:

Implementing ticket SVCC-112

Analysis menu now changes perspectives, handling the option checking behaviour as well. In addition the fitting menu appears and disappears as and when the user is in the fitting perspective.

File:

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

src/sas/qtgui/MainWindow/GuiManager.py

@@ -180 +180 @@
         Respond to change of the perspective signal
         """
+
+        # Save users from themselves...
+        if isinstance(self._current_perspective, Perspectives.PERSPECTIVES[str(perspective_name)]):
+            self.setupPerspectiveMenubarOptions(self._current_perspective)
+            return
+
         # Close the previous perspective
+        self.clearPerspectiveMenubarOptions(self._current_perspective)
         if self._current_perspective:
             self._current_perspective.setClosable()
@@ -187 +194 @@
         self._current_perspective = Perspectives.PERSPECTIVES[str(perspective_name)](parent=self)
 
+        self.setupPerspectiveMenubarOptions(self._current_perspective)
         self._workspace.workspace.addWindow(self._current_perspective)
         # Resize to the workspace height
@@ -650 +658 @@
     def actionFitting(self):
         """
-        """
-        print("actionFitting TRIGGERED")
-        pass
+        Change to the Fitting perspective
+        """
+        self.perspectiveChanged("Fitting")
 
     def actionInversion(self):
         """
-        """
+        Change to the Inversion perspective
+        """
+        # For now we'll just update the analysis menu status but when the inversion is implemented delete from here
+        self.checkAnalysisOption(self._workspace.actionInversion)
         print("actionInversion TRIGGERED")
-        pass
+        # to here and uncomment the following line
+        # self.perspectiveChanged("Inversion")
 
     def actionInvariant(self):
         """
-        """
-        print("actionInvariant TRIGGERED")
-        pass
+        Change to the Invariant perspective
+        """
+        self.perspectiveChanged("Invariant")
 
     #============ WINDOW =================
@@ -763 +775 @@
         if hasattr(self, "filesWidget"):
             self.filesWidget.displayData(plot)
+
+    def uncheckAllMenuItems(self, menuObject):
+        """
+        Uncheck all options in a given menu
+        """
+        menuObjects = menuObject.actions()
+
+        for menuItem in menuObjects:
+            menuItem.setChecked(False)
+
+    def checkAnalysisOption(self, analysisMenuOption):
+        """
+        Unchecks all the items in the analysis menu and checks the item passed
+        """
+        self.uncheckAllMenuItems(self._workspace.menuAnalysis)
+        analysisMenuOption.setChecked(True)
+
+    def clearPerspectiveMenubarOptions(self, perspective):
+        """
+        When closing a perspective, clears the menu bar
+        """
+        for menuItem in self._workspace.menuAnalysis.actions():
+            menuItem.setChecked(False)
+
+        if isinstance(self._current_perspective, Perspectives.PERSPECTIVES["Fitting"]):
+            self._workspace.menubar.removeAction(self._workspace.menuFitting.menuAction())
+
+    def setupPerspectiveMenubarOptions(self, perspective):
+        """
+        When setting a perspective, sets up the menu bar
+        """
+        if isinstance(perspective, Perspectives.PERSPECTIVES["Fitting"]):
+            self.checkAnalysisOption(self._workspace.actionFitting)
+            # Put the fitting menu back in
+            # This is a bit involved but it is needed to preserve the menu ordering
+            self._workspace.menubar.removeAction(self._workspace.menuWindow.menuAction())
+            self._workspace.menubar.removeAction(self._workspace.menuHelp.menuAction())
+            self._workspace.menubar.addAction(self._workspace.menuFitting.menuAction())
+            self._workspace.menubar.addAction(self._workspace.menuWindow.menuAction())
+            self._workspace.menubar.addAction(self._workspace.menuHelp.menuAction())
+        elif isinstance(perspective, Perspectives.PERSPECTIVES["Invariant"]):
+            self.checkAnalysisOption(self._workspace.actionInvariant)
+        # elif isinstance(perspective, Perspectives.PERSPECTIVES["Inversion"]):
+        #     self.checkAnalysisOption(self._workspace.actionInversion)