From 23e792d43d03ef92bac6691f89906d590a7b4c51 Mon Sep 17 00:00:00 2001 From: OTB Bot <otbbot@orfeo-toolbox.org> Date: Thu, 7 Aug 2014 19:55:20 +0200 Subject: [PATCH] STYLE --- .../otbAtmosphericCorrectionParameters.cxx | 1 - .../otbAtmosphericCorrectionParameters.h | 2 +- .../otbImageMetadataCorrectionParameters.cxx | 1 - ...flectanceToSurfaceReflectanceImageFilter.h | 22 +++++++++---------- ...ectanceToSurfaceReflectanceImageFilter.txx | 4 +--- ...aceAdjacencyEffectCorrectionSchemeFilter.h | 17 +++++++------- Code/Simulation/otbAtmosphericEffects.h | 2 +- Code/Simulation/otbAtmosphericEffects.txx | 4 ++-- ...otbSurfaceReflectanceToReflectanceFilter.h | 16 +++++++------- .../otbApplicationLauncherCommandLine.cxx | 2 +- .../otbWrapperCommandLineLauncher.cxx | 4 ++-- .../otbWrapperCommandLineParser.cxx | 14 ++++++------ .../otbAtmosphericCorrectionSequencement.cxx | 4 ++-- ...nParametersToAtmosphericRadiativeTerms.cxx | 6 ++--- ...nceToSurfaceReflectanceImageFilterTest.cxx | 8 +++---- ...ToRomaniaSurfaceReflectanceImageFilter.cxx | 4 ++-- ...AtmosphericCorrectionsRSRSVMClassifier.cxx | 6 ++--- .../Code/Simulation/otbAtmosphericEffects.cxx | 2 +- 18 files changed, 57 insertions(+), 62 deletions(-) diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx b/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx index 32c0526604..3a68212554 100644 --- a/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx +++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx @@ -66,7 +66,6 @@ AtmosphericCorrectionParameters } - /**PrintSelf method */ void AtmosphericCorrectionParameters diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.h b/Code/Radiometry/otbAtmosphericCorrectionParameters.h index 792b681e09..fe1ba2517e 100644 --- a/Code/Radiometry/otbAtmosphericCorrectionParameters.h +++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.h @@ -128,7 +128,7 @@ public: void UpdateAeronetData(const std::string& file, int year, int hour, int minute) { this->UpdateAeronetData(file, year, m_Month, m_Day, hour, minute, 0.4); - }*/ + }*/ /** Constructor */ AtmosphericCorrectionParameters(); diff --git a/Code/Radiometry/otbImageMetadataCorrectionParameters.cxx b/Code/Radiometry/otbImageMetadataCorrectionParameters.cxx index 30a79df185..4f6cbcf016 100644 --- a/Code/Radiometry/otbImageMetadataCorrectionParameters.cxx +++ b/Code/Radiometry/otbImageMetadataCorrectionParameters.cxx @@ -45,7 +45,6 @@ ImageMetadataCorrectionParameters } - /** Get data from filter function file*/ void ImageMetadataCorrectionParameters diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h index b880a23950..f89c940715 100644 --- a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h +++ b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h @@ -25,7 +25,7 @@ #include "otbUnaryImageFunctorWithVectorImageFilter.h" #include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h" -#include "otbAtmosphericCorrectionParameters.h" +#include "otbAtmosphericCorrectionParameters.h" #include "otbImageMetadataCorrectionParameters.h" #include "otbAtmosphericRadiativeTerms.h" @@ -119,8 +119,8 @@ private: * \ingroup AtmosphericRadiativeTerms * \ingroup AtmosphericCorrectionParameters * \ingroup LuminanceToReflectanceImageFilter - * \ingroup ImageToReflectanceImageFilter - * \ingroup ImageMetadataCorrectionParameters + * \ingroup ImageToReflectanceImageFilter + * \ingroup ImageMetadataCorrectionParameters * \ingroup otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms * \ingroup Radiometry * @@ -190,30 +190,30 @@ public: typedef itk::MetaDataDictionary MetaDataDictionaryType; /** Get/Set Atmospheric Radiative Terms. */ - void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms) + void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms) { m_AtmosphericRadiativeTerms = atmoRadTerms; - this->SetNthInput(1, m_AtmosphericRadiativeTerms); + this->SetNthInput(1, m_AtmosphericRadiativeTerms); m_IsSetAtmosphericRadiativeTerms = true; this->Modified(); } itkGetObjectMacro(AtmosphericRadiativeTerms, AtmosphericRadiativeTermsType); /** Get/Set Atmospheric Correction Parameters. */ - void SetAtmoCorrectionParameters(AtmoCorrectionParametersPointerType atmoCorrTerms) + void SetAtmoCorrectionParameters(AtmoCorrectionParametersPointerType atmoCorrTerms) { m_AtmoCorrectionParameters = atmoCorrTerms; - this->SetNthInput(2, m_AtmoCorrectionParameters); - m_IsSetAtmoCorrectionParameters = true; + this->SetNthInput(2, m_AtmoCorrectionParameters); + m_IsSetAtmoCorrectionParameters = true; this->Modified(); } itkGetObjectMacro(AtmoCorrectionParameters, AtmoCorrectionParametersType); /** Get/Set Acquisition Correction Parameters. */ - void SetAcquiCorrectionParameters(AcquiCorrectionParametersPointerType acquiCorrTerms) + void SetAcquiCorrectionParameters(AcquiCorrectionParametersPointerType acquiCorrTerms) { m_AcquiCorrectionParameters = acquiCorrTerms; - this->SetNthInput(3, m_AcquiCorrectionParameters); + this->SetNthInput(3, m_AcquiCorrectionParameters); m_IsSetAcquiCorrectionParameters = true; this->Modified(); } @@ -242,7 +242,7 @@ protected: /** Initialize the parameters of the functor before the threads run. */ virtual void BeforeThreadedGenerateData(); - /** Fill AtmosphericRadiativeTerms using image metadata*/ + /** Fill AtmosphericRadiativeTerms using image metadata*/ void UpdateAtmosphericRadiativeTerms(); /** Update Functors parameters */ void UpdateFunctors(); diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx index ff777e6fc7..24711e2967 100644 --- a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx +++ b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx @@ -80,7 +80,6 @@ ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage> } - template <class TInputImage, class TOutputImage> void ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage> @@ -135,7 +134,7 @@ ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage> { if (imageMetadataInterface->GetSpectralSensitivity()->Capacity() > 0) { - m_AcquiCorrectionParameters->SetWavelengthSpectralBand(imageMetadataInterface->GetSpectralSensitivity()); + m_AcquiCorrectionParameters->SetWavelengthSpectralBand(imageMetadataInterface->GetSpectralSensitivity()); } else { @@ -153,7 +152,6 @@ ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage> } - m_AtmosphericRadiativeTerms = CorrectionParametersToRadiativeTermsType::Compute(m_AtmoCorrectionParameters,m_AcquiCorrectionParameters); } diff --git a/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h b/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h index 4eca8b6b69..a8352b3e7e 100644 --- a/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h +++ b/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h @@ -219,42 +219,41 @@ public: itkSetMacro(PixelSpacingInKilometers, double); itkGetMacro(PixelSpacingInKilometers, double); /** Set/Get the viewing angle */ - itkSetMacro(ZenithalViewingAngle, double); + itkSetMacro(ZenithalViewingAngle, double); itkGetMacro(ZenithalViewingAngle, double); /** Get/Set Atmospheric Radiative Terms. */ - void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms) + void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms) { m_AtmosphericRadiativeTerms = atmoRadTerms; - this->SetNthInput(1, m_AtmosphericRadiativeTerms); + this->SetNthInput(1, m_AtmosphericRadiativeTerms); m_IsSetAtmosphericRadiativeTerms = true; this->Modified(); } itkGetObjectMacro(AtmosphericRadiativeTerms, AtmosphericRadiativeTermsType); /** Get/Set Atmospheric Correction Parameters. */ - void SetAtmoCorrectionParameters(AtmoCorrectionParametersPointerType atmoCorrTerms) + void SetAtmoCorrectionParameters(AtmoCorrectionParametersPointerType atmoCorrTerms) { m_AtmoCorrectionParameters = atmoCorrTerms; - this->SetNthInput(2, m_AtmoCorrectionParameters); - m_IsSetAtmoCorrectionParameters = true; + this->SetNthInput(2, m_AtmoCorrectionParameters); + m_IsSetAtmoCorrectionParameters = true; this->Modified(); } itkGetObjectMacro(AtmoCorrectionParameters, AtmoCorrectionParametersType); /** Get/Set Acquisition Correction Parameters. */ - void SetAcquiCorrectionParameters(AcquiCorrectionParametersPointerType acquiCorrTerms) + void SetAcquiCorrectionParameters(AcquiCorrectionParametersPointerType acquiCorrTerms) { m_AcquiCorrectionParameters = acquiCorrTerms; - this->SetNthInput(3, m_AcquiCorrectionParameters); + this->SetNthInput(3, m_AcquiCorrectionParameters); m_IsSetAcquiCorrectionParameters = true; this->Modified(); } itkGetObjectMacro(AcquiCorrectionParameters, AcquiCorrectionParametersType); - /** Compute radiative terms if necessary and then update functors attibuts. */ void GenerateParameters(); diff --git a/Code/Simulation/otbAtmosphericEffects.h b/Code/Simulation/otbAtmosphericEffects.h index 1807d60e5b..60ce6cfb87 100644 --- a/Code/Simulation/otbAtmosphericEffects.h +++ b/Code/Simulation/otbAtmosphericEffects.h @@ -72,7 +72,7 @@ class AtmosphericEffects itkSetObjectMacro(InputSpectralResponse, InputSpectralResponseType); /** Get/Set Atmospheric Radiative Terms. */ - void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms) + void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms) { m_AtmosphericRadiativeTerms = atmoRadTerms; this->Modified(); diff --git a/Code/Simulation/otbAtmosphericEffects.txx b/Code/Simulation/otbAtmosphericEffects.txx index da8ea20279..e31a692ca5 100644 --- a/Code/Simulation/otbAtmosphericEffects.txx +++ b/Code/Simulation/otbAtmosphericEffects.txx @@ -108,7 +108,7 @@ AtmosphericEffects<TSpectralResponse , TRSR> filterSRToR->Update(); - this->m_CorrectedSpectralResponse->SetFromImage( filterSRToR->GetOutput() );*/ + this->m_CorrectedSpectralResponse->SetFromImage( filterSRToR->GetOutput() ); */ /*if (m_IsSetAtmosphericRadiativeTerms) {*/ @@ -127,7 +127,7 @@ AtmosphericEffects<TSpectralResponse , TRSR> this->m_CorrectedSpectralResponse->SetFromImage( filterSRToR->GetOutput() ); /*} else - itkExceptionMacro(<< "Atmospheric radiative terms must be provided before updating the CSR (Corrected Spectral Response)");*/ + itkExceptionMacro(<< "Atmospheric radiative terms must be provided before updating the CSR (Corrected Spectral Response)"); */ } } // end namespace otb diff --git a/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.h b/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.h index 6c8ea24aac..2b9604b78f 100644 --- a/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.h +++ b/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.h @@ -26,7 +26,7 @@ #include "otbUnaryImageFunctorWithVectorImageFilter.h" #include "otbAtmosphericRadiativeTerms.h" -#include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h" +#include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h" #include "otbImageMetadataCorrectionParameters.h" #include "itkMetaDataDictionary.h" // #include "itkFactory.h" @@ -216,30 +216,30 @@ public: /** Get/Set Atmospheric Radiative Terms. */ - void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms) + void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmoRadTerms) { m_AtmosphericRadiativeTerms = atmoRadTerms; - this->SetNthInput(1, m_AtmosphericRadiativeTerms); + this->SetNthInput(1, m_AtmosphericRadiativeTerms); m_IsSetAtmosphericRadiativeTerms = true; this->Modified(); } itkGetObjectMacro(AtmosphericRadiativeTerms, AtmosphericRadiativeTermsType); /** Get/Set Atmospheric Correction Parameters. */ - void SetAtmoCorrectionParameters(AtmoCorrectionParametersPointerType atmoCorrTerms) + void SetAtmoCorrectionParameters(AtmoCorrectionParametersPointerType atmoCorrTerms) { m_AtmoCorrectionParameters = atmoCorrTerms; - this->SetNthInput(2, m_AtmoCorrectionParameters); - m_IsSetAtmoCorrectionParameters = true; + this->SetNthInput(2, m_AtmoCorrectionParameters); + m_IsSetAtmoCorrectionParameters = true; this->Modified(); } itkGetObjectMacro(AtmoCorrectionParameters, AtmoCorrectionParametersType); /** Get/Set Acquisition Correction Parameters. */ - void SetAcquiCorrectionParameters(AcquiCorrectionParametersPointerType acquiCorrTerms) + void SetAcquiCorrectionParameters(AcquiCorrectionParametersPointerType acquiCorrTerms) { m_AcquiCorrectionParameters = acquiCorrTerms; - this->SetNthInput(3, m_AcquiCorrectionParameters); + this->SetNthInput(3, m_AcquiCorrectionParameters); m_IsSetAcquiCorrectionParameters = true; this->Modified(); } diff --git a/Code/Wrappers/CommandLine/otbApplicationLauncherCommandLine.cxx b/Code/Wrappers/CommandLine/otbApplicationLauncherCommandLine.cxx index 56d7a85502..35f7b0eed6 100644 --- a/Code/Wrappers/CommandLine/otbApplicationLauncherCommandLine.cxx +++ b/Code/Wrappers/CommandLine/otbApplicationLauncherCommandLine.cxx @@ -177,7 +177,7 @@ int main(int argc, char* argv[]) }*/ std::string strarg (argv[i]); std::cout << strarg << std::endl; - vexp.push_back(strarg); + vexp.push_back(strarg); } } // std::cerr << exp << ":\n"; diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx index fe7d08fd8c..cc85fb6e58 100644 --- a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx +++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx @@ -95,7 +95,7 @@ void CommandLineLauncher::DeleteWatcherList() bool CommandLineLauncher::Load(const std::string & exp) { /*m_Expression = exp; - return this->Load();*/ + return this->Load(); */ return false; } @@ -884,7 +884,7 @@ bool CommandLineLauncher::CheckUnicity() bool CommandLineLauncher::CheckParametersPrefix() { // Check if the chain " --" appears in the args, could be a common mistake - for (std::vector<std::string>::iterator it = m_VExpression.begin() ; it != m_VExpression.end(); ++it) + for (std::vector<std::string>::iterator it = m_VExpression.begin(); it != m_VExpression.end(); ++it) { if (it->find("--") != std::string::npos ) { diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx b/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx index e76b2974c6..df4c449446 100644 --- a/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx +++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx @@ -164,7 +164,7 @@ CommandLineParser::GetPaths( std::vector<std::string> & paths, const std::string return OK; } -CommandLineParser::ParseResultType +CommandLineParser::ParseResultType CommandLineParser::GetModuleName( std::string & modName, std::vector<std::string> & exp ) { itksys::RegularExpression reg; @@ -260,15 +260,15 @@ CommandLineParser::GetAttribut( const std::string & key, std::vector<std::string if (it->find(key) != std::string::npos) { foundKey=true; - std::cout << "foundkey true" << std::endl; + std::cout << "foundkey true" << std::endl; } else { - std::cout << "foundkey false" << std::endl; + std::cout << "foundkey false" << std::endl; } ++it; } - return res; + return res; } std::vector<std::string> @@ -361,7 +361,7 @@ CommandLineParser::GetAttribut( const std::string & key, const std::string & exp return res; } -std::string +std::string CommandLineParser::GetAttributAsString( const std::string & key, std::vector<std::string> & exp ) { std::string res(""); @@ -437,7 +437,7 @@ CommandLineParser::IsAttributExists( const std::string key, const std::string & bool CommandLineParser::IsAttributExists( const std::string key, std::vector<std::string> & exp ) { - for (std::vector<std::string>::iterator it = exp.begin() ; it != exp.end(); ++it) + for (std::vector<std::string>::iterator it = exp.begin(); it != exp.end(); ++it) { if (it->find(key) != std::string::npos) return true; @@ -449,7 +449,7 @@ std::vector<std::string> CommandLineParser::GetKeyList( std::vector<std::string> & exp ) { std::vector<std::string> keyList; - for (std::vector<std::string>::iterator it = exp.begin() ; it != exp.end(); ++it) + for (std::vector<std::string>::iterator it = exp.begin(); it != exp.end(); ++it) { if (it->find("-") == 0 && this->IsAValidKey(*it)) { diff --git a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx index 535875b228..33ce4496f4 100644 --- a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx +++ b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx @@ -130,7 +130,7 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[]) AtmosphericCorrectionParametersType::Pointer dataAtmosphericCorrectionParameters = AtmosphericCorrectionParametersType::New(); - AtmosphericRadiativeTermsType::Pointer dataAtmosphericRadiativeTerms = AtmosphericRadiativeTermsType::New();*/ + AtmosphericRadiativeTermsType::Pointer dataAtmosphericRadiativeTerms = AtmosphericRadiativeTermsType::New(); */ typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms CorrectionParametersToRadiativeTermsType; @@ -210,7 +210,7 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[]) filterAtmosphericCorrectionParametersTo6SRadiativeTerms = RadiometryCorrectionParametersToRadiativeTermsType::New(); filterAtmosphericCorrectionParametersTo6SRadiativeTerms->SetInput(dataAtmosphericCorrectionParameters); - filterAtmosphericCorrectionParametersTo6SRadiativeTerms->Update();*/ + filterAtmosphericCorrectionParametersTo6SRadiativeTerms->Update(); */ paramAcqui->SetSolarZenithalAngle(filterLuminanceToReflectance->GetZenithalSolarAngle()); paramAcqui->SetSolarAzimutalAngle(static_cast<double>(atof(argv[8]))); diff --git a/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx b/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx index ff2e43ef56..1ad9654e4d 100644 --- a/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx +++ b/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx @@ -17,7 +17,7 @@ =========================================================================*/ #include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h" -#include "otbAtmosphericCorrectionParameters.h" +#include "otbAtmosphericCorrectionParameters.h" #include "otbImageMetadataCorrectionParameters.h" #include "otbAtmosphericRadiativeTerms.h" #include <vector> @@ -100,10 +100,10 @@ int otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms(int argc, char functionValues->SetMinSpectralValue(minSpectralValue); functionValues->SetMaxSpectralValue(maxSpectralValue); functionValues->SetUserStep(val); - paramAcqui->SetWavelengthSpectralBandWithIndex(0, functionValues); + paramAcqui->SetWavelengthSpectralBandWithIndex(0, functionValues); // Set parameters - paramAcqui->SetSolarZenithalAngle(static_cast<double>(solarZenithalAngle)); + paramAcqui->SetSolarZenithalAngle(static_cast<double>(solarZenithalAngle)); paramAcqui->SetSolarAzimutalAngle(static_cast<double>(solarAzimutalAngle)); paramAcqui->SetViewingZenithalAngle(static_cast<double>(viewingZenithalAngle)); paramAcqui->SetViewingAzimutalAngle(static_cast<double>(viewingAzimutalAngle)); diff --git a/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx b/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx index 68d5ed5796..52b304b559 100644 --- a/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx +++ b/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx @@ -25,7 +25,7 @@ #include "otbImageFileReader.h" #include "otbImageFileWriter.h" #include "otbAtmosphericRadiativeTerms.h" -#include "otbAtmosphericCorrectionParameters.h" +#include "otbAtmosphericCorrectionParameters.h" #include "itkMetaDataDictionary.h" #include "otbOpticalImageMetadataInterfaceFactory.h" @@ -107,12 +107,12 @@ int otbReflectanceToSurfaceReflectanceImageFilterTest(int itkNotUsed(argc), char writer->Update(); return EXIT_SUCCESS; -} +} //Check the correct generation of the atmospheric parameters int otbReflectanceToSurfaceReflectanceImageFilterTest2(int itkNotUsed(argc), char * argv[]) { - const char * inputFileName = argv[1]; + const char * inputFileName = argv[1]; const char * outputFileName = argv[2]; const unsigned int Dimension = 2; @@ -158,7 +158,7 @@ int otbReflectanceToSurfaceReflectanceImageFilterTest2(int itkNotUsed(argc), cha std::ofstream fout (outputFileName); fout << terms; - fout.close();*/ + fout.close(); */ return EXIT_SUCCESS; } diff --git a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx index 4fbbbd4151..37e22343b2 100644 --- a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx +++ b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx @@ -52,7 +52,7 @@ int otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter(int itkNotUsed(a typedef otb::FilterFunctionValues FilterFunctionValuesType; typedef CorrectionParametersType::AerosolModelType AerosolModelType; typedef FilterFunctionValuesType::WavelengthSpectralBandType ValueType; - typedef FilterFunctionValuesType::ValuesVectorType ValuesVectorType;*/ + typedef FilterFunctionValuesType::ValuesVectorType ValuesVectorType; */ typedef otb::AtmosphericCorrectionParameters AtmoCorrectionParametersType; typedef AtmoCorrectionParametersType::Pointer AtmoCorrectionParametersPointerType; @@ -134,7 +134,7 @@ int otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter(int itkNotUsed(a param->SetWaterVaporAmount(static_cast<double>(waterVaporAmount)); param->SetOzoneAmount(static_cast<double>(ozoneAmount)); param->SetAerosolModel(aerosolModel); - param->SetAerosolOptical(static_cast<double>(aerosolOptical));*/ + param->SetAerosolOptical(static_cast<double>(aerosolOptical)); */ paramAcqui->SetSolarZenithalAngle(solarZenithalAngle); paramAcqui->SetSolarAzimutalAngle(solarAzimutalAngle); diff --git a/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx b/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx index 11c1416099..e1699c2ffd 100644 --- a/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx +++ b/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx @@ -47,7 +47,7 @@ int otbAtmosphericCorrectionsRSRSVMClassifier(int argc, char * argv[]) /*typedef AtmosphericEffectsType::AtmosphericCorrectionParametersType AtmosphericCorrectionParametersType; chris typedef AtmosphericCorrectionParametersType::AerosolModelType AerosolModelType; - typedef AtmosphericCorrectionParametersType::AerosolModelType AerosolModelType;*/ + typedef AtmosphericCorrectionParametersType::AerosolModelType AerosolModelType; */ typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms CorrectionParametersToRadiativeTermsType; @@ -125,7 +125,7 @@ int otbAtmosphericCorrectionsRSRSVMClassifier(int argc, char * argv[]) //Instantiation /*AtmosphericCorrectionParametersType::Pointer chris - dataAtmosphericCorrectionParameters = AtmosphericCorrectionParametersType::New();*/ + dataAtmosphericCorrectionParameters = AtmosphericCorrectionParametersType::New(); */ AcquiCorrectionParametersPointerType paramAcqui = AcquiCorrectionParametersType::New(); AtmoCorrectionParametersPointerType paramAtmo = AtmoCorrectionParametersType::New(); @@ -148,7 +148,7 @@ int otbAtmosphericCorrectionsRSRSVMClassifier(int argc, char * argv[]) AerosolModelType aerosolModel = static_cast<AerosolModelType> (aerosolModelValue); dataAtmosphericCorrectionParameters->SetAerosolModel(aerosolModel); - dataAtmosphericCorrectionParameters->SetAerosolOptical(aerosolOptical);*/ + dataAtmosphericCorrectionParameters->SetAerosolOptical(aerosolOptical); */ paramAcqui->SetSolarZenithalAngle(zenithSolarAngle); paramAcqui->SetSolarAzimutalAngle(azimutSolarAngle); diff --git a/Testing/Code/Simulation/otbAtmosphericEffects.cxx b/Testing/Code/Simulation/otbAtmosphericEffects.cxx index 5c2507c92a..1f45adb92e 100644 --- a/Testing/Code/Simulation/otbAtmosphericEffects.cxx +++ b/Testing/Code/Simulation/otbAtmosphericEffects.cxx @@ -23,7 +23,7 @@ #include "otbAtmosphericEffects.h" #include "otbReduceSpectralResponse.h" -#include "otbAtmosphericCorrectionParameters.h" +#include "otbAtmosphericCorrectionParameters.h" #include "otbImageMetadataCorrectionParameters.h" #include "otbAtmosphericRadiativeTerms.h" -- GitLab