Changeset 63467b6 in sasview for src/sas/qtgui/Utilities/GuiUtils.py

Timestamp:

Sep 27, 2018 2:20:24 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

4f8c17f

Parents:

dce68f6

Message:

Improved handling of 2d plot children. Refactored model tree search.

File:

• src/sas/qtgui/Utilities/GuiUtils.py (modified) (2 diffs)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -500 +500 @@
     return plot_data
 
+def getChildrenFromItem(root):
+    """
+    Recursively go down the model item looking for all children
+    """
+    def recurse(parent):
+        for row in range(parent.rowCount()):
+            for column in range(parent.columnCount()):
+                child = parent.child(row, column)
+                yield child
+                if child.hasChildren():
+                    yield from recurse(child)
+    if root is not None:
+        yield from recurse(root)
+
 def plotsFromCheckedItems(model_item):
     """
@@ -507 +521 @@
 
     plot_data = []
+
     # Iterate over model looking for items with checkboxes
     for index in range(model_item.rowCount()):
         item = model_item.item(index)
-
-        # Going 1 level deeper only
-        for index_2 in range(item.rowCount()):
-            item_2 = item.child(index_2)
-            if item_2 and item_2.isCheckable() and item_2.checkState() == QtCore.Qt.Checked:
-                # TODO: assure item type is correct (either data1/2D or Plotter)
-                plot_data.append((item_2, item_2.child(0).data()))
-
-        if item.isCheckable() and item.checkState() == QtCore.Qt.Checked:
-            # TODO: assure item type is correct (either data1/2D or Plotter)
-            plot_data.append((item, item.child(0).data()))
+        if item and item.isCheckable() and item.checkState() == QtCore.Qt.Checked:
+            data = item.child(0).data()
+            plot_data.append((item, data))
+
+        items = list(getChildrenFromItem(item))
+
+        for it in items:
+            if it.isCheckable() and it.checkState() == QtCore.Qt.Checked:
+                data = it.child(0).data()
+                plot_data.append((it, data))
 
     return plot_data