Skip to content

Fix stringing issue on some touchpads #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JM1705 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix stringing issue on some touchpads #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 32 additions & 20 deletions fingerpaint/fingerpaint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@
import evdev
import pyudev

from datetime import datetime

DEFAULT_WIDTH = 600
AA_FACTOR = 4 # Anti-aliasing
OUTPUT_SCALE = 2
MAX_REFRESH_INTERVAL = 0.04 # Works on my ~80hz touchpad, may need to increase for slower touchpads


@contextlib.contextmanager
Expand Down Expand Up @@ -94,25 +97,30 @@ def exit_handler(_):
screen_projected_end = (line[1][0] * window_size[0], line[1][1] * window_size[1])
image_projected_start = (line[0][0] * image_size[0], line[0][1] * image_size[1])
image_projected_end = (line[1][0] * image_size[0], line[1][1] * image_size[1])
canvas.create_line(
screen_projected_start, screen_projected_end,
width=args.line_thickness, capstyle=tkinter.ROUND, fill=args.line_color
)
image_canvas.line(
((int(image_projected_start[0] * aa_factor), int(image_projected_start[1] * aa_factor)),
(int(image_projected_end[0] * aa_factor), int(image_projected_end[1] * aa_factor))),
width=int(args.line_thickness * aa_factor), joint='curve', fill=(0, 0, 0)
)
offset = (args.line_thickness * aa_factor - 1) / 2
image_canvas.ellipse(
(int(image_projected_start[0] * aa_factor - offset), int(image_projected_start[1] * aa_factor - offset),
int(image_projected_start[0] * aa_factor + offset), int(image_projected_start[1] * aa_factor + offset)),
fill=(0, 0, 0)
)
image_canvas.ellipse(
(int(image_projected_end[0] * aa_factor - offset), int(image_projected_end[1] * aa_factor - offset),
int(image_projected_end[0] * aa_factor + offset), int(image_projected_end[1] * aa_factor + offset)),
fill=(0, 0, 0)

delta = line[2]
# if delta > MAX_REFRESH_INTERVAL:
# print("Detected jump")
if delta <= MAX_REFRESH_INTERVAL:
canvas.create_line(
screen_projected_start, screen_projected_end,
width=args.line_thickness, capstyle=tkinter.ROUND, fill=args.line_color
)
image_canvas.line(
((int(image_projected_start[0] * aa_factor), int(image_projected_start[1] * aa_factor)),
(int(image_projected_end[0] * aa_factor), int(image_projected_end[1] * aa_factor))),
width=int(args.line_thickness * aa_factor), joint='curve', fill=(0, 0, 0)
)
offset = (args.line_thickness * aa_factor - 1) / 2
image_canvas.ellipse(
(int(image_projected_start[0] * aa_factor - offset), int(image_projected_start[1] * aa_factor - offset),
int(image_projected_start[0] * aa_factor + offset), int(image_projected_start[1] * aa_factor + offset)),
fill=(0, 0, 0)
)
image_canvas.ellipse(
(int(image_projected_end[0] * aa_factor - offset), int(image_projected_end[1] * aa_factor - offset),
int(image_projected_end[0] * aa_factor + offset), int(image_projected_end[1] * aa_factor + offset)),
fill=(0, 0, 0)
)

top.update_idletasks()
Expand Down Expand Up @@ -185,6 +193,7 @@ def handler_loop():
last_pos = (-1, -1)
curr_pos = (-1, -1)
wip_pos = (-1, -1)
last_time = datetime.now()
while True:
event = touchpad.read_one()
if event:
Expand All @@ -207,7 +216,10 @@ def handler_loop():
# Work with light taps
last_pos = curr_pos
if last_pos[0] != -1 and last_pos[1] != -1 and curr_pos[0] != -1 and curr_pos[1] != -1:
yield [(last_pos, curr_pos)]
now_time = datetime.now()
delta_secs = (now_time-last_time).total_seconds()
last_time = now_time
yield [(last_pos, curr_pos, delta_secs)]
else:
yield []
last_pos = curr_pos
Expand Down