diff --git a/Applications/DisparityMap/otbFineRegistration.cxx b/Applications/DisparityMap/otbFineRegistration.cxx index e67ed9aa23efe34b2b65e52e47d31e7b47538ef2..a0861a9b88cc806a74604937a4d65705c45501d7 100644 --- a/Applications/DisparityMap/otbFineRegistration.cxx +++ b/Applications/DisparityMap/otbFineRegistration.cxx @@ -42,22 +42,22 @@ // #include "otbImage.h" // #include "otbImageFileReader.h" // #include "otbStreamingImageFileWriter.h" -// +// // #include "otbStandardWriterWatcher.h" // #include "otbVectorImage.h" // #include "otbImageList.h" -// -// +// +// // #include "itkTimeProbe.h" -// -// +// +// -// -// -// -// -// -// +// +// +// +// +// +// // #include "itkCastImageFilter.h" namespace otb @@ -114,7 +114,7 @@ public: typedef itk::BinaryThresholdImageFilter <ScalarImageType, ScalarImageType> BinaryThresholdImageFilterType; typedef otb::VectorImageToIntensityImageFilter - <FloatVectorImageType,ScalarImageType> IntensityFilterType; + <FloatVectorImageType, ScalarImageType> IntensityFilterType; typedef itk::NormalizedCorrelationImageToImageMetric <ScalarImageType, ScalarImageType> NCCType; typedef itk::MeanSquaresImageToImageMetric @@ -167,19 +167,19 @@ private: AddParameter(ParameterType_Int, "erx", "Exploration Radius X"); SetParameterDescription( "erx", "The exploration radius along x (in pixels)" ); - SetMinimumParameterIntValue("erx",0); + SetMinimumParameterIntValue("erx", 0); AddParameter(ParameterType_Int, "ery", "Exploration Radius Y"); SetParameterDescription( "ery", "The exploration radius along y (in pixels)" ); - SetMinimumParameterIntValue("ery",0); + SetMinimumParameterIntValue("ery", 0); AddParameter(ParameterType_Int, "mrx", "Metric Radius X"); SetParameterDescription( "mrx", "Radius along x (in pixels) of the metric computation window" ); - SetMinimumParameterIntValue("mrx",0); + SetMinimumParameterIntValue("mrx", 0); AddParameter(ParameterType_Int, "mry", "Metric Radius Y"); SetParameterDescription( "mry", "Radius along y (in pixels) of the metric computation window" ); - SetMinimumParameterIntValue("mry",0); + SetMinimumParameterIntValue("mry", 0); AddParameter(ParameterType_InputImage, "w", "Image To Warp"); SetParameterDescription( "w", "The image to warp after disparity estimation is complete" ); @@ -191,24 +191,24 @@ private: AddParameter(ParameterType_Float, "cox", "Coarse Offset X"); SetParameterDescription( "cox", "Coarse offset along x (in physical space) between the two images" ); - SetDefaultParameterFloat("cox",0.0); + SetDefaultParameterFloat("cox", 0.0); MandatoryOff("cox"); AddParameter(ParameterType_Float, "coy", "Coarse Offset Y"); SetParameterDescription( "coy", "Coarse offset along y (in physical space) between the two images" ); - SetDefaultParameterFloat("coy",0.0); + SetDefaultParameterFloat("coy", 0.0); MandatoryOff("coy"); AddParameter(ParameterType_Float, "ssrx", "Sub-Sampling Rate X"); SetParameterDescription( "ssrx", "Generates a result at a coarser resolution with a given sub-sampling rate along X" ); - SetDefaultParameterFloat("ssrx",1.0); - SetMinimumParameterFloatValue("ssrx",1.0); + SetDefaultParameterFloat("ssrx", 1.0); + SetMinimumParameterFloatValue("ssrx", 1.0); MandatoryOff("ssrx"); AddParameter(ParameterType_Float, "ssry", "Sub-Sampling Rate Y"); SetParameterDescription( "ssry", "Generates a result at a coarser resolution with a given sub-sampling rate along Y" ); - SetDefaultParameterFloat("ssry",1.0); - SetMinimumParameterFloatValue("ssry",1.0); + SetDefaultParameterFloat("ssry", 1.0); + SetMinimumParameterFloatValue("ssry", 1.0); MandatoryOff("ssry"); AddParameter(ParameterType_Float, "rgsx", "Reference Gaussian Smoothing X"); @@ -233,8 +233,8 @@ private: AddParameter(ParameterType_Float, "spa", "SubPixelAccuracy"); SetParameterDescription( "spa", "Metric extrema location will be refined up to the given accuracy. Default is 0.01" ); - SetDefaultParameterFloat("spa",0.01); - SetMinimumParameterFloatValue("spa",0.0); + SetDefaultParameterFloat("spa", 0.01); + SetMinimumParameterFloatValue("spa", 0.0); MandatoryOff("spa"); AddParameter(ParameterType_Float, "vmlt", "Validity Mask Lower Threshold"); @@ -475,7 +475,7 @@ private: AddProcess(m_Warp,"Warp"); - SetParameterOutputImage("wo",m_Warp->GetOutput()); + SetParameterOutputImage("wo", m_Warp->GetOutput()); } else diff --git a/Applications/Radiometry/otbOpticalCalibration.cxx b/Applications/Radiometry/otbOpticalCalibration.cxx index 50c521d361c33f9b8e52bacbd3d902b8c91c6e7a..d0105505540a4588738bc0e8e2c72a22f1485166 100644 --- a/Applications/Radiometry/otbOpticalCalibration.cxx +++ b/Applications/Radiometry/otbOpticalCalibration.cxx @@ -82,7 +82,7 @@ private: SetDescription("Perform optical calibration TOA/TOC (Top Of Atmosphere/Top Of Canopy). Supported sensors: QuickBird, Ikonos, WorldView2, Formosat, Spot5"); // Documentation SetDocName("Optical calibration application"); - SetDocLongDescription("The application allows to convert pixel values from DN (for Digital Numbers) to physically interpretable and comparable values.Calibrated values are called surface reflectivity and its values lie in the range [0,1].\nThe first level is called Top Of Atmosphere (TOA) reflectivity. It takes into account the sensor gain, sensor spectral response and the solar illumination.\nThe second level is called Top Of Canopy (TOC) reflectivity. In addition to sensor gain and solar illumination, it takes into account the optical thickness of the atmosphere, the atmospheric pressure, the water vapor amount, the ozone amount, as well as the composition and amount of aerosol gasses.\nIt is also possible to indicate an AERONET file which contains atmospheric parameters (version 1 and version 2 of Aeronet file are supported."); + SetDocLongDescription("The application allows to convert pixel values from DN (for Digital Numbers) to physically interpretable and comparable values.Calibrated values are called surface reflectivity and its values lie in the range [0, 1].\nThe first level is called Top Of Atmosphere (TOA) reflectivity. It takes into account the sensor gain, sensor spectral response and the solar illumination.\nThe second level is called Top Of Canopy (TOC) reflectivity. In addition to sensor gain and solar illumination, it takes into account the optical thickness of the atmosphere, the atmospheric pressure, the water vapor amount, the ozone amount, as well as the composition and amount of aerosol gasses.\nIt is also possible to indicate an AERONET file which contains atmospheric parameters (version 1 and version 2 of Aeronet file are supported."); SetDocLimitations("None"); SetDocAuthors("OTB-Team"); SetDocSeeAlso("The OTB CookBook"); @@ -110,7 +110,7 @@ private: AddParameter(ParameterType_Empty, "milli", "Convert to milli reflectance"); SetParameterDescription("milli", "Output milli-reflectance instead of reflectance.\n" - "This allows to put save the image in integer pixel type (in the range [0,1000] instead of floating point in the range [0,1]."); + "This allows to put save the image in integer pixel type (in the range [0, 1000] instead of floating point in the range [0, 1]."); DisableParameter("milli"); MandatoryOff("milli"); diff --git a/Applications/Utils/otbColorMapping.cxx b/Applications/Utils/otbColorMapping.cxx index c209a373fcb884c58e364202961892cd23f66ebb..84ff6ffeaee9d91e58e8e9ebb074e5ce82737961 100644 --- a/Applications/Utils/otbColorMapping.cxx +++ b/Applications/Utils/otbColorMapping.cxx @@ -56,11 +56,11 @@ public: // Manual label LUT typedef otb::ChangeLabelImageFilter - <LabelImageType,VectorImageType> ChangeLabelFilterType; + <LabelImageType, VectorImageType> ChangeLabelFilterType; // Segmentation contrast maximisation LUT typedef itk::LabelToRGBImageFilter - <LabelImageType,RGBImageType> LabelToRGBFilterType; + <LabelImageType, RGBImageType> LabelToRGBFilterType; // Continuous LUT mapping typedef itk::ScalarToRGBColormapImageFilter @@ -151,20 +151,20 @@ private: AddParameter(ParameterType_Float,"method.continuous.min","Mapping range lower value"); SetParameterDescription("method.continuous.min","Set the lower input value of the mapping range."); - SetParameterFloat("method.continuous.min",0.); + SetParameterFloat("method.continuous.min", 0.); AddParameter(ParameterType_Float,"method.continuous.max","Mapping range higher value"); SetParameterDescription("method.continuous.max","Set the higher input value of the mapping range."); - SetParameterFloat("method.continuous.max",255.); + SetParameterFloat("method.continuous.max", 255.); // Segmentation LUT AddChoice("method.segmentation","Color mapping with a look-up table optimised for segmentation"); SetParameterDescription("method.segmentation","Compute an optimal look-up table such that neighbouring labels in a segmentation are mapped to highly contrasted colors."); AddParameter(ParameterType_Int,"method.segmentation.background", "Background label"); SetParameterDescription("method.segmentation.background","Value of the background label"); - SetParameterInt("method.segmentation.background",0); - SetMinimumParameterIntValue("method.segmentation.background",0); - SetMaximumParameterIntValue("method.segmentation.background",255); + SetParameterInt("method.segmentation.background", 0); + SetMinimumParameterIntValue("method.segmentation.background", 0); + SetMaximumParameterIntValue("method.segmentation.background", 255); } void DoUpdateParameters() @@ -217,7 +217,7 @@ private: { m_SegmentationColorMapper = LabelToRGBFilterType::New(); m_SegmentationColorMapper->SetInput(GetParameterUInt16Image("in")); - m_SegmentationColorMapper->SetBackgroundValue(GetParameterInt("method.segmentation.background")); + m_SegmentationColorMapper->SetBackgroundValue(GetParameterInt("method.segmentation.background")); SetParameterOutputImage("out", m_SegmentationColorMapper->GetOutput()); } } @@ -270,7 +270,7 @@ private: ChangeLabelFilterType::Pointer m_CustomMapper; ColorMapFilterType::Pointer m_ContinuousColorMapper; LabelToRGBFilterType::Pointer m_SegmentationColorMapper; - std::map<std::string,unsigned int> m_LutMap; + std::map<std::string, unsigned int> m_LutMap; }; } }