Skip to content

Allow both linestyle definition "accents" and dash-patterns as linestyle... #3265

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

Allow both linestyle definition "accents" and dash-patterns as linestyle... #3265

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
62fe186
Allow both linestyle definition "accents" and dash-patterns as linest…
lennart0901 Jul 15, 2014
48063af
refactored linestyle handling for lines
lennart0901 Jul 15, 2014
14fa552
Check for double linestyle definition in plot_format
lennart0901 Jul 29, 2014
e5211f1
Added documentation changes for #2136
lennart0901 Jul 29, 2014
209fb1c
Make baseline image for testing single_dash pattern in collections.p…
lennart0901 Jul 29, 2014
ac6f3b8
Added missing baseline_images
lennart0901 Jul 29, 2014
7a6d179
Corrected wrong ordering of linestyles in axes._base._process_plot_fo…
lennart0901 Oct 19, 2014
8e6b78b
Coding style
lennart0901 Oct 19, 2014
1bb78d0
Changed docstrings to numpydoc format and rst style corrections
lennart0901 Oct 19, 2014
1dc8d89
TST : skeletal test for parsing plot format string
tacaswell Oct 19, 2014
d1ac222
TST : added test to make sure bad fmts fail
tacaswell Oct 19, 2014
c53dbe0
Removed converting color and setting linestyle in _process_plot_format
lennart0901 Oct 20, 2014
24e1301
Restored setting linestyle or marker to 'None' if only one is given i…
lennart0901 Oct 20, 2014
bea2634
Extended docstring of set_linestyle
lennart0901 Oct 24, 2014
23d5e56
Fixed triplot to deal with linestyle or marker being None
lennart0901 Oct 24, 2014
03b897f
Coding style
lennart0901 Oct 24, 2014
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
Check for double linestyle definition in plot_format 
changed collision detection in lines.py to use ``not linestyle``
  • Loading branch information
@lennart0901
lennart0901 committed Oct 19, 2014
commit 14fa552062feac17d0ec34fd0204fd0a8a91b9b7
12 changes: 7 additions & 5 deletions lib/matplotlib/axes/_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,16 @@ def _process_plot_format(fmt):
fmt = fmt.replace(ls, '')
break

# Check for double linestyle definition
if linestyle:
for ls in sorted(mlines.lineStyles, key=len):
if fmt.find(ls) >= 0:
raise ValueError(
'Illegal format string "%s"; two linestyle symbols' % fmt)

chars = [c for c in fmt]

for c in chars:
# if c in mlines.lineStyles:
# if linestyle is not None:
# raise ValueError(
# 'Illegal format string "%s"; two linestyle symbols' % fmt)
# linestyle = c
if c in mlines.lineMarkers:
if marker is not None:
raise ValueError(
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/lines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ def contains(self, mouseevent):
olderrflags = np.seterr(all='ignore')
try:
# Check for collision
if self._linestyle in ['None', None]:
if not self._linestyle:
Copy link
Member

Choose a reason for hiding this comment

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

Has 'None' been completely validated out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should happen at line 958 in set_linestyle:

        if linestyle in [' ', 'None', 'none', '']:
            linestyle = ''

# If no line, return the nearby point(s)
d = (xt - mouseevent.x) ** 2 + (yt - mouseevent.y) ** 2
ind, = np.nonzero(np.less_equal(d, pixels ** 2))
Expand Down