|
13 | 13 |
|
14 | 14 | import numpy as np |
15 | 15 | from numpy import ma |
16 | | -from matplotlib import verbose |
17 | 16 | from . import artist, colors as mcolors |
18 | 17 | from .artist import Artist |
19 | 18 | from .cbook import (iterable, is_string_like, is_numlike, ls_mapper_r, |
20 | | - pts_to_prestep, pts_to_poststep, pts_to_midstep) |
| 19 | + pts_to_prestep, pts_to_poststep, pts_to_midstep, ls_mapper, |
| 20 | + is_hashable) |
21 | 21 |
|
22 | 22 | from .path import Path |
23 | 23 | from .transforms import Bbox, TransformedPath, IdentityTransform |
|
36 | 36 | from matplotlib import _path |
37 | 37 |
|
38 | 38 |
|
39 | | -def get_dash_pattern(style): |
40 | | - """ |
41 | | - Given a dash pattern name from 'solid', 'dashed', 'dashdot' or |
42 | | - 'dotted', returns the (offset, dashes) pattern. |
| 39 | +def _get_dash_pattern(style): |
| 40 | + """Convert linestyle -> dash pattern |
| 41 | +
|
43 | 42 | """ |
44 | | - if style == 'solid': |
| 43 | + # go from short hand -> full strings |
| 44 | + if is_string_like(style) and is_hashable(style): |
| 45 | + style = ls_mapper.get(style, style) |
| 46 | + # un-dashed styles |
| 47 | + if style in ['solid', 'None']: |
45 | 48 | offset, dashes = None, None |
| 49 | + # dashed styles |
46 | 50 | elif style in ['dashed', 'dashdot', 'dotted']: |
47 | 51 | offset = 0 |
48 | 52 | dashes = tuple(rcParams['lines.{}_pattern'.format(style)]) |
| 53 | + # |
49 | 54 | elif isinstance(style, tuple): |
50 | 55 | offset, dashes = style |
51 | 56 | else: |
52 | 57 | raise ValueError('Unrecognized linestyle: %s' % str(style)) |
53 | 58 |
|
| 59 | + # normalize offset to be positive and shorter than the dash cycle |
| 60 | + if dashes is not None and offset is not None: |
| 61 | + offset %= sum(dashes) |
| 62 | + |
54 | 63 | return offset, dashes |
55 | 64 |
|
56 | 65 |
|
| 66 | +def _scale_dashes(offset, dashes, lw): |
| 67 | + if rcParams['_internal.classic_mode']: |
| 68 | + return offset, dashes |
| 69 | + scale = max(1.0, lw) |
| 70 | + scaled_offset = scaled_dashes = None |
| 71 | + if offset is not None: |
| 72 | + scaled_offset = offset * scale |
| 73 | + if dashes is not None: |
| 74 | + scaled_dashes = [x * scale if x is not None else None |
| 75 | + for x in dashes] |
| 76 | + |
| 77 | + return scaled_offset, scaled_dashes |
| 78 | + |
| 79 | + |
57 | 80 | def segment_hits(cx, cy, x, y, radius): |
58 | 81 | """ |
59 | 82 | Determine if any line segments are within radius of a |
@@ -360,10 +383,14 @@ def __init__(self, xdata, ydata, |
360 | 383 |
|
361 | 384 | self._linestyles = None |
362 | 385 | self._drawstyle = None |
363 | | - self._linewidth = None |
| 386 | + self._linewidth = linewidth |
364 | 387 |
|
| 388 | + # scaled dash + offset |
365 | 389 | self._dashSeq = None |
366 | 390 | self._dashOffset = 0 |
| 391 | + # unscaled dash + offset |
| 392 | + self._us_dashSeq = None |
| 393 | + self._us_dashOffset = 0 |
367 | 394 |
|
368 | 395 | self.set_linestyle(linestyle) |
369 | 396 | self.set_drawstyle(drawstyle) |
@@ -1013,9 +1040,13 @@ def set_linewidth(self, w): |
1013 | 1040 | ACCEPTS: float value in points |
1014 | 1041 | """ |
1015 | 1042 | w = float(w) |
| 1043 | + |
1016 | 1044 | if self._linewidth != w: |
1017 | 1045 | self.stale = True |
1018 | 1046 | self._linewidth = w |
| 1047 | + # rescale the dashes + offset |
| 1048 | + self._dashOffset, self._dashSeq = _scale_dashes( |
| 1049 | + self._us_dashOffset, self._us_dashSeq, self._linewidth) |
1019 | 1050 |
|
1020 | 1051 | def _split_drawstyle_linestyle(self, ls): |
1021 | 1052 | '''Split drawstyle from linestyle string |
@@ -1093,31 +1124,31 @@ def set_linestyle(self, ls): |
1093 | 1124 | ls : { ``'-'``, ``'--'``, ``'-.'``, ``':'``} and more see description |
1094 | 1125 | The line style. |
1095 | 1126 | """ |
1096 | | - if not is_string_like(ls): |
1097 | | - if len(ls) != 2: |
1098 | | - raise ValueError() |
1099 | | - |
1100 | | - self.set_dashes(ls[1]) |
1101 | | - self._dashOffset = ls[0] |
1102 | | - self._linestyle = "--" |
1103 | | - return |
1104 | | - ds, ls = self._split_drawstyle_linestyle(ls) |
1105 | | - if ds is not None: |
1106 | | - self.set_drawstyle(ds) |
1107 | | - |
1108 | | - if ls in [' ', '', 'none']: |
1109 | | - ls = 'None' |
1110 | | - |
1111 | | - if ls not in self._lineStyles: |
1112 | | - try: |
1113 | | - ls = ls_mapper_r[ls] |
1114 | | - except KeyError: |
1115 | | - raise ValueError(("You passed in an invalid linestyle, " |
1116 | | - "`{0}`. See " |
1117 | | - "docs of Line2D.set_linestyle for " |
1118 | | - "valid values.").format(ls)) |
| 1127 | + if is_string_like(ls): |
| 1128 | + ds, ls = self._split_drawstyle_linestyle(ls) |
| 1129 | + if ds is not None: |
| 1130 | + self.set_drawstyle(ds) |
| 1131 | + |
| 1132 | + if ls in [' ', '', 'none']: |
| 1133 | + ls = 'None' |
| 1134 | + |
| 1135 | + if ls not in self._lineStyles: |
| 1136 | + try: |
| 1137 | + ls = ls_mapper_r[ls] |
| 1138 | + except KeyError: |
| 1139 | + raise ValueError(("You passed in an invalid linestyle, " |
| 1140 | + "`{0}`. See " |
| 1141 | + "docs of Line2D.set_linestyle for " |
| 1142 | + "valid values.").format(ls)) |
| 1143 | + self._linestyle = ls |
| 1144 | + else: |
| 1145 | + self._linestyle = '--' |
1119 | 1146 |
|
1120 | | - self._linestyle = ls |
| 1147 | + # get the unscaled dashes |
| 1148 | + self._us_dashOffset, self._us_dashSeq = _get_dash_pattern(ls) |
| 1149 | + # compute the linewidth scaled dashes |
| 1150 | + self._dashOffset, self._dashSeq = _scale_dashes( |
| 1151 | + self._us_dashOffset, self._us_dashSeq, self._linewidth) |
1121 | 1152 |
|
1122 | 1153 | @docstring.dedent_interpd |
1123 | 1154 | def set_marker(self, marker): |
@@ -1227,10 +1258,7 @@ def set_dashes(self, seq): |
1227 | 1258 | if seq == (None, None) or len(seq) == 0: |
1228 | 1259 | self.set_linestyle('-') |
1229 | 1260 | else: |
1230 | | - self.set_linestyle('--') |
1231 | | - if self._dashSeq != seq: |
1232 | | - self.stale = True |
1233 | | - self._dashSeq = seq # TODO: offset ignored for now |
| 1261 | + self.set_linestyle((0, seq)) |
1234 | 1262 |
|
1235 | 1263 | def _draw_lines(self, renderer, gc, path, trans): |
1236 | 1264 | self._lineFunc(renderer, gc, path, trans) |
@@ -1258,21 +1286,22 @@ def _draw_steps_mid(self, renderer, gc, path, trans): |
1258 | 1286 |
|
1259 | 1287 | def _draw_solid(self, renderer, gc, path, trans): |
1260 | 1288 | gc.set_linestyle('solid') |
| 1289 | + gc.set_dashes(self._dashOffset, self._dashSeq) |
1261 | 1290 | renderer.draw_path(gc, path, trans) |
1262 | 1291 |
|
1263 | 1292 | def _draw_dashed(self, renderer, gc, path, trans): |
1264 | 1293 | gc.set_linestyle('dashed') |
1265 | | - if self._dashSeq is not None: |
1266 | | - gc.set_dashes(self._dashOffset, self._dashSeq) |
1267 | | - |
| 1294 | + gc.set_dashes(self._dashOffset, self._dashSeq) |
1268 | 1295 | renderer.draw_path(gc, path, trans) |
1269 | 1296 |
|
1270 | 1297 | def _draw_dash_dot(self, renderer, gc, path, trans): |
1271 | 1298 | gc.set_linestyle('dashdot') |
| 1299 | + gc.set_dashes(self._dashOffset, self._dashSeq) |
1272 | 1300 | renderer.draw_path(gc, path, trans) |
1273 | 1301 |
|
1274 | 1302 | def _draw_dotted(self, renderer, gc, path, trans): |
1275 | 1303 | gc.set_linestyle('dotted') |
| 1304 | + gc.set_dashes(self._dashOffset, self._dashSeq) |
1276 | 1305 | renderer.draw_path(gc, path, trans) |
1277 | 1306 |
|
1278 | 1307 | def update_from(self, other): |
|
0 commit comments