From 051281dda49cf7de68dab863c3261def80ad9a8b Mon Sep 17 00:00:00 2001 From: Théo de la Hogue Date: Mon, 20 Feb 2023 09:56:09 +0100 Subject: Using numpy.ndarray instead of numpy.array to define attribute type in dataclass. --- src/argaze/ArUcoMarkers/ArUcoCamera.py | 6 +++--- src/argaze/ArUcoMarkers/ArUcoMarker.py | 8 ++++---- src/argaze/ArUcoMarkers/ArUcoScene.py | 4 ++-- src/argaze/TobiiGlassesPro2/TobiiData.py | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/argaze/ArUcoMarkers/ArUcoCamera.py b/src/argaze/ArUcoMarkers/ArUcoCamera.py index eea4393..4ed8f9f 100644 --- a/src/argaze/ArUcoMarkers/ArUcoCamera.py +++ b/src/argaze/ArUcoMarkers/ArUcoCamera.py @@ -19,13 +19,13 @@ class CalibrationData(): rms: float = field(default=0) """Root Mean Square error of calibration.""" - dimensions: numpy.array = field(default=numpy.array([0, 0])) + dimensions: numpy.ndarray = field(default=numpy.array([0, 0])) """Frame dimensions in pixels from which the calibration have been done.""" - K: numpy.array = field(default=K0) + K: numpy.ndarray = field(default=K0) """Intrinsic parameters matrix (focal lengths and principal point).""" - D: numpy.array = field(default=D0) + D: numpy.ndarray = field(default=D0) """Distorsion coefficients vector.""" @classmethod diff --git a/src/argaze/ArUcoMarkers/ArUcoMarker.py b/src/argaze/ArUcoMarkers/ArUcoMarker.py index df82523..62da2ca 100644 --- a/src/argaze/ArUcoMarkers/ArUcoMarker.py +++ b/src/argaze/ArUcoMarkers/ArUcoMarker.py @@ -21,16 +21,16 @@ class ArUcoMarker(): size: float """Size of marker in centimeters.""" - corners: numpy.array = field(init=False, repr=False) + corners: numpy.ndarray = field(init=False, repr=False) """Estimated 2D corner positions in camera image referential.""" - translation: numpy.array = field(init=False, repr=False) + translation: numpy.ndarray = field(init=False, repr=False) """Estimated 3D center position in camera world referential.""" - rotation: numpy.array = field(init=False, repr=False) + rotation: numpy.ndarray = field(init=False, repr=False) """Estimated 3D marker rotation in camera world referential.""" - points: numpy.array = field(init=False, repr=False) + points: numpy.ndarray = field(init=False, repr=False) """Estimated 3D corners positions in camera world referential.""" @property diff --git a/src/argaze/ArUcoMarkers/ArUcoScene.py b/src/argaze/ArUcoMarkers/ArUcoScene.py index a54c100..c9d792b 100644 --- a/src/argaze/ArUcoMarkers/ArUcoScene.py +++ b/src/argaze/ArUcoMarkers/ArUcoScene.py @@ -26,10 +26,10 @@ ArUcoSceneType = TypeVar('ArUcoScene', bound="ArUcoScene") class Place(): """Define a place as a pose and a marker.""" - translation: numpy.array + translation: numpy.ndarray """Position in scene referential.""" - rotation: numpy.array + rotation: numpy.ndarray """Rotation in scene referential.""" marker: dict diff --git a/src/argaze/TobiiGlassesPro2/TobiiData.py b/src/argaze/TobiiGlassesPro2/TobiiData.py index 0e28054..87af44a 100644 --- a/src/argaze/TobiiGlassesPro2/TobiiData.py +++ b/src/argaze/TobiiGlassesPro2/TobiiData.py @@ -62,14 +62,14 @@ class Event(): class Accelerometer(): """Define accelerometer data (ac).""" - value: numpy.array + value: numpy.ndarray """Accelerometer value""" @dataclass class Gyroscope(): """Define gyroscope data (gy).""" - value: numpy.array + value: numpy.ndarray """Gyroscope value""" @dataclass -- cgit v1.1