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

Skip to content

[WIP] Collection draw order and other mplot3d stuff #4090

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
WeatherGod wants to merge 4 commits into from
Closed

[WIP] Collection draw order and other mplot3d stuff #4090

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8db8cd2
Adding a _draworder attribute to Collection
WeatherGod Feb 8, 2015
d3f3a57
Utilize object arrays instead. Add new function to cbook
WeatherGod Feb 9, 2015
63cc594
Change Poly3DCollection to take advantage of the new _draworder
WeatherGod Feb 9, 2015
baa352c
Add get/set color methods for some 3d collections
WeatherGod Feb 9, 2015
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
Utilize object arrays instead. Add new function to cbook
  • Loading branch information
@WeatherGod
WeatherGod committed Feb 9, 2015
commit d3f3a5727a3ad6ba37f0a7522880da26922e9221
5 changes: 5 additions & 0 deletions lib/matplotlib/cbook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,11 @@ def __call__(self, s):
return self.missingval
return int(s)

def to_objarray(a):
'convert a non numpy array into an object numpy array'
b = np.empty(len(a), dtype=object)
b[:] = a
return b

class _BoundMethodProxy(object):
'''
Expand Down
33 changes: 24 additions & 9 deletions lib/matplotlib/collections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,15 +281,30 @@ def draw(self, renderer):
# *much* faster for Agg, and results in smaller file sizes in
# PDF/SVG/PS.

offsets = offsets[self._draworder]
paths = paths[self._draworder]
trans = self.get_transforms()[self._draworder]
facecolors = self.get_facecolor()[self._draworder]
edgecolors = self.get_edgecolor()[self._draworder]
linewidths = self._linewidths[self._draworder]
linestyles = self._linestyles[self._draworder]
antialiaseds = self._antialiaseds[self._draworder]
urls = self.urls[self._draworder]
prop_list = [offsets, paths, self.get_facecolor(),
self.get_edgecolor(),
self._linewidths, self._linestyles, self._antialiaseds,
self._urls]

type_list = [type(a) for a in prop_list]
prop_list = [cbook.to_objarray(a)
if not isinstance(a, np.ndarray) else a
for a in prop_list]
elem_cnt = max([a.shape[0] for a in prop_list])
# "broadcast" (only the first axis, and only for non-zero lengths)
bcasted = [np.tile(a, [int(elem_cnt // a.shape[0])] + ([1]*(a.ndim-1)))
if a.shape[0] else a for a in prop_list]
# Select only what is desired, in the particular order
bcasted = [a[self._draworder] if a.shape[0] else a for a in bcasted]
# Restore the original type of each object (may be list or tuple or
# some type of ndarray)
bcasted = [t(a) if not issubclass(t, np.ndarray) else a
for a, t in zip(bcasted, type_list)]

(offsets, paths, facecolors, edgecolors,
linewidths, linestyles, antialiaseds, urls) = bcasted
trans = self.get_transforms()

do_single_path_optimization = False
if (len(paths) == 1 and len(trans) <= 1 and
len(facecolors) == 1 and len(edgecolors) == 1 and
Expand Down