|
|
@@ -7,9 +7,8 @@ from threading import Thread
|
|
|
from screen import screen_size
|
|
|
from tuio_server import TuioServer2D
|
|
|
from logger import Logger
|
|
|
-from events import Event, DownEvent, UpEvent, MoveEvent, Tap, \
|
|
|
- SingleTap, DoubleTap, Flick, Rotate, Pinch, \
|
|
|
- Pan
|
|
|
+from events import Event, DownEvent, UpEvent, MoveEvent, Tap, SingleTap, \
|
|
|
+ DoubleTap, Rotate, Pinch, Pan
|
|
|
|
|
|
# Heuristic constants
|
|
|
# TODO: Encapsulate screen resolution in distance heuristics
|
|
|
@@ -251,7 +250,6 @@ class MultitouchServer(Logger):
|
|
|
# There are no touch points, move the centroid out of the screen
|
|
|
self.centroid = -1., -1.
|
|
|
|
|
|
-
|
|
|
def centroid_movement(self):
|
|
|
cx, cy = self.centroid
|
|
|
ocx, ocy = self.old_centroid
|