Changes in / [d84bc69:dba6e57] in sasview

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (3 diffs)
• GuiManager.py (modified) (6 diffs)
• GuiUtils.py (modified) (1 diff)
• Perspectives/Fitting/Fitting.py (added)
• Perspectives/Fitting/FittingPerspective.py (deleted)
• Perspectives/Fitting/UI/FittingUI.ui (deleted)
• Perspectives/Fitting/UI/__init__.py (deleted)
• Perspectives/Fitting/UI/convert_ui.sh (deleted)
• Perspectives/Fitting/UI/fitting.ui (added)
• Perspectives/Fitting/__init__.py (deleted)
• 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)
@@ -128 +125 @@
         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):
@@ -400 +389 @@
             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
 
@@ -100 +98 @@
                                               "_downloads",
                                               "Tutorial.pdf"))
-        # Current displayed perspective
-        self._current_perspective = None
-
-        # Invoke the initial perspective
-        self.perspectiveChanged("Fitting")
+
+        #==========================================================
+        # TEMP PROTOTYPE
+        # Add InvariantWindow to the workspace.
+        self.invariantWidget = InvariantWindow(self)
+        self._workspace.workspace.addWindow(self.invariantWidget)
+
+        # Default perspective
+        self._current_perspective = self.invariantWidget
 
     def addWidgets(self):
@@ -118 +120 @@
         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)
@@ -142 +143 @@
         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):
@@ -334 +322 @@
         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/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)
@@ -103 +102 @@
         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,
-}