Skip to content

allow fillstyle 'none' option #447

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

Merged
merged 10 commits into from
Dec 31, 2011
Merged

allow fillstyle 'none' option #447

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
213459e
first commit to allow fillstyle none
Aug 31, 2011
785e66f
auto markeredgecolor returns default color if fillstyle==none
Aug 31, 2011
5a2ced1
added missing fillstyle=='none' conditionals
Sep 8, 2011
1982c51
trying to track down self._fillstyle error
Sep 8, 2011
08de0bb
Merge branch 'master' of git://github.com/matplotlib/matplotlib into …
Oct 29, 2011
392fe5d
Merge branch 'master' into fillstyle_none
cragm Nov 2, 2011
9ac0f3d
Use local function to check for half-filled markers.
cragm Dec 7, 2011
9cff4e4
Merge branch 'master' from upstream into fillstyle_none.
cragm Dec 8, 2011
c6e93d3
Fix missing 'self.'s in call of _half_fill method.
cragm Dec 10, 2011
c40ba26
Merge branch 'master' into fillstyle_none
cragm Dec 23, 2011
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
Merge branch 'master' from upstream into fillstyle_none. 
Conflicts:
	lib/matplotlib/lines.py
	lib/matplotlib/markers.py
  • Loading branch information
@cragm
cragm committed Dec 8, 2011
commit 9cff4e4d368f98ad68325785f199fd9ad4c1323b
4 changes: 3 additions & 1 deletion lib/matplotlib/lines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,8 +574,10 @@ def get_marker(self): return self._marker.get_marker()
def get_markeredgecolor(self):
mec = self._markeredgecolor
if (is_string_like(mec) and mec == 'auto'):
if self._marker.get_marker() in ('.', ','):
return self._color
if self._marker.is_filled() and self.get_fillstyle() != 'none':
return 'k'
return 'k' # Bad hard-wired default...
else:
return self._color
else:
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/markers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class MarkerStyle:
# is calculated in the _set_* functions.
filled_markers = (
'o', 'v', '^', '<', '>', '8', 's', 'p', '*', 'h', 'H', 'D', 'd')

fillstyles = ('full', 'left' , 'right' , 'bottom' , 'top', 'none')
_half_fillstyles = ('left' , 'right' , 'bottom' , 'top')

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.