Changeset d84bc69 in sasview

Timestamp:

Feb 16, 2017 9:40:53 AM (8 years ago)

Author:

wojciech

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:

6a9559d

Parents:

dba6e57 (diff), 83d6249 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Conflict resolved

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (3 diffs)
• GuiManager.py (modified) (6 diffs)
• GuiUtils.py (modified) (1 diff)
• Perspectives/Fitting/FittingPerspective.py (moved) (moved from src/sas/qtgui/Perspectives/Fitting/Fitting.py) (3 diffs)
• Perspectives/Fitting/UI/FittingUI.ui (moved) (moved from src/sas/qtgui/Perspectives/Fitting/UI/fitting.ui) (3 diffs)
• Perspectives/Fitting/UI/__init__.py (added)
• Perspectives/Fitting/UI/convert_ui.sh (added)
• Perspectives/Fitting/__init__.py (added)
• Perspectives/Invariant/InvariantPerspective.py (modified) (2 diffs)
• Perspectives/__init__.py (modified) (1 diff, 1 prop)

src/sas/qtgui/DataExplorer.py

@@ -65 +65 @@
         self._helpView = QtWebKit.QWebView()
 
+        # Fill in the perspectives combo
+        self.initPerspectives()
+
         # Custom context menu
         self.treeView.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
@@ -125 +128 @@
         self.cbgraph.setEnabled(len(PlotHelper.currentPlots()) > 0)
         self.cmdAppend.setEnabled(len(PlotHelper.currentPlots()) > 0)
+
+    def initPerspectives(self):
+        """
+        Populate the Perspective combobox and define callbacks
+        """
+        self.cbFitting.currentIndexChanged.connect(self.updatePerspectiveCombo)
+        # Set the index so we see the default (Fitting)
+        self.updatePerspectiveCombo(0)
 
     def loadFromURL(self, url):
@@ -389 +400 @@
             self.cbgraph.setCurrentIndex(ind)
 
+    def updatePerspectiveCombo(self, index):
+        """
+        Notify the gui manager about the new perspective chosen.
+        """
+        self.communicator.perspectiveChangedSignal.emit(self.cbFitting.currentText())
+
     def newPlot(self):
         """

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):

src/sas/qtgui/GuiUtils.py

@@ -233 +233 @@
     # Current workspace chart's name changed
     activeGraphName = QtCore.pyqtSignal(tuple)
+
+    # Current perspective changed
+    perspectiveChangedSignal = QtCore.pyqtSignal(str)
 
 

src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

@@ -5 +5 @@
 from PyQt4 import QtCore
 
-from UI.fitting import Ui_Dialog
+from UI.FittingUI import Ui_FittingUI
 
 from sasmodels import generate
@@ -13 +13 @@
 from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
 
-class prototype(QtGui.QDialog, Ui_Dialog):
-    def __init__(self):
-        super(prototype, self).__init__()
+class FittingWindow(QtGui.QDialog, Ui_FittingUI):
+    name = "Fitting" # For displaying in the combo box
+    def __init__(self, manager=None, parent=None):
+        super(FittingWindow, self).__init__()
         self._model_model = QtGui.QStandardItemModel()
         self._poly_model = QtGui.QStandardItemModel()
@@ -175 +176 @@
 if __name__ == "__main__":
     app = QtGui.QApplication([])
-    dlg = prototype()
+    dlg = FittingWindow()
     dlg.show()
     sys.exit(app.exec_())

src/sas/qtgui/Perspectives/Fitting/UI/FittingUI.ui

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
+ <class>FittingUI</class>
+ <widget class="QDialog" name="FittingUI">
   <property name="geometry">
    <rect>
@@ -12 +12 @@
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Fitting Perspective</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../../../UI/main_resources.qrc">
+    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_15">
@@ -642 +646 @@
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../../UI/main_resources.qrc"/>
+ </resources>
  <connections/>
 </ui>

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -39 +39 @@
     # The controller which is responsible for managing signal slots connections
     # for the gui and providing an interface to the data model.
+    name = "Invariant" # For displaying in the combo box
     def __init__(self, manager=None, parent=None):
         super(InvariantWindow, self).__init__(parent)
@@ -102 +103 @@
         self.setupMapper()
 
-    def closeEvent(self, event):
-        """
-        Overwrite the default close method of QWidget
-        """
-        # No close on perspectives - one must always be active.
-        event.ignore()
+    #def closeEvent(self, event):
+    #    """
+    #    Overwrite the default close method of QWidget
+    #    """
+    #    # No close on perspectives - one must always be active.
+    #    event.ignore()
 
     def communicator(self):

src/sas/qtgui/Perspectives/__init__.py

@@ +1 @@
+# Available perspectives.
+# When adding a new perspective, this dictionary needs to be updated
+
+from Fitting.FittingPerspective import FittingWindow
+from Invariant.InvariantPerspective import InvariantWindow
+
+PERSPECTIVES = {
+    FittingWindow.name: FittingWindow,
+    InvariantWindow.name: InvariantWindow,
+}