Changeset d4881f6a in sasview for src/sas/qtgui/MainWindow

Timestamp:

Nov 15, 2017 6:52:27 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:

c7ebb37

Parents:

fa81e94

Message:

Initial implementation of Adam Washington's Corfunc perspective.
Converted to py3/Qt5.

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (2 diffs)
• GuiManager.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -29 +29 @@
 
 import sas.qtgui.Perspectives as Perspectives
+
+DEFAULT_PERSPECTIVE = "Fitting"
 
 class DataExplorerWindow(DroppableDataLoadWidget):
@@ -161 +163 @@
         self.cbFitting.currentIndexChanged.connect(self.updatePerspectiveCombo)
         # Set the index so we see the default (Fitting)
-        self.updatePerspectiveCombo(0)
+        self.cbFitting.setCurrentIndex(self.cbFitting.findText(DEFAULT_PERSPECTIVE))
 
     def _perspective(self):

src/sas/qtgui/MainWindow/GuiManager.py

@@ -37 +37 @@
 import sas.qtgui.Perspectives as Perspectives
 from sas.qtgui.Perspectives.Fitting.FittingPerspective import FittingWindow
-from sas.qtgui.MainWindow.DataExplorer import DataExplorerWindow
+from sas.qtgui.MainWindow.DataExplorer import DataExplorerWindow, DEFAULT_PERSPECTIVE
 
 class Acknowledgements(QDialog, Ui_Acknowledgements):
@@ -69 +69 @@
         self.addTriggers()
 
-        # Populate menus with dynamic data
-        #
-        # Analysis/Perspectives - potentially
-        # Window/current windows
-        #
-        # Widgets
-        #
-        # Current displayed perspective
+        # Currently displayed perspective
         self._current_perspective = None
 
-        # Invoke the initial perspective
-        #self.perspectiveChanged("Fitting")
+        # Populate the main window with stuff
         self.addWidgets()
 
@@ -674 +666 @@
         # 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")
         # to here and uncomment the following line
-        # self.perspectiveChanged("Inversion")
+        self.perspectiveChanged("Inversion")
 
     def actionInvariant(self):