fixed ticker bug

jdh2358 · jdh2358 · commit 6bd9aa465a63 · 2004-06-01T14:26:57.000Z
svn path=/trunk/matplotlib/; revision=327
diff --git a/MANIFEST b/MANIFEST
@@ -235,6 +235,7 @@ examples/multiple_figs_demo.py
 examples/object_picker.py
 examples/pcolor_demo.py
 examples/pcolor_demo2.py
+examples/pcolor_demo_with_scale.py
 examples/pcolor_small.py
 examples/psd_demo.py
 examples/pstest.py
@@ -391,6 +392,7 @@ matplotlib/backends/backend_gtkagg.py
 matplotlib/backends/backend_gtkgd.py
 matplotlib/backends/backend_paint.py
 matplotlib/backends/backend_ps.py
+matplotlib/backends/backend_svg.py
 matplotlib/backends/backend_template.py
 matplotlib/backends/backend_tkagg.py
 matplotlib/backends/backend_wx.py
@@ -399,7 +401,6 @@ matplotlib/backends/tkagg.py
 src/_backend_agg.cpp
 src/_backend_agg.h
 src/_gtkagg.cpp
-src/_gtkaggold.cpp
 src/_gtkgd.c
 src/_image.cpp
 src/_image.h
diff --git a/src/_transforms.cpp b/src/_transforms.cpp
@@ -194,13 +194,16 @@ Bbox::contains(const Py::Tuple &args) {
 
   double x = Py::Float(args[0]);
   double y = Py::Float(args[1]); 
-  
-  Interval *ix = intervalx_api();
-  Interval *iy = intervaly_api();
-  int b = ix->contains_api(x) && iy->contains_api(y);
-  delete ix;
-  delete iy;
-  return Py::Int(b);
+
+  double minx = _ll->xval();
+  double miny = _ll->yval();  
+  double maxx = _ur->xval();
+  double maxy = _ur->yval();
+
+  int inx = ( (x>=minx) && (x<=maxx) || (x>=maxx) && (x<=minx) );
+  if (!inx) return Py::Int(0);
+  int iny = ( (y>=miny) && (y<=maxy) || (y>=maxy) && (y<=miny) );
+  return Py::Int(iny);
 }
 
 Py::Object 
diff --git a/src/_transforms.h b/src/_transforms.h
@@ -249,13 +249,6 @@ class Bbox: public Py::PythonExtension<Bbox> {
     return Py::Object( new Interval( _ll->y_api(), _ur->y_api()));
   }
 
-  Interval* intervalx_api() {
-    return new Interval( _ll->x_api(), _ur->x_api());
-  }
-
-  Interval* intervaly_api() {
-    return new Interval( _ll->y_api(), _ur->y_api());
-  }
 
   // update the current bbox with data from xy tuples
   Py::Object update(const Py::Tuple &args);
