Changeset 7d9c83c in sasview

Timestamp:

Oct 20, 2017 5:44:12 AM (7 years 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:

• Calculators/DataOperationUtilityPanel.py (modified) (7 diffs)
• MainWindow/DataManager.py (modified) (1 diff, 1 prop)

src/sas/qtgui/Calculators/DataOperationUtilityPanel.py

@@ -272 +272 @@
             if input_to_check is None or input_to_check is '':
                 msg = 'DataOperation: Number requires a float number'
-                logging.info(msg)
+                logging.warning(msg)
                 self.txtNumber.setStyleSheet(QtCore.QString(BG_RED))
 
@@ -278 +278 @@
                 # should be check that 0 is not chosen
                 msg = 'DataOperation: Number requires a non zero number'
-                logging.info(msg)
+                logging.warning(msg)
                 self.txtNumber.setStyleSheet(QtCore.QString(BG_RED))
 
@@ -301 +301 @@
                 self.cbData2.setStyleSheet(QtCore.QString(BG_RED))
                 print self.data1.__class__.__name__ != self.data2.__class__.__name__
-                logging.info('Cannot compute data of different dimensions')
+                logging.warning('Cannot compute data of different dimensions')
                 return False
 
@@ -307 +307 @@
                     and (len(self.data2.x) != len(self.data1.x) or
                              not all(i == j for i, j in zip(self.data1.x, self.data2.x))):
-                logging.info('Cannot compute 1D data of different lengths')
+                logging.warning('Cannot compute 1D data of different lengths')
                 self.cbData1.setStyleSheet(QtCore.QString(BG_RED))
                 self.cbData2.setStyleSheet(QtCore.QString(BG_RED))
@@ -322 +322 @@
                 self.cbData1.setStyleSheet(QtCore.QString(BG_RED))
                 self.cbData2.setStyleSheet(QtCore.QString(BG_RED))
-                logging.info('Cannot compute 2D data of different lengths')
+                logging.warning('Cannot compute 2D data of different lengths')
                 return False
 
@@ -337 +337 @@
         if name_to_check is None or name_to_check == '':
             self.txtOutputData.setStyleSheet(QtCore.QString(BG_RED))
-            logging.info('No output name')
+            logging.warning('No output name')
             return False
 
         elif name_to_check in self.list_data_items:
             self.txtOutputData.setStyleSheet(QtCore.QString(BG_RED))
-            logging.info('The Output data name already exists')
+            logging.warning('The Output data name already exists')
             return False
 
@@ -375 +375 @@
 
         else:
-            logging.info('Error with data format')
+            logging.warning('Error with data format')
             return
 

src/sas/qtgui/MainWindow/DataManager.py

@@ -298 +298 @@
         """ update stored data after deleting files in Data Explorer """
         for selected_name in name_list:
-            for idx in self.stored_data.keys():
+            # Take the copy of current, possibly shorter stored_data dict
+            stored_data = copy.deepcopy(self.stored_data)
+            for idx in stored_data.keys():
                 if str(selected_name) in str(idx):
-                    print selected_name, idx
                     del self.stored_data[idx]