kopia lustrzana https://github.com/OpenDroneMap/ODM
Merge master
commit
3f75ad58a2
|
@ -299,7 +299,7 @@ class OSFMContext:
|
||||||
reconstruction_shots = tools.load_reconstruction_shots(meta_data)
|
reconstruction_shots = tools.load_reconstruction_shots(meta_data)
|
||||||
transformations = tools.align_reconstructions(reconstruction_shots,
|
transformations = tools.align_reconstructions(reconstruction_shots,
|
||||||
tools.partial_reconstruction_name,
|
tools.partial_reconstruction_name,
|
||||||
True)
|
False)
|
||||||
tools.apply_transformations(transformations)
|
tools.apply_transformations(transformations)
|
||||||
|
|
||||||
self.touch(alignment_file)
|
self.touch(alignment_file)
|
||||||
|
@ -579,4 +579,4 @@ def get_all_submodel_paths(submodels_path, *all_paths):
|
||||||
if all_found:
|
if all_found:
|
||||||
result.append([os.path.join(submodels_path, f, ap) for ap in all_paths])
|
result.append([os.path.join(submodels_path, f, ap) for ap in all_paths])
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
|
@ -13,8 +13,13 @@ matplotlib==3.3.3
|
||||||
networkx==2.5
|
networkx==2.5
|
||||||
numpy==1.19.4
|
numpy==1.19.4
|
||||||
Pillow==8.0.1
|
Pillow==8.0.1
|
||||||
|
<<<<<<< HEAD
|
||||||
vmem==1.0.0
|
vmem==1.0.0
|
||||||
pyodm==1.5.4
|
pyodm==1.5.4
|
||||||
|
=======
|
||||||
|
psutil==5.7.3
|
||||||
|
pyodm==1.5.5
|
||||||
|
>>>>>>> 1b0f17042e5b0ccf4026f950939e5a2c0b29642a
|
||||||
pyOpenSSL==19.1.0
|
pyOpenSSL==19.1.0
|
||||||
pyproj==3.0.0.post1
|
pyproj==3.0.0.post1
|
||||||
Pysolar==0.9
|
Pysolar==0.9
|
||||||
|
|
Ładowanie…
Reference in New Issue