diff options
author | Théo de la Hogue | 2024-01-18 10:15:52 +0100 |
---|---|---|
committer | Théo de la Hogue | 2024-01-18 10:15:52 +0100 |
commit | 8f3b769874159b449d197d86476aaac9d2738000 (patch) | |
tree | 946d03063d796732eb6699c105ed36678829eb04 /src/argaze | |
parent | 2c1956de549bbc98144c0c81864a30b59d745435 (diff) | |
download | argaze-8f3b769874159b449d197d86476aaac9d2738000.zip argaze-8f3b769874159b449d197d86476aaac9d2738000.tar.gz argaze-8f3b769874159b449d197d86476aaac9d2738000.tar.bz2 argaze-8f3b769874159b449d197d86476aaac9d2738000.tar.xz |
Renaming DataStructures.py into DataFeatures.py.
Diffstat (limited to 'src/argaze')
-rw-r--r-- | src/argaze/ArFeatures.py | 16 | ||||
-rw-r--r-- | src/argaze/ArUcoMarkers/ArUcoCamera.py | 4 | ||||
-rw-r--r-- | src/argaze/ArUcoMarkers/ArUcoOpticCalibrator.py | 4 | ||||
-rw-r--r-- | src/argaze/ArUcoMarkers/ArUcoScene.py | 4 | ||||
-rw-r--r-- | src/argaze/AreaOfInterest/AOI2DScene.py | 2 | ||||
-rw-r--r-- | src/argaze/AreaOfInterest/AOI3DScene.py | 2 | ||||
-rw-r--r-- | src/argaze/AreaOfInterest/AOIFeatures.py | 4 | ||||
-rw-r--r-- | src/argaze/DataFeatures.py (renamed from src/argaze/DataStructures.py) | 0 | ||||
-rw-r--r-- | src/argaze/GazeFeatures.py | 10 | ||||
-rw-r--r-- | src/argaze/PupillFeatures.py | 6 | ||||
-rw-r--r-- | src/argaze/__init__.py | 2 |
11 files changed, 27 insertions, 27 deletions
diff --git a/src/argaze/ArFeatures.py b/src/argaze/ArFeatures.py index 7f1d2d6..7263b94 100644 --- a/src/argaze/ArFeatures.py +++ b/src/argaze/ArFeatures.py @@ -16,7 +16,7 @@ from inspect import getmembers import threading import time -from argaze import DataStructures, GazeFeatures +from argaze import DataFeatures, GazeFeatures from argaze.AreaOfInterest import * from argaze.GazeAnalysis import * @@ -94,12 +94,12 @@ DEFAULT_ARLAYER_DRAW_PARAMETERS = { } @dataclass -class ArLayer(DataStructures.SharedObject): +class ArLayer(DataFeatures.SharedObject): """ Defines a space where to make matching of gaze movements and AOI and inside which those matchings need to be analyzed. !!! note - Inherits from DataStructures.SharedObject class to be shared by multiple threads + Inherits from DataFeatures.SharedObject class to be shared by multiple threads Parameters: name: name of the layer @@ -147,7 +147,7 @@ class ArLayer(DataStructures.SharedObject): # Create timestamped buffers to log each aoi scan path analysis for aoi_scan_path_analyzer_module_path in self.aoi_scan_path_analyzers.keys(): - self.__ts_logs[aoi_scan_path_analyzer_module_path] = DataStructures.TimeStampedBuffer() + self.__ts_logs[aoi_scan_path_analyzer_module_path] = DataFeatures.TimeStampedBuffer() @classmethod def from_dict(self, layer_data: dict, working_directory: str = None) -> ArLayerType: @@ -520,12 +520,12 @@ DEFAULT_ARFRAME_IMAGE_PARAMETERS = { } @dataclass -class ArFrame(DataStructures.SharedObject): +class ArFrame(DataFeatures.SharedObject): """ Defines a rectangular area where to project in timestamped gaze positions and inside which they need to be analyzed. !!! note - Inherits from DataStructures.SharedObject class to be shared by multiple threads + Inherits from DataFeatures.SharedObject class to be shared by multiple threads Parameters: name: name of the frame @@ -579,7 +579,7 @@ class ArFrame(DataStructures.SharedObject): # Create timestamped buffers to log each aoi scan path analysis for scan_path_analyzer_module_path in self.scan_path_analyzers.keys(): - self.__ts_logs[scan_path_analyzer_module_path] = DataStructures.TimeStampedBuffer() + self.__ts_logs[scan_path_analyzer_module_path] = DataFeatures.TimeStampedBuffer() @classmethod def from_dict(self, frame_data: dict, working_directory: str = None) -> ArFrameType: @@ -1546,4 +1546,4 @@ class ArCamera(ArFrame): with open(json_filepath, 'w', encoding='utf-8') as file: - json.dump(self, file, ensure_ascii=False, indent=4, cls=DataStructures.JsonEncoder) + json.dump(self, file, ensure_ascii=False, indent=4, cls=DataFeatures.JsonEncoder) diff --git a/src/argaze/ArUcoMarkers/ArUcoCamera.py b/src/argaze/ArUcoMarkers/ArUcoCamera.py index 6afce03..3ef572b 100644 --- a/src/argaze/ArUcoMarkers/ArUcoCamera.py +++ b/src/argaze/ArUcoMarkers/ArUcoCamera.py @@ -13,7 +13,7 @@ import json import os import time -from argaze import ArFeatures, DataStructures +from argaze import ArFeatures, DataFeatures from argaze.ArUcoMarkers import ArUcoMarkersDictionary, ArUcoDetector, ArUcoOpticCalibrator, ArUcoScene from argaze.AreaOfInterest import AOI2DScene @@ -121,7 +121,7 @@ class ArUcoCamera(ArFeatures.ArCamera): aruco_camera_data['image_parameters']['draw_layers'][layer_name] = ArFeatures.DEFAULT_ARLAYER_DRAW_PARAMETERS # Get values of temporary ar frame created from aruco_camera_data - temp_ar_frame_values = DataStructures.as_dict(ArFeatures.ArFrame.from_dict(aruco_camera_data, working_directory)) + temp_ar_frame_values = DataFeatures.as_dict(ArFeatures.ArFrame.from_dict(aruco_camera_data, working_directory)) # Create new aruco camera using temporary ar frame values return ArUcoCamera(aruco_detector=new_aruco_detector, scenes=new_scenes, **temp_ar_frame_values) diff --git a/src/argaze/ArUcoMarkers/ArUcoOpticCalibrator.py b/src/argaze/ArUcoMarkers/ArUcoOpticCalibrator.py index f206c11..cdf2c5c 100644 --- a/src/argaze/ArUcoMarkers/ArUcoOpticCalibrator.py +++ b/src/argaze/ArUcoMarkers/ArUcoOpticCalibrator.py @@ -9,7 +9,7 @@ __license__ = "BSD" from dataclasses import dataclass, field -from argaze import DataStructures +from argaze import DataFeatures import json import numpy @@ -58,7 +58,7 @@ class OpticParameters(): with open(json_filepath, 'w', encoding='utf-8') as calibration_file: - json.dump(self, calibration_file, ensure_ascii=False, indent=4, cls=DataStructures.JsonEncoder) + json.dump(self, calibration_file, ensure_ascii=False, indent=4, cls=DataFeatures.JsonEncoder) def __str__(self) -> str: """String display""" diff --git a/src/argaze/ArUcoMarkers/ArUcoScene.py b/src/argaze/ArUcoMarkers/ArUcoScene.py index 51dd88c..b60b59d 100644 --- a/src/argaze/ArUcoMarkers/ArUcoScene.py +++ b/src/argaze/ArUcoMarkers/ArUcoScene.py @@ -12,7 +12,7 @@ from dataclasses import dataclass, field import json import os -from argaze import ArFeatures, DataStructures +from argaze import ArFeatures, DataFeatures from argaze.ArUcoMarkers import ArUcoMarkersGroup from argaze.AreaOfInterest import AOI2DScene @@ -91,7 +91,7 @@ class ArUcoScene(ArFeatures.ArScene): new_aruco_markers_group = None # Get values of temporary ar scene created from aruco_scene_data - temp_ar_scene_values = DataStructures.as_dict(ArFeatures.ArScene.from_dict(aruco_scene_data, working_directory)) + temp_ar_scene_values = DataFeatures.as_dict(ArFeatures.ArScene.from_dict(aruco_scene_data, working_directory)) # Create new aruco scene using temporary ar scene values return ArUcoScene(aruco_markers_group=new_aruco_markers_group, **temp_ar_scene_values) diff --git a/src/argaze/AreaOfInterest/AOI2DScene.py b/src/argaze/AreaOfInterest/AOI2DScene.py index 062044f..91d9d56 100644 --- a/src/argaze/AreaOfInterest/AOI2DScene.py +++ b/src/argaze/AreaOfInterest/AOI2DScene.py @@ -9,7 +9,7 @@ __license__ = "BSD" from typing import TypeVar, Tuple -from argaze import DataStructures +from argaze import DataFeatures from argaze.AreaOfInterest import AOIFeatures, AOI3DScene from argaze import GazeFeatures diff --git a/src/argaze/AreaOfInterest/AOI3DScene.py b/src/argaze/AreaOfInterest/AOI3DScene.py index 33a815c..482437c 100644 --- a/src/argaze/AreaOfInterest/AOI3DScene.py +++ b/src/argaze/AreaOfInterest/AOI3DScene.py @@ -11,7 +11,7 @@ from typing import TypeVar, Tuple import math import re -from argaze import DataStructures +from argaze import DataFeatures from argaze.AreaOfInterest import AOIFeatures, AOI2DScene import numpy diff --git a/src/argaze/AreaOfInterest/AOIFeatures.py b/src/argaze/AreaOfInterest/AOIFeatures.py index 77a92fd..9f9f4ad 100644 --- a/src/argaze/AreaOfInterest/AOIFeatures.py +++ b/src/argaze/AreaOfInterest/AOIFeatures.py @@ -13,7 +13,7 @@ import json import os import math -from argaze import DataStructures +from argaze import DataFeatures import cv2 import matplotlib.path as mpath @@ -540,7 +540,7 @@ class AOIScene(): return scene_copy -class TimeStampedAOIScenes(DataStructures.TimeStampedBuffer): +class TimeStampedAOIScenes(DataFeatures.TimeStampedBuffer): """Define timestamped buffer to store AOI scenes in time.""" def __setitem__(self, ts, scene): diff --git a/src/argaze/DataStructures.py b/src/argaze/DataFeatures.py index 6e058e8..6e058e8 100644 --- a/src/argaze/DataStructures.py +++ b/src/argaze/DataFeatures.py diff --git a/src/argaze/GazeFeatures.py b/src/argaze/GazeFeatures.py index 12cccbc..af9f943 100644 --- a/src/argaze/GazeFeatures.py +++ b/src/argaze/GazeFeatures.py @@ -15,7 +15,7 @@ import json import importlib from inspect import getmembers -from argaze import DataStructures +from argaze import DataFeatures from argaze.AreaOfInterest import AOIFeatures import numpy @@ -119,7 +119,7 @@ class UnvalidGazePosition(GazePosition): TimeStampedGazePositionsType = TypeVar('TimeStampedGazePositions', bound="TimeStampedGazePositions") # Type definition for type annotation convenience -class TimeStampedGazePositions(DataStructures.TimeStampedBuffer): +class TimeStampedGazePositions(DataFeatures.TimeStampedBuffer): """Define timestamped buffer to store gaze positions.""" def __setitem__(self, key, value: GazePosition|dict): @@ -255,7 +255,7 @@ class GazePositionCalibrator(): # Open file with open(self.__json_filepath, 'w', encoding='utf-8') as calibration_file: - json.dump({DataStructures.module_path(self):DataStructures.JsonEncoder().default(self)}, calibration_file, ensure_ascii=False, indent=4) + json.dump({DataFeatures.module_path(self):DataFeatures.JsonEncoder().default(self)}, calibration_file, ensure_ascii=False, indent=4) def store(self, timestamp: int|float, observed_gaze_position: GazePosition, expected_gaze_position: GazePosition): """Store observed and expected gaze positions. @@ -466,7 +466,7 @@ def is_saccade(gaze_movement): TimeStampedGazeMovementsType = TypeVar('TimeStampedGazeMovements', bound="TimeStampedGazeMovements") # Type definition for type annotation convenience -class TimeStampedGazeMovements(DataStructures.TimeStampedBuffer): +class TimeStampedGazeMovements(DataFeatures.TimeStampedBuffer): """Define timestamped buffer to store gaze movements.""" def __setitem__(self, key, value: GazeMovement): @@ -507,7 +507,7 @@ class GazeStatus(GazePosition): TimeStampedGazeStatusType = TypeVar('TimeStampedGazeStatus', bound="TimeStampedGazeStatus") # Type definition for type annotation convenience -class TimeStampedGazeStatus(DataStructures.TimeStampedBuffer): +class TimeStampedGazeStatus(DataFeatures.TimeStampedBuffer): """Define timestamped buffer to store list of gaze statusa. !!! note diff --git a/src/argaze/PupillFeatures.py b/src/argaze/PupillFeatures.py index 05408a3..d751af6 100644 --- a/src/argaze/PupillFeatures.py +++ b/src/argaze/PupillFeatures.py @@ -11,7 +11,7 @@ from typing import TypeVar from dataclasses import dataclass, field import json -from argaze import DataStructures +from argaze import DataFeatures @dataclass(frozen=True) class PupillDiameter(): @@ -43,7 +43,7 @@ class UnvalidPupillDiameter(PupillDiameter): TimeStampedPupillDiametersType = TypeVar('TimeStampedPupillDiameters', bound="TimeStampedPupillDiameters") # Type definition for type annotation convenience -class TimeStampedPupillDiameters(DataStructures.TimeStampedBuffer): +class TimeStampedPupillDiameters(DataFeatures.TimeStampedBuffer): """Define timestamped buffer to store pupill diameters.""" def __setitem__(self, key, value: PupillDiameter|dict): @@ -92,7 +92,7 @@ class PupillDiameterAnalyzer(): assert(type(ts_pupill_diameters) == TimeStampedPupillDiameters) - ts_analyzis = DataStructures.TimeStampedBuffer() + ts_analyzis = DataFeatures.TimeStampedBuffer() # Iterate on pupill diameters for ts, pupill_diameter in ts_pupill_diameters.items(): diff --git a/src/argaze/__init__.py b/src/argaze/__init__.py index 9f79a17..f29c5d3 100644 --- a/src/argaze/__init__.py +++ b/src/argaze/__init__.py @@ -1,4 +1,4 @@ """ ArGaze is divided in submodules dedicated to various specifics features. """ -__all__ = ['ArUcoMarkers','AreaOfInterest','ArFeatures','GazeFeatures','GazeAnalysis','PupillFeatures','PupillAnalysis','DataStructures','utils']
\ No newline at end of file +__all__ = ['ArUcoMarkers','AreaOfInterest','ArFeatures','GazeFeatures','GazeAnalysis','PupillFeatures','PupillAnalysis','DataFeatures','utils']
\ No newline at end of file |