aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThéo de la Hogue2024-07-15 09:44:00 +0200
committerThéo de la Hogue2024-07-15 09:44:00 +0200
commitac5ce6be824b227240b41e011fb0883ce588e381 (patch)
tree08fc73d63d97dfc3449b114456448aa8fdfab1b8 /src
parent9b26d80f806f0718c9fd0ecc6a5b2f24252c28dd (diff)
downloadargaze-ac5ce6be824b227240b41e011fb0883ce588e381.zip
argaze-ac5ce6be824b227240b41e011fb0883ce588e381.tar.gz
argaze-ac5ce6be824b227240b41e011fb0883ce588e381.tar.bz2
argaze-ac5ce6be824b227240b41e011fb0883ce588e381.tar.xz
Removing angle_tolerance and distance_tolerance attributes as they are useless now.
Diffstat (limited to 'src')
-rw-r--r--src/argaze.test/ArUcoMarker/ArUcoCamera.py4
-rw-r--r--src/argaze.test/ArUcoMarker/utils/aruco_camera.json8
-rw-r--r--src/argaze/ArFeatures.py26
-rw-r--r--src/argaze/utils/demo/aruco_markers_pipeline.json4
-rw-r--r--src/argaze/utils/demo/opencv_movie_context.json3
5 files changed, 6 insertions, 39 deletions
diff --git a/src/argaze.test/ArUcoMarker/ArUcoCamera.py b/src/argaze.test/ArUcoMarker/ArUcoCamera.py
index 76b567e..0777beb 100644
--- a/src/argaze.test/ArUcoMarker/ArUcoCamera.py
+++ b/src/argaze.test/ArUcoMarker/ArUcoCamera.py
@@ -71,10 +71,6 @@ class TestArUcoCameraClass(unittest.TestCase):
self.assertEqual(len(ar_scene.layers.items()), 1)
self.assertEqual(len(ar_scene.layers["Main"].aoi_scene), 1)
self.assertEqual(ar_scene.layers["Main"].aoi_scene['Test'].points_number, 4)
-
- # Check ArScene
- self.assertEqual(ar_scene.angle_tolerance, 1.0)
- self.assertEqual(ar_scene.distance_tolerance, 2.0)
if __name__ == '__main__':
diff --git a/src/argaze.test/ArUcoMarker/utils/aruco_camera.json b/src/argaze.test/ArUcoMarker/utils/aruco_camera.json
index 980dc9f..7217c0e 100644
--- a/src/argaze.test/ArUcoMarker/utils/aruco_camera.json
+++ b/src/argaze.test/ArUcoMarker/utils/aruco_camera.json
@@ -63,9 +63,7 @@
"Main" : {
"aoi_scene": "aoi_3d.obj"
}
- },
- "angle_tolerance": 1.0,
- "distance_tolerance": 2.0
+ }
},
"TestSceneB" : {
"aruco_markers_group": {
@@ -87,9 +85,7 @@
"Main" : {
"aoi_scene": "aoi_3d.obj"
}
- },
- "angle_tolerance": 1.0,
- "distance_tolerance": 2.0
+ }
}
},
"layers": {
diff --git a/src/argaze/ArFeatures.py b/src/argaze/ArFeatures.py
index a8b62df..3eb1cda 100644
--- a/src/argaze/ArFeatures.py
+++ b/src/argaze/ArFeatures.py
@@ -915,8 +915,6 @@ class ArScene(DataFeatures.PipelineStepObject):
# Init private attributes
self._layers = {}
self.__frames = {}
- self.__angle_tolerance = 0.
- self.__distance_tolerance = 0.
@property
def layers(self) -> dict:
@@ -1010,35 +1008,13 @@ class ArScene(DataFeatures.PipelineStepObject):
for name, frame in self.__frames.items():
frame.parent = self
- @property
- def angle_tolerance(self) -> float:
- """Angle error tolerance to validate marker pose in degree used into [estimate_pose][argaze.ArFeatures.ArScene.estimate_pose] function."""
- return self.__angle_tolerance
-
- @angle_tolerance.setter
- def angle_tolerance(self, value: float):
-
- self.__angle_tolerance = value
-
- @property
- def distance_tolerance(self) -> float:
- """Distance error tolerance to validate marker pose in centimeter used into [estimate_pose][argaze.ArFeatures.ArScene.estimate_pose] function."""
- return self.__distance_tolerance
-
- @distance_tolerance.setter
- def distance_tolerance(self, value: float):
-
- self.__distance_tolerance = value
-
def as_dict(self) -> dict:
"""Export ArScene properties as dictionary."""
return {
**DataFeatures.PipelineStepObject.as_dict(self),
"layers": self._layers,
- "frames": self.__frames,
- "angle_tolerance": self.__angle_tolerance,
- "distance_tolerance": self.__distance_tolerance
+ "frames": self.__frames
}
@DataFeatures.PipelineStepMethod
diff --git a/src/argaze/utils/demo/aruco_markers_pipeline.json b/src/argaze/utils/demo/aruco_markers_pipeline.json
index 7a49089..3cf58f6 100644
--- a/src/argaze/utils/demo/aruco_markers_pipeline.json
+++ b/src/argaze/utils/demo/aruco_markers_pipeline.json
@@ -150,9 +150,7 @@
}
}
}
- },
- "angle_tolerance": 15.0,
- "distance_tolerance": 2.54
+ }
}
},
"observers": {
diff --git a/src/argaze/utils/demo/opencv_movie_context.json b/src/argaze/utils/demo/opencv_movie_context.json
index f7da7ee..954cc2b 100644
--- a/src/argaze/utils/demo/opencv_movie_context.json
+++ b/src/argaze/utils/demo/opencv_movie_context.json
@@ -2,6 +2,7 @@
"argaze.utils.contexts.OpenCV.Movie" : {
"name": "OpenCV Window",
"path": "./src/argaze/utils/demo/tobii_record/segments/1/fullstream.mp4",
- "pipeline": "aruco_markers_pipeline.json"
+ "pipeline": "aruco_markers_pipeline.json",
+ "catch_exceptions": false
}
} \ No newline at end of file