gazeMapper 1.2.0__tar.gz → 1.3.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (50) hide show
  1. {gazemapper-1.2.0/src/gazeMapper.egg-info → gazemapper-1.3.0}/PKG-INFO +5 -4
  2. {gazemapper-1.2.0 → gazemapper-1.3.0}/README.md +2 -1
  3. {gazemapper-1.2.0 → gazemapper-1.3.0}/requirements.txt +2 -2
  4. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/GUI/_impl/callbacks.py +8 -4
  5. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/process/gaze_to_plane.py +5 -2
  6. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/process/sync_et_to_cam.py +3 -0
  7. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/version.py +1 -1
  8. {gazemapper-1.2.0 → gazemapper-1.3.0/src/gazeMapper.egg-info}/PKG-INFO +5 -4
  9. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper.egg-info/requires.txt +2 -2
  10. {gazemapper-1.2.0 → gazemapper-1.3.0}/LICENSE +0 -0
  11. {gazemapper-1.2.0 → gazemapper-1.3.0}/MANIFEST.in +0 -0
  12. {gazemapper-1.2.0 → gazemapper-1.3.0}/pyproject.toml +0 -0
  13. {gazemapper-1.2.0 → gazemapper-1.3.0}/setup.cfg +0 -0
  14. {gazemapper-1.2.0 → gazemapper-1.3.0}/setup.py +0 -0
  15. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/GUI/__init__.py +0 -0
  16. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/GUI/_impl/__init__.py +0 -0
  17. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/GUI/_impl/colors.py +0 -0
  18. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/GUI/_impl/gui.py +0 -0
  19. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/GUI/_impl/image_helper.py +0 -0
  20. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/GUI/_impl/process_pool.py +0 -0
  21. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/GUI/_impl/session_lister.py +0 -0
  22. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/GUI/_impl/settings_editor.py +0 -0
  23. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/GUI/_impl/utils.py +0 -0
  24. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/__init__.py +0 -0
  25. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/config.py +0 -0
  26. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/episode.py +0 -0
  27. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/marker.py +0 -0
  28. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/naming.py +0 -0
  29. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/plane.py +0 -0
  30. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/process/__init__.py +0 -0
  31. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/process/_utils.py +0 -0
  32. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/process/auto_code_sync_points.py +0 -0
  33. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/process/auto_code_trials.py +0 -0
  34. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/process/code_episodes.py +0 -0
  35. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/process/detect_markers.py +0 -0
  36. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/process/export_trials.py +0 -0
  37. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/process/make_video.py +0 -0
  38. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/process/run_validation.py +0 -0
  39. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/process/sync_to_ref.py +0 -0
  40. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/project_watcher.py +0 -0
  41. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/session.py +0 -0
  42. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/synchronization.py +0 -0
  43. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/type_utils.py +0 -0
  44. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/typed_dict_defaults.py +0 -0
  45. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/utils/__init__.py +0 -0
  46. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper/utils/color_blob_localizer.py +0 -0
  47. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper.egg-info/SOURCES.txt +0 -0
  48. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper.egg-info/dependency_links.txt +0 -0
  49. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper.egg-info/entry_points.txt +0 -0
  50. {gazemapper-1.2.0 → gazemapper-1.3.0}/src/gazeMapper.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: gazeMapper
3
- Version: 1.2.0
3
+ Version: 1.3.0
4
4
  Summary: Automated world-based analysis of wearable eye tracker data.
5
5
  Home-page: https://github.com/dcnieho/gazeMapper
6
6
  Author: Diederick Niehorster
@@ -34,8 +34,8 @@ Classifier: Operating System :: OS Independent
34
34
  Requires-Python: >=3.11
35
35
  Description-Content-Type: text/markdown
36
36
  License-File: LICENSE
37
- Requires-Dist: glassesTools[GUI]==1.14.0
38
- Requires-Dist: glassesValidator==2.2.0
37
+ Requires-Dist: glassesTools[GUI]==1.15.0
38
+ Requires-Dist: glassesValidator==2.3.0
39
39
  Requires-Dist: typeguard
40
40
  Requires-Dist: uvloop; sys_platform != "win32"
41
41
  Requires-Dist: watchfiles
@@ -56,7 +56,7 @@ Dynamic: summary
56
56
  [![PyPI Latest Release](https://img.shields.io/pypi/v/gazeMapper.svg)](https://pypi.org/project/gazeMapper/)
57
57
  [![image](https://img.shields.io/pypi/pyversions/gazeMapper.svg)](https://pypi.org/project/gazeMapper/)
58
58
 
59
- # gazeMapper v1.2.0
59
+ # gazeMapper v1.3.0
60
60
  Tool for automated world-based analysis of wearable eye tracker data.
61
61
  gazeMapper is an open-source tool for automated mapping and processing of eye-tracking data to enable automated world-based analysis.
62
62
  gazeMapper can:
@@ -519,6 +519,7 @@ gazeMapper supports the following eye trackers:
519
519
  - SMI ETG 1 and ETG 2
520
520
  - Tobii Pro Glasses 2
521
521
  - Tobii Pro Glasses 3
522
+ - Viewpointsystem VPS 19
522
523
 
523
524
  * The generic eye tracker allows users to import recordings made with unsupported eye trackers into tools built upon glassesTools, if the user has already converted the recording to the [glassesTools format](https://github.com/dcnieho/glassesTools/blob/master/README.md#common-data-format) themselves. The name of the eye tracker can be set in the [recording info](https://github.com/dcnieho/glassesTools/blob/master/README.md#recording-info) file through the `eye_tracker_name` property, so that recordings from different devices imported as generic eye tracker recordings can be distinguished.
524
525
 
@@ -2,7 +2,7 @@
2
2
  [![PyPI Latest Release](https://img.shields.io/pypi/v/gazeMapper.svg)](https://pypi.org/project/gazeMapper/)
3
3
  [![image](https://img.shields.io/pypi/pyversions/gazeMapper.svg)](https://pypi.org/project/gazeMapper/)
4
4
 
5
- # gazeMapper v1.2.0
5
+ # gazeMapper v1.3.0
6
6
  Tool for automated world-based analysis of wearable eye tracker data.
7
7
  gazeMapper is an open-source tool for automated mapping and processing of eye-tracking data to enable automated world-based analysis.
8
8
  gazeMapper can:
@@ -465,6 +465,7 @@ gazeMapper supports the following eye trackers:
465
465
  - SMI ETG 1 and ETG 2
466
466
  - Tobii Pro Glasses 2
467
467
  - Tobii Pro Glasses 3
468
+ - Viewpointsystem VPS 19
468
469
 
469
470
  * The generic eye tracker allows users to import recordings made with unsupported eye trackers into tools built upon glassesTools, if the user has already converted the recording to the [glassesTools format](https://github.com/dcnieho/glassesTools/blob/master/README.md#common-data-format) themselves. The name of the eye tracker can be set in the [recording info](https://github.com/dcnieho/glassesTools/blob/master/README.md#recording-info) file through the `eye_tracker_name` property, so that recordings from different devices imported as generic eye tracker recordings can be distinguished.
470
471
 
@@ -1,5 +1,5 @@
1
- glassesTools[GUI]==1.14.0 # pulls in various other dependencies such as imgui_bundle, matplotlib, numpy, opencv, pandas, polars
2
- glassesValidator==2.2.0
1
+ glassesTools[GUI]==1.15.0 # pulls in various other dependencies such as imgui_bundle, matplotlib, numpy, opencv, pandas, polars
2
+ glassesValidator==2.3.0
3
3
  typeguard
4
4
  uvloop ; sys_platform != "win32"
5
5
  watchfiles
@@ -514,12 +514,14 @@ async def _show_addable_recordings(g, rec_getter: typing.Callable[[],list[record
514
514
  recs = rec_getter()
515
515
  all_recs: list[recording.Recording] = []
516
516
  dup_recs: list[recording.Recording] = []
517
+ known_rec_dirs = [g.sessions[s].recordings[r].info.source_directory for s in g.sessions for r in g.sessions[s].recordings if g.sessions[s].recordings[r].definition.type==dev_type]
518
+ known_rec_names= [g.sessions[s].recordings[r].info.name for s in g.sessions for r in g.sessions[s].recordings if g.sessions[s].recordings[r].definition.type==dev_type]
517
519
  for rec in recs:
518
520
  # skip duplicates. For eye tracker recordings, this checks for the source folder. For camera recordings, its checks for the full file path
519
521
  if dev_type==session.RecordingType.Camera:
520
522
  dup = rec.source_directory/rec.video_file in (g.sessions[s].recordings[r].info.source_directory/g.sessions[s].recordings[r].info.video_file for s in g.sessions for r in g.sessions[s].recordings if g.sessions[s].recordings[r].definition.type==dev_type)
521
523
  elif dev_type==session.RecordingType.Eye_Tracker:
522
- dup = rec.source_directory in (g.sessions[s].recordings[r].info.source_directory for s in g.sessions for r in g.sessions[s].recordings if g.sessions[s].recordings[r].definition.type==dev_type)
524
+ dup = any([a and b for a,b in zip([rec.source_directory==d for d in known_rec_dirs],[rec.name==n for n in known_rec_names])])
523
525
  if dup:
524
526
  dup_recs.append(rec)
525
527
  else:
@@ -739,6 +741,10 @@ def add_eyetracking_recordings(g, paths: list[pathlib.Path], sessions: list[str]
739
741
  changed, combo_value = imgui.combo("##select_eye_tracker", combo_value, eyetracker.eye_tracker_names)
740
742
  if changed:
741
743
  eye_tracker = eyetracker.EyeTracker(eyetracker.eye_tracker_names[combo_value])
744
+ if eye_tracker!=eyetracker.EyeTracker.Generic:
745
+ invalid = False
746
+ generic_et_idx = -1
747
+ generic_et_name = ''
742
748
  imgui.pop_item_width()
743
749
  imgui.dummy((0,2*imgui.get_style().item_spacing.y))
744
750
  if eye_tracker==eyetracker.EyeTracker.Generic:
@@ -759,15 +765,13 @@ def add_eyetracking_recordings(g, paths: list[pathlib.Path], sessions: list[str]
759
765
  generic_et_name = g.study_config.import_known_custom_eye_trackers[generic_et_idx]
760
766
  imgui.pop_item_width()
761
767
  imgui.dummy((0,2*imgui.get_style().item_spacing.y))
762
- else:
763
- invalid = False
764
768
 
765
769
  imgui.end_group()
766
770
 
767
771
  return combo_value, eye_tracker
768
772
 
769
773
  buttons = {
770
- ifa6.ICON_FA_CHECK+" Continue": (lambda: async_thread.run(_show_addable_recordings(g, lambda: recording.find_recordings(paths, eye_tracker, generic_et_name), session.RecordingType.Eye_Tracker, eye_tracker, sessions, generic_et_name)), lambda: invalid or generic_et_idx==-1),
774
+ ifa6.ICON_FA_CHECK+" Continue": (lambda: async_thread.run(_show_addable_recordings(g, lambda: recording.find_recordings(paths, eye_tracker, None if not generic_et_name else generic_et_name), session.RecordingType.Eye_Tracker, eye_tracker, sessions, None if not generic_et_name else generic_et_name)), lambda: invalid or (eye_tracker==eyetracker.EyeTracker.Generic and generic_et_idx==-1)),
771
775
  ifa6.ICON_FA_CIRCLE_XMARK+" Cancel": None
772
776
  }
773
777
 
@@ -55,8 +55,11 @@ def do_the_work(working_dir: pathlib.Path, config_dir: pathlib.Path, gui: GUI, s
55
55
  episodes[annotation.Event.Trial] = synchronization.get_episode_frame_indices_from_ref(working_dir, annotation.Event.Trial, rec_def.name, study_config.sync_ref_recording, all_recs, study_config.sync_ref_do_time_stretch, study_config.sync_ref_average_recordings, study_config.sync_ref_stretch_which)
56
56
 
57
57
  # we transform to map to plane for validate and trial episodes, set it up
58
+ episodes_to_proc = [annotation.Event.Validate, annotation.Event.Trial]
59
+ if annotation.Event.Sync_ET_Data in study_config.episodes_to_code and study_config.get_cam_movement_for_et_sync_method=='plane':
60
+ episodes_to_proc.append(annotation.Event.Sync_ET_Data)
58
61
  mapping_setup: dict[str, list[list[int]]] = {}
59
- for e in [annotation.Event.Validate, annotation.Event.Trial]:
62
+ for e in episodes_to_proc:
60
63
  if e in study_config.planes_per_episode:
61
64
  for p in study_config.planes_per_episode[e]:
62
65
  if p not in mapping_setup:
@@ -95,6 +98,6 @@ def do_the_work(working_dir: pathlib.Path, config_dir: pathlib.Path, gui: GUI, s
95
98
  worldgaze_gui.show_visualization(
96
99
  in_video, working_dir / gt_naming.frame_timestamps_fname, working_dir / gt_naming.scene_camera_calibration_fname,
97
100
  planes, poses, head_gazes, plane_gazes,
98
- {e:episodes[e] for e in [annotation.Event.Validate, annotation.Event.Trial] if e in episodes},
101
+ {e:episodes[e] for e in episodes_to_proc if e in episodes},
99
102
  gui, show_planes, show_only_intervals, 8
100
103
  )
@@ -1,4 +1,5 @@
1
1
  import pathlib
2
+ import time
2
3
  import numpy as np
3
4
  import pandas as pd
4
5
  import polars as pl
@@ -110,6 +111,8 @@ def do_the_work(working_dir: pathlib.Path, config_dir: pathlib.Path, gui: GUI, *
110
111
  has_requested_focus = not isMacOS # False only if on Mac OS, else True since its a no-op
111
112
  ival = 0
112
113
  need_to_load = True
114
+ while not gui.is_started:
115
+ time.sleep(0.01)
113
116
  while True:
114
117
  if not has_requested_focus:
115
118
  AppKit.NSApplication.sharedApplication().activateIgnoringOtherApps_(1)
@@ -1,4 +1,4 @@
1
- __version__ = "1.2.0"
1
+ __version__ = "1.3.0"
2
2
 
3
3
  __title__ = "gazeMapper"
4
4
  __description__ = "Automated world-based analysis of wearable eye tracker data."
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: gazeMapper
3
- Version: 1.2.0
3
+ Version: 1.3.0
4
4
  Summary: Automated world-based analysis of wearable eye tracker data.
5
5
  Home-page: https://github.com/dcnieho/gazeMapper
6
6
  Author: Diederick Niehorster
@@ -34,8 +34,8 @@ Classifier: Operating System :: OS Independent
34
34
  Requires-Python: >=3.11
35
35
  Description-Content-Type: text/markdown
36
36
  License-File: LICENSE
37
- Requires-Dist: glassesTools[GUI]==1.14.0
38
- Requires-Dist: glassesValidator==2.2.0
37
+ Requires-Dist: glassesTools[GUI]==1.15.0
38
+ Requires-Dist: glassesValidator==2.3.0
39
39
  Requires-Dist: typeguard
40
40
  Requires-Dist: uvloop; sys_platform != "win32"
41
41
  Requires-Dist: watchfiles
@@ -56,7 +56,7 @@ Dynamic: summary
56
56
  [![PyPI Latest Release](https://img.shields.io/pypi/v/gazeMapper.svg)](https://pypi.org/project/gazeMapper/)
57
57
  [![image](https://img.shields.io/pypi/pyversions/gazeMapper.svg)](https://pypi.org/project/gazeMapper/)
58
58
 
59
- # gazeMapper v1.2.0
59
+ # gazeMapper v1.3.0
60
60
  Tool for automated world-based analysis of wearable eye tracker data.
61
61
  gazeMapper is an open-source tool for automated mapping and processing of eye-tracking data to enable automated world-based analysis.
62
62
  gazeMapper can:
@@ -519,6 +519,7 @@ gazeMapper supports the following eye trackers:
519
519
  - SMI ETG 1 and ETG 2
520
520
  - Tobii Pro Glasses 2
521
521
  - Tobii Pro Glasses 3
522
+ - Viewpointsystem VPS 19
522
523
 
523
524
  * The generic eye tracker allows users to import recordings made with unsupported eye trackers into tools built upon glassesTools, if the user has already converted the recording to the [glassesTools format](https://github.com/dcnieho/glassesTools/blob/master/README.md#common-data-format) themselves. The name of the eye tracker can be set in the [recording info](https://github.com/dcnieho/glassesTools/blob/master/README.md#recording-info) file through the `eye_tracker_name` property, so that recordings from different devices imported as generic eye tracker recordings can be distinguished.
524
525
 
@@ -1,5 +1,5 @@
1
- glassesTools[GUI]==1.14.0
2
- glassesValidator==2.2.0
1
+ glassesTools[GUI]==1.15.0
2
+ glassesValidator==2.3.0
3
3
  typeguard
4
4
  watchfiles
5
5
  pebble
File without changes
File without changes
File without changes
File without changes
File without changes