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.1   # 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
 typeguard
 uvloop ; sys_platform != "win32"
 watchfiles

src/gazeMapper/GUI/_impl/callbacks.py

@@ -9,7 +9,7 @@
 from imgui_bundle import imgui, imspinner, hello_imgui, icons_fontawesome_6 as ifa6
 
 from glassesTools import annotation, aruco, async_thread, camera_recording, eyetracker, gui as gt_gui, naming as gt_naming, platform, process_pool, recording, video_utils
-from glassesTools.validation import config as val_config, DataQualityType, export, get_DataQualityType_explanation
+from glassesTools.validation import config as val_config, default_poster, DataQualityType, export, get_DataQualityType_explanation
 from glassesTools.gui import colors
 
 from . import utils
@@ -39,7 +39,7 @@ def select_callback(selected: list[pathlib.Path]):
             case 'deploy_aruco':
                 aruco.deploy_marker_images(selected[0], 1000, *args, **kwargs)
             case 'deploy_gv_poster_pdf':
-                val_config.plane.deploy_default_pdf(selected[0])
+                default_poster.deploy_default_pdf(selected[0])
             case 'export':
                 show_export_config(g, selected[0], *args, **kwargs)
             case _:
@@ -165,7 +165,7 @@ def glasses_validator_plane_check_config(study_config: config.Study, pl: plane.D
         val_config.get_validation_setup(working_dir)
     except:
         # no config file, deploy
-        val_config.deploy_validation_config(working_dir)
+        default_poster.deploy_config(working_dir)
     else:
         # already exists, nothing to do
         pass

src/gazeMapper/plane.py

@@ -8,7 +8,7 @@
 
 from glassesTools import plane, utils
 from glassesTools.validation.config import get_validation_setup
-from glassesTools.validation.config.plane import ValidationPlane
+from glassesTools.validation import Plane as ValidationPlane
 
 from . import type_utils
 

src/gazeMapper/process/run_validation.py

@@ -2,7 +2,7 @@
 import numpy as np
 
 from glassesTools import annotation, fixation_classification, process_pool
-from glassesTools.validation import config as val_config, assign_fixations, compute_offsets
+from glassesTools.validation import assign_fixations, compute_offsets, Plane as ValidationPlane
 
 from .. import config, episode, naming, plane, process, session
 
@@ -37,7 +37,7 @@ def run(working_dir: str|pathlib.Path, config_dir: str|pathlib.Path = None, **st
         if not plane_def.use_default:
             validator_config_dir = config_dir/p
 
-        validation_plane = val_config.plane.ValidationPlane(validator_config_dir)
+        validation_plane = ValidationPlane(validator_config_dir)
 
         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]]