Commit 8701d5ad authored by Guillaume Pasero's avatar Guillaume Pasero

Synchronize develop with 'release-5.6'

parents 9225132b 43c7a996
......@@ -15,10 +15,13 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef otbGeometriesToGeometriesFilter_txx
#define otbGeometriesToGeometriesFilter_txx
/*===========================================================================*/
/*===============================[ Includes ]================================*/
/*===========================================================================*/
#include "otbGeometriesToGeometriesFilter.h"
/*===========================================================================*/
/*==================[ DefaultGeometriesToGeometriesFilter ]==================*/
......@@ -111,3 +114,5 @@ void otb::TransformationFunctorDispatcher<TransformationFunctor,OGRGeometry,Fiel
inout.SetFeature(feat);
}
}
#endif
......@@ -24,6 +24,8 @@
#ifndef otbOGRDataSourceWrapper_txx
#define otbOGRDataSourceWrapper_txx
#include "otbOGRDataSourceWrapper.h"
/*===========================================================================*/
/*===============================[ Includes ]================================*/
/*===========================================================================*/
......
......@@ -21,6 +21,7 @@
/*===========================================================================*/
/*===============================[ Includes ]================================*/
/*===========================================================================*/
#include "otbOGRFeatureWrapper.h"
#include <cassert>
#include <boost/version.hpp>
#if BOOST_VERSION >= 104800
......
......@@ -153,7 +153,7 @@ private:
"- d is the earth-sun distance (in astronomical units) and depends on the acquisition's day and month \n"
"- ESUN(b) is the mean TOA solar irradiance (or solar illumination) in W/m2/micrometers\n"
"- θ is the solar zenith angle in degrees. \n"
"Note that the application asks for the solar elevation angle, and will perfom the conversion to the zenith angle itself (ze. angle = 90° - el. angle).\n"
"Note that the application asks for the solar elevation angle, and will perfom the conversion to the zenith angle itself (zenith_angle = 90 - elevation_angle , units : degrees).\n"
"Note also that ESUN(b) not only depends on the band b, but also on the spectral sensitivity of the sensor in this particular band. "
"In other words, the influence of spectral sensitivities is included within the ESUN different values.\n"
"These values are provided by the user thanks to a txt file following the same convention as before.\n"
......@@ -247,13 +247,13 @@ private:
AddParameter(ParameterType_Group,"acqui.sun","Sun angles");
SetParameterDescription("acqui.sun","This group contains the sun angles");
//Sun elevation angle
AddParameter(ParameterType_Float, "acqui.sun.elev", "Sun elevation angle (°)");
AddParameter(ParameterType_Float, "acqui.sun.elev", "Sun elevation angle (deg)");
SetParameterDescription("acqui.sun.elev", "Sun elevation angle (in degrees)");
SetMinimumParameterFloatValue("acqui.sun.elev", 0.);
SetMaximumParameterFloatValue("acqui.sun.elev", 120.);
SetDefaultParameterFloat("acqui.sun.elev",90.0);
//Sun azimuth angle
AddParameter(ParameterType_Float, "acqui.sun.azim", "Sun azimuth angle (°)");
AddParameter(ParameterType_Float, "acqui.sun.azim", "Sun azimuth angle (deg)");
SetParameterDescription("acqui.sun.azim", "Sun azimuth angle (in degrees)");
SetMinimumParameterFloatValue("acqui.sun.azim", 0.);
SetMaximumParameterFloatValue("acqui.sun.azim", 360.);
......@@ -262,13 +262,13 @@ private:
AddParameter(ParameterType_Group,"acqui.view","Viewing angles");
SetParameterDescription("acqui.view","This group contains the sensor viewing angles");
//Viewing elevation angle
AddParameter(ParameterType_Float, "acqui.view.elev", "Viewing elevation angle (°)");
AddParameter(ParameterType_Float, "acqui.view.elev", "Viewing elevation angle (deg)");
SetParameterDescription("acqui.view.elev", "Viewing elevation angle (in degrees)");
SetMinimumParameterFloatValue("acqui.view.elev", 0.);
SetMaximumParameterFloatValue("acqui.view.elev", 120.);
SetDefaultParameterFloat("acqui.view.elev",90.0);
//Viewing azimuth angle
AddParameter(ParameterType_Float, "acqui.view.azim", "Viewing azimuth angle (°)");
AddParameter(ParameterType_Float, "acqui.view.azim", "Viewing azimuth angle (deg)");
SetParameterDescription("acqui.view.azim", "Viewing azimuth angle (in degrees)");
SetMinimumParameterFloatValue("acqui.view.azim", 0.);
SetMaximumParameterFloatValue("acqui.view.azim", 360.);
......
......@@ -51,7 +51,7 @@ private:
SetDocLongDescription("This application gives, for each pixel, the power that would have been received by a SAR system with a basis different from the classical (H,V) one (polarimetric synthetis).\n"
"The new basis A and B are indicated through two Jones vectors, defined by the user thanks to orientation (psi) and ellipticity (khi) parameters.\n"
"These parameters are namely psii, khii, psir and khir. The suffixes (i) and (r) refer to the transmiting antenna and the receiving antenna respectively.\n"
"Orientations and ellipticities are given in degrees, and are between -90°/90° and -45°/45° respectively.\n "
"Orientations and ellipticities are given in degrees, and are between -90/90 degrees and -45/45 degrees respectively.\n "
"\n"
"Four polarization architectures can be processed : \n"
"1) HH_HV_VH_VV : full polarization, general bistatic case.\n"
......@@ -66,10 +66,10 @@ private:
"2) Concerning HH_HV_VV and HH_VH_VV architectures, both correspond to a three channels image. But they are processed in the same way, as the Sinclair matrix is symmetric in the monostatic case.\n"
"3) Finally, the two last architectures (dual polarizations), can't be distinguished only by the number of bands of the input image.\n"
" User must then use the parameters emissionh and emissionv to indicate the architecture of the system : emissionh=1 and emissionv=0 --> HH_HV, emissionh=0 and emissionv=1 --> VH_VV.\n"
"Note : if the architecture is HH_HV, khii and psii are automatically set to 0°/0°; if the architecture is VH_VV, khii and psii are automatically set to 0°/90°.\n"
"Note : if the architecture is HH_HV, khii and psii are automatically both set to 0 degree; if the architecture is VH_VV, khii and psii are automatically set to 0 degree and 90 degrees respectively.\n"
"\n"
"It is also possible to force the calculation to co-polar or cross-polar modes.\n"
"In the co-polar case, values for psir and khir will be ignored and forced to psii and khii; same as the cross-polar mode, where khir and psir will be forced to psii+90° and -khii.\n"
"In the co-polar case, values for psir and khir will be ignored and forced to psii and khii; same as the cross-polar mode, where khir and psir will be forced to (psii + 90 degrees) and -khii.\n"
"\n"
"Finally, the result of the polarimetric synthetis is expressed in the power domain, through a one-band scalar image.\n"
"Note: this application doesn't take into account the terms which do not depend on the polarization of the antennas. \n"
......
......@@ -19,6 +19,7 @@
#ifndef otbRGBAPixelConverter_txx
#define otbRGBAPixelConverter_txx
#include "otbRGBAPixelConverter.h"
namespace otb
{
......
......@@ -17,7 +17,7 @@
=========================================================================*/
#ifndef otbBSplineInterpolateImageFunction_txx
#define otbBSplineInterpolateImageFunction_txx
#include "itkBSplineInterpolateImageFunction.h"
#include "otbBSplineInterpolateImageFunction.h"
#include "itkImageLinearIteratorWithIndex.h"
#include "itkImageRegionConstIteratorWithIndex.h"
#include "itkImageRegionIterator.h"
......
......@@ -18,6 +18,7 @@
#ifndef otbImageList_txx
#define otbImageList_txx
#include "otbImageList.h"
#include "otbMacro.h"
namespace otb
......
......@@ -20,6 +20,7 @@
#ifndef otbKullbackLeiblerDistanceImageFilter_txx
#define otbKullbackLeiblerDistanceImageFilter_txx
#include "otbKullbackLeiblerDistanceImageFilter.h"
#include <vector>
#include "itkImageRegionConstIterator.h"
......
......@@ -21,6 +21,7 @@
#ifndef otbGaborFilterGenerator_txx
#define otbGaborFilterGenerator_txx
#include "otbGaborFilterGenerator.h"
#include "otbMath.h"
namespace otb
......
......@@ -21,6 +21,7 @@
#ifndef otbEuclideanDistanceMetricWithMissingValuePow2_txx
#define otbEuclideanDistanceMetricWithMissingValuePow2_txx
#include "otbEuclideanDistanceMetricWithMissingValuePow2.h"
#include "itkMeasurementVectorTraits.h"
namespace otb {
......
......@@ -21,6 +21,7 @@
#ifndef otbFlexibleDistanceWithMissingValue_txx
#define otbFlexibleDistanceWithMissingValue_txx
#include "otbFlexibleDistanceWithMissingValue.h"
#include "itkNumericTraits.h"
namespace otb {
......
......@@ -18,6 +18,7 @@
#ifndef otbStreamingResampleImageFilter_txx
#define otbStreamingResampleImageFilter_txx
#include "otbStreamingResampleImageFilter.h"
#include "itkProgressAccumulator.h"
namespace otb
......
......@@ -18,7 +18,7 @@
#ifndef otbCompacityPathFunction_txx
#define otbCompacityPathFunction_txx
#include "otbPathFunction.h"
#include "otbCompacityPathFunction.h"
#include "itkNumericTraits.h"
#include "otbMacro.h"
#include "otbMath.h"
......
......@@ -18,6 +18,7 @@
#ifndef otbOrientationPathFunction_txx
#define otbOrientationPathFunction_txx
#include "otbOrientationPathFunction.h"
#include "otbPathFunction.h"
#include "itkNumericTraits.h"
#include "otbMacro.h"
......
......@@ -16,8 +16,8 @@
=========================================================================*/
#ifndef __MuellerToPolarisationDegreeAndPowerImageFilter_h
#define __MuellerToPolarisationDegreeAndPowerImageFilter_h
#ifndef otbMuellerToPolarisationDegreeAndPowerImageFilter_h
#define otbMuellerToPolarisationDegreeAndPowerImageFilter_h
#include "otbUnaryFunctorImageFilter.h"
#include "itkNumericTraits.h"
......
......@@ -16,8 +16,8 @@
=========================================================================*/
#ifndef __MuellerToReciprocalCovarianceImageFilter_h
#define __MuellerToReciprocalCovarianceImageFilter_h
#ifndef otbMuellerToReciprocalCovarianceImageFilter_h
#define otbMuellerToReciprocalCovarianceImageFilter_h
#include "otbUnaryFunctorImageFilter.h"
......
......@@ -16,8 +16,8 @@
=========================================================================*/
#ifndef __ReciprocalBarnesDecompImageFilter_h
#define __ReciprocalBarnesDecompImageFilter_h
#ifndef otbReciprocalBarnesDecompImageFilter_h
#define otbReciprocalBarnesDecompImageFilter_h
#include "otbUnaryFunctorImageFilter.h"
#include "otbMath.h"
......
......@@ -16,8 +16,8 @@
=========================================================================*/
#ifndef __ReciprocalCoherencyToReciprocalMuellerImageFilter_h
#define __ReciprocalCoherencyToReciprocalMuellerImageFilter_h
#ifndef otbReciprocalCoherencyToReciprocalMuellerImageFilter_h
#define otbReciprocalCoherencyToReciprocalMuellerImageFilter_h
#include "otbUnaryFunctorImageFilter.h"
......
......@@ -16,8 +16,8 @@
=========================================================================*/
#ifndef __ReciprocalCovarianceToCoherencyDegreeImageFilter_h
#define __ReciprocalCovarianceToCoherencyDegreeImageFilter_h
#ifndef otbReciprocalCovarianceToCoherencyDegreeImageFilter_h
#define otbReciprocalCovarianceToCoherencyDegreeImageFilter_h
#include "otbUnaryFunctorImageFilter.h"
......
......@@ -16,8 +16,8 @@
=========================================================================*/
#ifndef __ReciprocalCovarianceToReciprocalCoherencyImageFilter_h
#define __ReciprocalCovarianceToReciprocalCoherencyImageFilter_h
#ifndef otbReciprocalCovarianceToReciprocalCoherencyImageFilter_h
#define otbReciprocalCovarianceToReciprocalCoherencyImageFilter_h
#include "otbUnaryFunctorImageFilter.h"
......
......@@ -16,8 +16,8 @@
=========================================================================*/
#ifndef __ReciprocalHAlphaImageFilter_h
#define __ReciprocalHAlphaImageFilter_h
#ifndef otbReciprocalHAlphaImageFilter_h
#define otbReciprocalHAlphaImageFilter_h
#include "otbUnaryFunctorImageFilter.h"
#include "otbMath.h"
......
......@@ -16,8 +16,8 @@
=========================================================================*/
#ifndef __ReciprocalHuynenDecompImageFilter_h
#define __ReciprocalHuynenDecompImageFilter_h
#ifndef otbReciprocalHuynenDecompImageFilter_h
#define otbReciprocalHuynenDecompImageFilter_h
#include "otbUnaryFunctorImageFilter.h"
......
......@@ -16,8 +16,8 @@
=========================================================================*/
#ifndef __ReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter_h
#define __ReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter_h
#ifndef otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter_h
#define otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter_h
#include "itkUnaryFunctorImageFilter.h"
#include "vcl_complex.h"
......
......@@ -16,8 +16,8 @@
=========================================================================*/
#ifndef __ReciprocalPauliDecompImageFilter_h
#define __ReciprocalPauliDecompImageFilter_h
#ifndef otbReciprocalPauliDecompImageFilter_h
#define otbReciprocalPauliDecompImageFilter_h
#include "otbUnaryFunctorImageFilter.h"
......
......@@ -15,6 +15,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef otbGeometriesProjectionFilter_txx
#define otbGeometriesProjectionFilter_txx
/*===========================================================================*/
/*===============================[ Includes ]================================*/
......@@ -97,3 +99,5 @@ void otb::GeometriesProjectionFilter::SetOutputKeywordList(const ImageKeywordlis
this->m_OutputKeywordList = kwl;
this->Modified();
}
#endif
......@@ -18,6 +18,8 @@
#ifndef otbMapProjectionDeprecated_txx
#define otbMapProjectionDeprecated_txx
#include "otbMapProjectionDeprecated.h"
namespace otb
{
......
......@@ -15,9 +15,6 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPleiadesPToXSAffineTransformCalculator__cxx
#define __otbPleiadesPToXSAffineTransformCalculator__cxx
#include "otbPleiadesPToXSAffineTransformCalculator.h"
#include "otbPleiadesImageMetadataInterface.h"
#include "otbDateTimeAdapter.h"
......@@ -199,7 +196,3 @@ PleiadesPToXSAffineTransformCalculator
}
} // End namespace otb
#endif
......@@ -15,8 +15,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __MeanShiftSmoothingImageFilter_h
#define __MeanShiftSmoothingImageFilter_h
#ifndef otbMeanShiftSmoothingImageFilter_h
#define otbMeanShiftSmoothingImageFilter_h
#include "otbImage.h"
#include "otbVectorImage.h"
......
......@@ -21,6 +21,7 @@
#ifndef otbListSampleToHistogramListGenerator_txx
#define otbListSampleToHistogramListGenerator_txx
#include "otbListSampleToHistogramListGenerator.h"
#include "itkArray.h"
#include "otbMacro.h"
......
......@@ -21,6 +21,7 @@
#ifndef otbListSampleToVariableDimensionHistogramGenerator_txx
#define otbListSampleToVariableDimensionHistogramGenerator_txx
#include "otbListSampleToVariableDimensionHistogramGenerator.h"
#include "otbMacro.h"
#include "itkStatisticsAlgorithm.h"
......
......@@ -15,8 +15,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPatternSampler_h
#define __otbPatternSampler_h
#ifndef otbPatternSampler_h
#define otbPatternSampler_h
#include "otbSamplerBase.h"
......
......@@ -15,8 +15,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPeriodicSampler_h
#define __otbPeriodicSampler_h
#ifndef otbPeriodicSampler_h
#define otbPeriodicSampler_h
#include "otbSamplerBase.h"
......
......@@ -15,8 +15,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbRandomSampler_h
#define __otbRandomSampler_h
#ifndef otbRandomSampler_h
#define otbRandomSampler_h
#include "otbSamplerBase.h"
......
......@@ -15,8 +15,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbSamplerBase_h
#define __otbSamplerBase_h
#ifndef otbSamplerBase_h
#define otbSamplerBase_h
#include "itkObject.h"
#include "itkObjectFactory.h"
......
......@@ -15,9 +15,6 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbOGRVectorDataIO_txx
#define __otbOGRVectorDataIO_txx
#include "otbOGRVectorDataIO.h"
#include "ogrsf_frmts.h"
......@@ -336,5 +333,3 @@ OGRVectorDataIO::GetOGRDriverName(std::string name) const
}
} // end namespace otb
#endif
......@@ -15,9 +15,6 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbTileMapImageIOHelper_cxx
#define __otbTileMapImageIOHelper_cxx
#include "otbTileMapImageIOHelper.h"
namespace otb
{
......@@ -94,5 +91,3 @@ const std::string TileMapImageIOHelper::ConvertDepthToScale(const unsigned int d
}
} // end namespace otb
#endif
......@@ -15,7 +15,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef otbScalarBufferToImageFileWriter_txx
#define otbScalarBufferToImageFileWriter_txx
#include "otbMacro.h"
......@@ -122,3 +123,4 @@ ScalarBufferToImageFileWriter<TBufferType, TOutputPixelType>
} // end namespace otb
#endif
......@@ -18,6 +18,7 @@
#ifndef otbSOMActivationBuilder_txx
#define otbSOMActivationBuilder_txx
#include "otbSOMActivationBuilder.h"
#include "itkImageRegionIterator.h"
namespace otb
......
......@@ -21,6 +21,7 @@ See IMTCopyright.txt for details.
#ifndef otbSOMMap_txx
#define otbSOMMap_txx
#include "otbSOMMap.h"
#include "itkImageRegionIteratorWithIndex.h"
namespace otb
......
......@@ -21,7 +21,7 @@
#ifndef otbSOMbasedImageFilter_txx
#define otbSOMbasedImageFilter_txx
#include "otbSOMbasedImageFilter.txx"
#include "otbSOMbasedImageFilter.h"
namespace otb {
......
......@@ -15,8 +15,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageSampleExtractorFilter_h
#define __otbImageSampleExtractorFilter_h
#ifndef otbImageSampleExtractorFilter_h
#define otbImageSampleExtractorFilter_h
#include "otbPersistentSamplingFilterBase.h"
#include "otbPersistentFilterStreamingDecorator.h"
......
......@@ -15,9 +15,10 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageSampleExtractorFilter_txx
#define __otbImageSampleExtractorFilter_txx
#ifndef otbImageSampleExtractorFilter_txx
#define otbImageSampleExtractorFilter_txx
#include "otbImageSampleExtractorFilter.h"
#include "itkDefaultConvertPixelTraits.h"
#include "itkProgressReporter.h"
......
......@@ -15,8 +15,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbOGRDataToSamplePositionFilter_h
#define __otbOGRDataToSamplePositionFilter_h
#ifndef otbOGRDataToSamplePositionFilter_h
#define otbOGRDataToSamplePositionFilter_h
#include "otbPersistentSamplingFilterBase.h"
#include "otbPersistentFilterStreamingDecorator.h"
......
......@@ -15,8 +15,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbOGRDataToSamplePositionFilter_txx
#define __otbOGRDataToSamplePositionFilter_txx
#ifndef otbOGRDataToSamplePositionFilter_txx
#define otbOGRDataToSamplePositionFilter_txx
#include "otbOGRDataToSamplePositionFilter.h"
#include "itkTimeProbe.h"
......
......@@ -15,8 +15,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbPersistentSamplingFilterBase_h
#define __otbPersistentSamplingFilterBase_h
#ifndef otbPersistentSamplingFilterBase_h
#define otbPersistentSamplingFilterBase_h
#include "otbPersistentImageFilter.h"
#include "otbOGRDataSourceWrapper.h"
......
......@@ -15,8 +15,8 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/