Changeset c416a17 in sasview for src/sas/sasgui/plottools/toolbar.py

Timestamp:

May 26, 2017 7:41:44 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:

c1e380e

Parents:

6964d44 (diff), 7132e49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ESS_GUI

File:

• src/sas/sasgui/plottools/toolbar.py (modified) (5 diffs)

src/sas/sasgui/plottools/toolbar.py

@@ -6 +6 @@
 from matplotlib.backends.backend_wx import _load_bitmap
 import logging
+
+logger = logging.getLogger(__name__)
 
 # Event binding code changed after version 2.5
@@ -35 +37 @@
 
     # CRUFT: mpl 1.1 uses save rather than save_figure
-    #try: save_figure = NavigationToolbar2WxAgg.save
-    #except AttributeError: pass
+    try: save_figure = NavigationToolbar2WxAgg.save
+    except AttributeError: pass
     
     def _init_toolbar(self):
@@ -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):
@@ -169 +171 @@
     wx.TheClipboard.SetData(bmp)
     wx.TheClipboard.Close()
-
-