diff --git a/Code/Radiometry/otbTerraSarBrightnessImageFilter.txx b/Code/Radiometry/otbTerraSarBrightnessImageFilter.txx index 212e4d5afc67f56eabaa99579cd7add4f943f48c..24fffbdff802214b4b33b2a3af58767bac48d4d9 100644 --- a/Code/Radiometry/otbTerraSarBrightnessImageFilter.txx +++ b/Code/Radiometry/otbTerraSarBrightnessImageFilter.txx @@ -40,7 +40,7 @@ TerraSarBrightnessImageFilter<TInputImage,TOutputImage> TerraSarImageMetadataInterface::Pointer lImageMetadata = otb::TerraSarImageMetadataInterface::New(); if( !lImageMetadata->CanRead(this->GetInput()->GetMetaDataDictionary()) ) { - itkExceptionMacro(<<"Invalid input image. Only TerraSar images are supproted"); + itkExceptionMacro(<<"Invalid input image. Only TerraSar images are supported"); } this->SetCalFactor( lImageMetadata->GetCalibrationFactor(this->GetInput()->GetMetaDataDictionary()) ); } diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index b7b962b4f9aed2fa4769934f0f5e63078301b2df..dfa3439bad779048302eb4b31412b3dd4e1f8f6e 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -39,6 +39,23 @@ ELSE(OTB_BINARY_DIR) 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) + + MACRO(OTB_ADD_EXECUTABLE name sources libraries) + ADD_EXECUTABLE(${name} ${sources}) + TARGET_LINK_LIBRARIES(${name} ${libraries}) + IF(OTB_CPP_CHECK_SOURCE_FILE) + FOREACH( file ${sources}) + ADD_CUSTOM_COMMAND( TARGET ${name} + PRE_BUILD + COMMAND ${OTB_CPP_CHECK_PROG} + ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${file} + DEPENDS ${libraries} + COMMENT "============== C++ checking ${file} source file... ==================" + VERBATIM ) + ENDFOREACH(file) + ENDIF(OTB_CPP_CHECK_SOURCE_FILE) + ENDMACRO(OTB_ADD_EXECUTABLE) + # Find OTB and load its settings. FIND_PACKAGE(OTB) IF(OTB_FOUND) @@ -68,23 +85,6 @@ ELSE(OTB_BINARY_DIR) STRING(REGEX REPLACE "^/" "" OTB_INSTALL_BIN_DIR_CM24 "${OTB_INSTALL_BIN_DIR}") STRING(REGEX REPLACE "^/" "" OTB_INSTALL_INCLUDE_DIR_CM24 "${OTB_INSTALL_INCLUDE_DIR}") - MACRO(OTB_ADD_EXECUTABLE name sources libraries) - ADD_EXECUTABLE(${name} ${sources}) - TARGET_LINK_LIBRARIES(${name} ${libraries}) - IF(OTB_CPP_CHECK_SOURCE_FILE) - FOREACH( file ${sources}) - ADD_CUSTOM_COMMAND( TARGET ${name} - PRE_BUILD - COMMAND ${OTB_CPP_CHECK_PROG} - ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${file} - DEPENDS ${libraries} - COMMENT "============== C++ checking ${file} source file... ==================" - VERBATIM ) - ENDFOREACH(file) - ENDIF(OTB_CPP_CHECK_SOURCE_FILE) - ENDMACRO(OTB_ADD_EXECUTABLE) - - ENDIF(OTB_BINARY_DIR) IF(OTB_COMPILE_WITH_FULL_WARNING) diff --git a/Testing/CTestConfig.cmake b/Testing/CTestConfig.cmake new file mode 100644 index 0000000000000000000000000000000000000000..0adadd4cd87bde7269b5301f487f5784d7ec66af --- /dev/null +++ b/Testing/CTestConfig.cmake @@ -0,0 +1,15 @@ +## This file should be placed in the root directory of your project. +## Then modify the CMakeLists.txt file in the root directory of your +## project to incorporate the testing dashboard. +## # The following are required to uses Dart and the Cdash dashboard +## ENABLE_TESTING() +## INCLUDE(Dart) +set(CTEST_PROJECT_NAME "OTB") +set(CTEST_NIGHTLY_START_TIME "20:00:00 CEST") + +set(CTEST_NIGHTLY_IDENT_LOCATION "http://www.orfeo-toolbox.org/nightly/libNightlyNumber") + +set(CTEST_DROP_METHOD "http") +set(CTEST_DROP_SITE "dash.orfeo-toolbox.org") +set(CTEST_DROP_LOCATION "/submit.php?project=OTB") +set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/Testing/Code/Radiometry/CMakeLists.txt b/Testing/Code/Radiometry/CMakeLists.txt index b3bba93307dc63b60759d50a32dd8999f6847e0e..37449a3cb1ee28dbc2fbc5e672864c1b4d2f7d76 100644 --- a/Testing/Code/Radiometry/CMakeLists.txt +++ b/Testing/Code/Radiometry/CMakeLists.txt @@ -1058,9 +1058,10 @@ ADD_TEST(raTvTerraSarBrightnessImageFunctor ${RADIOMETRY_TESTS9} ${BASELINE_FILES}/raTvTerraSarBrightnessImageFunctor.txt ${TEMP}/raTvTerraSarBrightnessImageFunctor.txt otbTerraSarBrightnessImageFunctor - 12 - 12 - 0 + 12 # real pixel + 12 # complex real part pixel + 0 # complex imaginary part pixel + 1 # calFactor ${TEMP}/raTvTerraSarBrightnessImageFunctor.txt ) diff --git a/Testing/Code/Radiometry/otbTerraSarBrightnessImageFunctor.cxx b/Testing/Code/Radiometry/otbTerraSarBrightnessImageFunctor.cxx index f27a40353bd9b9163a10eff9ae749b5c160e448a..ce6817684b782a1356c589a86df0d7439903b625 100644 --- a/Testing/Code/Radiometry/otbTerraSarBrightnessImageFunctor.cxx +++ b/Testing/Code/Radiometry/otbTerraSarBrightnessImageFunctor.cxx @@ -23,23 +23,21 @@ int otbTerraSarBrightnessImageFunctor(int argc, char * argv[]) { + char *outFilename = argv[5]; + double calFact = atof(argv[4]); + typedef double ScalarType; typedef std::complex<ScalarType> ComplexType; typedef otb::Functor::TerraSarBrightnessImageFunctor<ScalarType, ScalarType> FunctorType; FunctorType funct; - - if(argc!=5) - { - std::cout << "argv[0] <Scalar pixel> <Complex pixel (re part)> <Complex pixel (im part)> <output filename>" << std::endl; - - return EXIT_FAILURE; - } + funct.SetCalFactor(calFact); ScalarType inPix = static_cast<ScalarType>(atof(argv[1])); ComplexType inCplxPix(static_cast<ScalarType>(atof(argv[2])), static_cast<ScalarType>(atof(argv[3]))); - char *outFilename = argv[4]; + + std::ofstream file; file.open(outFilename);