Merged revisions 8690-8691,8696-8697 via svnmerge from

https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8690 | mdboom | 2010-09-08 09:32:17 -0500 (Wed, 08 Sep 2010) | 2 lines
  
  [3058804] part of a line is not drawn
........
  r8691 | mdboom | 2010-09-08 10:51:18 -0500 (Wed, 08 Sep 2010) | 2 lines
  
  Another pass at fixing simplification.
........
  r8696 | ryanmay | 2010-09-11 14:02:38 -0500 (Sat, 11 Sep 2010) | 1 line
  
  Fix typo in griddata().
........
  r8697 | ryanmay | 2010-09-11 14:03:52 -0500 (Sat, 11 Sep 2010) | 1 line
  
  Handle multple calls to GTKTimer.start() by stopping any existing gtk timer id.
........

svn path=/trunk/matplotlib/; revision=8698

Author: dopplershift

lib/matplotlib/backends/backend_gtk.py

@@ -101,6 +101,9 @@ class TimerGTK(TimerBase):
         functions add_callback and remove_callback can be used.
     '''
     def _timer_start(self):
+        # Need to stop it, otherwise we potentially leak a timer id that will
+        # never be stopped.
+        self._timer_stop()
         self._timer = gobject.timeout_add(self._interval, self._on_timer)
 
     def _timer_stop(self):
@@ -109,6 +112,7 @@ def _timer_stop(self):
             self._timer = None
 
     def _timer_set_interval(self):
+        # Only stop and restart it if the timer has already been started
         if self._timer is not None:
             self._timer_stop()
             self._timer_start()

lib/matplotlib/mlab.py

@@ -2719,7 +2719,7 @@ def griddata(x,y,z,xi,yi,interp='nn'):
     # remove masked points.
     if hasattr(z,'mask'):
         # make sure mask is not a scalar boolean array.
-        if a.mask.ndim:
+        if z.mask.ndim:
             x = x.compress(z.mask == False)
             y = y.compress(z.mask == False)
             z = z.compressed()

lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.pdf

@@ -73,6 +73,8 @@ def test_noise():
     path = transform.transform_path(path)
     simplified = list(path.iter_segments(simplify=(800, 600)))
 
+    print len(simplified)
+
     assert len(simplified) == 3884
 
 def test_sine_plus_noise():
@@ -90,6 +92,8 @@ def test_sine_plus_noise():
     path = transform.transform_path(path)
     simplified = list(path.iter_segments(simplify=(800, 600)))
 
+    print len(simplified)
+
     assert len(simplified) == 876
 
 @image_comparison(baseline_images=['simplify_curve'])
@@ -135,7 +139,9 @@ def test_fft_peaks():
     path = transform.transform_path(path)
     simplified = list(path.iter_segments(simplify=(800, 600)))
 
-    assert len(simplified) == 17
+    print len(simplified)
+
+    assert len(simplified) == 20
 
 def test_start_with_moveto():
     # Should be entirely clipped away to a single MOVETO
@@ -204,6 +210,17 @@ def test_clipper():
     ax.set_xlim(5, 9)
     fig.savefig('clipper_edge')
 
+@image_comparison(baseline_images=['para_equal_perp'])
+def test_para_equal_perp():
+    x = np.array([0, 1, 2, 1, 0, -1, 0, 1] + [1] * 128)
+    y = np.array([1, 1, 2, 1, 0, -1, 0, 0] + [0] * 128)
+
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
+    ax.plot(x + 1, y + 1)
+    ax.plot(x + 1, y + 1, 'ro')
+    fig.savefig('para_equal_perp')
+
 if __name__=='__main__':
     import nose
     nose.runmodule(argv=['-s','--with-doctest'], exit=False)

lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.png

@@ -520,7 +520,7 @@ class PathSimplifier : protected EmbeddedQueue<9>
         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),
-        m_origdNorm2(0.0), m_dnorm2Max(0.0), m_dnorm2Min(0.0),
+        m_origdNorm2(0.0), m_dnorm2Max(0.0),
         m_lastMax(false), m_nextX(0.0), m_nextY(0.0),
         m_lastWrittenX(0.0), m_lastWrittenY(0.0)
     {
@@ -637,7 +637,6 @@ class PathSimplifier : protected EmbeddedQueue<9>
 
                 //set all the variables to reflect this new orig vector
                 m_dnorm2Max = m_origdNorm2;
-                m_dnorm2Min = 0.0;
                 m_lastMax = true;
 
                 m_nextX = m_lastWrittenX = m_lastx = *x;
@@ -677,13 +676,11 @@ class PathSimplifier : protected EmbeddedQueue<9>
                 /* check if the current vector is parallel or
                    anti-parallel to the orig vector. If it is
                    parallel, test if it is the longest of the vectors
-                   we are merging in that direction. If anti-p, test
-                   if it is the longest in the opposite direction (the
-                   min of our final line) */
+                   we are merging in that direction. */
                 double paradNorm2 = paradx * paradx + parady * parady;
 
                 m_lastMax = false;
-                if (totdot >= 0.0)
+                if (totdot > 0.0)
                 {
                     if (paradNorm2 > m_dnorm2Max)
                     {
@@ -695,12 +692,9 @@ class PathSimplifier : protected EmbeddedQueue<9>
                 }
                 else
                 {
-                    if (paradNorm2 < m_dnorm2Min)
-                    {
-                        m_dnorm2Min = paradNorm2;
-                        m_nextX = *x;
-                        m_nextY = *y;
-                    }
+                    _push(&m_lastx, &m_lasty);
+                    _push(x, y);
+                    break;
                 }
 
                 m_lastx = *x;
@@ -764,7 +758,6 @@ class PathSimplifier : protected EmbeddedQueue<9>
     double m_origdy;
     double m_origdNorm2;
     double m_dnorm2Max;
-    double m_dnorm2Min;
     bool   m_lastMax;
     double m_nextX;
     double m_nextY;
@@ -799,7 +792,6 @@ class PathSimplifier : protected EmbeddedQueue<9>
         m_origdNorm2 = m_origdx * m_origdx + m_origdy * m_origdy;
 
         m_dnorm2Max = m_origdNorm2;
-        m_dnorm2Min = 0.0;
         m_lastMax = true;
         m_lastWrittenX = m_queue[m_queue_write-1].x;
         m_lastWrittenY = m_queue[m_queue_write-1].y;