Skip to content
Snippets Groups Projects
Commit 7a83ce93 authored by Guillaume Pasero's avatar Guillaume Pasero
Browse files

COMP: fix some warnings as well, radiometry example still under refactoring to explain new API

parent 6a45a21a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 65 additions and 64 deletions
Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx
+ 1
− 1
View file @ 7a83ce93
......@@ -47,8 +47,8 @@ SurfaceAdjacencyEffectCorrectionSchemeFilter<TInputImage, TOutputImage>
m_IsSetAtmosphericRadiativeTerms(false),
m_IsSetAtmoCorrectionParameters(false),
m_IsSetAcquiCorrectionParameters(false),
m_FunctorParametersHaveBeenComputed(false),
m_WindowRadius(1),
m_FunctorParametersHaveBeenComputed(false),
m_PixelSpacingInKilometers(1.),
m_ZenithalViewingAngle(361.)
{
......
Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
+ 1
− 1
View file @ 7a83ce93
......@@ -58,7 +58,7 @@ namespace Wrapper
{
CommandLineLauncher::CommandLineLauncher() :
/*m_Expression(""),*/ m_WatcherList(), m_ReportProgress(true), m_MaxKeySize(0),m_VExpression()
/*m_Expression(""),*/m_VExpression(), m_WatcherList(), m_ReportProgress(true), m_MaxKeySize(0)
{
m_Application = NULL;
m_Parser = CommandLineParser::New();
......
Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
+ 45
− 44
View file @ 7a83ce93
......@@ -58,7 +58,7 @@
#include "otbImageToLuminanceImageFilter.h"
#include "otbLuminanceToReflectanceImageFilter.h"
#include "otbReflectanceToSurfaceReflectanceImageFilter.h"
#include "otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.h"
#include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h"
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
......@@ -71,7 +71,8 @@
// Software Guide : BeginCodeSnippet
#include "otbAtmosphericCorrectionParameters.h"
#include "otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h"
#include "otbImageMetadataCorrectionParameters.h"
#include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
#include "otbAtmosphericRadiativeTerms.h"
// Software Guide : EndCodeSnippet
......@@ -265,17 +266,17 @@ int main(int argc, char *argv[])
//-------------------------------
// Software Guide : BeginLatex
//
// TODO : need an update
// At this step of the chain, radiometric informations are nedeed. Those informations
// will be computed from different parameters stored in a
// \doxygen{otb}{AtmosphericCorrectionParameters} class intance.
// This {\em container} will be given to an
// \doxygen{otb}{AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms}
// \doxygen{otb}{RadiometryCorrectionParametersToAtmosphericRadiativeTerms}
// class instance which will call a 6S routine that will compute the needed
// radiometric informations and store them in a
// \doxygen{otb}{AtmosphericRadiativeTerms} class instance.
// For this,
// \doxygen{otb}{AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms}
// \doxygen{otb}{RadiometryCorrectionParametersToAtmosphericRadiativeTerms}
// \doxygen{otb}{AtmosphericCorrectionParameters} and
// \doxygen{otb}{AtmosphericRadiativeTerms}
// types are defined and instancied.
......@@ -283,12 +284,15 @@ int main(int argc, char *argv[])
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
typedef otb::AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
AtmosphericCorrectionParametersTo6SRadiativeTermsType;
typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms
RadiometryCorrectionParametersToRadiativeTermsType;
typedef otb::AtmosphericCorrectionParameters
AtmosphericCorrectionParametersType;
typedef otb::ImageMetadataCorrectionParameters
AcquisitionCorrectionParametersType;
typedef otb::AtmosphericRadiativeTerms
AtmosphericRadiativeTermsType;
// Software Guide : EndCodeSnippet
......@@ -302,6 +306,9 @@ int main(int argc, char *argv[])
AtmosphericCorrectionParametersType::Pointer
dataAtmosphericCorrectionParameters =
AtmosphericCorrectionParametersType::New();
AcquisitionCorrectionParametersType::Pointer
dataAcquisitionCorrectionParameters =
AcquisitionCorrectionParametersType::New();
AtmosphericRadiativeTermsType::Pointer dataAtmosphericRadiativeTerms =
AtmosphericRadiativeTermsType::New();
......@@ -336,7 +343,7 @@ int main(int argc, char *argv[])
functionValues->SetMinSpectralValue(minSpectralValue);
functionValues->SetMaxSpectralValue(maxSpectralValue);
functionValues->SetUserStep(userStep);
dataAtmosphericCorrectionParameters->SetWavelengthSpectralBandWithIndex(
dataAcquisitionCorrectionParameters->SetWavelengthSpectralBandWithIndex(
i,
functionValues);
}
......@@ -344,7 +351,7 @@ int main(int argc, char *argv[])
fin.close();
// Software Guide : BeginLatex
//
// TODO : need an update
// The \doxygen{otb}{AtmosphericCorrectionParameters} class needs several parameters :
// \begin{itemize}
// \item The zenithal and azimutal solar angles that describe the solar incidence
......@@ -370,21 +377,21 @@ int main(int argc, char *argv[])
// Set parameters
// Software Guide : BeginCodeSnippet
dataAtmosphericCorrectionParameters->SetSolarZenithalAngle(
dataAcquisitionCorrectionParameters->SetSolarZenithalAngle(
static_cast<double>(atof(argv[6])));
dataAtmosphericCorrectionParameters->SetSolarAzimutalAngle(
dataAcquisitionCorrectionParameters->SetSolarAzimutalAngle(
static_cast<double>(atof(argv[9])));
dataAtmosphericCorrectionParameters->SetViewingZenithalAngle(
dataAcquisitionCorrectionParameters->SetViewingZenithalAngle(
static_cast<double>(atof(argv[10])));
dataAtmosphericCorrectionParameters->SetViewingAzimutalAngle(
dataAcquisitionCorrectionParameters->SetViewingAzimutalAngle(
static_cast<double>(atof(argv[11])));
dataAtmosphericCorrectionParameters->SetMonth(atoi(argv[8]));
dataAcquisitionCorrectionParameters->SetMonth(atoi(argv[8]));
dataAtmosphericCorrectionParameters->SetDay(atoi(argv[7]));
dataAcquisitionCorrectionParameters->SetDay(atoi(argv[7]));
dataAtmosphericCorrectionParameters->SetAtmosphericPressure(
static_cast<double>(atof(argv[12])));
......@@ -408,20 +415,16 @@ int main(int argc, char *argv[])
//
// Once those parameters are loaded and stored in the AtmosphericCorrectionParameters
// instance class, it is given in input of an instance of
// AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms that will compute
// RadiometryCorrectionParametersToAtmosphericRadiativeTerms that will compute
// the needed radiometric informations.
//
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
AtmosphericCorrectionParametersTo6SRadiativeTermsType::Pointer
filterAtmosphericCorrectionParametersTo6SRadiativeTerms =
AtmosphericCorrectionParametersTo6SRadiativeTermsType::New();
filterAtmosphericCorrectionParametersTo6SRadiativeTerms->SetInput(
dataAtmosphericCorrectionParameters);
filterAtmosphericCorrectionParametersTo6SRadiativeTerms->Update();
AtmosphericRadiativeTermsType::Pointer atmosphericRadiativeTerms =
RadiometryCorrectionParametersToRadiativeTermsType::Compute(
dataAtmosphericCorrectionParameters,
dataAcquisitionCorrectionParameters);
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
......@@ -481,20 +484,19 @@ int main(int argc, char *argv[])
// \item $T(\mu_{S})$ is the downward transmittance;
// \item $T(\mu_{V})$ is the upward transmittance.
// \end{itemize}
// All those parameters are contained in the AtmosphericCorrectionParametersTo6SRadiativeTerms
// All those parameters are contained in the RadiometryCorrectionParametersToRadiativeTerms
// output.
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
filterReflectanceToSurfaceReflectanceImageFilter->
SetAtmosphericRadiativeTerms(
filterAtmosphericCorrectionParametersTo6SRadiativeTerms->GetOutput());
SetAtmosphericRadiativeTerms(atmosphericRadiativeTerms);
// Software Guide : EndCodeSnippet
//-------------------------------
// Software Guide : BeginLatex
// Next (and last step) is the neighborhood correction.
// For this, the SurfaceAdjacencyEffect6SCorrectionSchemeFilter class is used.
// For this, the SurfaceAdjacencyEffectCorrectionSchemeFilter class is used.
// The previous surface reflectance inversion is performed under the assumption of a
// homogeneous ground environment. The following step allows to correct the adjacency
// effect on the radiometry of pixels. The method is based on the decomposition of
......@@ -525,37 +527,36 @@ int main(int argc, char *argv[])
// \end{itemize}
// \end{itemize}
// The neighborhood consideration window size is given by the window radius.
// An instance of \doxygen{otb}{SurfaceAdjacencyEffect6SCorrectionSchemeFilter} is created.
// An instance of \doxygen{otb}{SurfaceAdjacencyEffectCorrectionSchemeFilter} is created.
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
typedef otb::SurfaceAdjacencyEffect6SCorrectionSchemeFilter<ImageType,
typedef otb::SurfaceAdjacencyEffectCorrectionSchemeFilter<ImageType,
ImageType>
SurfaceAdjacencyEffect6SCorrectionSchemeFilterType;
SurfaceAdjacencyEffect6SCorrectionSchemeFilterType::Pointer
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter
= SurfaceAdjacencyEffect6SCorrectionSchemeFilterType::New();
SurfaceAdjacencyEffectCorrectionSchemeFilterType;
SurfaceAdjacencyEffectCorrectionSchemeFilterType::Pointer
filterSurfaceAdjacencyEffectCorrectionSchemeFilter
= SurfaceAdjacencyEffectCorrectionSchemeFilterType::New();
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
//
// The needs four input informations:
// \begin{itemize}
// \item Radiometric informations (the output of the AtmosphericCorrectionParametersTo6SRadiativeTerms filter);
// \item Radiometric informations (the output of the RadiometryCorrectionParametersToRadiativeTerms filter);
// \item The zenithal viewing angle;
// \item The neighborhood window radius;
// \item The pixel spacing in kilometers.
// \end{itemize}
//
// Software Guide : EndLatex
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->
SetAtmosphericRadiativeTerms(
filterAtmosphericCorrectionParametersTo6SRadiativeTerms->GetOutput());
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->SetZenithalViewingAngle(
dataAtmosphericCorrectionParameters->GetViewingZenithalAngle());
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->SetWindowRadius(atoi(argv
filterSurfaceAdjacencyEffectCorrectionSchemeFilter->
SetAtmosphericRadiativeTerms(atmosphericRadiativeTerms);
filterSurfaceAdjacencyEffectCorrectionSchemeFilter->SetZenithalViewingAngle(
dataAcquisitionCorrectionParameters->GetViewingZenithalAngle());
filterSurfaceAdjacencyEffectCorrectionSchemeFilter->SetWindowRadius(atoi(argv
[17]));
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->
filterSurfaceAdjacencyEffectCorrectionSchemeFilter->
SetPixelSpacingInKilometers(static_cast<double>(atof(argv[18])));
//-------------------------------
......@@ -575,11 +576,11 @@ int main(int argc, char *argv[])
filterLuminanceToReflectance->SetInput(filterImageToLuminance->GetOutput());
filterReflectanceToSurfaceReflectanceImageFilter->SetInput(
filterLuminanceToReflectance->GetOutput());
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->SetInput(
filterSurfaceAdjacencyEffectCorrectionSchemeFilter->SetInput(
filterReflectanceToSurfaceReflectanceImageFilter->GetOutput());
writer->SetInput(
filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->GetOutput());
filterSurfaceAdjacencyEffectCorrectionSchemeFilter->GetOutput());
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
......
Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
+ 4
− 4
View file @ 7a83ce93
......@@ -135,21 +135,21 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[])
typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms CorrectionParametersToRadiativeTermsType;
typedef otb::AtmosphericCorrectionParameters AtmoCorrectionParametersType;
typedef typename AtmoCorrectionParametersType::Pointer AtmoCorrectionParametersPointerType;
typedef AtmoCorrectionParametersType::Pointer AtmoCorrectionParametersPointerType;
typedef AtmoCorrectionParametersType::AerosolModelType AerosolModelType;
typedef otb::ImageMetadataCorrectionParameters AcquiCorrectionParametersType;
typedef typename AcquiCorrectionParametersType::Pointer AcquiCorrectionParametersPointerType;
typedef AcquiCorrectionParametersType::Pointer AcquiCorrectionParametersPointerType;
typedef otb::AtmosphericRadiativeTerms AtmosphericRadiativeTermsType;
typedef typename AtmosphericRadiativeTermsType::Pointer AtmosphericRadiativeTermsPointerType;
typedef AtmosphericRadiativeTermsType::Pointer AtmosphericRadiativeTermsPointerType;
typedef otb::AtmosphericRadiativeTerms::DataVectorType DataVectorType;
typedef otb::FilterFunctionValues FilterFunctionValuesType;
typedef FilterFunctionValuesType::WavelengthSpectralBandType ValueType; //float
typedef FilterFunctionValuesType::ValuesVectorType ValuesVectorType; //std::vector<float>
typedef typename AcquiCorrectionParametersType::WavelengthSpectralBandVectorType WavelengthSpectralBandVectorType;
typedef AcquiCorrectionParametersType::WavelengthSpectralBandVectorType WavelengthSpectralBandVectorType;
AcquiCorrectionParametersPointerType paramAcqui = AcquiCorrectionParametersType::New();
AtmoCorrectionParametersPointerType paramAtmo = AtmoCorrectionParametersType::New();
......
Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
+ 4
− 4
View file @ 7a83ce93
......@@ -55,21 +55,21 @@ int otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter(int itkNotUsed(a
typedef FilterFunctionValuesType::ValuesVectorType ValuesVectorType;*/
typedef otb::AtmosphericCorrectionParameters AtmoCorrectionParametersType;
typedef typename AtmoCorrectionParametersType::Pointer AtmoCorrectionParametersPointerType;
typedef AtmoCorrectionParametersType::Pointer AtmoCorrectionParametersPointerType;
typedef AtmoCorrectionParametersType::AerosolModelType AerosolModelType;
typedef otb::ImageMetadataCorrectionParameters AcquiCorrectionParametersType;
typedef typename AcquiCorrectionParametersType::Pointer AcquiCorrectionParametersPointerType;
typedef AcquiCorrectionParametersType::Pointer AcquiCorrectionParametersPointerType;
typedef otb::AtmosphericRadiativeTerms AtmosphericRadiativeTermsType;
typedef typename AtmosphericRadiativeTermsType::Pointer AtmosphericRadiativeTermsPointerType;
typedef AtmosphericRadiativeTermsType::Pointer AtmosphericRadiativeTermsPointerType;
typedef otb::AtmosphericRadiativeTerms::DataVectorType DataVectorType;
typedef otb::FilterFunctionValues FilterFunctionValuesType;
typedef FilterFunctionValuesType::WavelengthSpectralBandType ValueType; //float
typedef FilterFunctionValuesType::ValuesVectorType ValuesVectorType; //std::vector<float>
typedef typename AcquiCorrectionParametersType::WavelengthSpectralBandVectorType WavelengthSpectralBandVectorType;
typedef AcquiCorrectionParametersType::WavelengthSpectralBandVectorType WavelengthSpectralBandVectorType;
......
Testing/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx
+ 4
− 4
View file @ 7a83ce93
......@@ -49,21 +49,21 @@ int otbSurfaceAdjacencyEffectCorrectionSchemeFilter(int argc, char * argv[])
typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms CorrectionParametersToRadiativeTermsType;
typedef otb::AtmosphericCorrectionParameters AtmoCorrectionParametersType;
typedef typename AtmoCorrectionParametersType::Pointer AtmoCorrectionParametersPointerType;
typedef AtmoCorrectionParametersType::Pointer AtmoCorrectionParametersPointerType;
typedef AtmoCorrectionParametersType::AerosolModelType AerosolModelType;
typedef otb::ImageMetadataCorrectionParameters AcquiCorrectionParametersType;
typedef typename AcquiCorrectionParametersType::Pointer AcquiCorrectionParametersPointerType;
typedef AcquiCorrectionParametersType::Pointer AcquiCorrectionParametersPointerType;
typedef otb::AtmosphericRadiativeTerms AtmosphericRadiativeTermsType;
typedef typename AtmosphericRadiativeTermsType::Pointer AtmosphericRadiativeTermsPointerType;
typedef AtmosphericRadiativeTermsType::Pointer AtmosphericRadiativeTermsPointerType;
typedef otb::AtmosphericRadiativeTerms::DataVectorType DataVectorType;
typedef otb::FilterFunctionValues FilterFunctionValuesType;
typedef FilterFunctionValuesType::WavelengthSpectralBandType ValueType; //float
typedef FilterFunctionValuesType::ValuesVectorType ValuesVectorType; //std::vector<float>
typedef typename AcquiCorrectionParametersType::WavelengthSpectralBandVectorType WavelengthSpectralBandVectorType;
typedef AcquiCorrectionParametersType::WavelengthSpectralBandVectorType WavelengthSpectralBandVectorType;
AcquiCorrectionParametersPointerType paramAcqui = AcquiCorrectionParametersType::New();
......
Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
+ 3
− 3
View file @ 7a83ce93
......@@ -53,15 +53,15 @@ int otbAtmosphericCorrectionsRSRSVMClassifier(int argc, char * argv[])
typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms CorrectionParametersToRadiativeTermsType;
typedef otb::AtmosphericCorrectionParameters AtmoCorrectionParametersType;
typedef typename AtmoCorrectionParametersType::Pointer AtmoCorrectionParametersPointerType;
typedef AtmoCorrectionParametersType::Pointer AtmoCorrectionParametersPointerType;
typedef AtmoCorrectionParametersType::AerosolModelType AerosolModelType;
typedef otb::ImageMetadataCorrectionParameters AcquiCorrectionParametersType;
typedef typename AcquiCorrectionParametersType::Pointer AcquiCorrectionParametersPointerType;
typedef AcquiCorrectionParametersType::Pointer AcquiCorrectionParametersPointerType;
typedef otb::AtmosphericRadiativeTerms AtmosphericRadiativeTermsType;
typedef typename AtmosphericRadiativeTermsType::Pointer AtmosphericRadiativeTermsPointerType;
typedef AtmosphericRadiativeTermsType::Pointer AtmosphericRadiativeTermsPointerType;
typedef itk::VariableLengthVector<double> SampleType;
......
Testing/Code/Simulation/otbAtmosphericEffects.cxx
+ 3
− 3
View file @ 7a83ce93
......@@ -42,15 +42,15 @@ int otbAtmosphericEffects(int argc, char * argv[])
typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms CorrectionParametersToRadiativeTermsType;
typedef otb::AtmosphericCorrectionParameters AtmoCorrectionParametersType;
typedef typename AtmoCorrectionParametersType::Pointer AtmoCorrectionParametersPointerType;
typedef AtmoCorrectionParametersType::Pointer AtmoCorrectionParametersPointerType;
typedef AtmoCorrectionParametersType::AerosolModelType AerosolModelType;
typedef otb::ImageMetadataCorrectionParameters AcquiCorrectionParametersType;
typedef typename AcquiCorrectionParametersType::Pointer AcquiCorrectionParametersPointerType;
typedef AcquiCorrectionParametersType::Pointer AcquiCorrectionParametersPointerType;
typedef otb::AtmosphericRadiativeTerms AtmosphericRadiativeTermsType;
typedef typename AtmosphericRadiativeTermsType::Pointer AtmosphericRadiativeTermsPointerType;
typedef AtmosphericRadiativeTermsType::Pointer AtmosphericRadiativeTermsPointerType;
......
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