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

Move texturing cell to correct line

pull/347/head
Dakota Benjamin 2016-06-30 08:53:50 -04:00 zatwierdzone przez GitHub
rodzic 6b9e58dddb
commit c91b7cb2ab
1 zmienionych plików z 10 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

23
scripts/odm_app.py
Wyświetl plik

@ -45,16 +45,6 @@ class ODMApp(ecto.BlackBox):
feature_process_size=p.args.resize_to, feature_process_size=p.args.resize_to,
feature_min_frames=p.args.min_num_features, feature_min_frames=p.args.min_num_features,
processes=context.num_cores, processes=context.num_cores,
'texturing': ODMMvsTexCell(data_term=p.args.mvs_texturing_dataTerm,
outlier_rem_type=p.args.mvs_texturing_outlierRemovalType,
skip_vis_test=p.args.mvs_texturing_skipGeometricVisibilityTest,
skip_glob_seam_leveling=p.args.mvs_texturing_skipGlobalSeamLeveling,
skip_loc_seam_leveling=p.args.mvs_texturing_skipLocalSeamLeveling,
skip_hole_fill=p.args.mvs_texturing_skipHoleFilling,
keep_unseen_faces=p.args.mvs_texturing_keepUnseenFaces),
# Old odm_texturing
# 'texturing': ODMTexturingCell(resize=p.args['resize_to'],
# resolution=p.args['odm_texturing_textureResolution'],
matching_gps_neighbors=p.args.matcher_neighbors, matching_gps_neighbors=p.args.matcher_neighbors,
matching_gps_distance=p.args.matcher_distance), matching_gps_distance=p.args.matcher_distance),
'cmvs': ODMCmvsCell(max_images=p.args.cmvs_maxImages), 'cmvs': ODMCmvsCell(max_images=p.args.cmvs_maxImages),
@ -68,9 +58,16 @@ class ODMApp(ecto.BlackBox):
oct_tree=p.args.odm_meshing_octreeDepth, oct_tree=p.args.odm_meshing_octreeDepth,
samples=p.args.odm_meshing_samplesPerNode, samples=p.args.odm_meshing_samplesPerNode,
solver=p.args.odm_meshing_solverDivide), solver=p.args.odm_meshing_solverDivide),
'texturing': ODMTexturingCell(resize=p.args.resize_to, 'texturing': ODMMvsTexCell(data_term=p.args.mvs_texturing_dataTerm,
resolution=p.args.odm_texturing_textureResolution, outlier_rem_type=p.args.mvs_texturing_outlierRemovalType,
size=p.args.odm_texturing_textureWithSize), skip_vis_test=p.args.mvs_texturing_skipGeometricVisibilityTest,
skip_glob_seam_leveling=p.args.mvs_texturing_skipGlobalSeamLeveling,
skip_loc_seam_leveling=p.args.mvs_texturing_skipLocalSeamLeveling,
skip_hole_fill=p.args.mvs_texturing_skipHoleFilling,
keep_unseen_faces=p.args.mvs_texturing_keepUnseenFaces),
# Old odm_texturing
# 'texturing': ODMTexturingCell(resize=p.args['resize_to'],
# resolution=p.args['odm_texturing_textureResolution'],
'georeferencing': ODMGeoreferencingCell(img_size=p.args.resize_to, 'georeferencing': ODMGeoreferencingCell(img_size=p.args.resize_to,
gcp_file=p.args.odm_georeferencing_gcpFile, gcp_file=p.args.odm_georeferencing_gcpFile,
use_gcp=p.args.odm_georeferencing_useGcp), use_gcp=p.args.odm_georeferencing_useGcp),