update to latest glassesTools

Author: dcnieho

requirements.txt

@@ -1,4 +1,4 @@
-glassesTools[GUI]~=1.18.0   # pulls in various other dependencies such as imgui_bundle, matplotlib, numpy, opencv, pandas, polars
+glassesTools[GUI]~=1.23.1   # pulls in various other dependencies such as imgui_bundle, matplotlib, numpy, opencv, pandas, polars
 aiosqlite
 uvloop ; sys_platform != "win32"
 pyobjc-framework-Cocoa ; sys_platform == "darwin"

src/glassesValidator/process/b_codeMarkerInterval.py

@@ -10,7 +10,7 @@
 if isMacOS:
     import AppKit
 
-from glassesTools import annotation, gaze_headref, gaze_worldref, naming, ocv, plane, propagating_thread, recording, timestamps
+from glassesTools import annotation, gaze_headref, gaze_worldref, naming, ocv, pose, propagating_thread, recording, timestamps
 from glassesTools.gui import video_player
 from glassesTools.validation import config, Plane as ValidationPlane
 
@@ -62,7 +62,7 @@ def do_the_work(working_dir, config_dir, gui: video_player.GUI, show_plane):
     hasPlanePose = False
     if (working_dir / 'pose.tsv').is_file():
         try:
-            poses = plane.read_dict_from_file(working_dir / 'pose.tsv')
+            poses = pose.read_dict_from_file(working_dir / 'pose.tsv')
             hasPlanePose = True
         except:
             # ignore when file can't be read or is empty

src/glassesValidator/process/c_detectMarkers.py

@@ -1,6 +1,6 @@
 import pathlib
 
-from glassesTools import annotation, aruco, naming, plane, propagating_thread, recording
+from glassesTools import annotation, aruco, naming, pose, propagating_thread, recording
 from glassesTools.gui import video_player
 from glassesTools.validation import config, Plane as ValidationPlane
 
@@ -20,6 +20,7 @@ def process(working_dir, config_dir=None, show_visualization=False, show_rejecte
     if show_visualization:
         gui = video_player.GUI(use_thread = False)
         gui.add_window(working_dir.name)
+        gui.set_interruptible(False)
         gui.set_show_controls(True)
         gui.set_show_play_percentage(True)
         gui.set_show_annotation_label(False)
@@ -52,16 +53,19 @@ def do_the_work(working_dir, config_dir, gui, show_rejected_markers):
     # get video file to process
     in_video = recInfo.get_scene_video_path()
 
-    # set up pose estimator and run it
-    estimator = aruco.PoseEstimator(in_video, working_dir / naming.frame_timestamps_fname, working_dir / naming.scene_camera_calibration_fname)
-    estimator.add_plane('validate',
-                        {'plane': val_plane, 'aruco_params': {'markerBorderBits': validationSetup['markerBorderBits']}, 'min_num_markers': validationSetup['minNumMarkers']},
-                        analyzeFrames)
+    # set up pose estimator
+    estimator = pose.Estimator(in_video, working_dir / naming.frame_timestamps_fname, working_dir / naming.scene_camera_calibration_fname)
+    # first, register all ArUco planes and individual markers with ArUco manager, which
+    # will then wrap their detection and register them with the pose estimator
+    aruco_manager = aruco.Manager()
+    aruco_manager.add_plane('validate', val_plane.get_plane_setup(), analyzeFrames)
+    aruco_manager.consolidate_setup()
+    aruco_manager.register_with_estimator(estimator)
     estimator.attach_gui(gui, {annotation.Event.Validate: [i for iv in analyzeFrames for i in iv]})
     if gui is not None:
         estimator.show_rejected_markers = show_rejected_markers
     poses, _, _ = estimator.process_video()
 
-    plane.write_list_to_file(poses['validate'], working_dir/'pose.tsv', skip_failed=True)
+    pose.write_list_to_file(poses['validate'], working_dir/'pose.tsv', skip_failed=True)
 
     utils.update_recording_status(working_dir, utils.Task.Markers_Detected, utils.Status.Finished)

src/glassesValidator/process/d_gazeToPlane.py

@@ -1,6 +1,6 @@
 import pathlib
 
-from glassesTools import annotation, gaze_headref, gaze_worldref, naming, ocv, plane, propagating_thread, recording
+from glassesTools import annotation, gaze_headref, gaze_worldref, naming, ocv, pose, propagating_thread, recording
 from glassesTools.gui import video_player, worldgaze
 from glassesTools.validation import config, Plane as ValidationPlane
 
@@ -38,7 +38,7 @@ def do_the_work(working_dir, config_dir, gui, show_plane, show_only_intervals):
     utils.update_recording_status(working_dir, utils.Task.Gaze_Tranformed_To_Plane, utils.Status.Running)
 
     # get camera calibration info
-    cameraParams      = ocv.CameraParams.read_from_file(working_dir / naming.scene_camera_calibration_fname)
+    cameraParams    = ocv.CameraParams.read_from_file(working_dir / naming.scene_camera_calibration_fname)
 
     # get interval coded to be analyzed, if any
     analyzeFrames   = utils.readMarkerIntervalsFile(working_dir / "markerInterval.tsv")
@@ -47,7 +47,7 @@ def do_the_work(working_dir, config_dir, gui, show_plane, show_only_intervals):
     head_gazes  = gaze_headref.read_dict_from_file(working_dir / naming.gaze_data_fname, episodes=analyzeFrames if not gui or show_only_intervals else None)[0]
 
     # Read camera pose w.r.t. plane
-    poses       = plane.read_dict_from_file(working_dir / 'pose.tsv', episodes=analyzeFrames if not gui or show_only_intervals else None)
+    poses       = pose.read_dict_from_file(working_dir / 'pose.tsv', episodes=analyzeFrames if not gui or show_only_intervals else None)
 
     # transform
     plane_gazes = gaze_worldref.from_head(poses, head_gazes, cameraParams)

src/glassesValidator/process/f_assignFixations.py

@@ -1,7 +1,7 @@
 import pathlib
 import numpy as np
 
-from glassesTools.validation import config, assign_fixations, Plane as ValidationPlane
+from glassesTools.validation import config, assign_intervals, Plane as ValidationPlane
 
 from .. import utils
 
@@ -30,13 +30,29 @@ def process(working_dir, config_dir=None, do_global_shift=True, max_dist_fac=.5)
                    [validation_plane.bbox[1]-validation_plane.marker_size, validation_plane.bbox[3]+validation_plane.marker_size]]
     for idx,_ in enumerate(analyzeFrames):
         fix_file = working_dir / f'fixations_interval_{idx+1:02d}.tsv'
-        assign_fixations.distance(targets,
-                                  fix_file,
-                                  working_dir,
-                                  filename_stem='fixationAssignment',
-                                  iteration=idx,
-                                  background_image=(validation_plane.get_ref_image(as_RGB=True),
-                                                    np.array([validation_plane.bbox[x] for x in (0,2,3,1)])),
-                                  plot_limits=plot_limits)
+        selected_intervals, other_intervals = \
+                    assign_intervals.distance(targets,
+                                              fix_file,
+                                              do_global_shift=do_global_shift,
+                                              max_dist_fac=max_dist_fac)
+
+        # plot output
+        assign_intervals.plot(selected_intervals,
+                              other_intervals,
+                              targets,
+                              working_dir/'gazePlane.tsv',
+                              analyzeFrames[idx],
+                              working_dir,
+                              filename_stem='fixationAssignment',
+                              iteration=idx,
+                              background_image=(validation_plane.get_ref_image(as_RGB=True),
+                                                np.array([validation_plane.bbox[x] for x in (0,2,3,1)])),
+                              plot_limits=plot_limits)
+
+        # store output to file
+        assign_intervals.to_tsv(selected_intervals,
+                                working_dir,
+                                filename_stem=f'fixationAssignment',
+                                iteration=idx)
 
     utils.update_recording_status(working_dir, utils.Task.Fixation_Assigned, utils.Status.Finished, skip_if_missing=True)

src/glassesValidator/utils/__init__.py

@@ -1,11 +1,10 @@
 import pathlib
 import enum
-import json
 import csv
 
 from .makeVideo import process as make_video
 
-from glassesTools import utils
+from glassesTools import json, utils
 from glassesTools.recording import Recording
 from glassesTools.eyetracker import EyeTracker
 
@@ -25,7 +24,7 @@ class Task(utils.AutoName):
     Make_Video                      = enum.auto()
     Unknown                         = enum.auto()
 task_names = [x.value for x in Task]
-utils.register_type(utils.CustomTypeEntry(Task,'__enum.Task__', utils.enum_val_2_str, lambda x: getattr(Task, x.split('.')[1])))
+json.register_type(json.TypeEntry(Task,'__enum.Task__', utils.enum_val_2_str, lambda x: getattr(Task, x.split('.')[1])))
 
 def get_task_name_friendly(name: str | Task):
     if isinstance(name,Task):
@@ -85,15 +84,13 @@ class Status(utils.AutoName):
     Finished        = enum.auto()
     Errored         = enum.auto()
 status_names = [x.value for x in Status]
-utils.register_type(utils.CustomTypeEntry(Status,'__enum.Status__', utils.enum_val_2_str, lambda x: getattr(Status, x.split('.')[1])))
+json.register_type(json.TypeEntry(Status,'__enum.Status__', utils.enum_val_2_str, lambda x: getattr(Status, x.split('.')[1])))
 
 
 _status_file = 'glassesValidator.recording'
 def _create_recording_status_file(file: pathlib.Path):
     task_status_dict = {utils.enum_val_2_str(getattr(Task,x)): Status.Not_Started for x in Task.__members__ if x not in ['Not_Imported', 'Make_Video', 'Unknown']}
-
-    with open(file, 'w') as f:
-        json.dump(task_status_dict, f, cls=utils.CustomTypeEncoder)
+    json.dump(task_status_dict, file)
 
 
 def get_recording_status(path: str | pathlib.Path, create_if_missing = False, skip_if_missing=False):
@@ -106,8 +103,8 @@ def get_recording_status(path: str | pathlib.Path, create_if_missing = False, sk
         elif skip_if_missing:
             return None
 
-    with open(file, 'r') as f:
-        return json.load(f, object_hook=utils.json_reconstitute)
+    recording_states = json.load(file)
+    return {k: Status(recording_states[k]) for k in recording_states}  # turn state value from string back into enum instance
 
 def get_last_finished_step(status: dict[str,Status]):
     last = Task.Not_Imported
@@ -130,9 +127,7 @@ def update_recording_status(path: str | pathlib.Path, task: Task, status: Status
     while (next_task:=get_next_task(next_task)) is not None:
         rec_status[utils.enum_val_2_str(next_task)] = Status.Not_Started
 
-    file = path / _status_file
-    with open(file, 'w') as f:
-        json.dump(rec_status, f, cls=utils.CustomTypeEncoder, indent=2)
+    json.dump(rec_status, path / _status_file)
 
     return rec_status