Skip to content
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.

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

Markers module: PEP8 fixes and MEP10 documentation fixes #1803

Merged
merged 4 commits into from Mar 15, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions doc/api/markers_api.rst
@@ -0,0 +1,12 @@
*******
Markers*
******


:mod:`matplotlib.markers`
========================

.. automodule:: matplotlib.markers
:members:
:undoc-members:
:show-inheritance:
4 changes: 1 addition & 3 deletions lib/matplotlib/axes.py
Expand Up @@ -6190,9 +6190,7 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
which the rows are RGB or RGBA, however.

*marker*:
can be one of:

%(MarkerTable)s
See `~matplotlib.markers`

Any or all of *x*, *y*, *s*, and *c* may be masked arrays, in
which case all masks will be combined and only unmasked points
Expand Down
14 changes: 9 additions & 5 deletions lib/matplotlib/lines.py
Expand Up @@ -451,9 +451,9 @@ def recache(self, always=False):

self._subslice = False
if (self.axes and len(x) > 100 and self._is_sorted(x) and
self.axes.name == 'rectilinear' and
self.axes.get_xscale() == 'linear' and
self._markevery is None):
self.axes.name == 'rectilinear' and
self.axes.get_xscale() == 'linear' and
self._markevery is None):
self._subslice = True
if hasattr(self, '_path'):
interpolation_steps = self._path._interpolation_steps
Expand Down Expand Up @@ -816,9 +816,13 @@ def set_marker(self, marker):
"""
Set the line marker

%(MarkerTable)s
Parameters
-----------

marker: marker style
See `~matplotlib.markers` for full description of possible
argument

%(MarkerAccepts)s
"""
self._marker.set_marker(marker)

Expand Down