Skip to content

Commit 0549ee8

Browse files
committed
bump glassestools. Adapted code for changed validation submodule layout
now only allow newer point releases of glassesTools, so we don't have to worry about compatibility so much
1 parent 0cbd379 commit 0549ee8

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
glassesTools[GUI]>=1.17.0 # pulls in various other dependencies such as imgui_bundle, matplotlib, numpy, opencv, pandas, polars
1+
glassesTools[GUI]~=1.18.0 # pulls in various other dependencies such as imgui_bundle, matplotlib, numpy, opencv, pandas, polars
22
aiosqlite
33
uvloop ; sys_platform != "win32"
44
pyobjc-framework-Cocoa ; sys_platform == "darwin"

src/glassesValidator/GUI/_impl/callbacks.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from glassesTools.eyetracker import EyeTracker, eye_tracker_names
1313
eye_tracker_names = [e for e in eye_tracker_names if e!=EyeTracker.Generic.value]
1414
from glassesTools.gui import msg_box, recording_table, utils as gui_utils
15-
from glassesTools.validation import config, DataQualityType, export
15+
from glassesTools.validation import DataQualityType, default_poster, export
1616

1717
from .structs import JobDescription, Recording
1818
from . import globals, db, gui, process_pool
@@ -46,7 +46,7 @@ def open_folder(path: pathlib.Path):
4646

4747

4848
async def _deploy_config(conf_dir: pathlib.Path):
49-
config.deploy_validation_config(conf_dir)
49+
default_poster.deploy_config(conf_dir)
5050

5151
async def deploy_config(project_path: str|pathlib.Path, config_dir: str):
5252
if not config_dir:
@@ -65,7 +65,7 @@ async def deploy_config(project_path: str|pathlib.Path, config_dir: str):
6565
gui_utils.push_popup(globals, msg_box.msgbox, "Deploy configuration", f"The folder {conf_dir} already exist. Do you want to deploy a configuration to this folder,\npotentially overwriting any configuration that is already there?", msg_box.MsgBox.warn, buttons)
6666

6767
async def deploy_poster_pdf(dir: str|pathlib.Path):
68-
config.plane.deploy_default_pdf(dir)
68+
default_poster.deploy_default_pdf(dir)
6969

7070
async def remove_recording_working_dir(rec: Recording):
7171
if rec.working_directory and rec.working_directory.is_dir():

src/glassesValidator/process/b_codeMarkerInterval.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from glassesTools import annotation, gaze_headref, gaze_worldref, naming, ocv, plane, propagating_thread, recording, timestamps
1414
from glassesTools.gui import video_player
15-
from glassesTools.validation import config
15+
from glassesTools.validation import config, Plane as ValidationPlane
1616

1717
from .. import utils
1818

@@ -53,7 +53,7 @@ def do_the_work(working_dir, config_dir, gui: video_player.GUI, show_plane):
5353

5454
# open file with information about Aruco marker and Gaze target locations
5555
validationSetup = config.get_validation_setup(config_dir)
56-
val_plane = config.plane.ValidationPlane(config_dir, validationSetup)
56+
val_plane = ValidationPlane(config_dir, validationSetup)
5757

5858
# Read gaze data
5959
gazes = gaze_headref.read_dict_from_file(working_dir / naming.gaze_data_fname)[0]

src/glassesValidator/process/c_detectMarkers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from glassesTools import annotation, aruco, naming, plane, propagating_thread, recording
44
from glassesTools.gui import video_player
5-
from glassesTools.validation import config
5+
from glassesTools.validation import config, Plane as ValidationPlane
66

77
from .. import utils
88

@@ -42,7 +42,7 @@ def do_the_work(working_dir, config_dir, gui, show_rejected_markers):
4242
# open file with information about Aruco marker and Gaze target locations
4343
validationSetup = config.get_validation_setup(config_dir)
4444
# get info about markers on our validation plane
45-
val_plane = config.plane.ValidationPlane(config_dir, validationSetup)
45+
val_plane = ValidationPlane(config_dir, validationSetup)
4646

4747
# get interval(s) coded to be analyzed, if any
4848
analyzeFrames = utils.readMarkerIntervalsFile(working_dir / "markerInterval.tsv")

src/glassesValidator/process/d_gazeToPlane.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from glassesTools import annotation, gaze_headref, gaze_worldref, naming, ocv, plane, propagating_thread, recording
44
from glassesTools.gui import video_player, worldgaze
5-
from glassesTools.validation import config
5+
from glassesTools.validation import config, Plane as ValidationPlane
66

77
from .. import utils
88

@@ -64,7 +64,7 @@ def do_the_work(working_dir, config_dir, gui, show_plane, show_only_intervals):
6464

6565
in_video = recording.Recording.load_from_json(working_dir).get_scene_video_path()
6666
validationSetup = config.get_validation_setup(config_dir)
67-
val_plane = config.plane.ValidationPlane(config_dir, validationSetup)
67+
val_plane = ValidationPlane(config_dir, validationSetup)
6868
worldgaze.show_visualization(
6969
in_video, working_dir / naming.frame_timestamps_fname, working_dir / naming.scene_camera_calibration_fname,
7070
{'plane': val_plane}, {'plane': poses}, head_gazes, {'plane': plane_gazes}, {annotation.Event.Validate: analyzeFrames},

src/glassesValidator/process/e_classifyFixations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pathlib
22

33
from glassesTools import fixation_classification
4-
from glassesTools.validation import config
4+
from glassesTools.validation import config, Plane as ValidationPlane
55

66
from .. import utils
77

@@ -23,7 +23,7 @@ def process(working_dir: str|pathlib.Path, config_dir: str|pathlib.Path=None):
2323
print(' no marker intervals defined for this recording, skipping')
2424
return
2525

26-
validation_plane = config.plane.ValidationPlane(config_dir, validationSetup)
26+
validation_plane = ValidationPlane(config_dir, validationSetup)
2727

2828
plot_limits = [[validation_plane.bbox[0]-validation_plane.marker_size, validation_plane.bbox[2]+validation_plane.marker_size],
2929
[validation_plane.bbox[1]-validation_plane.marker_size, validation_plane.bbox[3]+validation_plane.marker_size]]

src/glassesValidator/process/f_assignFixations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pathlib
22
import numpy as np
33

4-
from glassesTools.validation import config, assign_fixations
4+
from glassesTools.validation import config, assign_fixations, Plane as ValidationPlane
55

66
from .. import utils
77

@@ -23,7 +23,7 @@ def process(working_dir, config_dir=None, do_global_shift=True, max_dist_fac=.5)
2323
print(' no marker intervals defined for this recording, skipping')
2424
return
2525

26-
validation_plane = config.plane.ValidationPlane(config_dir, validationSetup)
26+
validation_plane = ValidationPlane(config_dir, validationSetup)
2727

2828
targets = {t_id: np.append(validation_plane.targets[t_id].center, 0.) for t_id in validation_plane.targets} # get centers of targets
2929
plot_limits = [[validation_plane.bbox[0]-validation_plane.marker_size, validation_plane.bbox[2]+validation_plane.marker_size],

src/glassesValidator/process/g_calculateDataQuality.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import numpy as np
44

5-
from glassesTools.validation import config, DataQualityType, compute_offsets
5+
from glassesTools.validation import config, DataQualityType, compute_offsets, Plane as ValidationPlane
66

77
from .. import utils
88

@@ -20,7 +20,7 @@ def process(working_dir, config_dir=None,
2020

2121
# get information about gaze target locations
2222
validationSetup = config.get_validation_setup(config_dir)
23-
validation_plane = config.plane.ValidationPlane(config_dir, validationSetup)
23+
validation_plane = ValidationPlane(config_dir, validationSetup)
2424
targets = {t_id: np.append(validation_plane.targets[t_id].center, 0.) for t_id in validation_plane.targets} # get centers of targets
2525

2626
# get interval coded to be analyzed

src/glassesValidator/utils/makeVideo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from glassesTools import annotation, aruco, gaze_headref, gaze_worldref, naming, ocv, propagating_thread, recording, timestamps
99
from glassesTools.gui import video_player
10-
from glassesTools.validation import config
10+
from glassesTools.validation import config, Plane as ValidationPlane
1111

1212
from .. import utils
1313

@@ -52,7 +52,7 @@ def do_the_work(working_dir, config_dir, gui: video_player.GUI, show_rejected_ma
5252
# open file with information about Aruco marker and Gaze target locations
5353
validationSetup = config.get_validation_setup(config_dir)
5454
# get info about markers on our poster
55-
poster = config.plane.ValidationPlane(config_dir, validationSetup)
55+
poster = ValidationPlane(config_dir, validationSetup)
5656
# get poster image width, height
5757
ref_img = poster.get_ref_image(400)
5858
ref_height, ref_width, _ = ref_img.shape

0 commit comments

Comments
 (0)