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

Bug fix, all_orthos_and_ortho_cuts var 

Former-commit-id: 7da56c43f3
pull/1161/head
Piero Toffanin 2019-12-05 22:02:58 -05:00
rodzic 93de02a18b
commit a5522cabef
1 zmienionych plików z 3 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
stages/splitmerge.py
Wyświetl plik

@ -214,7 +214,7 @@ class ODMMergeStage(types.ODM_Stage):
) )
if len(all_orthos_and_ortho_cuts) > 1: if len(all_orthos_and_ortho_cuts) > 1:
log.ODM_INFO("Found %s submodels with valid orthophotos and cutlines" % len(all_orthos_and_cutlines)) log.ODM_INFO("Found %s submodels with valid orthophotos and cutlines" % len(all_orthos_and_ortho_cuts))
# TODO: histogram matching via rasterio # TODO: histogram matching via rasterio
# currently parts have different color tones # currently parts have different color tones
@ -225,10 +225,10 @@ class ODMMergeStage(types.ODM_Stage):
orthophoto_vars = orthophoto.get_orthophoto_vars(args) orthophoto_vars = orthophoto.get_orthophoto_vars(args)
orthophoto.merge(all_orthos_and_ortho_cuts, tree.odm_orthophoto_tif, orthophoto_vars) orthophoto.merge(all_orthos_and_ortho_cuts, tree.odm_orthophoto_tif, orthophoto_vars)
orthophoto.post_orthophoto_steps(args, merged_bounds_file, tree.odm_orthophoto_tif) orthophoto.post_orthophoto_steps(args, merged_bounds_file, tree.odm_orthophoto_tif)
elif len(all_orthos_and_cutlines) == 1: elif len(all_orthos_and_ortho_cuts) == 1:
# Simply copy # Simply copy
log.ODM_WARNING("A single orthophoto/cutline pair was found between all submodels.") log.ODM_WARNING("A single orthophoto/cutline pair was found between all submodels.")
shutil.copyfile(all_orthos_and_cutlines[0][0], tree.odm_orthophoto_tif) shutil.copyfile(all_orthos_and_ortho_cuts[0][0], tree.odm_orthophoto_tif)
else: else:
log.ODM_WARNING("No orthophoto/cutline pairs were found in any of the submodels. No orthophoto will be generated.") log.ODM_WARNING("No orthophoto/cutline pairs were found in any of the submodels. No orthophoto will be generated.")
else: else: