Renamed some classes and variables.

- Removed '__' from at begin and end of class variables.
- Renamed input server to event server.

TODO.txt

@@ -1,7 +1,6 @@
 Code:
 - Connect to VTK.
 - Rotation has a 'bump' at 0.
-- Rename InputServer to EventServer.
 
 Thesis:
 - Network protocol.

src/input_server.py → src/event_server.py

@@ -1,10 +1,10 @@
 from logger import Logger
 
 
-class InputServer(Logger):
+class EventServer(Logger):
     """
-    Abstract class for input servers. An input server translates driver
-    events to point 'down', 'move' and 'up' events. An input server
+    Abstract class for event servers. An event server translates driver
+    events to point 'down', 'move' and 'up' events. An event server
     implementation should define the methods 'start' and 'stop', which
     starts/stops some event loop that triggers on_point_up, on_point_move and
     on_point_down methods on the 'handler_obj' object.
@@ -19,7 +19,7 @@ class InputServer(Logger):
         raise NotImplementedError
 
 
-class InputServerHandler(Logger):
+class EventServerHandler(Logger):
     """
     Interface for gesture server. Defines empty on_point_up, on_point_move and
     on_point_down handlers.

src/geometry.py

@@ -128,7 +128,7 @@ class Surface(Positionable):
     'contains', which calculates whether a position is located in the surface.
     """
     def contains(self, point):
-        raise NotImplemented
+        raise NotImplementedError
 
 
 class RectangularSurface(Surface):

src/server.py → src/gesture_server.py

@@ -1,10 +1,10 @@
-from input_server import InputServerHandler
+from event_server import EventServerHandler
 from tuio_server import TuioServer2D
 from window import FullscreenWindow
 from point import TouchPoint
 
 
-class GestureServer(InputServerHandler):
+class GestureServer(EventServerHandler):
     """
     Multi-touch gesture server. This uses a TUIO server to receive basic touch
     events, which are translated to gestures using gesture trackers. Trackers

src/tracker.py

@@ -36,14 +36,14 @@ class GestureTracker(Logger):
             self.handlers[gesture_type].append(h)
 
     def trigger(self, gesture):
-        if gesture.__type__ not in self.handlers:
+        if gesture._type not in self.handlers:
             self.debug('Triggered "%s", but no handlers are bound.'
-                       % gesture.__type__)
+                       % gesture._type)
             return
 
         self.info('Triggered %s.' % gesture)
 
-        for handler, args, kwargs in self.handlers[gesture.__type__]:
+        for handler, args, kwargs in self.handlers[gesture._type]:
             handler(gesture, *args, **kwargs)
 
     def is_type_bound(self, gesture_type):

src/trackers/basic.py

@@ -7,7 +7,7 @@ class BasicTracker(GestureTracker):
     The main goal of this class is to provide a triggering mechanism for the
     low-level point-down, point-move and point-up events.
     """
-    __gesture_types__ = ['down', 'move', 'up']
+    gesture_types = ['down', 'move', 'up']
 
     def on_point_down(self, point):
         self.trigger(DownGesture(point))
@@ -20,12 +20,12 @@ class BasicTracker(GestureTracker):
 
 
 class DownGesture(PointGesture):
-    __type__ = 'down'
+    _type = 'down'
 
 
 class MoveGesture(PointGesture):
-    __type__ = 'move'
+    _type = 'move'
 
 
 class UpGesture(PointGesture):
-    __type__ = 'up'
+    _type = 'up'

src/trackers/tap.py

@@ -7,10 +7,10 @@ from utils import PointGesture
 
 
 class TapTracker(GestureTracker):
-    __gesture_types__ = ['tap', 'single_tap', 'double_tap']
+    gesture_types = ['tap', 'single_tap', 'double_tap']
 
-    __configurable__ = ['tap_distance', 'tap_time', 'double_tap_time',
-                        'double_tap_distance', 'update_rate']
+    configurable = ['tap_distance', 'tap_time', 'double_tap_time',
+                    'double_tap_distance', 'update_rate']
 
     def __init__(self, window=None):
         super(TapTracker, self).__init__(window)
@@ -110,7 +110,7 @@ class TapGesture(PointGesture):
     """
     A tap gesture is triggered
     """
-    __type__ = 'tap'
+    _type = 'tap'
 
 
 class SingleTapGesture(TapGesture):
@@ -118,7 +118,7 @@ class SingleTapGesture(TapGesture):
     A single tap gesture is triggered after a regular tap gesture, if no double
     tap is triggered for that gesture.
     """
-    __type__ = 'single_tap'
+    _type = 'single_tap'
 
 
 class DoubleTapGesture(TapGesture):
@@ -126,4 +126,4 @@ class DoubleTapGesture(TapGesture):
     A double tap gesture is triggered if two sequential taps are triggered
     within a certain time and distance of eachother.
     """
-    __type__ = 'double_tap'
+    _type = 'double_tap'

src/trackers/transform.py

@@ -9,7 +9,7 @@ class TransformationTracker(GestureTracker):
     Tracker for linear transformations. This implementation detects rotation,
     scaling and translation using the centroid of all touch points.
     """
-    __gesture_types__ = ['rotate', 'pinch', 'move']
+    gesture_types = ['rotate', 'pinch', 'move']
 
     def __init__(self, window=None):
         super(TransformationTracker, self).__init__(window)
@@ -77,7 +77,7 @@ class RotationGesture(Positionable, Gesture):
     """
     A rotation gesture has a angle in radians and a rotational centroid.
     """
-    __type__ = 'rotate'
+    _type = 'rotate'
 
     def __init__(self, centroid, angle):
         Positionable.__init__(self, *centroid.get_position())
@@ -96,7 +96,7 @@ class PinchGesture(Positionable, Gesture):
     A pinch gesture has a scale (1.0 means no scaling) and a centroid from
     which the scaling originates.
     """
-    __type__ = 'pinch'
+    _type = 'pinch'
 
     def __init__(self, centroid, scale):
         Positionable.__init__(self, *centroid.get_position())
@@ -115,7 +115,7 @@ class MovementGesture(Positionable, Gesture):
     A momevent gesture has an initial position, and a translation from that
     position.
     """
-    __type__ = 'move'
+    _type = 'move'
 
     def __init__(self, initial_position, translation):
         Positionable.__init__(self, *initial_position.get_position())

src/tuio_server.py

@@ -1,11 +1,11 @@
 from OSC import OSCServer
 OSCServer.print_tracebacks = True
 
-from input_server import InputServer
+from event_server import EventServer
 from screen import pixel_coords
 
 
-class TuioServer2D(InputServer):
+class TuioServer2D(EventServer):
     tuio_address = 'localhost', 3333
 
     def __init__(self, handler_obj):
@@ -84,7 +84,7 @@ if __name__ == '__main__':
     import logging
 
     from logger import Logger
-    from input_server import InputServerHandler
+    from event_server import EventServerHandler
 
     parser = argparse.ArgumentParser(description='TUIO server test.')
     parser.add_argument('--log', metavar='LOG_LEVEL', default='INFO',
@@ -102,7 +102,7 @@ if __name__ == '__main__':
     Logger.configure(**log_config)
 
     # Define handlers
-    class Handler(InputServerHandler, Logger):
+    class Handler(EventServerHandler, Logger):
         def on_point_down(self, sid, x, y):
             self.info('Point down: sid=%d (%.4f, %.4f)' % (sid, x, y))
 

tests/basic.py

@@ -1,4 +1,4 @@
-from src.server import GestureServer
+from src.gesture_server import GestureServer
 from src.window import FullscreenWindow
 from src.trackers.basic import BasicTracker
 

tests/draw.py

@@ -4,7 +4,7 @@ import pygame
 from threading import Thread
 from math import degrees
 
-from src.server import GestureServer
+from src.gesture_server import GestureServer
 from src.window import FullscreenWindow
 from src.trackers.transform import TransformationTracker
 from src.trackers.tap import TapTracker

tests/tap.py

@@ -1,4 +1,4 @@
-from src.server import GestureServer
+from src.gesture_server import GestureServer
 from src.window import FullscreenWindow
 from src.trackers.tap import TapTracker
 

tests/transform.py

@@ -1,4 +1,4 @@
-from src.server import GestureServer
+from src.gesture_server import GestureServer
 from src.window import FullscreenWindow
 from src.trackers.transform import TransformationTracker