Changeset 8548d739 in sasview

Timestamp:

Nov 29, 2016 6:08:29 AM (8 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 06:04:46)

git-committer:

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

Message:

Further work on the main QStandardItemModel

Location:

src/sas/qtgui

Files:

• DataExplorer.py (modified) (9 diffs)
• GuiUtils.py (modified) (3 diffs)
• Perspectives/Invariant/InvariantPerspective.py (modified) (3 diffs)
• UnitTesting/GuiUtilsTest.py (modified) (2 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

src/sas/qtgui/GuiUtils.py

@@ -230 +230 @@
 
 
-def updateModelItem(item, update_data, name=""):
+def updateModelItemWithPlot(item, update_data, name=""):
     """
     Adds a checkboxed row named "name" to QStandardItem
@@ -264 +264 @@
     # Append the new row to the main item
     item.appendRow(checkbox_item)
+
+def updateModelItem(item, update_data, name=""):
+    """
+    Adds a simple named child to QStandardItem
+    """
+    assert isinstance(item, QtGui.QStandardItem)
+    assert isinstance(update_data, list)
+
+    # Add the actual Data1D/Data2D object
+    object_item = QtGui.QStandardItem()
+    object_item.setText(name)
+    object_item.setData(QtCore.QVariant(update_data))
+
+    # Append the new row to the main item
+    item.appendRow(object_item)
+
 
 def plotsFromCheckedItems(model_item):
@@ -564 +580 @@
         except:
             pass
+
+def dataFromItem(item):
+    """
+    Retrieve Data1D/2D component from QStandardItem.
+    The assumption - data stored in SasView standard, in child 0
+    """
+    return item.child(0).data().toPyObject()

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

@@ -275 +275 @@
 
             # This needs to run in the main thread
-            reactor.callFromThread(GuiUtils.updateModelItem, self._model_item, variant_item, title)
+            reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
+                    self._model_item, variant_item, title)
 
         if self._high_extrapolate:
@@ -297 +298 @@
             variant_item = QtCore.QVariant(high_out_data)
             # This needs to run in the main thread
-            reactor.callFromThread(GuiUtils.updateModelItem, self._model_item, variant_item, title)
+            reactor.callFromThread(GuiUtils.updateModelItemWithPlot,
+                    self._model_item, variant_item, title)
 
         item = QtGui.QStandardItem(str(float('%.5g'% volume_fraction)))
@@ -531 +533 @@
 
         # Extract data on 1st child - this is the Data1D/2D component
-        data = self._model_item.child(0).data().toPyObject()
+        data = GuiUtils.dataFromItem(self._model_item)
         self.model.item(WIDGETS.W_FILENAME).setData(QtCore.QVariant(self._model_item.text()))
 

src/sas/qtgui/UnitTesting/GuiUtilsTest.py

@@ -73 +73 @@
             self.assertIn(signal, dir(com))
 
-
-    def testUpdateModelItem(self):
-        """
-        Test the QModelItem update method
+    def testupdateModelItem(self):
+        """
+        Test the generic QModelItem update method
+        """
+        test_item = QtGui.QStandardItem()
+        test_list = ['aa', 4, True, ]
+        name = "Black Sabbath"
+
+        # update the item
+        updateModelItem(test_item, test_list, name)
+
+        # Make sure test_item got all data added
+        self.assertEqual(test_item.child(0).text(), name)
+        list_from_item = test_item.child(0).data().toList()
+        self.assertIsInstance(list_from_item, list)
+        self.assertEqual(list_from_item[0].toPyObject(), test_list[0])
+        self.assertEqual(list_from_item[1].toPyObject(), test_list[1])
+        self.assertEqual(list_from_item[2].toPyObject(), test_list[2])
+
+    def testupdateModelItemWithPlot(self):
+        """
+        Test the QModelItem checkbox update method
         """
         test_item = QtGui.QStandardItem()
@@ -84 +102 @@
 
         # update the item
-        updateModelItem(test_item, update_data, name)
+        updateModelItemWithPlot(test_item, update_data, name)
         
         # Make sure test_item got all data added