Revision: 8280 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8280&view=rev Author: mdboom Date: 2010-04-28 15:08:19 +0000 (Wed, 28 Apr 2010)
Log Message: ----------- Fix path simplification -- distance threshold should have been squared. Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/offset_points.png trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_axes.png trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.png trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.svg trunk/matplotlib/lib/matplotlib/tests/test_simplification.py trunk/matplotlib/src/path_converters.h Modified: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/offset_points.png =================================================================== (Binary files differ) Modified: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_axes.png =================================================================== (Binary files differ) Modified: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.png =================================================================== (Binary files differ) Modified: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.svg =================================================================== --- trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.svg 2010-04-28 06:44:49 UTC (rev 8279) +++ trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.svg 2010-04-28 15:08:19 UTC (rev 8280) @@ -23,11 +23,12 @@ <clipPath id="p50431ccdcb28178602d99d9270004dde"> <rect x="72.000000" y="43.200000" width="446.400000" height="345.600000"/> </clipPath> -</defs><path style="fill: none; stroke: #0000ff; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p50431ccdcb28178602d99d9270004dde)" d="M72.000000 388.800000L76.145143 388.578724L76.151520 388.455734 -L76.157897 388.474541L76.177029 70.552590L76.489509 388.799636 -L175.303337 388.800000L485.723520 388.493668L485.736274 386.681411 -L485.755406 70.552590L486.067886 388.799652L489.926057 388.800000 -L489.926057 388.800000"/> +</defs><path style="fill: none; stroke: #0000ff; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" clip-path="url(#p50431ccdcb28178602d99d9270004dde)" d="M72.000000 388.800000L76.132389 388.704243L76.151520 388.455734 +L76.157897 388.474541L76.170651 262.490246L76.177029 70.552590 +L76.272686 388.786908L76.629806 388.799881L221.059337 388.800000 +L485.704389 388.713691L485.729897 388.401770L485.736274 386.681411 +L485.755406 70.552590L485.844686 388.786149L486.182674 388.799863 +L489.926057 388.800000L489.926057 388.800000"/> </g> <g id="matplotlib.axis1"> </g> Modified: trunk/matplotlib/lib/matplotlib/tests/test_simplification.py =================================================================== --- trunk/matplotlib/lib/matplotlib/tests/test_simplification.py 2010-04-28 06:44:49 UTC (rev 8279) +++ trunk/matplotlib/lib/matplotlib/tests/test_simplification.py 2010-04-28 15:08:19 UTC (rev 8280) @@ -69,7 +69,7 @@ path = transform.transform_path(path) simplified = list(path.iter_segments(simplify=(800, 600))) - assert len(simplified) == 2675 + assert len(simplified) == 3884 def test_sine_plus_noise(): np.random.seed(0) @@ -86,7 +86,7 @@ path = transform.transform_path(path) simplified = list(path.iter_segments(simplify=(800, 600))) - assert len(simplified) == 628 + assert len(simplified) == 876 @image_comparison(baseline_images=['simplify_curve']) def test_simplify_curve(): @@ -131,7 +131,7 @@ path = transform.transform_path(path) simplified = list(path.iter_segments(simplify=(800, 600))) - assert len(simplified) == 13 + assert len(simplified) == 17 def test_start_with_moveto(): # Should be entirely clipped away to a single MOVETO Modified: trunk/matplotlib/src/path_converters.h =================================================================== --- trunk/matplotlib/src/path_converters.h 2010-04-28 06:44:49 UTC (rev 8279) +++ trunk/matplotlib/src/path_converters.h 2010-04-28 15:08:19 UTC (rev 8280) @@ -477,7 +477,7 @@ /* Set simplify to true to perform simplification */ PathSimplifier(VertexSource& source, bool do_simplify, double simplify_threshold) : m_source(&source), m_simplify(do_simplify), - m_simplify_threshold(simplify_threshold), + m_simplify_threshold(simplify_threshold*simplify_threshold), m_moveto(true), m_after_moveto(false), m_lastx(0.0), m_lasty(0.0), m_clipped(false), m_origdx(0.0), m_origdy(0.0), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ _______________________________________________ Matplotlib-checkins mailing list Matplotlib-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins