MEP22 Save Figure Tool

OceanWolf · tacaswell · commit a975717b5553 · 2017-06-19T00:35:40.000-04:00
diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
@@ -19,6 +19,8 @@
 import time
 import warnings
 
+import os
+
 
 class Cursors(object):
     """Simple namespace for cursor reference"""
@@ -765,6 +767,43 @@ class SaveFigureBase(ToolBase):
     default_keymap = rcParams['keymap.save']
 
 
+class ToolSaveFigure(ToolBase):
+    """Saves the figure"""
+
+    description = 'Save the figure'
+    image = 'filesave.png'
+    default_keymap = rcParams['keymap.save']
+
+    def get_filechooser(self):
+        fc = self.figure.canvas.backend.FileChooserDialog(
+            title='Save the figure',
+            parent=self.figure.canvas.manager.window,
+            path=os.path.expanduser(rcParams.get('savefig.directory', '')),
+            filetypes=self.figure.canvas.get_supported_filetypes(),
+            default_filetype=self.figure.canvas.get_default_filetype())
+        fc.set_current_name(self.figure.canvas.get_default_filename())
+        return fc
+
+    def trigger(self, *args, **kwargs):
+        chooser = self.get_filechooser()
+        fname, format_ = chooser.get_filename_from_user()
+        chooser.destroy()
+        if fname:
+            startpath = os.path.expanduser(
+                rcParams.get('savefig.directory', ''))
+            if startpath == '':
+                # explicitly missing key or empty str signals to use cwd
+                rcParams['savefig.directory'] = startpath
+            else:
+                # save dir for next time
+                rcParams['savefig.directory'] = os.path.dirname(
+                    six.text_type(fname))
+            try:
+                self.figure.canvas.print_figure(fname, format=format_)
+            except Exception as e:
+                error_msg_gtk(str(e), parent=self)
+
+
 class ZoomPanBase(ToolToggleBase):
     """Base class for `ToolZoom` and `ToolPan`"""
     def __init__(self, *args):
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -912,38 +912,6 @@ def set_message(self, s):
         self.push(self._context, s)
 
 
-class SaveFigureGTK3(backend_tools.SaveFigureBase):
-
-    def get_filechooser(self):
-        fc = FileChooserDialog(
-            title='Save the figure',
-            parent=self.figure.canvas.manager.window,
-            path=os.path.expanduser(rcParams.get('savefig.directory', '')),
-            filetypes=self.figure.canvas.get_supported_filetypes(),
-            default_filetype=self.figure.canvas.get_default_filetype())
-        fc.set_current_name(self.figure.canvas.get_default_filename())
-        return fc
-
-    def trigger(self, *args, **kwargs):
-        chooser = self.get_filechooser()
-        fname, format_ = chooser.get_filename_from_user()
-        chooser.destroy()
-        if fname:
-            startpath = os.path.expanduser(
-                rcParams.get('savefig.directory', ''))
-            if startpath == '':
-                # explicitly missing key or empty str signals to use cwd
-                rcParams['savefig.directory'] = startpath
-            else:
-                # save dir for next time
-                rcParams['savefig.directory'] = os.path.dirname(
-                    six.text_type(fname))
-            try:
-                self.figure.canvas.print_figure(fname, format=format_)
-            except Exception as e:
-                error_msg_gtk(str(e), parent=self)
-
-
 class SetCursorGTK3(backend_tools.SetCursorBase):
     def set_cursor(self, cursor):
         self.figure.canvas.get_property("window").set_cursor(cursord[cursor])
@@ -1029,7 +997,6 @@ def error_msg_gtk(msg, parent=None):
     dialog.destroy()
 
 
-backend_tools.ToolSaveFigure = SaveFigureGTK3
 backend_tools.ToolConfigureSubplots = ConfigureSubplotsGTK3
 backend_tools.ToolSetCursor = SetCursorGTK3
 backend_tools.ToolRubberband = RubberbandGTK3
diff --git a/lib/matplotlib/backends/backend_gtk3agg.py b/lib/matplotlib/backends/backend_gtk3agg.py
@@ -124,6 +124,8 @@ def new_figure_manager_given_figure(num, figure):
 Window = backend_gtk3.WindowGTK3
 Toolbar = backend_gtk3.ToolbarGTK3
 Statusbar = backend_gtk3.StatusbarGTK3
+FileChooserDialog = backend_gtk3.FileChooserDialog
+
 Toolbar2 = backend_gtk3.NavigationToolbar2GTK3
 MainLoop = backend_gtk3.MainLoopGTK3
 show = backend_gtk3.show
diff --git a/lib/matplotlib/backends/backend_gtk3cairo.py b/lib/matplotlib/backends/backend_gtk3cairo.py
@@ -75,6 +75,8 @@ def new_figure_manager_given_figure(num, figure):
 Window = backend_gtk3.WindowGTK3
 Toolbar = backend_gtk3.ToolbarGTK3
 Statusbar = backend_gtk3.StatusbarGTK3
+FileChooserDialog = backend_gtk3.FileChooserDialog
+
 Toolbar2 = backend_gtk3.NavigationToolbar2GTK3
 MainLoop = backend_gtk3.MainLoopGTK3
 show = backend_gtk3.show
