diff options
| author | Théo de la Hogue | 2024-03-27 18:19:40 +0100 |
|---|---|---|
| committer | Théo de la Hogue | 2024-03-27 18:19:40 +0100 |
| commit | c28b87247bec54eac758bf130d372266beb07577 (patch) | |
| tree | 67aef45f6ab492e76a87384edb8bdc369014ad9f | |
| parent | 78ff8e4fc36432e533571cb72bd95709e61ac146 (diff) | |
| download | argaze-c28b87247bec54eac758bf130d372266beb07577.zip argaze-c28b87247bec54eac758bf130d372266beb07577.tar.gz argaze-c28b87247bec54eac758bf130d372266beb07577.tar.bz2 argaze-c28b87247bec54eac758bf130d372266beb07577.tar.xz | |
Inversing AOIMatcher.match argument position.
| -rw-r--r-- | src/argaze/ArFeatures.py | 2 | ||||
| -rw-r--r-- | src/argaze/GazeAnalysis/DeviationCircleCoverage.py | 2 | ||||
| -rw-r--r-- | src/argaze/GazeAnalysis/FocusPointInside.py | 2 | ||||
| -rw-r--r-- | src/argaze/GazeFeatures.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/argaze/ArFeatures.py b/src/argaze/ArFeatures.py index 6b5589e..111bde3 100644 --- a/src/argaze/ArFeatures.py +++ b/src/argaze/ArFeatures.py @@ -360,7 +360,7 @@ class ArLayer(DataFeatures.SharedObject, DataFeatures.PipelineStepObject): # Update looked aoi thanks to aoi matcher # Note: don't filter valid/unvalid and finished/unfinished fixation/saccade as we don't know how the aoi matcher works internally - self.__looked_aoi_name, _ = self.__aoi_matcher.match(self.__aoi_scene, gaze_movement, timestamp=gaze_movement.timestamp) + self.__looked_aoi_name, _ = self.__aoi_matcher.match(gaze_movement, self.__aoi_scene) logging.debug('\t> looked aoi name: %s', self.__looked_aoi_name) diff --git a/src/argaze/GazeAnalysis/DeviationCircleCoverage.py b/src/argaze/GazeAnalysis/DeviationCircleCoverage.py index 9f0121e..48ecbda 100644 --- a/src/argaze/GazeAnalysis/DeviationCircleCoverage.py +++ b/src/argaze/GazeAnalysis/DeviationCircleCoverage.py @@ -57,7 +57,7 @@ class AOIMatcher(GazeFeatures.AOIMatcher): self.__matched_region = None @DataFeatures.PipelineStepMethod - def match(self, aoi_scene, gaze_movement) -> tuple[str, AOIFeatures.AreaOfInterest]: + def match(self, gaze_movement, aoi_scene) -> tuple[str, AOIFeatures.AreaOfInterest]: """Returns AOI with the maximal fixation's deviation circle coverage if above coverage threshold.""" if GazeFeatures.is_fixation(gaze_movement): diff --git a/src/argaze/GazeAnalysis/FocusPointInside.py b/src/argaze/GazeAnalysis/FocusPointInside.py index 48943b2..3626e22 100644 --- a/src/argaze/GazeAnalysis/FocusPointInside.py +++ b/src/argaze/GazeAnalysis/FocusPointInside.py @@ -41,7 +41,7 @@ class AOIMatcher(GazeFeatures.AOIMatcher): self.__matched_gaze_movement = None @DataFeatures.PipelineStepMethod - def match(self, aoi_scene, gaze_movement) -> tuple[str, AOIFeatures.AreaOfInterest]: + def match(self, gaze_movement, aoi_scene) -> tuple[str, AOIFeatures.AreaOfInterest]: """Returns AOI containing fixation focus point.""" if GazeFeatures.is_fixation(gaze_movement): diff --git a/src/argaze/GazeFeatures.py b/src/argaze/GazeFeatures.py index 48b303c..bb2fb5b 100644 --- a/src/argaze/GazeFeatures.py +++ b/src/argaze/GazeFeatures.py @@ -848,7 +848,7 @@ class AOIMatcher(DataFeatures.PipelineStepObject): self.__exclude = exclude - def match(self, aoi_scene: AOIFeatures.AOIScene, gaze_movement: GazeMovement) -> tuple[str, AOIFeatures.AreaOfInterest]: + def match(self, gaze_movement: GazeMovement, aoi_scene: AOIFeatures.AOIScene) -> tuple[str, AOIFeatures.AreaOfInterest]: """Which AOI is looked in the scene?""" raise NotImplementedError('match() method not implemented') |