fixed numerous little bugs in gtk and gd and updated examples to new API

jdh2358 · jdh2358 · commit d86a5048e78f · 2004-01-30T17:55:49.000Z
svn path=/trunk/matplotlib/; revision=115
diff --git a/API_CHANGES b/API_CHANGES
@@ -16,26 +16,47 @@ API changes at 0.50
 
 Migrating code:
 
-  There are no API changes for the matlab interface.  
-
-  There is one important API change for application developers.
-  Figure instances used subclass GUI widgets that enabled them to be
-  placed directly into figures.  Eg, FigureGTK subclassed
-  gtk.DrawingArea.  Now the Figure class is independent of the
-  backend, and FigureCanvas takes over the functionality formerly
-  handled by Figure.  In order to include figures into your apps, you
-  now need to do, for example
-
-    # gtk example
-    fig = Figure(figsize=(5,4), dpi=100)
-    canvas = FigureCanvasGTK(fig)  # a gtk.DrawingArea
-    canvas.show()
-    vbox.pack_start(canvas)
-
-  Apologies for the inconvenience.  This refactorization brings
-  significant more freedom in developing matplotlib and should bring
-  better plotting capabilities, so I hope the inconvenience is worth
-  it.
+  Matlab interface: 
+
+    The only API change for those using the matlab interface is in how
+    you call figure redraws for dynamically updating figures.  In the
+    old API, you did
+   
+      fig.draw()
+
+    In the new API, you do
+
+      manager = get_current_fig_manager()
+      manager.canvas.draw()
+
+    See the examples system_monitor.py, dynamic_demo.py, and anim.py
+
+  API
+
+    There is one important API change for application developers.
+    Figure instances used subclass GUI widgets that enabled them to be
+    placed directly into figures.  Eg, FigureGTK subclassed
+    gtk.DrawingArea.  Now the Figure class is independent of the
+    backend, and FigureCanvas takes over the functionality formerly
+    handled by Figure.  In order to include figures into your apps,
+    you now need to do, for example
+
+      # gtk example
+      fig = Figure(figsize=(5,4), dpi=100)
+      canvas = FigureCanvasGTK(fig)  # a gtk.DrawingArea
+      canvas.show()
+      vbox.pack_start(canvas)
+
+    If you use the NavigationToolbar, this in now intialized with a
+    FigureCanvas, not a Figure.  The examples embedding_in_gtk.py,
+    embedding_in_gtk2.py, and mpl_with_glade.py all reflect the new
+    API so use these as a guide.
+
+    Apologies for the inconvenience.  This refactorization brings
+    significant more freedom in developing matplotlib and should bring
+    better plotting capabilities, so I hope the inconvenience is worth
+    it.
+
   
 
 API changes at 0.42
diff --git a/KNOWN_BUGS b/KNOWN_BUGS
@@ -22,3 +22,12 @@ KNOWN BUGS
   - x and y ticklabels overlap at origin
 
   - parse error on lines like plot(bins, mu, bins, mu+sigma, '--')
+
+GD 
+
+  - right tickline is off
+ 
+  - dashes not scaling with dpi properly - rounding error or other?
+
+
+ 
diff --git a/examples/dynamic_demo.py b/examples/dynamic_demo.py
@@ -10,16 +10,17 @@
 X = rand(len(ind),10)
 lines = plot(X[:,0], 'o')
 
+manager = get_current_fig_manager()
 def updatefig(*args):
     lines[0].set_data(ind, X[:,updatefig.count])
-    fig.draw()
+    manager.canvas.draw()
     updatefig.count += 1
     if updatefig.count<10: return gtk.TRUE
     else: return gtk.FALSE
 
 updatefig.count = 0
 
-gtk.timeout_add(1000, updatefig)
+gtk.timeout_add(300, updatefig)
 show()
     
 
diff --git a/examples/mpl_with_glade.py b/examples/mpl_with_glade.py
@@ -1,8 +1,9 @@
 import matplotlib
 matplotlib.use('GTK')
 
+from matplotlib.figure import Figure
 from matplotlib.axes import Subplot
-from matplotlib.backends.backend_gtk import FigureGTK, NavigationToolbar
+from matplotlib.backends.backend_gtk import FigureCanvasGTK, NavigationToolbar
 
 from Numeric import arange, sin, pi
 import gtk
@@ -37,21 +38,22 @@ def __init__(self):
         self.widgets = gtk.glade.XML('mpl_with_glade.glade')
         self.widgets.signal_autoconnect(GladeHandlers.__dict__)
 
-        self.figure = FigureGTK(figsize=(8,6), dpi=72)
-        self.figure.show()
+        self.figure = Figure(figsize=(8,6), dpi=72)
         self.axis = Subplot(self.figure, 111)
         self.figure.add_axis(self.axis)
         t = arange(0.0,3.0,0.01)
         s = sin(2*pi*t)
         self.axis.plot(t,s)
         self.axis.set_xlabel('time (s)')
         self.axis.set_ylabel('voltage')
-        
-        self['vboxMain'].pack_start(self.figure, gtk.TRUE, gtk.TRUE)
+
+        self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
+        self.canvas.show()
+        self['vboxMain'].pack_start(self.canvas, gtk.TRUE, gtk.TRUE)
         self['vboxMain'].show()
         
         # below is optional if you want the navigation toolbar
-        self.navToolbar = NavigationToolbar(self.figure, self['windowMain'])
+        self.navToolbar = NavigationToolbar(self.canvas, self['windowMain'])
         self.navToolbar.lastDir = '/var/tmp/'
         self['vboxMain'].pack_start(self.navToolbar)
         self.navToolbar.show()
diff --git a/examples/object_picker.py b/examples/object_picker.py
@@ -10,10 +10,11 @@
 import matplotlib
 matplotlib.use('GTK')
 
-from matplotlib.backends.backend_gtk import FigureGTK, NavigationToolbar, \
-     error_msg, colorManager
+from matplotlib.backends.backend_gtk import NavigationToolbar, \
+     error_msg, colorManager, FigureCanvasGTK
 from matplotlib.axes import Subplot
 
+from matplotlib.figure import Figure
 from matplotlib.lines import Line2D, lineStyles, lineMarkers
 from matplotlib.transforms import Bound2D
 from matplotlib.patches import draw_bbox
@@ -201,10 +202,10 @@ def run(self):
                 break
         self.destroy()            
 
-class ArtistPickerFigure(FigureGTK):
+class PickerCanvas(FigureCanvasGTK):
 
     def button_press_event(self, widget, event):
-        width, height = self.renderer.gdkDrawable.get_size()
+        width, height = self.figure.renderer.gdkDrawable.get_size()
         
         self.pick(event.x, height-event.y)
 
@@ -225,10 +226,10 @@ def pick(self, x, y, epsilon=5):
         """
 
         clickBBox = Bound2D(x-epsilon/2, y-epsilon/2, epsilon, epsilon)
-        draw_bbox(self.dpi, clickBBox, self.renderer)
+        draw_bbox(self.figure.dpi, clickBBox, self.figure.renderer)
 
         def over_text(t):
-            bbox = t.get_window_extent(self.renderer)
+            bbox = t.get_window_extent(self.figure.renderer)
             return clickBBox.overlap(bbox)
 
         def over_line(line):
@@ -239,9 +240,9 @@ def over_line(line):
             distances = sqrt((x-xdata)**2 + (y-ydata)**2)
             return min(distances)<epsilon
 
-        for ax in fig.axes:
+        for ax in self.figure.axes:
 
-            for line in ax._lines:
+            for line in ax.get_lines():
                 if over_line(line):
                     self.select_line(line)
                     return
@@ -265,17 +266,21 @@ def over_line(line):
 win.add(vbox)
 vbox.show()
 
-fig = ArtistPickerFigure(figsize=(5,4), dpi=100)
+fig = Figure(figsize=(5,4), dpi=100)
+
 ax = Subplot(fig, 111)
 t = arange(0.0,3.0,0.01)
 s = sin(2*pi*t)
 
 ax.plot(t,s)
+ax.set_title('click on line or text')
 fig.add_axis(ax)
-fig.show()
-vbox.pack_start(fig)
 
-toolbar = NavigationToolbar(fig, win)
+canvas = PickerCanvas(fig)
+canvas.show()
+vbox.pack_start(canvas)
+
+toolbar = NavigationToolbar(canvas, win)
 toolbar.show()
 vbox.pack_start(toolbar, gtk.FALSE, gtk.FALSE)
 
diff --git a/examples/pcolor_demo.py b/examples/pcolor_demo.py
@@ -16,7 +16,7 @@ def func3(x,y):
 pcolor(X, Y, Z, shading='flat')
 #axis([-3, 3, -3, 3])
 #axis('off')
-#savefig('pcolor_demo')
+savefig('pcolor_demo')
 show()
 
     
diff --git a/examples/subplot_demo.py b/examples/subplot_demo.py
@@ -21,6 +21,6 @@ def f(t):
 xlabel('time (s)')
 ylabel('Undamped')
 
-savefig('subplot_demo',dpi=300)
+savefig('subplot_demo')
 show()
 
diff --git a/examples/system_monitor.py b/examples/system_monitor.py
@@ -34,15 +34,16 @@ def get_stats():
 ax.set_ylabel('Percent usage')
 ax.set_title('System Monitor')
 
+manager = get_current_fig_manager()
 def updatefig(*args):
     m,c,n = get_stats()
     pm.set_height(m)
     pc.set_height(c)
     pn.set_height(n)
     ax.set_ylim([0,100])
 
-    fig.draw()
-    
+    manager.canvas.draw()
+
     return gtk.TRUE
 
 
