mirror
/
OpenDroneMap-ODM
kopia lustrzana https://github.com/OpenDroneMap/ODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #1640 from pierotofy/inpaint 

Edge Inpainting
pull/1643/head
Piero Toffanin 2023-05-01 17:01:46 -04:00 zatwierdzone przez GitHub
rodzic cdf876a46b ac89d2212e
commit c34f227157
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 9 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
SuperBuild/CMakeLists.txt
Wyświetl plik

@ -242,7 +242,7 @@ externalproject_add(dem2points
externalproject_add(odm_orthophoto externalproject_add(odm_orthophoto
DEPENDS opencv DEPENDS opencv
GIT_REPOSITORY https://github.com/OpenDroneMap/odm_orthophoto.git GIT_REPOSITORY https://github.com/OpenDroneMap/odm_orthophoto.git
GIT_TAG 290 GIT_TAG 314
PREFIX ${SB_BINARY_DIR}/odm_orthophoto PREFIX ${SB_BINARY_DIR}/odm_orthophoto
SOURCE_DIR ${SB_SOURCE_DIR}/odm_orthophoto SOURCE_DIR ${SB_SOURCE_DIR}/odm_orthophoto
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}

2
VERSION
Wyświetl plik

@ -1 +1 @@
3.1.3 3.1.4

9
stages/odm_orthophoto.py
Wyświetl plik

@ -41,7 +41,8 @@ class ODMOrthoPhotoStage(types.ODM_Stage):
'corners': tree.odm_orthophoto_corners, 'corners': tree.odm_orthophoto_corners,
'res': resolution, 'res': resolution,
'bands': '', 'bands': '',
'depth_idx': '' 'depth_idx': '',
'inpaint': ''
} }
models = [] models = []
@ -79,12 +80,16 @@ class ODMOrthoPhotoStage(types.ODM_Stage):
else: else:
models.append(os.path.join(base_dir, model_file)) models.append(os.path.join(base_dir, model_file))
# Perform edge inpainting on georeferenced RGB datasets
if reconstruction.is_georeferenced():
kwargs['inpaint'] = "-inpaintThreshold 1.0"
kwargs['models'] = ','.join(map(double_quote, models)) kwargs['models'] = ','.join(map(double_quote, models))
# run odm_orthophoto # run odm_orthophoto
system.run('"{odm_ortho_bin}" -inputFiles {models} ' system.run('"{odm_ortho_bin}" -inputFiles {models} '
'-logFile "{log}" -outputFile "{ortho}" -resolution {res} -verbose ' '-logFile "{log}" -outputFile "{ortho}" -resolution {res} -verbose '
'-outputCornerFile "{corners}" {bands} {depth_idx}'.format(**kwargs)) '-outputCornerFile "{corners}" {bands} {depth_idx} {inpaint}'.format(**kwargs), env_vars={'OMP_NUM_THREADS': args.max_concurrency})
# Create georeferenced GeoTiff # Create georeferenced GeoTiff
geotiffcreated = False geotiffcreated = False