Changeset b9e89d5 in sasview

Timestamp:

Apr 16, 2018 10:05:41 AM (7 years ago)

Author:

krzywon

Branches:

ESS_GUI, ESS_GUI_Docs, 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:

318b353e

Parents:

76567bb

Message:

Use communicator to delete data from Inversion perspective when deleted from data display.

File:

• src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py (modified) (5 diffs)

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -19 +19 @@
 # Batch calculation display
 from sas.qtgui.Utilities.GridPanel import BatchInversionOutputPanel
+
 
 def is_float(value):
@@ -27 +28 @@
         return 0.0
 
+
 NUMBER_OF_TERMS = 10
 REGULARIZATION = 0.0001
@@ -34 +36 @@
 
 
-# TODO: Use communicator to catch data deletions
 # TODO: Update help with batch capabilities
 class InversionWindow(QtWidgets.QDialog, Ui_PrInversion):
@@ -53 +54 @@
 
         self._manager = parent
-        self.communicate = GuiUtils.Communicate()
+        self.communicate = parent.communicator()
+        self.communicate.dataDeletedSignal.connect(self.removeData)
 
         self.logic = InversionLogic()
@@ -500 +502 @@
         self.enableButtons()
 
-    def removeData(self):
+    def removeData(self, data_list=None):
         """Remove the existing data reference from the P(r) Persepective"""
         if self.dmaxWindow is not None:
             self.dmaxWindow.close()
             self.dmaxWindow = None
-        self._data_list.pop(self._data)
+        if not data_list:
+            data_list = [self._data]
+        for data in data_list:
+            self._data_list.pop(data)
         self._data = None
-        self.dataList.removeItem(self.dataList.currentIndex())
+        for index in range(0, len(self.dataList)):
+            if self.dataList.itemData(index) in data_list:
+                self.dataList.removeItem(index)
         # Last file removed
         if len(self._data_list) == 0: