From c5d30aa93d5ff809e12b34b6b610f787d19654df Mon Sep 17 00:00:00 2001 From: ck-zhang Date: Fri, 2 May 2025 02:57:42 +0800 Subject: [PATCH] Unify style --- src/eyetrax/app/demo.py | 23 ++++++++++------------- src/eyetrax/app/virtualcam.py | 19 +++++++------------ src/eyetrax/calibration/__init__.py | 6 +++--- src/eyetrax/calibration/common.py | 1 + src/eyetrax/calibration/fine_tune.py | 3 ++- src/eyetrax/calibration/five_point.py | 6 +++--- src/eyetrax/calibration/lissajous.py | 3 +-- src/eyetrax/calibration/nine_point.py | 4 ++-- src/eyetrax/filters/__init__.py | 1 + src/eyetrax/filters/kalman.py | 4 +++- src/eyetrax/gaze.py | 13 +++++-------- src/eyetrax/models/__init__.py | 1 - src/eyetrax/models/base.py | 6 ++++-- src/eyetrax/models/ridge.py | 2 +- src/eyetrax/utils/video.py | 14 +++++++++++--- 15 files changed, 54 insertions(+), 52 deletions(-) diff --git a/src/eyetrax/app/demo.py b/src/eyetrax/app/demo.py index e31e506..e1b2b79 100644 --- a/src/eyetrax/app/demo.py +++ b/src/eyetrax/app/demo.py @@ -1,23 +1,20 @@ +import os import time + import cv2 import numpy as np -import os -from eyetrax.utils.screen import get_screen_size -from eyetrax.utils.video import camera, fullscreen, iter_frames -from eyetrax.gaze import GazeEstimator + from eyetrax.calibration import ( - run_9_point_calibration, - run_5_point_calibration, - run_lissajous_calibration, fine_tune_kalman_filter, -) -from eyetrax.filters import ( - make_kalman, - KalmanSmoother, - KDESmoother, - NoSmoother, + run_5_point_calibration, + run_9_point_calibration, + run_lissajous_calibration, ) from eyetrax.cli import parse_common_args +from eyetrax.filters import KalmanSmoother, KDESmoother, NoSmoother, make_kalman +from eyetrax.gaze import GazeEstimator +from eyetrax.utils.screen import get_screen_size +from eyetrax.utils.video import camera, fullscreen, iter_frames def run_demo(): diff --git a/src/eyetrax/app/virtualcam.py b/src/eyetrax/app/virtualcam.py index 15dbaaf..7bcf3dc 100644 --- a/src/eyetrax/app/virtualcam.py +++ b/src/eyetrax/app/virtualcam.py @@ -2,22 +2,17 @@ import cv2 import numpy as np import pyvirtualcam -from eyetrax.utils.screen import get_screen_size -from eyetrax.utils.video import camera, iter_frames -from eyetrax.gaze import GazeEstimator from eyetrax.calibration import ( - run_9_point_calibration, - run_5_point_calibration, - run_lissajous_calibration, fine_tune_kalman_filter, -) -from eyetrax.filters import ( - make_kalman, - KalmanSmoother, - KDESmoother, - NoSmoother, + run_5_point_calibration, + run_9_point_calibration, + run_lissajous_calibration, ) from eyetrax.cli import parse_common_args +from eyetrax.filters import KalmanSmoother, KDESmoother, NoSmoother, make_kalman +from eyetrax.gaze import GazeEstimator +from eyetrax.utils.screen import get_screen_size +from eyetrax.utils.video import camera, iter_frames def run_virtualcam(): diff --git a/src/eyetrax/calibration/__init__.py b/src/eyetrax/calibration/__init__.py index 60db22d..e57b36c 100644 --- a/src/eyetrax/calibration/__init__.py +++ b/src/eyetrax/calibration/__init__.py @@ -1,8 +1,8 @@ -from .common import wait_for_face_and_countdown, compute_grid_points -from .nine_point import run_9_point_calibration +from .common import compute_grid_points, wait_for_face_and_countdown +from .fine_tune import fine_tune_kalman_filter from .five_point import run_5_point_calibration from .lissajous import run_lissajous_calibration -from .fine_tune import fine_tune_kalman_filter +from .nine_point import run_9_point_calibration __all__ = [ "wait_for_face_and_countdown", diff --git a/src/eyetrax/calibration/common.py b/src/eyetrax/calibration/common.py index b079db0..7ad2ea4 100644 --- a/src/eyetrax/calibration/common.py +++ b/src/eyetrax/calibration/common.py @@ -1,4 +1,5 @@ import time + import cv2 import numpy as np diff --git a/src/eyetrax/calibration/fine_tune.py b/src/eyetrax/calibration/fine_tune.py index 6cc1912..21a7e25 100644 --- a/src/eyetrax/calibration/fine_tune.py +++ b/src/eyetrax/calibration/fine_tune.py @@ -1,4 +1,5 @@ import time + import cv2 import numpy as np @@ -7,7 +8,7 @@ from eyetrax.utils.screen import get_screen_size def fine_tune_kalman_filter(gaze_estimator, kalman, camera_index: int = 0): """ - Quick fine‑tuning pass to adjust Kalman filter's measurementNoiseCov. + Quick fine‑tuning pass to adjust Kalman filter's measurementNoiseCov """ screen_width, screen_height = get_screen_size() diff --git a/src/eyetrax/calibration/five_point.py b/src/eyetrax/calibration/five_point.py index 36cbce7..1005a4e 100644 --- a/src/eyetrax/calibration/five_point.py +++ b/src/eyetrax/calibration/five_point.py @@ -1,17 +1,17 @@ import cv2 import numpy as np -from eyetrax.utils.screen import get_screen_size from eyetrax.calibration.common import ( - wait_for_face_and_countdown, _pulse_and_capture, compute_grid_points, + wait_for_face_and_countdown, ) +from eyetrax.utils.screen import get_screen_size def run_5_point_calibration(gaze_estimator, camera_index: int = 0): """ - Faster five-point calibration. + Faster five-point calibration """ sw, sh = get_screen_size() diff --git a/src/eyetrax/calibration/lissajous.py b/src/eyetrax/calibration/lissajous.py index e93fc2d..e5e8432 100644 --- a/src/eyetrax/calibration/lissajous.py +++ b/src/eyetrax/calibration/lissajous.py @@ -1,9 +1,8 @@ -import time import cv2 import numpy as np -from eyetrax.utils.screen import get_screen_size from eyetrax.calibration.common import wait_for_face_and_countdown +from eyetrax.utils.screen import get_screen_size def run_lissajous_calibration(gaze_estimator, camera_index: int = 0): diff --git a/src/eyetrax/calibration/nine_point.py b/src/eyetrax/calibration/nine_point.py index fbff1f4..37db4a5 100644 --- a/src/eyetrax/calibration/nine_point.py +++ b/src/eyetrax/calibration/nine_point.py @@ -1,12 +1,12 @@ import cv2 import numpy as np -from eyetrax.utils.screen import get_screen_size from eyetrax.calibration.common import ( - wait_for_face_and_countdown, _pulse_and_capture, compute_grid_points, + wait_for_face_and_countdown, ) +from eyetrax.utils.screen import get_screen_size def run_9_point_calibration(gaze_estimator, camera_index: int = 0): diff --git a/src/eyetrax/filters/__init__.py b/src/eyetrax/filters/__init__.py index 207bae7..39e2239 100644 --- a/src/eyetrax/filters/__init__.py +++ b/src/eyetrax/filters/__init__.py @@ -1,4 +1,5 @@ from __future__ import annotations + import cv2 import numpy as np diff --git a/src/eyetrax/filters/kalman.py b/src/eyetrax/filters/kalman.py index a88bc16..0703b5d 100644 --- a/src/eyetrax/filters/kalman.py +++ b/src/eyetrax/filters/kalman.py @@ -1,9 +1,11 @@ from __future__ import annotations + from typing import Tuple + import numpy as np -from .base import BaseSmoother from . import make_kalman +from .base import BaseSmoother class KalmanSmoother(BaseSmoother): diff --git a/src/eyetrax/gaze.py b/src/eyetrax/gaze.py index 9fb1235..7cb5940 100644 --- a/src/eyetrax/gaze.py +++ b/src/eyetrax/gaze.py @@ -1,17 +1,14 @@ from __future__ import annotations +from collections import deque +from pathlib import Path + import cv2 import mediapipe as mp import numpy as np -from collections import deque -from pathlib import Path -from eyetrax.models import create_model, BaseModel -from eyetrax.constants import ( - LEFT_EYE_INDICES, - RIGHT_EYE_INDICES, - MUTUAL_INDICES, -) +from eyetrax.constants import LEFT_EYE_INDICES, MUTUAL_INDICES, RIGHT_EYE_INDICES +from eyetrax.models import BaseModel, create_model class GazeEstimator: diff --git a/src/eyetrax/models/__init__.py b/src/eyetrax/models/__init__.py index e49a8ff..ce84207 100644 --- a/src/eyetrax/models/__init__.py +++ b/src/eyetrax/models/__init__.py @@ -1,6 +1,5 @@ from importlib import import_module from pathlib import Path -from types import ModuleType from typing import Dict, Type from .base import BaseModel diff --git a/src/eyetrax/models/base.py b/src/eyetrax/models/base.py index 1c4f9e2..6618e46 100644 --- a/src/eyetrax/models/base.py +++ b/src/eyetrax/models/base.py @@ -1,8 +1,10 @@ from __future__ import annotations -from abc import ABC, abstractmethod + import pickle -import numpy as np +from abc import ABC, abstractmethod from pathlib import Path + +import numpy as np from sklearn.preprocessing import StandardScaler diff --git a/src/eyetrax/models/ridge.py b/src/eyetrax/models/ridge.py index 5ce3f7f..eca3c3c 100644 --- a/src/eyetrax/models/ridge.py +++ b/src/eyetrax/models/ridge.py @@ -2,8 +2,8 @@ from __future__ import annotations from sklearn.linear_model import Ridge -from .base import BaseModel from . import register_model +from .base import BaseModel class RidgeModel(BaseModel): diff --git a/src/eyetrax/utils/video.py b/src/eyetrax/utils/video.py index e3dc211..184b18f 100644 --- a/src/eyetrax/utils/video.py +++ b/src/eyetrax/utils/video.py @@ -1,11 +1,15 @@ from __future__ import annotations + from contextlib import contextmanager + import cv2 @contextmanager def fullscreen(name: str): - """Open a window in full-screen mode""" + """ + Open a window in full-screen mode + """ cv2.namedWindow(name, cv2.WND_PROP_FULLSCREEN) cv2.setWindowProperty(name, cv2.WND_PROP_FULLSCREEN, cv2.WINDOW_FULLSCREEN) try: @@ -16,7 +20,9 @@ def fullscreen(name: str): @contextmanager def camera(index: int = 0): - """Context manager returning an opened VideoCapture""" + """ + Context manager returning an opened VideoCapture + """ cap = cv2.VideoCapture(index) if not cap.isOpened(): raise RuntimeError(f"cannot open camera {index}") @@ -27,7 +33,9 @@ def camera(index: int = 0): def iter_frames(cap: cv2.VideoCapture): - """Infinite generator yielding successive frames""" + """ + Infinite generator yielding successive frames + """ while True: ok, frame = cap.read() if not ok: