Skip to content

Optimize 3D display #6085

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
AlexandreAbraham wants to merge 11 commits into from
Closed

Optimize 3D display #6085

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a4a8a86
Replace lists by numpy array in projection
AlexandreAbraham Feb 29, 2016
3d295af
Remove profiling code
AlexandreAbraham Feb 29, 2016
5239e1a
Vectorize output of proj_transform_vec
AlexandreAbraham Feb 29, 2016
7285fed
Reach vectorized projection functions directly
AlexandreAbraham Feb 29, 2016
328c2f4
Address comments
AlexandreAbraham Mar 2, 2016
a973da8
More fixes
AlexandreAbraham Mar 3, 2016
14853d0
Fix rotation of axes
AlexandreAbraham Mar 3, 2016
c4de047
Fix some failures
AlexandreAbraham Jun 8, 2016
6315961
Use a contiguous representation in memory and views for the segments
AlexandreAbraham Jun 8, 2016
bb948bb
Fix bug in PathPatch
AlexandreAbraham Sep 20, 2016
e6211bd
Fix vstack bug
AlexandreAbraham Sep 20, 2016
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
Prev Previous commit
Next Next commit
Address comments
  • Loading branch information
@AlexandreAbraham
AlexandreAbraham committed Jun 8, 2016
commit 328c2f4435fec294ef04c18ae1f0f169e6332c2e
67 changes: 51 additions & 16 deletions lib/mpl_toolkits/mplot3d/art3d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def set_3d_properties(self, zs=0, zdir='z'):
if not iterable(zs):
zs = np.ones(len(xs)) * zs
xyz = np.asarray([xs, ys, zs])
self._verts3d = juggle_axes(xyz, zdir)
self._verts3d = juggle_axes_vec(xyz, zdir)
self.stale = True

def draw(self, renderer):
Expand Down Expand Up @@ -148,7 +148,7 @@ def path_to_3d_segment(path, zs=0, zdir='z'):
pathsegs = path.iter_segments(simplify=False, curves=False)
for i, ((x, y), code) in enumerate(pathsegs):
seg3d[0:2, i] = x, y
seg3d = juggle_axes(seg3d, zdir)
seg3d = juggle_axes_vec(seg3d, zdir)
return seg3d.T

def paths_to_3d_segments(paths, zs=0, zdir='z'):
Expand Down Expand Up @@ -178,7 +178,7 @@ def path_to_3d_segment_with_codes(path, zs=0, zdir='z'):
for i, ((x, y), code) in enumerate(pathsegs):
seg3d[0:2, i] = x, y
codes[i] = code
seg3d = juggle_axes(seg3d, zdir)
seg3d = juggle_axes_vec(seg3d, zdir)
return seg3d.T, codes

def paths_to_3d_segments_with_codes(paths, zs=0, zdir='z'):
Expand Down Expand Up @@ -226,10 +226,10 @@ def do_3d_projection(self, renderer):
'''
shape = self._segments3d.shape
segments3d = np.transpose(self._segments3d, axes=[2, 0, 1])
segments3d = np.lib.pad(
segments3d, ((0, 1), (0, 0), (0, 0)),
'constant', constant_values=1)
xys = proj3d.proj_transform_vec(segments3d.reshape(4, -1), renderer.M)
segments3d = segments3d.reshape((3, -1))
# Pad ones
segments3d = np.vstack([segments3d, np.ones((1, segments3d.shape[1]))])
xys = proj3d.proj_transform_vec(segments3d, renderer.M)
xys = np.reshape(xys.T, shape)
segments_2d = xys[:, :, 0:2]
LineCollection.set_segments(self, segments_2d)
Expand Down Expand Up @@ -261,8 +261,8 @@ def __init__(self, *args, **kwargs):
self.set_3d_properties(zs, zdir)

def set_3d_properties(self, verts, zs=0, zdir='z'):
verts = np.vstack(verts, np.ones(len(verts)) * zs)
self._segment3d = juggle_axes(verts, zdir)
verts = np.vstack([verts, np.ones(len(verts)) * zs])
self._segment3d = juggle_axes_vec(verts, zdir)
self._facecolor3d = Patch.get_facecolor(self)

def get_path(self):
Expand All @@ -273,7 +273,7 @@ def get_facecolor(self):

def do_3d_projection(self, renderer):
# pad ones
s = np.vstack(self._segment3d, np.ones(self._segment3d.shape[1]))
s = np.vstack([self._segment3d, np.ones(self._segment3d.shape[1])])
vxyzis = proj3d.proj_transform_vec_clip(s, renderer.M)
self._path2d = mpath.Path(vxyzis[0:2].T)
# FIXME: coloring
Expand Down Expand Up @@ -370,7 +370,7 @@ def set_3d_properties(self, zs, zdir):
# just in case it is a scalarmappable with a colormap.
self.update_scalarmappable()
offsets = np.vstack(self.get_offsets(), np.ones(len(verts)) * zs)
self._offsets3d = juggle_axes(offsets, zdir)
self._offsets3d = juggle_axes_vec(offsets, zdir)
self._facecolor3d = self.get_facecolor()
self._edgecolor3d = self.get_edgecolor()
self.stale = True
Expand Down Expand Up @@ -434,7 +434,7 @@ def set_3d_properties(self, zs, zdir):
# just in case it is a scalarmappable with a colormap.
self.update_scalarmappable()
offsets = np.vstack(self.get_offsets(), np.ones(len(verts)) * zs)
self._offsets3d = juggle_axes(offsets, zdir)
self._offsets3d = juggle_axes_vec(offsets, zdir)
self._facecolor3d = self.get_facecolor()
self._edgecolor3d = self.get_edgecolor()
self.stale = True
Expand Down Expand Up @@ -539,6 +539,7 @@ def set_zsort(self, zsort):

def get_vector(self, segments3d):
"""Optimize points for projection"""
segments3d = np.asarray(segments3d)
# Segments 3d are given in shape (n_segments, segsize, 3)
self._segsize = segments3d.shape[1]
# Flatten
Expand Down Expand Up @@ -590,7 +591,7 @@ def do_3d_projection(self, renderer):
xys = proj3d.proj_transform_vec(self._vec, renderer.M)
xys = np.reshape(xys, (3, self._segsize, -1))
xyzlist = xys.T

# This extra fuss is to re-order face / edge colors
cface = self._facecolors3d
cedge = self._edgecolors3d
Expand Down Expand Up @@ -689,7 +690,22 @@ def poly_collection_2d_to_3d(col, zs=0, zdir='z'):
col.set_verts_and_codes(segments_3d, codes)
col.set_3d_properties()

def juggle_axes(xyz, zdir):
def juggle_axes(xs, ys, zs, zdir):
"""
Reorder coordinates so that 2D xs, ys can be plotted in the plane
orthogonal to zdir. zdir is normally x, y or z. However, if zdir
starts with a '-' it is interpreted as a compensation for rotate_axes.
"""
if zdir == 'x':
return zs, xs, ys
elif zdir == 'y':
return xs, zs, ys
elif zdir[0] == '-':
return rotate_axes(xs, ys, zs, zdir)
else:
return xs, ys, zs

def juggle_axes_vec(xyz, zdir):
Copy link
Copy Markdown
Contributor

@anntzer anntzer Sep 21, 2016

Choose a reason for hiding this comment

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

Can you make this a private function and (if other devs agree) deprecate juggle_axes? Similarly for rotate_axes. Let's take advantage of the opportunity to reduce the public API...

"""
Reorder coordinates so that 2D xs, ys can be plotted in the plane
orthogonal to zdir. zdir is normally x, y or z. However, if zdir
Expand All @@ -700,11 +716,30 @@ def juggle_axes(xyz, zdir):
elif zdir == 'y':
return xyz[[0, 2, 1]]
elif zdir[0] == '-':
return rotate_axes(xyz, zdir)
return rotate_axes_vec(xyz, zdir)
else:
return xyz

def rotate_axes(xyz, zdir):
def rotate_axes(xs, ys, zs, zdir):
"""
Reorder coordinates so that the axes are rotated with zdir along
the original z axis. Prepending the axis with a '-' does the
inverse transform, so zdir can be x, -x, y, -y, z or -z
"""
if zdir == 'x':
return ys, zs, xs
elif zdir == '-x':
return zs, xs, ys

elif zdir == 'y':
return zs, xs, ys
elif zdir == '-y':
return ys, zs, xs

else:
return xs, ys, zs

def rotate_axes_vec(xyz, zdir):
"""
Reorder coordinates so that the axes are rotated with zdir along
the original z axis. Prepending the axis with a '-' does the
Expand Down
2 changes: 1 addition & 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 @@ -2342,7 +2342,7 @@ def bar(self, left, height, zs=0, zdir='z', *args, **kwargs):

verts = np.vstack(verts, verts_zs)

xs, ys, verts_zs = art3d.juggle_axes(verts, zdir)
xs, ys, verts_zs = art3d.juggle_axes_vec(verts, zdir)
self.auto_scale_xyz(xs, ys, verts_zs, had_data)

return patches
Expand Down