Changeset 515c23df in sasview

Timestamp:

Jul 9, 2018 5:17:19 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

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

Children:

d9150d8, 6052c02

Parents:

05fa132

Message:

fixed deleteItem behaviour as per SASVIEW-956 discussion

File:

• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (7 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -30 +30 @@
 
 DEFAULT_PERSPECTIVE = "Fitting"
+
+logger = logging.getLogger(__name__)
 
 class DataExplorerWindow(DroppableDataLoadWidget):
@@ -296 +298 @@
         ind = -1
         # Use 'while' so the row count is forced at every iteration
-        deleted_indices = []
+        deleted_items = []
         deleted_names = []
         while ind < self.model.rowCount():
@@ -305 +307 @@
                 # Delete these rows from the model
                 deleted_names.append(str(self.model.item(ind).text()))
-                deleted_indices.append(item)
+                deleted_items.append(item)
 
                 self.model.removeRow(ind)
@@ -312 +314 @@
 
         # Let others know we deleted data
-        self.communicator.dataDeletedSignal.emit(deleted_indices)
+        self.communicator.dataDeletedSignal.emit(deleted_items)
 
         # update stored_data
@@ -1027 +1029 @@
         model = proxy.sourceModel()
 
-        deleted_indices = []
+        deleted_items = []
         deleted_names = []
 
@@ -1042 +1044 @@
 
                 # store the deleted item details so we can pass them on later
-                deleted_names.append(str(self.model.item(row).text()))
-                deleted_indices.append(self.model.item(row))
+                deleted_names.append(item_to_delete.text())
+                deleted_items.append(item_to_delete)
 
                 if item_to_delete.parent():
@@ -1054 +1056 @@
 
         # Let others know we deleted data
-        self.communicator.dataDeletedSignal.emit(deleted_indices)
+        self.communicator.dataDeletedSignal.emit(deleted_items)
 
         # update stored_data