From 614f1bc5d09ac8e5d219f6a89495d5f22fa49542 Mon Sep 17 00:00:00 2001
From: Théo de la Hogue
Date: Mon, 10 Jul 2023 16:36:14 +0200
Subject: Replacing ended_ by finished_

---
 src/argaze/ArFeatures.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/argaze/ArFeatures.py b/src/argaze/ArFeatures.py
index 5604a1d..3e2bc12 100644
--- a/src/argaze/ArFeatures.py
+++ b/src/argaze/ArFeatures.py
@@ -141,11 +141,11 @@ class ArFrame():
 			gaze_movement_identifier_type, gaze_movement_identifier_parameters = gaze_movement_identifier_value.popitem()
 
 			gaze_movement_identifier_module = importlib.import_module(f'argaze.GazeAnalysis.{gaze_movement_identifier_type}')
-			ended_gaze_movement_identifier = gaze_movement_identifier_module.GazeMovementIdentifier(**gaze_movement_identifier_parameters)
+			finished_gaze_movement_identifier = gaze_movement_identifier_module.GazeMovementIdentifier(**gaze_movement_identifier_parameters)
 
 		except KeyError:
 
-			ended_gaze_movement_identifier = None
+			finished_gaze_movement_identifier = None
 
 		# Load scan path analyzers
 		new_scan_path_analyzers = {}
@@ -248,7 +248,7 @@ class ArFrame():
 		return ArFrame(new_frame_name, \
 						new_frame_size, \
 						new_frame_background, \
-						ended_gaze_movement_identifier, \
+						finished_gaze_movement_identifier, \
 						GazeFeatures.ScanPath() if len(new_scan_path_analyzers) > 0 else None, \
 						new_scan_path_analyzers, \
 						GazeFeatures.AOIScanPath() if len(new_aoi_scan_path_analyzers) > 0 else None, \
@@ -315,15 +315,15 @@ class ArFrame():
 		# Identify gaze movement
 		if self.gaze_movement_identifier:
 
-			# Identify ended gaze movement
-			ended_gaze_movement = self.gaze_movement_identifier.identify(timestamp, self.__gaze_position)
+			# Identify finished gaze movement
+			finished_gaze_movement = self.gaze_movement_identifier.identify(timestamp, self.__gaze_position)
 
-			if GazeFeatures.is_fixation(ended_gaze_movement):
+			if GazeFeatures.is_fixation(finished_gaze_movement):
 
 				# Does the fixation match an aoi?
 				for name, aoi in self.aoi_2d_scene.items():
 
-					_, _, circle_ratio = aoi.circle_intersection(ended_gaze_movement.focus, ended_gaze_movement.deviation_max)
+					_, _, circle_ratio = aoi.circle_intersection(finished_gaze_movement.focus, finished_gaze_movement.deviation_max)
 
 					if circle_ratio > 0.25:
 
@@ -336,12 +336,12 @@ class ArFrame():
 				# Append fixation to scan path
 				if self.scan_path != None:
 
-					self.scan_path.append_fixation(timestamp, ended_gaze_movement)
+					self.scan_path.append_fixation(timestamp, finished_gaze_movement)
 
 				# Append fixation to aoi scan path
 				if self.aoi_scan_path != None and look_at != None:
 
-					aoi_scan_step = self.aoi_scan_path.append_fixation(timestamp, ended_gaze_movement, look_at)
+					aoi_scan_step = self.aoi_scan_path.append_fixation(timestamp, finished_gaze_movement, look_at)
 
 					# Analyze aoi scan path
 					if aoi_scan_step and len(self.aoi_scan_path) > 1:
@@ -352,7 +352,7 @@ class ArFrame():
 
 							aoi_scan_step_analysis[aoi_scan_path_analyzer_type] = aoi_scan_path_analyzer.analysis
 
-			elif GazeFeatures.is_saccade(ended_gaze_movement):
+			elif GazeFeatures.is_saccade(finished_gaze_movement):
 
 				# Update current look at
 				look_at = None
@@ -360,7 +360,7 @@ class ArFrame():
 				# Append saccade to scan path
 				if self.scan_path != None:
 					
-					scan_step = self.scan_path.append_saccade(timestamp, ended_gaze_movement)
+					scan_step = self.scan_path.append_saccade(timestamp, finished_gaze_movement)
 
 					# Analyze aoi scan path
 					if scan_step and len(self.scan_path) > 1:
@@ -374,7 +374,7 @@ class ArFrame():
 				# Append saccade to aoi scan path
 				if self.aoi_scan_path != None:
 
-					self.aoi_scan_path.append_saccade(timestamp, ended_gaze_movement)
+					self.aoi_scan_path.append_saccade(timestamp, finished_gaze_movement)
 
 		# Update heatmap
 		if self.heatmap:
@@ -385,7 +385,7 @@ class ArFrame():
 		self.__look_lock.release()
 
 		# Return look data
-		return ended_gaze_movement, look_at, scan_step_analysis, aoi_scan_step_analysis
+		return finished_gaze_movement, look_at, scan_step_analysis, aoi_scan_step_analysis
 
 	def draw(self, image:numpy.array):
 		"""
-- 
cgit v1.1