Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
multitouch
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Taddeüs Kroes
multitouch
Commits
0a7f8692
Commit
0a7f8692
authored
13 years ago
by
Taddeus Kroes
Browse files
Options
Downloads
Patches
Plain Diff
Replaced occurences of 'listener' with 'server'.
parent
0fc618e5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/draw.py
+12
-12
12 additions, 12 deletions
src/draw.py
src/touch.py
+15
-15
15 additions, 15 deletions
src/touch.py
with
27 additions
and
27 deletions
src/draw.py
+
12
−
12
View file @
0a7f8692
...
...
@@ -2,7 +2,7 @@
import
pygame
import
sys
import
time
from
touch
import
Multi
T
ouch
Listen
er
,
screen_size
from
touch
import
Multi
t
ouch
Serv
er
,
screen_size
from
math
import
degrees
,
cos
,
sin
from
events
import
Rotate
...
...
@@ -73,9 +73,9 @@ def update():
screen
.
blit
(
transformed
,
rect
)
# Draw touch points
c
=
coord
(
*
listen
er
.
centroid
)
c
=
coord
(
*
serv
er
.
centroid
)
for
p
in
listen
er
.
points
:
for
p
in
serv
er
.
points
:
xy
=
coord
(
p
.
x
,
p
.
y
)
# Draw line to centroid
...
...
@@ -131,14 +131,14 @@ def pinch(event):
scale
=
min
(
scale
*
event
.
amount
,
MAX_SCALE
)
# Start touch event
listen
er in separate thread
listen
er
=
Multi
T
ouch
Listen
er
(
verbose
=
1
,
tuio_verbose
=
0
)
listen
er
.
bind
(
'
rotate
'
,
rotate
)
listen
er
.
bind
(
'
pinch
'
,
pinch
)
listen
er
.
bind
(
'
tap
'
,
lambda
e
:
taps
.
append
([
coord
(
*
e
.
xy
),
FINGER_RADIUS
]))
listen
er
.
bind
(
'
single_tap
'
,
lambda
e
:
dtaps
.
append
(
list
(
coord
(
*
e
.
xy
))
+
[
1
]))
listen
er
.
bind
(
'
double_tap
'
,
lambda
e
:
dtaps
.
append
(
list
(
coord
(
*
e
.
xy
))
+
[
0
]))
listen
er
.
start
(
threaded
=
True
)
# Start touch event
serv
er in separate thread
serv
er
=
Multi
t
ouch
Serv
er
(
verbose
=
1
,
tuio_verbose
=
0
)
serv
er
.
bind
(
'
rotate
'
,
rotate
)
serv
er
.
bind
(
'
pinch
'
,
pinch
)
serv
er
.
bind
(
'
tap
'
,
lambda
e
:
taps
.
append
([
coord
(
*
e
.
xy
),
FINGER_RADIUS
]))
serv
er
.
bind
(
'
single_tap
'
,
lambda
e
:
dtaps
.
append
(
list
(
coord
(
*
e
.
xy
))
+
[
1
]))
serv
er
.
bind
(
'
double_tap
'
,
lambda
e
:
dtaps
.
append
(
list
(
coord
(
*
e
.
xy
))
+
[
0
]))
serv
er
.
start
(
threaded
=
True
)
def
is_quit_event
(
e
):
...
...
@@ -153,4 +153,4 @@ try:
except
KeyboardInterrupt
:
pass
finally
:
listen
er
.
stop
()
serv
er
.
stop
()
This diff is collapsed.
Click to expand it.
src/touch.py
+
15
−
15
View file @
0a7f8692
...
...
@@ -127,9 +127,9 @@ class TouchPoint(object):
return
rotation
(
prev
,
current
)
class
Multi
T
ouch
Listen
er
(
Logger
):
class
Multi
t
ouch
Serv
er
(
Logger
):
def
__init__
(
self
,
verbose
=
0
,
tuio_verbose
=
0
,
**
kwargs
):
super
(
Multi
T
ouch
Listen
er
,
self
).
__init__
(
**
kwargs
)
super
(
Multi
t
ouch
Serv
er
,
self
).
__init__
(
**
kwargs
)
self
.
verbose
=
verbose
self
.
last_tap
=
None
self
.
last_tap_time
=
0
...
...
@@ -151,7 +151,7 @@ class MultiTouchListener(Logger):
def
point_down
(
self
,
sid
,
x
,
y
):
"""
Called by TUIO
listen
er when a new touch point is created, triggers a
Called by TUIO
serv
er when a new touch point is created, triggers a
DownEvent.
"""
if
self
.
find_point
(
sid
):
...
...
@@ -165,7 +165,7 @@ class MultiTouchListener(Logger):
def
point_up
(
self
,
sid
):
"""
Called by TUIO
listen
er when a touch point is removed, triggers an
Called by TUIO
serv
er when a touch point is removed, triggers an
UpEvent. Also, simple/double tap detection is located here instead of
in the gesture thread (for responsiveness reasons).
"""
...
...
@@ -204,7 +204,7 @@ class MultiTouchListener(Logger):
def
point_move
(
self
,
sid
,
x
,
y
):
"""
Called by TUIO
listen
er when a touch point moves, triggers a MoveEvent.
Called by TUIO
serv
er when a touch point moves, triggers a MoveEvent.
The move event is only used if the movement distance is greater that a
preset constant, so that negligible movement is ignored. This prevents
unnecessary gesture detection.
...
...
@@ -394,7 +394,7 @@ class MultiTouchListener(Logger):
gesture_thread
.
daemon
=
True
gesture_thread
.
start
()
# Start TUIO
listen
er
# Start TUIO
serv
er
try
:
self
.
log
(
'
Starting TUIO server
'
)
self
.
server
.
start
()
...
...
@@ -430,17 +430,17 @@ if __name__ == '__main__':
def
tap
(
event
,
tap_type
):
print
'
tap:
'
,
tap_type
listen
er
=
Multi
T
ouch
Listen
er
(
verbose
=
1
,
tuio_verbose
=
0
)
listen
er
.
bind
(
'
tap
'
,
tap
,
0
)
listen
er
.
bind
(
'
single_tap
'
,
tap
,
1
)
listen
er
.
bind
(
'
double_tap
'
,
tap
,
2
)
serv
er
=
Multi
t
ouch
Serv
er
(
verbose
=
1
,
tuio_verbose
=
0
)
serv
er
.
bind
(
'
tap
'
,
tap
,
0
)
serv
er
.
bind
(
'
single_tap
'
,
tap
,
1
)
serv
er
.
bind
(
'
double_tap
'
,
tap
,
2
)
# Add empty handlers sp that the events are actually triggered
listen
er
.
bind
(
'
rotate
'
,
lambda
e
:
0
)
listen
er
.
bind
(
'
pinch
'
,
lambda
e
:
0
)
listen
er
.
bind
(
'
pan
'
,
lambda
e
:
0
)
serv
er
.
bind
(
'
rotate
'
,
lambda
e
:
0
)
serv
er
.
bind
(
'
pinch
'
,
lambda
e
:
0
)
serv
er
.
bind
(
'
pan
'
,
lambda
e
:
0
)
try
:
listen
er
.
start
()
serv
er
.
start
()
except
KeyboardInterrupt
:
listen
er
.
stop
()
serv
er
.
stop
()
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment