diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py index 57634cf2964c..26c7f7473d98 100644 --- a/lib/matplotlib/lines.py +++ b/lib/matplotlib/lines.py @@ -68,12 +68,12 @@ def _get_dash_pattern(style): def _scale_dashes(offset, dashes, lw): if not rcParams['lines.scale_dashes']: return offset, dashes - scale = max(2.0, lw) + scaled_offset = scaled_dashes = None if offset is not None: - scaled_offset = offset * scale + scaled_offset = offset * lw if dashes is not None: - scaled_dashes = [x * scale if x is not None else None + scaled_dashes = [x * lw if x is not None else None for x in dashes] return scaled_offset, scaled_dashes diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py index 762dcd6e4806..82d4e3914bb3 100644 --- a/lib/matplotlib/rcsetup.py +++ b/lib/matplotlib/rcsetup.py @@ -923,9 +923,9 @@ def validate_animation_writer_path(p): 'lines.solid_joinstyle': ['round', validate_joinstyle], 'lines.dash_capstyle': ['butt', validate_capstyle], 'lines.solid_capstyle': ['projecting', validate_capstyle], - 'lines.dashed_pattern': [[2.8, 1.2], validate_nseq_float()], - 'lines.dashdot_pattern': [[4.8, 1.2, 0.8, 1.2], validate_nseq_float()], - 'lines.dotted_pattern': [[1.1, 1.1], validate_nseq_float()], + 'lines.dashed_pattern': [[3.7, 1.6], validate_nseq_float()], + 'lines.dashdot_pattern': [[6.4, 1.6, 1, 1.6], validate_nseq_float()], + 'lines.dotted_pattern': [[1, 1.65], validate_nseq_float()], 'lines.scale_dashes': [True, validate_bool], # marker props diff --git a/lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_dash.png b/lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_dash.png index 1b1337af06a5..20a48fbdabf0 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_dash.png and b/lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_dash.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.pdf b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.pdf index 0e1fdc2d92a6..57e0fb494244 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.png index 79936d3f235f..61507b39c9cc 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.png and b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.svg b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.svg index 7bf4b57d323a..3e6deb97fa5a 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/boxplot_rc_parameters.svg @@ -32,17 +32,17 @@ z +" id="me3c5aad6dc" style="stroke:#000000;stroke-width:0.8;"/> - + - + @@ -53,30 +53,30 @@ L 0 3.5 +" id="mb093d27a24" style="stroke:#000000;stroke-width:0.8;"/> - + - + - + - +" style="fill:none;stroke:#ff0000;stroke-dasharray:7.4,3.2;stroke-dashoffset:0;stroke-width:2;"/> - - - +" style="fill:none;stroke:#00bfbf;stroke-dasharray:7.4,3.2;stroke-dashoffset:0;stroke-width:2;"/> - +" style="fill:none;stroke:#00bfbf;stroke-dasharray:7.4,3.2;stroke-dashoffset:0;stroke-width:2;"/> - - - - +" style="fill:none;stroke:#0000ff;stroke-dasharray:7.4,3.2;stroke-dashoffset:0;stroke-width:2;"/> +" id="mdf84968221" style="stroke:#0000ff;"/> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + +" style="fill:none;stroke:#ff0000;stroke-dasharray:7.4,3.2;stroke-dashoffset:0;stroke-width:2;"/> - - + - - + - - + +" style="fill:none;stroke:#00bfbf;stroke-dasharray:7.4,3.2;stroke-dashoffset:0;stroke-width:2;"/> - - + - - - +" style="fill:none;stroke:#00bfbf;stroke-dasharray:7.4,3.2;stroke-dashoffset:0;stroke-width:2;"/> - - + - - - - - - - - - - - - - - - - - +" style="fill:none;stroke:#0000ff;stroke-dasharray:7.4,3.2;stroke-dashoffset:0;stroke-width:2;"/> + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + - + - + - + - + @@ -329,70 +311,88 @@ z - + - + - - - - - - - - - - + + - - + - - + - - + + + + + + + + - + + + - - + - + @@ -443,64 +443,64 @@ z - + - + - + - +" style="fill:none;stroke:#ff0000;stroke-dasharray:12.8,3.2,2,3.2;stroke-dashoffset:0;stroke-width:2;"/> - +" style="fill:none;stroke:#ff0000;stroke-dasharray:12.8,3.2,2,3.2;stroke-dashoffset:0;stroke-width:2;"/> - + - + - + - + - - +" style="fill:none;stroke:#00bfbf;stroke-dasharray:7.4,3.2;stroke-dashoffset:0;stroke-width:2;"/> + - + - + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custombox.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custombox.png index 270f2696c431..19e3731575c7 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custombox.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custombox.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_customcap.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_customcap.png index 495fd667304d..cced1e51566e 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_customcap.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_customcap.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custommedian.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custommedian.png index ed012ca2bfb9..c7c22b938802 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custommedian.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custommedian.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompatchartist.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompatchartist.png index 857af4252f6f..e1aafcd346ed 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompatchartist.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_custompatchartist.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_line.png b/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_line.png index 7333ec55df16..966cc5a559cd 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_line.png and b/lib/matplotlib/tests/baseline_images/test_axes/bxp_withmean_line.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.pdf b/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.pdf index c82443381bea..c644b4cd8c5e 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.pdf and b/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.png b/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.png index f75601b67717..ab6317278b53 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.png and b/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.svg b/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.svg index c77f9edd7b51..b05173c1d236 100644 --- a/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.svg +++ b/lib/matplotlib/tests/baseline_images/test_lines/scaled_lines.svg @@ -32,10 +32,10 @@ z +" id="m25cd396ab9" style="stroke:#000000;stroke-width:0.8;"/> - + @@ -69,7 +69,7 @@ Q 19.53125 74.21875 31.78125 74.21875 - + @@ -108,7 +108,7 @@ z - + @@ -137,7 +137,7 @@ z - + @@ -151,7 +151,7 @@ z - + @@ -190,7 +190,7 @@ Q 31.109375 20.453125 19.1875 8.296875 - + @@ -204,7 +204,7 @@ Q 31.109375 20.453125 19.1875 8.296875 - + @@ -255,10 +255,10 @@ Q 46.96875 40.921875 40.578125 39.3125 +" id="mb0d3932513" style="stroke:#000000;stroke-width:0.8;"/> - + @@ -281,7 +281,7 @@ z - + @@ -296,7 +296,7 @@ z - + @@ -311,7 +311,7 @@ z - + @@ -326,7 +326,7 @@ z - + @@ -341,7 +341,7 @@ z - + @@ -356,7 +356,7 @@ z - + @@ -370,7 +370,7 @@ z - +" style="fill:none;stroke:#1f77b4;stroke-dasharray:1.85,0.8;stroke-dashoffset:0;stroke-width:0.5;"/> - +" style="fill:none;stroke:#1f77b4;stroke-dasharray:5.755556,2.488889;stroke-dashoffset:0;stroke-width:1.555556;"/> - +" style="fill:none;stroke:#1f77b4;stroke-dasharray:9.661111,4.177778;stroke-dashoffset:0;stroke-width:2.611111;"/> - +" style="fill:none;stroke:#1f77b4;stroke-dasharray:13.566667,5.866667;stroke-dashoffset:0;stroke-width:3.666667;"/> - +" style="fill:none;stroke:#1f77b4;stroke-dasharray:17.472222,7.555556;stroke-dashoffset:0;stroke-width:4.722222;"/> - +" style="fill:none;stroke:#1f77b4;stroke-dasharray:21.377778,9.244444;stroke-dashoffset:0;stroke-width:5.777778;"/> - +" style="fill:none;stroke:#1f77b4;stroke-dasharray:25.283333,10.933333;stroke-dashoffset:0;stroke-width:6.833333;"/> - +" style="fill:none;stroke:#1f77b4;stroke-dasharray:29.188889,12.622222;stroke-dashoffset:0;stroke-width:7.888889;"/> - +" style="fill:none;stroke:#1f77b4;stroke-dasharray:33.094444,14.311111;stroke-dashoffset:0;stroke-width:8.944444;"/> - +" style="fill:none;stroke:#1f77b4;stroke-dasharray:37,16;stroke-dashoffset:0;stroke-width:10;"/> - +" style="fill:none;stroke:#ff7f0e;stroke-dasharray:0.5,0.825;stroke-dashoffset:0;stroke-width:0.5;"/> - +" style="fill:none;stroke:#ff7f0e;stroke-dasharray:1.555556,2.566667;stroke-dashoffset:0;stroke-width:1.555556;"/> - +" style="fill:none;stroke:#ff7f0e;stroke-dasharray:2.611111,4.308333;stroke-dashoffset:0;stroke-width:2.611111;"/> - +" style="fill:none;stroke:#ff7f0e;stroke-dasharray:3.666667,6.05;stroke-dashoffset:0;stroke-width:3.666667;"/> - +" style="fill:none;stroke:#ff7f0e;stroke-dasharray:4.722222,7.791667;stroke-dashoffset:0;stroke-width:4.722222;"/> - +" style="fill:none;stroke:#ff7f0e;stroke-dasharray:5.777778,9.533333;stroke-dashoffset:0;stroke-width:5.777778;"/> - +" style="fill:none;stroke:#ff7f0e;stroke-dasharray:6.833333,11.275;stroke-dashoffset:0;stroke-width:6.833333;"/> - +" style="fill:none;stroke:#ff7f0e;stroke-dasharray:7.888889,13.016667;stroke-dashoffset:0;stroke-width:7.888889;"/> - +" style="fill:none;stroke:#ff7f0e;stroke-dasharray:8.944444,14.758333;stroke-dashoffset:0;stroke-width:8.944444;"/> - +" style="fill:none;stroke:#ff7f0e;stroke-dasharray:10,16.5;stroke-dashoffset:0;stroke-width:10;"/> - +" style="fill:none;stroke:#2ca02c;stroke-dasharray:3.2,0.8,0.5,0.8;stroke-dashoffset:0;stroke-width:0.5;"/> - +" style="fill:none;stroke:#2ca02c;stroke-dasharray:9.955556,2.488889,1.555556,2.488889;stroke-dashoffset:0;stroke-width:1.555556;"/> - +" style="fill:none;stroke:#2ca02c;stroke-dasharray:16.711111,4.177778,2.611111,4.177778;stroke-dashoffset:0;stroke-width:2.611111;"/> - +" style="fill:none;stroke:#2ca02c;stroke-dasharray:23.466667,5.866667,3.666667,5.866667;stroke-dashoffset:0;stroke-width:3.666667;"/> - +" style="fill:none;stroke:#2ca02c;stroke-dasharray:30.222222,7.555556,4.722222,7.555556;stroke-dashoffset:0;stroke-width:4.722222;"/> - +" style="fill:none;stroke:#2ca02c;stroke-dasharray:36.977778,9.244444,5.777778,9.244444;stroke-dashoffset:0;stroke-width:5.777778;"/> - +" style="fill:none;stroke:#2ca02c;stroke-dasharray:43.733333,10.933333,6.833333,10.933333;stroke-dashoffset:0;stroke-width:6.833333;"/> - +" style="fill:none;stroke:#2ca02c;stroke-dasharray:50.488889,12.622222,7.888889,12.622222;stroke-dashoffset:0;stroke-width:7.888889;"/> - +" style="fill:none;stroke:#2ca02c;stroke-dasharray:57.244444,14.311111,8.944444,14.311111;stroke-dashoffset:0;stroke-width:8.944444;"/> - +" style="fill:none;stroke:#2ca02c;stroke-dasharray:64,16,10,16;stroke-dashoffset:0;stroke-width:10;"/> +