Menu
▾
▴
SF.net SVN: matplotlib:[8395] trunk/matplotlib/lib/matplotlib
|
From: <md...@us...> - 2010-06-07 20:15:18
|
Revision: 8395
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8395&view=rev
Author: mdboom
Date: 2010-06-07 20:15:11 +0000 (Mon, 07 Jun 2010)
Log Message:
-----------
[2860167] setting radial range of polar plot fails
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/projections/polar.py
trunk/matplotlib/lib/matplotlib/tests/test_axes.py
Added Paths:
-----------
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.pdf
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.png
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.svg
Modified: trunk/matplotlib/lib/matplotlib/projections/polar.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/projections/polar.py 2010-06-07 18:29:09 UTC (rev 8394)
+++ trunk/matplotlib/lib/matplotlib/projections/polar.py 2010-06-07 20:15:11 UTC (rev 8395)
@@ -35,14 +35,31 @@
output_dims = 2
is_separable = False
+ def __init__(self, axis=None):
+ Transform.__init__(self)
+ self._axis = axis
+
def transform(self, tr):
xy = np.zeros(tr.shape, np.float_)
+ if self._axis is not None:
+ rmin = self._axis.viewLim.ymin
+ else:
+ rmin = 0
+
t = tr[:, 0:1]
r = tr[:, 1:2]
x = xy[:, 0:1]
y = xy[:, 1:2]
- x[:] = r * np.cos(t)
- y[:] = r * np.sin(t)
+
+ if rmin != 0:
+ r = r - rmin
+ mask = r < 0
+ x[:] = np.where(mask, np.nan, r * np.cos(t))
+ y[:] = np.where(mask, np.nan, r * np.sin(t))
+ else:
+ x[:] = r * np.cos(t)
+ y[:] = r * np.sin(t)
+
return xy
transform.__doc__ = Transform.transform.__doc__
@@ -61,7 +78,7 @@
transform_path_non_affine.__doc__ = Transform.transform_path_non_affine.__doc__
def inverted(self):
- return PolarAxes.InvertedPolarTransform()
+ return PolarAxes.InvertedPolarTransform(self._axis)
inverted.__doc__ = Transform.inverted.__doc__
class PolarAffine(Affine2DBase):
@@ -84,9 +101,9 @@
def get_matrix(self):
if self._invalid:
limits_scaled = self._limits.transformed(self._scale_transform)
- ymax = limits_scaled.ymax
+ yscale = limits_scaled.ymax - limits_scaled.ymin
affine = Affine2D() \
- .scale(0.5 / ymax) \
+ .scale(0.5 / yscale) \
.translate(0.5, 0.5)
self._mtx = affine.get_matrix()
self._inverted = None
@@ -103,10 +120,16 @@
output_dims = 2
is_separable = False
+ def __init__(self, axis=None):
+ Transform.__init__(self)
+ self._axis = axis
+
def transform(self, xy):
x = xy[:, 0:1]
y = xy[:, 1:]
r = np.sqrt(x*x + y*y)
+ if self._axis is not None:
+ r += self._axis.viewLim.ymin
theta = np.arccos(x / r)
theta = np.where(y < 0, 2 * np.pi - theta, theta)
return np.concatenate((theta, r), 1)
@@ -221,9 +244,13 @@
# It is assumed that this part will have non-linear components
self.transScale = TransformWrapper(IdentityTransform())
- # A (possibly non-linear) projection on the (already scaled) data
- self.transProjection = self.PolarTransform()
+ # A (possibly non-linear) projection on the (already scaled)
+ # data. This one is aware of rmin
+ self.transProjection = self.PolarTransform(self)
+ # This one is not aware of rmin
+ self.transPureProjection = self.PolarTransform()
+
# An affine transformation on the data, generally to limit the
# range of the axes
self.transProjectionAffine = self.PolarAffine(self.transScale, self.viewLim)
@@ -237,7 +264,7 @@
# equivalent to transData, except it always puts r == 1.0 at
# the edge of the axis circle.
self._xaxis_transform = (
- self.transProjection +
+ self.transPureProjection +
self.PolarAffine(IdentityTransform(), Bbox.unit()) +
self.transAxes)
# The theta labels are moved from radius == 0.0 to radius == 1.1
@@ -298,13 +325,23 @@
(0.5, 0.5), 0.5)}
def set_rmax(self, rmax):
- self.viewLim.y0 = 0
self.viewLim.y1 = rmax
- angle = self._r_label1_position.to_values()[4]
def get_rmax(self):
return self.viewLim.ymax
+ def set_rmin(self, rmin):
+ self.viewLim.y0 = rmin
+
+ def get_rmin(self):
+ return self.viewLim.ymin
+
+ def set_rlim(self, rmin=None, rmax=None):
+ self.viewLim.y0 = rmin
+ self.viewLim.y1 = rmax
+
+ set_ylim = set_rlim
+
def set_yscale(self, *args, **kwargs):
Axes.set_yscale(self, *args, **kwargs)
self.yaxis.set_major_locator(
Added: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.pdf
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.pdf (rev 0)
+++ trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.pdf 2010-06-07 20:15:11 UTC (rev 8395)
@@ -0,0 +1,321 @@
+%PDF-1.4
+%\xAC\xDC \xAB\xBA
+1 0 obj
+<< /Type /Catalog /Pages 2 0 R >>
+endobj
+8 0 obj
+<< /XObject 7 0 R /Pattern 5 0 R
+/ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] /ExtGState 4 0 R
+/Shading 6 0 R /Font 3 0 R >>
+endobj
+10 0 obj
+<< /Contents 9 0 R /Type /Page /Resources 8 0 R /Parent 2 0 R
+/MediaBox [ 0 0 576 432 ] >>
+endobj
+9 0 obj
+<< /Filter /FlateDecode /Length 11 0 R >>
+stream
+x\x9C\xED\x9DϮ<?n\xDD\xF7\xF5\xB5L6 \xFDWik 1\xE0]\xE2\xB2\xB2r\x90\xC6u\x80\xAC\xFCZyĜշKE]; ;?\xAF\xAE1\xE3\xF9ޮ\xAE\xAE\x92D R$Ͽ=\xD2\xF9Wg<\xFF\x87\xFE\xFB\x97G8\xC3\xF9wg\xEDM\xFF\xFBe\xFF[rҿ\xC2\xE7\xF5\xF9\xF1\xFA\xDE\xDF\xEB_y\xA4\xEBҕW\xD2M9\xE7וz\xB5\xBD?˽\xBF\xFA\x95K\x88\xAD\xC7v\xB6\xF8*\xA1\xA7q\x85\x91\xF5\xBB1\xBC\xE2u\x85\xFB5\x8E\xA1{c \xE5J1\x9Es\x96\x92^u\xE8\xC7\xE2\xAD\x9C1\xB5W\x8A\xAD\x8E+\xA7\xAB\x9C\xA5\x85\xD7uƮ \xD0\xCF\xDEl~\xA4\xEF\x9Cs\xBC\xFF\xAD\xC7ݯ\xF3\xFC\xBD \xEA\xFAb\xCFW\xC9\xF9\xBA\xFFһ\xB8Qd=v\xFD\xA9u\xD4\xF9\xBAx\xF2\xF5\xFE\xD7\xF17g҃?/9/\xC7q\xAD\x83q\xBF\xA7 \xF7Ll\xEF\xF5\xB4e\xDD8b\xAC\x9A\xF5\xC7\xC0\xDF Ŧw\x99\xFF~L\x9B\xFB=7\xCF\xCFwqK\xE4\x86\xF1\\xDCǰM>\x82\xF27\xE7\xFF<\xFE\xFB\xF1\xBF\xCF_\xC9\xF9\x95\x9C?_r\xFE\xF3\xF9\xBF\x84So8\xCF\xFF4\x88\xC5\xFB;}\xAF\xBD\xAER\xCF)h\xC8I\xEF\xAC\xC9i\xADf\xFDSЕ.
+9
+\xB8\xA7+\xD9\xF5 c\xCA)\xA51jz\x97W U\x9Fk \xAA]\xCF5i\x85c\xD7tp~\xD5\xDC\xF4G \x99\xEBE\x8F+!\xB71\xDE\xF7KRR \xB1\x94֢]O)\x84\xA6A\xA7b\xF7\xC7W\xEDZ\x972\xD2\xE0~M`\xAD5\xE50\xE2e\xF7\x87W\xB9\xF4Ҋ\xBD\xBF~No k ɞ߇\x94\x87@Yo\xA1\xEB\xFA\xB9b\xBD\xA2>\xE3~]O\x92\xE0p\x85\xA6iM\xCDRJ-]\xD0\xED\xFE\xEBծ\xA0\x97I\xA9h҂\xBE\x9E\xAE \xF3żs\xBF\x96%kZ\xBC\xBA\xDE/t=.զ\xE9\x8C\xC3\xEE\xB7z\xEEm\xAE7\xA6\xE3\xD2d\x87>k\x8Du\x8F&Y\xD7\xEB+\i\xB4z\xE5\xDA\xDF\xF7\xF78Z\xAAz`\xD6\xF5\xCCtĦ\xF7 \xF5}\xFFUr\xE8\xE1*A\xEF \xD2+\xE8\xD1W˹\xA7\xF7\xFBk\xB9Z\x91L\xCDO\xD0\xF8r\xD7|iA\xE3\xFB\xFD\xABV[C(\xA8\x83\xA4\xEC\xD2d\x871\xFA\xF7\xF4\xC5 C MK\xAA\xCB]\xA3\xEDU\xEB#%xO\xDF(\x9A\x99\xD1G@\xD7!y\x90 \xD9\xF0\xB5<\xD2'}\xA1\x94!\x81 E\xC3\xEB\xAD\xF6\xAB\xBE\x96W\xDD\xF8
+\xCDw ,\xDF%\xA5'\xD5B -\xF3\xF8\xF8һ \xA9E\xEC\xF5[\xFA\xBA\xFE\x90*K\xBA\xE254YI+\xF5)<ү\x96c\x95pI\xB3\xA54\xAD\xD6 \xBE\x85K\xAF|iH\xF6S\x837\xD5%\xCD\xD5\xD0\xC7M\x8F\xD2ȳ&7\xF2]=\xFB\xE2U5V]z!\xB5Hzn\x99\xFBZ)\x9A\xACvi\xA1\xA2\xDE,ǚ5\xAEL\x91F{e-m֛k\xA1\xA2F֊\xC4T\xB39o\xBFICk\xB3\xCB1\xC7r\xF1 \xA1\x97\xD0\xF34i%\xA4\xCAHӫ\x8F*\xB9\x89&\x86z\x87W\xE0\xDA% \xB0\xCB
+9\xAE5\xF7a\xB7\xEB\xE9\xB1غ\x97>\xAFKFR\xD5\xECV\xBB\xFF\xD2:t&+\xD4y]\xFA\x96[FO\xB8_z#\x95\xAD!J\xAC\xE6\xDBg\x9ET\xB4\x90\xA8\xA1~[r%\xC5\xEF=\xA4a\xA3\xA5&=K\xB0h\xF7wɑ~\xACJX\xA3]\xD7*i\xBAL\xAB\xB8_r\x8F\xA1\xE5b\x93 rN҂\xEC\xF1I\xEF+D\xD1 \x8Cl\xCD$"\x97$\xFA\xBAl\xF8IP\xABG\x85,Y\xB9l\xA1\x85(\x97\x86\xDFK\xB1\xFB\xA5%B\xE9U4
+\xF2\xBA\xA4Zܟ\xC3+\xE9iTM \x9B\xE49]\xE6\xFE\x9C\x84\xF1\xB1FTߤXW됰d\xBB[\xB2 \xA0\x8Cұ\xD6MId#\xAA\xAD\xE7jw냀Fhʸ\xAE\xB1\xCA\xC6\xD4b\x9CO /\xBD\xA1@Ib[M\x87\xF5\xB0"D\xC3h\xED\x80-\x8C |
