Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 4 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# Changelog

## v0.0.6
## v0.0.7

- Added `CONTRIBUTING.md`to project.
- Updated license document with full text.
- Fixed crash on Onboarding cancel.


- Fixed crash from probing for available cameras.
- Added background tracking loop to keep the application responsive.
- Mouse events no longer block the application via resource exhaustion due to spawning excessive threads.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "PowerMouse"
version = "0.0.6"
version = "0.0.7"
description = "Hands-free mouse control using face tracking"
authors = [
{ name = "Ralph Dugue", email = "ralph@phito.dev" }
Expand Down
6 changes: 4 additions & 2 deletions src/powermouse/adapters/devices.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import glob
import os
import platform

import cv2
Expand All @@ -22,9 +20,13 @@ def get_devices(self) -> list[Camera]:

for i, name in devices.items():
cap = cv2.VideoCapture(i)
if not cap.isOpened():
continue

fps = cap.get(cv2.CAP_PROP_FPS)
height = cap.get(cv2.CAP_PROP_FRAME_HEIGHT)
width = cap.get(cv2.CAP_PROP_FRAME_WIDTH)
cap.release()
frame = _EMPTY_FRAME
cameras.append(
Camera(
Expand Down
12 changes: 8 additions & 4 deletions src/powermouse/domain/usecases/track_face.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import threading
import time

from powermouse.domain.controllers import camera, inference, mouse, profile
from powermouse.domain.usecases.gesture_mapping import GestureToMouseTranslator
from powermouse.domain.models.mouse import MouseButton, MouseEvent, MouseEventType
from powermouse.domain.usecases.gesture_mapping import GestureToMouseTranslator


def _dispatch(mouse_controller: mouse.MouseController, event: MouseEvent) -> None:
threading.Thread(target=mouse_controller.handle_event, args=(event,)).start()
mouse_controller.handle_event(event)


def tracking_step(
Expand All @@ -26,7 +25,12 @@ def tracking_step(
cursor = inference_controller.get_cursor_position()
_dispatch(
mouse_controller,
MouseEvent(button=MouseButton.LEFT, x=cursor[0], y=cursor[1], event_type=MouseEventType.MOVE),
MouseEvent(
button=MouseButton.LEFT,
x=cursor[0],
y=cursor[1],
event_type=MouseEventType.MOVE,
),
)

# Drain any queued gestures and dispatch their mouse events.
Expand Down
19 changes: 10 additions & 9 deletions src/powermouse/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,16 @@ def main() -> None:

# Create a background thread for tracking
def background_tracking_loop():
tracking_step(
frame_processor=camera_widget.update_frame,
mouse_controller=mouse_controller,
inference_controller=inference_controller,
camera_controller=camera_controller,
gesture_translator=gesture_translator,
)

time.sleep(0.005)
while dpg.is_dearpygui_running():
tracking_step(
frame_processor=camera_widget.update_frame,
mouse_controller=mouse_controller,
inference_controller=inference_controller,
camera_controller=camera_controller,
gesture_translator=gesture_translator,
)

time.sleep(0.005)

tracking_thread = threading.Thread(target=background_tracking_loop, daemon=True)
tracking_thread.start()
Expand Down
Loading