Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
2a75026
Optimize 3D display (#6085)
AlexandreAbraham Jul 5, 2018
b168bed
Remove irrelevant changes
rth Jul 5, 2018
a3c331d
Fix undefined variables
rth Jul 5, 2018
a5c2bd5
Check diff with respect to the original PR
rth Jul 5, 2018
e955f56
Address some review comments
rth Jul 5, 2018
e227b50
Make _juggle_axes_vec and _rotate_axes_vec private
rth Jul 5, 2018
ee53be5
Address review comments
rth Jul 14, 2018
8244c07
Make TestVoxels.test_rgb_data pass
rth Jul 14, 2018
677e79b
Review comment - use np.split + np.cumsum
rth Jul 14, 2018
d095d26
Fix broadcasting
rth Jul 14, 2018
005f6fb
PEP8
rth Jul 15, 2018
f74f3d7
Better debug message
rth Jul 15, 2018
dda0f82
Merge branch 'master' into optimize_3d
rth Jul 15, 2018
1c1e4a1
Fix for numpy 1.10
rth Jul 15, 2018
7a5c50d
Merge branch 'optimize_3d' of github.com:rth/matplotlib into optimize_3d
rth Jul 15, 2018
7c2c22e
Ignore flake8 exception and code clean-up
rth Jul 15, 2018
b81c118
Fix sphinx build
rth Jul 15, 2018
822f4f7
More review comments
rth Jul 15, 2018
004fff2
Fix PEP8
rth Jul 15, 2018
f7795e0
Address part of Eric's comments
rth Jul 16, 2018
da7f72c
Fix anntzer's comments
rth Jul 16, 2018
17657a4
Address Benjamin's review comments
rth Jul 18, 2018
e43b930
Minor fixes
rth Jul 22, 2018
7211708
Removing _juggle_axes_vec and _rotate_axes_vec
rth Jul 22, 2018
5bfa368
Remove flake8 E231 ignore for art3d.py
rth Jul 22, 2018
5faaa0c
Addressed more eric-weiser's comments
rth Jul 23, 2018
7631cfe
Convert _seg_sizes to array
rth Jul 23, 2018
ad0e783
Handle empty sequences
rth Jul 29, 2018
98d1161
Address review comments
rth Aug 18, 2018
1696d52
Experimentally revert get_colors to the previous behaviour
rth Aug 18, 2018
867819f
Merge branch 'master' into optimize_3d
rth Sep 20, 2018
92daa11
Merge branch 'master' into optimize_3d
rth Dec 17, 2018
a268fc7
Fix merge issue
rth Dec 17, 2018
946b9bc
Fix more merge conflicts
rth Dec 17, 2018
ff18f5f
Lint
rth Dec 18, 2018
76d5dc7
Fix one test failure
rth Dec 18, 2018
3e230c7
Address comments
rth Dec 18, 2018
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
Remove irrelevant changes
  • Loading branch information
rth committed Jul 5, 2018
commit b168bed10c7560a519e4241bf56af554726e0b8c
14 changes: 5 additions & 9 deletions lib/mpl_toolkits/mplot3d/art3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ def path_to_3d_segment(path, zs=0, zdir='z'):
seg3d = juggle_axes_vec(seg3d, zdir)
return seg3d.T


def paths_to_3d_segments(paths, zs=0, zdir='z'):
"""Convert paths from a collection object to 3D segments."""

Expand All @@ -190,7 +191,7 @@ def paths_to_3d_segments(paths, zs=0, zdir='z'):


def path_to_3d_segment_with_codes(path, zs=0, zdir='z'):
'''Convert a path to a 3D segment with path codes.'''
"""Convert a path to a 3D segment with path codes."""
# Pre allocate memory
# XXX should we consider a 4d array?
seg3d = np.ones((3, len(path)))
Expand Down Expand Up @@ -233,9 +234,9 @@ def set_sort_zpos(self, val):
self.stale = True

def set_segments(self, segments):
'''
"""
Set 3D segments
'''
"""
self._seg_sizes = [len(c) for c in segments]
self._segments3d = []
if len(segments) > 0:
Expand Down Expand Up @@ -391,7 +392,7 @@ def __init__(self, *args, zs=0, zdir='z', depthshade=True, **kwargs):
super().__init__(*args, **kwargs)
self.set_3d_properties(zs, zdir)

def set_sort_zpos(self, val):
def set_sort_zpos(self,val):

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is a typo, I think

"""Set the position to use for z-sorting."""
self._sort_zpos = val
self.stale = True
Expand Down Expand Up @@ -798,11 +799,6 @@ def rotate_axes_vec(xyz, zdir):
return xyz


@cbook.deprecated('2.0', alternative='matplotlib.colors.is_color_like')
def iscolor(c):
return mcolors.is_color_like(c)


def get_colors(c, num):
"""Stretch the color argument to provide the required number *num*."""
return np.broadcast_to(
Expand Down