From ecf6d3bb2f94d6ee1db45bcd2ec3adc7f7c2cd19 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Mon, 25 Mar 2013 13:37:16 -0400 Subject: [PATCH 1/2] The rcParam lines.marker should not be used for gridlines --- lib/matplotlib/axis.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py index c4707f6f7e25..f0aa06f740ba 100644 --- a/lib/matplotlib/axis.py +++ b/lib/matplotlib/axis.py @@ -412,6 +412,7 @@ def _get_gridline(self): linestyle=rcParams['grid.linestyle'], linewidth=rcParams['grid.linewidth'], alpha=rcParams['grid.alpha'], + markersize=0 ) l.set_transform(self.axes.get_xaxis_transform(which='grid')) l.get_path()._interpolation_steps = GRIDLINE_INTERPOLATION_STEPS @@ -550,6 +551,7 @@ def _get_gridline(self): linestyle=rcParams['grid.linestyle'], linewidth=rcParams['grid.linewidth'], alpha=rcParams['grid.alpha'], + markersize=0 ) l.set_transform(self.axes.get_yaxis_transform(which='grid')) From 1715f5cad9b9295b8abc61b914e38f98605a93f2 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Mon, 25 Mar 2013 13:50:55 -0400 Subject: [PATCH 2/2] Add a test --- .../test_axes/single_point.pdf | Bin 7007 -> 7624 bytes .../test_axes/single_point.png | Bin 9506 -> 14632 bytes .../test_axes/single_point.svg | 1166 ++++++++--------- lib/matplotlib/tests/test_axes.py | 4 + 4 files changed, 582 insertions(+), 588 deletions(-) diff --git a/lib/matplotlib/tests/baseline_images/test_axes/single_point.pdf b/lib/matplotlib/tests/baseline_images/test_axes/single_point.pdf index 3aed1e9a2534f8a25d879b2f8d0e58f59428c7ae..1659f97d4a3e0f616e8e0aafe86afbb8dfe2fe0b 100644 GIT binary patch delta 2706 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 literal 9506 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 - + - - - - +" id="m0f54036a79" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + + +C0 0 0 0 0 0 +C0 0 0 0 0 0 +C0 0 0 0 0 0 +C0 0 0 0 0 0 +C0 0 0 0 0 0 +C0 0 0 0 0 0 +C0 0 0 0 0 0 +C0 0 0 0 0 0 +z +" id="m8ac445234e" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - - + + + +L0 -4" id="mcb557df647" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> + + + + + + + + - + - - + + - + @@ -149,50 +167,49 @@ z - - - - + + + + + + + + - + - - - - + - + - + @@ -202,54 +219,53 @@ z - - - - + + + + + + + + - + - - - - + - + +L7.32812 8.29688 +Q12.9375 14.1094 22.625 23.8906 +Q32.3281 33.6875 34.8125 36.5312 +Q39.5469 41.8438 41.4219 45.5312 +Q43.3125 49.2188 43.3125 52.7812 +Q43.3125 58.5938 39.2344 62.25 +Q35.1562 65.9219 28.6094 65.9219 +Q23.9688 65.9219 18.8125 64.3125 +Q13.6719 62.7031 7.8125 59.4219 +L7.8125 69.3906 +Q13.7656 71.7812 18.9375 73 +Q24.125 74.2188 28.4219 74.2188 +Q39.75 74.2188 46.4844 68.5469 +Q53.2188 62.8906 53.2188 53.4219 +Q53.2188 48.9219 51.5312 44.8906 +Q49.8594 40.875 45.4062 35.4062 +Q44.1875 33.9844 37.6406 27.2188 +Q31.1094 20.4531 19.1875 8.29688" id="BitstreamVeraSans-Roman-32"/> - + @@ -259,29 +275,28 @@ Q31.1094 -20.4531 19.1875 -8.29688" id="BitstreamVeraSans-Roman-32"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -290,29 +305,28 @@ L0 4" id="m9416ebf055"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -321,29 +335,28 @@ L0 4" id="m9416ebf055"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -352,29 +365,28 @@ L0 4" id="m9416ebf055"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -385,29 +397,38 @@ L0 4" id="m9416ebf055"/> - + + + + + + + + +L4 0" id="mc8fcea1516" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + - + +L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + - + @@ -417,29 +438,28 @@ L-4 0" id="m560f5ef9cf"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -449,29 +469,28 @@ L-4 0" id="m560f5ef9cf"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -481,29 +500,28 @@ L-4 0" id="m560f5ef9cf"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -512,29 +530,28 @@ L-4 0" id="m560f5ef9cf"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -543,29 +560,28 @@ L-4 0" id="m560f5ef9cf"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -574,29 +590,28 @@ L-4 0" id="m560f5ef9cf"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -636,85 +651,65 @@ L72 231.709 z " style="fill:#ffffff;"/> - - - - - - - - - + - + - - - - + + + + + + + + - + - - - - + - + +M10.9844 1.51562 +L10.9844 10.5 +Q14.7031 8.73438 18.5 7.8125 +Q22.3125 6.89062 25.9844 6.89062 +Q35.75 6.89062 40.8906 13.4531 +Q46.0469 20.0156 46.7812 33.4062 +Q43.9531 29.2031 39.5938 26.9531 +Q35.25 24.7031 29.9844 24.7031 +Q19.0469 24.7031 12.6719 31.3125 +Q6.29688 37.9375 6.29688 49.4219 +Q6.29688 60.6406 12.9375 67.4219 +Q19.5781 74.2188 30.6094 74.2188 +Q43.2656 74.2188 49.9219 64.5156 +Q56.5938 54.8281 56.5938 36.375 +Q56.5938 19.1406 48.4062 8.85938 +Q40.2344 -1.42188 26.4219 -1.42188 +Q22.7031 -1.42188 18.8906 -0.6875 +Q15.0938 0.046875 10.9844 1.51562 +M30.6094 32.4219 +Q37.25 32.4219 41.125 36.9531 +Q45.0156 41.5 45.0156 49.4219 +Q45.0156 57.2812 41.125 61.8438 +Q37.25 66.4062 30.6094 66.4062 +Q23.9688 66.4062 20.0938 61.8438 +Q16.2188 57.2812 16.2188 49.4219 +Q16.2188 41.5 20.0938 36.9531 +Q23.9688 32.4219 30.6094 32.4219" id="BitstreamVeraSans-Roman-39"/> - + @@ -723,29 +718,28 @@ Q23.9688 -32.4219 30.6094 -32.4219" id="BitstreamVeraSans-Roman-39"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -754,67 +748,66 @@ L0 4" id="m9416ebf055"/> - - - - + + + + + + + + - + - - - - + - + +M31.7812 34.625 +Q24.75 34.625 20.7188 30.8594 +Q16.7031 27.0938 16.7031 20.5156 +Q16.7031 13.9219 20.7188 10.1562 +Q24.75 6.39062 31.7812 6.39062 +Q38.8125 6.39062 42.8594 10.1719 +Q46.9219 13.9688 46.9219 20.5156 +Q46.9219 27.0938 42.8906 30.8594 +Q38.875 34.625 31.7812 34.625 +M21.9219 38.8125 +Q15.5781 40.375 12.0312 44.7188 +Q8.5 49.0781 8.5 55.3281 +Q8.5 64.0625 14.7188 69.1406 +Q20.9531 74.2188 31.7812 74.2188 +Q42.6719 74.2188 48.875 69.1406 +Q55.0781 64.0625 55.0781 55.3281 +Q55.0781 49.0781 51.5312 44.7188 +Q48 40.375 41.7031 38.8125 +Q48.8281 37.1562 52.7969 32.3125 +Q56.7812 27.4844 56.7812 20.5156 +Q56.7812 9.90625 50.3125 4.23438 +Q43.8438 -1.42188 31.7812 -1.42188 +Q19.7344 -1.42188 13.25 4.23438 +Q6.78125 9.90625 6.78125 20.5156 +Q6.78125 27.4844 10.7812 32.3125 +Q14.7969 37.1562 21.9219 38.8125 +M18.3125 54.3906 +Q18.3125 48.7344 21.8438 45.5625 +Q25.3906 42.3906 31.7812 42.3906 +Q38.1406 42.3906 41.7188 45.5625 +Q45.3125 48.7344 45.3125 54.3906 +Q45.3125 60.0625 41.7188 63.2344 +Q38.1406 66.4062 31.7812 66.4062 +Q25.3906 66.4062 21.8438 63.2344 +Q18.3125 60.0625 18.3125 54.3906" id="BitstreamVeraSans-Roman-38"/> - + @@ -823,45 +816,44 @@ Q18.3125 -60.0625 18.3125 -54.3906" id="BitstreamVeraSans-Roman-38"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -870,29 +862,28 @@ z - - - - + + + + + + + + - + - - - - + - + - + @@ -901,29 +892,28 @@ L0 4" id="m9416ebf055"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -932,29 +922,28 @@ L0 4" id="m9416ebf055"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -965,29 +954,28 @@ L0 4" id="m9416ebf055"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -996,29 +984,28 @@ L-4 0" id="m560f5ef9cf"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -1027,29 +1014,28 @@ L-4 0" id="m560f5ef9cf"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -1058,29 +1044,28 @@ L-4 0" id="m560f5ef9cf"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -1089,29 +1074,28 @@ L-4 0" id="m560f5ef9cf"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -1120,29 +1104,28 @@ L-4 0" id="m560f5ef9cf"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -1151,29 +1134,28 @@ L-4 0" id="m560f5ef9cf"/> - - - - + + + + + + + + - + - - - - + - + - + @@ -1204,4 +1186,12 @@ L72 231.709" style="fill:none;stroke:#000000;"/> + + + + + + + + diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index 194bcf9ba06f..bea08ebcd778 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -215,6 +215,10 @@ def test_fill_units(): @image_comparison(baseline_images=['single_point']) def test_single_point(): + # Issue #1796: don't let lines.marker affect the grid + matplotlib.rcParams['lines.marker'] = 'o' + matplotlib.rcParams['axes.grid'] = True + fig = plt.figure() plt.subplot( 211 ) plt.plot( [0], [0], 'o' )