Changes in src/sas/qtgui/MainWindow/GuiManager.py [8ac3551:14ec91c5] in sasview

File:

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

src/sas/qtgui/MainWindow/GuiManager.py

@@ -19 +19 @@
 
 import sas.qtgui.Utilities.ObjectLibrary as ObjectLibrary
-from sas.qtgui.Utilities.TabbedModelEditor import TabbedModelEditor
-from sas.qtgui.Utilities.PluginManager import PluginManager
 from sas.qtgui.MainWindow.UI.AcknowledgementsUI import Ui_Acknowledgements
 from sas.qtgui.MainWindow.AboutBox import AboutBox
@@ -49 +47 @@
     Main SasView window functionality
     """
+
     def __init__(self, parent=None):
         """
@@ -183 +182 @@
         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)
@@ -192 +197 @@
         # Default perspective
         self._current_perspective = Perspectives.PERSPECTIVES[str(perspective_name)](parent=self)
-
-        self.setupPerspectiveMenubarOptions(self._current_perspective)
 
         subwindow = self._workspace.workspace.addSubWindow(self._current_perspective)
@@ -355 +358 @@
         self.communicate.updateTheoryFromPerspectiveSignal.connect(self.updateTheoryFromPerspective)
         self.communicate.plotRequestedSignal.connect(self.showPlot)
-        self.communicate.plotFromFilenameSignal.connect(self.showPlotFromFilename)
         self.communicate.updateModelFromDataOperationPanelSignal.connect(self.updateModelFromDataOperationPanel)
 
@@ -404 +406 @@
         self._workspace.actionFit_Results.triggered.connect(self.actionFit_Results)
         self._workspace.actionChain_Fitting.triggered.connect(self.actionChain_Fitting)
-        self._workspace.actionAdd_Custom_Model.triggered.connect(self.actionAdd_Custom_Model)
         self._workspace.actionEdit_Custom_Model.triggered.connect(self.actionEdit_Custom_Model)
-        self._workspace.actionManage_Custom_Models.triggered.connect(self.actionManage_Custom_Models)
         # Window
         self._workspace.actionCascade.triggered.connect(self.actionCascade)
@@ -417 +417 @@
         self._workspace.actionInversion.triggered.connect(self.actionInversion)
         self._workspace.actionInvariant.triggered.connect(self.actionInvariant)
-        self._workspace.actionCorfunc.triggered.connect(self.actionCorfunc)
         # Help
         self._workspace.actionDocumentation.triggered.connect(self.actionDocumentation)
@@ -663 +662 @@
         pass
 
-    def actionAdd_Custom_Model(self):
-        """
-        """
-        self.model_editor = TabbedModelEditor(self)
-        self.model_editor.show()
-
     def actionEdit_Custom_Model(self):
         """
         """
-        self.model_editor = TabbedModelEditor(self, edit_only=True)
-        self.model_editor.show()
-
-    def actionManage_Custom_Models(self):
-        """
-        """
-        self.model_manager = PluginManager(self)
-        self.model_manager.show()
+        print("actionEdit_Custom_Model TRIGGERED")
+        pass
 
     #============ ANALYSIS =================
@@ -687 +674 @@
         """
         self.perspectiveChanged("Fitting")
-        # Notify other widgets
-        self.filesWidget.onAnalysisUpdate("Fitting")
 
     def actionInversion(self):
@@ -694 +679 @@
         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)
+        # to here and uncomment the following line
         self.perspectiveChanged("Inversion")
-        self.filesWidget.onAnalysisUpdate("Inversion")
 
     def actionInvariant(self):
@@ -702 +689 @@
         """
         self.perspectiveChanged("Invariant")
-        self.filesWidget.onAnalysisUpdate("Invariant")
-
-    def actionCorfunc(self):
-        """
-        Change to the Corfunc perspective
-        """
-        self.perspectiveChanged("Corfunc")
-        self.filesWidget.onAnalysisUpdate("Corfunc")
 
     #============ WINDOW =================
@@ -800 +779 @@
         self.filesWidget.model.appendRow(new_item)
         self._data_manager.add_data(new_datalist_item)
-
-    def showPlotFromFilename(self, filename):
-        """
-        Pass the show plot request to the data explorer
-        """
-        if hasattr(self, "filesWidget"):
-            self.filesWidget.displayFile(filename=filename, is_data=True)
 
     def showPlot(self, plot):
@@ -856 +828 @@
         elif isinstance(perspective, Perspectives.PERSPECTIVES["Invariant"]):
             self.checkAnalysisOption(self._workspace.actionInvariant)
-        elif isinstance(perspective, Perspectives.PERSPECTIVES["Inversion"]):
-            self.checkAnalysisOption(self._workspace.actionInversion)
-        elif isinstance(perspective, Perspectives.PERSPECTIVES["Corfunc"]):
-            self.checkAnalysisOption(self._workspace.actionCorfunc)
+        # elif isinstance(perspective, Perspectives.PERSPECTIVES["Inversion"]):
+        #     self.checkAnalysisOption(self._workspace.actionInversion)