Skip to content

Commit

Permalink
Merge pull request #18 from meyerls/dev
Browse files Browse the repository at this point in the history
Partly fixes issue #17 with wrong scaling
  • Loading branch information
meyerls authored Sep 30, 2022
2 parents a0280b1 + f022c0b commit 8573738
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions aruco_estimator/aruco_scale_factor.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@ def __detect(self):
raise ValueError("Thread return has not the same length as the input parameters!")

# Checks if all tuples in list are None
#if not all(all(v) for v in result):
# if not all(all(v) for v in result):
# self.aruco_marker_detected = False
#else:
# else:
# self.aruco_marker_detected = True

for image_idx in self.images.keys():
Expand Down Expand Up @@ -326,7 +326,7 @@ def run(self) -> [np.ndarray, None]:
"""
self.__detect()

#if not self.aruco_marker_detected:
# if not self.aruco_marker_detected:
# return self.aruco_marker_detected

self.__ray_cast()
Expand Down
2 changes: 1 addition & 1 deletion aruco_estimator/download.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def download_door_dataset(self, output_path: str = os.path.abspath(__file__), ov

self.url = 'https://faubox.rrze.uni-erlangen.de/dl/fiUNWMmsaEAavXHfjqxfyXU9/door.zip'
self.dataset_name = 'door'
self.scale = 0.15 # cm
self.scale = 0.15 # m

existence = self.__check_existence(output_directory=output_path, dataset_name=self.dataset_name)

Expand Down
2 changes: 1 addition & 1 deletion scale_estimator.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
parser = argparse.ArgumentParser(description='Estimate scale factor for COLMAP projects with aruco markers.')
parser.add_argument('--colmap_project', type=str, help='Path to COLMAP project')
parser.add_argument('--dense_model', type=str, help='name to the dense model', default='fused.ply')
parser.add_argument('--aruco_size', type=float, help='Size of the aruco marker in cm.', default=15)
parser.add_argument('--aruco_size', type=float, help='Size of the aruco marker in meter.', default=0.15)
parser.add_argument('--visualize', action='store_true', help='Flag to enable visualization')
parser.add_argument('--point_size', type=float, help='Point size of the visualized dense point cloud. '
'Depending on the number of points in the model. '
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

setuptools.setup(
name='aruco-estimator',
version='1.1.2',
version='1.1.3',
description='Aruco Scale Factor Estimation',
license="MIT",
long_description=long_description,
Expand Down

0 comments on commit 8573738

Please sign in to comment.