Extended marker documentation #834

Merged
merged 3 commits into from Apr 20, 2012

Conversation

Projects
None yet
2 participants
@pelson
Member

pelson commented Apr 16, 2012

Further to #631 I have updated the documentation to mention the fact that one may pass in a Path instance & have added a new example to show this in use.

It is now possible to pass in a numpy array of vertices without getting a un-hashable error from the line elif marker in self.markers:.

The pull is against 1.1.x as this is a bug fix & documentation enhancement, but if it turns out that it only gets put on master (1.2.x line) that wouldn't be a problem either.

@pelson

View changes

lib/matplotlib/markers.py
def _set_vertices(self):
+ # XXX how can this possibly work?

This comment has been minimized.

Show comment Hide comment
@pelson

pelson Apr 16, 2012

Member

@mdboom (or anyone else who has previously worked on this): I have put in a fix to what I think was a problem, but am not confident that it is the right thing to do. Would you mind having a quick look.

@pelson

pelson Apr 16, 2012

Member

@mdboom (or anyone else who has previously worked on this): I have put in a fix to what I think was a problem, but am not confident that it is the right thing to do. Would you mind having a quick look.

@mdboom

This comment has been minimized.

Show comment Hide comment
@mdboom

mdboom Apr 16, 2012

Owner

This looks good. I'll leave this up for others to review, but I think it's probably good to go.

Owner

mdboom commented Apr 16, 2012

This looks good. I'll leave this up for others to review, but I think it's probably good to go.

@pelson

This comment has been minimized.

Show comment Hide comment
@pelson

pelson Apr 16, 2012

Member

Thanks Mike. Since I couldn't resist, I have also fixed a couple of benign doc typos elsewhere.

Member

pelson commented Apr 16, 2012

Thanks Mike. Since I couldn't resist, I have also fixed a couple of benign doc typos elsewhere.

@pelson

This comment has been minimized.

Show comment Hide comment
@pelson

pelson Apr 20, 2012

Member

Since this is based against the 1.1.x branch I have included a 1 character fix from #843.

Member

pelson commented Apr 20, 2012

Since this is based against the 1.1.x branch I have included a 1 character fix from #843.

@mdboom

This comment has been minimized.

Show comment Hide comment
@mdboom

mdboom Apr 20, 2012

Owner

This looks good. Can you rebase on the current v1.1.x so this can be more automatically merged? Assuming you have a remote for the main repo called "upstream", it should be:

git checkout marker_doc
git fetch upstream
git rebase upstream/v1.1.x
# Fix conflicts, if any
git push -f origin marker_doc
Owner

mdboom commented Apr 20, 2012

This looks good. Can you rebase on the current v1.1.x so this can be more automatically merged? Assuming you have a remote for the main repo called "upstream", it should be:

git checkout marker_doc
git fetch upstream
git rebase upstream/v1.1.x
# Fix conflicts, if any
git push -f origin marker_doc
@pelson

This comment has been minimized.

Show comment Hide comment
@pelson

pelson Apr 20, 2012

Member

Sure thing. No conflicts so was nice and simple.

Thanks for the tips on git. I wouldn't have known to do it that way and might have ended up doing a pull/merge. Not sure if that would have been a problem or not...

Member

pelson commented Apr 20, 2012

Sure thing. No conflicts so was nice and simple.

Thanks for the tips on git. I wouldn't have known to do it that way and might have ended up doing a pull/merge. Not sure if that would have been a problem or not...

mdboom added a commit that referenced this pull request Apr 20, 2012

Merge pull request #834 from pelson/marker_doc
Extended marker documentation

@mdboom mdboom merged commit eb0ded7 into matplotlib:v1.1.x Apr 20, 2012

@pelson pelson referenced this pull request Aug 19, 2012

Closed

Update on Documentation #631

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment