matplotlib-checkins

SF.net SVN: matplotlib:[7896] branches/v0_99_maint/src/path_converters.h

[<md...@us...>]

Revision: 7896
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7896&view=rev
Author:   mdboom
Date:     2009-10-21 13:24:33 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
Fix bug in simplification code that was clipping peaks.

Modified Paths:
--------------
    branches/v0_99_maint/src/path_converters.h

Modified: branches/v0_99_maint/src/path_converters.h
===================================================================
--- branches/v0_99_maint/src/path_converters.h	2009-10-21 13:23:47 UTC (rev 7895)
+++ branches/v0_99_maint/src/path_converters.h	2009-10-21 13:24:33 UTC (rev 7896)
@@ -568,11 +568,15 @@
             }
             m_after_moveto = false;
 
+            /* NOTE: We used to skip this very short segments, but if
+               you have a lot of them cumulatively, you can miss
+               maxima or minima in the data. */
+
             /* Don't render line segments less than one pixel long */
-            if (fabs(*x - m_lastx) < 1.0 && fabs(*y - m_lasty) < 1.0)
-            {
-                continue;
-            }
+            /* if (fabs(*x - m_lastx) < 1.0 && fabs(*y - m_lasty) < 1.0) */
+            /* { */
+            /*     continue; */
+            /* } */
 
             /* if we have no orig vector, set it to this vector and
                continue.  this orig vector is the reference vector we
@@ -649,7 +653,7 @@
                 }
                 else
                 {
-                    if (paradNorm2 > m_dnorm2Min)
+                    if (paradNorm2 < m_dnorm2Min)
                     {
                         m_dnorm2Min = paradNorm2;
                         m_nextX = *x;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[7901] branches/v0_99_maint/src/path_converters.h

[<md...@us...>]

Revision: 7901
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7901&view=rev
Author:   mdboom
Date:     2009-10-22 13:46:08 +0000 (Thu, 22 Oct 2009)

Log Message:
-----------
Fix path simplification so the path always starts with a MOVETO.

Modified Paths:
--------------
    branches/v0_99_maint/src/path_converters.h

Modified: branches/v0_99_maint/src/path_converters.h
===================================================================
--- branches/v0_99_maint/src/path_converters.h	2009-10-22 13:43:31 UTC (rev 7900)
+++ branches/v0_99_maint/src/path_converters.h	2009-10-22 13:46:08 UTC (rev 7901)
@@ -684,9 +684,15 @@
         {
             if (m_origdNorm2 != 0.0)
             {
-                queue_push(agg::path_cmd_line_to, m_nextX, m_nextY);
+              queue_push((m_moveto || m_after_moveto) ?
+                         agg::path_cmd_move_to : agg::path_cmd_line_to,
+                         m_nextX, m_nextY);
+              m_moveto = false;
             }
-            queue_push(agg::path_cmd_line_to, m_lastx, m_lasty);
+            queue_push((m_moveto || m_after_moveto) ?
+                       agg::path_cmd_move_to : agg::path_cmd_line_to,
+                       m_lastx, m_lasty);
+            m_moveto = false;
             queue_push(agg::path_cmd_stop, 0.0, 0.0);
         }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.