Changeset 63467b6 in sasview for src/sas/qtgui/MainWindow

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.

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (2 diffs)
• UnitTesting/MainWindowTest.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)