Changeset 1420066 in sasview

Timestamp:

Oct 19, 2017 12:40:53 PM (7 years ago)

Author:

celinedurniak <celine.durniak@…>

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:

fca1f50

Parents:

0c468bf

Message:

Corrected problem with update of loaded files in Data Operation Panel (ESS-GUI-SasView245)

Location:

src/sas/qtgui

Files:

• Calculators/DataOperationUtilityPanel.py (modified) (1 diff)
• MainWindow/DataExplorer.py (modified) (3 diffs)
• MainWindow/DataManager.py (modified) (1 diff)

src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

@@ -122 +122 @@
         """ Close dialog """
         self.onReset()
+
+        self.cbData1.clear()
+        self.cbData1.addItems(['No Data Available'])
+        self.cbData2.clear()
+        self.cbData2.addItems(['No Data Available'])
         self.close()
+
 
     def onCompute(self):

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -281 +281 @@
         # Use 'while' so the row count is forced at every iteration
         deleted_indices = []
-        # deleted_names = []
+        deleted_names = []
         while ind < self.model.rowCount():
             ind += 1
@@ -288 +288 @@
             if item and item.isCheckable() and item.checkState() == QtCore.Qt.Checked:
                 # Delete these rows from the model
-                # deleted_names.append(self.model.item(ind).text())
+                deleted_names.append(str(self.model.item(ind).text()))
                 deleted_indices.append(item)
 
@@ -299 +299 @@
 
         # update stored_data
-        # self.manager.delete_by_name(deleted_names)
-
+        self.manager.update_stored_data(deleted_names)
 
     def deleteTheory(self, event):

src/sas/qtgui/MainWindow/DataManager.py

@@ -295 +295 @@
                     del self.stored_data[id]
 
+    def update_stored_data(self, name_list=None):
+        """ update stored data after deleting files in Data Explorer """
+        for selected_name in name_list:
+            for idx in self.stored_data.keys():
+                if str(selected_name) in str(idx):
+                    print selected_name, idx
+                    del self.stored_data[idx]
+
     def get_data_state(self, data_id):
         """