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

Author: dcnieho

requirements.txt

@@ -1,4 +1,4 @@
-glassesTools[GUI]>=1.17.0   # pulls in various other dependencies such as imgui_bundle, matplotlib, numpy, opencv, pandas, polars
+glassesTools[GUI]~=1.18.0   # 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/GUI/_impl/callbacks.py

@@ -12,7 +12,7 @@
 from glassesTools.eyetracker import EyeTracker, eye_tracker_names
 eye_tracker_names = [e for e in eye_tracker_names if e!=EyeTracker.Generic.value]
 from glassesTools.gui import msg_box, recording_table, utils as gui_utils
-from glassesTools.validation import config, DataQualityType, export
+from glassesTools.validation import DataQualityType, default_poster, export
 
 from .structs import JobDescription, Recording
 from . import globals, db, gui, process_pool
@@ -46,7 +46,7 @@ def open_folder(path: pathlib.Path):
 
 
 async def _deploy_config(conf_dir: pathlib.Path):
-    config.deploy_validation_config(conf_dir)
+    default_poster.deploy_config(conf_dir)
 
 async def deploy_config(project_path: str|pathlib.Path, config_dir: str):
     if not config_dir:
@@ -65,7 +65,7 @@ async def deploy_config(project_path: str|pathlib.Path, config_dir: str):
         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)
 
 async def deploy_poster_pdf(dir: str|pathlib.Path):
-    config.plane.deploy_default_pdf(dir)
+    default_poster.deploy_default_pdf(dir)
 
 async def remove_recording_working_dir(rec: Recording):
     if rec.working_directory and rec.working_directory.is_dir():

src/glassesValidator/process/b_codeMarkerInterval.py

@@ -12,7 +12,7 @@
 
 from glassesTools import annotation, gaze_headref, gaze_worldref, naming, ocv, plane, propagating_thread, recording, timestamps
 from glassesTools.gui import video_player
-from glassesTools.validation import config
+from glassesTools.validation import config, Plane as ValidationPlane
 
 from .. import utils
 
@@ -53,7 +53,7 @@ def do_the_work(working_dir, config_dir, gui: video_player.GUI, show_plane):
 
     # open file with information about Aruco marker and Gaze target locations
     validationSetup = config.get_validation_setup(config_dir)
-    val_plane = config.plane.ValidationPlane(config_dir, validationSetup)
+    val_plane = ValidationPlane(config_dir, validationSetup)
 
     # Read gaze data
     gazes = gaze_headref.read_dict_from_file(working_dir / naming.gaze_data_fname)[0]

src/glassesValidator/process/c_detectMarkers.py

@@ -2,7 +2,7 @@
 
 from glassesTools import annotation, aruco, naming, plane, propagating_thread, recording
 from glassesTools.gui import video_player
-from glassesTools.validation import config
+from glassesTools.validation import config, Plane as ValidationPlane
 
 from .. import utils
 
@@ -42,7 +42,7 @@ def do_the_work(working_dir, config_dir, gui, show_rejected_markers):
     # open file with information about Aruco marker and Gaze target locations
     validationSetup = config.get_validation_setup(config_dir)
     # get info about markers on our validation plane
-    val_plane       = config.plane.ValidationPlane(config_dir, validationSetup)
+    val_plane       = ValidationPlane(config_dir, validationSetup)
 
     # get interval(s) coded to be analyzed, if any
     analyzeFrames   = utils.readMarkerIntervalsFile(working_dir / "markerInterval.tsv")

src/glassesValidator/process/d_gazeToPlane.py

@@ -2,7 +2,7 @@
 
 from glassesTools import annotation, gaze_headref, gaze_worldref, naming, ocv, plane, propagating_thread, recording
 from glassesTools.gui import video_player, worldgaze
-from glassesTools.validation import config
+from glassesTools.validation import config, Plane as ValidationPlane
 
 from .. import utils
 
@@ -64,7 +64,7 @@ def do_the_work(working_dir, config_dir, gui, show_plane, show_only_intervals):
 
     in_video = recording.Recording.load_from_json(working_dir).get_scene_video_path()
     validationSetup = config.get_validation_setup(config_dir)
-    val_plane       = config.plane.ValidationPlane(config_dir, validationSetup)
+    val_plane       = ValidationPlane(config_dir, validationSetup)
     worldgaze.show_visualization(
         in_video, working_dir / naming.frame_timestamps_fname, working_dir / naming.scene_camera_calibration_fname,
         {'plane': val_plane}, {'plane': poses}, head_gazes, {'plane': plane_gazes}, {annotation.Event.Validate: analyzeFrames},

src/glassesValidator/process/e_classifyFixations.py

@@ -1,7 +1,7 @@
 import pathlib
 
 from glassesTools import fixation_classification
-from glassesTools.validation import config
+from glassesTools.validation import config, Plane as ValidationPlane
 
 from .. import utils
 
@@ -23,7 +23,7 @@ def process(working_dir: str|pathlib.Path, config_dir: str|pathlib.Path=None):
         print('  no marker intervals defined for this recording, skipping')
         return
 
-    validation_plane = config.plane.ValidationPlane(config_dir, validationSetup)
+    validation_plane = ValidationPlane(config_dir, validationSetup)
 
     plot_limits = [[validation_plane.bbox[0]-validation_plane.marker_size, validation_plane.bbox[2]+validation_plane.marker_size],
                    [validation_plane.bbox[1]-validation_plane.marker_size, validation_plane.bbox[3]+validation_plane.marker_size]]

src/glassesValidator/process/f_assignFixations.py

@@ -1,7 +1,7 @@
 import pathlib
 import numpy as np
 
-from glassesTools.validation import config, assign_fixations
+from glassesTools.validation import config, assign_fixations, Plane as ValidationPlane
 
 from .. import utils
 
@@ -23,7 +23,7 @@ def process(working_dir, config_dir=None, do_global_shift=True, max_dist_fac=.5)
         print('  no marker intervals defined for this recording, skipping')
         return
 
-    validation_plane = config.plane.ValidationPlane(config_dir, validationSetup)
+    validation_plane = ValidationPlane(config_dir, validationSetup)
 
     targets = {t_id: np.append(validation_plane.targets[t_id].center, 0.) for t_id in validation_plane.targets}   # get centers of targets
     plot_limits = [[validation_plane.bbox[0]-validation_plane.marker_size, validation_plane.bbox[2]+validation_plane.marker_size],

src/glassesValidator/process/g_calculateDataQuality.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 
-from glassesTools.validation import config, DataQualityType, compute_offsets
+from glassesTools.validation import config, DataQualityType, compute_offsets, Plane as ValidationPlane
 
 from .. import utils
 
@@ -20,7 +20,7 @@ def process(working_dir, config_dir=None,
 
     # get information about gaze target locations
     validationSetup = config.get_validation_setup(config_dir)
-    validation_plane = config.plane.ValidationPlane(config_dir, validationSetup)
+    validation_plane = ValidationPlane(config_dir, validationSetup)
     targets = {t_id: np.append(validation_plane.targets[t_id].center, 0.) for t_id in validation_plane.targets}   # get centers of targets
 
     # get interval coded to be analyzed

src/glassesValidator/utils/makeVideo.py

@@ -7,7 +7,7 @@
 
 from glassesTools import annotation, aruco, gaze_headref, gaze_worldref, naming, ocv, propagating_thread, recording, timestamps
 from glassesTools.gui import video_player
-from glassesTools.validation import config
+from glassesTools.validation import config, Plane as ValidationPlane
 
 from .. import utils
 
@@ -52,7 +52,7 @@ def do_the_work(working_dir, config_dir, gui: video_player.GUI, show_rejected_ma
     # open file with information about Aruco marker and Gaze target locations
     validationSetup = config.get_validation_setup(config_dir)
     # get info about markers on our poster
-    poster          = config.plane.ValidationPlane(config_dir, validationSetup)
+    poster          = ValidationPlane(config_dir, validationSetup)
     # get poster image width, height
     ref_img         = poster.get_ref_image(400)
     ref_height, ref_width, _ = ref_img.shape