Changeset 8ac3551 in sasview

Timestamp:

Mar 21, 2018 8:26: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:

3790f7f, fca1f50

Parents:

8b480d27

Message:

Analysis menu properly interacting with the perspective combo.
Fixed menu enablement for Fitting.

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (2 diffs)
• GuiManager.py (modified) (8 diffs)
• MainWindow.py (modified) (1 diff)
• UI/MainWindowUI.ui (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -473 +473 @@
         Notify the gui manager about the new perspective chosen.
         """
-        self.communicator.perspectiveChangedSignal.emit(self.cbFitting.currentText())
+        self.communicator.perspectiveChangedSignal.emit(self.cbFitting.itemText(index))
         self.chkBatch.setEnabled(self.parent.perspective().allowBatch())
 
@@ -1031 +1031 @@
         pass
 
+    def onAnalysisUpdate(self, new_perspective=""):
+        """
+        Update the perspective combo index based on passed string
+        """
+        assert new_perspective in Perspectives.PERSPECTIVES.keys()
+        self.cbFitting.blockSignals(True)
+        self.cbFitting.setCurrentIndex(self.cbFitting.findText(new_perspective))
+        self.cbFitting.blockSignals(False)
+        pass
+
     def loadComplete(self, output):
         """

src/sas/qtgui/MainWindow/GuiManager.py

@@ -49 +49 @@
     Main SasView window functionality
     """
-
     def __init__(self, parent=None):
         """
@@ -184 +183 @@
         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)
@@ -199 +192 @@
         # 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)
@@ -422 +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)
@@ -691 +687 @@
         """
         self.perspectiveChanged("Fitting")
+        # Notify other widgets
+        self.filesWidget.onAnalysisUpdate("Fitting")
 
     def actionInversion(self):
@@ -696 +694 @@
         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):
@@ -706 +702 @@
         """
         self.perspectiveChanged("Invariant")
+        self.filesWidget.onAnalysisUpdate("Invariant")
+
+    def actionCorfunc(self):
+        """
+        Change to the Corfunc perspective
+        """
+        self.perspectiveChanged("Corfunc")
+        self.filesWidget.onAnalysisUpdate("Corfunc")
 
     #============ WINDOW =================
@@ -852 +856 @@
         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["Inversion"]):
+            self.checkAnalysisOption(self._workspace.actionInversion)
+        elif isinstance(perspective, Perspectives.PERSPECTIVES["Corfunc"]):
+            self.checkAnalysisOption(self._workspace.actionCorfunc)

src/sas/qtgui/MainWindow/MainWindow.py

@@ -30 +30 @@
         except Exception as ex:
             import logging
-            logging.error("Application failed with: ", ex)
+            logging.error("Application failed with: " + str(ex))
             print("Application failed with: ", ex)
 

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -128 +128 @@
      <string>Analysis</string>
     </property>
+    <addaction name="actionCorfunc"/>
     <addaction name="actionFitting"/>
+    <addaction name="actionInvariant"/>
     <addaction name="actionInversion"/>
-    <addaction name="actionInvariant"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
@@ -517 +518 @@
    </property>
   </action>
+  <action name="actionCorfunc">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Correlation Function</string>
+   </property>
+  </action>
  </widget>
  <resources/>