Changeset c155a16 in sasview for src/sas/sasgui/plottools

Timestamp:

Apr 4, 2017 10:06:27 AM (8 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/plottools

Files:

• PlotPanel.py (modified) (2 diffs)
• binder.py (modified) (2 diffs)
• canvas.py (modified) (3 diffs)
• plottables.py (modified) (3 diffs)
• toolbar.py (modified) (3 diffs)

src/sas/sasgui/plottools/PlotPanel.py

@@ -33 +33 @@
 from sas.sasgui.guiframe.events import StatusEvent
 from .toolbar import NavigationToolBar, PlotPrintout, bind
+
+logger = logging.getLogger()
 
 def show_tree(obj, d=0):
@@ -1506 +1508 @@
                     from mpl_toolkits.mplot3d import Axes3D
                 except:
-                    logging.error("PlotPanel could not import Axes3D")
+                    logger.error("PlotPanel could not import Axes3D")
                 self.subplot.figure.clear()
                 ax = Axes3D(self.subplot.figure)

src/sas/sasgui/plottools/binder.py

@@ -4 +4 @@
 import sys
 import logging
+
+logger = logging.getLogger()
 
 class Selection(object):
@@ -121 +123 @@
             for cid in self._connections: self.canvas.mpl_disconnect(cid)
         except:
-            logging.error("Error disconnection canvas: %s" % sys.exc_value)
+            logger.error("Error disconnection canvas: %s" % sys.exc_value)
         self._connections = []
 

src/sas/sasgui/plottools/canvas.py

@@ -11 +11 @@
 from matplotlib.backends.backend_wx import RendererWx
 
+logger = logging.getLogger()
+
 
 def draw_image(self, x, y, im, bbox, clippath=None, clippath_trans=None):
@@ -96 +98 @@
             dc.DrawBitmap(self.canvas.bitmap, (0, 0))
         except:
-            logging.error(sys.exc_value)
+            logger.error(sys.exc_value)
 
     # restore original figure  resolution
@@ -207 +209 @@
                 fig.draw(self)
             except ValueError:
-                logging.error(sys.exc_value)
+                logger.error(sys.exc_value)
         else:
             self._isRendered = False

src/sas/sasgui/plottools/plottables.py

@@ -46 +46 @@
 import sys
 import logging
+
+logger = logging.getLogger()
 
 if 'any' not in dir(__builtins__):
@@ -808 +810 @@
                         tempdy.append(self.dy[i])
                 except:
-                    logging.error("check_data_logX: skipping point x %g", self.x[i])
-                    logging.error(sys.exc_value)
+                    logger.error("check_data_logX: skipping point x %g", self.x[i])
+                    logger.error(sys.exc_value)
             self.x = tempx
             self.y = tempy
@@ -838 +840 @@
                         tempdy.append(self.dy[i])
                 except:
-                    logging.error("check_data_logY: skipping point %g", self.y[i])
-                    logging.error(sys.exc_value)
+                    logger.error("check_data_logY: skipping point %g", self.y[i])
+                    logger.error(sys.exc_value)
 
             self.x = tempx

src/sas/sasgui/plottools/toolbar.py

@@ -6 +6 @@
 from matplotlib.backends.backend_wx import _load_bitmap
 import logging
+
+logger = logging.getLogger()
 
 # Event binding code changed after version 2.5
@@ -94 +96 @@
             self._parent.onToolContextMenu(event=event)
         except:
-            logging.error("Plot toolbar could not show menu")
+            logger.error("Plot toolbar could not show menu")
 
     def context_menu(self, event):
@@ -122 +124 @@
         except:
             import traceback
-            logging.error(traceback.format_exc())
+            logger.error(traceback.format_exc())
 
     def copy_figure(self, event):