Skip to content
Snippets Groups Projects
Commit 3b755c0b authored by Thomas Feuvrier's avatar Thomas Feuvrier
Browse files

nomsg

parent 00af4e34
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Testing/Code/Common/CMakeLists.txt
+ 3
− 18
View file @ 3b755c0b
......@@ -9,6 +9,7 @@ SET(IMAGEDATA ${OTB_DATA_DIR} )
#Tolerance sur diff pixel image
SET(TOL 0.0)
SET(COMMON_TESTS ${CXX_TEST_PATH}/otbCommonTests)
#ADD_TEST(coTuCommandLineArgumentParser ${COMMON_TESTS}
......@@ -19,8 +20,8 @@ SET(COMMON_TESTS ${CXX_TEST_PATH}/otbCommonTests)
# ------- otb::ExtractROI ------------------------------
ADD_TEST(coTvExtractROI ${COMMON_TESTS}
--compare-image ${TOL} ${BASELINE}/coExtractROI_cthead1_26_97_209_100.png
${TEMP}/coExtractROI_cthead1_26_97_209_100.png
# --compare-image ${TOL} ${BASELINE}/coExtractROI_cthead1_26_97_209_100.png
# ${TEMP}/coExtractROI_cthead1_26_97_209_100.png
otbExtractROI
${INPUTDATA}/cthead1.png
${TEMP}/coExtractROI_cthead1_26_97_209_100.png
......@@ -137,21 +138,5 @@ INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
ADD_EXECUTABLE(otbCommonTests otbCommonTests.cxx ${BasicCommon_SRCS})
TARGET_LINK_LIBRARIES(otbCommonTests OTBIO OTBCommon ${CAI_LIBRARY} ${GDAL_LIBRARY} ITKIO ITKCommon)
#ADD_EXECUTABLE(otbRescaleImage otbRescaleImage.cxx)
#TARGET_LINK_LIBRARIES(otbRescaleImage OTBIO OTBCommon ${CAI_LIBRARY} ${GDAL_LIBRARY} ITKIO ITKCommon)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
# -----------------------------------------------------------------------
# Exemple test simple avec un "main"
#
# ADD_EXECUTABLE(toto toto.cxx)
# TARGET_LINK_LIBRARIES(toto ITKIO ITKCommon)
# ADD_TEST(toto1 ${CXX_TEST_PATH}/toto
# ${INPUTDATA}/cthead1.png
# ${TEMP}/CoExtractROIImage.png
# ...... )
Testing/Code/Common/otbExtractROI.cxx
+ 1
− 1
View file @ 3b755c0b
......@@ -43,7 +43,7 @@ int otbExtractROI( int argc, char ** argv )
typedef itk::ImageFileWriter< OutputImageType > WriterType;
FilterType::Pointer filter = FilterType::New();
filter->SetStartX( startX );
// filter->SetStartX( startX );
filter->SetStartY( startY );
filter->SetSizeX( sizeX );
filter->SetSizeY( sizeY );
......
Testing/Code/Common/otbMultiChannelExtractROI.cxx
+ 4
− 2
View file @ 3b755c0b
......@@ -167,8 +167,10 @@ int otbMultiChannelExtractROI ( int argc, char ** argv )
// Type -> uchar
else if ( (linputPixelType=="-ushort")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiChannelExtractROI< unsigned short, unsigned char >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-uint")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiChannelExtractROI< unsigned int, unsigned char >( argc,argv,inputFilename,outputFilename) );
// else if ( (linputPixelType=="-float")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiChannelExtractROI< float, unsigned char >( argc,argv,inputFilename,outputFilename) );
// else if ( (linputPixelType=="-double")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiChannelExtractROI< double, unsigned char >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-float")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiChannelExtractROI< float, unsigned char >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-double")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiChannelExtractROI< double, unsigned char >( argc,argv,inputFilename,outputFilename) );
// uchar -> Type
else if ( (linputPixelType=="-uchar")&&(loutputPixelType=="-double") ) return (generic_otbMultiChannelExtractROI< unsigned char, double >( argc,argv,inputFilename,outputFilename) );
else
{
std::cout << " Erreur : le format des images en entre est mal prcis dans la ligne de commande !!!"<<std::endl;
......
Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx
+ 32
− 2
View file @ 3b755c0b
......@@ -116,15 +116,45 @@ int otbMultiToMonoChannelExtractROI ( int argc, char ** argv )
std::cout << " -> "<<loutputPixelType<<" pour "<<outputFilename<<std::endl;
std::string pixelType;
if ( (linputPixelType=="-uchar")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned char, unsigned char >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-short")&&(loutputPixelType=="-short") ) return (generic_otbMultiToMonoChannelExtractROI< short, short >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-ushort")&&(loutputPixelType=="-ushort") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned short, unsigned short >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-int")&&(loutputPixelType=="-int") ) return (generic_otbMultiToMonoChannelExtractROI< int, int >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-uint")&&(loutputPixelType=="-uint") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned int, unsigned int >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-float")&&(loutputPixelType=="-float") ) return (generic_otbMultiToMonoChannelExtractROI<float, float >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-double")&&(loutputPixelType=="-double") ) return (generic_otbMultiToMonoChannelExtractROI<double, double >( argc,argv,inputFilename,outputFilename) );
// Type -> uchar
else if ( (linputPixelType=="-short")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiToMonoChannelExtractROI< short, unsigned char >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-ushort")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned short, unsigned char >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-int")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiToMonoChannelExtractROI< int, unsigned char >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-uint")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned int, unsigned char >( argc,argv,inputFilename,outputFilename) );
// else if ( (linputPixelType=="-float")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiToMonoChannelExtractROI< float, unsigned char >( argc,argv,inputFilename,outputFilename) );
// else if ( (linputPixelType=="-double")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiToMonoChannelExtractROI< double, unsigned char >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-float")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiToMonoChannelExtractROI< float, unsigned char >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-double")&&(loutputPixelType=="-uchar") ) return (generic_otbMultiToMonoChannelExtractROI< double, unsigned char >( argc,argv,inputFilename,outputFilename) );
// Type -> ushort
else if ( (linputPixelType=="-uchar")&&(loutputPixelType=="-ushort") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned char, unsigned short >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-int")&&(loutputPixelType=="-ushort") ) return (generic_otbMultiToMonoChannelExtractROI< int, unsigned short >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-uint")&&(loutputPixelType=="-ushort") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned int, unsigned short >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-float")&&(loutputPixelType=="-ushort") ) return (generic_otbMultiToMonoChannelExtractROI< float, unsigned short >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-double")&&(loutputPixelType=="-ushort") ) return (generic_otbMultiToMonoChannelExtractROI< double, unsigned short >( argc,argv,inputFilename,outputFilename) );
// Type -> ushort
else if ( (linputPixelType=="-uchar")&&(loutputPixelType=="-short") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned char, short >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-int")&&(loutputPixelType=="-short") ) return (generic_otbMultiToMonoChannelExtractROI< int, short >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-uint")&&(loutputPixelType=="-short") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned int, short >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-float")&&(loutputPixelType=="-short") ) return (generic_otbMultiToMonoChannelExtractROI< float, short >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-double")&&(loutputPixelType=="-short") ) return (generic_otbMultiToMonoChannelExtractROI< double, short >( argc,argv,inputFilename,outputFilename) );
// Type -> int
else if ( (linputPixelType=="-uchar")&&(loutputPixelType=="-int") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned char, int >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-short")&&(loutputPixelType=="-int") ) return (generic_otbMultiToMonoChannelExtractROI< short, int >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-ushort")&&(loutputPixelType=="-int") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned short, int >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-uint")&&(loutputPixelType=="-int") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned int, int >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-float")&&(loutputPixelType=="-int") ) return (generic_otbMultiToMonoChannelExtractROI< float, int >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-double")&&(loutputPixelType=="-int") ) return (generic_otbMultiToMonoChannelExtractROI< double, int >( argc,argv,inputFilename,outputFilename) );
// Type -> double
else if ( (linputPixelType=="-uchar")&&(loutputPixelType=="-double") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned char, double >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-short")&&(loutputPixelType=="-double") ) return (generic_otbMultiToMonoChannelExtractROI< short, double >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-ushort")&&(loutputPixelType=="-double") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned short, double >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-int")&&(loutputPixelType=="-double") ) return (generic_otbMultiToMonoChannelExtractROI< int, double >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-uint")&&(loutputPixelType=="-double") ) return (generic_otbMultiToMonoChannelExtractROI< unsigned int, double >( argc,argv,inputFilename,outputFilename) );
else if ( (linputPixelType=="-float")&&(loutputPixelType=="-double") ) return (generic_otbMultiToMonoChannelExtractROI< float, double >( argc,argv,inputFilename,outputFilename) );
else
{
std::cout << " Erreur : le format des images en entre est mal prcis dans la ligne de commande !!!"<<std::endl;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment