Can't drag zoom on a polar plot.

mdboom · mdboom · commit f883f7921e31 · 2007-10-26T18:32:44.000Z
Finessing Agg drawing quality a little bit.

svn path=/branches/transforms/; revision=4019
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1820,6 +1820,12 @@ def format_coord(self, x, y):
     
     #### Interactive manipulation
 
+    def can_zoom(self):
+        """
+        Return True if this axes support the zoom box
+        """
+        return True
+    
     def get_navigate(self):
         """
         Get whether the axes responds to navigation commands
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -1361,7 +1361,8 @@ def press_zoom(self, event):
 
         self._xypress=[]
         for i, a in enumerate(self.canvas.figure.get_axes()):
-            if x is not None and y is not None and a.in_axes(event) and a.get_navigate():
+            if x is not None and y is not None and a.in_axes(event) \
+                    and a.get_navigate() and a.can_zoom():
                 self._xypress.append(( x, y, a, i, a.viewLim.frozen(), a.transData.frozen()))
 
         self.press(event)
diff --git a/lib/matplotlib/projections/polar.py b/lib/matplotlib/projections/polar.py
@@ -55,8 +55,11 @@ def transform(self, tr):
         transform_non_affine.__doc__ = Transform.transform_non_affine.__doc__
 
         def transform_path(self, path):
-            path = path.interpolated(self._resolution)
-            return Path(self.transform(path.vertices), path.codes)
+            vertices = path.vertices
+            if len(vertices) == 2 and vertices[0, 0] == vertices[1, 0]:
+                return Path(self.transform(vertices), path.codes)
+            ipath = path.interpolated(self._resolution)
+            return Path(self.transform(ipath.vertices), ipath.codes)
         transform_path.__doc__ = Transform.transform_path.__doc__
         
         transform_path_non_affine = transform_path
@@ -151,7 +154,7 @@ def zoom(self, direction):
         def refresh(self):
             return self.base.refresh()
 
-    RESOLUTION = 50
+    RESOLUTION = 75
         
     def __init__(self, *args, **kwargs):
         """
@@ -377,6 +380,12 @@ def get_data_ratio(self):
         return 1.0
 
     ### Interactive panning
+
+    def can_zoom(self):
+        """
+        Return True if this axes support the zoom box
+        """
+        return False
     
     def start_pan(self, x, y, button):
         angle = self._r_label1_position.to_values()[4] / 180.0 * npy.pi
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -95,8 +95,8 @@ template<class VertexSource> class conv_quantize
   unsigned vertex(double* x, double* y) {
     unsigned cmd = m_source->vertex(x, y);
     if (m_quantize && agg::is_vertex(cmd)) {
-      *x = int(*x) + 0.5;
-      *y = int(*y) + 0.5;
+      *x = round(*x) + 0.5;
+      *y = round(*y) + 0.5;
     }
     return cmd;
   }
@@ -389,7 +389,7 @@ bool should_snap(Path& path, const agg::trans_affine& trans) {
     }
 
     trans.transform(&x1, &y1);
-    if (!(fabs(x0 - x1) < 0.001 || fabs(y0 - y1) < 0.001)) {
+    if (!(fabs(x0 - x1) < 1e-4 || fabs(y0 - y1) < 1e-4)) {
       path.rewind(0);
       return false;
     }

Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,8 @@ template<class VertexSource> class conv_quantize`
`95`	`95`	`unsigned vertex(double* x, double* y) {`
`96`	`96`	`unsigned cmd = m_source->vertex(x, y);`
`97`	`97`	`if (m_quantize && agg::is_vertex(cmd)) {`
`98`		`- x = int(x) + 0.5;`
`99`		`- y = int(y) + 0.5;`
	`98`	`+ x = round(x) + 0.5;`
	`99`	`+ y = round(y) + 0.5;`
`100`	`100`	`}`
`101`	`101`	`return cmd;`
`102`	`102`	`}`
`@@ -389,7 +389,7 @@ bool should_snap(Path& path, const agg::trans_affine& trans) {`
`389`	`389`	`}`
`390`	`390`
`391`	`391`	`trans.transform(&x1, &y1);`
`392`		`- if (!(fabs(x0 - x1) < 0.001 \|\| fabs(y0 - y1) < 0.001)) {`
	`392`	`+ if (!(fabs(x0 - x1) < 1e-4 \|\| fabs(y0 - y1) < 1e-4)) {`
`393`	`393`	`path.rewind(0);`
`394`	`394`	`return false;`
`395`	`395`	`}`