Changeset 1420066 in sasview


Ignore:
Timestamp:
Oct 19, 2017 12:40:53 PM (5 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:
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

    r0c468bf r1420066  
    122122        """ Close dialog """ 
    123123        self.onReset() 
     124 
     125        self.cbData1.clear() 
     126        self.cbData1.addItems(['No Data Available']) 
     127        self.cbData2.clear() 
     128        self.cbData2.addItems(['No Data Available']) 
    124129        self.close() 
     130 
    125131 
    126132    def onCompute(self): 
  • src/sas/qtgui/MainWindow/DataExplorer.py

    rf0bb711 r1420066  
    281281        # Use 'while' so the row count is forced at every iteration 
    282282        deleted_indices = [] 
    283         # deleted_names = [] 
     283        deleted_names = [] 
    284284        while ind < self.model.rowCount(): 
    285285            ind += 1 
     
    288288            if item and item.isCheckable() and item.checkState() == QtCore.Qt.Checked: 
    289289                # Delete these rows from the model 
    290                 # deleted_names.append(self.model.item(ind).text()) 
     290                deleted_names.append(str(self.model.item(ind).text())) 
    291291                deleted_indices.append(item) 
    292292 
     
    299299 
    300300        # update stored_data 
    301         # self.manager.delete_by_name(deleted_names) 
    302  
     301        self.manager.update_stored_data(deleted_names) 
    303302 
    304303    def deleteTheory(self, event): 
  • src/sas/qtgui/MainWindow/DataManager.py

    rf0bb711 r1420066  
    295295                    del self.stored_data[id] 
    296296 
     297    def update_stored_data(self, name_list=None): 
     298        """ update stored data after deleting files in Data Explorer """ 
     299        for selected_name in name_list: 
     300            for idx in self.stored_data.keys(): 
     301                if str(selected_name) in str(idx): 
     302                    print selected_name, idx 
     303                    del self.stored_data[idx] 
     304 
    297305    def get_data_state(self, data_id): 
    298306        """ 
Note: See TracChangeset for help on using the changeset viewer.