Parcourir la source

Moved logging functionality to Logger class.

Admin il y a 14 ans
Parent
commit
7f609252f4
2 fichiers modifiés avec 18 ajouts et 7 suppressions
  1. 13 0
      src/logger.py
  2. 5 7
      src/touch.py

+ 13 - 0
src/logger.py

@@ -0,0 +1,13 @@
+#import time
+
+
+class Logger(object):
+    def __init__(self, **kwargs):
+        self.identifier = kwargs.get('identifier',
+                                     self.__class__.__name__)
+        self.verbose = kwargs.get('verbose', 0)
+
+    def log(self, msg, verbosity=1):
+        # TODO: log time
+        if self.verbose >= verbosity:
+            print '| %s | %s' % (self.identifier, msg)

+ 5 - 7
src/touch.py

@@ -2,8 +2,9 @@
 import time
 from threading import Thread
 from math import atan2, pi
-from OSC import OSCServer
 
+from tuio_server import TuiListener
+from logger import Logger
 from events import TapEvent, FlickEvent, RotateEvent, PinchEvent, PanEvent
 
 
@@ -69,8 +70,9 @@ TAP_TIMEOUT = .200
 MAX_MULTI_DRAG_DISTANCE = 100
 
 
-class MultiTouchListener(object):
-    def __init__(self, verbose=0, update_rate=60):
+class MultiTouchListener(Logger):
+    def __init__(self, verbose=0, update_rate=60, **kwargs):
+        super(MultiTouchListener, self).__init__(**kwargs)
         self.verbose = verbose
         self.last_tap = 0
         self.update_rate = update_rate
@@ -251,10 +253,6 @@ class MultiTouchListener(object):
         except KeyboardInterrupt:
             self.log('Stopping event loop')
 
-    def log(self, msg, verbosity=1):
-        if self.verbose >= verbosity:
-            print '| LOG | %s' % msg
-
     def bind(self, gesture, handler):
         if gesture not in SUPPORTED_GESTURES:
             raise ValueError('Unsupported gesture "%s".' % gesture)