diff --git a/opendm/config.py b/opendm/config.py index 2bddb640..4c9ef8d0 100644 --- a/opendm/config.py +++ b/opendm/config.py @@ -153,10 +153,10 @@ def config(): help=('The maximum number of processes to use in dense ' 'reconstruction. Default: %(default)s')) - parser.add_argument('--use-25dmesh', + parser.add_argument('--skip-25dmesh', action='store_true', default=False, - help='Use 2.5D mesh to compute the orthophoto') + help='Do not build a 2.5D mesh and use the poisson mesh to compute the orthophoto') parser.add_argument('--use-pmvs', action='store_true', diff --git a/scripts/mvstex.py b/scripts/mvstex.py index c4e0c8ee..401b9ddd 100644 --- a/scripts/mvstex.py +++ b/scripts/mvstex.py @@ -39,7 +39,7 @@ class ODMMvsTexCell(ecto.Cell): # define paths and create working directories system.mkdir_p(tree.odm_texturing) - if args.use_25dmesh: system.mkdir_p(tree.odm_25dtexturing) + if not args.skip_25dmesh: system.mkdir_p(tree.odm_25dtexturing) # check if we rerun cell or not rerun_cell = (args.rerun is not None and @@ -53,7 +53,7 @@ class ODMMvsTexCell(ecto.Cell): 'model': tree.odm_mesh }] - if args.use_25dmesh: + if not args.skip_25dmesh: runs += [{ 'out_dir': tree.odm_25dtexturing, 'model': tree.odm_25dmesh diff --git a/scripts/odm_georeferencing.py b/scripts/odm_georeferencing.py index 2202b1ec..c735db4f 100644 --- a/scripts/odm_georeferencing.py +++ b/scripts/odm_georeferencing.py @@ -48,7 +48,7 @@ class ODMGeoreferencingCell(ecto.Cell): # define paths and create working directories system.mkdir_p(tree.odm_georeferencing) - if args.use_25dmesh: system.mkdir_p(tree.odm_25dgeoreferencing) + if not args.skip_25dmesh: system.mkdir_p(tree.odm_25dgeoreferencing) # in case a gcp file it's not provided, let's try to generate it using # images metadata. Internally calls jhead. @@ -93,7 +93,7 @@ class ODMGeoreferencingCell(ecto.Cell): 'texturing_dir': tree.odm_texturing, 'model': os.path.join(tree.odm_texturing, tree.odm_textured_model_obj) }] - if args.use_25dmesh: + if not args.skip_25dmesh: runs += [{ 'georeferencing_dir': tree.odm_25dgeoreferencing, 'texturing_dir': tree.odm_25dtexturing, diff --git a/scripts/odm_meshing.py b/scripts/odm_meshing.py index cf67622d..d88bcc61 100644 --- a/scripts/odm_meshing.py +++ b/scripts/odm_meshing.py @@ -87,7 +87,7 @@ class ODMeshingCell(ecto.Cell): tree.odm_mesh) # Do we need to generate a 2.5D mesh also? - if args.use_25dmesh: + if not args.skip_25dmesh: if not io.file_exists(tree.odm_25dmesh) or rerun_cell: log.ODM_DEBUG('Writing ODM 2.5D Mesh file in: %s' % tree.odm_25dmesh) diff --git a/scripts/odm_orthophoto.py b/scripts/odm_orthophoto.py index 4174af42..7ecb204b 100644 --- a/scripts/odm_orthophoto.py +++ b/scripts/odm_orthophoto.py @@ -58,12 +58,12 @@ class ODMOrthoPhotoCell(ecto.Cell): # Have geo coordinates? if io.file_exists(tree.odm_georeferencing_coords): - if args.use_25dmesh: + if not args.skip_25dmesh: kwargs['model_geo'] = os.path.join(tree.odm_25dtexturing, tree.odm_georeferencing_model_obj_geo) else: kwargs['model_geo'] = os.path.join(tree.odm_texturing, tree.odm_georeferencing_model_obj_geo) else: - if args.use_25dmesh: + if not args.skip_25dmesh: kwargs['model_geo'] = os.path.join(tree.odm_25dtexturing, tree.odm_textured_model_obj) else: kwargs['model_geo'] = os.path.join(tree.odm_texturing, tree.odm_textured_model_obj)