Changeset 044454d in sasview for src/sas/qtgui

Timestamp:

Apr 19, 2018 12:35:46 PM (6 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:

0662f53

Parents:

917eba5

Message:

Fix issues deleting from p(r) when data deleted in data manager.

File:

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

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

@@ -86 +86 @@
             for datum in data_list:
                 self.updateDataList(datum)
+
+        self.dataDeleted = False
 
         self.enableButtons()
@@ -318 +320 @@
     def displayChange(self, data_index=0):
         """Switch to another item in the data list"""
+        if self.dataDeleted:
+            return
         self.updateDataList(self._data)
         self.setCurrentData(self.dataList.itemData(data_index))
@@ -512 +516 @@
             title = self.dataPlot.name
             GuiUtils.updateModelItemWithPlot(self._data, self.dataPlot, title)
-            self.communicate.plotRequestedSignal.emit(
-                [self.dataPlot, self.logic.data])
+            self.communicate.plotRequestedSignal.emit([self.dataPlot])
         self.enableButtons()
 
     def removeData(self, data_list=None):
         """Remove the existing data reference from the P(r) Persepective"""
+        self.dataDeleted = True
         if not data_list:
             data_list = [self._data]
@@ -523 +527 @@
         for data in data_list:
             self._dataList.pop(data)
-            data_file = GuiUtils.dataFromItem(data)
-            self.batchResults.pop(data_file.filename)
         self._data = None
-        for index in range(0, len(self.dataList)):
+        length = len(self.dataList)
+        for index in reversed(range(length)):
             if self.dataList.itemData(index) in data_list:
                 self.dataList.removeItem(index)
         # Last file removed
+        self.dataDeleted = False
         if len(self._dataList) == 0:
             self.prPlot = None