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

Timestamp:

Mar 10, 2017 9:44:44 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:

cd31251

Parents:

5236449

Message:

QModel items conversion into SasModel? parameters + data display SASVIEW-535

File:

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

src/sas/qtgui/DataExplorer.py

@@ -73 +73 @@
         self.contextMenu()
 
+        # Same menus for the theory view
+        self.freezeView.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
+        self.freezeView.customContextMenuRequested.connect(self.onCustomContextMenu)
+
         # Connect the comboboxes
         self.cbSelect.currentIndexChanged.connect(self.selectData)
 
         #self.closeEvent.connect(self.closeEvent)
-        # self.aboutToQuit.connect(self.closeEvent)
+        self.currentChanged.connect(self.onTabSwitch)
         self.communicator = self.parent.communicator()
         self.communicator.fileReadSignal.connect(self.loadFromURL)
         self.communicator.activeGraphsSignal.connect(self.updateGraphCombo)
         self.communicator.activeGraphName.connect(self.updatePlotName)
-        #self.communicator.updateTheoryFromPerspectiveSignal.connect(self.updateTheoryFromPerspective)
         self.cbgraph.editTextChanged.connect(self.enableGraphCombo)
         self.cbgraph.currentIndexChanged.connect(self.enableGraphCombo)
 
         self._perspective = self.parent.perspective()
-        self._perspective.updateTheoryFromPerspectiveSignal.connect(self.updateTheoryFromPerspective)
 
         # Proxy model for showing a subset of Data1D/Data2D content
@@ -111 +113 @@
         self.enableGraphCombo(None)
 
+        # Current view on model
+        self.current_view = self.treeView
+
     def closeEvent(self, event):
         """
@@ -116 +121 @@
         """
         event.ignore()
+
+    def onTabSwitch(self, index):
+        """ Callback for tab switching signal """
+        if index == 0:
+            self.current_view = self.treeView
+        else:
+            self.current_view = self.freezeView
 
     def displayHelp(self):
@@ -725 +737 @@
         Show the right-click context menu in the data treeview
         """
-        index = self.treeView.indexAt(position)
+        index = self.current_view.indexAt(position)
+        proxy = self.current_view.model()
+        model = proxy.sourceModel()
+
         if index.isValid():
-            model_item = self.model.itemFromIndex(self.data_proxy.mapToSource(index))
+            model_item = model.itemFromIndex(proxy.mapToSource(index))
             # Find the mapped index
             orig_index = model_item.isCheckable()
@@ -736 +751 @@
                 self.actionEditMask.setEnabled(is_2D)
                 # Fire up the menu
-                self.context_menu.exec_(self.treeView.mapToGlobal(position))
+                self.context_menu.exec_(self.current_view.mapToGlobal(position))
 
     def showDataInfo(self):
@@ -742 +757 @@
         Show a simple read-only text edit with data information.
         """
-        index = self.treeView.selectedIndexes()[0]
-        model_item = self.model.itemFromIndex(self.data_proxy.mapToSource(index))
+        index = self.current_view.selectedIndexes()[0]
+        proxy = self.current_view.model()
+        model = proxy.sourceModel()
+        model_item = model.itemFromIndex(proxy.mapToSource(index))
+
         data = GuiUtils.dataFromItem(model_item)
         if isinstance(data, Data1D):
@@ -769 +787 @@
         Save the data points as either txt or xml
         """
-        index = self.treeView.selectedIndexes()[0]
-        model_item = self.model.itemFromIndex(self.data_proxy.mapToSource(index))
+        index = self.current_view.selectedIndexes()[0]
+        proxy = self.current_view.model()
+        model = proxy.sourceModel()
+        model_item = model.itemFromIndex(proxy.mapToSource(index))
+
         data = GuiUtils.dataFromItem(model_item)
         if isinstance(data, Data1D):
@@ -781 +802 @@
         Frozen plot - display an image of the plot
         """
-        index = self.treeView.selectedIndexes()[0]
-        model_item = self.model.itemFromIndex(self.data_proxy.mapToSource(index))
+        index = self.current_view.selectedIndexes()[0]
+        proxy = self.current_view.model()
+        model = proxy.sourceModel()
+        model_item = model.itemFromIndex(proxy.mapToSource(index))
+
         data = GuiUtils.dataFromItem(model_item)
 
@@ -805 +829 @@
         Slowish 3D plot
         """
-        index = self.treeView.selectedIndexes()[0]
-        model_item = self.model.itemFromIndex(self.data_proxy.mapToSource(index))
+        index = self.current_view.selectedIndexes()[0]
+        proxy = self.current_view.model()
+        model = proxy.sourceModel()
+        model_item = model.itemFromIndex(proxy.mapToSource(index))
+
         data = GuiUtils.dataFromItem(model_item)
 
@@ -824 +851 @@
         Mask Editor for 2D plots
         """
-        index = self.treeView.selectedIndexes()[0]
-        model_item = self.model.itemFromIndex(self.data_proxy.mapToSource(index))
+        index = self.current_view.selectedIndexes()[0]
+        proxy = self.current_view.model()
+        model = proxy.sourceModel()
+        model_item = model.itemFromIndex(proxy.mapToSource(index))
+
         data = GuiUtils.dataFromItem(model_item)