Matt, Paul,

Find bellow the diff of my last 3 commits :

I've made the diff between a local copy and the one pushed on lp:
So everything starting with + has been removed and everything starting with - has been added.

I've done a bit of clean up in the MotionBuffer Class and added more tests.

Samuel- 

=== modified file 'entertainerlib/frontend/gui/widgets/motion_buffer.py'
--- entertainerlib/frontend/gui/widgets/motion_buffer.py	2009-04-28 09:49:40 +0000
+++ entertainerlib/frontend/gui/widgets/motion_buffer.py	2009-04-28 12:19:55 +0000
@@ -22,6 +22,9 @@
         self.dx_from_start = 0
         self.dy_from_start = 0
         self.distance_from_start = 0
+        self.speed_x_from_start = 0
+        self.speed_y_from_start = 0
+        self.speed_from_start = 0
 
         self.dt_from_last_motion_event = 0
         self.dx_from_last_motion_event = 0
@@ -84,6 +87,18 @@
         self.distance_from_start = math.sqrt(self.dx_from_start * \
             self.dx_from_start + self.dy_from_start * self.dy_from_start)
 
+        if self.dt_from_start != 0 :
+            self.speed_x_from_start = float(self.dx_from_start) / \
+                float(self.dt_from_start)
+            self.speed_y_from_start = float(self.dy_from_start) / \
+                float(self.dt_from_start)
+            self.speed_from_start = float(self.distance_from_start) / \
+                float(self.dt_from_start)
+        else:
+            self.speed_x_from_start = 0
+            self.speed_y_from_start = 0
+            self.speed_from_start = 0
+
     def compute_from_last_motion_event(self, event):
         '''Compute deltas and speeds from the last motion-event.'''
         self.dt_from_last_motion_event = event.time - \

=== modified file 'entertainerlib/frontend/gui/widgets/scroll_menu.py'
--- entertainerlib/frontend/gui/widgets/scroll_menu.py	2009-04-28 12:18:16 +0000
+++ entertainerlib/frontend/gui/widgets/scroll_menu.py	2009-04-28 12:19:55 +0000
@@ -117,10 +117,6 @@
 
     active = property(_get_active, _set_active)
 
-    def stop_animation(self):
-        '''Stops the timeline driving menu animation.'''
-        self._timeline.stop()
-
     def _update_behaviours(self, target):
         """Preparation of behaviours applied to menu items before animation"""
         items_len = len(self._items)

=== modified file 'entertainerlib/tests/mock.py'
--- entertainerlib/tests/mock.py	2009-04-28 11:49:43 +0000
+++ entertainerlib/tests/mock.py	2009-04-28 12:19:55 +0000
@@ -304,12 +304,3 @@
         '''See `VideoLibrary.get_number_of_video_clips`.'''
         return 0
 
-
-class MockPointerEvent(object):
-    '''Mock a pointer event like those generated by Clutter'''
-
-    def __init__(self):
-        self.x = 0
-        self.y = 0
-        self.time = 0
-

=== removed file 'entertainerlib/tests/test_motionbuffer.py'
--- entertainerlib/tests/test_motionbuffer.py	2009-04-28 12:18:16 +0000
+++ entertainerlib/tests/test_motionbuffer.py	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-"""Tests MotionBuffer"""
-
-__license__ = "GPLv2"
-__copyright__ = "2009, Samuel Buffet"
-__author__ = "Samuel Buffet <email address hidden>"
-
-from entertainerlib.frontend.gui.widgets.motion_buffer import MotionBuffer
-from entertainerlib.tests import EntertainerTest
-from entertainerlib.tests.mock import MockPointerEvent
-
-class MotionBufferTest(EntertainerTest):
-    """Test for entertainerlib.frontend.gui.widgets.motion_buffer"""
-
-    def setUp(self):
-        '''Set up the test.'''
-        EntertainerTest.setUp(self)
-
-        self.buffer = MotionBuffer()
-
-    def tearDown(self):
-        '''Clean up after the test.'''
-        EntertainerTest.tearDown(self)
-
-    def test_create(self):
-        '''Test correct MotionBuffer initialization.'''
-        self.assertTrue(isinstance(self.buffer, MotionBuffer))
-
-    def test_computations_from_start(self):
-        '''Test all values on a 3 events motion, computed from start.'''
-        self.buffer.start(self._create_first_event())
-        self.buffer.take_new_motion_event(self._create_second_event())
-        self.buffer.compute_from_start(self._create_third_event())
-
-        self.assertEqual(self.buffer.dt_from_start, 2)
-        self.assertEqual(self.buffer.dx_from_start, 10)
-        self.assertEqual(self.buffer.dy_from_start, 10)
-        self.assertAlmostEqual(self.buffer.distance_from_start, 14.142135624)
-
-    def test_computations_from_last_event(self):
-        '''Test all values on a 3 events motion, computed from last event.'''
-        self.buffer.start(self._create_first_event())
-        self.buffer.take_new_motion_event(self._create_second_event())
-        self.buffer.compute_from_last_motion_event(self._create_third_event())
-
-        self.assertEqual(self.buffer.dt_from_last_motion_event, 1)
-        self.assertEqual(self.buffer.dx_from_last_motion_event, 10)
-        self.assertEqual(self.buffer.dy_from_last_motion_event, 0)
-        self.assertEqual(self.buffer.distance_from_last_motion_event, 10.0)
-        self.assertEqual(self.buffer.speed_x_from_last_motion_event, 10.0)
-        self.assertEqual(self.buffer.speed_y_from_last_motion_event, 0.0)
-        self.assertEqual(self.buffer.speed_from_last_motion_event, 10.0)
-        self.assertAlmostEqual(self.buffer.dt_ema, 0.3333333333)
-        self.assertAlmostEqual(self.buffer.dx_ema, 3.3333333333)
-        self.assertAlmostEqual(self.buffer.dy_ema, 0.0)
-        self.assertAlmostEqual(self.buffer.distance_ema, 3.3333333333)
-        self.assertAlmostEqual(self.buffer.speed_x_ema, 3.3333333333)
-        self.assertAlmostEqual(self.buffer.speed_y_ema, 0.0)
-        self.assertAlmostEqual(self.buffer.speed_ema, 3.3333333333)
-
-    def _create_first_event(self):
-        '''Create a virtual pointer event.'''
-        event = MockPointerEvent()
-        event.x = 100
-        event.y = 100
-        event.time = 0
-        return event
-
-    def _create_second_event(self):
-        '''Create a virtual pointer event.'''
-        event = MockPointerEvent()
-        event.x = 100
-        event.y = 110
-        event.time = 1
-        return event
-
-    def _create_third_event(self):
-        '''Create a virtual pointer event.'''
-        event = MockPointerEvent()
-        event.x = 110
-        event.y = 110
-        event.time = 2
-        return event
-

=== modified file 'entertainerlib/tests/test_scrollmenu.py'
--- entertainerlib/tests/test_scrollmenu.py	2009-04-28 12:18:16 +0000
+++ entertainerlib/tests/test_scrollmenu.py	2009-04-28 12:19:55 +0000
@@ -4,8 +4,6 @@
 __copyright__ = "2009, Samuel Buffet"
 __author__ = "Samuel Buffet <email address hidden>"
 
-import time
-
 from entertainerlib.frontend.gui.widgets.scroll_menu import ScrollMenu
 from entertainerlib.tests import EntertainerTest
 
@@ -13,7 +11,7 @@
     """Test for entertainerlib.frontend.gui.widgets.scroll_menu"""
 
     def setUp(self):
-        '''Set up the test.'''
+        """Set up the test"""
         EntertainerTest.setUp(self)
 
         self.menu = ScrollMenu(10, 60, 0.045, "menuitem_active")
@@ -26,35 +24,10 @@
         self.menu.add_item(_("Headlines"), "rss")
 
     def tearDown(self):
-        '''Clean up after the test.'''
+        """Clean up after the test"""
         EntertainerTest.tearDown(self)
 
     def test_create(self):
-        '''Test correct ScrollMenu initialization.'''
+        """Test correct ScrollArea initialization"""
         self.assertTrue(isinstance(self.menu, ScrollMenu))
 
-    def test_selected_index(self):
-        '''Test the use of the selected_index property.'''
-        self.menu.selected_index = 2
-        self.assertEqual(self.menu.selected_index, self.menu.get_index("music"))
-
-    def test_get_index(self):
-        '''Test the use of the get_index method.'''
-        self.assertEqual(self.menu.get_index("photo"), 3)
-
-    def test_scroll_up(self):
-        '''Test the use of the scroll_up method.'''
-        self.menu.selected_index = 2
-        self.menu.stop_animation()
-        self.menu.scroll_up()
-        time.sleep(1)
-        self.assertEqual(self.menu.selected_index, 1)
-
-    def test_scroll_down(self):
-        '''Test the use of the scroll_up method.'''
-        self.menu.selected_index = 2
-        self.menu.stop_animation()
-        self.menu.scroll_down()
-        time.sleep(1)
-        self.assertEqual(self.menu.selected_index, 3)
-