fixed some obj picker and cords demo code

jdh2358 · jdh2358 · commit 6d1310038a9e · 2004-05-18T13:54:29.000Z
svn path=/trunk/matplotlib/; revision=307
diff --git a/API_CHANGES b/API_CHANGES
@@ -3,6 +3,17 @@ API CHANGES in matplotlib-0.54
 matlab interface
 ================
 
+dpi
+---
+
+Several of the backends used a PIXELS_PER_INCH hack that I added to
+try and make images render consistently across backends.  This just
+complicated matters.  So you may find that some font sizes and line
+widths appear different than before.  Apologies for the
+inconvenience. You should set the dpi to an accurate value for your
+screen to get true sizes.
+
+
 pcolor and scatter
 ------------------
 
@@ -96,12 +107,12 @@ Bounding boxes
    get the width and height of the bbox
 
      OLD
-        width = self.figure.bbox.x.interval()
-        height = self.figure.bbox.y.interval()
+        width  = fig.bbox.x.interval()
+        height = fig.bbox.y.interval()
 
      New
-        width = self.figure.bbox.width()
-        height = self.figure.bbox.height()
+        width  = fig.bbox.width()
+        height = fig.bbox.height()
 
 
 
@@ -170,10 +181,23 @@ Transformations
      Although this was done in numerix, it still involves 6 length(x)
      for-loops (the multiply, add, and function evaluation each for x
      and y).  Now all of that is done in a single pass.
+
+
+  If you are using transformations and bounding boxes to get the
+  cursor position in data coordinates, the method calls are a little
+  different now.  See the updated examples/coords_demo.py which shows
+  you how to do this.
+
+  Likewise, if you are using the artist bounding boxes to pick items
+  on the canvas with the GUI, the bbox methods are somewhat
+  different.  You will need to see the updated
+  examples/object_picker.py. 
  
   See unit/transforms_unit.py for many examples using the new
   transformations.
 
+
+
 API changes at 0.50
 
   * refactored Figure class so it is no longer backend dependent.
diff --git a/DEVNOTES b/DEVNOTES
@@ -28,8 +28,9 @@ http://matplotlib.sourceforge.net
 
 0) Turn off all the build flags
 
-0) Run examples/batch_figs.py w/o errors; run the backend specific
-   demos (object_picker, anim , embedding*)
+0) Run examples/backend_driver.py w/o errors; run the backend specific
+   demos (object_picker, anim , embedding*).  Do an explicity numarray
+   and python2.2 test.
 
 0) Remove MANIFEST so it will be rebuilt by MANIFEST.in
 
diff --git a/MANIFEST b/MANIFEST
@@ -232,6 +232,7 @@ examples/multiple_figs_demo.py
 examples/object_picker.py
 examples/pcolor_demo.py
 examples/pcolor_demo2.py
+examples/pcolor_small.py
 examples/psd_demo.py
 examples/pstest.py
 examples/pythonic_matplotlib.py
diff --git a/TODO b/TODO
@@ -366,7 +366,7 @@
 
 -- DONE clipping for collections
 
--- Todd's nx stuff
+-- DONE Todd's nx stuff
 
 -- fix object picker and eeg demo
 
@@ -378,4 +378,7 @@
 
 -- DONE - pcolor edge color
 
--- convert rank 1 arrays as per Flaviu's post
+-- convert rank 1 arrays as per Flaviu's post
+
+-- email tim log bar code after release
+
diff --git a/examples/coords_demo.py b/examples/coords_demo.py
@@ -14,32 +14,28 @@
 
 def on_move(widget, event):
     # get the x and y coords, flip y from top to bottom
-    height = canvas.figure.bbox.y.interval()
+    height = canvas.figure.bbox.height()
     x, y = event.x, height-event.y
 
     if ax.in_axes(x, y):
         # transData transforms data coords to display coords.  Use the
         # inverse method to transform back
-        t = ax.xaxis.transData.inverse_positions(x)
-        val = ax.yaxis.transData.inverse_positions(y)
-        print t, val
+        print ax.transData.inverse_xy_tup( (x,y) )
 
 def on_click(widget, event):
     # get the x and y coords, flip y from top to bottom
-    height = canvas.figure.bbox.y.interval()
+    height = canvas.figure.bbox.height()
     x, y = event.x, height-event.y
     if event.button==1:
         if ax.in_axes(x, y):
             # transData transforms data coords to display coords.  Use the
             # inverse method to transform back
-            t = ax.xaxis.transData.inverse_positions(x)
-            val = ax.yaxis.transData.inverse_positions(y)
-        
-            print t, val
+            print ax.transData.inverse_xy_tup( (x,y) )
 
 
-#canvas.connect('motion_notify_event', on_move)
-canvas.connect('button_press_event', on_click)
+
+canvas.connect('motion_notify_event', on_move)
+#canvas.connect('button_press_event', on_click)
 
 
 
diff --git a/examples/object_picker.py b/examples/object_picker.py
@@ -21,6 +21,7 @@
 from matplotlib.lines import Line2D, lineStyles, lineMarkers
 from matplotlib.transforms import Bbox, lbwh_to_bbox
 from matplotlib.patches import draw_bbox
+from matplotlib.cbook import is_string_like
 from matplotlib.colors import colorConverter
 import gtk
 
@@ -67,6 +68,7 @@ def make_option_menu( names, func=None ):
     menu.show()
     d = {}
     for label in names:
+        if  not is_string_like(label): continue
         item = gtk.MenuItem(label)
         menu.append(item)
         item.show()
@@ -234,7 +236,7 @@ def pick(self, x, y, epsilon=5):
 
         def over_text(t):
             bbox = t.get_window_extent(self.renderer)
-            return clickBBox.overlap(bbox)
+            return clickBBox.overlaps(bbox)
 
         def over_line(line):
             # can't use the line bbox because it covers the entire extent
diff --git a/src/_transforms.cpp b/src/_transforms.cpp
@@ -188,6 +188,21 @@ Bbox::get_bounds(const Py::Tuple & args) {
   return ret;
 }
 
+Py::Object 
+Bbox::contains(const Py::Tuple &args) {
+  args.verify_length(2);
+
+  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);
+}
+
 Py::Object 
 Bbox::overlaps(const Py::Tuple &args) {
   args.verify_length(1);
@@ -1066,6 +1081,7 @@ void Bbox::init_type()
   
   add_varargs_method("ll", 	&Bbox::ll, "ll()\n");
   add_varargs_method("ur", 	&Bbox::ur, "ur()\n");
+  add_varargs_method("contains" , &Bbox::contains, "contains(x,y)\n");
   add_varargs_method("overlaps" , &Bbox::overlaps, "overlaps(bbox)\n");
   add_varargs_method("overlapsx" , &Bbox::overlapsx, "overlapsx(bbox)\n");
   add_varargs_method("overlapsy" , &Bbox::overlapsy, "overlapsy(bbox)\n");
diff --git a/src/_transforms.h b/src/_transforms.h
@@ -138,16 +138,23 @@ class Point: public Py::PythonExtension<Point> {
 class Interval: public Py::PythonExtension<Interval> {
 public:
   Interval(LazyValue* val1, LazyValue* val2) : _val1(val1), _val2(val2) {};
+
   static void init_type(void);
   
   Py::Object contains( const Py::Tuple &args) {
     args.verify_length(1);
     double x =  Py::Float(args[0]);
+    int b = contains_api( x);
+    return Py::Int(b);
+  }
+
+  int contains_api( const double& val) {
+
     double val1 = _val1->val();
     double val2 = _val2->val();
 
-    int b = ( (x>=val1) && (x<=val2) || (x>=val2) && (x<=val1) );
-    return Py::Int(b);
+    return  ( (val>=val1) && (val<=val2) || (val>=val2) && (val<=val1) );
+
   }
 
   //update the interval to contain all points in seq of floats
@@ -241,8 +248,18 @@ class Bbox: public Py::PythonExtension<Bbox> {
   Py::Object intervaly(const Py::Tuple &args) {
     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);
+  Py::Object contains(const Py::Tuple &args);
 
   Py::Object width(const Py::Tuple &args) {
     double w = _ur->xval() - _ll->xval();
@@ -335,7 +352,7 @@ class Log : public Func {
 
   //the inverse mapping
   double inverse_api(const double& x) { 
-    return pow10(x);
+    return pow(x,10.0);
   };
 };
 
