Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 169a2f6

Browse files
tacaswelltacaswell
committed
Merge pull request #2444 from pelson/quiver_trans
Fixed bad vector transforms.
2 parents 53573c9 + 77e7628 commit 169a2f6

File tree

10 files changed

+91
-35
lines changed

10 files changed

+91
-35
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@ script:
3636
after_failure:
3737
- tar cjf result_images.tar.bz2 result_images
3838
- travis-artifacts upload --path result_images.tar.bz2
39-
- echo https://s3.amazonaws.com/matplotlib-test-results/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/result_images.tar.bz2
39+
- echo "The result images will only be uploaded if they are on the matplotlib/matplotlib repo - this is for security reasons to prevent arbitrary PRs echoing security details."
40+
- echo https://s3.amazonaws.com/matplotlib-test-results/artifacts/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/result_images.tar.bz2

‎lib/matplotlib/axes.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,10 +1474,7 @@ def add_collection(self, collection, autolim=True):
14741474
if collection.get_clip_path() is None:
14751475
collection.set_clip_path(self.patch)
14761476

1477-
if (autolim and
1478-
collection._paths is not None and
1479-
len(collection._paths) and
1480-
len(collection._offsets)):
1477+
if autolim:
14811478
self.update_datalim(collection.get_datalim(self.transData))
14821479

14831480
collection._remove_method = lambda h: self.collections.remove(h)
@@ -6842,8 +6839,8 @@ def quiver(self, *args, **kw):
68426839
if not self._hold:
68436840
self.cla()
68446841
q = mquiver.Quiver(self, *args, **kw)
6845-
self.add_collection(q, False)
6846-
self.update_datalim(q.XY)
6842+
6843+
self.add_collection(q, True)
68476844
self.autoscale_view()
68486845
return q
68496846
quiver.__doc__ = mquiver.Quiver.quiver_doc
@@ -6883,7 +6880,6 @@ def barbs(self, *args, **kw):
68836880
self.cla()
68846881
b = mquiver.Barbs(self, *args, **kw)
68856882
self.add_collection(b)
6886-
self.update_datalim(b.get_offsets())
68876883
self.autoscale_view()
68886884
return b
68896885

‎lib/matplotlib/collections.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,13 @@ def get_datalim(self, transData):
188188
# get_path_collection_extents handles nan but not masked arrays
189189
offsets.shape = (-1, 2) # Make it Nx2
190190

191-
if paths:
191+
if len(paths) and len(offsets):
192192
result = mpath.get_path_collection_extents(
193193
transform.frozen(), paths, self.get_transforms(),
194194
offsets, transOffset.frozen())
195195
result = result.inverse_transformed(transData)
196196
else:
197-
result = transforms.Bbox([[0, 0], [0, 0]])
197+
result = transforms.Bbox.null()
198198
return result
199199

200200
def get_window_extent(self, renderer):
@@ -1710,9 +1710,6 @@ def convert_mesh_to_triangles(self, meshWidth, meshHeight, coordinates):
17101710

17111711
return triangles, colors
17121712

1713-
def get_datalim(self, transData):
1714-
return self._bbox
1715-
17161713
@allow_rasterization
17171714
def draw(self, renderer):
17181715
if not self.get_visible():

‎lib/matplotlib/quiver.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,15 @@ def _init(self):
481481
sn = max(8, min(25, math.sqrt(self.N)))
482482
self.width = 0.06 * self.span / sn
483483

484+
def get_datalim(self, transData):
485+
trans = self.get_transform()
486+
transOffset = self.get_offset_transform()
487+
full_transform = (trans - transData) + (transOffset - transData)
488+
XY = full_transform.transform(self.XY)
489+
bbox = transforms.Bbox.null()
490+
bbox.update_from_data_xy(XY, ignore=True)
491+
return bbox
492+
484493
@allow_rasterization
485494
def draw(self, renderer):
486495
self._init()

‎lib/matplotlib/streamplot.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,7 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
168168
lc.set_cmap(cmap)
169169
lc.set_norm(norm)
170170
axes.add_collection(lc)
171-
172-
axes.update_datalim(((x.min(), y.min()), (x.max(), y.max())))
173-
axes.autoscale_view(tight=True)
171+
axes.autoscale_view()
174172

175173
ac = matplotlib.collections.PatchCollection(arrows)
176174
stream_container = StreamplotSet(lc, ac)

‎lib/matplotlib/tests/baseline_images/test_pickle/multi_pickle.png

-229 Bytes
Loading

‎lib/matplotlib/tests/test_axes.py

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,6 @@ def test_formatter_ticker():
5858
ax.set_xlabel( "x-label 005" )
5959
ax.autoscale_view()
6060

61-
@cleanup
62-
def test_add_collection():
63-
# Test if data limits are unchanged by adding an empty collection.
64-
# Github issue #1490, pull #1497.
65-
fig = matplotlib.figure.Figure()
66-
fig2 = matplotlib.figure.Figure()
67-
ax = fig.add_subplot(111)
68-
ax2 = fig2.add_subplot(111)
69-
coll = ax2.scatter([0, 1], [0, 1])
70-
ax.add_collection(coll)
71-
bounds = ax.dataLim.bounds
72-
coll = ax2.scatter([], [])
73-
ax.add_collection(coll)
74-
assert ax.dataLim.bounds == bounds
7561

7662
@image_comparison(baseline_images=["formatter_large_small"])
7763
def test_formatter_large_small():
@@ -81,6 +67,7 @@ def test_formatter_large_small():
8167
y = [1e64, 1.1e64]
8268
ax.plot(x, y)
8369

70+
8471
@image_comparison(baseline_images=["twin_axis_locaters_formatters"])
8572
def test_twin_axis_locaters_formatters():
8673
vals = np.linspace(0, 1, num=5, endpoint=True)

‎lib/matplotlib/tests/test_collections.py

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from nose.tools import assert_equal
66
import numpy as np
7-
from numpy.testing import assert_array_equal
7+
from numpy.testing import assert_array_equal, assert_array_almost_equal
88

99
import matplotlib.pyplot as plt
1010
import matplotlib.collections as mcollections
@@ -396,9 +396,56 @@ def test_null_collection_datalim():
396396
col = mcollections.PathCollection([])
397397
col_data_lim = col.get_datalim(mtransforms.IdentityTransform())
398398
assert_array_equal(col_data_lim.get_points(),
399-
mtransforms.Bbox([[0, 0], [0, 0]]).get_points())
399+
mtransforms.Bbox.null().get_points())
400400

401401

402+
@cleanup
403+
def test_add_collection():
404+
# Test if data limits are unchanged by adding an empty collection.
405+
# Github issue #1490, pull #1497.
406+
ax = plt.axes()
407+
plt.figure()
408+
ax2 = plt.axes()
409+
coll = ax2.scatter([0, 1], [0, 1])
410+
ax.add_collection(coll)
411+
bounds = ax.dataLim.bounds
412+
coll = ax2.scatter([], [])
413+
ax.add_collection(coll)
414+
assert_equal(ax.dataLim.bounds, bounds)
415+
416+
417+
@cleanup
418+
def test_quiver_limits():
419+
ax = plt.axes()
420+
x, y = np.arange(8), np.arange(10)
421+
data = u = v = np.linspace(0, 10, 80).reshape(10, 8)
422+
q = plt.quiver(x, y, u, v)
423+
assert_equal(q.get_datalim(ax.transData).bounds, (0., 0., 7., 9.))
424+
425+
plt.figure()
426+
ax = plt.axes()
427+
x = np.linspace(-5, 10, 20)
428+
y = np.linspace(-2, 4, 10)
429+
y, x = np.meshgrid(y, x)
430+
trans = mtransforms.Affine2D().translate(25, 32) + ax.transData
431+
plt.quiver(x, y, np.sin(x), np.cos(y), transform=trans)
432+
assert_equal(ax.dataLim.bounds, (20.0, 30.0, 15.0, 6.0))
433+
434+
435+
@cleanup
436+
def test_barb_limits():
437+
ax = plt.axes()
438+
x = np.linspace(-5, 10, 20)
439+
y = np.linspace(-2, 4, 10)
440+
y, x = np.meshgrid(y, x)
441+
trans = mtransforms.Affine2D().translate(25, 32) + ax.transData
442+
plt.barbs(x, y, np.sin(x), np.cos(y), transform=trans)
443+
# The calculated bounds are approximately the bounds of the original data,
444+
# this is because the entire path is taken into account when updating the
445+
# datalim.
446+
assert_array_almost_equal(ax.dataLim.bounds, (20, 30, 15, 6),
447+
decimal=2)
448+
402449
if __name__ == '__main__':
403450
import nose
404451
nose.runmodule(argv=['-s', '--with-doctest'], exit=False)

‎lib/matplotlib/tests/test_pickle.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,14 @@ def test_complete():
155155
plt.subplot(3, 3, 5)
156156
plt.pcolor(data)
157157

158-
plt.subplot(3, 3, 6)
158+
ax = plt.subplot(3, 3, 6)
159+
ax.set_xlim(0, 7)
160+
ax.set_ylim(0, 9)
159161
plt.streamplot(x, y, u, v)
160162

161-
plt.subplot(3, 3, 7)
163+
ax = plt.subplot(3, 3, 7)
164+
ax.set_xlim(0, 7)
165+
ax.set_ylim(0, 9)
162166
plt.quiver(x, y, u, v)
163167

164168
plt.subplot(3, 3, 8)

‎lib/matplotlib/tests/test_streamplot.py

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import numpy as np
2+
from numpy.testing import assert_array_almost_equal
23
import matplotlib.pyplot as plt
3-
from matplotlib.testing.decorators import image_comparison
4+
from matplotlib.testing.decorators import image_comparison, cleanup
5+
import matplotlib.transforms as mtransforms
46

57

68
def velocity_field():
@@ -36,6 +38,21 @@ def test_masks_and_nans():
3638
plt.streamplot(X, Y, U, V, color=U, cmap=plt.cm.Blues)
3739

3840

41+
@cleanup
42+
def test_streamplot_limits():
43+
ax = plt.axes()
44+
x = np.linspace(-5, 10, 20)
45+
y = np.linspace(-2, 4, 10)
46+
y, x = np.meshgrid(y, x)
47+
trans = mtransforms.Affine2D().translate(25, 32) + ax.transData
48+
plt.barbs(x, y, np.sin(x), np.cos(y), transform=trans)
49+
# The calculated bounds are approximately the bounds of the original data,
50+
# this is because the entire path is taken into account when updating the
51+
# datalim.
52+
assert_array_almost_equal(ax.dataLim.bounds, (20, 30, 15, 6),
53+
decimal=2)
54+
55+
3956
if __name__=='__main__':
4057
import nose
4158
nose.runmodule()

0 commit comments

Comments
 (0)