Merge pull request #1007 from JackKelly/master

efiring · efiring · commit 96d1814e387e · 2012-07-24T10:53:36.000-07:00
modifying GTK3 example to use pygobject, and adding a simple example to demonstrate NavigationToolbar in GTK3
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,8 @@
 *~
 *$
 *.bak
+.project
+.pydevproject
 
 # Compiled source #
 ###################
diff --git a/examples/user_interfaces/embedding_in_gtk3.py b/examples/user_interfaces/embedding_in_gtk3.py
@@ -1,20 +1,17 @@
 #!/usr/bin/env python
 """
-demonstrate adding a FigureCanvasGTK/GTKAgg widget to a gtk.ScrolledWindow
+demonstrate adding a FigureCanvasGTK3Agg widget to a Gtk.ScrolledWindow
+using GTK3 accessed via pygobject
 """
 
-import gtk
+from gi.repository import Gtk
 
 from matplotlib.figure import Figure
 from numpy import arange, sin, pi
+from matplotlib.backends.backend_gtk3agg import FigureCanvasGTK3Agg as FigureCanvas
 
-# uncomment to select /GTK/GTKAgg/GTKCairo
-#from matplotlib.backends.backend_gtk import FigureCanvasGTK as FigureCanvas
-from matplotlib.backends.backend_gtkagg import FigureCanvasGTKAgg as FigureCanvas
-#from matplotlib.backends.backend_gtkcairo import FigureCanvasGTKCairo as FigureCanvas
-
-win = gtk.Window()
-win.connect("destroy", lambda x: gtk.main_quit())
+win = Gtk.Window()
+win.connect("delete-event", Gtk.main_quit )
 win.set_default_size(400,300)
 win.set_title("Embedding in GTK")
 
@@ -24,17 +21,15 @@
 s = sin(2*pi*t)
 a.plot(t,s)
 
-sw = gtk.ScrolledWindow()
+sw = Gtk.ScrolledWindow()
 win.add (sw)
 # A scrolled window border goes outside the scrollbars and viewport
 sw.set_border_width (10)
-# policy: ALWAYS, AUTOMATIC, NEVER
-sw.set_policy (hscrollbar_policy=gtk.POLICY_AUTOMATIC,
-               vscrollbar_policy=gtk.POLICY_ALWAYS)
 
-canvas = FigureCanvas(f)  # a gtk.DrawingArea
+canvas = FigureCanvas(f)  # a Gtk.DrawingArea
 canvas.set_size_request(800,600)
 sw.add_with_viewport (canvas)
 
 win.show_all()
-gtk.main()
+Gtk.main()
+
diff --git a/examples/user_interfaces/embedding_in_gtk3_panzoom.py b/examples/user_interfaces/embedding_in_gtk3_panzoom.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+"""
+demonstrate NavigationToolbar with GTK3 accessed via pygobject
+"""
+
+from gi.repository import Gtk
+
+from matplotlib.figure import Figure
+from numpy import arange, sin, pi
+from matplotlib.backends.backend_gtk3agg import FigureCanvasGTK3Agg as FigureCanvas
+from matplotlib.backends.backend_gtk3 import NavigationToolbar2GTK3 as NavigationToolbar
+
+win = Gtk.Window()
+win.connect("delete-event", Gtk.main_quit )
+win.set_default_size(400,300)
+win.set_title("Embedding in GTK")
+
+f = Figure(figsize=(5,4), dpi=100)
+a = f.add_subplot(1,1,1)
+t = arange(0.0,3.0,0.01)
+s = sin(2*pi*t)
+a.plot(t,s)
+
+vbox = Gtk.VBox()
+win.add(vbox)
+
+# Add canvas to vbox
+canvas = FigureCanvas(f)  # a Gtk.DrawingArea
+vbox.pack_start(canvas, True, True, 0)
+
+# Create toolbar
+toolbar = NavigationToolbar(canvas, win)
+vbox.pack_start(toolbar, False, False, 0)
+
+win.show_all()
+Gtk.main()
+
