Changes in src/sas/qtgui/Utilities/GuiUtils.py [5d28d6b:9ce69ec] in sasview

File:

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

src/sas/qtgui/Utilities/GuiUtils.py

@@ -322 +322 @@
     assert isinstance(item, QtGui.QStandardItem)
 
+    # lists of plots names/ids for all deletable plots on item
     names = [p.name for p in new_plots if p.name is not None]
     ids = [p.id for p in new_plots if p.id is not None]
@@ -329 +330 @@
     for index in range(item.rowCount()):
         plot_item = item.child(index)
-        if plot_item.isCheckable():
-            plot_data = plot_item.child(0).data()
-            if (plot_data.id is not None) and (plot_data.id not in ids) and (plot_data.name not in names):
-                items_to_delete.append(plot_item)
+        if not plot_item.isCheckable():
+            continue
+        plot_data = plot_item.child(0).data()
+        if (plot_data.id is not None) and \
+            (plot_data.id not in ids) and \
+            (plot_data.name not in names) and \
+            (plot_data.plot_role == Data1D.ROLE_DELETABLE):
+            items_to_delete.append(plot_item)
 
     for plot_item in items_to_delete:
@@ -562 +567 @@
     The assumption - data stored in SasView standard, in child 0
     """
-    return item.child(0).data()
+    try:
+        data = item.child(0).data()
+    except AttributeError:
+        data = None
+    return data
 
 def openLink(url):