added Erics dot marker patcj

svn path=/trunk/matplotlib/; revision=1650

Author: jdh2358

CHANGELOG

@@ -1,5 +1,7 @@
 New entries should be added at the top
 
+2005-08-16 Added Eric's dot marker patch - JDH
+
 2005-08-08 Added blitting/animation for TkAgg - CM
 
 2005-08-05 Fixed duplicate tickline bug - JDH

examples/widgets/cursor.py

@@ -15,6 +15,6 @@
 ax.set_ylim(-2,2)
 
 # set useblit = True on gtkagg for enhanced performance
-cursor = Cursor(ax, useblit=False, color='red', linewidth=2 )
+cursor = Cursor(ax, useblit=True, color='red', linewidth=2 )
 
 pylab.show()

lib/matplotlib/backends/backend_gtk.py

@@ -230,7 +230,7 @@ def draw(self):
         # synchronous draw (needed for animation)
         x, y, w, h = self.allocation
         #print x, y, w, h
-        #if w<3 or h<3: return # empty fig        
+        if w<3 or h<3: return # empty fig        
         self._pixmap_prepare (w, h)
         self._render_figure(self._pixmap, w, h)
         self._need_redraw = False

lib/matplotlib/lines.py

@@ -203,6 +203,7 @@ def __init__(self, xdata, ydata,
         self._markerfacecolor = markerfacecolor
         self._markeredgecolor = markeredgecolor
         self._markeredgewidth = markeredgewidth
+        self._point_size_reduction = 0.5
 
         self.verticalOffset = None
         self._useDataClipping = rcParams['lines.data_clipping']
@@ -669,17 +670,16 @@ def _draw_dotted(self, renderer, gc, xt, yt):
             renderer.draw_lines(gc, xt, yt)
 
     def _draw_point(self, renderer, gc, xt, yt):
-        if self._newstyle:
-            rgbFace = self._get_rgb_face()
-            path = agg.path_storage()
-            path.move_to(-0.5, -0.5)
-            path.line_to(-0.5, 0.5)
-            path.line_to(0.5, 0.5)
-            path.line_to(0.5, -0.5)
-            renderer.draw_markers(gc, path, rgbFace, xt, yt, self._transform)
+
+        r = 0.5 * renderer.points_to_pixels(self._markersize)
+        r *= self._point_size_reduction
+        gc.set_linewidth(0)
+        if r <= 0.5:
+            self._draw_pixel(renderer, gc, xt, yt)
+        elif r <= 2:
+            self._draw_hexagon1(renderer, gc, xt, yt, point=True)
         else:
-            for (x,y) in zip(xt, yt):
-                renderer.draw_arc(gc, None, x, y, 1, 1, 0.0, 360.0)
+            self._draw_circle(renderer, gc, xt, yt, point=True)
 
     def _draw_pixel(self, renderer, gc, xt, yt):
         if self._newstyle:
@@ -695,9 +695,12 @@ def _draw_pixel(self, renderer, gc, xt, yt):
                 renderer.draw_point(gc, x, y)
 
 
-    def _draw_circle(self, renderer, gc, xt, yt):
+    def _draw_circle(self, renderer, gc, xt, yt, point=False):
+
+        w = renderer.points_to_pixels(self._markersize)
+        if point:
+            w *= self._point_size_reduction
 
-        w = h = renderer.points_to_pixels(self._markersize)
 
         rgbFace = self._get_rgb_face()
 
@@ -718,7 +721,7 @@ def _draw_circle(self, renderer, gc, xt, yt):
         else:
             for (x,y) in zip(xt, yt):
                 renderer.draw_arc(gc, rgbFace,
-                                  x, y, w, h, 0.0, 360.0)
+                                  x, y, w, w, 0.0, 360.0)
 
 
 
@@ -895,8 +898,10 @@ def _draw_pentagon(self, renderer, gc, xt, yt):
                           (x+offsetX1, y+offsetY1))
                 renderer.draw_polygon(gc, rgbFace, verts)
 
-    def _draw_hexagon1(self, renderer, gc, xt, yt):
+    def _draw_hexagon1(self, renderer, gc, xt, yt, point=False):
         offset = 0.6*renderer.points_to_pixels(self._markersize)
+        if point:
+            offset *= self._point_size_reduction
         offsetX1 = offset*0.87
         offsetY1 = offset*0.5
         rgbFace = self._get_rgb_face()

lib/matplotlib/widgets.py

@@ -201,9 +201,9 @@ def _update(self, event):
         if self.slidermax is not None:
             if val>=self.slidermax.val: return
 
-        self._set_val(val)
+        self.set_val(val)
 
-    def _set_val(self, val):
+    def set_val(self, val):
         self.poly.xy[-1] = val, 0
         self.poly.xy[-2] = val, 1        
         self.valtext.set_text(self.valfmt%val)
@@ -233,7 +233,7 @@ def disconnect(self, cid):
     def reset(self):
         "reset the slider to the initial value if needed"
         if (self.val != self.valinit):
-            self._set_val(self.valinit)     
+            self.set_val(self.valinit)