From 905176d2041d28dd1673df210db2656c5d97fc00 Mon Sep 17 00:00:00 2001 From: Thomas Feuvrier <thomas.feuvrier@c-s.fr> Date: Tue, 8 Sep 2009 18:35:31 +0200 Subject: [PATCH] ENH: Change TOULOUSE/QuickBird path by QUICKBIRD/TOULOUSE in LargeInput data base. --- Testing/Code/BasicFilters/CMakeLists.txt | 8 ++++---- Testing/Code/Common/CMakeLists.txt | 2 +- Testing/Code/IO/CMakeLists.txt | 16 ++++++++-------- Testing/Code/Projections/CMakeLists.txt | 18 +++++++++--------- Testing/Code/Visu/CMakeLists.txt | 4 ++-- Testing/Code/Visualization/CMakeLists.txt | 4 ++-- Testing/Utilities/CMakeLists.txt | 4 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Testing/Code/BasicFilters/CMakeLists.txt b/Testing/Code/BasicFilters/CMakeLists.txt index 7f35b1c45e..46b90b69c6 100644 --- a/Testing/Code/BasicFilters/CMakeLists.txt +++ b/Testing/Code/BasicFilters/CMakeLists.txt @@ -187,7 +187,7 @@ IF(OTB_DATA_USE_LARGEINPUT) ${BASELINE}/bfTvStreamingShrinkImageFilterQBPANOutput.hdr ${TEMP}/bfTvStreamingShrinkImageFilterQBPANOutput.hdr otbStreamingShrinkImageFilter - ${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${TEMP}/bfTvStreamingShrinkImageFilterQBPANOutput.hdr 50 ) @@ -197,7 +197,7 @@ ADD_TEST(bfTvStreamingShrinkImageFilterQBMUL ${BASICFILTERS_TESTS2} ${BASELINE}/bfTvStreamingShrinkImageFilterQBMULOutput.hdr ${TEMP}/bfTvStreamingShrinkImageFilterQBMULOutput.hdr otbStreamingShrinkImageFilter - ${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF + ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF ${TEMP}/bfTvStreamingShrinkImageFilterQBMULOutput.hdr 20 ) @@ -246,7 +246,7 @@ IF(OTB_DATA_USE_LARGEINPUT) ${BASELINE_FILES}/ioOSSIMImageQuickbirdMetaDataReader.txt ${TEMP}/bfTvImportGeoInformationKeywordListOutput.txt otbImportGeoInformationImageFilterWithKeywordList - ${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${TEMP}/bfTvImportGeoInformationKeywordListOutput.txt ) ENDIF(OTB_DATA_USE_LARGEINPUT) @@ -397,7 +397,7 @@ ADD_TEST(bfTvStreamingStatisticsImageFilter ${BASICFILTERS_TESTS4} ${BASELINE_FILES}/bfStreamingStatisticsImageFilterResults.txt ${TEMP}/bfStreamingStatisticsImageFilterResults.txt otbStreamingStatisticsImageFilter -# ${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF +# ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${INPUTDATA}/small_poupees_1canal.hd ${TEMP}/bfStreamingStatisticsImageFilterResults.txt) diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt index a8c0a03453..9c0b639b42 100755 --- a/Testing/Code/Common/CMakeLists.txt +++ b/Testing/Code/Common/CMakeLists.txt @@ -757,7 +757,7 @@ ADD_TEST(coTvVectorDataToImageFilterSensorModel ${COMMON_TESTS9} ${TEMP}/coTvVectorDataToImageFilterSensorModel.png otbVectorDataToImageFilterSensorModel ${LARGEINPUT}/VECTOR/MidiPyrenees/roads.shp - ${LARGEINPUT}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${TEMP}/coTvVectorDataToImageFilterSensorModel.png ) ENDIF(OTB_DATA_USE_LARGEINPUT) diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt index 37407f9afe..efcd0b80e3 100755 --- a/Testing/Code/IO/CMakeLists.txt +++ b/Testing/Code/IO/CMakeLists.txt @@ -515,10 +515,10 @@ ADD_TEST(ioTuGDALImageIOCanRead_SAR_ERS2 ${IO_TESTS5} otbGDALImageIOTestCanRead ${LARGEDATA}/SAR_ERS2_SLCI_SCENE1/DAT_01.001 ) ADD_TEST(ioTuGDALImageIOCanRead_QUICK_PAN ${IO_TESTS5} otbGDALImageIOTestCanRead - ${LARGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ) + ${LARGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ) ADD_TEST(ioTuGDALImageIOCanRead_QUICK_XS ${IO_TESTS5} otbGDALImageIOTestCanRead - ${LARGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF ) + ${LARGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF ) ADD_TEST(ioTuGDALImageIOCanRead_IKONOS_PAN ${IO_TESTS5} otbGDALImageIOTestCanRead ${LARGEDATA}/PARIS/Ikonos/po_79039_pan_0000000.tif) @@ -964,7 +964,7 @@ ADD_TEST(ioTvMultiChannelROI_QuickbirdPAN2TIFF ${COMMON_TESTS2} --compare-image ${EPSILON_9} ${BASELINE}/ioExtractROI_QuickbirdPAN2TIFF_1000_1000_100_150.tif ${TEMP}/ioExtractROI_QuickbirdPAN2TIFF_1000_1000_100_150.tif otbMultiChannelExtractROI - -ushort ${LARGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + -ushort ${LARGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF -ushort ${TEMP}/ioExtractROI_QuickbirdPAN2TIFF_1000_1000_100_150.tif -startX 1000 -startY 1000 -sizeX 100 -sizeY 150 ) @@ -974,7 +974,7 @@ ADD_TEST(ioTvMultiChannelROI_QuickbirdXS2TIFF ${COMMON_TESTS2} --compare-image ${EPSILON_9} ${BASELINE}/ioExtractROI_QuickbirdXS2TIFF_1000_1000_100_150.tif ${TEMP}/ioExtractROI_QuickbirdXS2TIFF_1000_1000_100_150.tif otbMultiChannelExtractROI - -ushort ${LARGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF + -ushort ${LARGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF -ushort ${TEMP}/ioExtractROI_QuickbirdXS2TIFF_1000_1000_100_150.tif -startX 1000 -startY 1000 -sizeX 100 -sizeY 150 ) @@ -1651,7 +1651,7 @@ ADD_TEST(ioTvSHPVectorDataFileReader ${IO_TESTS15} --compare-ascii ${EPSILON_9} ${BASELINE_FILES}/ioSHPVectorDataFileReader.txt ${TEMP}/ioSHPVectorDataFileReader.txt otbVectorDataFileReader - ${LARGEDATA}/TOULOUSE/QuickBird/GIS_FILES/000000128955_01_ORDER_SHAPE.shp + ${LARGEDATA}/QUICKBIRD/TOULOUSE/GIS_FILES/000000128955_01_ORDER_SHAPE.shp ${TEMP}/ioSHPVectorDataFileReader.txt ) ENDIF(OTB_DATA_USE_LARGEINPUT) @@ -1708,7 +1708,7 @@ ADD_TEST(ioTvVectorDataFileReaderWriter ${IO_TESTS15} ${BASELINE_FILES}/ioTvVectorDataFileReaderWriterOutput.shp ${TEMP}/ioTvVectorDataFileReaderWriterOutput.shp otbVectorDataFileReaderWriter - ${LARGEDATA}/TOULOUSE/QuickBird/GIS_FILES/000000128955_01_ORDER_SHAPE.shp + ${LARGEDATA}/QUICKBIRD/TOULOUSE/GIS_FILES/000000128955_01_ORDER_SHAPE.shp ${TEMP}/ioTvVectorDataFileReaderWriterOutput.shp ) ENDIF(OTB_DATA_USE_LARGEINPUT) @@ -1896,7 +1896,7 @@ ADD_TEST(ioTvImageMetadataInterfaceQBTest ${IO_TESTS17} --compare-ascii ${NOTOL} ${BASELINE_FILES}/ioTvImageMetadataInterfaceQB.txt ${TEMP}/ioTvImageMetadataInterfaceQB.txt otbImageMetadataInterfaceTest - ${LARGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + ${LARGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${TEMP}/ioTvImageMetadataInterfaceQB.txt ) ADD_TEST(ioTvImageMetadataInterfaceQBCevennesTest ${IO_TESTS17} @@ -1910,7 +1910,7 @@ ADD_TEST(ioTvImageMetadataInterfaceQBMULTest ${IO_TESTS17} --compare-ascii ${NOTOL} ${BASELINE_FILES}/ioTvImageMetadataInterfaceQBMUL.txt ${TEMP}/ioTvImageMetadataInterfaceQBMUL.txt otbImageMetadataInterfaceTest - ${LARGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF + ${LARGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF ${TEMP}/ioTvImageMetadataInterfaceQBMUL.txt ) ADD_TEST(ioTvImageMetadataInterfaceIKONOSTest ${IO_TESTS17} diff --git a/Testing/Code/Projections/CMakeLists.txt b/Testing/Code/Projections/CMakeLists.txt index 6dc5c64bfd..83857a2446 100644 --- a/Testing/Code/Projections/CMakeLists.txt +++ b/Testing/Code/Projections/CMakeLists.txt @@ -38,7 +38,7 @@ ADD_TEST(prTuSensorModelsNew ${PROJECTIONS_TESTS1} otbSensorModelsNew ) IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(prTvTestCreateProjectionWithOSSIM_Toulouse ${PROJECTIONS_TESTS1} otbCreateProjectionWithOSSIM - ${LARGEINPUT}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ) ADD_TEST(prTvTestCreateProjectionWithOSSIM_Cevennes ${PROJECTIONS_TESTS1} @@ -48,7 +48,7 @@ ADD_TEST(prTvTestCreateProjectionWithOSSIM_Cevennes ${PROJECTIONS_TESTS1} ADD_TEST(prTvTestCreateProjectionWithOTB_Toulouse ${PROJECTIONS_TESTS1} otbCreateProjectionWithOTB - ${LARGEINPUT}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ) ADD_TEST(prTvTestCreateProjectionWithOTB_Cevennes ${PROJECTIONS_TESTS1} @@ -58,7 +58,7 @@ ADD_TEST(prTvTestCreateProjectionWithOTB_Cevennes ${PROJECTIONS_TESTS1} ADD_TEST(prTvTestCreateInverseForwardSensorModel_Toulouse ${PROJECTIONS_TESTS1} otbCreateInverseForwardSensorModel - ${LARGEINPUT}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ) ADD_TEST(prTvTestCreateInverseForwardSensorModel_Cevennes ${PROJECTIONS_TESTS1} @@ -70,7 +70,7 @@ ADD_TEST(prTvRegionProjectionResamplerToulouse ${PROJECTIONS_TESTS1} --compare-image ${EPSILON_4} ${BASELINE}/prTvRegionProjectionResamplerToulouse.tif ${TEMP}/prTvRegionProjectionResamplerToulouse.tif otbRegionProjectionResampler - ${LARGEINPUT}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${TEMP}/prTvRegionProjectionResamplerToulouse.tif 1.44 43.6050 # Long/Lat of Toulouse, Capitole 500 @@ -109,7 +109,7 @@ ADD_TEST(prTvSensorModelQuickbird ${PROJECTIONS_TESTS1} ${BASELINE_FILES}/prTvSensorModelQuickbird.txt ${TEMP}/prTvSensorModelQuickbird.txt otbSensorModel - ${LARGEINPUT}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${TEMP}/prTvSensorModelQuickbird.txt ) @@ -203,7 +203,7 @@ ADD_TEST(prTvOrthoRectificationToulouse ${PROJECTIONS_TESTS2} --compare-image ${EPSILON_4} ${BASELINE}/prTvOrthoRectificationToulouse_UTM.tif ${TEMP}/prTvOrthoRectificationToulouse_UTM.tif otbOrthoRectificationFilter - ${LARGEINPUT}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${TEMP}/prTvOrthoRectificationToulouse_UTM.tif 374100.8 4829184.8 @@ -237,7 +237,7 @@ ADD_TEST(prTvOrthoRectificationToulouseWithDEM ${PROJECTIONS_TESTS2} --compare-image ${EPSILON_4} ${BASELINE}/prTvOrthoRectificationToulouseWithDEM_UTM.tif ${TEMP}/prTvOrthoRectificationToulouseWithDEM_UTM.tif otbOrthoRectificationFilterWithDEM - ${LARGEINPUT}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${TEMP}/prTvOrthoRectificationToulouseWithDEM_UTM.tif 374100.8 4829184.8 @@ -345,7 +345,7 @@ ADD_TEST(prTvCompositeTransform ${PROJECTIONS_TESTS3} --compare-ascii ${EPSILON_4} ${BASELINE_FILES}/prTvCompositeTransform.txt ${TEMP}/prTvCompositeTransform.txt otbCompositeTransform - ${LARGEINPUT}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${TEMP}/prTvCompositeTransform.txt ) ENDIF(OTB_DATA_USE_LARGEINPUT) @@ -403,7 +403,7 @@ ADD_TEST(prTvVectorDataProjectionFilterFromMapToSensor ${PROJECTIONS_TESTS3} ${TEMP}/prTvVectorDataProjectionFilterFromMapToSensor.shp otbVectorDataProjectionFilterFromMapToSensor ${INPUTDATA}/ToulousePoints-examples.shp - ${LARGEINPUT}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${TEMP}/prTvVectorDataProjectionFilterFromMapToSensor.shp ) ENDIF(OTB_DATA_USE_LARGEINPUT) diff --git a/Testing/Code/Visu/CMakeLists.txt b/Testing/Code/Visu/CMakeLists.txt index 2081b546fe..be2ca16aa2 100644 --- a/Testing/Code/Visu/CMakeLists.txt +++ b/Testing/Code/Visu/CMakeLists.txt @@ -79,7 +79,7 @@ ADD_TEST(viTvImageViewerWithOtbImage ${VISU_TESTS1} 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 + ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF 0 ) ADD_TEST(viTvModulusImageViewerWithComplexImage ${VISU_TESTS1} @@ -94,7 +94,7 @@ ADD_TEST(viTvPhaseImageViewerWithComplexImage ${VISU_TESTS1} ADD_TEST(viTvImageViewerWithLargeOtbImage ${VISU_TESTS1} otbImageViewerWithOtbImage - ${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF 0 + ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF 0 ) ENDIF(OTB_DATA_USE_LARGEINPUT) diff --git a/Testing/Code/Visualization/CMakeLists.txt b/Testing/Code/Visualization/CMakeLists.txt index 9e3c82f8fb..798f8c5ee1 100644 --- a/Testing/Code/Visualization/CMakeLists.txt +++ b/Testing/Code/Visualization/CMakeLists.txt @@ -300,7 +300,7 @@ IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(vrTvImageViewerEndToEndWithVectorData ${VISUREFAC_TESTS1} otbImageViewerEndToEndWithVectorData -${LARGEINPUTDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF +${LARGEINPUTDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${INPUTDATA}/ToulouseRoad-examples.shp ${INPUTDATA}/DEM/srtm_directory 200 500 200 0 @@ -321,7 +321,7 @@ ${INPUTDATA}/couleurs.tif 0 IF(OTB_DATA_USE_LARGEINPUT) ADD_TEST(vrTvStandardImageViewerToulouseWithWaterwaysShp ${VISUREFAC_TESTS1} otbStandardImageViewer -${LARGEINPUTDATA}/TOULOUSE/QuickBird/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF +${LARGEINPUTDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF 0 ${LARGEINPUTDATA}/VECTOR/MidiPyrenees/waterways.shp ${INPUTDATA}/DEM/srtm_directory diff --git a/Testing/Utilities/CMakeLists.txt b/Testing/Utilities/CMakeLists.txt index 7e1a87a6ba..03cd5d90e8 100644 --- a/Testing/Utilities/CMakeLists.txt +++ b/Testing/Utilities/CMakeLists.txt @@ -24,7 +24,7 @@ SET(UTILITIES_TESTS ${CXX_TEST_PATH}/otbUtilitiesTests) #ADD_TEST(utOssimIntegrationTest ${UTILITIES_TESTS} # ossimIntegrationTest # ossimTiffWriter -# ${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF +# ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF # ${TEMP}/utOssimIntegration.tif #) @@ -34,7 +34,7 @@ ADD_TEST(utTvOssimKeywordlistToulouseQuickBirdTest ${UTILITIES_TESTS} --compare-list ${EPSILON_10e6} ${BASELINE_FILES}/utOssimKeywordlistToulouseQuickBird.txt ${TEMP}/utOssimKeywordlistToulouseQuickBird.txt ossimKeywordlistTest - ${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF + ${IMAGEDATA}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF ${TEMP}/utOssimKeywordlistToulouseQuickBird.txt ) -- GitLab