New milestone -- resizing figure window works. shared_axis_demo.py

mdboom · mdboom · commit 6494ec592f82 · 2007-09-13T18:00:10.000Z
works.  (Uses callbacks to track changes between axes's).

svn path=/branches/transforms/; revision=3848
diff --git a/lib/matplotlib/affine.py b/lib/matplotlib/affine.py
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -21,7 +21,7 @@
 # http://groups.google.com/groups?hl=en&lr=&threadm=mailman.5090.1098044946.5135.python-list%40python.org&rnum=1&prev=/groups%3Fq%3D__doc__%2Bauthor%253Ajdhunter%2540ace.bsd.uchicago.edu%26hl%3Den%26btnG%3DGoogle%2BSearch
 
 
-class Artist:
+class Artist(object):
     """
     Abstract base class for someone who renders into a FigureCanvas
     """
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -436,8 +436,7 @@ class Axes(martist.Artist):
               }
 
     def __str__(self):
-        return "Axes(%g,%g;%gx%g)"%(self._position[0].get(),self._position[1].get(),
-                                    self._position[2].get(),self._position[3].get())
+        return "Axes(%g,%g;%gx%g)" % tuple(self._position.bounds)
     def __init__(self, fig, rect,
                  axisbg = None, # defaults to rc axes.facecolor
                  frameon = True,
@@ -590,13 +589,13 @@ def sharey_foreign(self, axforeign):
 
         def follow_foreign_ylim(ax):
             ymin, ymax = axforeign.get_ylim()
-            # do not emit here or we'll get a ping png effect
+            # do not emit here or we'll get a ping pong effect
             self.set_ylim(ymin, ymax, emit=False)
             self.figure.canvas.draw_idle()
 
         def follow_self_ylim(ax):
             ymin, ymax = self.get_ylim()
-            # do not emit here or we'll get a ping png effect
+            # do not emit here or we'll get a ping pong effect
             axforeign.set_ylim(ymin, ymax, emit=False)
             axforeign.figure.canvas.draw_idle()
 
@@ -613,65 +612,66 @@ def set_figure(self, fig):
         """
         martist.Artist.set_figure(self, fig)
 
-        l, b, w, h = self._position.bounds
-        xmin = fig.bbox.xmin
-        xmax = fig.bbox.xmax
-        ymin = fig.bbox.ymin
-        ymax = fig.bbox.ymax
-        figw = xmax-xmin
-        figh = ymax-ymin
-        self.left   =  l*figw
-        self.bottom =  b*figh
-        self.right  =  (l+w)*figw
-        self.top    =  (b+h)*figh
-
-        self.bbox = maffine.Bbox.from_lbrt(
-            self.left, self.bottom,
-            self.right, self.top,
-            )
+        self.bbox = maffine.TransformedBbox(self._position, fig.transFigure)
         #these will be updated later as data is added
         self._set_lim_and_transforms()
 
+    def _shared_xlim_callback(self, ax):
+	xmin, xmax = ax.get_xlim()
+	self.set_xlim(xmin, xmax, emit=False)
+	self.figure.canvas.draw_idle()
+
+    def _shared_ylim_callback(self, ax):
+	ymin, ymax = ax.get_ylim()
+	self.set_ylim(ymin, ymax, emit=False)
+	self.figure.canvas.draw_idle()
+	
     def _set_lim_and_transforms(self):
         """
         set the dataLim and viewLim BBox attributes and the
         transData and transAxes Transformation attributes
         """
-        Bbox = maffine.Bbox
+	Bbox = maffine.Bbox
+	self.viewLim = Bbox.unit()
+	
         if self._sharex is not None:
-            left = self._sharex.viewLim.xmin()
-            right = self._sharex.viewLim.xmax()
-        else:
-            left = 0.0
-            right = 1.0
+	    # MGDTODO: This may be doing at least one too many updates
+	    # than necessary
+	    self._sharex.callbacks.connect(
+ 		'xlim_changed', self._shared_xlim_callback)
+	    self.viewLim.intervalx = self._sharex.viewLim.intervalx
         if self._sharey is not None:
-            bottom = self._sharey.viewLim.ymin()
-            top = self._sharey.viewLim.ymax()
-        else:
-            bottom = 0.0
-            top = 1.0
+ 	    self._sharey.callbacks.connect(
+ 		'ylim_changed', self._shared_ylim_callback)
+	    self.viewLim.intervaly = self._sharex.viewLim.intervaly
 
-        self.viewLim = Bbox.from_lbrt(left, bottom, right, top)
 	self.dataLim = Bbox.unit()
 	
-        self.transData = maffine.BboxTransform(
-            self.viewLim, self.bbox)
         self.transAxes = maffine.BboxTransform(
             Bbox.unit(), self.bbox)
 
-	# MGDTODO
-#         if self._sharex:
-#             self.transData.set_funcx(self._sharex.transData.get_funcx())
-
-#         if self._sharey:
-#             self.transData.set_funcy(self._sharey.transData.get_funcy())
-
+        localTransData = maffine.BboxTransform(
+            self.viewLim, self.bbox)
+	if self._sharex:
+	    transDataX = self._sharex.transData
+	else:
+	    transDataX = localTransData
+	if self._sharey:
+	    transDataY = self._sharey.transData
+	else:
+	    transDataY = localTransData
+	self.transData = localTransData # maffine.blend_xy_sep_transform(transDataX, transDataY)
+	    
+	    
     def get_position(self, original=False):
         'Return the axes rectangle left, bottom, width, height'
+	# MGDTODO: This changed from returning a list to returning a Bbox
+	# If you get any errors with the result of this function, please
+	# update the calling code
         if original:
-            return self._originalPosition.bounds
+            return copy.copy(self._originalPosition)
         else:
-            return self._position.bounds
+            return copy.copy(self._position)
 	    # return [val.get() for val in self._position]
 
     def set_position(self, pos, which='both'):
@@ -690,14 +690,9 @@ def set_position(self, pos, which='both'):
         ACCEPTS: len(4) sequence of floats
         """
         if which in ('both', 'active'):
-	    # MGDTODO
-#             # Change values within self._position--don't replace it.
-#             for num,val in zip(pos, self._position):
-#                 val.set(num)
-	    self._position.bounds = pos.bounds
-	    # MGDTODO: side-effects
+	    self._position.set(pos)
         if which in ('both', 'original'):
-            self._originalPosition.bounds = pos.bounds
+            self._originalPosition.set(pos)
 	    
 	    
     def _set_artist_props(self, a):
@@ -1546,7 +1541,14 @@ def set_xlim(self, xmin=None, xmax=None, emit=True, **kwargs):
         xmin, xmax = maffine.nonsingular(xmin, xmax, increasing=False)
 
 	self.viewLim.intervalx = (xmin, xmax)
-	
+        if emit:
+	    self.callbacks.process('xlim_changed', self)
+	    # MGDTODO: It would be nice to do this is in the above callback list,
+	    # but it's difficult to tell how to initialize this at the
+	    # right time
+	    if self._sharex:
+		self._sharex.set_xlim(*self.viewLim.intervalx)
+	    
         return xmin, xmax
 
     def get_xscale(self):
@@ -1650,7 +1652,6 @@ def set_ylim(self, ymin=None, ymax=None, emit=True, **kwargs):
 
         ACCEPTS: len(2) sequence of floats
         """
-
         if ymax is None and iterable(ymin):
             ymin,ymax = ymin
 
@@ -1671,8 +1672,14 @@ def set_ylim(self, ymin=None, ymax=None, emit=True, **kwargs):
 
         ymin, ymax = maffine.nonsingular(ymin, ymax, increasing=False)
 	self.viewLim.intervaly = (ymin, ymax)
-        if emit: self.callbacks.process('ylim_changed', self)
-	
+        if emit:
+	    self.callbacks.process('ylim_changed', self)
+	    # MGDTODO: It would be nice to do this is in the above callback list,
+	    # but it's difficult to tell how to initialize this at the
+	    # right time
+	    if self._sharey:
+		self._sharey.set_ylim(*self.viewLim.intervaly)
+	    
         return ymin, ymax
 
     def get_yscale(self):
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1028,9 +1028,8 @@ def _update_label_position(self, bboxes, bboxes2):
         x,y = self.label.get_position()
         if self.label_position == 'bottom':
             if not len(bboxes):
-                bottom = self.axes.bbox.ymin()
+                bottom = self.axes.bbox.ymin
             else:
-
                 bbox = Bbox.union(bboxes)
                 bottom = bbox.ymin
 
@@ -1041,7 +1040,6 @@ def _update_label_position(self, bboxes, bboxes2):
             if not len(bboxes2):
                 top = self.axes.bbox.ymax
             else:
-
                 bbox = bbox_union(bboxes2)
                 top = bbox.ymax
 
@@ -1054,7 +1052,7 @@ def _update_offset_text_position(self, bboxes, bboxes2):
         """
         x,y = self.offsetText.get_position()
         if not len(bboxes):
-            bottom = self.axes.bbox.ymin()
+            bottom = self.axes.bbox.ymin
         else:
             bbox = Bbox.union(bboxes)
             bottom = bbox.ymin
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -752,7 +752,8 @@ def __init__(self, name, canvas, x, y,guiEvent=None):
         else: # Just found one hit
             self.inaxes = axes_list[0]
 
-        try: xdata, ydata = self.inaxes.transData.inverted()([[x, y]])[0]
+        try:
+	    xdata, ydata = self.inaxes.transData.inverted().transform_point((x, y))
         except ValueError:
             self.xdata  = None
             self.ydata  = None
@@ -1584,8 +1585,8 @@ def push_current(self):
             lims.append( (xmin, xmax, ymin, ymax) )
             # Store both the original and modified positions
             pos.append( (
-                    tuple( a.get_position(True) ),
-                    tuple( a.get_position() ) ) )
+		    a.get_position(True),
+                    a.get_position() ) )
         self._views.push(lims)
         self._positions.push(pos)
         self.set_history_buttons()
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -18,7 +18,7 @@
 from text import Text, _process_text_args
 
 from legend import Legend
-from affine import Bbox, BboxTransform
+from affine import Affine2D, Bbox, BboxTransform, TransformedBbox
 from ticker import FormatStrFormatter
 from cm import ScalarMappable
 from contour import ContourSet
@@ -128,16 +128,14 @@ def __init__(self,
         if facecolor is None: facecolor = rcParams['figure.facecolor']
         if edgecolor is None: edgecolor = rcParams['figure.edgecolor']
 
+	self._dpi_scale_trans = Affine2D()
         self.dpi = dpi
-	figwidth = figsize[0] * dpi
-	figheight = figsize[1] * dpi
-	self.bbox = Bbox.from_lbwh(0, 0, figwidth, figheight)
+	self.bbox_inches = Bbox.from_lbwh(0, 0, *figsize)
+	self.bbox = TransformedBbox(self.bbox_inches, self._dpi_scale_trans)
 	
         self.frameon = frameon
 
-        self.transFigure = BboxTransform( Bbox.unit(), self.bbox)
-
-
+        self.transFigure = BboxTransform(Bbox.unit(), self.bbox)
 
         self.figurePatch = Rectangle(
             xy=(0,0), width=1, height=1,
@@ -160,6 +158,15 @@ def __init__(self,
 
         self._cachedRenderer = None
 
+    def _get_dpi(self):
+	return self._dpi
+    def _set_dpi(self, dpi):
+	print "setting dpi"
+	self._dpi = dpi
+	self._dpi_scale_trans.clear().scale(dpi, dpi)
+	print self._dpi_scale_trans
+    dpi = property(_get_dpi, _set_dpi)
+	
     def autofmt_xdate(self, bottom=0.2, rotation=30, ha='right'):
         """
         A common use case is a number of subplots with shared xaxes
@@ -325,7 +332,7 @@ def set_size_inches(self, *args, **kwargs):
             w,h = args
 
 	dpival = self.dpi
-	self.bbox.max = w * dpival, h * dpival
+	self.bbox_inches.max = w, h
         # self.figwidth.set(w) MGDTODO
         # self.figheight.set(h)
 	
@@ -339,7 +346,7 @@ def set_size_inches(self, *args, **kwargs):
                 manager.resize(int(canvasw), int(canvash))
 
     def get_size_inches(self):
-        return self.bbox.max
+        return self.bbox_inches.max
         # return self.figwidth.get(), self.figheight.get() MGDTODO
 
     def get_edgecolor(self):
@@ -352,12 +359,12 @@ def get_facecolor(self):
 
     def get_figwidth(self):
         'Return the figwidth as a float'
-	return self.bbox.xmax
+	return self.bbox_inches.xmax
         # return self.figwidth.get() MGDTODO
 
     def get_figheight(self):
         'Return the figheight as a float'
-        return self.bbox.ymax
+        return self.bbox_inches.ymax
 
     def get_dpi(self):
         'Return the dpi as a float'
@@ -400,7 +407,7 @@ def set_figwidth(self, val):
         ACCEPTS: float
         """
         # self.figwidth.set(val)  MGDTODO
-	self.bbox.xmax = val
+	self.bbox_inches.xmax = val
 	
     def set_figheight(self, val):
         """
@@ -409,7 +416,7 @@ def set_figheight(self, val):
         ACCEPTS: float
         """
 	# MGDTODO (set())
-	self.bbox.ymax = val
+	self.bbox_inches.ymax = val
 
     def set_frameon(self, b):
         """
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -481,7 +481,7 @@ def subplot(*args, **kwargs):
     byebye = []
     for other in fig.axes:
         if other==a: continue
-        if bbox.overlaps(other.bbox, ignoreend=True):
+        if bbox.fully_overlaps(other.bbox):
             byebye.append(other)
     for ax in byebye: delaxes(ax)
 
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
