small cursor fix

jdh2358 · jdh2358 · commit eaee1cfe916b · 2005-08-05T16:13:26.000Z
svn path=/trunk/matplotlib/; revision=1586
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,7 @@
 New entries should be added at the top
 
+2005-08-05 Added Clovis Goldemberg patch to the tk save dialog
+
 2005-08-04 Removed origin kwarg from backend.draw_image.  origin is
            handled entirely by the frontend now.
 
diff --git a/examples/animation_blit.py b/examples/animation_blit.py
@@ -2,7 +2,7 @@
 # the wiki entry
 # http://www.scipy.org/wikis/topical_software/MatplotlibAnimation
 import matplotlib
-matplotlib.use('GTKAgg')
+#matplotlib.use('GTKAgg')
 import sys
 import gtk, gobject
 import pylab as p
@@ -50,7 +50,7 @@ def update_line(*args):
     return True
 update_line.cnt = 0
 
-gobject.idle_add(update_line)
+#gobject.idle_add(update_line)
 p.show()
 
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -2363,6 +2363,10 @@ def pie(self, x, explode=None, labels=None,
             shadow=False
             ):
         """
+        PIE(x, explode=None, labels=None,
+            colors=('b', 'g', 'r', 'c', 'm', 'y', 'k', 'w'),
+            autopct=None, shadow=False)
+
         Make a pie chart of array x.  The fractional area of each wedge is
         given by x/sum(x).  If sum(x)<=1, then the values of x give the
         fractional area directly and the array will not be normalized.
@@ -2397,7 +2401,7 @@ def pie(self, x, explode=None, labels=None,
           If autopct is not None, return (patches, texts, autotexts), where
           patches and texts are as above, and autotexts is a list of text
           instances for the numeric labels
-  """
+        """
         self.set_frame_on(False)
 
         x = asarray(x).astype(Float32)
diff --git a/lib/matplotlib/backends/backend_gtkagg.py b/lib/matplotlib/backends/backend_gtkagg.py
@@ -71,6 +71,7 @@ def _render_figure(self, pixmap, width, height):
         agg_to_gtk_drawable(pixmap, self.renderer._renderer, None)
 
     def blit(self, bbox=None):
+        
         agg_to_gtk_drawable(self._pixmap, self.renderer._renderer, bbox)
         x, y, w, h = self.allocation
         self.window.draw_drawable (self.style.fg_gc[self.state], self._pixmap,
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -612,6 +612,30 @@ def configure_subplots(self):
         canvas.get_tk_widget().pack(side=Tk.TOP, fill=Tk.BOTH, expand=1)
 
     def save_figure(self):
+        from tkFileDialog import asksaveasfilename
+
+        fname = asksaveasfilename(
+            master=self.window,
+            title='Save the figure',
+            filetypes=[
+            ('Portable Network Graphics','*.png'),
+            ('Encapsulated Postscript File','*.eps'),
+            ('Scalable Vector Graphics','*.svg'),
+
+            ])
+
+        if fname == "" :
+            return
+        else:
+            bname, fext = os.path.splitext(fname)
+            if (fext.lower()=='.png'):
+                self.canvas.print_figure(fname, dpi=300)
+            elif (fext.lower()=='.eps'):
+                self.canvas.print_figure(fname)
+            elif (fext.lower()=='.svg'):
+                self.canvas.print_figure(fname)
+
+    def _save_figure(self):
         fs = FileDialog.SaveFileDialog(master=self.window,
                                        title='Save the figure')
         try:
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -452,11 +452,11 @@ def createFontDict(fontfiles, fontext='ttf'):
                 continue
             prop = afmFontProperty(font)
         else:
-            #try:
-            font = ft2font.FT2Font(str(fpath))
-            #except RuntimeError:
-            #    warnings.warn("Could not open font file %s"%fpath)
-            #    continue
+            try:
+                font = ft2font.FT2Font(str(fpath))
+            except RuntimeError:
+                warnings.warn("Could not open font file %s"%fpath)
+                continue
             try: prop = ttfFontProperty(font)
             except: continue
             
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -635,7 +635,8 @@ def __init__(self, ax, useblit=False, **lineprops):
         
     def clear(self, event):
         'clear the cursor'
-        self.background = self.canvas.copy_from_bbox(self.ax.bbox)
+        if self.useblit:
+            self.background = self.canvas.copy_from_bbox(self.ax.bbox)
         self.linev.set_visible(False)
         self.lineh.set_visible(False)        
 
@@ -652,9 +653,11 @@ def onmove(self, event):
         self.needclear = True
         if not self.visible: return 
         self.linev.set_xdata((event.xdata, event.xdata))
+
         self.lineh.set_ydata((event.ydata, event.ydata))
         self.linev.set_visible(self.visible and self.vertOn)
         self.lineh.set_visible(self.visible and self.horizOn)        
+
         self._update()
         
 
@@ -667,6 +670,7 @@ def _update(self):
             self.ax.draw_artist(self.lineh)            
             self.canvas.blit(self.ax.bbox)
         else:
+
             self.canvas.draw_idle()
 
         return False
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -221,7 +221,7 @@ RendererAgg::set_clipbox_rasterizer( double *cliprect) {
   //set the clip rectangle from the gc
   
   _VERBOSE("RendererAgg::set_clipbox_rasterizer");
-  
+
   if (cliprect==NULL) {
     theRasterizer->reset_clipping();
     rendererBase->reset_clipping(true); 
diff --git a/src/_gtkagg.cpp b/src/_gtkagg.cpp
@@ -69,7 +69,7 @@ class _gtkagg_module : public Py::ExtensionModule<_gtkagg_module>
       deststride = srcstride;
     }
     else {
-      //bbos is not None; copy the image in the bbox
+      //bbox is not None; copy the image in the bbox
       
       Bbox* clipbox = static_cast<Bbox*>(args[2].ptr());
       double l = clipbox->ll_api()->x_api()->val() ; 

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class _gtkagg_module : public Py::ExtensionModule<_gtkagg_module>`
`69`	`69`	`deststride = srcstride;`
`70`	`70`	`}`
`71`	`71`	`else {`
`72`		`- //bbos is not None; copy the image in the bbox`
	`72`	`+ //bbox is not None; copy the image in the bbox`
`73`	`73`
`74`	`74`	`Bbox* clipbox = static_cast<Bbox*>(args[2].ptr());`
`75`	`75`	`double l = clipbox->ll_api()->x_api()->val() ;`