Changeset 63467b6 in sasview

Timestamp:

Sep 27, 2018 4: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.

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (2 diffs)
• MainWindow/UnitTesting/MainWindowTest.py (modified) (1 diff)
• Plotting/Plotter2D.py (modified) (1 diff)
• Plotting/Slicers/AnnulusSlicer.py (modified) (1 diff)
• Plotting/Slicers/BoxSlicer.py (modified) (1 diff)
• Plotting/Slicers/SectorSlicer.py (modified) (1 diff)
• Utilities/GuiUtils.py (modified) (2 diffs)
• Utilities/UnitTesting/GuiUtilsTest.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -950 +950 @@
 
         types = (None, Data1D, Data2D)
-        assert dimension in types
+        if not dimension in types:
+            return
 
         for index in range(model.rowCount()):
             item = model.item(index)
-            if dimension is not None and not isinstance(GuiUtils.dataFromItem(item), dimension):
-                continue
             if item.isCheckable() and item.checkState() != mode:
-                item.setCheckState(mode)
-            # look for all children
-            for inner_index in range(item.rowCount()):
-                child = item.child(inner_index)
-                if child.isCheckable() and child.checkState() != mode:
-                    child.setCheckState(mode)
+                data = item.child(0).data()
+                if dimension is None or isinstance(data, dimension):
+                    item.setCheckState(mode)
+
+            items = list(GuiUtils.getChildrenFromItem(item))
+
+            for it in items:
+                if it.isCheckable() and it.checkState() != mode:
+                    data = it.child(0).data()
+                    if dimension is None or isinstance(data, dimension):
+                        it.setCheckState(mode)
 
     def selectData(self, index):
@@ -1414 +1418 @@
         current_tab_name = model_item.text()
         for current_index in range(self.theory_model.rowCount()):
-            #if current_tab_name in self.theory_model.item(current_index).text():
             if current_tab_name == self.theory_model.item(current_index).text():
                 self.theory_model.removeRow(current_index)
                 break
-
         # send in the new item
         self.theory_model.appendRow(model_item)

src/sas/qtgui/MainWindow/UnitTesting/MainWindowTest.py

@@ -54 +54 @@
         tmp_main.guiManager.showWelcomeMessage()
         # Assure it is visible and a part of the MdiArea
-        self.assertTrue(tmp_main.guiManager.welcomePanel.isVisible())
         self.assertEqual(len(tmp_main.workspace.subWindowList()), 2)
 

src/sas/qtgui/Plotting/Plotter2D.py

@@ -284 +284 @@
         new_plot.id = "Circ avg " + self.data.name
         new_plot.is_data = True
-        GuiUtils.updateModelItemWithPlot(self._item, new_plot, new_plot.id)
+        if self._item.parent() is not None:
+            item = self._item.parent()
+        GuiUtils.updateModelItemWithPlot(item, new_plot, new_plot.id)
 
         self.manager.communicator.plotUpdateSignal.emit([new_plot])

src/sas/qtgui/Plotting/Slicers/AnnulusSlicer.py

@@ -143 +143 @@
         new_plot.xtransform = "x"
         new_plot.ytransform = "y"
-        GuiUtils.updateModelItemWithPlot(self._item, new_plot, new_plot.id)
+        item = self._item
+        if self._item.parent() is not None:
+            item = self._item.parent()
+        GuiUtils.updateModelItemWithPlot(item, new_plot, new_plot.id)
         self.base.manager.communicator.plotUpdateSignal.emit([new_plot])
 

src/sas/qtgui/Plotting/Slicers/BoxSlicer.py

@@ -188 +188 @@
         new_plot.id = (self.averager.__name__) + self.base.data.name
         new_plot.is_data = True
-        GuiUtils.updateModelItemWithPlot(self._item, new_plot, new_plot.id)
+        if self._item.parent() is not None:
+            item = self._item.parent()
+        GuiUtils.updateModelItemWithPlot(item, new_plot, new_plot.id)
 
         if self.update_model:

src/sas/qtgui/Plotting/Slicers/SectorSlicer.py

@@ -167 +167 @@
         new_plot.id = "SectorQ" + self.base.data.name
         new_plot.is_data = True
-        GuiUtils.updateModelItemWithPlot(self._item, new_plot, new_plot.id)
+        if self._item.parent() is not None:
+            item = self._item.parent()
+        GuiUtils.updateModelItemWithPlot(item, new_plot, new_plot.id)
 
         self.base.manager.communicator.plotUpdateSignal.emit([new_plot])

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

src/sas/qtgui/Utilities/UnitTesting/GuiUtilsTest.py

@@ -195 +195 @@
         # Make sure only the checked data is present
         # FRIDAY IN
-        self.assertIn(test_list0, plot_list[1])
+        self.assertIn(test_list0, plot_list[0])
         # SATURDAY IN
-        self.assertIn(test_list1, plot_list[0])
+        self.assertIn(test_list1, plot_list[1])
         # MONDAY NOT IN
         self.assertNotIn(test_list2, plot_list[0])