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

Skip to content

Add auto-scaling support to "add_collection3d" #25751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Add auto-scaling support to "add_collection3d" #25751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aeda54d
Text now accounts for mathtext width when wrapping
lganic Apr 15, 2023
ca42021
Added test case for mathtext wrapping
lganic Apr 15, 2023
fc7b2d0
Update lib/matplotlib/text.py
lganic Apr 15, 2023
935a691
removed unnecessary variable
lganic Apr 15, 2023
cc52106
Merge branch 'matplotlib:main' into main
lganic Apr 15, 2023
4c70aff
Added "add_collection3d" autoscaling, and updated test cases accordingly
lganic Apr 22, 2023
8e01c8d
Merge branch 'main' of https://github.com/lganic/matplotlib into main
lganic Apr 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion lib/mpl_toolkits/mplot3d/axes3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2158,7 +2158,7 @@ def tricontourf(self, *args, zdir='z', offset=None, **kwargs):
self._auto_scale_contourf(X, Y, Z, zdir, levels, had_data)
return cset

def add_collection3d(self, col, zs=0, zdir='z'):
def add_collection3d(self, col, zs=0, zdir='z', autolim=True):
"""
Add a 3D collection object to the plot.

Expand All @@ -2171,6 +2171,9 @@ def add_collection3d(self, col, zs=0, zdir='z'):
- LineCollection
- PatchCollection
"""

had_data = self.has_data()

zvals = np.atleast_1d(zs)
zsortval = (np.min(zvals) if zvals.size
else 0) # FIXME: arbitrary default
Expand All @@ -2188,6 +2191,26 @@ def add_collection3d(self, col, zs=0, zdir='z'):
art3d.patch_collection_2d_to_3d(col, zs=zs, zdir=zdir)
col.set_sort_zpos(zsortval)

# FIXME: Implement auto-scaling function for Patch3DCollection
# Currently unable to do so due to issues with Patch3DCollection
# See issue #14298 for details

# Bounding box checks
# If a 2D collection was passed, it has been converted to 3D

if autolim:
if type(col) is art3d.Line3DCollection:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason to not use isinstance here?

# Calculate bounds of Line3DCollection
tSeg = np.array(col._segments3d) # Copy coordinates
# Auto-scale with start points
self.auto_scale_xyz(*tSeg[:, 0].transpose(), had_data=had_data)
# Auto-scale with end points
self.auto_scale_xyz(*tSeg[:, 1].transpose(), had_data=True)

if type(col) is art3d.Poly3DCollection:
# Calculate bounds of poly collection
self.auto_scale_xyz(*col._vec[:-1], had_data=had_data)

collection = super().add_collection(col)
return collection

Expand Down
Binary file modified lib/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/voxels-named-colors.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 30 additions & 4 deletions lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,8 +868,8 @@ def test_poly3dcollection_closed():
facecolor=(0.5, 0.5, 1, 0.5), closed=True)
c2 = art3d.Poly3DCollection([poly2], linewidths=3, edgecolor='k',
facecolor=(1, 0.5, 0.5, 0.5), closed=False)
ax.add_collection3d(c1)
ax.add_collection3d(c2)
ax.add_collection3d(c1, autolim=False)
ax.add_collection3d(c2, autolim=False)


def test_poly_collection_2d_to_3d_empty():
Expand Down Expand Up @@ -902,8 +902,8 @@ def test_poly3dcollection_alpha():
c2.set_facecolor((1, 0.5, 0.5))
c2.set_edgecolor('k')
c2.set_alpha(0.5)
ax.add_collection3d(c1)
ax.add_collection3d(c2)
ax.add_collection3d(c1, autolim=False)
ax.add_collection3d(c2, autolim=False)


@mpl3d_image_comparison(['add_collection3d_zs_array.png'])
Expand Down Expand Up @@ -960,6 +960,32 @@ def test_add_collection3d_zs_scalar():
ax.set_zlim(0, 2)


def test_line3dCollection_autoscaling():
fig = plt.figure()
ax = fig.add_subplot(projection='3d')

lines = [[(0, 0, 0), (1, 4, 2)],
[(1, 1, 3), (2, 0, 2)],
[(1, 0, 4), (1, 4, 5)]]

lc = art3d.Line3DCollection(lines)
ax.add_collection3d(lc)
assert np.allclose(ax.get_xlim3d(), (0, 2))
assert np.allclose(ax.get_ylim3d(), (0, 4))
assert np.allclose(ax.get_zlim3d(), (0, 5))


def test_poly3dCollection_autoscaling():
fig = plt.figure()
ax = fig.add_subplot(projection='3d')
poly = np.array([[0, 0, 0], [1, 1, 3], [1, 0, 4]])
coll = art3d.Poly3DCollection([poly])
ax.add_collection3d(coll)
assert np.allclose(ax.get_xlim3d(), (0, 1))
assert np.allclose(ax.get_ylim3d(), (0, 1))
assert np.allclose(ax.get_zlim3d(), (0, 4))


@mpl3d_image_comparison(['axes3d_labelpad.png'], remove_text=False)
def test_axes3d_labelpad():
fig = plt.figure()
Expand Down