Changeset b1a7a81 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Jul 5, 2018 11:03:11 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:

f0a8f74

Parents:

e20870bc

Message:

fixed selected dataset deletion (see SASVIEW-956)

File:

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

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -1012 +1012 @@
         """
         # Assure this is indeed wanted
-        delete_msg = "This operation will delete the selected data sets." +\
+        delete_msg = "This operation will delete the selected data sets " +\
+                     "and all the dependents." +\
                      "\nDo you want to continue?"
         reply = QtWidgets.QMessageBox.question(self,
@@ -1023 +1024 @@
             return
 
-        indices = self.current_view.selectedIndexes()
         proxy = self.current_view.model()
         model = proxy.sourceModel()
 
-        for index in indices:
+        deleted_indices = []
+        deleted_names = []
+
+        # Every time a row is removed, the indices change, so we'll just remove
+        # rows and keep calling selectedIndexes until it returns an empty list.
+        indices = self.current_view.selectedIndexes()
+
+        while len(indices) > 0:
+            index = indices[0]
             row_index = proxy.mapToSource(index)
             item_to_delete = model.itemFromIndex(row_index)
             if item_to_delete and item_to_delete.isCheckable():
                 row = row_index.row()
+
+                # 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))
+
                 if item_to_delete.parent():
                     # We have a child item - delete from it
@@ -1038 +1051 @@
                     # delete directly from model
                     model.removeRow(row)
-        pass
+            indices = self.current_view.selectedIndexes()
+
+        # Let others know we deleted data
+        self.communicator.dataDeletedSignal.emit(deleted_indices)
+
+        # update stored_data
+        self.manager.update_stored_data(deleted_names)
 
     def onAnalysisUpdate(self, new_perspective=""):