Skip to content
Open
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
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v6.0.0
hooks:
- id: check-case-conflict
- id: check-merge-conflict
Expand All @@ -12,30 +12,30 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/asottile/pyupgrade
rev: v3.6.0
rev: v3.21.0
hooks:
- id: pyupgrade
name: PyUpgrade 3.6+
args: ["--py36-plus"]
exclude: ^bin/

- repo: https://github.com/pycqa/flake8
rev: 6.0.0
rev: 7.3.0
hooks:
- id: flake8

- repo: https://github.com/PyCQA/isort
rev: 5.12.0
rev: 7.0.0
hooks:
- id: isort
args: [--profile, black]

- repo: https://github.com/psf/black
rev: 23.3.0
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 25.9.0
hooks:
- id: black

- repo: https://github.com/asottile/setup-cfg-fmt
rev: v2.3.0
rev: v3.1.0
hooks:
- id: setup-cfg-fmt
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ classifiers =
Development Status :: 4 - Beta
Intended Audience :: Developers
Intended Audience :: End Users/Desktop
License :: OSI Approved :: MIT License
Operating System :: MacOS
Operating System :: Microsoft :: Windows :: Windows 10
Operating System :: Microsoft :: Windows :: Windows 11
Expand All @@ -30,7 +29,7 @@ install_requires =
pandas
rich
importlib-metadata;python_version<"3.8"
python_requires = >=3.7
python_requires = >=3.10
include_package_data = true
package_dir =
=src
Expand Down
9 changes: 5 additions & 4 deletions src/pupil_labs/dynamic_content_on_rim/dynamic_rim.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
This script is used to plot gaze over a video displayed on RIM
enrichment eye tracking recording.
"""

import glob
import logging
import os
Expand Down Expand Up @@ -162,9 +163,9 @@ def main():
# Applying the perspective transform
xy_transf = cv2.perspectiveTransform(xy, M)
# Saving the transformed gaze points
gaze_rim_df[
["gaze position transf x [px]", "gaze position transf y [px]"]
] = pd.DataFrame(xy_transf[0]).set_index(gaze_rim_df.index)
gaze_rim_df[["gaze position transf x [px]", "gaze position transf y [px]"]] = (
pd.DataFrame(xy_transf[0]).set_index(gaze_rim_df.index)
)
# Get the patch of the screen
mask = np.zeros(np.asarray(ref_img.shape)[0:2], dtype=np.uint8)
cv2.fillPoly(
Expand Down Expand Up @@ -651,7 +652,7 @@ def prepare_image(frame, xy, str, corners_screen, _screen, mheight=0, alpha=0.3)
),
)
overlay = frame.copy()
cv2.fillPoly(frame, [(corners_screen.astype(int))], color)
cv2.fillPoly(frame, [corners_screen.astype(int)], color)
cv2.addWeighted(frame[roi], alpha, overlay[roi], 1 - alpha, 0, frame[roi])
# Gazepoint overlay
frame = cv2.circle(
Expand Down
8 changes: 6 additions & 2 deletions src/pupil_labs/dynamic_content_on_rim/video/read.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,12 @@ def read_video_ts(video_path, audio=False, auto_thread_type=True):
for frame in packet.decode():
if frame is not None and frame.pts is not None:
pts.append(frame.pts)
dts.append(frame.dts) if frame.dts is not None else logging.info(
f"Decoding timestamp is missing at frame {len(pts)}"
(
dts.append(frame.dts)
if frame.dts is not None
else logging.info(
f"Decoding timestamp is missing at frame {len(pts)}"
)
)
ts.append(
(
Expand Down
Loading