Changeset 7d9c83c in sasview


Ignore:
Timestamp:
Oct 20, 2017 7:44:12 AM (21 months ago)
Author:
Piotr Rozyczko <rozyczko@…>
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:
16afe01
Parents:
f331852
Message:

Minor changes to logging and looping in DataOperation? calculator

Location:
src/sas/qtgui
Files:
2 edited

Legend:

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

    r1420066 r7d9c83c  
    272272            if input_to_check is None or input_to_check is '': 
    273273                msg = 'DataOperation: Number requires a float number' 
    274                 logging.info(msg) 
     274                logging.warning(msg) 
    275275                self.txtNumber.setStyleSheet(QtCore.QString(BG_RED)) 
    276276 
     
    278278                # should be check that 0 is not chosen 
    279279                msg = 'DataOperation: Number requires a non zero number' 
    280                 logging.info(msg) 
     280                logging.warning(msg) 
    281281                self.txtNumber.setStyleSheet(QtCore.QString(BG_RED)) 
    282282 
     
    301301                self.cbData2.setStyleSheet(QtCore.QString(BG_RED)) 
    302302                print self.data1.__class__.__name__ != self.data2.__class__.__name__ 
    303                 logging.info('Cannot compute data of different dimensions') 
     303                logging.warning('Cannot compute data of different dimensions') 
    304304                return False 
    305305 
     
    307307                    and (len(self.data2.x) != len(self.data1.x) or 
    308308                             not all(i == j for i, j in zip(self.data1.x, self.data2.x))): 
    309                 logging.info('Cannot compute 1D data of different lengths') 
     309                logging.warning('Cannot compute 1D data of different lengths') 
    310310                self.cbData1.setStyleSheet(QtCore.QString(BG_RED)) 
    311311                self.cbData2.setStyleSheet(QtCore.QString(BG_RED)) 
     
    322322                self.cbData1.setStyleSheet(QtCore.QString(BG_RED)) 
    323323                self.cbData2.setStyleSheet(QtCore.QString(BG_RED)) 
    324                 logging.info('Cannot compute 2D data of different lengths') 
     324                logging.warning('Cannot compute 2D data of different lengths') 
    325325                return False 
    326326 
     
    337337        if name_to_check is None or name_to_check == '': 
    338338            self.txtOutputData.setStyleSheet(QtCore.QString(BG_RED)) 
    339             logging.info('No output name') 
     339            logging.warning('No output name') 
    340340            return False 
    341341 
    342342        elif name_to_check in self.list_data_items: 
    343343            self.txtOutputData.setStyleSheet(QtCore.QString(BG_RED)) 
    344             logging.info('The Output data name already exists') 
     344            logging.warning('The Output data name already exists') 
    345345            return False 
    346346 
     
    375375 
    376376        else: 
    377             logging.info('Error with data format') 
     377            logging.warning('Error with data format') 
    378378            return 
    379379 
  • src/sas/qtgui/MainWindow/DataManager.py

    • Property mode changed from 100755 to 100644
    r1420066 r7d9c83c  
    298298        """ update stored data after deleting files in Data Explorer """ 
    299299        for selected_name in name_list: 
    300             for idx in self.stored_data.keys(): 
     300            # Take the copy of current, possibly shorter stored_data dict 
     301            stored_data = copy.deepcopy(self.stored_data) 
     302            for idx in stored_data.keys(): 
    301303                if str(selected_name) in str(idx): 
    302                     print selected_name, idx 
    303304                    del self.stored_data[idx] 
    304305 
Note: See TracChangeset for help on using the changeset viewer.