Changeset 8548d739 in sasview for src/sas/qtgui/DataExplorer.py

Timestamp:

Nov 29, 2016 8:08:29 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:

ded2ce3

Parents:

adf81b8

git-author:

Piotr Rozyczko <rozyczko@…> (11/29/16 08:04:46)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/29/16 08:08:29)

Message:

Further work on the main QStandardItemModel

File:

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

src/sas/qtgui/DataExplorer.py

@@ -23 +23 @@
 from sas.qtgui.Plotter2D import Plotter2D
 from sas.qtgui.DroppableDataLoadWidget import DroppableDataLoadWidget
-
-# This is how to get data1/2D from the model item
-# data = [selected_items[0].child(0).data().toPyObject()]
 
 class DataExplorerWindow(DroppableDataLoadWidget):
@@ -629 +626 @@
 
                 try:
-                    is1D = isinstance(item.child(0).data().toPyObject(), Data1D)
+                    is1D = isinstance(GuiUtils.dataFromItem(item), Data1D)
                 except AttributeError:
                     msg = "Bad structure of the data model."
@@ -643 +640 @@
 
                 try:
-                    is1D = isinstance(item.child(0).data().toPyObject(), Data1D)
+                    is1D = isinstance(GuiUtils.dataFromItem(item), Data1D)
                 except AttributeError:
                     msg = "Bad structure of the data model."
@@ -657 +654 @@
                 item.setCheckState(QtCore.Qt.Unchecked)
                 try:
-                    is2D = isinstance(item.child(0).data().toPyObject(), Data2D)
+                    is2D = isinstance(GuiUtils.dataFromItem(item), Data2D)
                 except AttributeError:
                     msg = "Bad structure of the data model."
@@ -671 +668 @@
 
                 try:
-                    is2D = isinstance(item.child(0).data().toPyObject(), Data2D)
+                    is2D = isinstance(GuiUtils.dataFromItem(item), Data2D)
                 except AttributeError:
                     msg = "Bad structure of the data model."
@@ -715 +712 @@
             if orig_index:
                 # Check the data to enable/disable actions
-                is_2D = isinstance(model_item.child(0).data().toPyObject(), Data2D)
+                is_2D = isinstance(GuiUtils.dataFromItem(model_item), Data2D)
                 self.actionQuick3DPlot.setEnabled(is_2D)
                 self.actionEditMask.setEnabled(is_2D)
@@ -727 +724 @@
         index = self.treeView.selectedIndexes()[0]
         model_item = self.model.itemFromIndex(self.data_proxy.mapToSource(index))
-        data = model_item.child(0).data().toPyObject()
+        data = GuiUtils.dataFromItem(model_item)
         if isinstance(data, Data1D):
             text_to_show = GuiUtils.retrieveData1d(data)
@@ -754 +751 @@
         index = self.treeView.selectedIndexes()[0]
         model_item = self.model.itemFromIndex(self.data_proxy.mapToSource(index))
-        data = model_item.child(0).data().toPyObject()
+        data = GuiUtils.dataFromItem(model_item)
         if isinstance(data, Data1D):
             GuiUtils.saveData1D(data)
@@ -766 +763 @@
         index = self.treeView.selectedIndexes()[0]
         model_item = self.model.itemFromIndex(self.data_proxy.mapToSource(index))
-        data = model_item.child(0).data().toPyObject()
+        data = GuiUtils.dataFromItem(model_item)
 
         dimension = 1 if isinstance(data, Data1D) else 2