From a2d315a7405c4696185f5697229f39c391ddf3eb Mon Sep 17 00:00:00 2001 From: Thomas Feuvrier <thomas.feuvrier@c-s.fr> Date: Fri, 10 Oct 2008 15:43:20 +0200 Subject: [PATCH] STYLE: Add new Cmake variable OTB_DATA_USE_LARGEINPUT [OFF] and OTB_DATA_LARGEINPUT_ROOT for the dierctory --- CMakeLists.txt | 7 +++ Testing/Code/BasicFilters/CMakeLists.txt | 8 ++- Testing/Code/ChangeDetection/CMakeLists.txt | 2 - Testing/Code/Common/CMakeLists.txt | 2 - Testing/Code/DisparityMap/CMakeLists.txt | 2 - Testing/Code/FeatureExtraction/CMakeLists.txt | 2 - Testing/Code/Fusion/CMakeLists.txt | 2 - Testing/Code/Gui/CMakeLists.txt | 2 - Testing/Code/IO/CMakeLists.txt | 54 +++++++++++++++---- Testing/Code/Learning/CMakeLists.txt | 2 - Testing/Code/Markov/CMakeLists.txt | 2 - Testing/Code/MultiScale/CMakeLists.txt | 2 - Testing/Code/Projections/CMakeLists.txt | 14 +++-- Testing/Code/Radiometry/CMakeLists.txt | 2 - Testing/Code/SARPolarimetry/CMakeLists.txt | 6 ++- Testing/Code/SpatialReasoning/CMakeLists.txt | 2 - Testing/Code/Visu/CMakeLists.txt | 17 +++--- 17 files changed, 83 insertions(+), 45 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 00b599d76a..17dceff242 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -575,6 +575,13 @@ CHECK_TYPE_SIZE("short int" OTB_SIZEOF_SHORT_INT) FIND_PATH(OTB_DATA_ROOT OTBData.readme $ENV{OTB_DATA_ROOT}) MARK_AS_ADVANCED(OTB_DATA_ROOT) +OPTION(OTB_DATA_USE_LARGEINPUT "Use Large inputs images test." OFF) +MARK_AS_ADVANCED(OTB_DATA_USE_LARGEINPUT) +IF(OTB_DATA_USE_LARGEINPUT) + FIND_PATH(OTB_DATA_LARGEINPUT_ROOT OTBData.readme $ENV{OTB_DATA_LARGEINPUT_ROOT}) + MARK_AS_ADVANCED(OTB_DATA_LARGEINPUT_ROOT) +ENDIF(OTB_DATA_USE_LARGEINPUT) + #----------------------------------------------------------------------------- # Configure files with settings for use by the build. diff --git a/Testing/Code/BasicFilters/CMakeLists.txt b/Testing/Code/BasicFilters/CMakeLists.txt index 5286f429c1..5f984ff8ec 100644 --- a/Testing/Code/BasicFilters/CMakeLists.txt +++ b/Testing/Code/BasicFilters/CMakeLists.txt @@ -5,7 +5,9 @@ SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) #Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) +IF(OTB_DATA_USE_LARGEINPUT) + SET(IMAGEDATA ${OTB_DATA_LARGEINPUT_ROOT} ) +ENDIF(OTB_DATA_USE_LARGEINPUT) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) @@ -164,6 +166,7 @@ ADD_TEST(bfTvInverseLogPolarTransformResample ${BASICFILTERS_TESTS2} ADD_TEST(bfTuStreamingShrinkImageFilterNew ${BASICFILTERS_TESTS2} otbStreamingShrinkImageFilterNew) +IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(bfTvStreamingShrinkImageFilterQBPAN ${BASICFILTERS_TESTS2} --compare-image ${TOL} @@ -184,6 +187,7 @@ ADD_TEST(bfTvStreamingShrinkImageFilterQBMUL ${BASICFILTERS_TESTS2} ${TEMP}/bfTvStreamingShrinkImageFilterQBMULOutput.hdr 20 ) +ENDIF(OTB_DATA_USE_LARGEINPUT) # ------- otb::SpatialObjectToImageDrawingFilter ---------------------------- @@ -222,6 +226,7 @@ ADD_TEST(bfTvStreamingShrinkImageFilterQBMUL ${BASICFILTERS_TESTS2} ) +IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(bfTvImportGeoInformationImageFilterWithKeywordList ${BASICFILTERS_TESTS3} --compare-ascii ${EPSILON} ${BASELINE_FILES}/ioOSSIMImageQuickbirdMetaDataReader.txt @@ -230,6 +235,7 @@ ADD_TEST(bfTvStreamingShrinkImageFilterQBMUL ${BASICFILTERS_TESTS2} ${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${TEMP}/bfTvImportGeoInformationKeywordListOutput.txt ) +ENDIF(OTB_DATA_USE_LARGEINPUT) # ------- otb::SpectralAngleDistanceImageFilter ---------------------------- diff --git a/Testing/Code/ChangeDetection/CMakeLists.txt b/Testing/Code/ChangeDetection/CMakeLists.txt index f42ed3aee6..6eaedf3c9f 100644 --- a/Testing/Code/ChangeDetection/CMakeLists.txt +++ b/Testing/Code/ChangeDetection/CMakeLists.txt @@ -4,8 +4,6 @@ IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) -#Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt index 54383d0099..63faf3a3d1 100644 --- a/Testing/Code/Common/CMakeLists.txt +++ b/Testing/Code/Common/CMakeLists.txt @@ -4,8 +4,6 @@ IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) -#Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) #Tolerance sur diff pixel image diff --git a/Testing/Code/DisparityMap/CMakeLists.txt b/Testing/Code/DisparityMap/CMakeLists.txt index 6b745eaa73..444691edc1 100644 --- a/Testing/Code/DisparityMap/CMakeLists.txt +++ b/Testing/Code/DisparityMap/CMakeLists.txt @@ -4,8 +4,6 @@ IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) -#Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) # Tolerance for pixel difference diff --git a/Testing/Code/FeatureExtraction/CMakeLists.txt b/Testing/Code/FeatureExtraction/CMakeLists.txt index 2adb976631..34302c9a1f 100644 --- a/Testing/Code/FeatureExtraction/CMakeLists.txt +++ b/Testing/Code/FeatureExtraction/CMakeLists.txt @@ -4,8 +4,6 @@ IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) -#Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) #Tolerance de base diff --git a/Testing/Code/Fusion/CMakeLists.txt b/Testing/Code/Fusion/CMakeLists.txt index 73da521e59..40c1a30099 100644 --- a/Testing/Code/Fusion/CMakeLists.txt +++ b/Testing/Code/Fusion/CMakeLists.txt @@ -4,8 +4,6 @@ IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) -#Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) #Tolerance de base diff --git a/Testing/Code/Gui/CMakeLists.txt b/Testing/Code/Gui/CMakeLists.txt index 68cc75725e..cf6289cc23 100644 --- a/Testing/Code/Gui/CMakeLists.txt +++ b/Testing/Code/Gui/CMakeLists.txt @@ -4,8 +4,6 @@ IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) -#Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) #Tolerance sur diff pixel image diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt index f49b9d8d50..72f0b5c618 100644 --- a/Testing/Code/IO/CMakeLists.txt +++ b/Testing/Code/IO/CMakeLists.txt @@ -6,7 +6,10 @@ SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) #Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) +IF(OTB_DATA_USE_LARGEINPUT) + SET(IMAGEDATA ${OTB_DATA_LARGEINPUT_ROOT} ) +ENDIF(OTB_DATA_USE_LARGEINPUT) + SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) #Tolerance sur diff pixel image @@ -43,6 +46,7 @@ SET(IO_TESTS16 ${CXX_TEST_PATH}/otbIOTests16) # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ COMMON_TESTS3 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +IF(OTB_DATA_USE_LARGEINPUT) # --- RADARSAT (GDAL) --- ADD_TEST(ioTvMultiMonoChannelROI_RADARSAT2ENVI ${COMMON_TESTS3} @@ -60,6 +64,7 @@ ADD_TEST(ioTvMultiMonoChannelROI_RADARSAT_ENVI2ENVI ${COMMON_TESTS3} -ushort ${TEMP}/ioMultiMonoChannelROI_RADARSAT2ENVI_2559_3591_337_280.hdr -ushort ${TEMP}/ioMultiMonoChannelROI_RADARSAT_ENVI2ENVI_2559_3591_337_280_2.hdr -startX 0 -startY 0 -sizeX 337 -sizeY 280 ) +ENDIF(OTB_DATA_USE_LARGEINPUT) # --- ENVI (GDAL) --- ADD_TEST(ioTvMultiMonoChannelROI_ENVI2PNG ${COMMON_TESTS3} @@ -76,6 +81,7 @@ ADD_TEST(ioTvMultiMonoChannelROI_ENVI2PNG ${COMMON_TESTS3} # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbIOTests1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +IF(OTB_DATA_USE_LARGEINPUT) # --- SAR_ERS2_SLCI (GDAL) --- ADD_TEST(ioTvImageFileReaderERS ${IO_TESTS1} # --compare-image ${TOL} ${BASELINE}/ioImageFileReaderERS_SLCI.png @@ -91,6 +97,7 @@ ADD_TEST(ioTvImageFileReaderRADARSAT ${IO_TESTS1} ${IMAGEDATA}/RADARSAT1/SCENE01/ ${TEMP}/ioImageFileReaderRADARSAT.png) +ENDIF(OTB_DATA_USE_LARGEINPUT) # ------- TEST IO COMMON ------------------------------ @@ -403,6 +410,8 @@ ADD_TEST(ioTuGDALImageIOCanRead_ENVI ${IO_TESTS5} otbGDALImageIOTestCanRead # ${INPUTDATA}/poupees_1canal.c1.hdr ) ${INPUTDATA}/poupees_1canal.c1 ) +IF(OTB_DATA_USE_LARGEINPUT) + ADD_TEST(ioTuGDALImageIOCanRead_RADARSAT ${IO_TESTS5} otbGDALImageIOTestCanRead # Filename identification is now set in the ImageFileReader class (Fiche 212) # ${IMAGEDATA}/RADARSAT1/SCENE01/ ) @@ -439,6 +448,8 @@ ADD_TEST(ioTuGDALImageIOCanRead_SPOT4 ${IO_TESTS5} otbGDALImageIOTestCanRead # ${IMAGEDATA}/SPOT4_SCENE01/ ) ${IMAGEDATA}/SPOT4_SCENE01/IMAG_01.DAT ) +ENDIF(OTB_DATA_USE_LARGEINPUT) + ADD_TEST(ioTuGDALImageIOCanRead_SPOT5TIF ${IO_TESTS5} otbGDALImageIOTestCanRead # Filename identification is now set in the ImageFileReader class (Fiche 212) # ${INPUTDATA}/poupeesTIF/ ) @@ -460,6 +471,8 @@ ADD_TEST(ioTuGDALImageIOCanWrite_HFA ${IO_TESTS6} otbGDALImageIOTestCanWrite # ------- otb::ONERAImageIO ------------------------------ # CanRead() +IF(OTB_DATA_USE_LARGEINPUT) + ADD_TEST(ioTuONERAImageIOCanRead ${IO_TESTS6} otbONERAImageIOTestCanRead ${IMAGEDATA}/ONERA/spa3_0215_rad.ent) @@ -496,6 +509,8 @@ ADD_TEST(ioTvONERAImageStreamWriter ${IO_TESTS6} ${TEMP}/ioImageFileReaderONERAComplexWrite.ent ${TEMP}/ioImageFileReaderONERAStreamWrite.ent ) +ENDIF(OTB_DATA_USE_LARGEINPUT) + # ------- otb::ONERAImageIO ------------------------------ # CanRead() ADD_TEST(ioTuMSTARImageIOCanRead1 ${IO_TESTS6} otbMSTARImageIOTestCanRead @@ -690,6 +705,7 @@ ADD_TEST(ioTvImageReaderWriterRgbJPEG2TIF ${IO_TESTS8} # ------- otb::MultiChannelExtractROI ------------------------------ +IF(OTB_DATA_USE_LARGEINPUT) # --- SPOT4 (CAI) --- ADD_TEST(ioTvMultiChannelROI_SPOT42PNG ${COMMON_TESTS2} --compare-image ${TOL} ${BASELINE}/ioExtractROI_SPOT42PNG_spot4_700_60_77_489_channels_1_2_3.png @@ -707,6 +723,7 @@ ADD_TEST(ioTvMultiChannelROI_SPOT42PNG_2 ${COMMON_TESTS2} ${TEMP}/ioExtractROI_SPOT42PNG_spot4_700_60_77_489_channels_3_2_1.png -startX 700 -startY 60 -sizeX 77 -sizeY 489 -channels 3 2 1 ) +ENDIF(OTB_DATA_USE_LARGEINPUT) # --- ENVI --- ADD_TEST(ioTvMultiChannelROI_ENVI2PNG_2 ${COMMON_TESTS2} @@ -733,6 +750,7 @@ ADD_TEST(ioTvMultiChannelROI_ENVI2PNG_2 ${COMMON_TESTS2} # --- SPOT5 (CAI) --- # --- Test sur l'image SPOT 5 4 canaux --- +IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(ioTvMultiChannelROI_SPOT52PNG ${COMMON_TESTS2} --compare-image ${TOL} ${BASELINE}/ioExtractROI_SPOT52PNG_spot5_700_700_1000_1000_channels_1_2_3.png ${TEMP}/ioExtractROI_SPOT52PNG_spot5_700_700_1000_1000_channels_1_2_3.png @@ -861,6 +879,7 @@ ADD_TEST(ioTvMultiChannelROI_QuickbirdXS2TIFF ${COMMON_TESTS2} -ushort ${TEMP}/ioExtractROI_QuickbirdXS2TIFF_1000_1000_100_150.tif -startX 1000 -startY 1000 -sizeX 100 -sizeY 150 ) +ENDIF(OTB_DATA_USE_LARGEINPUT) # -channels 1 2 3) @@ -868,6 +887,7 @@ ADD_TEST(ioTvMultiChannelROI_QuickbirdXS2TIFF ${COMMON_TESTS2} # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbIOTESTS9 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(ioTuOtbImageTestSAR_ERS ${IO_TESTS9} --compare-ascii ${EPS} ${BASELINE_FILES}/ioOtbImageTestSAR_ERS.txt ${TEMP}/ioOtbImageTestSAR_ERS.txt @@ -899,8 +919,8 @@ ADD_TEST(ioTuOtbVectorImageTestSpot5 ${IO_TESTS9} otbVectorImageTest ${IMAGEDATA}/SPOT5_SCENE01/ ${TEMP}/ioOtbVectorImageTestSpot5.txt) - +ENDIF(OTB_DATA_USE_LARGEINPUT) # --- otb::VectorImageReadWriteTest --- ADD_TEST(ioTvVectorImageFileReaderWriterTest ${IO_TESTS9} @@ -1167,6 +1187,7 @@ ADD_TEST(ioTvSpatialObjectDXFReader ${IO_TESTS11} # ------- Test pour la lecture des m�tadonn�es OSSIM ------------------------ # --- Quickbird Metadata --- +IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(ioTvOSSIMImageQuickbirdMetaDataReader ${IO_TESTS12} --compare-n-ascii ${EPS} 2 ${BASELINE_FILES}/ioOSSIMImageQuickbirdMetaDataReader.txt ${TEMP}/ioOSSIMImageQuickbirdMetaDataReader.txt @@ -1201,6 +1222,7 @@ ADD_TEST(ioTvOSSIMImageERS2MetaDataReader ${IO_TESTS12} ${TEMP}/ioOSSIMImageERS2MetaDataReader.txt ${TEMP}/ioOSSIMVectorImageERS2MetaDataReader.txt ) +ENDIF(OTB_DATA_USE_LARGEINPUT) # --- otb::DEMHandler --- ADD_TEST(ioTuDEMHandlerNew ${IO_TESTS12} otbDEMHandlerNew ) @@ -1226,14 +1248,13 @@ ADD_TEST(ioTvDEMToImageGeneratorTest ${IO_TESTS12} otbDEMToImageGeneratorTest ${INPUTDATA}/DEM/srtm_directory ${TEMP}/ioTvDEMToImageGenerator.tif - 6.5 - 44.5 - 500 - 500 - 0.002 - 0.002 - ) - + 6.5 + 44.5 + 500 + 500 + 0.002 + 0.002 + ) ADD_TEST(ioTvossimElevManagerTest ${IO_TESTS12} @@ -1283,10 +1304,12 @@ ADD_TEST(ioTuJ2KImageIOCanRead ${IO_TESTS13} ${INPUTDATA}/bretagne.j2k ) +IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(ioTuJP2ImageIOCanRead ${IO_TESTS13} otbJPEG2000ImageIOTestCanRead ${IMAGEDATA}/JPEG2000/QB_multicomp.jpx ) +ENDIF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(ioTvVectorImageFileReaderWriterJ2K2TIF ${IO_TESTS9} --compare-image ${TOL} ${BASELINE}/ioTvVectorImageFileReaderWriterJ2K2TIFOutput.tif @@ -1305,6 +1328,7 @@ ADD_TEST(ioTvImageFileReaderWriterJ2K2TIF ${IO_TESTS2} ) #NOTE: we are comparing with the kakadu output in raw format. +IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(ioTvVectorImageFileReaderWriterJP22TIF ${IO_TESTS9} --compare-image ${TOL} ${BASELINE}/ioTvVectorImageFileReaderWriterJP22TIFOutput ${TEMP}/ioTvVectorImageFileReaderWriterJP22TIFOutput.tif @@ -1321,6 +1345,7 @@ ADD_TEST(ioTvImageFileReaderWriterJP22TIF ${IO_TESTS2} ${IMAGEDATA}/JPEG2000/QB_multicomp_small.jpx ${TEMP}/ioTvImageFileReaderWriterJP22TIFOutput.tif ) +ENDIF(OTB_DATA_USE_LARGEINPUT) @@ -1335,11 +1360,13 @@ ENDIF(OTB_COMPILE_JPEG2000) # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbIOTESTS14 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(ioTuOGRDriverTest ${IO_TESTS14} otbOGRDriverTest ${IMAGEDATA}/TOULOUSE/QuickBird/GIS_FILES/000000128955_01_PRODUCT_SHAPE.shp foo ) +ENDIF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(ioTvGDALDriverDoubleWritingTest ${IO_TESTS14} --compare-n-images ${TOL} 4 @@ -1360,6 +1387,7 @@ ADD_TEST(ioTvGDALDriverDoubleWritingTest ${IO_TESTS14} ${TEMP}/ioGdalDriverDoubleWritingTestImage4.tif ) +IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(ioTvReadingComplexDataIntoComplexImage ${IO_TESTS14} otbReadingComplexDataIntoComplexImageTest ${IMAGEDATA}/RADARSAT2/SCENE01/DAT_01.001 @@ -1376,6 +1404,8 @@ ADD_TEST(ioTvWritingComplexDataWithComplexImage ${IO_TESTS14} 1000 1000 500 500 ) +ENDIF(OTB_DATA_USE_LARGEINPUT) + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbIOTESTS15 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1388,12 +1418,14 @@ ADD_TEST(ioTuVectorDataSourceNew ${IO_TESTS15} ADD_TEST(ioTuVectorDataFileReaderNew ${IO_TESTS15} otbVectorDataFileReaderNew ) +IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(ioTvSHPVectorDataFileReader ${IO_TESTS15} --compare-ascii ${TOL} ${BASELINE_FILES}/ioSHPVectorDataFileReader.txt ${TEMP}/ioSHPVectorDataFileReader.txt otbVectorDataFileReader ${IMAGEDATA}/TOULOUSE/QuickBird/GIS_FILES/000000128955_01_ORDER_SHAPE.shp ${TEMP}/ioSHPVectorDataFileReader.txt) +ENDIF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(ioTuVectorDataFileWriterNew ${IO_TESTS15} otbVectorDataFileWriterNew ) @@ -1409,11 +1441,13 @@ ADD_TEST(ioTvVectorDataFileWriter ${IO_TESTS15} # If the file exists, try remove it to prevent test failure FILE(REMOVE ${TEMP}/ioTvVectorDataFileReaderWriterOutput.shp) +IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(ioTvVectorDataFileReaderWriter ${IO_TESTS15} otbVectorDataFileReaderWriter ${IMAGEDATA}/TOULOUSE/QuickBird/GIS_FILES/000000128955_01_ORDER_SHAPE.shp ${TEMP}/ioTvVectorDataFileReaderWriterOutput.shp ) +ENDIF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(ioTuKMLVectorDataIO ${IO_TESTS15} otbKMLVectorDataIONew ) diff --git a/Testing/Code/Learning/CMakeLists.txt b/Testing/Code/Learning/CMakeLists.txt index fa49544ccd..e36471ef49 100644 --- a/Testing/Code/Learning/CMakeLists.txt +++ b/Testing/Code/Learning/CMakeLists.txt @@ -4,8 +4,6 @@ IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) -#Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) diff --git a/Testing/Code/Markov/CMakeLists.txt b/Testing/Code/Markov/CMakeLists.txt index 889aab1452..2b996773c7 100644 --- a/Testing/Code/Markov/CMakeLists.txt +++ b/Testing/Code/Markov/CMakeLists.txt @@ -4,8 +4,6 @@ IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) -#Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) #Tolerance sur diff pixel image diff --git a/Testing/Code/MultiScale/CMakeLists.txt b/Testing/Code/MultiScale/CMakeLists.txt index 5a6d2e2068..237c86f98e 100644 --- a/Testing/Code/MultiScale/CMakeLists.txt +++ b/Testing/Code/MultiScale/CMakeLists.txt @@ -4,8 +4,6 @@ IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) -#Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) #Tolerance sur diff pixel image diff --git a/Testing/Code/Projections/CMakeLists.txt b/Testing/Code/Projections/CMakeLists.txt index 0e40cf5c10..6c28bcff1c 100644 --- a/Testing/Code/Projections/CMakeLists.txt +++ b/Testing/Code/Projections/CMakeLists.txt @@ -4,7 +4,9 @@ SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) #Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) +IF(OTB_DATA_USE_LARGEINPUT) + SET(IMAGEDATA ${OTB_DATA_LARGEINPUT_ROOT} ) +ENDIF(OTB_DATA_USE_LARGEINPUT) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) @@ -30,6 +32,7 @@ ADD_TEST(prTuMapProjectionsNew ${PROJECTIONS_TESTS1} otbMapProjectionsNew ) ADD_TEST(prTuSensorModelsNew ${PROJECTIONS_TESTS1} otbSensorModelsNew ) # TEST 4 +IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(prTvTestCreateProjectionWithOSSIM_Toulouse ${PROJECTIONS_TESTS1} otbCreateProjectionWithOSSIM ${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF @@ -161,12 +164,15 @@ ADD_TEST(prTvRegionProjectionResamplerCevennes ${PROJECTIONS_TESTS1} # ) #======================================================================================= +ENDIF(OTB_DATA_USE_LARGEINPUT) + # TU pour otb::OrthoRectificationFilterBase otb::OrthoRectificationFilter ADD_TEST(prTuOrthoRectificationFilterNew ${PROJECTIONS_TESTS2} otbOrthoRectificationFilterNew ) # TEST 16.2 +IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(prTvOrthoRectificationToulouse ${PROJECTIONS_TESTS2} --compare-image ${EPSILON} ${BASELINE}/prTvOrthoRectificationToulouse_UTM.tif ${TEMP}/prTvOrthoRectificationToulouse_UTM.tif @@ -276,8 +282,7 @@ ADD_TEST(prTvOrthoRectificationCevennesWithDEM ${PROJECTIONS_TESTS2} ${INPUTDATA}/DEM/srtm_directory/ # ${TEMP}/prTvOrthoRectificationCevennesWithDEM_UTM.tif ) - - + #========================= Ortho rectif SPOT5 =============================== ADD_TEST(prTvOrthoRectificationSPOT5 ${PROJECTIONS_TESTS2} @@ -310,7 +315,8 @@ ADD_TEST(prTvOrthoRectificationSPOT5 ${PROJECTIONS_TESTS2} -5 39 N - ) + ) +ENDIF(OTB_DATA_USE_LARGEINPUT) #========================= TESTS SINGAPOUR =============================== #SET(EMMANUELDATA ${OTB_DATA_ROOT}/Emmanuel/Singapour/000000173549_01_P001_MUL) diff --git a/Testing/Code/Radiometry/CMakeLists.txt b/Testing/Code/Radiometry/CMakeLists.txt index d22abd3816..61d8587f6e 100644 --- a/Testing/Code/Radiometry/CMakeLists.txt +++ b/Testing/Code/Radiometry/CMakeLists.txt @@ -4,8 +4,6 @@ IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) -#Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) #Tolerance sur diff pixel image diff --git a/Testing/Code/SARPolarimetry/CMakeLists.txt b/Testing/Code/SARPolarimetry/CMakeLists.txt index 1a5db4d6fd..c28a0412b3 100644 --- a/Testing/Code/SARPolarimetry/CMakeLists.txt +++ b/Testing/Code/SARPolarimetry/CMakeLists.txt @@ -6,7 +6,9 @@ SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) #Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) +IF(OTB_DATA_USE_LARGEINPUT) + SET(IMAGEDATA ${OTB_DATA_LARGEINPUT_ROOT} ) +ENDIF(OTB_DATA_USE_LARGEINPUT) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) #Tolerance sur diff pixel image @@ -88,6 +90,7 @@ ADD_TEST(rdTuMultiChannelsPolarimetricSynthesisFilterNew ${SARPOLARIMETRY_TESTS1 ) # With vector image HH, HV, VH and VV channels +#IF(OTB_DATA_USE_LARGEINPUT) #ADD_TEST(rdTvVectorMultiChannelsPolarimetricSynthesisFilter ${SARPOLARIMETRY_TESTS1} # --compare-image ${TOL} ${BASELINE}/rdTvMultiPolarimetricSynthesis1.tif # ${TEMP}/resMultiPolarimetricSynthesis1.tif @@ -99,6 +102,7 @@ ADD_TEST(rdTuMultiChannelsPolarimetricSynthesisFilterNew ${SARPOLARIMETRY_TESTS1 # 0.0 # PsiR # 0.0 # KhiR # ) +#ENDIF(OTB_DATA_USE_LARGEINPUT) # With 3 images HH, HV and VV channels turned into vectorImage diff --git a/Testing/Code/SpatialReasoning/CMakeLists.txt b/Testing/Code/SpatialReasoning/CMakeLists.txt index 45a8b0cbb0..464e4260eb 100644 --- a/Testing/Code/SpatialReasoning/CMakeLists.txt +++ b/Testing/Code/SpatialReasoning/CMakeLists.txt @@ -4,8 +4,6 @@ IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) -#Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) #Tolerance sur diff pixel image diff --git a/Testing/Code/Visu/CMakeLists.txt b/Testing/Code/Visu/CMakeLists.txt index 1ce54f94ee..5b10f9d2f3 100644 --- a/Testing/Code/Visu/CMakeLists.txt +++ b/Testing/Code/Visu/CMakeLists.txt @@ -4,7 +4,9 @@ SET(BASELINE ${OTB_DATA_ROOT}/Baseline/OTB/Images) SET(BASELINE_FILES ${OTB_DATA_ROOT}/Baseline/OTB/Files) SET(INPUTDATA ${OTB_DATA_ROOT}/Input) #Images de teledetection (grosses images ) -SET(IMAGEDATA ${OTB_DATA_ROOT}/LargeInput ) +IF(OTB_DATA_USE_LARGEINPUT) + SET(IMAGEDATA ${OTB_DATA_LARGEINPUT_ROOT} ) +ENDIF(OTB_DATA_USE_LARGEINPUT) SET(TEMP ${OTBTesting_BINARY_DIR}/Temporary) @@ -69,17 +71,17 @@ ADD_TEST(viTvImageViewerWithOtbVectorImage ${VISU_TESTS1} ${INPUTDATA}/couleurs.jpg 3 ) +ADD_TEST(viTvImageViewerWithOtbImage ${VISU_TESTS1} + otbImageViewerWithOtbImage + ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif + ) + +IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(viTvImageViewerWithLargeOtbVectorImage ${VISU_TESTS1} otbImageViewer ${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF 0 ) - -ADD_TEST(viTvImageViewerWithOtbImage ${VISU_TESTS1} - otbImageViewerWithOtbImage - ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif - ) - ADD_TEST(viTvModulusImageViewerWithComplexImage ${VISU_TESTS1} otbImageViewer ${IMAGEDATA}/RADARSAT2/SCENE01/DAT_01.001 1 @@ -94,6 +96,7 @@ ADD_TEST(viTvImageViewerWithLargeOtbImage ${VISU_TESTS1} otbImageViewerWithOtbImage ${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF 0 ) +ENDIF(OTB_DATA_USE_LARGEINPUT) # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbVISU_Tests2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- GitLab