ODM win32 smoke test!

pull/1283/head
Piero Toffanin 2021-04-30 15:45:48 -04:00
rodzic 6fd2533e81
commit 7cd63f87df
6 zmienionych plików z 47 dodań i 18 usunięć

8
console.bat 100644
Wyświetl plik

@ -0,0 +1,8 @@
@echo off
setlocal
call win32env.bat
start "ODM Console" cmd "/k venv\Scripts\activate"
endlocal

Wyświetl plik

@ -33,18 +33,7 @@ mvstex_path = os.path.join(superbuild_bin_path, "texrecon")
omvs_densify_path = os.path.join(superbuild_bin_path, "OpenMVS", "DensifyPointCloud")
omvs_reconstructmesh_path = os.path.join(superbuild_bin_path, "OpenMVS", "ReconstructMesh")
<<<<<<< HEAD
=======
# define txt2las path
txt2las_path = os.path.join(superbuild_path, 'src/las-tools/bin')
pdal_path = os.path.join(superbuild_path, 'build/pdal/bin')
# define odm modules path
odm_modules_path = os.path.join(root_path, "build/bin")
odm_modules_src_path = os.path.join(root_path, "modules")
odm_orthophoto_path = os.path.join(superbuild_bin_path, "odm_orthophoto")
>>>>>>> piero/omvsup
settings_path = os.path.join(root_path, 'settings.yaml')
# Define supported image extensions

Wyświetl plik

@ -1,11 +1,22 @@
import sys
HEADER = '\033[95m'
OKBLUE = '\033[94m'
OKGREEN = '\033[92m'
DEFAULT = '\033[39m'
WARNING = '\033[93m'
FAIL = '\033[91m'
ENDC = '\033[0m'
if sys.platform == 'win32':
# No colors on Windows, sorry!
HEADER = ''
OKBLUE = ''
OKGREEN = ''
DEFAULT = ''
WARNING = ''
FAIL = ''
ENDC = ''
else:
HEADER = '\033[95m'
OKBLUE = '\033[94m'
OKGREEN = '\033[92m'
DEFAULT = '\033[39m'
WARNING = '\033[93m'
FAIL = '\033[91m'
ENDC = '\033[0m'
# logging has too many quirks...
class ODMLogger:

11
run.bat 100644
Wyświetl plik

@ -0,0 +1,11 @@
@echo off
setlocal
call win32env.bat
call %ODMBASE%\venv\Scripts\activate
python "%ODMBASE%\run.py" %*
endlocal

Wyświetl plik

@ -90,6 +90,10 @@ class ODMLoadDatasetStage(types.ODM_Stage):
# check if we rerun cell or not
images_database_file = os.path.join(tree.root_path, 'images.json')
if not io.file_exists(images_database_file) or self.rerun():
if not os.path.exists(images_dir):
log.ODM_ERROR("There are no images in %s! Make sure that your project path and dataset name is correct. The current is set to: %s" % (images_dir, args.project_path))
exit(1)
files, rejects = get_images(images_dir)
if files:
# create ODMPhoto list

6
win32env.bat 100644
Wyświetl plik

@ -0,0 +1,6 @@
set ODMBASE=%~dp0
set GDALBASE=%ODMBASE%venv\Lib\site-packages\osgeo
set OSFMBASE=%ODMBASE%SuperBuild\install\bin\opensfm\bin
set PATH=%GDALBASE%;%ODMBASE%SuperBuild\install\bin;%OSFMBASE%
set PROJ_LIB=%GDALBASE%\data\proj