Changeset 6ff103a in sasview

Timestamp:

Jul 12, 2018 8:38:48 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

18f11a6

Parents:

d0528c4

Message:

CR: Deleting a single dataitem child will close the corresponding plot (SASVIEW-958)

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (1 diff)
• Utilities/GuiUtils.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -496 +496 @@
         # Now query the model item for available plots
         plots = GuiUtils.plotsFromFilename(filename, model)
-        item = GuiUtils.itemFromFilename(filename, model)
 
         new_plots = []
-        for plot in plots:
+        for item, plot in plots.items():
             plot_id = plot.id
             if plot_id in list(self.active_plots.keys()):

src/sas/qtgui/Utilities/GuiUtils.py

@@ -415 +415 @@
     assert isinstance(filename, str)
 
-    plot_data = []
+    plot_data = {}
     # Iterate over model looking for named items
     for index in range(model_item.rowCount()):
@@ -421 +421 @@
         if str(item.text()) == filename:
             # TODO: assure item type is correct (either data1/2D or Plotter)
-            plot_data.append(item.child(0).data())
+            plot_data[item] = item.child(0).data()
             # Going 1 level deeper only
             for index_2 in range(item.rowCount()):
@@ -427 +427 @@
                 if item_2 and item_2.isCheckable():
                     # TODO: assure item type is correct (either data1/2D or Plotter)
-                    plot_data.append(item_2.child(0).data())
+                    plot_data[item_2] = item_2.child(0).data()
 
     return plot_data