17 files changed, 32 insertions, 32 deletions
diff --git a/src/argaze.test/ArUcoMarkers/ArUcoBoard.py b/src/argaze.test/ArUcoMarker/ArUcoBoard.py
index 0bfa568..b20be13 100644
--- a/src/argaze.test/ArUcoMarkers/ArUcoBoard.py
+++ b/src/argaze.test/ArUcoMarker/ArUcoBoard.py
@@ -19,7 +19,7 @@ __license__ = "GPLv3"
 import unittest
 import os
 
-from argaze.ArUcoMarkers import ArUcoBoard, ArUcoMarkersDictionary
+from argaze.ArUcoMarker import ArUcoBoard, ArUcoMarkerDictionary
 
 import numpy
 
@@ -35,7 +35,7 @@ class TestArUcoBoardClass(unittest.TestCase):
         marker_size = 1
 
         # Check ArUco board creation
-        aruco_dictionary = ArUcoMarkersDictionary.ArUcoMarkersDictionary('DICT_APRILTAG_16h5')
+        aruco_dictionary = ArUcoMarkerDictionary.ArUcoMarkerDictionary('DICT_APRILTAG_16h5')
         aruco_board = ArUcoBoard.ArUcoBoard(columns, rows, square_size, marker_size, aruco_dictionary)
 
         # Check ArUco board dictionary name
diff --git a/src/argaze.test/ArUcoMarkers/ArUcoCamera.py b/src/argaze.test/ArUcoMarker/ArUcoCamera.py
index eb930ab..eb930ab 100644
--- a/src/argaze.test/ArUcoMarkers/ArUcoCamera.py
+++ b/src/argaze.test/ArUcoMarker/ArUcoCamera.py
diff --git a/src/argaze.test/ArUcoMarkers/ArUcoDetector.py b/src/argaze.test/ArUcoMarker/ArUcoDetector.py
index 62e8a09..40b7d00 100644
--- a/src/argaze.test/ArUcoMarkers/ArUcoDetector.py
+++ b/src/argaze.test/ArUcoMarker/ArUcoDetector.py
@@ -20,7 +20,7 @@ import unittest
 import os
 import math
 
-from argaze.ArUcoMarkers import ArUcoMarkersDictionary, ArUcoOpticCalibrator, ArUcoDetector, ArUcoBoard
+from argaze.ArUcoMarker import ArUcoMarkerDictionary, ArUcoOpticCalibrator, ArUcoDetector, ArUcoBoard
 
 import cv2 as cv
 import numpy
@@ -63,7 +63,7 @@ class TestArUcoDetectorClass(unittest.TestCase):
         self.assertEqual(aruco_detector.detected_markers_number(), 0)
         self.assertEqual(aruco_detector.detected_markers(), {})
 
-        aruco_dictionary = ArUcoMarkersDictionary.ArUcoMarkersDictionary('DICT_APRILTAG_16h5')
+        aruco_dictionary = ArUcoMarkerDictionary.ArUcoMarkerDictionary('DICT_APRILTAG_16h5')
         aruco_detector = ArUcoDetector.ArUcoDetector(aruco_dictionary, 5.2)
 
          # Check ArUcoDetector creation
diff --git a/src/argaze.test/ArUcoMarkers/ArUcoMarker.py b/src/argaze.test/ArUcoMarker/ArUcoMarker.py
index de88623..6518c8c 100644
--- a/src/argaze.test/ArUcoMarkers/ArUcoMarker.py
+++ b/src/argaze.test/ArUcoMarker/ArUcoMarker.py
@@ -18,7 +18,7 @@ __license__ = "GPLv3"
 
 import unittest
 
-from argaze.ArUcoMarkers import ArUcoMarkersDictionary, ArUcoMarker
+from argaze.ArUcoMarker import ArUcoMarkerDictionary, ArUcoMarker
 
 class TestArUcoMarkerClass(unittest.TestCase):
     """Test ArUcoMarker class."""
@@ -27,7 +27,7 @@ class TestArUcoMarkerClass(unittest.TestCase):
         """Test ArUcoMarker creation."""
 
         # Check DICT_ARUCO_ORIGINAL ArUcoMarker creation
-        aruco_dictionary = ArUcoMarkersDictionary.ArUcoMarkersDictionary('DICT_ARUCO_ORIGINAL')
+        aruco_dictionary = ArUcoMarkerDictionary.ArUcoMarkerDictionary('DICT_ARUCO_ORIGINAL')
 
         aruco_marker = aruco_dictionary.create_marker(0, 3)
 
diff --git a/src/argaze.test/ArUcoMarkers/ArUcoMarkersDictionary.py b/src/argaze.test/ArUcoMarker/ArUcoMarkerDictionary.py
index 7a5e9e8..2f80a67 100644
--- a/src/argaze.test/ArUcoMarkers/ArUcoMarkersDictionary.py
+++ b/src/argaze.test/ArUcoMarker/ArUcoMarkerDictionary.py
@@ -18,28 +18,28 @@ __license__ = "GPLv3"
 
 import unittest
 
-from argaze.ArUcoMarkers import ArUcoMarkersDictionary
+from argaze.ArUcoMarker import ArUcoMarkerDictionary
 
-class TestArUcoMarkersDictionaryClass(unittest.TestCase):
-    """Test ArUcoMarkersDictionary class."""
+class TestArUcoMarkerDictionaryClass(unittest.TestCase):
+    """Test ArUcoMarkerDictionary class."""
 
     def test_new(self):
-        """Test ArUcoMarkersDictionary creation."""
+        """Test ArUcoMarkerDictionary creation."""
 
-        # Check that ArUcoMarkersDictionary creation fails with bad name
+        # Check that ArUcoMarkerDictionary creation fails with bad name
         with self.assertRaises(NameError):
 
-            aruco_dictionary = ArUcoMarkersDictionary.ArUcoMarkersDictionary('BAD_DICT_NAME')
+            aruco_dictionary = ArUcoMarkerDictionary.ArUcoMarkerDictionary('BAD_DICT_NAME')
 
-        # Check default ArUcoMarkersDictionary creation
-        aruco_dictionary = ArUcoMarkersDictionary.ArUcoMarkersDictionary()
+        # Check default ArUcoMarkerDictionary creation
+        aruco_dictionary = ArUcoMarkerDictionary.ArUcoMarkerDictionary()
 
         self.assertEqual(aruco_dictionary.name, 'DICT_ARUCO_ORIGINAL')
         self.assertEqual(aruco_dictionary.format, '5X5')
         self.assertEqual(aruco_dictionary.number, 1024)
 
-        # Check DICT_APRILTAG_16h5 ArUcoMarkersDictionary creation
-        aruco_dictionary = ArUcoMarkersDictionary.ArUcoMarkersDictionary('DICT_APRILTAG_16h5')
+        # Check DICT_APRILTAG_16h5 ArUcoMarkerDictionary creation
+        aruco_dictionary = ArUcoMarkerDictionary.ArUcoMarkerDictionary('DICT_APRILTAG_16h5')
 
         self.assertEqual(aruco_dictionary.name, 'DICT_APRILTAG_16h5')
         self.assertEqual(aruco_dictionary.format, '4X4')
diff --git a/src/argaze.test/ArUcoMarkers/ArUcoOpticCalibrator.py b/src/argaze.test/ArUcoMarker/ArUcoOpticCalibrator.py
index 79d2ead..d019a5d 100644
--- a/src/argaze.test/ArUcoMarkers/ArUcoOpticCalibrator.py
+++ b/src/argaze.test/ArUcoMarker/ArUcoOpticCalibrator.py
@@ -19,7 +19,7 @@ __license__ = "GPLv3"
 import unittest
 import os
 
-from argaze.ArUcoMarkers import ArUcoOpticCalibrator
+from argaze.ArUcoMarker import ArUcoOpticCalibrator
 
 import numpy
 
diff --git a/src/argaze.test/ArUcoMarkers/ArUcoScene.py b/src/argaze.test/ArUcoMarker/ArUcoScene.py
index f29b1d3..67cb668 100644
--- a/src/argaze.test/ArUcoMarkers/ArUcoScene.py
+++ b/src/argaze.test/ArUcoMarker/ArUcoScene.py
@@ -20,12 +20,12 @@ import unittest
 import os
 import math
 
-from argaze.ArUcoMarkers import ArUcoMarkersGroup, ArUcoMarker
+from argaze.ArUcoMarker import ArUcoMarkerGroup, ArUcoMarker
 
 import cv2 as cv
 import numpy
 
-class TestArUcoMarkersGroupClass(unittest.TestCase):
+class TestArUcoMarkerGroupClass(unittest.TestCase):
 
     def new_from_obj(self):
 
@@ -34,7 +34,7 @@ class TestArUcoMarkersGroupClass(unittest.TestCase):
         obj_filepath = os.path.join(current_directory, 'utils/scene.obj')
 
         # Load file
-        self.aruco_markers_group = ArUcoMarkersGroup.ArUcoMarkersGroup.from_obj(obj_filepath)
+        self.aruco_markers_group = ArUcoMarkerGroup.ArUcoMarkerGroup.from_obj(obj_filepath)
 
     def new_from_json(self):
 
@@ -43,7 +43,7 @@ class TestArUcoMarkersGroupClass(unittest.TestCase):
         json_filepath = os.path.join(current_directory, 'utils/scene.json')
 
         # Load file
-        self.aruco_markers_group = ArUcoMarkersGroup.ArUcoMarkersGroup.from_json(json_filepath)
+        self.aruco_markers_group = ArUcoMarkerGroup.ArUcoMarkerGroup.from_json(json_filepath)
 
     def setup_markers(self):
 
@@ -59,12 +59,12 @@ class TestArUcoMarkersGroupClass(unittest.TestCase):
         self.scene_markers, self.remaining_markers = self.aruco_markers_group.filter_markers(self.detected_markers())
 
     def test_new_from_obj(self):
-        """Test ArUcoMarkersGroup creation."""
+        """Test ArUcoMarkerGroup creation."""
 
         self.new_from_obj()
         self.setup_markers()
 
-         # Check ArUcoMarkersGroup creation
+         # Check ArUcoMarkerGroup creation
         self.assertEqual(len(self.aruco_markers_group.places), 3)
         self.assertIsNone(numpy.testing.assert_array_equal(self.aruco_markers_group.identifiers, [0, 1, 2]))
         self.assertEqual(self.aruco_markers_group.marker_size, 1.)
@@ -82,12 +82,12 @@ class TestArUcoMarkersGroupClass(unittest.TestCase):
         self.assertIsNone(numpy.testing.assert_array_equal(self.aruco_markers_group.places[2].rotation, [[1., 0., 0.], [0., 1., 0.], [0., 0., 1.]]))
 
     def test_new_from_json(self):
-        """Test ArUcoMarkersGroup creation."""
+        """Test ArUcoMarkerGroup creation."""
 
         self.new_from_json()
         self.setup_markers()
 
-         # Check ArUcoMarkersGroup creation
+         # Check ArUcoMarkerGroup creation
         self.assertEqual(len(self.aruco_markers_group.places), 3)
         self.assertIsNone(numpy.testing.assert_array_equal(self.aruco_markers_group.identifiers, [0, 1, 2]))
         self.assertEqual(self.aruco_markers_group.marker_size, 1.)
@@ -105,7 +105,7 @@ class TestArUcoMarkersGroupClass(unittest.TestCase):
         self.assertIsNone(numpy.testing.assert_array_equal(self.aruco_markers_group.places[2].rotation, [[1., 0., 0.], [0., 1., 0.], [0., 0., 1.]]))
 
     def test_filter_markers(self):
-        """Test ArUcoMarkersGroup markers filtering."""
+        """Test ArUcoMarkerGroup markers filtering."""
 
         self.new_from_obj()
         self.setup_markers()
@@ -118,7 +118,7 @@ class TestArUcoMarkersGroupClass(unittest.TestCase):
         self.assertIsNone(numpy.testing.assert_array_equal(list(self.remaining_markers.keys()), [3]))
 
     def test_check_markers_consistency(self):
-        """Test ArUcoMarkersGroup markers consistency checking."""
+        """Test ArUcoMarkerGroup markers consistency checking."""
 
         self.new_from_obj()
         self.setup_markers()
@@ -162,7 +162,7 @@ class TestArUcoMarkersGroupClass(unittest.TestCase):
         self.assertIsNone(numpy.testing.assert_array_equal(list(unconsistencies['translation']['1/2'].keys()), ['current', 'expected']))
 
     def test_estimate_pose_from_single_marker(self):
-        """Test ArUcoMarkersGroup pose estimation from single marker."""
+        """Test ArUcoMarkerGroup pose estimation from single marker."""
 
         self.new_from_obj()
         self.setup_markers()
@@ -178,7 +178,7 @@ class TestArUcoMarkersGroupClass(unittest.TestCase):
         self.assertIsNone(numpy.testing.assert_array_equal(rmat, [[1., 0., 0.], [0., 1., 0.], [0., 0., 1.]]))
 
     def test_estimate_pose_from_markers(self):
-        """Test ArUcoMarkersGroup pose estimation from markers."""
+        """Test ArUcoMarkerGroup pose estimation from markers."""
 
         self.new_from_obj()
         self.setup_markers()
@@ -199,9 +199,9 @@ class TestArUcoMarkersGroupClass(unittest.TestCase):
         self.assertIsNone(numpy.testing.assert_array_equal(tvec, [1., 1., 5.]))
         self.assertIsNone(numpy.testing.assert_array_equal(rmat, [[1., 0., 0.], [0., 1., 0.], [0., 0., 1.]]))
 
-    @unittest.skip("ArUcoMarkersGroup estimate_pose_from_axis_markers method is broken.")
+    @unittest.skip("ArUcoMarkerGroup estimate_pose_from_axis_markers method is broken.")
     def test_estimate_pose_from_axis_markers(self):
-        """Test ArUcoMarkersGroup pose estimation from axis markers."""
+        """Test ArUcoMarkerGroup pose estimation from axis markers."""
 
         self.new_from_obj()
         self.setup_markers()
diff --git a/src/argaze.test/ArUcoMarkers/__init__.py b/src/argaze.test/ArUcoMarker/__init__.py
index e69de29..e69de29 100644
--- a/src/argaze.test/ArUcoMarkers/__init__.py
+++ b/src/argaze.test/ArUcoMarker/__init__.py
diff --git a/src/argaze.test/ArUcoMarkers/utils/aoi_3d.obj b/src/argaze.test/ArUcoMarker/utils/aoi_3d.obj
index 92e85bd..92e85bd 100644
--- a/src/argaze.test/ArUcoMarkers/utils/aoi_3d.obj
+++ b/src/argaze.test/ArUcoMarker/utils/aoi_3d.obj
diff --git a/src/argaze.test/ArUcoMarkers/utils/aruco_camera.json b/src/argaze.test/ArUcoMarker/utils/aruco_camera.json
index 980dc9f..980dc9f 100644
--- a/src/argaze.test/ArUcoMarkers/utils/aruco_camera.json
+++ b/src/argaze.test/ArUcoMarker/utils/aruco_camera.json
diff --git a/src/argaze.test/ArUcoMarkers/utils/detector.json b/src/argaze.test/ArUcoMarker/utils/detector.json
index 8aada6d..8aada6d 100644
--- a/src/argaze.test/ArUcoMarkers/utils/detector.json
+++ b/src/argaze.test/ArUcoMarker/utils/detector.json
diff --git a/src/argaze.test/ArUcoMarkers/utils/detector_parameters.json b/src/argaze.test/ArUcoMarker/utils/detector_parameters.json
index d26a3fa..d26a3fa 100644
--- a/src/argaze.test/ArUcoMarkers/utils/detector_parameters.json
+++ b/src/argaze.test/ArUcoMarker/utils/detector_parameters.json
diff --git a/src/argaze.test/ArUcoMarkers/utils/full_hd_board.png b/src/argaze.test/ArUcoMarker/utils/full_hd_board.png
index d30b300..d30b300 100644
--- a/src/argaze.test/ArUcoMarkers/utils/full_hd_board.png
+++ b/src/argaze.test/ArUcoMarker/utils/full_hd_board.png
diff --git a/src/argaze.test/ArUcoMarkers/utils/full_hd_marker.png b/src/argaze.test/ArUcoMarker/utils/full_hd_marker.png
index 42146fe..42146fe 100644
--- a/src/argaze.test/ArUcoMarkers/utils/full_hd_marker.png
+++ b/src/argaze.test/ArUcoMarker/utils/full_hd_marker.png
diff --git a/src/argaze.test/ArUcoMarkers/utils/optic_parameters.json b/src/argaze.test/ArUcoMarker/utils/optic_parameters.json
index 988731c..988731c 100644
--- a/src/argaze.test/ArUcoMarkers/utils/optic_parameters.json
+++ b/src/argaze.test/ArUcoMarker/utils/optic_parameters.json
diff --git a/src/argaze.test/ArUcoMarkers/utils/scene.json b/src/argaze.test/ArUcoMarker/utils/scene.json
index bdd9ae8..bdd9ae8 100644
--- a/src/argaze.test/ArUcoMarkers/utils/scene.json
+++ b/src/argaze.test/ArUcoMarker/utils/scene.json
diff --git a/src/argaze.test/ArUcoMarkers/utils/scene.obj b/src/argaze.test/ArUcoMarker/utils/scene.obj
index c233da2..1eb9f81 100644
--- a/src/argaze.test/ArUcoMarkers/utils/scene.obj
+++ b/src/argaze.test/ArUcoMarker/utils/scene.obj
@@ -1,4 +1,4 @@
-# .OBJ file for ArUcoMarkersGroup unitary test
+# .OBJ file for ArUcoMarkerGroup unitary test
 o DICT_ARUCO_ORIGINAL#0_Marker
 v -0.500000 -0.500000 0.000000
 v 0.500000 -0.500000 0.000000