Changeset 1970780 in sasview for src/sas/qtgui/DataExplorer.py

Timestamp:

Apr 9, 2017 5:33:01 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:

9208346

Parents:

71361f0

Message:

Add display of orientational parameters + minor refactoring

File:

• src/sas/qtgui/DataExplorer.py (modified) (7 diffs)

src/sas/qtgui/DataExplorer.py

@@ -24 +24 @@
 from sas.qtgui.DroppableDataLoadWidget import DroppableDataLoadWidget
 from sas.qtgui.MaskEditor import MaskEditor
+
+import Perspectives
 
 class DataExplorerWindow(DroppableDataLoadWidget):
@@ -91 +93 @@
         self.cbgraph.currentIndexChanged.connect(self.enableGraphCombo)
 
-        self._perspective = self.parent.perspective()
-
         # Proxy model for showing a subset of Data1D/Data2D content
         self.data_proxy = QtGui.QSortFilterProxyModel(self)
@@ -151 +151 @@
         Populate the Perspective combobox and define callbacks
         """
+        available_perspectives = sorted([p for p in Perspectives.PERSPECTIVES.keys()])
+        if available_perspectives:
+            self.cbFitting.clear()
+            self.cbFitting.addItems(available_perspectives)
         self.cbFitting.currentIndexChanged.connect(self.updatePerspectiveCombo)
         # Set the index so we see the default (Fitting)
         self.updatePerspectiveCombo(0)
+
+    def _perspective(self):
+        """
+        Returns the current perspective
+        """
+        return self.parent.perspective()
 
     def loadFromURL(self, url):
@@ -313 +323 @@
         Send selected item data to the current perspective and set the relevant notifiers
         """
-        # should this reside on GuiManager or here?
-        self._perspective = self.parent.perspective()
-
         # Set the signal handlers
         self.communicator.updateModelFromPerspectiveSignal.connect(self.updateModelFromPerspective)
@@ -332 +339 @@
 
         # Which perspective has been selected?
-        if len(selected_items) > 1 and not self._perspective.allowBatch():
-            msg = self._perspective.title() + " does not allow multiple data."
+        if len(selected_items) > 1 and not self._perspective().allowBatch():
+            msg = self._perspective().title() + " does not allow multiple data."
             msgbox = QtGui.QMessageBox()
             msgbox.setIcon(QtGui.QMessageBox.Critical)
@@ -342 +349 @@
 
         # Notify the GuiManager about the send request
-        self._perspective.setData(data_item=selected_items)
+        self._perspective().setData(data_item=selected_items)
 
     def freezeTheory(self, event):
@@ -424 +431 @@
         """
         self.communicator.perspectiveChangedSignal.emit(self.cbFitting.currentText())
+        self.chkBatch.setEnabled(self.parent.perspective().allowBatch())
 
     def newPlot(self):