Changeset c155a16 in sasview for src/sas/sasgui/perspectives/invariant

Timestamp:

Apr 4, 2017 12:06:27 PM (7 years ago)

Author:

Ricardo Ferraz Leal <ricleal@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

463e7ffc

Parents:

6722fae

Message:

Logging is now logger

Location:

src/sas/sasgui/perspectives/invariant

Files:

• invariant.py (modified) (3 diffs)
• invariant_panel.py (modified) (10 diffs)
• invariant_state.py (modified) (3 diffs)
• report_dialog.py (modified) (2 diffs)

src/sas/sasgui/perspectives/invariant/invariant.py

@@ -27 +27 @@
 from sas.sasgui.guiframe.plugin_base import PluginBase
 
+logger = logging.getLogger()
+
 class Plugin(PluginBase):
     """
@@ -46 +48 @@
 
         # Log startup
-        logging.info("Invariant plug-in started")
+        logger.info("Invariant plug-in started")
 
     def get_data(self):
@@ -280 +282 @@
 
         except:
-            logging.error("invariant.set_state: %s" % sys.exc_value)
+            logger.error("invariant.set_state: %s" % sys.exc_value)
 
     def on_set_state_helper(self, event=None):

src/sas/sasgui/perspectives/invariant/invariant_panel.py

@@ -24 +24 @@
 from sas.sasgui.guiframe.panel_base import PanelBase
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
+
+logger = logging.getLogger()
 
 # The minimum q-value to be used when extrapolating
@@ -460 +462 @@
                 self._manager.plot_theory(name="Low-Q extrapolation")
             except:
-                logging.error(sys.exc_value)
+                logger.error(sys.exc_value)
 
     def get_high_qstar(self, inv, high_q=False):
@@ -494 +496 @@
                 self._manager.plot_theory(name="High-Q extrapolation")
             except:
-                logging.error(sys.exc_value)
+                logger.error(sys.exc_value)
 
     def get_qstar(self, inv):
@@ -845 +847 @@
             attr.SetValue(value)
         except:
-            logging.error("Invariant state: %s", sys.exc_value)
+            logger.error("Invariant state: %s", sys.exc_value)
 
     def get_bookmark_by_num(self, num=None):
@@ -862 +864 @@
             _, _, current_state, comp_state = self.state.bookmark_list[int(num)]
         except:
-            logging.error(sys.exc_value)
+            logger.error(sys.exc_value)
             raise ValueError, "No such bookmark exists"
 
@@ -957 +959 @@
                     self.state.clone_state()
         except:
-            logging.error(sys.exc_value)
+            logger.error(sys.exc_value)
 
         self._set_undo_flag(True)
@@ -1001 +1003 @@
                 del self.state.state_list[str(i)]
             except:
-                logging.error(sys.exc_value)
+                logger.error(sys.exc_value)
         # Enable the undo button if it was not
         self._set_undo_flag(True)
@@ -1066 +1068 @@
                 del self.state.state_list[str(i)]
             except:
-                logging.error(sys.exc_value)
+                logger.error(sys.exc_value)
 
         # try to add new state of the text changes in the state_list
@@ -1081 +1083 @@
             self.state.state_list[str(self.state.state_num)] = self.state.clone_state()
         except:
-            logging.error(sys.exc_value)
+            logger.error(sys.exc_value)
 
         self._set_undo_flag(True)
@@ -1103 +1105 @@
             self.state.state_list[str(self.state.state_num)] = self.state.clone_state()
         except:
-            logging.error(sys.exc_value)
+            logger.error(sys.exc_value)
 
     def _get_input_list(self):

src/sas/sasgui/perspectives/invariant/invariant_state.py

@@ -16 +16 @@
 from sas.sasgui.guiframe.gui_style import GUIFRAME_ID
 from sas.sasgui.guiframe.dataFitting import Data1D
+
+logger = logging.getLogger()
 
 INVNODE_NAME = 'invariant'
@@ -381 +383 @@
                     msg = "InvariantSate.fromXML: Could not read"
                     msg += " timestamp\n %s" % sys.exc_value
-                    logging.error(msg)
+                    logger.error(msg)
 
             # Parse bookmarks
@@ -694 +696 @@
             msg = "XML document does not contain invariant"
             msg += " information.\n %s" % sys.exc_value
-            logging.info(msg)
+            logger.info(msg)
         return state
 

src/sas/sasgui/perspectives/invariant/report_dialog.py

@@ -20 +20 @@
 
 from sas.sasgui.guiframe.report_dialog import BaseReportDialog
+
+logger = logging.getLogger()
 
 class ReportDialog(BaseReportDialog):
@@ -92 +94 @@
                     except:
                         # DO not open
-                        logging.error("Could not open file: %s" % sys.exc_value)
+                        logger.error("Could not open file: %s" % sys.exc_value)
             # delete image file
             os.remove(pic_fname)