From 231a23d97a8e5145b5d1fc525c78fdada800009a Mon Sep 17 00:00:00 2001
From: OTB Bot <otbbot@orfeo-toolbox.org>
Date: Fri, 9 Apr 2010 11:52:15 +0800
Subject: [PATCH] STYLE
---
.../otbAmplitudePhaseToRGBFunctor.h | 144 +-
.../otbBSplineDecompositionImageFilter.h | 49 +-
.../otbBSplineDecompositionImageFilter.txx | 146 +-
.../otbBSplineInterpolateImageFunction.h | 92 +-
.../otbBSplineInterpolateImageFunction.txx | 293 +-
.../otbBinaryImageDensityFunction.h | 69 +-
.../otbBinaryImageDensityFunction.txx | 67 +-
...naryImageMinimalBoundingRegionCalculator.h | 34 +-
...ryImageMinimalBoundingRegionCalculator.txx | 96 +-
.../otbBinaryImageToDensityImageFilter.h | 52 +-
.../otbBinaryImageToDensityImageFilter.txx | 90 +-
.../otbBoxAndWhiskerImageFilter.h | 58 +-
.../otbBoxAndWhiskerImageFilter.txx | 108 +-
Code/BasicFilters/otbChangeLabelImageFilter.h | 180 +-
.../otbChangeLabelImageFilter.txx | 17 +-
Code/BasicFilters/otbClosePathFunctor.h | 26 +-
.../otbClosingOpeningMorphologicalFilter.h | 38 +-
.../otbClosingOpeningMorphologicalFilter.txx | 16 +-
...bContinuousMinimumMaximumImageCalculator.h | 56 +-
...ontinuousMinimumMaximumImageCalculator.txx | 195 +-
Code/BasicFilters/otbConvolutionImageFilter.h | 71 +-
.../otbConvolutionImageFilter.txx | 77 +-
Code/BasicFilters/otbCorrectPolygonFunctor.h | 25 +-
Code/BasicFilters/otbDecimateImageFilter.h | 42 +-
Code/BasicFilters/otbDecimateImageFilter.txx | 93 +-
Code/BasicFilters/otbEdgeDensityImageFilter.h | 66 +-
.../otbEdgeDensityImageFilter.txx | 25 +-
.../BasicFilters/otbEdgeDetectorImageFilter.h | 86 +-
.../otbEdgeDetectorImageFilter.txx | 33 +-
.../otbEstimateInnerProductPCAImageFilter.h | 53 +-
.../otbEstimateInnerProductPCAImageFilter.txx | 47 +-
.../otbEuclideanDistanceWithMissingValue.h | 95 +-
...otbEuclideanDistanceWithMissingValuePow2.h | 69 +-
...bEuclideanDistanceWithMissingValuePow2.txx | 86 +-
.../otbFlexibleDistanceWithMissingValue.h | 109 +-
.../otbFlexibleDistanceWithMissingValue.txx | 98 +-
Code/BasicFilters/otbFrostImageFilter.h | 38 +-
Code/BasicFilters/otbFrostImageFilter.txx | 126 +-
Code/BasicFilters/otbFunctionToImageFilter.h | 35 +-
.../BasicFilters/otbFunctionToImageFilter.txx | 36 +-
...otbFunctionWithNeighborhoodToImageFilter.h | 60 +-
...bFunctionWithNeighborhoodToImageFilter.txx | 72 +-
Code/BasicFilters/otbGaborFilterGenerator.h | 44 +-
Code/BasicFilters/otbGaborFilterGenerator.txx | 52 +-
Code/BasicFilters/otbHillShadingFunctor.h | 49 +-
.../otbImageAndVectorImageOperationFilter.h | 199 +-
.../otbImageAndVectorImageOperationFilter.txx | 20 +-
.../otbImageListToImageListApplyFilter.h | 43 +-
.../otbImageListToImageListApplyFilter.txx | 57 +-
.../otbImageListToVectorImageFilter.h | 30 +-
.../otbImageListToVectorImageFilter.txx | 54 +-
Code/BasicFilters/otbImageToPointSetFilter.h | 46 +-
.../BasicFilters/otbImageToPointSetFilter.txx | 126 +-
.../otbImportGeoInformationImageFilter.h | 26 +-
.../otbImportGeoInformationImageFilter.txx | 22 +-
Code/BasicFilters/otbImportImageFilter.h | 55 +-
Code/BasicFilters/otbImportImageFilter.txx | 101 +-
.../BasicFilters/otbImportVectorImageFilter.h | 60 +-
.../otbImportVectorImageFilter.txx | 107 +-
.../otbInnerProductPCAImageFilter.h | 61 +-
.../otbInnerProductPCAImageFilter.txx | 27 +-
.../otbInverseLogPolarTransform.h | 52 +-
.../otbInverseLogPolarTransform.txx | 143 +-
.../otbKeyPointDensityImageFilter.h | 54 +-
.../otbKeyPointDensityImageFilter.txx | 42 +-
...tbLabelizeConfidenceConnectedImageFilter.h | 33 +-
...LabelizeConfidenceConnectedImageFilter.txx | 2 +-
...otbLabelizeConnectedThresholdImageFilter.h | 31 +-
...bLabelizeConnectedThresholdImageFilter.txx | 8 +-
.../BasicFilters/otbLabelizeImageFilterBase.h | 33 +-
.../otbLabelizeImageFilterBase.txx | 20 +-
...LabelizeNeighborhoodConnectedImageFilter.h | 31 +-
...belizeNeighborhoodConnectedImageFilter.txx | 6 +-
Code/BasicFilters/otbLeeImageFilter.h | 49 +-
Code/BasicFilters/otbLeeImageFilter.txx | 93 +-
.../otbListSampleToHistogramListGenerator.h | 73 +-
.../otbListSampleToHistogramListGenerator.txx | 94 +-
...pleToVariableDimensionHistogramGenerator.h | 63 +-
...eToVariableDimensionHistogramGenerator.txx | 105 +-
Code/BasicFilters/otbLogPolarTransform.h | 52 +-
Code/BasicFilters/otbLogPolarTransform.txx | 83 +-
Code/BasicFilters/otbMeanFunctor.h | 18 +-
Code/BasicFilters/otbMeanShiftImageFilter.h | 81 +-
Code/BasicFilters/otbMeanShiftImageFilter.txx | 333 +-
.../otbMeanShiftVectorImageFilter.h | 53 +-
.../otbNormalizeInnerProductPCAImageFilter.h | 43 +-
...otbNormalizeInnerProductPCAImageFilter.txx | 68 +-
.../otbOpeningClosingMorphologicalFilter.h | 38 +-
.../otbOpeningClosingMorphologicalFilter.txx | 16 +-
.../otbOverlapSaveConvolutionImageFilter.h | 71 +-
.../otbOverlapSaveConvolutionImageFilter.txx | 164 +-
Code/BasicFilters/otbPathLengthFunctor.h | 16 +-
.../BasicFilters/otbPathMeanDistanceFunctor.h | 46 +-
.../otbPerBandVectorImageFilter.h | 65 +-
.../otbPerBandVectorImageFilter.txx | 22 +-
.../otbPersistentVectorizationImageFilter.h | 48 +-
.../otbPersistentVectorizationImageFilter.txx | 13 +-
.../otbPointSetDensityEpanechnikovFunction.h | 37 +-
...otbPointSetDensityEpanechnikovFunction.txx | 26 +-
.../BasicFilters/otbPointSetDensityFunction.h | 37 +-
.../otbPointSetDensityFunction.txx | 40 +-
.../otbPointSetDensityGaussianFunction.h | 37 +-
.../otbPointSetDensityGaussianFunction.txx | 34 +-
Code/BasicFilters/otbPointSetExtractROI.h | 47 +-
Code/BasicFilters/otbPointSetExtractROI.txx | 53 +-
Code/BasicFilters/otbPointSetFunction.h | 24 +-
Code/BasicFilters/otbPointSetFunction.txx | 11 +-
.../otbPointSetToDensityImageFilter.h | 33 +-
.../otbPointSetToDensityImageFilter.txx | 25 +-
.../otbPointSetToPointSetFilter.h | 30 +-
.../otbPointSetToPointSetFilter.txx | 31 +-
.../BasicFilters/otbPolygonCompacityFunctor.h | 18 +-
Code/BasicFilters/otbPrintableImageFilter.h | 171 +-
Code/BasicFilters/otbPrintableImageFilter.txx | 99 +-
.../otbProlateInterpolateImageFunction.h | 93 +-
.../otbProlateInterpolateImageFunction.txx | 240 +-
.../otbQuaternaryFunctorImageFilter.h | 74 +-
.../otbQuaternaryFunctorImageFilter.txx | 97 +-
Code/BasicFilters/otbRandomPointSetSource.h | 14 +-
Code/BasicFilters/otbRandomPointSetSource.txx | 6 +-
Code/BasicFilters/otbReliefColormapFunctor.h | 36 +-
.../BasicFilters/otbReliefColormapFunctor.txx | 35 +-
.../otbScalarImageTextureFunctor.h | 29 +-
.../otbScalarToRainbowRGBPixelFunctor.h | 161 +-
.../otbScalarToRainbowRGBPixelFunctor.txx | 29 +-
.../otbScalarVectorImageTextureFunctor.h | 36 +-
Code/BasicFilters/otbSimplifyPathFunctor.h | 47 +-
.../otbSpatialObjectToImageDrawingFilter.h | 62 +-
.../otbSpatialObjectToImageDrawingFilter.txx | 391 +-
.../otbSpectralAngleDistanceImageFilter.h | 42 +-
.../otbSpectralAngleDistanceImageFilter.txx | 78 +-
...tbStreamingInnerProductVectorImageFilter.h | 80 +-
...StreamingInnerProductVectorImageFilter.txx | 153 +-
...treamingMatrixTransposeMatrixImageFilter.h | 116 +-
...eamingMatrixTransposeMatrixImageFilter.txx | 150 +-
.../otbStreamingResampleImageFilter.h | 37 +-
.../otbStreamingResampleImageFilter.txx | 109 +-
.../otbStreamingShrinkImageFilter.h | 28 +-
.../otbStreamingShrinkImageFilter.txx | 110 +-
.../otbStreamingStatisticsImageFilter.h | 47 +-
.../otbStreamingStatisticsImageFilter.txx | 109 +-
.../otbStreamingStatisticsVectorImageFilter.h | 124 +-
...tbStreamingStatisticsVectorImageFilter.txx | 210 +-
.../BasicFilters/otbTransformPointSetFilter.h | 46 +-
.../otbTransformPointSetFilter.txx | 51 +-
.../BasicFilters/otbUnaryFunctorImageFilter.h | 15 +-
.../otbUnaryFunctorObjectListBooleanFilter.h | 44 +-
...otbUnaryFunctorObjectListBooleanFilter.txx | 49 +-
.../otbUnaryFunctorObjectListFilter.h | 20 +-
.../otbUnaryFunctorObjectListFilter.txx | 39 +-
...tbUnaryImageFunctorWithVectorImageFilter.h | 32 +-
...UnaryImageFunctorWithVectorImageFilter.txx | 56 +-
Code/BasicFilters/otbVarianceImageFilter.h | 27 +-
Code/BasicFilters/otbVarianceImageFilter.txx | 65 +-
.../otbVectorImageTo3DScalarImageFilter.h | 43 +-
.../otbVectorImageTo3DScalarImageFilter.txx | 76 +-
.../otbVectorImageToAmplitudeImageFilter.h | 44 +-
.../otbVectorImageToImageListFilter.h | 30 +-
.../otbVectorImageToImageListFilter.txx | 72 +-
.../otbVectorImageToIntensityImageFilter.h | 39 +-
.../otbVectorImageToIntensityImageFilter.txx | 27 +-
.../otbVectorRescaleIntensityImageFilter.h | 161 +-
.../otbVectorRescaleIntensityImageFilter.txx | 86 +-
...owedSincInterpolateImageBlackmanFunction.h | 64 +-
...ndowedSincInterpolateImageCosineFunction.h | 68 +-
...WindowedSincInterpolateImageFunctionBase.h | 40 +-
...ndowedSincInterpolateImageFunctionBase.txx | 5 +-
...owedSincInterpolateImageGaussianFunction.h | 70 +-
...dowedSincInterpolateImageHammingFunction.h | 67 +-
...dowedSincInterpolateImageLanczosFunction.h | 72 +-
...indowedSincInterpolateImageWelchFunction.h | 64 +-
...ctorNeighborhoodJoinHistogramImageFilter.h | 72 +-
...orNeighborhoodJoinHistogramImageFilter.txx | 192 +-
Code/ChangeDetection/otbCBAMI.h | 145 +-
Code/ChangeDetection/otbCBAMIChangeDetector.h | 33 +-
.../otbCommandProgressUpdate.h | 16 +-
.../otbCommandProgressUpdate.txx | 30 +-
.../otbCorrelationChangeDetector.h | 31 +-
Code/ChangeDetection/otbCrossCorrelation.h | 56 +-
Code/ChangeDetection/otbJoinHistogramMI.h | 35 +-
.../otbJoinHistogramMIImageFilter.h | 32 +-
.../otbKullbackLeiblerDistanceImageFilter.h | 89 +-
.../otbKullbackLeiblerDistanceImageFilter.txx | 147 +-
.../otbKullbackLeiblerProfileImageFilter.h | 82 +-
.../otbKullbackLeiblerProfileImageFilter.txx | 269 +-
...backLeiblerSupervizedDistanceImageFilter.h | 74 +-
...ckLeiblerSupervizedDistanceImageFilter.txx | 119 +-
Code/ChangeDetection/otbLHMI.h | 99 +-
Code/ChangeDetection/otbLHMIChangeDetector.h | 31 +-
Code/ChangeDetection/otbMeanDifference.h | 21 +-
.../otbMeanDifferenceImageFilter.h | 31 +-
Code/ChangeDetection/otbMeanRatio.h | 26 +-
.../ChangeDetection/otbMeanRatioImageFilter.h | 31 +-
Code/Common/otbArcSpatialObject.h | 54 +-
Code/Common/otbArcSpatialObject.txx | 238 +-
Code/Common/otbAttributesMapLabelObject.h | 96 +-
.../otbAttributesMapOpeningLabelMapFilter.h | 21 +-
.../otbBinaryFunctorNeighborhoodImageFilter.h | 50 +-
...tbBinaryFunctorNeighborhoodImageFilter.txx | 140 +-
...naryFunctorNeighborhoodVectorImageFilter.h | 60 +-
...ryFunctorNeighborhoodVectorImageFilter.txx | 89 +-
Code/Common/otbCommandLineArgumentParser.cxx | 251 +-
Code/Common/otbCommandLineArgumentParser.h | 184 +-
Code/Common/otbConcatenateVectorImageFilter.h | 18 +-
.../otbConcatenateVectorImageFilter.txx | 115 +-
Code/Common/otbConfigurationFile.cxx | 15 +-
Code/Common/otbConfigurationFile.h | 100 +-
Code/Common/otbDataNode.h | 123 +-
Code/Common/otbDataNode.txx | 266 +-
Code/Common/otbDifferenceImageFilter.h | 41 +-
Code/Common/otbDifferenceImageFilter.txx | 107 +-
Code/Common/otbDrawLineSpatialObjectFilter.h | 62 +-
.../Common/otbDrawLineSpatialObjectFilter.txx | 27 +-
.../otbDrawLineSpatialObjectListFilter.h | 104 +-
.../otbDrawLineSpatialObjectListFilter.txx | 269 +-
Code/Common/otbDrawPathFilter.h | 54 +-
Code/Common/otbDrawPathFilter.txx | 31 +-
Code/Common/otbDrawPathListFilter.h | 62 +-
Code/Common/otbDrawPathListFilter.txx | 82 +-
Code/Common/otbExtractROI.h | 38 +-
Code/Common/otbExtractROI.txx | 20 +-
Code/Common/otbExtractROIBase.h | 63 +-
Code/Common/otbExtractROIBase.txx | 199 +-
Code/Common/otbFilterWatcherBase.cxx | 46 +-
Code/Common/otbFilterWatcherBase.h | 8 +-
Code/Common/otbGISConnectionImplementation.h | 28 +-
Code/Common/otbGISTable.h | 102 +-
Code/Common/otbGISTable.txx | 25 +-
Code/Common/otbGISTableSource.h | 18 +-
Code/Common/otbGISTableSource.txx | 21 +-
Code/Common/otbGISTableToGISTableFilter.h | 26 +-
Code/Common/otbGISTableToGISTableFilter.txx | 23 +-
Code/Common/otbGISTableToLabelMapFilter.h | 52 +-
Code/Common/otbGISTableToLabelMapFilter.txx | 105 +-
Code/Common/otbGISTableToVectorDataFilter.h | 37 +-
Code/Common/otbGISTableToVectorDataFilter.txx | 99 +-
.../otbGenericInterpolateImageFunction.h | 36 +-
.../otbGenericInterpolateImageFunction.txx | 150 +-
Code/Common/otbHistogramStatisticsFunction.h | 27 +-
.../Common/otbHistogramStatisticsFunction.txx | 132 +-
Code/Common/otbI18n.h | 84 +-
Code/Common/otbImageList.h | 34 +-
Code/Common/otbImageList.txx | 57 +-
Code/Common/otbImageListSource.h | 16 +-
Code/Common/otbImageListSource.txx | 12 +-
Code/Common/otbImageListToImageFilter.h | 40 +-
Code/Common/otbImageListToImageFilter.txx | 22 +-
Code/Common/otbImageListToImageListFilter.h | 44 +-
Code/Common/otbImageListToImageListFilter.txx | 22 +-
...otbImageOfVectorsToMonoChannelExtractROI.h | 43 +-
...bImageOfVectorsToMonoChannelExtractROI.txx | 45 +-
...RegionNonUniformMultidimensionalSplitter.h | 32 +-
...gionNonUniformMultidimensionalSplitter.txx | 103 +-
Code/Common/otbImageRegionTileMapSplitter.h | 15 +-
Code/Common/otbImageRegionTileMapSplitter.txx | 31 +-
Code/Common/otbImageToImageListFilter.h | 40 +-
Code/Common/otbImageToImageListFilter.txx | 22 +-
.../otbImageToLineSpatialObjectListFilter.h | 32 +-
.../otbImageToLineSpatialObjectListFilter.txx | 16 +-
Code/Common/otbImageToPathFilter.h | 12 +-
Code/Common/otbImageToPathFilter.txx | 6 +-
Code/Common/otbImageToPathListFilter.h | 34 +-
Code/Common/otbImageToPathListFilter.txx | 22 +-
Code/Common/otbImageToVectorImageCastFilter.h | 39 +-
.../otbLabelMapFeaturesFunctorImageFilter.h | 40 +-
Code/Common/otbLabelMapSource.h | 18 +-
Code/Common/otbLabelMapSource.txx | 23 +-
Code/Common/otbLabelMapToGISTableFilter.h | 54 +-
Code/Common/otbLabelMapToGISTableFilter.txx | 114 +-
Code/Common/otbLabelMapToVectorDataFilter.h | 49 +-
Code/Common/otbLabelMapToVectorDataFilter.txx | 101 +-
Code/Common/otbLabelObjectToPolygonFunctor.h | 130 +-
.../Common/otbLabelObjectToPolygonFunctor.txx | 950 +-
Code/Common/otbLineSpatialObject.h | 42 +-
Code/Common/otbLineSpatialObject.txx | 185 +-
Code/Common/otbLineSpatialObjectList.h | 25 +-
...otbLineSpatialObjectListToPointSetFilter.h | 41 +-
...bLineSpatialObjectListToPointSetFilter.txx | 44 +-
Code/Common/otbList.h | 5 +-
Code/Common/otbMacro.h | 325 +-
Code/Common/otbMath.h | 3 +-
Code/Common/otbMirrorBoundaryCondition.h | 24 +-
Code/Common/otbMirrorBoundaryCondition.txx | 65 +-
Code/Common/otbMultiChannelExtractROI.h | 54 +-
Code/Common/otbMultiChannelExtractROI.txx | 217 +-
Code/Common/otbMultiToMonoChannelExtractROI.h | 43 +-
.../otbMultiToMonoChannelExtractROI.txx | 49 +-
Code/Common/otbObjectList.h | 225 +-
Code/Common/otbObjectList.txx | 74 +-
Code/Common/otbObjectListSource.h | 20 +-
Code/Common/otbObjectListSource.txx | 37 +-
Code/Common/otbObjectListToObjectListFilter.h | 25 +-
.../otbObjectListToObjectListFilter.txx | 88 +-
Code/Common/otbPathFunction.h | 21 +-
Code/Common/otbPathFunction.txx | 9 +-
Code/Common/otbPathListSource.h | 19 +-
Code/Common/otbPathListToHistogramGenerator.h | 80 +-
.../otbPathListToHistogramGenerator.txx | 88 +-
Code/Common/otbPathListToPathListFilter.h | 34 +-
.../otbPersistentFilterStreamingDecorator.h | 34 +-
.../otbPersistentFilterStreamingDecorator.txx | 6 +-
Code/Common/otbPersistentImageFilter.h | 28 +-
Code/Common/otbPointSetAndValuesFunction.h | 55 +-
Code/Common/otbPointSetSource.h | 15 +-
Code/Common/otbPointSetSource.txx | 44 +-
Code/Common/otbPolyLineImageConstIterator.h | 18 +-
Code/Common/otbPolyLineImageConstIterator.txx | 68 +-
Code/Common/otbPolyLineImageIterator.h | 24 +-
.../otbPolyLineParametricPathWithValue.h | 72 +-
.../otbPolyLineParametricPathWithValue.txx | 136 +-
Code/Common/otbPolygon.h | 48 +-
Code/Common/otbPolygon.txx | 480 +-
.../otbPostGISConnectionImplementation.cxx | 22 +-
.../otbPostGISConnectionImplementation.h | 26 +-
Code/Common/otbPostGISTable.h | 80 +-
Code/Common/otbPostGISTable.txx | 206 +-
Code/Common/otbQuickLookImageGenerator.h | 105 +-
Code/Common/otbQuickLookImageGenerator.txx | 36 +-
.../otbRadiometricAttributesLabelMapFilter.h | 160 +-
...otbRadiometricAttributesLabelMapFilter.txx | 167 +-
Code/Common/otbRectangle.h | 179 +-
Code/Common/otbRectangle.txx | 285 +-
Code/Common/otbRemoteSensingRegion.h | 284 +-
.../Common/otbShapeAttributesLabelMapFilter.h | 120 +-
.../otbShapeAttributesLabelMapFilter.txx | 472 +-
Code/Common/otbShiftScaleImageAdaptor.h | 67 +-
Code/Common/otbSpatialObjectSource.h | 17 +-
Code/Common/otbSpatialObjectSource.txx | 12 +-
Code/Common/otbStandardFilterWatcher.cxx | 62 +-
Code/Common/otbStandardFilterWatcher.h | 6 +-
Code/Common/otbStandardWriterWatcher.cxx | 78 +-
Code/Common/otbStandardWriterWatcher.h | 14 +-
.../otbStatisticsAttributesLabelMapFilter.h | 73 +-
.../otbStatisticsAttributesLabelMapFilter.txx | 297 +-
Code/Common/otbStreamingTraits.h | 53 +-
Code/Common/otbStreamingTraits.txx | 272 +-
.../otbSubsampledImageRegionConstIterator.h | 79 +-
.../otbSubsampledImageRegionConstIterator.txx | 278 +-
.../Common/otbSubsampledImageRegionIterator.h | 62 +-
Code/Common/otbSystem.cxx | 164 +-
Code/Common/otbSystem.h | 17 +-
.../otbUnaryFunctorNeighborhoodImageFilter.h | 38 +-
...otbUnaryFunctorNeighborhoodImageFilter.txx | 69 +-
...FunctorNeighborhoodWithOffsetImageFilter.h | 42 +-
...nctorNeighborhoodWithOffsetImageFilter.txx | 78 +-
.../otbUnaryFunctorWithIndexImageFilter.h | 28 +-
.../otbUnaryFunctorWithIndexImageFilter.txx | 59 +-
Code/Common/otbVectorData.h | 59 +-
Code/Common/otbVectorData.txx | 89 +-
Code/Common/otbVectorDataExtractROI.h | 103 +-
Code/Common/otbVectorDataExtractROI.txx | 309 +-
Code/Common/otbVectorDataProperties.h | 118 +-
Code/Common/otbVectorDataProperties.txx | 150 +-
Code/Common/otbVectorDataSource.h | 14 +-
Code/Common/otbVectorDataSource.txx | 21 +-
Code/Common/otbVectorDataStyle.cxx | 9775 +++++++++--------
Code/Common/otbVectorDataStyle.h | 86 +-
Code/Common/otbVectorDataToGISTableFilter.h | 54 +-
Code/Common/otbVectorDataToGISTableFilter.txx | 130 +-
Code/Common/otbVectorDataToImageFilter.h | 258 +-
Code/Common/otbVectorDataToImageFilter.txx | 753 +-
Code/Common/otbVectorDataToLabelMapFilter.h | 117 +-
Code/Common/otbVectorDataToLabelMapFilter.txx | 392 +-
Code/Common/otbVectorDataToVectorDataFilter.h | 26 +-
.../otbVectorDataToVectorDataFilter.txx | 23 +-
Code/Common/otbVectorImageToASImageAdaptor.h | 27 +-
Code/Common/otbVectorImageToASPixelAccessor.h | 14 +-
Code/Common/otbWriterWatcherBase.cxx | 169 +-
Code/Common/otbWriterWatcherBase.h | 10 +-
...inesInterpolateDeformationFieldGenerator.h | 38 +-
...esInterpolateDeformationFieldGenerator.txx | 68 +-
...polateTransformDeformationFieldGenerator.h | 60 +-
...lateTransformDeformationFieldGenerator.txx | 105 +-
.../otbDisparityMapEstimationMethod.h | 83 +-
.../otbDisparityMapEstimationMethod.txx | 145 +-
Code/DisparityMap/otbNCCRegistrationFilter.h | 34 +-
.../DisparityMap/otbNCCRegistrationFilter.txx | 131 +-
.../DisparityMap/otbNCCRegistrationFunction.h | 91 +-
.../otbNCCRegistrationFunction.txx | 199 +-
...nearInterpolateDeformationFieldGenerator.h | 42 +-
...arInterpolateDeformationFieldGenerator.txx | 52 +-
...nearInterpolateDeformationFieldGenerator.h | 50 +-
...arInterpolateDeformationFieldGenerator.txx | 66 +-
...otbNearestPointDeformationFieldGenerator.h | 34 +-
...bNearestPointDeformationFieldGenerator.txx | 26 +-
...earestTransformDeformationFieldGenerator.h | 40 +-
...restTransformDeformationFieldGenerator.txx | 42 +-
.../otbPointSetToDeformationFieldGenerator.h | 57 +-
...otbPointSetToDeformationFieldGenerator.txx | 44 +-
...WithTransformToDeformationFieldGenerator.h | 44 +-
.../otbStreamingWarpImageFilter.h | 21 +-
.../otbStreamingWarpImageFilter.txx | 53 +-
.../otbAddCarvingPathFilter.h | 61 +-
.../otbAddCarvingPathFilter.txx | 197 +-
.../otbAngularSecondMomentumTextureFunctor.h | 28 +-
.../otbAssociativeSymmetricalSumImageFilter.h | 46 +-
...symmetricFusionOfLineDetectorImageFilter.h | 65 +-
...mmetricFusionOfLineDetectorImageFilter.txx | 26 +-
.../otbBreakAngularPathListFilter.h | 34 +-
.../otbBreakAngularPathListFilter.txx | 50 +-
.../otbCloudDetectionFilter.h | 40 +-
.../otbCloudDetectionFilter.txx | 41 +-
.../otbCloudDetectionFunctor.h | 42 +-
.../otbCloudEstimatorFilter.h | 40 +-
.../otbCloudEstimatorFilter.txx | 33 +-
.../otbCloudEstimatorFunctor.h | 51 +-
.../otbClusterProminenceTextureFunctor.h | 30 +-
.../otbClusterShadeTextureFunctor.h | 28 +-
.../otbCompacityPathFunction.h | 39 +-
.../otbCompacityPathFunction.txx | 90 +-
.../otbComplexMomentImageFunction.h | 54 +-
.../otbComplexMomentImageFunction.txx | 95 +-
.../otbComplexMomentPathFunction.h | 52 +-
.../otbComplexMomentPathFunction.txx | 119 +-
.../otbContrastTextureFunctor.h | 39 +-
.../otbCorrelationTextureFunctor.h | 73 +-
.../otbDifferenceEntropyTextureFunctor.h | 44 +-
.../otbDifferenceVarianceTextureFunctor.h | 64 +-
.../otbEnergyTextureFunctor.h | 48 +-
.../otbEntropyTextureFunctor.h | 39 +-
.../otbExtractSegmentsImageFilter.h | 105 +-
.../otbExtractSegmentsImageFilter.txx | 45 +-
Code/FeatureExtraction/otbFillGapsFilter.cxx | 118 +-
Code/FeatureExtraction/otbFillGapsFilter.h | 31 +-
.../otbFlusserImageFunction.h | 60 +-
.../otbFlusserImageFunction.txx | 197 +-
.../otbFlusserPathFunction.h | 44 +-
.../otbFlusserPathFunction.txx | 197 +-
...ForwardFourierMellinTransformImageFilter.h | 98 +-
...rwardFourierMellinTransformImageFilter.txx | 78 +-
.../otbGenericRoadExtractionFilter.h | 171 +-
.../otbGenericRoadExtractionFilter.txx | 50 +-
.../otbGeometricMomentImageFunction.h | 49 +-
.../otbGeometricMomentPathFunction.h | 32 +-
Code/FeatureExtraction/otbHarrisImageFilter.h | 64 +-
.../otbHarrisImageFilter.txx | 28 +-
.../otbHarrisImageToPointSetFilter.h | 47 +-
.../otbHarrisImageToPointSetFilter.txx | 18 +-
.../otbHessianToScalarImageFilter.h | 54 +-
.../otbHoughTransform2DLinesImageFilter.h | 108 +-
.../otbHoughTransform2DLinesImageFilter.txx | 270 +-
Code/FeatureExtraction/otbHuImageFunction.h | 59 +-
Code/FeatureExtraction/otbHuImageFunction.txx | 152 +-
Code/FeatureExtraction/otbHuPathFunction.h | 45 +-
Code/FeatureExtraction/otbHuPathFunction.txx | 153 +-
.../otbImageFittingPolygonListFilter.h | 52 +-
.../otbImageFittingPolygonListFilter.txx | 189 +-
.../otbImageToCarvingPathFilter.h | 26 +-
.../otbImageToCarvingPathFilter.txx | 150 +-
.../otbImageToEdgePathFilter.h | 29 +-
.../otbImageToEdgePathFilter.txx | 146 +-
.../otbImageToHessianDeterminantImageFilter.h | 40 +-
...tbImageToHessianDeterminantImageFilter.txx | 13 +-
.../otbImageToLineSegmentVectorData.h | 103 +-
.../otbImageToLineSegmentVectorData.txx | 316 +-
...otbImageToModulusAndDirectionImageFilter.h | 53 +-
...bImageToModulusAndDirectionImageFilter.txx | 64 +-
.../otbImageToPathListAlignFilter.h | 107 +-
.../otbImageToPathListAlignFilter.txx | 456 +-
.../otbImageToSIFTKeyPointSetFilter.h | 118 +-
.../otbImageToSIFTKeyPointSetFilter.txx | 651 +-
.../otbImageToSURFKeyPointSetFilter.h | 76 +-
.../otbImageToSURFKeyPointSetFilter.txx | 395 +-
...ationMeasureOfCorrelation1TextureFunctor.h | 76 +-
...ationMeasureOfCorrelation2TextureFunctor.h | 61 +-
...otbInverseDifferenceMomentTextureFunctor.h | 33 +-
.../otbKeyPointSetsMatchingFilter.h | 46 +-
.../otbKeyPointSetsMatchingFilter.txx | 112 +-
Code/FeatureExtraction/otbLandmark.h | 42 +-
.../otbLikelihoodPathListFilter.h | 38 +-
.../otbLikelihoodPathListFilter.txx | 30 +-
.../otbLineCorrelationDetectorImageFilter.h | 56 +-
.../otbLineCorrelationDetectorImageFilter.txx | 66 +-
.../otbLineDetectorImageFilterBase.h | 73 +-
.../otbLineDetectorImageFilterBase.txx | 231 +-
.../otbLineRatioDetectorImageFilter.h | 56 +-
.../otbLineRatioDetectorImageFilter.txx | 41 +-
.../otbLineSegmentDetector.h | 228 +-
.../otbLineSegmentDetector.txx | 843 +-
...tialObjectListToRightAnglePointSetFilter.h | 67 +-
...alObjectListToRightAnglePointSetFilter.txx | 252 +-
.../FeatureExtraction/otbLinkPathListFilter.h | 44 +-
.../otbLinkPathListFilter.txx | 165 +-
Code/FeatureExtraction/otbLocalHoughFilter.h | 64 +-
.../FeatureExtraction/otbLocalHoughFilter.txx | 154 +-
.../FeatureExtraction/otbMeanTextureFunctor.h | 25 +-
...otbModulusAndDirectionImageToImageFilter.h | 44 +-
...bModulusAndDirectionImageToImageFilter.txx | 44 +-
.../otbMultiplyByScalarImageFilter.h | 50 +-
.../otbNeighborhoodScalarProductFilter.h | 42 +-
.../otbNeighborhoodScalarProductFilter.txx | 112 +-
.../otbNonMaxRemovalByDirectionFilter.h | 59 +-
.../otbOrientationPathFunction.h | 39 +-
.../otbOrientationPathFunction.txx | 60 +-
.../otbPanTexTextureFunctor.h | 90 +-
.../otbPanTexTextureImageFilter.h | 59 +-
.../otbPanTexTextureImageFilter.txx | 32 +-
.../otbPanTexTextureImageFunctionFilter.h | 51 +-
.../otbParallelLinePathListFilter.h | 47 +-
.../otbParallelLinePathListFilter.txx | 318 +-
...tbPixelSuppressionByDirectionImageFilter.h | 55 +-
...PixelSuppressionByDirectionImageFilter.txx | 172 +-
.../otbRealMomentImageFunction.h | 44 +-
.../otbRealMomentPathFunction.h | 42 +-
...tbRegionImageToRectangularPathListFilter.h | 86 +-
...RegionImageToRectangularPathListFilter.txx | 517 +-
.../otbRemoveCarvingPathFilter.h | 62 +-
.../otbRemoveCarvingPathFilter.txx | 150 +-
.../otbRemoveIsolatedByDirectionFilter.h | 49 +-
.../otbRemoveTortuousPathListFilter.h | 13 +-
.../otbRemoveWrongDirectionFilter.h | 40 +-
.../otbRoadExtractionFilter.h | 104 +-
.../otbRoadExtractionFilter.txx | 21 +-
.../FeatureExtraction/otbSFSTexturesFunctor.h | 438 +-
.../otbSFSTexturesImageFilter.h | 163 +-
.../otbSFSTexturesImageFilter.txx | 303 +-
Code/FeatureExtraction/otbShape.h | 50 +-
Code/FeatureExtraction/otbShape.txx | 472 +-
.../otbSiftFastImageFilter.h | 44 +-
.../otbSiftFastImageFilter.txx | 53 +-
.../otbSimplePointCountStrategy.h | 38 +-
.../otbSimplifyPathListFilter.h | 14 +-
.../otbSpectralAngleFunctor.h | 56 +-
.../otbSqrtSpectralAngleFunctor.h | 12 +-
.../otbSumAverageTextureFunctor.h | 64 +-
.../otbSumEntropyTextureFunctor.h | 61 +-
.../otbSumVarianceTextureFunctor.h | 50 +-
.../FeatureExtraction/otbTextureFunctorBase.h | 390 +-
Code/FeatureExtraction/otbTextureFunctors.h | 2 -
.../otbTextureImageFunction.h | 82 +-
.../otbTextureImageFunction.txx | 26 +-
.../otbThresholdImageToPointSetFilter.h | 53 +-
.../otbThresholdImageToPointSetFilter.txx | 20 +-
.../otbTouziEdgeDetectorImageFilter.h | 54 +-
.../otbTouziEdgeDetectorImageFilter.txx | 171 +-
Code/FeatureExtraction/otbTreeNeighborhood.h | 35 +-
.../FeatureExtraction/otbTreeNeighborhood.txx | 74 +-
.../otbUrbanAreaDetectionImageFilter.h | 223 +-
.../otbUrbanAreaDetectionImageFilter.txx | 7 +-
.../otbVarianceTextureFunctor.h | 27 +-
.../otbVectorizationPathListFilter.h | 34 +-
.../otbVectorizationPathListFilter.txx | 171 +-
Code/Fusion/otbBayesianFusionFilter.h | 194 +-
Code/Fusion/otbBayesianFusionFilter.txx | 250 +-
Code/Fusion/otbFusionImageBase.h | 83 +-
...bSimpleRcsPanSharpeningFusionImageFilter.h | 50 +-
...impleRcsPanSharpeningFusionImageFilter.txx | 51 +-
Code/GeospatialAnalysis/otbGISTableFunction.h | 33 +-
.../otbGISTableFunction.txx | 7 +-
.../otbPostGISCreateTableTransactor.cxx | 54 +-
.../otbPostGISCreateTableTransactor.h | 32 +-
.../otbPostGISFromStringTransactor.cxx | 36 +-
.../otbPostGISFromStringTransactor.h | 23 +-
.../otbPostGISQueryTransactor.cxx | 37 +-
.../otbPostGISQueryTransactor.h | 29 +-
.../otbTransactorGISTableFunction.h | 32 +-
Code/Gui/otbFltkFilterWatcher.cxx | 6 +-
Code/Gui/otbFltkFilterWatcher.h | 14 +-
Code/Gui/otbFltkWriterWatcher.cxx | 18 +-
Code/Gui/otbFltkWriterWatcher.h | 27 +-
Code/IO/otbBSQImageIO.cxx | 619 +-
Code/IO/otbBSQImageIO.h | 59 +-
Code/IO/otbBSQImageIOFactory.cxx | 2 -
Code/IO/otbBSQImageIOFactory.h | 13 +-
Code/IO/otbCoordinateToName.cxx | 72 +-
Code/IO/otbCoordinateToName.h | 47 +-
Code/IO/otbDEMHandler.cxx | 55 +-
Code/IO/otbDEMHandler.h | 19 +-
Code/IO/otbDEMToImageGenerator.h | 72 +-
Code/IO/otbDEMToImageGenerator.txx | 39 +-
Code/IO/otbDEMToOrthoImageGenerator.h | 65 +-
Code/IO/otbDEMToOrthoImageGenerator.txx | 40 +-
Code/IO/otbDXFToSpatialObjectGroupFilter.h | 59 +-
Code/IO/otbDXFToSpatialObjectGroupFilter.txx | 318 +-
Code/IO/otbDefaultImageMetadataInterface.h | 141 +-
...tbDefaultImageMetadataInterfaceFactory.cxx | 4 +-
.../otbDefaultImageMetadataInterfaceFactory.h | 13 +-
Code/IO/otbFileName.cxx | 9 +-
Code/IO/otbFileName.h | 7 +-
Code/IO/otbGDALImageIO.cxx | 893 +-
Code/IO/otbGDALImageIO.h | 37 +-
Code/IO/otbGDALImageIOFactory.cxx | 2 -
Code/IO/otbGDALImageIOFactory.h | 13 +-
Code/IO/otbIkonosImageMetadataInterface.cxx | 526 +-
Code/IO/otbIkonosImageMetadataInterface.h | 78 +-
...otbIkonosImageMetadataInterfaceFactory.cxx | 5 +-
.../otbIkonosImageMetadataInterfaceFactory.h | 15 +-
Code/IO/otbImage.h | 75 +-
Code/IO/otbImage.txx | 79 +-
Code/IO/otbImageFileReader.h | 21 +-
Code/IO/otbImageFileReader.txx | 451 +-
Code/IO/otbImageFileWriter.h | 32 +-
Code/IO/otbImageFileWriter.txx | 11 +-
Code/IO/otbImageIOFactory.cxx | 30 +-
Code/IO/otbImageIOFactory.h | 15 +-
Code/IO/otbImageKeywordlist.cxx | 20 +-
Code/IO/otbImageKeywordlist.h | 22 +-
Code/IO/otbImageMetadataInterfaceBase.cxx | 289 +-
Code/IO/otbImageMetadataInterfaceBase.h | 132 +-
Code/IO/otbImageMetadataInterfaceFactory.cxx | 38 +-
Code/IO/otbImageMetadataInterfaceFactory.h | 15 +-
Code/IO/otbImageSeriesFileReader.h | 168 +-
Code/IO/otbImageSeriesFileReader.txx | 215 +-
Code/IO/otbImageSeriesFileReaderBase.h | 90 +-
Code/IO/otbImageSeriesFileReaderBase.txx | 403 +-
Code/IO/otbJPEG2000ImageIO.cxx | 510 +-
Code/IO/otbJPEG2000ImageIO.h | 14 +-
Code/IO/otbJPEG2000ImageIOFactory.cxx | 2 -
Code/IO/otbJPEG2000ImageIOFactory.h | 13 +-
Code/IO/otbKMLVectorDataIO.h | 58 +-
Code/IO/otbKMLVectorDataIO.txx | 681 +-
Code/IO/otbKMLVectorDataIOFactory.h | 14 +-
Code/IO/otbLUMImageIO.cxx | 519 +-
Code/IO/otbLUMImageIO.h | 79 +-
Code/IO/otbLUMImageIOFactory.cxx | 2 -
Code/IO/otbLUMImageIOFactory.h | 13 +-
Code/IO/otbMSTARImageIO.cxx | 440 +-
Code/IO/otbMSTARImageIO.h | 35 +-
Code/IO/otbMSTARImageIOFactory.cxx | 2 -
Code/IO/otbMSTARImageIOFactory.h | 13 +-
Code/IO/otbMWImageIO.cxx | 327 +-
Code/IO/otbMWImageIO.h | 60 +-
Code/IO/otbMWImageIOFactory.cxx | 2 -
Code/IO/otbMWImageIOFactory.h | 13 +-
Code/IO/otbMetaDataKey.cxx | 30 +-
Code/IO/otbMetaDataKey.h | 46 +-
Code/IO/otbOGRIOHelper.h | 70 +-
Code/IO/otbOGRIOHelper.txx | 965 +-
Code/IO/otbOGRVectorDataIO.h | 57 +-
Code/IO/otbOGRVectorDataIO.txx | 143 +-
Code/IO/otbOGRVectorDataIOFactory.h | 14 +-
Code/IO/otbONERAImageIO.cxx | 516 +-
Code/IO/otbONERAImageIO.h | 44 +-
Code/IO/otbONERAImageIOFactory.cxx | 2 -
Code/IO/otbONERAImageIOFactory.h | 13 +-
Code/IO/otbPointSetFileReader.h | 39 +-
Code/IO/otbPointSetFileReader.txx | 82 +-
Code/IO/otbPrepareSRTMDirectory.cxx | 70 +-
Code/IO/otbPrepareSRTMDirectory.h | 43 +-
.../IO/otbQuickBirdImageMetadataInterface.cxx | 673 +-
Code/IO/otbQuickBirdImageMetadataInterface.h | 77 +-
...QuickBirdImageMetadataInterfaceFactory.cxx | 4 +-
...tbQuickBirdImageMetadataInterfaceFactory.h | 13 +-
Code/IO/otbRADImageIO.cxx | 691 +-
Code/IO/otbRADImageIO.h | 63 +-
Code/IO/otbRADImageIOFactory.cxx | 2 -
Code/IO/otbRADImageIOFactory.h | 13 +-
Code/IO/otbSpatialObjectDXFReader.h | 16 +-
Code/IO/otbSpatialObjectDXFReader.txx | 44 +-
Code/IO/otbSpotImageMetadataInterface.cxx | 654 +-
Code/IO/otbSpotImageMetadataInterface.h | 80 +-
.../otbSpotImageMetadataInterfaceFactory.cxx | 4 +-
.../IO/otbSpotImageMetadataInterfaceFactory.h | 14 +-
Code/IO/otbStreamingImageFileWriter.h | 56 +-
Code/IO/otbStreamingImageFileWriter.txx | 253 +-
Code/IO/otbStreamingImageVirtualWriter.h | 30 +-
Code/IO/otbStreamingImageVirtualWriter.txx | 58 +-
Code/IO/otbTerraSarImageMetadataInterface.cxx | 647 +-
Code/IO/otbTerraSarImageMetadataInterface.h | 136 +-
Code/IO/otbTileMapFetcher.cxx | 1020 +-
Code/IO/otbTileMapFetcher.h | 215 +-
Code/IO/otbTileMapImageIO.cxx | 722 +-
Code/IO/otbTileMapImageIO.h | 65 +-
Code/IO/otbTileMapImageIOFactory.cxx | 2 -
Code/IO/otbTileMapImageIOFactory.h | 13 +-
Code/IO/otbTileMapImageSource.h | 81 +-
Code/IO/otbTileMapImageSource.txx | 274 +-
Code/IO/otbTileRecord.cxx | 72 +-
Code/IO/otbTileRecord.h | 68 +-
Code/IO/otbVectorDataFileReader.h | 37 +-
Code/IO/otbVectorDataFileReader.txx | 121 +-
Code/IO/otbVectorDataFileWriter.h | 35 +-
Code/IO/otbVectorDataFileWriter.txx | 100 +-
Code/IO/otbVectorDataIOBase.h | 21 +-
Code/IO/otbVectorDataIOBase.txx | 10 +-
Code/IO/otbVectorDataIOFactory.h | 12 +-
Code/IO/otbVectorDataIOFactory.txx | 44 +-
Code/IO/otbVectorDataKeywordlist.cxx | 296 +-
Code/IO/otbVectorDataKeywordlist.h | 86 +-
Code/IO/otbVectorImage.h | 76 +-
Code/IO/otbVectorImage.txx | 80 +-
Code/IO/otbWorldFile.h | 29 +-
.../otbChangeProfileKernelFunctor.cxx | 47 +-
Code/Learning/otbChangeProfileKernelFunctor.h | 13 +-
.../otbCzihoSOMLearningBehaviorFunctor.h | 53 +-
.../otbCzihoSOMNeighborhoodBehaviorFunctor.h | 32 +-
.../otbExhaustiveExponentialOptimizer.cxx | 106 +-
.../otbExhaustiveExponentialOptimizer.h | 88 +-
Code/Learning/otbGaussianModelComponent.h | 33 +-
Code/Learning/otbGaussianModelComponent.txx | 109 +-
.../otbKMeansImageClassificationFilter.h | 53 +-
.../otbKMeansImageClassificationFilter.txx | 103 +-
.../otbMixturePolyRBFKernelFunctor.cxx | 87 +-
.../Learning/otbMixturePolyRBFKernelFunctor.h | 16 +-
Code/Learning/otbModelComponentBase.h | 33 +-
Code/Learning/otbModelComponentBase.txx | 113 +-
.../otbNonGaussianRBFKernelFunctor.cxx | 36 +-
.../Learning/otbNonGaussianRBFKernelFunctor.h | 13 +-
Code/Learning/otbPeriodicSOM.h | 44 +-
Code/Learning/otbPeriodicSOM.txx | 62 +-
Code/Learning/otbROIdataConversion.h | 48 +-
Code/Learning/otbROIdataConversion.txx | 84 +-
Code/Learning/otbSEMClassifier.h | 94 +-
Code/Learning/otbSEMClassifier.txx | 607 +-
Code/Learning/otbSOM.h | 82 +-
Code/Learning/otbSOM.txx | 192 +-
Code/Learning/otbSOMActivationBuilder.h | 28 +-
Code/Learning/otbSOMActivationBuilder.txx | 24 +-
Code/Learning/otbSOMClassifier.h | 32 +-
Code/Learning/otbSOMClassifier.txx | 57 +-
.../otbSOMImageClassificationFilter.h | 61 +-
.../otbSOMImageClassificationFilter.txx | 100 +-
Code/Learning/otbSOMLearningBehaviorFunctor.h | 21 +-
Code/Learning/otbSOMMap.h | 34 +-
Code/Learning/otbSOMMap.txx | 38 +-
Code/Learning/otbSOMWithMissingValue.h | 86 +-
Code/Learning/otbSOMWithMissingValue.txx | 66 +-
Code/Learning/otbSOMbasedImageFilter.h | 147 +-
Code/Learning/otbSOMbasedImageFilter.txx | 68 +-
Code/Learning/otbSVMClassifier.h | 28 +-
Code/Learning/otbSVMClassifier.txx | 73 +-
.../otbSVMCrossValidationCostFunction.h | 41 +-
.../otbSVMCrossValidationCostFunction.txx | 246 +-
.../otbSVMImageClassificationFilter.h | 49 +-
.../otbSVMImageClassificationFilter.txx | 94 +-
.../otbSVMImageClassificationWithRuleFilter.h | 70 +-
...tbSVMImageClassificationWithRuleFilter.txx | 120 +-
Code/Learning/otbSVMImageModelEstimator.h | 26 +-
Code/Learning/otbSVMImageModelEstimator.txx | 70 +-
Code/Learning/otbSVMKernels.h | 434 +-
Code/Learning/otbSVMModel.h | 76 +-
Code/Learning/otbSVMModel.txx | 465 +-
Code/Learning/otbSVMModelEstimator.h | 48 +-
Code/Learning/otbSVMModelEstimator.txx | 188 +-
Code/Learning/otbSVMPointSetModelEstimator.h | 29 +-
.../Learning/otbSVMPointSetModelEstimator.txx | 100 +-
.../Learning/otbSVMSampleListModelEstimator.h | 54 +-
.../otbSVMSampleListModelEstimator.txx | 51 +-
.../otbSpectralAngleKernelFunctor.cxx | 32 +-
Code/Learning/otbSpectralAngleKernelFunctor.h | 17 +-
Code/Markov/otbMRFEnergy.h | 160 +-
Code/Markov/otbMRFEnergyEdgeFidelity.h | 25 +-
Code/Markov/otbMRFEnergyGaussian.h | 24 +-
.../otbMRFEnergyGaussianClassification.h | 37 +-
Code/Markov/otbMRFEnergyPotts.h | 30 +-
Code/Markov/otbMRFOptimizer.h | 20 +-
Code/Markov/otbMRFOptimizerICM.h | 13 +-
Code/Markov/otbMRFOptimizerMetropolis.h | 36 +-
Code/Markov/otbMRFSampler.h | 61 +-
Code/Markov/otbMRFSamplerMAP.h | 41 +-
Code/Markov/otbMRFSamplerRandom.h | 15 +-
Code/Markov/otbMRFSamplerRandomMAP.h | 90 +-
Code/Markov/otbMarkovRandomFieldFilter.h | 173 +-
Code/Markov/otbMarkovRandomFieldFilter.txx | 253 +-
.../otbConvexOrConcaveClassificationFilter.h | 89 +-
...odesicMorphologyDecompositionImageFilter.h | 58 +-
...esicMorphologyDecompositionImageFilter.txx | 36 +-
...phologyIterativeDecompositionImageFilter.h | 52 +-
...ologyIterativeDecompositionImageFilter.txx | 84 +-
.../otbGeodesicMorphologyLevelingFilter.h | 67 +-
Code/MultiScale/otbImageToProfileFilter.h | 52 +-
Code/MultiScale/otbImageToProfileFilter.txx | 61 +-
.../otbMorphologicalClosingProfileFilter.h | 42 +-
.../otbMorphologicalOpeningProfileFilter.h | 42 +-
.../otbMorphologicalPyramidAnalysisFilter.h | 44 +-
.../otbMorphologicalPyramidAnalysisFilter.txx | 122 +-
.../otbMorphologicalPyramidMRToMSConverter.h | 34 +-
...otbMorphologicalPyramidMRToMSConverter.txx | 148 +-
.../otbMorphologicalPyramidResampler.h | 30 +-
.../otbMorphologicalPyramidResampler.txx | 72 +-
...tbMorphologicalPyramidSegmentationFilter.h | 56 +-
...MorphologicalPyramidSegmentationFilter.txx | 57 +-
.../otbMorphologicalPyramidSegmenter.h | 44 +-
.../otbMorphologicalPyramidSegmenter.txx | 137 +-
.../otbMorphologicalPyramidSynthesisFilter.h | 56 +-
...otbMorphologicalPyramidSynthesisFilter.txx | 110 +-
...ScaleConvexOrConcaveClassificationFilter.h | 75 +-
...ivativeToMultiScaleCharacteristicsFilter.h | 49 +-
...ativeToMultiScaleCharacteristicsFilter.txx | 135 +-
.../otbProfileToProfileDerivativeFilter.h | 38 +-
.../otbProfileToProfileDerivativeFilter.txx | 58 +-
Code/MultiScale/otbSubsampleImageFilter.h | 67 +-
Code/MultiScale/otbSubsampleImageFilter.txx | 185 +-
Code/MultiScale/otbWaveletFilterBank.h | 183 +-
Code/MultiScale/otbWaveletFilterBank.txx | 1256 ++-
.../MultiScale/otbWaveletForwardTransform.txx | 82 +-
Code/MultiScale/otbWaveletGenerator.cxx | 436 +-
Code/MultiScale/otbWaveletGenerator.h | 28 +-
Code/MultiScale/otbWaveletHighPassOperator.h | 54 +-
Code/MultiScale/otbWaveletLowPassOperator.h | 54 +-
Code/MultiScale/otbWaveletOperator.h | 24 +-
Code/MultiScale/otbWaveletOperatorBase.h | 115 +-
Code/MultiScale/otbWaveletOperatorBase.txx | 165 +-
.../otbWaveletPacketDecompositionCosts.h | 24 +-
Code/MultiScale/otbWaveletPacketTransform.h | 156 +-
Code/MultiScale/otbWaveletPacketTransform.txx | 253 +-
Code/MultiScale/otbWaveletTransform.h | 128 +-
Code/MultiScale/otbWaveletTransform.txx | 206 +-
Code/Projections/otbCompositeTransform.h | 61 +-
Code/Projections/otbCompositeTransform.txx | 67 +-
Code/Projections/otbEckert4MapProjection.h | 32 +-
Code/Projections/otbEckert4MapProjection.txx | 9 +-
Code/Projections/otbForwardSensorModel.h | 35 +-
Code/Projections/otbForwardSensorModel.txx | 65 +-
.../otbGCPsToRPCSensorModelImageFilter.h | 122 +-
.../otbGCPsToRPCSensorModelImageFilter.txx | 260 +-
Code/Projections/otbGenericMapProjection.h | 58 +-
Code/Projections/otbGenericMapProjection.txx | 125 +-
Code/Projections/otbGenericRSTransform.h | 363 +-
Code/Projections/otbGenericRSTransform.txx | 211 +-
Code/Projections/otbGeocentricTransform.h | 110 +-
Code/Projections/otbGeocentricTransform.txx | 80 +-
Code/Projections/otbInverseSensorModel.h | 37 +-
Code/Projections/otbInverseSensorModel.txx | 53 +-
.../Projections/otbLambert2EtenduProjection.h | 28 +-
.../otbLambert2EtenduProjection.txx | 17 +-
.../otbLambert3CartoSudProjection.h | 28 +-
.../otbLambert3CartoSudProjection.txx | 16 +-
Code/Projections/otbLambert93Projection.h | 28 +-
Code/Projections/otbLambert93Projection.txx | 17 +-
.../otbLambertConformalConicMapProjection.h | 38 +-
.../otbLambertConformalConicMapProjection.txx | 11 +-
.../otbLeastSquareAffineTransformEstimator.h | 78 +-
...otbLeastSquareAffineTransformEstimator.txx | 103 +-
Code/Projections/otbMapProjection.h | 87 +-
Code/Projections/otbMapProjection.txx | 246 +-
Code/Projections/otbMapProjections.h | 134 +-
Code/Projections/otbMapToMapProjection.h | 57 +-
Code/Projections/otbMapToMapProjection.txx | 67 +-
Code/Projections/otbMollweidMapProjection.h | 29 +-
Code/Projections/otbMollweidMapProjection.txx | 9 +-
.../Projections/otbOrthoRectificationFilter.h | 56 +-
.../otbOrthoRectificationFilter.txx | 10 +-
Code/Projections/otbPlaceNameToLonLat.cxx | 92 +-
Code/Projections/otbPlaceNameToLonLat.h | 34 +-
Code/Projections/otbSVY21MapProjection.h | 28 +-
Code/Projections/otbSVY21MapProjection.txx | 15 +-
Code/Projections/otbSensorModelBase.h | 52 +-
Code/Projections/otbSensorModelBase.txx | 106 +-
Code/Projections/otbSinusoidalMapProjection.h | 30 +-
.../otbSinusoidalMapProjection.txx | 10 +-
Code/Projections/otbTileMapTransform.h | 45 +-
Code/Projections/otbTileMapTransform.txx | 54 +-
.../otbTransMercatorMapProjection.h | 31 +-
.../otbTransMercatorMapProjection.txx | 13 +-
Code/Projections/otbUtmMapProjection.h | 32 +-
Code/Projections/otbUtmMapProjection.txx | 30 +-
.../otbVectorDataProjectionFilter.h | 110 +-
.../otbVectorDataProjectionFilter.txx | 371 +-
Code/Radiometry/otbAeronetData.cxx | 10 +-
Code/Radiometry/otbAeronetData.h | 48 +-
Code/Radiometry/otbAeronetFileReader.cxx | 220 +-
Code/Radiometry/otbAeronetFileReader.h | 74 +-
.../otbAtmosphericCorrectionParameters.cxx | 92 +-
.../otbAtmosphericCorrectionParameters.h | 152 +-
...arametersTo6SAtmosphericRadiativeTerms.cxx | 68 +-
...nParametersTo6SAtmosphericRadiativeTerms.h | 22 +-
.../otbAtmosphericRadiativeTerms.cxx | 328 +-
.../Radiometry/otbAtmosphericRadiativeTerms.h | 135 +-
Code/Radiometry/otbBuiltUpIndicesFunctor.h | 50 +-
.../otbDEMCaracteristicsExtractor.h | 80 +-
.../otbDEMCaracteristicsExtractor.txx | 116 +-
Code/Radiometry/otbGAndRIndexImageFilter.h | 45 +-
Code/Radiometry/otbGAndRIndexImageFilter.txx | 27 +-
.../otbImageToLuminanceImageFilter.h | 111 +-
.../otbImageToReflectanceImageFilter.h | 194 +-
.../otbLuminanceToReflectanceImageFilter.h | 162 +-
.../otbMultiChannelGAndRIndexImageFilter.h | 46 +-
...bMultiChannelRAndBAndNIRIndexImageFilter.h | 54 +-
...nelRAndBAndNIRVegetationIndexImageFilter.h | 10 +-
...bMultiChannelRAndGAndNIRIndexImageFilter.h | 54 +-
...nelRAndGAndNIRVegetationIndexImageFilter.h | 10 +-
.../otbMultiChannelRAndNIRIndexImageFilter.h | 46 +-
...ChannelRAndNIRVegetationIndexImageFilter.h | 8 +-
.../otbRAndBAndNIRIndexImageFilter.h | 40 +-
.../otbRAndBAndNIRIndexImageFilter.txx | 34 +-
...otbRAndBAndNIRVegetationIndexImageFilter.h | 13 +-
.../otbRAndGAndNIRIndexImageFilter.h | 40 +-
.../otbRAndGAndNIRIndexImageFilter.txx | 34 +-
...otbRAndGAndNIRVegetationIndexImageFilter.h | 41 +-
Code/Radiometry/otbRAndNIRIndexImageFilter.h | 45 +-
.../Radiometry/otbRAndNIRIndexImageFilter.txx | 27 +-
.../otbRAndNIRVegetationIndexImageFilter.h | 10 +-
...flectanceToSurfaceReflectanceImageFilter.h | 100 +-
...ectanceToSurfaceReflectanceImageFilter.txx | 140 +-
Code/Radiometry/otbSIXSTraits.cxx | 258 +-
Code/Radiometry/otbSIXSTraits.h | 69 +-
Code/Radiometry/otbSoilIndicesFunctor.h | 81 +-
...aceAdjencyEffect6SCorrectionSchemeFilter.h | 155 +-
...eAdjencyEffect6SCorrectionSchemeFilter.txx | 169 +-
.../Radiometry/otbTerraSarBrightnessFunctor.h | 42 +-
.../otbTerraSarBrightnessFunctor.txx | 40 +-
.../otbTerraSarBrightnessImageFilter.h | 69 +-
.../otbTerraSarBrightnessImageFilter.txx | 23 +-
.../otbTerraSarCalibrationFunctor.h | 92 +-
.../otbTerraSarCalibrationFunctor.txx | 73 +-
.../otbTerraSarCalibrationImageFilter.h | 103 +-
.../otbTerraSarCalibrationImageFilter.txx | 270 +-
Code/Radiometry/otbVegetationIndicesFunctor.h | 437 +-
Code/Radiometry/otbWaterIndicesFunctor.h | 139 +-
.../otbWaterSqrtSpectralAngleImageFilter.h | 33 +-
...MultiChannelsPolarimetricSynthesisFilter.h | 99 +-
...ltiChannelsPolarimetricSynthesisFilter.txx | 257 +-
Code/SARPolarimetry/otbPolarimetricData.cxx | 94 +-
Code/SARPolarimetry/otbPolarimetricData.h | 42 +-
.../otbPolarimetricSynthesisFilter.h | 107 +-
.../otbPolarimetricSynthesisFilter.txx | 302 +-
.../otbPolarimetricSynthesisFunctor.h | 25 +-
.../otbImageListToRCC8GraphFilter.h | 46 +-
.../otbImageListToRCC8GraphFilter.txx | 22 +-
...bImageMultiSegmentationToRCC8GraphFilter.h | 34 +-
...mageMultiSegmentationToRCC8GraphFilter.txx | 207 +-
.../otbImageToImageRCC8Calculator.h | 36 +-
.../otbImageToImageRCC8Calculator.txx | 226 +-
.../otbPolygonListToRCC8GraphFilter.h | 50 +-
.../otbPolygonListToRCC8GraphFilter.txx | 289 +-
.../otbPolygonToPolygonRCC8Calculator.h | 40 +-
.../otbPolygonToPolygonRCC8Calculator.txx | 238 +-
Code/SpatialReasoning/otbRCC8Edge.cxx | 6 +-
Code/SpatialReasoning/otbRCC8Edge.h | 14 +-
Code/SpatialReasoning/otbRCC8EdgeIterator.h | 28 +-
Code/SpatialReasoning/otbRCC8EdgeIterator.txx | 82 +-
Code/SpatialReasoning/otbRCC8Graph.h | 38 +-
Code/SpatialReasoning/otbRCC8Graph.txx | 40 +-
.../SpatialReasoning/otbRCC8GraphFileReader.h | 32 +-
.../otbRCC8GraphFileReader.txx | 84 +-
.../SpatialReasoning/otbRCC8GraphFileWriter.h | 42 +-
.../otbRCC8GraphFileWriter.txx | 88 +-
Code/SpatialReasoning/otbRCC8GraphSource.h | 20 +-
Code/SpatialReasoning/otbRCC8GraphSource.txx | 12 +-
Code/SpatialReasoning/otbRCC8InEdgeIterator.h | 30 +-
.../otbRCC8InEdgeIterator.txx | 76 +-
.../SpatialReasoning/otbRCC8OutEdgeIterator.h | 30 +-
.../otbRCC8OutEdgeIterator.txx | 76 +-
Code/SpatialReasoning/otbRCC8Value.h | 6 +-
Code/SpatialReasoning/otbRCC8VertexBase.h | 32 +-
Code/SpatialReasoning/otbRCC8VertexBase.txx | 66 +-
Code/SpatialReasoning/otbRCC8VertexIterator.h | 24 +-
.../otbRCC8VertexIterator.txx | 70 +-
.../otbRCC8VertexWithCompacity.h | 18 +-
.../otbRCC8VertexWithCompacity.txx | 34 +-
.../otbRCC8VertexWithRegionCenter.h | 23 +-
.../otbRCC8VertexWithRegionCenter.txx | 44 +-
Code/Testing/otbTestDriver.cxx | 108 +-
Code/Testing/otbTestHelper.cxx | 928 +-
Code/Testing/otbTestHelper.h | 38 +-
Code/Testing/otbTestMain.h | 542 +-
Code/Visu/otbFixedSizeFullImageWidget.h | 46 +-
Code/Visu/otbFixedSizeFullImageWidget.txx | 40 +-
Code/Visu/otbFullResolutionImageWidget.h | 20 +-
Code/Visu/otbFullResolutionImageWidget.txx | 38 +-
Code/Visu/otbGluPolygonDrawingHelper.cxx | 150 +-
Code/Visu/otbGluPolygonDrawingHelper.h | 22 +-
.../otbHistogramAndTransferFunctionWidget.h | 98 +-
.../otbHistogramAndTransferFunctionWidget.txx | 392 +-
Code/Visu/otbImageAlternateViewer.h | 113 +-
Code/Visu/otbImageAlternateViewer.txx | 1054 +-
.../otbImageToGrayscaleAnaglyphImageFilter.h | 59 +-
Code/Visu/otbImageViewer.h | 26 +-
Code/Visu/otbImageViewer.txx | 125 +-
Code/Visu/otbImageViewerBase.h | 298 +-
Code/Visu/otbImageViewerBase.txx | 855 +-
...ImageViewerFullResolutionEventsInterface.h | 40 +-
Code/Visu/otbImageViewerFullWidget.h | 451 +-
...ViewerHistogramAndTransferFunctionWidget.h | 149 +-
Code/Visu/otbImageViewerScrollWidget.h | 94 +-
Code/Visu/otbImageViewerZoomWidget.h | 145 +-
Code/Visu/otbImageWidgetBase.h | 110 +-
Code/Visu/otbImageWidgetBase.txx | 329 +-
Code/Visu/otbImageWidgetBoxForm.h | 70 +-
Code/Visu/otbImageWidgetCircleForm.cxx | 33 +-
Code/Visu/otbImageWidgetCircleForm.h | 24 +-
Code/Visu/otbImageWidgetFormBase.h | 55 +-
Code/Visu/otbImageWidgetPointForm.h | 42 +-
Code/Visu/otbImageWidgetPolygonForm.h | 31 +-
Code/Visu/otbImageWidgetPolygonForm.txx | 29 +-
Code/Visu/otbImageWidgetPolylineForm.h | 33 +-
Code/Visu/otbImageWidgetPolylineForm.txx | 29 +-
Code/Visu/otbImageWidgetRectangleForm.h | 64 +-
Code/Visu/otbImageWidgetTransferFunction.h | 178 +-
...torImageToColorAnaglyphVectorImageFilter.h | 76 +-
Code/Visu/otbZoomableImageWidget.h | 20 +-
Code/Visu/otbZoomableImageWidget.txx | 40 +-
Code/Visualization/otbAlphaBlendingFunction.h | 48 +-
Code/Visualization/otbAmplitudeFunctor.h | 205 +-
.../otbArrowKeyMoveActionHandler.h | 378 +-
Code/Visualization/otbBlendingFunction.h | 14 +-
Code/Visualization/otbBlendingImageFilter.h | 48 +-
.../otbChangeExtractRegionActionHandler.h | 50 +-
.../otbChangeScaleActionHandler.h | 54 +-
...tbChangeScaledExtractRegionActionHandler.h | 44 +-
.../Visualization/otbChannelSelectorFunctor.h | 438 +-
Code/Visualization/otbCircleGlComponent.cxx | 80 +-
Code/Visualization/otbCircleGlComponent.h | 61 +-
Code/Visualization/otbCrossGlComponent.cxx | 58 +-
Code/Visualization/otbCrossGlComponent.h | 79 +-
Code/Visualization/otbCurve2D.h | 36 +-
Code/Visualization/otbCurves2DWidget.cxx | 117 +-
Code/Visualization/otbCurves2DWidget.h | 86 +-
Code/Visualization/otbGlComponent.h | 28 +-
Code/Visualization/otbGlWidget.cxx | 56 +-
Code/Visualization/otbGlWidget.h | 40 +-
.../Visualization/otbHistogramActionHandler.h | 225 +-
Code/Visualization/otbHistogramCurve.h | 42 +-
Code/Visualization/otbHistogramCurve.txx | 88 +-
Code/Visualization/otbImageLayer.h | 125 +-
Code/Visualization/otbImageLayer.txx | 199 +-
Code/Visualization/otbImageLayerBase.h | 98 +-
Code/Visualization/otbImageLayerGenerator.h | 115 +-
Code/Visualization/otbImageLayerGenerator.txx | 51 +-
.../otbImageLayerRenderingModel.h | 66 +-
.../otbImageLayerRenderingModel.txx | 126 +-
.../otbImageLayerRenderingModelListener.h | 6 +-
Code/Visualization/otbImageView.h | 58 +-
Code/Visualization/otbImageView.txx | 88 +-
Code/Visualization/otbImageWidget.h | 60 +-
Code/Visualization/otbImageWidget.txx | 141 +-
.../otbImageWidgetActionHandler.h | 38 +-
.../otbImageWidgetController.cxx | 33 +-
Code/Visualization/otbImageWidgetController.h | 28 +-
Code/Visualization/otbLayerBasedModel.h | 27 +-
Code/Visualization/otbLayerBasedModel.txx | 30 +-
Code/Visualization/otbListenerBase.h | 6 +-
Code/Visualization/otbMVCModel.h | 21 +-
.../otbMouseClickActionHandler.h | 89 +-
.../otbMultiplyBlendingFunction.h | 109 +-
Code/Visualization/otbPackedWidgetManager.cxx | 36 +-
Code/Visualization/otbPackedWidgetManager.h | 40 +-
Code/Visualization/otbPhaseFunctor.h | 201 +-
.../otbPixelDescriptionActionHandler.h | 68 +-
Code/Visualization/otbPixelDescriptionModel.h | 30 +-
.../otbPixelDescriptionModel.txx | 14 +-
.../otbPixelDescriptionModelListener.h | 6 +-
Code/Visualization/otbPixelDescriptionView.h | 26 +-
.../Visualization/otbPixelDescriptionView.txx | 19 +-
Code/Visualization/otbRegionGlComponent.h | 52 +-
Code/Visualization/otbRenderingFunction.h | 97 +-
Code/Visualization/otbRenderingImageFilter.h | 89 +-
.../otbSelectAreaActionHandler.h | 135 +-
.../otbSplittedWidgetManager.cxx | 41 +-
Code/Visualization/otbSplittedWidgetManager.h | 41 +-
Code/Visualization/otbStandardImageViewer.h | 109 +-
Code/Visualization/otbStandardImageViewer.txx | 161 +-
.../otbStandardRenderingFunction.h | 282 +-
.../otbUniformAlphaBlendingFunction.h | 29 +-
.../otbVectorDataActionHandler.h | 70 +-
Code/Visualization/otbVectorDataGlComponent.h | 107 +-
.../otbVectorDataGlComponent.txx | 199 +-
Code/Visualization/otbVectorDataModel.cxx | 122 +-
Code/Visualization/otbVectorDataModel.h | 29 +-
.../otbVerticalAsymptoteCurve.cxx | 24 +-
.../Visualization/otbVerticalAsymptoteCurve.h | 51 +-
.../otbVisualizationPixelTraits.h | 66 +-
Code/Visualization/otbWidgetManager.h | 40 +-
.../otbWidgetResizingActionHandler.h | 68 +-
1055 files changed, 54217 insertions(+), 55961 deletions(-)
diff --git a/Code/BasicFilters/otbAmplitudePhaseToRGBFunctor.h b/Code/BasicFilters/otbAmplitudePhaseToRGBFunctor.h
index e496ef42d4..73358b82ef 100644
--- a/Code/BasicFilters/otbAmplitudePhaseToRGBFunctor.h
+++ b/Code/BasicFilters/otbAmplitudePhaseToRGBFunctor.h
@@ -26,81 +26,81 @@
namespace otb
{
- namespace Functor
- {
- /**
- * \class AmplitudePhaseToRGBFunctor
- * \brief Function object to compute a color representation of a radar image.
- *
- * This class is useful for visualizing radar images with a combination of
- * the phase and the amplitude at the same time.
- *
- * The amplitude is used to represent the intensity of the pixel and the phase
- * to represent it's hue.
- *
- * Amplitude and phase can be obtained using the itk::ComplexToModulusImageFilter
- * and itk::ComplexToPhaseImageFilter for example.
- *
- */
- template< class TInput1, class TInput2=TInput1, class TInput3=TInput1, class TOutput=TInput1>
- class ITK_EXPORT AmplitudePhaseToRGBFunctor
+namespace Functor
+{
+/**
+ * \class AmplitudePhaseToRGBFunctor
+ * \brief Function object to compute a color representation of a radar image.
+ *
+ * This class is useful for visualizing radar images with a combination of
+ * the phase and the amplitude at the same time.
+ *
+ * The amplitude is used to represent the intensity of the pixel and the phase
+ * to represent it's hue.
+ *
+ * Amplitude and phase can be obtained using the itk::ComplexToModulusImageFilter
+ * and itk::ComplexToPhaseImageFilter for example.
+ *
+ */
+template<class TInput1, class TInput2 = TInput1, class TInput3 = TInput1, class TOutput = TInput1>
+class ITK_EXPORT AmplitudePhaseToRGBFunctor
+{
+public:
+ typedef TOutput RGBPixelType;
+ typedef typename RGBPixelType::ValueType RGBComponentType;
+ typedef HSVToRGBFunctor<RGBPixelType> HSVToRGBFunctorType;
+ typedef TInput1 ScalarType;
+
+ AmplitudePhaseToRGBFunctor()
{
- public:
- typedef TOutput RGBPixelType;
- typedef typename RGBPixelType::ValueType RGBComponentType;
- typedef HSVToRGBFunctor<RGBPixelType> HSVToRGBFunctorType;
- typedef TInput1 ScalarType;
-
- AmplitudePhaseToRGBFunctor()
- {
- m_Minimum = 0;
- m_Maximum = itk::NumericTraits<ScalarType>::max();
- };
- ~AmplitudePhaseToRGBFunctor(){};
-
- void SetMaximum(ScalarType max)
- {
- this->m_Maximum = max;
- }
-
- void SetMinimum(ScalarType min)
- {
- this->m_Minimum = min;
- }
-
- inline TOutput operator()( const TInput1 & amplitude, const TInput2 & coherence, const TInput3 & phase) const
- {
-// std::cout << amplitude << " - " << phase << std::endl;
- double hinc, sinc, vinc;
- hinc=0.6/(CONST_2PI);
- sinc=0.0;
- vinc=0.0;
-
- double hue, sat, val;
-
- hue = 0.6 - (phase+CONST_PI)*hinc;
- sat = 0.6*coherence+0.3;
- val = itk::NumericTraits<RGBComponentType>::max()/2
- * ( (amplitude-m_Minimum)/(m_Maximum-m_Minimum)+1.0);
-
- if (amplitude < m_Minimum)
- {
- val = 0;
- }
- if (amplitude > m_Maximum)
- {
- val = itk::NumericTraits<RGBComponentType>::max();
- }
-
- return m_HSVToRGBFunctor(hue, sat, val);
-
- }
- private:
- ScalarType m_Maximum;
- ScalarType m_Minimum;
- HSVToRGBFunctorType m_HSVToRGBFunctor;
+ m_Minimum = 0;
+ m_Maximum = itk::NumericTraits<ScalarType>::max();
};
+ ~AmplitudePhaseToRGBFunctor(){}
+
+ void SetMaximum(ScalarType max)
+ {
+ this->m_Maximum = max;
+ }
+
+ void SetMinimum(ScalarType min)
+ {
+ this->m_Minimum = min;
}
+ inline TOutput operator ()(const TInput1& amplitude, const TInput2& coherence, const TInput3& phase) const
+ {
+// std::cout << amplitude << " - " << phase << std::endl;
+ double hinc, sinc, vinc;
+ hinc = 0.6 / (CONST_2PI);
+ sinc = 0.0;
+ vinc = 0.0;
+
+ double hue, sat, val;
+
+ hue = 0.6 - (phase + CONST_PI) * hinc;
+ sat = 0.6 * coherence + 0.3;
+ val = itk::NumericTraits<RGBComponentType>::max() / 2
+ * ((amplitude - m_Minimum) / (m_Maximum - m_Minimum) + 1.0);
+
+ if (amplitude < m_Minimum)
+ {
+ val = 0;
+ }
+ if (amplitude > m_Maximum)
+ {
+ val = itk::NumericTraits<RGBComponentType>::max();
+ }
+
+ return m_HSVToRGBFunctor(hue, sat, val);
+
+ }
+private:
+ ScalarType m_Maximum;
+ ScalarType m_Minimum;
+ HSVToRGBFunctorType m_HSVToRGBFunctor;
+};
+}
+
}
#endif
diff --git a/Code/BasicFilters/otbBSplineDecompositionImageFilter.h b/Code/BasicFilters/otbBSplineDecompositionImageFilter.h
index a0a970131f..484c8edff6 100644
--- a/Code/BasicFilters/otbBSplineDecompositionImageFilter.h
+++ b/Code/BasicFilters/otbBSplineDecompositionImageFilter.h
@@ -36,29 +36,29 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT BSplineDecompositionImageFilter :
- public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef BSplineDecompositionImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef BSplineDecompositionImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(BSplineDecompositionImageFilter, ImageToImageFilter);
/** New macro for creation of through a Smart Pointer */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Inherit input and output image types from Superclass. */
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::InputImagePointer InputImagePointer;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::InputImagePointer InputImagePointer;
typedef typename Superclass::InputImageConstPointer InputImageConstPointer;
- typedef typename Superclass::OutputImagePointer OutputImagePointer;
+ typedef typename Superclass::OutputImagePointer OutputImagePointer;
/** Dimension underlying input image. */
- itkStaticConstMacro(ImageDimension, unsigned int,TInputImage::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, TInputImage::ImageDimension);
itkStaticConstMacro(OutputImageDimension, unsigned int,
TOutputImage::ImageDimension);
@@ -72,24 +72,23 @@ public:
protected:
BSplineDecompositionImageFilter();
- virtual ~BSplineDecompositionImageFilter() {};
+ virtual ~BSplineDecompositionImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
- void GenerateData( );
+ void GenerateData();
/** These are needed by the smoothing spline routine. */
- std::vector<double> m_Scratch; // temp storage for processing of Coefficients
- typename TInputImage::SizeType m_DataLength; // Image size
- unsigned int m_SplineOrder; // User specified spline order (3rd or cubic is the default)
- double m_SplinePoles[3];// Poles calculated for a given spline order
- int m_NumberOfPoles; // number of poles
- double m_Tolerance; // Tolerance used for determining initial causal coefficient
- unsigned int m_IteratorDirection; // Direction for iterator incrementing
-
+ std::vector<double> m_Scratch; // temp storage for processing of Coefficients
+ typename TInputImage::SizeType m_DataLength; // Image size
+ unsigned int m_SplineOrder; // User specified spline order (3rd or cubic is the default)
+ double m_SplinePoles[3]; // Poles calculated for a given spline order
+ int m_NumberOfPoles; // number of poles
+ double m_Tolerance; // Tolerance used for determining initial causal coefficient
+ unsigned int m_IteratorDirection; // Direction for iterator incrementing
private:
- BSplineDecompositionImageFilter( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ BSplineDecompositionImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Determines the poles given the Spline Order. */
virtual void SetPoles();
@@ -111,14 +110,13 @@ private:
void CopyImageToImage();
/** Copies a vector of data from the Coefficients image to the m_Scratch vector. */
- void CopyCoefficientsToScratch( OutputLinearIterator & );
+ void CopyCoefficientsToScratch(OutputLinearIterator&);
/** Copies a vector of data from m_Scratch to the Coefficients image. */
- void CopyScratchToCoefficients( OutputLinearIterator & );
+ void CopyScratchToCoefficients(OutputLinearIterator&);
};
-
} // namespace itk
#ifndef OTB_MANUAL_INSTANTIATION
@@ -126,4 +124,3 @@ private:
#endif
#endif
-
diff --git a/Code/BasicFilters/otbBSplineDecompositionImageFilter.txx b/Code/BasicFilters/otbBSplineDecompositionImageFilter.txx
index 2512d8da06..adb5161004 100644
--- a/Code/BasicFilters/otbBSplineDecompositionImageFilter.txx
+++ b/Code/BasicFilters/otbBSplineDecompositionImageFilter.txx
@@ -40,7 +40,6 @@ BSplineDecompositionImageFilter<TInputImage, TOutputImage>
this->SetSplineOrder(SplineOrder);
}
-
/**
* Standard "PrintSelf" method
*/
@@ -51,12 +50,11 @@ BSplineDecompositionImageFilter<TInputImage, TOutputImage>
std::ostream& os,
itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "Spline Order: " << m_SplineOrder << std::endl;
}
-
template <class TInputImage, class TOutputImage>
bool
BSplineDecompositionImageFilter<TInputImage, TOutputImage>
@@ -69,63 +67,61 @@ BSplineDecompositionImageFilter<TInputImage, TOutputImage>
double c0 = 1.0;
if (m_DataLength[m_IteratorDirection] == 1) //Required by mirror boundaries
- {
+ {
return false;
- }
+ }
// Compute overall gain
for (int k = 0; k < m_NumberOfPoles; ++k)
- {
+ {
// Note for cubic splines lambda = 6
c0 = c0 * (1.0 - m_SplinePoles[k]) * (1.0 - 1.0 / m_SplinePoles[k]);
- }
+ }
// apply the gain
for (unsigned int n = 0; n < m_DataLength[m_IteratorDirection]; ++n)
- {
+ {
m_Scratch[n] *= c0;
- }
+ }
// loop over all poles
for (int k = 0; k < m_NumberOfPoles; ++k)
- {
+ {
// causal initialization
this->SetInitialCausalCoefficient(m_SplinePoles[k]);
// causal recursion
for (unsigned int n = 1; n < m_DataLength[m_IteratorDirection]; ++n)
- {
+ {
m_Scratch[n] += m_SplinePoles[k] * m_Scratch[n - 1];
- }
+ }
// anticausal initialization
this->SetInitialAntiCausalCoefficient(m_SplinePoles[k]);
// anticausal recursion
- for ( int n = m_DataLength[m_IteratorDirection] - 2; 0 <= n; n--)
- {
+ for (int n = m_DataLength[m_IteratorDirection] - 2; 0 <= n; n--)
+ {
m_Scratch[n] = m_SplinePoles[k] * (m_Scratch[n + 1] - m_Scratch[n]);
+ }
}
- }
return true;
}
-
template <class TInputImage, class TOutputImage>
void
BSplineDecompositionImageFilter<TInputImage, TOutputImage>
::SetSplineOrder(unsigned int SplineOrder)
{
if (SplineOrder == m_SplineOrder)
- {
+ {
return;
- }
+ }
m_SplineOrder = SplineOrder;
this->SetPoles();
this->Modified();
}
-
template <class TInputImage, class TOutputImage>
void
BSplineDecompositionImageFilter<TInputImage, TOutputImage>
@@ -135,7 +131,7 @@ BSplineDecompositionImageFilter<TInputImage, TOutputImage>
// See also, Handbook of Medical Imaging, Processing and Analysis, Ed. Isaac N. Bankman,
// 2000, pg. 416.
switch (m_SplineOrder)
- {
+ {
case 3:
m_NumberOfPoles = 1;
m_SplinePoles[0] = vcl_sqrt(3.0) - 2.0;
@@ -165,14 +161,13 @@ BSplineDecompositionImageFilter<TInputImage, TOutputImage>
default:
// SplineOrder not implemented yet.
itk::ExceptionObject err(__FILE__, __LINE__);
- err.SetLocation( ITK_LOCATION);
- err.SetDescription( "SplineOrder must be between 0 and 5. Requested spline order has not been implemented yet." );
+ err.SetLocation(ITK_LOCATION);
+ err.SetDescription("SplineOrder must be between 0 and 5. Requested spline order has not been implemented yet.");
throw err;
break;
- }
+ }
}
-
template <class TInputImage, class TOutputImage>
void
BSplineDecompositionImageFilter<TInputImage, TOutputImage>
@@ -181,45 +176,44 @@ BSplineDecompositionImageFilter<TInputImage, TOutputImage>
/* begining InitialCausalCoefficient */
/* See Unser, 1999, Box 2 for explaination */
- double sum, zn, z2n, iz;
- unsigned long horizon;
+ double sum, zn, z2n, iz;
+ unsigned long horizon;
/* this initialization corresponds to mirror boundaries */
horizon = m_DataLength[m_IteratorDirection];
zn = z;
if (m_Tolerance > 0.0)
- {
- horizon = (long)vcl_ceil(log(m_Tolerance) / vcl_log(fabs(z)));
- }
+ {
+ horizon = (long) vcl_ceil(log(m_Tolerance) / vcl_log(fabs(z)));
+ }
if (horizon < m_DataLength[m_IteratorDirection])
- {
+ {
/* accelerated loop */
sum = m_Scratch[0]; // verify this
for (unsigned int n = 1; n < horizon; ++n)
- {
+ {
sum += zn * m_Scratch[n];
zn *= z;
- }
+ }
m_Scratch[0] = sum;
- }
+ }
else
- {
+ {
/* full loop */
iz = 1.0 / z;
- z2n = vcl_pow(z, (double)(m_DataLength[m_IteratorDirection] - 1L));
+ z2n = vcl_pow(z, (double) (m_DataLength[m_IteratorDirection] - 1L));
sum = m_Scratch[0] + z2n * m_Scratch[m_DataLength[m_IteratorDirection] - 1L];
z2n *= z2n * iz;
for (unsigned int n = 1; n <= (m_DataLength[m_IteratorDirection] - 2); ++n)
- {
+ {
sum += (zn + z2n) * m_Scratch[n];
zn *= z;
z2n *= iz;
- }
+ }
m_Scratch[0] = sum / (1.0 - zn * zn);
- }
+ }
}
-
template <class TInputImage, class TOutputImage>
void
BSplineDecompositionImageFilter<TInputImage, TOutputImage>
@@ -233,7 +227,6 @@ BSplineDecompositionImageFilter<TInputImage, TOutputImage>
(z * m_Scratch[m_DataLength[m_IteratorDirection] - 2] + m_Scratch[m_DataLength[m_IteratorDirection] - 1]);
}
-
template <class TInputImage, class TOutputImage>
void
BSplineDecompositionImageFilter<TInputImage, TOutputImage>
@@ -250,20 +243,19 @@ BSplineDecompositionImageFilter<TInputImage, TOutputImage>
// Initialize coeffient array
this->CopyImageToImage(); // Coefficients are initialized to the input data
- for (unsigned int n=0; n < ImageDimension; ++n)
- {
+ for (unsigned int n = 0; n < ImageDimension; ++n)
+ {
m_IteratorDirection = n;
// Loop through each dimension
// Initialize iterators
- OutputLinearIterator CIterator( output, output->GetBufferedRegion() );
- CIterator.SetDirection( m_IteratorDirection );
+ OutputLinearIterator CIterator(output, output->GetBufferedRegion());
+ CIterator.SetDirection(m_IteratorDirection);
// For each data vector
- while ( !CIterator.IsAtEnd() )
- {
+ while (!CIterator.IsAtEnd())
+ {
// Copy coefficients to scratch
- this->CopyCoefficientsToScratch( CIterator );
-
+ this->CopyCoefficientsToScratch(CIterator);
// Perform 1D BSpline calculations
this->DataToCoefficients1D();
@@ -271,14 +263,13 @@ BSplineDecompositionImageFilter<TInputImage, TOutputImage>
// Copy scratch back to coefficients.
// Brings us back to the end of the line we were working on.
CIterator.GoToBeginOfLine();
- this->CopyScratchToCoefficients( CIterator ); // m_Scratch = m_Image;
+ this->CopyScratchToCoefficients(CIterator); // m_Scratch = m_Image;
CIterator.NextLine();
progress.CompletedPixel();
+ }
}
- }
}
-
/**
* Copy the input image into the output image
*/
@@ -288,61 +279,59 @@ BSplineDecompositionImageFilter<TInputImage, TOutputImage>
::CopyImageToImage()
{
- typedef itk::ImageRegionConstIteratorWithIndex< TInputImage > InputIterator;
- typedef itk::ImageRegionIterator< TOutputImage > OutputIterator;
- typedef typename TOutputImage::PixelType OutputPixelType;
+ typedef itk::ImageRegionConstIteratorWithIndex<TInputImage> InputIterator;
+ typedef itk::ImageRegionIterator<TOutputImage> OutputIterator;
+ typedef typename TOutputImage::PixelType OutputPixelType;
- InputIterator inIt( this->GetInput(), this->GetInput()->GetBufferedRegion() );
- OutputIterator outIt( this->GetOutput(), this->GetOutput()->GetBufferedRegion() );
+ InputIterator inIt(this->GetInput(), this->GetInput()->GetBufferedRegion());
+ OutputIterator outIt(this->GetOutput(), this->GetOutput()->GetBufferedRegion());
inIt = inIt.Begin();
outIt = outIt.Begin();
- while ( !outIt.IsAtEnd() )
- {
- outIt.Set( static_cast<OutputPixelType>( inIt.Get() ) );
+ while (!outIt.IsAtEnd())
+ {
+ outIt.Set(static_cast<OutputPixelType>(inIt.Get()));
++inIt;
++outIt;
- }
+ }
}
-
/**
* Copy the scratch to one line of the output image
*/
template <class TInputImage, class TOutputImage>
void
BSplineDecompositionImageFilter<TInputImage, TOutputImage>
-::CopyScratchToCoefficients(OutputLinearIterator & Iter)
+::CopyScratchToCoefficients(OutputLinearIterator& Iter)
{
typedef typename TOutputImage::PixelType OutputPixelType;
unsigned long j = 0;
- while ( !Iter.IsAtEndOfLine() )
- {
- Iter.Set( static_cast<OutputPixelType>( m_Scratch[j] ) );
+ while (!Iter.IsAtEndOfLine())
+ {
+ Iter.Set(static_cast<OutputPixelType>(m_Scratch[j]));
++Iter;
++j;
- }
+ }
}
-
/**
* Copy one line of the output image to the scratch
*/
template <class TInputImage, class TOutputImage>
void
BSplineDecompositionImageFilter<TInputImage, TOutputImage>
-::CopyCoefficientsToScratch(OutputLinearIterator & Iter)
+::CopyCoefficientsToScratch(OutputLinearIterator& Iter)
{
unsigned long j = 0;
- while ( !Iter.IsAtEndOfLine() )
- {
- m_Scratch[j] = static_cast<double>( Iter.Get() );
+ while (!Iter.IsAtEndOfLine())
+ {
+ m_Scratch[j] = static_cast<double>(Iter.Get());
++Iter;
++j;
- }
+ }
}
/**
@@ -359,18 +348,18 @@ BSplineDecompositionImageFilter<TInputImage, TOutputImage>
m_DataLength = inputPtr->GetBufferedRegion().GetSize();
unsigned long maxLength = 0;
- for ( unsigned int n = 0; n < ImageDimension; ++n )
- {
- if ( m_DataLength[n] > maxLength )
+ for (unsigned int n = 0; n < ImageDimension; ++n)
{
+ if (m_DataLength[n] > maxLength)
+ {
maxLength = m_DataLength[n];
+ }
}
- }
- m_Scratch.resize( maxLength );
+ m_Scratch.resize(maxLength);
// Allocate memory for output image
OutputImagePointer outputPtr = this->GetOutput();
- outputPtr->SetBufferedRegion( outputPtr->GetRequestedRegion() );
+ outputPtr->SetBufferedRegion(outputPtr->GetRequestedRegion());
outputPtr->Allocate();
// Calculate actual output
@@ -381,7 +370,6 @@ BSplineDecompositionImageFilter<TInputImage, TOutputImage>
}
-
} // namespace otb
#endif
diff --git a/Code/BasicFilters/otbBSplineInterpolateImageFunction.h b/Code/BasicFilters/otbBSplineInterpolateImageFunction.h
index 6509b97f35..9bec9c2a82 100644
--- a/Code/BasicFilters/otbBSplineInterpolateImageFunction.h
+++ b/Code/BasicFilters/otbBSplineInterpolateImageFunction.h
@@ -41,25 +41,24 @@ namespace otb
* \ingroup ImageFunctions
*/
template <
-class TImageType,
-class TCoordRep = double,
-class TCoefficientType = double >
+ class TImageType,
+ class TCoordRep = double,
+ class TCoefficientType = double>
class ITK_EXPORT BSplineInterpolateImageFunction :
- public itk::InterpolateImageFunction<TImageType,TCoordRep>
+ public itk::InterpolateImageFunction<TImageType, TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef BSplineInterpolateImageFunction Self;
- typedef itk::InterpolateImageFunction<TImageType,TCoordRep> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef BSplineInterpolateImageFunction Self;
+ typedef itk::InterpolateImageFunction<TImageType, TCoordRep> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(BSplineInterpolateImageFunction, InterpolateImageFunction);
-
/** New macro for creation of through a Smart Pointer */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** OutputType typedef support. */
typedef typename Superclass::OutputType OutputType;
@@ -68,7 +67,7 @@ public:
typedef typename Superclass::InputImageType InputImageType;
/** Dimension underlying input image. */
- itkStaticConstMacro(ImageDimension, unsigned int,Superclass::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, Superclass::ImageDimension);
/** Index typedef support. */
typedef typename Superclass::IndexType IndexType;
@@ -88,8 +87,8 @@ public:
/** Internal Coefficient typedef support */
typedef TCoefficientType CoefficientDataType;
typedef itk::Image<CoefficientDataType,
- itkGetStaticConstMacro(ImageDimension)
- > CoefficientImageType;
+ itkGetStaticConstMacro(ImageDimension)
+ > CoefficientImageType;
/** Define filter for calculating the BSpline coefficients */
typedef otb::BSplineDecompositionImageFilter<TImageType, CoefficientImageType>
@@ -105,85 +104,81 @@ public:
* ImageFunction::IsInsideBuffer() can be used to check bounds before
* calling the method. */
virtual OutputType EvaluateAtContinuousIndex(
- const ContinuousIndexType & index ) const;
+ const ContinuousIndexType& index) const;
/** Derivative typedef support */
typedef itk::CovariantVector<OutputType,
- itkGetStaticConstMacro(ImageDimension)
- > CovariantVectorType;
+ itkGetStaticConstMacro(ImageDimension)
+ > CovariantVectorType;
- CovariantVectorType EvaluateDerivative( const PointType & point ) const
+ CovariantVectorType EvaluateDerivative(const PointType& point) const
{
ContinuousIndexType index;
- this->GetInputImage()->TransformPhysicalPointToContinuousIndex( point, index );
- return ( this->EvaluateDerivativeAtContinuousIndex( index ) );
+ this->GetInputImage()->TransformPhysicalPointToContinuousIndex(point, index);
+ return (this->EvaluateDerivativeAtContinuousIndex(index));
}
CovariantVectorType EvaluateDerivativeAtContinuousIndex(
- const ContinuousIndexType & x ) const;
-
+ const ContinuousIndexType& x) const;
/** Get/Sets the Spline Order, supports 0th - 5th order splines. The default
* is a 3rd order spline. */
void SetSplineOrder(unsigned int SplineOrder);
itkGetMacro(SplineOrder, int);
-
/** Set the input image. This must be set by the user. */
virtual void SetInputImage(const TImageType * inputData);
-
/** Update coefficients filter. Coefficient filter are computed over the buffered
region of the input image. */
virtual void UpdateCoefficientsFilter(void);
protected:
BSplineInterpolateImageFunction();
- virtual ~BSplineInterpolateImageFunction() {};
- void operator=( const Self& ); //purposely not implemented
+ virtual ~BSplineInterpolateImageFunction() {}
+ void operator =(const Self&); //purposely not implemented
void PrintSelf(std::ostream& os, itk::Indent indent) const;
// These are needed by the smoothing spline routine.
- std::vector<CoefficientDataType> m_Scratch; // temp storage for processing of Coefficients
- typename TImageType::SizeType m_DataLength; // Image size
- unsigned int m_SplineOrder; // User specified spline order (3rd or cubic is the default)
+ std::vector<CoefficientDataType> m_Scratch; // temp storage for processing of Coefficients
+ typename TImageType::SizeType m_DataLength; // Image size
+ unsigned int m_SplineOrder; // User specified spline order (3rd or cubic is the default)
- typename CoefficientImageType::ConstPointer m_Coefficients; // Spline coefficients
+ typename CoefficientImageType::ConstPointer m_Coefficients; // Spline coefficients
private:
- BSplineInterpolateImageFunction( const Self& ); //purposely not implemented
+ BSplineInterpolateImageFunction(const Self &); //purposely not implemented
/** Determines the weights for interpolation of the value x */
- void SetInterpolationWeights( const ContinuousIndexType & x,
- const vnl_matrix<long> & EvaluateIndex,
- vnl_matrix<double> & weights,
- unsigned int splineOrder ) const;
+ void SetInterpolationWeights(const ContinuousIndexType& x,
+ const vnl_matrix<long>& EvaluateIndex,
+ vnl_matrix<double>& weights,
+ unsigned int splineOrder) const;
/** Determines the weights for the derivative portion of the value x */
- void SetDerivativeWeights( const ContinuousIndexType & x,
- const vnl_matrix<long> & EvaluateIndex,
- vnl_matrix<double> & weights,
- unsigned int splineOrder ) const;
+ void SetDerivativeWeights(const ContinuousIndexType& x,
+ const vnl_matrix<long>& EvaluateIndex,
+ vnl_matrix<double>& weights,
+ unsigned int splineOrder) const;
/** Precomputation for converting the 1D index of the interpolation neighborhood
* to an N-dimensional index. */
- void GeneratePointsToIndex( );
+ void GeneratePointsToIndex();
/** Determines the indicies to use give the splines region of support */
- void DetermineRegionOfSupport( vnl_matrix<long> & evaluateIndex,
- const ContinuousIndexType & x,
- unsigned int splineOrder ) const;
+ void DetermineRegionOfSupport(vnl_matrix<long>& evaluateIndex,
+ const ContinuousIndexType& x,
+ unsigned int splineOrder) const;
/** Set the indicies in evaluateIndex at the boundaries based on mirror
* boundary conditions. */
- void ApplyMirrorBoundaryConditions(vnl_matrix<long> & evaluateIndex,
+ void ApplyMirrorBoundaryConditions(vnl_matrix<long>& evaluateIndex,
unsigned int splineOrder) const;
+ Iterator m_CIterator; // Iterator for traversing spline coefficients.
+ unsigned long m_MaxNumberInterpolationPoints; // number of neighborhood points used for interpolation
+ std::vector<IndexType> m_PointsToIndex; // Preallocation of interpolation neighborhood indicies
- Iterator m_CIterator; // Iterator for traversing spline coefficients.
- unsigned long m_MaxNumberInterpolationPoints; // number of neighborhood points used for interpolation
- std::vector<IndexType> m_PointsToIndex; // Preallocation of interpolation neighborhood indicies
-
- CoefficientFilterPointer m_CoefficientFilter;
+ CoefficientFilterPointer m_CoefficientFilter;
RegionType m_CurrentBufferedRegion;
@@ -196,4 +191,3 @@ private:
#endif
#endif
-
diff --git a/Code/BasicFilters/otbBSplineInterpolateImageFunction.txx b/Code/BasicFilters/otbBSplineInterpolateImageFunction.txx
index 03c9af7d98..c8ac86b4af 100644
--- a/Code/BasicFilters/otbBSplineInterpolateImageFunction.txx
+++ b/Code/BasicFilters/otbBSplineInterpolateImageFunction.txx
@@ -33,7 +33,7 @@ namespace otb
* Constructor
*/
template <class TImageType, class TCoordRep, class TCoefficientType>
-BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
+BSplineInterpolateImageFunction<TImageType, TCoordRep, TCoefficientType>
::BSplineInterpolateImageFunction()
{
m_SplineOrder = 0;
@@ -49,19 +49,19 @@ BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
*/
template <class TImageType, class TCoordRep, class TCoefficientType>
void
-BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
+BSplineInterpolateImageFunction<TImageType, TCoordRep, TCoefficientType>
::PrintSelf(
std::ostream& os,
itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "Spline Order: " << m_SplineOrder << std::endl;
}
template <class TImageType, class TCoordRep, class TCoefficientType>
void
-BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
+BSplineInterpolateImageFunction<TImageType, TCoordRep, TCoefficientType>
::UpdateCoefficientsFilter(void)
{
m_CoefficientFilter->GetOutput()->UpdateOutputInformation();
@@ -69,15 +69,15 @@ BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
m_CoefficientFilter->GetOutput()->PropagateRequestedRegion();
m_CoefficientFilter->GetOutput()->UpdateOutputData();
m_Coefficients = m_CoefficientFilter->GetOutput();
- m_CurrentBufferedRegion =m_CoefficientFilter->GetInput()->GetBufferedRegion();
+ m_CurrentBufferedRegion = m_CoefficientFilter->GetInput()->GetBufferedRegion();
}
template <class TImageType, class TCoordRep, class TCoefficientType>
void
-BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
+BSplineInterpolateImageFunction<TImageType, TCoordRep, TCoefficientType>
::SetInputImage(const TImageType * inputData)
{
- if ( inputData )
- {
+ if (inputData)
+ {
m_CoefficientFilter->SetInput(inputData);
// the Coefficient Filter requires that the spline order and the input data be set.
@@ -92,52 +92,50 @@ BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
Superclass::SetInputImage(inputData);
m_DataLength = inputData->GetBufferedRegion().GetSize();
- }
+ }
else
- {
+ {
m_Coefficients = NULL;
- }
+ }
}
-
template <class TImageType, class TCoordRep, class TCoefficientType>
void
-BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
+BSplineInterpolateImageFunction<TImageType, TCoordRep, TCoefficientType>
::SetSplineOrder(unsigned int SplineOrder)
{
if (SplineOrder == m_SplineOrder)
- {
+ {
return;
- }
+ }
m_SplineOrder = SplineOrder;
- m_CoefficientFilter->SetSplineOrder( SplineOrder );
+ m_CoefficientFilter->SetSplineOrder(SplineOrder);
//this->SetPoles();
m_MaxNumberInterpolationPoints = 1;
- for (unsigned int n=0; n < ImageDimension; ++n)
- {
- m_MaxNumberInterpolationPoints *= ( m_SplineOrder + 1);
- }
- this->GeneratePointsToIndex( );
+ for (unsigned int n = 0; n < ImageDimension; ++n)
+ {
+ m_MaxNumberInterpolationPoints *= (m_SplineOrder + 1);
+ }
+ this->GeneratePointsToIndex();
}
-
template <class TImageType, class TCoordRep, class TCoefficientType>
typename
-BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
+BSplineInterpolateImageFunction<TImageType, TCoordRep, TCoefficientType>
::OutputType
-BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
-::EvaluateAtContinuousIndex( const ContinuousIndexType & x ) const
+BSplineInterpolateImageFunction<TImageType, TCoordRep, TCoefficientType>
+::EvaluateAtContinuousIndex(const ContinuousIndexType& x) const
{
//UpdateCoefficientsFilter();
- vnl_matrix<long> EvaluateIndex(ImageDimension, ( m_SplineOrder + 1 ));
+ vnl_matrix<long> EvaluateIndex(ImageDimension, (m_SplineOrder + 1));
// compute the interpolation indexes
this->DetermineRegionOfSupport(EvaluateIndex, x, m_SplineOrder);
// Determine weights
- vnl_matrix<double> weights(ImageDimension, ( m_SplineOrder + 1 ));
- SetInterpolationWeights( x, EvaluateIndex, weights, m_SplineOrder );
+ vnl_matrix<double> weights(ImageDimension, (m_SplineOrder + 1));
+ SetInterpolationWeights(x, EvaluateIndex, weights, m_SplineOrder);
//std::cout<<"EvaluateIndex: "<<std::endl;
//std::cout<<EvaluateIndex[0][0]<<"\t"<<EvaluateIndex[0][1]<<"\t"
@@ -149,26 +147,26 @@ BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
this->ApplyMirrorBoundaryConditions(EvaluateIndex, m_SplineOrder);
// perform interpolation
- double interpolated = 0.0;
+ double interpolated = 0.0;
IndexType coefficientIndex;
// Step through eachpoint in the N-dimensional interpolation cube.
for (unsigned int p = 0; p < m_MaxNumberInterpolationPoints; ++p)
- {
+ {
// translate each step into the N-dimensional index.
// IndexType pointIndex = PointToIndex( p );
double w = 1.0;
- for (unsigned int n = 0; n < ImageDimension; ++n )
- {
- w *= weights[n][ m_PointsToIndex[p][n] ];
+ for (unsigned int n = 0; n < ImageDimension; ++n)
+ {
+ w *= weights[n][m_PointsToIndex[p][n]];
coefficientIndex[n] = EvaluateIndex[n][m_PointsToIndex[p][n]]; // Build up ND index for coefficients.
//std::cout<<"From inside: "<<n<<" "<<p<<" "<<m_PointsToIndex[p][n]<<" "<< EvaluateIndex[n][m_PointsToIndex[p][n]]<<std::endl;
- }
+ }
//std::cout<<"CoefficientIndex: "<<coefficientIndex<<std::endl;
// Convert our step p to the appropriate point in ND space in the
// m_Coefficients cube.
interpolated += w * m_Coefficients->GetPixel(coefficientIndex);
- }
+ }
/* double interpolated = 0.0;
IndexType coefficientIndex;
@@ -189,75 +187,73 @@ BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
}
}
*/
- return(interpolated);
+ return (interpolated);
}
-
template <class TImageType, class TCoordRep, class TCoefficientType>
typename
-BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
-:: CovariantVectorType
-BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
-::EvaluateDerivativeAtContinuousIndex( const ContinuousIndexType & x ) const
+BSplineInterpolateImageFunction<TImageType, TCoordRep, TCoefficientType>
+::CovariantVectorType
+BSplineInterpolateImageFunction<TImageType, TCoordRep, TCoefficientType>
+::EvaluateDerivativeAtContinuousIndex(const ContinuousIndexType& x) const
{
UpdateCoefficientsFilter();
- vnl_matrix<long> EvaluateIndex(ImageDimension, ( m_SplineOrder + 1 ));
+ vnl_matrix<long> EvaluateIndex(ImageDimension, (m_SplineOrder + 1));
// compute the interpolation indexes
// TODO: Do we need to revisit region of support for the derivatives?
this->DetermineRegionOfSupport(EvaluateIndex, x, m_SplineOrder);
// Determine weights
- vnl_matrix<double> weights(ImageDimension, ( m_SplineOrder + 1 ));
- SetInterpolationWeights( x, EvaluateIndex, weights, m_SplineOrder );
+ vnl_matrix<double> weights(ImageDimension, (m_SplineOrder + 1));
+ SetInterpolationWeights(x, EvaluateIndex, weights, m_SplineOrder);
- vnl_matrix<double> weightsDerivative(ImageDimension, ( m_SplineOrder + 1));
- SetDerivativeWeights( x, EvaluateIndex, weightsDerivative, ( m_SplineOrder ) );
+ vnl_matrix<double> weightsDerivative(ImageDimension, (m_SplineOrder + 1));
+ SetDerivativeWeights(x, EvaluateIndex, weightsDerivative, (m_SplineOrder));
// Modify EvaluateIndex at the boundaries using mirror boundary conditions
this->ApplyMirrorBoundaryConditions(EvaluateIndex, m_SplineOrder);
// Calculate derivative
CovariantVectorType derivativeValue;
- double tempValue;
- IndexType coefficientIndex;
+ double tempValue;
+ IndexType coefficientIndex;
for (unsigned int n = 0; n < ImageDimension; ++n)
- {
+ {
derivativeValue[n] = 0.0;
for (unsigned int p = 0; p < m_MaxNumberInterpolationPoints; ++p)
- {
+ {
tempValue = 1.0;
for (unsigned int n1 = 0; n1 < ImageDimension; n1++)
- {
+ {
//coefficientIndex[n1] = EvaluateIndex[n1][sp];
coefficientIndex[n1] = EvaluateIndex[n1][m_PointsToIndex[p][n1]];
if (n1 == n)
- {
+ {
//w *= weights[n][ m_PointsToIndex[p][n] ];
- tempValue *= weightsDerivative[n1][ m_PointsToIndex[p][n1] ];
- }
+ tempValue *= weightsDerivative[n1][m_PointsToIndex[p][n1]];
+ }
else
- {
- tempValue *= weights[n1][ m_PointsToIndex[p][n1] ];
+ {
+ tempValue *= weights[n1][m_PointsToIndex[p][n1]];
+ }
}
- }
derivativeValue[n] += m_Coefficients->GetPixel(coefficientIndex) * tempValue;
- }
+ }
derivativeValue[n] /= this->GetInputImage()->GetSpacing()[n]; // take spacing into account
- }
+ }
- return(derivativeValue);
+ return (derivativeValue);
}
-
template <class TImageType, class TCoordRep, class TCoefficientType>
void
-BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
-::SetInterpolationWeights( const ContinuousIndexType & x, const vnl_matrix<long> & EvaluateIndex,
- vnl_matrix<double> & weights, unsigned int splineOrder ) const
+BSplineInterpolateImageFunction<TImageType, TCoordRep, TCoefficientType>
+::SetInterpolationWeights(const ContinuousIndexType& x, const vnl_matrix<long>& EvaluateIndex,
+ vnl_matrix<double>& weights, unsigned int splineOrder) const
{
// For speed improvements we could make each case a separate function and use
// function pointers to reference the correct weight order.
@@ -265,46 +261,46 @@ BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
double w, w2, w4, t, t0, t1;
switch (splineOrder)
- {
+ {
case 3:
for (unsigned int n = 0; n < ImageDimension; ++n)
- {
+ {
w = x[n] - (double) EvaluateIndex[n][1];
weights[n][3] = (1.0 / 6.0) * w * w * w;
weights[n][0] = (1.0 / 6.0) + 0.5 * w * (w - 1.0) - weights[n][3];
weights[n][2] = w + weights[n][0] - 2.0 * weights[n][3];
weights[n][1] = 1.0 - weights[n][0] - weights[n][2] - weights[n][3];
- }
+ }
break;
case 0:
for (unsigned int n = 0; n < ImageDimension; ++n)
- {
+ {
weights[n][0] = 1; // implements nearest neighbor
- }
+ }
break;
case 1:
for (unsigned int n = 0; n < ImageDimension; ++n)
- {
+ {
w = x[n] - (double) EvaluateIndex[n][0];
weights[n][1] = w;
weights[n][0] = 1.0 - w;
- }
+ }
break;
case 2:
for (unsigned int n = 0; n < ImageDimension; ++n)
- {
+ {
/* x */
- w = x[n] - (double)EvaluateIndex[n][1];
+ w = x[n] - (double) EvaluateIndex[n][1];
weights[n][1] = 0.75 - w * w;
weights[n][2] = 0.5 * (w - weights[n][1] + 1.0);
weights[n][0] = 1.0 - weights[n][1] - weights[n][2];
- }
+ }
break;
case 4:
for (unsigned int n = 0; n < ImageDimension; ++n)
- {
+ {
/* x */
- w = x[n] - (double)EvaluateIndex[n][2];
+ w = x[n] - (double) EvaluateIndex[n][2];
w2 = w * w;
t = (1.0 / 6.0) * w2;
weights[n][0] = 0.5 - w;
@@ -316,13 +312,13 @@ BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
weights[n][3] = t1 - t0;
weights[n][4] = weights[n][0] + t0 + 0.5 * w;
weights[n][2] = 1.0 - weights[n][0] - weights[n][1] - weights[n][3] - weights[n][4];
- }
+ }
break;
case 5:
for (unsigned int n = 0; n < ImageDimension; ++n)
- {
+ {
/* x */
- w = x[n] - (double)EvaluateIndex[n][2];
+ w = x[n] - (double) EvaluateIndex[n][2];
w2 = w * w;
weights[n][5] = (1.0 / 120.0) * w * w2 * w2;
w2 -= w;
@@ -338,24 +334,24 @@ BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
t1 = (1.0 / 24.0) * w * (w4 - w2 - 5.0);
weights[n][1] = t0 + t1;
weights[n][4] = t0 - t1;
- }
+ }
break;
default:
// SplineOrder not implemented yet.
itk::ExceptionObject err(__FILE__, __LINE__);
- err.SetLocation( ITK_LOCATION );
- err.SetDescription( "SplineOrder must be between 0 and 5. Requested spline order has not been implemented yet." );
+ err.SetLocation(ITK_LOCATION);
+ err.SetDescription("SplineOrder must be between 0 and 5. Requested spline order has not been implemented yet.");
throw err;
break;
- }
+ }
}
template <class TImageType, class TCoordRep, class TCoefficientType>
void
-BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
-::SetDerivativeWeights( const ContinuousIndexType & x, const vnl_matrix<long> & EvaluateIndex,
- vnl_matrix<double> & weights, unsigned int splineOrder ) const
+BSplineInterpolateImageFunction<TImageType, TCoordRep, TCoefficientType>
+::SetDerivativeWeights(const ContinuousIndexType& x, const vnl_matrix<long>& EvaluateIndex,
+ vnl_matrix<double>& weights, unsigned int splineOrder) const
{
// For speed improvements we could make each case a separate function and use
// function pointers to reference the correct weight order.
@@ -363,43 +359,43 @@ BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
// of switch statement executions to one per routine call.
// Left as is for now for readability.
double w, w1, w2, w3, w4, w5, t, t0, t1, t2;
- int derivativeSplineOrder = (int) splineOrder -1;
+ int derivativeSplineOrder = (int) splineOrder - 1;
switch (derivativeSplineOrder)
- {
+ {
- // Calculates B(splineOrder) ( (x + 1/2) - xi) - B(splineOrder -1) ( (x - 1/2) - xi)
+ // Calculates B(splineOrder) ( (x + 1/2) - xi) - B(splineOrder -1) ( (x - 1/2) - xi)
case -1:
// Why would we want to do this?
for (unsigned int n = 0; n < ImageDimension; ++n)
- {
+ {
weights[n][0] = 0.0;
- }
+ }
break;
case 0:
for (unsigned int n = 0; n < ImageDimension; ++n)
- {
+ {
weights[n][0] = -1.0;
weights[n][1] = 1.0;
- }
+ }
break;
case 1:
for (unsigned int n = 0; n < ImageDimension; ++n)
- {
- w = x[n] + 0.5 - (double)EvaluateIndex[n][1];
+ {
+ w = x[n] + 0.5 - (double) EvaluateIndex[n][1];
// w2 = w;
w1 = 1.0 - w;
weights[n][0] = 0.0 - w1;
weights[n][1] = w1 - w;
weights[n][2] = w;
- }
+ }
break;
case 2:
for (unsigned int n = 0; n < ImageDimension; ++n)
- {
- w = x[n] + .5 - (double)EvaluateIndex[n][2];
+ {
+ w = x[n] + .5 - (double) EvaluateIndex[n][2];
w2 = 0.75 - w * w;
w3 = 0.5 * (w - w2 + 1.0);
w1 = 1.0 - w2 - w3;
@@ -408,13 +404,13 @@ BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
weights[n][1] = w1 - w2;
weights[n][2] = w2 - w3;
weights[n][3] = w3;
- }
+ }
break;
case 3:
for (unsigned int n = 0; n < ImageDimension; ++n)
- {
- w = x[n] + 0.5 - (double)EvaluateIndex[n][2];
+ {
+ w = x[n] + 0.5 - (double) EvaluateIndex[n][2];
w4 = (1.0 / 6.0) * w * w * w;
w1 = (1.0 / 6.0) + 0.5 * w * (w - 1.0) - w4;
w3 = w + w1 - 2.0 * w4;
@@ -425,12 +421,12 @@ BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
weights[n][2] = w2 - w3;
weights[n][3] = w3 - w4;
weights[n][4] = w4;
- }
+ }
break;
case 4:
for (unsigned int n = 0; n < ImageDimension; ++n)
- {
- w = x[n] + .5 - (double)EvaluateIndex[n][3];
+ {
+ w = x[n] + .5 - (double) EvaluateIndex[n][3];
t2 = w * w;
t = (1.0 / 6.0) * t2;
w1 = 0.5 - w;
@@ -449,122 +445,123 @@ BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
weights[n][3] = w3 - w4;
weights[n][4] = w4 - w5;
weights[n][5] = w5;
- }
+ }
break;
default:
// SplineOrder not implemented yet.
itk::ExceptionObject err(__FILE__, __LINE__);
- err.SetLocation( ITK_LOCATION );
- err.SetDescription( "SplineOrder (for derivatives) must be between 1 and 5. Requested spline order has not been implemented yet." );
+ err.SetLocation(ITK_LOCATION);
+ err.SetDescription(
+ "SplineOrder (for derivatives) must be between 1 and 5. Requested spline order has not been implemented yet.");
throw err;
break;
- }
+ }
}
-
// Generates m_PointsToIndex;
template <class TImageType, class TCoordRep, class TCoefficientType>
void
-BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
-::GeneratePointsToIndex( )
+BSplineInterpolateImageFunction<TImageType, TCoordRep, TCoefficientType>
+::GeneratePointsToIndex()
{
// m_PointsToIndex is used to convert a sequential location to an N-dimension
// index vector. This is precomputed to save time during the interpolation routine.
m_PointsToIndex.resize(m_MaxNumberInterpolationPoints);
for (unsigned int p = 0; p < m_MaxNumberInterpolationPoints; ++p)
- {
- int pp = p;
+ {
+ int pp = p;
unsigned long indexFactor[ImageDimension];
indexFactor[0] = 1;
- for (int j=1; j< static_cast<int>(ImageDimension); ++j)
- {
- indexFactor[j] = indexFactor[j-1] * ( m_SplineOrder + 1 );
- }
+ for (int j = 1; j < static_cast<int>(ImageDimension); ++j)
+ {
+ indexFactor[j] = indexFactor[j - 1] * (m_SplineOrder + 1);
+ }
for (int j = (static_cast<int>(ImageDimension) - 1); j >= 0; j--)
- {
+ {
m_PointsToIndex[p][j] = pp / indexFactor[j];
pp = pp % indexFactor[j];
+ }
}
- }
}
template <class TImageType, class TCoordRep, class TCoefficientType>
void
-BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
-::DetermineRegionOfSupport( vnl_matrix<long> & evaluateIndex,
- const ContinuousIndexType & x,
- unsigned int splineOrder ) const
+BSplineInterpolateImageFunction<TImageType, TCoordRep, TCoefficientType>
+::DetermineRegionOfSupport(vnl_matrix<long>& evaluateIndex,
+ const ContinuousIndexType& x,
+ unsigned int splineOrder) const
{
long indx;
// compute the interpolation indexes
- for (unsigned int n = 0; n< ImageDimension; ++n)
- {
- if (splineOrder & 1) // Use this index calculation for odd splineOrder
+ for (unsigned int n = 0; n < ImageDimension; ++n)
{
- indx = (long)vcl_floor((float)x[n]) - splineOrder / 2;
+ if (splineOrder & 1) // Use this index calculation for odd splineOrder
+ {
+ indx = (long) vcl_floor((float) x[n]) - splineOrder / 2;
//std::cout<<"x: "<<x<<std::endl;
//std::cout<<"splineOrder: "<<splineOrder<<std::endl;
//std::cout<<"indx: "<<indx<<std::endl;
for (unsigned int k = 0; k <= splineOrder; ++k)
- {
+ {
evaluateIndex[n][k] = indx++;
+ }
}
- }
else // Use this index calculation for even splineOrder
- {
+ {
- indx = (long)vcl_floor((float)(x[n] + 0.5)) - splineOrder / 2;
+ indx = (long) vcl_floor((float) (x[n] + 0.5)) - splineOrder / 2;
//std::cout<<"x: "<<x<<std::endl;
//std::cout<<"splineOrder: "<<splineOrder<<std::endl;
//std::cout<<"indx: "<<indx<<std::endl;
for (unsigned int k = 0; k <= splineOrder; ++k)
- {
+ {
evaluateIndex[n][k] = indx++;
+ }
}
}
- }
}
template <class TImageType, class TCoordRep, class TCoefficientType>
void
-BSplineInterpolateImageFunction<TImageType,TCoordRep,TCoefficientType>
-::ApplyMirrorBoundaryConditions(vnl_matrix<long> & evaluateIndex,
+BSplineInterpolateImageFunction<TImageType, TCoordRep, TCoefficientType>
+::ApplyMirrorBoundaryConditions(vnl_matrix<long>& evaluateIndex,
unsigned int splineOrder) const
{
for (unsigned int n = 0; n < ImageDimension; ++n)
- {
+ {
long dataLength = m_DataLength[n];
long dataOffset = m_CurrentBufferedRegion.GetIndex()[n];
// apply the mirror boundary conditions
// TODO: We could implement other boundary options beside mirror
if (m_DataLength[n] == 1)
- {
- for (unsigned int k = 0; k <= splineOrder; ++k)
{
+ for (unsigned int k = 0; k <= splineOrder; ++k)
+ {
evaluateIndex[n][k] = 0;
+ }
}
- }
else
- {
- for (unsigned int k = 0; k <= splineOrder; ++k)
{
- // btw - Think about this couldn't this be replaced with a more elagent modulus method?
- evaluateIndex[n][k] = (evaluateIndex[n][k] < dataOffset) ? (dataOffset+(dataOffset-evaluateIndex[n][k])%dataLength)
- : (evaluateIndex[n][k]);
- if ((long) dataLength+dataOffset <= evaluateIndex[n][k])
+ for (unsigned int k = 0; k <= splineOrder; ++k)
{
- evaluateIndex[n][k] = dataOffset + dataLength - (evaluateIndex[n][k]-dataOffset - dataLength)%dataLength;
+ // btw - Think about this couldn't this be replaced with a more elagent modulus method?
+ evaluateIndex[n][k] =
+ (evaluateIndex[n][k] < dataOffset) ? (dataOffset + (dataOffset - evaluateIndex[n][k]) % dataLength)
+ : (evaluateIndex[n][k]);
+ if ((long) dataLength + dataOffset <= evaluateIndex[n][k])
+ {
+ evaluateIndex[n][k] = dataOffset + dataLength - (evaluateIndex[n][k] - dataOffset - dataLength) % dataLength;
+ }
}
+
}
}
-
- }
}
} // namespace otb
diff --git a/Code/BasicFilters/otbBinaryImageDensityFunction.h b/Code/BasicFilters/otbBinaryImageDensityFunction.h
index 2416e1cd48..a2a7c57e0a 100644
--- a/Code/BasicFilters/otbBinaryImageDensityFunction.h
+++ b/Code/BasicFilters/otbBinaryImageDensityFunction.h
@@ -41,24 +41,25 @@ namespace otb
*
* \ingroup ImageFunctions
*/
-template <class TInputImage, class TCoordRep = float >
+template <class TInputImage, class TCoordRep = float>
class ITK_EXPORT BinaryImageDensityFunction :
- public itk::ImageFunction< TInputImage, typename itk::NumericTraits<typename TInputImage::PixelType>::RealType,TCoordRep >
+ public itk::ImageFunction<TInputImage, typename itk::NumericTraits<typename TInputImage::PixelType>::RealType,
+ TCoordRep>
{
- public:
+public:
/** Standard class typedefs. */
- typedef BinaryImageDensityFunction Self;
- typedef itk::ImageFunction<TInputImage,typename itk::NumericTraits<typename TInputImage::PixelType>::RealType,
- TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef BinaryImageDensityFunction Self;
+ typedef itk::ImageFunction<TInputImage, typename itk::NumericTraits<typename TInputImage::PixelType>::RealType,
+ TCoordRep> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
/** Run-time type information (and related methods). */
itkTypeMacro(BinaryImageDensityFunction, itk::ImageFunction);
-
+
/** Method for creation through the object factory. */
itkNewMacro(Self);
-
+
/** InputImageType typedef support. */
typedef TInputImage InputImageType;
typedef typename InputImageType::SizeType RadiusType;
@@ -66,50 +67,49 @@ class ITK_EXPORT BinaryImageDensityFunction :
typedef typename Superclass::IndexType IndexType;
typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
typedef typename Superclass::PointType PointType;
-
+
itkStaticConstMacro(ImageDimension, unsigned int, InputImageType::ImageDimension);
/** Datatype used for the density */
typedef typename itk::NumericTraits<typename InputImageType::PixelType>::RealType
- RealType;
+ RealType;
/** Evalulate the function at specified index */
- virtual RealType EvaluateAtIndex( const IndexType& index ) const;
-
+ virtual RealType EvaluateAtIndex(const IndexType& index) const;
+
/** Evaluate the function at non-integer positions */
- virtual RealType Evaluate( const PointType& point ) const
- {
- IndexType index;
- this->ConvertPointToNearestIndex( point, index );
- return this->EvaluateAtIndex( index );
- }
+ virtual RealType Evaluate(const PointType& point) const
+ {
+ IndexType index;
+ this->ConvertPointToNearestIndex(point, index);
+ return this->EvaluateAtIndex(index);
+ }
virtual RealType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex ) const
- {
- IndexType index;
- this->ConvertContinuousIndexToNearestIndex( cindex, index );
- return this->EvaluateAtIndex( index );
- }
+ const ContinuousIndexType& cindex) const
+ {
+ IndexType index;
+ this->ConvertContinuousIndexToNearestIndex(cindex, index);
+ return this->EvaluateAtIndex(index);
+ }
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
- itkSetMacro( NeighborhoodRadius, RadiusType );
- itkGetConstReferenceMacro( NeighborhoodRadius, RadiusType );
+ itkSetMacro(NeighborhoodRadius, RadiusType);
+ itkGetConstReferenceMacro(NeighborhoodRadius, RadiusType);
void SetNeighborhoodRadius(unsigned int rad)
{
- m_NeighborhoodRadius.Fill( rad );
+ m_NeighborhoodRadius.Fill(rad);
this->Modified();
}
-
protected:
BinaryImageDensityFunction();
- virtual ~BinaryImageDensityFunction(){};
+ virtual ~BinaryImageDensityFunction(){}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- BinaryImageDensityFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ BinaryImageDensityFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
RadiusType m_NeighborhoodRadius;
@@ -122,4 +122,3 @@ private:
#endif
#endif
-
diff --git a/Code/BasicFilters/otbBinaryImageDensityFunction.txx b/Code/BasicFilters/otbBinaryImageDensityFunction.txx
index 2321ba0870..ea4b0449a3 100644
--- a/Code/BasicFilters/otbBinaryImageDensityFunction.txx
+++ b/Code/BasicFilters/otbBinaryImageDensityFunction.txx
@@ -34,74 +34,71 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TCoordRep>
-BinaryImageDensityFunction<TInputImage,TCoordRep>
+BinaryImageDensityFunction<TInputImage, TCoordRep>
::BinaryImageDensityFunction()
{
- m_NeighborhoodRadius.Fill( 1 );
+ m_NeighborhoodRadius.Fill(1);
}
-
/**
*
*/
template <class TInputImage, class TCoordRep>
void
-BinaryImageDensityFunction<TInputImage,TCoordRep>
+BinaryImageDensityFunction<TInputImage, TCoordRep>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
os << indent << "NeighborhoodRadius: " << m_NeighborhoodRadius << std::endl;
}
-
/**
*
*/
template <class TInputImage, class TCoordRep>
-typename BinaryImageDensityFunction<TInputImage,TCoordRep>
+typename BinaryImageDensityFunction<TInputImage, TCoordRep>
::RealType
-BinaryImageDensityFunction<TInputImage,TCoordRep>
+BinaryImageDensityFunction<TInputImage, TCoordRep>
::EvaluateAtIndex(const IndexType& index) const
{
- RealType sum;
- RealType var;
+ RealType sum;
+ RealType var;
- sum = itk::NumericTraits<RealType>::Zero;
+ sum = itk::NumericTraits<RealType>::Zero;
- if( !this->GetInputImage() )
- {
- return ( itk::NumericTraits<RealType>::max() );
- }
+ if (!this->GetInputImage())
+ {
+ return (itk::NumericTraits<RealType>::max());
+ }
- if ( !this->IsInsideBuffer( index ) )
- {
- return ( itk::NumericTraits<RealType>::max() );
- }
+ if (!this->IsInsideBuffer(index))
+ {
+ return (itk::NumericTraits<RealType>::max());
+ }
// Create an N-d neighborhood kernel, using a zeroflux boundary condition
- typename InputImageType::SizeType kernelSize = m_NeighborhoodRadius;
+ typename InputImageType::SizeType kernelSize = m_NeighborhoodRadius;
- itk::ConstNeighborhoodIterator<InputImageType>
- it(kernelSize, this->GetInputImage(), this->GetInputImage()->GetBufferedRegion());
+ itk::ConstNeighborhoodIterator<InputImageType>
+ it(kernelSize, this->GetInputImage(), this->GetInputImage()->GetBufferedRegion());
- // Set the iterator at the desired location
- it.SetLocation(index);
+ // Set the iterator at the desired location
+ it.SetLocation(index);
- // Walk the neighborhood
- const unsigned int size = it.Size();
- for (unsigned int i = 0; i < size; ++i)
- {
- const RealType value = static_cast<RealType>( it.GetPixel(i) );
- sum += value;
- }
+ // Walk the neighborhood
+ const unsigned int size = it.Size();
+ for (unsigned int i = 0; i < size; ++i)
+ {
+ const RealType value = static_cast<RealType>(it.GetPixel(i));
+ sum += value;
+ }
- const RealType num = static_cast<RealType>( size );
- var = sum / num;
+ const RealType num = static_cast<RealType>(size);
+ var = sum / num;
- return var;
+ return var;
}
-
} // end namespace otb
#endif
diff --git a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.h b/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.h
index 02cdafa663..4b216c62ac 100644
--- a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.h
+++ b/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.h
@@ -37,46 +37,46 @@ namespace otb
*/
template <class TInputImage>
class ITK_EXPORT BinaryImageMinimalBoundingRegionCalculator
- : public itk::ImageToImageFilter<TInputImage,TInputImage>
+ : public itk::ImageToImageFilter<TInputImage, TInputImage>
{
public:
/** Standard typedefs */
- typedef BinaryImageMinimalBoundingRegionCalculator Self;
- typedef itk::ImageToImageFilter<TInputImage,TInputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef BinaryImageMinimalBoundingRegionCalculator Self;
+ typedef itk::ImageToImageFilter<TInputImage, TInputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
itkTypeMacro(BinaryImageMinimalBoundingRegionCalculator, ImageToImageFilter);
- typedef TInputImage InputImageType;
- typedef typename InputImageType::PixelType PixelType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::PixelType PixelType;
typedef typename InputImageType::RegionType RegionType;
- typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
/** Toogle the pad option */
- itkGetMacro(Region,RegionType);
- itkSetMacro(InsideValue,PixelType);
- itkGetMacro(InsideValue,PixelType);
- itkSetMacro(Pad,unsigned int);
- itkGetMacro(Pad,unsigned int);
+ itkGetMacro(Region, RegionType);
+ itkSetMacro(InsideValue, PixelType);
+ itkGetMacro(InsideValue, PixelType);
+ itkSetMacro(Pad, unsigned int);
+ itkGetMacro(Pad, unsigned int);
protected:
/** Constructor */
BinaryImageMinimalBoundingRegionCalculator();
/** Destructor */
- virtual ~BinaryImageMinimalBoundingRegionCalculator() {};
+ virtual ~BinaryImageMinimalBoundingRegionCalculator() {}
/** Main computation method */
void GenerateData(void);
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- BinaryImageMinimalBoundingRegionCalculator(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ BinaryImageMinimalBoundingRegionCalculator(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** The computed region */
RegionType m_Region;
/** Toogle if pad wanted */
- unsigned int m_Pad;
+ unsigned int m_Pad;
/** Inside value */
PixelType m_InsideValue;
};
diff --git a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx b/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
index e6253991be..8cca671afa 100644
--- a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
+++ b/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
@@ -32,17 +32,17 @@ BinaryImageMinimalBoundingRegionCalculator<TInputImage>
::BinaryImageMinimalBoundingRegionCalculator()
{
// The pad option is desactivated by default
- m_Pad=0;
+ m_Pad = 0;
// Set the default region
- typename InputImageType::SizeType size;
+ typename InputImageType::SizeType size;
typename InputImageType::IndexType index;
- size[0]=0;
- size[1]=0;
- index[0]=0;
- index[1]=0;
+ size[0] = 0;
+ size[1] = 0;
+ index[0] = 0;
+ index[1] = 0;
m_Region.SetSize(size);
m_Region.SetIndex(index);
- m_InsideValue=static_cast<PixelType>(255);
+ m_InsideValue = static_cast<PixelType>(255);
}
/**
* Main computation method
@@ -59,84 +59,84 @@ BinaryImageMinimalBoundingRegionCalculator<TInputImage>
// Indexes containing upper-left and lower-right corner
typename InputImageType::IndexType min;
typename InputImageType::IndexType max;
- min[0]=0;
- min[1]=0;
- max[1]=0;
- max[1]=0;
- for ( unsigned int axis = 0; axis < InputImageType::ImageDimension; ++axis )
- { // Create the forward iterator to find lower bound
- SliceIteratorType fit(image,image->GetLargestPossibleRegion());
-
- fit.SetFirstDirection( !axis );
- fit.SetSecondDirection( axis );
+ min[0] = 0;
+ min[1] = 0;
+ max[1] = 0;
+ max[1] = 0;
+ for (unsigned int axis = 0; axis < InputImageType::ImageDimension; ++axis)
+ { // Create the forward iterator to find lower bound
+ SliceIteratorType fit(image, image->GetLargestPossibleRegion());
+
+ fit.SetFirstDirection(!axis);
+ fit.SetSecondDirection(axis);
fit.GoToBegin();
// Walk through the two images line by line
while (!fit.IsAtEnd())
- {
- while (!fit.IsAtEndOfSlice())
{
- while (!fit.IsAtEndOfLine())
+ while (!fit.IsAtEndOfSlice())
{
- // If a common intersection is found
- if (fit.Get()==m_InsideValue)
+ while (!fit.IsAtEndOfLine())
{
+ // If a common intersection is found
+ if (fit.Get() == m_InsideValue)
+ {
// then the lower bound is found
- min[axis]=fit.GetIndex()[axis];
+ min[axis] = fit.GetIndex()[axis];
fit.GoToReverseBegin(); // skip to the end
break;
- }
+ }
++fit;
- }
+ }
fit.NextLine();
- }
+ }
fit.NextSlice();
- }
+ }
// Create the reverse iterator to find upper bound
- SliceIteratorType rit(image,image->GetLargestPossibleRegion());
+ SliceIteratorType rit(image, image->GetLargestPossibleRegion());
rit.SetFirstDirection(!axis);
rit.SetSecondDirection(axis);
rit.GoToReverseBegin();
// Walk through the two images line by line
while (!rit.IsAtReverseEnd())
- {
- while (!rit.IsAtReverseEndOfSlice())
{
- while (!rit.IsAtReverseEndOfLine())
+ while (!rit.IsAtReverseEndOfSlice())
{
- // If a common intersection is found
- if (rit.Get()==m_InsideValue)
+ while (!rit.IsAtReverseEndOfLine())
{
- max[axis]=rit.GetIndex()[axis];
+ // If a common intersection is found
+ if (rit.Get() == m_InsideValue)
+ {
+ max[axis] = rit.GetIndex()[axis];
rit.GoToBegin(); //Skip to reverse end
break;
- }
+ }
--rit;
- }
+ }
rit.PreviousLine();
- }
+ }
rit.PreviousSlice();
+ }
}
- }
- typename InputImageType::SizeType size;
+ typename InputImageType::SizeType size;
typename InputImageType::IndexType index;
- for (int i=0;i<InputImageType::ImageDimension;++i)
- {
- size[i]=max[i]-min[i]+1;
- index[i]=min[i];
- }
+ for (int i = 0; i < InputImageType::ImageDimension; ++i)
+ {
+ size[i] = max[i] - min[i] + 1;
+ index[i] = min[i];
+ }
m_Region.SetIndex(index);
m_Region.SetSize(size);
if (m_Pad)
- {
+ {
m_Region.PadByRadius(m_Pad);
- }
+ }
m_Region.Crop(image->GetLargestPossibleRegion());
}
@@ -146,9 +146,9 @@ BinaryImageMinimalBoundingRegionCalculator<TInputImage>
template <class TInputImage>
void
BinaryImageMinimalBoundingRegionCalculator<TInputImage>
-::PrintSelf( std::ostream& os,itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // End namespace otb
diff --git a/Code/BasicFilters/otbBinaryImageToDensityImageFilter.h b/Code/BasicFilters/otbBinaryImageToDensityImageFilter.h
index 018d779f3a..4dba9ada06 100644
--- a/Code/BasicFilters/otbBinaryImageToDensityImageFilter.h
+++ b/Code/BasicFilters/otbBinaryImageToDensityImageFilter.h
@@ -22,59 +22,57 @@
#include "itkDataObject.h"
#include "itkConstNeighborhoodIterator.h"
-
namespace otb
{
/** \class BinaryImageToDensityImageFilter
* \brief This class performs a streaming isotropic shrinking operation without smoothing.
*
*/
-template <class TInputImage,class TOutputImage , class TCountFunction>
+template <class TInputImage, class TOutputImage, class TCountFunction>
class ITK_EXPORT BinaryImageToDensityImageFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage >
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef BinaryImageToDensityImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef BinaryImageToDensityImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(BinaryImageToDensityImageFilter,itk::ImageToImageFilter);
+ itkTypeMacro(BinaryImageToDensityImageFilter, itk::ImageToImageFilter);
/** Template parameter typedefs */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename InputImageType::SizeType InputImageSizeType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::SizeType InputImageSizeType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
- typedef TCountFunction CountFunctionType;
- typedef typename CountFunctionType::Pointer CountFunctionPointerType;
+ typedef TCountFunction CountFunctionType;
+ typedef typename CountFunctionType::Pointer CountFunctionPointerType;
- typedef itk::ConstNeighborhoodIterator<TInputImage> NeighborhoodIteratorType;
- typedef typename NeighborhoodIteratorType::RadiusType RadiusType;
+ typedef itk::ConstNeighborhoodIterator<TInputImage> NeighborhoodIteratorType;
+ typedef typename NeighborhoodIteratorType::RadiusType RadiusType;
/** Shrink factor accessor */
itkSetMacro(NeighborhoodRadius, RadiusType);
itkGetMacro(NeighborhoodRadius, RadiusType);
void SetNeighborhoodRadius(unsigned int rad)
- {
- m_NeighborhoodRadius.Fill(rad);
- this->Modified();
- }
-
+ {
+ m_NeighborhoodRadius.Fill(rad);
+ this->Modified();
+ }
/** Main computation method */
- virtual void ThreadedGenerateData( const InputImageRegionType &outputRegionForThread, int threadId );
+ virtual void ThreadedGenerateData(const InputImageRegionType& outputRegionForThread, int threadId);
virtual void BeforeThreadedGenerateData();
virtual void GenerateInputRequestedRegion();
@@ -87,10 +85,10 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- BinaryImageToDensityImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ BinaryImageToDensityImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- CountFunctionPointerType m_CountFunction;
+ CountFunctionPointerType m_CountFunction;
/** The shrink factor */
RadiusType m_NeighborhoodRadius;
diff --git a/Code/BasicFilters/otbBinaryImageToDensityImageFilter.txx b/Code/BasicFilters/otbBinaryImageToDensityImageFilter.txx
index 21ebf02ab1..4dbaaabed0 100644
--- a/Code/BasicFilters/otbBinaryImageToDensityImageFilter.txx
+++ b/Code/BasicFilters/otbBinaryImageToDensityImageFilter.txx
@@ -35,7 +35,7 @@ template <class TInputImage, class TOutputImage, class TCountFunction>
BinaryImageToDensityImageFilter<TInputImage, TOutputImage, TCountFunction>
::BinaryImageToDensityImageFilter()
{
- m_NeighborhoodRadius.Fill( 1 );
+ m_NeighborhoodRadius.Fill(1);
m_CountFunction = CountFunctionType::New();
}
@@ -45,7 +45,6 @@ BinaryImageToDensityImageFilter<TInputImage, TOutputImage, TCountFunction>
::~BinaryImageToDensityImageFilter()
{}
-
template <class TInputImage, class TOutputImage, class TCountFunction>
void
BinaryImageToDensityImageFilter<TInputImage, TOutputImage, TCountFunction>
@@ -55,44 +54,44 @@ BinaryImageToDensityImageFilter<TInputImage, TOutputImage, TCountFunction>
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- InputImagePointerType inputPtr = const_cast< TInputImage * >( this->GetInput());
+ InputImagePointerType inputPtr = const_cast<TInputImage *>(this->GetInput());
OutputImagePointerType outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
InputImageRegionType inputRequestedRegion = inputPtr->GetRequestedRegion();
// pad the input requested region by the operator radius
- inputRequestedRegion.PadByRadius( m_NeighborhoodRadius );
+ inputRequestedRegion.PadByRadius(m_NeighborhoodRadius);
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << this->GetNameOfClass()
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
- }
+ }
}
template <class TInputImage, class TOutputImage, class TCountFunction>
@@ -106,66 +105,63 @@ BinaryImageToDensityImageFilter<TInputImage, TOutputImage, TCountFunction>
m_CountFunction->SetNeighborhoodRadius(m_NeighborhoodRadius);
}
-
/** Main computation method */
template <class TInputImage, class TOutputImage, class TCountFunction>
void
BinaryImageToDensityImageFilter<TInputImage, TOutputImage, TCountFunction>
-::ThreadedGenerateData( const InputImageRegionType &outputRegionForThread, int threadId )
+::ThreadedGenerateData(const InputImageRegionType& outputRegionForThread, int threadId)
{
- InputImagePointerType inputPtr = const_cast<InputImageType * > (this->GetInput());
- OutputImagePointerType outputPtr = this->GetOutput();
+ InputImagePointerType inputPtr = const_cast<InputImageType *> (this->GetInput());
+ OutputImagePointerType outputPtr = this->GetOutput();
itk::ZeroFluxNeumannBoundaryCondition<TInputImage> nbc;
- RadiusType r;
- r[0]=m_NeighborhoodRadius[0];
- r[1]=m_NeighborhoodRadius[1];
+ RadiusType r;
+ r[0] = m_NeighborhoodRadius[0];
+ r[1] = m_NeighborhoodRadius[1];
- NeighborhoodIteratorType it;
+ NeighborhoodIteratorType it;
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage>::FaceListType faceList;
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage> bC;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage> bC;
faceList = bC(inputPtr, outputRegionForThread, r);
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage>::FaceListType::iterator fit;
- itk::ImageRegionIterator<OutputImageType> itOut(outputPtr,outputRegionForThread );
+ itk::ImageRegionIterator<OutputImageType> itOut(outputPtr, outputRegionForThread);
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
typename InputImageType::IndexType index;
-
- for (fit=faceList.begin(); fit != faceList.end(); ++fit)
+
+ for (fit = faceList.begin(); fit != faceList.end(); ++fit)
{
- it = itk::ConstNeighborhoodIterator<TInputImage>(r, inputPtr, *fit);
-
- itOut = itk::ImageRegionIterator<TOutputImage>(outputPtr, *fit);
- it.OverrideBoundaryCondition(&nbc);
- it.GoToBegin();
-
- while(!itOut.IsAtEnd())
+ it = itk::ConstNeighborhoodIterator<TInputImage>(r, inputPtr, *fit);
+
+ itOut = itk::ImageRegionIterator<TOutputImage>(outputPtr, *fit);
+ it.OverrideBoundaryCondition(&nbc);
+ it.GoToBegin();
+
+ while (!itOut.IsAtEnd())
+ {
+ index = it.GetIndex();
+
+ if (outputRegionForThread.IsInside(index))
{
- index = it.GetIndex();
-
- if(outputRegionForThread.IsInside(index))
- {
- itOut.Set(m_CountFunction->EvaluateAtIndex(index));
- }
-
- ++itOut;
- ++it;
- progress.CompletedPixel(); // potential exception thrown here
+ itOut.Set(m_CountFunction->EvaluateAtIndex(index));
}
+
+ ++itOut;
+ ++it;
+ progress.CompletedPixel(); // potential exception thrown here
+ }
}
}
-
/** PrintSelf method */
template <class TInputImage, class TOutputImage, class TCountFunction>
void
BinaryImageToDensityImageFilter<TInputImage, TOutputImage, TCountFunction>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "Neighborhood Radius : " << m_NeighborhoodRadius << std::endl;
}
} // End namespace otb
diff --git a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h b/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h
index fa8a52d8c4..4c81568e01 100644
--- a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h
+++ b/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h
@@ -42,16 +42,16 @@ namespace otb {
* \ingroup Streamed
* \sa EuclideanDistanceWithMissingValue
*/
-template < class TInputImage >
+template <class TInputImage>
class ITK_EXPORT BoxAndWhiskerImageFilter
- : public itk::InPlaceImageFilter< TInputImage >
+ : public itk::InPlaceImageFilter<TInputImage>
{
- public :
+public:
/** Standard class typedefs. */
- typedef BoxAndWhiskerImageFilter Self;
- typedef typename itk::InPlaceImageFilter< TInputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef BoxAndWhiskerImageFilter Self;
+ typedef typename itk::InPlaceImageFilter<TInputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -60,20 +60,20 @@ class ITK_EXPORT BoxAndWhiskerImageFilter
itkTypeMacro(BoxAndWhiskerImageFilter, InPlaceImageFilter);
/** Template parameters typedefs */
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::OutputImagePointer OutputImagePointer;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::OutputImagePointer OutputImagePointer;
typedef typename Superclass::OutputImageRegionType OutputImageRegionType;
- typedef typename Superclass::OutputImagePixelType OutputImagePixelType;
+ typedef typename Superclass::OutputImagePixelType OutputImagePixelType;
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::InputImagePointer InputImagePointer;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::InputImagePointer InputImagePointer;
typedef typename Superclass::InputImageConstPointer InputImageConstPointer;
- typedef typename Superclass::InputImageRegionType InputImageRegionType;
- typedef typename Superclass::InputImagePixelType InputImagePixelType;
+ typedef typename Superclass::InputImageRegionType InputImageRegionType;
+ typedef typename Superclass::InputImagePixelType InputImagePixelType;
- typedef typename InputImageType::PixelType PixelType;
- typedef typename PixelType::ValueType ValueType;
- typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::PixelType PixelType;
+ typedef typename PixelType::ValueType ValueType;
+ typedef typename InputImageType::SizeType SizeType;
typedef typename InputImageType::RegionType RegionType;
/** Dimension */
@@ -84,28 +84,28 @@ class ITK_EXPORT BoxAndWhiskerImageFilter
itkGetConstReferenceMacro(Radius, SizeType);
/** Fix the whisker */
- itkGetConstMacro(Beta,double);
- itkSetMacro(Beta,double);
- itkGetConstMacro(NumberFound,unsigned int);
+ itkGetConstMacro(Beta, double);
+ itkSetMacro(Beta, double);
+ itkGetConstMacro(NumberFound, unsigned int);
- protected:
+protected:
BoxAndWhiskerImageFilter ();
virtual ~BoxAndWhiskerImageFilter () {}
/** Main computation method implemented as a multithreaded filter */
- virtual void ThreadedGenerateData ( const OutputImageRegionType& outputRegionForThread, int threadId );
+ virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
virtual void GenerateOutputInformation();
virtual void AllocateOutputs();
/** Perform the outlier detection */
- PixelType PerformBoxAndWhiskerDetection ( const PixelType & pixel );
+ PixelType PerformBoxAndWhiskerDetection(const PixelType& pixel);
+
+private:
+ BoxAndWhiskerImageFilter (const Self &);
+ void operator =(const Self&); // not implemented
- private:
- BoxAndWhiskerImageFilter ( const Self & );
- void operator= ( const Self & ); // not implemented
-
SizeType m_Radius;
- double m_Beta;
+ double m_Beta;
long int m_NumberFound;
}; // end of class BoxAndWhiskerImageFilter
@@ -117,5 +117,3 @@ class ITK_EXPORT BoxAndWhiskerImageFilter
#endif
#endif
-
-
diff --git a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.txx b/Code/BasicFilters/otbBoxAndWhiskerImageFilter.txx
index ec396b1538..83d38a590d 100644
--- a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.txx
+++ b/Code/BasicFilters/otbBoxAndWhiskerImageFilter.txx
@@ -32,11 +32,10 @@
#include "otbBoxAndWhiskerImageFilter.h"
#include "otbEuclideanDistanceWithMissingValue.h"
-
namespace otb {
-template < class TInputImage >
-BoxAndWhiskerImageFilter < TInputImage >
+template <class TInputImage>
+BoxAndWhiskerImageFilter <TInputImage>
::BoxAndWhiskerImageFilter ()
{
this->SetNumberOfRequiredInputs(1);
@@ -47,117 +46,116 @@ BoxAndWhiskerImageFilter < TInputImage >
m_NumberFound = 0L;
}
-template < class TInputImage >
+template <class TInputImage>
void
-BoxAndWhiskerImageFilter < TInputImage >
+BoxAndWhiskerImageFilter <TInputImage>
::ThreadedGenerateData(
- const OutputImageRegionType &outputRegionForThread,
- int threadId )
+ const OutputImageRegionType& outputRegionForThread,
+ int threadId)
{
const TInputImage * inputPtr = this->GetInput();
- OutputImageType * outputPtr = this->GetOutput();
+ OutputImageType * outputPtr = this->GetOutput();
// data-set boundary faces
typedef typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>
- ImageBoundaryFacesCalculatorType;
+ ImageBoundaryFacesCalculatorType;
typename ImageBoundaryFacesCalculatorType::FaceListType faceList;
- ImageBoundaryFacesCalculatorType boundaryCalculator;
- faceList = boundaryCalculator( inputPtr, outputRegionForThread, this->GetRadius() );
+ ImageBoundaryFacesCalculatorType boundaryCalculator;
+ faceList = boundaryCalculator(inputPtr, outputRegionForThread, this->GetRadius());
// face iterator
typename ImageBoundaryFacesCalculatorType::FaceListType::iterator faceIterator;
// local iterators
itk::ImageRegionConstIterator<InputImageType> inputIter;
- itk::ImageRegionIterator<OutputImageType> outputIter;
+ itk::ImageRegionIterator<OutputImageType> outputIter;
// support progress methods/callbacks
- itk::ProgressReporter progress ( this, threadId, outputRegionForThread.GetNumberOfPixels() );
+ itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
/**
* Process each of the boundary faces.
* These are N-d regions which border the edge of the buffer.
*/
- for ( faceIterator = faceList.begin();
- faceIterator != faceList.end();
- ++faceIterator )
- {
- inputIter = itk::ImageRegionConstIterator<InputImageType> ( inputPtr, *faceIterator );
+ for (faceIterator = faceList.begin();
+ faceIterator != faceList.end();
+ ++faceIterator)
+ {
+ inputIter = itk::ImageRegionConstIterator<InputImageType> (inputPtr, *faceIterator);
inputIter.GoToBegin();
- outputIter = itk::ImageRegionIterator<OutputImageType> ( outputPtr, *faceIterator );
+ outputIter = itk::ImageRegionIterator<OutputImageType> (outputPtr, *faceIterator);
outputIter.GoToBegin();
- while ( !outputIter.IsAtEnd() )
- {
- outputIter.Set( this->PerformBoxAndWhiskerDetection( inputIter.Get() ) );
+ while (!outputIter.IsAtEnd())
+ {
+ outputIter.Set(this->PerformBoxAndWhiskerDetection(inputIter.Get()));
++inputIter;
++outputIter;
progress.CompletedPixel();
+ }
}
- }
}
-template < class TInputImage >
-typename BoxAndWhiskerImageFilter < TInputImage >::PixelType
-BoxAndWhiskerImageFilter < TInputImage >
-::PerformBoxAndWhiskerDetection ( const PixelType & pixel )
+template <class TInputImage>
+typename BoxAndWhiskerImageFilter <TInputImage>::PixelType
+BoxAndWhiskerImageFilter <TInputImage>
+::PerformBoxAndWhiskerDetection(const PixelType& pixel)
{
- typedef std::vector< ValueType > VectorType;
- typedef otb::Statistics::EuclideanDistanceWithMissingValue< PixelType > OutlierType;
+ typedef std::vector<ValueType> VectorType;
+ typedef otb::Statistics::EuclideanDistanceWithMissingValue<PixelType> OutlierType;
- unsigned int i;
+ unsigned int i;
const unsigned int vectorSize = pixel.Size();
const unsigned int medianPosition = vectorSize / 2;
const unsigned int firstQuartilePosition = vectorSize / 4;
- const unsigned int thirdQuartilePosition = ( 3 * vectorSize ) / 4;
+ const unsigned int thirdQuartilePosition = (3 * vectorSize) / 4;
+
+ VectorType data(vectorSize);
+ for (i = 0; i < vectorSize; i++)
+ data[i] = pixel[i];
- VectorType data ( vectorSize );
- for ( i = 0; i < vectorSize; i++ )
- data[i]= pixel[i];
+ std::sort(data.begin(), data.end());
- std::sort( data.begin(), data.end() );
-
- double box = m_Beta * static_cast<double>( data[ thirdQuartilePosition ] - data[ firstQuartilePosition ] );
- double median = ::fabs( static_cast<double>( data[ medianPosition ] ) );
+ double box = m_Beta * static_cast<double>(data[thirdQuartilePosition] - data[firstQuartilePosition]);
+ double median = ::fabs(static_cast<double>(data[medianPosition]));
- PixelType outputPixel ( pixel );
- for ( i = 0; i < vectorSize; i++ )
- {
- if ( ::fabs( static_cast<double>( outputPixel[i] ) - box ) > median )
+ PixelType outputPixel(pixel);
+ for (i = 0; i < vectorSize; i++)
{
- OutlierType::SetToMissingValue( outputPixel[i] );
+ if (::fabs(static_cast<double>(outputPixel[i]) - box) > median)
+ {
+ OutlierType::SetToMissingValue(outputPixel[i]);
m_NumberFound++;
+ }
}
- }
return outputPixel;
}
-
-template < class TInputImage >
+template <class TInputImage>
void
-BoxAndWhiskerImageFilter < TInputImage >
-::GenerateOutputInformation ()
+BoxAndWhiskerImageFilter <TInputImage>
+::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
this->GetOutput()->SetNumberOfComponentsPerPixel(
- this->GetInput()->GetNumberOfComponentsPerPixel() );
+ this->GetInput()->GetNumberOfComponentsPerPixel());
- this->GetOutput()->CopyInformation( this->GetInput() );
+ this->GetOutput()->CopyInformation(this->GetInput());
}
-template < class TInputImage >
+template <class TInputImage>
void
-BoxAndWhiskerImageFilter < TInputImage >
-::AllocateOutputs ()
+BoxAndWhiskerImageFilter <TInputImage>
+::AllocateOutputs()
{
OutputImageType * output = this->GetOutput();
output->SetNumberOfComponentsPerPixel(
- this->GetInput()->GetNumberOfComponentsPerPixel() );
+ this->GetInput()->GetNumberOfComponentsPerPixel());
output->SetBufferedRegion(output->GetRequestedRegion());
output->Allocate();
}
@@ -165,5 +163,3 @@ BoxAndWhiskerImageFilter < TInputImage >
} // end of namespace otb
#endif
-
-
diff --git a/Code/BasicFilters/otbChangeLabelImageFilter.h b/Code/BasicFilters/otbChangeLabelImageFilter.h
index d68482c246..e3bb0b7b99 100644
--- a/Code/BasicFilters/otbChangeLabelImageFilter.h
+++ b/Code/BasicFilters/otbChangeLabelImageFilter.h
@@ -26,7 +26,7 @@
namespace otb
{
-
+
/** \class ChangeLabelImageFilter
*
* \brief Change Sets of Labels
@@ -35,98 +35,95 @@ namespace otb
*
*/
-
namespace Functor {
-
-template< class TInput, class TOutput>
+
+template<class TInput, class TOutput>
class VectorChangeLabel
{
public:
typedef typename TOutput::ValueType ValueType;
- VectorChangeLabel() {};
- virtual ~VectorChangeLabel() {};
+ VectorChangeLabel() {}
+ virtual ~VectorChangeLabel() {}
typedef std::map<TInput, TOutput> ChangeMapType;
-
void SetNumberOfComponentsPerPixel(unsigned int nb)
- {
- m_NumberOfComponentsPerPixel = nb;
- }
+ {
+ m_NumberOfComponentsPerPixel = nb;
+ }
unsigned int GetNumberOfComponentsPerPixel()
- {
- return m_NumberOfComponentsPerPixel;
- }
- bool operator!=( const VectorChangeLabel & other ) const
- {
+ {
+ return m_NumberOfComponentsPerPixel;
+ }
+ bool operator !=(const VectorChangeLabel& other) const
+ {
if (m_ChangeMap != other.m_ChangeMap)
{
return true;
}
return false;
- }
- bool operator==( const VectorChangeLabel & other ) const
- {
+ }
+ bool operator ==(const VectorChangeLabel& other) const
+ {
return !(*this != other);
- }
- TOutput GetChange( const TInput & original )
- {
+ }
+ TOutput GetChange(const TInput& original)
+ {
return m_ChangeMap[original];
- }
+ }
- void SetChange( const TInput & original, const TOutput & result )
- {
+ void SetChange(const TInput& original, const TOutput& result)
+ {
m_ChangeMap[original] = result;
- }
-
- void SetChangeMap( const ChangeMapType & changeMap )
- {
+ }
+
+ void SetChangeMap(const ChangeMapType& changeMap)
+ {
m_ChangeMap = changeMap;
- }
+ }
- void ClearChangeMap( )
- {
+ void ClearChangeMap()
+ {
m_ChangeMap.clear();
- }
+ }
- inline TOutput operator()( const TInput & A )
- {
- TOutput out;
- out.SetSize(m_NumberOfComponentsPerPixel);
-
- if ( m_ChangeMap.find(A) != m_ChangeMap.end() )
- {
- out = m_ChangeMap[A];
- }
- else
- {
- out.Fill(static_cast<ValueType>(A));
- }
- return out;
- }
+ inline TOutput operator ()(const TInput& A)
+ {
+ TOutput out;
+ out.SetSize(m_NumberOfComponentsPerPixel);
+
+ if (m_ChangeMap.find(A) != m_ChangeMap.end())
+ {
+ out = m_ChangeMap[A];
+ }
+ else
+ {
+ out.Fill(static_cast<ValueType>(A));
+ }
+ return out;
+ }
private:
ChangeMapType m_ChangeMap;
- unsigned int m_NumberOfComponentsPerPixel;
+ unsigned int m_NumberOfComponentsPerPixel;
};
}
-
template <class TInputImage, class TOutputImage>
class ITK_EXPORT ChangeLabelImageFilter :
- public itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,
- Functor::VectorChangeLabel< typename TInputImage::PixelType,
- typename TOutputImage::PixelType> >
+ public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage,
+ Functor::VectorChangeLabel<typename TInputImage::PixelType,
+ typename TOutputImage::PixelType> >
{
public:
/** Standard class typedefs. */
- typedef ChangeLabelImageFilter Self;
- typedef itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,
- Functor::VectorChangeLabel<
- typename TInputImage::PixelType,
- typename TOutputImage::PixelType>
- > Superclass;
+ typedef ChangeLabelImageFilter Self;
+ typedef itk::UnaryFunctorImageFilter<TInputImage, TOutputImage,
+ Functor::VectorChangeLabel<
+ typename TInputImage::PixelType,
+ typename TOutputImage::PixelType>
+ > Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -144,35 +141,34 @@ public:
typedef std::map<InputPixelType, OutputPixelType> ChangeMapType;
/** Set up a change of a single label */
- void SetChange( const InputPixelType & original, const OutputPixelType & result );
-
+ void SetChange(const InputPixelType& original, const OutputPixelType& result);
+
/** Set the entire change map */
- void SetChangeMap( const ChangeMapType & changeMap );
-
+ void SetChangeMap(const ChangeMapType& changeMap);
+
/** Clears the entire change map */
- void ClearChangeMap( );
+ void ClearChangeMap();
/** Set/Get the number of components per pixel */
void SetNumberOfComponentsPerPixel(unsigned int nb)
- {
- m_NumberOfComponentsPerPixel = nb;
- this->GetFunctor().SetNumberOfComponentsPerPixel(m_NumberOfComponentsPerPixel);
- this->Modified();
- }
- itkGetMacro(NumberOfComponentsPerPixel,unsigned int);
-
+ {
+ m_NumberOfComponentsPerPixel = nb;
+ this->GetFunctor().SetNumberOfComponentsPerPixel(m_NumberOfComponentsPerPixel);
+ this->Modified();
+ }
+ itkGetMacro(NumberOfComponentsPerPixel, unsigned int);
protected:
ChangeLabelImageFilter();
- virtual ~ChangeLabelImageFilter() {};
+ virtual ~ChangeLabelImageFilter() {}
/** Generate the output information missing */
virtual void GenerateOutputInformation();
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ChangeLabelImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ChangeLabelImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/// Number of components per pixel
unsigned int m_NumberOfComponentsPerPixel;
@@ -186,58 +182,54 @@ private:
#endif
-
#ifndef __otbChangeLabelImageFilter_h
#define __otbChangeLabelImageFilter_h
#include "itkChangeLabelImageFilter.h"
namespace otb
-{
-namespace Functor {
-
-template< class TInput, class TOutput>
+ {
+ namespace Functor {
+
+ template<class TInput, class TOutput>
class VectorChangeLabel : public ChangeLabel
-{
+ {
public:
- VectorChangeLabel() {m_NumberOfComponents=1;};
- virtual ~VectorChangeLabel() {};
+ VectorChangeLabel() {m_NumberOfComponents = 1; }
+ virtual ~VectorChangeLabel() {}
-
- void SetNumberOfComponents(unsigned int nb)
+ void SetNumberOfComponents(unsigned int nb)
{
m_NumberOfComponents = nb;
}
- unsigned int GetNumberOfComponents()
+ unsigned int GetNumberOfComponents()
{
return m_NumberOfComponents;
}
- inline TOutput operator()( const TInput & A )
+ inline TOutput operator ()(const TInput& A)
{
TOutput out;
out.SetSize(m_NumberOfComponents);
-
- if ( m_ChangeMap.find(A) != m_ChangeMap.end() )
+
+ if (m_ChangeMap.find(A) != m_ChangeMap.end())
{
- return m_ChangeMap[A];
+ return m_ChangeMap[A];
}
else
{
- out.Fill(static_cast<TOutput::ValueType>(A));
+ out.Fill(static_cast<TOutput::ValueType>(A));
}
}
private:
- unsigned int m_NumberOfComponents;
+ unsigned int m_NumberOfComponents;
-};
-}
+ };
+ }
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbChangeLabelImageFilter.txx"
#endif
#endif
-
-
diff --git a/Code/BasicFilters/otbChangeLabelImageFilter.txx b/Code/BasicFilters/otbChangeLabelImageFilter.txx
index 0c4ee60ab9..83ef21d8c1 100644
--- a/Code/BasicFilters/otbChangeLabelImageFilter.txx
+++ b/Code/BasicFilters/otbChangeLabelImageFilter.txx
@@ -38,10 +38,10 @@ ChangeLabelImageFilter<TInputImage, TOutputImage>
template <class TInputImage, class TOutputImage>
void
ChangeLabelImageFilter<TInputImage, TOutputImage>
-::SetChange( const InputPixelType & original, const OutputPixelType & result )
+::SetChange(const InputPixelType& original, const OutputPixelType& result)
{
- OutputPixelType current = this->GetFunctor().GetChange(original);
- if ( current != result )
+ OutputPixelType current = this->GetFunctor().GetChange(original);
+ if (current != result)
{
this->GetFunctor().SetChange(original, result);
this->Modified();
@@ -54,7 +54,7 @@ ChangeLabelImageFilter<TInputImage, TOutputImage>
template <class TInputImage, class TOutputImage>
void
ChangeLabelImageFilter<TInputImage, TOutputImage>
-::SetChangeMap( const ChangeMapType & changeMap )
+::SetChangeMap(const ChangeMapType& changeMap)
{
//If the whole map is being set then we assume that a real change is made
this->GetFunctor().SetChangeMap(changeMap);
@@ -67,7 +67,7 @@ ChangeLabelImageFilter<TInputImage, TOutputImage>
template <class TInputImage, class TOutputImage>
void
ChangeLabelImageFilter<TInputImage, TOutputImage>
-::ClearChangeMap( )
+::ClearChangeMap()
{
//If the whole map is being set then we assume that a real change is made
this->GetFunctor().ClearChangeMap();
@@ -83,11 +83,10 @@ ChangeLabelImageFilter<TInputImage, TOutputImage>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
-
+
this->GetOutput()->SetNumberOfComponentsPerPixel(m_NumberOfComponentsPerPixel);
}
-
/**
*
*/
@@ -96,8 +95,8 @@ void
ChangeLabelImageFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"Number of components per pixel: "<<m_NumberOfComponentsPerPixel;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Number of components per pixel: " << m_NumberOfComponentsPerPixel;
}
diff --git a/Code/BasicFilters/otbClosePathFunctor.h b/Code/BasicFilters/otbClosePathFunctor.h
index 142192da8f..8c4037e2bc 100644
--- a/Code/BasicFilters/otbClosePathFunctor.h
+++ b/Code/BasicFilters/otbClosePathFunctor.h
@@ -38,38 +38,36 @@ class ClosePathFunctor
public:
typedef typename TInput::VertexListType::ConstIterator VertexListConstIteratorType;
- typedef typename TInput::VertexListType::ConstPointer VertexListConstPointerType;
- typedef TOutput OutputPathType;
- typedef typename OutputPathType::Pointer OutputPathPointerType;
-
+ typedef typename TInput::VertexListType::ConstPointer VertexListConstPointerType;
+ typedef TOutput OutputPathType;
+ typedef typename OutputPathType::Pointer OutputPathPointerType;
ClosePathFunctor()
- {};
- virtual ~ClosePathFunctor() {};
+ {}
+ virtual ~ClosePathFunctor() {}
- inline OutputPathPointerType operator()(const TInput * input)
+ inline OutputPathPointerType operator ()(const TInput * input)
{
OutputPathPointerType newPath = OutputPathType::New();
newPath->Initialize();
typename TInput::VertexType lastVertex;
for (VertexListConstIteratorType vertexIt = input->GetVertexList()->Begin();
- vertexIt!= input->GetVertexList()->End();
- ++vertexIt)
- {
+ vertexIt != input->GetVertexList()->End();
+ ++vertexIt)
+ {
newPath->AddVertex(vertexIt.Value());
lastVertex = vertexIt.Value();
- }
+ }
if (lastVertex != input->GetVertexList()->Begin().Value())
- {
+ {
newPath->AddVertex(input->GetVertexList()->Begin().Value());
- }
+ }
newPath->SetMetaDataDictionary(input->GetMetaDataDictionary());
return newPath;
}
-
};
}
diff --git a/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.h b/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.h
index db7d1cb341..1220846477 100644
--- a/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.h
+++ b/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.h
@@ -40,31 +40,31 @@ namespace otb
* MorphologicalPyramidAnalysisFilter
*/
template <class TInputImage, class TOutputImage, class TKernel>
-class ITK_EXPORT ClosingOpeningMorphologicalFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+class ITK_EXPORT ClosingOpeningMorphologicalFilter
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
-public :
+public:
/** Standard typedefs */
- typedef ClosingOpeningMorphologicalFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ClosingOpeningMorphologicalFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(ClosingOpeningMorphologicalFilter,ImageToImageFilter);
+ itkTypeMacro(ClosingOpeningMorphologicalFilter, ImageToImageFilter);
/** Template parameter typedefs */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
- typedef TKernel KernelType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
+ typedef TKernel KernelType;
/** Useful typedefs */
- typedef typename InputImageType::Pointer InputImagePointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename TInputImage::PixelType PixelType;
+ typedef typename InputImageType::Pointer InputImagePointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename TInputImage::PixelType PixelType;
/** Kernel accessors */
itkSetMacro(Kernel, KernelType);
@@ -74,7 +74,7 @@ protected:
/** Constructor */
ClosingOpeningMorphologicalFilter();
/** Destructor */
- ~ClosingOpeningMorphologicalFilter() {};
+ ~ClosingOpeningMorphologicalFilter() {}
/* void GenerateInputRequestedRegion(); */
/* void EnlargeOutputRequestedRegion(itk::DataObject *itkNotUsed(output)); */
@@ -84,13 +84,13 @@ protected:
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-private :
- ClosingOpeningMorphologicalFilter(const Self&);//purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ ClosingOpeningMorphologicalFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Morphological operation kernel */
KernelType m_Kernel;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbClosingOpeningMorphologicalFilter.txx"
diff --git a/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.txx b/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.txx
index 2f91457727..4ab042b16a 100644
--- a/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.txx
+++ b/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.txx
@@ -29,7 +29,7 @@ namespace otb
/**
* Constructor
*/
-template <class TInputImage,class TOutputImage, class TKernel>
+template <class TInputImage, class TOutputImage, class TKernel>
ClosingOpeningMorphologicalFilter<TInputImage, TOutputImage, TKernel>
::ClosingOpeningMorphologicalFilter()
{
@@ -39,16 +39,16 @@ ClosingOpeningMorphologicalFilter<TInputImage, TOutputImage, TKernel>
/**
* Main computation method
*/
-template <class TInputImage,class TOutputImage, class TKernel>
+template <class TInputImage, class TOutputImage, class TKernel>
void
ClosingOpeningMorphologicalFilter<TInputImage, TOutputImage, TKernel>
::GenerateData()
{
// Filters Typedefs (this class is actually a composite filter)
- typedef itk::GrayscaleMorphologicalOpeningImageFilter<InputImageType,OutputImageType, KernelType> OpenFilterType;
- typedef itk::GrayscaleMorphologicalClosingImageFilter<InputImageType,OutputImageType,KernelType> CloseFilterType;
+ typedef itk::GrayscaleMorphologicalOpeningImageFilter<InputImageType, OutputImageType, KernelType> OpenFilterType;
+ typedef itk::GrayscaleMorphologicalClosingImageFilter<InputImageType, OutputImageType, KernelType> CloseFilterType;
// Filters initialization
- typename OpenFilterType::Pointer opening = OpenFilterType::New();
+ typename OpenFilterType::Pointer opening = OpenFilterType::New();
typename CloseFilterType::Pointer closing = CloseFilterType::New();
// Set the kernel
opening->SetKernel(this->GetKernel());
@@ -69,13 +69,13 @@ ClosingOpeningMorphologicalFilter<TInputImage, TOutputImage, TKernel>
/**
* PrintSelf method
*/
-template <class TInputImage,class TOutputImage, class TKernel>
+template <class TInputImage, class TOutputImage, class TKernel>
void
ClosingOpeningMorphologicalFilter<TInputImage, TOutputImage, TKernel>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "Kernel: " << m_Kernel << std::endl;
}
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.h b/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.h
index a9806cee61..24dc115cf6 100644
--- a/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.h
+++ b/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.h
@@ -58,14 +58,14 @@ namespace otb
template <class TInputImage>
class ITK_EXPORT ContinuousMinimumMaximumImageCalculator :
- public itk::Object
+ public itk::Object
{
public:
/** Standard class typedefs. */
typedef ContinuousMinimumMaximumImageCalculator Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -74,10 +74,10 @@ public:
itkTypeMacro(ContinuousMinimumMaximumImageCalculator, Object);
/** Type definition for the input image. */
- typedef TInputImage ImageType;
+ typedef TInputImage ImageType;
/** Pointer type for the image. */
- typedef typename TInputImage::Pointer ImagePointer;
+ typedef typename TInputImage::Pointer ImagePointer;
/** Const Pointer type for the image. */
typedef typename TInputImage::ConstPointer ImageConstPointer;
@@ -98,7 +98,7 @@ public:
typedef typename TInputImage::RegionType RegionType;
/** Set the input image. */
- itkSetConstObjectMacro(Image,ImageType);
+ itkSetConstObjectMacro(Image, ImageType);
/** Compute the minimum value of intensity of the input image. */
void ComputeMinimum(void);
@@ -110,52 +110,50 @@ public:
void Compute(void);
/** Return the minimum intensity value. */
- itkGetMacro(Minimum,PixelType);
+ itkGetMacro(Minimum, PixelType);
/** Return the maximum intensity value. */
- itkGetMacro(Maximum,PixelType);
+ itkGetMacro(Maximum, PixelType);
/** Return the index of the minimum intensity value. */
- itkGetConstReferenceMacro(IndexOfMinimum,IndexType);
+ itkGetConstReferenceMacro(IndexOfMinimum, IndexType);
/** Return the index of the maximum intensity value. */
- itkGetConstReferenceMacro(IndexOfMaximum,IndexType);
+ itkGetConstReferenceMacro(IndexOfMaximum, IndexType);
/** Return the index of the minimum intensity value. */
- itkGetConstReferenceMacro(ContinuousIndexOfMinimum,ContinuousIndexType);
+ itkGetConstReferenceMacro(ContinuousIndexOfMinimum, ContinuousIndexType);
/** Return the index of the maximum intensity value. */
- itkGetConstReferenceMacro(ContinuousIndexOfMaximum,ContinuousIndexType);
+ itkGetConstReferenceMacro(ContinuousIndexOfMaximum, ContinuousIndexType);
/** Set the region over which the values will be computed */
- void SetRegion( const RegionType & region );
+ void SetRegion(const RegionType& region);
protected:
ContinuousMinimumMaximumImageCalculator();
- virtual ~ContinuousMinimumMaximumImageCalculator() {};
+ virtual ~ContinuousMinimumMaximumImageCalculator() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
- PixelType m_Minimum;
- PixelType m_Maximum;
- ImageConstPointer m_ContinuousImage;
+ PixelType m_Minimum;
+ PixelType m_Maximum;
+ ImageConstPointer m_ContinuousImage;
- IndexType m_IndexOfMinimum;
- IndexType m_IndexOfMaximum;
- ContinuousIndexType m_ContinuousIndexOfMinimum;
- ContinuousIndexType m_ContinuousIndexOfMaximum;
- ImageConstPointer m_Image;
+ IndexType m_IndexOfMinimum;
+ IndexType m_IndexOfMaximum;
+ ContinuousIndexType m_ContinuousIndexOfMinimum;
+ ContinuousIndexType m_ContinuousIndexOfMaximum;
+ ImageConstPointer m_Image;
- RegionType m_Region;
- bool m_RegionSetByUser;
+ RegionType m_Region;
+ bool m_RegionSetByUser;
private:
- ContinuousMinimumMaximumImageCalculator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ ContinuousMinimumMaximumImageCalculator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#ifndef ITK_MANUAL_INSTANTIATION
diff --git a/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.txx b/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.txx
index 754531a66c..44fd9f5c32 100644
--- a/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.txx
+++ b/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.txx
@@ -41,7 +41,6 @@ ContinuousMinimumMaximumImageCalculator<TInputImage>
m_RegionSetByUser = false;
}
-
/*
* Compute Min and Max of m_Image
*/
@@ -50,96 +49,90 @@ void
ContinuousMinimumMaximumImageCalculator<TInputImage>
::Compute(void)
{
- if ( !m_RegionSetByUser )
- {
+ if (!m_RegionSetByUser)
+ {
m_Region = m_Image->GetRequestedRegion();
- }
+ }
- itk::ImageRegionConstIteratorWithIndex< TInputImage > it( m_Image, m_Region );
+ itk::ImageRegionConstIteratorWithIndex<TInputImage> it(m_Image, m_Region);
m_Maximum = itk::NumericTraits<PixelType>::NonpositiveMin();
m_Minimum = itk::NumericTraits<PixelType>::max();
-
- while ( !it.IsAtEnd() )
- {
- const RealPixelType value = it.Get();
- if (value > static_cast<RealPixelType>(m_Maximum) )
+ while (!it.IsAtEnd())
{
+ const RealPixelType value = it.Get();
+ if (value > static_cast<RealPixelType>(m_Maximum))
+ {
m_Maximum = static_cast<PixelType>(value);
m_IndexOfMaximum = it.GetIndex();
- }
+ }
if (value < static_cast<RealPixelType>(m_Minimum))
- {
+ {
m_Minimum = static_cast<PixelType>(value);
m_IndexOfMinimum = it.GetIndex();
- }
+ }
++it;
- }
+ }
IndexType indexNeighbor;
- { //Continuous Minimum calculation
- //Compute horizontal offset
- indexNeighbor[0] = m_IndexOfMinimum[0]-1;
+ { //Continuous Minimum calculation
+ //Compute horizontal offset
+ indexNeighbor[0] = m_IndexOfMinimum[0] - 1;
indexNeighbor[1] = m_IndexOfMinimum[1];
it.SetIndex(indexNeighbor);
- const RealPixelType leftValue= it.Get();
- indexNeighbor[0] = m_IndexOfMinimum[0]+1;
+ const RealPixelType leftValue = it.Get();
+ indexNeighbor[0] = m_IndexOfMinimum[0] + 1;
indexNeighbor[1] = m_IndexOfMinimum[1];
it.SetIndex(indexNeighbor);
- const RealPixelType rightValue= it.Get();
+ const RealPixelType rightValue = it.Get();
- double hOffset = -(rightValue-leftValue) / (2*(rightValue+leftValue-2*m_Minimum));
+ double hOffset = -(rightValue - leftValue) / (2 * (rightValue + leftValue - 2 * m_Minimum));
//Compute vertical offset
indexNeighbor[0] = m_IndexOfMinimum[0];
- indexNeighbor[1] = m_IndexOfMinimum[1]-1;
+ indexNeighbor[1] = m_IndexOfMinimum[1] - 1;
it.SetIndex(indexNeighbor);
- const RealPixelType topValue= it.Get();
+ const RealPixelType topValue = it.Get();
indexNeighbor[0] = m_IndexOfMinimum[0];
- indexNeighbor[1] = m_IndexOfMinimum[1]+1;
+ indexNeighbor[1] = m_IndexOfMinimum[1] + 1;
it.SetIndex(indexNeighbor);
- const RealPixelType bottomValue= it.Get();
-
-
- double vOffset = -(bottomValue-topValue) / (2*(bottomValue+topValue-2*m_Minimum));
+ const RealPixelType bottomValue = it.Get();
+ double vOffset = -(bottomValue - topValue) / (2 * (bottomValue + topValue - 2 * m_Minimum));
m_ContinuousIndexOfMinimum[0] = m_IndexOfMinimum[0] + hOffset;
m_ContinuousIndexOfMinimum[1] = m_IndexOfMinimum[1] + vOffset;
- }
-
+ }
- { //Continuous Maximum calculation
- //Compute horizontal offset
- indexNeighbor[0] = m_IndexOfMaximum[0]-1;
+ { //Continuous Maximum calculation
+ //Compute horizontal offset
+ indexNeighbor[0] = m_IndexOfMaximum[0] - 1;
indexNeighbor[1] = m_IndexOfMaximum[1];
it.SetIndex(indexNeighbor);
- const RealPixelType leftValue= it.Get();
- indexNeighbor[0] = m_IndexOfMaximum[0]+1;
+ const RealPixelType leftValue = it.Get();
+ indexNeighbor[0] = m_IndexOfMaximum[0] + 1;
indexNeighbor[1] = m_IndexOfMaximum[1];
it.SetIndex(indexNeighbor);
- const RealPixelType rightValue= it.Get();
+ const RealPixelType rightValue = it.Get();
- double hOffset = -(rightValue-leftValue) / (2*(rightValue+leftValue-2*m_Maximum));
+ double hOffset = -(rightValue - leftValue) / (2 * (rightValue + leftValue - 2 * m_Maximum));
//Compute vertical offset
indexNeighbor[0] = m_IndexOfMaximum[0];
- indexNeighbor[1] = m_IndexOfMaximum[1]-1;
+ indexNeighbor[1] = m_IndexOfMaximum[1] - 1;
it.SetIndex(indexNeighbor);
- const RealPixelType topValue= it.Get();
+ const RealPixelType topValue = it.Get();
indexNeighbor[0] = m_IndexOfMaximum[0];
- indexNeighbor[1] = m_IndexOfMaximum[1]+1;
+ indexNeighbor[1] = m_IndexOfMaximum[1] + 1;
it.SetIndex(indexNeighbor);
- const RealPixelType bottomValue= it.Get();
-
-
- double vOffset = -(bottomValue-topValue) / (2*(bottomValue+topValue-2*m_Maximum));
+ const RealPixelType bottomValue = it.Get();
+ double vOffset = -(bottomValue - topValue) / (2 * (bottomValue + topValue - 2 * m_Maximum));
m_ContinuousIndexOfMaximum[0] = m_IndexOfMaximum[0] + hOffset;
m_ContinuousIndexOfMaximum[1] = m_IndexOfMaximum[1] + vOffset;
- }
+ }
}
@@ -151,56 +144,53 @@ void
ContinuousMinimumMaximumImageCalculator<TInputImage>
::ComputeMinimum(void)
{
- if ( !m_RegionSetByUser )
- {
+ if (!m_RegionSetByUser)
+ {
m_Region = m_Image->GetRequestedRegion();
- }
- itk::ImageRegionConstIteratorWithIndex< TInputImage > it( m_Image, m_Region );
+ }
+ itk::ImageRegionConstIteratorWithIndex<TInputImage> it(m_Image, m_Region);
m_Minimum = itk::NumericTraits<PixelType>::max();
- while ( !it.IsAtEnd() )
- {
+ while (!it.IsAtEnd())
+ {
const RealPixelType value = it.Get();
if (value < static_cast<RealPixelType>(m_Minimum))
- {
+ {
m_Minimum = static_cast<PixelType>(value);
m_IndexOfMinimum = it.GetIndex();
- }
+ }
++it;
- }
+ }
IndexType indexNeighbor;
//Compute horizontal offset
- indexNeighbor[0] = m_IndexOfMinimum[0]-1;
+ indexNeighbor[0] = m_IndexOfMinimum[0] - 1;
indexNeighbor[1] = m_IndexOfMinimum[1];
it.SetIndex(indexNeighbor);
- const RealPixelType leftValue= it.Get();
- indexNeighbor[0] = m_IndexOfMinimum[0]+1;
+ const RealPixelType leftValue = it.Get();
+ indexNeighbor[0] = m_IndexOfMinimum[0] + 1;
indexNeighbor[1] = m_IndexOfMinimum[1];
it.SetIndex(indexNeighbor);
- const RealPixelType rightValue= it.Get();
+ const RealPixelType rightValue = it.Get();
- double hOffset = -(rightValue-leftValue) / (2*(rightValue+leftValue-2*m_Minimum));
+ double hOffset = -(rightValue - leftValue) / (2 * (rightValue + leftValue - 2 * m_Minimum));
//Compute vertical offset
indexNeighbor[0] = m_IndexOfMinimum[0];
- indexNeighbor[1] = m_IndexOfMinimum[1]-1;
+ indexNeighbor[1] = m_IndexOfMinimum[1] - 1;
it.SetIndex(indexNeighbor);
- const RealPixelType topValue= it.Get();
+ const RealPixelType topValue = it.Get();
indexNeighbor[0] = m_IndexOfMinimum[0];
- indexNeighbor[1] = m_IndexOfMinimum[1]+1;
+ indexNeighbor[1] = m_IndexOfMinimum[1] + 1;
it.SetIndex(indexNeighbor);
- const RealPixelType bottomValue= it.Get();
-
-
- double vOffset = -(bottomValue-topValue) / (2*(bottomValue+topValue-2*m_Minimum));
+ const RealPixelType bottomValue = it.Get();
+ double vOffset = -(bottomValue - topValue) / (2 * (bottomValue + topValue - 2 * m_Minimum));
m_ContinuousIndexOfMinimum[0] = m_IndexOfMinimum[0] + hOffset;
m_ContinuousIndexOfMinimum[1] = m_IndexOfMinimum[1] + vOffset;
-
}
/*
@@ -211,93 +201,89 @@ void
ContinuousMinimumMaximumImageCalculator<TInputImage>
::ComputeMaximum(void)
{
- if ( !m_RegionSetByUser )
- {
+ if (!m_RegionSetByUser)
+ {
m_Region = m_Image->GetRequestedRegion();
- }
- itk::ImageRegionConstIteratorWithIndex< TInputImage > it( m_Image, m_Region );
+ }
+ itk::ImageRegionConstIteratorWithIndex<TInputImage> it(m_Image, m_Region);
m_Maximum = itk::NumericTraits<PixelType>::NonpositiveMin();
- while ( !it.IsAtEnd() )
- {
- const RealPixelType value = it.Get();
- if (value > static_cast<RealPixelType>(m_Maximum) )
+ while (!it.IsAtEnd())
{
+ const RealPixelType value = it.Get();
+ if (value > static_cast<RealPixelType>(m_Maximum))
+ {
m_Maximum = static_cast<PixelType>(value);
m_IndexOfMaximum = it.GetIndex();
- }
+ }
++it;
- }
+ }
//Solve equations a,b,c
// y0 = a*x0^2 + b*x0 +c
// y1 = a*x1^2 + b*x1 +c
// y2 = a*x2^2 + b*x2 +c
- //
+//
// y0 = a - b +c
// y1 = c
// y2 = a + b +c
- //
- //
- // Max is at -b/2a
- // -(y2-y0)/(2*(y0+y2-2y1))
+//
+//
+// Max is at -b/2a
+// -(y2-y0)/(2*(y0+y2-2y1))
IndexType indexNeighbor;
//Compute horizontal offset
- indexNeighbor[0] = m_IndexOfMaximum[0]-1;
+ indexNeighbor[0] = m_IndexOfMaximum[0] - 1;
indexNeighbor[1] = m_IndexOfMaximum[1];
it.SetIndex(indexNeighbor);
- const RealPixelType leftValue= it.Get();
- indexNeighbor[0] = m_IndexOfMaximum[0]+1;
+ const RealPixelType leftValue = it.Get();
+ indexNeighbor[0] = m_IndexOfMaximum[0] + 1;
indexNeighbor[1] = m_IndexOfMaximum[1];
it.SetIndex(indexNeighbor);
- const RealPixelType rightValue= it.Get();
+ const RealPixelType rightValue = it.Get();
- double hOffset = -(rightValue-leftValue) / (2*(rightValue+leftValue-2*m_Maximum));
+ double hOffset = -(rightValue - leftValue) / (2 * (rightValue + leftValue - 2 * m_Maximum));
//Compute vertical offset
indexNeighbor[0] = m_IndexOfMaximum[0];
- indexNeighbor[1] = m_IndexOfMaximum[1]-1;
+ indexNeighbor[1] = m_IndexOfMaximum[1] - 1;
it.SetIndex(indexNeighbor);
- const RealPixelType topValue= it.Get();
+ const RealPixelType topValue = it.Get();
indexNeighbor[0] = m_IndexOfMaximum[0];
- indexNeighbor[1] = m_IndexOfMaximum[1]+1;
+ indexNeighbor[1] = m_IndexOfMaximum[1] + 1;
it.SetIndex(indexNeighbor);
- const RealPixelType bottomValue= it.Get();
-
-
- double vOffset = -(bottomValue-topValue) / (2*(bottomValue+topValue-2*m_Maximum));
+ const RealPixelType bottomValue = it.Get();
+ double vOffset = -(bottomValue - topValue) / (2 * (bottomValue + topValue - 2 * m_Maximum));
m_ContinuousIndexOfMaximum[0] = m_IndexOfMaximum[0] + hOffset;
m_ContinuousIndexOfMaximum[1] = m_IndexOfMaximum[1] + vOffset;
}
-
template<class TInputImage>
void
ContinuousMinimumMaximumImageCalculator<TInputImage>
-::SetRegion( const RegionType & region )
+::SetRegion(const RegionType& region)
{
m_Region = region;
m_RegionSetByUser = true;
}
-
template<class TInputImage>
void
ContinuousMinimumMaximumImageCalculator<TInputImage>
-::PrintSelf( std::ostream& os, itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "Minimum: "
- << static_cast<typename itk::NumericTraits<PixelType>::PrintType>(m_Minimum)
- << std::endl;
+ << static_cast<typename itk::NumericTraits<PixelType>::PrintType>(m_Minimum)
+ << std::endl;
os << indent << "Maximum: "
- << static_cast<typename itk::NumericTraits<PixelType>::PrintType>(m_Maximum)
- << std::endl;
+ << static_cast<typename itk::NumericTraits<PixelType>::PrintType>(m_Maximum)
+ << std::endl;
os << indent << "Index of Minimum: " << m_IndexOfMinimum << std::endl;
os << indent << "Index of Maximum: " << m_IndexOfMaximum << std::endl;
os << indent << "Continuous Index of Minimum: " << m_ContinuousIndexOfMinimum << std::endl;
@@ -306,11 +292,10 @@ ContinuousMinimumMaximumImageCalculator<TInputImage>
os << indent << "Image: " << std::endl;
m_Image->Print(os, indent.GetNextIndent());
os << indent << "Region: " << std::endl;
- m_Region.Print(os,indent.GetNextIndent());
+ m_Region.Print(os, indent.GetNextIndent());
os << indent << "Region set by User: " << m_RegionSetByUser << std::endl;
}
} // end namespace otb
-
#endif
diff --git a/Code/BasicFilters/otbConvolutionImageFilter.h b/Code/BasicFilters/otbConvolutionImageFilter.h
index 059043af2a..da0db56ed9 100644
--- a/Code/BasicFilters/otbConvolutionImageFilter.h
+++ b/Code/BasicFilters/otbConvolutionImageFilter.h
@@ -58,9 +58,10 @@ namespace otb
* \ingroup Streamed
* \ingroup MultiThreaded
*/
-template <class TInputImage, class TOutputImage, class TBoundaryCondition = itk::ZeroFluxNeumannBoundaryCondition<TInputImage> >
+template <class TInputImage, class TOutputImage, class TBoundaryCondition =
+ itk::ZeroFluxNeumannBoundaryCondition<TInputImage> >
class ITK_EXPORT ConvolutionImageFilter :
- public itk::ImageToImageFilter< TInputImage, TOutputImage >
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Extract dimension from input and output image. */
@@ -70,14 +71,14 @@ public:
TOutputImage::ImageDimension);
/** Convenient typedefs for simplifying declarations. */
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
/** Standard class typedefs. */
- typedef ConvolutionImageFilter Self;
- typedef itk::ImageToImageFilter< InputImageType, OutputImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ConvolutionImageFilter Self;
+ typedef itk::ImageToImageFilter<InputImageType, OutputImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -86,52 +87,53 @@ public:
itkTypeMacro(ConvolutionImageFilter, ImageToImageFilter);
/** Image typedef support. */
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
typedef typename itk::NumericTraits<InputPixelType>::RealType InputRealType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename InputImageType::SizeType InputSizeType;
- typedef typename itk::Array<InputRealType> ArrayType;
- typedef TBoundaryCondition BoundaryConditionType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename InputImageType::SizeType InputSizeType;
+ typedef typename itk::Array<InputRealType> ArrayType;
+ typedef TBoundaryCondition BoundaryConditionType;
/** Set the radius of the neighborhood of the filter */
- virtual void SetRadius (const InputSizeType rad)
+ virtual void SetRadius(const InputSizeType rad)
{
itkDebugMacro("setting radius to " << rad);
if (this->m_Radius != rad)
- {
- this->m_Radius = rad;
- unsigned int arraySize=1;
- for (unsigned int i=0; i<m_Radius.GetSizeDimension(); ++i)
{
- arraySize *= 2*this->m_Radius[i]+1;
- }
+ this->m_Radius = rad;
+ unsigned int arraySize = 1;
+ for (unsigned int i = 0; i < m_Radius.GetSizeDimension(); ++i)
+ {
+ arraySize *= 2 * this->m_Radius[i] + 1;
+ }
this->m_Filter.SetSize(arraySize);
this->m_Filter.Fill(1);
this->Modified();
- }
+ }
}
/** Get the radius of the neighborhood of the filter*/
itkGetConstReferenceMacro(Radius, InputSizeType);
/** Set the input filter */
- virtual void SetFilter( ArrayType filter )
+ virtual void SetFilter(ArrayType filter)
{
- if (filter.Size()!= m_Filter.Size())
- {
- itkExceptionMacro("Error in SetFilter, invalid filter size:"<< filter.Size()<<" instead of (2*m_Radius[0]+1)*(2*m_Radius[1]+1): "<<m_Filter.Size());
- }
+ if (filter.Size() != m_Filter.Size())
+ {
+ itkExceptionMacro(
+ "Error in SetFilter, invalid filter size:" << filter.Size() <<
+ " instead of (2*m_Radius[0]+1)*(2*m_Radius[1]+1): " << m_Filter.Size());
+ }
else
- {
+ {
m_Filter = filter;
- }
+ }
this->Modified();
}
itkGetConstReferenceMacro(Filter, ArrayType);
-
/**
* Set/Get methods for the normalization of the filter
*/
@@ -162,7 +164,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
/** ConvolutionImageFilter needs a larger input requested region than
* the output requested region. As such, ConvolutionImageFilter needs
@@ -170,11 +172,12 @@ protected:
* in order to inform the pipeline execution model.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
- virtual void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError);
+ virtual void GenerateInputRequestedRegion()
+ throw(itk::InvalidRequestedRegionError);
private:
- ConvolutionImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ConvolutionImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Radius of the filter */
InputSizeType m_Radius;
diff --git a/Code/BasicFilters/otbConvolutionImageFilter.txx b/Code/BasicFilters/otbConvolutionImageFilter.txx
index 722cd0ba77..122d991136 100644
--- a/Code/BasicFilters/otbConvolutionImageFilter.txx
+++ b/Code/BasicFilters/otbConvolutionImageFilter.txx
@@ -37,7 +37,7 @@ ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition>
::ConvolutionImageFilter()
{
m_Radius.Fill(1);
- m_Filter.SetSize(3*3);
+ m_Filter.SetSize(3 * 3);
m_Filter.Fill(1);
m_NormalizeFilter = false;
}
@@ -46,19 +46,19 @@ template <class TInputImage, class TOutputImage, class TBoundaryCondition>
void
ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition>
::GenerateInputRequestedRegion() throw (itk::InvalidRequestedRegionError)
-{
+ {
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
typename Superclass::InputImagePointer inputPtr =
- const_cast< TInputImage * >( this->GetInput() );
+ const_cast<TInputImage *>(this->GetInput());
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
@@ -66,23 +66,23 @@ ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition>
inputRequestedRegion = inputPtr->GetRequestedRegion();
// pad the input requested region by the operator radius
- inputRequestedRegion.PadByRadius( m_Radius );
- otbMsgDevMacro(<<"Padding by " << m_Radius );
- otbMsgDevMacro(<<"Region is now " << inputRequestedRegion.GetIndex() << ", "<< inputRequestedRegion.GetSize() );
+ inputRequestedRegion.PadByRadius(m_Radius);
+ otbMsgDevMacro(<< "Padding by " << m_Radius);
+ otbMsgDevMacro(<< "Region is now " << inputRequestedRegion.GetIndex() << ", " << inputRequestedRegion.GetSize());
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
@@ -90,21 +90,20 @@ ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition>
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
+ }
}
-}
-
-template< class TInputImage, class TOutputImage, class TBoundaryCondition>
+template<class TInputImage, class TOutputImage, class TBoundaryCondition>
void
-ConvolutionImageFilter< TInputImage, TOutputImage, TBoundaryCondition>
+ConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition>
::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
int threadId)
{
unsigned int i;
// Allocate output
- typename OutputImageType::Pointer output = this->GetOutput();
- typename InputImageType::ConstPointer input = this->GetInput();
+ typename OutputImageType::Pointer output = this->GetOutput();
+ typename InputImageType::ConstPointer input = this->GetInput();
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
@@ -122,38 +121,38 @@ ConvolutionImageFilter< TInputImage, TOutputImage, TBoundaryCondition>
unsigned int neighborhoodSize = inputIt.Size();
// Compute the norm of the filter
- if(m_NormalizeFilter)
- {
+ if (m_NormalizeFilter)
+ {
norm = itk::NumericTraits<InputRealType>::Zero;
for (i = 0; i < neighborhoodSize; ++i)
- {
- norm += static_cast<InputRealType>( vcl_abs(m_Filter(i)) );
+ {
+ norm += static_cast<InputRealType>(vcl_abs(m_Filter(i)));
+ }
}
- }
- while ( ! inputIt.IsAtEnd() )
- {
+ while (!inputIt.IsAtEnd())
+ {
sum = itk::NumericTraits<InputRealType>::Zero;
for (i = 0; i < neighborhoodSize; ++i)
- {
- sum += static_cast<InputRealType>( inputIt.GetPixel(i)*m_Filter(i) );
- }
+ {
+ sum += static_cast<InputRealType>(inputIt.GetPixel(i) * m_Filter(i));
+ }
// get the mean value
if (m_NormalizeFilter)
- {
- outputIt.Set( static_cast<OutputPixelType>(sum / double(norm)) );
- }
+ {
+ outputIt.Set(static_cast<OutputPixelType>(sum / double(norm)));
+ }
else
- {
- outputIt.Set( static_cast<OutputPixelType>(sum));
- }
+ {
+ outputIt.Set(static_cast<OutputPixelType>(sum));
+ }
++inputIt;
++outputIt;
progress.CompletedPixel();
- }
+ }
}
/**
@@ -164,7 +163,7 @@ void
ConvolutionImageFilter<TInputImage, TOutput, TBoundaryCondition>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "Radius: " << m_Radius << std::endl;
}
diff --git a/Code/BasicFilters/otbCorrectPolygonFunctor.h b/Code/BasicFilters/otbCorrectPolygonFunctor.h
index 002fe20fcd..b7f733987f 100644
--- a/Code/BasicFilters/otbCorrectPolygonFunctor.h
+++ b/Code/BasicFilters/otbCorrectPolygonFunctor.h
@@ -38,29 +38,28 @@ class CorrectPolygonFunctor
{
public:
- typedef TPolygon PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef TPolygon PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
/** Some typedefs specific to functors*/
- typedef otb::SimplifyPathFunctor<PolygonType,PolygonType> SimplifyFunctorType;
- typedef ClosePathFunctor <PolygonType,PolygonType> CloseFunctorType;
+ typedef otb::SimplifyPathFunctor<PolygonType, PolygonType> SimplifyFunctorType;
+ typedef ClosePathFunctor <PolygonType, PolygonType> CloseFunctorType;
CorrectPolygonFunctor()
- {};
- ~CorrectPolygonFunctor() {};
+ {}
+ ~CorrectPolygonFunctor() {}
- inline PolygonPointerType operator()(const TPolygon * input)
+ inline PolygonPointerType operator ()(const TPolygon * input)
{
/**create functors */
SimplifyFunctorType simplifyFunctor;
- CloseFunctorType closeFunctor;
-
+ CloseFunctorType closeFunctor;
+
simplifyFunctor.SetTolerance(0.0);
-
+
/** Erase aligned points and close polygon*/
- return closeFunctor ( simplifyFunctor(input) );
-
- }
+ return closeFunctor (simplifyFunctor(input));
+ }
};
diff --git a/Code/BasicFilters/otbDecimateImageFilter.h b/Code/BasicFilters/otbDecimateImageFilter.h
index 705bd2d679..ed12e71af0 100644
--- a/Code/BasicFilters/otbDecimateImageFilter.h
+++ b/Code/BasicFilters/otbDecimateImageFilter.h
@@ -35,16 +35,16 @@ namespace otb {
* \sa ResampleImageFilter
* \sa SubsampleImageRegionConstIterator
*/
-template < class TInputImage, class TOutputImage >
+template <class TInputImage, class TOutputImage>
class ITK_EXPORT DecimateImageFilter :
- public itk::ImageToImageFilter< TInputImage, TOutputImage >
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef DecimateImageFilter Self;
- typedef itk::ImageToImageFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef DecimateImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -59,31 +59,31 @@ public:
TOutputImage::ImageDimension);
/** Image typedef support. */
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef typename InputImageType::RegionType InputImageRegionType;
- typedef TOutputImage OutputImageType;
+ typedef TOutputImage OutputImageType;
typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
/** Set/Get the DecimateFactor */
- itkGetMacro(DecimationFactor,unsigned int);
- itkSetMacro(DecimationFactor,unsigned int);
+ itkGetMacro(DecimationFactor, unsigned int);
+ itkSetMacro(DecimationFactor, unsigned int);
protected:
DecimateImageFilter ()
- {
+ {
m_DecimationFactor = 1;
- }
+ }
virtual ~DecimateImageFilter() {}
/** Since input and output image are very likely to be of different size.
* Region estimation functions has to be reimplemented
*/
virtual void CallCopyOutputRegionToInputRegion
- ( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion );
+ (InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion);
virtual void CallCopyInputRegionToOutputRegion
- ( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion );
+ (OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion);
/** Output image region size is not of the same dimension as the input.
* That is why GenerateOutputInformation has to be redefined.
@@ -92,25 +92,21 @@ protected:
/** Allows multithreading */
virtual void ThreadedGenerateData
- ( const OutputImageRegionType & outputRegionForThread, int threadId );
+ (const OutputImageRegionType& outputRegionForThread, int threadId);
- virtual void PrintSelf( std::ostream & os, itk::Indent indent ) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- DecimateImageFilter ( const Self & ); // purposely not implemented
- void operator= ( const Self & ); // purposely not implemented
+ DecimateImageFilter (const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
unsigned int m_DecimationFactor;
}; // end of class
-
} // end of namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbDecimateImageFilter.txx"
#endif
-
#endif
-
-
diff --git a/Code/BasicFilters/otbDecimateImageFilter.txx b/Code/BasicFilters/otbDecimateImageFilter.txx
index 552379e842..61d6596472 100644
--- a/Code/BasicFilters/otbDecimateImageFilter.txx
+++ b/Code/BasicFilters/otbDecimateImageFilter.txx
@@ -28,113 +28,112 @@
#include "itkImageRegionIterator.h"
#include "itkProgressReporter.h"
-
namespace otb {
template <class TInputImage, class TOutputImage>
void
-DecimateImageFilter< TInputImage, TOutputImage >
-::PrintSelf( std::ostream & os, itk::Indent indent ) const
+DecimateImageFilter<TInputImage, TOutputImage>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "DecimationFactor = " << m_DecimationFactor << "\n";
}
template <class TInputImage, class TOutputImage>
void
-DecimateImageFilter< TInputImage, TOutputImage >
+DecimateImageFilter<TInputImage, TOutputImage>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
- if ( GetDecimationFactor() > 1 )
- {
- this->GetOutput()->CopyInformation( this->GetInput() );
+ if (GetDecimationFactor() > 1)
+ {
+ this->GetOutput()->CopyInformation(this->GetInput());
OutputImageRegionType newRegion;
- this->CallCopyInputRegionToOutputRegion( newRegion, this->GetInput()->GetLargestPossibleRegion() );
- this->GetOutput()->SetRegions( newRegion );
+ this->CallCopyInputRegionToOutputRegion(newRegion, this->GetInput()->GetLargestPossibleRegion());
+ this->GetOutput()->SetRegions(newRegion);
- for ( unsigned int i = 0; i < OutputImageDimension; ++i )
- {
- otbGenericMsgDebugMacro( << "Image Output size [" << i << "] = " << newRegion.GetSize(i) );
+ for (unsigned int i = 0; i < OutputImageDimension; ++i)
+ {
+ otbGenericMsgDebugMacro(<< "Image Output size [" << i << "] = " << newRegion.GetSize(i));
+ }
}
- }
}
template <class TInputImage, class TOutputImage>
void
-DecimateImageFilter< TInputImage, TOutputImage >
+DecimateImageFilter<TInputImage, TOutputImage>
::CallCopyOutputRegionToInputRegion
-( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion )
+ (InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion)
{
- Superclass::CallCopyOutputRegionToInputRegion( destRegion, srcRegion );
+ Superclass::CallCopyOutputRegionToInputRegion(destRegion, srcRegion);
typename OutputImageRegionType::IndexType srcIndex = srcRegion.GetIndex();
- typename OutputImageRegionType::SizeType srcSize = srcRegion.GetSize();
+ typename OutputImageRegionType::SizeType srcSize = srcRegion.GetSize();
typename InputImageRegionType::IndexType destIndex;
- typename InputImageRegionType::SizeType destSize;
+ typename InputImageRegionType::SizeType destSize;
- for ( unsigned int i = 0; i < InputImageDimension; ++i )
- {
+ for (unsigned int i = 0; i < InputImageDimension; ++i)
+ {
destIndex[i] = srcIndex[i] * GetDecimationFactor();
- destSize[i] = ( srcSize[i] - 1 ) * GetDecimationFactor() + 1;
- }
+ destSize[i] = (srcSize[i] - 1) * GetDecimationFactor() + 1;
+ }
- destRegion.SetIndex( destIndex );
- destRegion.SetSize( destSize );
+ destRegion.SetIndex(destIndex);
+ destRegion.SetSize(destSize);
}
template <class TInputImage, class TOutputImage>
void
-DecimateImageFilter< TInputImage, TOutputImage >
+DecimateImageFilter<TInputImage, TOutputImage>
::CallCopyInputRegionToOutputRegion
-( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
+ (OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion)
{
- Superclass::CallCopyInputRegionToOutputRegion( destRegion, srcRegion );
+ Superclass::CallCopyInputRegionToOutputRegion(destRegion, srcRegion);
typename InputImageRegionType::IndexType srcIndex = srcRegion.GetIndex();
- typename InputImageRegionType::SizeType srcSize = srcRegion.GetSize();
+ typename InputImageRegionType::SizeType srcSize = srcRegion.GetSize();
typename OutputImageRegionType::IndexType destIndex;
- typename OutputImageRegionType::SizeType destSize;
+ typename OutputImageRegionType::SizeType destSize;
- for ( unsigned int i = 0; i < InputImageDimension; ++i )
- {
+ for (unsigned int i = 0; i < InputImageDimension; ++i)
+ {
destIndex[i] = srcIndex[i] / GetDecimationFactor();
- destSize[i] = ( srcSize[i] - 1 ) / GetDecimationFactor() + 1;
- }
+ destSize[i] = (srcSize[i] - 1) / GetDecimationFactor() + 1;
+ }
- destRegion.SetIndex( destIndex );
- destRegion.SetSize( destSize );
+ destRegion.SetIndex(destIndex);
+ destRegion.SetSize(destSize);
}
template <class TInputImage, class TOutputImage>
void
-DecimateImageFilter< TInputImage, TOutputImage >
+DecimateImageFilter<TInputImage, TOutputImage>
::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
int threadId)
{
InputImageRegionType inputRegionForThread;
- this->CallCopyOutputRegionToInputRegion( inputRegionForThread, outputRegionForThread );
+ this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
- SubsampledImageRegionConstIterator< InputImageType > decimationIterator
- ( this->GetInput(), inputRegionForThread );
- decimationIterator.SetSubsampleFactor( GetDecimationFactor() );
+ SubsampledImageRegionConstIterator<InputImageType> decimationIterator
+ (this->GetInput(), inputRegionForThread);
+ decimationIterator.SetSubsampleFactor(GetDecimationFactor());
decimationIterator.GoToBegin();
- itk::ImageRegionIterator< InputImageType > outputIter
- ( this->GetOutput(), outputRegionForThread );
+ itk::ImageRegionIterator<InputImageType> outputIter
+ (this->GetOutput(), outputRegionForThread);
outputIter.GoToBegin();
- while ( !decimationIterator.IsAtEnd() && !outputIter.IsAtEnd() )
- {
- outputIter.Set( static_cast< OutputPixelType >( decimationIterator.Get() ) );
+ while (!decimationIterator.IsAtEnd() && !outputIter.IsAtEnd())
+ {
+ outputIter.Set(static_cast<OutputPixelType>(decimationIterator.Get()));
++outputIter;
++decimationIterator;
- }
+ }
}
} // end of namespace otb
diff --git a/Code/BasicFilters/otbEdgeDensityImageFilter.h b/Code/BasicFilters/otbEdgeDensityImageFilter.h
index 19ad03ad6d..e2a0753235 100644
--- a/Code/BasicFilters/otbEdgeDensityImageFilter.h
+++ b/Code/BasicFilters/otbEdgeDensityImageFilter.h
@@ -25,7 +25,6 @@
#include "itkProcessObject.h"
#include "itkNumericTraits.h"
-
/** \class EdgeDensityImageFilter
* \brief This composite filter computes the density of the edges around a pixel.
*
@@ -34,66 +33,65 @@
namespace otb
{
-template <class TInputImage, class TOutputImage , class TEdgeDetector, class TDensityCount>
+template <class TInputImage, class TOutputImage, class TEdgeDetector, class TDensityCount>
class ITK_EXPORT EdgeDensityImageFilter
- : public itk::ImageToImageFilter<TInputImage, TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef EdgeDensityImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef EdgeDensityImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(EdgeDensityImageFilter,itk::ImageToImageFilter);
-
+ itkTypeMacro(EdgeDensityImageFilter, itk::ImageToImageFilter);
/** Template parameters typedefs*/
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef typename InputImageType::SizeType InputImageSizeType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::SizeType InputImageSizeType;
/** OutputImageType typedef support*/
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
/** Edge Detector typedef Support*/
- typedef TEdgeDetector DetectorType;
- typedef typename DetectorType::Pointer DetectorPointerType;
+ typedef TEdgeDetector DetectorType;
+ typedef typename DetectorType::Pointer DetectorPointerType;
/** Count Density Function typedef support*/
- typedef TDensityCount DensityCountFunctionType;
+ typedef TDensityCount DensityCountFunctionType;
/** PointSetToDensityImageFilter support*/
typedef otb::BinaryImageToDensityImageFilter<InputImageType,
OutputImageType,
DensityCountFunctionType> DensityImageType;
-
- typedef typename DensityImageType::Pointer DensityImagePointerType;
-
+
+ typedef typename DensityImageType::Pointer DensityImagePointerType;
+
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
- itkSetMacro( NeighborhoodRadius, InputImageSizeType );
- itkGetConstReferenceMacro( NeighborhoodRadius, InputImageSizeType );
- void SetNeighborhoodRadius( unsigned int rad)
- {
- m_NeighborhoodRadius.Fill(rad);
- this->Modified();
- }
+ itkSetMacro(NeighborhoodRadius, InputImageSizeType);
+ itkGetConstReferenceMacro(NeighborhoodRadius, InputImageSizeType);
+ void SetNeighborhoodRadius(unsigned int rad)
+ {
+ m_NeighborhoodRadius.Fill(rad);
+ this->Modified();
+ }
/**Set/Get detector */
itkSetObjectMacro(Detector, DetectorType);
itkGetObjectMacro(Detector, DetectorType);
itkGetObjectMacro(DensityImageFilter, DensityImageType);
-
+
protected:
/**
@@ -111,12 +109,12 @@ protected:
/**
* Main computation method.
*/
- virtual void GenerateData( );
+ virtual void GenerateData();
private:
- EdgeDensityImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ EdgeDensityImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
DetectorPointerType m_Detector;
DensityImagePointerType m_DensityImageFilter;
@@ -128,5 +126,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/BasicFilters/otbEdgeDensityImageFilter.txx b/Code/BasicFilters/otbEdgeDensityImageFilter.txx
index d73a733956..b43e2f0399 100644
--- a/Code/BasicFilters/otbEdgeDensityImageFilter.txx
+++ b/Code/BasicFilters/otbEdgeDensityImageFilter.txx
@@ -28,51 +28,48 @@ namespace otb
/**---------------------------------------------------------
* Constructor
----------------------------------------------------------*/
-template <class TInputImage , class TOutputImage, class TEdgeDetector, class TDensityCount>
+template <class TInputImage, class TOutputImage, class TEdgeDetector, class TDensityCount>
EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount>
::EdgeDensityImageFilter()
{
- this->SetNumberOfRequiredInputs( 1 );
-
- m_NeighborhoodRadius.Fill( 1 );
+ this->SetNumberOfRequiredInputs(1);
+
+ m_NeighborhoodRadius.Fill(1);
m_Detector = DetectorType::New();
m_DensityImageFilter = DensityImageType::New();
}
-
/*---------------------------------------------------------
* Destructor.c
----------------------------------------------------------*/
-template <class TInputImage , class TOutputImage, class TEdgeDetector, class TDensityCount>
+template <class TInputImage, class TOutputImage, class TEdgeDetector, class TDensityCount>
EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount>
::~EdgeDensityImageFilter()
{}
-
/**
* threaded Generate Data
*/
-template <class TInputImage , class TOutputImage, class TEdgeDetector, class TDensityCount>
+template <class TInputImage, class TOutputImage, class TEdgeDetector, class TDensityCount>
void
EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount>
::GenerateData()
{
typename ImageFileWriter<TInputImage>::Pointer writer = ImageFileWriter<TInputImage>::New();
- m_Detector->SetInput( this->GetInput() );
-
+ m_Detector->SetInput(this->GetInput());
+
m_DensityImageFilter->SetNeighborhoodRadius(m_NeighborhoodRadius);
- m_DensityImageFilter->SetInput( m_Detector->GetOutput() );
+ m_DensityImageFilter->SetInput(m_Detector->GetOutput());
m_DensityImageFilter->GraftOutput(this->GetOutput());
m_DensityImageFilter->Update();
this->GraftOutput(m_DensityImageFilter->GetOutput());
}
-
/*----------------------------------------------------------------
PrintSelf
-----------------------------------------------------------------*/
-template <class TInputImage , class TOutputImage, class TEdgeDetector, class TDensityCount>
+template <class TInputImage, class TOutputImage, class TEdgeDetector, class TDensityCount>
void
EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount>
::PrintSelf(std::ostream& os, itk::Indent indent) const
@@ -81,5 +78,5 @@ EdgeDensityImageFilter<TInputImage, TOutputImage, TEdgeDetector, TDensityCount>
os << indent << "Neighborhood Radius " << m_NeighborhoodRadius << std::endl;
}
-}/** end namesapce otb*/
+} /** end namesapce otb*/
#endif
diff --git a/Code/BasicFilters/otbEdgeDetectorImageFilter.h b/Code/BasicFilters/otbEdgeDetectorImageFilter.h
index e3d62fa9ce..03a57af1b9 100644
--- a/Code/BasicFilters/otbEdgeDetectorImageFilter.h
+++ b/Code/BasicFilters/otbEdgeDetectorImageFilter.h
@@ -23,7 +23,6 @@
#include "itkImageToImageFilter.h"
#include "itkBinaryThresholdImageFilter.h"
-
/** \class EdgeDetectorImageFilter
* \brief This composite filter binaries a edge detection image output.
* The used edge detection filter is given as template of the class.
@@ -33,45 +32,43 @@
namespace otb
{
-template <class TInputImage, class TOutputImage , class TEdgeDetection>
+template <class TInputImage, class TOutputImage, class TEdgeDetection>
class ITK_EXPORT EdgeDetectorImageFilter
-: public itk::ImageToImageFilter<TInputImage, TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef EdgeDetectorImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef EdgeDetectorImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(EdgeDetectorImageFilter,itk::ImageToImageFilter);
-
+ itkTypeMacro(EdgeDetectorImageFilter, itk::ImageToImageFilter);
/** Template parameters typedefs*/
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef typename InputImageType::SizeType InputImageSizeType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
- typedef typename OutputImageType::PixelType OutputImagePixelType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::SizeType InputImageSizeType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename OutputImageType::PixelType OutputImagePixelType;
/** Edge Detection */
- typedef TEdgeDetection DetectionType;
- typedef typename DetectionType::Pointer DetectionPointerType;
+ typedef TEdgeDetection DetectionType;
+ typedef typename DetectionType::Pointer DetectionPointerType;
/** Thresholder filter : Otsu */
- typedef itk::BinaryThresholdImageFilter<InputImageType, InputImageType> BinaryFilterType;
- typedef typename BinaryFilterType::Pointer BinaryFilterPointerType;
+ typedef itk::BinaryThresholdImageFilter<InputImageType, InputImageType> BinaryFilterType;
+ typedef typename BinaryFilterType::Pointer BinaryFilterPointerType;
-
/**Set/Get detector */
itkSetObjectMacro(Detector, DetectionType);
itkGetObjectMacro(Detector, DetectionType);
@@ -81,45 +78,44 @@ public:
itkGetObjectMacro(BinaryFilter, BinaryFilterType);
//itkGetObjectMacro(DetectorImageFilter, DetectorImageType);
-
/** Set lower threshold value. */
void SetLowerThreshold(InputImagePixelType val)
- {
- m_BinaryFilter->SetLowerThreshold(val);
- this->Modified();
- }
+ {
+ m_BinaryFilter->SetLowerThreshold(val);
+ this->Modified();
+ }
/** Set upper threshold value. */
void SetUpperThreshold(InputImagePixelType val)
- {
- m_BinaryFilter->SetUpperThreshold(val);
- this->Modified();
- }
+ {
+ m_BinaryFilter->SetUpperThreshold(val);
+ this->Modified();
+ }
/** Set Inside value. */
void SetInsideValue(InputImagePixelType val)
- {
- m_BinaryFilter->SetInsideValue(val);
- this->Modified();
- }
+ {
+ m_BinaryFilter->SetInsideValue(val);
+ this->Modified();
+ }
/** Set Outside value. */
void SetOutsideValue(InputImagePixelType val)
- {
- m_BinaryFilter->SetOutsideValue(val);
- this->Modified();
- }
- protected:
+ {
+ m_BinaryFilter->SetOutsideValue(val);
+ this->Modified();
+ }
+protected:
EdgeDetectorImageFilter();
virtual ~EdgeDetectorImageFilter();
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
- virtual void GenerateData( );
+ virtual void GenerateData();
private:
- EdgeDetectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ EdgeDetectorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- DetectionPointerType m_Detector;
- BinaryFilterPointerType m_BinaryFilter;
+ DetectionPointerType m_Detector;
+ BinaryFilterPointerType m_BinaryFilter;
};
}
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/BasicFilters/otbEdgeDetectorImageFilter.txx b/Code/BasicFilters/otbEdgeDetectorImageFilter.txx
index 5aaabbb97a..61d8135eda 100644
--- a/Code/BasicFilters/otbEdgeDetectorImageFilter.txx
+++ b/Code/BasicFilters/otbEdgeDetectorImageFilter.txx
@@ -27,52 +27,49 @@ namespace otb
/**---------------------------------------------------------
* Constructor
----------------------------------------------------------*/
-template <class TInputImage , class TOutputImage, class TEdgeDetection>
+template <class TInputImage, class TOutputImage, class TEdgeDetection>
EdgeDetectorImageFilter<TInputImage, TOutputImage, TEdgeDetection>
::EdgeDetectorImageFilter()
{
- this->SetNumberOfRequiredInputs( 1 );
-
+ this->SetNumberOfRequiredInputs(1);
+
m_Detector = DetectionType::New();
m_BinaryFilter = BinaryFilterType::New();
- m_BinaryFilter->SetInsideValue( static_cast<OutputImagePixelType>(0.) );
- m_BinaryFilter->SetOutsideValue( static_cast<OutputImagePixelType>(1.) );
- m_BinaryFilter->SetUpperThreshold( static_cast<InputImagePixelType>(255) );
- m_BinaryFilter->SetLowerThreshold( static_cast<InputImagePixelType>(0) );
+ m_BinaryFilter->SetInsideValue(static_cast<OutputImagePixelType>(0.));
+ m_BinaryFilter->SetOutsideValue(static_cast<OutputImagePixelType>(1.));
+ m_BinaryFilter->SetUpperThreshold(static_cast<InputImagePixelType>(255));
+ m_BinaryFilter->SetLowerThreshold(static_cast<InputImagePixelType>(0));
}
-
/*---------------------------------------------------------
* Destructor.c
----------------------------------------------------------*/
-template <class TInputImage , class TOutputImage, class TEdgeDetection>
+template <class TInputImage, class TOutputImage, class TEdgeDetection>
EdgeDetectorImageFilter<TInputImage, TOutputImage, TEdgeDetection>
::~EdgeDetectorImageFilter()
{}
-
/**
* threaded Generate Data
*/
-template <class TInputImage , class TOutputImage, class TEdgeDetection>
+template <class TInputImage, class TOutputImage, class TEdgeDetection>
void
EdgeDetectorImageFilter<TInputImage, TOutputImage, TEdgeDetection>
::GenerateData()
{
- m_Detector->SetInput( this->GetInput() );
-m_Detector->Update();
-
- m_BinaryFilter->SetInput( m_Detector->GetOutput() );
+ m_Detector->SetInput(this->GetInput());
+ m_Detector->Update();
+
+ m_BinaryFilter->SetInput(m_Detector->GetOutput());
m_BinaryFilter->GraftOutput(this->GetOutput());
m_BinaryFilter->Update();
this->GraftOutput(m_BinaryFilter->GetOutput());
}
-
/*----------------------------------------------------------------
PrintSelf
-----------------------------------------------------------------*/
-template <class TInputImage , class TOutputImage, class TEdgeDetection>
+template <class TInputImage, class TOutputImage, class TEdgeDetection>
void
EdgeDetectorImageFilter<TInputImage, TOutputImage, TEdgeDetection>
::PrintSelf(std::ostream& os, itk::Indent indent) const
@@ -80,5 +77,5 @@ EdgeDetectorImageFilter<TInputImage, TOutputImage, TEdgeDetection>
Superclass::PrintSelf(os, indent);
}
-}/** end namesapce otb*/
+} /** end namesapce otb*/
#endif
diff --git a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.h b/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.h
index b9f3f60f68..0ebac0dd36 100644
--- a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.h
+++ b/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.h
@@ -29,52 +29,52 @@ namespace otb
* Implement the itk::ImagePCAShapeModelEstimator algorithms in streaming capabilities
* Use by the InnerProductPCAImageFilter composite filter
*/
-template <class TInputImage, class TOutputImage >
-class ITK_EXPORT EstimateInnerProductPCAImageFilter : public itk::ImageToImageFilter< TInputImage, TOutputImage >
+template <class TInputImage, class TOutputImage>
+class ITK_EXPORT EstimateInnerProductPCAImageFilter : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef EstimateInnerProductPCAImageFilter Self;
- typedef typename itk::ImageToImageFilter < TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef EstimateInnerProductPCAImageFilter Self;
+ typedef typename itk::ImageToImageFilter <TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(EstimateInnerProductPCAImageFilter,ImageToImageFilter);
+ itkTypeMacro(EstimateInnerProductPCAImageFilter, ImageToImageFilter);
/** Some convenient typedefs. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointer;
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointer;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
typedef StreamingInnerProductVectorImageFilter<InputImageType> StreamingInnerProductType;
- typedef typename StreamingInnerProductType::Pointer StreamingInnerProductPointer;
- typedef typename StreamingInnerProductType::MatrixType MatrixType;
- typedef typename StreamingInnerProductType::MatrixObjectType MatrixObjectType;
+ typedef typename StreamingInnerProductType::Pointer StreamingInnerProductPointer;
+ typedef typename StreamingInnerProductType::MatrixType MatrixType;
+ typedef typename StreamingInnerProductType::MatrixObjectType MatrixObjectType;
/** Set/Get the number of required largest principal components. The filter produces
the required number of principal components plus one outputs. Output index 0 represents
the mean image and the remaining outputs the requested principal components.*/
- itkSetMacro( NumberOfPrincipalComponentsRequired, unsigned int );
- itkGetMacro( NumberOfPrincipalComponentsRequired, unsigned int );
+ itkSetMacro(NumberOfPrincipalComponentsRequired, unsigned int);
+ itkGetMacro(NumberOfPrincipalComponentsRequired, unsigned int);
/** Enable/Disable center data */
- itkSetMacro( CenterData, bool );
- itkGetMacro( CenterData, bool );
+ itkSetMacro(CenterData, bool);
+ itkGetMacro(CenterData, bool);
itkBooleanMacro(CenterData);
protected:
EstimateInnerProductPCAImageFilter();
- virtual ~EstimateInnerProductPCAImageFilter() {};
+ virtual ~EstimateInnerProductPCAImageFilter() {}
/** GenerateOutputInformation
* Set the number of bands of the output.
@@ -91,8 +91,8 @@ protected:
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- EstimateInnerProductPCAImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ EstimateInnerProductPCAImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The number of output Pricipal Components */
unsigned int m_NumberOfPrincipalComponentsRequired;
@@ -115,4 +115,3 @@ private:
#endif
#endif
-
diff --git a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx b/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx
index 318452dc1e..c2dce7cae9 100644
--- a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx
+++ b/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx
@@ -30,7 +30,7 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage>
-EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
+EstimateInnerProductPCAImageFilter<TInputImage, TOutputImage>
::EstimateInnerProductPCAImageFilter()
{
m_NumberOfPrincipalComponentsRequired = 1;
@@ -41,10 +41,10 @@ EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
+EstimateInnerProductPCAImageFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
}
/**
@@ -52,7 +52,7 @@ EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
*/
template<class TInputImage, class TOutputImage>
void
-EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
+EstimateInnerProductPCAImageFilter<TInputImage, TOutputImage>
::GenerateOutputInformation(void)
{
Superclass::GenerateOutputInformation();
@@ -64,7 +64,7 @@ EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
+EstimateInnerProductPCAImageFilter<TInputImage, TOutputImage>
::BeforeThreadedGenerateData()
{
// Instantiation object
@@ -74,7 +74,7 @@ EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
streamingInnerProduct->Update();
m_InnerProduct = streamingInnerProduct->GetInnerProduct();
- MatrixType identityMatrix( m_InnerProduct.rows(), m_InnerProduct.columns() );
+ MatrixType identityMatrix(m_InnerProduct.rows(), m_InnerProduct.columns());
identityMatrix.set_identity();
vnl_generalized_eigensystem eigenVectors_eigenValues(m_InnerProduct, identityMatrix);
m_EigenVectorsOfInnerProductMatrix = eigenVectors_eigenValues.V;
@@ -83,11 +83,11 @@ EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
void
-EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
+EstimateInnerProductPCAImageFilter<TInputImage, TOutputImage>
::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
- typename InputImageType::ConstPointer inputPtr = this->GetInput();
- typename OutputImageType::Pointer outputPtr = this->GetOutput();
+ typename InputImageType::ConstPointer inputPtr = this->GetInput();
+ typename OutputImageType::Pointer outputPtr = this->GetOutput();
// Define the portion of the input to walk for this thread, using
// the CallCopyOutputRegionToInputRegion method allows for the input
@@ -106,30 +106,35 @@ EstimateInnerProductPCAImageFilter<TInputImage,TOutputImage>
inputIt.GoToBegin();
outputIt.GoToBegin();
- while ( !inputIt.IsAtEnd() )
- {
- InputPixelType inputPixel = inputIt.Get();
+ while (!inputIt.IsAtEnd())
+ {
+ InputPixelType inputPixel = inputIt.Get();
OutputPixelType outputPixel;
outputPixel.SetSize(m_NumberOfPrincipalComponentsRequired);
outputPixel.Fill(0);
- for(unsigned int img_number = 0; img_number < numberOfTrainingImages; ++img_number )
- {
- unsigned int indexNumberOfTrainingImages = numberOfTrainingImages-1;
- for( unsigned int vec_number = 0; vec_number < m_NumberOfPrincipalComponentsRequired; ++vec_number, indexNumberOfTrainingImages-- )
+ for (unsigned int img_number = 0; img_number < numberOfTrainingImages; ++img_number)
{
- outputPixel[vec_number] += static_cast<OutputInternalPixelType>( static_cast<double>(inputPixel[img_number]) * static_cast<double>(m_EigenVectorsOfInnerProductMatrix[img_number][indexNumberOfTrainingImages]));
+ unsigned int indexNumberOfTrainingImages = numberOfTrainingImages - 1;
+ for (unsigned int vec_number = 0;
+ vec_number < m_NumberOfPrincipalComponentsRequired;
+ ++vec_number, indexNumberOfTrainingImages--)
+ {
+ outputPixel[vec_number] += static_cast<OutputInternalPixelType>(static_cast<double>(
+ inputPixel[img_number]) *
+ static_cast<double>(
+ m_EigenVectorsOfInnerProductMatrix[img_number
+ ][indexNumberOfTrainingImages]));
+ }
}
- }
- outputIt.Set( outputPixel );
+ outputIt.Set(outputPixel);
++inputIt;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
}
}
#endif
-
diff --git a/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.h b/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.h
index 55f4d1c2b8..734c27ce9e 100644
--- a/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.h
+++ b/Code/BasicFilters/otbEuclideanDistanceWithMissingValue.h
@@ -41,51 +41,59 @@ namespace Statistics {
* \sa EuclideanDistance
* \sa EuclideanDistanceWithMissingValuePow2
*/
-template< class TVector >
+template<class TVector>
class ITK_EXPORT EuclideanDistanceWithMissingValue :
- public otb::Statistics::EuclideanDistanceWithMissingValuePow2< TVector >
+ public otb::Statistics::EuclideanDistanceWithMissingValuePow2<TVector>
{
- public:
- /** Standard "Self" typedef. */
- typedef EuclideanDistanceWithMissingValue Self;
- typedef otb::Statistics::EuclideanDistanceWithMissingValuePow2< TVector >
- Superclass;
- typedef itk::SmartPointer< Self > Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- typedef typename Superclass::MeasurementVectorSizeType
- MeasurementVectorSizeType;
-
- /** Run-time type information (and related methods). */
- itkTypeMacro(EuclideanDistanceWithMissingValue, EuclideanDistance);
-
- /** Method for creation through the object factory. */
- itkNewMacro(Self);
-
- /** Type of the component of a vector */
- typedef typename TVector::ValueType ValueType;
-
- /** Gets the distance between the origin and x */
- double Evaluate(const TVector &x) const {
- return ::vcl_sqrt( Superclass::Evaluate( x ) ); }
-
- /** Gets the distance between x1 and x2 */
- double Evaluate(const TVector &x1, const TVector &x2) const {
- return ::vcl_sqrt( Superclass::Evaluate( x1, x2 ) ); }
-
- /** Gets the cooridnate distance between a and b. NOTE: a and b
- * should be type of component */
- double Evaluate(const ValueType &a, const ValueType &b) const {
- return ::vcl_sqrt( Superclass::Evaluate( a, b ) ); }
-
- /** Returns true if the distance between x and the origin is less
- * than radius */
- bool IsWithinRange(const TVector &x, const double radius) const {
- return Superclass::IsWithinRange( x, radius ); }
-
- protected:
- EuclideanDistanceWithMissingValue() {}
- virtual ~EuclideanDistanceWithMissingValue() {}
+public:
+ /** Standard "Self" typedef. */
+ typedef EuclideanDistanceWithMissingValue Self;
+ typedef otb::Statistics::EuclideanDistanceWithMissingValuePow2<TVector>
+ Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ typedef typename Superclass::MeasurementVectorSizeType
+ MeasurementVectorSizeType;
+
+ /** Run-time type information (and related methods). */
+ itkTypeMacro(EuclideanDistanceWithMissingValue, EuclideanDistance);
+
+ /** Method for creation through the object factory. */
+ itkNewMacro(Self);
+
+ /** Type of the component of a vector */
+ typedef typename TVector::ValueType ValueType;
+
+ /** Gets the distance between the origin and x */
+ double Evaluate(const TVector& x) const
+ {
+ return ::vcl_sqrt(Superclass::Evaluate(x));
+ }
+
+ /** Gets the distance between x1 and x2 */
+ double Evaluate(const TVector& x1, const TVector& x2) const
+ {
+ return ::vcl_sqrt(Superclass::Evaluate(x1, x2));
+ }
+
+ /** Gets the cooridnate distance between a and b. NOTE: a and b
+ * should be type of component */
+ double Evaluate(const ValueType& a, const ValueType& b) const
+ {
+ return ::vcl_sqrt(Superclass::Evaluate(a, b));
+ }
+
+ /** Returns true if the distance between x and the origin is less
+ * than radius */
+ bool IsWithinRange(const TVector& x, const double radius) const
+ {
+ return Superclass::IsWithinRange(x, radius);
+ }
+
+protected:
+ EuclideanDistanceWithMissingValue() {}
+ virtual ~EuclideanDistanceWithMissingValue() {}
}; // end of class
} // end namespace statistics
@@ -93,4 +101,3 @@ class ITK_EXPORT EuclideanDistanceWithMissingValue :
} // end namespace otb
#endif
-
diff --git a/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.h b/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.h
index fcfc579291..4622e48c9f 100644
--- a/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.h
+++ b/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.h
@@ -43,51 +43,53 @@ namespace Statistics {
* \sa EuclideanDistance
* \sa EuclideanDistanceWithMissingValue
*/
-template< class TVector >
+template<class TVector>
class ITK_EXPORT EuclideanDistanceWithMissingValuePow2 :
- public itk::Statistics::EuclideanDistance< TVector >
+ public itk::Statistics::EuclideanDistance<TVector>
{
- public:
- /** Standard "Self" typedef. */
- typedef EuclideanDistanceWithMissingValuePow2 Self;
- typedef itk::Statistics::EuclideanDistance< TVector > Superclass;
- typedef itk::SmartPointer< Self > Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::MeasurementVectorSizeType MeasurementVectorSizeType;
+public:
+ /** Standard "Self" typedef. */
+ typedef EuclideanDistanceWithMissingValuePow2 Self;
+ typedef itk::Statistics::EuclideanDistance<TVector> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef typename Superclass::MeasurementVectorSizeType MeasurementVectorSizeType;
- /** Run-time type information (and related methods). */
- itkTypeMacro(EuclideanDistanceWithMissingValuePow2, EuclideanDistance);
+ /** Run-time type information (and related methods). */
+ itkTypeMacro(EuclideanDistanceWithMissingValuePow2, EuclideanDistance);
- /** Method for creation through the object factory. */
- itkNewMacro(Self);
+ /** Method for creation through the object factory. */
+ itkNewMacro(Self);
- /** Type of the component of a vector */
- typedef typename TVector::ValueType ValueType;
+ /** Type of the component of a vector */
+ typedef typename TVector::ValueType ValueType;
- /** Gets the distance between the origin and x */
- double Evaluate(const TVector &x) const;
+ /** Gets the distance between the origin and x */
+ double Evaluate(const TVector& x) const;
- /** Gets the distance between x1 and x2 */
- double Evaluate(const TVector &x1, const TVector &x2) const;
+ /** Gets the distance between x1 and x2 */
+ double Evaluate(const TVector& x1, const TVector& x2) const;
- /** Gets the cooridnate distance between a and b. NOTE: a and b
- * should be type of component */
- double Evaluate(const ValueType &a, const ValueType &b) const;
+ /** Gets the cooridnate distance between a and b. NOTE: a and b
+ * should be type of component */
+ double Evaluate(const ValueType& a, const ValueType& b) const;
- /** Returns true if the distance between x and the origin is less
- * than radius */
- bool IsWithinRange(const TVector &x, const double radius) const {
- return Superclass::IsWithinRange( x, radius ); }
+ /** Returns true if the distance between x and the origin is less
+ * than radius */
+ bool IsWithinRange(const TVector& x, const double radius) const
+ {
+ return Superclass::IsWithinRange(x, radius);
+ }
- /** Check if a value is NaN or not */
- static bool IsMissingValue ( const ValueType & v);
+ /** Check if a value is NaN or not */
+ static bool IsMissingValue(const ValueType& v);
- /** Set a value to Nan */
- static void SetToMissingValue ( ValueType & v );
+ /** Set a value to Nan */
+ static void SetToMissingValue(ValueType& v);
- protected:
- EuclideanDistanceWithMissingValuePow2() {}
- virtual ~EuclideanDistanceWithMissingValuePow2() {}
+protected:
+ EuclideanDistanceWithMissingValuePow2() {}
+ virtual ~EuclideanDistanceWithMissingValuePow2() {}
}; // end of class
} // end namespace statistics
@@ -99,4 +101,3 @@ class ITK_EXPORT EuclideanDistanceWithMissingValuePow2 :
#endif
#endif
-
diff --git a/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.txx b/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.txx
index 8c0a9d5d03..51ef3406a6 100644
--- a/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.txx
+++ b/Code/BasicFilters/otbEuclideanDistanceWithMissingValuePow2.txx
@@ -27,95 +27,91 @@ namespace otb {
namespace Statistics {
-template< class TVector >
+template<class TVector>
inline double
-EuclideanDistanceWithMissingValuePow2< TVector >
-::Evaluate(const TVector &x1, const TVector &x2) const
+EuclideanDistanceWithMissingValuePow2<TVector>
+::Evaluate(const TVector& x1, const TVector& x2) const
{
- if( itk::MeasurementVectorTraits::GetLength( x1 ) !=
- itk::MeasurementVectorTraits::GetLength( x2 ) )
- {
- itkExceptionMacro( << "Vector lengths must be equal." );
- }
+ if (itk::MeasurementVectorTraits::GetLength(x1) !=
+ itk::MeasurementVectorTraits::GetLength(x2))
+ {
+ itkExceptionMacro(<< "Vector lengths must be equal.");
+ }
- double temp, distance = itk::NumericTraits< double >::Zero;
+ double temp, distance = itk::NumericTraits<double>::Zero;
- for(unsigned int i = 0; i < x1.Size(); i++ )
- {
- if ( !IsMissingValue( x1[i] ) && !IsMissingValue( x2[i] ) )
+ for (unsigned int i = 0; i < x1.Size(); i++)
{
+ if (!IsMissingValue(x1[i]) && !IsMissingValue(x2[i]))
+ {
temp = x1[i] - x2[i];
distance += temp * temp;
+ }
}
- }
return distance;
}
-template< class TVector >
+template<class TVector>
inline double
-EuclideanDistanceWithMissingValuePow2< TVector >
-::Evaluate(const TVector &x) const
+EuclideanDistanceWithMissingValuePow2<TVector>
+::Evaluate(const TVector& x) const
{
MeasurementVectorSizeType
measurementVectorSize = this->GetMeasurementVectorSize();
- if(measurementVectorSize == 0)
- {
- itkExceptionMacro( << "Please set the MeasurementVectorSize first" );
- }
- itk::MeasurementVectorTraits::Assert( this->m_Origin, measurementVectorSize,
- "EuclideanDistance::Evaluate Origin and input vector have different lengths");
-
- double temp, distance = itk::NumericTraits< double >::Zero;
-
- for(unsigned int i = 0; i < measurementVectorSize; i++ )
- {
- if ( !IsMissingValue( this->GetOrigin()[i] ) && !IsMissingValue( x[i] ) )
+ if (measurementVectorSize == 0)
{
+ itkExceptionMacro(<< "Please set the MeasurementVectorSize first");
+ }
+ itk::MeasurementVectorTraits::Assert(this->m_Origin, measurementVectorSize,
+ "EuclideanDistance::Evaluate Origin and input vector have different lengths");
+
+ double temp, distance = itk::NumericTraits<double>::Zero;
+
+ for (unsigned int i = 0; i < measurementVectorSize; i++)
+ {
+ if (!IsMissingValue(this->GetOrigin()[i]) && !IsMissingValue(x[i]))
+ {
temp = this->GetOrigin()[i] - x[i];
distance += temp * temp;
+ }
}
- }
return distance;
}
-template< class TVector >
+template<class TVector>
inline double
-EuclideanDistanceWithMissingValuePow2< TVector >
-::Evaluate( const ValueType &a, const ValueType &b ) const
+EuclideanDistanceWithMissingValuePow2<TVector>
+::Evaluate(const ValueType& a, const ValueType& b) const
{
// FIXME throw NaN exception ??
- if ( IsMissingValue( a ) || IsMissingValue( b ) )
- return 0.0;
+ if (IsMissingValue(a) || IsMissingValue(b)) return 0.0;
double temp = a - b;
return temp * temp;
}
-template< class TVector >
+template<class TVector>
/*static */
bool
-EuclideanDistanceWithMissingValuePow2< TVector >
-::IsMissingValue ( const ValueType & v)
+EuclideanDistanceWithMissingValuePow2<TVector>
+::IsMissingValue(const ValueType& v)
{
- return static_cast<bool>( vnl_math_isnan( static_cast<double>( v ) ) );
+ return static_cast<bool>(vnl_math_isnan(static_cast<double>(v)));
}
-template< class TVector >
+template<class TVector>
/* static */
void
-EuclideanDistanceWithMissingValuePow2< TVector >
-::SetToMissingValue ( ValueType & v )
+EuclideanDistanceWithMissingValuePow2<TVector>
+::SetToMissingValue(ValueType& v)
{
- v = std::numeric_limits<ValueType>::signaling_NaN();
+ v = std::numeric_limits<ValueType>::signaling_NaN();
}
-
} // end namespace statistics
} // end namespace otb
#endif
-
-
diff --git a/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.h b/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.h
index dd9ddf8ccd..c4cea49bb7 100644
--- a/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.h
+++ b/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.h
@@ -46,65 +46,66 @@ namespace Statistics {
*
* \sa EuclideanDistanceWithMissingValuePow2
*/
-template< class TVector >
+template<class TVector>
class ITK_EXPORT FlexibleDistanceWithMissingValue :
- public otb::Statistics::EuclideanDistanceWithMissingValuePow2< TVector >
+ public otb::Statistics::EuclideanDistanceWithMissingValuePow2<TVector>
{
- public:
- /** Standard "Self" typedef. */
- typedef FlexibleDistanceWithMissingValue Self;
- typedef otb::Statistics::EuclideanDistanceWithMissingValuePow2< TVector > Superclass;
- typedef itk::SmartPointer< Self > Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- typedef typename Superclass::MeasurementVectorSizeType MeasurementVectorSizeType;
-
- /** Run-time type information (and related methods). */
- itkTypeMacro(FlexibleDistanceWithMissingValue, EuclideanDistanceWithMissingValuePow2);
-
- /** Method for creation through the object factory. */
- itkNewMacro(Self);
-
- /** Type of the component of a vector */
- typedef typename TVector::ValueType ValueType;
-
- /** Gets the distance between the origin and x */
- double Evaluate(const TVector &x) const;
-
- /** Gets the distance between x1 and x2 */
- double Evaluate(const TVector &x1, const TVector &x2) const;
-
- /** Gets the cooridnate distance between a and b. NOTE: a and b
- * should be type of component */
- double Evaluate(const ValueType &a, const ValueType &b) const;
-
- /** Returns true if the distance between x and the origin is less
- * than radius */
- bool IsWithinRange(const TVector &x, const double radius) const {
- return Superclass::IsWithinRange( x, radius ); }
-
- /** Set the value of the parameter a and b.
- * Those parameters are defined as static component in order to call it far
- * away from the instanciation of the class (through the SOM training for instance) */
- static double Alpha;
- static double Beta;
- static void SetAlphaBeta( double a, double b);
-
- /** test if it is ordinary Euclidean distance */
- static bool IsEuclidean();
-
- protected:
- FlexibleDistanceWithMissingValue() {}
- virtual ~FlexibleDistanceWithMissingValue() {}
+public:
+ /** Standard "Self" typedef. */
+ typedef FlexibleDistanceWithMissingValue Self;
+ typedef otb::Statistics::EuclideanDistanceWithMissingValuePow2<TVector> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ typedef typename Superclass::MeasurementVectorSizeType MeasurementVectorSizeType;
+
+ /** Run-time type information (and related methods). */
+ itkTypeMacro(FlexibleDistanceWithMissingValue, EuclideanDistanceWithMissingValuePow2);
+
+ /** Method for creation through the object factory. */
+ itkNewMacro(Self);
+
+ /** Type of the component of a vector */
+ typedef typename TVector::ValueType ValueType;
+
+ /** Gets the distance between the origin and x */
+ double Evaluate(const TVector& x) const;
+
+ /** Gets the distance between x1 and x2 */
+ double Evaluate(const TVector& x1, const TVector& x2) const;
+
+ /** Gets the cooridnate distance between a and b. NOTE: a and b
+ * should be type of component */
+ double Evaluate(const ValueType& a, const ValueType& b) const;
+
+ /** Returns true if the distance between x and the origin is less
+ * than radius */
+ bool IsWithinRange(const TVector& x, const double radius) const
+ {
+ return Superclass::IsWithinRange(x, radius);
+ }
+
+ /** Set the value of the parameter a and b.
+ * Those parameters are defined as static component in order to call it far
+ * away from the instanciation of the class (through the SOM training for instance) */
+ static double Alpha;
+ static double Beta;
+ static void SetAlphaBeta(double a, double b);
+
+ /** test if it is ordinary Euclidean distance */
+ static bool IsEuclidean();
+
+protected:
+ FlexibleDistanceWithMissingValue() {}
+ virtual ~FlexibleDistanceWithMissingValue() {}
}; // end of class
/** Static variable instanciation */
-template< class TVector >
-double FlexibleDistanceWithMissingValue< TVector >::Alpha=1.0;
-
-template< class TVector >
-double FlexibleDistanceWithMissingValue< TVector >::Beta=2.0;
+template<class TVector>
+double FlexibleDistanceWithMissingValue<TVector>::Alpha = 1.0;
+template<class TVector>
+double FlexibleDistanceWithMissingValue<TVector>::Beta = 2.0;
} // end namespace statistics
@@ -115,5 +116,3 @@ double FlexibleDistanceWithMissingValue< TVector >::Beta=2.0;
#endif
#endif
-
-
diff --git a/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.txx b/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.txx
index 7139e87bb6..6b00ae7838 100644
--- a/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.txx
+++ b/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.txx
@@ -29,110 +29,104 @@ namespace otb {
namespace Statistics {
-template< class TVector >
+template<class TVector>
inline double
-FlexibleDistanceWithMissingValue< TVector >
-::Evaluate(const TVector &x1, const TVector &x2) const
+FlexibleDistanceWithMissingValue<TVector>
+::Evaluate(const TVector& x1, const TVector& x2) const
{
- if (IsEuclidean())
- return Superclass::Evaluate(x1,x2);
+ if (IsEuclidean()) return Superclass::Evaluate(x1, x2);
- if( itk::MeasurementVectorTraits::GetLength( x1 ) !=
- itk::MeasurementVectorTraits::GetLength( x2 ) )
- {
- itkExceptionMacro( << "Vector lengths must be equal." );
- }
+ if (itk::MeasurementVectorTraits::GetLength(x1) !=
+ itk::MeasurementVectorTraits::GetLength(x2))
+ {
+ itkExceptionMacro(<< "Vector lengths must be equal.");
+ }
- double temp, distance = itk::NumericTraits< double >::Zero;
+ double temp, distance = itk::NumericTraits<double>::Zero;
- for(unsigned int i = 0; i < x1.Size(); i++ )
- {
- if ( !IsMissingValue( x1[i] ) && !IsMissingValue( x2[i] ) )
+ for (unsigned int i = 0; i < x1.Size(); i++)
{
- temp = vcl_pow( vcl_abs( vcl_pow(x1[i],this->Alpha) - vcl_pow(x2[i],this->Alpha) ), this->Beta );
+ if (!IsMissingValue(x1[i]) && !IsMissingValue(x2[i]))
+ {
+ temp = vcl_pow(vcl_abs(vcl_pow(x1[i], this->Alpha) - vcl_pow(x2[i], this->Alpha)), this->Beta);
distance += temp;
+ }
}
- }
return distance;
}
-template< class TVector >
+template<class TVector>
inline double
-FlexibleDistanceWithMissingValue< TVector >
-::Evaluate(const TVector &x) const
+FlexibleDistanceWithMissingValue<TVector>
+::Evaluate(const TVector& x) const
{
- if ( IsEuclidean() )
- return Superclass::Evaluate(x);
+ if (IsEuclidean()) return Superclass::Evaluate(x);
MeasurementVectorSizeType
measurementVectorSize = this->GetMeasurementVectorSize();
- if(measurementVectorSize == 0)
- {
- itkExceptionMacro( << "Please set the MeasurementVectorSize first" );
- }
+ if (measurementVectorSize == 0)
+ {
+ itkExceptionMacro(<< "Please set the MeasurementVectorSize first");
+ }
- itk::MeasurementVectorTraits::Assert( this->m_Origin, measurementVectorSize,
- "EuclideanDistance::Evaluate Origin and input vector have different lengths");
+ itk::MeasurementVectorTraits::Assert(this->m_Origin, measurementVectorSize,
+ "EuclideanDistance::Evaluate Origin and input vector have different lengths");
- double temp, distance = itk::NumericTraits< double >::Zero;
+ double temp, distance = itk::NumericTraits<double>::Zero;
- for(unsigned int i = 0; i < measurementVectorSize; i++ )
- {
- if ( !IsMissingValue( this->GetOrigin()[i] ) && !IsMissingValue( x[i] ) )
+ for (unsigned int i = 0; i < measurementVectorSize; i++)
{
- temp = vcl_pow( vcl_abs( vcl_pow(this->GetOrigin()[i],this->Alpha) - vcl_pow(x[i],this->Alpha) ), this->Beta);
+ if (!IsMissingValue(this->GetOrigin()[i]) && !IsMissingValue(x[i]))
+ {
+ temp = vcl_pow(vcl_abs(vcl_pow(this->GetOrigin()[i], this->Alpha) - vcl_pow(x[i], this->Alpha)), this->Beta);
distance += temp;
+ }
}
- }
return distance;
}
-template< class TVector >
+template<class TVector>
inline double
-FlexibleDistanceWithMissingValue< TVector >
-::Evaluate( const ValueType &a, const ValueType &b ) const
+FlexibleDistanceWithMissingValue<TVector>
+::Evaluate(const ValueType& a, const ValueType& b) const
{
- if (IsEuclidean())
- return Superclass::Evaluate(a,b);
+ if (IsEuclidean()) return Superclass::Evaluate(a, b);
// FIXME throw NaN exception instaed of returning 0. ??
- if ( IsMissingValue( a ) || IsMissingValue( b ) )
- return 0.0;
+ if (IsMissingValue(a) || IsMissingValue(b)) return 0.0;
- double temp = vcl_pow(vcl_abs(vcl_pow(a,this->Alpha) - vcl_pow(b,this->Alpha)), this->Beta);
+ double temp = vcl_pow(vcl_abs(vcl_pow(a, this->Alpha) - vcl_pow(b, this->Alpha)), this->Beta);
return temp;
}
-template< class TVector >
+template<class TVector>
void
-FlexibleDistanceWithMissingValue< TVector >
-::SetAlphaBeta ( double a, double b )
+FlexibleDistanceWithMissingValue<TVector>
+::SetAlphaBeta(double a, double b)
{
Alpha = a;
Beta = b;
}
-template< class TVector >
+template<class TVector>
bool
-FlexibleDistanceWithMissingValue< TVector >
+FlexibleDistanceWithMissingValue<TVector>
::IsEuclidean()
{
if ((Alpha == 1.0) && (Beta == 2.0))
- {
+ {
return true;
- }
+ }
else
- {
+ {
return false;
- }
+ }
}
} // end namespace statistics
} // end namespace otb
#endif
-
-
diff --git a/Code/BasicFilters/otbFrostImageFilter.h b/Code/BasicFilters/otbFrostImageFilter.h
index 4e391faffe..c7d5cb9ee4 100644
--- a/Code/BasicFilters/otbFrostImageFilter.h
+++ b/Code/BasicFilters/otbFrostImageFilter.h
@@ -44,16 +44,16 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
-class ITK_EXPORT FrostImageFilter : public itk::ImageToImageFilter< TInputImage, TOutputImage >
+class ITK_EXPORT FrostImageFilter : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Extract input and output images sizes. */
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,
- unsigned int,
- TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension,
+ unsigned int,
+ TOutputImage::ImageDimension);
/** typedef to simplify variables definition and declaration. */
typedef TInputImage InputImageType;
@@ -61,10 +61,10 @@ public:
typedef TOutputImage OutputImageType;
/** typedef for standard classes. */
- typedef FrostImageFilter Self;
- typedef itk::ImageToImageFilter< InputImageType, OutputImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef FrostImageFilter Self;
+ typedef itk::ImageToImageFilter<InputImageType, OutputImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** "object factory" management method. */
itkNewMacro(Self);
@@ -73,12 +73,12 @@ public:
itkTypeMacro(FrostImageFilter, ImageToImageFilter);
/** Supported images definition. */
- typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::PixelType InputPixelType;
typedef typename OutputImageType::PixelType OutputPixelType;
/** "typedef" to define a real. */
typedef typename itk::NumericTraits<InputPixelType>::RealType InputRealType;
- typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
typedef typename OutputImageType::RegionType OutputImageRegionType;
/** "typedef" to define an image size. */
@@ -98,11 +98,12 @@ public:
/** To be allowed to use the pipeline method FrostImageFilter needs
* an input processing area larger than the output one.
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
- virtual void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError);
+ virtual void GenerateInputRequestedRegion()
+ throw(itk::InvalidRequestedRegionError);
protected:
FrostImageFilter();
- virtual ~FrostImageFilter() {};
+ virtual ~FrostImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** FrostImageFilter can be implemented for a multithreaded filter treatment.
@@ -114,11 +115,11 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
private:
- FrostImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ FrostImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Radius declaration */
SizeType m_Radius;
@@ -131,5 +132,4 @@ private:
#include "otbFrostImageFilter.txx"
#endif
-
#endif
diff --git a/Code/BasicFilters/otbFrostImageFilter.txx b/Code/BasicFilters/otbFrostImageFilter.txx
index c473bc2150..38fc611dd7 100644
--- a/Code/BasicFilters/otbFrostImageFilter.txx
+++ b/Code/BasicFilters/otbFrostImageFilter.txx
@@ -44,19 +44,20 @@ FrostImageFilter<TInputImage, TOutputImage>::FrostImageFilter()
}
template <class TInputImage, class TOutputImage>
-void FrostImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() throw (itk::InvalidRequestedRegionError)
-{
+void FrostImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() throw (
+ itk::InvalidRequestedRegionError)
+ {
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- typename Superclass::InputImagePointer inputPtr = const_cast< TInputImage * >( this->GetInput() );
+ typename Superclass::InputImagePointer inputPtr = const_cast<TInputImage *>(this->GetInput());
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
@@ -64,105 +65,101 @@ void FrostImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion()
inputRequestedRegion = inputPtr->GetRequestedRegion();
// pad the input requested region by the operator radius
- inputRequestedRegion.PadByRadius( m_Radius );
+ inputRequestedRegion.PadByRadius(m_Radius);
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << static_cast<const char *>(this->GetNameOfClass())
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
+ }
}
-}
-
-template< class TInputImage, class TOutputImage>
-void FrostImageFilter< TInputImage, TOutputImage>::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread,
- int threadId
-)
+template<class TInputImage, class TOutputImage>
+void FrostImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(
+ const OutputImageRegionType& outputRegionForThread,
+ int threadId
+ )
{
- unsigned int i;
- itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
- itk::ConstNeighborhoodIterator<InputImageType> bit;
- typename itk::ConstNeighborhoodIterator<InputImageType>::OffsetType off;
- itk::ImageRegionIterator<OutputImageType> it;
-
+ unsigned int i;
+ itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
+ itk::ConstNeighborhoodIterator<InputImageType> bit;
+ typename itk::ConstNeighborhoodIterator<InputImageType>::OffsetType off;
+ itk::ImageRegionIterator<OutputImageType> it;
// Allocate output
typename OutputImageType::Pointer output = this->GetOutput();
typename InputImageType::ConstPointer input = this->GetInput();
// Find the data-set boundary "faces"
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType faceList;
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType::iterator fit;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType faceList;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType::iterator fit;
itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> bC;
faceList = bC(input, outputRegionForThread, m_Radius);
-
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
InputRealType sum;
InputRealType sum2;
- double Mean, Variance;
- double Alpha;
- double NormFilter;
- double FrostFilter;
- double CoefFilter;
- double dPixel;
-
+ double Mean, Variance;
+ double Alpha;
+ double NormFilter;
+ double FrostFilter;
+ double CoefFilter;
+ double dPixel;
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
- for (fit=faceList.begin(); fit != faceList.end(); ++fit)
- {
+ for (fit = faceList.begin(); fit != faceList.end(); ++fit)
+ {
bit = itk::ConstNeighborhoodIterator<InputImageType>(m_Radius, input, *fit);
unsigned int neighborhoodSize = bit.Size();
it = itk::ImageRegionIterator<OutputImageType>(output, *fit);
bit.OverrideBoundaryCondition(&nbc);
bit.GoToBegin();
- while ( ! bit.IsAtEnd() )
- {
+ while (!bit.IsAtEnd())
+ {
sum = itk::NumericTraits<InputRealType>::Zero;
sum2 = itk::NumericTraits<InputRealType>::Zero;
for (i = 0; i < neighborhoodSize; ++i)
- {
- dPixel = static_cast<double>( bit.GetPixel(i) );
+ {
+ dPixel = static_cast<double>(bit.GetPixel(i));
sum += dPixel;
sum2 += dPixel * dPixel;
- }
+ }
Mean = sum / double(neighborhoodSize);
Variance = sum2 / double(neighborhoodSize) - Mean * Mean;
if (Mean == 0)
- {
+ {
Alpha = 0;
- }
+ }
else
- {
+ {
Alpha = m_Deramp * Variance / (Mean * Mean);
- }
+ }
NormFilter = 0.0;
FrostFilter = 0.0;
@@ -170,36 +167,33 @@ void FrostImageFilter< TInputImage, TOutputImage>::ThreadedGenerateData(
const double rad_x = static_cast<double>(m_Radius[0]);
const double rad_y = static_cast<double>(m_Radius[1]);
- for (double x = -rad_x; x<= rad_x; ++x)
- {
- for (double y = -rad_y; y <= rad_y; ++y)
+ for (double x = -rad_x; x <= rad_x; ++x)
{
- double Dist = double(vcl_sqrt(x*x+y*y));
- off[0]= static_cast<int>(x);
- off[1]= static_cast<int>(y);
+ for (double y = -rad_y; y <= rad_y; ++y)
+ {
+ double Dist = double(vcl_sqrt(x * x + y * y));
+ off[0] = static_cast<int>(x);
+ off[1] = static_cast<int>(y);
// i = (unsigned int)((y+rad_y)*(2*rad_y+1)+(x+rad_x));
- dPixel= static_cast<double>( bit.GetPixel(off));
+ dPixel = static_cast<double>(bit.GetPixel(off));
// dPixel= static_cast<double>( bit.GetPixel(i));
- CoefFilter = Alpha * vcl_exp(-Alpha *Dist);
+ CoefFilter = Alpha * vcl_exp(-Alpha * Dist);
NormFilter = NormFilter + CoefFilter;
FrostFilter = FrostFilter + (CoefFilter * dPixel);
+ }
}
- }
+ if (NormFilter == 0.) dPixel = 0.;
+ else dPixel = FrostFilter / NormFilter;
- if (NormFilter==0.)
- dPixel=0.;
- else
- dPixel=FrostFilter/NormFilter;
-
- it.Set( static_cast<OutputPixelType>( dPixel ) );
+ it.Set(static_cast<OutputPixelType>(dPixel));
++bit;
++it;
progress.CompletedPixel();
+ }
}
- }
}
/**
@@ -209,12 +203,10 @@ template <class TInputImage, class TOutput>
void
FrostImageFilter<TInputImage, TOutput>::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "Radius: " << m_Radius << std::endl;
}
-
} // end namespace otb
-
#endif
diff --git a/Code/BasicFilters/otbFunctionToImageFilter.h b/Code/BasicFilters/otbFunctionToImageFilter.h
index 7ddb3eab12..c0e9693136 100644
--- a/Code/BasicFilters/otbFunctionToImageFilter.h
+++ b/Code/BasicFilters/otbFunctionToImageFilter.h
@@ -28,7 +28,6 @@
#include "itkSize.h"
#include "itkSpatialFunction.h"
-
namespace otb
{
@@ -50,16 +49,16 @@ namespace otb
* \ingroup ImageFilters
*/
-template <class TInputImage, class TOutputImage,class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
class ITK_EXPORT FunctionToImageFilter :
- public itk::InPlaceImageFilter<TInputImage,TOutputImage>
+ public itk::InPlaceImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef FunctionToImageFilter Self;
- typedef itk::InPlaceImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef FunctionToImageFilter Self;
+ typedef itk::InPlaceImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -78,23 +77,23 @@ public:
typedef typename OutputImageType::RegionType OutputImageRegionType;
typedef typename OutputImageType::PixelType OutputImagePixelType;
/** Type of function. */
- typedef TFunction FunctionType;
- typedef typename FunctionType::OutputType FunctionValueType;
- typedef typename FunctionType::InputType FunctionPositionType;
+ typedef TFunction FunctionType;
+ typedef typename FunctionType::OutputType FunctionValueType;
+ typedef typename FunctionType::InputType FunctionPositionType;
/** Connect one of the operands for pixel-wise addition. */
//void SetInput( const TInputImage *image);
/** Set the internal spatial function. */
- void SetFunction( FunctionType* PixelFunction )
+ void SetFunction(FunctionType* PixelFunction)
{
m_PixelFunction = PixelFunction;
this->Modified();
- };
+ }
FunctionType* GetFunction()
{
return m_PixelFunction;
- };
+ }
/** Image dimensions */
itkStaticConstMacro(InputImageDimension, unsigned int,
@@ -104,7 +103,7 @@ public:
protected:
FunctionToImageFilter();
- virtual ~FunctionToImageFilter() {};
+ virtual ~FunctionToImageFilter() {}
/** Validate the presence of all three inputs. If one or more inputs
* are missing, throw an exception. */
@@ -121,14 +120,14 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
private:
- FunctionToImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ FunctionToImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The function that will be evaluated over the image */
- FunctionType * m_PixelFunction;
+ FunctionType * m_PixelFunction;
};
} // end namespace otb
diff --git a/Code/BasicFilters/otbFunctionToImageFilter.txx b/Code/BasicFilters/otbFunctionToImageFilter.txx
index e4d826b43b..8a082a1548 100644
--- a/Code/BasicFilters/otbFunctionToImageFilter.txx
+++ b/Code/BasicFilters/otbFunctionToImageFilter.txx
@@ -33,15 +33,14 @@ namespace otb
/**
* Constructor
*/
-template<class TInputImage, class TOutputImage, class TFunction >
-FunctionToImageFilter<TInputImage,TOutputImage,TFunction>
+template<class TInputImage, class TOutputImage, class TFunction>
+FunctionToImageFilter<TInputImage, TOutputImage, TFunction>
::FunctionToImageFilter()
{
this->InPlaceOff();
this->m_PixelFunction = 0;
}
-
/**
* Connect one of the operands for pixel-wise addition
*/
@@ -54,39 +53,38 @@ FunctionToImageFilter<TInputImage,TOutputImage,TFunction>
// SetNthInput( 0, const_cast<TInputImage *>( image ) );
// }
-
/**
* BeforeThreadedGenerateData function. Validate inputs
*/
-template<class TInputImage, class TOutputImage, class TFunction >
+template<class TInputImage, class TOutputImage, class TFunction>
void
-FunctionToImageFilter<TInputImage,TOutputImage,TFunction>
+FunctionToImageFilter<TInputImage, TOutputImage, TFunction>
::BeforeThreadedGenerateData()
{
InputImagePointer inputPtr
- = dynamic_cast<const TInputImage*>((itk::ProcessObject::GetInput(0)));
+ = dynamic_cast<const TInputImage*>((itk::ProcessObject::GetInput(0)));
if (inputPtr.IsNull())
- {
+ {
itkExceptionMacro(<< "At least one input is missing."
- << " Input is missing :" << inputPtr.GetPointer();)
+ << " Input is missing :" << inputPtr.GetPointer(); )
- }
+ }
m_PixelFunction->SetInputImage(inputPtr);
}
/**
* ThreadedGenerateData function. Performs the pixel-wise addition
*/
-template<class TInputImage, class TOutputImage, class TFunction >
+template<class TInputImage, class TOutputImage, class TFunction>
void
-FunctionToImageFilter<TInputImage,TOutputImage,TFunction>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread,
- int threadId)
+FunctionToImageFilter<TInputImage, TOutputImage, TFunction>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
+ int threadId)
{
// We use dynamic_cast since inputs are stored as DataObjects.
InputImagePointer inputPtr
- = dynamic_cast<const TInputImage*>((itk::ProcessObject::GetInput(0)));
+ = dynamic_cast<const TInputImage*>((itk::ProcessObject::GetInput(0)));
OutputImagePointer outputPtr = this->GetOutput(0);
@@ -98,14 +96,14 @@ FunctionToImageFilter<TInputImage,TOutputImage,TFunction>
inputIt.GoToBegin();
outputIt.GoToBegin();
- while ( !inputIt.IsAtEnd() )
- {
- outputIt.Set( static_cast<OutputImagePixelType>(m_PixelFunction->EvaluateAtIndex(inputIt.GetIndex())) );
+ while (!inputIt.IsAtEnd())
+ {
+ outputIt.Set(static_cast<OutputImagePixelType>(m_PixelFunction->EvaluateAtIndex(inputIt.GetIndex())));
++inputIt;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
}
} // end namespace otb
diff --git a/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.h b/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.h
index 62f6f361ce..dc6a286e5c 100644
--- a/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.h
+++ b/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.h
@@ -24,7 +24,6 @@
#include "otbFunctionToImageFilter.h"
#include "itkInPlaceImageFilter.h"
-
namespace otb
{
@@ -46,16 +45,16 @@ namespace otb
* \ingroup ImageFilters
*/
-template <class TInputImage, class TOutputImage,class TFunction>
+template <class TInputImage, class TOutputImage, class TFunction>
class ITK_EXPORT FunctionWithNeighborhoodToImageFilter :
-public itk::InPlaceImageFilter<TInputImage,TOutputImage>
+ public itk::InPlaceImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef FunctionWithNeighborhoodToImageFilter Self;
- typedef itk::InPlaceImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef FunctionWithNeighborhoodToImageFilter Self;
+ typedef itk::InPlaceImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -77,11 +76,10 @@ public:
typedef typename OutputImageType::RegionType OutputImageRegionType;
typedef typename OutputImageType::PixelType OutputImagePixelType;
/** Type of function. */
- typedef TFunction FunctionType;
- typedef typename FunctionType::Pointer FunctionPointerType;
- typedef typename FunctionType::OutputType FunctionValueType;
- typedef typename FunctionType::InputType FunctionPositionType;
-
+ typedef TFunction FunctionType;
+ typedef typename FunctionType::Pointer FunctionPointerType;
+ typedef typename FunctionType::OutputType FunctionValueType;
+ typedef typename FunctionType::InputType FunctionPositionType;
itkGetObjectMacro(Function, FunctionType);
/** Image dimensions */
@@ -92,23 +90,23 @@ public:
/** Accessors */
itkGetMacro(Radius, InputImageSizeType);
- void SetRadius( InputImageSizeType & rad )
- {
- m_Radius = rad;
- m_Function->SetRadius( rad );
- this->Modified();
- }
+ void SetRadius(InputImageSizeType& rad)
+ {
+ m_Radius = rad;
+ m_Function->SetRadius(rad);
+ this->Modified();
+ }
itkGetMacro(Offset, InputImageOffsetType);
- void SetOffset( InputImageOffsetType & offset )
- {
- m_Offset = offset;
- m_Function->SetOffset( offset );
- this->Modified();
- }
+ void SetOffset(InputImageOffsetType& offset)
+ {
+ m_Offset = offset;
+ m_Function->SetOffset(offset);
+ this->Modified();
+ }
protected:
FunctionWithNeighborhoodToImageFilter();
- virtual ~FunctionWithNeighborhoodToImageFilter(){};
+ virtual ~FunctionWithNeighborhoodToImageFilter(){}
void BeforeThreadedGenerateData();
@@ -125,17 +123,17 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
private:
- FunctionWithNeighborhoodToImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ FunctionWithNeighborhoodToImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
//FunctionPointerType m_Function;
- FunctionPointerType m_Function;
+ FunctionPointerType m_Function;
std::vector<FunctionPointerType> m_FunctionList;
- InputImageSizeType m_Radius;
- InputImageOffsetType m_Offset;
+ InputImageSizeType m_Radius;
+ InputImageOffsetType m_Offset;
};
} // end namespace otb
diff --git a/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.txx b/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.txx
index 26aeba2e75..951d6cf697 100644
--- a/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.txx
+++ b/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.txx
@@ -30,8 +30,8 @@ namespace otb
/**
* Constructor
*/
-template<class TInputImage, class TOutputImage, class TFunction >
-FunctionWithNeighborhoodToImageFilter<TInputImage,TOutputImage,TFunction>
+template<class TInputImage, class TOutputImage, class TFunction>
+FunctionWithNeighborhoodToImageFilter<TInputImage, TOutputImage, TFunction>
::FunctionWithNeighborhoodToImageFilter()
{
this->InPlaceOff();
@@ -43,45 +43,44 @@ FunctionWithNeighborhoodToImageFilter<TInputImage,TOutputImage,TFunction>
}
-
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
-FunctionWithNeighborhoodToImageFilter<TInputImage,TOutputImage,TFunction>
+FunctionWithNeighborhoodToImageFilter<TInputImage, TOutputImage, TFunction>
::BeforeThreadedGenerateData()
{
Superclass::BeforeThreadedGenerateData();
InputImageConstPointer inputPtr = dynamic_cast<const TInputImage*>((itk::ProcessObject::GetInput(0)));
if (inputPtr.IsNull())
- {
+ {
itkExceptionMacro(<< "At least one input is missing."
- << " Input is missing :" << inputPtr.GetPointer();)
+ << " Input is missing :" << inputPtr.GetPointer(); )
- }
+ }
m_Function->SetInputImage(inputPtr);
- for(unsigned int i = 0; i<static_cast<unsigned int>(this->GetNumberOfThreads()); ++i)
+ for (unsigned int i = 0; i < static_cast<unsigned int>(this->GetNumberOfThreads()); ++i)
{
- FunctionPointerType func = m_Function;
- m_FunctionList.push_back( func );
+ FunctionPointerType func = m_Function;
+ m_FunctionList.push_back(func);
}
}
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
-FunctionWithNeighborhoodToImageFilter<TInputImage,TOutputImage,TFunction>
+FunctionWithNeighborhoodToImageFilter<TInputImage, TOutputImage, TFunction>
::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- InputImagePointer inputPtr = const_cast< TInputImage * >( this->GetInput());
+ InputImagePointer inputPtr = const_cast<TInputImage *>(this->GetInput());
OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
InputImageRegionType inputRequestedRegion = inputPtr->GetRequestedRegion();
@@ -90,43 +89,42 @@ FunctionWithNeighborhoodToImageFilter<TInputImage,TOutputImage,TFunction>
InputImageSizeType maxRad;
maxRad[0] = m_Radius[0] + vcl_abs(m_Offset[0]);
maxRad[1] = m_Radius[0] + vcl_abs(m_Offset[1]);
- inputRequestedRegion.PadByRadius( maxRad );
+ inputRequestedRegion.PadByRadius(maxRad);
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << this->GetNameOfClass()
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
- }
+ }
}
-
/**
* ThreadedGenerateData function. Performs the pixel-wise addition
*/
-template<class TInputImage, class TOutputImage, class TFunction >
+template<class TInputImage, class TOutputImage, class TFunction>
void
-FunctionWithNeighborhoodToImageFilter<TInputImage,TOutputImage,TFunction>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread,
- int threadId)
+FunctionWithNeighborhoodToImageFilter<TInputImage, TOutputImage, TFunction>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
+ int threadId)
{
// We use dynamic_cast since inputs are stored as DataObjects.
InputImageConstPointer inputPtr = dynamic_cast<const TInputImage*>((itk::ProcessObject::GetInput(0)));
@@ -141,13 +139,13 @@ FunctionWithNeighborhoodToImageFilter<TInputImage,TOutputImage,TFunction>
inputIt.GoToBegin();
outputIt.GoToBegin();
- while ( !inputIt.IsAtEnd() )
+ while (!inputIt.IsAtEnd())
{
- outputIt.Set( static_cast<OutputImagePixelType>(m_FunctionList[threadId]->EvaluateAtIndex(inputIt.GetIndex())) );
- ++inputIt;
- ++outputIt;
-
- progress.CompletedPixel(); // potential exception thrown here
+ outputIt.Set(static_cast<OutputImagePixelType>(m_FunctionList[threadId]->EvaluateAtIndex(inputIt.GetIndex())));
+ ++inputIt;
+ ++outputIt;
+
+ progress.CompletedPixel(); // potential exception thrown here
}
}
} // end namespace otb
diff --git a/Code/BasicFilters/otbGaborFilterGenerator.h b/Code/BasicFilters/otbGaborFilterGenerator.h
index c13ed623f4..4a5ebba0a5 100644
--- a/Code/BasicFilters/otbGaborFilterGenerator.h
+++ b/Code/BasicFilters/otbGaborFilterGenerator.h
@@ -68,42 +68,42 @@ namespace otb
template <class TPrecision>
class GaborFilterGenerator
- : public itk::Object
+ : public itk::Object
{
public:
// Standard class typedefs
- typedef GaborFilterGenerator Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef GaborFilterGenerator Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
// Standard new and type macro
itkNewMacro(Self);
- itkTypeMacro(GaborFilterGenerator,Object);
+ itkTypeMacro(GaborFilterGenerator, Object);
// usefull typedefs
- typedef TPrecision PrecisionType;
+ typedef TPrecision PrecisionType;
typedef itk::Array<PrecisionType> ArrayType;
typedef itk::Size<2> RadiusType;
/** Setters/Getters */
- itkSetMacro(A,PrecisionType);
- itkGetMacro(A,PrecisionType);
- itkSetMacro(B,PrecisionType);
- itkGetMacro(B,PrecisionType);
- itkSetMacro(Theta,PrecisionType);
- itkGetMacro(Theta,PrecisionType);
- itkSetMacro(Phi,PrecisionType);
- itkGetMacro(Phi,PrecisionType);
- itkSetMacro(U0,PrecisionType);
- itkGetMacro(U0,PrecisionType);
- itkSetMacro(V0,PrecisionType);
- itkGetMacro(V0,PrecisionType);
- itkSetMacro(Radius,RadiusType);
- itkGetConstReferenceMacro(Radius,RadiusType);
+ itkSetMacro(A, PrecisionType);
+ itkGetMacro(A, PrecisionType);
+ itkSetMacro(B, PrecisionType);
+ itkGetMacro(B, PrecisionType);
+ itkSetMacro(Theta, PrecisionType);
+ itkGetMacro(Theta, PrecisionType);
+ itkSetMacro(Phi, PrecisionType);
+ itkGetMacro(Phi, PrecisionType);
+ itkSetMacro(U0, PrecisionType);
+ itkGetMacro(U0, PrecisionType);
+ itkSetMacro(V0, PrecisionType);
+ itkGetMacro(V0, PrecisionType);
+ itkSetMacro(Radius, RadiusType);
+ itkGetConstReferenceMacro(Radius, RadiusType);
/** Get The generated filter */
- const ArrayType & GetFilter();
+ const ArrayType& GetFilter();
protected:
/** constructor */
@@ -123,7 +123,7 @@ protected:
private:
GaborFilterGenerator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Radius of the filter */
RadiusType m_Radius;
diff --git a/Code/BasicFilters/otbGaborFilterGenerator.txx b/Code/BasicFilters/otbGaborFilterGenerator.txx
index c2b06b5120..de4c6f5083 100644
--- a/Code/BasicFilters/otbGaborFilterGenerator.txx
+++ b/Code/BasicFilters/otbGaborFilterGenerator.txx
@@ -40,14 +40,14 @@ GaborFilterGenerator<TPrecision>
}
template <class TPrecision>
const typename GaborFilterGenerator<TPrecision>
-::ArrayType &
+::ArrayType&
GaborFilterGenerator<TPrecision>
::GetFilter()
{
if (m_NeedToRegenerateFilter)
- {
+ {
this->GenerateFilter();
- }
+ }
return m_Filter;
}
@@ -56,29 +56,29 @@ void
GaborFilterGenerator<TPrecision>
::GenerateFilter()
{
- m_Filter.SetSize((2*m_Radius[0]+1)*(2*m_Radius[1]+1));
+ m_Filter.SetSize((2 * m_Radius[0] + 1) * (2 * m_Radius[1] + 1));
m_Filter.Fill(0);
- PrecisionType coef,xr,yr,costheta,sintheta;
- unsigned int k = 0;
-
- costheta = vcl_cos(m_Theta*CONST_PI_180);
- sintheta = vcl_sin(m_Theta*CONST_PI_180);
+ PrecisionType coef, xr, yr, costheta, sintheta;
+ unsigned int k = 0;
+ costheta = vcl_cos(m_Theta * CONST_PI_180);
+ sintheta = vcl_sin(m_Theta * CONST_PI_180);
- for (PrecisionType y = - static_cast<PrecisionType>(m_Radius[1]);
- y<=static_cast<PrecisionType>(m_Radius[1]);y+=1)
- {
- for (PrecisionType x = - static_cast<PrecisionType>(m_Radius[0]);
- x<=static_cast<PrecisionType>(m_Radius[0]);x+=1)
+ for (PrecisionType y = -static_cast<PrecisionType>(m_Radius[1]);
+ y <= static_cast<PrecisionType>(m_Radius[1]); y += 1)
{
+ for (PrecisionType x = -static_cast<PrecisionType>(m_Radius[0]);
+ x <= static_cast<PrecisionType>(m_Radius[0]); x += 1)
+ {
xr = x * costheta + y * sintheta;
yr = y * costheta - x * sintheta;
- coef = vcl_exp(-CONST_PI*(vcl_pow(m_A*xr,2)+vcl_pow(m_B*yr,2)))*cos(CONST_2PI*(m_U0*x+m_V0*y)+m_Phi);
- m_Filter.SetElement(k,coef);
+ coef = vcl_exp(-CONST_PI * (vcl_pow(m_A * xr, 2) + vcl_pow(m_B * yr, 2))) * cos(
+ CONST_2PI * (m_U0 * x + m_V0 * y) + m_Phi);
+ m_Filter.SetElement(k, coef);
++k;
+ }
}
- }
}
template <class TPrecision>
@@ -95,15 +95,15 @@ void
GaborFilterGenerator<TPrecision>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"Radius: "<<m_Radius<<std::endl;
- os<<indent<<"A: "<<m_A<<std::endl;
- os<<indent<<"B: "<<m_B<<std::endl;
- os<<indent<<"Theta: "<<m_Theta<<std::endl;
- os<<indent<<"U0: "<<m_U0<<std::endl;
- os<<indent<<"V0: "<<m_V0<<std::endl;
- os<<indent<<"Phi: "<<m_Phi<<std::endl;
- os<<"Need to regenerate filter: "<<m_NeedToRegenerateFilter<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Radius: " << m_Radius << std::endl;
+ os << indent << "A: " << m_A << std::endl;
+ os << indent << "B: " << m_B << std::endl;
+ os << indent << "Theta: " << m_Theta << std::endl;
+ os << indent << "U0: " << m_U0 << std::endl;
+ os << indent << "V0: " << m_V0 << std::endl;
+ os << indent << "Phi: " << m_Phi << std::endl;
+ os << "Need to regenerate filter: " << m_NeedToRegenerateFilter << std::endl;
}
}
diff --git a/Code/BasicFilters/otbHillShadingFunctor.h b/Code/BasicFilters/otbHillShadingFunctor.h
index 316ea001f3..9c62d7fa75 100644
--- a/Code/BasicFilters/otbHillShadingFunctor.h
+++ b/Code/BasicFilters/otbHillShadingFunctor.h
@@ -34,14 +34,14 @@ namespace Functor
* \ingroup Functor
* \example BasicFilters/HillShadingExample.cxx
*/
-template< class TInput1, class TInput2=TInput1, class TOutput=TInput1>
+template<class TInput1, class TInput2 = TInput1, class TOutput = TInput1>
class HillShadeModulationFunctor
{
public:
HillShadeModulationFunctor() {}
~HillShadeModulationFunctor() {}
- inline TOutput operator()( const TInput1 & A, const TInput2 & B) const
+ inline TOutput operator ()(const TInput1& A, const TInput2& B) const
{
TOutput out;
out.SetRed(A.GetRed() * B);
@@ -70,8 +70,8 @@ public:
typedef TNeighIter IteratorType;
typedef typename IteratorType::PixelType PixelType;
- HillShadingFunctor(): m_AzimuthLight(30.0/180.0*CONST_PI), m_ElevationLight(45.0/180.0*CONST_PI),
- m_XRes(100.0), m_YRes(100.0), m_Scale(0.1)
+ HillShadingFunctor() : m_AzimuthLight(30.0 / 180.0 * CONST_PI), m_ElevationLight(45.0 / 180.0 * CONST_PI),
+ m_XRes(100.0), m_YRes(100.0), m_Scale(0.1)
{
m_SinElev = vcl_sin(m_ElevationLight);
m_CosElev = vcl_cos(m_ElevationLight);
@@ -110,37 +110,40 @@ public:
m_Scale = scale;
}
- inline TOutput operator()(const TNeighIter & it) const
+ inline TOutput operator ()(const TNeighIter& it) const
{
- const typename IteratorType::OffsetType LEFT ={{-1,0}};
- const typename IteratorType::OffsetType RIGHT ={{1,0}};
- const typename IteratorType::OffsetType UP ={{0,-1}};
- const typename IteratorType::OffsetType DOWN ={{0,1}};
- const typename IteratorType::OffsetType LEFTUP ={{-1,-1}};
- const typename IteratorType::OffsetType RIGHTDOWN ={{1,1}};
- const typename IteratorType::OffsetType RIGHTUP ={{1,-1}};
- const typename IteratorType::OffsetType LEFTDOWN ={{-1,1}};
+ const typename IteratorType::OffsetType LEFT = {{-1, 0}};
+ const typename IteratorType::OffsetType RIGHT = {{1, 0}};
+ const typename IteratorType::OffsetType UP = {{0, -1}};
+ const typename IteratorType::OffsetType DOWN = {{0, 1}};
+ const typename IteratorType::OffsetType LEFTUP = {{-1, -1}};
+ const typename IteratorType::OffsetType RIGHTDOWN = {{1, 1}};
+ const typename IteratorType::OffsetType RIGHTUP = {{1, -1}};
+ const typename IteratorType::OffsetType LEFTDOWN = {{-1, 1}};
// const typename IteratorType::OffsetType CENTER ={{0,0}};
- float xSlope = ((makeValid(it.GetPixel(LEFTUP))+2*makeValid(it.GetPixel(LEFT))+makeValid(it.GetPixel(RIGHTDOWN)))
- -(makeValid(it.GetPixel(RIGHTUP))+2*makeValid(it.GetPixel(RIGHT))+makeValid(it.GetPixel(RIGHTDOWN))))
- /(m_XRes*m_Scale);
+ float xSlope =
+ ((makeValid(it.GetPixel(LEFTUP)) + 2 * makeValid(it.GetPixel(LEFT)) + makeValid(it.GetPixel(RIGHTDOWN)))
+ - (makeValid(it.GetPixel(RIGHTUP)) + 2 * makeValid(it.GetPixel(RIGHT)) +
+ makeValid(it.GetPixel(RIGHTDOWN))))
+ / (m_XRes * m_Scale);
// - as the azimuth is given compared to y axis pointing up
- float ySlope = -((makeValid(it.GetPixel(LEFTUP))+2*makeValid(it.GetPixel(UP))+makeValid(it.GetPixel(RIGHTUP)))
- -(makeValid(it.GetPixel(LEFTDOWN))+2*makeValid(it.GetPixel(DOWN))+makeValid(it.GetPixel(RIGHTDOWN))))
- /(m_YRes*m_Scale);
+ float ySlope = -((makeValid(it.GetPixel(LEFTUP)) + 2 * makeValid(it.GetPixel(UP)) + makeValid(it.GetPixel(RIGHTUP)))
+ - (makeValid(it.GetPixel(LEFTDOWN)) + 2 * makeValid(it.GetPixel(DOWN)) +
+ makeValid(it.GetPixel(RIGHTDOWN))))
+ / (m_YRes * m_Scale);
// permutation between x and y as the azimuth angle is given compared to the north-south axis
- float lambertian = ((m_SinElev*m_CosAz*ySlope)+(m_SinElev*m_SinAz*xSlope)+m_CosElev)
- / vcl_sqrt(xSlope*xSlope+ySlope*ySlope+1);
+ float lambertian = ((m_SinElev * m_CosAz * ySlope) + (m_SinElev * m_SinAz * xSlope) + m_CosElev)
+ / vcl_sqrt(xSlope * xSlope + ySlope * ySlope + 1);
- return (lambertian+1)/2; //normalize between 0 and 1
+ return (lambertian + 1) / 2; //normalize between 0 and 1
}
private:
HillShadingFunctor(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
inline PixelType makeValid(PixelType v) const
{
diff --git a/Code/BasicFilters/otbImageAndVectorImageOperationFilter.h b/Code/BasicFilters/otbImageAndVectorImageOperationFilter.h
index 5ae3905b75..3b9f68796a 100644
--- a/Code/BasicFilters/otbImageAndVectorImageOperationFilter.h
+++ b/Code/BasicFilters/otbImageAndVectorImageOperationFilter.h
@@ -25,81 +25,78 @@
#include "itkBinaryFunctorImageFilter.h"
#include "itkImageToImageFilter.h"
-
namespace otb
{
namespace Functor
{
-template <typename TInput,typename TVectorInput, typename TOutput>
+template <typename TInput, typename TVectorInput, typename TOutput>
class ITK_EXPORT ImageAndVectorImageOperationFunctor
{
public:
- typedef typename TVectorInput::ValueType InternalInputPixelType;
- typedef typename TOutput::ValueType InternalOutputPixelType;
- typedef enum{MULTIPLICATION, ADDITION, DIVISON, SUBSTRACTION } OperatorType;
-
+ typedef typename TVectorInput::ValueType InternalInputPixelType;
+ typedef typename TOutput::ValueType InternalOutputPixelType;
+ typedef enum {MULTIPLICATION, ADDITION, DIVISON, SUBSTRACTION } OperatorType;
+
ImageAndVectorImageOperationFunctor()
{
- m_Operator = ADDITION;//1;
+ m_Operator = ADDITION; //1;
};
- virtual ~ImageAndVectorImageOperationFunctor(){};
+ virtual ~ImageAndVectorImageOperationFunctor(){}
-
void SetOperator(OperatorType oper)
- {
- m_Operator = oper;
- }
+ {
+ m_Operator = oper;
+ }
OperatorType GetOperator()
- {
- return m_Operator;
- }
+ {
+ return m_Operator;
+ }
- inline TOutput operator() (const TInput & inPix, const TVectorInput & vInPix)
+ inline TOutput operator ()(const TInput& inPix, const TVectorInput& vInPix)
{
TOutput out;
- out.SetSize( vInPix.Size() );
+ out.SetSize(vInPix.Size());
TVectorInput vInTmp = vInPix;
- switch(m_Operator)
+ switch (m_Operator)
{
- case MULTIPLICATION:
+ case MULTIPLICATION:
+ {
+ vInTmp *= static_cast<InternalInputPixelType>(inPix);
+ break;
+ }
+ case ADDITION:
+ {
+ vInTmp += static_cast<InternalInputPixelType>(inPix);
+ break;
+ }
+ case DIVISON:
+ {
+ if (inPix != 0) vInTmp /= static_cast<InternalInputPixelType>(inPix);
+ else
+ {
+ vInTmp.Fill(0);
+ }
+ break;
+ }
+ case SUBSTRACTION:
+ {
+ vInTmp -= static_cast<InternalInputPixelType>(inPix);
+ break;
+ }
+ default:
{
- vInTmp *= static_cast<InternalInputPixelType>(inPix);
- break;
}
- case ADDITION:
- {
- vInTmp += static_cast<InternalInputPixelType>(inPix);
- break;
- }
- case DIVISON:
- {
- if(inPix!=0)
- vInTmp /= static_cast<InternalInputPixelType>(inPix);
- else
- {
- vInTmp.Fill(0);
- }
- break;
- }
- case SUBSTRACTION:
- {
- vInTmp -= static_cast<InternalInputPixelType>(inPix);
- break;
- }
- default:
- {
- }
}
- for(unsigned int i=0; i<vInTmp.Size(); i++)
+ for (unsigned int i = 0; i < vInTmp.Size(); i++)
{
- out[i] = static_cast<InternalInputPixelType>(vInTmp[i]);
+ out[i] = static_cast<InternalInputPixelType>(vInTmp[i]);
}
return out;
}
- protected:
+protected:
OperatorType m_Operator;
};
}
@@ -119,33 +116,34 @@ public:
*/
template <class TInputImage, class TVectorInputImage, class TOutputImage>
-class ITK_EXPORT ImageAndVectorImageOperationFilter:
-public itk::BinaryFunctorImageFilter<TInputImage,
- TVectorInputImage,
- TOutputImage,
- Functor::ImageAndVectorImageOperationFunctor<ITK_TYPENAME TInputImage::PixelType,
- ITK_TYPENAME TVectorInputImage::PixelType,
- ITK_TYPENAME TOutputImage::PixelType > >
+class ITK_EXPORT ImageAndVectorImageOperationFilter :
+ public itk::BinaryFunctorImageFilter<TInputImage,
+ TVectorInputImage,
+ TOutputImage,
+ Functor::ImageAndVectorImageOperationFunctor<ITK_TYPENAME TInputImage::PixelType,
+ ITK_TYPENAME TVectorInputImage::
+ PixelType,
+ ITK_TYPENAME TOutputImage::
+ PixelType> >
//ImageToImageFilter< TVectorInputImage, TOutputImage >
{
public:
/** Standard class typedefs. */
- typedef ImageAndVectorImageOperationFilter Self;
+ typedef ImageAndVectorImageOperationFilter Self;
//typedef itk::ImageToImageFilter<TVectorInputImage, TOutputImage> Superclass;
typedef Functor::ImageAndVectorImageOperationFunctor<ITK_TYPENAME TInputImage::PixelType,
ITK_TYPENAME TVectorInputImage::PixelType,
- ITK_TYPENAME TOutputImage::PixelType > FunctorType;
+ ITK_TYPENAME TOutputImage::PixelType> FunctorType;
typedef itk::BinaryFunctorImageFilter<TInputImage, TVectorInputImage, TOutputImage, FunctorType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(ImageAndVectorImageOperationFilter,itk::BinaryFunctorImageFilter);
-
+ itkTypeMacro(ImageAndVectorImageOperationFilter, itk::BinaryFunctorImageFilter);
/** Typedef for the images. */
typedef TInputImage InputImageType;
@@ -155,20 +153,17 @@ public:
typedef TOutputImage OutputImageType;
typedef typename OutputImageType::PixelType OutputPixelType;
-
/** Operation type typedef. */
- typedef typename FunctorType::OperatorType OperatorType;
-
+ typedef typename FunctorType::OperatorType OperatorType;
/** Set the input images of this process object. */
- void SetInput( const InputImageType *input );
- void SetVectorInput( const VectorInputImageType *input );
+ void SetInput(const InputImageType *input);
+ void SetVectorInput(const VectorInputImageType *input);
/** Get the input images of this process object. */
const InputImageType * GetInput();
const VectorInputImageType * GetVectorInput();
-
/** Accessors */
itkGetMacro(UseAddition, bool);
itkGetMacro(UseMultiplication, bool);
@@ -176,43 +171,41 @@ public:
itkGetMacro(UseSubstraction, bool);
void UseAddition()
- {
- m_UseAddition = true;
- m_UseMultiplication = false;
- m_UseDivision = false;
- m_UseSubstraction = false;
- this->GetFunctor().SetOperator(static_cast<OperatorType>(1));
- this->Modified();
- }
+ {
+ m_UseAddition = true;
+ m_UseMultiplication = false;
+ m_UseDivision = false;
+ m_UseSubstraction = false;
+ this->GetFunctor().SetOperator(static_cast<OperatorType>(1));
+ this->Modified();
+ }
void UseMultiplication()
- {
- m_UseAddition = false;
- m_UseMultiplication = true;
- m_UseDivision = false;
- m_UseSubstraction = false;
- this->GetFunctor().SetOperator(static_cast<OperatorType>(0));
- this->Modified();
- }
+ {
+ m_UseAddition = false;
+ m_UseMultiplication = true;
+ m_UseDivision = false;
+ m_UseSubstraction = false;
+ this->GetFunctor().SetOperator(static_cast<OperatorType>(0));
+ this->Modified();
+ }
void UseDivision()
- {
- m_UseAddition = false;
- m_UseMultiplication = false;
- m_UseDivision = true;
- m_UseSubstraction = false;
- this->GetFunctor().SetOperator(static_cast<OperatorType>(2));
- this->Modified();
- }
+ {
+ m_UseAddition = false;
+ m_UseMultiplication = false;
+ m_UseDivision = true;
+ m_UseSubstraction = false;
+ this->GetFunctor().SetOperator(static_cast<OperatorType>(2));
+ this->Modified();
+ }
void UseSubstraction()
- {
- m_UseAddition = false;
- m_UseMultiplication = false;
- m_UseDivision = false;
- m_UseSubstraction = true;
- this->GetFunctor().SetOperator(static_cast<OperatorType>(3));
- this->Modified();
- }
-
-
+ {
+ m_UseAddition = false;
+ m_UseMultiplication = false;
+ m_UseDivision = false;
+ m_UseSubstraction = true;
+ this->GetFunctor().SetOperator(static_cast<OperatorType>(3));
+ this->Modified();
+ }
protected:
ImageAndVectorImageOperationFilter();
@@ -223,11 +216,9 @@ protected:
* \sa ProcessObject::GenerateOutputInformation() */
virtual void GenerateOutputInformation();
-
-
private:
ImageAndVectorImageOperationFilter(const ImageAndVectorImageOperationFilter &); //purposely not implemented
- void operator=(const ImageAndVectorImageOperationFilter&); //purposely not implemented
+ void operator =(const ImageAndVectorImageOperationFilter&); //purposely not implemented
bool m_UseAddition;
bool m_UseMultiplication;
@@ -242,5 +233,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/BasicFilters/otbImageAndVectorImageOperationFilter.txx b/Code/BasicFilters/otbImageAndVectorImageOperationFilter.txx
index 01ba29a728..86febca379 100644
--- a/Code/BasicFilters/otbImageAndVectorImageOperationFilter.txx
+++ b/Code/BasicFilters/otbImageAndVectorImageOperationFilter.txx
@@ -45,7 +45,7 @@ void
ImageAndVectorImageOperationFilter<TInputImage, TVectorInputImage, TOutputImage>
::SetInput(const InputImageType *input)
{
- this->SetNthInput(0, const_cast< InputImageType * >(input) );
+ this->SetNthInput(0, const_cast<InputImageType *>(input));
}
template <class TInputImage, class TVectorInputImage, class TOutputImage>
@@ -53,7 +53,7 @@ void
ImageAndVectorImageOperationFilter<TInputImage, TVectorInputImage, TOutputImage>
::SetVectorInput(const VectorInputImageType *input)
{
- this->SetNthInput(1, const_cast< VectorInputImageType * >(input) );
+ this->SetNthInput(1, const_cast<VectorInputImageType *>(input));
}
template <class TInputImage, class TVectorInputImage, class TOutputImage>
@@ -61,10 +61,9 @@ const typename ImageAndVectorImageOperationFilter<TInputImage, TVectorInputImage
ImageAndVectorImageOperationFilter<TInputImage, TVectorInputImage, TOutputImage>
::GetInput()
{
- if (this->GetNumberOfInputs() < 1)
- return 0;
-
- return dynamic_cast<const InputImageType*>(this->GetInput(0));
+ if (this->GetNumberOfInputs() < 1) return 0;
+
+ return dynamic_cast<const InputImageType*>(this->GetInput(0));
}
template <class TInputImage, class TVectorInputImage, class TOutputImage>
@@ -72,10 +71,9 @@ const typename ImageAndVectorImageOperationFilter<TInputImage, TVectorInputImage
ImageAndVectorImageOperationFilter<TInputImage, TVectorInputImage, TOutputImage>
::GetVectorInput()
{
- if (this->GetNumberOfInputs() < 2)
- return 0;
-
- return dynamic_cast<const VectorInputImageType*>(this->itk::ProcessObject::GetInput(1));
+ if (this->GetNumberOfInputs() < 2) return 0;
+
+ return dynamic_cast<const VectorInputImageType*>(this->itk::ProcessObject::GetInput(1));
}
/**
*
@@ -87,7 +85,7 @@ ImageAndVectorImageOperationFilter<TInputImage, TVectorInputImage, TOutputImage>
{
// call the superclass' implementation of this method
Superclass::GenerateOutputInformation();
- this->GetOutput()->SetNumberOfComponentsPerPixel( this->GetVectorInput()->GetNumberOfComponentsPerPixel());
+ this->GetOutput()->SetNumberOfComponentsPerPixel(this->GetVectorInput()->GetNumberOfComponentsPerPixel());
}
} // end namespace otb
diff --git a/Code/BasicFilters/otbImageListToImageListApplyFilter.h b/Code/BasicFilters/otbImageListToImageListApplyFilter.h
index 7ca9834eb9..ff783ab57f 100644
--- a/Code/BasicFilters/otbImageListToImageListApplyFilter.h
+++ b/Code/BasicFilters/otbImageListToImageListApplyFilter.h
@@ -20,7 +20,6 @@
#include "otbImageListToImageListFilter.h"
-
namespace otb
{
/** \class ImageListToImageListApplyFilter
@@ -41,16 +40,16 @@ namespace otb
*/
template <class TInputImageList, class TOutputImageList, class TFilter>
class ITK_EXPORT ImageListToImageListApplyFilter
- : public ImageListToImageListFilter<typename TInputImageList::ImageType,
- typename TOutputImageList::ImageType>
+ : public ImageListToImageListFilter<typename TInputImageList::ImageType,
+ typename TOutputImageList::ImageType>
{
public:
/** Standard typedefs */
- typedef ImageListToImageListApplyFilter Self;
+ typedef ImageListToImageListApplyFilter Self;
typedef ImageListToImageListFilter<typename TInputImageList::ImageType,
- typename TOutputImageList::ImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typename TOutputImageList::ImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -59,21 +58,21 @@ public:
itkTypeMacro(ImageListToImageListApplyFilter, ImageListToImageListFilter);
/** Template parameters typedefs */
- typedef TInputImageList InputImageListType;
- typedef typename InputImageListType::Pointer InputImageListPointerType;
- typedef typename InputImageListType::ImageType InputImageType;
- typedef TOutputImageList OutputImageListType;
- typedef typename OutputImageListType::Pointer OutputImageListPointerType;
+ typedef TInputImageList InputImageListType;
+ typedef typename InputImageListType::Pointer InputImageListPointerType;
+ typedef typename InputImageListType::ImageType InputImageType;
+ typedef TOutputImageList OutputImageListType;
+ typedef typename OutputImageListType::Pointer OutputImageListPointerType;
typedef typename OutputImageListType::ImageType OutputImageType;
- typedef TFilter FilterType;
- typedef typename FilterType::Pointer FilterPointerType;
+ typedef TFilter FilterType;
+ typedef typename FilterType::Pointer FilterPointerType;
/** Accessors */
- itkSetObjectMacro(Filter,FilterType);
- itkGetObjectMacro(Filter,FilterType);
+ itkSetObjectMacro(Filter, FilterType);
+ itkGetObjectMacro(Filter, FilterType);
- itkGetMacro(OutputIndex,unsigned int);
- itkSetMacro(OutputIndex,unsigned int);
+ itkGetMacro(OutputIndex, unsigned int);
+ itkSetMacro(OutputIndex, unsigned int);
/** Generate output information for the ImageList and for each image
in the list. */
@@ -88,20 +87,20 @@ protected:
/** Constructor */
ImageListToImageListApplyFilter();
/** Destructor */
- virtual ~ImageListToImageListApplyFilter() {};
+ virtual ~ImageListToImageListApplyFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageListToImageListApplyFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageListToImageListApplyFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The processing filter */
FilterPointerType m_Filter;
/** The index of the output of the filter to use */
unsigned int m_OutputIndex;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbImageListToImageListApplyFilter.txx"
#endif
diff --git a/Code/BasicFilters/otbImageListToImageListApplyFilter.txx b/Code/BasicFilters/otbImageListToImageListApplyFilter.txx
index 5d60408514..66556e2e58 100644
--- a/Code/BasicFilters/otbImageListToImageListApplyFilter.txx
+++ b/Code/BasicFilters/otbImageListToImageListApplyFilter.txx
@@ -26,42 +26,42 @@ namespace otb
* Constructor
*/
template <class TInputImageList, class TOutputImageList, class TFilter>
-ImageListToImageListApplyFilter<TInputImageList,TOutputImageList,TFilter>
+ImageListToImageListApplyFilter<TInputImageList, TOutputImageList, TFilter>
::ImageListToImageListApplyFilter()
{
m_Filter = FilterType::New();
- m_OutputIndex=0;
+ m_OutputIndex = 0;
}
/** Generate output information for the ImageList and for each image
in the List. */
template <class TInputImageList, class TOutputImageList, class TFilter>
void
-ImageListToImageListApplyFilter<TInputImageList,TOutputImageList,TFilter>
+ImageListToImageListApplyFilter<TInputImageList, TOutputImageList, TFilter>
::GenerateOutputInformation()
{
// Retrieving input/output pointers
- InputImageListPointerType inputPtr = this->GetInput();
+ InputImageListPointerType inputPtr = this->GetInput();
OutputImageListPointerType outputPtr = this->GetOutput();
if (outputPtr)
- {
- if (outputPtr->Size()!=inputPtr->Size())
{
+ if (outputPtr->Size() != inputPtr->Size())
+ {
// in this case, clear the list
outputPtr->Clear();
typename InputImageListType::ConstIterator inputListIt = inputPtr->Begin();
- while (inputListIt!=inputPtr->End())
- {
+ while (inputListIt != inputPtr->End())
+ {
outputPtr->PushBack(OutputImageType::New());
++inputListIt;
+ }
}
- }
// For each input image
typename InputImageListType::ConstIterator inputListIt = inputPtr->Begin();
- typename OutputImageListType::Iterator outputListIt = outputPtr->Begin();
+ typename OutputImageListType::Iterator outputListIt = outputPtr->Begin();
- while (inputListIt!=inputPtr->End()&&outputListIt!=outputPtr->End())
- {
+ while (inputListIt != inputPtr->End() && outputListIt != outputPtr->End())
+ {
// Create the output image and set its information
m_Filter->SetInput(inputListIt.Get());
@@ -70,67 +70,66 @@ ImageListToImageListApplyFilter<TInputImageList,TOutputImageList,TFilter>
outputListIt.Get()->SetLargestPossibleRegion(m_Filter->GetOutput(m_OutputIndex)->GetLargestPossibleRegion());
++inputListIt;
++outputListIt;
+ }
}
- }
}
/** Generate input requested region for each image in the List. */
template <class TInputImageList, class TOutputImageList, class TFilter>
void
-ImageListToImageListApplyFilter<TInputImageList,TOutputImageList,TFilter>
+ImageListToImageListApplyFilter<TInputImageList, TOutputImageList, TFilter>
::GenerateInputRequestedRegion()
{
// Retrieving input/output pointers
- InputImageListPointerType inputPtr = this->GetInput();
+ InputImageListPointerType inputPtr = this->GetInput();
OutputImageListPointerType outputPtr = this->GetOutput();
// For each input image and corresponding output image
typename InputImageListType::ConstIterator inputListIt = inputPtr->Begin();
- typename OutputImageListType::Iterator outputListIt = outputPtr->Begin();
+ typename OutputImageListType::Iterator outputListIt = outputPtr->Begin();
// Use the filter to generate input requested region
- while (inputListIt!=inputPtr->End()&&outputListIt!=outputPtr->End())
- {
+ while (inputListIt != inputPtr->End() && outputListIt != outputPtr->End())
+ {
m_Filter->SetInput(inputListIt.Get());
m_Filter->GetOutput(m_OutputIndex)->SetRequestedRegion(outputListIt.Get()->GetRequestedRegion());
m_Filter->PropagateRequestedRegion(outputListIt.Get());
++inputListIt;
++outputListIt;
- }
+ }
}
/** Main computation method */
template <class TInputImageList, class TOutputImageList, class TFilter>
void
-ImageListToImageListApplyFilter<TInputImageList,TOutputImageList,TFilter>
+ImageListToImageListApplyFilter<TInputImageList, TOutputImageList, TFilter>
::GenerateData()
{
// Retrieving input/output pointers
- InputImageListPointerType inputPtr = this->GetInput();
+ InputImageListPointerType inputPtr = this->GetInput();
OutputImageListPointerType outputPtr = this->GetOutput();
// For each input image and corresponding output image
typename InputImageListType::ConstIterator inputListIt = inputPtr->Begin();
- typename OutputImageListType::Iterator outputListIt = outputPtr->Begin();
- unsigned int counter = 0;
-
+ typename OutputImageListType::Iterator outputListIt = outputPtr->Begin();
+ unsigned int counter = 0;
- while (inputListIt!=inputPtr->End()&&outputListIt!=outputPtr->End())
- {
+ while (inputListIt != inputPtr->End() && outputListIt != outputPtr->End())
+ {
m_Filter->SetInput(inputListIt.Get());
m_Filter->GetOutput(m_OutputIndex)->SetRequestedRegion(outputListIt.Get()->GetRequestedRegion());
m_Filter->Update();
- outputPtr->SetNthElement(counter,static_cast<OutputImageType *>(m_Filter->GetOutput(m_OutputIndex)));
+ outputPtr->SetNthElement(counter, static_cast<OutputImageType *>(m_Filter->GetOutput(m_OutputIndex)));
outputListIt.Get()->DisconnectPipeline();
++inputListIt;
++outputListIt;
++counter;
- }
+ }
}
/**
* PrintSelf Method
*/
template <class TInputImageList, class TOutputImageList, class TFilter>
void
-ImageListToImageListApplyFilter<TInputImageList,TOutputImageList,TFilter>
+ImageListToImageListApplyFilter<TInputImageList, TOutputImageList, TFilter>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/BasicFilters/otbImageListToVectorImageFilter.h b/Code/BasicFilters/otbImageListToVectorImageFilter.h
index ecefae3eff..29447fb1a0 100644
--- a/Code/BasicFilters/otbImageListToVectorImageFilter.h
+++ b/Code/BasicFilters/otbImageListToVectorImageFilter.h
@@ -35,29 +35,29 @@ namespace otb
*/
template <class TImageList, class TVectorImage>
class ITK_EXPORT ImageListToVectorImageFilter
- : public ImageListToImageFilter<typename TImageList::ImageType, TVectorImage>
+ : public ImageListToImageFilter<typename TImageList::ImageType, TVectorImage>
{
public:
/** Standard typedefs */
- typedef ImageListToVectorImageFilter Self;
+ typedef ImageListToVectorImageFilter Self;
typedef ImageListToImageFilter<typename TImageList::ImageType,
- TVectorImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ TVectorImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(ImageListToVectorImageFilter,ImageToImageListFilter);
+ itkTypeMacro(ImageListToVectorImageFilter, ImageToImageListFilter);
/** Template parameters typedefs */
- typedef TVectorImage OutputVectorImageType;
+ typedef TVectorImage OutputVectorImageType;
typedef typename OutputVectorImageType::Pointer OutputVectorImagePointerType;
- typedef TImageList InputImageListType;
- typedef typename InputImageListType::Pointer InputImageListPointerType;
- typedef typename InputImageListType::ImageType InputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef TImageList InputImageListType;
+ typedef typename InputImageListType::Pointer InputImageListPointerType;
+ typedef typename InputImageListType::ImageType InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
protected:
@@ -79,15 +79,15 @@ protected:
/** Constructor */
ImageListToVectorImageFilter() {};
/** Destructor */
- virtual ~ImageListToVectorImageFilter() {};
+ virtual ~ImageListToVectorImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageListToVectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageListToVectorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbImageListToVectorImageFilter.txx"
#endif
diff --git a/Code/BasicFilters/otbImageListToVectorImageFilter.txx b/Code/BasicFilters/otbImageListToVectorImageFilter.txx
index df4fc8af26..08e09c7079 100644
--- a/Code/BasicFilters/otbImageListToVectorImageFilter.txx
+++ b/Code/BasicFilters/otbImageListToVectorImageFilter.txx
@@ -32,33 +32,33 @@ namespace otb
*/
template <class TImageList, class TVectorImage>
void
-ImageListToVectorImageFilter<TImageList,TVectorImage>
+ImageListToVectorImageFilter<TImageList, TVectorImage>
::GenerateOutputInformation(void)
{
if (this->GetOutput())
- {
- if (this->GetInput()->Size()>0)
{
+ if (this->GetInput()->Size() > 0)
+ {
this->GetOutput()->CopyInformation(this->GetInput()->GetNthElement(0));
this->GetOutput()->SetNumberOfComponentsPerPixel(this->GetInput()->Size());
this->GetOutput()->SetLargestPossibleRegion(this->GetInput()->GetNthElement(0)->GetLargestPossibleRegion());
+ }
}
- }
}
/**
* GenerateInputRequestedRegion
*/
template <class TImageList, class TVectorImage>
void
-ImageListToVectorImageFilter<TImageList,TVectorImage>
+ImageListToVectorImageFilter<TImageList, TVectorImage>
::GenerateInputRequestedRegion(void)
{
- InputImageListPointerType inputPtr = this->GetInput();
+ InputImageListPointerType inputPtr = this->GetInput();
typename InputImageListType::ConstIterator inputListIt = inputPtr->Begin();
- while (inputListIt!=inputPtr->End())
+ while (inputListIt != inputPtr->End())
{
- inputListIt.Get()->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
- ++inputListIt;
+ inputListIt.Get()->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
+ ++inputListIt;
}
}
/**
@@ -66,14 +66,14 @@ ImageListToVectorImageFilter<TImageList,TVectorImage>
*/
template <class TImageList, class TVectorImage>
void
-ImageListToVectorImageFilter<TImageList,TVectorImage>
+ImageListToVectorImageFilter<TImageList, TVectorImage>
::GenerateData(void)
{
- InputImageListPointerType inputPtr = this->GetInput();
+ InputImageListPointerType inputPtr = this->GetInput();
OutputVectorImagePointerType outputPtr = this->GetOutput();
- itk::ProgressReporter progress(this,0,outputPtr->GetRequestedRegion().GetNumberOfPixels());
+ itk::ProgressReporter progress(this, 0, outputPtr->GetRequestedRegion().GetNumberOfPixels());
// Output image initializations
typename OutputVectorImageType::PixelType black;
@@ -84,7 +84,7 @@ ImageListToVectorImageFilter<TImageList,TVectorImage>
outputPtr->FillBuffer(black);
// defines input and output iterators
- typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
+ typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
typedef itk::ImageRegionIterator<OutputVectorImageType> OutputIteratorType;
typename InputImageListType::ConstIterator inputListIt = inputPtr->Begin();
@@ -94,42 +94,42 @@ ImageListToVectorImageFilter<TImageList,TVectorImage>
InputIteratorListType inputIteratorList;
// fills the vector of input iterators
- for (;inputListIt!=inputPtr->End();++inputListIt)
- {
- inputIteratorList.push_back(InputIteratorType(inputListIt.Get(),outputPtr->GetRequestedRegion()));
+ for (; inputListIt != inputPtr->End(); ++inputListIt)
+ {
+ inputIteratorList.push_back(InputIteratorType(inputListIt.Get(), outputPtr->GetRequestedRegion()));
inputIteratorList.back().GoToBegin();
- }
+ }
// walk through the output image
- OutputIteratorType outputIt(outputPtr,outputPtr->GetRequestedRegion());
+ OutputIteratorType outputIt(outputPtr, outputPtr->GetRequestedRegion());
outputIt.GoToBegin();
while (!outputIt.IsAtEnd())
- {
+ {
typename OutputVectorImageType::PixelType pixel = outputIt.Get();
- unsigned int counter = 0;
+ unsigned int counter = 0;
// for each input iterator, fill the right component
for (typename InputIteratorListType::iterator it = inputIteratorList.begin();
- it != inputIteratorList.end();++it)
- {
- if (!it->IsAtEnd())
+ it != inputIteratorList.end(); ++it)
{
- pixel[counter]=static_cast<typename OutputVectorImageType::InternalPixelType>(it->Get());
+ if (!it->IsAtEnd())
+ {
+ pixel[counter] = static_cast<typename OutputVectorImageType::InternalPixelType>(it->Get());
++(*it);
++counter;
+ }
}
- }
outputIt.Set(pixel);
progress.CompletedPixel();
++outputIt;
- }
+ }
}
/**
* PrintSelf Method
*/
template <class TVectorImageType, class TImageList>
void
-ImageListToVectorImageFilter<TVectorImageType,TImageList>
+ImageListToVectorImageFilter<TVectorImageType, TImageList>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/BasicFilters/otbImageToPointSetFilter.h b/Code/BasicFilters/otbImageToPointSetFilter.h
index cdfa8060f3..06843f3170 100644
--- a/Code/BasicFilters/otbImageToPointSetFilter.h
+++ b/Code/BasicFilters/otbImageToPointSetFilter.h
@@ -39,32 +39,32 @@ class ITK_EXPORT ImageToPointSetFilter : public PointSetSource<TOutputPointSet>
{
public:
/** Standard class typedefs. */
- typedef ImageToPointSetFilter Self;
- typedef PointSetSource<TOutputPointSet> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageToPointSetFilter Self;
+ typedef PointSetSource<TOutputPointSet> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(ImageToPointSetFilter, PointSetSource);
/** Some Image related typedefs. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointer;
- typedef typename InputImageType::ConstPointer InputImageConstPointer;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointer;
+ typedef typename InputImageType::ConstPointer InputImageConstPointer;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
itkStaticConstMacro(InputImageDimension, unsigned int,
- TInputImage::ImageDimension);
+ TInputImage::ImageDimension);
/** Some PointSet related typedefs. */
- typedef typename Superclass::OutputPointSetType OutputPointSetType;
- typedef typename Superclass::OutputPointSetPointer OutputPointSetPointer;
- typedef typename Superclass::PointsContainerType PointsContainerType;
- typedef itk::ProcessObject ProcessObjectType;
+ typedef typename Superclass::OutputPointSetType OutputPointSetType;
+ typedef typename Superclass::OutputPointSetPointer OutputPointSetPointer;
+ typedef typename Superclass::PointsContainerType PointsContainerType;
+ typedef itk::ProcessObject ProcessObjectType;
/** Set the input image of this process object. */
void SetInput(unsigned int idx, const InputImageType *input);
- void SetInput( const InputImageType *input);
+ void SetInput(const InputImageType *input);
/** Get the input image of this process object. */
const InputImageType * GetInput(unsigned int idx);
@@ -75,7 +75,7 @@ public:
protected:
ImageToPointSetFilter();
- virtual ~ImageToPointSetFilter() {};
+ virtual ~ImageToPointSetFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
virtual void GenerateData(void);
@@ -90,12 +90,12 @@ protected:
virtual int SplitRequestedRegion(int i, int num, InputImageRegionType& splitRegion);
- virtual void ThreadedGenerateData(const InputImageRegionType &inputRegionForThread, int threadId);
+ virtual void ThreadedGenerateData(const InputImageRegionType& inputRegionForThread, int threadId);
/** Static function used as a "callback" by the MultiThreader. The threading
* library will call this routine for each thread, which will delegate the
* control to ThreadedGenerateData(). */
- static ITK_THREAD_RETURN_TYPE ThreaderCallback( void *arg );
+ static ITK_THREAD_RETURN_TYPE ThreaderCallback(void *arg);
/** Internal structure used for passing image data into the threading library */
struct ThreadStruct
@@ -108,14 +108,14 @@ protected:
/** End Multi-threading implementation */
/** Setup for streaming */
- typedef StreamingTraits<InputImageType> StreamingTraitsType;
- typedef itk::ImageRegionSplitter<itkGetStaticConstMacro(InputImageDimension)> SplitterType;
- typedef typename SplitterType::Pointer RegionSplitterPointer;
+ typedef StreamingTraits<InputImageType> StreamingTraitsType;
+ typedef itk::ImageRegionSplitter<itkGetStaticConstMacro(InputImageDimension)> SplitterType;
+ typedef typename SplitterType::Pointer RegionSplitterPointer;
RegionSplitterPointer m_RegionSplitter;
private:
- ImageToPointSetFilter(const ImageToPointSetFilter&); //purposely not implemented
- void operator=(const ImageToPointSetFilter&); //purposely not implemented
+ ImageToPointSetFilter(const ImageToPointSetFilter &); //purposely not implemented
+ void operator =(const ImageToPointSetFilter&); //purposely not implemented
};
diff --git a/Code/BasicFilters/otbImageToPointSetFilter.txx b/Code/BasicFilters/otbImageToPointSetFilter.txx
index 9d2eb01b14..2eb13a9627 100644
--- a/Code/BasicFilters/otbImageToPointSetFilter.txx
+++ b/Code/BasicFilters/otbImageToPointSetFilter.txx
@@ -27,13 +27,13 @@ namespace otb
*
*/
template <class TInputImage, class TOutputPointSet>
-ImageToPointSetFilter<TInputImage,TOutputPointSet>
+ImageToPointSetFilter<TInputImage, TOutputPointSet>
::ImageToPointSetFilter()
{
this->ProcessObjectType::SetNumberOfRequiredInputs(1);
OutputPointSetPointer output
- = dynamic_cast<OutputPointSetType*>(this->MakeOutput(0).GetPointer());
+ = dynamic_cast<OutputPointSetType*>(this->MakeOutput(0).GetPointer());
ProcessObjectType::SetNumberOfRequiredOutputs(1);
ProcessObjectType::SetNthOutput(0, output.GetPointer());
@@ -41,7 +41,6 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
// create default region splitter
m_RegionSplitter = itk::ImageRegionSplitter<itkGetStaticConstMacro(InputImageDimension)>::New();
-
}
/**
@@ -49,13 +48,13 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
*/
template <class TInputImage, class TOutputPointSet>
void
-ImageToPointSetFilter<TInputImage,TOutputPointSet>
-::SetInput(unsigned int idx,const InputImageType *input)
+ImageToPointSetFilter<TInputImage, TOutputPointSet>
+::SetInput(unsigned int idx, const InputImageType *input)
{
// process object is not const-correct, the const_cast
// is required here.
this->ProcessObjectType::SetNthInput(idx,
- const_cast< InputImageType * >(input) );
+ const_cast<InputImageType *>(input));
}
/**
@@ -63,41 +62,40 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
*/
template <class TInputImage, class TOutputPointSet>
void
-ImageToPointSetFilter<TInputImage,TOutputPointSet>
+ImageToPointSetFilter<TInputImage, TOutputPointSet>
::SetInput(const InputImageType *input)
{
// process object is not const-correct, the const_cast
// is required here.
this->ProcessObjectType::SetNthInput(0,
- const_cast< InputImageType * >(input) );
+ const_cast<InputImageType *>(input));
}
/**
*
*/
template <class TInputImage, class TOutputPointSet>
-const typename ImageToPointSetFilter<TInputImage,TOutputPointSet>::InputImageType *
-ImageToPointSetFilter<TInputImage,TOutputPointSet>
+const typename ImageToPointSetFilter<TInputImage, TOutputPointSet>::InputImageType *
+ImageToPointSetFilter<TInputImage, TOutputPointSet>
::GetInput(unsigned int idx)
{
return dynamic_cast<const InputImageType*>
- (this->ProcessObjectType::GetInput(idx));
+ (this->ProcessObjectType::GetInput(idx));
}
/**
*
*/
template <class TInputImage, class TOutputPointSet>
-const typename ImageToPointSetFilter<TInputImage,TOutputPointSet>::InputImageType *
-ImageToPointSetFilter<TInputImage,TOutputPointSet>
+const typename ImageToPointSetFilter<TInputImage, TOutputPointSet>::InputImageType *
+ImageToPointSetFilter<TInputImage, TOutputPointSet>
::GetInput(void)
{
- if (this->GetNumberOfInputs() < 1)
- return 0;
+ if (this->GetNumberOfInputs() < 1) return 0;
return dynamic_cast<const InputImageType*>
- (this->ProcessObjectType::GetInput(0));
+ (this->ProcessObjectType::GetInput(0));
}
/**
@@ -105,10 +103,10 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
*/
template <class TInputImage, class TOutputPointSet>
void
-ImageToPointSetFilter<TInputImage,TOutputPointSet>
+ImageToPointSetFilter<TInputImage, TOutputPointSet>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
/**
@@ -118,7 +116,7 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
*/
template <class TInputImage, class TOutputPointSet>
void
-ImageToPointSetFilter<TInputImage,TOutputPointSet>
+ImageToPointSetFilter<TInputImage, TOutputPointSet>
::GenerateOutputInformation()
{
}
@@ -128,7 +126,7 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
*/
template <class TInputImage, class TOutputPointSet>
void
-ImageToPointSetFilter<TInputImage,TOutputPointSet>
+ImageToPointSetFilter<TInputImage, TOutputPointSet>
::GenerateData(void)
{
@@ -139,11 +137,11 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
unsigned int numDivisions;
numDivisions = StreamingTraitsType
- ::CalculateNumberOfStreamDivisions(this->GetInput(),
- this->GetInput()->GetLargestPossibleRegion(),
- m_RegionSplitter,
- SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS,
- 0, 0, 0);
+ ::CalculateNumberOfStreamDivisions(this->GetInput(),
+ this->GetInput()->GetLargestPossibleRegion(),
+ m_RegionSplitter,
+ SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS,
+ 0, 0, 0);
// Input is an image, cast away the constness so we can set
// the requested region.
@@ -153,20 +151,20 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
* Loop over the number of pieces, execute the upstream pipeline on each
* piece, and copy the results into the output image.
*/
- unsigned int piece;
+ unsigned int piece;
InputImageRegionType streamRegion;
for (piece = 0;
piece < numDivisions && !this->GetAbortGenerateData();
piece++)
- {
+ {
streamRegion = m_RegionSplitter->GetSplit(piece, numDivisions, inputRegion);
typedef itk::ImageToImageFilterDetail::ImageRegionCopier<itkGetStaticConstMacro(InputImageDimension),
- itkGetStaticConstMacro(InputImageDimension)> OutputToInputRegionCopierType;
+ itkGetStaticConstMacro(InputImageDimension)>
+ OutputToInputRegionCopierType;
OutputToInputRegionCopierType regionCopier;
- InputImageRegionType inputRegion;
+ InputImageRegionType inputRegion;
regionCopier(inputRegion, streamRegion);
- input->SetRequestedRegion( inputRegion );
-
+ input->SetRequestedRegion(inputRegion);
// Call a method that can be overridden by a subclass to perform
// some calculations prior to splitting the main computations into
@@ -180,8 +178,7 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
// Initializing object per thread
typename PointsContainerType::Pointer defaultPointsContainer = PointsContainerType::New();
this->m_PointsContainerPerThread
- = OutputPointsContainerForThreadType(this->GetNumberOfThreads(),defaultPointsContainer);
-
+ = OutputPointsContainerForThreadType(this->GetNumberOfThreads(), defaultPointsContainer);
// Setting up multithreader
this->GetMultiThreader()->SetNumberOfThreads(this->GetNumberOfThreads());
@@ -193,13 +190,13 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
// Call a method that can be overridden by a subclass to perform
// some calculations after all the threads have completed
this->AfterThreadedGenerateData();
- }
+ }
}
template <class TInputImage, class TOutputPointSet>
void
-ImageToPointSetFilter<TInputImage,TOutputPointSet>
+ImageToPointSetFilter<TInputImage, TOutputPointSet>
::BeforeThreadedGenerateData(void)
{
@@ -207,31 +204,31 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
template <class TInputImage, class TOutputPointSet>
void
-ImageToPointSetFilter<TInputImage,TOutputPointSet>
+ImageToPointSetFilter<TInputImage, TOutputPointSet>
::AfterThreadedGenerateData(void)
{
// copy the lists to the output
PointsContainerType * outputPointsContainer = this->GetOutput()->GetPoints();
typedef typename PointsContainerType::ConstIterator OutputPointsContainerIterator;
- for (unsigned int i=0; i< this->m_PointsContainerPerThread.size(); ++i)
- {
- if (this->m_PointsContainerPerThread[i].IsNotNull())
+ for (unsigned int i = 0; i < this->m_PointsContainerPerThread.size(); ++i)
{
+ if (this->m_PointsContainerPerThread[i].IsNotNull())
+ {
for (OutputPointsContainerIterator it = this->m_PointsContainerPerThread[i]->Begin();
it != this->m_PointsContainerPerThread[i]->End();
++it)
- {
+ {
outputPointsContainer->push_back(it.Value());
+ }
}
}
- }
}
template <class TInputImage, class TOutputPointSet>
void
-ImageToPointSetFilter<TInputImage,TOutputPointSet>
+ImageToPointSetFilter<TInputImage, TOutputPointSet>
::ThreadedGenerateData(const InputImageRegionType&, int)
{
// The following code is equivalent to:
@@ -240,23 +237,23 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
// 'noreturn' function does return
itk::OStringStream message;
message << "itk::ERROR: " << this->GetNameOfClass()
- << "(" << this << "): " << "Subclass should override this method!!!";
- itk::ExceptionObject e_(__FILE__, __LINE__, message.str().c_str(),ITK_LOCATION);
+ << "(" << this << "): " << "Subclass should override this method!!!";
+ itk::ExceptionObject e_(__FILE__, __LINE__, message.str().c_str(), ITK_LOCATION);
throw e_;
}
template <class TInputImage, class TOutputPointSet>
ITK_THREAD_RETURN_TYPE
-ImageToPointSetFilter<TInputImage,TOutputPointSet>
-::ThreaderCallback( void *arg )
+ImageToPointSetFilter<TInputImage, TOutputPointSet>
+::ThreaderCallback(void *arg)
{
ThreadStruct *str;
- int total, threadId, threadCount;
+ int total, threadId, threadCount;
- threadId = ((itk::MultiThreader::ThreadInfoStruct *)(arg))->ThreadID;
- threadCount = ((itk::MultiThreader::ThreadInfoStruct *)(arg))->NumberOfThreads;
- str = (ThreadStruct *)(((itk::MultiThreader::ThreadInfoStruct *)(arg))->UserData);
+ threadId = ((itk::MultiThreader::ThreadInfoStruct *) (arg))->ThreadID;
+ threadCount = ((itk::MultiThreader::ThreadInfoStruct *) (arg))->NumberOfThreads;
+ str = (ThreadStruct *) (((itk::MultiThreader::ThreadInfoStruct *) (arg))->UserData);
// execute the actual method with appropriate output region
// first find out how many pieces extent can be split into.
@@ -265,9 +262,9 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
splitRegion);
if (threadId < total)
- {
- str->Filter->ThreadedGenerateData(splitRegion, threadId);
- }
+ {
+ str->Filter->ThreadedGenerateData(splitRegion, threadId);
+ }
// else
// {
// otherwise don't use this thread. Sometimes the threads dont
@@ -280,7 +277,7 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
template <class TInputImage, class TOutputPointSet>
int
-ImageToPointSetFilter<TInputImage,TOutputPointSet>
+ImageToPointSetFilter<TInputImage, TOutputPointSet>
::SplitRequestedRegion(int i, int num, InputImageRegionType& splitRegion)
{
// Get the output pointer
@@ -288,9 +285,9 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
const typename TInputImage::SizeType& requestedRegionSize
= inputPtr->GetRequestedRegion().GetSize();
- int splitAxis;
+ int splitAxis;
typename TInputImage::IndexType splitIndex;
- typename TInputImage::SizeType splitSize;
+ typename TInputImage::SizeType splitSize;
// Initialize the splitRegion to the output requested region
splitRegion = inputPtr->GetRequestedRegion();
@@ -311,27 +308,28 @@ ImageToPointSetFilter<TInputImage,TOutputPointSet>
// determine the actual number of pieces that will be generated
typename TInputImage::SizeType::SizeValueType range = requestedRegionSize[splitAxis];
- int valuesPerThread = (int)::vcl_ceil(range/(double)num);
- int maxThreadIdUsed = (int)::vcl_ceil(range/(double)valuesPerThread) - 1;
+ int valuesPerThread = (int) ::vcl_ceil(range / (double) num);
+ int maxThreadIdUsed =
+ (int) ::vcl_ceil(range / (double) valuesPerThread) - 1;
// Split the region
if (i < maxThreadIdUsed)
{
- splitIndex[splitAxis] += i*valuesPerThread;
+ splitIndex[splitAxis] += i * valuesPerThread;
splitSize[splitAxis] = valuesPerThread;
}
if (i == maxThreadIdUsed)
{
- splitIndex[splitAxis] += i*valuesPerThread;
+ splitIndex[splitAxis] += i * valuesPerThread;
// last thread needs to process the "rest" dimension being split
- splitSize[splitAxis] = splitSize[splitAxis] - i*valuesPerThread;
+ splitSize[splitAxis] = splitSize[splitAxis] - i * valuesPerThread;
}
// set the split region ivars
- splitRegion.SetIndex( splitIndex );
- splitRegion.SetSize( splitSize );
+ splitRegion.SetIndex(splitIndex);
+ splitRegion.SetSize(splitSize);
- itkDebugMacro(" Split Piece: " << splitRegion );
+ itkDebugMacro(" Split Piece: " << splitRegion);
return maxThreadIdUsed + 1;
}
diff --git a/Code/BasicFilters/otbImportGeoInformationImageFilter.h b/Code/BasicFilters/otbImportGeoInformationImageFilter.h
index ada67bb770..35e69f29e0 100644
--- a/Code/BasicFilters/otbImportGeoInformationImageFilter.h
+++ b/Code/BasicFilters/otbImportGeoInformationImageFilter.h
@@ -36,14 +36,14 @@ namespace otb
*/
template <class TImage, class TSourceImage>
class ITK_EXPORT ImportGeoInformationImageFilter
- : public itk::CastImageFilter<TImage,TImage>
+ : public itk::CastImageFilter<TImage, TImage>
{
public:
/** Standard typedefs */
- typedef ImportGeoInformationImageFilter Self;
- typedef itk::CastImageFilter<TImage,TImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImportGeoInformationImageFilter Self;
+ typedef itk::CastImageFilter<TImage, TImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -52,11 +52,11 @@ public:
itkTypeMacro(ImportGeoInformationImageFilter, CastImageFilter);
/** Template parameters typedefs */
- typedef TImage ImageType;
- typedef typename ImageType::Pointer ImagePointerType;
+ typedef TImage ImageType;
+ typedef typename ImageType::Pointer ImagePointerType;
typedef typename ImageType::ConstPointer ImageConstPointerType;
- typedef TSourceImage SourceImageType;
- typedef SourceImageType SourceImagePointerType;
+ typedef TSourceImage SourceImageType;
+ typedef SourceImageType SourceImagePointerType;
/**
* Set the source for geo information.
@@ -73,7 +73,7 @@ protected:
/** Constructor */
ImportGeoInformationImageFilter();
/** Destructor */
- virtual ~ImportGeoInformationImageFilter() {};
+ virtual ~ImportGeoInformationImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Generate input requested region */
@@ -83,10 +83,10 @@ protected:
/* /\** Generate data *\/ */
/* virtual void GenerateData(void); */
private:
- ImportGeoInformationImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImportGeoInformationImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbImportGeoInformationImageFilter.txx"
#endif
diff --git a/Code/BasicFilters/otbImportGeoInformationImageFilter.txx b/Code/BasicFilters/otbImportGeoInformationImageFilter.txx
index a36df89de7..2e8a1bdc73 100644
--- a/Code/BasicFilters/otbImportGeoInformationImageFilter.txx
+++ b/Code/BasicFilters/otbImportGeoInformationImageFilter.txx
@@ -30,7 +30,7 @@ namespace otb
* Constructor
*/
template <class TImage, class TSourceImage>
-ImportGeoInformationImageFilter<TImage,TSourceImage>
+ImportGeoInformationImageFilter<TImage, TSourceImage>
::ImportGeoInformationImageFilter()
{
this->SetNumberOfRequiredInputs(2);
@@ -38,14 +38,14 @@ ImportGeoInformationImageFilter<TImage,TSourceImage>
template <class TImage, class TSourceImage>
void
-ImportGeoInformationImageFilter<TImage,TSourceImage>
+ImportGeoInformationImageFilter<TImage, TSourceImage>
::SetSource(const TSourceImage * source)
{
- this->SetNthInput(1,const_cast<TSourceImage *>(source));
+ this->SetNthInput(1, const_cast<TSourceImage *>(source));
}
template <class TImage, class TSourceImage>
const TSourceImage *
-ImportGeoInformationImageFilter<TImage,TSourceImage>
+ImportGeoInformationImageFilter<TImage, TSourceImage>
::GetSource()
{
return static_cast<const TSourceImage *>(this->itk::ProcessObject::GetInput(1));
@@ -53,14 +53,14 @@ ImportGeoInformationImageFilter<TImage,TSourceImage>
template <class TImage, class TSourceImage>
void
-ImportGeoInformationImageFilter<TImage,TSourceImage>
+ImportGeoInformationImageFilter<TImage, TSourceImage>
::GenerateInputRequestedRegion(void)
{
Superclass::GenerateInputRequestedRegion();
typename SourceImageType::RegionType region;
- typename SourceImageType::SizeType size;
- typename SourceImageType::IndexType index;
+ typename SourceImageType::SizeType size;
+ typename SourceImageType::IndexType index;
size.Fill(0);
index.Fill(0);
@@ -73,13 +73,13 @@ ImportGeoInformationImageFilter<TImage,TSourceImage>
template <class TImage, class TSourceImage>
void
-ImportGeoInformationImageFilter<TImage,TSourceImage>
+ImportGeoInformationImageFilter<TImage, TSourceImage>
::GenerateOutputInformation(void)
{
Superclass::GenerateOutputInformation();
// Get output and source pointer
- ImagePointerType outputPtr = this->GetOutput();
- SourceImageType * sourcePtr =const_cast<SourceImageType *>(this->GetSource());
+ ImagePointerType outputPtr = this->GetOutput();
+ SourceImageType * sourcePtr = const_cast<SourceImageType *>(this->GetSource());
// Import metdata
outputPtr->CopyInformation(sourcePtr);
@@ -106,7 +106,7 @@ ImportGeoInformationImageFilter<TImage,TSourceImage>
*/
template <class TImage, class TSourceImage>
void
-ImportGeoInformationImageFilter<TImage,TSourceImage>
+ImportGeoInformationImageFilter<TImage, TSourceImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/BasicFilters/otbImportImageFilter.h b/Code/BasicFilters/otbImportImageFilter.h
index 9f9f7f8b0f..066d99e27b 100644
--- a/Code/BasicFilters/otbImportImageFilter.h
+++ b/Code/BasicFilters/otbImportImageFilter.h
@@ -39,38 +39,37 @@ namespace otb
*/
template <typename TOutputImageType>
-class ITK_EXPORT ImportImageFilter:
- public itk::ImageSource< TOutputImageType >
+class ITK_EXPORT ImportImageFilter :
+ public itk::ImageSource<TOutputImageType>
{
public:
/** Typedef for the output image. */
- typedef TOutputImageType OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef TOutputImageType OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
typedef typename OutputImageType::SpacingType SpacingType;
typedef typename OutputImageType::PointType OriginType;
-
/** Standard class typedefs. */
- typedef ImportImageFilter Self;
- typedef itk::ImageSource<OutputImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImportImageFilter Self;
+ typedef itk::ImageSource<OutputImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(ImportImageFilter,itk::ImageSource);
+ itkTypeMacro(ImportImageFilter, itk::ImageSource);
/** Index typedef support. An index is used to access pixel values. */
- typedef itk::Index<OutputImageType::ImageDimension> IndexType;
+ typedef itk::Index<OutputImageType::ImageDimension> IndexType;
/** Size typedef support. A size is used to define region bounds. */
- typedef itk::Size<OutputImageType::ImageDimension> SizeType;
+ typedef itk::Size<OutputImageType::ImageDimension> SizeType;
/** Region typedef support. A region is used to specify a
* subset of an image. */
- typedef itk::ImageRegion<OutputImageType::ImageDimension> RegionType;
+ typedef itk::ImageRegion<OutputImageType::ImageDimension> RegionType;
/** Type of the output image pixel type. */
typedef typename OutputImageType::PixelType TPixel;
@@ -92,14 +91,14 @@ public:
* for the imported image. This will serve as the LargestPossibleRegion,
* the BufferedRegion, and the RequestedRegion.
* \sa ImageRegion */
- void SetRegion(const RegionType ®ion)
+ void SetRegion(const RegionType& region)
{
if (m_Region != region)
- {
+ {
m_Region = region;
this->Modified();
- }
- };
+ }
+ }
/** Get the region object that defines the size and starting index
* for the imported image. This will serve as the LargestPossibleRegion,
@@ -108,7 +107,7 @@ public:
const RegionType& GetRegion() const
{
return m_Region;
- };
+ }
/** Set the spacing (size of a pixel) of the image.
* \sa GetSpacing() */
@@ -118,13 +117,13 @@ public:
/** Get the spacing (size of a pixel) of the image.
* \sa SetSpacing() */
itkGetVectorMacro(Spacing, const double, OutputImageType::ImageDimension);
- void SetSpacing( const SpacingType & spacing );
+ void SetSpacing(const SpacingType& spacing);
/** Set the origin of the image.
* \sa GetOrigin() */
itkSetVectorMacro(Origin, const double, OutputImageType::ImageDimension);
itkSetVectorMacro(Origin, const float, OutputImageType::ImageDimension);
- void SetOrigin( const OriginType & origin );
+ void SetOrigin(const OriginType& origin);
/** Get the origin of the image.
* \sa SetOrigin() */
@@ -134,7 +133,7 @@ public:
/** Set the direction of the image
* \sa GetDirection() */
- virtual void SetDirection( const DirectionType direction );
+ virtual void SetDirection(const DirectionType direction);
/** Get the direction of the image
* \sa SetDirection */
itkGetConstReferenceMacro(Direction, DirectionType);
@@ -164,15 +163,15 @@ protected:
private:
ImportImageFilter(const ImportImageFilter &); //purposely not implemented
- void operator=(const ImportImageFilter&); //purposely not implemented
+ void operator =(const ImportImageFilter&); //purposely not implemented
- RegionType m_Region;
- double m_Spacing[OutputImageType::ImageDimension];
- double m_Origin[OutputImageType::ImageDimension];
+ RegionType m_Region;
+ double m_Spacing[OutputImageType::ImageDimension];
+ double m_Origin[OutputImageType::ImageDimension];
DirectionType m_Direction;
- TPixel* m_ImportPointer;
- bool m_FilterManageMemory;
+ TPixel* m_ImportPointer;
+ bool m_FilterManageMemory;
unsigned long m_Size;
};
@@ -183,5 +182,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/BasicFilters/otbImportImageFilter.txx b/Code/BasicFilters/otbImportImageFilter.txx
index 70efa8ba8f..4b41af2ef0 100644
--- a/Code/BasicFilters/otbImportImageFilter.txx
+++ b/Code/BasicFilters/otbImportImageFilter.txx
@@ -37,10 +37,10 @@ ImportImageFilter<TOutputImage>
unsigned int idx;
for (idx = 0; idx < TOutputImage::ImageDimension; ++idx)
- {
+ {
m_Spacing[idx] = 1.0;
m_Origin[idx] = 0.0;
- }
+ }
m_Direction.SetIdentity();
m_ImportPointer = 0;
@@ -56,12 +56,11 @@ ImportImageFilter<TOutputImage>
::~ImportImageFilter()
{
if (m_ImportPointer && m_FilterManageMemory)
- {
- delete [] m_ImportPointer;
- }
+ {
+ delete[] m_ImportPointer;
+ }
}
-
/**
*
*/
@@ -72,37 +71,36 @@ ImportImageFilter<TOutputImage>
{
int i;
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
if (m_ImportPointer)
- {
+ {
os << indent << "Imported pointer: (" << m_ImportPointer << ")" << std::endl;
- }
+ }
else
- {
+ {
os << indent << "Imported pointer: (None)" << std::endl;
- }
+ }
os << indent << "Import buffer size: " << m_Size << std::endl;
os << indent << "Import buffer size: " << m_Size << std::endl;
os << indent << "Filter manages memory: " << (m_FilterManageMemory ? "true" : "false") << std::endl;
os << indent << "Spacing: [";
- for (i=0; i < static_cast<int>(TOutputImage::ImageDimension) - 1; ++i)
- {
+ for (i = 0; i < static_cast<int>(TOutputImage::ImageDimension) - 1; ++i)
+ {
os << m_Spacing[i] << ", ";
- }
+ }
os << m_Spacing[i] << "]" << std::endl;
os << indent << "Origin: [";
- for (i=0; i < static_cast<int>(TOutputImage::ImageDimension) - 1; ++i)
- {
+ for (i = 0; i < static_cast<int>(TOutputImage::ImageDimension) - 1; ++i)
+ {
os << m_Origin[i] << ", ";
- }
+ }
os << m_Origin[i] << "]" << std::endl;
os << indent << "Direction: " << std::endl << this->GetDirection() << std::endl;
}
-
/**
*
*/
@@ -112,19 +110,18 @@ ImportImageFilter<TOutputImage>
::SetImportPointer(TPixel *ptr, unsigned long num, bool LetFilterManageMemory)
{
if (ptr != m_ImportPointer)
- {
- if (m_ImportPointer && m_FilterManageMemory)
{
- delete [] m_ImportPointer;
- }
+ if (m_ImportPointer && m_FilterManageMemory)
+ {
+ delete[] m_ImportPointer;
+ }
m_ImportPointer = ptr;
this->Modified();
- }
+ }
m_FilterManageMemory = LetFilterManageMemory;
m_Size = num;
}
-
/**
*
*/
@@ -136,7 +133,6 @@ ImportImageFilter<TOutputImage>
return m_ImportPointer;
}
-
/**
*
*/
@@ -153,10 +149,9 @@ ImportImageFilter<TOutputImage>
// set the requested region to the largest possible region (in this case
// the amount of data that we have)
- outputPtr->SetRequestedRegion( outputPtr->GetLargestPossibleRegion() );
+ outputPtr->SetRequestedRegion(outputPtr->GetLargestPossibleRegion());
}
-
/**
*
*/
@@ -173,13 +168,12 @@ ImportImageFilter<TOutputImage>
// we need to compute the output spacing, the output origin, the
// output image size, and the output image start index
- outputPtr->SetSpacing( m_Spacing );
- outputPtr->SetOrigin( m_Origin );
- outputPtr->SetDirection( m_Direction );
- outputPtr->SetLargestPossibleRegion( m_Region );
+ outputPtr->SetSpacing(m_Spacing);
+ outputPtr->SetOrigin(m_Origin);
+ outputPtr->SetDirection(m_Direction);
+ outputPtr->SetLargestPossibleRegion(m_Region);
}
-
/**
*
*/
@@ -197,76 +191,73 @@ ImportImageFilter<TOutputImage>
// the output buffer size is set to the size specified by the user via the
// SetRegion() method.
- outputPtr->SetBufferedRegion( outputPtr->GetLargestPossibleRegion() );
+ outputPtr->SetBufferedRegion(outputPtr->GetLargestPossibleRegion());
// pass the pointer down to the container during each Update() since
// a call to Initialize() causes the container to forget the
// pointer. Note that we tell the container NOT to manage the
// memory itself. This filter will properly manage the memory (as
// opposed to the container) if the user wants it to.
- outputPtr->GetPixelContainer()->SetImportPointer( m_ImportPointer,
- m_Size, false );
+ outputPtr->GetPixelContainer()->SetImportPointer(m_ImportPointer,
+ m_Size, false);
}
-
/**
*
*/
template <class TOutputImage>
void
ImportImageFilter<TOutputImage>
-::SetSpacing( const SpacingType & spacing )
+::SetSpacing(const SpacingType& spacing)
{
double dspacing[TOutputImage::ImageDimension];
- for (unsigned int i=0; i<TOutputImage::ImageDimension; ++i)
- {
+ for (unsigned int i = 0; i < TOutputImage::ImageDimension; ++i)
+ {
dspacing[i] = spacing[i];
- }
- this->SetSpacing( dspacing );
+ }
+ this->SetSpacing(dspacing);
}
-
/**
*
*/
template <class TOutputImage>
void
ImportImageFilter<TOutputImage>
-::SetOrigin( const OriginType & origin )
+::SetOrigin(const OriginType& origin)
{
double dorigin[TOutputImage::ImageDimension];
- for (unsigned int i=0; i<TOutputImage::ImageDimension; ++i)
- {
+ for (unsigned int i = 0; i < TOutputImage::ImageDimension; ++i)
+ {
dorigin[i] = origin[i];
- }
- this->SetOrigin( dorigin );
+ }
+ this->SetOrigin(dorigin);
}
//----------------------------------------------------------------------------
template <class TOutputImage>
void
ImportImageFilter<TOutputImage>
-::SetDirection(const DirectionType direction )
+::SetDirection(const DirectionType direction)
{
bool modified = false;
for (unsigned int r = 0; r < TOutputImage::ImageDimension; ++r)
- {
- for (unsigned int c = 0; c < TOutputImage::ImageDimension; ++c)
{
- if (m_Direction[r][c] != direction[r][c])
+ for (unsigned int c = 0; c < TOutputImage::ImageDimension; ++c)
{
+ if (m_Direction[r][c] != direction[r][c])
+ {
m_Direction[r][c] = direction[r][c];
modified = true;
+ }
}
}
- }
if (modified)
- {
+ {
this->Modified();
- }
+ }
}
-
} // end namespace otb
#endif
diff --git a/Code/BasicFilters/otbImportVectorImageFilter.h b/Code/BasicFilters/otbImportVectorImageFilter.h
index 0b9f1e674a..8f0ff7a802 100644
--- a/Code/BasicFilters/otbImportVectorImageFilter.h
+++ b/Code/BasicFilters/otbImportVectorImageFilter.h
@@ -39,43 +39,41 @@ namespace otb
*/
template <typename TOutputImageType>
-class ITK_EXPORT ImportVectorImageFilter:
- public itk::ImageSource< TOutputImageType >
+class ITK_EXPORT ImportVectorImageFilter :
+ public itk::ImageSource<TOutputImageType>
{
public:
/** Typedef for the output image. */
- typedef TOutputImageType OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef TOutputImageType OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
typedef typename OutputImageType::SpacingType SpacingType;
typedef typename OutputImageType::PointType OriginType;
-
/** Standard class typedefs. */
- typedef ImportVectorImageFilter Self;
- typedef itk::ImageSource<OutputImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImportVectorImageFilter Self;
+ typedef itk::ImageSource<OutputImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(ImportVectorImageFilter,itk::ImageSource);
+ itkTypeMacro(ImportVectorImageFilter, itk::ImageSource);
/** Index typedef support. An index is used to access pixel values. */
- typedef itk::Index<OutputImageType::ImageDimension> IndexType;
+ typedef itk::Index<OutputImageType::ImageDimension> IndexType;
/** Size typedef support. A size is used to define region bounds. */
- typedef itk::Size<OutputImageType::ImageDimension> SizeType;
+ typedef itk::Size<OutputImageType::ImageDimension> SizeType;
/** Region typedef support. A region is used to specify a
* subset of an image. */
- typedef itk::ImageRegion<OutputImageType::ImageDimension> RegionType;
+ typedef itk::ImageRegion<OutputImageType::ImageDimension> RegionType;
/** Type of the output image pixel type. */
typedef typename OutputImageType::PixelType TOutputPixel;
- typedef typename TOutputPixel::ValueType TPixel;
-
+ typedef typename TOutputPixel::ValueType TPixel;
/** Get the pointer from which the image data is imported. */
TPixel *GetImportPointer();
@@ -94,14 +92,14 @@ public:
* for the imported image. This will serve as the LargestPossibleRegion,
* the BufferedRegion, and the RequestedRegion.
* \sa ImageRegion */
- void SetRegion(const RegionType ®ion)
+ void SetRegion(const RegionType& region)
{
if (m_Region != region)
- {
+ {
m_Region = region;
this->Modified();
- }
- };
+ }
+ }
/** Get the region object that defines the size and starting index
* for the imported image. This will serve as the LargestPossibleRegion,
@@ -110,7 +108,7 @@ public:
const RegionType& GetRegion() const
{
return m_Region;
- };
+ }
/** Set the spacing (size of a pixel) of the image.
* \sa GetSpacing() */
@@ -120,13 +118,13 @@ public:
/** Get the spacing (size of a pixel) of the image.
* \sa SetSpacing() */
itkGetVectorMacro(Spacing, const double, OutputImageType::ImageDimension);
- void SetSpacing( const SpacingType & spacing );
+ void SetSpacing(const SpacingType& spacing);
/** Set the origin of the image.
* \sa GetOrigin() */
itkSetVectorMacro(Origin, const double, OutputImageType::ImageDimension);
itkSetVectorMacro(Origin, const float, OutputImageType::ImageDimension);
- void SetOrigin( const OriginType & origin );
+ void SetOrigin(const OriginType& origin);
itkGetMacro(NumberOfComponents, unsigned int);
itkSetMacro(NumberOfComponents, unsigned int);
@@ -139,7 +137,7 @@ public:
/** Set the direction of the image
* \sa GetDirection() */
- virtual void SetDirection( const DirectionType direction );
+ virtual void SetDirection(const DirectionType direction);
/** Get the direction of the image
* \sa SetDirection */
itkGetConstReferenceMacro(Direction, DirectionType);
@@ -169,16 +167,16 @@ protected:
private:
ImportVectorImageFilter(const ImportVectorImageFilter &); //purposely not implemented
- void operator=(const ImportVectorImageFilter&); //purposely not implemented
+ void operator =(const ImportVectorImageFilter&); //purposely not implemented
- RegionType m_Region;
- double m_Spacing[OutputImageType::ImageDimension];
- double m_Origin[OutputImageType::ImageDimension];
+ RegionType m_Region;
+ double m_Spacing[OutputImageType::ImageDimension];
+ double m_Origin[OutputImageType::ImageDimension];
DirectionType m_Direction;
- TPixel* m_ImportPointer;
- bool m_FilterManageMemory;
- unsigned int m_NumberOfComponents;
+ TPixel* m_ImportPointer;
+ bool m_FilterManageMemory;
+ unsigned int m_NumberOfComponents;
unsigned long m_Size;
};
@@ -189,5 +187,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/BasicFilters/otbImportVectorImageFilter.txx b/Code/BasicFilters/otbImportVectorImageFilter.txx
index 491b0bc411..e5c99db6bc 100644
--- a/Code/BasicFilters/otbImportVectorImageFilter.txx
+++ b/Code/BasicFilters/otbImportVectorImageFilter.txx
@@ -37,10 +37,10 @@ ImportVectorImageFilter<TOutputImage>
unsigned int idx;
for (idx = 0; idx < TOutputImage::ImageDimension; ++idx)
- {
+ {
m_Spacing[idx] = 1.0;
m_Origin[idx] = 0.0;
- }
+ }
m_Direction.SetIdentity();
m_ImportPointer = 0;
@@ -56,12 +56,11 @@ ImportVectorImageFilter<TOutputImage>
::~ImportVectorImageFilter()
{
if (m_ImportPointer && m_FilterManageMemory)
- {
- delete [] m_ImportPointer;
- }
+ {
+ delete[] m_ImportPointer;
+ }
}
-
/**
*
*/
@@ -72,37 +71,36 @@ ImportVectorImageFilter<TOutputImage>
{
int i;
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
if (m_ImportPointer)
- {
+ {
os << indent << "Imported pointer: (" << m_ImportPointer << ")" << std::endl;
- }
+ }
else
- {
+ {
os << indent << "Imported pointer: (None)" << std::endl;
- }
+ }
os << indent << "Import buffer size: " << m_Size << std::endl;
os << indent << "Import buffer size: " << m_Size << std::endl;
os << indent << "Filter manages memory: " << (m_FilterManageMemory ? "true" : "false") << std::endl;
os << indent << "Spacing: [";
- for (i=0; i < static_cast<int>(TOutputImage::ImageDimension) - 1; ++i)
- {
+ for (i = 0; i < static_cast<int>(TOutputImage::ImageDimension) - 1; ++i)
+ {
os << m_Spacing[i] << ", ";
- }
+ }
os << m_Spacing[i] << "]" << std::endl;
os << indent << "Origin: [";
- for (i=0; i < static_cast<int>(TOutputImage::ImageDimension) - 1; ++i)
- {
+ for (i = 0; i < static_cast<int>(TOutputImage::ImageDimension) - 1; ++i)
+ {
os << m_Origin[i] << ", ";
- }
+ }
os << m_Origin[i] << "]" << std::endl;
os << indent << "Direction: " << std::endl << this->GetDirection() << std::endl;
}
-
/**
*
*/
@@ -113,19 +111,18 @@ ImportVectorImageFilter<TOutputImage>
::SetImportPointer(TPixel *ptr, unsigned long num, bool LetFilterManageMemory)
{
if (ptr != m_ImportPointer)
- {
- if (m_ImportPointer && m_FilterManageMemory)
{
- delete [] m_ImportPointer;
- }
+ if (m_ImportPointer && m_FilterManageMemory)
+ {
+ delete[] m_ImportPointer;
+ }
m_ImportPointer = ptr;
this->Modified();
- }
+ }
m_FilterManageMemory = LetFilterManageMemory;
m_Size = num;
}
-
/**
*
*/
@@ -137,7 +134,6 @@ ImportVectorImageFilter<TOutputImage>
return m_ImportPointer;
}
-
/**
*
*/
@@ -154,10 +150,9 @@ ImportVectorImageFilter<TOutputImage>
// set the requested region to the largest possible region (in this case
// the amount of data that we have)
- outputPtr->SetRequestedRegion( outputPtr->GetLargestPossibleRegion() );
+ outputPtr->SetRequestedRegion(outputPtr->GetLargestPossibleRegion());
}
-
/**
*
*/
@@ -174,22 +169,21 @@ ImportVectorImageFilter<TOutputImage>
// we need to compute the output spacing, the output origin, the
// output image size, and the output image start index
- outputPtr->SetSpacing( m_Spacing );
- outputPtr->SetOrigin( m_Origin );
- outputPtr->SetDirection( m_Direction );
- outputPtr->SetLargestPossibleRegion( m_Region );
+ outputPtr->SetSpacing(m_Spacing);
+ outputPtr->SetOrigin(m_Origin);
+ outputPtr->SetDirection(m_Direction);
+ outputPtr->SetLargestPossibleRegion(m_Region);
typename RegionType::SizeType size = m_Region.GetSize();
- int numberOfBands= m_Size/(size[0]*size[1]);
+ int numberOfBands = m_Size / (size[0] * size[1]);
- if (numberOfBands!=static_cast<int>(numberOfBands))
- itkExceptionMacro(<<"Buffer size and image size are not compatible !");
+ if (numberOfBands != static_cast<int>(numberOfBands)) itkExceptionMacro(
+ << "Buffer size and image size are not compatible !");
outputPtr->SetNumberOfComponentsPerPixel(numberOfBands);
}
-
/**
*
*/
@@ -207,77 +201,74 @@ ImportVectorImageFilter<TOutputImage>
// the output buffer size is set to the size specified by the user via the
// SetRegion() method.
- outputPtr->SetBufferedRegion( outputPtr->GetLargestPossibleRegion() );
+ outputPtr->SetBufferedRegion(outputPtr->GetLargestPossibleRegion());
// pass the pointer down to the container during each Update() since
// a call to Initialize() causes the container to forget the
// pointer. Note that we tell the container NOT to manage the
// memory itself. This filter will properly manage the memory (as
// opposed to the container) if the user wants it to.
- outputPtr->GetPixelContainer()->SetImportPointer( m_ImportPointer,
- m_Size, false );
+ outputPtr->GetPixelContainer()->SetImportPointer(m_ImportPointer,
+ m_Size, false);
}
-
/**
*
*/
template <class TOutputImage>
void
ImportVectorImageFilter<TOutputImage>
-::SetSpacing( const SpacingType & spacing )
+::SetSpacing(const SpacingType& spacing)
{
double dspacing[TOutputImage::ImageDimension];
- for (unsigned int i=0; i<TOutputImage::ImageDimension; ++i)
- {
+ for (unsigned int i = 0; i < TOutputImage::ImageDimension; ++i)
+ {
dspacing[i] = spacing[i];
- }
- this->SetSpacing( dspacing );
+ }
+ this->SetSpacing(dspacing);
}
-
/**
*
*/
template <class TOutputImage>
void
ImportVectorImageFilter<TOutputImage>
-::SetOrigin( const OriginType & origin )
+::SetOrigin(const OriginType& origin)
{
double dorigin[TOutputImage::ImageDimension];
- for (unsigned int i=0; i<TOutputImage::ImageDimension; ++i)
- {
+ for (unsigned int i = 0; i < TOutputImage::ImageDimension; ++i)
+ {
dorigin[i] = origin[i];
- }
- this->SetOrigin( dorigin );
+ }
+ this->SetOrigin(dorigin);
}
//----------------------------------------------------------------------------
template <class TOutputImage>
void
ImportVectorImageFilter<TOutputImage>
-::SetDirection(const DirectionType direction )
+::SetDirection(const DirectionType direction)
{
bool modified = false;
for (unsigned int r = 0; r < TOutputImage::ImageDimension; ++r)
- {
- for (unsigned int c = 0; c < TOutputImage::ImageDimension; ++c)
{
- if (m_Direction[r][c] != direction[r][c])
+ for (unsigned int c = 0; c < TOutputImage::ImageDimension; ++c)
{
+ if (m_Direction[r][c] != direction[r][c])
+ {
m_Direction[r][c] = direction[r][c];
modified = true;
+ }
}
}
- }
if (modified)
- {
+ {
this->Modified();
- }
+ }
}
-
} // end namespace otb
#endif
diff --git a/Code/BasicFilters/otbInnerProductPCAImageFilter.h b/Code/BasicFilters/otbInnerProductPCAImageFilter.h
index a4893adffc..eedbc621c9 100644
--- a/Code/BasicFilters/otbInnerProductPCAImageFilter.h
+++ b/Code/BasicFilters/otbInnerProductPCAImageFilter.h
@@ -60,14 +60,14 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT InnerProductPCAImageFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef InnerProductPCAImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef InnerProductPCAImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -76,39 +76,40 @@ public:
itkTypeMacro(InnerProductPCAImageFilter, ImageToImageFilter);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
- typedef EstimateInnerProductPCAImageFilter<InputImageType,OutputImageType> EstimatePCAFilterType;
- typedef typename EstimatePCAFilterType::Pointer EstimatePCAFilterPointer;
- typedef NormalizeInnerProductPCAImageFilter<OutputImageType,OutputImageType> NormalizePCAFilterType;
- typedef typename NormalizePCAFilterType::Pointer NormalizePCAFilterPointer;
+ typedef EstimateInnerProductPCAImageFilter<InputImageType, OutputImageType> EstimatePCAFilterType;
+ typedef typename EstimatePCAFilterType::Pointer EstimatePCAFilterPointer;
+ typedef NormalizeInnerProductPCAImageFilter<OutputImageType, OutputImageType> NormalizePCAFilterType;
+ typedef typename NormalizePCAFilterType::Pointer NormalizePCAFilterPointer;
/** Template parameters typedefs for mean component generation */
- typedef Image< typename InputImageType::InternalPixelType,::itk::GetImageDimension<InputImageType>::ImageDimension > InternalImageType;
- typedef Functor::MeanFunctor<typename InputImageType::PixelType, typename InternalImageType::PixelType >
+ typedef Image<typename InputImageType::InternalPixelType,
+ ::itk::GetImageDimension<InputImageType>::ImageDimension> InternalImageType;
+ typedef Functor::MeanFunctor<typename InputImageType::PixelType, typename InternalImageType::PixelType>
MeanFunctorType;
typedef itk::UnaryFunctorImageFilter<InputImageType, InternalImageType, MeanFunctorType> MeanFilterType;
- typedef typename MeanFilterType::Pointer MeanFilterPointer;
- typedef ImageToVectorImageCastFilter<InternalImageType, OutputImageType> CastFilterType;
- typedef typename CastFilterType::Pointer CastFilterPointer;
- typedef ConcatenateVectorImageFilter< OutputImageType, OutputImageType, OutputImageType > ConcatenateFilterType;
- typedef typename ConcatenateFilterType::Pointer ConcatenateFilterPointer;
+ typedef typename MeanFilterType::Pointer MeanFilterPointer;
+ typedef ImageToVectorImageCastFilter<InternalImageType, OutputImageType> CastFilterType;
+ typedef typename CastFilterType::Pointer CastFilterPointer;
+ typedef ConcatenateVectorImageFilter<OutputImageType, OutputImageType, OutputImageType> ConcatenateFilterType;
+ typedef typename ConcatenateFilterType::Pointer ConcatenateFilterPointer;
/** Set/Get the number of required largest principal components. The filter produces
the required number of principal components plus one outputs. Output index 0 represents
the mean image and the remaining outputs the requested principal components.*/
- itkSetMacro( NumberOfPrincipalComponentsRequired, unsigned int );
- itkGetMacro( NumberOfPrincipalComponentsRequired, unsigned int );
-
+ itkSetMacro(NumberOfPrincipalComponentsRequired, unsigned int);
+ itkGetMacro(NumberOfPrincipalComponentsRequired, unsigned int);
+
/** Enable/Disable the generation of the mean component output */
- itkSetMacro( GenerateMeanComponent, bool );
- itkGetMacro( GenerateMeanComponent, bool );
+ itkSetMacro(GenerateMeanComponent, bool);
+ itkGetMacro(GenerateMeanComponent, bool);
itkBooleanMacro(GenerateMeanComponent);
/** Enable/Disable center data */
- itkSetMacro( CenterData, bool );
- itkGetMacro( CenterData, bool );
+ itkSetMacro(CenterData, bool);
+ itkGetMacro(CenterData, bool);
itkBooleanMacro(CenterData);
protected:
@@ -117,7 +118,7 @@ protected:
/** Constructor */
InnerProductPCAImageFilter();
/** Destructor */
- virtual ~InnerProductPCAImageFilter() {};
+ virtual ~InnerProductPCAImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -132,8 +133,8 @@ protected:
virtual void GenerateOutputInformation();
private:
- InnerProductPCAImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ InnerProductPCAImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The number of largest principal components */
unsigned int m_NumberOfPrincipalComponentsRequired;
@@ -151,12 +152,12 @@ private:
bool m_GenerateMeanComponent;
/** Internals filters use to generate mean component output */
- MeanFilterPointer m_MeanFilter;
- CastFilterPointer m_CastFilter;
+ MeanFilterPointer m_MeanFilter;
+ CastFilterPointer m_CastFilter;
ConcatenateFilterPointer m_ConcatenateFilter;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbInnerProductPCAImageFilter.txx"
diff --git a/Code/BasicFilters/otbInnerProductPCAImageFilter.txx b/Code/BasicFilters/otbInnerProductPCAImageFilter.txx
index d816d5fe18..aff2bdc62f 100644
--- a/Code/BasicFilters/otbInnerProductPCAImageFilter.txx
+++ b/Code/BasicFilters/otbInnerProductPCAImageFilter.txx
@@ -26,11 +26,11 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage>
-InnerProductPCAImageFilter<TInputImage,TOutputImage>
+InnerProductPCAImageFilter<TInputImage, TOutputImage>
::InnerProductPCAImageFilter()
{
this->SetNumberOfOutputs(1);
- this->SetNthOutput(0,OutputImageType::New());
+ this->SetNthOutput(0, OutputImageType::New());
m_EstimatePCAFilter = EstimatePCAFilterType::New();
m_NormalizePCAFilter = NormalizePCAFilterType::New();
m_CenterData = true;
@@ -44,14 +44,13 @@ InnerProductPCAImageFilter<TInputImage,TOutputImage>
*/
template<class TInputImage, class TOutputImage>
void
-InnerProductPCAImageFilter<TInputImage,TOutputImage>
+InnerProductPCAImageFilter<TInputImage, TOutputImage>
::GenerateOutputInformation(void)
{
Superclass::GenerateOutputInformation();
- if( m_GenerateMeanComponent == false )
- this->GetOutput()->SetNumberOfComponentsPerPixel(m_NumberOfPrincipalComponentsRequired);
- else
- this->GetOutput()->SetNumberOfComponentsPerPixel(m_NumberOfPrincipalComponentsRequired + 1);
+ if (m_GenerateMeanComponent == false) this->GetOutput()->SetNumberOfComponentsPerPixel(
+ m_NumberOfPrincipalComponentsRequired);
+ else this->GetOutput()->SetNumberOfComponentsPerPixel(m_NumberOfPrincipalComponentsRequired + 1);
}
/**
@@ -59,7 +58,7 @@ InnerProductPCAImageFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-InnerProductPCAImageFilter<TInputImage,TOutputImage>
+InnerProductPCAImageFilter<TInputImage, TOutputImage>
::GenerateData()
{
m_EstimatePCAFilter->SetInput(this->GetInput());
@@ -68,14 +67,14 @@ InnerProductPCAImageFilter<TInputImage,TOutputImage>
m_NormalizePCAFilter->SetInput(m_EstimatePCAFilter->GetOutput());
- if( (m_CenterData == false) || ( (m_CenterData == true) && (m_GenerateMeanComponent == false) ) )
- {
+ if ((m_CenterData == false) || ((m_CenterData == true) && (m_GenerateMeanComponent == false)))
+ {
m_NormalizePCAFilter->GraftOutput(this->GetOutput());
m_NormalizePCAFilter->Update();
this->GraftOutput(m_NormalizePCAFilter->GetOutput());
- }
+ }
else
- {
+ {
m_MeanFilter->SetInput(this->GetInput());
m_CastFilter->SetInput(m_MeanFilter->GetOutput());
@@ -85,7 +84,7 @@ InnerProductPCAImageFilter<TInputImage,TOutputImage>
m_ConcatenateFilter->GraftOutput(this->GetOutput());
m_ConcatenateFilter->Update();
this->GraftOutput(m_ConcatenateFilter->GetOutput());
- }
+ }
}
/**
@@ -93,7 +92,7 @@ InnerProductPCAImageFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-InnerProductPCAImageFilter<TInputImage,TOutputImage>
+InnerProductPCAImageFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/BasicFilters/otbInverseLogPolarTransform.h b/Code/BasicFilters/otbInverseLogPolarTransform.h
index b18b1103ed..8475d5f429 100644
--- a/Code/BasicFilters/otbInverseLogPolarTransform.h
+++ b/Code/BasicFilters/otbInverseLogPolarTransform.h
@@ -41,44 +41,44 @@ namespace otb
template <class TScalarType>
class ITK_EXPORT InverseLogPolarTransform
- : public itk::Transform<TScalarType,2,2>
+ : public itk::Transform<TScalarType, 2, 2>
{
public:
/** Standard typedef */
- typedef InverseLogPolarTransform Self;
- typedef itk::Transform<TScalarType,2,2> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef InverseLogPolarTransform Self;
+ typedef itk::Transform<TScalarType, 2, 2> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(InverseLogPolarTransform,Transform);
+ itkTypeMacro(InverseLogPolarTransform, Transform);
/** Template related typedefs */
typedef TScalarType ScalarType;
/** Superclass related typedefs */
- typedef typename Superclass::InputPointType InputPointType;
- typedef typename Superclass::OutputPointType OutputPointType;
- typedef typename Superclass::InputVectorType InputVectorType;
- typedef typename Superclass::OutputVectorType OutputVectorType;
- typedef typename Superclass::InputVnlVectorType InputVnlVectorType;
+ typedef typename Superclass::InputPointType InputPointType;
+ typedef typename Superclass::OutputPointType OutputPointType;
+ typedef typename Superclass::InputVectorType InputVectorType;
+ typedef typename Superclass::OutputVectorType OutputVectorType;
+ typedef typename Superclass::InputVnlVectorType InputVnlVectorType;
typedef typename Superclass::OutputVnlVectorType OutputVnlVectorType;
- typedef typename Superclass::ParametersType ParametersType;
- typedef itk::FixedArray<TScalarType,2> ScaleType;
+ typedef typename Superclass::ParametersType ParametersType;
+ typedef itk::FixedArray<TScalarType, 2> ScaleType;
/** Set/Get the origin */
- itkSetMacro(Center,InputPointType);
- itkGetConstReferenceMacro(Center,InputPointType);
+ itkSetMacro(Center, InputPointType);
+ itkGetConstReferenceMacro(Center, InputPointType);
/** Set/Get the scales */
- itkSetMacro(Scale,ScaleType);
- itkGetConstReferenceMacro(Scale,ScaleType);
+ itkSetMacro(Scale, ScaleType);
+ itkGetConstReferenceMacro(Scale, ScaleType);
/**
* Set the transform parameters through the standard interface.
* \param parameters The parameters of the transform.
*/
- void SetParameters(const ParametersType ¶meters);
+ void SetParameters(const ParametersType& parameters);
/**
* Get the transform parameters through the standard interface.
* \return The parameters of the transform.
@@ -89,19 +89,19 @@ public:
* \param point The point to transform.
* \return The transformed point.
*/
- OutputPointType TransformPoint(const InputPointType &point) const;
+ OutputPointType TransformPoint(const InputPointType& point) const;
/**
* Transform a vector representing a point.
* \param vector The point to transform.
* \return The transformed point.
*/
- OutputVectorType TransformVector(const InputVectorType &vector) const;
+ OutputVectorType TransformVector(const InputVectorType& vector) const;
/**
* Transform a vnl vector representing a point.
* \param vector The point to transform.
* \return The transformed point.
*/
- OutputVnlVectorType TransformVector(const InputVnlVectorType &vector) const;
+ OutputVnlVectorType TransformVector(const InputVnlVectorType& vector) const;
protected:
/** Constructor */
@@ -109,16 +109,16 @@ protected:
/** Destructor */
virtual ~InverseLogPolarTransform();
/** PrintSelf method */
- void PrintSelf(std::ostream &os,itk::Indent indent) const;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- InverseLogPolarTransform(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ InverseLogPolarTransform(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
InputPointType m_Center;
- ScaleType m_Scale;
+ ScaleType m_Scale;
};
-}// end namespace otb
+} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbInverseLogPolarTransform.txx"
#endif
diff --git a/Code/BasicFilters/otbInverseLogPolarTransform.txx b/Code/BasicFilters/otbInverseLogPolarTransform.txx
index a7b0208655..00db344f81 100644
--- a/Code/BasicFilters/otbInverseLogPolarTransform.txx
+++ b/Code/BasicFilters/otbInverseLogPolarTransform.txx
@@ -22,7 +22,6 @@
#include "otbMacro.h"
#include "otbMath.h"
-
namespace otb
{
/**
@@ -31,12 +30,12 @@ namespace otb
template <class TScalarType>
InverseLogPolarTransform<TScalarType>
::InverseLogPolarTransform()
- :Superclass(2,4)
+ : Superclass(2, 4)
{
- m_Center[0]=0.0;
- m_Center[1]=0.0;
- m_Scale[0]=1.0;
- m_Scale[1]=1.0;
+ m_Center[0] = 0.0;
+ m_Center[1] = 0.0;
+ m_Scale[0] = 1.0;
+ m_Scale[1] = 1.0;
}
/**
* Destructor.
@@ -52,14 +51,14 @@ InverseLogPolarTransform<TScalarType>
template <class TScalarType>
void
InverseLogPolarTransform<TScalarType>
-::SetParameters(const ParametersType ¶meters)
+::SetParameters(const ParametersType& parameters)
{
- m_Center[0]=parameters[0];
- m_Center[1]=parameters[1];
- m_Scale[0] =parameters[2];
- m_Scale[1] =parameters[3];
- otbMsgDebugMacro(<<"Call To SetParameters: Center="<<m_Center<<", Scale="<<m_Scale);
- this->m_Parameters=parameters;
+ m_Center[0] = parameters[0];
+ m_Center[1] = parameters[1];
+ m_Scale[0] = parameters[2];
+ m_Scale[1] = parameters[3];
+ otbMsgDebugMacro(<< "Call To SetParameters: Center=" << m_Center << ", Scale=" << m_Scale);
+ this->m_Parameters = parameters;
this->Modified();
}
/**
@@ -73,10 +72,10 @@ InverseLogPolarTransform<TScalarType>
::GetParameters(void) const
{
// Filling parameters vector
- this->m_Parameters[0]=m_Center[0];
- this->m_Parameters[1]=m_Center[1];
- this->m_Parameters[2]=m_Scale[0];
- this->m_Parameters[3]=m_Scale[1];
+ this->m_Parameters[0] = m_Center[0];
+ this->m_Parameters[1] = m_Center[1];
+ this->m_Parameters[2] = m_Scale[0];
+ this->m_Parameters[3] = m_Scale[1];
return this->m_Parameters;
}
@@ -90,31 +89,31 @@ template <class TScalarType>
typename InverseLogPolarTransform<TScalarType>
::OutputPointType
InverseLogPolarTransform<TScalarType>
-::TransformPoint(const InputPointType &point) const
+::TransformPoint(const InputPointType& point) const
{
OutputPointType result;
- double rho =vcl_sqrt(vcl_pow(point[0]-m_Center[0],2)+vcl_pow(point[1]-m_Center[1],2));
- if (rho>0)
- {
- result[0]=(1./m_Scale[0])*vcl_asin((point[1]-m_Center[1])/rho);
+ double rho = vcl_sqrt(vcl_pow(point[0] - m_Center[0], 2) + vcl_pow(point[1] - m_Center[1], 2));
+ if (rho > 0)
+ {
+ result[0] = (1. / m_Scale[0]) * vcl_asin((point[1] - m_Center[1]) / rho);
// degree conversion
- result[0]=result[0]*(180./CONST_PI);
+ result[0] = result[0] * (180. / CONST_PI);
// Deplacing the range to [0,90], [270,360]
- result[0]= result[0]>0. ? result[0] : result[0]+360.;
+ result[0] = result[0] > 0. ? result[0] : result[0] + 360.;
// Avoiding asin indetermination
- if ((point[0]-m_Center[0])>=0)
- {
- result[0]=result[0]<90. ? result[0]+90. : result[0]-90.;
- }
- result[1]=(1./m_Scale[1])*vcl_log(rho);
+ if ((point[0] - m_Center[0]) >= 0)
+ {
+ result[0] = result[0] < 90. ? result[0] + 90. : result[0] - 90.;
+ }
+ result[1] = (1. / m_Scale[1]) * vcl_log(rho);
// otbMsgDebugMacro(<<vcl_log(vcl_pow(point[0]-m_Center[0],2)+vcl_pow(point[1]-m_Center[1],2)));
- }
+ }
else
- {
+ {
// for rho=0, reject the point outside the angular range to avoid nan error
- result[0]=400.;
- result[1]=0.;
- }
+ result[0] = 400.;
+ result[1] = 0.;
+ }
return result;
}
/**
@@ -126,31 +125,31 @@ template <class TScalarType>
typename InverseLogPolarTransform<TScalarType>
::OutputVectorType
InverseLogPolarTransform<TScalarType>
-::TransformVector(const InputVectorType &vector) const
+::TransformVector(const InputVectorType& vector) const
{
OutputVectorType result;
- double rho =vcl_sqrt(vcl_pow(vector[0]-m_Center[0],2)+vcl_pow(vector[1]-m_Center[1],2));
- if (rho>0)
- {
- result[0]=(1/m_Scale[0])*vcl_asin((vector[1]-m_Center[1])/rho);
+ double rho = vcl_sqrt(vcl_pow(vector[0] - m_Center[0], 2) + vcl_pow(vector[1] - m_Center[1], 2));
+ if (rho > 0)
+ {
+ result[0] = (1 / m_Scale[0]) * vcl_asin((vector[1] - m_Center[1]) / rho);
// degree conversion
- result[0]=result[0]*(180/CONST_PI);
+ result[0] = result[0] * (180 / CONST_PI);
// Deplacing the range to [0,90], [270,360]
- result[0]= result[0]>0 ? result[0] : result[0]+360;
+ result[0] = result[0] > 0 ? result[0] : result[0] + 360;
// Avoiding asin indetermination
- if ((vector[0]-m_Center[0])>=0)
- {
- result[0]=result[0]<90 ? result[0]+90 : result[0]-90;
- }
- result[1]=(1/m_Scale[1])*vcl_log(rho);
+ if ((vector[0] - m_Center[0]) >= 0)
+ {
+ result[0] = result[0] < 90 ? result[0] + 90 : result[0] - 90;
+ }
+ result[1] = (1 / m_Scale[1]) * vcl_log(rho);
// otbMsgDebugMacro(<<vcl_log(vcl_pow(vector[0]-m_Center[0],2)+vcl_pow(vector[1]-m_Center[1],2)));
- }
+ }
else
- {
+ {
// for rho=0, reject the vector outside the angular range to avoid nan error
- result[0]=400;
- result[1]=0;
- }
+ result[0] = 400;
+ result[1] = 0;
+ }
return result;
}
/**
@@ -162,31 +161,31 @@ template <class TScalarType>
typename InverseLogPolarTransform<TScalarType>
::OutputVnlVectorType
InverseLogPolarTransform<TScalarType>
-::TransformVector(const InputVnlVectorType &vector) const
+::TransformVector(const InputVnlVectorType& vector) const
{
OutputVnlVectorType result;
- double rho =vcl_sqrt(vcl_pow(vector[0],2)+vcl_pow(vector[1],2));
- if (rho>0)
- {
- result[0]=(1/m_Scale[0])*vcl_asin((vector[1]-m_Center[1])/rho);
+ double rho = vcl_sqrt(vcl_pow(vector[0], 2) + vcl_pow(vector[1], 2));
+ if (rho > 0)
+ {
+ result[0] = (1 / m_Scale[0]) * vcl_asin((vector[1] - m_Center[1]) / rho);
// degree conversion
- result[0]=result[0]*(180/CONST_PI);
+ result[0] = result[0] * (180 / CONST_PI);
// Deplacing the range to [0,90], [270,360]
- result[0]= result[0]>0 ? result[0] : result[0]+360;
+ result[0] = result[0] > 0 ? result[0] : result[0] + 360;
// Avoiding vcl_asin indetermination
- if ((vector[0]-m_Center[0])>=0)
- {
- result[0]=result[0]<90 ? result[0]+90 : result[0]-90;
- }
- result[1]=(1/m_Scale[1])*vcl_log(rho);
+ if ((vector[0] - m_Center[0]) >= 0)
+ {
+ result[0] = result[0] < 90 ? result[0] + 90 : result[0] - 90;
+ }
+ result[1] = (1 / m_Scale[1]) * vcl_log(rho);
// otbMsgDebugMacro(<<log(vcl_pow(vector[0]-m_Center[0],2)+vcl_pow(vector[1]-m_Center[1],2)));
- }
+ }
else
- {
+ {
// for rho=0, reject the vector outside the angular range to avoid nan error
- result[0]=400;
- result[1]=0;
- }
+ result[0] = 400;
+ result[1] = 0;
+ }
return result;
}
/**
@@ -195,11 +194,11 @@ InverseLogPolarTransform<TScalarType>
template <class TScalarType>
void
InverseLogPolarTransform<TScalarType>
-::PrintSelf(std::ostream &os,itk::Indent indent) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"Center: "<<m_Center<<std::endl;
- os<<indent<<"Scale: "<<m_Scale<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Center: " << m_Center << std::endl;
+ os << indent << "Scale: " << m_Scale << std::endl;
}
} // end namespace otb
diff --git a/Code/BasicFilters/otbKeyPointDensityImageFilter.h b/Code/BasicFilters/otbKeyPointDensityImageFilter.h
index 5442a63b99..9c36a41d15 100644
--- a/Code/BasicFilters/otbKeyPointDensityImageFilter.h
+++ b/Code/BasicFilters/otbKeyPointDensityImageFilter.h
@@ -20,13 +20,11 @@
#ifndef __otbKeyPointDensityImageFilter_h
#define __otbKeyPointDensityImageFilter_h
-
#include "itkImageToImageFilter.h"
#include "itkProcessObject.h"
#include "otbPointSetToDensityImageFilter.h"
#include "itkNumericTraits.h"
-
namespace otb
{
@@ -35,48 +33,47 @@ namespace otb
* points detected in the image.
*
* The density computed is a ratio of the number of keypoints over
- * the total number of pixels within a region.
+ * the total number of pixels within a region.
* It uses the class \doxygen{otb}{PointSetToDensityImageFilter} to do so.
*
* This class use the key point detector specified in the 3rd argument
* template to detect the keypoints. Then for every pixel, the density of the key points
* within its neighborhood is computed.
- *
+ *
* The output is a map of key points density.
*/
-template <class TInputImage, class TOutputImage , class TDetector>
+template <class TInputImage, class TOutputImage, class TDetector>
class ITK_EXPORT KeyPointDensityImageFilter
- : public itk::ImageToImageFilter<TInputImage, TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef KeyPointDensityImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef KeyPointDensityImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(KeyPointDensityImageFilter,itk::ImageToImageFilter);
-
+ itkTypeMacro(KeyPointDensityImageFilter, itk::ImageToImageFilter);
/** Template parameters typedefs*/
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
/** OutputImageType typedef support*/
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
/** Detector typedef Support*/
- typedef TDetector DetectorType;
- typedef typename DetectorType::OutputPointSetType PointSetType;
- typedef typename DetectorType::Pointer DetectorPointerType;
+ typedef TDetector DetectorType;
+ typedef typename DetectorType::OutputPointSetType PointSetType;
+ typedef typename DetectorType::Pointer DetectorPointerType;
/** PointSetToDensityImageFilter support*/
typedef otb::PointSetToDensityImageFilter<PointSetType, OutputImageType> PointSetToDensityImageType;
@@ -84,9 +81,8 @@ public:
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
- itkSetMacro( NeighborhoodRadius, unsigned int );
- itkGetConstReferenceMacro( NeighborhoodRadius, unsigned int );
-
+ itkSetMacro(NeighborhoodRadius, unsigned int);
+ itkGetConstReferenceMacro(NeighborhoodRadius, unsigned int);
/**Set/Get Descriptor from the otbCountmageFunction*/
virtual void SetDetector(DetectorType* detector);
@@ -110,16 +106,16 @@ protected:
* Main computation method.
*/
//virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
- virtual void GenerateData( );
+ virtual void GenerateData();
private:
- KeyPointDensityImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ KeyPointDensityImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- DetectorPointerType m_Detector;
- PointSetToDensityImagePointerType m_PointSetToDensityImageFilter;
- unsigned int m_NeighborhoodRadius;
+ DetectorPointerType m_Detector;
+ PointSetToDensityImagePointerType m_PointSetToDensityImageFilter;
+ unsigned int m_NeighborhoodRadius;
};
}
#ifndef OTB_MANUAL_INSTANTIATION
@@ -127,5 +123,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/BasicFilters/otbKeyPointDensityImageFilter.txx b/Code/BasicFilters/otbKeyPointDensityImageFilter.txx
index 14e9133ac0..e057f30c1d 100644
--- a/Code/BasicFilters/otbKeyPointDensityImageFilter.txx
+++ b/Code/BasicFilters/otbKeyPointDensityImageFilter.txx
@@ -23,28 +23,26 @@
#include "otbKeyPointDensityImageFilter.h"
#include "itkImageRegionIterator.h"
-
namespace otb
{
/**---------------------------------------------------------
* Constructor
----------------------------------------------------------*/
-template <class TInputImage , class TOutputImage, class TDetector>
-KeyPointDensityImageFilter<TInputImage , TOutputImage, TDetector>
+template <class TInputImage, class TOutputImage, class TDetector>
+KeyPointDensityImageFilter<TInputImage, TOutputImage, TDetector>
::KeyPointDensityImageFilter()
{
- this->SetNumberOfRequiredInputs( 1 );
+ this->SetNumberOfRequiredInputs(1);
m_NeighborhoodRadius = 1;
m_Detector = DetectorType::New();
m_PointSetToDensityImageFilter = PointSetToDensityImageType::New();
}
-
/*---------------------------------------------------------
* Destructor.c
----------------------------------------------------------*/
-template <class TInputImage , class TOutputImage, class TDetector>
-KeyPointDensityImageFilter<TInputImage, TOutputImage, TDetector >
+template <class TInputImage, class TOutputImage, class TDetector>
+KeyPointDensityImageFilter<TInputImage, TOutputImage, TDetector>
::~KeyPointDensityImageFilter()
{}
@@ -55,16 +53,15 @@ KeyPointDensityImageFilter<TInputImage, TOutputImage, TDetector >
/**
* GenerateData Performs the pixel-wise addition
*/
-template <class TInputImage , class TOutputImage, class TDetector>
+template <class TInputImage, class TOutputImage, class TDetector>
void
-KeyPointDensityImageFilter<TInputImage, TOutputImage, TDetector >
+KeyPointDensityImageFilter<TInputImage, TOutputImage, TDetector>
::GenerateData()
//::GenerateData( const OutputImageRegionType &outputRegionForThread, int threadId )
{
- typename Superclass::OutputImagePointer outputImage = this->GetOutput();
- InputImagePointerType ptr = const_cast<InputImageType *>(this->GetInput());
- if (!ptr)
- return;
+ typename Superclass::OutputImagePointer outputImage = this->GetOutput();
+ InputImagePointerType ptr = const_cast<InputImageType *>(this->GetInput());
+ if (!ptr) return;
/** Detector*/
m_Detector->SetInput(ptr);
@@ -81,43 +78,40 @@ KeyPointDensityImageFilter<TInputImage, TOutputImage, TDetector >
this->GraftOutput(m_PointSetToDensityImageFilter->GetOutput());
}
-
/**
* Set Detector
*/
-template <class TInputImage , class TOutputImage, class TDetector>
+template <class TInputImage, class TOutputImage, class TDetector>
void
-KeyPointDensityImageFilter<TInputImage, TOutputImage, TDetector >
+KeyPointDensityImageFilter<TInputImage, TOutputImage, TDetector>
::SetDetector(DetectorType* detector)
{
m_Detector = detector;
}
-
/**
* Get Detector
*/
-template <class TInputImage , class TOutputImage, class TDetector>
-typename KeyPointDensityImageFilter< TInputImage , TOutputImage, TDetector >
+template <class TInputImage, class TOutputImage, class TDetector>
+typename KeyPointDensityImageFilter<TInputImage, TOutputImage, TDetector>
::DetectorType *
-KeyPointDensityImageFilter< TInputImage , TOutputImage, TDetector >
+KeyPointDensityImageFilter<TInputImage, TOutputImage, TDetector>
::GetDetector()
{
return m_Detector;
}
-
/*----------------------------------------------------------------
PrintSelf
-----------------------------------------------------------------*/
-template <class TInputImage , class TOutputImage, class TDetector>
+template <class TInputImage, class TOutputImage, class TDetector>
void
-KeyPointDensityImageFilter< TInputImage , TOutputImage, TDetector >
+KeyPointDensityImageFilter<TInputImage, TOutputImage, TDetector>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
os << indent << "Neighborhood Radius " << m_NeighborhoodRadius << std::endl;
}
-}/** end namesapce otb*/
+} /** end namesapce otb*/
#endif
diff --git a/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.h b/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.h
index 48671fc296..88003b8c91 100644
--- a/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.h
+++ b/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.h
@@ -32,22 +32,27 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT LabelizeConfidenceConnectedImageFilter
- : public otb::LabelizeImageFilterBase<TInputImage, TOutputImage, itk::ConfidenceConnectedImageFilter<TInputImage, TOutputImage> >
+ : public otb::LabelizeImageFilterBase<TInputImage, TOutputImage,
+ itk::ConfidenceConnectedImageFilter<TInputImage, TOutputImage> >
{
public:
/** typedef for standard classes. */
- typedef LabelizeConfidenceConnectedImageFilter Self;
- typedef otb::LabelizeImageFilterBase<TInputImage,TOutputImage, itk::ConfidenceConnectedImageFilter<TInputImage, TOutputImage> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LabelizeConfidenceConnectedImageFilter
+ Self;
+ typedef otb::LabelizeImageFilterBase<TInputImage, TOutputImage,
+ itk::ConfidenceConnectedImageFilter<TInputImage, TOutputImage> > Superclass;
+ typedef itk::SmartPointer<Self>
+ Pointer;
+ typedef itk::SmartPointer<const Self>
+ ConstPointer;
/** typedef to simplify variables definition and declaration. */
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
- typedef typename TInputImage::PixelType InputPixelType;
+ typedef typename TInputImage::PixelType InputPixelType;
typedef typename TOutputImage::PixelType OutputPixelType;
- typedef typename TInputImage::IndexType IndexType;
+ typedef typename TInputImage::IndexType IndexType;
/** "object factory" management method. */
itkNewMacro(Self);
@@ -74,7 +79,7 @@ public:
}
/** Set number of iterations */
- void SetNumberOfIterations( const unsigned int iteration )
+ void SetNumberOfIterations(const unsigned int iteration)
{
this->m_RegionGrowingFilter->SetNumberOfIterations(iteration);
}
@@ -92,22 +97,22 @@ public:
}
/** Set initial neigborhood radius */
- void SetInitialNeighborhoodRadius(const unsigned int initial )
+ void SetInitialNeighborhoodRadius(const unsigned int initial)
{
this->m_RegionGrowingFilter->SetInitialNeighborhoodRadius(initial);
}
protected:
LabelizeConfidenceConnectedImageFilter();
- virtual ~LabelizeConfidenceConnectedImageFilter() {};
+ virtual ~LabelizeConfidenceConnectedImageFilter() {}
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Region growing */
- virtual void RegionGrowing( const IndexType indexSeed );
+ virtual void RegionGrowing(const IndexType indexSeed);
private:
- LabelizeConfidenceConnectedImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LabelizeConfidenceConnectedImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Intial replace value*/
OutputPixelType m_ReplaceValue;
diff --git a/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.txx b/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.txx
index 9f4bc6c2b5..4e63b8fac7 100644
--- a/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.txx
+++ b/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.txx
@@ -40,7 +40,7 @@ LabelizeConfidenceConnectedImageFilter<TInputImage, TOutputImage>
template <class TInputImage, class TOutputImage>
void
LabelizeConfidenceConnectedImageFilter<TInputImage, TOutputImage>
-::RegionGrowing( const IndexType indexSeed )
+::RegionGrowing(const IndexType indexSeed)
{
this->m_RegionGrowingFilter->SetReplaceValue(m_ReplaceValue);
this->m_RegionGrowingFilter->SetSeed(indexSeed);
diff --git a/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.h b/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.h
index fde008e5e4..494656170a 100644
--- a/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.h
+++ b/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.h
@@ -30,21 +30,26 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT LabelizeConnectedThresholdImageFilter
- : public otb::LabelizeImageFilterBase<TInputImage, TOutputImage, itk::ConnectedThresholdImageFilter<TInputImage, TOutputImage> >
+ : public otb::LabelizeImageFilterBase<TInputImage, TOutputImage,
+ itk::ConnectedThresholdImageFilter<TInputImage, TOutputImage> >
{
public:
/** typedef for standard classes. */
- typedef LabelizeConnectedThresholdImageFilter Self;
- typedef otb::LabelizeImageFilterBase<TInputImage,TOutputImage, itk::ConnectedThresholdImageFilter<TInputImage, TOutputImage> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- typedef TInputImage InputImageType;
+ typedef LabelizeConnectedThresholdImageFilter
+ Self;
+ typedef otb::LabelizeImageFilterBase<TInputImage, TOutputImage,
+ itk::ConnectedThresholdImageFilter<TInputImage, TOutputImage> > Superclass;
+ typedef itk::SmartPointer<Self>
+ Pointer;
+ typedef itk::SmartPointer<const Self>
+ ConstPointer;
+
+ typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
- typedef typename TInputImage::PixelType InputPixelType;
+ typedef typename TInputImage::PixelType InputPixelType;
typedef typename TOutputImage::PixelType OutputPixelType;
- typedef typename TInputImage::IndexType IndexType;
+ typedef typename TInputImage::IndexType IndexType;
/** "object factory" management method. */
itkNewMacro(Self);
@@ -72,15 +77,15 @@ public:
protected:
LabelizeConnectedThresholdImageFilter();
- virtual ~LabelizeConnectedThresholdImageFilter() {};
+ virtual ~LabelizeConnectedThresholdImageFilter() {}
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Region growing */
- virtual void RegionGrowing( const IndexType indexSeed );
+ virtual void RegionGrowing(const IndexType indexSeed);
private:
- LabelizeConnectedThresholdImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LabelizeConnectedThresholdImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Delta + threshold for growing region */
InputPixelType m_UpperThresholdDelta;
diff --git a/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.txx b/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.txx
index 6603139c88..9052c27183 100644
--- a/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.txx
+++ b/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.txx
@@ -34,7 +34,7 @@ LabelizeConnectedThresholdImageFilter<TInputImage, TOutputImage>
m_LowerThresholdDelta = itk::NumericTraits<InputPixelType>::NonpositiveMin();
m_UpperThresholdDelta = itk::NumericTraits<InputPixelType>::max();
- m_ReplaceValue = 5;//itk::NumericTraits<OutputPixelType>::One;
+ m_ReplaceValue = 5; //itk::NumericTraits<OutputPixelType>::One;
}
/** Region growing
@@ -43,12 +43,12 @@ LabelizeConnectedThresholdImageFilter<TInputImage, TOutputImage>
template <class TInputImage, class TOutputImage>
void
LabelizeConnectedThresholdImageFilter<TInputImage, TOutputImage>
-::RegionGrowing( const IndexType indexSeed )
+::RegionGrowing(const IndexType indexSeed)
{
InputPixelType threshold = this->GetInput()->GetPixel(indexSeed);
- this->m_RegionGrowingFilter->SetLower(threshold-m_LowerThresholdDelta);
- this->m_RegionGrowingFilter->SetUpper(threshold+m_UpperThresholdDelta);
+ this->m_RegionGrowingFilter->SetLower(threshold - m_LowerThresholdDelta);
+ this->m_RegionGrowingFilter->SetUpper(threshold + m_UpperThresholdDelta);
this->m_RegionGrowingFilter->SetReplaceValue(m_ReplaceValue);
this->m_RegionGrowingFilter->SetSeed(indexSeed);
diff --git a/Code/BasicFilters/otbLabelizeImageFilterBase.h b/Code/BasicFilters/otbLabelizeImageFilterBase.h
index 1bcda1a335..7208ace1b6 100644
--- a/Code/BasicFilters/otbLabelizeImageFilterBase.h
+++ b/Code/BasicFilters/otbLabelizeImageFilterBase.h
@@ -32,28 +32,28 @@ namespace otb
*/
template <class TInputImage, class TOutputImage, class TFilter>
class ITK_EXPORT LabelizeImageFilterBase
- : public itk::ImageToImageFilter<TInputImage, TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** typedef for standard classes. */
- typedef LabelizeImageFilterBase Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LabelizeImageFilterBase Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** typedef to simplify variables definition and declaration. */
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
- typedef typename TInputImage::PixelType InputPixelType;
+ typedef typename TInputImage::PixelType InputPixelType;
typedef typename TOutputImage::PixelType OutputPixelType;
typedef typename TInputImage::IndexType IndexType;
typedef itk::PointSet<InputPixelType, 2> PointSetType;
- typedef typename PointSetType::Pointer PointSetPointerType;
+ typedef typename PointSetType::Pointer PointSetPointerType;
- typedef TFilter RegionGrowingFilterType;
+ typedef TFilter RegionGrowingFilterType;
typedef typename TFilter::Pointer RegionGrowingFilterPointerType;
/** "object factory" management method. */
@@ -81,24 +81,24 @@ public:
/** Internal */
typedef otb::ThresholdImageToPointSetFilter<InputImageType, PointSetType> ThresholdFilterType;
- typedef typename ThresholdFilterType::Pointer ThresholdFilterPointerType;
+ typedef typename ThresholdFilterType::Pointer ThresholdFilterPointerType;
typedef otb::MultiplyByScalarImageFilter<InputImageType, OutputImageType> MultiplyFilterType;
- typedef typename MultiplyFilterType::Pointer MultiplyFilterPointerType;
+ typedef typename MultiplyFilterType::Pointer MultiplyFilterPointerType;
typedef itk::AddImageFilter<OutputImageType, OutputImageType, OutputImageType> AddImageFilterType;
- typedef typename AddImageFilterType::Pointer AddImageFilterPointerType;
+ typedef typename AddImageFilterType::Pointer AddImageFilterPointerType;
protected:
LabelizeImageFilterBase();
- virtual ~LabelizeImageFilterBase() {};
+ virtual ~LabelizeImageFilterBase() {}
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Main computation method */
virtual void GenerateData();
/** Region growing */
- virtual void RegionGrowing( const IndexType indexSeed) { }
+ virtual void RegionGrowing(const IndexType indexSeed) {}
/** Instance region growing filter*/
RegionGrowingFilterPointerType m_RegionGrowingFilter;
@@ -122,9 +122,8 @@ protected:
unsigned long m_ObjectCount;
private:
- LabelizeImageFilterBase(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ LabelizeImageFilterBase(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
}; // end class LabelizeImageFilterBase
diff --git a/Code/BasicFilters/otbLabelizeImageFilterBase.txx b/Code/BasicFilters/otbLabelizeImageFilterBase.txx
index 5c7251ee5a..0fb39b1072 100644
--- a/Code/BasicFilters/otbLabelizeImageFilterBase.txx
+++ b/Code/BasicFilters/otbLabelizeImageFilterBase.txx
@@ -57,11 +57,11 @@ LabelizeImageFilterBase<TInputImage, TOutputImage, TFilter>
// Compute points set
m_ThresholdPointSetFilter->SetInput(0, this->GetInput());
- m_ThresholdPointSetFilter->SetLowerThreshold( m_LowerThreshold );
- m_ThresholdPointSetFilter->SetUpperThreshold( m_UpperThreshold );
+ m_ThresholdPointSetFilter->SetLowerThreshold(m_LowerThreshold);
+ m_ThresholdPointSetFilter->SetUpperThreshold(m_UpperThreshold);
m_ThresholdPointSetFilter->Update();
m_PointSet = m_ThresholdPointSetFilter->GetOutput();
- m_ObjectCount=0;
+ m_ObjectCount = 0;
// Iterate Point set
typedef typename PointSetType::PointsContainer ContainerType;
@@ -71,16 +71,16 @@ LabelizeImageFilterBase<TInputImage, TOutputImage, TFilter>
typename OutputImageType::Pointer outputImage = m_MultiplyFilter->GetOutput();
- while ( itList != pointsContainer->End() )
- {
- typename PointSetType::PointType pCoordinate = (itList.Value());
+ while (itList != pointsContainer->End())
+ {
+ typename PointSetType::PointType pCoordinate = (itList.Value());
typename InputImageType::IndexType index;
index[0] = static_cast <int> (pCoordinate[0]);
index[1] = static_cast <int> (pCoordinate[1]);
if (outputImage->GetPixel(index) ==
- itk::NumericTraits<OutputPixelType>::ZeroValue() )
- {
+ itk::NumericTraits<OutputPixelType>::ZeroValue())
+ {
this->RegionGrowing(index);
AddImageFilterPointerType addImage = AddImageFilterType::New();
@@ -89,9 +89,9 @@ LabelizeImageFilterBase<TInputImage, TOutputImage, TFilter>
addImage->Update();
outputImage = addImage->GetOutput();
++m_ObjectCount;
- }
+ }
++itList;
- }
+ }
this->GraftOutput(outputImage);
}
diff --git a/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.h b/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.h
index def4c753eb..ad977d3cb5 100644
--- a/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.h
+++ b/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.h
@@ -36,21 +36,26 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT LabelizeNeighborhoodConnectedImageFilter
- : public otb::LabelizeImageFilterBase<TInputImage, TOutputImage, itk::NeighborhoodConnectedImageFilter<TInputImage, TOutputImage> >
+ : public otb::LabelizeImageFilterBase<TInputImage, TOutputImage,
+ itk::NeighborhoodConnectedImageFilter<TInputImage, TOutputImage> >
{
public:
/** typedef for standard classes. */
- typedef LabelizeNeighborhoodConnectedImageFilter Self;
- typedef otb::LabelizeImageFilterBase<TInputImage,TOutputImage, itk::NeighborhoodConnectedImageFilter<TInputImage, TOutputImage> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LabelizeNeighborhoodConnectedImageFilter
+ Self;
+ typedef otb::LabelizeImageFilterBase<TInputImage, TOutputImage,
+ itk::NeighborhoodConnectedImageFilter<TInputImage, TOutputImage> > Superclass;
+ typedef itk::SmartPointer<Self>
+ Pointer;
+ typedef itk::SmartPointer<const Self>
+ ConstPointer;
/** typedef to simplify variables definition and declaration. */
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
typedef typename TInputImage::PixelType InputPixelType;
- typedef typename TInputImage::SizeType InputSizeType;
+ typedef typename TInputImage::SizeType InputSizeType;
typedef typename TInputImage::IndexType IndexType;
typedef typename TOutputImage::PixelType OutputPixelType;
@@ -86,24 +91,23 @@ public:
}
/** Set radius */
- void SetRadius( const InputSizeType radius )
+ void SetRadius(const InputSizeType radius)
{
this->m_RegionGrowingFilter->SetRadius(radius);
this->Modified();
}
-
protected:
LabelizeNeighborhoodConnectedImageFilter();
- virtual ~LabelizeNeighborhoodConnectedImageFilter() {};
+ virtual ~LabelizeNeighborhoodConnectedImageFilter() {}
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Region growing */
- virtual void RegionGrowing( const IndexType indexSeed );
+ virtual void RegionGrowing(const IndexType indexSeed);
private:
- LabelizeNeighborhoodConnectedImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LabelizeNeighborhoodConnectedImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Delta + threshold for growing region */
InputPixelType m_UpperThresholdDelta;
@@ -114,7 +118,6 @@ private:
/** Intial replace value*/
OutputPixelType m_ReplaceValue;
-
}; // end class LabelizeconnectedThresholdImageFilter
} // end namespace otb
diff --git a/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.txx b/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.txx
index 558b4cd2f0..a1c51148ad 100644
--- a/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.txx
+++ b/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.txx
@@ -41,12 +41,12 @@ LabelizeNeighborhoodConnectedImageFilter<TInputImage, TOutputImage>
template <class TInputImage, class TOutputImage>
void
LabelizeNeighborhoodConnectedImageFilter<TInputImage, TOutputImage>
-::RegionGrowing( const IndexType indexSeed )
+::RegionGrowing(const IndexType indexSeed)
{
InputPixelType threshold = this->GetInput()->GetPixel(indexSeed);
- this->m_RegionGrowingFilter->SetLower(threshold-m_LowerThresholdDelta);
- this->m_RegionGrowingFilter->SetUpper(threshold+m_UpperThresholdDelta);
+ this->m_RegionGrowingFilter->SetLower(threshold - m_LowerThresholdDelta);
+ this->m_RegionGrowingFilter->SetUpper(threshold + m_UpperThresholdDelta);
this->m_RegionGrowingFilter->SetReplaceValue(m_ReplaceValue);
this->m_RegionGrowingFilter->SetSeed(indexSeed);
diff --git a/Code/BasicFilters/otbLeeImageFilter.h b/Code/BasicFilters/otbLeeImageFilter.h
index f71e1bb061..e645749c1c 100644
--- a/Code/BasicFilters/otbLeeImageFilter.h
+++ b/Code/BasicFilters/otbLeeImageFilter.h
@@ -40,26 +40,25 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
-class ITK_EXPORT LeeImageFilter : public itk::ImageToImageFilter< TInputImage, TOutputImage >
+class ITK_EXPORT LeeImageFilter : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Extract input and output image dimension */
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,
- unsigned int,
- TOutputImage::ImageDimension);
-
-
- typedef TInputImage InputImageType;
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension,
+ unsigned int,
+ TOutputImage::ImageDimension);
+
+ typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
/** standard class typedefs */
- typedef LeeImageFilter Self;
- typedef itk::ImageToImageFilter< InputImageType, OutputImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LeeImageFilter Self;
+ typedef itk::ImageToImageFilter<InputImageType, OutputImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Object factory management */
itkNewMacro(Self);
@@ -67,12 +66,12 @@ public:
/** typemacro */
itkTypeMacro(LeeImageFilter, ImageToImageFilter);
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
typedef typename itk::NumericTraits<InputPixelType>::RealType InputRealType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename InputImageType::SizeType SizeType;
/** Set the radius of the neighborhood used in this filter */
itkSetMacro(Radius, SizeType);
@@ -91,11 +90,12 @@ public:
* in order to inform the pipeline execution model.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
- virtual void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError);
+ virtual void GenerateInputRequestedRegion()
+ throw(itk::InvalidRequestedRegionError);
protected:
LeeImageFilter();
- virtual ~LeeImageFilter() {};
+ virtual ~LeeImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** LeeImageFilter can be multithreaded.
@@ -109,11 +109,11 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
private:
- LeeImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LeeImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Radius of the filter */
SizeType m_Radius;
@@ -126,5 +126,4 @@ private:
#include "otbLeeImageFilter.txx"
#endif
-
#endif
diff --git a/Code/BasicFilters/otbLeeImageFilter.txx b/Code/BasicFilters/otbLeeImageFilter.txx
index 4d1132c0a2..b21d133468 100644
--- a/Code/BasicFilters/otbLeeImageFilter.txx
+++ b/Code/BasicFilters/otbLeeImageFilter.txx
@@ -45,18 +45,18 @@ LeeImageFilter<TInputImage, TOutputImage>::LeeImageFilter()
template <class TInputImage, class TOutputImage>
void LeeImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() throw (itk::InvalidRequestedRegionError)
-{
+ {
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- typename Superclass::InputImagePointer inputPtr = const_cast< TInputImage * >( this->GetInput() );
+ typename Superclass::InputImagePointer inputPtr = const_cast<TInputImage *>(this->GetInput());
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
@@ -64,59 +64,57 @@ void LeeImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() t
inputRequestedRegion = inputPtr->GetRequestedRegion();
// pad the input requested region by the operator radius
- inputRequestedRegion.PadByRadius( m_Radius );
+ inputRequestedRegion.PadByRadius(m_Radius);
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << static_cast<const char *>(this->GetNameOfClass())
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
+ }
}
-}
-
-template< class TInputImage, class TOutputImage>
-void LeeImageFilter< TInputImage, TOutputImage>::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread,
- int threadId
-)
+template<class TInputImage, class TOutputImage>
+void LeeImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(
+ const OutputImageRegionType& outputRegionForThread,
+ int threadId
+ )
{
- unsigned int i;
+ unsigned int i;
itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
itk::ConstNeighborhoodIterator<InputImageType> bit;
- itk::ImageRegionIterator<OutputImageType> it;
+ itk::ImageRegionIterator<OutputImageType> it;
// Allocate output
typename OutputImageType::Pointer output = this->GetOutput();
typename InputImageType::ConstPointer input = this->GetInput();
// Find the data-set boundary "faces"
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType faceList;
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType::iterator fit;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType faceList;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType::iterator fit;
itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> bC;
faceList = bC(input, outputRegionForThread, m_Radius);
-
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
@@ -126,55 +124,54 @@ void LeeImageFilter< TInputImage, TOutputImage>::ThreadedGenerateData(
double Cr2, Cv2, E_I, I, Var_I, dPixel;
-
// dPixel = this->getNbVues();
dPixel = m_NbLooks;
//Calcul du rapport
- Cv2 = 1./(vcl_sqrt(dPixel));
- Cv2 = Cv2*Cv2;
+ Cv2 = 1. / (vcl_sqrt(dPixel));
+ Cv2 = Cv2 * Cv2;
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
- for (fit=faceList.begin(); fit != faceList.end(); ++fit)
- {
+ for (fit = faceList.begin(); fit != faceList.end(); ++fit)
+ {
bit = itk::ConstNeighborhoodIterator<InputImageType>(m_Radius, input, *fit);
unsigned int neighborhoodSize = bit.Size();
it = itk::ImageRegionIterator<OutputImageType>(output, *fit);
bit.OverrideBoundaryCondition(&nbc);
bit.GoToBegin();
- while ( ! bit.IsAtEnd() )
- {
+ while (!bit.IsAtEnd())
+ {
sum = itk::NumericTraits<InputRealType>::Zero;
sum2 = itk::NumericTraits<InputRealType>::Zero;
//Parcours du voisinage
for (i = 0; i < neighborhoodSize; ++i)
- {
- dPixel = static_cast<double>( bit.GetPixel(i) );
+ {
+ dPixel = static_cast<double>(bit.GetPixel(i));
sum += dPixel;
sum2 += dPixel * dPixel;
- }
+ }
E_I = sum / double(neighborhoodSize);
- Var_I = sum2 / double(neighborhoodSize) - E_I*E_I;
- I = static_cast<double>( bit.GetCenterPixel() );
- if (E_I==0)
- {
+ Var_I = sum2 / double(neighborhoodSize) - E_I * E_I;
+ I = static_cast<double>(bit.GetCenterPixel());
+ if (E_I == 0)
+ {
dPixel = itk::NumericTraits<OutputPixelType>::Zero;
- }
+ }
else
- {
- Cr2 = Var_I / (E_I*E_I);
- dPixel = E_I + ((I-E_I)*(Cr2))/(Cr2 + Cv2);
+ {
+ Cr2 = Var_I / (E_I * E_I);
+ dPixel = E_I + ((I - E_I) * (Cr2)) / (Cr2 + Cv2);
- }
+ }
// get the mean value
- it.Set( static_cast<OutputPixelType>( dPixel ) );
+ it.Set(static_cast<OutputPixelType>(dPixel));
++bit;
++it;
progress.CompletedPixel();
+ }
}
- }
}
/**
@@ -184,12 +181,10 @@ template <class TInputImage, class TOutput>
void
LeeImageFilter<TInputImage, TOutput>::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "Radius: " << m_Radius << std::endl;
}
-
} // end namespace otb
-
#endif
diff --git a/Code/BasicFilters/otbListSampleToHistogramListGenerator.h b/Code/BasicFilters/otbListSampleToHistogramListGenerator.h
index 9c6246ab1f..9ac3a4badb 100644
--- a/Code/BasicFilters/otbListSampleToHistogramListGenerator.h
+++ b/Code/BasicFilters/otbListSampleToHistogramListGenerator.h
@@ -29,7 +29,7 @@
#include "itkDenseFrequencyContainer.h"
#include "itkNumericTraits.h"
-namespace otb{
+namespace otb {
/** \class ListSampleToHistogramListGenerator
* \brief Generates a list of 1D Histograms from a ListSample
@@ -40,18 +40,18 @@ namespace otb{
* ObjectList).
* \sa ListSampleToVariableDimensionHistogram
*/
-template< class TListSample,
- class THistogramMeasurement,
- class TFrequencyContainer = itk::Statistics::DenseFrequencyContainer>
+template<class TListSample,
+ class THistogramMeasurement,
+ class TFrequencyContainer = itk::Statistics::DenseFrequencyContainer>
class ITK_EXPORT ListSampleToHistogramListGenerator :
- public itk::Object
+ public itk::Object
{
public:
/** Standard typedefs */
typedef ListSampleToHistogramListGenerator Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(ListSampleToHistogramListGenerator, Object);
@@ -59,29 +59,29 @@ public:
/** Method for creation through the object factory. */
itkNewMacro(Self);
- /** Type needed for defining the limits of the histogram bins */
+ /** Type needed for defining the limits of the histogram bins */
typedef typename itk::NumericTraits
- < THistogramMeasurement >::RealType HistogramMeasurementRealType;
- typedef itk::Statistics::Histogram< HistogramMeasurementRealType,1,
- TFrequencyContainer > HistogramType;
- typedef typename HistogramType::SizeType HistogramSizeType;
- typedef typename TListSample::MeasurementVectorType MeasurementVectorType;
- typedef ObjectList<HistogramType> HistogramListType;
- typedef typename HistogramListType::Pointer HistogramListPointerType;
-
- typedef typename TListSample::ConstPointer ListSampleConstPointerType;
+ <THistogramMeasurement>::RealType HistogramMeasurementRealType;
+ typedef itk::Statistics::Histogram<HistogramMeasurementRealType, 1,
+ TFrequencyContainer> HistogramType;
+ typedef typename HistogramType::SizeType HistogramSizeType;
+ typedef typename TListSample::MeasurementVectorType MeasurementVectorType;
+ typedef ObjectList<HistogramType> HistogramListType;
+ typedef typename HistogramListType::Pointer HistogramListPointerType;
+
+ typedef typename TListSample::ConstPointer ListSampleConstPointerType;
/** plug in the ListSample object */
void SetListSample(const TListSample* list)
- {
- m_List = list;
- }
+ {
+ m_List = list;
+ }
void SetMarginalScale(float scale)
{ m_MarginalScale = scale; }
void SetNumberOfBins(unsigned int size)
{
- m_Size[0]=size;
+ m_Size[0] = size;
}
HistogramListPointerType GetOutput() const
@@ -90,21 +90,20 @@ public:
void Update()
{ this->GenerateData(); }
- itkSetMacro(AutoMinMax,bool);
- itkGetConstReferenceMacro(AutoMinMax,bool);
+ itkSetMacro(AutoMinMax, bool);
+ itkGetConstReferenceMacro(AutoMinMax, bool);
- void SetHistogramMin(const MeasurementVectorType & histogramMin)
- {
+ void SetHistogramMin(const MeasurementVectorType& histogramMin)
+ {
m_HistogramMin = histogramMin;
m_AutoMinMax = false;
- }
+ }
- void SetHistogramMax(const MeasurementVectorType & histogramMax)
- {
+ void SetHistogramMax(const MeasurementVectorType& histogramMax)
+ {
m_HistogramMax = histogramMax;
m_AutoMinMax = false;
- }
-
+ }
protected:
ListSampleToHistogramListGenerator();
@@ -114,12 +113,12 @@ protected:
private:
ListSampleConstPointerType m_List;
- HistogramSizeType m_Size;
- float m_MarginalScale;
- MeasurementVectorType m_HistogramMin;
- MeasurementVectorType m_HistogramMax;
- bool m_AutoMinMax;
- HistogramListPointerType m_HistogramList;
+ HistogramSizeType m_Size;
+ float m_MarginalScale;
+ MeasurementVectorType m_HistogramMin;
+ MeasurementVectorType m_HistogramMax;
+ bool m_AutoMinMax;
+ HistogramListPointerType m_HistogramList;
}; // end of class
diff --git a/Code/BasicFilters/otbListSampleToHistogramListGenerator.txx b/Code/BasicFilters/otbListSampleToHistogramListGenerator.txx
index 0c1bd5d5e9..62e063078c 100644
--- a/Code/BasicFilters/otbListSampleToHistogramListGenerator.txx
+++ b/Code/BasicFilters/otbListSampleToHistogramListGenerator.txx
@@ -28,37 +28,37 @@
namespace otb
{
-template< class TListSample,
- class THistogramMeasurement,
- class TFrequencyContainer>
-ListSampleToHistogramListGenerator< TListSample,
- THistogramMeasurement,
- TFrequencyContainer >
-::ListSampleToHistogramListGenerator() : m_List(), m_Size(), m_MarginalScale(100), m_HistogramMin(), m_HistogramMax(), m_AutoMinMax(true), m_HistogramList()
+template<class TListSample,
+ class THistogramMeasurement,
+ class TFrequencyContainer>
+ListSampleToHistogramListGenerator<TListSample,
+ THistogramMeasurement,
+ TFrequencyContainer>
+::ListSampleToHistogramListGenerator() : m_List(), m_Size(), m_MarginalScale(100), m_HistogramMin(), m_HistogramMax(),
+ m_AutoMinMax(true), m_HistogramList()
{
m_HistogramList = HistogramListType::New();
m_Size.Fill(255);
}
-
-template< class TListSample,
- class THistogramMeasurement,
- class TFrequencyContainer >
+template<class TListSample,
+ class THistogramMeasurement,
+ class TFrequencyContainer>
void
-ListSampleToHistogramListGenerator< TListSample,
- THistogramMeasurement,
- TFrequencyContainer >
+ListSampleToHistogramListGenerator<TListSample,
+ THistogramMeasurement,
+ TFrequencyContainer>
::GenerateData()
{
- otbMsgDebugMacro(<<"ListSampleToHistogramListGenerator::GenerateData(): Entering");
+ otbMsgDebugMacro(<< "ListSampleToHistogramListGenerator::GenerateData(): Entering");
- if(!m_AutoMinMax)
+ if (!m_AutoMinMax)
{
- if(m_HistogramMin.GetSize() != m_List->GetMeasurementVectorSize())
+ if (m_HistogramMin.GetSize() != m_List->GetMeasurementVectorSize())
{
itkExceptionMacro("Sample list measurement vectors and histogram min have different dimensions !");
}
- if(m_HistogramMax.GetSize() != m_List->GetMeasurementVectorSize())
+ if (m_HistogramMax.GetSize() != m_List->GetMeasurementVectorSize())
{
itkExceptionMacro("Sample list measurement vectors and histogram max have different dimensions !");
}
@@ -74,22 +74,22 @@ ListSampleToHistogramListGenerator< TListSample,
// must test for the list size to avoid making FindSampleBound() segfault.
// Also, the min and max can't be found automatically in that case. We can
// only return an empty histogram
- if( m_AutoMinMax && m_List->Size() != 0 )
+ if (m_AutoMinMax && m_List->Size() != 0)
{
- FindSampleBound(m_List.GetPointer () , m_List->Begin(),
+ FindSampleBound(m_List.GetPointer (), m_List->Begin(),
m_List->End(), lower, upper);
float margin;
- for ( unsigned int i = 0; i < m_List->GetMeasurementVectorSize(); ++i )
+ for (unsigned int i = 0; i < m_List->GetMeasurementVectorSize(); ++i)
{
- if ( !itk::NumericTraits< THistogramMeasurement >::is_integer )
+ if (!itk::NumericTraits<THistogramMeasurement>::is_integer)
{
margin =
- ( (THistogramMeasurement)(upper[i] - lower[i]) /
- (THistogramMeasurement) m_Size[0] ) /
+ ((THistogramMeasurement) (upper[i] - lower[i]) /
+ (THistogramMeasurement) m_Size[0]) /
(THistogramMeasurement) m_MarginalScale;
h_upper[i] = (THistogramMeasurement) (upper[i] + margin);
- if(h_upper[i] <= upper[i])
+ if (h_upper[i] <= upper[i])
{
// an overflow has occurred therefore set upper to upper
h_upper[i] = upper[i];
@@ -103,8 +103,8 @@ ListSampleToHistogramListGenerator< TListSample,
else
{
h_upper[i] = ((THistogramMeasurement) upper[i]) +
- itk::NumericTraits< THistogramMeasurement >::One;
- if(h_upper[i] <= upper[i])
+ itk::NumericTraits<THistogramMeasurement>::One;
+ if (h_upper[i] <= upper[i])
{
// an overflow has occurred therefore set upper to upper
h_upper[i] = upper[i];
@@ -115,7 +115,7 @@ ListSampleToHistogramListGenerator< TListSample,
// computation and clearly the user intended to include min and max.
}
}
- h_lower[i] = ( THistogramMeasurement) lower[i];
+ h_lower[i] = (THistogramMeasurement) lower[i];
}
}
else
@@ -128,7 +128,7 @@ ListSampleToHistogramListGenerator< TListSample,
m_HistogramList->Clear();
// For each dimension
- for(unsigned int comp = 0; comp<m_List->GetMeasurementVectorSize();++comp)
+ for (unsigned int comp = 0; comp < m_List->GetMeasurementVectorSize(); ++comp)
{
// initialize the Histogram object using the sizes and
// the upper and lower bound from the FindSampleBound function
@@ -136,22 +136,24 @@ ListSampleToHistogramListGenerator< TListSample,
comp_lower[0] = h_lower[comp];
comp_upper[0] = h_upper[comp];
- otbMsgDevMacro(<<"ListSampleToHistogramListGenerator::GenerateData(): Initializing histogram "<<comp<<" with (size= "<<m_Size<<", lower = "<<comp_lower<<", upper = "<<comp_upper<<")");
+ otbMsgDevMacro(
+ << "ListSampleToHistogramListGenerator::GenerateData(): Initializing histogram " << comp << " with (size= " <<
+ m_Size << ", lower = " << comp_lower << ", upper = " << comp_upper << ")");
// Create a new histogrma for this component
m_HistogramList->PushBack(HistogramType::New());
m_HistogramList->Back()->SetClipBinsAtEnds(clipBinsAtEnds);
m_HistogramList->Back()->Initialize(m_Size, comp_lower, comp_upper);
- typename TListSample::ConstIterator iter = m_List->Begin();
- typename TListSample::ConstIterator last = m_List->End();
- typename HistogramType::IndexType index;
+ typename TListSample::ConstIterator iter = m_List->Begin();
+ typename TListSample::ConstIterator last = m_List->End();
+ typename HistogramType::IndexType index;
typename HistogramType::MeasurementVectorType hvector;
while (iter != last)
{
hvector[0] = static_cast<THistogramMeasurement>(iter.GetMeasurementVector()[comp]);
- m_HistogramList->Back()->GetIndex(hvector,index);
+ m_HistogramList->Back()->GetIndex(hvector, index);
if (!m_HistogramList->Back()->IsIndexOutOfBounds(index))
{
@@ -166,28 +168,26 @@ ListSampleToHistogramListGenerator< TListSample,
++iter;
}
}
- otbMsgDebugMacro(<<"ListSampleToHistogramListGenerator::GenerateData(): Leaving");
+ otbMsgDebugMacro(<< "ListSampleToHistogramListGenerator::GenerateData(): Leaving");
}
-template< class TListSample,
- class THistogramMeasurement,
- class TFrequencyContainer >
+template<class TListSample,
+ class THistogramMeasurement,
+ class TFrequencyContainer>
void
-ListSampleToHistogramListGenerator< TListSample,
- THistogramMeasurement,
- TFrequencyContainer >
+ListSampleToHistogramListGenerator<TListSample,
+ THistogramMeasurement,
+ TFrequencyContainer>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "AutoMinMax: " << m_AutoMinMax << std::endl;
os << indent << "Size: " << m_Size << std::endl;
- os << indent << "MarginalScale: "<< m_MarginalScale << std::endl;
- os << indent << "HistogramMin: "<< m_HistogramMin << std::endl;
- os << indent << "HistogramMax: "<< m_HistogramMax << std::endl;
+ os << indent << "MarginalScale: " << m_MarginalScale << std::endl;
+ os << indent << "HistogramMin: " << m_HistogramMin << std::endl;
+ os << indent << "HistogramMax: " << m_HistogramMax << std::endl;
}
} // end of namespace itk
#endif
-
-
diff --git a/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h b/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h
index d604f1ec1d..5170fcb811 100644
--- a/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h
+++ b/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h
@@ -28,7 +28,7 @@
#include "itkDenseFrequencyContainer.h"
#include "itkNumericTraits.h"
-namespace otb{
+namespace otb {
/** \class ListSampleToVariableDimensionHistogramGenerator
* \brief Generates a VariableDimensionHistogram from a ListSample
@@ -45,40 +45,40 @@ namespace otb{
*
* \sa VariableDimensionHistogram, ListSample, ListSampleToHistogramGenerator
*/
-template< class TListSample,
- class THistogramMeasurement,
- class TFrequencyContainer = itk::Statistics::DenseFrequencyContainer>
+template<class TListSample,
+ class THistogramMeasurement,
+ class TFrequencyContainer = itk::Statistics::DenseFrequencyContainer>
class ITK_EXPORT ListSampleToVariableDimensionHistogramGenerator :
- public itk::Object
+ public itk::Object
{
public:
/** Standard typedefs */
typedef ListSampleToVariableDimensionHistogramGenerator Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
/** Run-time type information (and related methods). */
itkTypeMacro(ListSampleToVariableDimensionHistogramGenerator, Object);
-
+
/** Method for creation through the object factory. */
itkNewMacro(Self);
- /** Type needed for defining the limits of the histogram bins */
- typedef typename itk::NumericTraits< THistogramMeasurement >::RealType
- HistogramMeasurementRealType;
+ /** Type needed for defining the limits of the histogram bins */
+ typedef typename itk::NumericTraits<THistogramMeasurement>::RealType
+ HistogramMeasurementRealType;
- typedef itk::Statistics::VariableDimensionHistogram< HistogramMeasurementRealType,
- TFrequencyContainer > HistogramType;
+ typedef itk::Statistics::VariableDimensionHistogram<HistogramMeasurementRealType,
+ TFrequencyContainer> HistogramType;
- typedef typename HistogramType::SizeType HistogramSizeType;
- typedef typename HistogramType::MeasurementVectorType MeasurementVectorType;
+ typedef typename HistogramType::SizeType HistogramSizeType;
+ typedef typename HistogramType::MeasurementVectorType MeasurementVectorType;
/** plug in the ListSample object */
void SetListSample(const TListSample* list)
- {
- m_List = list;
- }
+ {
+ m_List = list;
+ }
void SetMarginalScale(float scale)
{ m_MarginalScale = scale; }
@@ -92,21 +92,20 @@ public:
void Update()
{ this->GenerateData(); }
- itkSetMacro(AutoMinMax,bool);
- itkGetConstReferenceMacro(AutoMinMax,bool);
+ itkSetMacro(AutoMinMax, bool);
+ itkGetConstReferenceMacro(AutoMinMax, bool);
- void SetHistogramMin(const MeasurementVectorType & histogramMin)
- {
+ void SetHistogramMin(const MeasurementVectorType& histogramMin)
+ {
m_HistogramMin = histogramMin;
m_AutoMinMax = false;
- }
+ }
- void SetHistogramMax(const MeasurementVectorType & histogramMax)
- {
+ void SetHistogramMax(const MeasurementVectorType& histogramMax)
+ {
m_HistogramMax = histogramMax;
m_AutoMinMax = false;
- }
-
+ }
protected:
ListSampleToVariableDimensionHistogramGenerator();
@@ -117,11 +116,11 @@ protected:
private:
const TListSample* m_List;
typename HistogramType::Pointer m_Histogram;
- HistogramSizeType m_Sizes;
- float m_MarginalScale;
+ HistogramSizeType m_Sizes;
+ float m_MarginalScale;
MeasurementVectorType m_HistogramMin;
MeasurementVectorType m_HistogramMax;
- bool m_AutoMinMax;
+ bool m_AutoMinMax;
}; // end of class
diff --git a/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.txx b/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.txx
index abc41724c0..b16a354e10 100644
--- a/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.txx
+++ b/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.txx
@@ -27,12 +27,12 @@
namespace otb
{
-template< class TListSample,
- class THistogramMeasurement,
- class TFrequencyContainer>
-ListSampleToVariableDimensionHistogramGenerator< TListSample,
- THistogramMeasurement,
- TFrequencyContainer >
+template<class TListSample,
+ class THistogramMeasurement,
+ class TFrequencyContainer>
+ListSampleToVariableDimensionHistogramGenerator<TListSample,
+ THistogramMeasurement,
+ TFrequencyContainer>
::ListSampleToVariableDimensionHistogramGenerator()
{
m_Histogram = HistogramType::New();
@@ -40,33 +40,32 @@ ListSampleToVariableDimensionHistogramGenerator< TListSample,
m_AutoMinMax = true;
}
-
-template< class TListSample,
- class THistogramMeasurement,
- class TFrequencyContainer >
+template<class TListSample,
+ class THistogramMeasurement,
+ class TFrequencyContainer>
void
-ListSampleToVariableDimensionHistogramGenerator< TListSample,
- THistogramMeasurement,
- TFrequencyContainer >
+ListSampleToVariableDimensionHistogramGenerator<TListSample,
+ THistogramMeasurement,
+ TFrequencyContainer>
::GenerateData()
{
- otbMsgDebugMacro(<<"ListSampleToVariableDimensionHistogramGenerator::GenerateData(): Entering");
+ otbMsgDebugMacro(<< "ListSampleToVariableDimensionHistogramGenerator::GenerateData(): Entering");
// TODO : Sanity checks
- if(m_Sizes.GetSize() != m_List->GetMeasurementVectorSize())
+ if (m_Sizes.GetSize() != m_List->GetMeasurementVectorSize())
{
itkExceptionMacro("Sample list measurement vectors and histogram bin sizes vector have different dimensions !");
}
- if(!m_AutoMinMax)
- {
- if(m_HistogramMin.GetSize() != m_List->GetMeasurementVectorSize())
- {
- itkExceptionMacro("Sample list measurement vectors and histogram min have different dimensions !");
- }
- if(m_HistogramMax.GetSize() != m_List->GetMeasurementVectorSize())
+ if (!m_AutoMinMax)
{
- itkExceptionMacro("Sample list measurement vectors and histogram max have different dimensions !");
- }
+ if (m_HistogramMin.GetSize() != m_List->GetMeasurementVectorSize())
+ {
+ itkExceptionMacro("Sample list measurement vectors and histogram min have different dimensions !");
+ }
+ if (m_HistogramMax.GetSize() != m_List->GetMeasurementVectorSize())
+ {
+ itkExceptionMacro("Sample list measurement vectors and histogram max have different dimensions !");
+ }
}
typename TListSample::MeasurementVectorType lower(m_List->GetMeasurementVectorSize());
@@ -78,22 +77,22 @@ ListSampleToVariableDimensionHistogramGenerator< TListSample,
// must test for the list size to avoid making FindSampleBound() segfault.
// Also, the min and max can't be found automatically in that case. We can
// only return an empty histogram
- if( m_AutoMinMax && m_List->Size() != 0 )
+ if (m_AutoMinMax && m_List->Size() != 0)
{
FindSampleBound(m_List, m_List->Begin(),
m_List->End(), lower, upper);
float margin;
- for ( unsigned int i = 0; i < m_List->GetMeasurementVectorSize(); ++i )
+ for (unsigned int i = 0; i < m_List->GetMeasurementVectorSize(); ++i)
{
- if ( !itk::NumericTraits< THistogramMeasurement >::is_integer )
+ if (!itk::NumericTraits<THistogramMeasurement>::is_integer)
{
margin =
- ( (THistogramMeasurement)(upper[i] - lower[i]) /
- (THistogramMeasurement) m_Sizes[i] ) /
+ ((THistogramMeasurement) (upper[i] - lower[i]) /
+ (THistogramMeasurement) m_Sizes[i]) /
(THistogramMeasurement) m_MarginalScale;
h_upper[i] = (THistogramMeasurement) (upper[i] + margin);
- if(h_upper[i] <= upper[i])
+ if (h_upper[i] <= upper[i])
{
// an overflow has occurred therefore set upper to upper
h_upper[i] = upper[i];
@@ -107,8 +106,8 @@ ListSampleToVariableDimensionHistogramGenerator< TListSample,
else
{
h_upper[i] = ((THistogramMeasurement) upper[i]) +
- itk::NumericTraits< THistogramMeasurement >::One;
- if(h_upper[i] <= upper[i])
+ itk::NumericTraits<THistogramMeasurement>::One;
+ if (h_upper[i] <= upper[i])
{
// an overflow has occurred therefore set upper to upper
h_upper[i] = upper[i];
@@ -119,7 +118,7 @@ ListSampleToVariableDimensionHistogramGenerator< TListSample,
// computation and clearly the user intended to include min and max.
}
}
- h_lower[i] = ( THistogramMeasurement) lower[i];
+ h_lower[i] = (THistogramMeasurement) lower[i];
}
}
else
@@ -130,26 +129,28 @@ ListSampleToVariableDimensionHistogramGenerator< TListSample,
// initialize the Histogram object using the sizes and
// the upper and lower bound from the FindSampleBound function
-
- otbMsgDevMacro(<<"ListSampleToVariableDimensionHistogramGenerator::GenerateData(): Initializing histogram with (sizes= "<<m_Sizes<<", lower = "<<h_lower<<", upper = "<<h_upper<<")");
+
+ otbMsgDevMacro(
+ << "ListSampleToVariableDimensionHistogramGenerator::GenerateData(): Initializing histogram with (sizes= " <<
+ m_Sizes << ", lower = " << h_lower << ", upper = " << h_upper << ")");
m_Histogram->Initialize(m_Sizes, h_lower, h_upper);
- otbMsgDevMacro(<<"ListSampleToVariableDimensionHistogramGenerator::GenerateData(): Histogram initialized");
+ otbMsgDevMacro(<< "ListSampleToVariableDimensionHistogramGenerator::GenerateData(): Histogram initialized");
typename TListSample::ConstIterator iter = m_List->Begin();
typename TListSample::ConstIterator last = m_List->End();
typename HistogramType::IndexType index(m_List->GetMeasurementVectorSize());
typename TListSample::MeasurementVectorType lvector(m_List->GetMeasurementVectorSize());
typename HistogramType::MeasurementVectorType hvector(m_List->GetMeasurementVectorSize());
unsigned int i;
-
- otbMsgDevMacro(<<"ListSampleToVariableDimensionHistogramGenerator::GenerateData(): Filling the histogram");
+
+ otbMsgDevMacro(<< "ListSampleToVariableDimensionHistogramGenerator::GenerateData(): Filling the histogram");
while (iter != last)
{
lvector = iter.GetMeasurementVector();
- for ( i = 0; i < m_List->GetMeasurementVectorSize(); ++i)
+ for (i = 0; i < m_List->GetMeasurementVectorSize(); ++i)
{
hvector[i] = (THistogramMeasurement) lvector[i];
}
- m_Histogram->GetIndex(hvector,index);
+ m_Histogram->GetIndex(hvector, index);
if (!m_Histogram->IsIndexOutOfBounds(index))
{
@@ -164,28 +165,26 @@ ListSampleToVariableDimensionHistogramGenerator< TListSample,
++iter;
}
- otbMsgDebugMacro(<<"ListSampleToVariableDimensionHistogramGenerator::GenerateData(): Leaving");
+ otbMsgDebugMacro(<< "ListSampleToVariableDimensionHistogramGenerator::GenerateData(): Leaving");
}
-template< class TListSample,
- class THistogramMeasurement,
- class TFrequencyContainer >
+template<class TListSample,
+ class THistogramMeasurement,
+ class TFrequencyContainer>
void
-ListSampleToVariableDimensionHistogramGenerator< TListSample,
- THistogramMeasurement,
- TFrequencyContainer >
+ListSampleToVariableDimensionHistogramGenerator<TListSample,
+ THistogramMeasurement,
+ TFrequencyContainer>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "AutoMinMax: " << m_AutoMinMax << std::endl;
os << indent << "Sizes: " << m_Sizes << std::endl;
- os << indent << "MarginalScale: "<< m_MarginalScale << std::endl;
- os << indent << "HistogramMin: "<< m_HistogramMin << std::endl;
- os << indent << "HistogramMax: "<< m_HistogramMax << std::endl;
+ os << indent << "MarginalScale: " << m_MarginalScale << std::endl;
+ os << indent << "HistogramMin: " << m_HistogramMin << std::endl;
+ os << indent << "HistogramMax: " << m_HistogramMax << std::endl;
}
} // end of namespace itk
#endif
-
-
diff --git a/Code/BasicFilters/otbLogPolarTransform.h b/Code/BasicFilters/otbLogPolarTransform.h
index ded4ec920b..4eda0016cb 100644
--- a/Code/BasicFilters/otbLogPolarTransform.h
+++ b/Code/BasicFilters/otbLogPolarTransform.h
@@ -42,44 +42,44 @@ namespace otb
*/
template <class TScalarType>
class ITK_EXPORT LogPolarTransform
- : public itk::Transform<TScalarType,2,2>
+ : public itk::Transform<TScalarType, 2, 2>
{
public:
/** Standard typedef */
- typedef LogPolarTransform Self;
- typedef itk::Transform<TScalarType,2,2> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LogPolarTransform Self;
+ typedef itk::Transform<TScalarType, 2, 2> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(LogPolarTransform,Transform);
+ itkTypeMacro(LogPolarTransform, Transform);
/** Template related typedefs */
typedef TScalarType ScalarType;
/** Superclass related typedefs */
- typedef typename Superclass::InputPointType InputPointType;
- typedef typename Superclass::OutputPointType OutputPointType;
- typedef typename Superclass::InputVectorType InputVectorType;
- typedef typename Superclass::OutputVectorType OutputVectorType;
- typedef typename Superclass::InputVnlVectorType InputVnlVectorType;
+ typedef typename Superclass::InputPointType InputPointType;
+ typedef typename Superclass::OutputPointType OutputPointType;
+ typedef typename Superclass::InputVectorType InputVectorType;
+ typedef typename Superclass::OutputVectorType OutputVectorType;
+ typedef typename Superclass::InputVnlVectorType InputVnlVectorType;
typedef typename Superclass::OutputVnlVectorType OutputVnlVectorType;
- typedef typename Superclass::ParametersType ParametersType;
- typedef itk::FixedArray<TScalarType,2> ScaleType;
+ typedef typename Superclass::ParametersType ParametersType;
+ typedef itk::FixedArray<TScalarType, 2> ScaleType;
/** Set/Get the origin */
- itkSetMacro(Center,InputPointType);
- itkGetConstReferenceMacro(Center,InputPointType);
+ itkSetMacro(Center, InputPointType);
+ itkGetConstReferenceMacro(Center, InputPointType);
/** Set/Get the scales */
- itkSetMacro(Scale,ScaleType);
- itkGetConstReferenceMacro(Scale,ScaleType);
+ itkSetMacro(Scale, ScaleType);
+ itkGetConstReferenceMacro(Scale, ScaleType);
/**
* Set the transform parameters through the standard interface.
* \param parameters The parameters of the transform.
*/
- void SetParameters(const ParametersType ¶meters);
+ void SetParameters(const ParametersType& parameters);
/**
* Get the transform parameters through the standard interface.
* \return The parameters of the transform.
@@ -90,19 +90,19 @@ public:
* \param point The point to transform.
* \return The transformed point.
*/
- OutputPointType TransformPoint(const InputPointType &point) const;
+ OutputPointType TransformPoint(const InputPointType& point) const;
/**
* Transform a vector representing a point.
* \param vector The point to transform.
* \return The transformed point.
*/
- OutputVectorType TransformVector(const InputVectorType &vector) const;
+ OutputVectorType TransformVector(const InputVectorType& vector) const;
/**
* Transform a vnl vector representing a point.
* \param vector The point to transform.
* \return The transformed point.
*/
- OutputVnlVectorType TransformVector(const InputVnlVectorType &vector) const;
+ OutputVnlVectorType TransformVector(const InputVnlVectorType& vector) const;
protected:
/** Constructor */
@@ -110,16 +110,16 @@ protected:
/** Destructor */
virtual ~LogPolarTransform();
/** PrintSelf method */
- void PrintSelf(std::ostream &os,itk::Indent indent) const;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- LogPolarTransform(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ LogPolarTransform(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
InputPointType m_Center;
- ScaleType m_Scale;
+ ScaleType m_Scale;
};
-}// end namespace otb
+} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbLogPolarTransform.txx"
#endif
diff --git a/Code/BasicFilters/otbLogPolarTransform.txx b/Code/BasicFilters/otbLogPolarTransform.txx
index d39797f99b..343fc14bb5 100644
--- a/Code/BasicFilters/otbLogPolarTransform.txx
+++ b/Code/BasicFilters/otbLogPolarTransform.txx
@@ -30,12 +30,12 @@ namespace otb
template <class TScalarType>
LogPolarTransform<TScalarType>
::LogPolarTransform()
- :Superclass(2,4)
+ : Superclass(2, 4)
{
- m_Center[0]=0.0;
- m_Center[1]=0.0;
- m_Scale[0]=1.0;
- m_Scale[1]=1.0;
+ m_Center[0] = 0.0;
+ m_Center[1] = 0.0;
+ m_Scale[0] = 1.0;
+ m_Scale[1] = 1.0;
}
/**
* Destructor.
@@ -51,14 +51,14 @@ LogPolarTransform<TScalarType>
template <class TScalarType>
void
LogPolarTransform<TScalarType>
-::SetParameters(const ParametersType ¶meters)
+::SetParameters(const ParametersType& parameters)
{
- m_Center[0]=parameters[0];
- m_Center[1]=parameters[1];
- m_Scale[0] =parameters[2];
- m_Scale[1] =parameters[3];
- otbMsgDebugMacro(<<"Call To SetParameters: Center="<<m_Center<<", Scale="<<m_Scale);
- this->m_Parameters=parameters;
+ m_Center[0] = parameters[0];
+ m_Center[1] = parameters[1];
+ m_Scale[0] = parameters[2];
+ m_Scale[1] = parameters[3];
+ otbMsgDebugMacro(<< "Call To SetParameters: Center=" << m_Center << ", Scale=" << m_Scale);
+ this->m_Parameters = parameters;
this->Modified();
}
/**
@@ -72,10 +72,10 @@ LogPolarTransform<TScalarType>
::GetParameters(void) const
{
// Filling parameters vector
- this->m_Parameters[0]=m_Center[0];
- this->m_Parameters[1]=m_Center[1];
- this->m_Parameters[2]=m_Scale[0];
- this->m_Parameters[3]=m_Scale[1];
+ this->m_Parameters[0] = m_Center[0];
+ this->m_Parameters[1] = m_Center[1];
+ this->m_Parameters[2] = m_Scale[0];
+ this->m_Parameters[3] = m_Scale[1];
return this->m_Parameters;
}
@@ -88,15 +88,15 @@ template <class TScalarType>
typename LogPolarTransform<TScalarType>
::OutputPointType
LogPolarTransform<TScalarType>
-::TransformPoint(const InputPointType &point) const
+::TransformPoint(const InputPointType& point) const
{
OutputPointType result;
- double theta = point[0]*m_Scale[0]*CONST_PI_180;
- double logRho = point[1]*m_Scale[1];
- result[0]=m_Center[0];
- result[1]=m_Center[1];
- result[0]+=vcl_exp(logRho) *vcl_cos(theta);
- result[1]+=vcl_exp(logRho) *vcl_sin(theta);
+ double theta = point[0] * m_Scale[0] * CONST_PI_180;
+ double logRho = point[1] * m_Scale[1];
+ result[0] = m_Center[0];
+ result[1] = m_Center[1];
+ result[0] += vcl_exp(logRho) * vcl_cos(theta);
+ result[1] += vcl_exp(logRho) * vcl_sin(theta);
return result;
}
/**
@@ -108,15 +108,15 @@ template <class TScalarType>
typename LogPolarTransform<TScalarType>
::OutputVectorType
LogPolarTransform<TScalarType>
-::TransformVector(const InputVectorType &vector) const
+::TransformVector(const InputVectorType& vector) const
{
OutputVectorType result;
- double theta = vector[0]*m_Scale[0]*CONST_PI_180;
- double logRho = vector[1]*m_Scale[1];
- result[0]=0.;
- result[1]=0.;
- result[0]+=vcl_exp(logRho) *vcl_cos(theta);
- result[1]+=vcl_exp(logRho) *vcl_sin(theta);
+ double theta = vector[0] * m_Scale[0] * CONST_PI_180;
+ double logRho = vector[1] * m_Scale[1];
+ result[0] = 0.;
+ result[1] = 0.;
+ result[0] += vcl_exp(logRho) * vcl_cos(theta);
+ result[1] += vcl_exp(logRho) * vcl_sin(theta);
return result;
}
@@ -129,16 +129,15 @@ template <class TScalarType>
typename LogPolarTransform<TScalarType>
::OutputVnlVectorType
LogPolarTransform<TScalarType>
-::TransformVector(const InputVnlVectorType &vector) const
+::TransformVector(const InputVnlVectorType& vector) const
{
OutputVnlVectorType result;
- double theta = vector[0]*m_Scale[0]*CONST_PI_180;
- double logRho = vector[1]*m_Scale[1];
- result[0]=0.;
- result[1]=0.;
- result[0]+=vcl_exp(logRho) *vcl_cos(theta);
- result[1]+=vcl_exp(logRho) *vcl_sin(theta);
-
+ double theta = vector[0] * m_Scale[0] * CONST_PI_180;
+ double logRho = vector[1] * m_Scale[1];
+ result[0] = 0.;
+ result[1] = 0.;
+ result[0] += vcl_exp(logRho) * vcl_cos(theta);
+ result[1] += vcl_exp(logRho) * vcl_sin(theta);
return result;
}
@@ -148,11 +147,11 @@ LogPolarTransform<TScalarType>
template <class TScalarType>
void
LogPolarTransform<TScalarType>
-::PrintSelf(std::ostream &os,itk::Indent indent) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"Center: "<<m_Center<<std::endl;
- os<<indent<<"Scale: "<<m_Scale<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Center: " << m_Center << std::endl;
+ os << indent << "Scale: " << m_Scale << std::endl;
}
} // end namespace otb
diff --git a/Code/BasicFilters/otbMeanFunctor.h b/Code/BasicFilters/otbMeanFunctor.h
index 73b0ab0e49..1e29dae672 100644
--- a/Code/BasicFilters/otbMeanFunctor.h
+++ b/Code/BasicFilters/otbMeanFunctor.h
@@ -25,7 +25,7 @@ namespace otb
*/
namespace Functor
{
-template<class TInput,class TOutputValue>
+template<class TInput, class TOutputValue>
class MeanFunctor
{
public:
@@ -33,18 +33,18 @@ public:
MeanFunctor()
{
- };
+ }
- ~MeanFunctor() {};
- inline TOutputValue operator()(const TInput& inPix)
+ ~MeanFunctor() {}
+ inline TOutputValue operator ()(const TInput& inPix)
{
double value(0.);
- if( inPix.Size() <= 0) return static_cast<TOutputValue> (0.);
- for (unsigned int i = 0; i <inPix.Size(); ++i)
- {
+ if (inPix.Size() <= 0) return static_cast<TOutputValue> (0.);
+ for (unsigned int i = 0; i < inPix.Size(); ++i)
+ {
value += static_cast<double>(inPix[i]);
- }
- return static_cast<TOutputValue> ( value/static_cast<double>(inPix.Size()));
+ }
+ return static_cast<TOutputValue> (value / static_cast<double>(inPix.Size()));
}
};
diff --git a/Code/BasicFilters/otbMeanShiftImageFilter.h b/Code/BasicFilters/otbMeanShiftImageFilter.h
index 0dfdfeade4..ee89c7018f 100644
--- a/Code/BasicFilters/otbMeanShiftImageFilter.h
+++ b/Code/BasicFilters/otbMeanShiftImageFilter.h
@@ -40,7 +40,7 @@ public:
*/
template <class TPixel>
static inline void
- FloatArrayToPixel(const float * data, unsigned int index, TPixel & pixel,
+ FloatArrayToPixel(const float * data, unsigned int index, TPixel& pixel,
const unsigned int /*nbComp*/, double scale)
{
pixel = static_cast<TPixel>(scale * data[index]);
@@ -50,9 +50,9 @@ public:
*/
template <class TPixel>
static inline void
- PixelToFloatArray(float * data, unsigned int index, const TPixel & pixel, double scale)
+ PixelToFloatArray(float * data, unsigned int index, const TPixel& pixel, double scale)
{
- data[index]=static_cast<float>(scale * pixel);
+ data[index] = static_cast<float>(scale * pixel);
}
};
}
@@ -106,53 +106,53 @@ public:
*/
template <class TInputImage, class TOutputImage,
-class TLabeledOutput = otb::Image<unsigned short,2>,
-class TBufferConverter = MeanShift::ScalarBufferConverter>
+ class TLabeledOutput = otb::Image<unsigned short, 2>,
+ class TBufferConverter = MeanShift::ScalarBufferConverter>
class ITK_EXPORT MeanShiftImageFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedef */
- typedef MeanShiftImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MeanShiftImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
- itkTypeMacro(MeanShiftImageFilter,ImageToImageFilter);
+ itkTypeMacro(MeanShiftImageFilter, ImageToImageFilter);
itkNewMacro(Self);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::PointType PointType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::RegionType RegionType;
- typedef TLabeledOutput LabeledOutputType;
- typedef typename LabeledOutputType::Pointer LabeledOutputPointerType;
- typedef typename LabeledOutputType::PixelType LabelType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::PointType PointType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::RegionType RegionType;
+ typedef TLabeledOutput LabeledOutputType;
+ typedef typename LabeledOutputType::Pointer LabeledOutputPointerType;
+ typedef typename LabeledOutputType::PixelType LabelType;
/** Typedefs for vectorized output */
- typedef otb::Polygon<InputPixelType> PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
- typedef otb::ObjectList<PolygonType> PolygonListType;
- typedef typename PolygonListType::Pointer PolygonListPointerType;
+ typedef otb::Polygon<InputPixelType> PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef otb::ObjectList<PolygonType> PolygonListType;
+ typedef typename PolygonListType::Pointer PolygonListPointerType;
/** Typedef for mean-shift modes map */
- typedef std::map<LabelType,InputPixelType> ModeMapType;
+ typedef std::map<LabelType, InputPixelType> ModeMapType;
/** Setters / Getters */
- itkSetMacro(SpatialRadius,unsigned int);
- itkGetMacro(SpatialRadius,unsigned int);
- itkSetMacro(RangeRadius,double);
- itkGetMacro(RangeRadius,double);
- itkSetMacro(MinimumRegionSize,unsigned int);
- itkGetMacro(MinimumRegionSize,unsigned int);
- itkSetMacro(Scale,double);
- itkGetMacro(Scale,double);
+ itkSetMacro(SpatialRadius, unsigned int);
+ itkGetMacro(SpatialRadius, unsigned int);
+ itkSetMacro(RangeRadius, double);
+ itkGetMacro(RangeRadius, double);
+ itkSetMacro(MinimumRegionSize, unsigned int);
+ itkGetMacro(MinimumRegionSize, unsigned int);
+ itkSetMacro(Scale, double);
+ itkGetMacro(Scale, double);
/** Return the const clustered image output */
const OutputImageType * GetClusteredOutput() const;
@@ -177,7 +177,7 @@ protected:
* input requested region */
virtual void GenerateInputRequestedRegion();
/** Threaded generate data (handle the filtering part) */
- virtual void ThreadedGenerateData(const RegionType& outputRegionForThread,int threadId);
+ virtual void ThreadedGenerateData(const RegionType& outputRegionForThread, int threadId);
/** After threaded generate data (handle the clustering part) */
virtual void AfterThreadedGenerateData();
/** Allocate the outputs (need to be reimplemented since outputs have differents type) */
@@ -192,14 +192,14 @@ protected:
/** Constructor */
MeanShiftImageFilter();
/** destructor */
- virtual ~MeanShiftImageFilter() {};
+ virtual ~MeanShiftImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- MeanShiftImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MeanShiftImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Spatial radius for mean shift convergence */
unsigned int m_SpatialRadius;
@@ -212,8 +212,7 @@ private:
/** A map of the different modes by segmented regions */
ModeMapType m_Modes;
};
-}// end namespace otb
-
+} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbMeanShiftImageFilter.txx"
diff --git a/Code/BasicFilters/otbMeanShiftImageFilter.txx b/Code/BasicFilters/otbMeanShiftImageFilter.txx
index 2b12c42c87..b3b8e5e22d 100644
--- a/Code/BasicFilters/otbMeanShiftImageFilter.txx
+++ b/Code/BasicFilters/otbMeanShiftImageFilter.txx
@@ -30,8 +30,8 @@
namespace otb
{
-template <class TInputImage,class TOutputImage, class TLabeledOutput, class TBufferConverter>
-MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
+template <class TInputImage, class TOutputImage, class TLabeledOutput, class TBufferConverter>
+MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>
::MeanShiftImageFilter()
{
m_SpatialRadius = 3;
@@ -40,92 +40,90 @@ MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
m_Scale = 100000.;
this->SetNumberOfOutputs(4);
- this->SetNthOutput(1,OutputImageType::New());
- this->SetNthOutput(2,LabeledOutputType::New());
- this->SetNthOutput(3,LabeledOutputType::New());
+ this->SetNthOutput(1, OutputImageType::New());
+ this->SetNthOutput(2, LabeledOutputType::New());
+ this->SetNthOutput(3, LabeledOutputType::New());
}
-template <class TInputImage,class TOutputImage, class TLabeledOutput, class TBufferConverter>
-const typename MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>::OutputImageType *
-MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
-::GetClusteredOutput()const
+template <class TInputImage, class TOutputImage, class TLabeledOutput, class TBufferConverter>
+const typename MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>::OutputImageType *
+MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>
+::GetClusteredOutput() const
{
if (this->GetNumberOfOutputs() < 2)
- {
+ {
return 0;
- }
- return static_cast<const OutputImageType * >(this->itk::ProcessObject::GetOutput(1));
+ }
+ return static_cast<const OutputImageType *>(this->itk::ProcessObject::GetOutput(1));
}
-template <class TInputImage,class TOutputImage, class TLabeledOutput, class TBufferConverter>
-typename MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>::OutputImageType *
-MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
+template <class TInputImage, class TOutputImage, class TLabeledOutput, class TBufferConverter>
+typename MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>::OutputImageType *
+MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>
::GetClusteredOutput()
{
if (this->GetNumberOfOutputs() < 2)
- {
+ {
return 0;
- }
- return static_cast< OutputImageType * >(this->itk::ProcessObject::GetOutput(1));
+ }
+ return static_cast<OutputImageType *>(this->itk::ProcessObject::GetOutput(1));
}
-
-template <class TInputImage,class TOutputImage, class TLabeledOutput, class TBufferConverter>
-const typename MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>::LabeledOutputType *
-MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
-::GetLabeledClusteredOutput()const
+template <class TInputImage, class TOutputImage, class TLabeledOutput, class TBufferConverter>
+const typename MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>::LabeledOutputType *
+MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>
+::GetLabeledClusteredOutput() const
{
if (this->GetNumberOfOutputs() < 3)
- {
+ {
return 0;
- }
- return static_cast<const LabeledOutputType * >(this->itk::ProcessObject::GetOutput(2));
+ }
+ return static_cast<const LabeledOutputType *>(this->itk::ProcessObject::GetOutput(2));
}
-template <class TInputImage,class TOutputImage, class TLabeledOutput, class TBufferConverter>
-typename MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>::LabeledOutputType *
-MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
+template <class TInputImage, class TOutputImage, class TLabeledOutput, class TBufferConverter>
+typename MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>::LabeledOutputType *
+MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>
::GetLabeledClusteredOutput()
{
if (this->GetNumberOfOutputs() < 3)
- {
+ {
return 0;
- }
- return static_cast< LabeledOutputType * >(this->itk::ProcessObject::GetOutput(2));
+ }
+ return static_cast<LabeledOutputType *>(this->itk::ProcessObject::GetOutput(2));
}
-
-template <class TInputImage,class TOutputImage, class TLabeledOutput, class TBufferConverter>
-const typename MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>::LabeledOutputType *
-MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
-::GetClusterBoundariesOutput()const
+template <class TInputImage, class TOutputImage, class TLabeledOutput, class TBufferConverter>
+const typename MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>::LabeledOutputType *
+MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>
+::GetClusterBoundariesOutput() const
{
if (this->GetNumberOfOutputs() < 4)
- {
+ {
return 0;
- }
- return static_cast<const LabeledOutputType * >(this->itk::ProcessObject::GetOutput(3));
+ }
+ return static_cast<const LabeledOutputType *>(this->itk::ProcessObject::GetOutput(3));
}
-template <class TInputImage,class TOutputImage, class TLabeledOutput, class TBufferConverter>
-typename MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>::LabeledOutputType *
-MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
+template <class TInputImage, class TOutputImage, class TLabeledOutput, class TBufferConverter>
+typename MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>::LabeledOutputType *
+MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>
::GetClusterBoundariesOutput()
{
if (this->GetNumberOfOutputs() < 4)
- {
+ {
return 0;
- }
- return static_cast< LabeledOutputType * >(this->itk::ProcessObject::GetOutput(3));
+ }
+ return static_cast<LabeledOutputType *>(this->itk::ProcessObject::GetOutput(3));
}
-template <class TInputImage,class TOutputImage, class TLabeledOutput, class TBufferConverter>
+template <class TInputImage, class TOutputImage, class TLabeledOutput, class TBufferConverter>
void
-MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
+MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>
::AllocateOutputs()
{
- typename OutputImageType::Pointer outputPtr = this->GetOutput();
- typename OutputImageType::Pointer clusteredOutputPtr = this->GetClusteredOutput();
+ typename OutputImageType::Pointer outputPtr = this->GetOutput();
+ typename OutputImageType::Pointer clusteredOutputPtr = this->GetClusteredOutput();
typename LabeledOutputType::Pointer labeledClusteredOutputPtr = this->GetLabeledClusteredOutput();
typename LabeledOutputType::Pointer clusterBoundariesOutputPtr = this->GetClusterBoundariesOutput();
@@ -142,9 +140,9 @@ MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
clusterBoundariesOutputPtr->Allocate();
}
-template <class TInputImage,class TOutputImage, class TLabeledOutput, class TBufferConverter>
+template <class TInputImage, class TOutputImage, class TLabeledOutput, class TBufferConverter>
void
-MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
+MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>
::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
@@ -152,13 +150,13 @@ MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
// get pointers to the input and output
typename Superclass::InputImagePointer inputPtr =
- const_cast< TInputImage * >( this->GetInput() );
+ const_cast<TInputImage *>(this->GetInput());
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
@@ -166,21 +164,21 @@ MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
inputRequestedRegion = inputPtr->GetRequestedRegion();
// pad the input requested region by the operator radius
- inputRequestedRegion.PadByRadius( static_cast<unsigned int>(m_SpatialRadius) );
+ inputRequestedRegion.PadByRadius(static_cast<unsigned int>(m_SpatialRadius));
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
@@ -188,19 +186,19 @@ MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
- }
+ }
}
-template <class TInputImage,class TOutputImage, class TLabeledOutput, class TBufferConverter>
+template <class TInputImage, class TOutputImage, class TLabeledOutput, class TBufferConverter>
void
-MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
-::ThreadedGenerateData(const RegionType& outputRegionForThread, int threadId )
+MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>
+::ThreadedGenerateData(const RegionType& outputRegionForThread, int threadId)
{
// Input and output pointers
- typename InputImageType::ConstPointer inputPtr = this->GetInput();
- typename OutputImageType::Pointer outputPtr = this->GetOutput();
+ typename InputImageType::ConstPointer inputPtr = this->GetInput();
+ typename OutputImageType::Pointer outputPtr = this->GetOutput();
- double invScale = 1/m_Scale;
+ double invScale = 1 / m_Scale;
RegionType inputRequestedRegion = outputRegionForThread;
RegionType outputRequestedRegion = outputRegionForThread;
@@ -209,22 +207,21 @@ MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
inputRequestedRegion.Crop(inputPtr->GetRequestedRegion());
// Iterators
- itk::ImageRegionConstIteratorWithIndex<InputImageType> inputIt(inputPtr,inputRequestedRegion);
- itk::ImageRegionIterator<OutputImageType> outputIt(outputPtr,outputRequestedRegion);
-
+ itk::ImageRegionConstIteratorWithIndex<InputImageType> inputIt(inputPtr, inputRequestedRegion);
+ itk::ImageRegionIterator<OutputImageType> outputIt(outputPtr, outputRequestedRegion);
//create image processing object
msImageProcessor edisonProcessor;
- float * data = new float[inputRequestedRegion.GetNumberOfPixels()*inputPtr->GetNumberOfComponentsPerPixel()];
+ float * data = new float[inputRequestedRegion.GetNumberOfPixels() * inputPtr->GetNumberOfComponentsPerPixel()];
unsigned int index = 0;
- for (inputIt.GoToBegin();!inputIt.IsAtEnd();++inputIt)
- {
- TBufferConverter::PixelToFloatArray(data,index,inputIt.Get(),m_Scale);
- index+=inputPtr->GetNumberOfComponentsPerPixel();
- }
+ for (inputIt.GoToBegin(); !inputIt.IsAtEnd(); ++inputIt)
+ {
+ TBufferConverter::PixelToFloatArray(data, index, inputIt.Get(), m_Scale);
+ index += inputPtr->GetNumberOfComponentsPerPixel();
+ }
edisonProcessor.DefineLInput(data,
inputRequestedRegion.GetSize()[1],
@@ -232,88 +229,85 @@ MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
inputPtr->GetNumberOfComponentsPerPixel());
//define default kernel paramerters...
- kernelType k[2] = {Uniform, Uniform};
- int P[2] = {2, inputPtr->GetNumberOfComponentsPerPixel()};
- float tempH[2] = {1.0 , 1.0};
+ kernelType k[2] = {Uniform, Uniform};
+ int P[2] = {2, inputPtr->GetNumberOfComponentsPerPixel()};
+ float tempH[2] = {1.0, 1.0};
edisonProcessor.DefineKernel(k, tempH, P, 2);
- edisonProcessor.Filter(m_SpatialRadius,m_RangeRadius*m_Scale,MED_SPEEDUP);
+ edisonProcessor.Filter(m_SpatialRadius, m_RangeRadius * m_Scale, MED_SPEEDUP);
if (edisonProcessor.ErrorStatus)
- {
- itkExceptionMacro(<<"Error while running edison!");
- }
-
+ {
+ itkExceptionMacro(<< "Error while running edison!");
+ }
typename OutputImageType::Pointer tmpOutput = OutputImageType::New();
tmpOutput->SetRegions(inputRequestedRegion);
tmpOutput->SetNumberOfComponentsPerPixel(outputPtr->GetNumberOfComponentsPerPixel());
tmpOutput->Allocate();
- itk::ImageRegionIterator<OutputImageType> tmpIt(tmpOutput,inputRequestedRegion);
- itk::ImageRegionIterator<OutputImageType> tmp2It(tmpOutput,outputRequestedRegion);
+ itk::ImageRegionIterator<OutputImageType> tmpIt(tmpOutput, inputRequestedRegion);
+ itk::ImageRegionIterator<OutputImageType> tmp2It(tmpOutput, outputRequestedRegion);
edisonProcessor.GetRawData(data);
if (edisonProcessor.ErrorStatus)
- {
- itkExceptionMacro(<<"Error while running edison!");
- }
-
+ {
+ itkExceptionMacro(<< "Error while running edison!");
+ }
index = 0;
- for (tmpIt.GoToBegin();!tmpIt.IsAtEnd();++tmpIt)
- {
+ for (tmpIt.GoToBegin(); !tmpIt.IsAtEnd(); ++tmpIt)
+ {
OutputPixelType pixel;
- TBufferConverter::FloatArrayToPixel(data,index,pixel,outputPtr->GetNumberOfComponentsPerPixel(),invScale);
+ TBufferConverter::FloatArrayToPixel(data, index, pixel, outputPtr->GetNumberOfComponentsPerPixel(), invScale);
tmpIt.Set(pixel);
- index+=outputPtr->GetNumberOfComponentsPerPixel();
- }
+ index += outputPtr->GetNumberOfComponentsPerPixel();
+ }
tmp2It.GoToBegin();
outputIt.GoToBegin();
while (!tmp2It.IsAtEnd() && !outputIt.IsAtEnd())
- {
+ {
outputIt.Set(tmp2It.Get());
++tmp2It;
++outputIt;
- }
+ }
- delete [] data;
+ delete[] data;
}
-template <class TInputImage,class TOutputImage, class TLabeledOutput, class TBufferConverter>
+template <class TInputImage, class TOutputImage, class TLabeledOutput, class TBufferConverter>
void
-MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
+MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>
::AfterThreadedGenerateData()
{
- double invScale = 1/m_Scale;
+ double invScale = 1 / m_Scale;
- typename OutputImageType::Pointer outputPtr = this->GetOutput();
- typename OutputImageType::Pointer clusteredOutputPtr = this->GetClusteredOutput();
+ typename OutputImageType::Pointer outputPtr = this->GetOutput();
+ typename OutputImageType::Pointer clusteredOutputPtr = this->GetClusteredOutput();
typename LabeledOutputType::Pointer labeledClusteredOutputPtr = this->GetLabeledClusteredOutput();
typename LabeledOutputType::Pointer clusterBoudariesOutputPtr = this->GetClusterBoundariesOutput();
RegionType outputRequestedRegion = outputPtr->GetRequestedRegion();
- itk::ImageRegionIterator<OutputImageType> outputIt(outputPtr,outputRequestedRegion);
- itk::ImageRegionIterator<OutputImageType> clusteredOutputIt(clusteredOutputPtr,outputRequestedRegion);
-
+ itk::ImageRegionIterator<OutputImageType> outputIt(outputPtr, outputRequestedRegion);
+ itk::ImageRegionIterator<OutputImageType> clusteredOutputIt(clusteredOutputPtr, outputRequestedRegion);
//create image processing object
msImageProcessor edisonProcessor;
- float * data = new float[outputRequestedRegion.GetNumberOfPixels()*outputPtr->GetNumberOfComponentsPerPixel()];
+ float * data = new float[outputRequestedRegion.GetNumberOfPixels() * outputPtr->GetNumberOfComponentsPerPixel()];
unsigned int index = 0;
- for (outputIt.GoToBegin();!outputIt.IsAtEnd();++outputIt)
- {
- TBufferConverter::PixelToFloatArray(data,index,outputIt.Get(),m_Scale);
- index+=outputPtr->GetNumberOfComponentsPerPixel();
- }
+ for (outputIt.GoToBegin(); !outputIt.IsAtEnd(); ++outputIt)
+ {
+ TBufferConverter::PixelToFloatArray(data, index, outputIt.Get(), m_Scale);
+ index += outputPtr->GetNumberOfComponentsPerPixel();
+ }
edisonProcessor.DefineLInput(data,
outputRequestedRegion.GetSize()[1],
@@ -321,105 +315,114 @@ MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
outputPtr->GetNumberOfComponentsPerPixel());
// define default kernel paramerters...
- kernelType k[2] = {Uniform, Uniform};
- int P[2] = {2, outputPtr->GetNumberOfComponentsPerPixel()};
- float tempH[2] = {1.0 , 1.0};
+ kernelType k[2] = {Uniform, Uniform};
+ int P[2] = {2, outputPtr->GetNumberOfComponentsPerPixel()};
+ float tempH[2] = {1.0, 1.0};
edisonProcessor.DefineKernel(k, tempH, P, 2);
- edisonProcessor.FuseRegions(m_RangeRadius*m_Scale,m_MinimumRegionSize);
+ edisonProcessor.FuseRegions(m_RangeRadius * m_Scale, m_MinimumRegionSize);
if (edisonProcessor.ErrorStatus)
- {
- itkExceptionMacro(<<"Error while running edison!");
- }
+ {
+ itkExceptionMacro(<< "Error while running edison!");
+ }
edisonProcessor.GetRawData(data);
if (edisonProcessor.ErrorStatus)
- {
- itkExceptionMacro(<<"Error while running edison!");
- }
+ {
+ itkExceptionMacro(<< "Error while running edison!");
+ }
index = 0;
- for (clusteredOutputIt.GoToBegin();!clusteredOutputIt.IsAtEnd();++clusteredOutputIt)
- {
+ for (clusteredOutputIt.GoToBegin(); !clusteredOutputIt.IsAtEnd(); ++clusteredOutputIt)
+ {
OutputPixelType pixel;
- TBufferConverter::FloatArrayToPixel(data,index,pixel,clusteredOutputPtr->GetNumberOfComponentsPerPixel(),invScale);
+ TBufferConverter::FloatArrayToPixel(data, index, pixel,
+ clusteredOutputPtr->GetNumberOfComponentsPerPixel(), invScale);
clusteredOutputIt.Set(pixel);
- index+=clusteredOutputPtr->GetNumberOfComponentsPerPixel();
- }
+ index += clusteredOutputPtr->GetNumberOfComponentsPerPixel();
+ }
- delete [] data;
+ delete[] data;
- int * labels = NULL;
+ int * labels = NULL;
float * modes = NULL;
- int * modesPointsCount = NULL;
+ int * modesPointsCount = NULL;
- edisonProcessor.GetRegions(&labels,&modes,&modesPointsCount);
+ edisonProcessor.GetRegions(&labels, &modes, &modesPointsCount);
if (edisonProcessor.ErrorStatus)
- {
- itkExceptionMacro(<<"Error while running edison!");
- }
+ {
+ itkExceptionMacro(<< "Error while running edison!");
+ }
- itk::ImageRegionIteratorWithIndex<LabeledOutputType> lcIt(labeledClusteredOutputPtr,labeledClusteredOutputPtr->GetRequestedRegion());
+ itk::ImageRegionIteratorWithIndex<LabeledOutputType> lcIt(labeledClusteredOutputPtr,
+ labeledClusteredOutputPtr->GetRequestedRegion());
index = 0;
labeledClusteredOutputPtr->FillBuffer(0);
- for (lcIt.GoToBegin();!lcIt.IsAtEnd();++lcIt)
- {
+ for (lcIt.GoToBegin(); !lcIt.IsAtEnd(); ++lcIt)
+ {
lcIt.Set(static_cast<LabelType>(labels[index]));
++index;
- }
+ }
clusterBoudariesOutputPtr->FillBuffer(0);
//define the boundaries
- RegionList *regionList = edisonProcessor.GetBoundaries();
- int *regionIndeces;
- unsigned int numRegions = regionList->GetNumRegions();
+ RegionList * regionList = edisonProcessor.GetBoundaries();
+ int * regionIndeces;
+ unsigned int numRegions = regionList->GetNumRegions();
typename LabeledOutputType::IndexType boundIndex;
for (LabelType label = 0; label < static_cast<LabelType>(numRegions); ++label)
- {
+ {
OutputPixelType pixel;
TBufferConverter::FloatArrayToPixel(modes,
- static_cast<unsigned int>(label*clusteredOutputPtr->GetNumberOfComponentsPerPixel()),
- pixel,clusteredOutputPtr->GetNumberOfComponentsPerPixel(),invScale);
+ static_cast<unsigned int>(label *
+ clusteredOutputPtr->GetNumberOfComponentsPerPixel()),
+ pixel, clusteredOutputPtr->GetNumberOfComponentsPerPixel(), invScale);
// Filling the modes map
- m_Modes[label]=pixel;
+ m_Modes[label] = pixel;
regionIndeces = regionList->GetRegionIndeces(static_cast<int>(label));
- for (int i = 0; i<regionList->GetRegionCount(static_cast<int>(label)); ++i)
- {
- boundIndex[0]= (regionIndeces[i] % clusterBoudariesOutputPtr->GetRequestedRegion().GetSize()[0])+clusterBoudariesOutputPtr->GetRequestedRegion().GetIndex()[0];
- boundIndex[1]= (regionIndeces[i] / clusterBoudariesOutputPtr->GetRequestedRegion().GetSize()[0])+clusterBoudariesOutputPtr->GetRequestedRegion().GetIndex()[1];
- if (clusterBoudariesOutputPtr->GetBufferedRegion().IsInside(boundIndex))
+ for (int i = 0; i < regionList->GetRegionCount(static_cast<int>(label)); ++i)
{
- clusterBoudariesOutputPtr->SetPixel(boundIndex,1);
+ boundIndex[0] =
+ (regionIndeces[i] %
+ clusterBoudariesOutputPtr->GetRequestedRegion().GetSize()[0]) +
+ clusterBoudariesOutputPtr->GetRequestedRegion().GetIndex()[0];
+ boundIndex[1] =
+ (regionIndeces[i] /
+ clusterBoudariesOutputPtr->GetRequestedRegion().GetSize()[0]) +
+ clusterBoudariesOutputPtr->GetRequestedRegion().GetIndex()[1];
+ if (clusterBoudariesOutputPtr->GetBufferedRegion().IsInside(boundIndex))
+ {
+ clusterBoudariesOutputPtr->SetPixel(boundIndex, 1);
+ }
}
}
- }
// Free memory
- delete [] labels;
- delete [] modes;
- delete [] modesPointsCount;
+ delete[] labels;
+ delete[] modes;
+ delete[] modesPointsCount;
}
-template <class TInputImage,class TOutputImage, class TLabeledOutput, class TBufferConverter>
+template <class TInputImage, class TOutputImage, class TLabeledOutput, class TBufferConverter>
void
-MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,TBufferConverter>
+MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, TBufferConverter>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"Spatial radius: " <<m_SpatialRadius <<std::endl;
- os<<indent<<"Range radius: " <<m_RangeRadius <<std::endl;
- os<<indent<<"Minimum region size: " <<m_MinimumRegionSize <<std::endl;
- os<<indent<<"Scale: " <<m_Scale <<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Spatial radius: " << m_SpatialRadius << std::endl;
+ os << indent << "Range radius: " << m_RangeRadius << std::endl;
+ os << indent << "Minimum region size: " << m_MinimumRegionSize << std::endl;
+ os << indent << "Scale: " << m_Scale << std::endl;
}
} // end namespace otb
diff --git a/Code/BasicFilters/otbMeanShiftVectorImageFilter.h b/Code/BasicFilters/otbMeanShiftVectorImageFilter.h
index f717ac2a23..02c5e2f2d4 100644
--- a/Code/BasicFilters/otbMeanShiftVectorImageFilter.h
+++ b/Code/BasicFilters/otbMeanShiftVectorImageFilter.h
@@ -34,23 +34,30 @@ public:
/**
* Fill the pixel with the float array values at index, using nbComp values scaled by scale.
*/
- template <class TPixel> static inline void FloatArrayToPixel(const float * data, unsigned int index, TPixel & pixel, const unsigned int nbComp, double scale)
+ template <class TPixel> static inline void FloatArrayToPixel(const float * data,
+ unsigned int index,
+ TPixel& pixel,
+ const unsigned int nbComp,
+ double scale)
{
pixel.SetSize(nbComp);
- for (unsigned int i = 0; i<pixel.Size();++i)
- {
- pixel[i]= static_cast<typename TPixel::ValueType> (scale * data[index+i]);
- }
+ for (unsigned int i = 0; i < pixel.Size(); ++i)
+ {
+ pixel[i] = static_cast<typename TPixel::ValueType> (scale * data[index + i]);
+ }
}
/**
* Fill the float array data with the pixel values at index, using nbComp values scaled by scale.
*/
- template <class TPixel> static inline void PixelToFloatArray(float * data, unsigned int index, const TPixel & pixel,double scale)
+ template <class TPixel> static inline void PixelToFloatArray(float * data,
+ unsigned int index,
+ const TPixel& pixel,
+ double scale)
{
- for (unsigned int i = 0; i<pixel.Size();++i)
- {
- data[index+i]=static_cast<float>(scale * pixel[i]);
- }
+ for (unsigned int i = 0; i < pixel.Size(); ++i)
+ {
+ data[index + i] = static_cast<float>(scale * pixel[i]);
+ }
}
};
}
@@ -66,38 +73,38 @@ public:
* \ingroup Streamed
* \ingroup Threaded
*/
-template <class TInputImage, class TOutputImage, class TLabeledOutput = otb::Image<unsigned short,2> >
+template <class TInputImage, class TOutputImage, class TLabeledOutput = otb::Image<unsigned short, 2> >
class MeanShiftVectorImageFilter
- : public MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,MeanShift::VectorBufferConverter>
+ : public MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput, MeanShift::VectorBufferConverter>
{
public:
/** Standard class typedef */
- typedef MeanShiftVectorImageFilter Self;
- typedef MeanShiftImageFilter<TInputImage,TOutputImage,TLabeledOutput,
- MeanShift::VectorBufferConverter> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MeanShiftVectorImageFilter Self;
+ typedef MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledOutput,
+ MeanShift::VectorBufferConverter> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
- itkTypeMacro(MeanShiftVectorImageFilter,MeanShiftImageFilter);
+ itkTypeMacro(MeanShiftVectorImageFilter, MeanShiftImageFilter);
itkNewMacro(Self);
protected:
/** Constructor */
- MeanShiftVectorImageFilter() {};
+ MeanShiftVectorImageFilter() {}
/** destructor */
- virtual ~MeanShiftVectorImageFilter() {};
+ virtual ~MeanShiftVectorImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
MeanShiftVectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.h b/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.h
index d8a2e05abc..7cb60d8e3b 100644
--- a/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.h
+++ b/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.h
@@ -32,13 +32,13 @@ namespace otb
* \ingroup VectorImage
*/
template <class TInputImage, class TOutputImage>
-class ITK_EXPORT NormalizeInnerProductPCAImageFilter : public itk::InPlaceImageFilter<TInputImage,TOutputImage>
+class ITK_EXPORT NormalizeInnerProductPCAImageFilter : public itk::InPlaceImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef NormalizeInnerProductPCAImageFilter Self;
- typedef itk::InPlaceImageFilter<TInputImage,TOutputImage> Superclass;
+ typedef NormalizeInnerProductPCAImageFilter Self;
+ typedef itk::InPlaceImageFilter<TInputImage, TOutputImage> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -49,34 +49,34 @@ public:
itkTypeMacro(NormalizeInnerProductPCAImageFilter, itk::InPlaceImageFilter);
/** Extract input and output images dimensions.*/
- itkStaticConstMacro( InputImageDimension, unsigned int, TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
/** "typedef" to simplify the variables definition and the declaration. */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
-
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
+
/** Supported images definition. */
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::InternalPixelType InputInternalPixelType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::InternalPixelType InputInternalPixelType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
/** Image size "typedef" definition. */
typedef typename InputImageType::SizeType SizeType;
/** Typedef for statistic computing. */
- typedef StreamingStatisticsVectorImageFilter<InputImageType> StreamingStatisticsVectorImageFilterType;
- typedef typename StreamingStatisticsVectorImageFilterType::Pointer StreamingStatisticsVectorImageFilterPointer;
- typedef typename StreamingStatisticsVectorImageFilterType::RealType RealType;
- typedef typename StreamingStatisticsVectorImageFilterType::RealPixelType RealPixelType;
- typedef typename StreamingStatisticsVectorImageFilterType::MatrixType MatrixType;
+ typedef StreamingStatisticsVectorImageFilter<InputImageType> StreamingStatisticsVectorImageFilterType;
+ typedef typename StreamingStatisticsVectorImageFilterType::Pointer StreamingStatisticsVectorImageFilterPointer;
+ typedef typename StreamingStatisticsVectorImageFilterType::RealType RealType;
+ typedef typename StreamingStatisticsVectorImageFilterType::RealPixelType RealPixelType;
+ typedef typename StreamingStatisticsVectorImageFilterType::MatrixType MatrixType;
protected:
NormalizeInnerProductPCAImageFilter();
- virtual ~NormalizeInnerProductPCAImageFilter() {};
+ virtual ~NormalizeInnerProductPCAImageFilter() {}
/** NormalizeInnerProductPCAImageFilter can produce an image which is a different
* resolution than its input image. As such, NormalizeInnerProductPCAImageFilter
@@ -88,7 +88,6 @@ protected:
* \sa ProcessObject::GenerateOutputInformaton() */
virtual void GenerateOutputInformation();
-
/** NormalizeInnerProductPCAImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
* which is called for each processing thread. The output image data is
@@ -99,7 +98,7 @@ protected:
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType &outputRegionForThread, int threadId);
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
/** BeforeThreadedGenerateData method */
void BeforeThreadedGenerateData();
diff --git a/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.txx b/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.txx
index 5d115a9f63..dc840e7d3f 100644
--- a/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.txx
+++ b/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.txx
@@ -31,11 +31,11 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage>
-NormalizeInnerProductPCAImageFilter<TInputImage,TOutputImage>
+NormalizeInnerProductPCAImageFilter<TInputImage, TOutputImage>
::NormalizeInnerProductPCAImageFilter()
{
- this->SetNumberOfRequiredInputs( 1 );
- this->SetNumberOfRequiredOutputs( 1 );
+ this->SetNumberOfRequiredInputs(1);
+ this->SetNumberOfRequiredOutputs(1);
this->InPlaceOff();
}
@@ -44,7 +44,7 @@ NormalizeInnerProductPCAImageFilter<TInputImage,TOutputImage>
*/
template<class TInputImage, class TOutputImage>
void
-NormalizeInnerProductPCAImageFilter<TInputImage,TOutputImage>
+NormalizeInnerProductPCAImageFilter<TInputImage, TOutputImage>
::GenerateOutputInformation(void)
{
Superclass::GenerateOutputInformation();
@@ -55,37 +55,39 @@ NormalizeInnerProductPCAImageFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-NormalizeInnerProductPCAImageFilter<TInputImage,TOutputImage>
-::BeforeThreadedGenerateData( )
+NormalizeInnerProductPCAImageFilter<TInputImage, TOutputImage>
+::BeforeThreadedGenerateData()
{
StreamingStatisticsVectorImageFilterPointer stats = StreamingStatisticsVectorImageFilterType::New();
stats->SetInput(const_cast<InputImageType*>(this->GetInput()));
stats->Update();
RealPixelType means = stats->GetMean();
- MatrixType cov = stats->GetCovariance();
- double NbPixels = static_cast<double>(this->GetInput()->GetLargestPossibleRegion().GetSize()[0] * this->GetInput()->GetLargestPossibleRegion().GetSize()[1]);
- if( (cov.Rows() != means.Size()) || (cov.Cols() != means.Size()) )
- {
- itkExceptionMacro( << "Covariance matrix with size (" << cov.Rows() << "," <<
- cov.Cols() << ") is incompatible with mean vector with size" << means.Size() );
- }
+ MatrixType cov = stats->GetCovariance();
+ double NbPixels = static_cast<double>(
+ this->GetInput()->GetLargestPossibleRegion().GetSize()[0] *
+ this->GetInput()->GetLargestPossibleRegion().GetSize()[1]);
+ if ((cov.Rows() != means.Size()) || (cov.Cols() != means.Size()))
+ {
+ itkExceptionMacro(<< "Covariance matrix with size (" << cov.Rows() << "," <<
+ cov.Cols() << ") is incompatible with mean vector with size" << means.Size());
+ }
m_CoefNorm.SetSize(means.Size());
- for(unsigned int i=0; i<m_CoefNorm.Size(); ++i)
- {
- m_CoefNorm[i] = (1./vcl_sqrt(NbPixels*(cov[i][i] + means[i]*means[i])));
- }
+ for (unsigned int i = 0; i < m_CoefNorm.Size(); ++i)
+ {
+ m_CoefNorm[i] = (1. / vcl_sqrt(NbPixels * (cov[i][i] + means[i] * means[i])));
+ }
}
/**
* ThreadedGenerateData Performs the pixel-wise addition
*/
template <class TInputImage, class TOutputImage>
void
-NormalizeInnerProductPCAImageFilter<TInputImage,TOutputImage>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread, int threadId )
+NormalizeInnerProductPCAImageFilter<TInputImage, TOutputImage>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
// Define the iterators
itk::ImageRegionConstIterator<InputImageType> inputIt(inputPtr, outputRegionForThread);
@@ -98,33 +100,33 @@ NormalizeInnerProductPCAImageFilter<TInputImage,TOutputImage>
// Null pixel construction
InputPixelType nullPixel;
- nullPixel.SetSize( inputPtr->GetNumberOfComponentsPerPixel() );
+ nullPixel.SetSize(inputPtr->GetNumberOfComponentsPerPixel());
nullPixel.Fill(itk::NumericTraits<OutputInternalPixelType>::Zero);
- while ( !inputIt.IsAtEnd() )
- {
- InputPixelType inPixel = inputIt.Get();
+ while (!inputIt.IsAtEnd())
+ {
+ InputPixelType inPixel = inputIt.Get();
OutputPixelType outPixel;
- outPixel.SetSize( inputPtr->GetNumberOfComponentsPerPixel() );
+ outPixel.SetSize(inputPtr->GetNumberOfComponentsPerPixel());
outPixel.Fill(itk::NumericTraits<OutputInternalPixelType>::Zero);
//outPixel = m_Means * inPixel;
- for (unsigned int j=0; j<inputPtr->GetNumberOfComponentsPerPixel(); ++j)
- {
- outPixel[j] = static_cast<OutputInternalPixelType>(m_CoefNorm[j]*static_cast<double>(inPixel[j]));
- }
+ for (unsigned int j = 0; j < inputPtr->GetNumberOfComponentsPerPixel(); ++j)
+ {
+ outPixel[j] = static_cast<OutputInternalPixelType>(m_CoefNorm[j] * static_cast<double>(inPixel[j]));
+ }
outputIt.Set(outPixel);
++inputIt;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
}
template <class TInputImage, class TOutputImage>
void
-NormalizeInnerProductPCAImageFilter<TInputImage,TOutputImage>
+NormalizeInnerProductPCAImageFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.h b/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.h
index a39a34c024..92c6581ef6 100644
--- a/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.h
+++ b/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.h
@@ -40,31 +40,31 @@ namespace otb
* MorphologicalPyramidAnalyseFilter
*/
template <class TInputImage, class TOutputImage, class TKernel>
-class ITK_EXPORT OpeningClosingMorphologicalFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+class ITK_EXPORT OpeningClosingMorphologicalFilter
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
-public :
+public:
/** Standard typedefs */
- typedef OpeningClosingMorphologicalFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef OpeningClosingMorphologicalFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(OpeningClosingMorphologicalFilter,ImageToImageFilter);
+ itkTypeMacro(OpeningClosingMorphologicalFilter, ImageToImageFilter);
/** Template parameter typedefs */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
- typedef TKernel KernelType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
+ typedef TKernel KernelType;
/** Useful typedefs */
- typedef typename InputImageType::Pointer InputImagePointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename TInputImage::PixelType PixelType;
+ typedef typename InputImageType::Pointer InputImagePointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename TInputImage::PixelType PixelType;
/** Kernel accessors */
itkSetMacro(Kernel, KernelType);
@@ -74,7 +74,7 @@ protected:
/** Constructor */
OpeningClosingMorphologicalFilter();
/** Destructor */
- ~OpeningClosingMorphologicalFilter() {};
+ ~OpeningClosingMorphologicalFilter() {}
/* void GenerateInputRequestedRegion(); */
/* void EnlargeOutputRequestedRegion(itk::DataObject *itkNotUsed(output)); */
@@ -84,13 +84,13 @@ protected:
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-private :
- OpeningClosingMorphologicalFilter(const Self&);//purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ OpeningClosingMorphologicalFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Morphological operation kernel */
KernelType m_Kernel;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbOpeningClosingMorphologicalFilter.txx"
diff --git a/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.txx b/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.txx
index 0dbe5dc4c6..373fc005a2 100644
--- a/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.txx
+++ b/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.txx
@@ -29,7 +29,7 @@ namespace otb
/**
* Constructor
*/
-template <class TInputImage,class TOutputImage, class TKernel>
+template <class TInputImage, class TOutputImage, class TKernel>
OpeningClosingMorphologicalFilter<TInputImage, TOutputImage, TKernel>
::OpeningClosingMorphologicalFilter()
{
@@ -40,16 +40,16 @@ OpeningClosingMorphologicalFilter<TInputImage, TOutputImage, TKernel>
/**
* Main computation method
*/
-template <class TInputImage,class TOutputImage, class TKernel>
+template <class TInputImage, class TOutputImage, class TKernel>
void
OpeningClosingMorphologicalFilter<TInputImage, TOutputImage, TKernel>
::GenerateData()
{
// Filters Typedefs (this class is actually a composite filter)
- typedef itk::GrayscaleMorphologicalOpeningImageFilter<InputImageType,OutputImageType, KernelType> OpenFilterType;
- typedef itk::GrayscaleMorphologicalClosingImageFilter<InputImageType,OutputImageType,KernelType> CloseFilterType;
+ typedef itk::GrayscaleMorphologicalOpeningImageFilter<InputImageType, OutputImageType, KernelType> OpenFilterType;
+ typedef itk::GrayscaleMorphologicalClosingImageFilter<InputImageType, OutputImageType, KernelType> CloseFilterType;
// Filters initialization
- typename OpenFilterType::Pointer opening = OpenFilterType::New();
+ typename OpenFilterType::Pointer opening = OpenFilterType::New();
typename CloseFilterType::Pointer closing = CloseFilterType::New();
// Set the kernel
opening->SetKernel(this->GetKernel());
@@ -70,13 +70,13 @@ OpeningClosingMorphologicalFilter<TInputImage, TOutputImage, TKernel>
/**
* PrintSelf method
*/
-template <class TInputImage,class TOutputImage, class TKernel>
+template <class TInputImage, class TOutputImage, class TKernel>
void
OpeningClosingMorphologicalFilter<TInputImage, TOutputImage, TKernel>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "Kernel: " << m_Kernel << std::endl;
}
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.h b/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.h
index 4712898ab6..d77075f112 100644
--- a/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.h
+++ b/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.h
@@ -57,22 +57,22 @@ namespace otb
template <class TInputImage, class TOutputImage,
class TBoundaryCondition = itk::ZeroFluxNeumannBoundaryCondition<TInputImage> >
class ITK_EXPORT OverlapSaveConvolutionImageFilter
- : public itk::ImageToImageFilter< TInputImage, TOutputImage >
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Extract dimension from input and output image. */
- itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
- itkStaticConstMacro(OutputImageDimension, unsigned int,TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
/** Convenient typedefs for simplifying declarations. */
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
/** Standard class typedefs. */
- typedef OverlapSaveConvolutionImageFilter Self;
- typedef itk::ImageToImageFilter< InputImageType, OutputImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef OverlapSaveConvolutionImageFilter Self;
+ typedef itk::ImageToImageFilter<InputImageType, OutputImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -81,31 +81,31 @@ public:
itkTypeMacro(OverlapSaveConvolutionImageFilter, ImageToImageFilter);
/** Image typedef support. */
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
typedef typename itk::NumericTraits<InputPixelType>::RealType InputRealType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename InputImageType::SizeType InputSizeType;
- typedef typename itk::Array<InputRealType> ArrayType;
- typedef TBoundaryCondition BoundaryConditionType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename InputImageType::SizeType InputSizeType;
+ typedef typename itk::Array<InputRealType> ArrayType;
+ typedef TBoundaryCondition BoundaryConditionType;
/** Set the radius of the neighborhood used to compute the mean. */
- virtual void SetRadius (const InputSizeType rad)
+ virtual void SetRadius(const InputSizeType rad)
{
itkDebugMacro("setting radius to " << rad);
if (this->m_Radius != rad)
- {
- this->m_Radius = rad;
- unsigned int arraySize=1;
- for (unsigned int i=0; i<m_Radius.GetSizeDimension(); ++i)
{
- arraySize *= 2*this->m_Radius[i]+1;
- }
+ this->m_Radius = rad;
+ unsigned int arraySize = 1;
+ for (unsigned int i = 0; i < m_Radius.GetSizeDimension(); ++i)
+ {
+ arraySize *= 2 * this->m_Radius[i] + 1;
+ }
this->m_Filter.SetSize(arraySize);
this->m_Filter.Fill(1);
this->Modified();
- }
+ }
}
/** Get the radius of the neighborhood used to compute the mean */
@@ -114,18 +114,20 @@ public:
/** Set the input filter */
void SetFilter(ArrayType filter)
{
- if ((filter.Size()!= m_Filter.Size()))
- {
- itkExceptionMacro("Error in SetFilter, invalid filter size:"<< filter.Size()<<" instead of 2*(m_Radius[0]+1)*(2*m_Radius[1]+1): "<<m_Filter.Size());
- }
+ if ((filter.Size() != m_Filter.Size()))
+ {
+ itkExceptionMacro(
+ "Error in SetFilter, invalid filter size:" << filter.Size() <<
+ " instead of 2*(m_Radius[0]+1)*(2*m_Radius[1]+1): " << m_Filter.Size());
+ }
else
- {
+ {
m_Filter = filter;
- }
+ }
this->Modified();
}
/** Get the filter */
- itkGetConstReferenceMacro(Filter,ArrayType);
+ itkGetConstReferenceMacro(Filter, ArrayType);
/** Set/Get methods for the normalization of the filter */
itkSetMacro(NormalizeFilter, bool);
@@ -135,11 +137,12 @@ public:
/** Since this filter implements a neighborhood operation, it requests a largest input
* region than the output region.
*/
- virtual void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError);
+ virtual void GenerateInputRequestedRegion()
+ throw(itk::InvalidRequestedRegionError);
#ifdef ITK_USE_CONCEPT_CHECKING
/** Begin concept checking */
- itkConceptMacro(InputHasNumericTraitsCheck,(itk::Concept::HasNumericTraits<InputPixelType>));
+ itkConceptMacro(InputHasNumericTraitsCheck, (itk::Concept::HasNumericTraits<InputPixelType>));
/** End concept checking */
#endif
@@ -157,8 +160,8 @@ protected:
// void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,int threadId);
private:
- OverlapSaveConvolutionImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ OverlapSaveConvolutionImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Radius of the filter */
InputSizeType m_Radius;
diff --git a/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.txx b/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.txx
index 213d943551..9c5798f2f2 100644
--- a/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.txx
+++ b/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.txx
@@ -41,7 +41,7 @@ OverlapSaveConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition>
::OverlapSaveConvolutionImageFilter()
{
m_Radius.Fill(1);
- m_Filter.SetSize(3*3);
+ m_Filter.SetSize(3 * 3);
m_Filter.Fill(1);
m_NormalizeFilter = false;
}
@@ -50,19 +50,19 @@ template <class TInputImage, class TOutputImage, class TBoundaryCondition>
void
OverlapSaveConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition>
::GenerateInputRequestedRegion() throw (itk::InvalidRequestedRegionError)
-{
+ {
#if defined USE_FFTWD
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- typename Superclass::InputImagePointer inputPtr = const_cast< TInputImage * >( this->GetInput() );
+ typename Superclass::InputImagePointer inputPtr = const_cast<TInputImage *>(this->GetInput());
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
@@ -74,12 +74,12 @@ OverlapSaveConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition>
// crop the input requested region at the input's largest possible region
if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
- {
+ {
inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
@@ -92,22 +92,24 @@ OverlapSaveConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition>
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
- }
+ }
#else
- itkGenericExceptionMacro(<<"The OverlapSaveConvolutionImageFilter can not operate without the FFTW library (double implementation). Please install it and set it up in the cmake configuration.");
+ itkGenericExceptionMacro(
+ <<
+ "The OverlapSaveConvolutionImageFilter can not operate without the FFTW library (double implementation). Please install it and set it up in the cmake configuration.");
#endif
-}
+ }
-template< class TInputImage, class TOutputImage, class TBoundaryCondition>
+template<class TInputImage, class TOutputImage, class TBoundaryCondition>
void
-OverlapSaveConvolutionImageFilter< TInputImage, TOutputImage, TBoundaryCondition>
+OverlapSaveConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition>
/* TODO commented out since multi-threading is not supported for the moment
* ::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,int threadId) */
::GenerateData()
{
#if defined USE_FFTWD
// Input/Output pointers
- typename OutputImageType::Pointer output = this->GetOutput();
+ typename OutputImageType::Pointer output = this->GetOutput();
typename InputImageType::ConstPointer input = this->GetInput();
/* TODO: This is a patch to switch from GenerateData() to ThreadedGenerateData(). Remove these two lines
@@ -117,8 +119,8 @@ OverlapSaveConvolutionImageFilter< TInputImage, TOutputImage, TBoundaryCondition
// Size of the filter
typename InputImageType::SizeType sizeOfFilter;
- sizeOfFilter[0]=2*m_Radius[0]+1;
- sizeOfFilter[1]=2*m_Radius[1]+1;
+ sizeOfFilter[0] = 2 * m_Radius[0] + 1;
+ sizeOfFilter[1] = 2 * m_Radius[1] + 1;
// Filter normalization
InputRealType norm;
@@ -130,134 +132,149 @@ OverlapSaveConvolutionImageFilter< TInputImage, TOutputImage, TBoundaryCondition
// Compute the piece region for the input thread. Piece region is different
// from input region on boundaries
typename InputImageType::RegionType pieceRegion = inputRegionForThread;
- typename InputImageType::SizeType pieceSize = pieceRegion.GetSize();
- typename InputImageType::IndexType pieceIndex = pieceRegion.GetIndex();
+ typename InputImageType::SizeType pieceSize = pieceRegion.GetSize();
+ typename InputImageType::IndexType pieceIndex = pieceRegion.GetIndex();
// Compute the size of the FFT and the size of the piece
unsigned int pieceNbOfPixel = pieceRegion.GetNumberOfPixels();
- unsigned int sizeFFT=(pieceSize[0]/2+1)*pieceSize[1];
+ unsigned int sizeFFT = (pieceSize[0] / 2 + 1) * pieceSize[1];
// Achieve the computation of the inputRegionForThread
inputRegionForThread.Crop(input->GetLargestPossibleRegion());
typename InputImageType::IndexType inputIndex = inputRegionForThread.GetIndex();
- typename InputImageType::SizeType inputSize = inputRegionForThread.GetSize();
+ typename InputImageType::SizeType inputSize = inputRegionForThread.GetSize();
//Iterator of input image
- itk::ConstNeighborhoodIterator<InputImageType,BoundaryConditionType>
- inputIt(m_Radius,input,inputRegionForThread);
+ itk::ConstNeighborhoodIterator<InputImageType, BoundaryConditionType>
+ inputIt(m_Radius, input, inputRegionForThread);
inputIt.GoToBegin();
//Iterator of output image
itk::ImageRegionIteratorWithIndex<OutputImageType> outputIt;
- outputIt = itk::ImageRegionIteratorWithIndex<OutputImageType>(output,outputRegionForThread);
+ outputIt = itk::ImageRegionIteratorWithIndex<OutputImageType>(output, outputRegionForThread);
//variables for loops
- unsigned int i,j,k,l;
+ unsigned int i, j, k, l;
// ITK proxy to the fftw library
typedef typename itk::fftw::Proxy<double> FFTWProxyType;
//memory allocation
InputPixelType* resampledFilterPiece;
- resampledFilterPiece=static_cast<FFTWProxyType::PixelType*>(fftw_malloc(pieceNbOfPixel*sizeof(InputPixelType)));
+ resampledFilterPiece = static_cast<FFTWProxyType::PixelType*>(fftw_malloc(pieceNbOfPixel * sizeof(InputPixelType)));
FFTWProxyType::ComplexType* filterPieceFFT;
- filterPieceFFT=static_cast<FFTWProxyType::ComplexType*>(fftw_malloc(sizeFFT*sizeof(FFTWProxyType::ComplexType)));
+ filterPieceFFT = static_cast<FFTWProxyType::ComplexType*>(fftw_malloc(sizeFFT * sizeof(FFTWProxyType::ComplexType)));
InputPixelType *inputPiece;
- inputPiece=static_cast<FFTWProxyType::PixelType*>(fftw_malloc(pieceNbOfPixel*sizeof(InputPixelType)));
+ inputPiece = static_cast<FFTWProxyType::PixelType*>(fftw_malloc(pieceNbOfPixel * sizeof(InputPixelType)));
FFTWProxyType::ComplexType* inputPieceFFT;
- inputPieceFFT=static_cast<FFTWProxyType::ComplexType*>(fftw_malloc(sizeFFT*sizeof(FFTWProxyType::ComplexType)));
+ inputPieceFFT = static_cast<FFTWProxyType::ComplexType*>(fftw_malloc(sizeFFT * sizeof(FFTWProxyType::ComplexType)));
// Image piece FFT
- FFTWProxyType::PlanType inputPlan=FFTWProxyType::Plan_dft_r2c_2d(pieceSize[1],pieceSize[0],inputPiece,inputPieceFFT,FFTW_MEASURE);
+ FFTWProxyType::PlanType inputPlan = FFTWProxyType::Plan_dft_r2c_2d(pieceSize[1],
+ pieceSize[0],
+ inputPiece,
+ inputPieceFFT,
+ FFTW_MEASURE);
// left zero padding
- unsigned int leftskip = static_cast<unsigned int>(std::max(0L,inputIndex[0]-pieceIndex[0]));
- unsigned int topskip = pieceSize[0]*static_cast<unsigned int>(std::max(0L,inputIndex[1]-pieceIndex[1]));
+ unsigned int leftskip = static_cast<unsigned int>(std::max(0L, inputIndex[0] - pieceIndex[0]));
+ unsigned int topskip = pieceSize[0] * static_cast<unsigned int>(std::max(0L, inputIndex[1] - pieceIndex[1]));
// Filling the buffer with image values
- for (l = 0; l<inputSize[1]; ++l)
- {
- for (k = 0; k<inputSize[0]; ++k)
+ for (l = 0; l < inputSize[1]; ++l)
{
- inputPiece[topskip+pieceSize[0]*l+k+leftskip]=inputIt.GetCenterPixel();
+ for (k = 0; k < inputSize[0]; ++k)
+ {
+ inputPiece[topskip + pieceSize[0] * l + k + leftskip] = inputIt.GetCenterPixel();
++inputIt;
+ }
}
- }
FFTWProxyType::Execute(inputPlan);
// Resampled filter FFT
- FFTWProxyType::PlanType filterPlan=FFTWProxyType::Plan_dft_r2c_2d(pieceSize[1],pieceSize[0],resampledFilterPiece,filterPieceFFT,FFTW_MEASURE);
+ FFTWProxyType::PlanType filterPlan = FFTWProxyType::Plan_dft_r2c_2d(pieceSize[1],
+ pieceSize[0],
+ resampledFilterPiece,
+ filterPieceFFT,
+ FFTW_MEASURE);
- k=0;
+ k = 0;
// Filling the buffer with filter values
- for (j=0;j<sizeOfFilter[1];++j)
- {
- for (i=0;i<sizeOfFilter[0];++i)
+ for (j = 0; j < sizeOfFilter[1]; ++j)
{
- resampledFilterPiece[i+j*pieceSize[0]]=m_Filter.GetElement(k);//Copy values
+ for (i = 0; i < sizeOfFilter[0]; ++i)
+ {
+ resampledFilterPiece[i + j * pieceSize[0]] = m_Filter.GetElement(k); //Copy values
++k;
+ }
}
- }
FFTWProxyType::Execute(filterPlan);
// memory allocation for inverse FFT
FFTWProxyType::ComplexType* multipliedFFTarray;
- multipliedFFTarray=static_cast<FFTWProxyType::ComplexType*>(fftw_malloc(sizeFFT*sizeof(FFTWProxyType::ComplexType)));
+ multipliedFFTarray = static_cast<FFTWProxyType::ComplexType*>(fftw_malloc(sizeFFT * sizeof(FFTWProxyType::ComplexType)));
FFTWProxyType::PixelType* inverseFFTpiece;
- inverseFFTpiece=static_cast<FFTWProxyType::PixelType*>(fftw_malloc(pieceNbOfPixel*sizeof(FFTWProxyType::PixelType)));
-
+ inverseFFTpiece = static_cast<FFTWProxyType::PixelType*>(fftw_malloc(pieceNbOfPixel * sizeof(FFTWProxyType::PixelType)));
// Inverse FFT of the product of FFT (actually do filtering here)
- FFTWProxyType::PlanType outputPlan=FFTWProxyType::Plan_dft_c2r_2d(pieceSize[1],pieceSize[0],multipliedFFTarray,inverseFFTpiece,FFTW_MEASURE);
+ FFTWProxyType::PlanType outputPlan = FFTWProxyType::Plan_dft_c2r_2d(pieceSize[1],
+ pieceSize[0],
+ multipliedFFTarray,
+ inverseFFTpiece,
+ FFTW_MEASURE);
// Filling the buffer with complex product values
- for (k=0;k<sizeFFT;++k)
- {
+ for (k = 0; k < sizeFFT; ++k)
+ {
//complex mutiplication
- multipliedFFTarray[k][0]=inputPieceFFT[k][0]*filterPieceFFT[k][0]-inputPieceFFT[k][1]*filterPieceFFT[k][1];
- multipliedFFTarray[k][1]=inputPieceFFT[k][0]*filterPieceFFT[k][1]+inputPieceFFT[k][1]*filterPieceFFT[k][0];
- }
+ multipliedFFTarray[k][0] = inputPieceFFT[k][0] * filterPieceFFT[k][0] - inputPieceFFT[k][1] * filterPieceFFT[k][1];
+ multipliedFFTarray[k][1] = inputPieceFFT[k][0] * filterPieceFFT[k][1] + inputPieceFFT[k][1] * filterPieceFFT[k][0];
+ }
FFTWProxyType::Execute(outputPlan);
// Computing the filter normalization
if (m_NormalizeFilter)
- {
- norm = itk::NumericTraits<InputRealType>::Zero;
- for (i=0;i<sizeOfFilter[0]*sizeOfFilter[1];++i)
{
+ norm = itk::NumericTraits<InputRealType>::Zero;
+ for (i = 0; i < sizeOfFilter[0] * sizeOfFilter[1]; ++i)
+ {
norm += static_cast<InputRealType>(m_Filter(i));
- }
+ }
if (norm == 0.0)
- {
+ {
norm = 1.0;
- }
+ }
else
- {
- norm = 1/norm;
+ {
+ norm = 1 / norm;
+ }
}
- }
else
- {
+ {
norm = 1.0;
- }
+ }
// Fill the ouptut image
outputIt.GoToBegin();
while (!outputIt.IsAtEnd())
- {
+ {
typename InputImageType::IndexType index = outputIt.GetIndex();
- unsigned int linearIndex = (index[1]+sizeOfFilter[1]-1-outputRegionForThread.GetIndex()[1])*pieceSize[0]-1+index[0]+sizeOfFilter[0]-outputRegionForThread.GetIndex()[0];
- outputIt.Set( static_cast<OutputPixelType>((inverseFFTpiece[linearIndex]/pieceNbOfPixel)*static_cast<double>(norm) ));
+ unsigned int linearIndex =
+ (index[1] + sizeOfFilter[1] - 1 -
+ outputRegionForThread.GetIndex()[1]) * pieceSize[0] - 1 + index[0] + sizeOfFilter[0] -
+ outputRegionForThread.GetIndex()[0];
+ outputIt.Set(static_cast<OutputPixelType>((inverseFFTpiece[linearIndex] /
+ pieceNbOfPixel) * static_cast<double>(norm)));
++outputIt;
- }
+ }
// destroy the FFT plans
FFTWProxyType::DestroyPlan(inputPlan);
@@ -272,7 +289,9 @@ OverlapSaveConvolutionImageFilter< TInputImage, TOutputImage, TBoundaryCondition
fftw_free(multipliedFFTarray);
fftw_free(inverseFFTpiece);
#else
- itkGenericExceptionMacro(<<"The OverlapSaveConvolutionImageFilter can not operate without the FFTW library (double implementation). Please install it and set it up in the cmake configuration.");
+ itkGenericExceptionMacro(
+ <<
+ "The OverlapSaveConvolutionImageFilter can not operate without the FFTW library (double implementation). Please install it and set it up in the cmake configuration.");
#endif
}
@@ -280,13 +299,12 @@ OverlapSaveConvolutionImageFilter< TInputImage, TOutputImage, TBoundaryCondition
template <class TInputImage, class TOutput, class TBoundaryCondition>
void
OverlapSaveConvolutionImageFilter<TInputImage, TOutput, TBoundaryCondition>
-::PrintSelf(std::ostream& os,itk::Indent indent) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "Radius: " << m_Radius << std::endl;
- os << indent << "Normalize filter: "<<m_NormalizeFilter << std::endl;
+ os << indent << "Normalize filter: " << m_NormalizeFilter << std::endl;
}
} // end namespace otb
#endif
-
diff --git a/Code/BasicFilters/otbPathLengthFunctor.h b/Code/BasicFilters/otbPathLengthFunctor.h
index 69d133013e..fc17eb1650 100644
--- a/Code/BasicFilters/otbPathLengthFunctor.h
+++ b/Code/BasicFilters/otbPathLengthFunctor.h
@@ -37,7 +37,7 @@ class PathLengthFunctor
{
public:
- void SetThreshold(double threshold )
+ void SetThreshold(double threshold)
{
m_Threshold = threshold;
}
@@ -49,21 +49,21 @@ public:
PathLengthFunctor()
{
m_Threshold = 10;
- };
- ~PathLengthFunctor() {};
+ }
+ ~PathLengthFunctor() {}
- inline bool operator()(const TInput1 & input)
+ inline bool operator ()(const TInput1& input)
{
double length = input->GetLength();
if (length > m_Threshold)
- {
+ {
return true;
- }
+ }
else
- {
+ {
return false;
- }
+ }
}
private:
diff --git a/Code/BasicFilters/otbPathMeanDistanceFunctor.h b/Code/BasicFilters/otbPathMeanDistanceFunctor.h
index b0530fcb97..4602847c4a 100644
--- a/Code/BasicFilters/otbPathMeanDistanceFunctor.h
+++ b/Code/BasicFilters/otbPathMeanDistanceFunctor.h
@@ -38,65 +38,63 @@ class PathMeanDistanceFunctor
{
public:
-
- void SetThreshold(double threshold )
+ void SetThreshold(double threshold)
{
m_Threshold = threshold;
}
- double GetThreshold(void)const
+ double GetThreshold(void) const
{
- return ( m_Threshold );
+ return (m_Threshold);
}
PathMeanDistanceFunctor()
{
m_Threshold = 0.2;
- };
- ~PathMeanDistanceFunctor() {};
+ }
+ ~PathMeanDistanceFunctor() {}
- inline bool operator()(const TInput1 & input)
+ inline bool operator ()(const TInput1& input)
{
double meanDistance = 0.0;
typedef typename TInput1::ObjectType::VertexListType::ConstIterator VertexListConstIteratorType;
- typedef typename TInput1::ObjectType::VertexType VertexType;
+ typedef typename TInput1::ObjectType::VertexType VertexType;
VertexListConstIteratorType beginIt = input->GetVertexList()->Begin();
VertexType v1 = beginIt.Value();
VertexType v2 = beginIt.Value();
++beginIt;
while (beginIt != input->GetVertexList()->End())
- {
+ {
v1 = v2;
v2 = beginIt.Value();
- meanDistance+=vcl_sqrt(vcl_pow(v1[0]-v2[0],2)+vcl_pow(v1[1]-v2[1],2));
+ meanDistance += vcl_sqrt(vcl_pow(v1[0] - v2[0], 2) + vcl_pow(v1[1] - v2[1], 2));
++beginIt;
- }
+ }
double nbVertices = static_cast<double>(input->GetVertexList()->Size());
- if (nbVertices>1)
- {
- meanDistance = meanDistance / (nbVertices-1);
- }
+ if (nbVertices > 1)
+ {
+ meanDistance = meanDistance / (nbVertices - 1);
+ }
else
- {
- itkGenericExceptionMacro(<<"Object with only one vertex!" );
- }
+ {
+ itkGenericExceptionMacro(<< "Object with only one vertex!");
+ }
/* std::cout << "Num vertex: " << nbVertices << std::endl;
std::cout << "Mean dist: " << meanDistance << std::endl;
*/
- if ( meanDistance > m_Threshold)
- {
+ if (meanDistance > m_Threshold)
+ {
return true;
- }
+ }
else
- {
+ {
return false;
- }
+ }
}
-
private:
double m_Threshold;
};
diff --git a/Code/BasicFilters/otbPerBandVectorImageFilter.h b/Code/BasicFilters/otbPerBandVectorImageFilter.h
index 6eaf30e08d..328b647060 100644
--- a/Code/BasicFilters/otbPerBandVectorImageFilter.h
+++ b/Code/BasicFilters/otbPerBandVectorImageFilter.h
@@ -42,14 +42,14 @@ namespace otb
*/
template <class TInputImage, class TOutputImage, class TFilter>
class ITK_EXPORT PerBandVectorImageFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef PerBandVectorImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PerBandVectorImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -58,37 +58,36 @@ public:
itkTypeMacro(PerBandVectorImageFilter, ImageToImageFilter);
/** Template parameters typedefs */
- typedef TInputImage InputVectorImageType;
- typedef typename InputVectorImageType::Pointer InputVectorImagePointerType;
- typedef typename InputVectorImageType::InternalPixelType InputPixelType;
- typedef Image<InputPixelType,InputVectorImageType::ImageDimension> InputImageType;
- typedef ImageList<InputImageType> InputImageListType;
-
- typedef TOutputImage OutputVectorImageType;
- typedef typename OutputVectorImageType::Pointer OutputVectorImagePointerType;
- typedef typename OutputVectorImageType::InternalPixelType OutputPixelType;
- typedef Image<OutputPixelType,OutputVectorImageType::ImageDimension> OutputImageType;
- typedef ImageList<OutputImageType> OutputImageListType;
-
- typedef TFilter FilterType;
+ typedef TInputImage InputVectorImageType;
+ typedef typename InputVectorImageType::Pointer InputVectorImagePointerType;
+ typedef typename InputVectorImageType::InternalPixelType InputPixelType;
+ typedef Image<InputPixelType, InputVectorImageType::ImageDimension> InputImageType;
+ typedef ImageList<InputImageType> InputImageListType;
+
+ typedef TOutputImage OutputVectorImageType;
+ typedef typename OutputVectorImageType::Pointer OutputVectorImagePointerType;
+ typedef typename OutputVectorImageType::InternalPixelType OutputPixelType;
+ typedef Image<OutputPixelType, OutputVectorImageType::ImageDimension> OutputImageType;
+ typedef ImageList<OutputImageType> OutputImageListType;
+
+ typedef TFilter FilterType;
typedef typename FilterType::Pointer FilterPointerType;
// Internal filters definition
- typedef VectorImageToImageListFilter<InputVectorImageType,InputImageListType> DecompositionFilterType;
- typedef typename DecompositionFilterType::Pointer DecompositionFilterPointerType;
- typedef ImageListToImageListApplyFilter<InputImageListType,OutputImageListType,FilterType>
+ typedef VectorImageToImageListFilter<InputVectorImageType, InputImageListType> DecompositionFilterType;
+ typedef typename DecompositionFilterType::Pointer DecompositionFilterPointerType;
+ typedef ImageListToImageListApplyFilter<InputImageListType, OutputImageListType, FilterType>
ProcessingFilterType;
- typedef typename ProcessingFilterType::Pointer ProcessingFilterPointerType;
- typedef ImageListToVectorImageFilter<OutputImageListType,OutputVectorImageType> RecompositionFilterType;
- typedef typename RecompositionFilterType::Pointer RecompositionFilterPointerType;
+ typedef typename ProcessingFilterType::Pointer ProcessingFilterPointerType;
+ typedef ImageListToVectorImageFilter<OutputImageListType, OutputVectorImageType> RecompositionFilterType;
+ typedef typename RecompositionFilterType::Pointer RecompositionFilterPointerType;
/// Accessors
- itkSetObjectMacro(Filter,FilterType);
- itkGetObjectMacro(Filter,FilterType);
-
- itkSetMacro(OutputIndex,unsigned int);
- itkGetMacro(OutputIndex,unsigned int);
+ itkSetObjectMacro(Filter, FilterType);
+ itkGetObjectMacro(Filter, FilterType);
+ itkSetMacro(OutputIndex, unsigned int);
+ itkGetMacro(OutputIndex, unsigned int);
virtual void GenerateInputRequestedRegion(void);
virtual void GenerateOutputInformation(void);
@@ -99,13 +98,13 @@ protected:
/** Constructor */
PerBandVectorImageFilter();
/** Destructor */
- virtual ~PerBandVectorImageFilter() {};
+ virtual ~PerBandVectorImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- PerBandVectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PerBandVectorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/// The processing filter
FilterPointerType m_Filter;
@@ -113,7 +112,7 @@ private:
/// The index of the output of the filter to gather
unsigned m_OutputIndex;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbPerBandVectorImageFilter.txx"
#endif
diff --git a/Code/BasicFilters/otbPerBandVectorImageFilter.txx b/Code/BasicFilters/otbPerBandVectorImageFilter.txx
index f6b729a0c3..2687b4a806 100644
--- a/Code/BasicFilters/otbPerBandVectorImageFilter.txx
+++ b/Code/BasicFilters/otbPerBandVectorImageFilter.txx
@@ -26,7 +26,7 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage, class TFilter>
-PerBandVectorImageFilter<TInputImage,TOutputImage,TFilter>
+PerBandVectorImageFilter<TInputImage, TOutputImage, TFilter>
::PerBandVectorImageFilter()
{
m_Filter = FilterType::New();
@@ -35,11 +35,11 @@ PerBandVectorImageFilter<TInputImage,TOutputImage,TFilter>
template <class TInputImage, class TOutputImage, class TFilter>
void
-PerBandVectorImageFilter<TInputImage,TOutputImage,TFilter>
+PerBandVectorImageFilter<TInputImage, TOutputImage, TFilter>
::GenerateOutputInformation()
{
if (this->GetInput())
- {
+ {
// Create a false monoband image
typename InputImageType::Pointer dummyInputImage = InputImageType::New();
dummyInputImage->CopyInformation(this->GetInput());
@@ -48,15 +48,15 @@ PerBandVectorImageFilter<TInputImage,TOutputImage,TFilter>
m_Filter->UpdateOutputInformation();
this->GetOutput()->CopyInformation(m_Filter->GetOutput(m_OutputIndex));
this->GetOutput()->SetNumberOfComponentsPerPixel(this->GetInput()->GetNumberOfComponentsPerPixel());
- }
+ }
}
template <class TInputImage, class TOutputImage, class TFilter>
void
-PerBandVectorImageFilter<TInputImage,TOutputImage,TFilter>
+PerBandVectorImageFilter<TInputImage, TOutputImage, TFilter>
::GenerateInputRequestedRegion()
{
- InputVectorImageType * inputPtr = const_cast<InputVectorImageType *>(this->GetInput());
+ InputVectorImageType * inputPtr = const_cast<InputVectorImageType *>(this->GetInput());
typename InputImageType::Pointer dummyInputImage = InputImageType::New();
dummyInputImage->CopyInformation(this->GetInput());
dummyInputImage->SetNumberOfComponentsPerPixel(1);
@@ -70,13 +70,13 @@ PerBandVectorImageFilter<TInputImage,TOutputImage,TFilter>
*/
template <class TInputImage, class TOutputImage, class TFilter>
void
-PerBandVectorImageFilter<TInputImage,TOutputImage,TFilter>
+PerBandVectorImageFilter<TInputImage, TOutputImage, TFilter>
::GenerateData()
{
- InputVectorImageType * inputPtr = const_cast<InputVectorImageType *>(this->GetInput());
- OutputVectorImagePointerType outputPtr = this->GetOutput();
+ InputVectorImageType * inputPtr = const_cast<InputVectorImageType *>(this->GetInput());
+ OutputVectorImagePointerType outputPtr = this->GetOutput();
DecompositionFilterPointerType decomposer = DecompositionFilterType::New();
- ProcessingFilterPointerType processor = ProcessingFilterType::New();
+ ProcessingFilterPointerType processor = ProcessingFilterType::New();
RecompositionFilterPointerType recomposer = RecompositionFilterType::New();
inputPtr->UpdateOutputData();
@@ -97,7 +97,7 @@ PerBandVectorImageFilter<TInputImage,TOutputImage,TFilter>
*/
template <class TInputImage, class TOutputImage, class TFilter>
void
-PerBandVectorImageFilter<TInputImage,TOutputImage,TFilter>
+PerBandVectorImageFilter<TInputImage, TOutputImage, TFilter>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/BasicFilters/otbPersistentVectorizationImageFilter.h b/Code/BasicFilters/otbPersistentVectorizationImageFilter.h
index eca4d72bbb..9a500aea96 100644
--- a/Code/BasicFilters/otbPersistentVectorizationImageFilter.h
+++ b/Code/BasicFilters/otbPersistentVectorizationImageFilter.h
@@ -44,14 +44,14 @@ namespace otb
*/
template<class TInputImage, class TOutputPath>
class ITK_EXPORT PersistentVectorizationImageFilter :
- public PersistentImageFilter<TInputImage, TInputImage>
+ public PersistentImageFilter<TInputImage, TInputImage>
{
public:
/** Standard Self typedef */
- typedef PersistentVectorizationImageFilter Self;
- typedef PersistentImageFilter<TInputImage,TInputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PersistentVectorizationImageFilter Self;
+ typedef PersistentImageFilter<TInputImage, TInputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -61,38 +61,38 @@ public:
/** Image related typedefs. */
// First Input
- typedef TInputImage ImageType;
- typedef typename TInputImage::Pointer InputImagePointer;
- typedef typename TInputImage::RegionType RegionType;
- typedef typename TInputImage::SizeType SizeType;
- typedef typename TInputImage::IndexType IndexType;
- typedef typename TInputImage::PixelType PixelType;
- typedef typename TInputImage::InternalPixelType InternalPixelType;
+ typedef TInputImage ImageType;
+ typedef typename TInputImage::Pointer InputImagePointer;
+ typedef typename TInputImage::RegionType RegionType;
+ typedef typename TInputImage::SizeType SizeType;
+ typedef typename TInputImage::IndexType IndexType;
+ typedef typename TInputImage::PixelType PixelType;
+ typedef typename TInputImage::InternalPixelType InternalPixelType;
// Output path type
- typedef TOutputPath PathType;
- typedef otb::ObjectList<PathType> PathListType;
- typedef typename PathListType::Pointer PathListPointerType;
- typedef typename PathType::Pointer PathPointerType;
- typedef itk::MinimumMaximumImageFilter<ImageType> MinMaxFilterType;
- typedef typename MinMaxFilterType::Pointer MinMaxFilterPointerType;
- typedef otb::ImageToEdgePathFilter<ImageType,PathType> ImageToEdgePathFilterType;
- typedef typename ImageToEdgePathFilterType::Pointer ImageToEdgePathFilterPointerType;
+ typedef TOutputPath PathType;
+ typedef otb::ObjectList<PathType> PathListType;
+ typedef typename PathListType::Pointer PathListPointerType;
+ typedef typename PathType::Pointer PathPointerType;
+ typedef itk::MinimumMaximumImageFilter<ImageType> MinMaxFilterType;
+ typedef typename MinMaxFilterType::Pointer MinMaxFilterPointerType;
+ typedef otb::ImageToEdgePathFilter<ImageType, PathType> ImageToEdgePathFilterType;
+ typedef typename ImageToEdgePathFilterType::Pointer ImageToEdgePathFilterPointerType;
virtual void Reset(void);
virtual void Synthetize(void);
- itkGetObjectMacro(PathList,PathListType);
+ itkGetObjectMacro(PathList, PathListType);
protected:
PersistentVectorizationImageFilter();
- virtual ~PersistentVectorizationImageFilter() {};
+ virtual ~PersistentVectorizationImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
virtual void GenerateData();
private:
- PersistentVectorizationImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PersistentVectorizationImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
// Min max filter (the mini-pipeline)
MinMaxFilterPointerType m_MinMaxFilter;
diff --git a/Code/BasicFilters/otbPersistentVectorizationImageFilter.txx b/Code/BasicFilters/otbPersistentVectorizationImageFilter.txx
index 60416f664b..07b00d0675 100644
--- a/Code/BasicFilters/otbPersistentVectorizationImageFilter.txx
+++ b/Code/BasicFilters/otbPersistentVectorizationImageFilter.txx
@@ -36,7 +36,6 @@ PersistentVectorizationImageFilter<TInputImage, TOutputPath>
m_PathList = PathListType::New();
}
-
template<class TInputImage, class TOutputPath>
void
PersistentVectorizationImageFilter<TInputImage, TOutputPath>
@@ -62,15 +61,14 @@ PersistentVectorizationImageFilter<TInputImage, TOutputPath>
m_MinMaxFilter->Update();
this->GraftOutput(m_MinMaxFilter->GetOutput());
-
- for (PixelType label = m_MinMaxFilter->GetMinimum()+1; label<=m_MinMaxFilter->GetMaximum(); ++label)
- {
+ for (PixelType label = m_MinMaxFilter->GetMinimum() + 1; label <= m_MinMaxFilter->GetMaximum(); ++label)
+ {
ImageToEdgePathFilterPointerType edgeFilter = ImageToEdgePathFilterType::New();
edgeFilter->SetInput(m_MinMaxFilter->GetOutput());
edgeFilter->SetForegroundValue(label);
edgeFilter->Update();
m_PathList->PushBack(edgeFilter->GetOutput());
- }
+ }
}
template<class TInputImage, class TOutputPath>
@@ -78,9 +76,8 @@ void
PersistentVectorizationImageFilter<TInputImage, TOutputPath>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/BasicFilters/otbPointSetDensityEpanechnikovFunction.h b/Code/BasicFilters/otbPointSetDensityEpanechnikovFunction.h
index b3cdcd01cb..6db85d75f3 100644
--- a/Code/BasicFilters/otbPointSetDensityEpanechnikovFunction.h
+++ b/Code/BasicFilters/otbPointSetDensityEpanechnikovFunction.h
@@ -31,16 +31,15 @@ namespace otb
*
* \ingroup PointSetFunctions
*/
-template <class TPointSet, class TOutput>
-class ITK_EXPORT PointSetDensityEpanechnikovFunction : public PointSetFunction< TPointSet , TOutput >
+template <class TPointSet, class TOutput>
+class ITK_EXPORT PointSetDensityEpanechnikovFunction : public PointSetFunction<TPointSet, TOutput>
{
public:
/** Standard class typedefs. */
- typedef PointSetDensityEpanechnikovFunction Self;
- typedef PointSetFunction< TPointSet ,TOutput > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef PointSetDensityEpanechnikovFunction Self;
+ typedef PointSetFunction<TPointSet, TOutput> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(PointSetDensityEpanechnikovFunction, PointSetFunction);
@@ -49,37 +48,35 @@ public:
itkNewMacro(Self);
/** PointSet Type typedef Support*/
- typedef TPointSet PointSetType;
- typedef typename Superclass::InputType InputType;
- typedef typename PointSetType::Pointer PointSetPointerType;
+ typedef TPointSet PointSetType;
+ typedef typename Superclass::InputType InputType;
+ typedef typename PointSetType::Pointer PointSetPointerType;
/** TOutput typedef support*/
- typedef TOutput OutputType;
+ typedef TOutput OutputType;
/** Set/Get the number of scales*/
- itkSetMacro(Radius,unsigned int);
- itkGetMacro(Radius,unsigned int);
+ itkSetMacro(Radius, unsigned int);
+ itkGetMacro(Radius, unsigned int);
/** Evaluate Method */
- virtual OutputType Evaluate(const InputType& input ) const;
+ virtual OutputType Evaluate(const InputType& input) const;
protected:
- PointSetDensityEpanechnikovFunction(): m_Radius(1) {};
- virtual ~PointSetDensityEpanechnikovFunction() {};
+ PointSetDensityEpanechnikovFunction() : m_Radius(1) {};
+ virtual ~PointSetDensityEpanechnikovFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
private:
- PointSetDensityEpanechnikovFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ PointSetDensityEpanechnikovFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
unsigned int m_Radius;
};
} // end namespace otb
-
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbPointSetDensityEpanechnikovFunction.txx"
#endif
diff --git a/Code/BasicFilters/otbPointSetDensityEpanechnikovFunction.txx b/Code/BasicFilters/otbPointSetDensityEpanechnikovFunction.txx
index 4bf6be1063..63af5cffe5 100644
--- a/Code/BasicFilters/otbPointSetDensityEpanechnikovFunction.txx
+++ b/Code/BasicFilters/otbPointSetDensityEpanechnikovFunction.txx
@@ -26,29 +26,29 @@ namespace otb
/**
* Evaluate
*/
-template <class TPointSet, class TOutput >
-typename PointSetDensityEpanechnikovFunction< TPointSet, TOutput>
+template <class TPointSet, class TOutput>
+typename PointSetDensityEpanechnikovFunction<TPointSet, TOutput>
::OutputType
-PointSetDensityEpanechnikovFunction< TPointSet, TOutput>
-::Evaluate(const InputType& input ) const
+PointSetDensityEpanechnikovFunction<TPointSet, TOutput>
+::Evaluate(const InputType& input) const
{
double accu = 0;
- double radiussq = m_Radius*m_Radius;
+ double radiussq = m_Radius * m_Radius;
if (this->GetPointSet()->GetNumberOfPoints() != 0)
{
typedef typename TPointSet::PointsContainer::ConstIterator iteratorType;
iteratorType it = this->GetPointSet()->GetPoints()->Begin();
- while ( it != this->GetPointSet()->GetPoints()->End())
+ while (it != this->GetPointSet()->GetPoints()->End())
{
- float distX = input[0]-it.Value()[0];
- float distY = input[1]-it.Value()[1];
- float distsq = distX*distX + distY*distY;
+ float distX = input[0] - it.Value()[0];
+ float distY = input[1] - it.Value()[1];
+ float distsq = distX * distX + distY * distY;
if (distsq < radiussq)
{
- accu += 0.75 * (1-distsq/radiussq);
+ accu += 0.75 * (1 - distsq / radiussq);
}
++it;
}
@@ -60,12 +60,12 @@ PointSetDensityEpanechnikovFunction< TPointSet, TOutput>
/**
* PrintSelf
*/
-template <class TPointSet, class TOutput >
+template <class TPointSet, class TOutput>
void
-PointSetDensityEpanechnikovFunction< TPointSet, TOutput>
+PointSetDensityEpanechnikovFunction<TPointSet, TOutput>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/BasicFilters/otbPointSetDensityFunction.h b/Code/BasicFilters/otbPointSetDensityFunction.h
index 1c035f3668..846838d97c 100644
--- a/Code/BasicFilters/otbPointSetDensityFunction.h
+++ b/Code/BasicFilters/otbPointSetDensityFunction.h
@@ -31,16 +31,15 @@ namespace otb
*
* \ingroup PointSetFunctions
*/
-template <class TPointSet, class TOutput>
-class ITK_EXPORT PointSetDensityFunction : public PointSetFunction< TPointSet , TOutput >
+template <class TPointSet, class TOutput>
+class ITK_EXPORT PointSetDensityFunction : public PointSetFunction<TPointSet, TOutput>
{
public:
/** Standard class typedefs. */
- typedef PointSetDensityFunction Self;
- typedef PointSetFunction< TPointSet ,TOutput > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef PointSetDensityFunction Self;
+ typedef PointSetFunction<TPointSet, TOutput> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(PointSetDensityFunction, PointSetFunction);
@@ -49,37 +48,35 @@ public:
itkNewMacro(Self);
/** PointSet Type typedef Support*/
- typedef TPointSet PointSetType;
- typedef typename Superclass::InputType InputType;
- typedef typename PointSetType::Pointer PointSetPointerType;
+ typedef TPointSet PointSetType;
+ typedef typename Superclass::InputType InputType;
+ typedef typename PointSetType::Pointer PointSetPointerType;
/** TOutput typedef support*/
- typedef TOutput OutputType;
+ typedef TOutput OutputType;
/** Set/Get the number of scales*/
- itkSetMacro(Radius,unsigned int);
- itkGetMacro(Radius,unsigned int);
+ itkSetMacro(Radius, unsigned int);
+ itkGetMacro(Radius, unsigned int);
/** Evaluate Method */
- virtual OutputType Evaluate(const InputType& input ) const;
+ virtual OutputType Evaluate(const InputType& input) const;
protected:
- PointSetDensityFunction(): m_Radius(1) {};
- virtual ~PointSetDensityFunction() {};
+ PointSetDensityFunction() : m_Radius(1) {};
+ virtual ~PointSetDensityFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
private:
- PointSetDensityFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ PointSetDensityFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
unsigned int m_Radius;
};
} // end namespace otb
-
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbPointSetDensityFunction.txx"
#endif
diff --git a/Code/BasicFilters/otbPointSetDensityFunction.txx b/Code/BasicFilters/otbPointSetDensityFunction.txx
index fafa509846..8cf53d4786 100644
--- a/Code/BasicFilters/otbPointSetDensityFunction.txx
+++ b/Code/BasicFilters/otbPointSetDensityFunction.txx
@@ -26,47 +26,47 @@ namespace otb
/**
* Evaluate
*/
-template <class TPointSet, class TOutput >
-typename PointSetDensityFunction< TPointSet, TOutput>
+template <class TPointSet, class TOutput>
+typename PointSetDensityFunction<TPointSet, TOutput>
::OutputType
-PointSetDensityFunction< TPointSet, TOutput>
-::Evaluate(const InputType& input ) const
+PointSetDensityFunction<TPointSet, TOutput>
+::Evaluate(const InputType& input) const
{
- int accu = 0;
- double surface = CONST_PI*m_Radius*m_Radius;
+ int accu = 0;
+ double surface = CONST_PI * m_Radius * m_Radius;
if (this->GetPointSet()->GetNumberOfPoints() != 0)
- {
+ {
typedef typename TPointSet::PointsContainer::ConstIterator iteratorType;
iteratorType it = this->GetPointSet()->GetPoints()->Begin();
- while ( it != this->GetPointSet()->GetPoints()->End())
- {
- float distX = input[0]-it.Value()[0];
- float distY = input[1]-it.Value()[1];
- float distsq = distX*distX + distY*distY;
-
- if (distsq <= m_Radius*m_Radius)
+ while (it != this->GetPointSet()->GetPoints()->End())
{
+ float distX = input[0] - it.Value()[0];
+ float distY = input[1] - it.Value()[1];
+ float distsq = distX * distX + distY * distY;
+
+ if (distsq <= m_Radius * m_Radius)
+ {
accu++;
- }
+ }
++it;
+ }
}
- }
- return static_cast<float>(accu/surface);
+ return static_cast<float>(accu / surface);
}
/**
* PrintSelf
*/
-template <class TPointSet, class TOutput >
+template <class TPointSet, class TOutput>
void
-PointSetDensityFunction< TPointSet, TOutput>
+PointSetDensityFunction<TPointSet, TOutput>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/BasicFilters/otbPointSetDensityGaussianFunction.h b/Code/BasicFilters/otbPointSetDensityGaussianFunction.h
index a2ce8af952..adc6c5b3b8 100644
--- a/Code/BasicFilters/otbPointSetDensityGaussianFunction.h
+++ b/Code/BasicFilters/otbPointSetDensityGaussianFunction.h
@@ -31,16 +31,15 @@ namespace otb
*
* \ingroup PointSetFunctions
*/
-template <class TPointSet, class TOutput>
-class ITK_EXPORT PointSetDensityGaussianFunction : public PointSetFunction< TPointSet , TOutput >
+template <class TPointSet, class TOutput>
+class ITK_EXPORT PointSetDensityGaussianFunction : public PointSetFunction<TPointSet, TOutput>
{
public:
/** Standard class typedefs. */
- typedef PointSetDensityGaussianFunction Self;
- typedef PointSetFunction< TPointSet ,TOutput > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef PointSetDensityGaussianFunction Self;
+ typedef PointSetFunction<TPointSet, TOutput> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(PointSetDensityGaussianFunction, PointSetFunction);
@@ -49,37 +48,35 @@ public:
itkNewMacro(Self);
/** PointSet Type typedef Support*/
- typedef TPointSet PointSetType;
- typedef typename Superclass::InputType InputType;
- typedef typename PointSetType::Pointer PointSetPointerType;
+ typedef TPointSet PointSetType;
+ typedef typename Superclass::InputType InputType;
+ typedef typename PointSetType::Pointer PointSetPointerType;
/** TOutput typedef support*/
- typedef TOutput OutputType;
+ typedef TOutput OutputType;
/** Set/Get the number of scales*/
- itkSetMacro(Radius,unsigned int);
- itkGetMacro(Radius,unsigned int);
+ itkSetMacro(Radius, unsigned int);
+ itkGetMacro(Radius, unsigned int);
/** Evaluate Method */
- virtual OutputType Evaluate(const InputType& input ) const;
+ virtual OutputType Evaluate(const InputType& input) const;
protected:
- PointSetDensityGaussianFunction(): m_Radius(1) {};
- virtual ~PointSetDensityGaussianFunction() {};
+ PointSetDensityGaussianFunction() : m_Radius(1) {};
+ virtual ~PointSetDensityGaussianFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
private:
- PointSetDensityGaussianFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ PointSetDensityGaussianFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
unsigned int m_Radius;
};
} // end namespace otb
-
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbPointSetDensityGaussianFunction.txx"
#endif
diff --git a/Code/BasicFilters/otbPointSetDensityGaussianFunction.txx b/Code/BasicFilters/otbPointSetDensityGaussianFunction.txx
index b51856b3d9..c4de669a3c 100644
--- a/Code/BasicFilters/otbPointSetDensityGaussianFunction.txx
+++ b/Code/BasicFilters/otbPointSetDensityGaussianFunction.txx
@@ -26,32 +26,32 @@ namespace otb
/**
* Evaluate
*/
-template <class TPointSet, class TOutput >
-typename PointSetDensityGaussianFunction< TPointSet, TOutput>
+template <class TPointSet, class TOutput>
+typename PointSetDensityGaussianFunction<TPointSet, TOutput>
::OutputType
-PointSetDensityGaussianFunction< TPointSet, TOutput>
-::Evaluate(const InputType& input ) const
+PointSetDensityGaussianFunction<TPointSet, TOutput>
+::Evaluate(const InputType& input) const
{
double accu = 0;
- double radiussq = m_Radius*m_Radius;
+ double radiussq = m_Radius * m_Radius;
if (this->GetPointSet()->GetNumberOfPoints() != 0)
- {
+ {
typedef typename TPointSet::PointsContainer::ConstIterator iteratorType;
iteratorType it = this->GetPointSet()->GetPoints()->Begin();
- while ( it != this->GetPointSet()->GetPoints()->End())
- {
- float distX = input[0]-it.Value()[0];
- float distY = input[1]-it.Value()[1];
- float distsq = distX*distX + distY*distY;
+ while (it != this->GetPointSet()->GetPoints()->End())
+ {
+ float distX = input[0] - it.Value()[0];
+ float distY = input[1] - it.Value()[1];
+ float distsq = distX * distX + distY * distY;
- accu += vcl_exp(-distsq/radiussq/2);
+ accu += vcl_exp(-distsq / radiussq / 2);
++it;
+ }
+ accu /= vcl_sqrt(2 * CONST_PI * radiussq);
}
- accu /= vcl_sqrt(2*CONST_PI*radiussq);
- }
return accu;
}
@@ -59,12 +59,12 @@ PointSetDensityGaussianFunction< TPointSet, TOutput>
/**
* PrintSelf
*/
-template <class TPointSet, class TOutput >
+template <class TPointSet, class TOutput>
void
-PointSetDensityGaussianFunction< TPointSet, TOutput>
+PointSetDensityGaussianFunction<TPointSet, TOutput>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/BasicFilters/otbPointSetExtractROI.h b/Code/BasicFilters/otbPointSetExtractROI.h
index 87e510eec3..00f421ae55 100644
--- a/Code/BasicFilters/otbPointSetExtractROI.h
+++ b/Code/BasicFilters/otbPointSetExtractROI.h
@@ -25,61 +25,60 @@ namespace otb
{
/** \class PointSetExtractROI
- * \brief
+ * \brief
*
* PointSetExtractROI applies a transform to all the points
* of a PointSet.
*
* The additional content of the PointSet is passed untouched.
- *
- *
+ *
+ *
* \ingroup PointSetFilters
*/
template <class TInputPointSet, class TOutputPointSet>
class ITK_EXPORT PointSetExtractROI :
- public PointSetToPointSetFilter<TInputPointSet,TOutputPointSet>
+ public PointSetToPointSetFilter<TInputPointSet, TOutputPointSet>
{
public:
/** Standard class typedefs. */
- typedef PointSetExtractROI Self;
- typedef PointSetToPointSetFilter<TInputPointSet,TOutputPointSet> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef PointSetExtractROI Self;
+ typedef PointSetToPointSetFilter<TInputPointSet, TOutputPointSet> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
typedef TInputPointSet InputPointSetType;
typedef TOutputPointSet OutputPointSetType;
typedef typename InputPointSetType::Pointer InputPointSetPointer;
typedef typename OutputPointSetType::Pointer OutputPointSetPointer;
-
+
/** Type for representing coordinates. */
- typedef typename TInputPointSet::CoordRepType CoordRepType;
+ typedef typename TInputPointSet::CoordRepType CoordRepType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
-
+
/** Run-time type information (and related methods). */
- itkTypeMacro(PointSetExtractROI,PointSetToPointSetFilter);
+ itkTypeMacro(PointSetExtractROI, PointSetToPointSetFilter);
/** Set/Get Start methods */
- itkSetMacro(StartX,unsigned long);
- itkSetMacro(StartY,unsigned long);
+ itkSetMacro(StartX, unsigned long);
+ itkSetMacro(StartY, unsigned long);
/** Set/Get Size methods */
- itkSetMacro(SizeX,unsigned long);
- itkSetMacro(SizeY,unsigned long);
+ itkSetMacro(SizeX, unsigned long);
+ itkSetMacro(SizeY, unsigned long);
protected:
PointSetExtractROI();
- ~PointSetExtractROI() {};
+ ~PointSetExtractROI() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
- /** Generate Requested Data */
- virtual void GenerateData( void );
+ /** Generate Requested Data */
+ virtual void GenerateData(void);
private:
- PointSetExtractROI(const PointSetExtractROI&); //purposely not implemented
- void operator=(const PointSetExtractROI&); //purposely not implemented
-
+ PointSetExtractROI(const PointSetExtractROI &); //purposely not implemented
+ void operator =(const PointSetExtractROI&); //purposely not implemented
+
/** X/Y coordinates of the first point of the region to extract. */
unsigned long m_StartX;
unsigned long m_StartY;
diff --git a/Code/BasicFilters/otbPointSetExtractROI.txx b/Code/BasicFilters/otbPointSetExtractROI.txx
index c808509e84..89625e1d65 100644
--- a/Code/BasicFilters/otbPointSetExtractROI.txx
+++ b/Code/BasicFilters/otbPointSetExtractROI.txx
@@ -23,39 +23,37 @@
namespace otb
{
-
+
/**
*
*/
template <class TInputPointSet, class TOutputPointSet>
-PointSetExtractROI<TInputPointSet,TOutputPointSet>
+PointSetExtractROI<TInputPointSet, TOutputPointSet>
::PointSetExtractROI()
{
}
-
/**
*
*/
template <class TInputPointSet, class TOutputPointSet>
-void
-PointSetExtractROI<TInputPointSet,TOutputPointSet>
+void
+PointSetExtractROI<TInputPointSet, TOutputPointSet>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
/**
* This method causes the filter to generate its output.
*/
template <class TInputPointSet, class TOutputPointSet>
-void
-PointSetExtractROI<TInputPointSet,TOutputPointSet>
-::GenerateData(void)
+void
+PointSetExtractROI<TInputPointSet, TOutputPointSet>
+::GenerateData(void)
{
-
+
typedef typename TInputPointSet::PointsContainer InputPointsContainer;
typedef typename TOutputPointSet::PointsContainer OutputPointsContainer;
@@ -68,41 +66,40 @@ PointSetExtractROI<TInputPointSet,TOutputPointSet>
typedef typename TInputPointSet::PointDataContainerPointer InputPointDataContainerPointer;
typedef typename TOutputPointSet::PointDataContainerPointer OutputPointDataContainerPointer;
- InputPointSetPointer inputPointSet = this->GetInput();
- OutputPointSetPointer outputPointSet = this->GetOutput();
-
- if( !inputPointSet )
+ InputPointSetPointer inputPointSet = this->GetInput();
+ OutputPointSetPointer outputPointSet = this->GetOutput();
+
+ if (!inputPointSet)
{
- itkExceptionMacro(<<"Missing Input PointSet");
+ itkExceptionMacro(<< "Missing Input PointSet");
}
- if( !outputPointSet )
+ if (!outputPointSet)
{
- itkExceptionMacro(<<"Missing Output PointSet");
+ itkExceptionMacro(<< "Missing Output PointSet");
}
- outputPointSet->SetBufferedRegion( outputPointSet->GetRequestedRegion() );//TODO update outputRegion
+ outputPointSet->SetBufferedRegion(outputPointSet->GetRequestedRegion()); //TODO update outputRegion
- InputPointsContainerPointer inPoints = inputPointSet->GetPoints();
- InputPointDataContainerPointer inData = inputPointSet->GetPointData();
- OutputPointsContainerPointer outPoints = outputPointSet->GetPoints();
+ InputPointsContainerPointer inPoints = inputPointSet->GetPoints();
+ InputPointDataContainerPointer inData = inputPointSet->GetPointData();
+ OutputPointsContainerPointer outPoints = outputPointSet->GetPoints();
OutputPointDataContainerPointer outData = outputPointSet->GetPointData();
-
- typename InputPointsContainer::ConstIterator inputPoint = inPoints->Begin();
+ typename InputPointsContainer::ConstIterator inputPoint = inPoints->Begin();
typename InputPointDataContainer::ConstIterator inputData;
if (inData.IsNotNull())
{
inputData = inData->Begin();
}
- while( inputPoint != inPoints->End() )
+ while (inputPoint != inPoints->End())
{
typename InputPointsContainer::Element point = inputPoint.Value();
if ((((point[0] >= m_StartX) && (point[0] < m_StartX + m_SizeX))
- || ((point[0] <= m_StartX) && (point[0] > m_StartX + m_SizeX))) //cover the case when size<0
- && (((point[1] >= m_StartY) && (point[1] < m_StartY + m_SizeY))
- || ((point[1] <= m_StartY) && (point[1] > m_StartY + m_SizeY))))
+ || ((point[0] <= m_StartX) && (point[0] > m_StartX + m_SizeX))) //cover the case when size<0
+ && (((point[1] >= m_StartY) && (point[1] < m_StartY + m_SizeY))
+ || ((point[1] <= m_StartY) && (point[1] > m_StartY + m_SizeY))))
{
outPoints->push_back(inputPoint.Value());
if (inData.IsNotNull())
diff --git a/Code/BasicFilters/otbPointSetFunction.h b/Code/BasicFilters/otbPointSetFunction.h
index 631f2e6677..4206833267 100644
--- a/Code/BasicFilters/otbPointSetFunction.h
+++ b/Code/BasicFilters/otbPointSetFunction.h
@@ -31,14 +31,15 @@ namespace otb
*
* \ingroup SpatialFunctions
*/
-template <class TPointSet, class TOutput>
+template <class TPointSet, class TOutput>
class ITK_EXPORT PointSetFunction :
- public itk::SpatialFunction< TOutput , 2/* TODO : change 2 by PointType::PointDimension*/, typename TPointSet::PointType >
+ public itk::SpatialFunction<TOutput, 2 /* TODO : change 2 by PointType::PointDimension*/,
+ typename TPointSet::PointType>
{
public:
/** Standard class typedefs. */
- typedef PointSetFunction Self;
- typedef itk::SpatialFunction< TOutput, 2 , typename TPointSet::PointType > Superclass;
+ typedef PointSetFunction Self;
+ typedef itk::SpatialFunction<TOutput, 2, typename TPointSet::PointType> Superclass;
/** Run-time type information (and related methods). */
itkTypeMacro(PointSetFunction, itk::SpatialFunction);
@@ -48,10 +49,10 @@ public:
typedef typename PointSetType::ConstPointer PointSetPointerType;
/** TOutput typedef suppoty*/
- typedef TOutput OutputType;
+ typedef TOutput OutputType;
/** Set the input image (reimplemented since we need to set the detector input) */
- itkGetConstObjectMacro(PointSet,PointSetType);
+ itkGetConstObjectMacro(PointSet, PointSetType);
void SetPointSet(PointSetType * PointSet)
{
@@ -66,25 +67,22 @@ public:
protected:
PointSetFunction();
- ~PointSetFunction() {};
+ ~PointSetFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
private:
- PointSetFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ PointSetFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- PointSetPointerType m_PointSet;
+ PointSetPointerType m_PointSet;
};
} // end namespace otb
-
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbPointSetFunction.txx"
#endif
#endif
-
diff --git a/Code/BasicFilters/otbPointSetFunction.txx b/Code/BasicFilters/otbPointSetFunction.txx
index 73638b6308..aeb5e7a81a 100644
--- a/Code/BasicFilters/otbPointSetFunction.txx
+++ b/Code/BasicFilters/otbPointSetFunction.txx
@@ -30,8 +30,8 @@ namespace otb
/**
* Constructor
*/
-template <class TPointSet, class TOutput >
-PointSetFunction< TPointSet, TOutput>
+template <class TPointSet, class TOutput>
+PointSetFunction<TPointSet, TOutput>
::PointSetFunction()
{
m_PointSet = PointSetType::New();
@@ -40,15 +40,14 @@ PointSetFunction< TPointSet, TOutput>
/**
*
*/
-template <class TPointSet, class TOutput >
+template <class TPointSet, class TOutput>
void
-PointSetFunction< TPointSet, TOutput>
+PointSetFunction<TPointSet, TOutput>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
}
-
// /**
// * SetDetector method
// */
diff --git a/Code/BasicFilters/otbPointSetToDensityImageFilter.h b/Code/BasicFilters/otbPointSetToDensityImageFilter.h
index eb7d2abbce..ba4b7a9d90 100644
--- a/Code/BasicFilters/otbPointSetToDensityImageFilter.h
+++ b/Code/BasicFilters/otbPointSetToDensityImageFilter.h
@@ -26,7 +26,6 @@
#include "otbPointSetDensityFunction.h"
#include "itkPoint.h"
-
namespace otb
{
@@ -37,16 +36,16 @@ namespace otb
template <class TInputPointSet, class TOutputImage,
class TDensityFunction = PointSetDensityFunction<TInputPointSet, typename TOutputImage::PixelType> >
class ITK_EXPORT PointSetToDensityImageFilter
- : public itk::PointSetToImageFilter<TInputPointSet, TOutputImage >
+ : public itk::PointSetToImageFilter<TInputPointSet, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef PointSetToDensityImageFilter Self;
- typedef itk::PointSetToImageFilter<TInputPointSet, TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PointSetToDensityImageFilter Self;
+ typedef itk::PointSetToImageFilter<TInputPointSet, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -55,19 +54,18 @@ public:
itkTypeMacro(PointSetToDensityImageFilter, itk::PointSetToImageFilter);
/** typedefs parameters support */
- typedef TInputPointSet PointSetType;
+ typedef TInputPointSet PointSetType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::PixelType PixelType;
- typedef typename OutputImageType::IndexType IndexType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::PixelType PixelType;
+ typedef typename OutputImageType::IndexType IndexType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
/** typedef filter support*/
typedef TDensityFunction PointSetDensityFunctionType;
typedef typename PointSetDensityFunctionType::InputType InputType;
typedef typename PointSetDensityFunctionType::Pointer PointSetDensityFunctionPointerType;
-
/** Set/Get Radius*/
itkGetMacro(Radius, unsigned int);
itkSetMacro(Radius, unsigned int);
@@ -81,7 +79,7 @@ protected:
/**
* Destructor.
*/
- virtual ~PointSetToDensityImageFilter() {};
+ virtual ~PointSetToDensityImageFilter() {}
/**
* Standard PrintSelf method.
*/
@@ -96,20 +94,19 @@ protected:
* Main computation method.
*/
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
/**
* Main computation method.
*/
virtual void GenerateOutputInformation();
-
private:
- PointSetToDensityImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PointSetToDensityImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- unsigned int m_Radius;
+ unsigned int m_Radius;
typename PointSetType::Pointer m_PointSet;
};
}
diff --git a/Code/BasicFilters/otbPointSetToDensityImageFilter.txx b/Code/BasicFilters/otbPointSetToDensityImageFilter.txx
index 0e563ad7c6..a5053cbd3c 100644
--- a/Code/BasicFilters/otbPointSetToDensityImageFilter.txx
+++ b/Code/BasicFilters/otbPointSetToDensityImageFilter.txx
@@ -39,7 +39,7 @@ PointSetToDensityImageFilter<TInputPointSet, TOutputImage, TDensityFunction>
/*-------------------------------------------------------
* GenerateData
--------------------------------------------------------*/
-template <class TInputPointSet , class TOutputImage, class TDensityFunction>
+template <class TInputPointSet, class TOutputImage, class TDensityFunction>
void
PointSetToDensityImageFilter<TInputPointSet, TOutputImage, TDensityFunction>
::GenerateData(void)
@@ -55,8 +55,8 @@ template <class TInputPointSet, class TOutputImage, class TDensityFunction>
void
PointSetToDensityImageFilter<TInputPointSet, TOutputImage, TDensityFunction>
::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread,
- int threadId)
+ const OutputImageRegionType& outputRegionForThread,
+ int threadId)
{
// sleep(threadId);
// std::cerr << threadId << " -> " << outputRegionForThread.GetIndex() << std::endl;
@@ -74,18 +74,18 @@ PointSetToDensityImageFilter<TInputPointSet, TOutputImage, TDensityFunction>
InputType pCenter;
IndexType index;
itk::ImageRegionIterator<OutputImageType> itOut(outPtr,
- outputRegionForThread);
+ outputRegionForThread);
itOut.GoToBegin();
while (!itOut.IsAtEnd())
- {
+ {
index = itOut.GetIndex();
outPtr->TransformIndexToPhysicalPoint(index, pCenter);
itOut.Set(densityComputeFunction->Evaluate(pCenter));
++itOut;
progress.CompletedPixel();
- }
+ }
}
/*----------------------------------------------------------------
@@ -97,15 +97,15 @@ PointSetToDensityImageFilter<TInputPointSet, TOutputImage, TDensityFunction>
::GenerateOutputInformation(void)
{
//Superclass::GenerateOutputInformation();
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !outputPtr )
- {
+ if (!outputPtr)
+ {
return;
- }
+ }
typename OutputImageType::RegionType region;
- IndexType start;
+ IndexType start;
start.Fill(0);
region.SetSize(this->GetSize());
@@ -113,10 +113,9 @@ PointSetToDensityImageFilter<TInputPointSet, TOutputImage, TDensityFunction>
outputPtr->SetOrigin(this->GetOrigin());
outputPtr->SetSpacing(this->GetSpacing());
- outputPtr->SetRegions( region );
+ outputPtr->SetRegions(region);
}
-
/*----------------------------------------------------------------
PrintSelf
-----------------------------------------------------------------*/
diff --git a/Code/BasicFilters/otbPointSetToPointSetFilter.h b/Code/BasicFilters/otbPointSetToPointSetFilter.h
index 1039201564..8920e23ab9 100644
--- a/Code/BasicFilters/otbPointSetToPointSetFilter.h
+++ b/Code/BasicFilters/otbPointSetToPointSetFilter.h
@@ -39,28 +39,28 @@ class ITK_EXPORT PointSetToPointSetFilter : public PointSetSource<TOutputPointSe
{
public:
/** Standard class typedefs. */
- typedef PointSetToPointSetFilter Self;
- typedef PointSetSource<TOutputPointSet> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PointSetToPointSetFilter Self;
+ typedef PointSetSource<TOutputPointSet> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(PointSetToPointSetFilter, PointSetSource);
/** Some Image related typedefs. */
- typedef TInputPointSet InputPointSetType;
- typedef typename InputPointSetType::Pointer InputPointSetPointer;
- typedef typename InputPointSetType::ConstPointer InputPointSetConstPointer;
+ typedef TInputPointSet InputPointSetType;
+ typedef typename InputPointSetType::Pointer InputPointSetPointer;
+ typedef typename InputPointSetType::ConstPointer InputPointSetConstPointer;
/** Some PointSet related typedefs. */
- typedef typename Superclass::OutputPointSetType OutputPointSetType;
- typedef typename Superclass::OutputPointSetPointer OutputPointSetPointer;
- typedef typename Superclass::PointsContainerType PointsContainerType;
- typedef itk::ProcessObject ProcessObjectType;
+ typedef typename Superclass::OutputPointSetType OutputPointSetType;
+ typedef typename Superclass::OutputPointSetPointer OutputPointSetPointer;
+ typedef typename Superclass::PointsContainerType PointsContainerType;
+ typedef itk::ProcessObject ProcessObjectType;
/** Set the input image of this process object. */
void SetInput(unsigned int idx, const InputPointSetType *input);
- void SetInput( const InputPointSetType *input);
+ void SetInput(const InputPointSetType *input);
/** Get the input image of this process object. */
InputPointSetType * GetInput(unsigned int idx);
@@ -68,12 +68,12 @@ public:
protected:
PointSetToPointSetFilter();
- virtual ~PointSetToPointSetFilter() {};
+ virtual ~PointSetToPointSetFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- PointSetToPointSetFilter(const PointSetToPointSetFilter&); //purposely not implemented
- void operator=(const PointSetToPointSetFilter&); //purposely not implemented
+ PointSetToPointSetFilter(const PointSetToPointSetFilter &); //purposely not implemented
+ void operator =(const PointSetToPointSetFilter&); //purposely not implemented
};
diff --git a/Code/BasicFilters/otbPointSetToPointSetFilter.txx b/Code/BasicFilters/otbPointSetToPointSetFilter.txx
index fb2c0e31f6..2433cab447 100644
--- a/Code/BasicFilters/otbPointSetToPointSetFilter.txx
+++ b/Code/BasicFilters/otbPointSetToPointSetFilter.txx
@@ -27,7 +27,7 @@ namespace otb
*
*/
template <class TInputPointSet, class TOutputPointSet>
-PointSetToPointSetFilter<TInputPointSet,TOutputPointSet>
+PointSetToPointSetFilter<TInputPointSet, TOutputPointSet>
::PointSetToPointSetFilter()
{
this->SetNumberOfRequiredInputs(1);
@@ -39,13 +39,13 @@ PointSetToPointSetFilter<TInputPointSet,TOutputPointSet>
*/
template <class TInputPointSet, class TOutputPointSet>
void
-PointSetToPointSetFilter<TInputPointSet,TOutputPointSet>
-::SetInput(unsigned int idx,const InputPointSetType *input)
+PointSetToPointSetFilter<TInputPointSet, TOutputPointSet>
+::SetInput(unsigned int idx, const InputPointSetType *input)
{
// process object is not const-correct, the const_cast
// is required here.
this->ProcessObjectType::SetNthInput(idx,
- const_cast< InputPointSetType * >(input) );
+ const_cast<InputPointSetType *>(input));
this->GetInput()->ReleaseDataFlagOff();
}
@@ -54,13 +54,13 @@ PointSetToPointSetFilter<TInputPointSet,TOutputPointSet>
*/
template <class TInputPointSet, class TOutputPointSet>
void
-PointSetToPointSetFilter<TInputPointSet,TOutputPointSet>
+PointSetToPointSetFilter<TInputPointSet, TOutputPointSet>
::SetInput(const InputPointSetType *input)
{
// process object is not const-correct, the const_cast
// is required here.
this->ProcessObjectType::SetNthInput(0,
- const_cast< InputPointSetType * >(input) );
+ const_cast<InputPointSetType *>(input));
this->GetInput()->ReleaseDataFlagOff();
}
@@ -68,28 +68,27 @@ PointSetToPointSetFilter<TInputPointSet,TOutputPointSet>
*
*/
template <class TInputPointSet, class TOutputPointSet>
-typename PointSetToPointSetFilter<TInputPointSet,TOutputPointSet>::InputPointSetType *
-PointSetToPointSetFilter<TInputPointSet,TOutputPointSet>
+typename PointSetToPointSetFilter<TInputPointSet, TOutputPointSet>::InputPointSetType *
+PointSetToPointSetFilter<TInputPointSet, TOutputPointSet>
::GetInput(unsigned int idx)
{
return static_cast<InputPointSetType*>
- (this->ProcessObjectType::GetInput(idx));
+ (this->ProcessObjectType::GetInput(idx));
}
/**
*
*/
template <class TInputPointSet, class TOutputPointSet>
-typename PointSetToPointSetFilter<TInputPointSet,TOutputPointSet>::InputPointSetType *
-PointSetToPointSetFilter<TInputPointSet,TOutputPointSet>
+typename PointSetToPointSetFilter<TInputPointSet, TOutputPointSet>::InputPointSetType *
+PointSetToPointSetFilter<TInputPointSet, TOutputPointSet>
::GetInput(void)
{
- if (this->GetNumberOfInputs() < 1)
- return 0;
+ if (this->GetNumberOfInputs() < 1) return 0;
return static_cast<InputPointSetType*>
- (this->ProcessObjectType::GetInput(0));
+ (this->ProcessObjectType::GetInput(0));
}
/**
@@ -97,10 +96,10 @@ PointSetToPointSetFilter<TInputPointSet,TOutputPointSet>
*/
template <class TInputPointSet, class TOutputPointSet>
void
-PointSetToPointSetFilter<TInputPointSet,TOutputPointSet>
+PointSetToPointSetFilter<TInputPointSet, TOutputPointSet>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/BasicFilters/otbPolygonCompacityFunctor.h b/Code/BasicFilters/otbPolygonCompacityFunctor.h
index 18a7aa20ae..ecf1f61b96 100644
--- a/Code/BasicFilters/otbPolygonCompacityFunctor.h
+++ b/Code/BasicFilters/otbPolygonCompacityFunctor.h
@@ -42,11 +42,11 @@ template <class TInput1>
class PolygonCompacityFunctor
{
public:
- void SetThreshold(double threshold )
+ void SetThreshold(double threshold)
{
m_Threshold = threshold;
}
- double GetThreshold(void)const
+ double GetThreshold(void) const
{
return m_Threshold;
}
@@ -54,22 +54,22 @@ public:
PolygonCompacityFunctor()
{
m_Threshold = 0.2;
- };
- ~PolygonCompacityFunctor() {};
+ }
+ ~PolygonCompacityFunctor() {}
- inline bool operator()(const TInput1 & input)
+ inline bool operator ()(const TInput1& input)
{
double circularityRatio = 4*CONST_PI*input->GetArea()
/ vnl_math_sqr(input->GetLength());
if (circularityRatio > m_Threshold)
- {
+ {
return true;
- }
+ }
else
- {
+ {
return false;
- }
+ }
}
private:
diff --git a/Code/BasicFilters/otbPrintableImageFilter.h b/Code/BasicFilters/otbPrintableImageFilter.h
index bb32e29a5f..b06390ad55 100644
--- a/Code/BasicFilters/otbPrintableImageFilter.h
+++ b/Code/BasicFilters/otbPrintableImageFilter.h
@@ -41,14 +41,14 @@ namespace Functor
template<class TInputPixel, class TMaskPixel, class TOutputPixel>
class ITK_EXPORT MaskFunctor
{
- public :
- MaskFunctor()
+public:
+ MaskFunctor()
{
- m_BackgroundValue = 0;
- m_ObjectColor.SetSize(3);
- m_ObjectColor.Fill(255);
+ m_BackgroundValue = 0;
+ m_ObjectColor.SetSize(3);
+ m_ObjectColor.Fill(255);
};
- ~MaskFunctor(){};
+ ~MaskFunctor(){}
typedef TInputPixel InputPixelType;
typedef TMaskPixel MaskPixelType;
@@ -56,49 +56,48 @@ class ITK_EXPORT MaskFunctor
typedef typename OutputPixelType::ValueType OutputInternalPixelType;
MaskPixelType GetBackgroundValue()
- {
- return m_BackgroundValue;
- }
- void SetBackgroundValue( MaskPixelType val )
- {
- m_BackgroundValue = val;
- }
+ {
+ return m_BackgroundValue;
+ }
+ void SetBackgroundValue(MaskPixelType val)
+ {
+ m_BackgroundValue = val;
+ }
- OutputPixelType GetObjectColor()
- {
- return m_ObjectColor;
- }
- void SetObjectColor( OutputPixelType val )
- {
- m_ObjectColor = val;
- }
+ OutputPixelType GetObjectColor()
+ {
+ return m_ObjectColor;
+ }
+ void SetObjectColor(OutputPixelType val)
+ {
+ m_ObjectColor = val;
+ }
- inline OutputPixelType operator()(InputPixelType inPix, MaskPixelType maskPix) const
- {
- OutputPixelType outPix;
- if( maskPix==m_BackgroundValue )
- {
- outPix.SetSize( inPix.Size() );
- for(unsigned int i=0; i<outPix.Size(); i++)
- {
- outPix[i] = static_cast<OutputInternalPixelType>(inPix[i]);
- }
- }
- else
- {
- outPix = m_ObjectColor;
- }
-
- return outPix;
- }
-
- protected:
+ inline OutputPixelType operator ()(InputPixelType inPix, MaskPixelType maskPix) const
+ {
+ OutputPixelType outPix;
+ if (maskPix == m_BackgroundValue)
+ {
+ outPix.SetSize(inPix.Size());
+ for (unsigned int i = 0; i < outPix.Size(); i++)
+ {
+ outPix[i] = static_cast<OutputInternalPixelType>(inPix[i]);
+ }
+ }
+ else
+ {
+ outPix = m_ObjectColor;
+ }
+
+ return outPix;
+ }
+
+protected:
MaskPixelType m_BackgroundValue;
OutputPixelType m_ObjectColor;
};
}
-
/**
* \class PrintableImageFilter
* \brief This class is a helper class to turn a vector image to a generic 8 bytes RGB image.
@@ -114,41 +113,40 @@ class ITK_EXPORT MaskFunctor
* \sa itkImageToImageFilter
**/
-template <class TInputImage , class TMaskImage = otb::Image<unsigned char, 2> >
+template <class TInputImage, class TMaskImage = otb::Image<unsigned char, 2> >
class ITK_EXPORT PrintableImageFilter :
-public itk::ImageToImageFilter<TInputImage, otb::VectorImage<unsigned char, 2> >
+ public itk::ImageToImageFilter<TInputImage, otb::VectorImage<unsigned char, 2> >
{
public:
- typedef PrintableImageFilter Self;
+ typedef PrintableImageFilter Self;
typedef itk::ImageToImageFilter
- <TInputImage, otb::VectorImage<unsigned char,2> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ <TInputImage, otb::VectorImage<unsigned char, 2> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef TInputImage InputImageType;
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::InternalPixelType InputInternalPixelType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::InternalPixelType InputInternalPixelType;
// typedef typename itk::NumericTraits<InputPixelType>::ValueType InputInternalPixelType;
- typedef unsigned char OutputInternalPixelType;
- typedef VectorImage<OutputInternalPixelType,2> OutputImageType;
- typedef OutputImageType::PixelType OutputPixelType;
-
- typedef TMaskImage MaskImageType;
- typedef typename MaskImageType::Pointer MaskImagePointerType;
- typedef typename MaskImageType::PixelType MaskPixelType;
+ typedef unsigned char OutputInternalPixelType;
+ typedef VectorImage<OutputInternalPixelType, 2> OutputImageType;
+ typedef OutputImageType::PixelType OutputPixelType;
+ typedef TMaskImage MaskImageType;
+ typedef typename MaskImageType::Pointer MaskImagePointerType;
+ typedef typename MaskImageType::PixelType MaskPixelType;
typedef otb::MultiChannelExtractROI<InputInternalPixelType,
InputInternalPixelType> ChannelExtractorType;
- typedef typename ChannelExtractorType::ChannelsType ChannelsType;
+ typedef typename ChannelExtractorType::ChannelsType ChannelsType;
typedef VectorRescaleIntensityImageFilter
- <typename ChannelExtractorType::OutputImageType,OutputImageType> VectorRescalerType;
+ <typename ChannelExtractorType::OutputImageType, OutputImageType> VectorRescalerType;
- typedef Functor::MaskFunctor<InputPixelType,MaskPixelType,OutputPixelType> FunctorType;
+ typedef Functor::MaskFunctor<InputPixelType, MaskPixelType, OutputPixelType> FunctorType;
typedef itk::BinaryFunctorImageFilter<OutputImageType, MaskImageType,
- OutputImageType, FunctorType > FunctorFilterType;
- typedef typename FunctorFilterType::Pointer FunctorFilterPointerType;
+ OutputImageType, FunctorType> FunctorFilterType;
+ typedef typename FunctorFilterType::Pointer FunctorFilterPointerType;
/** Method for creation through object factory */
itkNewMacro(Self);
@@ -158,18 +156,17 @@ public:
itk::ImageToImageFilter);
/** Display */
- void PrintSelf( std::ostream& os, itk::Indent indent ) const;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
- void SetChannel( unsigned int channel);
+ void SetChannel(unsigned int channel);
const ChannelsType GetChannels(void) const;
- otbSetObjectMemberMacro(Rescaler,AutomaticInputMinMaxComputation,bool);
- otbGetObjectMemberMacro(Rescaler,AutomaticInputMinMaxComputation,bool);
- otbSetObjectMemberMacro(Rescaler,InputMinimum,InputPixelType);
- otbGetObjectMemberMacro(Rescaler,InputMinimum,InputPixelType);
- otbSetObjectMemberMacro(Rescaler,InputMaximum,InputPixelType);
- otbGetObjectMemberMacro(Rescaler,InputMaximum,InputPixelType);
-
+ otbSetObjectMemberMacro(Rescaler, AutomaticInputMinMaxComputation, bool);
+ otbGetObjectMemberMacro(Rescaler, AutomaticInputMinMaxComputation, bool);
+ otbSetObjectMemberMacro(Rescaler, InputMinimum, InputPixelType);
+ otbGetObjectMemberMacro(Rescaler, InputMinimum, InputPixelType);
+ otbSetObjectMemberMacro(Rescaler, InputMaximum, InputPixelType);
+ otbGetObjectMemberMacro(Rescaler, InputMaximum, InputPixelType);
/**
* If set, only pixels within the mask will be classified.
@@ -191,33 +188,33 @@ public:
return m_ChannelList;
}
/* Set the selected channle index (order is important) */
- void SetChannelList( ChannelsType chList )
+ void SetChannelList(ChannelsType chList)
{
- if(chList.size() != 3)
+ if (chList.size() != 3)
{
- itkExceptionMacro(<<"Invalid channel list, size is "<<chList.size()<<" instead of 3");
+ itkExceptionMacro(<< "Invalid channel list, size is " << chList.size() << " instead of 3");
}
m_ChannelList = chList;
this->Modified();
}
/** Output Mask Object color. */
- void SetObjectColor( OutputPixelType val )
+ void SetObjectColor(OutputPixelType val)
{
- if(val.GetSize() != 3)
- {
- itkExceptionMacro(<<"Invalid object color, size is "<<val.Size()<<" instead of 3");
- }
+ if (val.GetSize() != 3)
+ {
+ itkExceptionMacro(<< "Invalid object color, size is " << val.Size() << " instead of 3");
+ }
m_ObjectColor = val;
- m_MaskFilter->GetFunctor().SetObjectColor( val );
+ m_MaskFilter->GetFunctor().SetObjectColor(val);
this->Modified();
}
itkGetMacro(ObjectColor, OutputPixelType);
- void SetBackgroundMaskValue( MaskPixelType val )
+ void SetBackgroundMaskValue(MaskPixelType val)
{
m_BackgroundMaskValue = val;
- m_MaskFilter->GetFunctor().SetBackgroundValue( val );
+ m_MaskFilter->GetFunctor().SetBackgroundValue(val);
this->Modified();
}
itkGetMacro(BackgroundMaskValue, MaskPixelType);
@@ -241,13 +238,13 @@ protected:
private:
- PrintableImageFilter(Self&); // intentionally not implemented
- void operator=(const Self&); // intentionally not implemented
+ PrintableImageFilter(Self &); // intentionally not implemented
+ void operator =(const Self&); // intentionally not implemented
- typename VectorRescalerType::Pointer m_Rescaler;
+ typename VectorRescalerType::Pointer m_Rescaler;
typename ChannelExtractorType::Pointer m_Extractor;
// Foreground mask value
- FunctorFilterPointerType m_MaskFilter;
+ FunctorFilterPointerType m_MaskFilter;
// Objects (of the mask) will be displayer with the choosen color.
OutputPixelType m_ObjectColor;
// Use mask
diff --git a/Code/BasicFilters/otbPrintableImageFilter.txx b/Code/BasicFilters/otbPrintableImageFilter.txx
index 3b6a61c92a..c8f75397ea 100644
--- a/Code/BasicFilters/otbPrintableImageFilter.txx
+++ b/Code/BasicFilters/otbPrintableImageFilter.txx
@@ -33,14 +33,14 @@ PrintableImageFilter<TInputImage, TMaskImage>
m_Rescaler = VectorRescalerType::New();
m_Extractor = ChannelExtractorType::New();
-
- m_Rescaler->SetInput( m_Extractor->GetOutput() );
+
+ m_Rescaler->SetInput(m_Extractor->GetOutput());
m_MaskFilter = FunctorFilterType::New();
- m_ChannelList = ChannelsType(3,2);
+ m_ChannelList = ChannelsType(3, 2);
m_ChannelList[1] = 3;
m_ChannelList[2] = 4;
- m_ObjectColor.SetSize( 3 );
+ m_ObjectColor.SetSize(3);
m_ObjectColor.Fill(255);
m_UseMask = false;
m_BackgroundMaskValue = 0;
@@ -57,7 +57,7 @@ PrintableImageFilter<TInputImage, TMaskImage>
}
template <class TInputImage, class TMaskImage>
-const typename PrintableImageFilter<TInputImage,TMaskImage>::ChannelsType
+const typename PrintableImageFilter<TInputImage, TMaskImage>::ChannelsType
PrintableImageFilter<TInputImage, TMaskImage>
::GetChannels() const
{
@@ -69,20 +69,19 @@ void
PrintableImageFilter<TInputImage, TMaskImage>
::SetInputMask(const MaskImageType * mask)
{
- this->itk::ProcessObject::SetNthInput(1,const_cast<MaskImageType *>(mask));
+ this->itk::ProcessObject::SetNthInput(1, const_cast<MaskImageType *>(mask));
m_UseMask = true;
}
-
template <class TInputImage, class TMaskImage>
-typename PrintableImageFilter<TInputImage,TMaskImage>::MaskImageType *
+typename PrintableImageFilter<TInputImage, TMaskImage>::MaskImageType *
PrintableImageFilter<TInputImage, TMaskImage>
::GetInputMask()
{
- if (this->GetNumberOfInputs()<2)
- {
+ if (this->GetNumberOfInputs() < 2)
+ {
return 0;
- }
+ }
return static_cast<MaskImageType *>(this->itk::ProcessObject::GetInput(1));
}
@@ -94,7 +93,7 @@ PrintableImageFilter<TInputImage, TMaskImage>
// Call to the superclass implementation
Superclass::GenerateOutputInformation();
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
outputPtr->SetNumberOfComponentsPerPixel(3);
}
@@ -103,36 +102,37 @@ void
PrintableImageFilter<TInputImage, TMaskImage>
::BeforeGenerateData()
{
- if(m_Extractor->GetNbChannels() == 0 && m_ChannelList.size()>3)
+ if (m_Extractor->GetNbChannels() == 0 && m_ChannelList.size() > 3)
{
- itkExceptionMacro(<<"Invalid channel list (must be three channels instead of "<<m_ChannelList.size());
+ itkExceptionMacro(<< "Invalid channel list (must be three channels instead of " << m_ChannelList.size());
}
- if(m_Extractor->GetNbChannels() == 0 && m_Extractor->GetNbChannels()>3)
+ if (m_Extractor->GetNbChannels() == 0 && m_Extractor->GetNbChannels() > 3)
{
- itkExceptionMacro(<<"Invalid channel list (must be three channels instead of "<<m_Extractor->GetNbChannels());
+ itkExceptionMacro(<< "Invalid channel list (must be three channels instead of " << m_Extractor->GetNbChannels());
}
- if( m_ObjectColor.GetSize() != 3 )
+ if (m_ObjectColor.GetSize() != 3)
{
- itkExceptionMacro(<<"Invalid m_ObjectColor pixel size");
+ itkExceptionMacro(<< "Invalid m_ObjectColor pixel size");
}
-
- if( m_UseMask == true )
+
+ if (m_UseMask == true)
{
- MaskImagePointerType inputMaskPtr = this->GetInputMask();
- typename InputImageType::ConstPointer inputPtr = this->GetInput();
-
- if( !inputMaskPtr )
- {
- itkExceptionMacro(<<"No mask detected");
- }
- if( inputMaskPtr->GetLargestPossibleRegion().GetSize() != inputPtr->GetLargestPossibleRegion().GetSize())
- {
- itkExceptionMacro(<<"Input size ("<<inputPtr->GetLargestPossibleRegion().GetSize()<<") and Mask size ("<<inputMaskPtr->GetLargestPossibleRegion().GetSize()<<") must be the same");
- }
+ MaskImagePointerType inputMaskPtr = this->GetInputMask();
+ typename InputImageType::ConstPointer inputPtr = this->GetInput();
+
+ if (!inputMaskPtr)
+ {
+ itkExceptionMacro(<< "No mask detected");
+ }
+ if (inputMaskPtr->GetLargestPossibleRegion().GetSize() != inputPtr->GetLargestPossibleRegion().GetSize())
+ {
+ itkExceptionMacro(
+ << "Input size (" << inputPtr->GetLargestPossibleRegion().GetSize() << ") and Mask size (" <<
+ inputMaskPtr->GetLargestPossibleRegion().GetSize() << ") must be the same");
+ }
}
}
-
/*
* If no mask used, just rescale the input between 0 and 255.
* Else, sur M%askFunctor.
@@ -145,17 +145,16 @@ PrintableImageFilter<TInputImage, TMaskImage>
this->BeforeGenerateData();
// let this loop to be compliant with previous version of the class where m_ChannelList didn't exist...
- if(m_Extractor->GetNbChannels() == 0)
+ if (m_Extractor->GetNbChannels() == 0)
{
- for(unsigned int i=0; i<m_ChannelList.size(); i++)
- m_Extractor->SetChannel( m_ChannelList[i]);
+ for (unsigned int i = 0; i < m_ChannelList.size(); i++)
+ m_Extractor->SetChannel(m_ChannelList[i]);
}
-
-
+
m_Extractor->SetInput(this->GetInput());
m_Extractor->UpdateOutputInformation();
- typename TInputImage::PixelType minimum,maximum;
+ typename TInputImage::PixelType minimum, maximum;
minimum.SetSize(m_Extractor->GetNbChannels());
maximum.SetSize(m_Extractor->GetNbChannels());
minimum.Fill(0);
@@ -165,29 +164,29 @@ PrintableImageFilter<TInputImage, TMaskImage>
m_Rescaler->SetOutputMaximum(maximum);
m_Rescaler->SetClampThreshold(0.01);
- if( m_UseMask == false )
+ if (m_UseMask == false)
{
- m_Rescaler->GraftOutput( this->GetOutput() );
- m_Rescaler->Update();
- this->GraftOutput( m_Rescaler->GetOutput() );
+ m_Rescaler->GraftOutput(this->GetOutput());
+ m_Rescaler->Update();
+ this->GraftOutput(m_Rescaler->GetOutput());
}
else
{
- m_MaskFilter->SetInput1(m_Rescaler->GetOutput());
- m_MaskFilter->SetInput2(this->GetInputMask());
- m_MaskFilter->GraftOutput( this->GetOutput() );
- m_MaskFilter->Update();
- this->GraftOutput( m_MaskFilter->GetOutput() );
+ m_MaskFilter->SetInput1(m_Rescaler->GetOutput());
+ m_MaskFilter->SetInput2(this->GetInputMask());
+ m_MaskFilter->GraftOutput(this->GetOutput());
+ m_MaskFilter->Update();
+ this->GraftOutput(m_MaskFilter->GetOutput());
}
-
+
}
template <class TInputImage, class TMaskImage>
void
PrintableImageFilter<TInputImage, TMaskImage>
-::PrintSelf( std::ostream& os, itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/BasicFilters/otbProlateInterpolateImageFunction.h b/Code/BasicFilters/otbProlateInterpolateImageFunction.h
index 712d5b573f..e258ee449f 100644
--- a/Code/BasicFilters/otbProlateInterpolateImageFunction.h
+++ b/Code/BasicFilters/otbProlateInterpolateImageFunction.h
@@ -41,8 +41,8 @@ public:
ProlateFunction()
{
m_Radius = 1;
- };
- ~ProlateFunction() {};
+ }
+ ~ProlateFunction() {}
typedef std::vector<double> VectorType;
// Accessors definitions
@@ -64,39 +64,41 @@ public:
}
double ComputeEnergy(double resampleRatio) const;
- inline TOutput operator()( const TInput & A ) const
+ inline TOutput operator ()(const TInput& A) const
{
- TOutput val = itk::NumericTraits< TOutput >::Zero;
- if ( A != itk::NumericTraits< TInput >::Zero && vcl_abs(A) != static_cast<TInput>(m_Radius) && m_Radius!=0 )
- {
- double ival = static_cast<double>(m_OriginalProfileSize)*static_cast<double>(vcl_abs(A))/static_cast<double>(m_Radius);
+ TOutput val = itk::NumericTraits<TOutput>::Zero;
+ if (A != itk::NumericTraits<TInput>::Zero && vcl_abs(A) != static_cast<TInput>(m_Radius) && m_Radius != 0)
+ {
+ double ival = static_cast<double>(m_OriginalProfileSize) * static_cast<double>(vcl_abs(A)) /
+ static_cast<double>(m_Radius);
double ivalFloor = vcl_floor(ival);
double left = ival - ivalFloor;
- if ( ivalFloor < m_OriginalProfileSize-1 )
- {
- val = left*m_OriginalProfile[static_cast<unsigned int>(ivalFloor)] + (1-left)*m_OriginalProfile[static_cast<unsigned int>(ivalFloor)+1];
- }
+ if (ivalFloor < m_OriginalProfileSize - 1)
+ {
+ val = left * m_OriginalProfile[static_cast<unsigned int>(ivalFloor)] +
+ (1 - left) * m_OriginalProfile[static_cast<unsigned int>(ivalFloor) + 1];
+ }
else
- {
- itkGenericExceptionMacro(<<"Out of Profile limits ("<<ivalFloor<<" -1 > 721)");
+ {
+ itkGenericExceptionMacro(<< "Out of Profile limits (" << ivalFloor << " -1 > 721)");
+ }
}
- }
else
- {
- if ( A == itk::NumericTraits< TInput >::Zero || m_Radius==0)
{
+ if (A == itk::NumericTraits<TInput>::Zero || m_Radius == 0)
+ {
val = m_OriginalProfile[0];
- }
+ }
else
- {
- if ( vcl_abs(A) == static_cast<TInput>(m_Radius) )
{
- val = m_OriginalProfile[m_OriginalProfileSize-1];
+ if (vcl_abs(A) == static_cast<TInput>(m_Radius))
+ {
+ val = m_OriginalProfile[m_OriginalProfileSize - 1];
+ }
}
}
- }
return val;
}
@@ -110,7 +112,7 @@ private:
};
-}//namespace Function
+} //namespace Function
/** \class ProlateInterpolateImageFunction
* \brief Prolate interpolation of an otb::image.
@@ -122,22 +124,23 @@ private:
*
* \ingroup ImageFunctions ImageInterpolators
*/
-template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep=double, class TInputInterpolator=double, class TOutputInterpolator=double>
+template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep =
+ double, class TInputInterpolator = double, class TOutputInterpolator = double>
class ITK_EXPORT ProlateInterpolateImageFunction :
- public GenericInterpolateImageFunction< TInputImage,
- ITK_TYPENAME Function::ProlateFunction< TInputInterpolator, TOutputInterpolator>,
- TBoundaryCondition,
- TCoordRep >
+ public GenericInterpolateImageFunction<TInputImage,
+ ITK_TYPENAME Function::ProlateFunction<TInputInterpolator, TOutputInterpolator>,
+ TBoundaryCondition,
+ TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef ProlateInterpolateImageFunction Self;
+ typedef ProlateInterpolateImageFunction Self;
typedef GenericInterpolateImageFunction<TInputImage,
- Function::ProlateFunction< TInputInterpolator, TOutputInterpolator>,
- TBoundaryCondition,
- TCoordRep> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ Function::ProlateFunction<TInputInterpolator, TOutputInterpolator>,
+ TBoundaryCondition,
+ TCoordRep> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(ProlateInterpolateImageFunction, GenericInterpolateImageFunction);
@@ -152,25 +155,25 @@ public:
typedef TOutputInterpolator OutputInterpolatorType;
/** Dimension underlying input image. */
- itkStaticConstMacro(ImageDimension, unsigned int,Superclass::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, Superclass::ImageDimension);
/** Superclass typedef inheritance. */
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::SizeType SizeType;
- typedef typename Superclass::RealType RealType;
- typedef Function::ProlateFunction<InputInterpolatorType, OutputInterpolatorType> FunctionType;
- typedef typename Superclass::IteratorType IteratorType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename std::vector<double> VectorType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::RealType RealType;
+ typedef Function::ProlateFunction<InputInterpolatorType, OutputInterpolatorType> FunctionType;
+ typedef typename Superclass::IteratorType IteratorType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
+ typedef typename std::vector<double> VectorType;
unsigned int GetOriginalProfileSize() const
{
return this->GetFunction().GetOriginalProfileSize;
- };
+ }
VectorType GetOriginalProfile() const
{
return this->GetFunction().GetOriginalProfile();
- };
+ }
protected:
ProlateInterpolateImageFunction();
@@ -178,8 +181,8 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ProlateInterpolateImageFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ProlateInterpolateImageFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
diff --git a/Code/BasicFilters/otbProlateInterpolateImageFunction.txx b/Code/BasicFilters/otbProlateInterpolateImageFunction.txx
index e261ccfe84..c600c16241 100644
--- a/Code/BasicFilters/otbProlateInterpolateImageFunction.txx
+++ b/Code/BasicFilters/otbProlateInterpolateImageFunction.txx
@@ -29,74 +29,133 @@ const unsigned int
ProlateFunction<TInput, TOutput>
::m_OriginalProfileSize = 721;
-
template<class TInput, class TOutput>
const double
ProlateFunction<TInput, TOutput>
::m_OriginalProfile[721] =
-{
- 0.00125, 0.00124999, 0.00124998, 0.00124997, 0.00124995, 0.00124992, 0.00124989, 0.00124985, 0.0012498, 0.00124975, 0.00124969, 0.00124962,
- 0.00124955, 0.00124948, 0.00124939, 0.0012493, 0.00124921, 0.00124911, 0.001249, 0.00124888, 0.00124876, 0.00124864, 0.0012485, 0.00124837,
- 0.00124822, 0.00124807, 0.00124791, 0.00124775, 0.00124758, 0.0012474, 0.00124722, 0.00124703, 0.00124684, 0.00124664, 0.00124643, 0.00124622,
- 0.001246, 0.00124578, 0.00124555, 0.00124531, 0.00124507, 0.00124482, 0.00124456, 0.0012443, 0.00124403, 0.00124376, 0.00124348, 0.00124319,
- 0.0012429, 0.0012426, 0.0012423, 0.00124199, 0.00124167, 0.00124135, 0.00124102, 0.00124069, 0.00124035, 0.00124, 0.00123965, 0.00123929,
- 0.00123892, 0.00123855, 0.00123817, 0.00123779, 0.0012374, 0.001237, 0.0012366, 0.00123619, 0.00123578, 0.00123536, 0.00123494, 0.0012345,
- 0.00123407, 0.00123362, 0.00123317, 0.00123272, 0.00123225, 0.00123179, 0.00123131, 0.00123083, 0.00123035, 0.00122985, 0.00122936, 0.00122885,
- 0.00122834, 0.00122783, 0.0012273, 0.00122678, 0.00122624, 0.0012257, 0.00122516, 0.0012246, 0.00122405, 0.00122348, 0.00122291, 0.00122234,
- 0.00122175, 0.00122117, 0.00122057, 0.00121997, 0.00121937, 0.00121876, 0.00121814, 0.00121752, 0.00121689, 0.00121625, 0.00121561, 0.00121497,
- 0.00121431, 0.00121366, 0.00121299, 0.00121232, 0.00121165, 0.00121096, 0.00121028, 0.00120958, 0.00120888, 0.00120818, 0.00120747, 0.00120675,
- 0.00120603, 0.0012053, 0.00120457, 0.00120383, 0.00120308, 0.00120233, 0.00120157, 0.00120081, 0.00120004, 0.00119927, 0.00119849, 0.0011977,
- 0.00119691, 0.00119611, 0.00119531, 0.0011945, 0.00119368, 0.00119286, 0.00119204, 0.00119121, 0.00119037, 0.00118953, 0.00118868, 0.00118782,
- 0.00118696, 0.0011861, 0.00118523, 0.00118435, 0.00118347, 0.00118258, 0.00118169, 0.00118079, 0.00117988, 0.00117897, 0.00117805, 0.00117713,
- 0.00117621, 0.00117527, 0.00117433, 0.00117339, 0.00117244, 0.00117149, 0.00117053, 0.00116956, 0.00116859, 0.00116761, 0.00116663, 0.00116564,
- 0.00116465, 0.00116365, 0.00116265, 0.00116164, 0.00116062, 0.0011596, 0.00115858, 0.00115754, 0.00115651, 0.00115547, 0.00115442, 0.00115337,
- 0.00115231, 0.00115124, 0.00115018, 0.0011491, 0.00114802, 0.00114694, 0.00114585, 0.00114475, 0.00114365, 0.00114255, 0.00114143, 0.00114032,
- 0.0011392, 0.00113807, 0.00113694, 0.0011358, 0.00113466, 0.00113351, 0.00113236, 0.0011312, 0.00113003, 0.00112887, 0.00112769, 0.00112651,
- 0.00112533, 0.00112414, 0.00112295, 0.00112175, 0.00112054, 0.00111933, 0.00111812, 0.0011169, 0.00111567, 0.00111444, 0.00111321, 0.00111197,
- 0.00111072, 0.00110947, 0.00110822, 0.00110696, 0.00110569, 0.00110442, 0.00110315, 0.00110187, 0.00110059, 0.0010993, 0.001098, 0.0010967,
- 0.0010954, 0.00109409, 0.00109277, 0.00109146, 0.00109013, 0.0010888, 0.00108747, 0.00108613, 0.00108479, 0.00108344, 0.00108209, 0.00108073,
- 0.00107937, 0.001078, 0.00107663, 0.00107526, 0.00107387, 0.00107249, 0.0010711, 0.0010697, 0.0010683, 0.0010669, 0.00106549, 0.00106408,
- 0.00106266, 0.00106124, 0.00105981, 0.00105838, 0.00105694, 0.0010555, 0.00105405, 0.0010526, 0.00105115, 0.00104969, 0.00104823, 0.00104676,
- 0.00104528, 0.00104381, 0.00104233, 0.00104084, 0.00103935, 0.00103785, 0.00103636, 0.00103485, 0.00103334, 0.00103183, 0.00103031, 0.00102879,
- 0.00102727, 0.00102574, 0.0010242, 0.00102267, 0.00102112, 0.00101958, 0.00101803, 0.00101647, 0.00101491, 0.00101335, 0.00101178, 0.00101021,
- 0.00100863, 0.00100705, 0.00100547, 0.00100388, 0.00100228, 0.00100069, 0.000999085, 0.00099748, 0.000995871, 0.000994258, 0.00099264, 0.000991019,
- 0.000989394, 0.000987764, 0.000986131, 0.000984494, 0.000982852, 0.000981207, 0.000979558, 0.000977905, 0.000976248, 0.000974587, 0.000972922, 0.000971254,
- 0.000969581, 0.000967905, 0.000966225, 0.000964541, 0.000962853, 0.000961162, 0.000959466, 0.000957767, 0.000956065, 0.000954358, 0.000952648, 0.000950934,
- 0.000949217, 0.000947495, 0.00094577, 0.000944042, 0.00094231, 0.000940574, 0.000938834, 0.000937092, 0.000935345, 0.000933595, 0.000931841, 0.000930084,
- 0.000928323, 0.000926559, 0.000924792, 0.000923021, 0.000921246, 0.000919468, 0.000917686, 0.000915902, 0.000914113, 0.000912322, 0.000910527, 0.000908728,
- 0.000906927, 0.000905122, 0.000903314, 0.000901502, 0.000899687, 0.000897869, 0.000896048, 0.000894223, 0.000892395, 0.000890564, 0.00088873, 0.000886892,
- 0.000885052, 0.000883208, 0.000881361, 0.000879511, 0.000877658, 0.000875802, 0.000873943, 0.000872081, 0.000870216, 0.000868347, 0.000866476, 0.000864602,
- 0.000862724, 0.000860844, 0.000858961, 0.000857075, 0.000855186, 0.000853294, 0.000851399, 0.000849502, 0.000847601, 0.000845698, 0.000843791, 0.000841882,
- 0.000839971, 0.000838056, 0.000836139, 0.000834219, 0.000832296, 0.000830371, 0.000828442, 0.000826511, 0.000824578, 0.000822642, 0.000820703, 0.000818761,
- 0.000816817, 0.000814871, 0.000812922, 0.00081097, 0.000809016, 0.000807059, 0.000805099, 0.000803138, 0.000801173, 0.000799207, 0.000797237, 0.000795266,
- 0.000793292, 0.000791315, 0.000789337, 0.000787355, 0.000785372, 0.000783386, 0.000781398, 0.000779407, 0.000777415, 0.00077542, 0.000773422, 0.000771423,
- 0.000769421, 0.000767417, 0.000765411, 0.000763403, 0.000761393, 0.00075938, 0.000757365, 0.000755349, 0.00075333, 0.000751309, 0.000749286, 0.000747261,
- 0.000745234, 0.000743205, 0.000741173, 0.00073914, 0.000737105, 0.000735069, 0.00073303, 0.000730989, 0.000728946, 0.000726902, 0.000724855, 0.000722807,
- 0.000720757, 0.000718705, 0.000716652, 0.000714596, 0.000712539, 0.00071048, 0.000708419, 0.000706357, 0.000704293, 0.000702227, 0.00070016, 0.000698091,
- 0.00069602, 0.000693948, 0.000691874, 0.000689798, 0.000687721, 0.000685643, 0.000683563, 0.000681481, 0.000679398, 0.000677313, 0.000675227, 0.00067314,
- 0.000671051, 0.000668961, 0.000666869, 0.000664776, 0.000662681, 0.000660586, 0.000658489, 0.00065639, 0.00065429, 0.000652189, 0.000650087, 0.000647984,
- 0.000645879, 0.000643773, 0.000641666, 0.000639558, 0.000637448, 0.000635337, 0.000633226, 0.000631113, 0.000628999, 0.000626884, 0.000624768, 0.000622651,
- 0.000620533, 0.000618414, 0.000616293, 0.000614172, 0.00061205, 0.000609927, 0.000607803, 0.000605679, 0.000603553, 0.000601426, 0.000599299, 0.000597171,
- 0.000595042, 0.000592912, 0.000590781, 0.000588649, 0.000586517, 0.000584384, 0.000582251, 0.000580116, 0.000577981, 0.000575845, 0.000573709, 0.000571572,
- 0.000569434, 0.000567296, 0.000565157, 0.000563018, 0.000560878, 0.000558738, 0.000556597, 0.000554455, 0.000552313, 0.000550171, 0.000548028, 0.000545884,
- 0.000543741, 0.000541596, 0.000539452, 0.000537307, 0.000535162, 0.000533016, 0.00053087, 0.000528724, 0.000526578, 0.000524431, 0.000522284, 0.000520137,
- 0.000517989, 0.000515842, 0.000513694, 0.000511546, 0.000509398, 0.000507249, 0.000505101, 0.000502953, 0.000500804, 0.000498655, 0.000496507, 0.000494358,
- 0.000492209, 0.000490061, 0.000487912, 0.000485763, 0.000483615, 0.000481466, 0.000479318, 0.00047717, 0.000475021, 0.000472873, 0.000470725, 0.000468578,
- 0.00046643, 0.000464283, 0.000462136, 0.000459989, 0.000457842, 0.000455696, 0.00045355, 0.000451404, 0.000449259, 0.000447114, 0.000444969, 0.000442825,
- 0.000440681, 0.000438537, 0.000436394, 0.000434251, 0.000432109, 0.000429967, 0.000427826, 0.000425685, 0.000423545, 0.000421405, 0.000419266, 0.000417127,
- 0.000414989, 0.000412852, 0.000410715, 0.000408579, 0.000406443, 0.000404308, 0.000402174, 0.000400041, 0.000397908, 0.000395776, 0.000393645, 0.000391514,
- 0.000389385, 0.000387256, 0.000385128, 0.000383, 0.000380874, 0.000378748, 0.000376624, 0.0003745, 0.000372377, 0.000370255, 0.000368134, 0.000366014,
- 0.000363895, 0.000361777, 0.00035966, 0.000357544, 0.000355429, 0.000353315, 0.000351202, 0.000349091, 0.00034698, 0.000344871, 0.000342762, 0.000340655,
- 0.000338549, 0.000336444, 0.00033434, 0.000332238, 0.000330137, 0.000328037, 0.000325938, 0.000323841, 0.000321745, 0.00031965, 0.000317556, 0.000315464,
- 0.000313374, 0.000311284, 0.000309196, 0.00030711, 0.000305025, 0.000302941, 0.000300859, 0.000298778, 0.000296699, 0.000294621, 0.000292544, 0.00029047,
- 0.000288397, 0.000286325, 0.000284255, 0.000282186, 0.00028012, 0.000278054, 0.000275991, 0.000273929, 0.000271869, 0.00026981, 0.000267753, 0.000265698,
- 0.000263645, 0.000261593, 0.000259543, 0.000257495, 0.000255449, 0.000253404, 0.000251362, 0.000249321, 0.000247282, 0.000245245, 0.00024321, 0.000241176,
- 0.000239145, 0.000237116, 0.000235088, 0.000233062, 0.000231039, 0.000229017, 0.000226998, 0.00022498, 0.000222965, 0.000220951, 0.00021894, 0.00021693,
- 0.000214923, 0.000212918, 0.000210915, 0.000208914, 0.000206915, 0.000204919, 0.000202924, 0.000200932, 0.000198942, 0.000196955, 0.000194969, 0.000192986,
- 0.000191005, 0.000189026, 0.00018705, 0.000185076, 0.000183104, 0.000181135, 0.000179167, 0.000177203, 0.00017524, 0.000173281, 0.000171323, 0.000169368,
- 0.000167415, 0.000165465, 0.000163517, 0.000161572, 0.000159629, 0.000157689, 0.000155752, 0.000153816, 0.000151884, 0.000149954, 0.000148026, 0.000146101,
+ {
+ 0.00125, 0.00124999, 0.00124998, 0.00124997, 0.00124995, 0.00124992, 0.00124989, 0.00124985,
+ 0.0012498, 0.00124975, 0.00124969, 0.00124962,
+ 0.00124955, 0.00124948, 0.00124939, 0.0012493, 0.00124921, 0.00124911, 0.001249, 0.00124888,
+ 0.00124876, 0.00124864, 0.0012485, 0.00124837,
+ 0.00124822, 0.00124807, 0.00124791, 0.00124775, 0.00124758, 0.0012474, 0.00124722, 0.00124703,
+ 0.00124684, 0.00124664, 0.00124643, 0.00124622,
+ 0.001246, 0.00124578, 0.00124555, 0.00124531, 0.00124507, 0.00124482, 0.00124456, 0.0012443,
+ 0.00124403, 0.00124376, 0.00124348, 0.00124319,
+ 0.0012429, 0.0012426, 0.0012423, 0.00124199, 0.00124167, 0.00124135, 0.00124102, 0.00124069,
+ 0.00124035, 0.00124, 0.00123965, 0.00123929,
+ 0.00123892, 0.00123855, 0.00123817, 0.00123779, 0.0012374, 0.001237, 0.0012366, 0.00123619,
+ 0.00123578, 0.00123536, 0.00123494, 0.0012345,
+ 0.00123407, 0.00123362, 0.00123317, 0.00123272, 0.00123225, 0.00123179, 0.00123131, 0.00123083,
+ 0.00123035, 0.00122985, 0.00122936, 0.00122885,
+ 0.00122834, 0.00122783, 0.0012273, 0.00122678, 0.00122624, 0.0012257, 0.00122516, 0.0012246,
+ 0.00122405, 0.00122348, 0.00122291, 0.00122234,
+ 0.00122175, 0.00122117, 0.00122057, 0.00121997, 0.00121937, 0.00121876, 0.00121814, 0.00121752,
+ 0.00121689, 0.00121625, 0.00121561, 0.00121497,
+ 0.00121431, 0.00121366, 0.00121299, 0.00121232, 0.00121165, 0.00121096, 0.00121028, 0.00120958,
+ 0.00120888, 0.00120818, 0.00120747, 0.00120675,
+ 0.00120603, 0.0012053, 0.00120457, 0.00120383, 0.00120308, 0.00120233, 0.00120157, 0.00120081,
+ 0.00120004, 0.00119927, 0.00119849, 0.0011977,
+ 0.00119691, 0.00119611, 0.00119531, 0.0011945, 0.00119368, 0.00119286, 0.00119204, 0.00119121,
+ 0.00119037, 0.00118953, 0.00118868, 0.00118782,
+ 0.00118696, 0.0011861, 0.00118523, 0.00118435, 0.00118347, 0.00118258, 0.00118169, 0.00118079,
+ 0.00117988, 0.00117897, 0.00117805, 0.00117713,
+ 0.00117621, 0.00117527, 0.00117433, 0.00117339, 0.00117244, 0.00117149, 0.00117053, 0.00116956,
+ 0.00116859, 0.00116761, 0.00116663, 0.00116564,
+ 0.00116465, 0.00116365, 0.00116265, 0.00116164, 0.00116062, 0.0011596, 0.00115858, 0.00115754,
+ 0.00115651, 0.00115547, 0.00115442, 0.00115337,
+ 0.00115231, 0.00115124, 0.00115018, 0.0011491, 0.00114802, 0.00114694, 0.00114585, 0.00114475,
+ 0.00114365, 0.00114255, 0.00114143, 0.00114032,
+ 0.0011392, 0.00113807, 0.00113694, 0.0011358, 0.00113466, 0.00113351, 0.00113236, 0.0011312,
+ 0.00113003, 0.00112887, 0.00112769, 0.00112651,
+ 0.00112533, 0.00112414, 0.00112295, 0.00112175, 0.00112054, 0.00111933, 0.00111812, 0.0011169,
+ 0.00111567, 0.00111444, 0.00111321, 0.00111197,
+ 0.00111072, 0.00110947, 0.00110822, 0.00110696, 0.00110569, 0.00110442, 0.00110315, 0.00110187,
+ 0.00110059, 0.0010993, 0.001098, 0.0010967,
+ 0.0010954, 0.00109409, 0.00109277, 0.00109146, 0.00109013, 0.0010888, 0.00108747, 0.00108613,
+ 0.00108479, 0.00108344, 0.00108209, 0.00108073,
+ 0.00107937, 0.001078, 0.00107663, 0.00107526, 0.00107387, 0.00107249, 0.0010711, 0.0010697,
+ 0.0010683, 0.0010669, 0.00106549, 0.00106408,
+ 0.00106266, 0.00106124, 0.00105981, 0.00105838, 0.00105694, 0.0010555, 0.00105405, 0.0010526,
+ 0.00105115, 0.00104969, 0.00104823, 0.00104676,
+ 0.00104528, 0.00104381, 0.00104233, 0.00104084, 0.00103935, 0.00103785, 0.00103636, 0.00103485,
+ 0.00103334, 0.00103183, 0.00103031, 0.00102879,
+ 0.00102727, 0.00102574, 0.0010242, 0.00102267, 0.00102112, 0.00101958, 0.00101803, 0.00101647,
+ 0.00101491, 0.00101335, 0.00101178, 0.00101021,
+ 0.00100863, 0.00100705, 0.00100547, 0.00100388, 0.00100228, 0.00100069, 0.000999085, 0.00099748,
+ 0.000995871, 0.000994258, 0.00099264, 0.000991019,
+ 0.000989394, 0.000987764, 0.000986131, 0.000984494, 0.000982852, 0.000981207, 0.000979558, 0.000977905,
+ 0.000976248, 0.000974587, 0.000972922, 0.000971254,
+ 0.000969581, 0.000967905, 0.000966225, 0.000964541, 0.000962853, 0.000961162, 0.000959466, 0.000957767,
+ 0.000956065, 0.000954358, 0.000952648, 0.000950934,
+ 0.000949217, 0.000947495, 0.00094577, 0.000944042, 0.00094231, 0.000940574, 0.000938834, 0.000937092,
+ 0.000935345, 0.000933595, 0.000931841, 0.000930084,
+ 0.000928323, 0.000926559, 0.000924792, 0.000923021, 0.000921246, 0.000919468, 0.000917686, 0.000915902,
+ 0.000914113, 0.000912322, 0.000910527, 0.000908728,
+ 0.000906927, 0.000905122, 0.000903314, 0.000901502, 0.000899687, 0.000897869, 0.000896048, 0.000894223,
+ 0.000892395, 0.000890564, 0.00088873, 0.000886892,
+ 0.000885052, 0.000883208, 0.000881361, 0.000879511, 0.000877658, 0.000875802, 0.000873943, 0.000872081,
+ 0.000870216, 0.000868347, 0.000866476, 0.000864602,
+ 0.000862724, 0.000860844, 0.000858961, 0.000857075, 0.000855186, 0.000853294, 0.000851399, 0.000849502,
+ 0.000847601, 0.000845698, 0.000843791, 0.000841882,
+ 0.000839971, 0.000838056, 0.000836139, 0.000834219, 0.000832296, 0.000830371, 0.000828442, 0.000826511,
+ 0.000824578, 0.000822642, 0.000820703, 0.000818761,
+ 0.000816817, 0.000814871, 0.000812922, 0.00081097, 0.000809016, 0.000807059, 0.000805099, 0.000803138,
+ 0.000801173, 0.000799207, 0.000797237, 0.000795266,
+ 0.000793292, 0.000791315, 0.000789337, 0.000787355, 0.000785372, 0.000783386, 0.000781398, 0.000779407,
+ 0.000777415, 0.00077542, 0.000773422, 0.000771423,
+ 0.000769421, 0.000767417, 0.000765411, 0.000763403, 0.000761393, 0.00075938, 0.000757365, 0.000755349,
+ 0.00075333, 0.000751309, 0.000749286, 0.000747261,
+ 0.000745234, 0.000743205, 0.000741173, 0.00073914, 0.000737105, 0.000735069, 0.00073303, 0.000730989,
+ 0.000728946, 0.000726902, 0.000724855, 0.000722807,
+ 0.000720757, 0.000718705, 0.000716652, 0.000714596, 0.000712539, 0.00071048, 0.000708419, 0.000706357,
+ 0.000704293, 0.000702227, 0.00070016, 0.000698091,
+ 0.00069602, 0.000693948, 0.000691874, 0.000689798, 0.000687721, 0.000685643, 0.000683563, 0.000681481,
+ 0.000679398, 0.000677313, 0.000675227, 0.00067314,
+ 0.000671051, 0.000668961, 0.000666869, 0.000664776, 0.000662681, 0.000660586, 0.000658489, 0.00065639,
+ 0.00065429, 0.000652189, 0.000650087, 0.000647984,
+ 0.000645879, 0.000643773, 0.000641666, 0.000639558, 0.000637448, 0.000635337, 0.000633226, 0.000631113,
+ 0.000628999, 0.000626884, 0.000624768, 0.000622651,
+ 0.000620533, 0.000618414, 0.000616293, 0.000614172, 0.00061205, 0.000609927, 0.000607803, 0.000605679,
+ 0.000603553, 0.000601426, 0.000599299, 0.000597171,
+ 0.000595042, 0.000592912, 0.000590781, 0.000588649, 0.000586517, 0.000584384, 0.000582251, 0.000580116,
+ 0.000577981, 0.000575845, 0.000573709, 0.000571572,
+ 0.000569434, 0.000567296, 0.000565157, 0.000563018, 0.000560878, 0.000558738, 0.000556597, 0.000554455,
+ 0.000552313, 0.000550171, 0.000548028, 0.000545884,
+ 0.000543741, 0.000541596, 0.000539452, 0.000537307, 0.000535162, 0.000533016, 0.00053087, 0.000528724,
+ 0.000526578, 0.000524431, 0.000522284, 0.000520137,
+ 0.000517989, 0.000515842, 0.000513694, 0.000511546, 0.000509398, 0.000507249, 0.000505101, 0.000502953,
+ 0.000500804, 0.000498655, 0.000496507, 0.000494358,
+ 0.000492209, 0.000490061, 0.000487912, 0.000485763, 0.000483615, 0.000481466, 0.000479318, 0.00047717,
+ 0.000475021, 0.000472873, 0.000470725, 0.000468578,
+ 0.00046643, 0.000464283, 0.000462136, 0.000459989, 0.000457842, 0.000455696, 0.00045355, 0.000451404,
+ 0.000449259, 0.000447114, 0.000444969, 0.000442825,
+ 0.000440681, 0.000438537, 0.000436394, 0.000434251, 0.000432109, 0.000429967, 0.000427826, 0.000425685,
+ 0.000423545, 0.000421405, 0.000419266, 0.000417127,
+ 0.000414989, 0.000412852, 0.000410715, 0.000408579, 0.000406443, 0.000404308, 0.000402174, 0.000400041,
+ 0.000397908, 0.000395776, 0.000393645, 0.000391514,
+ 0.000389385, 0.000387256, 0.000385128, 0.000383, 0.000380874, 0.000378748, 0.000376624, 0.0003745,
+ 0.000372377, 0.000370255, 0.000368134, 0.000366014,
+ 0.000363895, 0.000361777, 0.00035966, 0.000357544, 0.000355429, 0.000353315, 0.000351202, 0.000349091,
+ 0.00034698, 0.000344871, 0.000342762, 0.000340655,
+ 0.000338549, 0.000336444, 0.00033434, 0.000332238, 0.000330137, 0.000328037, 0.000325938, 0.000323841,
+ 0.000321745, 0.00031965, 0.000317556, 0.000315464,
+ 0.000313374, 0.000311284, 0.000309196, 0.00030711, 0.000305025, 0.000302941, 0.000300859, 0.000298778,
+ 0.000296699, 0.000294621, 0.000292544, 0.00029047,
+ 0.000288397, 0.000286325, 0.000284255, 0.000282186, 0.00028012, 0.000278054, 0.000275991, 0.000273929,
+ 0.000271869, 0.00026981, 0.000267753, 0.000265698,
+ 0.000263645, 0.000261593, 0.000259543, 0.000257495, 0.000255449, 0.000253404, 0.000251362, 0.000249321,
+ 0.000247282, 0.000245245, 0.00024321, 0.000241176,
+ 0.000239145, 0.000237116, 0.000235088, 0.000233062, 0.000231039, 0.000229017, 0.000226998, 0.00022498,
+ 0.000222965, 0.000220951, 0.00021894, 0.00021693,
+ 0.000214923, 0.000212918, 0.000210915, 0.000208914, 0.000206915, 0.000204919, 0.000202924, 0.000200932,
+ 0.000198942, 0.000196955, 0.000194969, 0.000192986,
+ 0.000191005, 0.000189026, 0.00018705, 0.000185076, 0.000183104, 0.000181135, 0.000179167, 0.000177203,
+ 0.00017524, 0.000173281, 0.000171323, 0.000169368,
+ 0.000167415, 0.000165465, 0.000163517, 0.000161572, 0.000159629, 0.000157689, 0.000155752, 0.000153816,
+ 0.000151884, 0.000149954, 0.000148026, 0.000146101,
0.000144179
-};
+ };
template<class TInput, class TOutput>
double
@@ -106,46 +165,47 @@ ProlateFunction<TInput, TOutput>
vnl_vector<vcl_complex<double> > resampledProfile(1024);
resampledProfile.fill(0);
- for (unsigned int i = 0; i<m_Radius+1; ++i)
- {
- unsigned int ival = static_cast<unsigned int>(static_cast<double>(m_OriginalProfileSize*i)/static_cast<double>(m_Radius+1));
+ for (unsigned int i = 0; i < m_Radius + 1; ++i)
+ {
+ unsigned int ival =
+ static_cast<unsigned int>(static_cast<double>(m_OriginalProfileSize * i) / static_cast<double>(m_Radius + 1));
resampledProfile[i] = m_OriginalProfile[ival];
- }
+ }
vnl_fft_1d<double> v1d(1024);
v1d.fwd_transform(resampledProfile);
// Carrful, spectrum is symmetrical
- unsigned int sampleNb = static_cast<unsigned int>( 1024/(2*resampleRatio) );
+ unsigned int sampleNb = static_cast<unsigned int>(1024 / (2 * resampleRatio));
double energy = 0.;
// First part of spectrum
- for (unsigned int j = 0; j<sampleNb+1; ++j)
- {
- energy += std::abs(resampledProfile[j])*std::abs(resampledProfile[j]);
- }
+ for (unsigned int j = 0; j < sampleNb + 1; ++j)
+ {
+ energy += std::abs(resampledProfile[j]) * std::abs(resampledProfile[j]);
+ }
// Last part of spectrum
- for (unsigned int j = 1023; j>1023-sampleNb; j--)
- {
- energy += std::abs(resampledProfile[j])*std::abs(resampledProfile[j]);
- }
+ for (unsigned int j = 1023; j > 1023 - sampleNb; j--)
+ {
+ energy += std::abs(resampledProfile[j]) * std::abs(resampledProfile[j]);
+ }
double totalEnergy = energy;
// Middle part
- for (unsigned int j = sampleNb+1; j<1023-sampleNb+1; ++j)
- {
- totalEnergy += std::abs(resampledProfile[j])*std::abs(resampledProfile[j]);
- }
+ for (unsigned int j = sampleNb + 1; j < 1023 - sampleNb + 1; ++j)
+ {
+ totalEnergy += std::abs(resampledProfile[j]) * std::abs(resampledProfile[j]);
+ }
- std::cout<<"SampleNb: "<<sampleNb<<", energy: "<<energy<<", total energy: "<<totalEnergy<<std::endl;
+ std::cout << "SampleNb: " << sampleNb << ", energy: " << energy << ", total energy: " << totalEnergy << std::endl;
- return std::sqrt(energy)/std::sqrt(totalEnergy);
+ return std::sqrt(energy) / std::sqrt(totalEnergy);
}
-
-}// end namespace Function
+} // end namespace Function
/** Constructor */
-template<class TInputImage, class TBoundaryCondition, class TCoordRep, class TInputInterpolator, class TOutputInterpolator>
+template<class TInputImage, class TBoundaryCondition, class TCoordRep, class TInputInterpolator,
+ class TOutputInterpolator>
ProlateInterpolateImageFunction<TInputImage, TBoundaryCondition, TCoordRep, TInputInterpolator, TOutputInterpolator>
::ProlateInterpolateImageFunction()
{
@@ -154,20 +214,22 @@ ProlateInterpolateImageFunction<TInputImage, TBoundaryCondition, TCoordRep, TInp
}
/** Destructor */
-template<class TInputImage, class TBoundaryCondition, class TCoordRep, class TInputInterpolator, class TOutputInterpolator>
+template<class TInputImage, class TBoundaryCondition, class TCoordRep, class TInputInterpolator,
+ class TOutputInterpolator>
ProlateInterpolateImageFunction<TInputImage, TBoundaryCondition, TCoordRep, TInputInterpolator, TOutputInterpolator>
::~ProlateInterpolateImageFunction()
{
}
-template<class TInputImage, class TBoundaryCondition, class TCoordRep, class TInputInterpolator, class TOutputInterpolator>
+template<class TInputImage, class TBoundaryCondition, class TCoordRep, class TInputInterpolator,
+ class TOutputInterpolator>
void
ProlateInterpolateImageFunction<TInputImage, TBoundaryCondition, TCoordRep, TInputInterpolator, TOutputInterpolator>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
-}//namespace otb
+} //namespace otb
#endif
diff --git a/Code/BasicFilters/otbQuaternaryFunctorImageFilter.h b/Code/BasicFilters/otbQuaternaryFunctorImageFilter.h
index b8c4276d99..cfe52467cd 100644
--- a/Code/BasicFilters/otbQuaternaryFunctorImageFilter.h
+++ b/Code/BasicFilters/otbQuaternaryFunctorImageFilter.h
@@ -39,17 +39,17 @@ namespace otb
* \ingroup IntensityImageFilters Multithreaded
*/
template <class TInputImage1, class TInputImage2,
-class TInputImage3, class TInputImage4,
-class TOutputImage, class TFunction >
+ class TInputImage3, class TInputImage4,
+ class TOutputImage, class TFunction>
class ITK_EXPORT QuaternaryFunctorImageFilter :
- public itk::InPlaceImageFilter<TInputImage1,TOutputImage>
+ public itk::InPlaceImageFilter<TInputImage1, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef QuaternaryFunctorImageFilter Self;
- typedef itk::InPlaceImageFilter<TInputImage1,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef QuaternaryFunctorImageFilter Self;
+ typedef itk::InPlaceImageFilter<TInputImage1, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -58,39 +58,39 @@ public:
itkTypeMacro(QuaternaryFunctorImageFilter, InPlaceImageFilter);
/** Some typedefs. */
- typedef TFunction FunctorType;
- typedef TInputImage1 Input1ImageType;
+ typedef TFunction FunctorType;
+ typedef TInputImage1 Input1ImageType;
typedef typename Input1ImageType::ConstPointer Input1ImagePointer;
- typedef typename Input1ImageType::RegionType Input1ImageRegionType;
- typedef typename Input1ImageType::PixelType Input1ImagePixelType;
- typedef TInputImage2 Input2ImageType;
+ typedef typename Input1ImageType::RegionType Input1ImageRegionType;
+ typedef typename Input1ImageType::PixelType Input1ImagePixelType;
+ typedef TInputImage2 Input2ImageType;
typedef typename Input2ImageType::ConstPointer Input2ImagePointer;
- typedef typename Input2ImageType::RegionType Input2ImageRegionType;
- typedef typename Input2ImageType::PixelType Input2ImagePixelType;
- typedef TInputImage3 Input3ImageType;
+ typedef typename Input2ImageType::RegionType Input2ImageRegionType;
+ typedef typename Input2ImageType::PixelType Input2ImagePixelType;
+ typedef TInputImage3 Input3ImageType;
typedef typename Input3ImageType::ConstPointer Input3ImagePointer;
- typedef typename Input3ImageType::RegionType Input3ImageRegionType;
- typedef typename Input3ImageType::PixelType Input3ImagePixelType;
- typedef TInputImage4 Input4ImageType;
+ typedef typename Input3ImageType::RegionType Input3ImageRegionType;
+ typedef typename Input3ImageType::PixelType Input3ImagePixelType;
+ typedef TInputImage4 Input4ImageType;
typedef typename Input4ImageType::ConstPointer Input4ImagePointer;
- typedef typename Input4ImageType::RegionType Input4ImageRegionType;
- typedef typename Input4ImageType::PixelType Input4ImagePixelType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputImagePixelType;
+ typedef typename Input4ImageType::RegionType Input4ImageRegionType;
+ typedef typename Input4ImageType::PixelType Input4ImagePixelType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputImagePixelType;
/** Connect one of the operands for pixel-wise addition. */
- void SetInput1( const TInputImage1 *image1);
+ void SetInput1(const TInputImage1 *image1);
/** Connect one of the operands for pixel-wise addition. */
- void SetInput2( const TInputImage2 *image2);
+ void SetInput2(const TInputImage2 *image2);
/** Connect one of the operands for pixel-wise addition. */
- void SetInput3( const TInputImage3 *image3);
+ void SetInput3(const TInputImage3 *image3);
/** Connect one of the operands for pixel-wise addition. */
- void SetInput4( const TInputImage4 *image4);
+ void SetInput4(const TInputImage4 *image4);
/** Get the functor object. The functor is returned by reference.
* (Functors do not have to derive from itk::LightObject, so they do
@@ -99,7 +99,7 @@ public:
FunctorType& GetFunctor(void)
{
return m_Functor;
- };
+ }
/** Get the functor object. The functor is returned by reference.
* (Functors do not have to derive from itk::LightObject, so they do
@@ -108,7 +108,7 @@ public:
const FunctorType& GetFunctor() const
{
return m_Functor;
- };
+ }
/** Set the functor object. This replaces the current Functor with a
* copy of the specified Functor. This allows the user to specify a
@@ -118,11 +118,11 @@ public:
* appropriate). */
void SetFunctor(const FunctorType& functor)
{
- if (! (functor == m_Functor) )
- {
+ if (!(functor == m_Functor))
+ {
m_Functor = functor;
this->Modified();
- }
+ }
}
/** Image dimensions */
@@ -139,7 +139,7 @@ public:
protected:
QuaternaryFunctorImageFilter();
- virtual ~QuaternaryFunctorImageFilter() {};
+ virtual ~QuaternaryFunctorImageFilter() {}
/** Validate the presence of all three inputs. If one or more inputs
* are missing, throw an exception. */
@@ -156,11 +156,11 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
private:
- QuaternaryFunctorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ QuaternaryFunctorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
FunctorType m_Functor;
};
diff --git a/Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx b/Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx
index 0927f731ae..0458ddfe7b 100644
--- a/Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx
+++ b/Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx
@@ -32,119 +32,115 @@ namespace otb
/**
* Constructor
*/
-template < class TInputImage1, class TInputImage2,class TInputImage3,
-class TInputImage4, class TOutputImage, class TFunction >
-QuaternaryFunctorImageFilter<TInputImage1,TInputImage2,TInputImage3,TInputImage4,TOutputImage,TFunction>
+template <class TInputImage1, class TInputImage2, class TInputImage3,
+ class TInputImage4, class TOutputImage, class TFunction>
+QuaternaryFunctorImageFilter<TInputImage1, TInputImage2, TInputImage3, TInputImage4, TOutputImage, TFunction>
::QuaternaryFunctorImageFilter()
{
this->InPlaceOff();
}
-
/**
* Connect one of the operands for pixel-wise addition
*/
-template < class TInputImage1, class TInputImage2,class TInputImage3,
-class TInputImage4, class TOutputImage, class TFunction >
+template <class TInputImage1, class TInputImage2, class TInputImage3,
+ class TInputImage4, class TOutputImage, class TFunction>
void
-QuaternaryFunctorImageFilter<TInputImage1,TInputImage2,TInputImage3,TInputImage4,TOutputImage,TFunction>
-::SetInput1( const TInputImage1 *image1 )
+QuaternaryFunctorImageFilter<TInputImage1, TInputImage2, TInputImage3, TInputImage4, TOutputImage, TFunction>
+::SetInput1(const TInputImage1 *image1)
{
// The ProcessObject is not const-correct so the const_cast is required here
- SetNthInput( 0, const_cast<TInputImage1 *>( image1 ) );
+ SetNthInput(0, const_cast<TInputImage1 *>(image1));
}
-
/**
* Connect one of the operands for pixel-wise addition
*/
-template < class TInputImage1, class TInputImage2,class TInputImage3,
-class TInputImage4, class TOutputImage, class TFunction >
+template <class TInputImage1, class TInputImage2, class TInputImage3,
+ class TInputImage4, class TOutputImage, class TFunction>
void
-QuaternaryFunctorImageFilter<TInputImage1,TInputImage2,TInputImage3,TInputImage4,TOutputImage,TFunction>
-::SetInput2( const TInputImage2 *image2 )
+QuaternaryFunctorImageFilter<TInputImage1, TInputImage2, TInputImage3, TInputImage4, TOutputImage, TFunction>
+::SetInput2(const TInputImage2 *image2)
{
// The ProcessObject is not const-correct so the const_cast is required here
- SetNthInput( 1, const_cast<TInputImage2 *>( image2 ) );
+ SetNthInput(1, const_cast<TInputImage2 *>(image2));
}
-
/**
* Connect one of the operands for pixel-wise addition
*/
-template < class TInputImage1, class TInputImage2,class TInputImage3,
-class TInputImage4, class TOutputImage, class TFunction >
+template <class TInputImage1, class TInputImage2, class TInputImage3,
+ class TInputImage4, class TOutputImage, class TFunction>
void
-QuaternaryFunctorImageFilter<TInputImage1,TInputImage2,TInputImage3,TInputImage4,TOutputImage,TFunction>
-::SetInput3( const TInputImage3 *image3 )
+QuaternaryFunctorImageFilter<TInputImage1, TInputImage2, TInputImage3, TInputImage4, TOutputImage, TFunction>
+::SetInput3(const TInputImage3 *image3)
{
// The ProcessObject is not const-correct so the const_cast is required here
- SetNthInput( 2, const_cast<TInputImage3 *>( image3 ) );
+ SetNthInput(2, const_cast<TInputImage3 *>(image3));
}
-
/**
* Connect one of the operands for pixel-wise addition
*/
-template < class TInputImage1, class TInputImage2,class TInputImage3,
-class TInputImage4, class TOutputImage, class TFunction >
+template <class TInputImage1, class TInputImage2, class TInputImage3,
+ class TInputImage4, class TOutputImage, class TFunction>
void
-QuaternaryFunctorImageFilter<TInputImage1,TInputImage2,TInputImage3,TInputImage4,TOutputImage,TFunction>
-::SetInput4( const TInputImage4 *image4 )
+QuaternaryFunctorImageFilter<TInputImage1, TInputImage2, TInputImage3, TInputImage4, TOutputImage, TFunction>
+::SetInput4(const TInputImage4 *image4)
{
// The ProcessObject is not const-correct so the const_cast is required here
- SetNthInput( 3, const_cast<TInputImage4 *>( image4 ) );
+ SetNthInput(3, const_cast<TInputImage4 *>(image4));
}
/**
* BeforeThreadedGenerateData function. Validate inputs
*/
-template < class TInputImage1, class TInputImage2,class TInputImage3,
-class TInputImage4, class TOutputImage, class TFunction >
+template <class TInputImage1, class TInputImage2, class TInputImage3,
+ class TInputImage4, class TOutputImage, class TFunction>
void
-QuaternaryFunctorImageFilter<TInputImage1,TInputImage2,TInputImage3,TInputImage4,TOutputImage,TFunction>
+QuaternaryFunctorImageFilter<TInputImage1, TInputImage2, TInputImage3, TInputImage4, TOutputImage, TFunction>
::BeforeThreadedGenerateData()
{
Input1ImagePointer inputPtr1
- = dynamic_cast<const TInputImage1*>((itk::ProcessObject::GetInput(0)));
+ = dynamic_cast<const TInputImage1*>((itk::ProcessObject::GetInput(0)));
Input2ImagePointer inputPtr2
- = dynamic_cast<const TInputImage2*>((itk::ProcessObject::GetInput(1)));
+ = dynamic_cast<const TInputImage2*>((itk::ProcessObject::GetInput(1)));
Input3ImagePointer inputPtr3
- = dynamic_cast<const TInputImage3*>((itk::ProcessObject::GetInput(2)));
+ = dynamic_cast<const TInputImage3*>((itk::ProcessObject::GetInput(2)));
Input4ImagePointer inputPtr4
- = dynamic_cast<const TInputImage4*>((itk::ProcessObject::GetInput(3)));
- if (inputPtr1.IsNull() || inputPtr2.IsNull() || inputPtr3.IsNull() ||inputPtr4.IsNull())
- {
+ = dynamic_cast<const TInputImage4*>((itk::ProcessObject::GetInput(3)));
+ if (inputPtr1.IsNull() || inputPtr2.IsNull() || inputPtr3.IsNull() || inputPtr4.IsNull())
+ {
itkExceptionMacro(<< "At least one input is missing."
<< " Input1 is " << inputPtr1.GetPointer() << ", "
<< " Input2 is " << inputPtr2.GetPointer() << ", "
<< " Input3 is " << inputPtr3.GetPointer() << ", "
<< " Input4 is " << inputPtr4.GetPointer());
- }
+ }
}
/**
* ThreadedGenerateData function. Performs the pixel-wise addition
*/
-template < class TInputImage1, class TInputImage2,class TInputImage3,
-class TInputImage4, class TOutputImage, class TFunction >
+template <class TInputImage1, class TInputImage2, class TInputImage3,
+ class TInputImage4, class TOutputImage, class TFunction>
void
-QuaternaryFunctorImageFilter<TInputImage1,TInputImage2,TInputImage3,TInputImage4,TOutputImage,TFunction>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread,
- int threadId)
+QuaternaryFunctorImageFilter<TInputImage1, TInputImage2, TInputImage3, TInputImage4, TOutputImage, TFunction>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
+ int threadId)
{
// We use dynamic_cast since inputs are stored as DataObjects. The
// ImageToImageFilter::GetInput(int) always returns a pointer to a
// TInputImage1 so it cannot be used for the second or third input.
Input1ImagePointer inputPtr1
- = dynamic_cast<const TInputImage1*>((itk::ProcessObject::GetInput(0)));
+ = dynamic_cast<const TInputImage1*>((itk::ProcessObject::GetInput(0)));
Input2ImagePointer inputPtr2
- = dynamic_cast<const TInputImage2*>((itk::ProcessObject::GetInput(1)));
+ = dynamic_cast<const TInputImage2*>((itk::ProcessObject::GetInput(1)));
Input3ImagePointer inputPtr3
- = dynamic_cast<const TInputImage3*>((itk::ProcessObject::GetInput(2)));
+ = dynamic_cast<const TInputImage3*>((itk::ProcessObject::GetInput(2)));
Input4ImagePointer inputPtr4
- = dynamic_cast<const TInputImage4*>((itk::ProcessObject::GetInput(3)));
+ = dynamic_cast<const TInputImage4*>((itk::ProcessObject::GetInput(3)));
OutputImagePointer outputPtr = this->GetOutput(0);
itk::ImageRegionConstIterator<TInputImage1> inputIt1(inputPtr1, outputRegionForThread);
@@ -160,17 +156,16 @@ QuaternaryFunctorImageFilter<TInputImage1,TInputImage2,TInputImage3,TInputImage4
inputIt3.GoToBegin();
outputIt.GoToBegin();
-
- while ( !inputIt1.IsAtEnd() )
- {
- outputIt.Set( m_Functor(inputIt1.Get(), inputIt2.Get(), inputIt3.Get(), inputIt4.Get()) );
+ while (!inputIt1.IsAtEnd())
+ {
+ outputIt.Set(m_Functor(inputIt1.Get(), inputIt2.Get(), inputIt3.Get(), inputIt4.Get()));
++inputIt1;
++inputIt2;
++inputIt3;
++inputIt4;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
}
} // end namespace otb
diff --git a/Code/BasicFilters/otbRandomPointSetSource.h b/Code/BasicFilters/otbRandomPointSetSource.h
index 01b92d09b0..27fce9ea9d 100644
--- a/Code/BasicFilters/otbRandomPointSetSource.h
+++ b/Code/BasicFilters/otbRandomPointSetSource.h
@@ -40,7 +40,7 @@ namespace otb
template <class TOutputPointSet>
class ITK_EXPORT RandomPointSetSource
- : public PointSetSource<TOutputPointSet>
+ : public PointSetSource<TOutputPointSet>
{
public:
@@ -73,19 +73,19 @@ public:
itkGetMacro(MaxPoint, PointType)
void SetSeed(ITK_UINT32 seed)
- {
+ {
m_Generator->SetSeed(seed);
- }
+ }
protected:
RandomPointSetSource();
- virtual ~RandomPointSetSource() {};
+ virtual ~RandomPointSetSource() {}
- virtual void GenerateData( void );
+ virtual void GenerateData(void);
private:
- RandomPointSetSource(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ RandomPointSetSource(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
unsigned int m_NumberOfPoints;
diff --git a/Code/BasicFilters/otbRandomPointSetSource.txx b/Code/BasicFilters/otbRandomPointSetSource.txx
index beaff22190..9958c92ea5 100644
--- a/Code/BasicFilters/otbRandomPointSetSource.txx
+++ b/Code/BasicFilters/otbRandomPointSetSource.txx
@@ -47,13 +47,13 @@ RandomPointSetSource<TOutputPointSet>
outputPointSet->Initialize();
PointsContainerPointer outPoints = outputPointSet->GetPoints();
- outPoints->Reserve( m_NumberOfPoints );
+ outPoints->Reserve(m_NumberOfPoints);
typename PointsContainerType::Iterator outputPoint = outPoints->Begin();
- while(outputPoint != outPoints->End() )
+ while (outputPoint != outPoints->End())
{
PointType point;
- for (unsigned int i=0; i<OutputPointSetType::PointDimension; ++i)
+ for (unsigned int i = 0; i < OutputPointSetType::PointDimension; ++i)
{
double v = m_Generator->GetVariateWithClosedRange(1.0);
point[i] = (1.0 - v) * m_MinPoint[i] + v * m_MaxPoint[i];
diff --git a/Code/BasicFilters/otbReliefColormapFunctor.h b/Code/BasicFilters/otbReliefColormapFunctor.h
index 6448bcc492..d468312589 100644
--- a/Code/BasicFilters/otbReliefColormapFunctor.h
+++ b/Code/BasicFilters/otbReliefColormapFunctor.h
@@ -22,12 +22,12 @@
namespace otb {
-namespace Functor {
+namespace Functor {
/**
* \class ReliefColormapFunctor
* \brief Function object which maps a scalar value into an RGB colormap value for relief representation.
- *
+ *
* This code is working with the framework contributed in the Insight Journal paper:
*
* "Meeting Andy Warhol Somewhere Over the Rainbow: RGB Colormapping and ITK"
@@ -35,35 +35,35 @@ namespace Functor {
* http://hdl.handle.net/1926/1452
*
*/
-template< class TScalar, class TRGBPixel >
+template<class TScalar, class TRGBPixel>
class ITK_EXPORT ReliefColormapFunctor
-: public itk::Functor::ColormapFunctor<TScalar, TRGBPixel>
+ : public itk::Functor::ColormapFunctor<TScalar, TRGBPixel>
{
public:
- typedef ReliefColormapFunctor Self;
- typedef itk::Functor::ColormapFunctor<TScalar, TRGBPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ReliefColormapFunctor Self;
+ typedef itk::Functor::ColormapFunctor<TScalar, TRGBPixel> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
+
+ typedef typename Superclass::RGBPixelType RGBPixelType;
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef typename Superclass::RealType RealType;
- typedef typename Superclass::RGBPixelType RGBPixelType;
- typedef typename Superclass::ScalarType ScalarType;
- typedef typename Superclass::RealType RealType;
-
- virtual RGBPixelType operator()( const TScalar & ) const;
+ virtual RGBPixelType operator ()(const TScalar&) const;
protected:
ReliefColormapFunctor(){};
- ~ReliefColormapFunctor() {};
+ ~ReliefColormapFunctor() {}
private:
- ReliefColormapFunctor(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ReliefColormapFunctor(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
+
} // end namespace functor
} // end namespace otb
diff --git a/Code/BasicFilters/otbReliefColormapFunctor.txx b/Code/BasicFilters/otbReliefColormapFunctor.txx
index b5d6583b5f..b381f39abd 100644
--- a/Code/BasicFilters/otbReliefColormapFunctor.txx
+++ b/Code/BasicFilters/otbReliefColormapFunctor.txx
@@ -27,7 +27,7 @@ namespace Functor {
template <class TScalar, class TRGBPixel>
typename ReliefColormapFunctor<TScalar, TRGBPixel>::RGBPixelType
ReliefColormapFunctor<TScalar, TRGBPixel>
-::operator()( const TScalar & v ) const
+::operator() (const TScalar &v) const
{
float m_Borders[] = {0.0, 0.00001, 0.2, 0.43, 0.71, 1.0};
@@ -36,37 +36,37 @@ ReliefColormapFunctor<TScalar, TRGBPixel>
float m_BlueValues[] = {0.96, 0.59, 0.40, 0.57, 0.00, 1.0};
// Map the input scalar between [0, 1].
- RealType value = this->RescaleInputValue( v );
-
+ RealType value = this->RescaleInputValue(v);
int i = 1;
- while (value > m_Borders[i]) i++;
+ while (value > m_Borders[i])
+ i++;
- float factor = (value-m_Borders[i-1]) / (m_Borders[i]-m_Borders[i-1]);
+ float factor = (value - m_Borders[i - 1]) / (m_Borders[i] - m_Borders[i - 1]);
// Apply the color mapping.
- RealType red = m_RedValues[i-1]+factor*(m_RedValues[i]-m_RedValues[i-1]);
+ RealType red = m_RedValues[i - 1] + factor * (m_RedValues[i] - m_RedValues[i - 1]);
- RealType green = m_GreenValues[i-1]+factor*(m_GreenValues[i]-m_GreenValues[i-1]);
+ RealType green = m_GreenValues[i - 1] + factor * (m_GreenValues[i] - m_GreenValues[i - 1]);
- RealType blue = m_BlueValues[i-1]+factor*(m_BlueValues[i]-m_BlueValues[i-1]);
+ RealType blue = m_BlueValues[i - 1] + factor * (m_BlueValues[i] - m_BlueValues[i - 1]);
// Normalize the values
- red = vnl_math_max( 0.0, red );
- red = vnl_math_min( 1.0, red );
+ red = vnl_math_max(0.0, red);
+ red = vnl_math_min(1.0, red);
- green = vnl_math_max( 0.0, green );
- green = vnl_math_min( 1.0, green );
+ green = vnl_math_max(0.0, green);
+ green = vnl_math_min(1.0, green);
- blue = vnl_math_max( 0.0, blue );
- blue = vnl_math_min( 1.0, blue );
+ blue = vnl_math_max(0.0, blue);
+ blue = vnl_math_min(1.0, blue);
// Set the rgb components after rescaling the values.
RGBPixelType pixel;
- pixel[0] = this->RescaleRGBComponentValue( red );
- pixel[1] = this->RescaleRGBComponentValue( green );
- pixel[2] = this->RescaleRGBComponentValue( blue );
+ pixel[0] = this->RescaleRGBComponentValue(red);
+ pixel[1] = this->RescaleRGBComponentValue(green);
+ pixel[2] = this->RescaleRGBComponentValue(blue);
return pixel;
}
@@ -75,5 +75,4 @@ ReliefColormapFunctor<TScalar, TRGBPixel>
} // end namespace otb
-
#endif
diff --git a/Code/BasicFilters/otbScalarImageTextureFunctor.h b/Code/BasicFilters/otbScalarImageTextureFunctor.h
index e9825bc34a..cac9772e0c 100644
--- a/Code/BasicFilters/otbScalarImageTextureFunctor.h
+++ b/Code/BasicFilters/otbScalarImageTextureFunctor.h
@@ -18,7 +18,6 @@
#ifndef __otbScalarImageTextureFunctor_h
#define __otbScalarImageTextureFunctor_h
-
#include "itkScalarImageTextureCalculator.h"
#include "itkImageRegionIterator.h"
namespace otb
@@ -36,24 +35,24 @@ class ScalarImageTextureFunctor
{
public:
- typedef ScalarImageTextureFunctor Self;
+ typedef ScalarImageTextureFunctor Self;
- ScalarImageTextureFunctor(): m_FeatureIndex(0) {};
- ~ScalarImageTextureFunctor() {};
+ ScalarImageTextureFunctor() : m_FeatureIndex(0) {}
+ ~ScalarImageTextureFunctor() {}
void SetFeatureIndex(int i)
{
m_FeatureIndex = i;
- };
+ }
int GetFeatureIndex()
{
return m_FeatureIndex;
- };
+ }
- typedef TInputImage InputImageType;
- typedef typename itk::Statistics::ScalarImageTextureCalculator< InputImageType> TextureCalcType;
+ typedef TInputImage InputImageType;
+ typedef typename itk::Statistics::ScalarImageTextureCalculator<InputImageType> TextureCalcType;
- inline TOutput operator()(const TNeighIter & it) const
+ inline TOutput operator ()(const TNeighIter& it) const
{
unsigned int neighborhoodSize = it.Size();
@@ -67,17 +66,17 @@ public:
region = it.GetBoundingBoxAsImageRegion();
region.SetIndex(index);
- image->SetRegions( region );
+ image->SetRegions(region);
image->Allocate();
- typedef itk::ImageRegionIterator< InputImageType > IteratorType;
- IteratorType inputIt( image, image->GetLargestPossibleRegion() );
+ typedef itk::ImageRegionIterator<InputImageType> IteratorType;
+ IteratorType inputIt(image, image->GetLargestPossibleRegion());
inputIt.GoToBegin();
for (unsigned int i = 0; i < neighborhoodSize; ++i)
- {
+ {
inputIt.Set(it.GetPixel(i));
++inputIt;
- }
+ }
textureFilter->FastCalculationsOn();
textureFilter->SetInput(image);
@@ -88,7 +87,7 @@ public:
}
private:
ScalarImageTextureFunctor(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
int m_FeatureIndex;
diff --git a/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.h b/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.h
index 6df25b82a0..70455bbc93 100644
--- a/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.h
+++ b/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.h
@@ -28,85 +28,85 @@ namespace otb
namespace Functor
{
- /**
- * \class HSVToRGBFunctor
- * \brief Function object to convert HSV value to RGB.
- *
- *
- * \sa ScalarToRainbowRGBPixelFunctor
- *
- */
- template< class TRGBPixel >
- class ITK_EXPORT HSVToRGBFunctor
+/**
+ * \class HSVToRGBFunctor
+ * \brief Function object to convert HSV value to RGB.
+ *
+ *
+ * \sa ScalarToRainbowRGBPixelFunctor
+ *
+ */
+template<class TRGBPixel>
+class ITK_EXPORT HSVToRGBFunctor
+{
+public:
+ HSVToRGBFunctor(){};
+ ~HSVToRGBFunctor(){}
+ inline TRGBPixel operator ()(double h, double s, double v) const
{
- public:
- HSVToRGBFunctor(){};
- ~HSVToRGBFunctor(){};
- inline TRGBPixel operator()(double h, double s, double v) const
+ const double onethird = 1.0 / 3.0;
+ const double onesixth = 1.0 / 6.0;
+ const double twothird = 2.0 / 3.0;
+ const double fivesixth = 5.0 / 6.0;
+ double r, g, b;
+
+ // compute RGB from HSV
+ if (h > onesixth && h <= onethird) // green/red
+ {
+ g = 1.0;
+ r = (onethird - h) / onesixth;
+ b = 0.0;
+ }
+ else if (h > onethird && h <= 0.5) // green/blue
{
- const double onethird = 1.0 / 3.0;
- const double onesixth = 1.0 / 6.0;
- const double twothird = 2.0 / 3.0;
- const double fivesixth = 5.0 / 6.0;
- double r, g, b;
-
- // compute RGB from HSV
- if (h > onesixth && h <= onethird) // green/red
- {
- g = 1.0;
- r = (onethird - h) / onesixth;
- b = 0.0;
- }
- else if (h > onethird && h <= 0.5) // green/blue
- {
- g = 1.0;
- b = (h - onethird) / onesixth;
- r = 0.0;
- }
- else if (h > 0.5 && h <= twothird) // blue/green
- {
- b = 1.0;
- g = (twothird - h) / onesixth;
- r = 0.0;
- }
- else if (h > twothird && h <= fivesixth) // blue/red
- {
- b = 1.0;
- r = (h - twothird) / onesixth;
- g = 0.0;
- }
- else if (h > fivesixth && h <= 1.0) // red/blue
- {
- r = 1.0;
- b = (1.0 - h) / onesixth;
- g = 0.0;
- }
- else // red/green
- {
- r = 1.0;
- g = h / onesixth;
- b = 0.0;
- }
-
- // add Saturation to the equation.
- r = (s * r + (1.0 - s));
- g = (s * g + (1.0 - s));
- b = (s * b + (1.0 - s));
-
- r *= v;
- g *= v;
- b *= v;
+ g = 1.0;
+ b = (h - onethird) / onesixth;
+ r = 0.0;
+ }
+ else if (h > 0.5 && h <= twothird) // blue/green
+ {
+ b = 1.0;
+ g = (twothird - h) / onesixth;
+ r = 0.0;
+ }
+ else if (h > twothird && h <= fivesixth) // blue/red
+ {
+ b = 1.0;
+ r = (h - twothird) / onesixth;
+ g = 0.0;
+ }
+ else if (h > fivesixth && h <= 1.0) // red/blue
+ {
+ r = 1.0;
+ b = (1.0 - h) / onesixth;
+ g = 0.0;
+ }
+ else // red/green
+ {
+ r = 1.0;
+ g = h / onesixth;
+ b = 0.0;
+ }
+
+ // add Saturation to the equation.
+ r = (s * r + (1.0 - s));
+ g = (s * g + (1.0 - s));
+ b = (s * b + (1.0 - s));
+
+ r *= v;
+ g *= v;
+ b *= v;
// std::cout << h << ", " << s << ", " << v << " -> " << r << ", " << g << ", " << b << std::endl;
- TRGBPixel ans;
- typedef typename TRGBPixel::ComponentType RGBComponentType;
- ans[0] = static_cast<RGBComponentType>( r );
- ans[1] = static_cast<RGBComponentType>( g );
- ans[2] = static_cast<RGBComponentType>( b );
- return ans;
+ TRGBPixel ans;
+ typedef typename TRGBPixel::ComponentType RGBComponentType;
+ ans[0] = static_cast<RGBComponentType>(r);
+ ans[1] = static_cast<RGBComponentType>(g);
+ ans[2] = static_cast<RGBComponentType>(b);
+ return ans;
- }
+ }
};
}
@@ -126,14 +126,14 @@ namespace Functor
* \example BasicFilters/DEMToRainbowExample.cxx
*
*/
-template< class TScalar , class TRGBPixel=itk::RGBPixel<unsigned char> >
+template<class TScalar, class TRGBPixel = itk::RGBPixel<unsigned char> >
class ITK_EXPORT ScalarToRainbowRGBPixelFunctor
-: public itk::Functor::ColormapFunctor<TScalar, TRGBPixel>
+ : public itk::Functor::ColormapFunctor<TScalar, TRGBPixel>
// public itk::Functor::ScalarToRGBPixelFunctor<TScalar>
{
public:
ScalarToRainbowRGBPixelFunctor();
- ~ScalarToRainbowRGBPixelFunctor() {};
+ ~ScalarToRainbowRGBPixelFunctor() {}
typedef ScalarToRainbowRGBPixelFunctor Self;
typedef itk::Functor::ColormapFunctor<TScalar, TRGBPixel> Superclass;
@@ -141,15 +141,14 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
typedef TRGBPixel RGBPixelType;
typedef typename RGBPixelType::ComponentType RGBComponentType;
typedef TScalar ScalarType;
typedef HSVToRGBFunctor<RGBPixelType> HSVToRGBFunctorType;
-
- RGBPixelType operator()( const TScalar &) const;
+ RGBPixelType operator ()(const TScalar&) const;
/** Set the input maximum to be mapped to red
* \deprecated use SetMaximumInputValue() */
@@ -169,8 +168,8 @@ protected:
RGBPixelType HSVToRGB(double h, double s, double v) const;
private:
- ScalarToRainbowRGBPixelFunctor(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ScalarToRainbowRGBPixelFunctor(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
HSVToRGBFunctorType m_HSVToRGBFunctor;
};
diff --git a/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.txx b/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.txx
index f49422cf38..82e300375b 100644
--- a/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.txx
+++ b/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.txx
@@ -36,38 +36,35 @@ ScalarToRainbowRGBPixelFunctor<TScalar, TRGBPixel>
}
-
template <class TScalar, class TRGBPixel>
typename ScalarToRainbowRGBPixelFunctor<TScalar, TRGBPixel>::RGBPixelType
ScalarToRainbowRGBPixelFunctor<TScalar, TRGBPixel>
-::operator()( const TScalar & v) const
+::operator() (const TScalar &v) const
{
double hinc, sinc, vinc;
- hinc=0.6/(this->GetMaximumInputValue()-this->GetMinimumInputValue());
- sinc=0.0;
- vinc=0.0;
+ hinc = 0.6 / (this->GetMaximumInputValue() - this->GetMinimumInputValue());
+ sinc = 0.0;
+ vinc = 0.0;
double hue, sat, val;
- hue = 0.6 - (v-this->GetMinimumInputValue())*hinc;
+ hue = 0.6 - (v - this->GetMinimumInputValue()) * hinc;
if (v < this->GetMinimumInputValue())
- {
- hue=0.6;
- }
+ {
+ hue = 0.6;
+ }
if (v > this->GetMaximumInputValue())
- {
- hue =0.0;
- }
- sat = 0.99 + v*sinc;
- val = itk::NumericTraits<RGBComponentType>::max() + v*vinc;
+ {
+ hue = 0.0;
+ }
+ sat = 0.99 + v * sinc;
+ val = itk::NumericTraits<RGBComponentType>::max() + v * vinc;
return m_HSVToRGBFunctor(hue, sat, val);
}
-
} // end namespace Functor
} // end namespace otb
-
#endif
diff --git a/Code/BasicFilters/otbScalarVectorImageTextureFunctor.h b/Code/BasicFilters/otbScalarVectorImageTextureFunctor.h
index 0552a6b446..6ee75e9a7e 100644
--- a/Code/BasicFilters/otbScalarVectorImageTextureFunctor.h
+++ b/Code/BasicFilters/otbScalarVectorImageTextureFunctor.h
@@ -40,23 +40,23 @@ public:
ScalarVectorImageTextureFunctor()
{
m_FeatureIndex.clear();
- };
- ~ScalarVectorImageTextureFunctor() { };
+ }
+ ~ScalarVectorImageTextureFunctor() {}
- typedef std::vector<int> IndexSelectFeaturesType;
- typedef TInputImage InputImageType;
- typedef typename itk::Statistics::ScalarImageTextureCalculator< InputImageType> TextureCalcType;
+ typedef std::vector<int> IndexSelectFeaturesType;
+ typedef TInputImage InputImageType;
+ typedef typename itk::Statistics::ScalarImageTextureCalculator<InputImageType> TextureCalcType;
- void SetFeatureIndex(const IndexSelectFeaturesType & listIndex)
+ void SetFeatureIndex(const IndexSelectFeaturesType& listIndex)
{
m_FeatureIndex = listIndex;
- };
- const IndexSelectFeaturesType & GetFeatureIndex()
+ }
+ const IndexSelectFeaturesType& GetFeatureIndex()
{
return m_FeatureIndex;
- };
+ }
- inline TOutput operator()(const TNeighIter & it)
+ inline TOutput operator ()(const TNeighIter& it)
{
unsigned int neighborhoodSize = it.Size();
@@ -70,17 +70,17 @@ public:
region = it.GetBoundingBoxAsImageRegion();
region.SetIndex(index);
- image->SetRegions( region );
+ image->SetRegions(region);
image->Allocate();
- typedef itk::ImageRegionIterator< InputImageType > IteratorrrType;
- IteratorrrType inputIt( image, image->GetLargestPossibleRegion() );
+ typedef itk::ImageRegionIterator<InputImageType> IteratorrrType;
+ IteratorrrType inputIt(image, image->GetLargestPossibleRegion());
inputIt.GoToBegin();
for (unsigned int i = 0; i < neighborhoodSize; ++i)
- {
+ {
inputIt.Set(it.GetPixel(i));
++inputIt;
- }
+ }
textureFilter->FastCalculationsOn();
textureFilter->SetInput(image);
@@ -90,10 +90,10 @@ public:
resultvalue.SetSize(m_FeatureIndex.size());
resultvalue.AllocateElements(m_FeatureIndex.size());
- for (unsigned int cpt=0; cpt < m_FeatureIndex.size(); cpt++)
- {
+ for (unsigned int cpt = 0; cpt < m_FeatureIndex.size(); cpt++)
+ {
resultvalue[cpt] = textureFilter->GetFeatureMeans()->at(m_FeatureIndex[cpt]);
- }
+ }
return (static_cast<TOutput>(resultvalue));
diff --git a/Code/BasicFilters/otbSimplifyPathFunctor.h b/Code/BasicFilters/otbSimplifyPathFunctor.h
index 5b7f35edb6..ed0ab54510 100644
--- a/Code/BasicFilters/otbSimplifyPathFunctor.h
+++ b/Code/BasicFilters/otbSimplifyPathFunctor.h
@@ -55,22 +55,22 @@ public:
typedef TOutput OutputPathType;
typedef typename OutputPathType::Pointer OutputPathPointerType;
- void SetTolerance(double Tolerance )
+ void SetTolerance(double Tolerance)
{
m_Tolerance = Tolerance;
}
- double GetTolerance(void)const
+ double GetTolerance(void) const
{
- return ( m_Tolerance );
+ return (m_Tolerance);
}
SimplifyPathFunctor()
{
m_Tolerance = 1.0;
- };
- ~SimplifyPathFunctor() {};
+ }
+ ~SimplifyPathFunctor() {}
- inline OutputPathPointerType operator()(const TInput * input)
+ inline OutputPathPointerType operator ()(const TInput * input)
{
OutputPathPointerType newPath = OutputPathType::New();
@@ -83,47 +83,46 @@ public:
// Add the first vertex
newPath->AddVertex(beginIt.Value());
- while ( beginIt != beforeTheEndIt)
- {
+ while (beginIt != beforeTheEndIt)
+ {
VertexListConstIteratorType endIt = beforeTheEndIt;
// while the segment is not consistent, decrement endIt
while (!this->TestPathConsistency(beginIt, endIt))
- {
+ {
--endIt;
- }
+ }
// Add the final vertex
newPath->AddVertex(endIt.Value());
- beginIt=endIt;
- }
+ beginIt = endIt;
+ }
newPath->SetMetaDataDictionary(input->GetMetaDataDictionary());
return newPath;
}
-
private:
double m_Tolerance;
bool TestPathConsistency(VertexListConstIteratorType begin,
- VertexListConstIteratorType end)const
+ VertexListConstIteratorType end) const
{
VertexListConstIteratorType segmentIt = begin;
++segmentIt;
//Compute the distance of a point to a segment based on the cross product
while (segmentIt != end)
- {
- double crossProduct = (end.Value()[0]-begin.Value()[0])*(segmentIt.Value()[1]-begin.Value()[1])
- - (end.Value()[1]-begin.Value()[1])*(segmentIt.Value()[0]-begin.Value()[0]);
- double lenghtSeg = (end.Value()[0]-begin.Value()[0])*(end.Value()[0]-begin.Value()[0])
- +(end.Value()[1]-begin.Value()[1])*(end.Value()[1]-begin.Value()[1]);
- if (lenghtSeg == 0) return false;
- double distsq = crossProduct*crossProduct/lenghtSeg;
- if (distsq > static_cast<double>(m_Tolerance) )
{
+ double crossProduct = (end.Value()[0] - begin.Value()[0]) * (segmentIt.Value()[1] - begin.Value()[1])
+ - (end.Value()[1] - begin.Value()[1]) * (segmentIt.Value()[0] - begin.Value()[0]);
+ double lenghtSeg = (end.Value()[0] - begin.Value()[0]) * (end.Value()[0] - begin.Value()[0])
+ + (end.Value()[1] - begin.Value()[1]) * (end.Value()[1] - begin.Value()[1]);
+ if (lenghtSeg == 0) return false;
+ double distsq = crossProduct * crossProduct / lenghtSeg;
+ if (distsq > static_cast<double>(m_Tolerance))
+ {
return false;
- }
+ }
++segmentIt;
- }
+ }
return true;
}
diff --git a/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.h b/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.h
index 05fda2cc4e..01ead3b510 100644
--- a/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.h
+++ b/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.h
@@ -38,31 +38,31 @@ class ITK_EXPORT SpatialObjectToImageDrawingFilter : public itk::ImageSource<TOu
{
public:
/** Standard class typedefs. */
- typedef SpatialObjectToImageDrawingFilter Self;
- typedef itk::ImageSource<TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename TOutputImage::SizeType SizeType;
- typedef typename TOutputImage::PointType PointType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::ValueType ValueType;
+ typedef SpatialObjectToImageDrawingFilter Self;
+ typedef itk::ImageSource<TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef typename TOutputImage::SizeType SizeType;
+ typedef typename TOutputImage::PointType PointType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::ValueType ValueType;
typedef typename OutputImageType::SpacingType SpacingType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(SpatialObjectToImageDrawingFilter,itk::ImageSource);
+ itkTypeMacro(SpatialObjectToImageDrawingFilter, itk::ImageSource);
/** Superclass typedefs. */
typedef typename Superclass::OutputImageRegionType OutputImageRegionType;
/** Some convenient typedefs. */
- typedef TInputSpatialObject InputSpatialObjectType;
- typedef typename InputSpatialObjectType::Pointer InputSpatialObjectPointer;
- typedef typename InputSpatialObjectType::ConstPointer InputSpatialObjectConstPointer;
- typedef typename TInputSpatialObject::ChildrenListType ChildrenListType;
+ typedef TInputSpatialObject InputSpatialObjectType;
+ typedef typename InputSpatialObjectType::Pointer InputSpatialObjectPointer;
+ typedef typename InputSpatialObjectType::ConstPointer InputSpatialObjectConstPointer;
+ typedef typename TInputSpatialObject::ChildrenListType ChildrenListType;
/** ImageDimension constants */
itkStaticConstMacro(ObjectDimension, unsigned int,
@@ -71,8 +71,8 @@ public:
TOutputImage::ImageDimension);
/** Set/Get the image input of this process object. */
- virtual void SetInput( const InputSpatialObjectType *object);
- virtual void SetInput( unsigned int, const InputSpatialObjectType * object);
+ virtual void SetInput(const InputSpatialObjectType *object);
+ virtual void SetInput(unsigned int, const InputSpatialObjectType * object);
const InputSpatialObjectType * GetInput(void);
const InputSpatialObjectType * GetInput(unsigned int idx);
@@ -80,9 +80,9 @@ public:
* spacing is the geometric distance between image samples.
* It is stored internally as double, but may be set from
* float. \sa GetSpacing() */
- virtual void SetSpacing( const SpacingType& spacing);
- virtual void SetSpacing( const double* spacing);
- virtual void SetSpacing( const float* spacing);
+ virtual void SetSpacing(const SpacingType& spacing);
+ virtual void SetSpacing(const double* spacing);
+ virtual void SetSpacing(const float* spacing);
virtual const double* GetSpacing() const;
/** Set/Get the value for pixels inside the spatial object.
@@ -107,9 +107,9 @@ public:
* coordinates of the index (0,0,...,0). It is stored internally
* as double but may be set from float.
* \sa GetOrigin() */
- virtual void SetOrigin( const PointType& origin);
- virtual void SetOrigin( const double* origin);
- virtual void SetOrigin( const float* origin);
+ virtual void SetOrigin(const PointType& origin);
+ virtual void SetOrigin(const double* origin);
+ virtual void SetOrigin(const float* origin);
virtual const double * GetOrigin() const;
/** The spatial object being transformed can be part of a hierarchy.
@@ -120,18 +120,17 @@ public:
itkGetMacro(ChildrenDepth, unsigned int);
/** Set/Get Size */
- itkSetMacro(Size,SizeType);
- itkGetMacro(Size,SizeType);
+ itkSetMacro(Size, SizeType);
+ itkGetMacro(Size, SizeType);
/** If UseObjectValue is set to true, then the filter uses
* the ValueAt() function instead of IsInside() */
- itkSetMacro(UseObjectValue,bool);
- itkGetMacro(UseObjectValue,bool);
-
+ itkSetMacro(UseObjectValue, bool);
+ itkGetMacro(UseObjectValue, bool);
typedef itk::SpatialObject<InputSpatialObjectType::ObjectDimension> SpatialObjectType;
- typedef typename SpatialObjectType::ChildrenListType* ChildrenType;
- typedef typename SpatialObjectType::ChildrenListType::iterator IteratorType;
+ typedef typename SpatialObjectType::ChildrenListType* ChildrenType;
+ typedef typename SpatialObjectType::ChildrenListType::iterator IteratorType;
protected:
SpatialObjectToImageDrawingFilter();
@@ -140,7 +139,6 @@ protected:
virtual void GenerateOutputInformation(); // do nothing
virtual void GenerateData();
-
SizeType m_Size;
double m_Spacing[OutputImageDimension];
double m_Origin[OutputImageDimension];
@@ -152,8 +150,8 @@ protected:
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- SpatialObjectToImageDrawingFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SpatialObjectToImageDrawingFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
diff --git a/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx b/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx
index cda9b375b6..cf832715e1 100644
--- a/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx
+++ b/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx
@@ -21,13 +21,12 @@
#include "otbSpatialObjectToImageDrawingFilter.h"
#include "itkImageRegionIteratorWithIndex.h"
-
namespace otb
{
/** Constructor */
template <class TInputSpatialObject, class TOutputImage>
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::SpatialObjectToImageDrawingFilter()
{
this->SetNumberOfRequiredInputs(1);
@@ -35,10 +34,10 @@ SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
m_Size.Fill(0);
for (unsigned int i = 0; i < OutputImageDimension; ++i)
- {
+ {
m_Spacing[i] = 1.0;
m_Origin[i] = 0.;
- }
+ }
m_InsideValue = 0;
m_OutsideValue = 0;
@@ -47,337 +46,333 @@ SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
/** Destructor */
template <class TInputSpatialObject, class TOutputImage>
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::~SpatialObjectToImageDrawingFilter()
{
}
-
/** Set the Input SpatialObject */
template <class TInputSpatialObject, class TOutputImage>
void
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::SetInput(const InputSpatialObjectType *input)
{
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(0,
- const_cast< InputSpatialObjectType * >( input ) );
+ const_cast<InputSpatialObjectType *>(input));
}
-
/** Connect one of the operands */
template <class TInputSpatialObject, class TOutputImage>
void
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
-::SetInput( unsigned int index, const TInputSpatialObject * object )
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
+::SetInput(unsigned int index, const TInputSpatialObject * object)
{
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(index,
- const_cast< TInputSpatialObject *>( object ) );
+ const_cast<TInputSpatialObject *>(object));
}
-
/** Get the input Spatial Object */
template <class TInputSpatialObject, class TOutputImage>
-const typename SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>::InputSpatialObjectType *
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+const typename SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>::InputSpatialObjectType *
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TInputSpatialObject * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<const TInputSpatialObject *>
+ (this->itk::ProcessObject::GetInput(0));
}
/** Get the input Spatial Object */
template <class TInputSpatialObject, class TOutputImage>
-const typename SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>::InputSpatialObjectType *
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+const typename SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>::InputSpatialObjectType *
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::GetInput(unsigned int idx)
{
- return static_cast< const TInputSpatialObject * >
- (this->itk::ProcessObject::GetInput(idx));
+ return static_cast<const TInputSpatialObject *>
+ (this->itk::ProcessObject::GetInput(idx));
}
-
//----------------------------------------------------------------------------
template <class TInputSpatialObject, class TOutputImage>
void
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
-::SetSpacing(const SpacingType& spacing )
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
+::SetSpacing(const SpacingType& spacing)
{
unsigned int i;
- for (i=0; i<TOutputImage::ImageDimension; ++i)
- {
- if ( (double)spacing[i] != m_Spacing[i] )
+ for (i = 0; i < TOutputImage::ImageDimension; ++i)
{
+ if ((double) spacing[i] != m_Spacing[i])
+ {
break;
+ }
}
- }
- if ( i < TOutputImage::ImageDimension )
- {
- for (i=0; i<TOutputImage::ImageDimension; ++i)
+ if (i < TOutputImage::ImageDimension)
{
+ for (i = 0; i < TOutputImage::ImageDimension; ++i)
+ {
m_Spacing[i] = spacing[i];
- }
+ }
this->Modified();
- }
+ }
}
//----------------------------------------------------------------------------
template <class TInputSpatialObject, class TOutputImage>
void
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::SetSpacing(const double* spacing)
{
unsigned int i;
- for (i=0; i<OutputImageDimension; ++i)
- {
- if ( spacing[i] != m_Spacing[i] )
+ for (i = 0; i < OutputImageDimension; ++i)
{
+ if (spacing[i] != m_Spacing[i])
+ {
break;
+ }
}
- }
- if ( i < OutputImageDimension )
- {
- for (i=0; i<OutputImageDimension; ++i)
+ if (i < OutputImageDimension)
{
+ for (i = 0; i < OutputImageDimension; ++i)
+ {
m_Spacing[i] = spacing[i];
+ }
}
- }
}
template <class TInputSpatialObject, class TOutputImage>
void
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::SetSpacing(const float* spacing)
{
unsigned int i;
- for (i=0; i<OutputImageDimension; ++i)
- {
- if ( (double)spacing[i] != m_Spacing[i] )
+ for (i = 0; i < OutputImageDimension; ++i)
{
+ if ((double) spacing[i] != m_Spacing[i])
+ {
break;
+ }
}
- }
- if ( i < OutputImageDimension )
- {
- for (i=0; i<OutputImageDimension; ++i)
+ if (i < OutputImageDimension)
{
+ for (i = 0; i < OutputImageDimension; ++i)
+ {
m_Spacing[i] = spacing[i];
+ }
}
- }
}
template <class TInputSpatialObject, class TOutputImage>
const double *
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::GetSpacing() const
{
return m_Spacing;
}
-
//----------------------------------------------------------------------------
template <class TInputSpatialObject, class TOutputImage>
void
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::SetOrigin(const PointType& origin)
{
unsigned int i;
- for (i=0; i<TOutputImage::ImageDimension; ++i)
- {
- if ( (double)origin[i] != m_Origin[i] )
+ for (i = 0; i < TOutputImage::ImageDimension; ++i)
{
+ if ((double) origin[i] != m_Origin[i])
+ {
break;
+ }
}
- }
- if ( i < TOutputImage::ImageDimension )
- {
- for (i=0; i<TOutputImage::ImageDimension; ++i)
+ if (i < TOutputImage::ImageDimension)
{
+ for (i = 0; i < TOutputImage::ImageDimension; ++i)
+ {
m_Origin[i] = origin[i];
- }
+ }
this->Modified();
- }
+ }
}
//----------------------------------------------------------------------------
template <class TInputSpatialObject, class TOutputImage>
void
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::SetOrigin(const double* origin)
{
unsigned int i;
- for (i=0; i<OutputImageDimension; ++i)
- {
- if ( origin[i] != m_Origin[i] )
+ for (i = 0; i < OutputImageDimension; ++i)
{
+ if (origin[i] != m_Origin[i])
+ {
break;
+ }
}
- }
- if ( i < OutputImageDimension )
- {
- for (i=0; i<OutputImageDimension; ++i)
+ if (i < OutputImageDimension)
{
+ for (i = 0; i < OutputImageDimension; ++i)
+ {
m_Origin[i] = origin[i];
- }
+ }
this->Modified();
- }
+ }
}
template <class TInputSpatialObject, class TOutputImage>
void
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::SetOrigin(const float* origin)
{
unsigned int i;
- for (i=0; i<OutputImageDimension; ++i)
- {
- if ( (double)origin[i] != m_Origin[i] )
+ for (i = 0; i < OutputImageDimension; ++i)
{
+ if ((double) origin[i] != m_Origin[i])
+ {
break;
+ }
}
- }
- if ( i < OutputImageDimension )
- {
- for (i=0; i<OutputImageDimension; ++i)
+ if (i < OutputImageDimension)
{
+ for (i = 0; i < OutputImageDimension; ++i)
+ {
m_Origin[i] = origin[i];
- }
+ }
this->Modified();
- }
+ }
}
template <class TInputSpatialObject, class TOutputImage>
const double *
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::GetOrigin() const
{
return m_Origin;
}
-
template <class TInputSpatialObject, class TOutputImage>
void
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::GenerateOutputInformation()
{
const InputSpatialObjectType * InputObject = this->GetInput();
- OutputImagePointer OutputImage = this->GetOutput();
-
+ OutputImagePointer OutputImage = this->GetOutput();
+
unsigned int i;
// Generate the image
SizeType size;
- double origine[ObjectDimension];
+ double origine[ObjectDimension];
InputObject->ComputeBoundingBox();
bool originspecified = false;
- if (!strcmp(InputObject->GetNameOfClass(),"GroupSpatialObject"))
+ if (!strcmp(InputObject->GetNameOfClass(), "GroupSpatialObject"))
{
- ChildrenType children;
- children=InputObject->GetChildren(0);
- IteratorType iter = children->begin();
- IteratorType end = children->end();
- double minimum[ObjectDimension];
-
+ ChildrenType children;
+ children = InputObject->GetChildren(0);
+ IteratorType iter = children->begin();
+ IteratorType end = children->end();
+ double minimum[ObjectDimension];
+
+ (*iter)->ComputeBoundingBox();
+ for (i = 0; i < ObjectDimension; ++i)
+ {
+ minimum[i] = (*iter)->GetBoundingBox()->GetMinimum()[i];
+ }
+
+ while (iter != end)
+ {
(*iter)->ComputeBoundingBox();
- for (i=0;i<ObjectDimension;++i)
- {
- minimum[i]=(*iter)->GetBoundingBox()->GetMinimum()[i];
- }
-
- while (iter != end)
- {
- (*iter)->ComputeBoundingBox();
- for (i=0;i<ObjectDimension;++i)
- {
- if ((*iter)->GetBoundingBox()->GetMinimum()[i] < minimum[i])
- {
- minimum[i]=(*iter)->GetBoundingBox()->GetMinimum()[i];
- }
- }
- ++iter;
- }
-
- for (i=0;i<ObjectDimension;++i)
- {
- size[i] = (long unsigned int) (InputObject->GetBoundingBox()->GetMaximum()[i] - minimum[i])+1;
- origine[i]=(long int) minimum[i];
- originspecified = true;
- }
-
- itkDebugMacro(<<"minx= "<<minimum[0]<<", miny= "<<minimum[0]<<", maxx= "<<InputObject->GetBoundingBox()->GetMaximum()[0]<<", maxy= "<<InputObject->GetBoundingBox()->GetMaximum()[1]);
+ for (i = 0; i < ObjectDimension; ++i)
+ {
+ if ((*iter)->GetBoundingBox()->GetMinimum()[i] < minimum[i])
+ {
+ minimum[i] = (*iter)->GetBoundingBox()->GetMinimum()[i];
+ }
+ }
+ ++iter;
+ }
+
+ for (i = 0; i < ObjectDimension; ++i)
+ {
+ size[i] = (long unsigned int) (InputObject->GetBoundingBox()->GetMaximum()[i] - minimum[i]) + 1;
+ origine[i] = (long int) minimum[i];
+ originspecified = true;
+ }
+
+ itkDebugMacro(
+ << "minx= " << minimum[0] << ", miny= " << minimum[0] << ", maxx= " <<
+ InputObject->GetBoundingBox()->GetMaximum()[0] << ", maxy= " << InputObject->GetBoundingBox()->GetMaximum()[1]);
}
else
{
-
- for (i=0;i<ObjectDimension;++i)
- {
- size[i] = (long int)(InputObject->GetBoundingBox()->GetMaximum()[i]
+
+ for (i = 0; i < ObjectDimension; ++i)
+ {
+ size[i] = (long int) (InputObject->GetBoundingBox()->GetMaximum()[i]
- InputObject->GetBoundingBox()->GetMinimum()[i]);
- }
+ }
}
-
+
typename OutputImageType::IndexType index;
index.Fill(0);
typename OutputImageType::RegionType region;
-
+
// If the size of the output has been explicitly specified, the filter
// will set the output size to the explicit size, otherwise the size from the spatial
// object's bounding box will be used as default.
-
+
bool specified = false;
for (i = 0; i < OutputImageDimension; ++i)
- {
+ {
if (m_Size[i] != 0)
{
- specified = true;
- break;
+ specified = true;
+ break;
}
- }
-
+ }
+
if (specified)
{
- region.SetSize( m_Size );
+ region.SetSize(m_Size);
}
else
{
- region.SetSize ( size );
- m_Size = size;
+ region.SetSize (size);
+ m_Size = size;
}
- region.SetIndex( index );
-
- OutputImage->SetLargestPossibleRegion( region);
+ region.SetIndex(index);
+
+ OutputImage->SetLargestPossibleRegion(region);
specified = false;
for (i = 0; i < OutputImageDimension; ++i)
{
- if (m_Spacing[i] != 0)
- {
- specified = true;
- break;
- }
+ if (m_Spacing[i] != 0)
+ {
+ specified = true;
+ break;
+ }
}
-
+
if (specified)
{
- OutputImage->SetSpacing(this->m_Spacing); // set spacing
+ OutputImage->SetSpacing(this->m_Spacing); // set spacing
}
else
{
- OutputImage->SetSpacing(InputObject->GetIndexToObjectTransform()->GetScaleComponent()); // set spacing
- m_Spacing[0] = InputObject->GetIndexToObjectTransform()->GetScaleComponent()[0];
- m_Spacing[1] = InputObject->GetIndexToObjectTransform()->GetScaleComponent()[1];
+ OutputImage->SetSpacing(InputObject->GetIndexToObjectTransform()->GetScaleComponent()); // set spacing
+ m_Spacing[0] = InputObject->GetIndexToObjectTransform()->GetScaleComponent()[0];
+ m_Spacing[1] = InputObject->GetIndexToObjectTransform()->GetScaleComponent()[1];
}
-
+
if (originspecified)
{
- OutputImage->SetOrigin(origine); // and origin
- m_Origin[0] = OutputImage->GetOrigin()[0];
- m_Origin[1] = OutputImage->GetOrigin()[1];
+ OutputImage->SetOrigin(origine); // and origin
+ m_Origin[0] = OutputImage->GetOrigin()[0];
+ m_Origin[1] = OutputImage->GetOrigin()[1];
}
else OutputImage->SetOrigin(m_Origin);
@@ -388,71 +383,70 @@ SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
/** Update */
template <class TInputSpatialObject, class TOutputImage>
void
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::GenerateData(void)
{
itkDebugMacro(<< "SpatialObjectToImageDrawingFilter::Update() called");
// Get the input and output pointers
const InputSpatialObjectType * InputObject = this->GetInput();
- OutputImagePointer OutputImage = this->GetOutput();
-
+ OutputImagePointer OutputImage = this->GetOutput();
+
typename OutputImageType::RegionType region = OutputImage->GetLargestPossibleRegion();
- OutputImage->SetBufferedRegion( region ); // set the region
- OutputImage->SetRequestedRegion( region ); //
-
+ OutputImage->SetBufferedRegion(region); // set the region
+ OutputImage->SetRequestedRegion(region); //
+
OutputImage->Allocate(); // allocate the image
typedef itk::ImageRegionIteratorWithIndex<OutputImageType> myIteratorType;
- myIteratorType it(OutputImage,region);
+ myIteratorType it(OutputImage, region);
- itk::Point<double,ObjectDimension> point;
+ itk::Point<double, ObjectDimension> point;
while (!it.IsAtEnd())
- {
+ {
// ValueAt requires the point to be in physical coordinate i.e
- for (unsigned int i=0;i<ObjectDimension;++i)
- {
- point[i]=(int)(it.GetIndex()[i]*m_Spacing[i])+m_Origin[i];
- }
- double val =0;
+ for (unsigned int i = 0; i < ObjectDimension; ++i)
+ {
+ point[i] = (int) (it.GetIndex()[i] * m_Spacing[i]) + m_Origin[i];
+ }
+ double val = 0;
- InputObject->ValueAt(point,val,99999);
- if ( m_InsideValue != 0 || m_OutsideValue != 0 )
- {
- if ( val)
- {
- if (m_UseObjectValue)
- {
- it.Set(static_cast<ValueType>(val));
- }
- else
- {
- it.Set(m_InsideValue);
- }
- }
+ InputObject->ValueAt(point, val, 99999);
+ if (m_InsideValue != 0 || m_OutsideValue != 0)
+ {
+ if (val)
+ {
+ if (m_UseObjectValue)
+ {
+ it.Set(static_cast<ValueType>(val));
+ }
+ else
+ {
+ it.Set(m_InsideValue);
+ }
+ }
else
- {
- it.Set(m_OutsideValue);
- }
- }
+ {
+ it.Set(m_OutsideValue);
+ }
+ }
else
{
- it.Set(static_cast<ValueType>(val));
+ it.Set(static_cast<ValueType>(val));
}
++it;
- }
-
+ }
+
itkDebugMacro(<< "SpatialObjectToImageDrawingFilter::Update() finished");
} // end update function
-
template<class TInputSpatialObject, class TOutputImage>
void
-SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
+SpatialObjectToImageDrawingFilter<TInputSpatialObject, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
@@ -461,16 +455,15 @@ SpatialObjectToImageDrawingFilter<TInputSpatialObject,TOutputImage>
os << indent << "Inside Value : " << m_InsideValue << std::endl;
os << indent << "Outside Value : " << m_OutsideValue << std::endl;
if (m_UseObjectValue)
- {
+ {
os << indent << "Using Object Value : ON" << std::endl;
- }
+ }
else
- {
+ {
os << indent << "Using Object Value : OFF" << std::endl;
- }
+ }
}
-
} // end namespace otb
#endif
diff --git a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h b/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h
index 97d60e2003..1b89f105d4 100644
--- a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h
+++ b/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h
@@ -45,41 +45,41 @@ namespace otb
* \ingroup Threading
* \ingroup Streamed
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
class ITK_EXPORT SpectralAngleDistanceImageFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef SpectralAngleDistanceImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SpectralAngleDistanceImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(SpectralAngleDistanceImageFilter,itk::ImageToImageFilter);
+ itkTypeMacro(SpectralAngleDistanceImageFilter, itk::ImageToImageFilter);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef typename InputImageType::ConstPointer InputImageConstPointerType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputPixelType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
/** Get/Set the reference pixel */
- itkGetConstReferenceMacro(ReferencePixel,InputPixelType);
- itkSetMacro(ReferencePixel,InputPixelType);
+ itkGetConstReferenceMacro(ReferencePixel, InputPixelType);
+ itkSetMacro(ReferencePixel, InputPixelType);
protected:
/** Constructor */
SpectralAngleDistanceImageFilter();
/** Destructor */
- virtual ~SpectralAngleDistanceImageFilter() {};
+ virtual ~SpectralAngleDistanceImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** SpectralAngleDistanceImageFilter can be implemented as a multithreaded filter.
@@ -93,18 +93,18 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
void BeforeThreadedGenerateData();
private:
- SpectralAngleDistanceImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SpectralAngleDistanceImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The reference pixel */
InputPixelType m_ReferencePixel;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbSpectralAngleDistanceImageFilter.txx"
#endif
diff --git a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx b/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx
index 982983b2a2..2e277f6062 100644
--- a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx
+++ b/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx
@@ -31,46 +31,44 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage>
-SpectralAngleDistanceImageFilter<TInputImage,TOutputImage>
+SpectralAngleDistanceImageFilter<TInputImage, TOutputImage>
::SpectralAngleDistanceImageFilter()
{
- m_ReferencePixel=0;
+ m_ReferencePixel = 0;
}
template <class TInputImage, class TOutputImage>
void
-SpectralAngleDistanceImageFilter<TInputImage,TOutputImage>
+SpectralAngleDistanceImageFilter<TInputImage, TOutputImage>
::BeforeThreadedGenerateData()
{
- if ( this->GetInput()->GetNumberOfComponentsPerPixel() == 1 )
- {
- itkExceptionMacro(<<"Not valid input image : mono channel image gives a nul output image.");
- }
+ if (this->GetInput()->GetNumberOfComponentsPerPixel() == 1)
+ {
+ itkExceptionMacro(<< "Not valid input image : mono channel image gives a nul output image.");
+ }
}
-
template <class TInputImage, class TOutputImage>
void
-SpectralAngleDistanceImageFilter<TInputImage,TOutputImage>
-::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,int threadId)
+SpectralAngleDistanceImageFilter<TInputImage, TOutputImage>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
if (m_ReferencePixel == 0)
- {
- itkExceptionMacro(<<"Reference pixel is not set!");
- }
+ {
+ itkExceptionMacro(<< "Reference pixel is not set!");
+ }
- InputImageConstPointerType inputPtr = this->GetInput();
- OutputImagePointerType outputPtr = this->GetOutput();
+ InputImageConstPointerType inputPtr = this->GetInput();
+ OutputImagePointerType outputPtr = this->GetOutput();
//inputPtr->UpdateOutputInformation();
// Check if the reference pixel size matches the input image number of components.
if (m_ReferencePixel.GetSize() != inputPtr->GetNumberOfComponentsPerPixel())
- {
- itkExceptionMacro(<<"Reference pixel size ("<<m_ReferencePixel.GetSize()<<" and input image pixel size ("
- <<inputPtr->GetNumberOfComponentsPerPixel()<<") don't match!");
- }
-
+ {
+ itkExceptionMacro(<< "Reference pixel size (" << m_ReferencePixel.GetSize() << " and input image pixel size ("
+ << inputPtr->GetNumberOfComponentsPerPixel() << ") don't match!");
+ }
// Define the portion of the input to walk for this thread, using
// the CallCopyOutputRegionToInputRegion method allows for the input
@@ -87,29 +85,29 @@ SpectralAngleDistanceImageFilter<TInputImage,TOutputImage>
outputIt.GoToBegin();
while (!inputIt.IsAtEnd() && !outputIt.IsAtEnd())
- {
- double dist=0.0;
- double scalarProd=0.0;
- double normProd=0.0;
- double normProd1=0.0;
- double normProd2=0.0;
- InputPixelType pixel = inputIt.Get();
- for (unsigned int i=0; i<pixel.Size(); ++i)
{
- scalarProd += pixel[i]*m_ReferencePixel[i];
- normProd1 += pixel[i]*pixel[i];
- normProd2 += m_ReferencePixel[i]*m_ReferencePixel[i];
- }
+ double dist = 0.0;
+ double scalarProd = 0.0;
+ double normProd = 0.0;
+ double normProd1 = 0.0;
+ double normProd2 = 0.0;
+ InputPixelType pixel = inputIt.Get();
+ for (unsigned int i = 0; i < pixel.Size(); ++i)
+ {
+ scalarProd += pixel[i] * m_ReferencePixel[i];
+ normProd1 += pixel[i] * pixel[i];
+ normProd2 += m_ReferencePixel[i] * m_ReferencePixel[i];
+ }
normProd = normProd1 * normProd2;
- if ( normProd == 0.0)
- {
+ if (normProd == 0.0)
+ {
dist = 0.0;
- }
+ }
else
- {
- dist = vcl_acos(scalarProd/vcl_sqrt(normProd));
- }
+ {
+ dist = vcl_acos(scalarProd / vcl_sqrt(normProd));
+ }
//------ This part was supressed since the filter must perform only the spectral angle computation ---
// Spectral angle normalization
// dist = dist/(CONST_PI_2);
@@ -119,14 +117,14 @@ SpectralAngleDistanceImageFilter<TInputImage,TOutputImage>
++inputIt;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
}
/**
* PrintSelf Method
*/
template <class TInputImage, class TOutputImage>
void
-SpectralAngleDistanceImageFilter<TInputImage,TOutputImage>
+SpectralAngleDistanceImageFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.h b/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.h
index 17b666247f..9a58346d79 100644
--- a/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.h
+++ b/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.h
@@ -21,7 +21,6 @@
#ifndef __otbStreamingInnerProductVectorImageFilter_h
#define __otbStreamingInnerProductVectorImageFilter_h
-
#include "otbPersistentImageFilter.h"
#include "otbPersistentFilterStreamingDecorator.h"
#include "itkNumericTraits.h"
@@ -32,7 +31,6 @@
#include "itkVariableLengthVector.h"
#include "vnl/vnl_matrix.h"
-
namespace otb
{
@@ -54,52 +52,51 @@ namespace otb
*/
template<class TInputImage>
class ITK_EXPORT PersistentInnerProductVectorImageFilter :
- public PersistentImageFilter<TInputImage, TInputImage>
+ public PersistentImageFilter<TInputImage, TInputImage>
{
public:
/** Standard Self typedef */
- typedef PersistentInnerProductVectorImageFilter Self;
- typedef PersistentImageFilter<TInputImage,TInputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PersistentInnerProductVectorImageFilter Self;
+ typedef PersistentImageFilter<TInputImage, TInputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Runtime information support. */
- itkTypeMacro(PersistentInnerProductVectorImageFilter,PersistentImageFilter);
+ itkTypeMacro(PersistentInnerProductVectorImageFilter, PersistentImageFilter);
/** Image related typedefs. */
- typedef TInputImage ImageType;
- typedef typename TInputImage::Pointer InputImagePointer;
- typedef typename TInputImage::RegionType RegionType;
- typedef typename TInputImage::PixelType PixelType;
+ typedef TInputImage ImageType;
+ typedef typename TInputImage::Pointer InputImagePointer;
+ typedef typename TInputImage::RegionType RegionType;
+ typedef typename TInputImage::PixelType PixelType;
itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/** Image related typedefs. */
- itkStaticConstMacro(ImageDimension, unsigned int, TInputImage::ImageDimension );
+ itkStaticConstMacro(ImageDimension, unsigned int, TInputImage::ImageDimension);
/** Smart Pointer type to a DataObject. */
typedef typename itk::DataObject::Pointer DataObjectPointer;
/** Type definition for a double matrix. */
- typedef vnl_matrix<double> MatrixType;
- typedef typename std::vector<MatrixType> ArrayMatrixType;
+ typedef vnl_matrix<double> MatrixType;
+ typedef typename std::vector<MatrixType> ArrayMatrixType;
/** Type of DataObjects used for scalar outputs */
- typedef itk::SimpleDataObjectDecorator<MatrixType> MatrixObjectType;
+ typedef itk::SimpleDataObjectDecorator<MatrixType> MatrixObjectType;
/** Return the computed inner product matrix. */
MatrixType GetInnerProduct() const
{
return this->GetInnerProductOutput()->Get();
- };
+ }
MatrixObjectType* GetInnerProductOutput();
const MatrixObjectType* GetInnerProductOutput() const;
-
/** Make a DataObject of the correct type to be used as the specified
* output.
*/
@@ -114,27 +111,26 @@ public:
virtual void Reset(void);
/** Enable/Disable center data */
- itkSetMacro( CenterData, bool );
- itkGetMacro( CenterData, bool );
+ itkSetMacro(CenterData, bool);
+ itkGetMacro(CenterData, bool);
itkBooleanMacro(CenterData);
protected:
PersistentInnerProductVectorImageFilter();
- virtual ~PersistentInnerProductVectorImageFilter() {};
+ virtual ~PersistentInnerProductVectorImageFilter() {}
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Multi-thread version GenerateData. */
- void ThreadedGenerateData (const RegionType& outputRegionForThread,int threadId);
+ void ThreadedGenerateData(const RegionType& outputRegionForThread, int threadId);
private:
- PersistentInnerProductVectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PersistentInnerProductVectorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- ArrayMatrixType m_ThreadInnerProduct;
+ ArrayMatrixType m_ThreadInnerProduct;
/** Enable/Disable center data */
bool m_CenterData;
-
}; // end of class PersistentStatisticsVectorImageFilter
/**===========================================================================*/
@@ -159,28 +155,26 @@ private:
template<class TInputImage>
class ITK_EXPORT StreamingInnerProductVectorImageFilter :
- public PersistentFilterStreamingDecorator< PersistentInnerProductVectorImageFilter<TInputImage> >
+ public PersistentFilterStreamingDecorator<PersistentInnerProductVectorImageFilter<TInputImage> >
{
public:
/** Standard Self typedef */
- typedef StreamingInnerProductVectorImageFilter Self;
+ typedef StreamingInnerProductVectorImageFilter Self;
typedef PersistentFilterStreamingDecorator
- < PersistentInnerProductVectorImageFilter<TInputImage> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ <PersistentInnerProductVectorImageFilter<TInputImage> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(StreamingInnerProductVectorImageFilter,PersistentFilterStreamingDecorator);
+ itkTypeMacro(StreamingInnerProductVectorImageFilter, PersistentFilterStreamingDecorator);
- typedef TInputImage InputImageType;
- typedef typename Superclass::FilterType StatFilterType;
+ typedef TInputImage InputImageType;
+ typedef typename Superclass::FilterType StatFilterType;
typedef typename StatFilterType::MatrixType MatrixType;
-
/** Type of DataObjects used for scalar outputs */
typedef typename StatFilterType::MatrixObjectType MatrixObjectType;
@@ -197,18 +191,18 @@ public:
MatrixType GetInnerProduct() const
{
return this->GetFilter()->GetInnerProductOutput()->Get();
- };
+ }
MatrixObjectType* GetInnerProductOutput()
{
return this->GetFilter()->GetInnerProductOutput();
- };
+ }
const MatrixObjectType* GetInnerProductOutput() const
{
return this->GetFilter()->GetInnerProductOutput();
- };
+ }
/** Enable/Disable center data */
- void SetCenterData(bool centerdata )
+ void SetCenterData(bool centerdata)
{
this->GetFilter()->SetCenterData(centerdata);
}
@@ -217,11 +211,11 @@ protected:
/** Constructor */
StreamingInnerProductVectorImageFilter() {};
/** Destructor */
- virtual ~StreamingInnerProductVectorImageFilter() {};
+ virtual ~StreamingInnerProductVectorImageFilter() {}
private:
- StreamingInnerProductVectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ StreamingInnerProductVectorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.txx b/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.txx
index e6d4cb655f..512f9615fc 100644
--- a/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.txx
@@ -57,7 +57,7 @@ PersistentInnerProductVectorImageFilter<TInputImage>
::MakeOutput(unsigned int output)
{
switch (output)
- {
+ {
case 0:
return static_cast<itk::DataObject*>(TInputImage::New().GetPointer());
break;
@@ -68,7 +68,7 @@ PersistentInnerProductVectorImageFilter<TInputImage>
// might as well make an image
return static_cast<itk::DataObject*>(TInputImage::New().GetPointer());
break;
- }
+ }
}
template<class TInputImage>
@@ -87,23 +87,22 @@ PersistentInnerProductVectorImageFilter<TInputImage>
return static_cast<const MatrixObjectType*>(this->itk::ProcessObject::GetOutput(1));
}
-
template<class TInputImage>
void
PersistentInnerProductVectorImageFilter<TInputImage>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
- if ( this->GetInput() )
- {
+ if (this->GetInput())
+ {
this->GetOutput()->CopyInformation(this->GetInput());
this->GetOutput()->SetLargestPossibleRegion(this->GetInput()->GetLargestPossibleRegion());
- if (this->GetOutput()->GetRequestedRegion().GetNumberOfPixels()==0)
- {
+ if (this->GetOutput()->GetRequestedRegion().GetNumberOfPixels() == 0)
+ {
this->GetOutput()->SetRequestedRegion(this->GetOutput()->GetLargestPossibleRegion());
+ }
}
- }
}
template<class TInputImage>
@@ -123,13 +122,13 @@ void
PersistentInnerProductVectorImageFilter<TInputImage>
::Reset()
{
- TInputImage * inputPtr = const_cast<TInputImage * >(this->GetInput());
+ TInputImage * inputPtr = const_cast<TInputImage *>(this->GetInput());
inputPtr->UpdateOutputInformation();
- if (this->GetOutput()->GetRequestedRegion().GetNumberOfPixels()==0)
- {
+ if (this->GetOutput()->GetRequestedRegion().GetNumberOfPixels() == 0)
+ {
this->GetOutput()->SetRequestedRegion(this->GetOutput()->GetLargestPossibleRegion());
- }
+ }
unsigned int numberOfThreads = this->GetNumberOfThreads();
unsigned int numberOfTrainingImages = inputPtr->GetNumberOfComponentsPerPixel();
@@ -142,7 +141,7 @@ PersistentInnerProductVectorImageFilter<TInputImage>
MatrixType initMatrix;
initMatrix.set_size(numberOfTrainingImages, numberOfTrainingImages);
initMatrix.fill(0);
- this->GetInnerProductOutput()->Set( initMatrix );
+ this->GetInnerProductOutput()->Set(initMatrix);
}
@@ -151,42 +150,42 @@ void
PersistentInnerProductVectorImageFilter<TInputImage>
::Synthetize()
{
- // Compute Inner product Matrix
- TInputImage * inputPtr = const_cast<TInputImage * >(this->GetInput());
- unsigned int numberOfTrainingImages = inputPtr->GetNumberOfComponentsPerPixel();
- unsigned int numberOfThreads = this->GetNumberOfThreads();
- MatrixType innerProduct;
- innerProduct.set_size( numberOfTrainingImages, numberOfTrainingImages );
- innerProduct.fill( 0 );
-
- // Concatenate threaded matrix
- for ( unsigned int thread = 0; thread < numberOfThreads; thread++)
+ // Compute Inner product Matrix
+ TInputImage * inputPtr = const_cast<TInputImage *>(this->GetInput());
+ unsigned int numberOfTrainingImages = inputPtr->GetNumberOfComponentsPerPixel();
+ unsigned int numberOfThreads = this->GetNumberOfThreads();
+ MatrixType innerProduct;
+ innerProduct.set_size(numberOfTrainingImages, numberOfTrainingImages);
+ innerProduct.fill(0);
+
+ // Concatenate threaded matrix
+ for (unsigned int thread = 0; thread < numberOfThreads; thread++)
{
- innerProduct += m_ThreadInnerProduct[thread];
+ innerProduct += m_ThreadInnerProduct[thread];
}
- //---------------------------------------------------------------------
- // Fill the rest of the inner product matrix and make it symmetric
- //---------------------------------------------------------------------
- for(unsigned int band_x = 0; band_x < (numberOfTrainingImages - 1); ++band_x)
+ //---------------------------------------------------------------------
+ // Fill the rest of the inner product matrix and make it symmetric
+ //---------------------------------------------------------------------
+ for (unsigned int band_x = 0; band_x < (numberOfTrainingImages - 1); ++band_x)
{
- for(unsigned int band_y = band_x+1; band_y < numberOfTrainingImages; ++band_y)
- {
- innerProduct[band_x][band_y] = innerProduct[band_y][band_x];
- }// end band_y loop
- }// end band_x loop
+ for (unsigned int band_y = band_x + 1; band_y < numberOfTrainingImages; ++band_y)
+ {
+ innerProduct[band_x][band_y] = innerProduct[band_y][band_x];
+ } // end band_y loop
+ } // end band_x loop
- if( ( numberOfTrainingImages - 1 ) != 0 )
+ if ((numberOfTrainingImages - 1) != 0)
{
- innerProduct /= ( numberOfTrainingImages - 1 );
+ innerProduct /= (numberOfTrainingImages - 1);
}
- else
+ else
{
- innerProduct.fill(0);
+ innerProduct.fill(0);
}
- // Set the output
- this->GetInnerProductOutput()->Set( innerProduct );
+ // Set the output
+ this->GetInnerProductOutput()->Set(innerProduct);
}
template<class TInputImage>
@@ -197,59 +196,59 @@ PersistentInnerProductVectorImageFilter<TInputImage>
/**
* Grab the input
*/
- InputImagePointer inputPtr = const_cast< TInputImage * >( this->GetInput() );
+ InputImagePointer inputPtr = const_cast<TInputImage *>(this->GetInput());
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
unsigned int numberOfTrainingImages = inputPtr->GetNumberOfComponentsPerPixel();
- itk::ImageRegionConstIterator<TInputImage> it (inputPtr, outputRegionForThread);
- if( m_CenterData == true)
- {
+ itk::ImageRegionConstIterator<TInputImage> it(inputPtr, outputRegionForThread);
+ if (m_CenterData == true)
+ {
it.GoToBegin();
// do the work
while (!it.IsAtEnd())
- {
- PixelType vectorValue = it.Get();
- double mean(0.);
- for (unsigned int i=0; i<vectorValue.GetSize(); ++i)
+ {
+ PixelType vectorValue = it.Get();
+ double mean(0.);
+ for (unsigned int i = 0; i < vectorValue.GetSize(); ++i)
{
- mean += static_cast<double>(vectorValue[i]);
+ mean += static_cast<double>(vectorValue[i]);
}
- mean /= static_cast<double>(vectorValue.GetSize());
+ mean /= static_cast<double>(vectorValue.GetSize());
- // Matrix iteration
- for(unsigned int band_x = 0; band_x < numberOfTrainingImages; ++band_x)
+ // Matrix iteration
+ for (unsigned int band_x = 0; band_x < numberOfTrainingImages; ++band_x)
{
- for(unsigned int band_y = 0; band_y <= band_x; ++band_y )
- {
- m_ThreadInnerProduct[threadId][band_x][band_y] +=
- (static_cast<double>(vectorValue[band_x]) - mean) * (static_cast<double>(vectorValue[band_y]) - mean);
- } // end: band_y loop
+ for (unsigned int band_y = 0; band_y <= band_x; ++band_y)
+ {
+ m_ThreadInnerProduct[threadId][band_x][band_y] +=
+ (static_cast<double>(vectorValue[band_x]) - mean) * (static_cast<double>(vectorValue[band_y]) - mean);
+ } // end: band_y loop
} // end: band_x loop
- ++it;
- progress.CompletedPixel();
- }// end: looping through the image
- }
+ ++it;
+ progress.CompletedPixel();
+ } // end: looping through the image
+ }
else
- {
+ {
it.GoToBegin();
// do the work
while (!it.IsAtEnd())
- {
- PixelType vectorValue = it.Get();
- // Matrix iteration
- for(unsigned int band_x = 0; band_x < numberOfTrainingImages; ++band_x)
+ {
+ PixelType vectorValue = it.Get();
+ // Matrix iteration
+ for (unsigned int band_x = 0; band_x < numberOfTrainingImages; ++band_x)
{
- for(unsigned int band_y = 0; band_y <= band_x; ++band_y )
- {
- m_ThreadInnerProduct[threadId][band_x][band_y] +=
- (static_cast<double>(vectorValue[band_x]) ) * (static_cast<double>(vectorValue[band_y]) );
- } // end: band_y loop
+ for (unsigned int band_y = 0; band_y <= band_x; ++band_y)
+ {
+ m_ThreadInnerProduct[threadId][band_x][band_y] +=
+ (static_cast<double>(vectorValue[band_x])) * (static_cast<double>(vectorValue[band_y]));
+ } // end: band_y loop
} // end: band_x loop
- ++it;
- progress.CompletedPixel();
- }// end: looping through the image
- }
+ ++it;
+ progress.CompletedPixel();
+ } // end: looping through the image
+ }
}
template <class TImage>
@@ -257,13 +256,11 @@ void
PersistentInnerProductVectorImageFilter<TImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "m_CenterData: " << m_CenterData << std::endl;
os << indent << "InnerProduct: " << this->GetInnerProductOutput()->Get() << std::endl;
-
}
-
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.h b/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.h
index c9f7eab2b2..7f831943fd 100644
--- a/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.h
+++ b/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.h
@@ -52,14 +52,14 @@ namespace otb
*/
template<class TInputImage, class TInputImage2>
class ITK_EXPORT PersistentMatrixTransposeMatrixImageFilter :
- public PersistentImageFilter<TInputImage, TInputImage>
+ public PersistentImageFilter<TInputImage, TInputImage>
{
public:
/** Standard Self typedef */
- typedef PersistentMatrixTransposeMatrixImageFilter Self;
- typedef PersistentImageFilter<TInputImage,TInputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PersistentMatrixTransposeMatrixImageFilter Self;
+ typedef PersistentImageFilter<TInputImage, TInputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -69,33 +69,32 @@ public:
/** Image related typedefs. */
// First Input
- typedef TInputImage ImageType;
- typedef typename TInputImage::Pointer InputImagePointer;
- typedef typename TInputImage::RegionType RegionType;
- typedef typename TInputImage::SizeType SizeType;
- typedef typename TInputImage::IndexType IndexType;
- typedef typename TInputImage::PixelType PixelType;
- typedef typename TInputImage::InternalPixelType InternalPixelType;
-
- typedef typename TInputImage2::IndexType IndexType2;
- typedef typename TInputImage2::PixelType PixelType2;
- typedef typename TInputImage2::InternalPixelType InternalPixelType2;
+ typedef TInputImage ImageType;
+ typedef typename TInputImage::Pointer InputImagePointer;
+ typedef typename TInputImage::RegionType RegionType;
+ typedef typename TInputImage::SizeType SizeType;
+ typedef typename TInputImage::IndexType IndexType;
+ typedef typename TInputImage::PixelType PixelType;
+ typedef typename TInputImage::InternalPixelType InternalPixelType;
+
+ typedef typename TInputImage2::IndexType IndexType2;
+ typedef typename TInputImage2::PixelType PixelType2;
+ typedef typename TInputImage2::InternalPixelType InternalPixelType2;
itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
- itkSetMacro(UsePadFirstInput,bool);
- itkGetMacro(UsePadFirstInput,bool);
- itkSetMacro(UsePadSecondInput,bool);
- itkGetMacro(UsePadSecondInput,bool);
+ itkSetMacro(UsePadFirstInput, bool);
+ itkGetMacro(UsePadFirstInput, bool);
+ itkSetMacro(UsePadSecondInput, bool);
+ itkGetMacro(UsePadSecondInput, bool);
/** Image related typedefs. */
- itkStaticConstMacro(ImageDimension, unsigned int, TInputImage::ImageDimension );
+ itkStaticConstMacro(ImageDimension, unsigned int, TInputImage::ImageDimension);
/** Type to use for computations. */
// First Input
- typedef double RealType;
- typedef itk::VariableLengthVector<RealType> RealPixelType;
-
+ typedef double RealType;
+ typedef itk::VariableLengthVector<RealType> RealPixelType;
/** Smart Pointer type to a DataObject. */
typedef typename itk::DataObject::Pointer DataObjectPointer;
@@ -110,16 +109,14 @@ public:
typedef itk::SimpleDataObjectDecorator<PixelType> PixelObjectType;
typedef itk::SimpleDataObjectDecorator<MatrixType> MatrixObjectType;
-
/** Return the computed transpose(Image1)*Image2. */
MatrixType GetResult() const
{
return this->GetResultOutput()->Get();
- };
+ }
MatrixObjectType* GetResultOutput();
const MatrixObjectType* GetResultOutput() const;
-
/** Make a DataObject of the correct type to be used as the specified
* output.
*/
@@ -138,47 +135,45 @@ public:
/** Input wrapper */
void SetFirstInput(const TInputImage *input1)
{
- this->SetInput(0, input1 );
- };
+ this->SetInput(0, input1);
+ }
void SetSecondInput(const TInputImage2 *input2)
{
- this->SetInput(1, input2 );
- };
+ this->SetInput(1, input2);
+ }
const TInputImage* GetFirstInput()
{
- if ( this->GetNumberOfInputs() < 1 )
- {
+ if (this->GetNumberOfInputs() < 1)
+ {
return 0;
- }
- else
- return( static_cast<const TInputImage *>(this->itk::ProcessObject::GetInput(0)) );
+ }
+ else return (static_cast<const TInputImage *>(this->itk::ProcessObject::GetInput(0)));
}
const TInputImage2* GetSecondInput()
{
- if ( this->GetNumberOfInputs() < 2 )
- {
+ if (this->GetNumberOfInputs() < 2)
+ {
return 0;
- }
- else
- return( static_cast<const TInputImage2 *>(this->itk::ProcessObject::GetInput(1)) );
+ }
+ else return (static_cast<const TInputImage2 *>(this->itk::ProcessObject::GetInput(1)));
}
protected:
PersistentMatrixTransposeMatrixImageFilter();
- virtual ~PersistentMatrixTransposeMatrixImageFilter() {};
+ virtual ~PersistentMatrixTransposeMatrixImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Multi-thread version GenerateData. */
- virtual void ThreadedGenerateData (const RegionType& outputRegionForThread,int threadId);
+ virtual void ThreadedGenerateData(const RegionType& outputRegionForThread, int threadId);
private:
- PersistentMatrixTransposeMatrixImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PersistentMatrixTransposeMatrixImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- ArrayMatrixType m_ThreadSum;
- bool m_UsePadFirstInput;
- bool m_UsePadSecondInput;
+ ArrayMatrixType m_ThreadSum;
+ bool m_UsePadFirstInput;
+ bool m_UsePadSecondInput;
/** Nulber Of Component per Pixel. Change for padding */
unsigned int m_NumberOfComponents1;
@@ -206,29 +201,28 @@ private:
* \ingroup MathematicalStatisticsImageFilters
*/
-
template<class TInputImage1, class TInputImage2>
class ITK_EXPORT StreamingMatrixTransposeMatrixImageFilter :
- public PersistentFilterStreamingDecorator
- < PersistentMatrixTransposeMatrixImageFilter<TInputImage1, TInputImage2> >
+ public PersistentFilterStreamingDecorator
+ <PersistentMatrixTransposeMatrixImageFilter<TInputImage1, TInputImage2> >
{
public:
/** Standard Self typedef */
- typedef StreamingMatrixTransposeMatrixImageFilter Self;
+ typedef StreamingMatrixTransposeMatrixImageFilter Self;
typedef PersistentFilterStreamingDecorator
- < PersistentMatrixTransposeMatrixImageFilter<TInputImage1, TInputImage2> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ <PersistentMatrixTransposeMatrixImageFilter<TInputImage1, TInputImage2> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(StreamingMatrixTransposeMatrixImageFilter,PersistentFilterStreamingDecorator);
+ itkTypeMacro(StreamingMatrixTransposeMatrixImageFilter, PersistentFilterStreamingDecorator);
- typedef typename Superclass::FilterType MatrixToTransposeMatrixFilterType;
+ typedef typename Superclass::FilterType MatrixToTransposeMatrixFilterType;
typedef typename MatrixToTransposeMatrixFilterType::MatrixType MatrixType;
- typedef itk::SimpleDataObjectDecorator<MatrixType> MatrixObjectType;
+ typedef itk::SimpleDataObjectDecorator<MatrixType> MatrixObjectType;
typedef TInputImage1 InputImage1Type;
typedef TInputImage2 InputImage2Type;
@@ -275,11 +269,11 @@ protected:
/** Constructor */
StreamingMatrixTransposeMatrixImageFilter() {};
/** Destructor */
- virtual ~StreamingMatrixTransposeMatrixImageFilter() {};
+ virtual ~StreamingMatrixTransposeMatrixImageFilter() {}
private:
- StreamingMatrixTransposeMatrixImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ StreamingMatrixTransposeMatrixImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
diff --git a/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.txx b/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.txx
index 206c48e9a7..f53d53076b 100644
--- a/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.txx
@@ -28,7 +28,6 @@
#include "itkNumericTraits.h"
#include "itkProgressReporter.h"
-
namespace otb
{
@@ -58,14 +57,13 @@ PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>
m_NumberOfComponents2 = 0;
}
-
template<class TInputImage, class TInputImage2>
itk::DataObject::Pointer
PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>
::MakeOutput(unsigned int output)
{
switch (output)
- {
+ {
case 0:
return static_cast<itk::DataObject*>(TInputImage::New().GetPointer());
break;
@@ -76,7 +74,7 @@ PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>
// might as well make an image
return static_cast<itk::DataObject*>(TInputImage::New().GetPointer());
break;
- }
+ }
}
template<class TInputImage, class TInputImage2>
@@ -95,7 +93,6 @@ PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>
return static_cast<const MatrixObjectType*>(this->itk::ProcessObject::GetOutput(1));
}
-
template<class TInputImage, class TInputImage2>
void
PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>
@@ -103,13 +100,13 @@ PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>
{
Superclass::GenerateInputRequestedRegion();
- if ( this->GetFirstInput() && this->GetSecondInput() )
- {
- InputImagePointer image = const_cast< typename Superclass::InputImageType * >( this->GetFirstInput() );
- InputImagePointer image2 = const_cast< typename Superclass::InputImageType * >( this->GetSecondInput() );
+ if (this->GetFirstInput() && this->GetSecondInput())
+ {
+ InputImagePointer image = const_cast<typename Superclass::InputImageType *>(this->GetFirstInput());
+ InputImagePointer image2 = const_cast<typename Superclass::InputImageType *>(this->GetSecondInput());
image->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
image2->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
- }
+ }
}
template<class TInputImage, class TInputImage2>
void
@@ -117,16 +114,16 @@ PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
- if ( this->GetFirstInput() )
- {
+ if (this->GetFirstInput())
+ {
this->GetOutput()->CopyInformation(this->GetFirstInput());
this->GetOutput()->SetLargestPossibleRegion(this->GetFirstInput()->GetLargestPossibleRegion());
- }
+ }
- if (this->GetOutput()->GetRequestedRegion().GetNumberOfPixels()==0)
- {
+ if (this->GetOutput()->GetRequestedRegion().GetNumberOfPixels() == 0)
+ {
this->GetOutput()->SetRequestedRegion(this->GetOutput()->GetLargestPossibleRegion());
- }
+ }
}
template<class TInputImage, class TInputImage2>
@@ -147,37 +144,37 @@ PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>
::Reset()
{
- TInputImage * inputPtr1 = const_cast<TInputImage * >(this->GetFirstInput());
+ TInputImage * inputPtr1 = const_cast<TInputImage *>(this->GetFirstInput());
inputPtr1->UpdateOutputInformation();
- TInputImage2 * inputPtr2 = const_cast<TInputImage2 * >(this->GetSecondInput());
+ TInputImage2 * inputPtr2 = const_cast<TInputImage2 *>(this->GetSecondInput());
inputPtr2->UpdateOutputInformation();
- if (this->GetOutput()->GetRequestedRegion().GetNumberOfPixels()==0)
- {
+ if (this->GetOutput()->GetRequestedRegion().GetNumberOfPixels() == 0)
+ {
this->GetOutput()->SetRequestedRegion(this->GetOutput()->GetLargestPossibleRegion());
- }
+ }
- if ( inputPtr1->GetLargestPossibleRegion().GetSize() != inputPtr2->GetLargestPossibleRegion().GetSize() )
- {
- itkExceptionMacro( <<" Can't multiply the transposed matrix of a "
- << inputPtr1->GetLargestPossibleRegion().GetSize()
- << " and a "
- << inputPtr2->GetLargestPossibleRegion().GetSize()
- << " matrix " );
- }
+ if (inputPtr1->GetLargestPossibleRegion().GetSize() != inputPtr2->GetLargestPossibleRegion().GetSize())
+ {
+ itkExceptionMacro(<< " Can't multiply the transposed matrix of a "
+ << inputPtr1->GetLargestPossibleRegion().GetSize()
+ << " and a "
+ << inputPtr2->GetLargestPossibleRegion().GetSize()
+ << " matrix ");
+ }
m_NumberOfComponents1 = inputPtr1->GetNumberOfComponentsPerPixel();
m_NumberOfComponents2 = inputPtr2->GetNumberOfComponentsPerPixel();
unsigned int numberOfThreads = this->GetNumberOfThreads();
- if ( m_UsePadFirstInput == true )
- {
+ if (m_UsePadFirstInput == true)
+ {
m_NumberOfComponents1++;
- }
- if ( m_UsePadSecondInput == true )
- {
+ }
+ if (m_UsePadSecondInput == true)
+ {
m_NumberOfComponents2++;
- }
+ }
MatrixType tempMatrix, initMatrix;
tempMatrix.SetSize(m_NumberOfComponents1, m_NumberOfComponents2);
@@ -186,37 +183,35 @@ PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>
initMatrix.SetSize(m_NumberOfComponents2, m_NumberOfComponents2);
initMatrix.Fill(itk::NumericTraits<RealType>::Zero);
- this->GetResultOutput()->Set( initMatrix );
+ this->GetResultOutput()->Set(initMatrix);
}
-
template<class TInputImage, class TInputImage2>
void
PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>
::Synthetize()
{
unsigned int numberOfThreads = this->GetNumberOfThreads();
- MatrixType resultMatrix;
+ MatrixType resultMatrix;
resultMatrix.SetSize(m_NumberOfComponents1, m_NumberOfComponents2);
resultMatrix.Fill(itk::NumericTraits<RealType>::Zero);
-
- for ( unsigned int thread = 0; thread < numberOfThreads; thread++)
- {
+ for (unsigned int thread = 0; thread < numberOfThreads; thread++)
+ {
/** TODO
* To modify using + method operator. If we use it now -> exceptionmacro (no GetClassName...)
* resultMatrix += m_ThreadSum[thread];
**/
- for (unsigned int i=0; i<resultMatrix.Rows(); ++i)
- {
- for (unsigned int j=0; j<resultMatrix.Cols(); ++j)
+ for (unsigned int i = 0; i < resultMatrix.Rows(); ++i)
{
+ for (unsigned int j = 0; j < resultMatrix.Cols(); ++j)
+ {
resultMatrix(i, j) += m_ThreadSum[thread](i, j);
+ }
}
- }
/********END TODO ******/
- }
- this->GetResultOutput()->Set( resultMatrix );
+ }
+ this->GetResultOutput()->Set(resultMatrix);
}
template<class TInputImage, class TInputImage2>
@@ -227,8 +222,8 @@ PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>
/**
* Grab the input
*/
- InputImagePointer input1Ptr = const_cast< TInputImage * >( this->GetFirstInput() );
- InputImagePointer input2Ptr = const_cast< TInputImage2 * >( this->GetSecondInput() );
+ InputImagePointer input1Ptr = const_cast<TInputImage *>(this->GetFirstInput());
+ InputImagePointer input2Ptr = const_cast<TInputImage2 *>(this->GetSecondInput());
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
@@ -239,56 +234,56 @@ PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>
input2Ptr->PropagateRequestedRegion();
input2Ptr->UpdateOutputData();
- itk::ImageRegionConstIterator<TInputImage> it1 (input1Ptr, outputRegionForThread);
- itk::ImageRegionConstIterator<TInputImage2> it2 (input2Ptr, outputRegionForThread);
+ itk::ImageRegionConstIterator<TInputImage> it1(input1Ptr, outputRegionForThread);
+ itk::ImageRegionConstIterator<TInputImage2> it2(input2Ptr, outputRegionForThread);
it1.GoToBegin();
it2.GoToBegin();
// loop the second image and get one pixel a time
while (!it1.IsAtEnd())
- {
- PixelType vectorValue1 = it1.Get();
+ {
+ PixelType vectorValue1 = it1.Get();
PixelType2 vectorValue2 = it2.Get();
// Add a first component to vectorValue2 and vectorValue1 filled with ones.
if (m_UsePadFirstInput == true)
- {
- PixelType vectortemp1(vectorValue1.Size()+1);
- vectortemp1[0] = 1;
- for (unsigned int n=0; n<vectorValue1.Size(); ++n)
{
- vectortemp1[n+1] = vectorValue1[n];
+ PixelType vectortemp1(vectorValue1.Size() + 1);
+ vectortemp1[0] = 1;
+ for (unsigned int n = 0; n < vectorValue1.Size(); ++n)
+ {
+ vectortemp1[n + 1] = vectorValue1[n];
- }
+ }
vectorValue1.SetSize(vectortemp1.Size());
vectorValue1 = vectortemp1;
- }
+ }
if (m_UsePadSecondInput == true)
- {
- PixelType2 vectortemp2(vectorValue2.Size()+1);
- vectortemp2[0] = 1;
- for (unsigned int m=0; m<vectorValue2.Size(); m++)
{
- vectortemp2[m+1] = vectorValue2[m];
+ PixelType2 vectortemp2(vectorValue2.Size() + 1);
+ vectortemp2[0] = 1;
+ for (unsigned int m = 0; m < vectorValue2.Size(); m++)
+ {
+ vectortemp2[m + 1] = vectorValue2[m];
- }
+ }
vectorValue2.SetSize(vectortemp2.Size());
vectorValue2 = vectortemp2;
- }
+ }
- for (unsigned int i=0; i<vectorValue1.Size(); ++i)
- {
- for (unsigned int j=0; j<vectorValue2.Size(); ++j)
+ for (unsigned int i = 0; i < vectorValue1.Size(); ++i)
{
- m_ThreadSum[threadId](i, j) += static_cast<RealType>(vectorValue1[i])*static_cast<RealType>(vectorValue2[j]);
- }
+ for (unsigned int j = 0; j < vectorValue2.Size(); ++j)
+ {
+ m_ThreadSum[threadId](i, j) += static_cast<RealType>(vectorValue1[i]) * static_cast<RealType>(vectorValue2[j]);
+ }
- }
+ }
++it1;
++it2;
progress.CompletedPixel();
- }
+ }
}
template<class TInputImage, class TInputImage2>
@@ -296,11 +291,10 @@ void
PersistentMatrixTransposeMatrixImageFilter<TInputImage, TInputImage2>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
- os << indent << "Result: " <<this->GetResultOutput()->Get()<< std::endl;
+ os << indent << "Result: " << this->GetResultOutput()->Get() << std::endl;
}
-
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/BasicFilters/otbStreamingResampleImageFilter.h b/Code/BasicFilters/otbStreamingResampleImageFilter.h
index 906dbdc823..87a43fb56a 100644
--- a/Code/BasicFilters/otbStreamingResampleImageFilter.h
+++ b/Code/BasicFilters/otbStreamingResampleImageFilter.h
@@ -31,23 +31,24 @@ namespace otb
* This class add streaming aspect on it::ResampleImageFilter
*/
-template <class TInputImage, class TOutputImage, class TInterpolatorPrecisionType=double>
-class ITK_EXPORT StreamingResampleImageFilter : public itk::ResampleImageFilter< TInputImage, TOutputImage, TInterpolatorPrecisionType >
+template <class TInputImage, class TOutputImage, class TInterpolatorPrecisionType = double>
+class ITK_EXPORT StreamingResampleImageFilter : public itk::ResampleImageFilter<TInputImage, TOutputImage,
+ TInterpolatorPrecisionType>
{
public:
/** Standard class typedefs. */
- typedef StreamingResampleImageFilter Self;
- typedef itk::ResampleImageFilter< TInputImage, TOutputImage, TInterpolatorPrecisionType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef StreamingResampleImageFilter Self;
+ typedef itk::ResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecisionType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Image related typedefs. */
- typedef typename TInputImage::Pointer InputImagePointer;
+ typedef typename TInputImage::Pointer InputImagePointer;
typedef typename TOutputImage::Pointer OutputImagePointer;
typedef typename TInputImage::IndexType IndexType;
- typedef typename TInputImage::SizeType SizeType;
+ typedef typename TInputImage::SizeType SizeType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -56,20 +57,20 @@ public:
itkTypeMacro(StreamingResampleImageFilter, itk::ResampleImageFilter);
/** Type definitions */
- typedef typename TInputImage::PixelType InputPixelType;
+ typedef typename TInputImage::PixelType InputPixelType;
typedef typename TOutputImage::PixelType OutputPixelType;
- typedef typename TInputImage::RegionType InputImageRegionType;
+ typedef typename TInputImage::RegionType InputImageRegionType;
typedef typename TOutputImage::RegionType OutputImageRegionType;
typedef typename Superclass::InterpolatorType InterpolatorType;
typedef typename InterpolatorType::PointType PointType;
- itkSetMacro(InterpolatorNeighborhoodRadius,unsigned int);
- itkGetMacro(InterpolatorNeighborhoodRadius,unsigned int);
+ itkSetMacro(InterpolatorNeighborhoodRadius, unsigned int);
+ itkGetMacro(InterpolatorNeighborhoodRadius, unsigned int);
- itkSetMacro(AddedRadius,unsigned int);
- itkGetMacro(AddedRadius,unsigned int);
+ itkSetMacro(AddedRadius, unsigned int);
+ itkGetMacro(AddedRadius, unsigned int);
/** ResampleImageFilter needs a different input requested region than
* the output requested region. As such, ResampleImageFilter needs
@@ -81,13 +82,12 @@ public:
protected:
StreamingResampleImageFilter();
- virtual ~StreamingResampleImageFilter() {};
+ virtual ~StreamingResampleImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
private:
- StreamingResampleImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ StreamingResampleImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
// Determine size of pad needed for interpolators neighborhood
unsigned int m_InterpolatorNeighborhoodRadius;
@@ -103,5 +103,4 @@ private:
#include "otbStreamingResampleImageFilter.txx"
#endif
-
#endif
diff --git a/Code/BasicFilters/otbStreamingResampleImageFilter.txx b/Code/BasicFilters/otbStreamingResampleImageFilter.txx
index be9e500532..193a6c9d3d 100644
--- a/Code/BasicFilters/otbStreamingResampleImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingResampleImageFilter.txx
@@ -30,12 +30,11 @@
#include "itkProgressReporter.h"
#include "itkContinuousIndex.h"
-
namespace otb
{
template<class TInputImage, class TOutputImage, class TInterpolatorPrecisionType>
-StreamingResampleImageFilter<TInputImage,TOutputImage,TInterpolatorPrecisionType>
+StreamingResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecisionType>
::StreamingResampleImageFilter()
{
// Default neighborhood interpolation radius is one pixel
@@ -43,48 +42,47 @@ StreamingResampleImageFilter<TInputImage,TOutputImage,TInterpolatorPrecisionType
m_AddedRadius = 2;
}
-
template<class TInputImage, class TOutputImage, class TInterpolatorPrecisionType>
void
-StreamingResampleImageFilter<TInputImage,TOutputImage,TInterpolatorPrecisionType>
+StreamingResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecisionType>
::GenerateInputRequestedRegion()
{
Superclass::GenerateInputRequestedRegion();
- if ( this->GetInput() )
- {
+ if (this->GetInput())
+ {
otbMsgDevMacro(<< "-------------- GenerateInputRequestedRegion ---------------" << std::endl);
- InputImagePointer inputImage = const_cast< typename Superclass::InputImageType *>( this->GetInput() );
- OutputImagePointer outputImage = const_cast< typename Superclass::OutputImageType *>( this->GetOutput() );
+ InputImagePointer inputImage = const_cast<typename Superclass::InputImageType *>(this->GetInput());
+ OutputImagePointer outputImage = const_cast<typename Superclass::OutputImageType *>(this->GetOutput());
IndexType index = outputImage->GetRequestedRegion().GetIndex();
- SizeType size = outputImage->GetRequestedRegion().GetSize();
+ SizeType size = outputImage->GetRequestedRegion().GetSize();
// Obtain coordinates of upperleft, upperright, lowerleft and lowerright points in the image
- IndexType indexTmp;
- std::vector<IndexType> vPoints;
+ IndexType indexTmp;
+ std::vector<IndexType> vPoints;
typename std::vector<IndexType>::iterator it;
otbMsgDevMacro(<< "Size : " << size[0] << " " << size[1]);
- indexTmp[0]=index[0];
- indexTmp[1]=index[1];
+ indexTmp[0] = index[0];
+ indexTmp[1] = index[1];
vPoints.push_back(indexTmp);
//otbGenericMsgDebugMacro(<< "indexUL : (" << indexTmp[0] << "," << indexTmp[1] << ")");
- indexTmp[0]=index[0]+size[0];
- indexTmp[1]=index[1];
+ indexTmp[0] = index[0] + size[0];
+ indexTmp[1] = index[1];
vPoints.push_back(indexTmp);
//otbGenericMsgDebugMacro(<< "indexUR : (" << indexTmp[0] << "," << indexTmp[1] << ")");
- indexTmp[0]=index[0]+size[0];
- indexTmp[1]=index[1]+size[1];
+ indexTmp[0] = index[0] + size[0];
+ indexTmp[1] = index[1] + size[1];
vPoints.push_back(indexTmp);
//otbGenericMsgDebugMacro(<< "indexLR : (" << indexTmp[0] << "," << indexTmp[1] << ")");
- indexTmp[0]=index[0];
- indexTmp[1]=index[1]+size[1];
+ indexTmp[0] = index[0];
+ indexTmp[1] = index[1] + size[1];
vPoints.push_back(indexTmp);
//otbGenericMsgDebugMacro(<< "indexLL : (" << indexTmp[0] << "," << indexTmp[1] << ")");
@@ -103,39 +101,35 @@ StreamingResampleImageFilter<TInputImage,TOutputImage,TInterpolatorPrecisionType
// Transform each "corner" point
for (it = vPoints.begin(); it != vPoints.end(); it++)
- {
+ {
ContinuousIndexType indexTmpTr;
// Calculate transformed points needed for previous filter in the pipeline
// std::cout << "Origin : " << outputImage->GetOrigin() << std::endl;
// std::cout << "Spacing : " << outputImage->GetSpacing() << std::endl;
- outputImage->TransformIndexToPhysicalPoint( *it, outputPoint );
+ outputImage->TransformIndexToPhysicalPoint(*it, outputPoint);
- otbMsgDevMacro(<< "Ncurrent Index :(" << (*it)[0]<<","<< (*it)[1] << ")"<< std::endl
- << "Physical point: ("<< outputPoint[0]<< ","<< outputPoint[1]<< ")");
+ otbMsgDevMacro(<< "Ncurrent Index :(" << (*it)[0] << "," << (*it)[1] << ")" << std::endl
+ << "Physical point: (" << outputPoint[0] << "," << outputPoint[1] << ")");
// Compute corresponding input pixel continuous index
inputPoint = this->GetTransform()->TransformPoint(outputPoint);
inputImage->TransformPhysicalPointToContinuousIndex(inputPoint, indexTmpTr);
otbMsgDevMacro(<< " -> Point Index:" << std::endl
- << indexTmpTr[0] << ","<< indexTmpTr[1] );
+ << indexTmpTr[0] << "," << indexTmpTr[1]);
- if (indexTmpTr[0]>maxX)
- maxX = indexTmpTr[0];
+ if (indexTmpTr[0] > maxX) maxX = indexTmpTr[0];
- if (indexTmpTr[0]<minX)
- minX = indexTmpTr[0];
+ if (indexTmpTr[0] < minX) minX = indexTmpTr[0];
- if (indexTmpTr[1]>maxY)
- maxY = indexTmpTr[1];
+ if (indexTmpTr[1] > maxY) maxY = indexTmpTr[1];
- if (indexTmpTr[1]<minY)
- minY = indexTmpTr[1];
+ if (indexTmpTr[1] < minY) minY = indexTmpTr[1];
//otbGenericMsgDebugMacro(<< "indexTr : (" << indexTmpTr[0] << "," << indexTmpTr[1] << ")");
- }
+ }
otbMsgDevMacro(<< "MinX : " << minX << " MinY : " << minY << " MaxX : " << maxX << " MaxY " << maxY);
@@ -152,50 +146,57 @@ StreamingResampleImageFilter<TInputImage,TOutputImage,TInterpolatorPrecisionType
region.SetIndex(index);
// Grow region to be sure that interpolator can found needed point on image borders
- unsigned int neededRadius = StreamingTraits<typename Superclass::InputImageType>::CalculateNeededRadiusForInterpolator(this->GetInterpolator());
+ unsigned int neededRadius =
+ StreamingTraits<typename Superclass::InputImageType>::CalculateNeededRadiusForInterpolator(this->GetInterpolator());
if (neededRadius == 0)
- {
+ {
itkGenericOutputMacro(<< "If you haven't fixed interpolator radius, default is 1");
neededRadius = m_InterpolatorNeighborhoodRadius;
- }
+ }
otbMsgDevMacro(<< "Interpolation needed radius : " << neededRadius);
- region.PadByRadius(neededRadius+m_AddedRadius);
+ region.PadByRadius(neededRadius + m_AddedRadius);
- otbMsgDevMacro(<< "Initial Region : Index(" << inputImage->GetLargestPossibleRegion().GetIndex()[0] << "," << inputImage->GetLargestPossibleRegion().GetIndex()[1] << ") Size(" << inputImage->GetLargestPossibleRegion().GetSize()[0] << "," << inputImage->GetLargestPossibleRegion().GetSize()[1] << ")");
+ otbMsgDevMacro(
+ << "Initial Region : Index(" << inputImage->GetLargestPossibleRegion().GetIndex()[0] << "," <<
+ inputImage->GetLargestPossibleRegion().GetIndex()[1] << ") Size(" <<
+ inputImage->GetLargestPossibleRegion().GetSize()[0] << "," <<
+ inputImage->GetLargestPossibleRegion().GetSize()[1] << ")");
// To be sure that requested region in pipeline is not largest than real input image
- otbMsgDevMacro(<< "Final Region (Before Crop) : Index(" << region.GetIndex()[0] << "," << region.GetIndex()[1] << ") Size(" << region.GetSize()[0] << "," << region.GetSize()[1] << ")");
+ otbMsgDevMacro(
+ << "Final Region (Before Crop) : Index(" << region.GetIndex()[0] << "," << region.GetIndex()[1] << ") Size(" <<
+ region.GetSize()[0] << "," << region.GetSize()[1] << ")");
// If requested region is not contained in input image, then result region is null
if (!region.Crop(inputImage->GetLargestPossibleRegion()))
- {
- index[0]=0;
- index[1]=0;
- size[0]=0;
- size[1]=0;
+ {
+ index[0] = 0;
+ index[1] = 0;
+ size[0] = 0;
+ size[1] = 0;
region.SetIndex(index);
region.SetSize(size);
- }
+ }
inputImage->SetRequestedRegion(region);
- otbMsgDevMacro(<< "Final Region (After Crop) : Index(" << region.GetIndex()[0] << "," << region.GetIndex()[1] << ") Size(" << region.GetSize()[0] << "," << region.GetSize()[1] << ")");
- }
+ otbMsgDevMacro(
+ << "Final Region (After Crop) : Index(" << region.GetIndex()[0] << "," << region.GetIndex()[1] << ") Size(" <<
+ region.GetSize()[0] << "," << region.GetSize()[1] << ")");
+ }
}
-
template<class TInputImage, class TOutputImage, class TInterpolatorPrecisionType>
void
-StreamingResampleImageFilter<TInputImage,TOutputImage,TInterpolatorPrecisionType>
+StreamingResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecisionType>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os << indent << "m_InterpolatorNeighborhoodRadius: " << m_InterpolatorNeighborhoodRadius<<std::endl;
- os << indent << "m_AddedRadius: " <<m_AddedRadius<< std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "m_InterpolatorNeighborhoodRadius: " << m_InterpolatorNeighborhoodRadius << std::endl;
+ os << indent << "m_AddedRadius: " << m_AddedRadius << std::endl;
}
-
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/BasicFilters/otbStreamingShrinkImageFilter.h b/Code/BasicFilters/otbStreamingShrinkImageFilter.h
index 0c96e4aaff..db5218a95f 100644
--- a/Code/BasicFilters/otbStreamingShrinkImageFilter.h
+++ b/Code/BasicFilters/otbStreamingShrinkImageFilter.h
@@ -36,31 +36,31 @@ namespace otb
* For example, with a 6000X6000 image and a 10 shrinkFactor, it will read 600 lines of 5990 pixels
* instead of the whole image.
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
class ITK_EXPORT StreamingShrinkImageFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef StreamingShrinkImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef StreamingShrinkImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(StreamingShrinkImageFilter,ImageToImageFilter);
+ itkTypeMacro(StreamingShrinkImageFilter, ImageToImageFilter);
/** Template parameter typedefs */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef TOutputImage OutputImageType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef TOutputImage OutputImageType;
typedef typename OutputImageType::Pointer OutputImagePointerType;
/** Shrink factor accessor */
- itkSetMacro(ShrinkFactor,unsigned int);
+ itkSetMacro(ShrinkFactor, unsigned int);
itkGetMacro(ShrinkFactor, unsigned int);
/**
@@ -72,7 +72,7 @@ public:
virtual void GenerateInputRequestedRegion(void);
/** Main computation method */
- virtual void UpdateOutputData(itk::DataObject *itkNotUsed(output));
+ virtual void UpdateOutputData(itk::DataObject * itkNotUsed(output));
protected:
/** Constructor */
@@ -83,8 +83,8 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- StreamingShrinkImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ StreamingShrinkImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The shrink factor */
unsigned int m_ShrinkFactor;
diff --git a/Code/BasicFilters/otbStreamingShrinkImageFilter.txx b/Code/BasicFilters/otbStreamingShrinkImageFilter.txx
index 4f8c79e142..76de6a5401 100644
--- a/Code/BasicFilters/otbStreamingShrinkImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingShrinkImageFilter.txx
@@ -30,7 +30,7 @@ StreamingShrinkImageFilter<TInputImage, TOutputImage>
::StreamingShrinkImageFilter()
{
// Default shrink factor
- m_ShrinkFactor=10;
+ m_ShrinkFactor = 10;
}
/** Destructor */
template <class TInputImage, class TOutputImage>
@@ -52,36 +52,36 @@ StreamingShrinkImageFilter<TInputImage, TOutputImage>
// get pointers to the input and output
typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
// we need to compute the output spacing, the output image size, and the
// output image start index
const typename InputImageType::SpacingType&
- inputSpacing = inputPtr->GetSpacing();
- const typename InputImageType::SizeType& inputSize
- = inputPtr->GetLargestPossibleRegion().GetSize();
- const typename InputImageType::IndexType& inputStartIndex
- = inputPtr->GetLargestPossibleRegion().GetIndex();
- otbMsgDebugMacro(<<"Input index "<<inputStartIndex);
- otbMsgDebugMacro(<<"Input size: "<<inputSize);
-
- typename OutputImageType::SpacingType outputSpacing;
- typename OutputImageType::SizeType outputSize;
- typename OutputImageType::IndexType outputStartIndex;
+ inputSpacing = inputPtr->GetSpacing();
+ const typename InputImageType::SizeType& inputSize
+ = inputPtr->GetLargestPossibleRegion().GetSize();
+ const typename InputImageType::IndexType& inputStartIndex
+ = inputPtr->GetLargestPossibleRegion().GetIndex();
+ otbMsgDebugMacro(<< "Input index " << inputStartIndex);
+ otbMsgDebugMacro(<< "Input size: " << inputSize);
+
+ typename OutputImageType::SpacingType outputSpacing;
+ typename OutputImageType::SizeType outputSize;
+ typename OutputImageType::IndexType outputStartIndex;
for (unsigned int i = 0; i < OutputImageType::ImageDimension; ++i)
- {
- outputSpacing[i] = inputSpacing[i] * static_cast<double>( m_ShrinkFactor);
- outputSize[i] = static_cast<int>( static_cast<double>(inputSize[i])/static_cast<double>( m_ShrinkFactor ));
+ {
+ outputSpacing[i] = inputSpacing[i] * static_cast<double>(m_ShrinkFactor);
+ outputSize[i] = static_cast<int>(static_cast<double>(inputSize[i]) / static_cast<double>(m_ShrinkFactor));
//outputStartIndex[i] = inputStartIndex[i];
- outputStartIndex[i]=0;
- }
- outputPtr->SetSpacing( outputSpacing );
+ outputStartIndex[i] = 0;
+ }
+ outputPtr->SetSpacing(outputSpacing);
typename OutputImageType::RegionType outputLargestPossibleRegion;
- outputLargestPossibleRegion.SetSize( outputSize );
- outputLargestPossibleRegion.SetIndex( outputStartIndex );
+ outputLargestPossibleRegion.SetSize(outputSize);
+ outputLargestPossibleRegion.SetIndex(outputStartIndex);
// otbMsgDebugMacro(<<"Output largest possible region: "<<outputLargestPossibleRegion);
- outputPtr->SetLargestPossibleRegion( outputLargestPossibleRegion );
+ outputPtr->SetLargestPossibleRegion(outputLargestPossibleRegion);
}
template <class TInputImage, class TOutputImage>
@@ -92,10 +92,10 @@ StreamingShrinkImageFilter<TInputImage, TOutputImage>
// otbMsgDebugMacro(<<"Call to GenerateInputRequestedRegion");
// if(this->GetInput())
// {
- InputImagePointerType inputPtr = const_cast<InputImageType * >( this->GetInput(0) );
+ InputImagePointerType inputPtr = const_cast<InputImageType *>(this->GetInput(0));
// otbMsgDebugMacro(<<"Input largest possible region: "<<inputPtr->GetLargestPossibleRegion());
typename InputImageType::IndexType index = inputPtr->GetLargestPossibleRegion().GetIndex();
- typename InputImageType::SizeType size;
+ typename InputImageType::SizeType size;
size.Fill(0);
typename InputImageType::RegionType region;
region.SetSize(size);
@@ -115,9 +115,9 @@ StreamingShrinkImageFilter<TInputImage, TOutputImage>
* prevent chasing our tail
*/
if (this->m_Updating)
- {
+ {
return;
- }
+ }
/**
* Prepare all the outputs. This may deallocate previous bulk data.
*/
@@ -128,10 +128,10 @@ StreamingShrinkImageFilter<TInputImage, TOutputImage>
*/
unsigned int ninputs = this->GetNumberOfValidRequiredInputs();
if (ninputs < 1)
- {
+ {
itkExceptionMacro(<< "At least 1 input is required but only " << ninputs << " are specified.");
return;
- }
+ }
this->SetAbortGenerateData(0);
this->SetProgress(0.0);
this->m_Updating = true;
@@ -142,36 +142,36 @@ StreamingShrinkImageFilter<TInputImage, TOutputImage>
/**
* Allocate the output buffer.
*/
- OutputImagePointerType outputPtr = this->GetOutput(0);
+ OutputImagePointerType outputPtr = this->GetOutput(0);
typename OutputImageType::RegionType outputRegion = outputPtr->GetRequestedRegion();
- outputPtr->SetBufferedRegion( outputRegion );
+ outputPtr->SetBufferedRegion(outputRegion);
outputPtr->Allocate();
/**
* Grab the input
*/
- InputImagePointerType inputPtr = const_cast<InputImageType * >( this->GetInput(0) );
+ InputImagePointerType inputPtr = const_cast<InputImageType *>(this->GetInput(0));
// otbMsgDebugMacro(<<"Input Largest possible region: "<<inputPtr->GetLargestPossibleRegion());
typename InputImageType::IndexType origin = inputPtr->GetLargestPossibleRegion().GetIndex();
typedef itk::ImageRegionIteratorWithIndex<OutputImageType> OutputIteratorType;
- typedef itk::ImageRegionIteratorWithIndex<InputImageType> InputIteratorType;
+ typedef itk::ImageRegionIteratorWithIndex<InputImageType> InputIteratorType;
- OutputIteratorType it(outputPtr,outputRegion);
+ OutputIteratorType it(outputPtr, outputRegion);
it.GoToBegin();
- typename OutputImageType::SizeType size = outputRegion.GetSize();
+ typename OutputImageType::SizeType size = outputRegion.GetSize();
typename OutputImageType::IndexType index = outputRegion.GetIndex();
- for (unsigned int i=0;i<size[1]&&!it.IsAtEnd();++i)
- {
+ for (unsigned int i = 0; i < size[1] && !it.IsAtEnd(); ++i)
+ {
typename InputImageType::IndexType readIndex;
- readIndex[0] = index[0]*m_ShrinkFactor;
- readIndex[1] = (i+index[1])*m_ShrinkFactor;
+ readIndex[0] = index[0] * m_ShrinkFactor;
+ readIndex[1] = (i + index[1]) * m_ShrinkFactor;
typename InputImageType::SizeType readSize;
- readSize[0]=size[0]*m_ShrinkFactor;
- readSize[1]=1;
+ readSize[0] = size[0] * m_ShrinkFactor;
+ readSize[1] = 1;
typename InputImageType::RegionType readRegion;
readRegion.SetSize(readSize);
readRegion.SetIndex(readIndex);
@@ -180,37 +180,37 @@ StreamingShrinkImageFilter<TInputImage, TOutputImage>
inputPtr->SetRequestedRegion(readRegion);
inputPtr->PropagateRequestedRegion();
inputPtr->UpdateOutputData();
- InputIteratorType readIt(inputPtr,readRegion);
- unsigned int count=0;
- for (readIt.GoToBegin();!readIt.IsAtEnd()&&!it.IsAtEnd();++readIt,++count)
- {
- if (count%m_ShrinkFactor==0)
+ InputIteratorType readIt(inputPtr, readRegion);
+ unsigned int count = 0;
+ for (readIt.GoToBegin(); !readIt.IsAtEnd() && !it.IsAtEnd(); ++readIt, ++count)
{
+ if (count % m_ShrinkFactor == 0)
+ {
it.Set(readIt.Get());
++it;
+ }
}
+ this->UpdateProgress(static_cast<float>(i) / static_cast<float>(size[1]));
}
- this->UpdateProgress(static_cast<float>(i)/ static_cast<float>(size[1]));
- }
/**
* If we ended due to aborting, push the progress up to 1.0 (since
* it probably didn't end there)
*/
- if ( !this->GetAbortGenerateData() )
- {
+ if (!this->GetAbortGenerateData())
+ {
this->UpdateProgress(1.0);
- }
+ }
// Notify end event observers
- this->InvokeEvent(itk::EndEvent() );
+ this->InvokeEvent(itk::EndEvent());
/**
* Now we have to mark the data as up to data.
*/
if (this->GetOutput(0))
- {
+ {
this->GetOutput(0)->DataHasBeenGenerated();
- }
+ }
/**
* Release any inputs if marked for release
*/
@@ -225,9 +225,9 @@ void
StreamingShrinkImageFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "Shrink factor: " << m_ShrinkFactor
- << std::endl;
+ << std::endl;
}
} // End namespace otb
#endif
diff --git a/Code/BasicFilters/otbStreamingStatisticsImageFilter.h b/Code/BasicFilters/otbStreamingStatisticsImageFilter.h
index d9d7468f4f..00b615460f 100644
--- a/Code/BasicFilters/otbStreamingStatisticsImageFilter.h
+++ b/Code/BasicFilters/otbStreamingStatisticsImageFilter.h
@@ -47,12 +47,12 @@ namespace otb
*/
template<class TInputImage>
class ITK_EXPORT PersistentStatisticsImageFilter :
- public PersistentImageFilter<TInputImage, TInputImage>
+ public PersistentImageFilter<TInputImage, TInputImage>
{
public:
/** Standard Self typedef */
typedef PersistentStatisticsImageFilter Self;
- typedef PersistentImageFilter<TInputImage,TInputImage> Superclass;
+ typedef PersistentImageFilter<TInputImage, TInputImage> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -60,10 +60,10 @@ public:
itkNewMacro(Self);
/** Runtime information support. */
- itkTypeMacro(PersistentStatisticsImageFilter,PersistentImageFilter);
+ itkTypeMacro(PersistentStatisticsImageFilter, PersistentImageFilter);
/** Image related typedefs. */
- typedef TInputImage ImageType;
+ typedef TInputImage ImageType;
typedef typename TInputImage::Pointer InputImagePointer;
typedef typename TInputImage::RegionType RegionType;
@@ -76,7 +76,7 @@ public:
/** Image related typedefs. */
itkStaticConstMacro(ImageDimension, unsigned int,
- TInputImage::ImageDimension );
+ TInputImage::ImageDimension);
/** Type to use for computations. */
typedef typename itk::NumericTraits<PixelType>::RealType RealType;
@@ -150,17 +150,17 @@ public:
protected:
PersistentStatisticsImageFilter();
- virtual ~PersistentStatisticsImageFilter() {};
+ virtual ~PersistentStatisticsImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Multi-thread version GenerateData. */
- void ThreadedGenerateData (const RegionType&
- outputRegionForThread,
- int threadId);
+ void ThreadedGenerateData(const RegionType&
+ outputRegionForThread,
+ int threadId);
private:
- PersistentStatisticsImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PersistentStatisticsImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
itk::Array<RealType> m_ThreadSum;
itk::Array<RealType> m_SumOfSquares;
@@ -201,26 +201,26 @@ private:
template<class TInputImage>
class ITK_EXPORT StreamingStatisticsImageFilter :
- public PersistentFilterStreamingDecorator< PersistentStatisticsImageFilter<TInputImage> >
+ public PersistentFilterStreamingDecorator<PersistentStatisticsImageFilter<TInputImage> >
{
public:
/** Standard Self typedef */
- typedef StreamingStatisticsImageFilter Self;
+ typedef StreamingStatisticsImageFilter Self;
typedef PersistentFilterStreamingDecorator
- < PersistentStatisticsImageFilter<TInputImage> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ <PersistentStatisticsImageFilter<TInputImage> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(StreamingStatisticsImageFilter,PersistentFilterStreamingDecorator);
+ itkTypeMacro(StreamingStatisticsImageFilter, PersistentFilterStreamingDecorator);
- typedef typename Superclass::FilterType StatFilterType;
+ typedef typename Superclass::FilterType StatFilterType;
typedef typename StatFilterType::PixelType PixelType;
- typedef typename StatFilterType::RealType RealType;
- typedef TInputImage InputImageType;
+ typedef typename StatFilterType::RealType RealType;
+ typedef TInputImage InputImageType;
/** Type of DataObjects used for scalar outputs */
typedef itk::SimpleDataObjectDecorator<RealType> RealObjectType;
@@ -313,16 +313,15 @@ public:
return this->GetFilter()->GetSumOutput();
}
-
protected:
/** Constructor */
StreamingStatisticsImageFilter() {};
/** Destructor */
- virtual ~StreamingStatisticsImageFilter() {};
+ virtual ~StreamingStatisticsImageFilter() {}
private:
- StreamingStatisticsImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ StreamingStatisticsImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
diff --git a/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx b/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
index d5145d8655..cdc051bba1 100644
--- a/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
@@ -33,34 +33,34 @@ namespace otb
template<class TInputImage>
PersistentStatisticsImageFilter<TInputImage>
-::PersistentStatisticsImageFilter(): m_ThreadSum(1), m_SumOfSquares(1), m_Count(1), m_ThreadMin(1), m_ThreadMax(1)
+::PersistentStatisticsImageFilter() : m_ThreadSum(1), m_SumOfSquares(1), m_Count(1), m_ThreadMin(1), m_ThreadMax(1)
{
// first output is a copy of the image, DataObject created by
// superclass
//
// allocate the data objects for the outputs which are
// just decorators around pixel types
- for (int i=1; i < 3; ++i)
- {
+ for (int i = 1; i < 3; ++i)
+ {
typename PixelObjectType::Pointer output
- = static_cast<PixelObjectType*>(this->MakeOutput(i).GetPointer());
+ = static_cast<PixelObjectType*>(this->MakeOutput(i).GetPointer());
this->itk::ProcessObject::SetNthOutput(i, output.GetPointer());
- }
+ }
// allocate the data objects for the outputs which are
// just decorators around real types
- for (int i=3; i < 7; ++i)
- {
+ for (int i = 3; i < 7; ++i)
+ {
typename RealObjectType::Pointer output
- = static_cast<RealObjectType*>(this->MakeOutput(i).GetPointer());
+ = static_cast<RealObjectType*>(this->MakeOutput(i).GetPointer());
this->itk::ProcessObject::SetNthOutput(i, output.GetPointer());
- }
+ }
- this->GetMinimumOutput()->Set( itk::NumericTraits<PixelType>::max() );
- this->GetMaximumOutput()->Set( itk::NumericTraits<PixelType>::NonpositiveMin() );
- this->GetMeanOutput()->Set( itk::NumericTraits<RealType>::max() );
- this->GetSigmaOutput()->Set( itk::NumericTraits<RealType>::max() );
- this->GetVarianceOutput()->Set( itk::NumericTraits<RealType>::max() );
- this->GetSumOutput()->Set( itk::NumericTraits<RealType>::Zero );
+ this->GetMinimumOutput()->Set(itk::NumericTraits<PixelType>::max());
+ this->GetMaximumOutput()->Set(itk::NumericTraits<PixelType>::NonpositiveMin());
+ this->GetMeanOutput()->Set(itk::NumericTraits<RealType>::max());
+ this->GetSigmaOutput()->Set(itk::NumericTraits<RealType>::max());
+ this->GetVarianceOutput()->Set(itk::NumericTraits<RealType>::max());
+ this->GetSumOutput()->Set(itk::NumericTraits<RealType>::Zero);
this->Reset();
}
@@ -71,7 +71,7 @@ PersistentStatisticsImageFilter<TInputImage>
::MakeOutput(unsigned int output)
{
switch (output)
- {
+ {
case 0:
return static_cast<itk::DataObject*>(TInputImage::New().GetPointer());
break;
@@ -91,10 +91,9 @@ PersistentStatisticsImageFilter<TInputImage>
// might as well make an image
return static_cast<itk::DataObject*>(TInputImage::New().GetPointer());
break;
- }
+ }
}
-
template<class TInputImage>
typename PersistentStatisticsImageFilter<TInputImage>::PixelObjectType*
PersistentStatisticsImageFilter<TInputImage>
@@ -111,7 +110,6 @@ PersistentStatisticsImageFilter<TInputImage>
return static_cast<const PixelObjectType*>(this->itk::ProcessObject::GetOutput(1));
}
-
template<class TInputImage>
typename PersistentStatisticsImageFilter<TInputImage>::PixelObjectType*
PersistentStatisticsImageFilter<TInputImage>
@@ -128,7 +126,6 @@ PersistentStatisticsImageFilter<TInputImage>
return static_cast<const PixelObjectType*>(this->itk::ProcessObject::GetOutput(2));
}
-
template<class TInputImage>
typename PersistentStatisticsImageFilter<TInputImage>::RealObjectType*
PersistentStatisticsImageFilter<TInputImage>
@@ -145,7 +142,6 @@ PersistentStatisticsImageFilter<TInputImage>
return static_cast<const RealObjectType*>(this->itk::ProcessObject::GetOutput(3));
}
-
template<class TInputImage>
typename PersistentStatisticsImageFilter<TInputImage>::RealObjectType*
PersistentStatisticsImageFilter<TInputImage>
@@ -162,7 +158,6 @@ PersistentStatisticsImageFilter<TInputImage>
return static_cast<const RealObjectType*>(this->itk::ProcessObject::GetOutput(4));
}
-
template<class TInputImage>
typename PersistentStatisticsImageFilter<TInputImage>::RealObjectType*
PersistentStatisticsImageFilter<TInputImage>
@@ -179,7 +174,6 @@ PersistentStatisticsImageFilter<TInputImage>
return static_cast<const RealObjectType*>(this->itk::ProcessObject::GetOutput(5));
}
-
template<class TInputImage>
typename PersistentStatisticsImageFilter<TInputImage>::RealObjectType*
PersistentStatisticsImageFilter<TInputImage>
@@ -201,16 +195,16 @@ PersistentStatisticsImageFilter<TInputImage>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
- if ( this->GetInput() )
- {
+ if (this->GetInput())
+ {
this->GetOutput()->CopyInformation(this->GetInput());
this->GetOutput()->SetLargestPossibleRegion(this->GetInput()->GetLargestPossibleRegion());
- if (this->GetOutput()->GetRequestedRegion().GetNumberOfPixels()==0)
- {
+ if (this->GetOutput()->GetRequestedRegion().GetNumberOfPixels() == 0)
+ {
this->GetOutput()->SetRequestedRegion(this->GetOutput()->GetLargestPossibleRegion());
+ }
}
- }
}
template<class TInputImage>
void
@@ -229,8 +223,8 @@ void
PersistentStatisticsImageFilter<TInputImage>
::Synthetize()
{
- int i;
- long count;
+ int i;
+ long count;
RealType sumOfSquares;
int numberOfThreads = this->GetNumberOfThreads();
@@ -249,36 +243,36 @@ PersistentStatisticsImageFilter<TInputImage>
// sum of squares
minimum = itk::NumericTraits<PixelType>::max();
maximum = itk::NumericTraits<PixelType>::NonpositiveMin();
- for ( i = 0; i < numberOfThreads; ++i)
- {
+ for (i = 0; i < numberOfThreads; ++i)
+ {
count += m_Count[i];
sum += m_ThreadSum[i];
sumOfSquares += m_SumOfSquares[i];
if (m_ThreadMin[i] < minimum)
- {
+ {
minimum = m_ThreadMin[i];
- }
+ }
if (m_ThreadMax[i] > maximum)
- {
+ {
maximum = m_ThreadMax[i];
+ }
}
- }
// compute statistics
mean = sum / static_cast<RealType>(count);
// unbiased estimate
- variance = (sumOfSquares - (sum*sum / static_cast<RealType>(count)))
+ variance = (sumOfSquares - (sum * sum / static_cast<RealType>(count)))
/ (static_cast<RealType>(count) - 1);
sigma = vcl_sqrt(variance);
// Set the outputs
- this->GetMinimumOutput()->Set( minimum );
- this->GetMaximumOutput()->Set( maximum );
- this->GetMeanOutput()->Set( mean );
- this->GetSigmaOutput()->Set( sigma );
- this->GetVarianceOutput()->Set( variance );
- this->GetSumOutput()->Set( sum );
+ this->GetMinimumOutput()->Set(minimum);
+ this->GetMaximumOutput()->Set(maximum);
+ this->GetMeanOutput()->Set(mean);
+ this->GetSigmaOutput()->Set(sigma);
+ this->GetVarianceOutput()->Set(variance);
+ this->GetSumOutput()->Set(sum);
}
template<class TInputImage>
@@ -303,7 +297,6 @@ PersistentStatisticsImageFilter<TInputImage>
m_ThreadMax.Fill(itk::NumericTraits<PixelType>::NonpositiveMin());
}
-
template<class TInputImage>
void
PersistentStatisticsImageFilter<TInputImage>
@@ -313,52 +306,52 @@ PersistentStatisticsImageFilter<TInputImage>
/**
* Grab the input
*/
- InputImagePointer inputPtr = const_cast< TInputImage * >( this->GetInput(0) );
+ InputImagePointer inputPtr = const_cast<TInputImage *>(this->GetInput(0));
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
- RealType realValue;
+ RealType realValue;
PixelType value;
- itk::ImageRegionConstIterator<TInputImage> it (inputPtr, outputRegionForThread);
+ itk::ImageRegionConstIterator<TInputImage> it(inputPtr, outputRegionForThread);
it.GoToBegin();
// do the work
while (!it.IsAtEnd())
- {
+ {
value = it.Get();
- realValue = static_cast<RealType>( value );
+ realValue = static_cast<RealType>(value);
if (value < m_ThreadMin[threadId])
- {
+ {
m_ThreadMin[threadId] = value;
- }
+ }
if (value > m_ThreadMax[threadId])
- {
+ {
m_ThreadMax[threadId] = value;
- }
+ }
m_ThreadSum[threadId] += realValue;
m_SumOfSquares[threadId] += (realValue * realValue);
m_Count[threadId]++;
++it;
progress.CompletedPixel();
- }
+ }
}
template <class TImage>
void
PersistentStatisticsImageFilter<TImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "Minimum: "
- << static_cast<typename itk::NumericTraits<PixelType>::PrintType>(this->GetMinimum()) << std::endl;
+ << static_cast<typename itk::NumericTraits<PixelType>::PrintType>(this->GetMinimum()) << std::endl;
os << indent << "Maximum: "
- << static_cast<typename itk::NumericTraits<PixelType>::PrintType>(this->GetMaximum()) << std::endl;
+ << static_cast<typename itk::NumericTraits<PixelType>::PrintType>(this->GetMaximum()) << std::endl;
os << indent << "Sum: " << this->GetSum() << std::endl;
os << indent << "Mean: " << this->GetMean() << std::endl;
os << indent << "Sigma: " << this->GetSigma() << std::endl;
os << indent << "Variance: " << this->GetVariance() << std::endl;
}
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h
index 2d3d52eb55..db5e25eeaf 100644
--- a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h
+++ b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h
@@ -21,7 +21,6 @@
#ifndef __otbStreamingStatisticsVectorImageFilter_h
#define __otbStreamingStatisticsVectorImageFilter_h
-
#include "otbPersistentImageFilter.h"
#include "otbPersistentFilterStreamingDecorator.h"
#include "itkNumericTraits.h"
@@ -31,7 +30,6 @@
#include "itkVariableSizeMatrix.h"
#include "itkVariableLengthVector.h"
-
namespace otb
{
@@ -53,34 +51,34 @@ namespace otb
*/
template<class TInputImage>
class ITK_EXPORT PersistentStatisticsVectorImageFilter :
- public PersistentImageFilter<TInputImage, TInputImage>
+ public PersistentImageFilter<TInputImage, TInputImage>
{
public:
/** Standard Self typedef */
- typedef PersistentStatisticsVectorImageFilter Self;
- typedef PersistentImageFilter<TInputImage,TInputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PersistentStatisticsVectorImageFilter Self;
+ typedef PersistentImageFilter<TInputImage, TInputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Runtime information support. */
- itkTypeMacro(PersistentStatisticsVectorImageFilter,PersistentImageFilter);
+ itkTypeMacro(PersistentStatisticsVectorImageFilter, PersistentImageFilter);
/** Image related typedefs. */
- typedef TInputImage ImageType;
- typedef typename TInputImage::Pointer InputImagePointer;
- typedef typename TInputImage::RegionType RegionType;
- typedef typename TInputImage::SizeType SizeType;
- typedef typename TInputImage::IndexType IndexType;
- typedef typename TInputImage::PixelType PixelType;
- typedef typename TInputImage::InternalPixelType InternalPixelType;
+ typedef TInputImage ImageType;
+ typedef typename TInputImage::Pointer InputImagePointer;
+ typedef typename TInputImage::RegionType RegionType;
+ typedef typename TInputImage::SizeType SizeType;
+ typedef typename TInputImage::IndexType IndexType;
+ typedef typename TInputImage::PixelType PixelType;
+ typedef typename TInputImage::InternalPixelType InternalPixelType;
itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/** Image related typedefs. */
- itkStaticConstMacro(ImageDimension, unsigned int, TInputImage::ImageDimension );
+ itkStaticConstMacro(ImageDimension, unsigned int, TInputImage::ImageDimension);
/** Type to use for computations. */
typedef typename itk::NumericTraits<InternalPixelType>::RealType RealType;
@@ -99,12 +97,11 @@ public:
typedef itk::SimpleDataObjectDecorator<PixelType> PixelObjectType;
typedef itk::SimpleDataObjectDecorator<MatrixType> MatrixObjectType;
-
/** Return the computed Minimum. */
PixelType GetMinimum() const
{
return this->GetMinimumOutput()->Get();
- };
+ }
PixelObjectType* GetMinimumOutput();
const PixelObjectType* GetMinimumOutput() const;
@@ -112,7 +109,7 @@ public:
PixelType GetMaximum() const
{
return this->GetMaximumOutput()->Get();
- };
+ }
PixelObjectType* GetMaximumOutput();
const PixelObjectType* GetMaximumOutput() const;
@@ -120,7 +117,7 @@ public:
RealPixelType GetMean() const
{
return this->GetMeanOutput()->Get();
- };
+ }
RealPixelObjectType* GetMeanOutput();
const RealPixelObjectType* GetMeanOutput() const;
@@ -128,7 +125,7 @@ public:
RealPixelType GetSum() const
{
return this->GetSumOutput()->Get();
- };
+ }
RealPixelObjectType* GetSumOutput();
const RealPixelObjectType* GetSumOutput() const;
@@ -136,11 +133,10 @@ public:
MatrixType GetCovariance() const
{
return this->GetCovarianceOutput()->Get();
- };
+ }
MatrixObjectType* GetCovarianceOutput();
const MatrixObjectType* GetCovarianceOutput() const;
-
/** Make a DataObject of the correct type to be used as the specified
* output.
*/
@@ -156,14 +152,14 @@ public:
protected:
PersistentStatisticsVectorImageFilter();
- virtual ~PersistentStatisticsVectorImageFilter() {};
+ virtual ~PersistentStatisticsVectorImageFilter() {}
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Multi-thread version GenerateData. */
- void ThreadedGenerateData (const RegionType& outputRegionForThread,int threadId);
+ void ThreadedGenerateData(const RegionType& outputRegionForThread, int threadId);
private:
- PersistentStatisticsVectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PersistentStatisticsVectorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
ArrayRealPixelType m_ThreadSum;
ArrayLongPixelType m_Count;
@@ -195,39 +191,37 @@ private:
template<class TInputImage>
class ITK_EXPORT StreamingStatisticsVectorImageFilter :
- public PersistentFilterStreamingDecorator< PersistentStatisticsVectorImageFilter<TInputImage> >
+ public PersistentFilterStreamingDecorator<PersistentStatisticsVectorImageFilter<TInputImage> >
{
public:
/** Standard Self typedef */
- typedef StreamingStatisticsVectorImageFilter Self;
+ typedef StreamingStatisticsVectorImageFilter Self;
typedef PersistentFilterStreamingDecorator
- < PersistentStatisticsVectorImageFilter<TInputImage> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ <PersistentStatisticsVectorImageFilter<TInputImage> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(StreamingStatisticsVectorImageFilter,PersistentFilterStreamingDecorator);
-
- typedef TInputImage InputImageType;
- typedef typename Superclass::FilterType StatFilterType;
- typedef typename StatFilterType::PixelType PixelType;
- typedef typename StatFilterType::RealType RealType;
- typedef typename StatFilterType::RealPixelType RealPixelType;
- typedef typename StatFilterType::MatrixType MatrixType;
- typedef typename StatFilterType::ArrayMatrixType ArrayMatrixType;
+ itkTypeMacro(StreamingStatisticsVectorImageFilter, PersistentFilterStreamingDecorator);
+
+ typedef TInputImage InputImageType;
+ typedef typename Superclass::FilterType StatFilterType;
+ typedef typename StatFilterType::PixelType PixelType;
+ typedef typename StatFilterType::RealType RealType;
+ typedef typename StatFilterType::RealPixelType RealPixelType;
+ typedef typename StatFilterType::MatrixType MatrixType;
+ typedef typename StatFilterType::ArrayMatrixType ArrayMatrixType;
typedef typename StatFilterType::ArrayLongPixelType ArrayLongPixelType;
typedef typename StatFilterType::ArrayRealPixelType ArrayRealPixelType;
- typedef typename StatFilterType::ArrayPixelType ArrayPixelType;
-
+ typedef typename StatFilterType::ArrayPixelType ArrayPixelType;
/** Type of DataObjects used for scalar outputs */
typedef typename StatFilterType::RealPixelObjectType RealPixelObjectType;
- typedef typename StatFilterType::PixelObjectType PixelObjectType;
- typedef typename StatFilterType::MatrixObjectType MatrixObjectType;
+ typedef typename StatFilterType::PixelObjectType PixelObjectType;
+ typedef typename StatFilterType::MatrixObjectType MatrixObjectType;
void SetInput(TInputImage * input)
{
@@ -238,87 +232,85 @@ public:
return this->GetFilter()->GetInput();
}
-
/** Return the computed Minimum. */
PixelType GetMinimum() const
{
return this->GetFilter()->GetMinimumOutput()->Get();
- };
+ }
PixelObjectType* GetMinimumOutput()
{
return this->GetFilter()->MinimumOutput();
- };
+ }
const PixelObjectType* GetMinimumOutput() const
{
return this->GetFilter()->MinimumOutput();
- };
+ }
/** Return the computed Maximum. */
PixelType GetMaximum() const
{
return this->GetFilter()->GetMaximumOutput()->Get();
- };
+ }
PixelObjectType* GetMaximumOutput()
{
return this->GetFilter()->MaximumOutput();
- };
+ }
const PixelObjectType* GetMaximumOutput() const
{
return this->GetFilter()->MaximumOutput();
- };
-
+ }
/** Return the computed Mean. */
RealPixelType GetMean() const
{
return this->GetFilter()->GetMeanOutput()->Get();
- };
+ }
RealPixelObjectType* GetMeanOutput()
{
return this->GetFilter()->GetMeanOutput();
- };
+ }
const RealPixelObjectType* GetMeanOutput() const
{
return this->GetFilter()->GetMeanOutput();
- };
+ }
/** Return the compute Sum. */
RealPixelType GetSum() const
{
return this->GetFilter()->GetSumOutput()->Get();
- };
+ }
RealPixelObjectType* GetSumOutput()
{
return this->GetFilter()->GetSumOutput();
- };
+ }
const RealPixelObjectType* GetSumOutput() const
{
return this->GetFilter()->GetSumOutput();
- };
+ }
/** Return the computed Covariance. */
MatrixType GetCovariance() const
{
return this->GetFilter()->GetCovarianceOutput()->Get();
- };
+ }
MatrixObjectType* GetCovarianceOutput()
{
return this->GetFilter()->GetCovarianceOutput();
- };
+ }
const MatrixObjectType* GetCovarianceOutput() const
{
return this->GetFilter()->GetCovarianceOutput();
- };
+ }
protected:
/** Constructor */
StreamingStatisticsVectorImageFilter() {};
/** Destructor */
- virtual ~StreamingStatisticsVectorImageFilter() {};
+ virtual ~StreamingStatisticsVectorImageFilter() {}
private:
- StreamingStatisticsVectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ StreamingStatisticsVectorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
diff --git a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx
index e32879fd6e..3886e0d648 100644
--- a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx
@@ -41,20 +41,20 @@ PersistentStatisticsVectorImageFilter<TInputImage>
// allocate the data objects for the outputs which are
// just decorators around pixel types
- for (int i=1; i < 3; ++i)
- {
+ for (int i = 1; i < 3; ++i)
+ {
typename PixelObjectType::Pointer output = static_cast<PixelObjectType*>(this->MakeOutput(i).GetPointer());
this->itk::ProcessObject::SetNthOutput(i, output.GetPointer());
- }
+ }
// allocate the data objects for the outputs which are
// just decorators around real types
- for (int i=3; i < 5; ++i)
- {
+ for (int i = 3; i < 5; ++i)
+ {
typename RealPixelObjectType::Pointer output = static_cast<RealPixelObjectType*>(this->MakeOutput(i).GetPointer());
this->itk::ProcessObject::SetNthOutput(i, output.GetPointer());
- }
+ }
// allocate the data objects for the outputs which are
// just decorators around matrix types
@@ -68,7 +68,7 @@ PersistentStatisticsVectorImageFilter<TInputImage>
::MakeOutput(unsigned int output)
{
switch (output)
- {
+ {
case 0:
return static_cast<itk::DataObject*>(TInputImage::New().GetPointer());
break;
@@ -87,11 +87,10 @@ PersistentStatisticsVectorImageFilter<TInputImage>
// might as well make an image
return static_cast<itk::DataObject*>(TInputImage::New().GetPointer());
break;
- }
+ }
}
-
template<class TInputImage>
typename PersistentStatisticsVectorImageFilter<TInputImage>::PixelObjectType*
PersistentStatisticsVectorImageFilter<TInputImage>
@@ -108,7 +107,6 @@ PersistentStatisticsVectorImageFilter<TInputImage>
return static_cast<const PixelObjectType*>(this->itk::ProcessObject::GetOutput(1));
}
-
template<class TInputImage>
typename PersistentStatisticsVectorImageFilter<TInputImage>::PixelObjectType*
PersistentStatisticsVectorImageFilter<TInputImage>
@@ -125,7 +123,6 @@ PersistentStatisticsVectorImageFilter<TInputImage>
return static_cast<const PixelObjectType*>(this->itk::ProcessObject::GetOutput(2));
}
-
template<class TInputImage>
typename PersistentStatisticsVectorImageFilter<TInputImage>::RealPixelObjectType*
PersistentStatisticsVectorImageFilter<TInputImage>
@@ -174,23 +171,22 @@ PersistentStatisticsVectorImageFilter<TInputImage>
return static_cast<const MatrixObjectType*>(this->itk::ProcessObject::GetOutput(5));
}
-
template<class TInputImage>
void
PersistentStatisticsVectorImageFilter<TInputImage>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
- if ( this->GetInput() )
- {
+ if (this->GetInput())
+ {
this->GetOutput()->CopyInformation(this->GetInput());
this->GetOutput()->SetLargestPossibleRegion(this->GetInput()->GetLargestPossibleRegion());
- if (this->GetOutput()->GetRequestedRegion().GetNumberOfPixels()==0)
- {
+ if (this->GetOutput()->GetRequestedRegion().GetNumberOfPixels() == 0)
+ {
this->GetOutput()->SetRequestedRegion(this->GetOutput()->GetLargestPossibleRegion());
+ }
}
- }
}
template<class TInputImage>
@@ -210,7 +206,7 @@ void
PersistentStatisticsVectorImageFilter<TInputImage>
::Reset()
{
- TInputImage * inputPtr = const_cast<TInputImage * >(this->GetInput());
+ TInputImage * inputPtr = const_cast<TInputImage *>(this->GetInput());
inputPtr->UpdateOutputInformation();
unsigned int numberOfThreads = this->GetNumberOfThreads();
@@ -220,18 +216,18 @@ PersistentStatisticsVectorImageFilter<TInputImage>
PixelType tempPixel;
tempPixel.SetSize(numberOfComponent);
tempPixel.Fill(itk::NumericTraits<InternalPixelType>::Zero);
- this->GetMaximumOutput()->Set( tempPixel );
+ this->GetMaximumOutput()->Set(tempPixel);
tempPixel.Fill(itk::NumericTraits<InternalPixelType>::max());
- this->GetMinimumOutput()->Set( tempPixel );
+ this->GetMinimumOutput()->Set(tempPixel);
RealPixelType tempRealPixel;
tempRealPixel.SetSize(numberOfComponent);
tempRealPixel.Fill(itk::NumericTraits<RealType>::max());
- this->GetMeanOutput()->Set( tempRealPixel );
+ this->GetMeanOutput()->Set(tempRealPixel);
tempRealPixel.Fill(itk::NumericTraits<RealType>::Zero);
- this->GetMeanOutput()->Set( tempRealPixel );
+ this->GetMeanOutput()->Set(tempRealPixel);
MatrixType tempMatrix;
tempMatrix.SetSize(numberOfComponent, numberOfComponent);
@@ -239,7 +235,7 @@ PersistentStatisticsVectorImageFilter<TInputImage>
// Initialize the tempories
m_Count.SetSize(numberOfThreads);
- m_Count.Fill( itk::NumericTraits<long>::Zero );
+ m_Count.Fill(itk::NumericTraits<long>::Zero);
PixelType tempTemporiesPixel;
tempTemporiesPixel.SetSize(numberOfComponent);
@@ -262,120 +258,120 @@ void
PersistentStatisticsVectorImageFilter<TInputImage>
::Synthetize()
{
- int i;
+ int i;
long count;
- int numberOfThreads = this->GetNumberOfThreads();
+ int numberOfThreads = this->GetNumberOfThreads();
unsigned int numberOfComponent = this->GetInput()->GetNumberOfComponentsPerPixel();
PixelType minimumVector;
- minimumVector.SetSize( numberOfComponent );
+ minimumVector.SetSize(numberOfComponent);
minimumVector.Fill(itk::NumericTraits<InternalPixelType>::max());
PixelType maximumVector;
- maximumVector.SetSize( numberOfComponent );
+ maximumVector.SetSize(numberOfComponent);
maximumVector.Fill(itk::NumericTraits<InternalPixelType>::NonpositiveMin());
RealPixelType sumVector;
- sumVector.SetSize( numberOfComponent );
+ sumVector.SetSize(numberOfComponent);
sumVector.Fill(itk::NumericTraits<RealType>::Zero);
RealPixelType meanVector;
- meanVector.SetSize( numberOfComponent );
+ meanVector.SetSize(numberOfComponent);
MatrixType crossedMatrix;
- crossedMatrix.SetSize(numberOfComponent,numberOfComponent);
+ crossedMatrix.SetSize(numberOfComponent, numberOfComponent);
crossedMatrix.Fill(itk::NumericTraits<RealType>::Zero);
count = 0;
// Find the min/max over all threads and accumulate count, sum and
// sum of squares
- for ( i = 0; i < numberOfThreads; ++i)
- {
+ for (i = 0; i < numberOfThreads; ++i)
+ {
count += m_Count[i];
/** TODO
* To modify using + method operator. If we use it now -> exceptionmacro (no GetClassName...)
* crossedMatrix += m_XX[i];
**/
- if ( (m_XX[i].Rows() != crossedMatrix.Rows()) || (m_XX[i].Cols() != crossedMatrix.Cols()))
- {
- itkExceptionMacro( << "Matrix with size (" << m_XX[i].Rows() << "," <<
- m_XX[i].Cols() << ") cannot be subtracted from matrix with size (" <<
- crossedMatrix.Rows() << "," << crossedMatrix.Cols() );
- }
+ if ((m_XX[i].Rows() != crossedMatrix.Rows()) || (m_XX[i].Cols() != crossedMatrix.Cols()))
+ {
+ itkExceptionMacro(<< "Matrix with size (" << m_XX[i].Rows() << "," <<
+ m_XX[i].Cols() << ") cannot be subtracted from matrix with size (" <<
+ crossedMatrix.Rows() << "," << crossedMatrix.Cols());
+ }
- for ( unsigned int r=0; r<m_XX[i].Rows(); ++r)
- {
- for ( unsigned int c=0; c<m_XX[i].Cols(); ++c )
+ for (unsigned int r = 0; r < m_XX[i].Rows(); ++r)
{
- crossedMatrix(r,c) += m_XX[i](r,c);
+ for (unsigned int c = 0; c < m_XX[i].Cols(); ++c)
+ {
+ crossedMatrix(r, c) += m_XX[i](r, c);
+ }
}
- }
//**** END TODO ****
- for (unsigned int j=0; j<numberOfComponent; ++j)
- {
+ for (unsigned int j = 0; j < numberOfComponent; ++j)
+ {
sumVector[j] += m_ThreadSum[i][j];
if (m_ThreadMin[i][j] < minimumVector[j])
- {
+ {
minimumVector[j] = m_ThreadMin[i][j];
- }
+ }
if (m_ThreadMax[i][j] > maximumVector[j])
- {
+ {
maximumVector[j] = m_ThreadMax[i][j];
+ }
}
- }
- } // end for( i = 0; i < numberOfThreads; ++i)
+ } // end for( i = 0; i < numberOfThreads; ++i)
- for (unsigned int j=0; j<numberOfComponent; ++j)
- {
+ for (unsigned int j = 0; j < numberOfComponent; ++j)
+ {
// compute statistics
meanVector[j] = sumVector[j] / static_cast<RealType>(count);
- }
+ }
// Compute Matrix Covariance
MatrixType pixelSumMatrix;
pixelSumMatrix.SetSize(static_cast<unsigned int>(numberOfComponent), 1);
pixelSumMatrix.Fill(itk::NumericTraits<RealType>::Zero);
- for ( unsigned int j = 0; j < numberOfComponent; ++j)
- {
+ for (unsigned int j = 0; j < numberOfComponent; ++j)
+ {
pixelSumMatrix(j, 0) = sumVector[j];
- }
+ }
MatrixType covMatrix, covMatrixTemp, tempTranspose;
covMatrix.SetSize(static_cast<unsigned int>(numberOfComponent), static_cast<unsigned int>(numberOfComponent));
covMatrixTemp.SetSize(static_cast<unsigned int>(numberOfComponent), static_cast<unsigned int>(numberOfComponent));
tempTranspose.SetSize(1, static_cast<unsigned int>(numberOfComponent));
- covMatrix = crossedMatrix/static_cast<RealType>(count);
- pixelSumMatrix/=static_cast<RealType>(count);
+ covMatrix = crossedMatrix / static_cast<RealType>(count);
+ pixelSumMatrix /= static_cast<RealType>(count);
tempTranspose = pixelSumMatrix.GetTranspose();
- covMatrixTemp = pixelSumMatrix*tempTranspose;
+ covMatrixTemp = pixelSumMatrix * tempTranspose;
/** TODO
* To modify using - method operator. If we use it now -> exceptionmacro (no GetClassName...)
*covMatrix -= covMatrixTemp;
**/
- if ( (covMatrix.Rows() != covMatrixTemp.Rows()) || (covMatrix.Cols() != covMatrixTemp.Cols()))
- {
- itkExceptionMacro( << "Matrix with size (" << covMatrix.Rows() << "," <<
- covMatrix.Cols() << ") cannot be subtracted from matrix with size (" <<
- covMatrixTemp.Rows() << "," << covMatrixTemp.Cols() );
- }
-
- for ( unsigned int r=0; r<covMatrix.Rows(); ++r)
- {
- for ( unsigned int c=0; c<covMatrix.Cols(); ++c )
+ if ((covMatrix.Rows() != covMatrixTemp.Rows()) || (covMatrix.Cols() != covMatrixTemp.Cols()))
{
- covMatrix(r,c) -= covMatrixTemp(r,c);
+ itkExceptionMacro(<< "Matrix with size (" << covMatrix.Rows() << "," <<
+ covMatrix.Cols() << ") cannot be subtracted from matrix with size (" <<
+ covMatrixTemp.Rows() << "," << covMatrixTemp.Cols());
+ }
+
+ for (unsigned int r = 0; r < covMatrix.Rows(); ++r)
+ {
+ for (unsigned int c = 0; c < covMatrix.Cols(); ++c)
+ {
+ covMatrix(r, c) -= covMatrixTemp(r, c);
+ }
}
- }
//**** END TODO ****/
// Set the outputs
- this->GetMinimumOutput()->Set( minimumVector );
- this->GetMaximumOutput()->Set( maximumVector );
- this->GetMeanOutput()->Set( meanVector );
- this->GetSumOutput()->Set( sumVector);
- this->GetCovarianceOutput()->Set( covMatrix );
+ this->GetMinimumOutput()->Set(minimumVector);
+ this->GetMaximumOutput()->Set(maximumVector);
+ this->GetMeanOutput()->Set(meanVector);
+ this->GetSumOutput()->Set(sumVector);
+ this->GetCovarianceOutput()->Set(covMatrix);
}
template<class TInputImage>
@@ -386,45 +382,44 @@ PersistentStatisticsVectorImageFilter<TInputImage>
/**
* Grab the input
*/
- InputImagePointer inputPtr = const_cast< TInputImage * >( this->GetInput() );
+ InputImagePointer inputPtr = const_cast<TInputImage *>(this->GetInput());
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
MatrixType pixelVector, pixelTransposeVector, pixelSumVector, tempMatrix;
pixelVector.SetSize(this->GetInput()->GetNumberOfComponentsPerPixel(), 1);
pixelVector.Fill(itk::NumericTraits<RealType>::Zero);
pixelTransposeVector.SetSize(1, this->GetInput()->GetNumberOfComponentsPerPixel());
pixelTransposeVector.Fill(itk::NumericTraits<RealType>::Zero);
- pixelSumVector.SetSize(this->GetInput()->GetNumberOfComponentsPerPixel(), this->GetInput()->GetNumberOfComponentsPerPixel());
+ pixelSumVector.SetSize(this->GetInput()->GetNumberOfComponentsPerPixel(),
+ this->GetInput()->GetNumberOfComponentsPerPixel());
pixelSumVector.Fill(itk::NumericTraits<RealType>::Zero);
tempMatrix.SetSize(this->GetInput()->GetNumberOfComponentsPerPixel(), this->GetInput()->GetNumberOfComponentsPerPixel());
-
- itk::ImageRegionConstIteratorWithIndex<TInputImage> it (inputPtr, outputRegionForThread);
+ itk::ImageRegionConstIteratorWithIndex<TInputImage> it(inputPtr, outputRegionForThread);
it.GoToBegin();
// do the work
while (!it.IsAtEnd())
- {
+ {
IndexType index = it.GetIndex();
PixelType vectorValue = it.Get();
- for (unsigned int j=0; j<vectorValue.GetSize(); ++j)
- {
+ for (unsigned int j = 0; j < vectorValue.GetSize(); ++j)
+ {
InternalPixelType value = vectorValue[j];
- RealType realValue = static_cast<RealType>( value );
+ RealType realValue = static_cast<RealType>(value);
if (value < m_ThreadMin[threadId][j])
- {
+ {
m_ThreadMin[threadId][j] = value;
- }
+ }
if (value > m_ThreadMax[threadId][j])
- {
+ {
m_ThreadMax[threadId][j] = value;
- }
+ }
m_ThreadSum[threadId][j] += realValue;
pixelVector(j, 0) = realValue;
- }
+ }
++it;
progress.CompletedPixel();
@@ -433,24 +428,24 @@ PersistentStatisticsVectorImageFilter<TInputImage>
* To modify using + method operator. If we use it now -> exceptionmacro (no GetClassName...)
* m_XX[threadId]+=pixelVector*pixelTransposeVector;
**/
- tempMatrix = pixelVector*pixelTransposeVector;
- if ( (m_XX[threadId].Rows() != tempMatrix.Rows()) || (m_XX[threadId].Cols() != tempMatrix.Cols()))
- {
- itkExceptionMacro( << "Matrix with size (" << m_XX[threadId].Rows() << "," <<
- m_XX[threadId].Cols() << ") cannot be subtracted from matrix with size (" <<
- tempMatrix.Rows() << "," << tempMatrix.Cols() );
- }
+ tempMatrix = pixelVector * pixelTransposeVector;
+ if ((m_XX[threadId].Rows() != tempMatrix.Rows()) || (m_XX[threadId].Cols() != tempMatrix.Cols()))
+ {
+ itkExceptionMacro(<< "Matrix with size (" << m_XX[threadId].Rows() << "," <<
+ m_XX[threadId].Cols() << ") cannot be subtracted from matrix with size (" <<
+ tempMatrix.Rows() << "," << tempMatrix.Cols());
+ }
- for ( unsigned int r=0; r<m_XX[threadId].Rows(); ++r)
- {
- for ( unsigned int c=0; c<m_XX[threadId].Cols(); ++c )
+ for (unsigned int r = 0; r < m_XX[threadId].Rows(); ++r)
{
- m_XX[threadId](r,c) += tempMatrix(r,c);
+ for (unsigned int c = 0; c < m_XX[threadId].Cols(); ++c)
+ {
+ m_XX[threadId](r, c) += tempMatrix(r, c);
+ }
}
- }
//**** END TODO ****
m_Count[threadId]++;
- }
+ }
}
template <class TImage>
@@ -458,16 +453,15 @@ void
PersistentStatisticsVectorImageFilter<TImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
- os << indent << "Minimum: " <<this->GetMinimumOutput()->Get()<< std::endl;
- os << indent << "Maximum: "<< this->GetMaximumOutput()->Get() << std::endl;
+ os << indent << "Minimum: " << this->GetMinimumOutput()->Get() << std::endl;
+ os << indent << "Maximum: " << this->GetMaximumOutput()->Get() << std::endl;
os << indent << "Sum: " << this->GetSumOutput()->Get() << std::endl;
os << indent << "Mean: " << this->GetMeanOutput()->Get() << std::endl;
os << indent << "Covariance: " << this->GetCovarianceOutput()->Get() << std::endl;
}
-
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/BasicFilters/otbTransformPointSetFilter.h b/Code/BasicFilters/otbTransformPointSetFilter.h
index 87f6d0228b..df883b5220 100644
--- a/Code/BasicFilters/otbTransformPointSetFilter.h
+++ b/Code/BasicFilters/otbTransformPointSetFilter.h
@@ -25,67 +25,67 @@ namespace otb
{
/** \class TransformPointSetFilter
- * \brief
+ * \brief
*
* TransformPointSetFilter applies a transform to all the points
* of a PointSet.
*
* The additional content of the PointSet is passed untouched.
- *
+ *
* PointSets that have added information like normal vector on the points, will
* have to take care of transforming this data by other means.
- *
+ *
* \ingroup PointSetFilters
*/
template <class TInputPointSet, class TOutputPointSet, class TTransform>
class ITK_EXPORT TransformPointSetFilter :
- public PointSetToPointSetFilter<TInputPointSet,TOutputPointSet>
+ public PointSetToPointSetFilter<TInputPointSet, TOutputPointSet>
{
public:
/** Standard class typedefs. */
- typedef TransformPointSetFilter Self;
- typedef PointSetToPointSetFilter<TInputPointSet,TOutputPointSet> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef TransformPointSetFilter Self;
+ typedef PointSetToPointSetFilter<TInputPointSet, TOutputPointSet> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
typedef TInputPointSet InputPointSetType;
typedef TOutputPointSet OutputPointSetType;
typedef typename InputPointSetType::Pointer InputPointSetPointer;
typedef typename OutputPointSetType::Pointer OutputPointSetPointer;
-
+
/** Type for representing coordinates. */
- typedef typename TInputPointSet::CoordRepType CoordRepType;
+ typedef typename TInputPointSet::CoordRepType CoordRepType;
/** Type of the transform. */
- typedef TTransform TransformType;
+ typedef TTransform TransformType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
-
+
/** Run-time type information (and related methods). */
- itkTypeMacro(TransformPointSetFilter,PointSetToPointSetFilter);
+ itkTypeMacro(TransformPointSetFilter, PointSetToPointSetFilter);
/** Set transform. */
- itkSetObjectMacro(Transform, TransformType);
+ itkSetObjectMacro(Transform, TransformType);
/** Get transform. */
- itkGetObjectMacro(Transform,TransformType);
+ itkGetObjectMacro(Transform, TransformType);
protected:
TransformPointSetFilter();
- ~TransformPointSetFilter() {};
+ ~TransformPointSetFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
+
/** Generate Requested Data */
- virtual void GenerateData( void );
+ virtual void GenerateData(void);
/** Transform to apply to all the PointSet points. */
- typename TransformType::Pointer m_Transform;
+ typename TransformType::Pointer m_Transform;
private:
- TransformPointSetFilter(const TransformPointSetFilter&); //purposely not implemented
- void operator=(const TransformPointSetFilter&); //purposely not implemented
-
+ TransformPointSetFilter(const TransformPointSetFilter &); //purposely not implemented
+ void operator =(const TransformPointSetFilter&); //purposely not implemented
+
};
} // end namespace otb
diff --git a/Code/BasicFilters/otbTransformPointSetFilter.txx b/Code/BasicFilters/otbTransformPointSetFilter.txx
index db1c3eb4be..323afe56c5 100644
--- a/Code/BasicFilters/otbTransformPointSetFilter.txx
+++ b/Code/BasicFilters/otbTransformPointSetFilter.txx
@@ -23,87 +23,84 @@
namespace otb
{
-
+
/**
*
*/
template <class TInputPointSet, class TOutputPointSet, class TTransform>
-TransformPointSetFilter<TInputPointSet,TOutputPointSet,TTransform>
+TransformPointSetFilter<TInputPointSet, TOutputPointSet, TTransform>
::TransformPointSetFilter()
{
m_Transform = TransformType::New();
}
-
/**
*
*/
template <class TInputPointSet, class TOutputPointSet, class TTransform>
-void
-TransformPointSetFilter<TInputPointSet,TOutputPointSet,TTransform>
+void
+TransformPointSetFilter<TInputPointSet, TOutputPointSet, TTransform>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
if (m_Transform)
{
os << indent << "Transform: " << m_Transform << std::endl;
}
}
-
/**
* This method causes the filter to generate its output.
*/
template <class TInputPointSet, class TOutputPointSet, class TTransform>
-void
-TransformPointSetFilter<TInputPointSet,TOutputPointSet,TTransform>
-::GenerateData(void)
+void
+TransformPointSetFilter<TInputPointSet, TOutputPointSet, TTransform>
+::GenerateData(void)
{
-
+
typedef typename TInputPointSet::PointsContainer InputPointsContainer;
typedef typename TOutputPointSet::PointsContainer OutputPointsContainer;
typedef typename TInputPointSet::PointsContainerPointer InputPointsContainerPointer;
typedef typename TOutputPointSet::PointsContainerPointer OutputPointsContainerPointer;
- InputPointSetPointer inputPointSet = this->GetInput();
- OutputPointSetPointer outputPointSet = this->GetOutput();
-
- if( !inputPointSet )
+ InputPointSetPointer inputPointSet = this->GetInput();
+ OutputPointSetPointer outputPointSet = this->GetOutput();
+
+ if (!inputPointSet)
{
- itkExceptionMacro(<<"Missing Input PointSet");
+ itkExceptionMacro(<< "Missing Input PointSet");
}
- if( !outputPointSet )
+ if (!outputPointSet)
{
- itkExceptionMacro(<<"Missing Output PointSet");
+ itkExceptionMacro(<< "Missing Output PointSet");
}
- outputPointSet->SetBufferedRegion( outputPointSet->GetRequestedRegion() );
+ outputPointSet->SetBufferedRegion(outputPointSet->GetRequestedRegion());
InputPointsContainerPointer inPoints = inputPointSet->GetPoints();
OutputPointsContainerPointer outPoints = outputPointSet->GetPoints();
- outPoints->Reserve( inputPointSet->GetNumberOfPoints() );
+ outPoints->Reserve(inputPointSet->GetNumberOfPoints());
outPoints->Squeeze(); // in case the previous PointSet had
// allocated a larger memory
- typename InputPointsContainer::ConstIterator inputPoint = inPoints->Begin();
- typename OutputPointsContainer::Iterator outputPoint = outPoints->Begin();
+ typename InputPointsContainer::ConstIterator inputPoint = inPoints->Begin();
+ typename OutputPointsContainer::Iterator outputPoint = outPoints->Begin();
- while( inputPoint != inPoints->End() )
+ while (inputPoint != inPoints->End())
{
- outputPoint.Value() =
- m_Transform->TransformPoint( inputPoint.Value() );
+ outputPoint.Value() =
+ m_Transform->TransformPoint(inputPoint.Value());
++inputPoint;
++outputPoint;
}
-
// Create duplicate references to the rest of data on the PointSet
- outputPointSet->SetPointData( inputPointSet->GetPointData() );
+ outputPointSet->SetPointData(inputPointSet->GetPointData());
//TODO validate that we are copying everything
}
diff --git a/Code/BasicFilters/otbUnaryFunctorImageFilter.h b/Code/BasicFilters/otbUnaryFunctorImageFilter.h
index c212e467a6..2269a77005 100644
--- a/Code/BasicFilters/otbUnaryFunctorImageFilter.h
+++ b/Code/BasicFilters/otbUnaryFunctorImageFilter.h
@@ -35,13 +35,13 @@ namespace otb
*
* \sa itk::UnaryFunctorImageFilter
*/
-template <class TInputImage, class TOutputImage, class TFunction >
-class ITK_EXPORT UnaryFunctorImageFilter : public itk::UnaryFunctorImageFilter<TInputImage,TOutputImage, TFunction>
+template <class TInputImage, class TOutputImage, class TFunction>
+class ITK_EXPORT UnaryFunctorImageFilter : public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction>
{
public:
/** Standard class typedefs. */
typedef UnaryFunctorImageFilter Self;
- typedef itk::UnaryFunctorImageFilter<TInputImage,TOutputImage, TFunction> Superclass;
+ typedef itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -53,7 +53,7 @@ public:
protected:
UnaryFunctorImageFilter() {};
- virtual ~UnaryFunctorImageFilter() {};
+ virtual ~UnaryFunctorImageFilter() {}
/** UnaryFunctorImageFilter can produce an image which has a different number of bands
* than its input image. As such, UnaryFunctorImageFilter
@@ -68,13 +68,12 @@ protected:
Superclass::GenerateOutputInformation();
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
outputPtr->SetNumberOfComponentsPerPixel( // propagate vector length info
- this->GetFunctor().GetOutputSize());
+ this->GetFunctor().GetOutputSize());
}
-
private:
- UnaryFunctorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ UnaryFunctorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/BasicFilters/otbUnaryFunctorObjectListBooleanFilter.h b/Code/BasicFilters/otbUnaryFunctorObjectListBooleanFilter.h
index eae876fba0..a7a01fb21a 100644
--- a/Code/BasicFilters/otbUnaryFunctorObjectListBooleanFilter.h
+++ b/Code/BasicFilters/otbUnaryFunctorObjectListBooleanFilter.h
@@ -32,16 +32,16 @@ namespace otb
*
* \ingroup ObjectListFilter
*/
-template <class TInputList, class TOutputList, class TFunction >
+template <class TInputList, class TOutputList, class TFunction>
class ITK_EXPORT UnaryFunctorObjectListBooleanFilter :
- public otb::ObjectListToObjectListFilter<TInputList,TOutputList>
+ public otb::ObjectListToObjectListFilter<TInputList, TOutputList>
{
public:
/** Standard class typedefs. */
- typedef UnaryFunctorObjectListBooleanFilter Self;
- typedef otb::ObjectListToObjectListFilter<TInputList,TOutputList> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef UnaryFunctorObjectListBooleanFilter Self;
+ typedef otb::ObjectListToObjectListFilter<TInputList, TOutputList> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -50,15 +50,14 @@ public:
itkTypeMacro(UnaryFunctorObjectListBooleanFilter, ObjectListToObjectListFilter);
/** Some typedefs. */
- typedef TFunction FunctorType;
- typedef TInputList InputListType;
- typedef TOutputList OutputListType;
- typedef typename TInputList::ConstPointer InputListPointer;
- typedef typename TOutputList::Pointer OutputListPointer;
- typedef typename TInputList::ConstIterator InputListIterator;
+ typedef TFunction FunctorType;
+ typedef TInputList InputListType;
+ typedef TOutputList OutputListType;
+ typedef typename TInputList::ConstPointer InputListPointer;
+ typedef typename TOutputList::Pointer OutputListPointer;
+ typedef typename TInputList::ConstIterator InputListIterator;
typedef typename TOutputList::ConstIterator OutputListIterator;
-
/** Get the functor object. The functor is returned by reference.
* (Functors do not have to derive from itk::LightObject, so they do
* not necessarily have a reference count. So we cannot return a
@@ -66,11 +65,11 @@ public:
FunctorType& GetFunctor()
{
return m_Functor;
- };
+ }
const FunctorType& GetFunctor() const
{
return m_Functor;
- };
+ }
/** Set the functor object. This replaces the current Functor with a
* copy of the specified Functor. This allows the user to specify a
@@ -81,28 +80,24 @@ public:
void SetFunctor(const FunctorType& functor)
{
if (m_Functor != functor)
- {
+ {
m_Functor = functor;
this->Modified();
- }
+ }
}
-
protected:
UnaryFunctorObjectListBooleanFilter();
- virtual ~UnaryFunctorObjectListBooleanFilter() {};
-
+ virtual ~UnaryFunctorObjectListBooleanFilter() {}
/** Multi-threading implementation */
-
virtual void AfterThreadedGenerateData();
/** startIndex and stopIndex represent the indices of the Objects to
examine in thread threadId */
virtual void ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex, int threadId);
-
/** Internal structure used for passing image data into the threading library */
struct ThreadStruct
{
@@ -111,10 +106,9 @@ protected:
/** End Multi-threading implementation */
-
private:
- UnaryFunctorObjectListBooleanFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ UnaryFunctorObjectListBooleanFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
FunctorType m_Functor;
};
diff --git a/Code/BasicFilters/otbUnaryFunctorObjectListBooleanFilter.txx b/Code/BasicFilters/otbUnaryFunctorObjectListBooleanFilter.txx
index 234a880411..9420bfda43 100644
--- a/Code/BasicFilters/otbUnaryFunctorObjectListBooleanFilter.txx
+++ b/Code/BasicFilters/otbUnaryFunctorObjectListBooleanFilter.txx
@@ -27,71 +27,68 @@ namespace otb
/**
* Constructor
*/
-template <class TInputList, class TOutputList, class TFunction >
-UnaryFunctorObjectListBooleanFilter<TInputList,TOutputList,TFunction>
+template <class TInputList, class TOutputList, class TFunction>
+UnaryFunctorObjectListBooleanFilter<TInputList, TOutputList, TFunction>
::UnaryFunctorObjectListBooleanFilter()
{
}
-
-template <class TInputList, class TOutputList, class TFunction >
- void
- UnaryFunctorObjectListBooleanFilter<TInputList,TOutputList,TFunction>
- ::ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex,int threadId)
+template <class TInputList, class TOutputList, class TFunction>
+void
+UnaryFunctorObjectListBooleanFilter<TInputList, TOutputList, TFunction>
+::ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex, int threadId)
{
InputListPointer inputPtr = this->GetInput();
this->m_ObjectListPerThread[threadId] = OutputListType::New();
- itk::ProgressReporter progress(this, threadId, stopIndex-startIndex);
+ itk::ProgressReporter progress(this, threadId, stopIndex - startIndex);
// Define the iterators
InputListIterator it = inputPtr->Begin();
- unsigned int count = 0;
+ unsigned int count = 0;
while ((count < startIndex) && (it != inputPtr->End()))
- {
+ {
++it;
++count;
- }
+ }
while ((count < stopIndex) && (it != inputPtr->End()))
- {
- if (m_Functor(it.Get()))
{
+ if (m_Functor(it.Get()))
+ {
this->m_ObjectListPerThread[threadId]->PushBack(it.Get());
- }
+ }
progress.CompletedPixel();
++it;
++count;
- }
+ }
}
-
-template <class TInputList, class TOutputList, class TFunction >
- void
- UnaryFunctorObjectListBooleanFilter<TInputList,TOutputList,TFunction>
- ::AfterThreadedGenerateData()
+template <class TInputList, class TOutputList, class TFunction>
+void
+UnaryFunctorObjectListBooleanFilter<TInputList, TOutputList, TFunction>
+::AfterThreadedGenerateData()
{
// copy the lists to the output
OutputListPointer outputPtr = this->GetOutput();
- for (unsigned int i=0; i< this->m_ObjectListPerThread.size(); ++i)
- {
- if (this->m_ObjectListPerThread[i].IsNotNull())
+ for (unsigned int i = 0; i < this->m_ObjectListPerThread.size(); ++i)
{
+ if (this->m_ObjectListPerThread[i].IsNotNull())
+ {
for (OutputListIterator it = this->m_ObjectListPerThread[i]->Begin();
it != this->m_ObjectListPerThread[i]->End();
++it)
- {
+ {
outputPtr->PushBack(it.Get());
+ }
}
}
- }
}
-
} // end namespace otb
#endif
diff --git a/Code/BasicFilters/otbUnaryFunctorObjectListFilter.h b/Code/BasicFilters/otbUnaryFunctorObjectListFilter.h
index 4d731f6fa1..e2500412c3 100644
--- a/Code/BasicFilters/otbUnaryFunctorObjectListFilter.h
+++ b/Code/BasicFilters/otbUnaryFunctorObjectListFilter.h
@@ -32,14 +32,14 @@ namespace otb
*
* \ingroup ObjectListFilter
*/
-template <class TInputList, class TOutputList, class TFunction >
+template <class TInputList, class TOutputList, class TFunction>
class ITK_EXPORT UnaryFunctorObjectListFilter :
- public otb::ObjectListToObjectListFilter<TInputList,TOutputList>
+ public otb::ObjectListToObjectListFilter<TInputList, TOutputList>
{
public:
/** Standard class typedefs. */
typedef UnaryFunctorObjectListFilter Self;
- typedef otb::ObjectListToObjectListFilter<TInputList,TOutputList> Superclass;
+ typedef otb::ObjectListToObjectListFilter<TInputList, TOutputList> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -58,7 +58,6 @@ public:
typedef typename TInputList::ConstIterator InputListIterator;
typedef typename TOutputList::ConstIterator OutputListIterator;
-
/** Get the functor object. The functor is returned by reference.
* (Functors do not have to derive from itk::LightObject, so they do
* not necessarily have a reference count. So we cannot return a
@@ -82,32 +81,29 @@ public:
void SetFunctor(const FunctorType& functor)
{
if (m_Functor != functor)
- {
+ {
m_Functor = functor;
this->Modified();
- }
+ }
}
-
protected:
UnaryFunctorObjectListFilter();
- virtual ~UnaryFunctorObjectListFilter() {};
+ virtual ~UnaryFunctorObjectListFilter() {}
/** Multi-threading implementation */
-
virtual void AfterThreadedGenerateData();
/** startIndex and stopIndex represent the indices of the Objects to
examine in thread threadId */
virtual void ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex, int threadId);
-
/** End Multi-threading implementation */
private:
- UnaryFunctorObjectListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ UnaryFunctorObjectListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
FunctorType m_Functor;
diff --git a/Code/BasicFilters/otbUnaryFunctorObjectListFilter.txx b/Code/BasicFilters/otbUnaryFunctorObjectListFilter.txx
index 33db51588f..f0eace0dbf 100644
--- a/Code/BasicFilters/otbUnaryFunctorObjectListFilter.txx
+++ b/Code/BasicFilters/otbUnaryFunctorObjectListFilter.txx
@@ -28,68 +28,65 @@ namespace otb
/**
* Constructor
*/
-template <class TInputList, class TOutputList, class TFunction >
-UnaryFunctorObjectListFilter<TInputList,TOutputList,TFunction>
+template <class TInputList, class TOutputList, class TFunction>
+UnaryFunctorObjectListFilter<TInputList, TOutputList, TFunction>
::UnaryFunctorObjectListFilter()
{
}
-
-template <class TInputList, class TOutputList, class TFunction >
+template <class TInputList, class TOutputList, class TFunction>
void
-UnaryFunctorObjectListFilter<TInputList,TOutputList,TFunction>
-::ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex,int threadId)
+UnaryFunctorObjectListFilter<TInputList, TOutputList, TFunction>
+::ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex, int threadId)
{
InputListPointer inputPtr = this->GetInput();
this->m_ObjectListPerThread[threadId] = OutputListType::New();
- itk::ProgressReporter progress(this, threadId, stopIndex-startIndex);
+ itk::ProgressReporter progress(this, threadId, stopIndex - startIndex);
// Define the iterators
InputListIterator it = inputPtr->Begin();
- unsigned int count = 0;
+ unsigned int count = 0;
while ((count < startIndex) && (it != inputPtr->End()))
- {
+ {
++it;
++count;
- }
+ }
while ((count < stopIndex) && (it != inputPtr->End()))
- {
+ {
this->m_ObjectListPerThread[threadId]->PushBack(m_Functor(it.Get()));
progress.CompletedPixel();
++it;
++count;
- }
+ }
}
-
-template <class TInputList, class TOutputList, class TFunction >
+template <class TInputList, class TOutputList, class TFunction>
void
-UnaryFunctorObjectListFilter<TInputList,TOutputList,TFunction>
+UnaryFunctorObjectListFilter<TInputList, TOutputList, TFunction>
::AfterThreadedGenerateData()
{
// copy the lists to the output
OutputListPointer outputPtr = this->GetOutput();
- for (unsigned int i=0; i< this->m_ObjectListPerThread.size(); ++i)
- {
- if (this->m_ObjectListPerThread[i].IsNotNull())
+ for (unsigned int i = 0; i < this->m_ObjectListPerThread.size(); ++i)
{
+ if (this->m_ObjectListPerThread[i].IsNotNull())
+ {
for (OutputListIterator it = this->m_ObjectListPerThread[i]->Begin();
it != this->m_ObjectListPerThread[i]->End();
++it)
- {
+ {
outputPtr->PushBack(it.Get());
+ }
}
}
- }
}
-
} // end namespace otb
#endif
diff --git a/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.h b/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.h
index 008f30135d..2428b042a6 100644
--- a/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.h
+++ b/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.h
@@ -39,36 +39,35 @@ namespace otb
* \ingroup VectorImage
*/
template <class TInputImage, class TOutputImage, class TFunction>
-class ITK_EXPORT UnaryImageFunctorWithVectorImageFilter : public itk::InPlaceImageFilter<TInputImage,TOutputImage>
+class ITK_EXPORT UnaryImageFunctorWithVectorImageFilter : public itk::InPlaceImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
typedef UnaryImageFunctorWithVectorImageFilter Self;
- typedef itk::InPlaceImageFilter<TInputImage,TOutputImage> Superclass;
+ typedef itk::InPlaceImageFilter<TInputImage, TOutputImage> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
-
/** Extract input and output images dimensions.*/
- itkStaticConstMacro( InputImageDimension, unsigned int, TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
/** "typedef" to simplify the variables definition and the declaration. */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
- typedef TFunction FunctorType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
+ typedef TFunction FunctorType;
/** Supported images definition. */
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::InternalPixelType InputInternalPixelType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::InternalPixelType InputInternalPixelType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
/** Image size "typedef" definition. */
typedef typename InputImageType::SizeType SizeType;
@@ -86,7 +85,7 @@ public:
protected:
UnaryImageFunctorWithVectorImageFilter();
- virtual ~UnaryImageFunctorWithVectorImageFilter() {};
+ virtual ~UnaryImageFunctorWithVectorImageFilter() {}
/** UnaryImageFunctorWithVectorImageFilter can produce an image which is a different
* resolution than its input image. As such, UnaryImageFunctorWithVectorImageFilter
@@ -98,7 +97,6 @@ protected:
* \sa ProcessObject::GenerateOutputInformaton() */
virtual void GenerateOutputInformation();
-
/** UnaryImageFunctorWithVectorImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
* which is called for each processing thread. The output image data is
@@ -109,7 +107,7 @@ protected:
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- void ThreadedGenerateData(const OutputImageRegionType &outputRegionForThread, int threadId);
+ void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
void PrintSelf(std::ostream& os, itk::Indent indent) const;
diff --git a/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.txx b/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.txx
index 1ab8d1e7d8..73c19a04e7 100644
--- a/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.txx
+++ b/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.txx
@@ -31,10 +31,10 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage, class TFunction>
-UnaryImageFunctorWithVectorImageFilter<TInputImage,TOutputImage,TFunction>
+UnaryImageFunctorWithVectorImageFilter<TInputImage, TOutputImage, TFunction>
::UnaryImageFunctorWithVectorImageFilter()
{
- this->SetNumberOfRequiredInputs( 1 );
+ this->SetNumberOfRequiredInputs(1);
this->InPlaceOff();
}
@@ -49,29 +49,29 @@ UnaryImageFunctorWithVectorImageFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
void
-UnaryImageFunctorWithVectorImageFilter<TInputImage,TOutputImage,TFunction>
+UnaryImageFunctorWithVectorImageFilter<TInputImage, TOutputImage, TFunction>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
// get pointers to the input and output
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
- if ( !outputPtr || !inputPtr)
- {
+ if (!outputPtr || !inputPtr)
+ {
return;
- }
+ }
outputPtr->SetNumberOfComponentsPerPixel( // propagate vector length info
inputPtr->GetNumberOfComponentsPerPixel());
// TODO: Check this
// The Functor vector is not initialised !
- for (unsigned int i = 0;i<inputPtr->GetNumberOfComponentsPerPixel();++i)
- {
+ for (unsigned int i = 0; i < inputPtr->GetNumberOfComponentsPerPixel(); ++i)
+ {
FunctorType functor;
m_FunctorVector.push_back(functor);
- }
+ }
}
/**
@@ -79,11 +79,11 @@ UnaryImageFunctorWithVectorImageFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
void
-UnaryImageFunctorWithVectorImageFilter<TInputImage,TOutputImage,TFunction>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread, int threadId )
+UnaryImageFunctorWithVectorImageFilter<TInputImage, TOutputImage, TFunction>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
// Define the iterators
itk::ImageRegionConstIterator<InputImageType> inputIt(inputPtr, outputRegionForThread);
@@ -96,36 +96,36 @@ UnaryImageFunctorWithVectorImageFilter<TInputImage,TOutputImage,TFunction>
// Null pixel construction
InputPixelType nullPixel;
- nullPixel.SetSize( inputPtr->GetNumberOfComponentsPerPixel() );
+ nullPixel.SetSize(inputPtr->GetNumberOfComponentsPerPixel());
nullPixel.Fill(itk::NumericTraits<OutputInternalPixelType>::Zero);
- while ( !inputIt.IsAtEnd() )
- {
- InputPixelType inPixel = inputIt.Get();
+ while (!inputIt.IsAtEnd())
+ {
+ InputPixelType inPixel = inputIt.Get();
OutputPixelType outPixel;
- outPixel.SetSize( inputPtr->GetNumberOfComponentsPerPixel() );
+ outPixel.SetSize(inputPtr->GetNumberOfComponentsPerPixel());
outPixel.Fill(itk::NumericTraits<OutputInternalPixelType>::Zero);
// if the input pixel in null, the output is considered as null ( no sensor informations )
- if ( inPixel!= nullPixel)
- {
- for (unsigned int j=0; j<inputPtr->GetNumberOfComponentsPerPixel(); ++j)
+ if (inPixel != nullPixel)
{
- outPixel[j] = m_FunctorVector[j]( inPixel[j] );
+ for (unsigned int j = 0; j < inputPtr->GetNumberOfComponentsPerPixel(); ++j)
+ {
+ outPixel[j] = m_FunctorVector[j](inPixel[j]);
+ }
}
- }
outputIt.Set(outPixel);
++inputIt;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
}
template <class TInputImage, class TOutputImage, class TFunction>
void
-UnaryImageFunctorWithVectorImageFilter<TInputImage,TOutputImage,TFunction>
+UnaryImageFunctorWithVectorImageFilter<TInputImage, TOutputImage, TFunction>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/BasicFilters/otbVarianceImageFilter.h b/Code/BasicFilters/otbVarianceImageFilter.h
index c3735a8bba..8dc2db76cd 100644
--- a/Code/BasicFilters/otbVarianceImageFilter.h
+++ b/Code/BasicFilters/otbVarianceImageFilter.h
@@ -40,7 +40,7 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT VarianceImageFilter :
- public itk::ImageToImageFilter< TInputImage, TOutputImage >
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Extract dimension from input and output image. */
@@ -50,14 +50,14 @@ public:
TOutputImage::ImageDimension);
/** Convenient typedefs for simplifying declarations. */
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
/** Standard class typedefs. */
- typedef VarianceImageFilter Self;
- typedef itk::ImageToImageFilter< InputImageType, OutputImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef VarianceImageFilter Self;
+ typedef itk::ImageToImageFilter<InputImageType, OutputImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -66,11 +66,11 @@ public:
itkTypeMacro(VarianceImageFilter, ImageToImageFilter);
/** Image typedef support. */
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
typedef typename itk::NumericTraits<InputPixelType>::RealType InputRealType;
- typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
typedef typename OutputImageType::RegionType OutputImageRegionType;
typedef typename InputImageType::SizeType InputSizeType;
@@ -87,7 +87,8 @@ public:
* in order to inform the pipeline execution model.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
- virtual void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError);
+ virtual void GenerateInputRequestedRegion()
+ throw(itk::InvalidRequestedRegionError);
#ifdef ITK_USE_CONCEPT_CHECKING
/** Begin concept checking */
@@ -112,11 +113,11 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
private:
- VarianceImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VarianceImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
InputSizeType m_Radius;
};
diff --git a/Code/BasicFilters/otbVarianceImageFilter.txx b/Code/BasicFilters/otbVarianceImageFilter.txx
index 09274a48c0..7ed8a34b14 100644
--- a/Code/BasicFilters/otbVarianceImageFilter.txx
+++ b/Code/BasicFilters/otbVarianceImageFilter.txx
@@ -42,19 +42,19 @@ template <class TInputImage, class TOutputImage>
void
VarianceImageFilter<TInputImage, TOutputImage>
::GenerateInputRequestedRegion() throw (itk::InvalidRequestedRegionError)
-{
+ {
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
typename Superclass::InputImagePointer inputPtr =
- const_cast< TInputImage * >( this->GetInput() );
+ const_cast<TInputImage *>(this->GetInput());
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
@@ -62,21 +62,21 @@ VarianceImageFilter<TInputImage, TOutputImage>
inputRequestedRegion = inputPtr->GetRequestedRegion();
// pad the input requested region by the operator radius
- inputRequestedRegion.PadByRadius( m_Radius );
+ inputRequestedRegion.PadByRadius(m_Radius);
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
@@ -84,29 +84,28 @@ VarianceImageFilter<TInputImage, TOutputImage>
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
+ }
}
-}
-
-template< class TInputImage, class TOutputImage>
+template<class TInputImage, class TOutputImage>
void
-VarianceImageFilter< TInputImage, TOutputImage>
+VarianceImageFilter<TInputImage, TOutputImage>
::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
int threadId)
{
- unsigned int i;
+ unsigned int i;
itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
itk::ConstNeighborhoodIterator<InputImageType> bit;
- itk::ImageRegionIterator<OutputImageType> it;
+ itk::ImageRegionIterator<OutputImageType> it;
// Allocate output
- typename OutputImageType::Pointer output = this->GetOutput();
- typename InputImageType::ConstPointer input = this->GetInput();
+ typename OutputImageType::Pointer output = this->GetOutput();
+ typename InputImageType::ConstPointer input = this->GetInput();
// Find the data-set boundary "faces"
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType faceList;
- itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> bC;
+ itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> bC;
faceList = bC(input, outputRegionForThread, m_Radius);
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType::iterator fit;
@@ -119,35 +118,35 @@ VarianceImageFilter< TInputImage, TOutputImage>
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
- for (fit=faceList.begin(); fit != faceList.end(); ++fit)
- {
+ for (fit = faceList.begin(); fit != faceList.end(); ++fit)
+ {
bit = itk::ConstNeighborhoodIterator<InputImageType>(m_Radius,
- input, *fit);
+ input, *fit);
unsigned int neighborhoodSize = bit.Size();
it = itk::ImageRegionIterator<OutputImageType>(output, *fit);
bit.OverrideBoundaryCondition(&nbc);
bit.GoToBegin();
- while ( ! bit.IsAtEnd() )
- {
+ while (!bit.IsAtEnd())
+ {
sum = itk::NumericTraits<InputRealType>::Zero;
sumOfSquares = itk::NumericTraits<InputRealType>::Zero;
for (i = 0; i < neighborhoodSize; ++i)
- {
- const InputRealType value = static_cast<InputRealType>( bit.GetPixel(i) );
+ {
+ const InputRealType value = static_cast<InputRealType>(bit.GetPixel(i));
sum += value;
sumOfSquares += value * value;
- }
+ }
// get the mean value
- const double num = static_cast<double>( neighborhoodSize );
- it.Set( static_cast<OutputPixelType>( sumOfSquares - ( sum*sum / num ) ) / ( num - 1.0 ) );
+ const double num = static_cast<double>(neighborhoodSize);
+ it.Set(static_cast<OutputPixelType>(sumOfSquares - (sum * sum / num)) / (num - 1.0));
++bit;
++it;
progress.CompletedPixel();
+ }
}
- }
}
/**
@@ -160,7 +159,7 @@ VarianceImageFilter<TInputImage, TOutput>
std::ostream& os,
itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "Radius: " << m_Radius << std::endl;
}
diff --git a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h b/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h
index f48fabc63f..d555da5559 100644
--- a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h
+++ b/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h
@@ -38,14 +38,14 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT VectorImageTo3DScalarImageFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef VectorImageTo3DScalarImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef VectorImageTo3DScalarImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -54,19 +54,18 @@ public:
itkTypeMacro(VectorImageTo3DScalarImageFilter, ImageToImageFilter);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef typename InputImageType::ConstPointer InputImageConstPointerType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::SizeType InputImageSizeType;
- typedef typename InputImageType::IndexType InputImageIndexType;
- typedef typename InputImageType::PixelType InputPixelType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::IndexType OutputImageIndexType;
- typedef typename OutputImageType::SizeType OutputImageSizeType;
- typedef typename OutputImageType::PixelType OutputPixelType;
-
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::SizeType InputImageSizeType;
+ typedef typename InputImageType::IndexType InputImageIndexType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::IndexType OutputImageIndexType;
+ typedef typename OutputImageType::SizeType OutputImageSizeType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
protected:
@@ -78,20 +77,20 @@ protected:
/** Threaded Generate data */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
/** Constructor */
VectorImageTo3DScalarImageFilter();
/** Destructor */
- virtual ~VectorImageTo3DScalarImageFilter() {};
+ virtual ~VectorImageTo3DScalarImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- VectorImageTo3DScalarImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorImageTo3DScalarImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbVectorImageTo3DScalarImageFilter.txx"
#endif
diff --git a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx b/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx
index 5d25a5fbc4..87c02ce083 100644
--- a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx
+++ b/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx
@@ -39,18 +39,18 @@ VectorImageTo3DScalarImageFilter<TInputImage, TOutputImage>
{
const InputImageType* inputPtr = this->GetInput();
- OutputImageType* outputPtr = this->GetOutput();
+ OutputImageType* outputPtr = this->GetOutput();
InputImageRegionType inputLargestRegion = this->GetInput()->GetLargestPossibleRegion();
- OutputImageSizeType size;
+ OutputImageSizeType size;
OutputImageIndexType index;
- for (unsigned int i = 0;i<InputImageType::ImageDimension;++i)
- {
+ for (unsigned int i = 0; i < InputImageType::ImageDimension; ++i)
+ {
size[i] = inputLargestRegion.GetSize()[i];
- index[i]= inputLargestRegion.GetIndex()[i];
- }
- size[OutputImageType::ImageDimension-1]=inputPtr->GetNumberOfComponentsPerPixel();
- index[OutputImageType::ImageDimension-1]=0;
+ index[i] = inputLargestRegion.GetIndex()[i];
+ }
+ size[OutputImageType::ImageDimension - 1] = inputPtr->GetNumberOfComponentsPerPixel();
+ index[OutputImageType::ImageDimension - 1] = 0;
OutputImageRegionType outputRegion;
outputRegion.SetSize(size);
@@ -63,19 +63,19 @@ void
VectorImageTo3DScalarImageFilter<TInputImage, TOutputImage>
::GenerateInputRequestedRegion()
{
- InputImageType* inputPtr = const_cast<InputImageType *>(this->GetInput());
+ InputImageType* inputPtr = const_cast<InputImageType *>(this->GetInput());
OutputImageType* outputPtr = this->GetOutput();
OutputImageRegionType requestedRegion = outputPtr->GetRequestedRegion();
- InputImageRegionType inputRequestedRegion;
- InputImageSizeType size;
- InputImageIndexType index;
-
- for (unsigned int i = 0;i<InputImageType::ImageDimension;++i)
- {
- size[i]=requestedRegion.GetSize()[i];
- index[i]=requestedRegion.GetIndex()[i];
- }
+ InputImageRegionType inputRequestedRegion;
+ InputImageSizeType size;
+ InputImageIndexType index;
+
+ for (unsigned int i = 0; i < InputImageType::ImageDimension; ++i)
+ {
+ size[i] = requestedRegion.GetSize()[i];
+ index[i] = requestedRegion.GetIndex()[i];
+ }
inputRequestedRegion.SetSize(size);
inputRequestedRegion.SetIndex(index);
inputPtr->SetRequestedRegion(inputRequestedRegion);
@@ -84,29 +84,29 @@ template <class TInputImage, class TOutputImage>
void
VectorImageTo3DScalarImageFilter<TInputImage, TOutputImage>
::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId )
+ int threadId)
{
const InputImageType* inputPtr = this->GetInput();
- OutputImageType* outputPtr = this->GetOutput();
+ OutputImageType* outputPtr = this->GetOutput();
- typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
+ typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
typedef itk::ImageSliceIteratorWithIndex<OutputImageType> OutputIteratorType;
InputImageRegionType inputRegion;
- InputImageSizeType size;
- InputImageIndexType index;
-
- for (unsigned int i = 0;i<InputImageType::ImageDimension;++i)
- {
- size[i]=outputRegionForThread.GetSize()[i];
- index[i]=outputRegionForThread.GetIndex()[i];
- }
+ InputImageSizeType size;
+ InputImageIndexType index;
+
+ for (unsigned int i = 0; i < InputImageType::ImageDimension; ++i)
+ {
+ size[i] = outputRegionForThread.GetSize()[i];
+ index[i] = outputRegionForThread.GetIndex()[i];
+ }
inputRegion.SetSize(size);
inputRegion.SetIndex(index);
- InputIteratorType inIt(inputPtr,inputRegion);
+ InputIteratorType inIt(inputPtr, inputRegion);
- OutputIteratorType outIt(outputPtr,outputRegionForThread);
+ OutputIteratorType outIt(outputPtr, outputRegionForThread);
outIt.SetFirstDirection(0);
outIt.SetSecondDirection(1);
@@ -114,23 +114,23 @@ VectorImageTo3DScalarImageFilter<TInputImage, TOutputImage>
inIt.GoToBegin();
while (!outIt.IsAtEnd())
- {
+ {
outIt.Set(static_cast<OutputPixelType>(inIt.Get()[outIt.GetIndex()[InputImageType::ImageDimension]]));
++inIt;
if (inIt.IsAtEnd())
- {
+ {
inIt.GoToBegin();
- }
+ }
++outIt;
if (outIt.IsAtEndOfLine())
- {
+ {
outIt.NextLine();
- }
+ }
if (outIt.IsAtEndOfSlice())
- {
+ {
outIt.NextSlice();
+ }
}
- }
}
/**
* PrintSelf Method
diff --git a/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h b/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h
index e336c18891..4dbbc14d32 100644
--- a/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h
+++ b/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h
@@ -26,26 +26,24 @@ namespace otb
{
namespace Functor
{
-template < class TInput, class TOutput>
+template <class TInput, class TOutput>
class VectorToAmplitudeFunctor
{
public:
- VectorToAmplitudeFunctor() {};
- virtual ~VectorToAmplitudeFunctor() {};
+ VectorToAmplitudeFunctor() {}
+ virtual ~VectorToAmplitudeFunctor() {}
- inline TOutput operator()(const TInput & A)
+ inline TOutput operator ()(const TInput& A)
{
return static_cast<TOutput>(vcl_sqrt(A.GetSquaredNorm()));
}
itkConceptMacro(OutputShouldNotBeVectorImageCheck,
- (itk::Concept::Convertible<TOutput, double>));
-
+ (itk::Concept::Convertible<TOutput, double>));
}; // end namespace Functor
}
-
/** \class VectorImageToAmplitudeImageFilter
* \brief This filter returns the the amplitude of the pixel vector.
*
@@ -55,21 +53,21 @@ public:
template <class TInputImage, class TOutputImage>
class ITK_EXPORT VectorImageToAmplitudeImageFilter
- : public itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,
- Functor::VectorToAmplitudeFunctor<
- typename TInputImage::PixelType, typename TOutputImage::PixelType> >
+ : public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage,
+ Functor::VectorToAmplitudeFunctor<
+ typename TInputImage::PixelType, typename TOutputImage::PixelType> >
{
public:
/** Standard typedefs */
- typedef VectorImageToAmplitudeImageFilter Self;
+ typedef VectorImageToAmplitudeImageFilter Self;
typedef itk::UnaryFunctorImageFilter<
- TInputImage,
- TOutputImage,
- Functor::VectorToAmplitudeFunctor<
- typename TInputImage::PixelType,
- typename TOutputImage::PixelType> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ TInputImage,
+ TOutputImage,
+ Functor::VectorToAmplitudeFunctor<
+ typename TInputImage::PixelType,
+ typename TOutputImage::PixelType> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -81,17 +79,17 @@ protected:
/** Constructor */
VectorImageToAmplitudeImageFilter() {};
/** Destructor */
- virtual ~VectorImageToAmplitudeImageFilter() {};
+ virtual ~VectorImageToAmplitudeImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
- VectorImageToAmplitudeImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorImageToAmplitudeImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/BasicFilters/otbVectorImageToImageListFilter.h b/Code/BasicFilters/otbVectorImageToImageListFilter.h
index 4cda50c967..4cd1fe90d3 100644
--- a/Code/BasicFilters/otbVectorImageToImageListFilter.h
+++ b/Code/BasicFilters/otbVectorImageToImageListFilter.h
@@ -34,29 +34,29 @@ namespace otb
*/
template <class TVectorImageType, class TImageList>
class ITK_EXPORT VectorImageToImageListFilter
- : public ImageToImageListFilter<TVectorImageType,typename TImageList::ImageType>
+ : public ImageToImageListFilter<TVectorImageType, typename TImageList::ImageType>
{
public:
/** Standard typedefs */
- typedef VectorImageToImageListFilter Self;
+ typedef VectorImageToImageListFilter Self;
typedef ImageToImageListFilter<TVectorImageType,
- typename TImageList::ImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typename TImageList::ImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(VectorImageToImageListFilter,ImageToImageListFilter);
+ itkTypeMacro(VectorImageToImageListFilter, ImageToImageListFilter);
/** Template parameters typedefs */
- typedef TVectorImageType InputVectorImageType;
- typedef typename InputVectorImageType::Pointer InputVectorImagePointerType;
- typedef TImageList OutputImageListType;
- typedef typename OutputImageListType::Pointer OutputImageListPointerType;
+ typedef TVectorImageType InputVectorImageType;
+ typedef typename InputVectorImageType::Pointer InputVectorImagePointerType;
+ typedef TImageList OutputImageListType;
+ typedef typename OutputImageListType::Pointer OutputImageListPointerType;
typedef typename OutputImageListType::ImageType OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
/** Generate the input requested region from the first element in the list. */
virtual void GenerateInputRequestedRegion(void);
@@ -72,15 +72,15 @@ protected:
/** Constructor */
VectorImageToImageListFilter() {};
/** Destructor */
- virtual ~VectorImageToImageListFilter() {};
+ virtual ~VectorImageToImageListFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- VectorImageToImageListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorImageToImageListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbVectorImageToImageListFilter.txx"
#endif
diff --git a/Code/BasicFilters/otbVectorImageToImageListFilter.txx b/Code/BasicFilters/otbVectorImageToImageListFilter.txx
index 58379d5ef1..ed794852dd 100644
--- a/Code/BasicFilters/otbVectorImageToImageListFilter.txx
+++ b/Code/BasicFilters/otbVectorImageToImageListFilter.txx
@@ -30,109 +30,109 @@ namespace otb
/** Generate the input requested region from the first element in the list. */
template <class TVectorImageType, class TImageList>
void
-VectorImageToImageListFilter<TVectorImageType,TImageList>
+VectorImageToImageListFilter<TVectorImageType, TImageList>
::GenerateOutputInformation(void)
{
- OutputImageListPointerType outputPtr = this->GetOutput();
+ OutputImageListPointerType outputPtr = this->GetOutput();
InputVectorImagePointerType inputPtr = this->GetInput();
if (inputPtr)
- {
- if (outputPtr->Size()!=inputPtr->GetNumberOfComponentsPerPixel())
{
+ if (outputPtr->Size() != inputPtr->GetNumberOfComponentsPerPixel())
+ {
// if the number of components does not match, clear the list
outputPtr->Clear();
- for (unsigned int i=0;i<inputPtr->GetNumberOfComponentsPerPixel();++i)
- {
- typename OutputImageType::Pointer tmpImagePtr = OutputImageType::New();
+ for (unsigned int i = 0; i < inputPtr->GetNumberOfComponentsPerPixel(); ++i)
+ {
+ typename OutputImageType::Pointer tmpImagePtr = OutputImageType::New();
this->AddOutput(tmpImagePtr);
outputPtr->PushBack(tmpImagePtr);
+ }
}
- }
- for (unsigned int i=0;i<inputPtr->GetNumberOfComponentsPerPixel();++i)
- {
- typename OutputImageType::Pointer tmpImagePtr = outputPtr->GetNthElement(i);
+ for (unsigned int i = 0; i < inputPtr->GetNumberOfComponentsPerPixel(); ++i)
+ {
+ typename OutputImageType::Pointer tmpImagePtr = outputPtr->GetNthElement(i);
tmpImagePtr->CopyInformation(inputPtr);
tmpImagePtr->SetLargestPossibleRegion(inputPtr->GetLargestPossibleRegion());
tmpImagePtr->SetRequestedRegion(inputPtr->GetLargestPossibleRegion());
+ }
}
- }
}
/** Generate the output information by building the output list. */
template <class TVectorImageType, class TImageList>
void
-VectorImageToImageListFilter<TVectorImageType,TImageList>
+VectorImageToImageListFilter<TVectorImageType, TImageList>
::GenerateInputRequestedRegion(void)
{
- OutputImageListPointerType outputPtr = this->GetOutput();
+ OutputImageListPointerType outputPtr = this->GetOutput();
InputVectorImagePointerType inputPtr = this->GetInput();
if (inputPtr)
- {
- if (outputPtr->Size()>0)
{
+ if (outputPtr->Size() > 0)
+ {
inputPtr->SetRequestedRegion(outputPtr->GetNthElement(0)->GetRequestedRegion());
+ }
}
- }
}
/**
* Main computation method
*/
template <class TVectorImageType, class TImageList>
void
-VectorImageToImageListFilter<TVectorImageType,TImageList>
+VectorImageToImageListFilter<TVectorImageType, TImageList>
::GenerateData(void)
{
- OutputImageListPointerType outputPtr = this->GetOutput();
+ OutputImageListPointerType outputPtr = this->GetOutput();
InputVectorImagePointerType inputPtr = this->GetInput();
typedef itk::ImageRegionConstIteratorWithIndex<InputVectorImageType> InputIteratorType;
- typedef itk::ImageRegionIteratorWithIndex<OutputImageType> OutputIteratorType;
+ typedef itk::ImageRegionIteratorWithIndex<OutputImageType> OutputIteratorType;
std::vector<OutputIteratorType> outputIteratorList;
typename OutputImageListType::ConstIterator outputListIt = outputPtr->Begin();
- for (;outputListIt!=outputPtr->End();++outputListIt)
- {
+ for (; outputListIt != outputPtr->End(); ++outputListIt)
+ {
outputListIt.Get()->SetBufferedRegion(outputListIt.Get()->GetRequestedRegion());
outputListIt.Get()->Allocate();
- OutputIteratorType tmpIt = OutputIteratorType(outputListIt.Get(),outputListIt.Get()->GetRequestedRegion());
+ OutputIteratorType tmpIt = OutputIteratorType(outputListIt.Get(), outputListIt.Get()->GetRequestedRegion());
tmpIt.GoToBegin();
outputIteratorList.push_back(tmpIt);
- }
+ }
- InputIteratorType inputIt(inputPtr,outputPtr->GetNthElement(0)->GetRequestedRegion());
+ InputIteratorType inputIt(inputPtr, outputPtr->GetNthElement(0)->GetRequestedRegion());
- itk::ProgressReporter progress(this,0,outputPtr->GetNthElement(0)->GetRequestedRegion().GetNumberOfPixels());
+ itk::ProgressReporter progress(this, 0, outputPtr->GetNthElement(0)->GetRequestedRegion().GetNumberOfPixels());
inputIt.GoToBegin();
while (!inputIt.IsAtEnd())
- {
+ {
unsigned int counter = 0;
for (typename std::vector<OutputIteratorType>::iterator it = outputIteratorList.begin();
- it!=outputIteratorList.end();++it)
- {
- if (!(*it).IsAtEnd())
+ it != outputIteratorList.end(); ++it)
{
+ if (!(*it).IsAtEnd())
+ {
(*it).Set(static_cast<typename OutputImageType::PixelType>(inputIt.Get()[counter]));
++(*it);
++counter;
- }
+ }
else
- {
- itkGenericExceptionMacro("End of image for band "<<counter<<" at index "<<(*it).GetIndex()<<" !");
+ {
+ itkGenericExceptionMacro("End of image for band " << counter << " at index " << (*it).GetIndex() << " !");
+ }
}
- }
progress.CompletedPixel();
++inputIt;
- }
+ }
}
/**
* PrintSelf Method
*/
template <class TVectorImageType, class TImageList>
void
-VectorImageToImageListFilter<TVectorImageType,TImageList>
+VectorImageToImageListFilter<TVectorImageType, TImageList>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.h b/Code/BasicFilters/otbVectorImageToIntensityImageFilter.h
index 0888ad9da0..f7c95563d6 100644
--- a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.h
+++ b/Code/BasicFilters/otbVectorImageToIntensityImageFilter.h
@@ -43,39 +43,38 @@ namespace otb
* \ingroup Threading
* \ingroup Streamed
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
class ITK_EXPORT VectorImageToIntensityImageFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef VectorImageToIntensityImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef VectorImageToIntensityImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(VectorImageToIntensityImageFilter,itk::ImageToImageFilter);
+ itkTypeMacro(VectorImageToIntensityImageFilter, itk::ImageToImageFilter);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef typename InputImageType::ConstPointer InputImageConstPointerType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputPixelType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputPixelType;
-
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
protected:
/** Constructor */
VectorImageToIntensityImageFilter();
/** Destructor */
- virtual ~VectorImageToIntensityImageFilter() {};
+ virtual ~VectorImageToIntensityImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** VectorImageToIntensityImageFilter can be implemented as a multithreaded filter.
@@ -89,14 +88,14 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
private:
- VectorImageToIntensityImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorImageToIntensityImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbVectorImageToIntensityImageFilter.txx"
#endif
diff --git a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx b/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx
index 60d249b370..467950d8d3 100644
--- a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx
+++ b/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx
@@ -31,7 +31,7 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage>
-VectorImageToIntensityImageFilter<TInputImage,TOutputImage>
+VectorImageToIntensityImageFilter<TInputImage, TOutputImage>
::VectorImageToIntensityImageFilter()
{
@@ -39,14 +39,12 @@ VectorImageToIntensityImageFilter<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
void
-VectorImageToIntensityImageFilter<TInputImage,TOutputImage>
-::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,int threadId)
+VectorImageToIntensityImageFilter<TInputImage, TOutputImage>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
-
- InputImageConstPointerType inputPtr = this->GetInput();
- OutputImagePointerType outputPtr = this->GetOutput();
-
+ InputImageConstPointerType inputPtr = this->GetInput();
+ OutputImagePointerType outputPtr = this->GetOutput();
// Define the portion of the input to walk for this thread, using
// the CallCopyOutputRegionToInputRegion method allows for the input
@@ -63,28 +61,27 @@ VectorImageToIntensityImageFilter<TInputImage,TOutputImage>
outputIt.GoToBegin();
while (!inputIt.IsAtEnd() && !outputIt.IsAtEnd())
- {
- double sum=0.0;
- InputPixelType pixel = inputIt.Get();
- for (unsigned int i=0; i<pixel.Size(); ++i)
{
+ double sum = 0.0;
+ InputPixelType pixel = inputIt.Get();
+ for (unsigned int i = 0; i < pixel.Size(); ++i)
+ {
sum += pixel[i];
- }
+ }
sum /= pixel.Size();
-
outputIt.Set(static_cast<OutputPixelType>(sum));
++inputIt;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
}
/**
* PrintSelf Method
*/
template <class TInputImage, class TOutputImage>
void
-VectorImageToIntensityImageFilter<TInputImage,TOutputImage>
+VectorImageToIntensityImageFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.h b/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.h
index 3b77e14b24..4741dc0b5c 100644
--- a/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.h
+++ b/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.h
@@ -37,12 +37,12 @@ namespace Functor
* TInput and TOutput type are supposed to be of type itk::VariableLengthVector.
*
*/
-template< typename TInput, typename TOutput>
+template<typename TInput, typename TOutput>
class VectorAffineTransform
{
public:
/// Real type typedef
- typedef typename itk::NumericTraits< typename TInput::ValueType >::RealType RealType;
+ typedef typename itk::NumericTraits<typename TInput::ValueType>::RealType RealType;
/// Constructor
VectorAffineTransform() {}
@@ -50,11 +50,11 @@ public:
virtual ~VectorAffineTransform() {}
/// Accessors
- void SetOutputMaximum( TOutput a )
+ void SetOutputMaximum(TOutput a)
{
m_OutputMaximum = a;
}
- void SetOutputMinimum( TOutput a)
+ void SetOutputMinimum(TOutput a)
{
m_OutputMinimum = a;
}
@@ -83,95 +83,94 @@ public:
return m_InputMaximum;
}
-
- bool operator!=( const VectorAffineTransform & other ) const
+ bool operator !=(const VectorAffineTransform& other) const
{
if (m_OutputMaximum.Size() == other.GetOutputMinimum().Size())
- {
- for (unsigned int i = 0; i < m_OutputMinimum.Size(); ++i)
{
- if ( m_OutputMinimum[i] != other.GetOutputMinimum()[i] )
+ for (unsigned int i = 0; i < m_OutputMinimum.Size(); ++i)
{
+ if (m_OutputMinimum[i] != other.GetOutputMinimum()[i])
+ {
return true;
+ }
}
}
- }
if (m_OutputMaximum.Size() == other.GetOutputMaximum().Size())
- {
- for (unsigned int i = 0; i < m_OutputMaximum.Size(); ++i)
{
- if ( m_OutputMaximum[i] != other.GetOutputMaximum()[i] )
+ for (unsigned int i = 0; i < m_OutputMaximum.Size(); ++i)
{
+ if (m_OutputMaximum[i] != other.GetOutputMaximum()[i])
+ {
return true;
+ }
}
}
- }
if (m_InputMinimum.Size() == other.GetInputMinimum().Size())
- {
- for (unsigned int i = 0; i < m_InputMinimum.Size(); ++i)
{
- if ( m_InputMinimum[i] != other.GetInputMinimum()[i] )
+ for (unsigned int i = 0; i < m_InputMinimum.Size(); ++i)
{
+ if (m_InputMinimum[i] != other.GetInputMinimum()[i])
+ {
return true;
+ }
}
}
- }
if (m_InputMaximum.Size() == other.GetInputMaximum().Size())
- {
- for (unsigned int i = 0; i < m_InputMaximum.Size(); ++i)
{
- if ( m_InputMaximum[i] != other.GetInputMaximum()[i] )
+ for (unsigned int i = 0; i < m_InputMaximum.Size(); ++i)
{
+ if (m_InputMaximum[i] != other.GetInputMaximum()[i])
+ {
return true;
+ }
}
}
- }
return false;
}
- bool operator==( const VectorAffineTransform & other ) const
+ bool operator ==(const VectorAffineTransform& other) const
{
return !(*this != other);
}
// main computation method
- inline TOutput operator()( const TInput & x )
+ inline TOutput operator ()(const TInput& x)
{
// output instantiation
- TOutput result;
+ TOutput result;
result.SetSize(x.GetSize());
// consistency checking
- if ( result.GetSize() != m_OutputMinimum.GetSize()
- || result.GetSize() != m_OutputMaximum.GetSize()
- || result.GetSize() != m_InputMinimum.GetSize()
- || result.GetSize() != m_InputMaximum.GetSize())
- {
- itkGenericExceptionMacro(<<"Pixel size different from scale or shift size !");
- }
+ if (result.GetSize() != m_OutputMinimum.GetSize()
+ || result.GetSize() != m_OutputMaximum.GetSize()
+ || result.GetSize() != m_InputMinimum.GetSize()
+ || result.GetSize() != m_InputMaximum.GetSize())
+ {
+ itkGenericExceptionMacro(<< "Pixel size different from scale or shift size !");
+ }
// transformation
- for (unsigned int i=0; i<x.GetSize();++i)
- {
- if (x[i]<m_InputMinimum[i])
+ for (unsigned int i = 0; i < x.GetSize(); ++i)
{
+ if (x[i] < m_InputMinimum[i])
+ {
result[i] = m_OutputMinimum[i];
- }
- else if (x[i]>m_InputMaximum[i])
- {
+ }
+ else if (x[i] > m_InputMaximum[i])
+ {
result[i] = m_OutputMaximum[i];
- }
- else if (m_InputMaximum[i]==m_InputMinimum[i])
- {
- result[i]=m_OutputMinimum[i];
- }
+ }
+ else if (m_InputMaximum[i] == m_InputMinimum[i])
+ {
+ result[i] = m_OutputMinimum[i];
+ }
else
- {
- const RealType scaledComponent = static_cast<RealType>( x[i]-m_InputMinimum[i] )
+ {
+ const RealType scaledComponent = static_cast<RealType>(x[i] - m_InputMinimum[i])
* static_cast<RealType> (m_OutputMaximum[i] - m_OutputMinimum[i])
/ static_cast<RealType> (m_InputMaximum[i] - m_InputMinimum[i]);
- result[i]= static_cast< typename TOutput::ValueType >( scaledComponent+m_OutputMinimum[i] );
+ result[i] = static_cast<typename TOutput::ValueType>(scaledComponent + m_OutputMinimum[i]);
+ }
}
- }
return result;
}
private:
@@ -182,7 +181,6 @@ private:
};
} // end namespace functor
-
/** \class VectorRescaleIntensityImageFilter
* \brief This filter performs a rescaling of a vector image on a per band basis.
*
@@ -195,21 +193,21 @@ private:
* \ingroup IntensityImageFilters
* \ingroup MultiThreaded
*/
-template <class TInputImage, class TOutputImage=TInputImage>
+template <class TInputImage, class TOutputImage = TInputImage>
class ITK_EXPORT VectorRescaleIntensityImageFilter
- : public itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,
- Functor::VectorAffineTransform<
- typename TInputImage::PixelType,
- typename TOutputImage::PixelType> >
+ : public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage,
+ Functor::VectorAffineTransform<
+ typename TInputImage::PixelType,
+ typename TOutputImage::PixelType> >
{
public:
/** Standard class typedefs. */
- typedef VectorRescaleIntensityImageFilter Self;
- typedef itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,
- Functor::VectorAffineTransform< typename TInputImage::PixelType,
- typename TOutputImage::PixelType> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef VectorRescaleIntensityImageFilter Self;
+ typedef itk::UnaryFunctorImageFilter<TInputImage, TOutputImage,
+ Functor::VectorAffineTransform<typename TInputImage::PixelType,
+ typename TOutputImage::PixelType> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
typedef typename TOutputImage::PixelType OutputPixelType;
typedef typename TInputImage::PixelType InputPixelType;
@@ -221,23 +219,22 @@ public:
/** Method for creation through the object factory. */
itkNewMacro(Self);
- itkSetMacro( OutputMaximum, OutputPixelType );
- itkGetConstReferenceMacro( OutputMaximum, OutputPixelType );
- itkSetMacro( OutputMinimum, OutputPixelType );
- itkGetConstReferenceMacro( OutputMinimum, OutputPixelType );
- itkSetMacro(AutomaticInputMinMaxComputation,bool);
- itkGetMacro(AutomaticInputMinMaxComputation,bool);
+ itkSetMacro(OutputMaximum, OutputPixelType);
+ itkGetConstReferenceMacro(OutputMaximum, OutputPixelType);
+ itkSetMacro(OutputMinimum, OutputPixelType);
+ itkGetConstReferenceMacro(OutputMinimum, OutputPixelType);
+ itkSetMacro(AutomaticInputMinMaxComputation, bool);
+ itkGetMacro(AutomaticInputMinMaxComputation, bool);
itkBooleanMacro(AutomaticInputMinMaxComputation);
- itkGetMacro(ClampThreshold,double);
- itkSetMacro(ClampThreshold,double);
-
- itkGetMacro(InputMinimum,InputPixelType);
- itkSetMacro(InputMinimum,InputPixelType);
+ itkGetMacro(ClampThreshold, double);
+ itkSetMacro(ClampThreshold, double);
- itkGetMacro(InputMaximum,InputPixelType);
- itkSetMacro(InputMaximum,InputPixelType);
+ itkGetMacro(InputMinimum, InputPixelType);
+ itkSetMacro(InputMinimum, InputPixelType);
+ itkGetMacro(InputMaximum, InputPixelType);
+ itkSetMacro(InputMaximum, InputPixelType);
/** Process to execute before entering the multithreaded section */
void BeforeThreadedGenerateData(void);
@@ -253,18 +250,18 @@ public:
protected:
VectorRescaleIntensityImageFilter();
- virtual ~VectorRescaleIntensityImageFilter() {};
+ virtual ~VectorRescaleIntensityImageFilter() {}
private:
- VectorRescaleIntensityImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
- OutputPixelType m_OutputMinimum;
- OutputPixelType m_OutputMaximum;
- InputPixelType m_InputMinimum;
- InputPixelType m_InputMaximum;
- double m_ClampThreshold;
- bool m_AutomaticInputMinMaxComputation;
+ VectorRescaleIntensityImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
+
+ OutputPixelType m_OutputMinimum;
+ OutputPixelType m_OutputMaximum;
+ InputPixelType m_InputMinimum;
+ InputPixelType m_InputMaximum;
+ double m_ClampThreshold;
+ bool m_AutomaticInputMinMaxComputation;
};
diff --git a/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx b/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx
index 8b7ea4bb52..c572b9ab31 100644
--- a/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx
+++ b/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx
@@ -45,28 +45,28 @@ VectorRescaleIntensityImageFilter<TInputImage, TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-VectorRescaleIntensityImageFilter<TInputImage,TOutputImage>
+VectorRescaleIntensityImageFilter<TInputImage, TOutputImage>
::GenerateOutputInformation(void)
{
this->Superclass::GenerateOutputInformation();
this->GetOutput()->SetNumberOfComponentsPerPixel(
- this->GetInput()->GetNumberOfComponentsPerPixel() );
+ this->GetInput()->GetNumberOfComponentsPerPixel());
}
/**
* Generate input requested region.
*/
template <class TInputImage, class TOutputImage>
void
-VectorRescaleIntensityImageFilter<TInputImage,TOutputImage>
+VectorRescaleIntensityImageFilter<TInputImage, TOutputImage>
::GenerateInputRequestedRegion(void)
{
if (this->GetInput())
- {
- typename TInputImage::Pointer input = const_cast<TInputImage *>(this->GetInput());
+ {
+ typename TInputImage::Pointer input = const_cast<TInputImage *>(this->GetInput());
typename TInputImage::RegionType inputRegion;
- this->CallCopyOutputRegionToInputRegion(inputRegion,this->GetOutput()->GetRequestedRegion());
+ this->CallCopyOutputRegionToInputRegion(inputRegion, this->GetOutput()->GetRequestedRegion());
input->SetRequestedRegion(inputRegion);
- }
+ }
}
/**
* Process to execute before entering the multithreaded section.
@@ -76,26 +76,27 @@ void
VectorRescaleIntensityImageFilter<TInputImage, TOutputImage>
::BeforeThreadedGenerateData()
{
- if(m_ClampThreshold==0.)
+ if (m_ClampThreshold == 0.)
{
- itkExceptionMacro(<<"Invalid Clamp Threshold must be greater than 0.0");
+ itkExceptionMacro(<< "Invalid Clamp Threshold must be greater than 0.0");
}
if (m_AutomaticInputMinMaxComputation)
- {
+ {
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::InputImagePointer InputImagePointer;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::InputImagePointer InputImagePointer;
// Get the input
InputImagePointer inputImage = this->GetInput();
- typedef itk::ImageRegionConstIterator< InputImageType > InputIterator;
- typedef itk::Vector<typename InputImageType::InternalPixelType,1> MeasurementVectorType;
- typedef itk::Statistics::ListSample<MeasurementVectorType> ListSampleType;
- typedef float HistogramMeasurementType;
- typedef itk::Statistics::ListSampleToHistogramGenerator<ListSampleType,HistogramMeasurementType,
- itk::Statistics::DenseFrequencyContainer,1> HistogramGeneratorType;
+ typedef itk::ImageRegionConstIterator<InputImageType> InputIterator;
+ typedef itk::Vector<typename InputImageType::InternalPixelType, 1> MeasurementVectorType;
+ typedef itk::Statistics::ListSample<MeasurementVectorType> ListSampleType;
+ typedef float HistogramMeasurementType;
+ typedef itk::Statistics::ListSampleToHistogramGenerator<ListSampleType, HistogramMeasurementType,
+ itk::Statistics::DenseFrequencyContainer,
+ 1> HistogramGeneratorType;
typedef ObjectList<ListSampleType> ListSampleListType;
@@ -105,43 +106,46 @@ VectorRescaleIntensityImageFilter<TInputImage, TOutputImage>
sl->Reserve(inputImage->GetNumberOfComponentsPerPixel());
- for (unsigned int i = 0;i<m_InputMaximum.GetSize();++i)
- {
+ for (unsigned int i = 0; i < m_InputMaximum.GetSize(); ++i)
+ {
sl->PushBack(ListSampleType::New());
- }
+ }
- InputIterator it( inputImage, inputImage->GetBufferedRegion() );
+ InputIterator it(inputImage, inputImage->GetBufferedRegion());
it.GoToBegin();
- while ( !it.IsAtEnd() )
- {
- InputPixelType pixel = it.Get();
- for (unsigned int i = 0;i<m_InputMaximum.GetSize();++i)
+ while (!it.IsAtEnd())
{
+ InputPixelType pixel = it.Get();
+ for (unsigned int i = 0; i < m_InputMaximum.GetSize(); ++i)
+ {
sl->GetNthElement(i)->PushBack(pixel[i]);
- }
+ }
++it;
- }
+ }
- for (unsigned int i = 0;i<m_InputMaximum.GetSize();++i)
- {
+ for (unsigned int i = 0; i < m_InputMaximum.GetSize(); ++i)
+ {
typename HistogramGeneratorType::Pointer generator = HistogramGeneratorType::New();
generator->SetListSample(sl->GetNthElement(i));
typename HistogramGeneratorType::HistogramType::SizeType size;
- size.Fill(static_cast<unsigned int>(vcl_ceil(1/m_ClampThreshold)*10));
+ size.Fill(static_cast<unsigned int>(vcl_ceil(1 / m_ClampThreshold) * 10));
generator->SetNumberOfBins(size);
generator->Update();
- m_InputMinimum[i]=static_cast<typename InputImageType::InternalPixelType>(generator->GetOutput()->Quantile(0,m_ClampThreshold));
- m_InputMaximum[i]=static_cast<typename InputImageType::InternalPixelType>(generator->GetOutput()->Quantile(0,1-m_ClampThreshold));
+ m_InputMinimum[i] =
+ static_cast<typename InputImageType::InternalPixelType>(generator->GetOutput()->Quantile(0, m_ClampThreshold));
+ m_InputMaximum[i] =
+ static_cast<typename InputImageType::InternalPixelType>(generator->GetOutput()->Quantile(0, 1 -
+ m_ClampThreshold));
+ }
}
- }
// set up the functor values
- this->GetFunctor().SetInputMinimum( m_InputMinimum );
- this->GetFunctor().SetInputMaximum( m_InputMaximum );
- this->GetFunctor().SetOutputMaximum(m_OutputMaximum );
- this->GetFunctor().SetOutputMinimum(m_OutputMinimum );
+ this->GetFunctor().SetInputMinimum(m_InputMinimum);
+ this->GetFunctor().SetInputMaximum(m_InputMaximum);
+ this->GetFunctor().SetOutputMaximum(m_OutputMaximum);
+ this->GetFunctor().SetOutputMinimum(m_OutputMinimum);
}
/**
@@ -152,9 +156,9 @@ void
VectorRescaleIntensityImageFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"Automatic min/max computation: "<<m_AutomaticInputMinMaxComputation<<std::endl;
- os<<indent<<"Clamp threshold: "<<m_ClampThreshold<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Automatic min/max computation: " << m_AutomaticInputMinMaxComputation << std::endl;
+ os << indent << "Clamp threshold: " << m_ClampThreshold << std::endl;
}
} // end namespace otb
#endif
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
index b0e9af84b6..1ee14d88bd 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
@@ -34,7 +34,7 @@ namespace Function
* \f[ w(x) = 0.42 + 0.5 cos(\frac{\pi x}{m}) + 0.08 cos(\frac{2 \pi x}{m}) \f]
* \sa WindowedSincInterpolateImageBlackmanFunction
*/
-template< class TInput=double, class TOutput=double >
+template<class TInput = double, class TOutput = double>
class BlackmanWindowFunction
{
public:
@@ -47,17 +47,17 @@ public:
unsigned int GetRadius() const
{
return m_Radius;
- };
+ }
double GetFactor1()
{
return m_Factor1;
- };
+ }
double GetFactor2()
{
return m_Factor2;
- };
+ }
- inline TOutput operator()( const TInput & A ) const
+ inline TOutput operator ()(const TInput& A) const
{
double x = static_cast<double>(A);
double px = CONST_PI * x;
@@ -71,8 +71,7 @@ private:
// Equal to \f$ \frac{2 \pi}{m} \f$
double m_Factor2;
};
-}//namespace Function
-
+} //namespace Function
/**
* \class WindowedSincInterpolateImageBlackmanFunction
@@ -87,23 +86,26 @@ private:
* \sa Function::BlackmanWindowFunction
* \ingroup ImageFunctionBases ImageInterpolators
*/
-template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep=double, class TInputInterpolator=double, class TOutputInterpolator=double>
+template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep =
+ double, class TInputInterpolator = double, class TOutputInterpolator = double>
class ITK_EXPORT WindowedSincInterpolateImageBlackmanFunction :
- public WindowedSincInterpolateImageFunctionBase< TInputImage,
- ITK_TYPENAME Function::BlackmanWindowFunction< TInputInterpolator, TOutputInterpolator>,
- TBoundaryCondition,
- TCoordRep >
+ public WindowedSincInterpolateImageFunctionBase<TInputImage,
+ ITK_TYPENAME Function::BlackmanWindowFunction<TInputInterpolator,
+ TOutputInterpolator>,
+ TBoundaryCondition,
+ TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef WindowedSincInterpolateImageBlackmanFunction Self;
+ typedef WindowedSincInterpolateImageBlackmanFunction Self;
typedef WindowedSincInterpolateImageFunctionBase<TInputImage,
- ITK_TYPENAME Function::BlackmanWindowFunction< TInputInterpolator,
- TOutputInterpolator>,
- TBoundaryCondition,
- TCoordRep> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ ITK_TYPENAME Function::BlackmanWindowFunction<TInputInterpolator,
+ TOutputInterpolator>,
+ TBoundaryCondition,
+ TCoordRep>
+ Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(WindowedSincInterpolateImageBlackmanFunction, WindowedSincInterpolateImageFunctionBase);
@@ -116,30 +118,28 @@ public:
typedef typename Superclass::OutputType OutputType;
/** Dimension underlying input image. */
- itkStaticConstMacro(ImageDimension, unsigned int,Superclass::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, Superclass::ImageDimension);
/** Superclass typedef inheritance. */
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::SizeType SizeType;
- typedef typename Superclass::RealType RealType;
- typedef typename Superclass::IteratorType IteratorType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
-
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::RealType RealType;
+ typedef typename Superclass::IteratorType IteratorType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
protected:
WindowedSincInterpolateImageBlackmanFunction() {};
- ~WindowedSincInterpolateImageBlackmanFunction() {};
+ ~WindowedSincInterpolateImageBlackmanFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
- };
+ Superclass::PrintSelf(os, indent);
+ }
private:
- WindowedSincInterpolateImageBlackmanFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ WindowedSincInterpolateImageBlackmanFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
index 40dcbe1bdc..848aad7c9e 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
@@ -34,38 +34,37 @@ namespace Function
* \f[ w(x) = 0.54 + 0.46 cos(\frac{\pi x}{m} ) \f]
* \sa WindowedSincInterpolateImageCosineFunction
*/
-template< class TInput=double, class TOutput=double >
+template<class TInput = double, class TOutput = double>
class CosineWindowFunction
{
public:
void SetRadius(unsigned int radius)
{
m_Radius = radius;
- m_Factor = CONST_PI / ( 2 * static_cast<double>(radius) );
+ m_Factor = CONST_PI / (2 * static_cast<double>(radius));
}
unsigned int GetRadius() const
{
return m_Radius;
- };
+ }
double GetFactor()
{
return m_Factor;
- };
+ }
- inline TOutput operator()( const TInput & A ) const
+ inline TOutput operator ()(const TInput& A) const
{
double x = static_cast<double>(A);
double px = CONST_PI * x;
- double temp = vcl_cos(x * m_Factor );
+ double temp = vcl_cos(x * m_Factor);
return (x == 0.0) ? static_cast<TOutput>(temp) : static_cast<TOutput>(temp * vcl_sin(px) / px);
}
private:
// Equal to \f$ \frac{\pi}{2 m} \f$
- double m_Factor;
+ double m_Factor;
unsigned int m_Radius;
};
-}//namespace Function
-
+} //namespace Function
/**
* \class WindowedSincInterpolateImageCosineFunction
@@ -80,23 +79,26 @@ private:
* \sa Function::BlackmanWindowFunction
* \ingroup ImageFunctionBases ImageInterpolators
*/
-template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep=double, class TInputInterpolator=double, class TOutputInterpolator=double>
+template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep =
+ double, class TInputInterpolator = double, class TOutputInterpolator = double>
class ITK_EXPORT WindowedSincInterpolateImageCosineFunction :
- public WindowedSincInterpolateImageFunctionBase< TInputImage,
- ITK_TYPENAME Function::CosineWindowFunction< TInputInterpolator, TOutputInterpolator>,
- TBoundaryCondition,
- TCoordRep >
+ public WindowedSincInterpolateImageFunctionBase<TInputImage,
+ ITK_TYPENAME Function::CosineWindowFunction<TInputInterpolator,
+ TOutputInterpolator>,
+ TBoundaryCondition,
+ TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef WindowedSincInterpolateImageCosineFunction Self;
+ typedef WindowedSincInterpolateImageCosineFunction Self;
typedef WindowedSincInterpolateImageFunctionBase<TInputImage,
- ITK_TYPENAME Function::CosineWindowFunction< TInputInterpolator,
- TOutputInterpolator>,
- TBoundaryCondition,
- TCoordRep> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ ITK_TYPENAME Function::CosineWindowFunction<TInputInterpolator,
+ TOutputInterpolator>,
+ TBoundaryCondition,
+ TCoordRep>
+ Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(WindowedSincInterpolateImageCosineFunction, WindowedSincInterpolateImageFunctionBase);
@@ -109,30 +111,28 @@ public:
typedef typename Superclass::OutputType OutputType;
/** Dimension underlying input image. */
- itkStaticConstMacro(ImageDimension, unsigned int,Superclass::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, Superclass::ImageDimension);
/** Superclass typedef inheritance. */
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::SizeType SizeType;
- typedef typename Superclass::RealType RealType;
- typedef typename Superclass::IteratorType IteratorType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
-
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::RealType RealType;
+ typedef typename Superclass::IteratorType IteratorType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
protected:
WindowedSincInterpolateImageCosineFunction() {};
- ~WindowedSincInterpolateImageCosineFunction() {};
+ ~WindowedSincInterpolateImageCosineFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
- };
+ Superclass::PrintSelf(os, indent);
+ }
private:
- WindowedSincInterpolateImageCosineFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ WindowedSincInterpolateImageCosineFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.h b/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.h
index 1219bd2b27..7834e4fd08 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.h
@@ -131,19 +131,20 @@ namespace otb
* \sa Function::BlackmanWindowFunction
* \ingroup ImageFunctionBases ImageInterpolators
*/
-template<class TInputImage, class TWindowFunction, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep=double>
+template<class TInputImage, class TWindowFunction, class TBoundaryCondition =
+ itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep = double>
class ITK_EXPORT WindowedSincInterpolateImageFunctionBase :
- public GenericInterpolateImageFunction< TInputImage,
- TWindowFunction,
- TBoundaryCondition,
- TCoordRep >
+ public GenericInterpolateImageFunction<TInputImage,
+ TWindowFunction,
+ TBoundaryCondition,
+ TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef WindowedSincInterpolateImageFunctionBase Self;
- typedef GenericInterpolateImageFunction<TInputImage, TWindowFunction, TBoundaryCondition, TCoordRep> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef WindowedSincInterpolateImageFunctionBase Self;
+ typedef GenericInterpolateImageFunction<TInputImage, TWindowFunction, TBoundaryCondition, TCoordRep> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(WindowedSincInterpolateImageFunctionBase, GenericInterpolateImageFunction);
@@ -156,30 +157,29 @@ public:
typedef typename Superclass::OutputType OutputType;
/** Dimension underlying input image. */
- itkStaticConstMacro(ImageDimension, unsigned int,Superclass::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, Superclass::ImageDimension);
/** Superclass typedef inheritance. */
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::SizeType SizeType;
- typedef typename Superclass::RealType RealType;
- typedef typename Superclass::IteratorType IteratorType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::RealType RealType;
+ typedef typename Superclass::IteratorType IteratorType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
//typedef typename TWindowFunction FunctionType;
- typedef typename Superclass::FunctionType FunctionType;
- typedef typename std::vector<double> VectorType;
+ typedef typename Superclass::FunctionType FunctionType;
+ typedef typename std::vector<double> VectorType;
/** Compute a resampled profil according to the window size.*/
// virtual void ComputeResampledWindowedSincProfil();
-
protected:
WindowedSincInterpolateImageFunctionBase();
virtual ~WindowedSincInterpolateImageFunctionBase();
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- WindowedSincInterpolateImageFunctionBase(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ WindowedSincInterpolateImageFunctionBase(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace itk
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.txx b/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.txx
index f823459c14..2a2b35b11c 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.txx
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.txx
@@ -18,7 +18,6 @@
#ifndef __otbWindowedSincInterpolateImageFunctionBase_txx
#define __otbWindowedSincInterpolateImageFunctionBase_txx
-
#include "otbWindowedSincInterpolateImageFunctionBase.h"
namespace otb
@@ -42,8 +41,8 @@ void
WindowedSincInterpolateImageFunctionBase<TInputImage, TWindowFunction, TBoundaryCondition, TCoordRep>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
-}//namespace otb
+} //namespace otb
#endif
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
index 177126a4b4..f78181a935 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
@@ -34,38 +34,37 @@ namespace Function
* \f[ w(x) = exp ( -2. \frac{sigma*sigma * \pi } ) \f]
* \sa otbWindowedSincInterpolateImageFunctionBase
*/
-template< class TInput=double, class TOutput=double>
+template<class TInput = double, class TOutput = double>
class GaussianWindowFunction
{
public:
- void SetRadius( unsigned int radius)
+ void SetRadius(unsigned int radius)
{
m_Radius = radius;
- m_Factor = -2. / ( static_cast<double>(m_Radius * m_Radius) * CONST_PI );
+ m_Factor = -2. / (static_cast<double>(m_Radius * m_Radius) * CONST_PI);
}
double GetFactor()
{
return m_Factor;
- };
+ }
unsigned int GetRadius() const
{
return m_Radius;
- };
+ }
- inline TOutput operator()( const TInput & A ) const
+ inline TOutput operator ()(const TInput& A) const
{
double x = static_cast<double>(A);
double px = CONST_PI * x;
- double temp = vcl_exp( px*px * m_Factor);
+ double temp = vcl_exp(px * px * m_Factor);
return (x == 0.0) ? static_cast<TOutput>(temp) : static_cast<TOutput>(temp * vcl_sin(px) / px);
}
private:
- double m_Factor;
+ double m_Factor;
unsigned int m_Radius;
};
-}//namespace Function
-
+} //namespace Function
/**
* \class WindowedSincInterpolateImageGaussianFunction
@@ -80,23 +79,26 @@ private:
* \sa Function::BlackmanWindowFunction
* \ingroup ImageFunctionBases ImageInterpolators
*/
-template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep=double, class TInputInterpolator=double, class TOutputInterpolator=double>
+template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep =
+ double, class TInputInterpolator = double, class TOutputInterpolator = double>
class ITK_EXPORT WindowedSincInterpolateImageGaussianFunction :
- public WindowedSincInterpolateImageFunctionBase< TInputImage,
- ITK_TYPENAME Function::GaussianWindowFunction< TInputInterpolator, TOutputInterpolator>,
- TBoundaryCondition,
- TCoordRep >
+ public WindowedSincInterpolateImageFunctionBase<TInputImage,
+ ITK_TYPENAME Function::GaussianWindowFunction<TInputInterpolator,
+ TOutputInterpolator>,
+ TBoundaryCondition,
+ TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef WindowedSincInterpolateImageGaussianFunction Self;
+ typedef WindowedSincInterpolateImageGaussianFunction Self;
typedef WindowedSincInterpolateImageFunctionBase<TInputImage,
- ITK_TYPENAME Function::GaussianWindowFunction< TInputInterpolator,
- TOutputInterpolator>,
- TBoundaryCondition,
- TCoordRep> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ ITK_TYPENAME Function::GaussianWindowFunction<TInputInterpolator,
+ TOutputInterpolator>,
+ TBoundaryCondition,
+ TCoordRep>
+ Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(WindowedSincInterpolateImageGaussianFunction, WindowedSincInterpolateImageFunctionBase);
@@ -109,30 +111,28 @@ public:
typedef typename Superclass::OutputType OutputType;
/** Dimension underlying input image. */
- itkStaticConstMacro(ImageDimension, unsigned int,Superclass::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, Superclass::ImageDimension);
/** Superclass typedef inheritance. */
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::SizeType SizeType;
- typedef typename Superclass::RealType RealType;
- typedef typename Superclass::IteratorType IteratorType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
-
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::RealType RealType;
+ typedef typename Superclass::IteratorType IteratorType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
protected:
WindowedSincInterpolateImageGaussianFunction() {};
- ~WindowedSincInterpolateImageGaussianFunction() {};
+ ~WindowedSincInterpolateImageGaussianFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
- };
+ Superclass::PrintSelf(os, indent);
+ }
private:
- WindowedSincInterpolateImageGaussianFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ WindowedSincInterpolateImageGaussianFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
index d11f77ac26..6e91c342ef 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
@@ -34,7 +34,7 @@ namespace Function
* \f[ w(x) = 0.54 + 0.46 cos(\frac{\pi x}{m} ) \f]
* \sa WindowedSincInterpolateImageHammingFunction
*/
-template< class TInput=double, class TOutput=double >
+template<class TInput = double, class TOutput = double>
class HammingWindowFunction
{
public:
@@ -46,28 +46,26 @@ public:
unsigned int GetRadius() const
{
return m_Radius;
- };
+ }
double GetFactor()
{
return m_Factor;
- };
+ }
- inline TOutput operator()( const TInput & A ) const
+ inline TOutput operator ()(const TInput& A) const
{
double x = static_cast<double>(A);
double px = CONST_PI * x;
- double temp = 0.54 + 0.46 * vcl_cos(x * m_Factor );
+ double temp = 0.54 + 0.46 * vcl_cos(x * m_Factor);
return (x == 0.0) ? static_cast<TOutput>(temp) : static_cast<TOutput>(temp * vcl_sin(px) / px);
}
private:
// Equal to \f$ \frac{\pi}{m} \f$
- double m_Factor;
+ double m_Factor;
unsigned int m_Radius;
};
-
-}//namespace Function
-
+} //namespace Function
/**
* \class WindowedSincInterpolateImageHammingFunction
@@ -82,23 +80,26 @@ private:
* \sa Function::BlackmanWindowFunction
* \ingroup ImageFunctionBases ImageInterpolators
*/
-template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep=double, class TInputInterpolator=double, class TOutputInterpolator=double>
+template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep =
+ double, class TInputInterpolator = double, class TOutputInterpolator = double>
class ITK_EXPORT WindowedSincInterpolateImageHammingFunction :
- public WindowedSincInterpolateImageFunctionBase< TInputImage,
- ITK_TYPENAME Function::HammingWindowFunction< TInputInterpolator, TOutputInterpolator>,
- TBoundaryCondition,
- TCoordRep >
+ public WindowedSincInterpolateImageFunctionBase<TInputImage,
+ ITK_TYPENAME Function::HammingWindowFunction<TInputInterpolator,
+ TOutputInterpolator>,
+ TBoundaryCondition,
+ TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef WindowedSincInterpolateImageHammingFunction Self;
+ typedef WindowedSincInterpolateImageHammingFunction Self;
typedef WindowedSincInterpolateImageFunctionBase<TInputImage,
- ITK_TYPENAME Function::HammingWindowFunction< TInputInterpolator,
- TOutputInterpolator>,
- TBoundaryCondition,
- TCoordRep> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ ITK_TYPENAME Function::HammingWindowFunction<TInputInterpolator,
+ TOutputInterpolator>,
+ TBoundaryCondition,
+ TCoordRep>
+ Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(WindowedSincInterpolateImageHammingFunction, WindowedSincInterpolateImageFunctionBase);
@@ -111,30 +112,28 @@ public:
typedef typename Superclass::OutputType OutputType;
/** Dimension underlying input image. */
- itkStaticConstMacro(ImageDimension, unsigned int,Superclass::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, Superclass::ImageDimension);
/** Superclass typedef inheritance. */
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::SizeType SizeType;
- typedef typename Superclass::RealType RealType;
- typedef typename Superclass::IteratorType IteratorType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
-
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::RealType RealType;
+ typedef typename Superclass::IteratorType IteratorType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
protected:
WindowedSincInterpolateImageHammingFunction() {};
- ~WindowedSincInterpolateImageHammingFunction() {};
+ ~WindowedSincInterpolateImageHammingFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
- };
+ Superclass::PrintSelf(os, indent);
+ }
private:
- WindowedSincInterpolateImageHammingFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ WindowedSincInterpolateImageHammingFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
index 99d62a95d6..c19061a4c1 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
@@ -36,7 +36,7 @@ namespace Function
* an incorrect definition of this window function.
* \sa WindowedSincInterpolateImageLanczosFunction
*/
-template< class TInput=double, class TOutput=double >
+template<class TInput = double, class TOutput = double>
class LanczosWindowFunction
{
public:
@@ -48,35 +48,34 @@ public:
unsigned int GetRadius() const
{
return m_Radius;
- };
+ }
double GetFactor()
{
return m_Factor;
- };
+ }
- inline TOutput operator()( const TInput & A ) const
+ inline TOutput operator ()(const TInput& A) const
{
double x = static_cast<double>(A);
double px = CONST_PI * x;
double temp;
if (x == 0.0)
- {
+ {
temp = 1.0;
- }
+ }
else
- {
+ {
double z = m_Factor * x;
temp = vcl_sin(z) / z;
- }
+ }
return (x == 0.0) ? static_cast<TOutput>(temp) : static_cast<TOutput>(temp * vcl_sin(px) / px);
}
private:
// Equal to \f$ \frac{\pi}{m} \f$
- double m_Factor;
+ double m_Factor;
unsigned int m_Radius;
};
-}//namespace Function
-
+} //namespace Function
/**
* \class WindowedSincInterpolateImageLanczosFunction
@@ -91,23 +90,26 @@ private:
* \sa Function::BlackmanWindowFunction
* \ingroup ImageFunctionBases ImageInterpolators
*/
-template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep=double, class TInputInterpolator=double, class TOutputInterpolator=double>
+template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep =
+ double, class TInputInterpolator = double, class TOutputInterpolator = double>
class ITK_EXPORT WindowedSincInterpolateImageLanczosFunction :
- public WindowedSincInterpolateImageFunctionBase< TInputImage,
- ITK_TYPENAME Function::LanczosWindowFunction< TInputInterpolator, TOutputInterpolator>,
- TBoundaryCondition,
- TCoordRep >
+ public WindowedSincInterpolateImageFunctionBase<TInputImage,
+ ITK_TYPENAME Function::LanczosWindowFunction<TInputInterpolator,
+ TOutputInterpolator>,
+ TBoundaryCondition,
+ TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef WindowedSincInterpolateImageLanczosFunction Self;
+ typedef WindowedSincInterpolateImageLanczosFunction Self;
typedef WindowedSincInterpolateImageFunctionBase<TInputImage,
- ITK_TYPENAME Function::LanczosWindowFunction< TInputInterpolator,
- TOutputInterpolator>,
- TBoundaryCondition,
- TCoordRep> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ ITK_TYPENAME Function::LanczosWindowFunction<TInputInterpolator,
+ TOutputInterpolator>,
+ TBoundaryCondition,
+ TCoordRep>
+ Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(WindowedSincInterpolateImageLanczosFunction, WindowedSincInterpolateImageFunctionBase);
@@ -120,30 +122,28 @@ public:
typedef typename Superclass::OutputType OutputType;
/** Dimension underlying input image. */
- itkStaticConstMacro(ImageDimension, unsigned int,Superclass::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, Superclass::ImageDimension);
/** Superclass typedef inheritance. */
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::SizeType SizeType;
- typedef typename Superclass::RealType RealType;
- typedef typename Superclass::IteratorType IteratorType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
-
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::RealType RealType;
+ typedef typename Superclass::IteratorType IteratorType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
protected:
WindowedSincInterpolateImageLanczosFunction() {};
- ~WindowedSincInterpolateImageLanczosFunction() {};
+ ~WindowedSincInterpolateImageLanczosFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
- };
+ Superclass::PrintSelf(os, indent);
+ }
private:
- WindowedSincInterpolateImageLanczosFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ WindowedSincInterpolateImageLanczosFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
index 0d82404328..01ac15a1c8 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
@@ -34,7 +34,7 @@ namespace Function
* \f[ w(x) = 1 - ( \frac{x^2}{m^2} ) \f]
* \sa WindowedSincInterpolateImageWelchFunction
*/
-template< class TInput=double, class TOutput=double >
+template<class TInput = double, class TOutput = double>
class WelchWindowFunction
{
public:
@@ -46,13 +46,13 @@ public:
unsigned int GetRadius() const
{
return m_Radius;
- };
+ }
double GetFactor()
{
return m_Factor;
- };
+ }
- inline TOutput operator()( const TInput & A ) const
+ inline TOutput operator ()(const TInput& A) const
{
double x = static_cast<double>(A);
double px = CONST_PI * x;
@@ -61,11 +61,10 @@ public:
}
private:
// Equal to \f$ \frac{1}{m^2} \f$
- double m_Factor;
+ double m_Factor;
unsigned int m_Radius;
};
-}//namespace Function
-
+} //namespace Function
/**
* \class WindowedSincInterpolateImageWelchFunction
@@ -80,23 +79,26 @@ private:
* \sa Function::BlackmanWindowFunction
* \ingroup ImageFunctionBases ImageInterpolators
*/
-template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep=double, class TInputInterpolator=double, class TOutputInterpolator=double>
+template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep =
+ double, class TInputInterpolator = double, class TOutputInterpolator = double>
class ITK_EXPORT WindowedSincInterpolateImageWelchFunction :
- public WindowedSincInterpolateImageFunctionBase< TInputImage,
- ITK_TYPENAME Function::WelchWindowFunction< TInputInterpolator, TOutputInterpolator>,
- TBoundaryCondition,
- TCoordRep >
+ public WindowedSincInterpolateImageFunctionBase<TInputImage,
+ ITK_TYPENAME Function::WelchWindowFunction<TInputInterpolator,
+ TOutputInterpolator>,
+ TBoundaryCondition,
+ TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef WindowedSincInterpolateImageWelchFunction Self;
+ typedef WindowedSincInterpolateImageWelchFunction Self;
typedef WindowedSincInterpolateImageFunctionBase<TInputImage,
- ITK_TYPENAME Function::WelchWindowFunction< TInputInterpolator,
- TOutputInterpolator>,
- TBoundaryCondition,
- TCoordRep> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ ITK_TYPENAME Function::WelchWindowFunction<TInputInterpolator,
+ TOutputInterpolator>,
+ TBoundaryCondition,
+ TCoordRep>
+ Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(WindowedSincInterpolateImageWelchFunction, WindowedSincInterpolateImageFunctionBase);
@@ -109,30 +111,28 @@ public:
typedef typename Superclass::OutputType OutputType;
/** Dimension underlying input image. */
- itkStaticConstMacro(ImageDimension, unsigned int,Superclass::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, Superclass::ImageDimension);
/** Superclass typedef inheritance. */
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::SizeType SizeType;
- typedef typename Superclass::RealType RealType;
- typedef typename Superclass::IteratorType IteratorType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
-
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::RealType RealType;
+ typedef typename Superclass::IteratorType IteratorType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
protected:
WindowedSincInterpolateImageWelchFunction() {};
- ~WindowedSincInterpolateImageWelchFunction() {};
+ ~WindowedSincInterpolateImageWelchFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
- };
+ Superclass::PrintSelf(os, indent);
+ }
private:
- WindowedSincInterpolateImageWelchFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ WindowedSincInterpolateImageWelchFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
index 0f9f80223b..eea0214968 100644
--- a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
+++ b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
@@ -36,15 +36,16 @@ namespace otb
* \ingroup IntensityImageFilters Multithreaded
*/
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
-class ITK_EXPORT BinaryFunctorNeighborhoodJoinHistogramImageFilter : public itk::ImageToImageFilter<TInputImage1,TOutputImage>
+ class TOutputImage, class TFunction>
+class ITK_EXPORT BinaryFunctorNeighborhoodJoinHistogramImageFilter : public itk::ImageToImageFilter<TInputImage1,
+ TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef BinaryFunctorNeighborhoodJoinHistogramImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage1,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef BinaryFunctorNeighborhoodJoinHistogramImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage1, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -52,31 +53,30 @@ public:
/** Run-time type information (and related methods). */
itkTypeMacro(BinaryFunctorNeighborhoodJoinHistogramImageFilter, ImageToImageFilter);
-
/** Some convenient typedefs. */
- typedef TFunction FunctorType;
- typedef TInputImage1 Input1ImageType;
+ typedef TFunction FunctorType;
+ typedef TInputImage1 Input1ImageType;
typedef typename Input1ImageType::Pointer Input1ImagePointer;
typedef typename Input1ImageType::ConstPointer Input1ImageConstPointer;
- typedef typename Input1ImageType::RegionType Input1ImageRegionType;
- typedef typename Input1ImageType::PixelType Input1ImagePixelType;
- typedef TInputImage2 Input2ImageType;
+ typedef typename Input1ImageType::RegionType Input1ImageRegionType;
+ typedef typename Input1ImageType::PixelType Input1ImagePixelType;
+ typedef TInputImage2 Input2ImageType;
typedef typename Input2ImageType::Pointer Input2ImagePointer;
typedef typename Input2ImageType::ConstPointer Input2ImageConstPointer;
- typedef typename Input2ImageType::RegionType Input2ImageRegionType;
- typedef typename Input2ImageType::PixelType Input2ImagePixelType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputImagePixelType;
+ typedef typename Input2ImageType::RegionType Input2ImageRegionType;
+ typedef typename Input2ImageType::PixelType Input2ImagePixelType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputImagePixelType;
typedef itk::ProcessObject ProcessObjectType;
/** Connect one of the operands for pixel-wise addition */
- void SetInput1( const TInputImage1 * image1);
+ void SetInput1(const TInputImage1 * image1);
/** Connect one of the operands for pixel-wise addition */
- void SetInput2( const TInputImage2 * image2);
+ void SetInput2(const TInputImage2 * image2);
/** Get the inputs */
const TInputImage1 * GetInput1();
@@ -89,7 +89,7 @@ public:
FunctorType& GetFunctor()
{
return m_Functor;
- };
+ }
/** Set the functor object. This replaces the current Functor with a
* copy of the specified Functor. This allows the user to specify a
@@ -103,14 +103,13 @@ public:
this->Modified();
}
-
typedef itk::ConstNeighborhoodIterator<TInputImage1>
NeighborhoodIteratorType1;
typedef itk::ConstNeighborhoodIterator<TInputImage2>
NeighborhoodIteratorType2;
- typedef typename NeighborhoodIteratorType1::RadiusType RadiusType1;
- typedef typename NeighborhoodIteratorType2::RadiusType RadiusType2;
+ typedef typename NeighborhoodIteratorType1::RadiusType RadiusType1;
+ typedef typename NeighborhoodIteratorType2::RadiusType RadiusType2;
typedef unsigned char RadiusSizeType;
@@ -125,32 +124,31 @@ public:
/** Sets the histogram size. Note this function must be called before
\c Initialize(). */
- itkSetMacro( HistogramSize, HistogramSizeType );
+ itkSetMacro(HistogramSize, HistogramSizeType);
/** Gets the histogram size. */
- itkGetConstReferenceMacro( HistogramSize, HistogramSizeType );
+ itkGetConstReferenceMacro(HistogramSize, HistogramSizeType);
/** Factor to increase the upper bound for the samples in the histogram.
Default value is 0.001 */
- itkSetMacro( UpperBoundIncreaseFactor, double );
- itkGetMacro( UpperBoundIncreaseFactor, double );
+ itkSetMacro(UpperBoundIncreaseFactor, double);
+ itkGetMacro(UpperBoundIncreaseFactor, double);
/** The padding value. */
- itkSetMacro( PaddingValue, Input1ImagePixelType );
+ itkSetMacro(PaddingValue, Input1ImagePixelType);
/** Returns the padding value. */
- itkGetConstReferenceMacro( PaddingValue, Input1ImagePixelType );
+ itkGetConstReferenceMacro(PaddingValue, Input1ImagePixelType);
/** Set whether the padding value should be used to determine which pixels
should be ignored when calculating the similarity measure. Those pixels
in the fixed image which have the padding value will be ignored. */
- itkSetMacro( UsePaddingValue, bool );
- itkGetMacro( UsePaddingValue, bool );
-
+ itkSetMacro(UsePaddingValue, bool);
+ itkGetMacro(UsePaddingValue, bool);
protected:
BinaryFunctorNeighborhoodJoinHistogramImageFilter();
- virtual ~BinaryFunctorNeighborhoodJoinHistogramImageFilter() {};
+ virtual ~BinaryFunctorNeighborhoodJoinHistogramImageFilter() {}
/** BinaryFunctorNeighborhoodJoinHistogramImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -163,7 +161,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
/**
* Pad the inputs requested regions by radius
@@ -184,8 +182,8 @@ protected:
double m_UpperBoundIncreaseFactor;
private:
- BinaryFunctorNeighborhoodJoinHistogramImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ BinaryFunctorNeighborhoodJoinHistogramImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
FunctorType m_Functor;
diff --git a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
index 78bdaf0676..e8efdc5dad 100644
--- a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
+++ b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
@@ -31,222 +31,218 @@ namespace otb
* Constructor
*/
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
-BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
+ class TOutputImage, class TFunction>
+BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
::BinaryFunctorNeighborhoodJoinHistogramImageFilter()
{
- this->SetNumberOfRequiredInputs( 2 );
+ this->SetNumberOfRequiredInputs(2);
m_Radius = 3;
m_HistogramSize.Fill(256);
m_UsePaddingValue = false;
m_UpperBoundIncreaseFactor = 0.001;
}
-
/**
* Connect one of the operands for neighborhood-wise operation
*/
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
-::SetInput1( const TInputImage1 * image1 )
+BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
+::SetInput1(const TInputImage1 * image1)
{
// Process object is not const-correct so the const casting is required.
- SetNthInput(0, const_cast<TInputImage1 *>( image1 ));
+ SetNthInput(0, const_cast<TInputImage1 *>(image1));
}
-
/**
* Connect one of the operands for neighborhood-wise operation
*/
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
-::SetInput2( const TInputImage2 * image2 )
+BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
+::SetInput2(const TInputImage2 * image2)
{
// Process object is not const-correct so the const casting is required.
- SetNthInput(1, const_cast<TInputImage2 *>( image2 ));
+ SetNthInput(1, const_cast<TInputImage2 *>(image2));
}
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
const TInputImage1 *
-BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
+BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
::GetInput1()
{
- if (this->GetNumberOfInputs()<1)
- {
+ if (this->GetNumberOfInputs() < 1)
+ {
return 0;
- }
+ }
return static_cast<const TInputImage1 *>(this->itk::ProcessObject::GetInput(0));
}
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
const TInputImage2 *
-BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
+BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
::GetInput2()
{
- if (this->GetNumberOfInputs()<2)
- {
+ if (this->GetNumberOfInputs() < 2)
+ {
return 0;
- }
+ }
return static_cast<const TInputImage2 *>(this->itk::ProcessObject::GetInput(1));
}
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
+BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- Input1ImagePointer inputPtr1 =
- const_cast< TInputImage1 * >( this->GetInput1());
- Input2ImagePointer inputPtr2 =
- const_cast< TInputImage2 * >( this->GetInput2());
+ Input1ImagePointer inputPtr1 =
+ const_cast<TInputImage1 *>(this->GetInput1());
+ Input2ImagePointer inputPtr2 =
+ const_cast<TInputImage2 *>(this->GetInput2());
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr1 || !inputPtr2 || !outputPtr )
- {
+ if (!inputPtr1 || !inputPtr2 || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
typename TInputImage1::RegionType inputRequestedRegion1, inputRequestedRegion2;
inputRequestedRegion1 = inputPtr1->GetRequestedRegion();
// pad the input requested region by the operator radius
- inputRequestedRegion1.PadByRadius( m_Radius );
+ inputRequestedRegion1.PadByRadius(m_Radius);
inputRequestedRegion2 = inputRequestedRegion1;
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion1.Crop(inputPtr1->GetLargestPossibleRegion()))
- {
- inputPtr1->SetRequestedRegion( inputRequestedRegion1 );
- }
+ if (inputRequestedRegion1.Crop(inputPtr1->GetLargestPossibleRegion()))
+ {
+ inputPtr1->SetRequestedRegion(inputRequestedRegion1);
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr1->SetRequestedRegion( inputRequestedRegion1 );
+ inputPtr1->SetRequestedRegion(inputRequestedRegion1);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << this->GetNameOfClass()
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region of image 1.");
e.SetDataObject(inputPtr1);
throw e;
- }
- if ( inputRequestedRegion2.Crop(inputPtr2->GetLargestPossibleRegion()))
- {
- inputPtr2->SetRequestedRegion( inputRequestedRegion2 );
- }
+ }
+ if (inputRequestedRegion2.Crop(inputPtr2->GetLargestPossibleRegion()))
+ {
+ inputPtr2->SetRequestedRegion(inputRequestedRegion2);
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr2->SetRequestedRegion( inputRequestedRegion2 );
+ inputPtr2->SetRequestedRegion(inputRequestedRegion2);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << this->GetNameOfClass()
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region of image 1.");
e.SetDataObject(inputPtr2);
throw e;
- }
+ }
return;
}
-
/**
* Initialize the histogram
*/
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
-BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
+ class TOutputImage, class TFunction>
+BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
::HistogramType::Pointer
-BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
-::ComputeHistogram( )
+BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
+::ComputeHistogram()
{
// Calculate min and max image values in input1 image.
Input1ImageConstPointer pInput1Image
- = dynamic_cast<const TInputImage1*>(ProcessObjectType::GetInput(0));
+ = dynamic_cast<const TInputImage1*>(ProcessObjectType::GetInput(0));
Input1ImagePixelType minInput1, maxInput1;
itk::ImageRegionConstIterator<Input1ImageType> fiIt(pInput1Image,
- pInput1Image->GetBufferedRegion());
+ pInput1Image->GetBufferedRegion());
fiIt.GoToBegin();
minInput1 = fiIt.Value();
maxInput1 = fiIt.Value();
++fiIt;
while (!fiIt.IsAtEnd())
- {
+ {
Input1ImagePixelType value = fiIt.Value();
if (value < minInput1)
- {
+ {
minInput1 = value;
- }
+ }
else if (value > maxInput1)
- {
+ {
maxInput1 = value;
- }
+ }
++fiIt;
- }
+ }
// Calculate min and max image values in input2 image.
Input2ImageConstPointer pInput2Image
- = dynamic_cast<const TInputImage2*>(ProcessObjectType::GetInput(1));
+ = dynamic_cast<const TInputImage2*>(ProcessObjectType::GetInput(1));
Input2ImagePixelType minInput2, maxInput2;
itk::ImageRegionConstIterator<Input2ImageType> miIt(pInput2Image,
- pInput2Image->GetBufferedRegion());
+ pInput2Image->GetBufferedRegion());
miIt.GoToBegin();
minInput2 = miIt.Value();
maxInput2 = miIt.Value();
++miIt;
while (!miIt.IsAtEnd())
- {
+ {
Input2ImagePixelType value = miIt.Value();
if (value < minInput2)
- {
+ {
minInput2 = value;
- }
+ }
else if (value > maxInput2)
- {
+ {
maxInput2 = value;
- }
+ }
++miIt;
- }
+ }
// Initialize the upper and lower bounds of the histogram.
m_LowerBound[0] = minInput1;
m_LowerBound[1] = minInput2;
m_UpperBound[0] =
- maxInput1 + (maxInput1 - minInput1 ) * m_UpperBoundIncreaseFactor;
+ maxInput1 + (maxInput1 - minInput1) * m_UpperBoundIncreaseFactor;
m_UpperBound[1] =
- maxInput2 + (maxInput2 - minInput2 ) * m_UpperBoundIncreaseFactor;
-
+ maxInput2 + (maxInput2 - minInput2) * m_UpperBoundIncreaseFactor;
- typedef itk::ImageRegionConstIteratorWithIndex<Input1ImageType> Input1IteratorType;
- typedef itk::ImageRegionConstIteratorWithIndex<Input2ImageType> Input2IteratorType;
+ typedef itk::ImageRegionConstIteratorWithIndex<Input1ImageType> Input1IteratorType;
+ typedef itk::ImageRegionConstIteratorWithIndex<Input2ImageType> Input2IteratorType;
typename Input1ImageType::RegionType input1Region;
typename Input1ImageType::RegionType input2Region;
@@ -264,33 +260,30 @@ BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1,TInputImage2,TOut
ti1.GoToBegin();
ti2.GoToBegin();
while (!ti1.IsAtEnd() && !ti2.IsAtEnd())
- {
-
+ {
typename HistogramType::MeasurementVectorType sample;
sample[0] = ti1.Get();
sample[1] = ti2.Get();
- if (sample[0]!=itk::NumericTraits<Input1ImagePixelType>::Zero &&
- sample[1]!=itk::NumericTraits<Input2ImagePixelType>::Zero)
- histogram->IncreaseFrequency(sample, 1);
+ if (sample[0] != itk::NumericTraits<Input1ImagePixelType>::Zero &&
+ sample[1] != itk::NumericTraits<Input2ImagePixelType>::Zero) histogram->IncreaseFrequency(sample, 1);
++ti1;
++ti2;
- }
+ }
return histogram;
}
-
/**
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
-template <class TInputImage1, class TInputImage2, class TOutputImage, class TFunction >
+template <class TInputImage1, class TInputImage2, class TOutputImage, class TFunction>
void
BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread,
- int threadId)
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
+ int threadId)
{
//this->Initialize();
@@ -303,15 +296,14 @@ BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TO
itk::ZeroFluxNeumannBoundaryCondition<TInputImage2> nbc2;
// We use dynamic_cast since inputs are stored as DataObjects. The
- // ImageToJoinHistogramImageFilter::GetInput(int) always returns a pointer to a
- // TInputImage1 so it cannot be used for the second input.
+// ImageToJoinHistogramImageFilter::GetInput(int) always returns a pointer to a
+// TInputImage1 so it cannot be used for the second input.
Input1ImageConstPointer inputPtr1
- = dynamic_cast<const TInputImage1*>(ProcessObjectType::GetInput(0));
+ = dynamic_cast<const TInputImage1*>(ProcessObjectType::GetInput(0));
Input2ImageConstPointer inputPtr2
- = dynamic_cast<const TInputImage2*>(ProcessObjectType::GetInput(1));
+ = dynamic_cast<const TInputImage2*>(ProcessObjectType::GetInput(1));
OutputImagePointer outputPtr = this->GetOutput(0);
-
RadiusType1 r1;
r1.Fill(m_Radius);
NeighborhoodIteratorType1 neighInputIt1;
@@ -322,14 +314,13 @@ BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TO
itk::ImageRegionIterator<TOutputImage> outputIt;
-
// Find the data-set boundary "faces"
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage1>::FaceListType faceList1;
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage1> bC1;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage1> bC1;
faceList1 = bC1(inputPtr1, outputRegionForThread, r1);
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage2>::FaceListType faceList2;
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage2> bC2;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage2> bC2;
faceList2 = bC2(inputPtr2, outputRegionForThread, r2);
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage1>::FaceListType::iterator fit1;
@@ -340,8 +331,10 @@ BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TO
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
- for (fit1=faceList1.begin(), fit2=faceList2.begin(); fit1 != faceList1.end(), fit2 != faceList2.end(); ++fit1, ++fit2)
- {
+ for (fit1 = faceList1.begin(), fit2 = faceList2.begin();
+ fit1 != faceList1.end(), fit2 != faceList2.end();
+ ++fit1, ++fit2)
+ {
neighInputIt1 = itk::ConstNeighborhoodIterator<TInputImage1>(r1, inputPtr1, *fit1);
neighInputIt2 = itk::ConstNeighborhoodIterator<TInputImage2>(r1, inputPtr2, *fit2);
outputIt = itk::ImageRegionIterator<TOutputImage>(outputPtr, outputRegionForThread);
@@ -352,18 +345,17 @@ BinaryFunctorNeighborhoodJoinHistogramImageFilter<TInputImage1, TInputImage2, TO
neighInputIt2.OverrideBoundaryCondition(&nbc2);
neighInputIt2.GoToBegin();
- while ( ! outputIt.IsAtEnd() )
- {
+ while (!outputIt.IsAtEnd())
+ {
- outputIt.Set( m_Functor( neighInputIt1, neighInputIt2, histogram ) );
+ outputIt.Set(m_Functor(neighInputIt1, neighInputIt2, histogram));
++neighInputIt1;
++neighInputIt2;
++outputIt;
progress.CompletedPixel();
+ }
}
- }
-
}
diff --git a/Code/ChangeDetection/otbCBAMI.h b/Code/ChangeDetection/otbCBAMI.h
index 556a27988d..6529791b49 100644
--- a/Code/ChangeDetection/otbCBAMI.h
+++ b/Code/ChangeDetection/otbCBAMI.h
@@ -22,17 +22,15 @@
#include <stdlib.h>
#include <math.h>
-
namespace otb
{
// #define EPSILON_VALUE_CBAMI 0.01
-
namespace Functor
{
-template< class TInput1, class TInput2, class TOutput>
+template<class TInput1, class TInput2, class TOutput>
class CBAMI
{
public:
@@ -42,27 +40,27 @@ public:
typedef typename std::vector<VectorType> VectorOfVectorType;
typedef typename VectorOfVectorType::iterator VecOfVecIteratorType;
- CBAMI() {};
- virtual ~CBAMI() {};
- inline TOutput operator()( const TInput1 & itA,
- const TInput2 & itB) const
+ CBAMI() {}
+ virtual ~CBAMI() {}
+ inline TOutput operator ()(const TInput1& itA,
+ const TInput2& itB) const
{
- double epsilon = 0.01;
+ double epsilon = 0.01;
VectorType vecA;
VectorType vecB;
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
+ for (unsigned long pos = 0; pos < itA.Size(); ++pos)
+ {
vecA.push_back(static_cast<double>(itA.GetPixel(pos)));
vecB.push_back(static_cast<double>(itB.GetPixel(pos)));
- }
+ }
normalizeInPlace(vecA);
normalizeInPlace(vecB);
- return static_cast<TOutput>( - vcl_log( static_cast<double>(PhiMI(vecA, vecB)+epsilon) ));
+ return static_cast<TOutput>(-vcl_log(static_cast<double>(PhiMI(vecA, vecB) + epsilon)));
}
protected:
@@ -74,27 +72,26 @@ protected:
IteratorType itx;
- for ( itx = vx.begin(); itx < vx.end(); ++itx)
- {
+ for (itx = vx.begin(); itx < vx.end(); ++itx)
+ {
Ex += static_cast<TOutput>(*itx);
- }
+ }
Ex /= (vx.size());
TOutput Vx = 0.0;
- for ( itx = vx.begin(); itx < vx.end(); ++itx)
- {
- Vx += static_cast<TOutput>(vcl_pow(static_cast<double>((*itx)-Ex),2));
- }
+ for (itx = vx.begin(); itx < vx.end(); ++itx)
+ {
+ Vx += static_cast<TOutput>(vcl_pow(static_cast<double>((*itx) - Ex), 2));
+ }
Vx /= (vx.size());
- for ( itx = vx.begin(); itx < vx.end(); ++itx)
- {
- (*itx) = ((*itx)-Ex)/static_cast<TOutput>(vcl_sqrt(static_cast<double>(Vx)));
- }
-
+ for (itx = vx.begin(); itx < vx.end(); ++itx)
+ {
+ (*itx) = ((*itx) - Ex) / static_cast<TOutput>(vcl_sqrt(static_cast<double>(Vx)));
+ }
}
inline TOutput Exyc(VectorType vx, VectorType vy) const
@@ -107,19 +104,19 @@ protected:
IteratorType itx;
IteratorType ity;
- for ( itx = vx.begin(), ity = vy.begin(); itx < vx.end(); ++itx, ++ity)
- {
+ for (itx = vx.begin(), ity = vy.begin(); itx < vx.end(); ++itx, ++ity)
+ {
//Ex += (*itx);
//Ey += (*ity);
- Exy += (*itx)*(*ity);
+ Exy += (*itx) * (*ity);
- }
+ }
//Ex /= (vx.size());
//Ey /= (vy.size());
Exy /= (vx.size());
- return Exy-Ex*Ey;
+ return Exy - Ex * Ey;
}
inline TOutput Exyztc(VectorType vx, VectorType vy, VectorType vz, VectorType vt) const
@@ -144,42 +141,41 @@ protected:
TOutput Ez = 0.0;
TOutput Et = 0.0;
-
IteratorType itx;
IteratorType ity;
IteratorType itz;
IteratorType itt;
- for ( itx = vx.begin(),
- ity = vy.begin(),
- itz = vz.begin(),
- itt = vt.begin();
- itx < vx.end();
- ++itx,
- ++ity,
- itz++,
- itt++)
- {
+ for (itx = vx.begin(),
+ ity = vy.begin(),
+ itz = vz.begin(),
+ itt = vt.begin();
+ itx < vx.end();
+ ++itx,
+ ++ity,
+ itz++,
+ itt++)
+ {
//Ex += (*itx);
//Ey += (*ity);
//Ez += (*itz);
//Et += (*itt);
- Exy += (*itx)*(*ity);
- Exz += (*itx)*(*itz);
- Ext += (*itx)*(*itt);
- Eyz += (*ity)*(*itz);
- Eyt += (*ity)*(*itt);
- Ezt += (*itz)*(*itt);
+ Exy += (*itx) * (*ity);
+ Exz += (*itx) * (*itz);
+ Ext += (*itx) * (*itt);
+ Eyz += (*ity) * (*itz);
+ Eyt += (*ity) * (*itt);
+ Ezt += (*itz) * (*itt);
- Exyz += (*itx)*(*ity)*(*itz);
- Exyt += (*itx)*(*ity)*(*itt);
- Exzt += (*itx)*(*itz)*(*itt);
- Eyzt += (*ity)*(*itz)*(*itt);
+ Exyz += (*itx) * (*ity) * (*itz);
+ Exyt += (*itx) * (*ity) * (*itt);
+ Exzt += (*itx) * (*itz) * (*itt);
+ Eyzt += (*ity) * (*itz) * (*itt);
- Exyzt += (*itx)*(*ity)*(*itz)*(*itt);
+ Exyzt += (*itx) * (*ity) * (*itz) * (*itt);
- }
+ }
/*Ex /= (vx.size());
Ey /= (vx.size());
@@ -198,10 +194,9 @@ protected:
Exzt /= (vx.size());
Eyzt /= (vx.size());
-
- TOutput result = Exyzt - Exyz*Et- Exyt*Ez- Exzt*Ey- Eyzt*Ex +
- Exy*Ez*Et + Exz*Et*Ey + Ext*Ey*Ez + Eyz*Et*Ex + Eyt*Ex*Ez + Ezt*Ex*Ey -
- 3*Ex*Ey*Ez*Et;
+ TOutput result = Exyzt - Exyz * Et - Exyt * Ez - Exzt * Ey - Eyzt * Ex +
+ Exy * Ez * Et + Exz * Et * Ey + Ext * Ey * Ez + Eyz * Et * Ex + Eyt * Ex * Ez + Ezt * Ex * Ey -
+ 3 * Ex * Ey * Ez * Et;
return result;
}
@@ -220,10 +215,8 @@ protected:
// IteratorType itc;
// IteratorType itd;
-
TOutput Eabcd_c = Exyztc(va, vb, vc, vd);
-
TOutput Eab_c = Exyc(va, vb);
TOutput Eac_c = Exyc(va, vc);
TOutput Ead_c = Exyc(va, vd);
@@ -231,15 +224,13 @@ protected:
TOutput Ebd_c = Exyc(vb, vd);
TOutput Ebc_c = Exyc(vb, vc);
- return Eabcd_c - Eab_c*Ecd_c - Eac_c*Ebd_c - Ead_c*Ebc_c;
-
+ return Eabcd_c - Eab_c * Ecd_c - Eac_c * Ebd_c - Ead_c * Ebc_c;
}
inline TOutput PhiMI(VectorType v1, VectorType v2) const
{
-
VectorOfVectorType donnees;
donnees.push_back(v1);
donnees.push_back(v2);
@@ -252,22 +243,22 @@ protected:
TOutput termeR = 0.0;
TOutput termeQ = 0.0;
- for ( iti = donnees.begin(); iti < donnees.end(); ++iti )
- for ( itj = donnees.begin(); itj < donnees.end(); ++itj )
- {
- if (iti != itj)
- termeR += static_cast<TOutput>(vcl_pow(static_cast<double>(Rxy((*iti),(*itj))),2));
-
- for ( itk = donnees.begin(); itk < donnees.end(); ++itk )
- for ( itl = donnees.begin(); itl < donnees.end(); itl++ )
- {
- if ((iti != itj) || (iti != itk) || (iti != itl))
- termeQ += static_cast<TOutput>(vcl_pow( static_cast<double>(Qxijkl((*iti),(*itj),(*itk),(*itl))),2));
- }
- }
-
-
- return 1.0/4.0*termeR + 1.0/48.0*termeQ;
+ for (iti = donnees.begin(); iti < donnees.end(); ++iti)
+ for (itj = donnees.begin(); itj < donnees.end(); ++itj)
+ {
+ if (iti != itj) termeR += static_cast<TOutput>(vcl_pow(static_cast<double>(Rxy((*iti), (*itj))), 2));
+
+ for (itk = donnees.begin(); itk < donnees.end(); ++itk)
+ for (itl = donnees.begin(); itl < donnees.end(); itl++)
+ {
+ if ((iti != itj) || (iti != itk) ||
+ (iti !=
+ itl)) termeQ +=
+ static_cast<TOutput>(vcl_pow(static_cast<double>(Qxijkl((*iti), (*itj), (*itk), (*itl))), 2));
+ }
+ }
+
+ return 1.0 / 4.0 * termeR + 1.0 / 48.0 * termeQ;
}
diff --git a/Code/ChangeDetection/otbCBAMIChangeDetector.h b/Code/ChangeDetection/otbCBAMIChangeDetector.h
index e077237c09..f29c21bd8c 100644
--- a/Code/ChangeDetection/otbCBAMIChangeDetector.h
+++ b/Code/ChangeDetection/otbCBAMIChangeDetector.h
@@ -18,11 +18,9 @@
#ifndef __otbCBAMIChangeDetector_h
#define __otbCBAMIChangeDetector_h
-
#include "otbBinaryFunctorNeighborhoodImageFilter.h"
#include "otbCBAMI.h"
-
namespace otb
{
@@ -53,25 +51,25 @@ namespace otb
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT CBAMIChangeDetector :
- public BinaryFunctorNeighborhoodImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::CBAMI<
+ public BinaryFunctorNeighborhoodImageFilter<
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::CBAMI<
ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
- ITK_TYPENAME TOutputImage::PixelType> >
+ ITK_TYPENAME TOutputImage::PixelType> >
{
public:
/** Standard class typedefs. */
- typedef CBAMIChangeDetector Self;
+ typedef CBAMIChangeDetector Self;
typedef BinaryFunctorNeighborhoodImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::CBAMI<
- ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
- ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
- ITK_TYPENAME TOutputImage::PixelType>
- > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::CBAMI<
+ ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
+ ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
+ ITK_TYPENAME TOutputImage::PixelType>
+ > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -81,12 +79,11 @@ protected:
virtual ~CBAMIChangeDetector() {}
private:
- CBAMIChangeDetector(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ CBAMIChangeDetector(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/ChangeDetection/otbCommandProgressUpdate.h b/Code/ChangeDetection/otbCommandProgressUpdate.h
index c81e5e1304..47b10ddf51 100644
--- a/Code/ChangeDetection/otbCommandProgressUpdate.h
+++ b/Code/ChangeDetection/otbCommandProgressUpdate.h
@@ -30,23 +30,21 @@ class CommandProgressUpdate : public itk::Command
{
public:
typedef CommandProgressUpdate Self;
- typedef itk::Command Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- itkNewMacro( Self );
+ typedef itk::Command Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ itkNewMacro(Self);
protected:
- CommandProgressUpdate() {};
+ CommandProgressUpdate() {}
public:
- typedef const TFilter * FilterPointer;
+ typedef const TFilter * FilterPointer;
- void Execute(itk::Object *caller, const itk::EventObject & event);
+ void Execute(itk::Object *caller, const itk::EventObject& event);
- void Execute(const itk::Object * object, const itk::EventObject & event);
+ void Execute(const itk::Object * object, const itk::EventObject& event);
};
-
} // end namespace otb
-
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbCommandProgressUpdate.txx"
#endif
diff --git a/Code/ChangeDetection/otbCommandProgressUpdate.txx b/Code/ChangeDetection/otbCommandProgressUpdate.txx
index 7579f5b44e..a722def497 100644
--- a/Code/ChangeDetection/otbCommandProgressUpdate.txx
+++ b/Code/ChangeDetection/otbCommandProgressUpdate.txx
@@ -18,48 +18,44 @@
#ifndef __otbCommandProgressUpdate_txx
#define __otbCommandProgressUpdate_txx
-
#include "otbCommandProgressUpdate.h"
namespace otb
{
-
template <class TFilter>
-void CommandProgressUpdate<TFilter>::Execute(itk::Object *caller, const itk::EventObject & event)
+void CommandProgressUpdate<TFilter>::Execute(itk::Object *caller, const itk::EventObject& event)
{
- Execute( (const itk::Object *)caller, event);
+ Execute((const itk::Object *) caller, event);
}
template <class TFilter>
-void CommandProgressUpdate<TFilter>::Execute(const itk::Object * object, const itk::EventObject & event)
+void CommandProgressUpdate<TFilter>::Execute(const itk::Object * object, const itk::EventObject& event)
{
FilterPointer filter =
- dynamic_cast< FilterPointer >( object );
- if ( typeid( event ) != typeid( itk::ProgressEvent ) )
- {
+ dynamic_cast<FilterPointer>(object);
+ if (typeid(event) != typeid(itk::ProgressEvent))
+ {
return;
- }
+ }
int factor = 160;
- int val = int(filter->GetProgress()*factor);
+ int val = int(filter->GetProgress() * factor);
- if ((val%2) == 0)
- {
+ if ((val % 2) == 0)
+ {
std::cout << "|";
std::cout.flush();
- }
+ }
if (val == factor)
- {
+ {
std::cout << ">";
std::cout.flush();
- }
+ }
}
-
} // end namespace otb
-
#endif
diff --git a/Code/ChangeDetection/otbCorrelationChangeDetector.h b/Code/ChangeDetection/otbCorrelationChangeDetector.h
index 147e51849e..09a147af0c 100644
--- a/Code/ChangeDetection/otbCorrelationChangeDetector.h
+++ b/Code/ChangeDetection/otbCorrelationChangeDetector.h
@@ -50,25 +50,25 @@ namespace otb
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT CorrelationChangeDetector :
- public BinaryFunctorNeighborhoodImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::CrossCorrelation<
+ public BinaryFunctorNeighborhoodImageFilter<
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::CrossCorrelation<
ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
- ITK_TYPENAME TOutputImage::PixelType> >
+ ITK_TYPENAME TOutputImage::PixelType> >
{
public:
/** Standard class typedefs. */
- typedef CorrelationChangeDetector Self;
+ typedef CorrelationChangeDetector Self;
typedef BinaryFunctorNeighborhoodImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::CrossCorrelation<
- ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
- ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
- ITK_TYPENAME TOutputImage::PixelType>
- > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::CrossCorrelation<
+ ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
+ ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
+ ITK_TYPENAME TOutputImage::PixelType>
+ > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -78,12 +78,11 @@ protected:
virtual ~CorrelationChangeDetector() {}
private:
- CorrelationChangeDetector(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ CorrelationChangeDetector(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/ChangeDetection/otbCrossCorrelation.h b/Code/ChangeDetection/otbCrossCorrelation.h
index 87fb6ef087..9406801588 100644
--- a/Code/ChangeDetection/otbCrossCorrelation.h
+++ b/Code/ChangeDetection/otbCrossCorrelation.h
@@ -18,11 +18,9 @@
#ifndef __otbCrossCorrelation_h
#define __otbCrossCorrelation_h
-
namespace otb
{
-
namespace Functor
{
@@ -37,28 +35,26 @@ namespace Functor
*
*/
-
-template< class TInput1, class TInput2, class TOutput>
+template<class TInput1, class TInput2, class TOutput>
class CrossCorrelation
{
public:
- CrossCorrelation() {};
- virtual ~CrossCorrelation() {};
- inline TOutput operator()( const TInput1 & itA,
- const TInput2 & itB)
+ CrossCorrelation() {}
+ virtual ~CrossCorrelation() {}
+ inline TOutput operator ()(const TInput1& itA,
+ const TInput2& itB)
{
TOutput meanA = itk::NumericTraits<TOutput>::Zero;
TOutput meanB = itk::NumericTraits<TOutput>::Zero;
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
+ for (unsigned long pos = 0; pos < itA.Size(); ++pos)
+ {
meanA += static_cast<TOutput>(itA.GetPixel(pos));
meanB += static_cast<TOutput>(itB.GetPixel(pos));
-
- }
+ }
meanA /= itA.Size();
meanB /= itB.Size();
@@ -66,36 +62,42 @@ public:
TOutput varA = itk::NumericTraits<TOutput>::Zero;
TOutput varB = itk::NumericTraits<TOutput>::Zero;
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
+ for (unsigned long pos = 0; pos < itA.Size(); ++pos)
+ {
- varA += static_cast<TOutput>( vcl_pow( static_cast<double>(itA.GetPixel(pos))-static_cast<double>(meanA),static_cast<double>(2.0)));
- varB += static_cast<TOutput>( vcl_pow( static_cast<double>(itB.GetPixel(pos))-static_cast<double>(meanB),static_cast<double>(2.0)));
+ varA +=
+ static_cast<TOutput>(vcl_pow(static_cast<double>(itA.GetPixel(pos)) - static_cast<double>(meanA),
+ static_cast<double>(2.0)));
+ varB +=
+ static_cast<TOutput>(vcl_pow(static_cast<double>(itB.GetPixel(pos)) - static_cast<double>(meanB),
+ static_cast<double>(2.0)));
- }
+ }
varA /= itA.Size();
varB /= itB.Size();
TOutput crossCorrel = itk::NumericTraits<TOutput>::Zero;
- if (varA!= itk::NumericTraits<TOutput>::Zero && varB!= itk::NumericTraits<TOutput>::Zero)
- {
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
+ if (varA != itk::NumericTraits<TOutput>::Zero && varB != itk::NumericTraits<TOutput>::Zero)
{
- crossCorrel += (static_cast<TOutput>(itA.GetPixel(pos))-meanA)*(static_cast<TOutput>(itB.GetPixel(pos))-meanB)/(itA.Size()*vcl_sqrt(static_cast<double>(varA*varB)));
+ for (unsigned long pos = 0; pos < itA.Size(); ++pos)
+ {
+ crossCorrel +=
+ (static_cast<TOutput>(itA.GetPixel(pos)) -
+ meanA) *
+ (static_cast<TOutput>(itB.GetPixel(pos)) - meanB) / (itA.Size() * vcl_sqrt(static_cast<double>(varA * varB)));
+ }
}
- }
- else if (varA==itk::NumericTraits<TOutput>::Zero && varB==itk::NumericTraits<TOutput>::Zero)
- {
+ else if (varA == itk::NumericTraits<TOutput>::Zero && varB == itk::NumericTraits<TOutput>::Zero)
+ {
crossCorrel = itk::NumericTraits<TOutput>::One;
- }
- return static_cast<TOutput>( itk::NumericTraits<TOutput>::One - crossCorrel );
+ }
+ return static_cast<TOutput>(itk::NumericTraits<TOutput>::One - crossCorrel);
}
};
}
} // end namespace otb
-
#endif
diff --git a/Code/ChangeDetection/otbJoinHistogramMI.h b/Code/ChangeDetection/otbJoinHistogramMI.h
index 35eeef25f1..075dbc43b3 100644
--- a/Code/ChangeDetection/otbJoinHistogramMI.h
+++ b/Code/ChangeDetection/otbJoinHistogramMI.h
@@ -26,18 +26,18 @@ namespace otb
namespace Functor
{
-template< class TInput1, class TInput2, class TOutput>
+template<class TInput1, class TInput2, class TOutput>
class JoinHistogramMI
{
public:
- typedef double HistogramFrequencyType;
+ typedef double HistogramFrequencyType;
typedef typename itk::Statistics::Histogram<HistogramFrequencyType, 2> HistogramType;
- JoinHistogramMI() {};
- virtual ~JoinHistogramMI() {};
- inline TOutput operator()( const TInput1 & itA,
- const TInput2 & itB, const HistogramType* histogram)
+ JoinHistogramMI() {}
+ virtual ~JoinHistogramMI() {}
+ inline TOutput operator ()(const TInput1& itA,
+ const TInput2& itB, const HistogramType* histogram)
{
- TOutput jointEntropy = itk::NumericTraits<TOutput>::Zero;
+ TOutput jointEntropy = itk::NumericTraits<TOutput>::Zero;
HistogramFrequencyType totalFreq = histogram->GetTotalFrequency();
/* for(unsigned long pos = 0; pos< itA.Size(); ++pos)
@@ -82,27 +82,25 @@ public:
return entropyX + entropyY - jointEntropy;*/
-
typename HistogramType::MeasurementVectorType sample;
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
+ for (unsigned long pos = 0; pos < itA.Size(); ++pos)
+ {
double valueA = static_cast<double>(itA.GetPixel(pos));
double valueB = static_cast<double>(itB.GetPixel(pos));
sample[0] = valueA;
sample[1] = valueB;
-
HistogramFrequencyType freq = histogram->GetFrequency(
- histogram->GetIndex(sample));
+ histogram->GetIndex(sample));
if (freq > 0)
- {
- jointEntropy += freq*vcl_log(freq);
- }
+ {
+ jointEntropy += freq * vcl_log(freq);
+ }
- }
+ }
- jointEntropy = -jointEntropy/static_cast<TOutput>(totalFreq) +
+ jointEntropy = -jointEntropy / static_cast<TOutput>(totalFreq) +
vcl_log(totalFreq);
return jointEntropy;
@@ -118,7 +116,7 @@ public:
}*/
- return static_cast<TOutput>( 0 );
+ return static_cast<TOutput>(0);
}
/* void SetHistogram(HistogramType* histo)
@@ -132,5 +130,4 @@ public:
}
} // end namespace otb
-
#endif
diff --git a/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h b/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h
index 3117a2bba8..2611eb0052 100644
--- a/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h
+++ b/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h
@@ -50,28 +50,27 @@ namespace otb
* \ingroup IntensityImageFilters Multithreaded
*/
-
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT JoinHistogramMIImageFilter :
- public BinaryFunctorNeighborhoodJoinHistogramImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::JoinHistogramMI<
+ public BinaryFunctorNeighborhoodJoinHistogramImageFilter<
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::JoinHistogramMI<
typename itk::ConstNeighborhoodIterator<TInputImage1>,
typename itk::ConstNeighborhoodIterator<TInputImage2>,
- typename TOutputImage::PixelType> >
+ typename TOutputImage::PixelType> >
{
public:
/** Standard class typedefs. */
- typedef JoinHistogramMIImageFilter Self;
+ typedef JoinHistogramMIImageFilter Self;
typedef BinaryFunctorNeighborhoodJoinHistogramImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::JoinHistogramMI<
- typename itk::ConstNeighborhoodIterator<TInputImage1>,
- typename itk::ConstNeighborhoodIterator<TInputImage2>,
- typename TOutputImage::PixelType>
- > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::JoinHistogramMI<
+ typename itk::ConstNeighborhoodIterator<TInputImage1>,
+ typename itk::ConstNeighborhoodIterator<TInputImage2>,
+ typename TOutputImage::PixelType>
+ > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -81,12 +80,11 @@ protected:
virtual ~JoinHistogramMIImageFilter() {}
private:
- JoinHistogramMIImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ JoinHistogramMIImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.h b/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.h
index 9fb820f639..1aa5b78817 100644
--- a/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.h
+++ b/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.h
@@ -30,79 +30,77 @@ namespace otb
* \brief Helper class for KullbackLeiblerDistanceImageFilter. Please refer to KullbackLeiblerDistanceImageFilter.
*
*/
-template < class TInput >
+template <class TInput>
class CumulantsForEdgeworth
{
-public :
- CumulantsForEdgeworth ( const TInput & input );
- CumulantsForEdgeworth ( const itk::Image< typename TInput::ImageType::PixelType, 1 > * input );
- virtual ~CumulantsForEdgeworth () { }
+public:
+ CumulantsForEdgeworth (const TInput& input);
+ CumulantsForEdgeworth (const itk::Image<typename TInput::ImageType::PixelType, 1> * input);
+ virtual ~CumulantsForEdgeworth () {}
/** KL Divergence calculation */
template <class TInput2>
- double Divergence ( const CumulantsForEdgeworth<TInput2> & cumulants );
+ double Divergence(const CumulantsForEdgeworth<TInput2>& cumulants);
- inline double GetMean () const
+ inline double GetMean() const
{
return this->fMean;
}
- inline double GetVariance () const
+ inline double GetVariance() const
{
return this->fVariance;
}
- inline double GetSkewness () const
+ inline double GetSkewness() const
{
return this->fSkewness;
}
- inline double GetKurtosis () const
+ inline double GetKurtosis() const
{
return this->fKurtosis;
}
- inline bool IsDataAvailable () const {
+ inline bool IsDataAvailable() const
+ {
return this->fDataAvailable;
}
-protected :
+protected:
/** Moment estimation from intial neighborhood */
- void MakeSumAndMoments ( const TInput & input );
+ void MakeSumAndMoments(const TInput& input);
/** Moment estimation from raw data */
- void MakeSumAndMoments ( const itk::Image< typename TInput::ImageType::PixelType, 1 > * input );
+ void MakeSumAndMoments(const itk::Image<typename TInput::ImageType::PixelType, 1> * input);
/** transformation moment -> cumulants (for Edgeworth) */
void MakeCumulants();
- double fSum0, fSum1, fSum2, fSum3, fSum4;
- double fMu1, fMu2, fMu3, fMu4;
- double fMean, fVariance, fSkewness, fKurtosis;
+ double fSum0, fSum1, fSum2, fSum3, fSum4;
+ double fMu1, fMu2, fMu3, fMu4;
+ double fMean, fVariance, fSkewness, fKurtosis;
- bool fDataAvailable;
+ bool fDataAvailable;
};
-
namespace Functor
{
/** \class KullbackLeiblerDistance
* \brief Functor for KullbackLeiblerDistanceImageFilter. Please refer to KullbackLeiblerDistanceImageFilter.
*
*/
-template < class TInput1, class TInput2, class TOutput >
+template <class TInput1, class TInput2, class TOutput>
class KullbackLeiblerDistance
{
-public :
- KullbackLeiblerDistance () { }
- virtual ~KullbackLeiblerDistance () { }
- TOutput operator () ( const TInput1 & it1, const TInput2 & it2 )
+public:
+ KullbackLeiblerDistance () {}
+ virtual ~KullbackLeiblerDistance () {}
+ TOutput operator ()(const TInput1& it1, const TInput2& it2)
{
- CumulantsForEdgeworth<TInput1> cum1 ( it1 );
- if ( !cum1.IsDataAvailable() )
- return static_cast<TOutput>( 0. );
+ CumulantsForEdgeworth<TInput1> cum1 (it1);
+ if (!cum1.IsDataAvailable()) return static_cast<TOutput>(0.);
- CumulantsForEdgeworth<TInput2> cum2 ( it2 );
- if ( !cum2.IsDataAvailable() )
- return static_cast<TOutput>( 0. );
+ CumulantsForEdgeworth<TInput2> cum2 (it2);
+ if (!cum2.IsDataAvailable()) return static_cast<TOutput>(0.);
- return static_cast<TOutput> ( cum1.Divergence( cum2 )
- + cum2.Divergence( cum1 ) );
+ return static_cast<TOutput> (cum1.Divergence(cum2)
+ + cum2.Divergence(cum1));
}
};
@@ -139,9 +137,9 @@ public :
*/
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT KullbackLeiblerDistanceImageFilter :
- public otb::BinaryFunctorNeighborhoodImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::KullbackLeiblerDistance<
+ public otb::BinaryFunctorNeighborhoodImageFilter<
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::KullbackLeiblerDistance<
typename itk::ConstNeighborhoodIterator<TInputImage1>,
typename itk::ConstNeighborhoodIterator<TInputImage2>,
typename TOutputImage::PixelType> >
@@ -150,13 +148,13 @@ public:
/** Standard class typedefs. */
typedef KullbackLeiblerDistanceImageFilter Self;
typedef otb::BinaryFunctorNeighborhoodImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::KullbackLeiblerDistance<
- typename itk::ConstNeighborhoodIterator<TInputImage1>,
- typename itk::ConstNeighborhoodIterator<TInputImage2>,
- typename TOutputImage::PixelType>
- > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::KullbackLeiblerDistance<
+ typename itk::ConstNeighborhoodIterator<TInputImage1>,
+ typename itk::ConstNeighborhoodIterator<TInputImage2>,
+ typename TOutputImage::PixelType>
+ > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
@@ -167,8 +165,8 @@ protected:
virtual ~KullbackLeiblerDistanceImageFilter() {}
private:
- KullbackLeiblerDistanceImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ KullbackLeiblerDistanceImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -178,7 +176,4 @@ private:
#include "otbKullbackLeiblerDistanceImageFilter.txx"
#endif
-
#endif
-
-
diff --git a/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.txx b/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.txx
index 001dbace52..410190dc65 100644
--- a/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.txx
+++ b/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.txx
@@ -33,35 +33,35 @@ namespace otb
* CumulantsForEdgeworth
*********************************************************************
*/
-template < class TInput >
-CumulantsForEdgeworth< TInput >
-::CumulantsForEdgeworth ( const TInput & input )
+template <class TInput>
+CumulantsForEdgeworth<TInput>
+::CumulantsForEdgeworth (const TInput& input)
{
- MakeSumAndMoments( input );
+ MakeSumAndMoments(input);
MakeCumulants();
}
-template < class TInput >
-CumulantsForEdgeworth< TInput >
-::CumulantsForEdgeworth ( const itk::Image< typename TInput::ImageType::PixelType, 1 > * input )
+template <class TInput>
+CumulantsForEdgeworth<TInput>
+::CumulantsForEdgeworth (const itk::Image<typename TInput::ImageType::PixelType, 1> * input)
{
- MakeSumAndMoments( input );
+ MakeSumAndMoments(input);
MakeCumulants();
}
/* ========================== Divergence de KL ======================= */
-template < class TInput >
-template < class TInput2 >
+template <class TInput>
+template <class TInput2>
double
-CumulantsForEdgeworth< TInput >
-::Divergence ( const CumulantsForEdgeworth<TInput2> & cumulants )
+CumulantsForEdgeworth<TInput>
+::Divergence(const CumulantsForEdgeworth<TInput2>& cumulants)
{
double cum1 = GetMean();
double cum2 = GetVariance();
double cum3 = GetSkewness();
- double sqrt_cum2 = sqrt( cum2 );
+ double sqrt_cum2 = sqrt(cum2);
double cum2_3 = cum2 * cum2 * cum2;
double cum3_2 = cum3 * cum3;
@@ -76,7 +76,7 @@ CumulantsForEdgeworth< TInput >
double tilde_cum3_2 = tilde_cum3 * tilde_cum3;
double beta = sqrt_cum2 / tilde_cum2;
- double alpha = ( cum1 - tilde_cum1 ) / tilde_cum2;
+ double alpha = (cum1 - tilde_cum1) / tilde_cum2;
double alpha_2 = alpha * alpha;
double alpha_4 = alpha_2 * alpha_2;
@@ -87,7 +87,7 @@ CumulantsForEdgeworth< TInput >
double beta_6 = beta_2 * beta_4;
double c2 = alpha_2 + beta_2;
- double c3 = alpha * ( alpha_2 + 3.0 * beta_2 );
+ double c3 = alpha * (alpha_2 + 3.0 * beta_2);
double c4 = alpha_4 + 6.0 * alpha_2 * beta_2 + 3.0 * beta_4;
double c6 = alpha_6 + 15.0 * alpha_4 * beta_2 + 45.0 * alpha_2 * beta_4 + 15.0 * beta_6;
@@ -96,30 +96,30 @@ CumulantsForEdgeworth< TInput >
double a3 = c6 - 15.0 * c4 / tilde_cum2 + 45.0 * c2 / tilde_cum2_2 - 15.0 / tilde_cum2_3;
double tmp = cum1 - tilde_cum1 + sqrt_cum2;
- double resu = cum3_2 / ( 12.0 * cum2_3 )
- + ( log( tilde_cum2 / cum2 )
- - 1.0 + tmp * tmp / tilde_cum2 ) / 2.0
- - ( tilde_cum3 * a1 / 6.0 + tilde_cum4 * a2 / 24.0 + tilde_cum3_2 * a3 / 72.0 )
- - tilde_cum3_2 * ( c6 - 6.0 * c4 / cum2 + 9.0 * c2 / tilde_cum2_2 ) / 72.0
- - 10.0 * cum3 * tilde_cum3 * ( cum1 - tilde_cum1 ) * ( cum2 - tilde_cum2 ) / tilde_cum2_6;
+ double resu = cum3_2 / (12.0 * cum2_3)
+ + (log(tilde_cum2 / cum2)
+ - 1.0 + tmp * tmp / tilde_cum2) / 2.0
+ - (tilde_cum3 * a1 / 6.0 + tilde_cum4 * a2 / 24.0 + tilde_cum3_2 * a3 / 72.0)
+ - tilde_cum3_2 * (c6 - 6.0 * c4 / cum2 + 9.0 * c2 / tilde_cum2_2) / 72.0
+ - 10.0 * cum3 * tilde_cum3 * (cum1 - tilde_cum1) * (cum2 - tilde_cum2) / tilde_cum2_6;
return resu < 0.0 ? 0.0 : resu;
}
/* ========== Moment estimation from initial neighborhood ============ */
-template < class TInput >
+template <class TInput>
void
-CumulantsForEdgeworth< TInput >
-::MakeSumAndMoments ( const TInput & input )
+CumulantsForEdgeworth<TInput>
+::MakeSumAndMoments(const TInput& input)
{
fSum0 = fSum1 = fSum2 = fSum3 = fSum4 = 0.0;
- double pixel,pixel_2;
+ double pixel, pixel_2;
- for ( unsigned long i = 0; i < input.Size(); ++i )
- {
- pixel = static_cast<double> ( input.GetPixel(i) );
+ for (unsigned long i = 0; i < input.Size(); ++i)
+ {
+ pixel = static_cast<double> (input.GetPixel(i));
pixel_2 = pixel * pixel;
fSum0 += 1.0;
@@ -127,37 +127,37 @@ CumulantsForEdgeworth< TInput >
fSum2 += pixel_2;
fSum3 += pixel_2 * pixel;
fSum4 += pixel_2 * pixel_2;
- }
+ }
fMu1 = fSum1 / fSum0;
fMu2 = fSum2 / fSum0 - fMu1 * fMu1;
- if ( fMu2 <= 0.0 )
- {
+ if (fMu2 <= 0.0)
+ {
//otbGenericMsgDebugMacro( << "Potential NAN detected in function MakeSumAndMoments.");
fMu3 = 0.0;
fMu4 = 4.0;
fDataAvailable = false;
return;
- }
+ }
- double sigma = sqrt( fMu2 );
+ double sigma = sqrt(fMu2);
- itk::VariableLengthVector<double> tab ( input.Size() );
- double * x = const_cast<double *> ( tab.GetDataPointer() );
- for ( unsigned long i = 0; i < input.Size(); ++i )
- *x++ = ( static_cast<double> ( input.GetPixel(i) ) - fMu1 ) / sigma;
+ itk::VariableLengthVector<double> tab(input.Size());
+ double * x = const_cast<double *> (tab.GetDataPointer());
+ for (unsigned long i = 0; i < input.Size(); ++i)
+ *x++ = (static_cast<double> (input.GetPixel(i)) - fMu1) / sigma;
fMu3 = fMu4 = 0.0;
- x = const_cast<double *> ( tab.GetDataPointer() );
- for ( unsigned long i = 0; i < input.Size(); ++i )
- {
+ x = const_cast<double *> (tab.GetDataPointer());
+ for (unsigned long i = 0; i < input.Size(); ++i)
+ {
pixel = *x++;
pixel_2 = pixel * pixel;
fMu3 += pixel * pixel_2;
fMu4 += pixel_2 * pixel_2;
- }
+ }
fMu3 /= fSum0;
fMu4 /= fSum0;
@@ -167,25 +167,25 @@ CumulantsForEdgeworth< TInput >
/* ================= Moment estimation from raw data ================= */
-template < class TInput >
+template <class TInput>
void
-CumulantsForEdgeworth< TInput >
-::MakeSumAndMoments ( const itk::Image< typename TInput::ImageType::PixelType, 1 > * input )
+CumulantsForEdgeworth<TInput>
+::MakeSumAndMoments(const itk::Image<typename TInput::ImageType::PixelType, 1> * input)
{
fSum0 = fSum1 = fSum2 = fSum3 = fSum4 = 0.0;
- double pixel,pixel_2;
+ double pixel, pixel_2;
- typedef itk::Image< typename TInput::ImageType::PixelType, 1 > LocalImageType;
- typedef itk::ImageRegionConstIterator< LocalImageType > ImageRegionConstIteratorType;
+ typedef itk::Image<typename TInput::ImageType::PixelType, 1> LocalImageType;
+ typedef itk::ImageRegionConstIterator<LocalImageType> ImageRegionConstIteratorType;
- ImageRegionConstIteratorType inputIter ( input, input->GetRequestedRegion() );
+ ImageRegionConstIteratorType inputIter(input, input->GetRequestedRegion());
inputIter.GoToBegin();
unsigned int inputSize = 0;
- while ( !inputIter.IsAtEnd() )
- {
- pixel = static_cast<double> ( inputIter.Get() );
+ while (!inputIter.IsAtEnd())
+ {
+ pixel = static_cast<double> (inputIter.Get());
pixel_2 = pixel * pixel;
fSum0 += 1.0;
@@ -196,76 +196,73 @@ CumulantsForEdgeworth< TInput >
++inputIter;
++inputSize;
- }
+ }
fMu1 = fSum1 / fSum0;
fMu2 = fSum2 / fSum0 - fMu1 * fMu1;
- if ( fMu2 <= 0.0 )
- {
+ if (fMu2 <= 0.0)
+ {
//otbGenericMsgDebugMacro( << "Potential NAN detected in function MakeSumAndMoments.");
fMu3 = 0.0;
fMu4 = 4.0;
-
+
fDataAvailable = false;
return;
- }
+ }
- double sigma = sqrt( fMu2 );
+ double sigma = sqrt(fMu2);
- std::vector<double> tab ( inputSize );
+ std::vector<double> tab(inputSize);
std::vector<double>::iterator iterTab = tab.begin();
inputIter.GoToBegin();
- while ( !inputIter.IsAtEnd() )
- {
- *iterTab = ( static_cast<double> ( inputIter.Get() ) - fMu1 ) / sigma;
+ while (!inputIter.IsAtEnd())
+ {
+ *iterTab = (static_cast<double> (inputIter.Get()) - fMu1) / sigma;
++inputIter;
++iterTab;
- }
+ }
fMu3 = fMu4 = 0.0;
- for ( iterTab = tab.begin(); iterTab != tab.end(); ++iterTab )
- {
+ for (iterTab = tab.begin(); iterTab != tab.end(); ++iterTab)
+ {
pixel = *iterTab;
pixel_2 = pixel * pixel;
fMu3 += pixel * pixel_2;
fMu4 += pixel_2 * pixel_2;
- }
+ }
fMu3 /= fSum0;
fMu4 /= fSum0;
- otbGenericMsgDebugMacro( << "Moments: " << fMu1 << ",\t" << fMu2 << ",\t" << fMu3 << ",\t" << fMu4 );
+ otbGenericMsgDebugMacro(<< "Moments: " << fMu1 << ",\t" << fMu2 << ",\t" << fMu3 << ",\t" << fMu4);
fDataAvailable = true;
//return 0;
}
-
/* ================= moments -> cumulants transformation ============= */
-template < class TInput >
+template <class TInput>
void
-CumulantsForEdgeworth< TInput >
-::MakeCumulants ()
+CumulantsForEdgeworth<TInput>
+::MakeCumulants()
{
- if ( fDataAvailable )
- {
+ if (fDataAvailable)
+ {
fMean = fMu1;
fVariance = fMu2;
fSkewness = fMu3;
fKurtosis = fMu4 - 3.0;
- }
+ }
//return 0;
}
} // end of namespace otb
#endif
-
-
diff --git a/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.h b/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.h
index 6e5df46fdf..044a652c5b 100644
--- a/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.h
+++ b/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.h
@@ -39,53 +39,54 @@ namespace otb
template <class TInput>
class CumulantsForEdgeworthProfile
{
-public :
- typedef itk::Vector<double,4> CumulantType;
- typedef std::vector< CumulantType > CumulantSet;
- typedef CumulantSet::iterator Iterator;
+public:
+ typedef itk::Vector<double, 4> CumulantType;
+ typedef std::vector<CumulantType> CumulantSet;
+ typedef CumulantSet::iterator Iterator;
- CumulantsForEdgeworthProfile ( const TInput & input, std::vector< itk::Array2D<int> > & mask );
- virtual ~CumulantsForEdgeworthProfile () { }
+ CumulantsForEdgeworthProfile (const TInput& input, std::vector<itk::Array2D<int> >& mask);
+ virtual ~CumulantsForEdgeworthProfile () {}
// Kullback-Leibler Profile
template <class TInput2>
- itk::VariableLengthVector<double> KL_profile ( CumulantsForEdgeworthProfile<TInput2> & cumulants );
+ itk::VariableLengthVector<double> KL_profile(CumulantsForEdgeworthProfile<TInput2>& cumulants);
// Kullback-Leibler divergence at a given scale
- double KL_profile ( const CumulantType & cumulants1, const CumulantType & cumulants2 );
+ double KL_profile(const CumulantType& cumulants1, const CumulantType& cumulants2);
// Access to data
- inline CumulantType & GetCumulantAtScale( int i )
+ inline CumulantType& GetCumulantAtScale(int i)
{
return this->fCum[i];
}
// Check data availability
- inline bool IsDataAvailable () const {
+ inline bool IsDataAvailable() const
+ {
return this->fDataAvailable;
}
// debug
int m_debug;
-protected :
+protected:
// Momentum Estimation from encapsulated neighborhood
- int MakeSumAndMoments ( const TInput & input, std::vector< itk::Array2D<int> > & mask );
+ int MakeSumAndMoments(const TInput& input, std::vector<itk::Array2D<int> >& mask);
// momentum estimation from the smaller window
- int InitSumAndMoments ( const TInput & input, itk::Array2D<int> & mask );
+ int InitSumAndMoments(const TInput& input, itk::Array2D<int>& mask);
//
- int ReInitSumAndMoments ( const TInput & input, itk::Array2D<int> & mask, int level );
+ int ReInitSumAndMoments(const TInput& input, itk::Array2D<int>& mask, int level);
// transformation moment -> cumulants (for Edgeworth)
int MakeCumulants();
// Internal variables
- double fSum0, fSum1, fSum2, fSum3, fSum4;
+ double fSum0, fSum1, fSum2, fSum3, fSum4;
CumulantSet fMu;
CumulantSet fCum;
bool fDataAvailable;
-private :
+private:
CumulantsForEdgeworthProfile (); // Not implemented
- CumulantsForEdgeworthProfile ( const TInput & input ); // Not implemented
+ CumulantsForEdgeworthProfile (const TInput& input); // Not implemented
};
@@ -95,14 +96,14 @@ namespace Functor
* \brief Functor for KullbackLeiblerProfileImageFilter. Please refer to KullbackLeiblerProfileImageFilter.
*
*/
-template< class TInput1, class TInput2, class TOutput >
+template<class TInput1, class TInput2, class TOutput>
class KullbackLeiblerProfile
{
-public :
+public:
KullbackLeiblerProfile ();
- virtual ~KullbackLeiblerProfile () { }
+ virtual ~KullbackLeiblerProfile () {}
// Gives the radius min and max of neighborhood
- void SetRadius ( const unsigned char & min, const unsigned char & max );
+ void SetRadius(const unsigned char& min, const unsigned char& max);
unsigned char GetRadiusMin(void);
unsigned char GetRadiusMax(void);
// Gives the size of the profile
@@ -111,14 +112,14 @@ public :
return m_mask.size();
}
// functor
- TOutput operator () ( const TInput1 & it1, const TInput2 & it2 );
-protected :
+ TOutput operator ()(const TInput1& it1, const TInput2& it2);
+protected:
// Make the set of masks to play the increase in window size
- void MakeMultiscaleProfile ();
+ void MakeMultiscaleProfile();
// Internal attributes
- unsigned char m_RadiusMin;
- unsigned char m_RadiusMax;
- std::vector< itk::Array2D<int> > m_mask;
+ unsigned char m_RadiusMin;
+ unsigned char m_RadiusMax;
+ std::vector<itk::Array2D<int> > m_mask;
};
} // Functor
@@ -154,9 +155,9 @@ protected :
*/
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT KullbackLeiblerProfileImageFilter :
- public BinaryFunctorNeighborhoodVectorImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::KullbackLeiblerProfile<
+ public BinaryFunctorNeighborhoodVectorImageFilter<
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::KullbackLeiblerProfile<
typename itk::ConstNeighborhoodIterator<TInputImage1>,
typename itk::ConstNeighborhoodIterator<TInputImage2>,
typename TOutputImage::PixelType> >
@@ -165,13 +166,13 @@ public:
/** Standard class typedefs. */
typedef KullbackLeiblerProfileImageFilter Self;
typedef /*typename*/ BinaryFunctorNeighborhoodVectorImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::KullbackLeiblerProfile<
- typename itk::ConstNeighborhoodIterator<TInputImage1>,
- typename itk::ConstNeighborhoodIterator<TInputImage2>,
- typename TOutputImage::PixelType>
- > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::KullbackLeiblerProfile<
+ typename itk::ConstNeighborhoodIterator<TInputImage1>,
+ typename itk::ConstNeighborhoodIterator<TInputImage2>,
+ typename TOutputImage::PixelType>
+ > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
@@ -182,8 +183,8 @@ protected:
virtual ~KullbackLeiblerProfileImageFilter() {}
private:
- KullbackLeiblerProfileImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ KullbackLeiblerProfileImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -193,7 +194,4 @@ private:
#include "otbKullbackLeiblerProfileImageFilter.txx"
#endif
-
#endif
-
-
diff --git a/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.txx b/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.txx
index 2de7bcdef1..4ba6a7c004 100644
--- a/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.txx
+++ b/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.txx
@@ -36,9 +36,9 @@ namespace otb
template <class TInput>
CumulantsForEdgeworthProfile<TInput>
::CumulantsForEdgeworthProfile
-( const TInput & input, std::vector< itk::Array2D<int> > & mask )
+ (const TInput& input, std::vector<itk::Array2D<int> >& mask)
{
- m_debug = MakeSumAndMoments( input, mask );
+ m_debug = MakeSumAndMoments(input, mask);
MakeCumulants();
}
@@ -48,15 +48,15 @@ template <class TInput>
template <class TInput2>
itk::VariableLengthVector<double>
CumulantsForEdgeworthProfile<TInput>
-::KL_profile ( CumulantsForEdgeworthProfile<TInput2> & cumulants )
+::KL_profile(CumulantsForEdgeworthProfile<TInput2>& cumulants)
{
- itk::VariableLengthVector<double> resu ( fCum.size() );
+ itk::VariableLengthVector<double> resu(fCum.size());
Iterator iter1 = fCum.begin();
Iterator iter2 = cumulants.fCum.begin();
- for (unsigned int level = 0; level < resu.GetSize(); level++ )
- resu[level] = KL_profile( (*iter1++), (*iter2++) );
+ for (unsigned int level = 0; level < resu.GetSize(); level++)
+ resu[level] = KL_profile((*iter1++), (*iter2++));
return resu;
}
@@ -67,14 +67,14 @@ template <class TInput>
double
CumulantsForEdgeworthProfile<TInput>
::KL_profile
-( const CumulantType & cumulants1, const CumulantType & cumulants2 )
+ (const CumulantType& cumulants1, const CumulantType& cumulants2)
{
double cum1 = cumulants1[0];
double cum2 = cumulants1[1];
double cum3 = cumulants1[2];
// double cum4 = cumulants1[3]; // unused
- double sqrt_cum2 = sqrt( cum2 );
+ double sqrt_cum2 = sqrt(cum2);
double cum2_3 = cum2 * cum2 * cum2;
double cum3_2 = cum3 * cum3;
@@ -89,7 +89,7 @@ CumulantsForEdgeworthProfile<TInput>
double tilde_cum3_2 = tilde_cum3 * tilde_cum3;
double beta = sqrt_cum2 / tilde_cum2;
- double alpha = ( cum1 - tilde_cum1 ) / tilde_cum2;
+ double alpha = (cum1 - tilde_cum1) / tilde_cum2;
double alpha_2 = alpha * alpha;
double alpha_4 = alpha_2 * alpha_2;
@@ -100,7 +100,7 @@ CumulantsForEdgeworthProfile<TInput>
double beta_6 = beta_2 * beta_4;
double c2 = alpha_2 + beta_2;
- double c3 = alpha * ( alpha_2 + 3.0 * beta_2 );
+ double c3 = alpha * (alpha_2 + 3.0 * beta_2);
double c4 = alpha_4 + 6.0 * alpha_2 * beta_2 + 3.0 * beta_4;
double c6 = alpha_6 + 15.0 * alpha_4 * beta_2 + 45.0 * alpha_2 * beta_4 + 15.0 * beta_6;
@@ -109,15 +109,14 @@ CumulantsForEdgeworthProfile<TInput>
double a3 = c6 - 15.0 * c4 / tilde_cum2 + 45.0 * c2 / tilde_cum2_2 - 15.0 / tilde_cum2_3;
double tmp = cum1 - tilde_cum1 + sqrt_cum2;
- double resu = cum3_2 / ( 12.0 * cum2_3 )
- + ( log( tilde_cum2 / cum2 )
- - 1.0 + tmp * tmp / tilde_cum2 ) / 2.0
- - ( tilde_cum3 * a1 / 6.0 + tilde_cum4 * a2 / 24.0 + tilde_cum3_2 * a3 / 72.0 )
- - tilde_cum3_2 * ( c6 - 6.0 * c4 / cum2 + 9.0 * c2 / tilde_cum2_2 ) / 72.0
- - 10.0 * cum3 * tilde_cum3 * ( cum1 - tilde_cum1 ) * ( cum2 - tilde_cum2 ) / tilde_cum2_6;
+ double resu = cum3_2 / (12.0 * cum2_3)
+ + (log(tilde_cum2 / cum2)
+ - 1.0 + tmp * tmp / tilde_cum2) / 2.0
+ - (tilde_cum3 * a1 / 6.0 + tilde_cum4 * a2 / 24.0 + tilde_cum3_2 * a3 / 72.0)
+ - tilde_cum3_2 * (c6 - 6.0 * c4 / cum2 + 9.0 * c2 / tilde_cum2_2) / 72.0
+ - 10.0 * cum3 * tilde_cum3 * (cum1 - tilde_cum1) * (cum2 - tilde_cum2) / tilde_cum2_6;
- if ( vnl_math_isnan( resu ) || resu > 1e3 )
- resu = 1e3;
+ if (vnl_math_isnan(resu) || resu > 1e3) resu = 1e3;
return resu < 0.0 ? 0.0 : resu;
}
@@ -128,17 +127,15 @@ template <class TInput>
int
CumulantsForEdgeworthProfile<TInput>
::MakeSumAndMoments
-( const TInput & input, std::vector< itk::Array2D<int> > & mask )
+ (const TInput& input, std::vector<itk::Array2D<int> >& mask)
{
- fMu.resize( mask.size() );
- std::vector< itk::Array2D<int> >::iterator iter = mask.begin();
+ fMu.resize(mask.size());
+ std::vector<itk::Array2D<int> >::iterator iter = mask.begin();
- if ( InitSumAndMoments ( input, (*iter++) ) )
- return 1;
+ if (InitSumAndMoments (input, (*iter++))) return 1;
- for (unsigned int level = 1; level < mask.size(); level++ )
- if ( ReInitSumAndMoments( input, (*iter++), level ) )
- return 1;
+ for (unsigned int level = 1; level < mask.size(); level++)
+ if (ReInitSumAndMoments(input, (*iter++), level)) return 1;
return 0;
}
@@ -150,24 +147,24 @@ template <class TInput>
int
CumulantsForEdgeworthProfile<TInput>
::InitSumAndMoments
-( const TInput & input, itk::Array2D<int> & mask )
+ (const TInput& input, itk::Array2D<int>& mask)
{
fSum0 = fSum1 = fSum2 = fSum3 = fSum4 = 0.0;
fMu[0].Fill(0.0);
- unsigned int i,j;
+ unsigned int i, j;
unsigned long k = 0;
- double pixel,pixel_2;
+ double pixel, pixel_2;
// for ( unsigned long i = 0; i < input.Size(); ++i )
- for (i = 0; i < mask.rows(); ++i )
- {
- for ( j = 0; j < mask.cols(); ++j )
+ for (i = 0; i < mask.rows(); ++i)
{
- // std::cerr << "(" << i << "," << j << ") k=" << k << " ";
- if ( mask.get(i,j) == 1 )
+ for (j = 0; j < mask.cols(); ++j)
{
- pixel = static_cast<double> ( input.GetPixel(k) );
+ // std::cerr << "(" << i << "," << j << ") k=" << k << " ";
+ if (mask.get(i, j) == 1)
+ {
+ pixel = static_cast<double> (input.GetPixel(k));
pixel_2 = pixel * pixel;
fSum0 += 1.0;
@@ -176,64 +173,63 @@ CumulantsForEdgeworthProfile<TInput>
fSum3 += pixel_2 * pixel;
fSum4 += pixel_2 * pixel_2;
// std::cerr << "*\n";
- }
+ }
++k;
+ }
}
- }
- if ( fSum0 == 0.0 )
- {
+ if (fSum0 == 0.0)
+ {
fDataAvailable = false;
return 1;
- }
+ }
double mu1, mu2;
mu1 = fSum1 / fSum0;
mu2 = fSum2 / fSum0 - mu1 * mu1;
- if ( mu2 == 0.0 )
- {
+ if (mu2 == 0.0)
+ {
fDataAvailable = false;
return 1;
- }
+ }
- double sigma = sqrt( mu2 );
+ double sigma = sqrt(mu2);
- itk::VariableLengthVector<double> tab ( input.Size() );
- double * x = const_cast<double *> ( tab.GetDataPointer() );
- for ( unsigned long cp = 0; cp < input.Size(); ++cp )
- *x++ = ( static_cast<double> ( input.GetPixel(cp) ) - mu1 ) / sigma;
+ itk::VariableLengthVector<double> tab(input.Size());
+ double * x = const_cast<double *> (tab.GetDataPointer());
+ for (unsigned long cp = 0; cp < input.Size(); ++cp)
+ *x++ = (static_cast<double> (input.GetPixel(cp)) - mu1) / sigma;
double mu3 = 0.0;
double mu4 = 0.0;
- x = const_cast<double *> ( tab.GetDataPointer() );
+ x = const_cast<double *> (tab.GetDataPointer());
// for ( unsigned long i = 0; i < input.Size(); ++i )
- for ( i = 0; i < mask.rows(); ++i )
- {
- for ( j = 0; j < mask.cols(); ++j )
+ for (i = 0; i < mask.rows(); ++i)
{
- if ( mask.get(i,j) == 1 )
+ for (j = 0; j < mask.cols(); ++j)
{
+ if (mask.get(i, j) == 1)
+ {
pixel = *x++;
pixel_2 = pixel * pixel;
mu3 += pixel * pixel_2;
mu4 += pixel_2 * pixel_2;
+ }
+ else ++x;
}
- else
- ++x;
}
- }
mu3 /= fSum0;
mu4 /= fSum0;
- if ( vnl_math_isnan( mu3 ) || vnl_math_isnan( mu4 ) )
- {
+ if (vnl_math_isnan(mu3) || vnl_math_isnan(mu4))
+ {
fDataAvailable = false;
return 1;
- }
+ }
fMu[0][0] = mu1;
fMu[0][1] = mu2;
@@ -251,29 +247,29 @@ template <class TInput>
int
CumulantsForEdgeworthProfile<TInput>
::ReInitSumAndMoments
-( const TInput & input, itk::Array2D<int> & mask, int level )
+ (const TInput& input, itk::Array2D<int>& mask, int level)
{
fMu[level].Fill(0.0);
// mise a jour du comptage...
double sum0 = 0.0,
- sum1 = 0.0,
- sum2 = 0.0,
- sum3 = 0.0,
- sum4 = 0.0;
+ sum1 = 0.0,
+ sum2 = 0.0,
+ sum3 = 0.0,
+ sum4 = 0.0;
- double pixel,pixel_2;
+ double pixel, pixel_2;
- unsigned int i,j;
+ unsigned int i, j;
unsigned long k = 0L;
// for ( unsigned long i = 0; i < input.Size(); ++i )
- for ( i = 0; i < mask.rows(); ++i )
- {
- for ( j = 0; j < mask.cols(); ++j )
+ for (i = 0; i < mask.rows(); ++i)
{
- if ( mask.get(i,j) == 1 )
+ for (j = 0; j < mask.cols(); ++j)
{
- pixel = static_cast<double> ( input.GetPixel(k) );
+ if (mask.get(i, j) == 1)
+ {
+ pixel = static_cast<double> (input.GetPixel(k));
pixel_2 = pixel * pixel;
sum0 += 1.0;
@@ -281,10 +277,10 @@ CumulantsForEdgeworthProfile<TInput>
sum2 += pixel_2;
sum3 += pixel * pixel_2;
sum4 += pixel_2 * pixel_2;
- }
+ }
++k;
+ }
}
- }
fSum0 += sum0;
fSum1 += sum1;
@@ -300,16 +296,16 @@ CumulantsForEdgeworthProfile<TInput>
fMu[level][0] = mu;
fMu[level][1] = fSum2 / fSum0 - mu_2;
- double sigma = sqrt( fSum2 );
+ double sigma = sqrt(fSum2);
double sigma_2 = fSum2;
double sigma_3 = sigma * sigma_2;
double sigma_4 = sigma_2 * sigma_2;
- fMu[level][2] = ( fSum3 - 3.0 * mu * fSum2 + 3.0 * mu_2 * fSum1 - fSum0 * mu_3 )
- / ( sigma_3 * fSum0 );
- fMu[level][3] = ( fSum4 - 4.0 * mu * fSum3 + 6.0 * mu_2 * fSum2
- - 4.0 * mu_3 * fSum1 + fSum0 * mu_4 )
- / ( sigma_4 * fSum0 );
+ fMu[level][2] = (fSum3 - 3.0 * mu * fSum2 + 3.0 * mu_2 * fSum1 - fSum0 * mu_3)
+ / (sigma_3 * fSum0);
+ fMu[level][3] = (fSum4 - 4.0 * mu * fSum3 + 6.0 * mu_2 * fSum2
+ - 4.0 * mu_3 * fSum1 + fSum0 * mu_4)
+ / (sigma_4 * fSum0);
return 0;
}
@@ -321,13 +317,12 @@ int
CumulantsForEdgeworthProfile<TInput>
::MakeCumulants()
{
- if ( !IsDataAvailable() )
- return 1;
+ if (!IsDataAvailable()) return 1;
- fCum.resize( fMu.size() );
+ fCum.resize(fMu.size());
fCum = fMu;
- for ( unsigned int i = 0; i < fCum.size(); ++i )
+ for (unsigned int i = 0; i < fCum.size(); ++i)
fCum[i][3] -= 3.0;
return 0;
@@ -343,8 +338,8 @@ CumulantsForEdgeworthProfile<TInput>
namespace Functor
{
-template< class TInput1, class TInput2, class TOutput >
-KullbackLeiblerProfile<TInput1,TInput2,TOutput>
+template<class TInput1, class TInput2, class TOutput>
+KullbackLeiblerProfile<TInput1, TInput2, TOutput>
::KullbackLeiblerProfile ()
{
m_RadiusMin = 1;
@@ -353,108 +348,104 @@ KullbackLeiblerProfile<TInput1,TInput2,TOutput>
/* =========== Gives the radius min and max of neighborhood ========== */
-template< class TInput1, class TInput2, class TOutput >
+template<class TInput1, class TInput2, class TOutput>
void
-KullbackLeiblerProfile<TInput1,TInput2,TOutput>
-::SetRadius ( const unsigned char & min, const unsigned char & max )
+KullbackLeiblerProfile<TInput1, TInput2, TOutput>
+::SetRadius(const unsigned char& min, const unsigned char& max)
{
m_RadiusMin = min < max ? min : max;
m_RadiusMax = max > min ? max : min;
MakeMultiscaleProfile();
}
-template< class TInput1, class TInput2, class TOutput >
+template<class TInput1, class TInput2, class TOutput>
unsigned char
-KullbackLeiblerProfile<TInput1,TInput2,TOutput>
+KullbackLeiblerProfile<TInput1, TInput2, TOutput>
::GetRadiusMin(void)
{
return m_RadiusMin;
}
-template< class TInput1, class TInput2, class TOutput >
+template<class TInput1, class TInput2, class TOutput>
unsigned char
-KullbackLeiblerProfile<TInput1,TInput2,TOutput>
+KullbackLeiblerProfile<TInput1, TInput2, TOutput>
::GetRadiusMax(void)
{
return m_RadiusMax;
}
-
/* ====== Make the set of masks to play the increase in window size == */
-template< class TInput1, class TInput2, class TOutput >
+template<class TInput1, class TInput2, class TOutput>
void
-KullbackLeiblerProfile<TInput1,TInput2,TOutput>
-::MakeMultiscaleProfile ()
+KullbackLeiblerProfile<TInput1, TInput2, TOutput>
+::MakeMultiscaleProfile()
{
- m_mask.resize( m_RadiusMax - m_RadiusMin + 1 );
- int lenMax = 2*m_RadiusMax+1;
- int i,j,middle = m_RadiusMax;
+ m_mask.resize(m_RadiusMax - m_RadiusMin + 1);
+ int lenMax = 2 * m_RadiusMax + 1;
+ int i, j, middle = m_RadiusMax;
// let's begin by the smaller neighborhood
- std::vector< itk::Array2D<int> >::iterator outer_iter = m_mask.begin();
- (*outer_iter).SetSize( lenMax, lenMax );
+ std::vector<itk::Array2D<int> >::iterator outer_iter = m_mask.begin();
+ (*outer_iter).SetSize(lenMax, lenMax);
(*outer_iter).fill(0);
- for ( i = middle - m_RadiusMin; i <= middle + m_RadiusMin; ++i )
- for ( j = middle - m_RadiusMin; j <= middle + m_RadiusMin; ++j )
- (*outer_iter).put(i,j,1);
+ for (i = middle - m_RadiusMin; i <= middle + m_RadiusMin; ++i)
+ for (j = middle - m_RadiusMin; j <= middle + m_RadiusMin; ++j)
+ (*outer_iter).put(i, j, 1);
// std::cerr << "outerIter = " << (*outer_iter) << std::endl;
// let's continue with increasing neighborhoods
++outer_iter;
- for ( int radius = m_RadiusMin+1; radius <= m_RadiusMax; ++radius )
- {
- (*outer_iter).SetSize( lenMax, lenMax );
+ for (int radius = m_RadiusMin + 1; radius <= m_RadiusMax; ++radius)
+ {
+ (*outer_iter).SetSize(lenMax, lenMax);
(*outer_iter).fill(0);
- for ( i = middle - radius; i <= middle + radius; ++i )
- {
- (*outer_iter).put( i, middle-radius, 1 );
- (*outer_iter).put( i, middle+radius, 1 );
- (*outer_iter).put( middle-radius, i, 1 );
- (*outer_iter).put( middle+radius, i, 1 );
- }
+ for (i = middle - radius; i <= middle + radius; ++i)
+ {
+ (*outer_iter).put(i, middle - radius, 1);
+ (*outer_iter).put(i, middle + radius, 1);
+ (*outer_iter).put(middle - radius, i, 1);
+ (*outer_iter).put(middle + radius, i, 1);
+ }
// std::cerr << "outerIter = " << (*outer_iter) << std::endl;
++outer_iter;
- }
+ }
}
/* ========================== Functor ================================ */
-template< class TInput1, class TInput2, class TOutput >
+template<class TInput1, class TInput2, class TOutput>
TOutput
-KullbackLeiblerProfile<TInput1,TInput2,TOutput>
-::operator ()
-( const TInput1 & it1, const TInput2 & it2 )
-{
- CumulantsForEdgeworthProfile<TInput1> cum1 ( it1, m_mask );
-
- if ( cum1.m_debug )
+KullbackLeiblerProfile<TInput1, TInput2, TOutput>
+::operator()
+ (const TInput1 &it1, const TInput2 &it2)
{
- itk::VariableLengthVector<double> resu ( m_RadiusMax - m_RadiusMin + 1 );
- resu.Fill( 1e3 );
- return static_cast<TOutput> ( resu );
- }
+ CumulantsForEdgeworthProfile<TInput1> cum1(it1, m_mask);
- CumulantsForEdgeworthProfile<TInput2> cum2 ( it2, m_mask );
+ if (cum1.m_debug)
+ {
+ itk::VariableLengthVector<double> resu(m_RadiusMax - m_RadiusMin + 1);
+ resu.Fill(1e3);
+ return static_cast<TOutput> (resu);
+ }
- if ( cum2.m_debug )
- {
- itk::VariableLengthVector<double> resu ( m_RadiusMax - m_RadiusMin + 1 );
- resu.Fill( 1e3 );
- return static_cast<TOutput> ( resu );
- }
+ CumulantsForEdgeworthProfile<TInput2> cum2(it2, m_mask);
- return static_cast<TOutput> ( cum1.KL_profile( cum2 ) + cum2.KL_profile( cum1 ) );
-}
+ if (cum2.m_debug)
+ {
+ itk::VariableLengthVector<double> resu(m_RadiusMax - m_RadiusMin + 1);
+ resu.Fill(1e3);
+ return static_cast<TOutput> (resu);
+ }
+
+ return static_cast<TOutput> (cum1.KL_profile(cum2) + cum2.KL_profile(cum1));
+ }
} // Functor
} // namespace otb
-
#endif
-
-
diff --git a/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.h b/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.h
index 3167684f25..3e31532174 100644
--- a/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.h
+++ b/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.h
@@ -18,7 +18,6 @@
=========================================================================*/
-
#ifndef __otbKullbackLeiblerSupervizedDistanceImageFilter_h
#define __otbKullbackLeiblerSupervizedDistanceImageFilter_h
@@ -67,50 +66,49 @@ namespace Functor
* \brief Functor for KullbackLeiblerSupervizedDistanceImageFilter. Please refer to KullbackLeiblerSupervizedDistanceImageFilter.
*
*/
-template < class TInput1, class TInput2, class TInputROIImage, class TOutput >
+template <class TInput1, class TInput2, class TInputROIImage, class TOutput>
class KullbackLeiblerSupervizedDistance
{
-public :
+public:
KullbackLeiblerSupervizedDistance ();
virtual ~KullbackLeiblerSupervizedDistance ();
/** performs the preprocess calculation on the training area */
- void Evaluate ( const typename TInput1::ImageType * img1,
- const typename TInput2::ImageType * img2,
- const TInputROIImage * imgROI );
+ void Evaluate(const typename TInput1::ImageType * img1,
+ const typename TInput2::ImageType * img2,
+ const TInputROIImage * imgROI);
/** The functor by itself */
- TOutput operator () ( const TInput1 & it1, const TInput2 & it2 );
+ TOutput operator ()(const TInput1& it1, const TInput2& it2);
-protected :
+protected:
typedef ROIdataConversion<
- typename TInput1::ImageType, TInputROIImage > ROIConversionType1;
+ typename TInput1::ImageType, TInputROIImage> ROIConversionType1;
typedef itk::ConstNeighborhoodIterator<
- typename ROIConversionType1::OutputImageType > ROIInputType1;
+ typename ROIConversionType1::OutputImageType> ROIInputType1;
typedef ROIdataConversion<
- typename TInput2::ImageType, TInputROIImage > ROIConversionType2;
+ typename TInput2::ImageType, TInputROIImage> ROIConversionType2;
typedef itk::ConstNeighborhoodIterator<
- typename ROIConversionType2::OutputImageType > ROIInputType2;
+ typename ROIConversionType2::OutputImageType> ROIInputType2;
- CumulantsForEdgeworth< ROIInputType1 > * m_CumROI1;
- CumulantsForEdgeworth< ROIInputType2 > * m_CumROI2;
-private :
- KullbackLeiblerSupervizedDistance ( const KullbackLeiblerSupervizedDistance & );
+ CumulantsForEdgeworth<ROIInputType1> * m_CumROI1;
+ CumulantsForEdgeworth<ROIInputType2> * m_CumROI2;
+private:
+ KullbackLeiblerSupervizedDistance (const KullbackLeiblerSupervizedDistance&);
};
} // Functor
-
template <class TInputImage1, class TInputImage2, class TInputROIImage, class TOutputImage>
class ITK_EXPORT KullbackLeiblerSupervizedDistanceImageFilter :
- public otb::BinaryFunctorNeighborhoodImageFilter<
- TInputImage1, TInputImage2, TOutputImage,
- Functor::KullbackLeiblerSupervizedDistance<
- typename itk::ConstNeighborhoodIterator< TInputImage1 >,
- typename itk::ConstNeighborhoodIterator< TInputImage2 >,
+ public otb::BinaryFunctorNeighborhoodImageFilter<
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::KullbackLeiblerSupervizedDistance<
+ typename itk::ConstNeighborhoodIterator<TInputImage1>,
+ typename itk::ConstNeighborhoodIterator<TInputImage2>,
TInputROIImage,
typename TOutputImage::PixelType> >
{
@@ -118,42 +116,42 @@ public:
/** Standard class typedefs. */
typedef KullbackLeiblerSupervizedDistanceImageFilter Self;
typedef typename otb::BinaryFunctorNeighborhoodImageFilter<
- TInputImage1, TInputImage2, TOutputImage,
- Functor::KullbackLeiblerSupervizedDistance<
- typename itk::ConstNeighborhoodIterator< TInputImage1 >,
- typename itk::ConstNeighborhoodIterator< TInputImage2 >,
- TInputROIImage,
- typename TOutputImage::PixelType >
- > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::KullbackLeiblerSupervizedDistance<
+ typename itk::ConstNeighborhoodIterator<TInputImage1>,
+ typename itk::ConstNeighborhoodIterator<TInputImage2>,
+ TInputROIImage,
+ typename TOutputImage::PixelType>
+ > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Vectors that hold the training area */
typedef typename TInputImage1::PixelType MeasurementType1;
typedef typename TInputImage2::PixelType MeasurementType2;
- typedef std::vector< MeasurementType1 > TrainingMeasureType1;
- typedef std::vector< MeasurementType2 > TrainingMeasureType2;
+ typedef std::vector<MeasurementType1> TrainingMeasureType1;
+ typedef std::vector<MeasurementType2> TrainingMeasureType2;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Method for creation of the training area and the computation
* of some reference cumulants */
- void SetTrainingArea ( const TInputROIImage * trainingImage );
+ void SetTrainingArea(const TInputROIImage * trainingImage);
protected:
virtual void BeforeThreadedGenerateData(void);
KullbackLeiblerSupervizedDistanceImageFilter()
- {
+ {
this->SetNumberOfRequiredInputs(3);
- }
+ }
virtual ~KullbackLeiblerSupervizedDistanceImageFilter() {}
private:
- KullbackLeiblerSupervizedDistanceImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ KullbackLeiblerSupervizedDistanceImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -164,5 +162,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.txx b/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.txx
index ab1a4438af..16773ec981 100644
--- a/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.txx
+++ b/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.txx
@@ -18,7 +18,6 @@
=========================================================================*/
-
#ifndef __otbKullbackLeiblerSupervizedDistanceImageFilter_txx
#define __otbKullbackLeiblerSupervizedDistanceImageFilter_txx
@@ -30,16 +29,16 @@ namespace otb
namespace Functor
{
-template < class TInput1, class TInput2, class TInputROIImage, class TOutput >
-KullbackLeiblerSupervizedDistance< TInput1, TInput2, TInputROIImage, TOutput >
+template <class TInput1, class TInput2, class TInputROIImage, class TOutput>
+KullbackLeiblerSupervizedDistance<TInput1, TInput2, TInputROIImage, TOutput>
::KullbackLeiblerSupervizedDistance ()
{
m_CumROI1 = NULL;
m_CumROI2 = NULL;
}
-template < class TInput1, class TInput2, class TInputROIImage, class TOutput >
-KullbackLeiblerSupervizedDistance< TInput1, TInput2, TInputROIImage, TOutput >
+template <class TInput1, class TInput2, class TInputROIImage, class TOutput>
+KullbackLeiblerSupervizedDistance<TInput1, TInput2, TInputROIImage, TOutput>
::~KullbackLeiblerSupervizedDistance ()
{
delete m_CumROI1;
@@ -49,78 +48,82 @@ KullbackLeiblerSupervizedDistance< TInput1, TInput2, TInputROIImage, TOutput >
m_CumROI2 = NULL;
}
-template < class TInput1, class TInput2, class TInputROIImage, class TOutput >
+template <class TInput1, class TInput2, class TInputROIImage, class TOutput>
void
-KullbackLeiblerSupervizedDistance< TInput1, TInput2, TInputROIImage, TOutput >
-::Evaluate ( const typename TInput1::ImageType * img1,
- const typename TInput2::ImageType * img2,
- const TInputROIImage * imgROI )
+KullbackLeiblerSupervizedDistance<TInput1, TInput2, TInputROIImage, TOutput>
+::Evaluate(const typename TInput1::ImageType * img1,
+ const typename TInput2::ImageType * img2,
+ const TInputROIImage * imgROI)
{
- typedef ROIdataConversion< typename TInput1::ImageType, TInputROIImage >
+ typedef ROIdataConversion<typename TInput1::ImageType, TInputROIImage>
ROIConversionType1;
typedef itk::ConstNeighborhoodIterator<
- typename ROIConversionType1::OutputImageType > ROIInputType1;
+ typename ROIConversionType1::OutputImageType> ROIInputType1;
typename ROIConversionType1::Pointer convertion1 = ROIConversionType1::New();
- convertion1->SetInputImage( img1 );
- convertion1->SetROIImage( imgROI );
+ convertion1->SetInputImage(img1);
+ convertion1->SetROIImage(imgROI);
convertion1->Update();
- if ( m_CumROI1 != NULL )
- delete m_CumROI1;
+ if (m_CumROI1 != NULL) delete m_CumROI1;
- m_CumROI1 = new CumulantsForEdgeworth< ROIInputType1 > ( convertion1->GetOutput() );
+ m_CumROI1 = new CumulantsForEdgeworth<ROIInputType1> (convertion1->GetOutput());
- if ( !m_CumROI1->IsDataAvailable() )
- {
- throw itk::ExceptionObject( __FILE__, __LINE__, "Cumulants estimated from ROI in image 1 are not usable", ITK_LOCATION );
- }
+ if (!m_CumROI1->IsDataAvailable())
+ {
+ throw itk::ExceptionObject(__FILE__,
+ __LINE__,
+ "Cumulants estimated from ROI in image 1 are not usable",
+ ITK_LOCATION);
+ }
- typedef ROIdataConversion< typename TInput2::ImageType, TInputROIImage >
+ typedef ROIdataConversion<typename TInput2::ImageType, TInputROIImage>
ROIConversionType2;
typedef itk::ConstNeighborhoodIterator<
- typename ROIConversionType2::OutputImageType > ROIInputType2;
+ typename ROIConversionType2::OutputImageType> ROIInputType2;
typename ROIConversionType2::Pointer convertion2 = ROIConversionType2::New();
- convertion2->SetInputImage( img2 );
- convertion2->SetROIImage( imgROI );
+ convertion2->SetInputImage(img2);
+ convertion2->SetROIImage(imgROI);
convertion2->Update();
- if ( m_CumROI2 != NULL )
- delete m_CumROI2;
+ if (m_CumROI2 != NULL) delete m_CumROI2;
- m_CumROI2 = new CumulantsForEdgeworth< ROIInputType2 > ( convertion2->GetOutput() );
+ m_CumROI2 = new CumulantsForEdgeworth<ROIInputType2> (convertion2->GetOutput());
- if ( !m_CumROI2->IsDataAvailable() )
- {
- throw itk::ExceptionObject( __FILE__, __LINE__, "Cumulants estimated from ROI in image 2 are not usable", ITK_LOCATION );
- }
+ if (!m_CumROI2->IsDataAvailable())
+ {
+ throw itk::ExceptionObject(__FILE__,
+ __LINE__,
+ "Cumulants estimated from ROI in image 2 are not usable",
+ ITK_LOCATION);
+ }
}
-template < class TInput1, class TInput2, class TInputROIImage, class TOutput >
+template <class TInput1, class TInput2, class TInputROIImage, class TOutput>
TOutput
-KullbackLeiblerSupervizedDistance< TInput1, TInput2, TInputROIImage, TOutput >
-::operator () ( const TInput1 & it1, const TInput2 & it2 )
-{
- CumulantsForEdgeworth<TInput1> cum1 ( it1 );
-
- if ( !cum1.IsDataAvailable() )
+KullbackLeiblerSupervizedDistance<TInput1, TInput2, TInputROIImage, TOutput>
+::operator() (const TInput1 &it1, const TInput2 &it2)
{
- return static_cast<TOutput> ( 0. );
- }
+ CumulantsForEdgeworth<TInput1> cum1(it1);
- CumulantsForEdgeworth<TInput2> cum2 ( it2 );
+ if (!cum1.IsDataAvailable())
+ {
+ return static_cast<TOutput> (0.);
+ }
- if ( !cum2.IsDataAvailable() )
- {
- return static_cast<TOutput> ( 0. );
- }
+ CumulantsForEdgeworth<TInput2> cum2(it2);
- return static_cast<TOutput> ( m_CumROI1->Divergence( cum1 )
- + m_CumROI2->Divergence( cum2 ) );
-}
+ if (!cum2.IsDataAvailable())
+ {
+ return static_cast<TOutput> (0.);
+ }
+
+ return static_cast<TOutput> (m_CumROI1->Divergence(cum1)
+ + m_CumROI2->Divergence(cum2));
+ }
} // end of namespace Functor
@@ -133,29 +136,27 @@ KullbackLeiblerSupervizedDistance< TInput1, TInput2, TInputROIImage, TOutput >
*/
template <class TInputImage1, class TInputImage2, class TInputROIImage, class TOutputImage>
void
-KullbackLeiblerSupervizedDistanceImageFilter<TInputImage1,TInputImage2,TInputROIImage,TOutputImage>
-::SetTrainingArea( const TInputROIImage * trainingImage )
+KullbackLeiblerSupervizedDistanceImageFilter<TInputImage1, TInputImage2, TInputROIImage, TOutputImage>
+::SetTrainingArea(const TInputROIImage * trainingImage)
{
- this->itk::ProcessObject::SetNthInput(2,const_cast<TInputROIImage *>(trainingImage));
+ this->itk::ProcessObject::SetNthInput(2, const_cast<TInputROIImage *>(trainingImage));
}
template <class TInputImage1, class TInputImage2, class TInputROIImage, class TOutputImage>
void
-KullbackLeiblerSupervizedDistanceImageFilter<TInputImage1,TInputImage2,TInputROIImage,TOutputImage>
+KullbackLeiblerSupervizedDistanceImageFilter<TInputImage1, TInputImage2, TInputROIImage, TOutputImage>
::BeforeThreadedGenerateData(void)
{
typename TInputImage1::ConstPointer inputPtr1
- = dynamic_cast<const TInputImage1*>( this->GetInput(0) );
+ = dynamic_cast<const TInputImage1*>(this->GetInput(0));
typename TInputImage2::ConstPointer inputPtr2
- = dynamic_cast<const TInputImage2*>( this->GetInput(1) );
+ = dynamic_cast<const TInputImage2*>(this->GetInput(1));
typename TInputROIImage::ConstPointer trainingImage
- = static_cast<const TInputROIImage *>( this->itk::ProcessObject::GetInput(2) );
+ = static_cast<const TInputROIImage *>(this->itk::ProcessObject::GetInput(2));
- this->GetFunctor().Evaluate( inputPtr1, inputPtr2, trainingImage );
+ this->GetFunctor().Evaluate(inputPtr1, inputPtr2, trainingImage);
}
} // end of namespace otb
#endif
-
-
diff --git a/Code/ChangeDetection/otbLHMI.h b/Code/ChangeDetection/otbLHMI.h
index d8fa5ceabb..d633facc8f 100644
--- a/Code/ChangeDetection/otbLHMI.h
+++ b/Code/ChangeDetection/otbLHMI.h
@@ -24,7 +24,6 @@
#include <math.h>
#include "itkHistogram.h"
-
namespace otb
{
@@ -41,28 +40,27 @@ namespace Functor
*
*/
-template< class TInput1, class TInput2, class TOutput>
+template<class TInput1, class TInput2, class TOutput>
class LHMI
{
public:
- typedef typename std::vector<TOutput> VectorType;
- typedef typename VectorType::iterator IteratorType;
- typedef typename std::vector<VectorType> VectorOfVectorType;
- typedef typename VectorOfVectorType::iterator VecOfVecIteratorType;
- typedef double HistogramFrequencyType;
+ typedef typename std::vector<TOutput> VectorType;
+ typedef typename VectorType::iterator IteratorType;
+ typedef typename std::vector<VectorType> VectorOfVectorType;
+ typedef typename VectorOfVectorType::iterator VecOfVecIteratorType;
+ typedef double HistogramFrequencyType;
typedef typename itk::Statistics::Histogram<HistogramFrequencyType, 2> HistogramType;
typedef typename HistogramType::MeasurementVectorType
MeasurementVectorType;
- typedef typename HistogramType::SizeType HistogramSizeType;
- typedef typename HistogramType::Iterator HistogramIteratorType;
-
+ typedef typename HistogramType::SizeType HistogramSizeType;
+ typedef typename HistogramType::Iterator HistogramIteratorType;
- LHMI() {};
- virtual ~LHMI() {};
- inline TOutput operator()( const TInput1 & itA,
- const TInput2 & itB)
+ LHMI() {}
+ virtual ~LHMI() {}
+ inline TOutput operator ()(const TInput1& itA,
+ const TInput2& itB)
{
HistogramType::Pointer histogram;
@@ -82,42 +80,35 @@ public:
TOutput maxB = itB.GetPixel(0);
TOutput minB = itB.GetPixel(0);
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
+ for (unsigned long pos = 0; pos < itA.Size(); ++pos)
+ {
TOutput value = static_cast<TOutput>(itA.GetPixel(pos));
- if (value > maxA)
- maxA = value;
- else if (value < minA)
- minA = value;
+ if (value > maxA) maxA = value;
+ else if (value < minA) minA = value;
value = static_cast<TOutput>(itB.GetPixel(pos));
- if (value > maxB)
- maxB = value;
- else if (value < minB)
- minB = value;
-
-
- }
+ if (value > maxB) maxB = value;
+ else if (value < minB) minB = value;
+ }
// Initialize the upper and lower bounds of the histogram.
lowerBound[0] = minA;
lowerBound[1] = minB;
upperBound[0] =
- maxA + (maxA - minA ) * upperBoundIncreaseFactor;
+ maxA + (maxA - minA) * upperBoundIncreaseFactor;
upperBound[1] =
- maxB + (maxB - minB ) * upperBoundIncreaseFactor;
-
+ maxB + (maxB - minB) * upperBoundIncreaseFactor;
histogram = HistogramType::New();
histogram->Initialize(histogramSize, lowerBound, upperBound);
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
+ for (unsigned long pos = 0; pos < itA.Size(); ++pos)
+ {
typename HistogramType::MeasurementVectorType sample;
sample[0] = itA.GetPixel(pos);
@@ -126,55 +117,53 @@ public:
sample[1]!=NumericTraits<TOutput>::Zero)*/
histogram->IncreaseFrequency(sample, 1);
- }
-
+ }
- TOutput entropyX = itk::NumericTraits<TOutput>::Zero;
- TOutput entropyY = itk::NumericTraits<TOutput>::Zero;
- TOutput jointEntropy = itk::NumericTraits<TOutput>::Zero;
+ TOutput entropyX = itk::NumericTraits<TOutput>::Zero;
+ TOutput entropyY = itk::NumericTraits<TOutput>::Zero;
+ TOutput jointEntropy = itk::NumericTraits<TOutput>::Zero;
HistogramFrequencyType totalFreq = histogram->GetTotalFrequency();
for (unsigned int i = 0; i < histogram->GetSize()[0]; ++i)
- {
+ {
HistogramFrequencyType freq = histogram->GetFrequency(i, 0);
if (freq > 0)
- {
- entropyX += freq*vcl_log(freq);
+ {
+ entropyX += freq * vcl_log(freq);
+ }
}
- }
- entropyX = -entropyX/static_cast<TOutput>(totalFreq) + vcl_log(totalFreq);
+ entropyX = -entropyX / static_cast<TOutput>(totalFreq) + vcl_log(totalFreq);
for (unsigned int i = 0; i < histogram->GetSize()[1]; ++i)
- {
+ {
HistogramFrequencyType freq = histogram->GetFrequency(i, 1);
if (freq > 0)
- {
- entropyY += freq*vcl_log(freq);
+ {
+ entropyY += freq * vcl_log(freq);
+ }
}
- }
- entropyY = -entropyY/static_cast<TOutput>(totalFreq) + vcl_log(totalFreq);
+ entropyY = -entropyY / static_cast<TOutput>(totalFreq) + vcl_log(totalFreq);
HistogramIteratorType it = histogram->Begin();
HistogramIteratorType end = histogram->End();
while (it != end)
- {
+ {
HistogramFrequencyType freq = it.GetFrequency();
if (freq > 0)
- {
- jointEntropy += freq*vcl_log(freq);
- }
+ {
+ jointEntropy += freq * vcl_log(freq);
+ }
++it;
- }
+ }
- jointEntropy = -jointEntropy/static_cast<TOutput>(totalFreq) +
+ jointEntropy = -jointEntropy / static_cast<TOutput>(totalFreq) +
vcl_log(totalFreq);
- return static_cast<TOutput>( jointEntropy/(entropyX + entropyY) );
+ return static_cast<TOutput>(jointEntropy / (entropyX + entropyY));
}
-
};
}
diff --git a/Code/ChangeDetection/otbLHMIChangeDetector.h b/Code/ChangeDetection/otbLHMIChangeDetector.h
index 621618edb9..46e3428583 100644
--- a/Code/ChangeDetection/otbLHMIChangeDetector.h
+++ b/Code/ChangeDetection/otbLHMIChangeDetector.h
@@ -51,25 +51,25 @@ namespace otb
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT LHMIChangeDetector :
- public BinaryFunctorNeighborhoodImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::LHMI<
+ public BinaryFunctorNeighborhoodImageFilter<
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::LHMI<
ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
- ITK_TYPENAME TOutputImage::PixelType> >
+ ITK_TYPENAME TOutputImage::PixelType> >
{
public:
/** Standard class typedefs. */
- typedef LHMIChangeDetector Self;
+ typedef LHMIChangeDetector Self;
typedef BinaryFunctorNeighborhoodImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::LHMI<
- ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
- ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
- ITK_TYPENAME TOutputImage::PixelType>
- > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::LHMI<
+ ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
+ ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
+ ITK_TYPENAME TOutputImage::PixelType>
+ > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -79,12 +79,11 @@ protected:
virtual ~LHMIChangeDetector() {}
private:
- LHMIChangeDetector(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LHMIChangeDetector(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/ChangeDetection/otbMeanDifference.h b/Code/ChangeDetection/otbMeanDifference.h
index aac79bd64f..0f29f742c2 100644
--- a/Code/ChangeDetection/otbMeanDifference.h
+++ b/Code/ChangeDetection/otbMeanDifference.h
@@ -18,36 +18,33 @@
#ifndef __otbMeanDifference_h
#define __otbMeanDifference_h
-
namespace otb
{
-
namespace Functor
{
-template< class TInput1, class TInput2, class TOutput>
+template<class TInput1, class TInput2, class TOutput>
class MeanDifference
{
public:
- MeanDifference() {};
- virtual ~MeanDifference() {};
- inline TOutput operator()( const TInput1 & itA,
- const TInput2 & itB)
+ MeanDifference() {}
+ virtual ~MeanDifference() {}
+ inline TOutput operator ()(const TInput1& itA,
+ const TInput2& itB)
{
TOutput meanA = 0.0;
TOutput meanB = 0.0;
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
+ for (unsigned long pos = 0; pos < itA.Size(); ++pos)
+ {
meanA += static_cast<TOutput>(itA.GetPixel(pos));
meanB += static_cast<TOutput>(itB.GetPixel(pos));
-
- }
- return static_cast<TOutput>( (meanA-meanB)/itA.Size() );
+ }
+ return static_cast<TOutput>((meanA - meanB) / itA.Size());
}
};
}
diff --git a/Code/ChangeDetection/otbMeanDifferenceImageFilter.h b/Code/ChangeDetection/otbMeanDifferenceImageFilter.h
index 371fd87a86..4f140147c3 100644
--- a/Code/ChangeDetection/otbMeanDifferenceImageFilter.h
+++ b/Code/ChangeDetection/otbMeanDifferenceImageFilter.h
@@ -49,25 +49,25 @@ namespace otb
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT MeanDifferenceImageFilter :
- public BinaryFunctorNeighborhoodImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::MeanDifference<
+ public BinaryFunctorNeighborhoodImageFilter<
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::MeanDifference<
ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
- ITK_TYPENAME TOutputImage::PixelType> >
+ ITK_TYPENAME TOutputImage::PixelType> >
{
public:
/** Standard class typedefs. */
- typedef MeanDifferenceImageFilter Self;
+ typedef MeanDifferenceImageFilter Self;
typedef BinaryFunctorNeighborhoodImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::MeanDifference<
- ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
- ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
- ITK_TYPENAME TOutputImage::PixelType>
- > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::MeanDifference<
+ ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
+ ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
+ ITK_TYPENAME TOutputImage::PixelType>
+ > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -77,12 +77,11 @@ protected:
virtual ~MeanDifferenceImageFilter() {}
private:
- MeanDifferenceImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MeanDifferenceImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/ChangeDetection/otbMeanRatio.h b/Code/ChangeDetection/otbMeanRatio.h
index dbe0ba5a91..d62cf7f682 100644
--- a/Code/ChangeDetection/otbMeanRatio.h
+++ b/Code/ChangeDetection/otbMeanRatio.h
@@ -36,27 +36,26 @@ namespace otb
namespace Functor
{
-template< class TInput1, class TInput2, class TOutput>
+template<class TInput1, class TInput2, class TOutput>
class MeanRatio
{
public:
- MeanRatio() {};
- virtual ~MeanRatio() {};
- inline TOutput operator()( const TInput1 & itA,
- const TInput2 & itB)
+ MeanRatio() {}
+ virtual ~MeanRatio() {}
+ inline TOutput operator ()(const TInput1& itA,
+ const TInput2& itB)
{
TOutput meanA = 0.0;
TOutput meanB = 0.0;
- for (unsigned long pos = 0; pos< itA.Size(); ++pos)
- {
+ for (unsigned long pos = 0; pos < itA.Size(); ++pos)
+ {
meanA += static_cast<TOutput>(itA.GetPixel(pos));
meanB += static_cast<TOutput>(itB.GetPixel(pos));
-
- }
+ }
meanA /= itA.Size();
meanB /= itB.Size();
@@ -65,11 +64,9 @@ public:
TOutput ratio;
- if(meanA == meanB)
- ratio = 0.;
- else if (meanA>meanB)
- ratio = static_cast<TOutput>(1.0 - meanB/meanA);
- else ratio = static_cast<TOutput>(1.0 - meanA/meanB);
+ if (meanA == meanB) ratio = 0.;
+ else if (meanA > meanB) ratio = static_cast<TOutput>(1.0 - meanB / meanA);
+ else ratio = static_cast<TOutput>(1.0 - meanA / meanB);
return ratio;
}
@@ -77,5 +74,4 @@ public:
}
} // end namespace otb
-
#endif
diff --git a/Code/ChangeDetection/otbMeanRatioImageFilter.h b/Code/ChangeDetection/otbMeanRatioImageFilter.h
index 9e77191fcb..f8d720439d 100644
--- a/Code/ChangeDetection/otbMeanRatioImageFilter.h
+++ b/Code/ChangeDetection/otbMeanRatioImageFilter.h
@@ -48,25 +48,25 @@ namespace otb
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT MeanRatioImageFilter :
- public BinaryFunctorNeighborhoodImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::MeanRatio<
+ public BinaryFunctorNeighborhoodImageFilter<
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::MeanRatio<
ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
- ITK_TYPENAME TOutputImage::PixelType> >
+ ITK_TYPENAME TOutputImage::PixelType> >
{
public:
/** Standard class typedefs. */
- typedef MeanRatioImageFilter Self;
+ typedef MeanRatioImageFilter Self;
typedef BinaryFunctorNeighborhoodImageFilter<
- TInputImage1,TInputImage2,TOutputImage,
- Functor::MeanRatio<
- ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
- ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
- ITK_TYPENAME TOutputImage::PixelType>
- > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ TInputImage1, TInputImage2, TOutputImage,
+ Functor::MeanRatio<
+ ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage1>,
+ ITK_TYPENAME itk::ConstNeighborhoodIterator<TInputImage2>,
+ ITK_TYPENAME TOutputImage::PixelType>
+ > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -76,12 +76,11 @@ protected:
virtual ~MeanRatioImageFilter() {}
private:
- MeanRatioImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MeanRatioImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/Common/otbArcSpatialObject.h b/Code/Common/otbArcSpatialObject.h
index e7032a408f..3f8c4789e8 100644
--- a/Code/Common/otbArcSpatialObject.h
+++ b/Code/Common/otbArcSpatialObject.h
@@ -30,14 +30,14 @@ namespace otb
*/
template <unsigned int VDimension = 2>
class ITK_EXPORT ArcSpatialObject
- : public itk::SpatialObject<VDimension>
+ : public itk::SpatialObject<VDimension>
{
public:
/** Standard typedefs */
- typedef ArcSpatialObject Self;
+ typedef ArcSpatialObject Self;
typedef itk::SpatialObject<VDimension> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -46,7 +46,7 @@ public:
itkTypeMacro(ArcSpatialObject, SpatialObject);
/** Get the number of Dimensions */
- itkStaticConstMacro(NumberOfDimension, unsigned int,VDimension);
+ itkStaticConstMacro(NumberOfDimension, unsigned int, VDimension);
/** Superclass typedefs */
typedef typename Superclass::PointType PointType;
@@ -54,47 +54,47 @@ public:
typedef typename Superclass::BoundingBoxType BoundingBoxType;
/** Additional typedefs */
- typedef itk::VectorContainer<unsigned long,PointType> PointContainerType;
- typedef itk::SmartPointer<PointContainerType> PointContainerPointer;
+ typedef itk::VectorContainer<unsigned long, PointType> PointContainerType;
+ typedef itk::SmartPointer<PointContainerType> PointContainerPointer;
/**
* Set all radii to the same radius value. Each radius is
* half the length of one axis of the ellipse.
*/
- itkSetMacro(Radius,double);
- itkGetConstReferenceMacro(Radius,double);
+ itkSetMacro(Radius, double);
+ itkGetConstReferenceMacro(Radius, double);
/// Set the Start Angle
- itkSetMacro(Angle1,double);
- itkGetMacro(Angle1,double);
+ itkSetMacro(Angle1, double);
+ itkGetMacro(Angle1, double);
//Set the End Angle
- itkSetMacro(Angle2,double);
- itkGetMacro(Angle2,double);
+ itkSetMacro(Angle2, double);
+ itkGetMacro(Angle2, double);
/**
* That's useful for fuzzy objects.
* \return a degree of membership to the object.
*/
- virtual bool ValueAt( const PointType & point, double & value,
- unsigned int depth=0,
- char * name=NULL) const;
+ virtual bool ValueAt(const PointType& point, double& value,
+ unsigned int depth = 0,
+ char * name = NULL) const;
/**
* \return true if the object provides a method to evaluate the value
* at the specified point, false otherwise.
*/
- virtual bool IsEvaluableAt( const PointType & point,
- unsigned int depth=0,
- char * name=NULL) const;
+ virtual bool IsEvaluableAt(const PointType& point,
+ unsigned int depth = 0,
+ char * name = NULL) const;
/**
* Test whether a point is inside or outside the object
*/
- virtual bool IsInside( const PointType & point,
- unsigned int depth,
- char *) const;
+ virtual bool IsInside(const PointType& point,
+ unsigned int depth,
+ char *) const;
/**
* Test whether a point is inside or outside the object
* For computational speed purposes, it is faster if the method does not
* check the name of the class and the current depth
*/
- virtual bool IsInside( const PointType & point) const;
+ virtual bool IsInside(const PointType& point) const;
/**
* Get the boundaries of a specific object. This function needs to
* be called every time one of the object's components is
@@ -110,19 +110,19 @@ protected:
/** Constructor */
ArcSpatialObject();
/** Destructor */
- virtual ~ArcSpatialObject() {};
+ virtual ~ArcSpatialObject() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ArcSpatialObject(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ArcSpatialObject(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
double m_Radius;
double m_Angle1;
double m_Angle2;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbArcSpatialObject.txx"
#endif
diff --git a/Code/Common/otbArcSpatialObject.txx b/Code/Common/otbArcSpatialObject.txx
index e54b8358ab..074dff19e4 100644
--- a/Code/Common/otbArcSpatialObject.txx
+++ b/Code/Common/otbArcSpatialObject.txx
@@ -20,117 +20,117 @@
#include "otbArcSpatialObject.h"
-#define PI 4*vcl_atan(1.)
+#define PI 4 * vcl_atan(1.)
namespace otb
{
/**
* Constructor.
*/
-template< unsigned int VDimension >
-ArcSpatialObject< VDimension >
+template<unsigned int VDimension>
+ArcSpatialObject<VDimension>
::ArcSpatialObject()
{
this->SetTypeName("ArcSpatialObject");
- m_Radius=1.0;
+ m_Radius = 1.0;
this->SetDimension(VDimension);
- m_Angle1=0.0;
- m_Angle2=0.0;
+ m_Angle1 = 0.0;
+ m_Angle2 = 0.0;
}
/**
* Test whether a point is inside or outside the object
* For computational speed purposes, it is faster if the method does not
* check the name of the class and the current depth
*/
-template< unsigned int VDimension >
+template<unsigned int VDimension>
bool
-ArcSpatialObject< VDimension >
-::IsInside( const PointType & point) const
+ArcSpatialObject<VDimension>
+::IsInside(const PointType& point) const
{
this->ComputeLocalBoundingBox();
if (!this->GetIndexToWorldTransform()->GetInverse(const_cast<TransformType *>(this->GetInternalInverseTransform())))
- {
+ {
return false;
- }
+ }
PointType transformedPoint = this->GetInternalInverseTransform()->TransformPoint(point);
- double r = 0;
- for (unsigned int i=0;i<VDimension;++i)
- {
- if (m_Radius!=0.0)
- {
- r += ((transformedPoint[i]*transformedPoint[i])/(m_Radius*m_Radius));
- }
- else if (transformedPoint[i]>0.0) // Degenerate ellipse
+ double r = 0;
+ for (unsigned int i = 0; i < VDimension; ++i)
{
+ if (m_Radius != 0.0)
+ {
+ r += ((transformedPoint[i] * transformedPoint[i]) / (m_Radius * m_Radius));
+ }
+ else if (transformedPoint[i] > 0.0) // Degenerate ellipse
+ {
r = 2; // Keeps function from returning true here
break;
+ }
}
- }
- if (r<=1)
- {
- double angle(0.);
- if (transformedPoint[0]!=0)
- {
- angle=vcl_atan(transformedPoint[1]/transformedPoint[0])*180/PI;
- }
- else if (transformedPoint[1]>0)
+ if (r <= 1)
{
- angle=90;
- }
- else if (transformedPoint[1]<0)
- {
- angle=-90;
- }
+ double angle(0.);
+ if (transformedPoint[0] != 0)
+ {
+ angle = vcl_atan(transformedPoint[1] / transformedPoint[0]) * 180 / PI;
+ }
+ else if (transformedPoint[1] > 0)
+ {
+ angle = 90;
+ }
+ else if (transformedPoint[1] < 0)
+ {
+ angle = -90;
+ }
// std::cout << "\n angle= " << angle << std::endl;
- if (angle>=m_Angle1 && angle<=m_Angle2)
- {
+ if (angle >= m_Angle1 && angle <= m_Angle2)
+ {
// std::cout << "----> OK") << std::endl;
return true;
- }
+ }
else return false;
- }
+ }
return false;
}
/**
* Test if the given point is inside the arc
*/
-template< unsigned int VDimension >
+template<unsigned int VDimension>
bool
-ArcSpatialObject< VDimension >
-::IsInside( const PointType & point, unsigned int depth, char * name ) const
+ArcSpatialObject<VDimension>
+::IsInside(const PointType& point, unsigned int depth, char * name) const
{
// itkDebugMacro( "Checking the point [" << point << "] is inside the Arc" );
if (name == NULL)
- {
- if (IsInside(point))
{
+ if (IsInside(point))
+ {
return true;
+ }
}
- }
else if (strstr(typeid(Self).name(), name))
- {
- if (IsInside(point))
{
+ if (IsInside(point))
+ {
return true;
+ }
}
- }
return Superclass::IsInside(point, depth, name);
}
/**
* Compute the bounds of the arc
*/
-template< unsigned int VDimension >
+template<unsigned int VDimension>
bool
-ArcSpatialObject< VDimension >
+ArcSpatialObject<VDimension>
::ComputeLocalBoundingBox() const
{
- itkDebugMacro( "Computing arc bounding box" );
- if ( this->GetBoundingBoxChildrenName().empty()
- || strstr(typeid(Self).name(), this->GetBoundingBoxChildrenName().c_str()) )
- {
+ itkDebugMacro("Computing arc bounding box");
+ if (this->GetBoundingBoxChildrenName().empty()
+ || strstr(typeid(Self).name(), this->GetBoundingBoxChildrenName().c_str()))
+ {
// we need to set the minimum and maximum of the bounding box
// the center is always inside the bounding box.
PointType center;
@@ -147,40 +147,64 @@ ArcSpatialObject< VDimension >
PointType pntC;
PointType pntD;
- double alpha,longueur,largeur;
- alpha=(m_Angle2-m_Angle1); // Difference between 2 angles.
+ double alpha, longueur, largeur;
+ alpha = (m_Angle2 - m_Angle1); // Difference between 2 angles.
- if (alpha<=180)
- {
- pntA[0]=m_Radius*vcl_cos(m_Angle1*PI/180);
- pntA[1]=m_Radius*vcl_sin(m_Angle1*PI/180);
- pntB[0]=m_Radius*vcl_cos(m_Angle2*PI/180);
- pntB[1]=m_Radius*vcl_sin(m_Angle2*PI/180);
+ if (alpha <= 180)
+ {
+ pntA[0] = m_Radius * vcl_cos(m_Angle1 * PI / 180);
+ pntA[1] = m_Radius * vcl_sin(m_Angle1 * PI / 180);
+ pntB[0] = m_Radius * vcl_cos(m_Angle2 * PI / 180);
+ pntB[1] = m_Radius * vcl_sin(m_Angle2 * PI / 180);
- longueur=vcl_sqrt((pntB[0]-pntA[0])*(pntB[0]-pntA[0])+(pntB[1]-pntA[1])*(pntB[1]-pntA[1]));
- largeur=m_Radius*(1-vcl_cos((alpha/2)*PI/180));
- pntC[0]=pntB[0]+largeur*(pntB[1]-pntA[1])/longueur;
- pntC[1]=pntB[1]-largeur*(pntB[0]-pntA[0])/longueur;
- pntD[0]=pntA[0]+largeur*(pntB[1]-pntA[1])/longueur;
- pntD[1]=pntA[1]-largeur*(pntB[0]-pntA[0])/longueur;
- }
+ longueur = vcl_sqrt((pntB[0] - pntA[0]) * (pntB[0] - pntA[0]) + (pntB[1] - pntA[1]) * (pntB[1] - pntA[1]));
+ largeur = m_Radius * (1 - vcl_cos((alpha / 2) * PI / 180));
+ pntC[0] = pntB[0] + largeur * (pntB[1] - pntA[1]) / longueur;
+ pntC[1] = pntB[1] - largeur * (pntB[0] - pntA[0]) / longueur;
+ pntD[0] = pntA[0] + largeur * (pntB[1] - pntA[1]) / longueur;
+ pntD[1] = pntA[1] - largeur * (pntB[0] - pntA[0]) / longueur;
+ }
else
- {
- pntA[0]=m_Radius*vcl_cos(m_Angle1*PI/180);
- pntA[1]=m_Radius*vcl_sin(m_Angle1*PI/180);
- pntB[0]=m_Radius*vcl_cos(m_Angle2*PI/180);
- pntB[1]=m_Radius*vcl_sin(m_Angle2*PI/180);
- longueur=vcl_sqrt((pntB[0]-pntA[0])*(pntB[0]-pntA[0])+(pntB[1]-pntA[1])*(pntB[1]-pntA[1]));
- largeur=m_Radius*(1-vcl_cos((alpha/2)*PI/180));
- pntA[0]=(m_Radius/2)*(vcl_cos(m_Angle1*PI/180)+vcl_cos(m_Angle2*PI/180))-(m_Radius*m_Radius/longueur)*(vcl_cos(m_Angle1*PI/180)-vcl_cos(m_Angle2*PI/180));
- pntA[1]=(m_Radius/2)*(vcl_sin(m_Angle1*PI/180)+vcl_sin(m_Angle2*PI/180))-(m_Radius*m_Radius/longueur)*(vcl_sin(m_Angle1*PI/180)-vcl_sin(m_Angle2*PI/180));
- pntB[0]=(m_Radius/2)*(vcl_cos(m_Angle1*PI/180)+vcl_cos(m_Angle2*PI/180))+(m_Radius*m_Radius/longueur)*(vcl_cos(m_Angle1*PI/180)-vcl_cos(m_Angle2*PI/180));
- pntB[1]=(m_Radius/2)*(vcl_sin(m_Angle1*PI/180)+vcl_sin(m_Angle2*PI/180))+(m_Radius*m_Radius/longueur)*(vcl_sin(m_Angle1*PI/180)-vcl_sin(m_Angle2*PI/180));
- pntC[0]=pntB[0]-(largeur/(2*m_Radius))*(pntB[1]-pntA[1]);
- pntC[1]=pntB[1]+(largeur/(2*m_Radius))*(pntB[0]-pntA[0]);
- pntD[0]=pntA[0]-(largeur/(2*m_Radius))*(pntB[1]-pntA[1]);
- pntD[1]=pntA[1]+(largeur/(2*m_Radius))*(pntB[0]-pntA[0]);
- }
+ {
+ pntA[0] = m_Radius * vcl_cos(m_Angle1 * PI / 180);
+ pntA[1] = m_Radius * vcl_sin(m_Angle1 * PI / 180);
+ pntB[0] = m_Radius * vcl_cos(m_Angle2 * PI / 180);
+ pntB[1] = m_Radius * vcl_sin(m_Angle2 * PI / 180);
+ longueur = vcl_sqrt((pntB[0] - pntA[0]) * (pntB[0] - pntA[0]) + (pntB[1] - pntA[1]) * (pntB[1] - pntA[1]));
+ largeur = m_Radius * (1 - vcl_cos((alpha / 2) * PI / 180));
+ pntA[0] =
+ (m_Radius /
+ 2) *
+ (vcl_cos(m_Angle1 * PI /
+ 180) +
+ vcl_cos(m_Angle2 * PI /
+ 180)) - (m_Radius * m_Radius / longueur) * (vcl_cos(m_Angle1 * PI / 180) - vcl_cos(m_Angle2 * PI / 180));
+ pntA[1] =
+ (m_Radius /
+ 2) *
+ (vcl_sin(m_Angle1 * PI /
+ 180) +
+ vcl_sin(m_Angle2 * PI /
+ 180)) - (m_Radius * m_Radius / longueur) * (vcl_sin(m_Angle1 * PI / 180) - vcl_sin(m_Angle2 * PI / 180));
+ pntB[0] =
+ (m_Radius /
+ 2) *
+ (vcl_cos(m_Angle1 * PI /
+ 180) +
+ vcl_cos(m_Angle2 * PI /
+ 180)) + (m_Radius * m_Radius / longueur) * (vcl_cos(m_Angle1 * PI / 180) - vcl_cos(m_Angle2 * PI / 180));
+ pntB[1] =
+ (m_Radius /
+ 2) *
+ (vcl_sin(m_Angle1 * PI /
+ 180) +
+ vcl_sin(m_Angle2 * PI /
+ 180)) + (m_Radius * m_Radius / longueur) * (vcl_sin(m_Angle1 * PI / 180) - vcl_sin(m_Angle2 * PI / 180));
+ pntC[0] = pntB[0] - (largeur / (2 * m_Radius)) * (pntB[1] - pntA[1]);
+ pntC[1] = pntB[1] + (largeur / (2 * m_Radius)) * (pntB[0] - pntA[0]);
+ pntD[0] = pntA[0] - (largeur / (2 * m_Radius)) * (pntB[1] - pntA[1]);
+ pntD[1] = pntA[1] + (largeur / (2 * m_Radius)) * (pntB[0] - pntA[0]);
+ }
bb->ConsiderPoint(pntA);
bb->ConsiderPoint(pntB);
bb->ConsiderPoint(pntC);
@@ -194,16 +218,16 @@ ArcSpatialObject< VDimension >
const_cast<BoundingBoxType *>(this->GetBounds())->ConsiderPoint(pnt);
pnt = this->GetIndexToWorldTransform()->TransformPoint(pntD);
const_cast<BoundingBoxType *>(this->GetBounds())->ConsiderPoint(pnt);
- }
+ }
return true;
}
/**
* Returns if the arc is evaluable at one point
*/
-template< unsigned int VDimension >
+template<unsigned int VDimension>
bool
-ArcSpatialObject< VDimension >
-::IsEvaluableAt( const PointType & point, unsigned int depth, char * name ) const
+ArcSpatialObject<VDimension>
+::IsEvaluableAt(const PointType& point, unsigned int depth, char * name) const
{
// itkDebugMacro( "Checking if the arc is evaluable at " << point );
return IsInside(point, depth, name);
@@ -211,40 +235,40 @@ ArcSpatialObject< VDimension >
/**
* Returns the value at one point
*/
-template< unsigned int VDimension >
+template<unsigned int VDimension>
bool
-ArcSpatialObject< VDimension >
-::ValueAt( const PointType & point, double & value, unsigned int depth,
- char * name ) const
+ArcSpatialObject<VDimension>
+::ValueAt(const PointType& point, double& value, unsigned int depth,
+ char * name) const
{
// itkDebugMacro( "Getting the value of the arc at " << point );
- if ( IsInside(point, 0, name) )
- {
+ if (IsInside(point, 0, name))
+ {
value = this->GetDefaultInsideValue();
return true;
- }
+ }
else
- {
- if ( Superclass::IsEvaluableAt(point, depth, name) )
{
+ if (Superclass::IsEvaluableAt(point, depth, name))
+ {
Superclass::ValueAt(point, value, depth, name);
return true;
- }
+ }
else
- {
+ {
value = this->GetDefaultOutsideValue();
return false;
+ }
}
- }
return false;
}
/**
* Print Self function
*/
-template< unsigned int VDimension >
+template<unsigned int VDimension>
void
-ArcSpatialObject< VDimension >
-::PrintSelf( std::ostream& os, itk::Indent indent ) const
+ArcSpatialObject<VDimension>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
os << "Radius: " << m_Radius << std::endl;
@@ -252,17 +276,17 @@ ArcSpatialObject< VDimension >
/**
* Copy the information from another spatial object
*/
-template< unsigned int VDimension >
-void ArcSpatialObject< VDimension >
+template<unsigned int VDimension>
+void ArcSpatialObject<VDimension>
::CopyInformation(const itk::DataObject *data)
{
// check if we are the same type
const Self* source = dynamic_cast<const Self*>(data);
if (!source)
- {
+ {
std::cout << "CopyInformation: objects are not of the same type" << std::endl;
return;
- }
+ }
// copy the properties
Superclass::CopyInformation(data);
diff --git a/Code/Common/otbAttributesMapLabelObject.h b/Code/Common/otbAttributesMapLabelObject.h
index 3c4ee8023c..d1a79ffd6c 100644
--- a/Code/Common/otbAttributesMapLabelObject.h
+++ b/Code/Common/otbAttributesMapLabelObject.h
@@ -37,7 +37,7 @@ namespace Functor
*
* \sa AttributesMapLabelObject
*/
-template< class TLabelObject >
+template<class TLabelObject>
class ITK_EXPORT AttributesMapLabelObjectAccessor
{
public:
@@ -50,11 +50,11 @@ public:
* \param labelObject The pointer to the label object
* \return The attribute value.
*/
- inline const AttributeValueType operator()( LabelObjectType * labelObject ) const
- {
+ inline const AttributeValueType operator ()(LabelObjectType * labelObject) const
+ {
return labelObject->GetAttribute(m_AttributeName.c_str());
- }
-
+ }
+
/// Set the name of the attribute to retrieve
void SetAttributeName(const char * name)
{
@@ -92,18 +92,18 @@ private:
*
* \ingroup DataRepresentation
*/
-template < class TLabel, unsigned int VImageDimension, class TAttributesValue >
+template <class TLabel, unsigned int VImageDimension, class TAttributesValue>
class ITK_EXPORT AttributesMapLabelObject
-: public itk::LabelObject< TLabel, VImageDimension >
+ : public itk::LabelObject<TLabel, VImageDimension>
{
public:
/** Standard class typedefs */
- typedef AttributesMapLabelObject Self;
- typedef itk::LabelObject< TLabel, VImageDimension > Superclass;
- typedef typename Superclass::LabelObjectType LabelObjectType;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef itk::WeakPointer <const Self> ConstWeakPointer;
+ typedef AttributesMapLabelObject Self;
+ typedef itk::LabelObject<TLabel, VImageDimension> Superclass;
+ typedef typename Superclass::LabelObjectType LabelObjectType;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::WeakPointer <const Self> ConstWeakPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -114,26 +114,26 @@ public:
itkStaticConstMacro(ImageDimension, unsigned int, VImageDimension);
/// Type of a label map using an AttributesMapLabelObject
- typedef itk::LabelMap< Self > LabelMapType;
+ typedef itk::LabelMap<Self> LabelMapType;
/// Template parameters typedef
- typedef TLabel LabelType;
- typedef TAttributesValue AttributesValueType;
-
+ typedef TLabel LabelType;
+ typedef TAttributesValue AttributesValueType;
+
// Convenient inherited typedefs
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::LineType LineType;
- typedef typename Superclass::LengthType LengthType;
- typedef typename Superclass::LineContainerType LineContainerType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::LineType LineType;
+ typedef typename Superclass::LengthType LengthType;
+ typedef typename Superclass::LineContainerType LineContainerType;
/// Map container typedefs
- typedef std::map<std::string,AttributesValueType> AttributesMapType;
+ typedef std::map<std::string, AttributesValueType> AttributesMapType;
typedef typename AttributesMapType::iterator AttributesMapIteratorType;
typedef typename AttributesMapType::const_iterator AttributesMapConstIteratorType;
// The polygon corresponding to the label object
- typedef Polygon<double> PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef Polygon<double> PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
/**
* Set an attribute value.
@@ -141,7 +141,7 @@ public:
*/
void SetAttribute(const char * name, AttributesValueType value)
{
- m_Attributes[name]=value;
+ m_Attributes[name] = value;
}
/**
@@ -150,13 +150,13 @@ public:
AttributesValueType GetAttribute(const char * name) const
{
AttributesMapConstIteratorType it = m_Attributes.find(name);
- if (it!=m_Attributes.end())
+ if (it != m_Attributes.end())
{
return it->second;
}
else
{
- itkExceptionMacro(<<"Could not find attribute named "<<name<<".");
+ itkExceptionMacro(<< "Could not find attribute named " << name << ".");
}
}
@@ -174,32 +174,32 @@ public:
std::vector<std::string> GetAvailableAttributes() const
{
std::vector<std::string> attributesNames;
-
+
AttributesMapConstIteratorType it = m_Attributes.begin();
- while(it!=m_Attributes.end())
+ while (it != m_Attributes.end())
{
attributesNames.push_back(it->first);
++it;
}
return attributesNames;
}
-
+
/**
* This method is overloaded to add the copy of the attributes map.
*/
- virtual void CopyAttributesFrom( const LabelObjectType * lo)
- {
- Superclass::CopyAttributesFrom( lo );
+ virtual void CopyAttributesFrom(const LabelObjectType * lo)
+ {
+ Superclass::CopyAttributesFrom(lo);
// copy the data of the current type if possible
- const Self * src = dynamic_cast<const Self *>( lo );
- if( src == NULL )
+ const Self * src = dynamic_cast<const Self *>(lo);
+ if (src == NULL)
{
return;
}
- m_Attributes = src->m_Attributes;
- }
+ m_Attributes = src->m_Attributes;
+ }
/** Return the polygon (const version) */
const PolygonType * GetPolygon() const
@@ -222,24 +222,24 @@ public:
protected:
/** Constructor */
AttributesMapLabelObject() : m_Attributes(), m_Polygon(PolygonType::New())
- {}
+ {}
/** Destructor */
virtual ~AttributesMapLabelObject() {}
-
+
/** The printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
- {
- Superclass::PrintSelf( os, indent );
- os << indent << "Attributes: "<< std::endl;
- for(AttributesMapConstIteratorType it = m_Attributes.begin();
- it!=m_Attributes.end();++it)
+ {
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Attributes: " << std::endl;
+ for (AttributesMapConstIteratorType it = m_Attributes.begin();
+ it != m_Attributes.end(); ++it)
{
- os<<indent<<indent<<it->first<<" = "<<it->second<<std::endl;
+ os << indent << indent << it->first << " = " << it->second << std::endl;
}
- }
+ }
private:
- AttributesMapLabelObject(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ AttributesMapLabelObject(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The attributes map */
AttributesMapType m_Attributes;
diff --git a/Code/Common/otbAttributesMapOpeningLabelMapFilter.h b/Code/Common/otbAttributesMapOpeningLabelMapFilter.h
index e1efa50a2d..746c58e357 100644
--- a/Code/Common/otbAttributesMapOpeningLabelMapFilter.h
+++ b/Code/Common/otbAttributesMapOpeningLabelMapFilter.h
@@ -37,22 +37,23 @@ namespace otb
*/
template<class TImage>
class ITK_EXPORT AttributesMapOpeningLabelMapFilter
-: public itk::AttributeOpeningLabelMapFilter<TImage,
- Functor::AttributesMapLabelObjectAccessor<typename TImage::LabelObjectType> >
+ : public itk::AttributeOpeningLabelMapFilter<TImage,
+ Functor::AttributesMapLabelObjectAccessor<typename TImage::
+ LabelObjectType> >
{
public:
/** Standard class typedefs. */
- typedef AttributesMapOpeningLabelMapFilter Self;
+ typedef AttributesMapOpeningLabelMapFilter Self;
typedef itk::AttributeOpeningLabelMapFilter <TImage,
- Functor::AttributesMapLabelObjectAccessor<TImage> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ Functor::AttributesMapLabelObjectAccessor<TImage> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Standard New method. */
itkNewMacro(Self);
/** Runtime information support. */
- itkTypeMacro(AttributesMapOpeningLabelMapFilter,itk::AttributeOpeningLabelMapFilter);
+ itkTypeMacro(AttributesMapOpeningLabelMapFilter, itk::AttributeOpeningLabelMapFilter);
/** Set the name of the attribute to perform opening on */
void SetAttributeName(const char * name)
@@ -73,13 +74,11 @@ protected:
~AttributesMapOpeningLabelMapFilter() {}
private:
- AttributesMapOpeningLabelMapFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ AttributesMapOpeningLabelMapFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
}; // end of class
} // end namespace otb
#endif
-
-
diff --git a/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.h b/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.h
index 423f0714a9..1ae41fe584 100644
--- a/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.h
+++ b/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.h
@@ -39,15 +39,15 @@ namespace otb
*
*/
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
-class ITK_EXPORT BinaryFunctorNeighborhoodImageFilter : public itk::ImageToImageFilter<TInputImage1,TOutputImage>
+ class TOutputImage, class TFunction>
+class ITK_EXPORT BinaryFunctorNeighborhoodImageFilter : public itk::ImageToImageFilter<TInputImage1, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef BinaryFunctorNeighborhoodImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage1,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef BinaryFunctorNeighborhoodImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage1, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -55,32 +55,30 @@ public:
/** Run-time type information (and related methods). */
itkTypeMacro(BinaryFunctorNeighborhoodImageFilter, BinaryFunctorImageFilter);
-
/** Some convenient typedefs. */
- typedef TFunction FunctorType;
- typedef TInputImage1 Input1ImageType;
+ typedef TFunction FunctorType;
+ typedef TInputImage1 Input1ImageType;
typedef typename Input1ImageType::ConstPointer Input1ImageConstPointer;
typedef typename Input1ImageType::Pointer Input1ImagePointer;
typedef typename Input1ImageType::RegionType Input1ImageRegionType;
typedef typename Input1ImageType::PixelType Input1ImagePixelType;
- typedef TInputImage2 Input2ImageType;
+ typedef TInputImage2 Input2ImageType;
typedef typename Input2ImageType::ConstPointer Input2ImageConstPointer;
typedef typename Input2ImageType::Pointer Input2ImagePointer;
typedef typename Input2ImageType::RegionType Input2ImageRegionType;
typedef typename Input2ImageType::PixelType Input2ImagePixelType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputImagePixelType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputImagePixelType;
typedef itk::ProcessObject ProcessObjectType;
-
/** Connect one of the operands for pixel-wise addition */
- void SetInput1( const TInputImage1 * image1);
+ void SetInput1(const TInputImage1 * image1);
/** Connect one of the operands for pixel-wise addition */
- void SetInput2( const TInputImage2 * image2);
+ void SetInput2(const TInputImage2 * image2);
/** Get the inputs */
const TInputImage1 * GetInput1();
@@ -93,7 +91,7 @@ public:
FunctorType& GetFunctor()
{
return m_Functor;
- };
+ }
/** Set the functor object. This replaces the current Functor with a
* copy of the specified Functor. This allows the user to specify a
@@ -107,17 +105,15 @@ public:
this->Modified();
}
-
typedef itk::ConstNeighborhoodIterator<TInputImage1>
NeighborhoodIteratorType1;
typedef itk::ConstNeighborhoodIterator<TInputImage2>
NeighborhoodIteratorType2;
- typedef typename NeighborhoodIteratorType1::RadiusType RadiusType1;
- typedef typename NeighborhoodIteratorType2::RadiusType RadiusType2;
-
+ typedef typename NeighborhoodIteratorType1::RadiusType RadiusType1;
+ typedef typename NeighborhoodIteratorType2::RadiusType RadiusType2;
- typedef typename itk::Size<Input1ImageType::ImageDimension> RadiusSizeType;
+ typedef typename itk::Size<Input1ImageType::ImageDimension> RadiusSizeType;
itkSetMacro(Radius, RadiusSizeType);
@@ -129,7 +125,7 @@ public:
protected:
BinaryFunctorNeighborhoodImageFilter();
- virtual ~BinaryFunctorNeighborhoodImageFilter() {};
+ virtual ~BinaryFunctorNeighborhoodImageFilter() {}
/** BinaryFunctorNeighborhoodImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -142,7 +138,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
/**
* Pad the inputs requested regions by radius
@@ -152,8 +148,8 @@ protected:
RadiusSizeType m_Radius;
private:
- BinaryFunctorNeighborhoodImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ BinaryFunctorNeighborhoodImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
FunctorType m_Functor;
};
diff --git a/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx b/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx
index d836ad4f0b..f2684feb56 100644
--- a/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx
+++ b/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx
@@ -31,154 +31,151 @@ namespace otb
* Constructor
*/
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
-BinaryFunctorNeighborhoodImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
+ class TOutputImage, class TFunction>
+BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
::BinaryFunctorNeighborhoodImageFilter()
{
- this->SetNumberOfRequiredInputs( 2 );
+ this->SetNumberOfRequiredInputs(2);
m_Radius.Fill(3);
}
-
/**
* Connect one of the operands for neighborhood-wise operation
*/
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-BinaryFunctorNeighborhoodImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
-::SetInput1( const TInputImage1 * image1 )
+BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
+::SetInput1(const TInputImage1 * image1)
{
// Process object is not const-correct so the const casting is required.
- SetNthInput(0, const_cast<TInputImage1 *>( image1 ));
+ SetNthInput(0, const_cast<TInputImage1 *>(image1));
}
-
/**
* Connect one of the operands for neighborhood-wise operation
*/
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-BinaryFunctorNeighborhoodImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
-::SetInput2( const TInputImage2 * image2 )
+BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
+::SetInput2(const TInputImage2 * image2)
{
// Process object is not const-correct so the const casting is required.
- SetNthInput(1, const_cast<TInputImage2 *>( image2 ));
+ SetNthInput(1, const_cast<TInputImage2 *>(image2));
}
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
const TInputImage1 *
-BinaryFunctorNeighborhoodImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
+BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
::GetInput1()
{
- if (this->GetNumberOfInputs()<1)
- {
+ if (this->GetNumberOfInputs() < 1)
+ {
return 0;
- }
+ }
return static_cast<const TInputImage1 *>(this->itk::ProcessObject::GetInput(0));
}
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
const TInputImage2 *
-BinaryFunctorNeighborhoodImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
+BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
::GetInput2()
{
- if (this->GetNumberOfInputs()<2)
- {
+ if (this->GetNumberOfInputs() < 2)
+ {
return 0;
- }
+ }
return static_cast<const TInputImage2 *>(this->itk::ProcessObject::GetInput(1));
}
-
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-BinaryFunctorNeighborhoodImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
+BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- Input1ImagePointer inputPtr1 =
- const_cast< TInputImage1 * >( this->GetInput1());
- Input2ImagePointer inputPtr2 =
- const_cast< TInputImage2 * >( this->GetInput2());
+ Input1ImagePointer inputPtr1 =
+ const_cast<TInputImage1 *>(this->GetInput1());
+ Input2ImagePointer inputPtr2 =
+ const_cast<TInputImage2 *>(this->GetInput2());
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr1 || !inputPtr2 || !outputPtr )
- {
+ if (!inputPtr1 || !inputPtr2 || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
typename TInputImage1::RegionType inputRequestedRegion1, inputRequestedRegion2;
inputRequestedRegion1 = inputPtr1->GetRequestedRegion();
// pad the input requested region by the operator radius
- inputRequestedRegion1.PadByRadius( m_Radius );
+ inputRequestedRegion1.PadByRadius(m_Radius);
inputRequestedRegion2 = inputRequestedRegion1;
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion1.Crop(inputPtr1->GetLargestPossibleRegion()))
- {
- inputPtr1->SetRequestedRegion( inputRequestedRegion1 );
- }
+ if (inputRequestedRegion1.Crop(inputPtr1->GetLargestPossibleRegion()))
+ {
+ inputPtr1->SetRequestedRegion(inputRequestedRegion1);
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr1->SetRequestedRegion( inputRequestedRegion1 );
+ inputPtr1->SetRequestedRegion(inputRequestedRegion1);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << this->GetNameOfClass()
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region of image 1.");
e.SetDataObject(inputPtr1);
throw e;
- }
- if ( inputRequestedRegion2.Crop(inputPtr2->GetLargestPossibleRegion()))
- {
- inputPtr2->SetRequestedRegion( inputRequestedRegion2 );
- }
+ }
+ if (inputRequestedRegion2.Crop(inputPtr2->GetLargestPossibleRegion()))
+ {
+ inputPtr2->SetRequestedRegion(inputRequestedRegion2);
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr2->SetRequestedRegion( inputRequestedRegion2 );
+ inputPtr2->SetRequestedRegion(inputRequestedRegion2);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << this->GetNameOfClass()
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region of image 1.");
e.SetDataObject(inputPtr2);
throw e;
- }
+ }
return;
}
/**
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
-template <class TInputImage1, class TInputImage2, class TOutputImage, class TFunction >
+template <class TInputImage1, class TInputImage2, class TOutputImage, class TFunction>
void
BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread,
- int threadId)
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
+ int threadId)
{
//unsigned int i;
@@ -186,35 +183,33 @@ BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputImage, T
itk::ZeroFluxNeumannBoundaryCondition<TInputImage2> nbc2;
// We use dynamic_cast since inputs are stored as DataObjects. The
- // ImageToImageFilter::GetInput(int) always returns a pointer to a
- // TInputImage1 so it cannot be used for the second input.
+// ImageToImageFilter::GetInput(int) always returns a pointer to a
+// TInputImage1 so it cannot be used for the second input.
Input1ImageConstPointer inputPtr1
- = dynamic_cast<const TInputImage1*>(ProcessObjectType::GetInput(0));
+ = dynamic_cast<const TInputImage1*>(ProcessObjectType::GetInput(0));
Input2ImageConstPointer inputPtr2
- = dynamic_cast<const TInputImage2*>(ProcessObjectType::GetInput(1));
+ = dynamic_cast<const TInputImage2*>(ProcessObjectType::GetInput(1));
OutputImagePointer outputPtr = this->GetOutput(0);
-
RadiusType1 r1;
- r1[0]=m_Radius[0];
- r1[1]=m_Radius[1];
+ r1[0] = m_Radius[0];
+ r1[1] = m_Radius[1];
NeighborhoodIteratorType1 neighInputIt1;
RadiusType2 r2;
- r2[0]=m_Radius[0];
- r2[1]=m_Radius[1];
+ r2[0] = m_Radius[0];
+ r2[1] = m_Radius[1];
NeighborhoodIteratorType2 neighInputIt2;
itk::ImageRegionIterator<TOutputImage> outputIt;
-
// Find the data-set boundary "faces"
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage1>::FaceListType faceList1;
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage1> bC1;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage1> bC1;
faceList1 = bC1(inputPtr1, outputRegionForThread, r1);
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage2>::FaceListType faceList2;
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage2> bC2;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage2> bC2;
faceList2 = bC2(inputPtr2, outputRegionForThread, r2);
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage1>::FaceListType::iterator fit1;
@@ -225,8 +220,10 @@ BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputImage, T
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
- for (fit1=faceList1.begin(), fit2=faceList2.begin(); fit1 != faceList1.end(), fit2 != faceList2.end(); ++fit1, ++fit2)
- {
+ for (fit1 = faceList1.begin(), fit2 = faceList2.begin();
+ fit1 != faceList1.end(), fit2 != faceList2.end();
+ ++fit1, ++fit2)
+ {
neighInputIt1 = itk::ConstNeighborhoodIterator<TInputImage1>(r1, inputPtr1, *fit1);
neighInputIt2 = itk::ConstNeighborhoodIterator<TInputImage2>(r2, inputPtr2, *fit2);
// outputIt = itk::ImageRegionIterator<TOutputImage>(outputPtr, outputRegionForThread);
@@ -237,18 +234,17 @@ BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputImage, T
neighInputIt2.OverrideBoundaryCondition(&nbc2);
neighInputIt2.GoToBegin();
- while ( ! outputIt.IsAtEnd() )
- {
+ while (!outputIt.IsAtEnd())
+ {
- outputIt.Set( m_Functor( neighInputIt1, neighInputIt2 ) );
+ outputIt.Set(m_Functor(neighInputIt1, neighInputIt2));
++neighInputIt1;
++neighInputIt2;
++outputIt;
progress.CompletedPixel();
+ }
}
- }
-
}
diff --git a/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.h b/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.h
index e419062a14..ede2658f5f 100644
--- a/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.h
+++ b/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.h
@@ -34,52 +34,50 @@ namespace otb
* \ingroup IntensityImageFilters Multithreaded
*/
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
class ITK_EXPORT BinaryFunctorNeighborhoodVectorImageFilter
- : public itk::InPlaceImageFilter<TInputImage1,TOutputImage>
+ : public itk::InPlaceImageFilter<TInputImage1, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef BinaryFunctorNeighborhoodVectorImageFilter Self;
- typedef itk::InPlaceImageFilter<TInputImage1,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef BinaryFunctorNeighborhoodVectorImageFilter Self;
+ typedef itk::InPlaceImageFilter<TInputImage1, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(BinaryFunctorNeighborhoodVectorImageFilter,InPlaceImageFilter);
-
+ itkTypeMacro(BinaryFunctorNeighborhoodVectorImageFilter, InPlaceImageFilter);
/** Some convenient typedefs. */
- typedef TFunction FunctorType;
- typedef TInputImage1 Input1ImageType;
+ typedef TFunction FunctorType;
+ typedef TInputImage1 Input1ImageType;
typedef typename Input1ImageType::ConstPointer Input1ImagePointer;
- typedef typename Input1ImageType::RegionType Input1ImageRegionType;
- typedef typename Input1ImageType::PixelType Input1ImagePixelType;
- typedef TInputImage2 Input2ImageType;
+ typedef typename Input1ImageType::RegionType Input1ImageRegionType;
+ typedef typename Input1ImageType::PixelType Input1ImagePixelType;
+ typedef TInputImage2 Input2ImageType;
typedef typename Input2ImageType::ConstPointer Input2ImagePointer;
- typedef typename Input2ImageType::RegionType Input2ImageRegionType;
- typedef typename Input2ImageType::PixelType Input2ImagePixelType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputImagePixelType;
+ typedef typename Input2ImageType::RegionType Input2ImageRegionType;
+ typedef typename Input2ImageType::PixelType Input2ImagePixelType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputImagePixelType;
typedef itk::ProcessObject ProcessObjectType;
-
/** Connect one of the operands for pixel-wise addition */
- void SetInput1( const TInputImage1 * image1);
+ void SetInput1(const TInputImage1 * image1);
/** Connect one of the operands for pixel-wise addition */
- void SetInput2( const TInputImage2 * image2);
+ void SetInput2(const TInputImage2 * image2);
/** Connect the set of radius. In fact, Self keeps the larger size
* only to define neighborhood parameters, and gives the min and max
* radius to the functor. */
- void SetRadius ( const unsigned char & min, const unsigned char & max );
+ void SetRadius(const unsigned char& min, const unsigned char& max);
/** Get the functor object. The functor is returned by reference.
* (Functors do not have to derive from itk::LightObject, so they do
@@ -88,7 +86,7 @@ public:
FunctorType& GetFunctor()
{
return m_Functor;
- };
+ }
/** Set the functor object. This replaces the current Functor with a
* copy of the specified Functor. This allows the user to specify a
@@ -102,14 +100,13 @@ public:
this->Modified();
}
-
typedef itk::ConstNeighborhoodIterator<TInputImage1>
NeighborhoodIteratorType1;
typedef itk::ConstNeighborhoodIterator<TInputImage2>
NeighborhoodIteratorType2;
- typedef typename NeighborhoodIteratorType1::RadiusType RadiusType1;
- typedef typename NeighborhoodIteratorType2::RadiusType RadiusType2;
+ typedef typename NeighborhoodIteratorType1::RadiusType RadiusType1;
+ typedef typename NeighborhoodIteratorType2::RadiusType RadiusType2;
typedef unsigned char RadiusSizeType;
@@ -117,7 +114,7 @@ public:
protected:
BinaryFunctorNeighborhoodVectorImageFilter();
- virtual ~BinaryFunctorNeighborhoodVectorImageFilter() {};
+ virtual ~BinaryFunctorNeighborhoodVectorImageFilter() {}
/** BinaryFunctorNeighborhoodVectorImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -130,7 +127,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
/**
* Since the number of components per pixel depends on the radius range, one must reimplement
@@ -141,8 +138,8 @@ protected:
RadiusSizeType m_Radius;
private:
- BinaryFunctorNeighborhoodVectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ BinaryFunctorNeighborhoodVectorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
FunctorType m_Functor;
};
@@ -152,5 +149,4 @@ private:
#include "otbBinaryFunctorNeighborhoodVectorImageFilter.txx"
#endif
-
#endif
diff --git a/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx b/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
index c0ad277586..a7766e0520 100644
--- a/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
+++ b/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
@@ -31,67 +31,65 @@ namespace otb
* Constructor
*/
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
-BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
+ class TOutputImage, class TFunction>
+BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
::BinaryFunctorNeighborhoodVectorImageFilter()
{
- this->SetNumberOfRequiredInputs( 2 );
+ this->SetNumberOfRequiredInputs(2);
this->InPlaceOff();
m_Radius = 3;
}
-
/**
* Connect one of the operands for neighborhood-wise operation
*/
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
-::SetInput1( const TInputImage1 * image1 )
+BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
+::SetInput1(const TInputImage1 * image1)
{
// Process object is not const-correct so the const casting is required.
- SetNthInput(0, const_cast<TInputImage1 *>( image1 ));
+ SetNthInput(0, const_cast<TInputImage1 *>(image1));
}
-
/**
* Connect one of the operands for neighborhood-wise operation
*/
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
-::SetInput2( const TInputImage2 * image2 )
+BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
+::SetInput2(const TInputImage2 * image2)
{
// Process object is not const-correct so the const casting is required.
- SetNthInput(1, const_cast<TInputImage2 *>( image2 ));
+ SetNthInput(1, const_cast<TInputImage2 *>(image2));
}
/**
* Connect the interval of radius
*/
template <class TInputImage1, class TInputImage2,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1,TInputImage2,TOutputImage,TFunction>
-::SetRadius( const unsigned char & min, const unsigned char & max )
+BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
+::SetRadius(const unsigned char& min, const unsigned char& max)
{
- this->SetRadius( max );
- GetFunctor().SetRadius( min, max );
+ this->SetRadius(max);
+ GetFunctor().SetRadius(min, max);
}
/**
* Generate the output information
*/
-template <class TInputImage1, class TInputImage2, class TOutputImage, class TFunction >
+template <class TInputImage1, class TInputImage2, class TOutputImage, class TFunction>
void
BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
::GenerateOutputInformation(void)
{
Superclass::GenerateOutputInformation();
- int nbComponents = static_cast<int>(m_Functor.GetRadiusMax())+1
+ int nbComponents = static_cast<int>(m_Functor.GetRadiusMax()) + 1
- static_cast<int>(m_Functor.GetRadiusMin());
this->GetOutput()->SetNumberOfComponentsPerPixel(nbComponents);
@@ -100,19 +98,18 @@ BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1, TInputImage2, TOutputIm
/**
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
-template <class TInputImage1, class TInputImage2, class TOutputImage, class TFunction >
+template <class TInputImage1, class TInputImage2, class TOutputImage, class TFunction>
void
BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread,
- int threadId)
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
+ int threadId)
{
itk::ZeroFluxNeumannBoundaryCondition<TInputImage1> nbc1;
itk::ZeroFluxNeumannBoundaryCondition<TInputImage2> nbc2;
- Input1ImagePointer inputPtr1 = dynamic_cast<const TInputImage1 *>( ProcessObjectType::GetInput(0) );
- Input2ImagePointer inputPtr2 = dynamic_cast<const TInputImage2 *>( ProcessObjectType::GetInput(1) );
-
+ Input1ImagePointer inputPtr1 = dynamic_cast<const TInputImage1 *>(ProcessObjectType::GetInput(0));
+ Input2ImagePointer inputPtr2 = dynamic_cast<const TInputImage2 *>(ProcessObjectType::GetInput(1));
RadiusType1 r1;
r1.Fill(m_Radius);
@@ -124,7 +121,7 @@ BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1, TInputImage2, TOutputIm
// This is the main difference from BinaryFunctorNeighborhoodImageFilter<TInputImage1, TInputImage2, TOutputImage, TFunction>::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread, int threadId)
OutputImagePointer outputPtr = this->GetOutput();
- outputPtr->SetNumberOfComponentsPerPixel( m_Functor.GetNumberOfComponentsPerPixel() );
+ outputPtr->SetNumberOfComponentsPerPixel(m_Functor.GetNumberOfComponentsPerPixel());
outputPtr->Allocate();
itk::ImageRegionIterator<TOutputImage> outputIt;
@@ -132,47 +129,47 @@ BinaryFunctorNeighborhoodVectorImageFilter<TInputImage1, TInputImage2, TOutputIm
// Find the data-set boundary "faces"
typedef typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage1> TypeFace1;
typename TypeFace1::FaceListType::iterator fit1;
- typename TypeFace1::FaceListType faceList1;
- TypeFace1 bC1;
- faceList1 = bC1( inputPtr1, outputRegionForThread, r1 );
+ typename TypeFace1::FaceListType faceList1;
+ TypeFace1 bC1;
+ faceList1 = bC1(inputPtr1, outputRegionForThread, r1);
typedef typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage2> TypeFace2;
typename TypeFace2::FaceListType::iterator fit2;
- typename TypeFace2::FaceListType faceList2;
- TypeFace2 bC2;
- faceList2 = bC2( inputPtr2, outputRegionForThread, r2 );
+ typename TypeFace2::FaceListType faceList2;
+ TypeFace2 bC2;
+ faceList2 = bC2(inputPtr2, outputRegionForThread, r2);
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
// Process each of the boundary faces.
// Center first and then left, right, up, down borders
- for ( fit1=faceList1.begin(), fit2=faceList2.begin();
- fit1 != faceList1.end() && fit2 != faceList2.end();
- ++fit1, ++fit2 )
- {
- neighInputIt1 = itk::ConstNeighborhoodIterator<TInputImage1> ( r1, inputPtr1, *fit1 );
- neighInputIt1.OverrideBoundaryCondition( &nbc1 );
+ for (fit1 = faceList1.begin(), fit2 = faceList2.begin();
+ fit1 != faceList1.end() && fit2 != faceList2.end();
+ ++fit1, ++fit2)
+ {
+ neighInputIt1 = itk::ConstNeighborhoodIterator<TInputImage1> (r1, inputPtr1, *fit1);
+ neighInputIt1.OverrideBoundaryCondition(&nbc1);
neighInputIt1.GoToBegin();
- neighInputIt2 = itk::ConstNeighborhoodIterator<TInputImage2> ( r2, inputPtr2, *fit2 );
- neighInputIt2.OverrideBoundaryCondition( &nbc2 );
+ neighInputIt2 = itk::ConstNeighborhoodIterator<TInputImage2> (r2, inputPtr2, *fit2);
+ neighInputIt2.OverrideBoundaryCondition(&nbc2);
neighInputIt2.GoToBegin();
- outputIt = itk::ImageRegionIterator<TOutputImage> ( outputPtr, *fit1 );
+ outputIt = itk::ImageRegionIterator<TOutputImage> (outputPtr, *fit1);
outputIt.GoToBegin();
- while ( !outputIt.IsAtEnd() )
- {
- outputIt.Set( m_Functor( neighInputIt1, neighInputIt2 ) );
+ while (!outputIt.IsAtEnd())
+ {
+ outputIt.Set(m_Functor(neighInputIt1, neighInputIt2));
++neighInputIt1;
++neighInputIt2;
++outputIt;
progress.CompletedPixel();
+ }
}
- }
}
} // end namespace otb
diff --git a/Code/Common/otbCommandLineArgumentParser.cxx b/Code/Common/otbCommandLineArgumentParser.cxx
index 8c3869586f..26212de666 100644
--- a/Code/Common/otbCommandLineArgumentParser.cxx
+++ b/Code/Common/otbCommandLineArgumentParser.cxx
@@ -25,53 +25,52 @@
namespace otb
{
-
// --------- CommandLineArgumentParseResult ----------------------------------------
void CommandLineArgumentParseResult
-::PrintSelf(std::ostream& /*os*/ /*, itk::Indent indent*/)const
+::PrintSelf(std::ostream& /*os*/ /*, itk::Indent indent*/) const
{
}
bool CommandLineArgumentParseResult
-::IsOptionPresent(std::string option)const
+::IsOptionPresent(std::string option) const
{
return (m_OptionMap.find(option) != m_OptionMap.end());
}
bool CommandLineArgumentParseResult
-::IsOptionInputImagePresent(void)const
+::IsOptionInputImagePresent(void) const
{
return (this->IsOptionPresent("--InputImage"));
}
bool CommandLineArgumentParseResult
-::IsOptionOutputImagePresent(void)const
+::IsOptionOutputImagePresent(void) const
{
return (this->IsOptionPresent("--OutputImage"));
}
bool CommandLineArgumentParseResult
-::IsOptionOTBTestingPresent(void)const
+::IsOptionOTBTestingPresent(void) const
{
return (this->IsOptionPresent("--OTBTesting"));
}
std::string CommandLineArgumentParseResult
-::GetParameterString(std::string option, unsigned int number)const
+::GetParameterString(std::string option, unsigned int number) const
{
- if ( this->IsOptionPresent(option) == false )
- {
+ if (this->IsOptionPresent(option) == false)
+ {
itk::OStringStream msg;
- msg<<"GetParameterString(): The following '"<<option<<"' option is unknown !!";
+ msg << "GetParameterString(): The following '" << option << "' option is unknown !!";
CommandLineArgumentParserArgumentErrorException e(__FILE__, __LINE__);
e.SetDescription(msg.str().c_str());
throw e;
- }
+ }
OptionMapType::const_iterator it = m_OptionMap.begin();
it = m_OptionMap.find(option);
ParameterArrayType pat = (*it).second;
- std::string lString = pat[number];
- return ( lString );
+ std::string lString = pat[number];
+ return (lString);
}
std::string CommandLineArgumentParseResult
@@ -93,7 +92,6 @@ int CommandLineArgumentParseResult
return (m_OptionMap[option].size());
}
-
void CommandLineArgumentParseResult
::Clear()
{
@@ -101,7 +99,7 @@ void CommandLineArgumentParseResult
}
void CommandLineArgumentParseResult
-::AddOption(const std::string &option)
+::AddOption(const std::string& option)
{
ParameterArrayType pat;
// pat.reserve(nParms);
@@ -109,38 +107,36 @@ void CommandLineArgumentParseResult
}
void CommandLineArgumentParseResult
-::AddParameter(const std::string &option, const std::string ¶meter)
+::AddParameter(const std::string& option, const std::string& parameter)
{
m_OptionMap[option].push_back(parameter);
}
-
// --------- CommandLineArgumentParser ----------------------------------------
CommandLineArgumentParser
::CommandLineArgumentParser()
{
- AddOption("--help","Help","-h",0,false);
- AddOption("--version","Version","-v",0,false);
- AddOptionNParams("--OTBTesting", "Testing purposes only.","-OTBTesting",false);
+ AddOption("--help", "Help", "-h", 0, false);
+ AddOption("--version", "Version", "-v", 0, false);
+ AddOptionNParams("--OTBTesting", "Testing purposes only.", "-OTBTesting", false);
m_ProgramDescription.clear();
}
-
void CommandLineArgumentParser
::AddInputImage(bool obligatory)
{
- AddOption("--InputImage","input image file name ","-in",1,obligatory);
+ AddOption("--InputImage", "input image file name ", "-in", 1, obligatory);
}
void CommandLineArgumentParser
::AddOutputImage(bool obligatory)
{
- AddOption("--OutputImage","output image file name ","-out",1,obligatory);
+ AddOption("--OutputImage", "output image file name ", "-out", 1, obligatory);
}
void CommandLineArgumentParser
-::AddOption(std::string name, std::string comment, std::string synonim, int nParameters, bool obligatory )
+::AddOption(std::string name, std::string comment, std::string synonim, int nParameters, bool obligatory)
{
// Create a structure for the command
OptionType option;
@@ -158,7 +154,7 @@ void CommandLineArgumentParser
}
void CommandLineArgumentParser
-::AddOptionNParams(std::string name, std::string comment, std::string synonim, bool obligatory )
+::AddOptionNParams(std::string name, std::string comment, std::string synonim, bool obligatory)
{
// Create a structure for the command
OptionType option;
@@ -173,11 +169,10 @@ void CommandLineArgumentParser
// Add the option to the map
m_OptionList.push_back(option);
-
}
void CommandLineArgumentParser
-::ParseGUI(CommandLineArgumentParseResult * /*outResult*/,bool /*failOnUnknownTrailingParameters*/ )
+::ParseGUI(CommandLineArgumentParseResult * /*outResult*/, bool /*failOnUnknownTrailingParameters*/)
{
/* OTB Comment : Todo : use OTB_USE_VISU_GUI cmake option for generate this method
Fl_Window *window = new Fl_Window(320,(m_OptionList.size()+2)*50);
@@ -208,41 +203,40 @@ void CommandLineArgumentParser
void CommandLineArgumentParser
::ParseCommandLine(int argc, char *argv[],
CommandLineArgumentParseResult * outResult,
- bool failOnUnknownTrailingParameters )
+ bool failOnUnknownTrailingParameters)
{
bool tryParse = TryParseCommandLine(argc, argv, outResult, false, failOnUnknownTrailingParameters);
bool IsHelp = outResult->IsOptionPresent("--help");
- if ( IsHelp == true )
- {
+ if (IsHelp == true)
+ {
PrintUsage(std::cout);
CommandLineArgumentParserHelpException e(__FILE__, __LINE__);
e.SetDescription("ParseCommandLine(): Help Parser");
throw e;
- }
+ }
bool IsVersion = outResult->IsOptionPresent("--version");
- if ( IsVersion == true )
- {
+ if (IsVersion == true)
+ {
PrintVersion(std::cout);
CommandLineArgumentParserHelpException e(__FILE__, __LINE__);
e.SetDescription("ParseCommandLine(): Version Parser");
throw e;
- }
+ }
tryParse = TryParseCommandLine(argc, argv, outResult, true, failOnUnknownTrailingParameters);
- if ( (tryParse == false) )
- {
+ if ((tryParse == false))
+ {
PrintUsage(std::cerr);
CommandLineArgumentParserArgumentErrorException e(__FILE__, __LINE__);
e.SetDescription("ParseCommandLine() argument Error");
throw e;
- }
+ }
}
-
bool CommandLineArgumentParser::TryParseCommandLine(int argc, char *argv[],
- CommandLineArgumentParseResult * outResult,
- bool reportFailedMsg,
- bool failOnUnknownTrailingParameters)
+ CommandLineArgumentParseResult * outResult,
+ bool reportFailedMsg,
+ bool failOnUnknownTrailingParameters)
{
// Clear the result
outResult->Clear();
@@ -252,191 +246,188 @@ bool CommandLineArgumentParser::TryParseCommandLine(int argc, char *argv[],
int index(0);
// Go through the arguments
- for (i=1; i < argc; ++i)
- {
+ for (i = 1; i < argc; ++i)
+ {
// Get the next argument
std::string arg(argv[i]);
// Check if the argument is known
- bool findOption = FindOption( arg, index );
+ bool findOption = FindOption(arg, index);
if (findOption == false)
- {
- if (failOnUnknownTrailingParameters)
{
- // Unknown argument found
- if ( reportFailedMsg == true)
+ if (failOnUnknownTrailingParameters)
{
+ // Unknown argument found
+ if (reportFailedMsg == true)
+ {
std::cerr << "The following '" << arg << "' option is unknown !!" << std::endl;
- }
+ }
return false;
- }
+ }
else return true;
- }
+ }
//Check the option
m_OptionList[index].Finded = true;
// If the number of parameters is predefined
if (m_OptionList[index].NumberOfParametersFixed == true)
- {
+ {
// Check if the number of parameters is correct
int nParameters = m_OptionList[index].NumberOfParameters;
- if (i+nParameters >= argc)
- {
- // Too few parameters
- if ( reportFailedMsg == true)
+ if (i + nParameters >= argc)
{
+ // Too few parameters
+ if (reportFailedMsg == true)
+ {
std::cerr << "Missing one (or more) parameter(s) for the following '" << arg << "' option." << std::endl;
- }
+ }
return false;
- }
+ }
// Tell the result that the option has been encountered
outResult->AddOption(m_OptionList[index].CommonName);
// Pass in the parameters
- for (int j=0;j<nParameters;++j,++i)
- {
- outResult->AddParameter(m_OptionList[index].CommonName,std::string(argv[i+1]));
+ for (int j = 0; j < nParameters; ++j, ++i)
+ {
+ outResult->AddParameter(m_OptionList[index].CommonName, std::string(argv[i + 1]));
+ }
}
- }
// If the number of parameters is not defined, read until the next option or the end of argv
else
- {
+ {
// Tell the result that the option has been encountered
outResult->AddOption(m_OptionList[index].CommonName);
bool goOnFlag(true);
- while (goOnFlag == true )
- {
- if ( argv[i+1] != NULL )
+ while (goOnFlag == true)
{
- std::string strArgv = std::string(argv[i+1]);
- if ( strArgv[0] == '-' )
+ if (argv[i + 1] != NULL)
{
+ std::string strArgv = std::string(argv[i + 1]);
+ if (strArgv[0] == '-')
+ {
goOnFlag = false;
- }
+ }
else
- {
- outResult->AddParameter(m_OptionList[index].CommonName,strArgv);
+ {
+ outResult->AddParameter(m_OptionList[index].CommonName, strArgv);
++i;
+ }
}
- }
else goOnFlag = false;
// ++i;
+ }
}
- }
-
- }
+ }
// Check that all required arguments are specified
- for (unsigned int cpt=0; cpt < m_OptionList.size(); cpt++ )
- {
- if ( (m_OptionList[cpt].Obligatory == true) && (m_OptionList[cpt].Finded == false) )
+ for (unsigned int cpt = 0; cpt < m_OptionList.size(); cpt++)
{
- // Too few parameters
- if ( reportFailedMsg == true)
+ if ((m_OptionList[cpt].Obligatory == true) && (m_OptionList[cpt].Finded == false))
{
+ // Too few parameters
+ if (reportFailedMsg == true)
+ {
std::cerr << "'" << m_OptionList[cpt].CommonName << "' argument is required !!!" << std::endl;
- }
+ }
return false;
+ }
}
- }
// Everything is correct
return true;
}
-bool CommandLineArgumentParser::FindOption(const std::string & option, int & index)
+bool CommandLineArgumentParser::FindOption(const std::string& option, int& index)
{
//Look through the option list
- bool optionFoundFlag(false);
- bool goOnFlag(true);
+ bool optionFoundFlag(false);
+ bool goOnFlag(true);
unsigned int cpt(0);
- std::string strOption(option);
- while ( goOnFlag == true )
- {
- if ( (m_OptionList[cpt].CommonName == strOption) || (m_OptionList[cpt].Synonim == strOption) )
+ std::string strOption(option);
+ while (goOnFlag == true)
{
+ if ((m_OptionList[cpt].CommonName == strOption) || (m_OptionList[cpt].Synonim == strOption))
+ {
index = cpt;
goOnFlag = false;
optionFoundFlag = true;
- }
+ }
cpt++;
- if ( cpt >= m_OptionList.size() )
- {
+ if (cpt >= m_OptionList.size())
+ {
goOnFlag = false;
+ }
}
- }
return (optionFoundFlag);
}
-void CommandLineArgumentParser::PrintUsage(std::ostream& os)const
+void CommandLineArgumentParser::PrintUsage(std::ostream& os) const
{
os << std::endl;
if (!m_ProgramDescription.empty())
- {
+ {
os << m_ProgramDescription << std::endl << std::endl;
- }
+ }
- os << " Usage : "<<m_ProgramName<<std::endl;
+ os << " Usage : " << m_ProgramName << std::endl;
// Compute the max width for option display
- int largeurmax(-1);
+ int largeurmax(-1);
unsigned int i;
- for (i=0; i < m_OptionList.size(); ++i )
- {
+ for (i = 0; i < m_OptionList.size(); ++i)
+ {
int largeur = m_OptionList[i].CommonName.size() + m_OptionList[i].Synonim.size();
- if ( largeur > largeurmax ) largeurmax = largeur;
- }
+ if (largeur > largeurmax) largeurmax = largeur;
+ }
// Check that all required arguments are present on the command line
- for (i=0; i < m_OptionList.size(); ++i )
- {
- if (m_OptionList[i].CommonName != "--OTBTesting")
+ for (i = 0; i < m_OptionList.size(); ++i)
{
+ if (m_OptionList[i].CommonName != "--OTBTesting")
+ {
int largeur = m_OptionList[i].CommonName.size() + m_OptionList[i].Synonim.size();
os << " ";
- if ( m_OptionList[i].Obligatory == false ) os <<"[";
+ if (m_OptionList[i].Obligatory == false) os << "[";
else os << " ";
os << m_OptionList[i].CommonName;
- if (m_OptionList[i].Synonim.empty() == false )
- {
- os << "|"<<m_OptionList[i].Synonim;
- }
- if ( m_OptionList[i].Obligatory == false ) os <<"]";
+ if (m_OptionList[i].Synonim.empty() == false)
+ {
+ os << "|" << m_OptionList[i].Synonim;
+ }
+ if (m_OptionList[i].Obligatory == false) os << "]";
else os << " ";
//Align the text
- for (int b=largeur; b< largeurmax; b++) os <<" ";
- os << " : "<<m_OptionList[i].Description;
- if (m_OptionList[i].NumberOfParametersFixed == true )
- {
- switch ( m_OptionList[i].NumberOfParameters )
+ for (int b = largeur; b < largeurmax; b++)
+ os << " ";
+ os << " : " << m_OptionList[i].Description;
+ if (m_OptionList[i].NumberOfParametersFixed == true)
{
- case 0 :
+ switch (m_OptionList[i].NumberOfParameters)
+ {
+ case 0:
break;
- case 1 :
- os << " ("<<m_OptionList[i].NumberOfParameters<<" parameter)";
+ case 1:
+ os << " (" << m_OptionList[i].NumberOfParameters << " parameter)";
break;
- default :
- os << " ("<<m_OptionList[i].NumberOfParameters<<" parameters)";
+ default:
+ os << " (" << m_OptionList[i].NumberOfParameters << " parameters)";
break;
+ }
}
- }
else
- {
+ {
os << " (N parameters)";
- }
+ }
os << std::endl;
+ }
}
- }
os << std::endl;
}
-void CommandLineArgumentParser::PrintVersion(std::ostream& os)const
+void CommandLineArgumentParser::PrintVersion(std::ostream& os) const
{
- os << " OTB Version : "<<OTB_VERSION_STRING<<std::endl;
+ os << " OTB Version : " << OTB_VERSION_STRING << std::endl;
}
-
}
-
-
diff --git a/Code/Common/otbCommandLineArgumentParser.h b/Code/Common/otbCommandLineArgumentParser.h
index eb3b96fec9..9f03f0de90 100644
--- a/Code/Common/otbCommandLineArgumentParser.h
+++ b/Code/Common/otbCommandLineArgumentParser.h
@@ -32,83 +32,81 @@
#include "itkProcessObject.h"
#include "otbMacro.h"
-
/** \class CommandLineArgumentParserHelpException
* \brief This exception is thrown when the help menu is displayed.
*/
class ITK_EXPORT CommandLineArgumentParserHelpException
- : public itk::ExceptionObject
+ : public itk::ExceptionObject
{
public:
/** Run-time information. */
- itkTypeMacro(CommandLineArgumentParserHelpException , ExceptionObject );
+ itkTypeMacro(CommandLineArgumentParserHelpException, ExceptionObject);
/** Constructor. */
CommandLineArgumentParserHelpException(const char *file, unsigned int line,
const char* message = "Help:",
- const char* loc = "Unknown" ) :
- ExceptionObject(file, line, message, loc)
- {}
+ const char* loc = "Unknown") :
+ ExceptionObject(file, line, message, loc)
+ {}
/** Constructor. */
- CommandLineArgumentParserHelpException(const std::string &file, unsigned int line,
+ CommandLineArgumentParserHelpException(const std::string & file, unsigned int line,
const char* message = "Help:",
- const char* loc = "Unknown" ) :
- ExceptionObject(file, line, message, loc)
- {}
+ const char* loc = "Unknown") :
+ ExceptionObject(file, line, message, loc)
+ {}
};
/** \class CommandLineArgumentParserVersionException
* \brief This exception is thrown when the version is displayed.
*/
class ITK_EXPORT CommandLineArgumentParserVersionException
- : public itk::ExceptionObject
+ : public itk::ExceptionObject
{
public:
/** Run-time information. */
- itkTypeMacro(CommandLineArgumentParserVersionException , ExceptionObject );
+ itkTypeMacro(CommandLineArgumentParserVersionException, ExceptionObject);
/** Constructor. */
CommandLineArgumentParserVersionException(const char *file, unsigned int line,
- const char* message = "Version:",
- const char* loc = "Unknown" ) :
- ExceptionObject(file, line, message, loc)
- {}
+ const char* message = "Version:",
+ const char* loc = "Unknown") :
+ ExceptionObject(file, line, message, loc)
+ {}
/** Constructor. */
- CommandLineArgumentParserVersionException(const std::string &file, unsigned int line,
- const char* message = "Version:",
- const char* loc = "Unknown" ) :
- ExceptionObject(file, line, message, loc)
- {}
+ CommandLineArgumentParserVersionException(const std::string & file, unsigned int line,
+ const char* message = "Version:",
+ const char* loc = "Unknown") :
+ ExceptionObject(file, line, message, loc)
+ {}
};
/** \class CommandLineArgumentParserArgumentErrorException
* \brief This exception is thrown when the version is displayed.
*/
class ITK_EXPORT CommandLineArgumentParserArgumentErrorException
- : public itk::ExceptionObject
+ : public itk::ExceptionObject
{
public:
/** Run-time information. */
- itkTypeMacro(CommandLineArgumentParserArgumentErrorException , ExceptionObject );
+ itkTypeMacro(CommandLineArgumentParserArgumentErrorException, ExceptionObject);
/** Constructor. */
CommandLineArgumentParserArgumentErrorException(const char *file, unsigned int line,
- const char* message = "Argument error:",
- const char* loc = "Unknown" ) :
- ExceptionObject(file, line, message, loc)
- {}
+ const char* message = "Argument error:",
+ const char* loc = "Unknown") :
+ ExceptionObject(file, line, message, loc)
+ {}
/** Constructor. */
- CommandLineArgumentParserArgumentErrorException(const std::string &file, unsigned int line,
- const char* message = "Argument error:",
- const char* loc = "Unknown" ) :
- ExceptionObject(file, line, message, loc)
- {}
+ CommandLineArgumentParserArgumentErrorException(const std::string & file, unsigned int line,
+ const char* message = "Argument error:",
+ const char* loc = "Unknown") :
+ ExceptionObject(file, line, message, loc)
+ {}
};
namespace otb
{
-
//class CommandLineArgumentParser;
/**
@@ -119,13 +117,13 @@ namespace otb
class ITK_EXPORT CommandLineArgumentParseResult : public itk::ProcessObject
{
public:
- typedef CommandLineArgumentParseResult Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef CommandLineArgumentParseResult Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
itkNewMacro(Self);
- itkTypeMacro(CommandLineArgumentParseResult,itk::ProcessObject);
+ itkTypeMacro(CommandLineArgumentParseResult, itk::ProcessObject);
/** Check whether the option was passed in or not */
bool IsOptionPresent(std::string option) const;
@@ -137,58 +135,55 @@ public:
bool IsOptionOutputImagePresent(void) const;
/** Check whether the OTBTesting option was passed in or not */
- bool IsOptionOTBTestingPresent(void)const;
+ bool IsOptionOTBTestingPresent(void) const;
/** Get one of the parameters to the option */
// const char *GetOptionParameter(const char *option, unsigned int number = 0);
int GetNumberOfParameters(std::string option);
- void PrintSelf(std::ostream& os/*, itk::Indent indent*/) const;
-
-#define otbGetParameterMacro(name,type) \
- virtual type GetParameter##name (std::string option, unsigned int number=0) const \
- { \
- std::string parameter = this->GetParameterString(option, number); \
- type lValeur; \
- ::otb::StringStream flux; \
- flux << parameter; \
- flux >> lValeur; \
- return lValeur; \
- }
-
-
- otbGetParameterMacro(Char,char);
- otbGetParameterMacro(Short,short);
- otbGetParameterMacro(UShort,unsigned short);
- otbGetParameterMacro(Int,int);
- otbGetParameterMacro(UInt,unsigned int);
- otbGetParameterMacro(Long,long);
- otbGetParameterMacro(ULong,unsigned long);
- otbGetParameterMacro(Float,float);
- otbGetParameterMacro(Double,double);
-
-
- std::string GetParameterString(std::string option, unsigned int number=0) const;
-
- std::string GetInputImage(void) const;
- std::string GetOutputImage(void) const;
-
+ void PrintSelf(std::ostream& os /*, itk::Indent indent*/) const;
+
+#define otbGetParameterMacro(name, type) \
+ virtual type GetParameter ## name (std::string option, unsigned int number = 0) const \
+ { \
+ std::string parameter = this->GetParameterString(option, number); \
+ type lValeur; \
+ ::otb::StringStream flux; \
+ flux << parameter; \
+ flux >> lValeur; \
+ return lValeur; \
+ }
+
+ otbGetParameterMacro(Char, char);
+ otbGetParameterMacro(Short, short);
+ otbGetParameterMacro(UShort, unsigned short);
+ otbGetParameterMacro(Int, int);
+ otbGetParameterMacro(UInt, unsigned int);
+ otbGetParameterMacro(Long, long);
+ otbGetParameterMacro(ULong, unsigned long);
+ otbGetParameterMacro(Float, float);
+ otbGetParameterMacro(Double, double);
+
+ std::string GetParameterString(std::string option, unsigned int number = 0) const;
+
+ std::string GetInputImage(void) const;
+ std::string GetOutputImage(void) const;
protected:
CommandLineArgumentParseResult() {};
- virtual ~CommandLineArgumentParseResult() {};
+ virtual ~CommandLineArgumentParseResult() {}
private:
- template< typename TypeValeur >
- TypeValeur GetParameter(std::string option, unsigned int number=0) const;
+ template<typename TypeValeur>
+ TypeValeur GetParameter(std::string option, unsigned int number = 0) const;
- typedef std::vector< std::string > ParameterArrayType;
- typedef std::map< std::string, ParameterArrayType > OptionMapType;
+ typedef std::vector<std::string> ParameterArrayType;
+ typedef std::map<std::string, ParameterArrayType> OptionMapType;
void Clear();
- void AddOption(const std::string &option);
- void AddParameter(const std::string &option, const std::string ¶meter);
+ void AddOption(const std::string & option);
+ void AddParameter(const std::string & option, const std::string & parameter);
OptionMapType m_OptionMap;
@@ -226,29 +221,33 @@ private:
class ITK_EXPORT CommandLineArgumentParser : public itk::ProcessObject
{
public:
- typedef CommandLineArgumentParser Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef CommandLineArgumentParser Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
itkNewMacro(Self);
- itkTypeMacro(CommandLineArgumentParser,itk::ProcessObject);
+ itkTypeMacro(CommandLineArgumentParser, itk::ProcessObject);
/** Add an input image option */
- void AddInputImage(bool obligatory=true);
+ void AddInputImage(bool obligatory = true);
/** Add an output image option */
- void AddOutputImage(bool obligatory=true);
+ void AddOutputImage(bool obligatory = true);
itkSetStringMacro(ProgramDescription);
itkGetStringMacro(ProgramDescription);
/** Add an option with 0 or more parameters (words that follow it) */
// void AddOption(const char *name, const int nParameters, const char * comment);
- // at least one value
+// at least one value
- void AddOption(std::string name, std::string comment, std::string synonim = NULL, int nParameters = 1, bool obligatory =true);
+ void AddOption(std::string name,
+ std::string comment,
+ std::string synonim = NULL,
+ int nParameters = 1,
+ bool obligatory = true);
// if -1 we do not know the number of parameters
- void AddOptionNParams(std::string name, std::string comment, std::string synonim = NULL, bool obligatory =true);
+ void AddOptionNParams(std::string name, std::string comment, std::string synonim = NULL, bool obligatory = true);
/** Add a different string that envokes the same option (--file and -f) */
// void AddSynonim(const char *option, const char *synonim);
@@ -257,23 +256,23 @@ public:
CommandLineArgumentParseResult * outResult,
bool failOnUnknownTrailingParameters = true);
- void ParseGUI( CommandLineArgumentParseResult * outResult,
- bool failOnUnknownTrailingParameters = true);
+ void ParseGUI(CommandLineArgumentParseResult * outResult,
+ bool failOnUnknownTrailingParameters = true);
protected:
CommandLineArgumentParser();
- virtual ~CommandLineArgumentParser() {};
+ virtual ~CommandLineArgumentParser() {}
private:
void PrintUsage(std::ostream& os) const;
void PrintVersion(std::ostream& os) const;
- bool FindOption(const std::string & , int & index);
+ bool FindOption(const std::string&, int& index);
/** Try processing a command line. Returns false if something breaks */
bool TryParseCommandLine(int argc, char *argv[],
CommandLineArgumentParseResult * outResult,
bool reportFailedMsg,
- bool failOnUnknownTrailingParameters );
+ bool failOnUnknownTrailingParameters);
typedef struct
{
@@ -285,11 +284,10 @@ private:
bool Obligatory; // is the option mandatory ?
bool Finded; // check if the option is present
} OptionType;
- typedef std::vector< OptionType> ListOptionType;
+ typedef std::vector<OptionType> ListOptionType;
ListOptionType m_OptionList;
-
std::string m_ProgramName;
std::string m_ProgramDescription;
diff --git a/Code/Common/otbConcatenateVectorImageFilter.h b/Code/Common/otbConcatenateVectorImageFilter.h
index 37bd8d64ba..6811f57c97 100644
--- a/Code/Common/otbConcatenateVectorImageFilter.h
+++ b/Code/Common/otbConcatenateVectorImageFilter.h
@@ -27,22 +27,22 @@ namespace otb
* \brief This filter concatenates the vector pixel of the first
* image with the vector pixel of the second image.
*/
-template<class TInputImage1,class TInputImage2,class TOutputImage>
+template<class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT ConcatenateVectorImageFilter
- : public itk::ImageToImageFilter<TInputImage1,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage1, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef ConcatenateVectorImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage1,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ConcatenateVectorImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage1, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(VectorImageToImagePixelAccessor,ImageToImageFilter);
+ itkTypeMacro(VectorImageToImagePixelAccessor, ImageToImageFilter);
/** Template related typedefs */
typedef TInputImage1 InputImage1Type;
@@ -96,8 +96,8 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ConcatenateVectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ConcatenateVectorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Common/otbConcatenateVectorImageFilter.txx b/Code/Common/otbConcatenateVectorImageFilter.txx
index 6d8c5eb394..5832aa58da 100644
--- a/Code/Common/otbConcatenateVectorImageFilter.txx
+++ b/Code/Common/otbConcatenateVectorImageFilter.txx
@@ -27,8 +27,8 @@ namespace otb
/**
* Constructor.
*/
-template <class TInputImage1,class TInputImage2,class TOutputImage>
-ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
+template <class TInputImage1, class TInputImage2, class TOutputImage>
+ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>
::ConcatenateVectorImageFilter()
{
this->SetNumberOfRequiredInputs(2);
@@ -36,40 +36,40 @@ ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
/**
* Destructor.
*/
-template <class TInputImage1,class TInputImage2,class TOutputImage>
-ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
+template <class TInputImage1, class TInputImage2, class TOutputImage>
+ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>
::~ConcatenateVectorImageFilter()
{}
/**
* Set The first input image.
* \param image The first input image.
*/
-template <class TInputImage1,class TInputImage2,class TOutputImage>
+template <class TInputImage1, class TInputImage2, class TOutputImage>
void
-ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
+ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>
::SetInput1(const TInputImage1 * image)
{
- this->SetNthInput(0,const_cast<TInputImage1 *>(image));
+ this->SetNthInput(0, const_cast<TInputImage1 *>(image));
}
/**
* Set The second input image.
* \param image The second input image.
*/
-template <class TInputImage1,class TInputImage2,class TOutputImage>
+template <class TInputImage1, class TInputImage2, class TOutputImage>
void
-ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
+ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>
::SetInput2(const TInputImage2 * image)
{
- this->SetNthInput(1,const_cast<TInputImage2 *>(image));
+ this->SetNthInput(1, const_cast<TInputImage2 *>(image));
}
/**
* Get the first input image.
* \return The first input image.
*/
-template <class TInputImage1,class TInputImage2,class TOutputImage>
-typename ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
+template <class TInputImage1, class TInputImage2, class TOutputImage>
+typename ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>
::InputImage1Type *
-ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
+ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>
::GetInput1(void)
{
return const_cast<InputImage1Type *>(this->GetInput(0));
@@ -78,58 +78,57 @@ ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
* Get the second input image.
* \return The second input image.
*/
-template <class TInputImage1,class TInputImage2,class TOutputImage>
-typename ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
+template <class TInputImage1, class TInputImage2, class TOutputImage>
+typename ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>
::InputImage2Type *
-ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
+ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>
::GetInput2(void)
{
return const_cast<InputImage2Type *>(this->GetInput(1));
}
-
-template <class TInputImage1,class TInputImage2,class TOutputImage>
+template <class TInputImage1, class TInputImage2, class TOutputImage>
void
-ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
+ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>
::GenerateOutputInformation()
{
// Call to the superclass implementation
Superclass::GenerateOutputInformation();
- typename Superclass::InputImageConstPointer inputPtr1 = this->GetInput1();
- typename Superclass::InputImageConstPointer inputPtr2 = this->GetInput2();
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
-
- unsigned int nbComponentsPerPixel = inputPtr1->GetNumberOfComponentsPerPixel() + inputPtr2->GetNumberOfComponentsPerPixel();
-
+ typename Superclass::InputImageConstPointer inputPtr1 = this->GetInput1();
+ typename Superclass::InputImageConstPointer inputPtr2 = this->GetInput2();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+
+ unsigned int nbComponentsPerPixel = inputPtr1->GetNumberOfComponentsPerPixel() +
+ inputPtr2->GetNumberOfComponentsPerPixel();
+
// initialize the number of channels of the output image
- outputPtr->SetNumberOfComponentsPerPixel( nbComponentsPerPixel );
+ outputPtr->SetNumberOfComponentsPerPixel(nbComponentsPerPixel);
}
-
-template <class TInputImage1,class TInputImage2,class TOutputImage>
+template <class TInputImage1, class TInputImage2, class TOutputImage>
void
-ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
+ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>
::BeforeThreadedGenerateData()
{
Superclass::BeforeThreadedGenerateData();
- typename Superclass::InputImageConstPointer inputPtr1 = this->GetInput1();
- typename Superclass::InputImageConstPointer inputPtr2 = this->GetInput2();
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::InputImageConstPointer inputPtr1 = this->GetInput1();
+ typename Superclass::InputImageConstPointer inputPtr2 = this->GetInput2();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if (inputPtr1->GetLargestPossibleRegion()!=inputPtr2->GetLargestPossibleRegion())
- {
- itkExceptionMacro(<<"InputImage1 and InputImage2 have different requested regions.");
- }
+ if (inputPtr1->GetLargestPossibleRegion() != inputPtr2->GetLargestPossibleRegion())
+ {
+ itkExceptionMacro(<< "InputImage1 and InputImage2 have different requested regions.");
+ }
}
/**
* Main computation method.
*/
-template <class TInputImage1,class TInputImage2,class TOutputImage>
+template <class TInputImage1, class TInputImage2, class TOutputImage>
void
-ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
+ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>
::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
int threadId)
{
@@ -139,7 +138,7 @@ ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
OutputImagePointerType output = this->GetOutput();
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
+
// Define the portion of the input to walk for this thread
typename InputImage1Type::RegionType inputRegionForThread;
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
@@ -148,11 +147,11 @@ ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
typedef itk::ImageRegionIterator<InputImage1Type> Input1IteratorType;
typedef itk::ImageRegionIterator<InputImage2Type> Input2IteratorType;
typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
-
+
// Iterators declaration
- Input1IteratorType input1It(input1,inputRegionForThread);
- Input2IteratorType input2It(input2,inputRegionForThread);
- OutputIteratorType outputIt(output,outputRegionForThread);
+ Input1IteratorType input1It(input1, inputRegionForThread);
+ Input2IteratorType input2It(input2, inputRegionForThread);
+ OutputIteratorType outputIt(output, outputRegionForThread);
input1It.GoToBegin();
input2It.GoToBegin();
@@ -160,45 +159,45 @@ ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
// Iterate through the pixel
while (!outputIt.IsAtEnd())
- {
+ {
// define an output pixel
typename OutputImageType::PixelType output;
// Retrieve the size of each input pixel
unsigned int l1 = input1It.Get().GetSize();
unsigned int l2 = input2It.Get().GetSize();
// Set the output pixel size
- output.SetSize(l1+l2);
+ output.SetSize(l1 + l2);
// Loop through each band of the first image
- for (unsigned int i=0;i<l1;++i)
- {
+ for (unsigned int i = 0; i < l1; ++i)
+ {
// Fill the output pixel
- output[i]=static_cast<typename OutputImageType::InternalPixelType>(input1It.Get()[i]);
- }
+ output[i] = static_cast<typename OutputImageType::InternalPixelType>(input1It.Get()[i]);
+ }
// Loop though each band of the second image
- for (unsigned int i = 0;i<l2;++i)
- {
+ for (unsigned int i = 0; i < l2; ++i)
+ {
// Fill the output pixel
- output[i+l1]=static_cast<typename OutputImageType::InternalPixelType>(input2It.Get()[i]);
- }
+ output[i + l1] = static_cast<typename OutputImageType::InternalPixelType>(input2It.Get()[i]);
+ }
// Set the output pixel
outputIt.Set(output);
// Increment the iterator
++input1It;
++input2It;
++outputIt;
- }
-
+ }
+
}
/**
* PrintSelf method.
*/
-template <class TInputImage1,class TInputImage2,class TOutputImage>
+template <class TInputImage1, class TInputImage2, class TOutputImage>
void
-ConcatenateVectorImageFilter<TInputImage1,TInputImage2,TOutputImage>
+ConcatenateVectorImageFilter<TInputImage1, TInputImage2, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
#endif
diff --git a/Code/Common/otbConfigurationFile.cxx b/Code/Common/otbConfigurationFile.cxx
index 29fc9f718c..8d8fd2f336 100644
--- a/Code/Common/otbConfigurationFile.cxx
+++ b/Code/Common/otbConfigurationFile.cxx
@@ -30,15 +30,15 @@ ConfigurationFile
std::string OTBBinDir(OTB_CONFIG);
try
- {
+ {
m_OTBConfig = new ConfigFile(OTBBinDir + "/otb.conf");
- }
+ }
// catch (ConfigFile::file_not_found& e)
catch (...)
- {
+ {
// otbMsgDevMacro(<< "Error - File '" << e.filename << "' not found.");
otbMsgDevMacro(<< "Error - File not found.");
- }
+ }
}
ConfigurationFile
@@ -52,13 +52,12 @@ ConfigurationFile
::GetInstance()
{
if (!Instance)
- {
+ {
Instance = Self::New();
- }
+ }
return Instance;
}
-
void
ConfigurationFile
::PrintSelf(std::ostream& os, itk::Indent indent) const
@@ -66,6 +65,6 @@ ConfigurationFile
Superclass::PrintSelf(os, indent);
os << indent;
os << (*m_OTBConfig);
-
+
}
} // end namespace otb
diff --git a/Code/Common/otbConfigurationFile.h b/Code/Common/otbConfigurationFile.h
index cdccb974db..0bdcad324a 100644
--- a/Code/Common/otbConfigurationFile.h
+++ b/Code/Common/otbConfigurationFile.h
@@ -31,62 +31,62 @@ namespace otb
* \brief Manage OTB ConfigurationFile file
*/
- class ConfigurationFile
+class ConfigurationFile
: public itk::Object
- {
- public:
- /** Standard class typedef */
+{
+public:
+ /** Standard class typedef */
+
+ typedef ConfigurationFile Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ /** Standard macro */
+ itkTypeMacro(ConfigurationFile, Object);
- typedef ConfigurationFile Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ /** Get the unique instanc1e of the model */
+ static Pointer GetInstance();
+ ConfigFile * GetOTBConfig()
+ {
+ return m_OTBConfig;
+ }
- /** Standard macro */
- itkTypeMacro(ConfigurationFile,Object);
-
+ /** Get parameter*/
+ template<typename T> T GetParameter(const std::string& key) const
+ {
- /** Get the unique instanc1e of the model */
- static Pointer GetInstance();
+ if (m_OTBConfig == NULL)
+ {
+ itkExceptionMacro(<< "Configuration file not found.");
+ }
- ConfigFile * GetOTBConfig()
+ try
+ {
+ return m_OTBConfig->read<T>(key);
+ }
+ catch (ConfigFile::key_not_found& e)
{
- return m_OTBConfig;
- };
-
- /** Get parameter*/
- template<typename T> T GetParameter(const std::string & key) const {
-
- if(m_OTBConfig == NULL)
- {
- itkExceptionMacro(<<"Configuration file not found.");
- }
-
- try
- {
- return m_OTBConfig->read<T>( key );
- }
- catch( ConfigFile::key_not_found& e ) {
- itkExceptionMacro(<< "Error - Key '" << e.key << "' not found.");
- }
-
- };
-
- protected:
- /** This is protected for the singleton. Use GetInstance() instead. */
- itkNewMacro(Self);
- /** Constructor */
- ConfigurationFile();
-
- /** Destructor */
- ~ConfigurationFile();
- /** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
- private:
- /** The instance singleton */
- static Pointer Instance;
- ConfigFile * m_OTBConfig;
+ itkExceptionMacro(<< "Error - Key '" << e.key << "' not found.");
+ }
+
+ }
+
+protected:
+ /** This is protected for the singleton. Use GetInstance() instead. */
+ itkNewMacro(Self);
+ /** Constructor */
+ ConfigurationFile();
+
+ /** Destructor */
+ ~ConfigurationFile();
+ /** PrintSelf method */
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
+private:
+ /** The instance singleton */
+ static Pointer Instance;
+ ConfigFile * m_OTBConfig;
};
-}// end namespace
+} // end namespace
#endif
diff --git a/Code/Common/otbDataNode.h b/Code/Common/otbDataNode.h
index 257230d100..c24a75ead6 100644
--- a/Code/Common/otbDataNode.h
+++ b/Code/Common/otbDataNode.h
@@ -34,19 +34,18 @@ namespace otb
typedef
enum
-{
- ROOT=0,
- DOCUMENT=1,
- FOLDER=2,
- FEATURE_POINT=3,
- FEATURE_LINE=4,
- FEATURE_POLYGON=5,
- FEATURE_MULTIPOINT=6,
- FEATURE_MULTILINE=7,
- FEATURE_MULTIPOLYGON=8,
- FEATURE_COLLECTION=9
-} NodeType;
-
+ {
+ ROOT = 0,
+ DOCUMENT = 1,
+ FOLDER = 2,
+ FEATURE_POINT = 3,
+ FEATURE_LINE = 4,
+ FEATURE_POLYGON = 5,
+ FEATURE_MULTIPOINT = 6,
+ FEATURE_MULTILINE = 7,
+ FEATURE_MULTIPOLYGON = 8,
+ FEATURE_COLLECTION = 9
+ } NodeType;
/** \class DataNode
* \brief This class represents a node of data in a vector data hierarchy.
@@ -67,43 +66,42 @@ enum
*/
template <class TPrecision = double, unsigned VDimension = 2, class TValuePrecision = double>
class DataNode
- : public itk::Object
+ : public itk::Object
{
public:
/** Standard class typedef */
- typedef DataNode Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef DataNode Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Standard macro */
itkNewMacro(Self);
- itkTypeMacro(DataNode,Object);
+ itkTypeMacro(DataNode, Object);
/** Template parameters typedefs */
- typedef TPrecision PrecisionType;
+ typedef TPrecision PrecisionType;
typedef TValuePrecision ValuePrecisionType;
itkStaticConstMacro(Dimension, unsigned int, VDimension);
-
/** Internal data typedef */
- typedef itk::Point<PrecisionType,VDimension> PointType;
- typedef otb::PolyLineParametricPathWithValue<ValuePrecisionType,VDimension> LineType;
- typedef typename LineType::Pointer LinePointerType;
- typedef typename LineType::ConstPointer LineConstPointerType;
- typedef Polygon<ValuePrecisionType> PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
- typedef typename PolygonType::ConstPointer PolygonConstPointerType;
- typedef ObjectList<PolygonType> PolygonListType;
- typedef typename PolygonListType::Pointer PolygonListPointerType;
- typedef typename PolygonListType::ConstPointer PolygonListConstPointerType;
+ typedef itk::Point<PrecisionType, VDimension> PointType;
+ typedef otb::PolyLineParametricPathWithValue<ValuePrecisionType, VDimension> LineType;
+ typedef typename LineType::Pointer LinePointerType;
+ typedef typename LineType::ConstPointer LineConstPointerType;
+ typedef Polygon<ValuePrecisionType> PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef typename PolygonType::ConstPointer PolygonConstPointerType;
+ typedef ObjectList<PolygonType> PolygonListType;
+ typedef typename PolygonListType::Pointer PolygonListPointerType;
+ typedef typename PolygonListType::ConstPointer PolygonListConstPointerType;
/** Fields typedef */
// typedef std::map<std::string,std::string> FieldMapType;
// typedef std::pair<std::string,std::string> FieldType;
/** Accessors */
- itkGetMacro(NodeType,NodeType);
+ itkGetMacro(NodeType, NodeType);
itkGetStringMacro(NodeId);
itkSetStringMacro(NodeId);
@@ -209,76 +207,75 @@ public:
* \param key The name of the field.
* \return The value of the field. A default value is returned if the key was not found.
*/
- std::string GetFieldAsString(std::string key) const;
-
- /**
- * Add a field to the node.
- * \param key The name of the field.
- * \param value The value of the field.
- */
- void SetFieldAsInt(std::string key, int value);
- /**
- * Returns the value associated with a field name.
- * \param key The name of the field.
- * \return The value of the field. A default value is returned if the key was not found.
- */
- int GetFieldAsInt(std::string key) const;
-
+ std::string GetFieldAsString(std::string key) const;
/**
- * Remove the field associated with the given key, if possible.
+ * Add a field to the node.
* \param key The name of the field.
+ * \param value The value of the field.
*/
-// void RemoveField(std::string key);
+ void SetFieldAsInt(std::string key, int value);
+ /**
+ * Returns the value associated with a field name.
+ * \param key The name of the field.
+ * \return The value of the field. A default value is returned if the key was not found.
+ */
+ int GetFieldAsInt(std::string key) const;
+
/**
- * \return True if the node contains the field named after the given key.
+ * Remove the field associated with the given key, if possible.
* \param key The name of the field.
*/
+// void RemoveField(std::string key);
+/**
+ * \return True if the node contains the field named after the given key.
+ * \param key The name of the field.
+ */
bool HasField(std::string key) const;
/**
* \return the nth field of the node as a std::pair of (key,value).
* \param index the index of the field to return.
*/
// FieldType GetNthField(unsigned int index) const;
- /**
- * \return the number of fields in the node.
- */
+/**
+ * \return the number of fields in the node.
+ */
// unsigned int GetNumberOfFields() const;
- /**
- * Clear all fields.
- */
+/**
+ * Clear all fields.
+ */
// void ClearFields();
protected:
/** Constructor */
DataNode();
/** Destructor */
- ~DataNode() {};
+ ~DataNode() {}
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
DataNode(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** typedef of the data associated with the node */
typedef struct
{
- bool valid;
+ bool valid;
PointType point;
LinePointerType line;
- PolygonPointerType exteriorRing;
- PolygonListPointerType interiorRings;
+ PolygonPointerType exteriorRing;
+ PolygonListPointerType interiorRings;
} DataType;
/** The node type */
- NodeType m_NodeType;
+ NodeType m_NodeType;
/** The node id */
- std::string m_NodeId;
+ std::string m_NodeId;
/** The data associated with the node */
- DataType m_Data;
+ DataType m_Data;
/** The fields map */
// FieldMapType m_FieldMap;
diff --git a/Code/Common/otbDataNode.txx b/Code/Common/otbDataNode.txx
index 9ffdd41e04..bb46fcf0f2 100644
--- a/Code/Common/otbDataNode.txx
+++ b/Code/Common/otbDataNode.txx
@@ -25,7 +25,7 @@
namespace otb
{
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::DataNode()
{
m_NodeType = ROOT;
@@ -35,7 +35,7 @@ DataNode<TPrecision,VDimension,TValuePrecision>
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
void
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::SetNodeType(NodeType type)
{
m_NodeType = type;
@@ -44,7 +44,7 @@ DataNode<TPrecision,VDimension,TValuePrecision>
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
void
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::SetPoint(PointType point)
{
m_NodeType = FEATURE_POINT;
@@ -53,7 +53,7 @@ DataNode<TPrecision,VDimension,TValuePrecision>
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
-void DataNode<TPrecision,VDimension,TValuePrecision>
+void DataNode<TPrecision, VDimension, TValuePrecision>
::SetLine(LineType* line)
{
m_NodeType = FEATURE_LINE;
@@ -62,173 +62,173 @@ void DataNode<TPrecision,VDimension,TValuePrecision>
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
void
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::SetPolygonExteriorRing(PolygonType* polygon)
{
m_NodeType = FEATURE_POLYGON;
m_Data.exteriorRing = polygon;
if (!m_Data.interiorRings)
- {
+ {
m_Data.interiorRings = PolygonListType::New();
- }
+ }
m_Data.valid = true;
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
void
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::SetPolygonInteriorRings(PolygonListType* polygonList)
{
m_NodeType = FEATURE_POLYGON;
m_Data.interiorRings = polygonList;
if (!m_Data.exteriorRing)
- {
+ {
m_Data.exteriorRing = PolygonType::New();
- }
+ }
m_Data.valid = true;
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
-typename DataNode<TPrecision,VDimension,TValuePrecision>
+typename DataNode<TPrecision, VDimension, TValuePrecision>
::PointType
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::GetPoint() const
{
if (!IsPointFeature())
- {
- itkGenericExceptionMacro(<<"Node "<<m_NodeId<<" is not a point.");
- }
+ {
+ itkGenericExceptionMacro(<< "Node " << m_NodeId << " is not a point.");
+ }
if (!m_Data.valid)
- {
- itkGenericExceptionMacro(<<"Invalid point node.");
- }
+ {
+ itkGenericExceptionMacro(<< "Invalid point node.");
+ }
return m_Data.point;
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
-typename DataNode<TPrecision,VDimension,TValuePrecision>
+typename DataNode<TPrecision, VDimension, TValuePrecision>
::LinePointerType
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::GetLine() const
{
if (!IsLineFeature())
- {
- itkGenericExceptionMacro(<<"Node "<<m_NodeId<<" is not a line.");
- }
+ {
+ itkGenericExceptionMacro(<< "Node " << m_NodeId << " is not a line.");
+ }
if (!m_Data.valid)
- {
- itkGenericExceptionMacro(<<"Invalid line node.");
- }
+ {
+ itkGenericExceptionMacro(<< "Invalid line node.");
+ }
return m_Data.line;
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
-typename DataNode<TPrecision,VDimension,TValuePrecision>
+typename DataNode<TPrecision, VDimension, TValuePrecision>
::PolygonPointerType
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::GetPolygonExteriorRing() const
{
if (!IsPolygonFeature())
- {
- itkGenericExceptionMacro(<<"Node "<<m_NodeId<<" is not a polygon.");
- }
- if (!m_Data.valid || !m_Data.exteriorRing )
- {
- itkGenericExceptionMacro(<<"Invalid polygon node.");
- }
+ {
+ itkGenericExceptionMacro(<< "Node " << m_NodeId << " is not a polygon.");
+ }
+ if (!m_Data.valid || !m_Data.exteriorRing)
+ {
+ itkGenericExceptionMacro(<< "Invalid polygon node.");
+ }
return m_Data.exteriorRing;
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
-typename DataNode<TPrecision,VDimension,TValuePrecision>
+typename DataNode<TPrecision, VDimension, TValuePrecision>
::PolygonListPointerType
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::GetPolygonInteriorRings() const
{
if (!IsPolygonFeature())
- {
- itkGenericExceptionMacro(<<"Node "<<m_NodeId<<" is not a polygon.");
- }
+ {
+ itkGenericExceptionMacro(<< "Node " << m_NodeId << " is not a polygon.");
+ }
if (!m_Data.valid || !m_Data.interiorRings)
- {
- itkGenericExceptionMacro(<<"Invalid polygon node.");
- }
+ {
+ itkGenericExceptionMacro(<< "Invalid polygon node.");
+ }
return m_Data.interiorRings;
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
void
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- os<<indent<<this->GetNodeTypeAsString();
+ os << indent << this->GetNodeTypeAsString();
}
-
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
std::string
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::GetNodeTypeAsString() const
{
itk::OStringStream oss;
switch (m_NodeType)
- {
- case ROOT:
{
- oss<<"Root ("<<m_NodeId<<")";
- break;
+ case ROOT:
+ {
+ oss << "Root (" << m_NodeId << ")";
+ break;
}
- case DOCUMENT:
+ case DOCUMENT:
{
- oss<<"Document ("<<m_NodeId<<")";
- break;
+ oss << "Document (" << m_NodeId << ")";
+ break;
}
- case FOLDER:
+ case FOLDER:
{
- oss<<"Folder ("<<m_NodeId<<")";
- break;
+ oss << "Folder (" << m_NodeId << ")";
+ break;
}
- case FEATURE_POINT:
+ case FEATURE_POINT:
{
- oss<<"Point ("<<m_NodeId<<") "<<m_Data.point;
- break;
+ oss << "Point (" << m_NodeId << ") " << m_Data.point;
+ break;
}
- case FEATURE_LINE:
+ case FEATURE_LINE:
{
- oss<<"Line ("<<m_NodeId<<") "<<m_Data.line->GetVertexList()->Size()<<" points";
- break;
+ oss << "Line (" << m_NodeId << ") " << m_Data.line->GetVertexList()->Size() << " points";
+ break;
}
- case FEATURE_POLYGON:
+ case FEATURE_POLYGON:
{
- oss<<"Polygon ("<<m_NodeId<<") "<<this->GetPolygonExteriorRing()->GetVertexList()->Size()<<" points, "<<this->GetPolygonInteriorRings()->Size()<<" interior rings";
- break;
+ oss << "Polygon (" << m_NodeId << ") " << this->GetPolygonExteriorRing()->GetVertexList()->Size() << " points, " <<
+ this->GetPolygonInteriorRings()->Size() << " interior rings";
+ break;
}
- case FEATURE_MULTIPOINT:
+ case FEATURE_MULTIPOINT:
{
- oss<<"MultiPoint ("<<m_NodeId<<")";
- break;
+ oss << "MultiPoint (" << m_NodeId << ")";
+ break;
}
- case FEATURE_MULTILINE:
+ case FEATURE_MULTILINE:
{
- oss<<"MultiLine ("<<m_NodeId<<")";
- break;
+ oss << "MultiLine (" << m_NodeId << ")";
+ break;
}
- case FEATURE_MULTIPOLYGON:
+ case FEATURE_MULTIPOLYGON:
{
- oss<<"MultiPolygon ("<<m_NodeId<<")";
- break;
+ oss << "MultiPolygon (" << m_NodeId << ")";
+ break;
}
- case FEATURE_COLLECTION:
+ case FEATURE_COLLECTION:
{
- oss<<"Collection ("<<m_NodeId<<")";
- break;
+ oss << "Collection (" << m_NodeId << ")";
+ break;
}
- }
- if(GetMetaDataDictionary().HasKey(MetaDataKey::VectorDataKeywordlistKey))
- {
+ }
+ if (GetMetaDataDictionary().HasKey(MetaDataKey::VectorDataKeywordlistKey))
+ {
VectorDataKeywordlist kwl;
itk::ExposeMetaData<VectorDataKeywordlist>(GetMetaDataDictionary(), MetaDataKey::VectorDataKeywordlistKey, kwl);
- oss<< "\n -> Metadata: " << kwl;
- }
+ oss << "\n -> Metadata: " << kwl;
+ }
return oss.str();
}
/*
@@ -242,35 +242,35 @@ DataNode<TPrecision,VDimension,TValuePrecision>
*/
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
- void
- DataNode<TPrecision,VDimension,TValuePrecision>
- ::SetFieldAsString(std::string key, std::string value)
+void
+DataNode<TPrecision, VDimension, TValuePrecision>
+::SetFieldAsString(std::string key, std::string value)
{
otb::VectorDataKeywordlist kwl;
- itk::ExposeMetaData< VectorDataKeywordlist >(this->GetMetaDataDictionary(),
- MetaDataKey::VectorDataKeywordlistKey,
- kwl);
+ itk::ExposeMetaData<VectorDataKeywordlist>(this->GetMetaDataDictionary(),
+ MetaDataKey::VectorDataKeywordlistKey,
+ kwl);
kwl.SetFieldAsString(key, value);
- itk::EncapsulateMetaData< VectorDataKeywordlist >(this->GetMetaDataDictionary(),
- MetaDataKey::VectorDataKeywordlistKey,
- kwl);
+ itk::EncapsulateMetaData<VectorDataKeywordlist>(this->GetMetaDataDictionary(),
+ MetaDataKey::VectorDataKeywordlistKey,
+ kwl);
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
- void
- DataNode<TPrecision,VDimension,TValuePrecision>
- ::SetFieldAsInt(std::string key, int value)
+void
+DataNode<TPrecision, VDimension, TValuePrecision>
+::SetFieldAsInt(std::string key, int value)
{
otb::VectorDataKeywordlist kwl;
- itk::ExposeMetaData< VectorDataKeywordlist >(this->GetMetaDataDictionary(),
- MetaDataKey::VectorDataKeywordlistKey,
- kwl);
+ itk::ExposeMetaData<VectorDataKeywordlist>(this->GetMetaDataDictionary(),
+ MetaDataKey::VectorDataKeywordlistKey,
+ kwl);
std::ostringstream os;
os << value;
- kwl.SetFieldAsString(key,os.str() );//FIXME the int is currently saved as string in the OGR data
- itk::EncapsulateMetaData< VectorDataKeywordlist >(this->GetMetaDataDictionary(),
- MetaDataKey::VectorDataKeywordlistKey,
- kwl);
+ kwl.SetFieldAsString(key, os.str()); //FIXME the int is currently saved as string in the OGR data
+ itk::EncapsulateMetaData<VectorDataKeywordlist>(this->GetMetaDataDictionary(),
+ MetaDataKey::VectorDataKeywordlistKey,
+ kwl);
}
/*
@@ -290,35 +290,35 @@ DataNode<TPrecision,VDimension,TValuePrecision>
}*/
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
- std::string
- DataNode<TPrecision,VDimension,TValuePrecision>
- ::GetFieldAsString(std::string key) const
+std::string
+DataNode<TPrecision, VDimension, TValuePrecision>
+::GetFieldAsString(std::string key) const
{
VectorDataKeywordlist keywordlist;
if (HasField(key))
- {
- itk::ExposeMetaData< VectorDataKeywordlist >(this->GetMetaDataDictionary(),
- MetaDataKey::VectorDataKeywordlistKey, keywordlist);
+ {
+ itk::ExposeMetaData<VectorDataKeywordlist>(this->GetMetaDataDictionary(),
+ MetaDataKey::VectorDataKeywordlistKey, keywordlist);
return keywordlist.GetFieldAsString(key);
- }
+ }
return "";
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
- int
- DataNode<TPrecision,VDimension,TValuePrecision>
- ::GetFieldAsInt(std::string key) const
+int
+DataNode<TPrecision, VDimension, TValuePrecision>
+::GetFieldAsInt(std::string key) const
{
VectorDataKeywordlist keywordlist;
if (HasField(key))
- {
- itk::ExposeMetaData< VectorDataKeywordlist >(this->GetMetaDataDictionary(),
- MetaDataKey::VectorDataKeywordlistKey, keywordlist);
+ {
+ itk::ExposeMetaData<VectorDataKeywordlist>(this->GetMetaDataDictionary(),
+ MetaDataKey::VectorDataKeywordlistKey, keywordlist);
std::istringstream is(keywordlist.GetFieldAsString(key));
int value;
is >> value;
return value;
- }
+ }
return 0;
}
@@ -340,17 +340,17 @@ DataNode<TPrecision,VDimension,TValuePrecision>
*/
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
- bool
- DataNode<TPrecision,VDimension,TValuePrecision>
- ::HasField(std::string key) const
+bool
+DataNode<TPrecision, VDimension, TValuePrecision>
+::HasField(std::string key) const
{
VectorDataKeywordlist keywordlist;
if (this->GetMetaDataDictionary().HasKey(MetaDataKey::VectorDataKeywordlistKey))
- {
- itk::ExposeMetaData< VectorDataKeywordlist >(this->GetMetaDataDictionary(),
- MetaDataKey::VectorDataKeywordlistKey, keywordlist);
+ {
+ itk::ExposeMetaData<VectorDataKeywordlist>(this->GetMetaDataDictionary(),
+ MetaDataKey::VectorDataKeywordlistKey, keywordlist);
return keywordlist.HasField(key);
- }
+ }
return false;
}
@@ -389,42 +389,42 @@ DataNode<TPrecision,VDimension,TValuePrecision>
}*/
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
bool
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::IsDocument() const
{
return m_NodeType == DOCUMENT;
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
bool
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::IsRoot() const
{
return m_NodeType == ROOT;
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
bool
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::IsFolder() const
{
return m_NodeType == FOLDER;
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
bool
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::IsPointFeature() const
{
return m_NodeType == FEATURE_POINT;
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
bool
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::IsLineFeature() const
{
return m_NodeType == FEATURE_LINE;
}
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
bool
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::IsPolygonFeature() const
{
return m_NodeType == FEATURE_POLYGON;
@@ -432,7 +432,7 @@ DataNode<TPrecision,VDimension,TValuePrecision>
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
bool
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::IsMultiPointFeature() const
{
return m_NodeType == FEATURE_MULTIPOINT;
@@ -440,7 +440,7 @@ DataNode<TPrecision,VDimension,TValuePrecision>
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
bool
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::IsMultiLineFeature() const
{
return m_NodeType == FEATURE_MULTILINE;
@@ -448,7 +448,7 @@ DataNode<TPrecision,VDimension,TValuePrecision>
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
bool
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::IsMultiPolygonFeature() const
{
return m_NodeType == FEATURE_MULTIPOLYGON;
@@ -456,7 +456,7 @@ DataNode<TPrecision,VDimension,TValuePrecision>
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
bool
-DataNode<TPrecision,VDimension,TValuePrecision>
+DataNode<TPrecision, VDimension, TValuePrecision>
::IsCollectionFeature() const
{
return m_NodeType == FEATURE_COLLECTION;
diff --git a/Code/Common/otbDifferenceImageFilter.h b/Code/Common/otbDifferenceImageFilter.h
index ced28a1e4e..771565bf4d 100644
--- a/Code/Common/otbDifferenceImageFilter.h
+++ b/Code/Common/otbDifferenceImageFilter.h
@@ -21,14 +21,14 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT DifferenceImageFilter :
- public itk::ImageToImageFilter<TInputImage, TOutputImage>
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef DifferenceImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef DifferenceImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -37,13 +37,13 @@ public:
itkTypeMacro(DifferenceImageFilter, ImageToImageFilter);
/** Some convenient typedefs. */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
typedef typename itk::NumericTraits<OutputPixelType>::RealType RealType;
- typedef typename itk::NumericTraits<RealType>::AccumulateType AccumulateType;
- typedef typename RealType::RealValueType ScalarRealType;
+ typedef typename itk::NumericTraits<RealType>::AccumulateType AccumulateType;
+ typedef typename RealType::RealValueType ScalarRealType;
/** Set the valid image input. This will be input 0. */
virtual void SetValidInput(const InputImageType* validImage);
@@ -58,8 +58,8 @@ public:
/** Set/Get the minimum threshold for pixels to be different (relative).
Default is 0. */
- itkSetMacro(DifferenceThreshold,ScalarRealType );
- itkGetMacro(DifferenceThreshold,ScalarRealType );
+ itkSetMacro(DifferenceThreshold, ScalarRealType);
+ itkGetMacro(DifferenceThreshold, ScalarRealType);
/** Get parameters of the difference image after execution. */
itkGetMacro(MeanDifference, RealType);
@@ -91,22 +91,21 @@ protected:
virtual void GenerateOutputInformation();
ScalarRealType m_DifferenceThreshold;
- RealType m_MeanDifference;
- RealType m_TotalDifference;
+ RealType m_MeanDifference;
+ RealType m_TotalDifference;
unsigned long m_NumberOfPixelsWithDifferences;
- int m_ToleranceRadius;
+ int m_ToleranceRadius;
- std::vector<RealType> m_ThreadDifferenceSum;
- itk::Array<unsigned long> m_ThreadNumberOfPixels;
+ std::vector<RealType> m_ThreadDifferenceSum;
+ itk::Array<unsigned long> m_ThreadNumberOfPixels;
private:
- DifferenceImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ DifferenceImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbDifferenceImageFilter.txx"
#endif
diff --git a/Code/Common/otbDifferenceImageFilter.txx b/Code/Common/otbDifferenceImageFilter.txx
index 91dc7d251a..2caa8ccebb 100644
--- a/Code/Common/otbDifferenceImageFilter.txx
+++ b/Code/Common/otbDifferenceImageFilter.txx
@@ -1,4 +1,3 @@
-
#ifndef __otbDifferenceImageFilter_txx
#define __otbDifferenceImageFilter_txx
@@ -48,7 +47,7 @@ DifferenceImageFilter<TInputImage, TOutputImage>
os << indent << "MeanDifference: " << m_MeanDifference << "\n";
os << indent << "TotalDifference: " << m_TotalDifference << "\n";
os << indent << "NumberOfPixelsWithDifferences: "
- << m_NumberOfPixelsWithDifferences << "\n";
+ << m_NumberOfPixelsWithDifferences << "\n";
}
//----------------------------------------------------------------------------
@@ -76,10 +75,12 @@ DifferenceImageFilter<TInputImage, TOutputImage>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
- if (this->GetInput(0)->GetNumberOfComponentsPerPixel()!=this->GetInput(1)->GetNumberOfComponentsPerPixel())
- {
- itkExceptionMacro(<<"Image 1 has "<<this->GetInput(0)->GetNumberOfComponentsPerPixel()<<" bands, whereas image 2 has "<<this->GetInput(1)->GetNumberOfComponentsPerPixel());
- }
+ if (this->GetInput(0)->GetNumberOfComponentsPerPixel() != this->GetInput(1)->GetNumberOfComponentsPerPixel())
+ {
+ itkExceptionMacro(<< "Image 1 has " << this->GetInput(
+ 0)->GetNumberOfComponentsPerPixel() << " bands, whereas image 2 has " << this->GetInput(
+ 1)->GetNumberOfComponentsPerPixel());
+ }
this->GetOutput()->SetNumberOfComponentsPerPixel(this->GetInput(0)->GetNumberOfComponentsPerPixel());
}
//----------------------------------------------------------------------------
@@ -103,10 +104,10 @@ DifferenceImageFilter<TInputImage, TOutputImage>
m_ThreadNumberOfPixels.SetSize(numberOfThreads);
// Initialize the temporaries
- for (int i = 0; i<numberOfThreads;++i)
- {
+ for (int i = 0; i < numberOfThreads; ++i)
+ {
m_ThreadDifferenceSum.push_back(m_TotalDifference);
- }
+ }
m_ThreadNumberOfPixels.Fill(0);
}
@@ -114,16 +115,16 @@ DifferenceImageFilter<TInputImage, TOutputImage>
template <class TInputImage, class TOutputImage>
void
DifferenceImageFilter<TInputImage, TOutputImage>
-::ThreadedGenerateData(const OutputImageRegionType &threadRegion, int threadId)
+::ThreadedGenerateData(const OutputImageRegionType& threadRegion, int threadId)
{
- typedef itk::ConstNeighborhoodIterator<InputImageType> SmartIterator;
- typedef itk::ImageRegionConstIterator<InputImageType> InputIterator;
- typedef itk::ImageRegionIterator<OutputImageType> OutputIterator;
+ typedef itk::ConstNeighborhoodIterator<InputImageType> SmartIterator;
+ typedef itk::ImageRegionConstIterator<InputImageType> InputIterator;
+ typedef itk::ImageRegionIterator<OutputImageType> OutputIterator;
typedef itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> FacesCalculator;
- typedef typename FacesCalculator::RadiusType RadiusType;
- typedef typename FacesCalculator::FaceListType FaceListType;
- typedef typename FaceListType::iterator FaceListIterator;
- typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename FacesCalculator::RadiusType RadiusType;
+ typedef typename FacesCalculator::FaceListType FaceListType;
+ typedef typename FaceListType::iterator FaceListIterator;
+ typedef typename InputImageType::PixelType InputPixelType;
// Prepare standard boundary condition.
itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
@@ -131,29 +132,29 @@ DifferenceImageFilter<TInputImage, TOutputImage>
// Get a pointer to each image.
const InputImageType* validImage = this->GetInput(0);
const InputImageType* testImage = this->GetInput(1);
- OutputImageType* outputPtr = this->GetOutput();
+ OutputImageType* outputPtr = this->GetOutput();
// Create a radius of pixels.
RadiusType radius;
if (m_ToleranceRadius > 0)
- {
+ {
radius.Fill(m_ToleranceRadius);
- }
+ }
else
- {
+ {
radius.Fill(0);
- }
+ }
// Find the data-set boundary faces.
FacesCalculator boundaryCalculator;
- FaceListType faceList = boundaryCalculator(testImage, threadRegion, radius);
+ FaceListType faceList = boundaryCalculator(testImage, threadRegion, radius);
// Support progress methods/callbacks.
itk::ProgressReporter progress(this, threadId, threadRegion.GetNumberOfPixels());
// Process the internal face and each of the boundary faces.
for (FaceListIterator face = faceList.begin(); face != faceList.end(); ++face)
- {
+ {
SmartIterator test(radius, testImage, *face); // Iterate over test image.
InputIterator valid(validImage, *face); // Iterate over valid image.
OutputIterator out(outputPtr, *face); // Iterate over output image.
@@ -162,80 +163,80 @@ DifferenceImageFilter<TInputImage, TOutputImage>
for (valid.GoToBegin(), test.GoToBegin(), out.GoToBegin();
!valid.IsAtEnd();
++valid, ++test, ++out)
- {
+ {
// Get the current valid pixel.
InputPixelType t = valid.Get();
// Find the closest-valued pixel in the neighborhood of the test
// image.
OutputPixelType minimumDifference = itk::NumericTraits<OutputPixelType>::max(t);
- unsigned int neighborhoodSize = test.Size();
- for (unsigned int i=0; i < neighborhoodSize; ++i)
- {
+ unsigned int neighborhoodSize = test.Size();
+ for (unsigned int i = 0; i < neighborhoodSize; ++i)
+ {
// Use the RealType for the difference to make sure we get the
// sign.
RealType difference = static_cast<RealType>(t) - static_cast<RealType>(test.GetPixel(i));
- for (unsigned int j = 0;j<difference.Size();++j)
- {
- if (difference[j]<0)
+ for (unsigned int j = 0; j < difference.Size(); ++j)
{
- difference[j]*=-1;
- }
+ if (difference[j] < 0)
+ {
+ difference[j] *= -1;
+ }
ScalarRealType d = static_cast<ScalarRealType>(difference[j]);
if (d < minimumDifference[j])
- {
+ {
minimumDifference[j] = d;
// std::cout << std::setprecision(16) << minimumDifference[j] << std::endl;
// std::cout << std::setprecision(16) << t << std::endl;
// std::cout << std::setprecision(16) << test.GetPixel(i) << std::endl;
// std::cout << "----------------------" << std::endl;
+ }
}
}
- }
//for complex and vector type. FIXME: module might be better
// ScalarRealType tMax=vcl_abs(t[0]);
- ScalarRealType tMax=0.01;//Avoiding the 0 case for neighborhood computing
+ ScalarRealType tMax = 0.01; //Avoiding the 0 case for neighborhood computing
// NB: still more restrictive than before for small values.
- for (unsigned int j = 0;j<t.Size();++j)
- {
- if (vcl_abs(t[j])>tMax) tMax = vcl_abs(t[j]);
- }
+ for (unsigned int j = 0; j < t.Size(); ++j)
+ {
+ if (vcl_abs(t[j]) > tMax) tMax = vcl_abs(t[j]);
+ }
// Check if difference is above threshold
// the threshold is interpreted as relative to the value
bool isDifferent = false;
- for (unsigned int j = 0;j<minimumDifference.Size();++j)
- {
- if (minimumDifference[j] > m_DifferenceThreshold * tMax)
+ for (unsigned int j = 0; j < minimumDifference.Size(); ++j)
{
+ if (minimumDifference[j] > m_DifferenceThreshold * tMax)
+ {
// std::cout << std::setprecision(16) << minimumDifference[j] << std::endl;
isDifferent = true;
+ }
}
- }
if (isDifferent)
- {
+ {
// Store the minimum difference value in the output image.
out.Set(minimumDifference);
// Update difference image statistics.
m_ThreadDifferenceSum[threadId] += minimumDifference;
m_ThreadNumberOfPixels[threadId]++;
- }
+ }
else
- {
+ {
// Difference is below threshold.
out.Set(itk::NumericTraits<OutputPixelType>::Zero(minimumDifference));
- }
+ }
// Update progress.
progress.CompletedPixel();
+ }
}
- }
}
//----------------------------------------------------------------------------
template <class TInputImage, class TOutputImage>
@@ -245,18 +246,18 @@ DifferenceImageFilter<TInputImage, TOutputImage>
{
// Set statistics about difference image.
int numberOfThreads = this->GetNumberOfThreads();
- for (int i=0; i < numberOfThreads; ++i)
- {
+ for (int i = 0; i < numberOfThreads; ++i)
+ {
m_TotalDifference += m_ThreadDifferenceSum[i];
m_NumberOfPixelsWithDifferences += m_ThreadNumberOfPixels[i];
- }
+ }
// Get the total number of pixels processed in the region.
// This is different from the m_TotalNumberOfPixels which
// is the number of pixels that actually have differences
// above the intensity threshold.
OutputImageRegionType region = this->GetOutput()->GetRequestedRegion();
- unsigned int numberOfPixels = region.GetNumberOfPixels();
+ unsigned int numberOfPixels = region.GetNumberOfPixels();
// Calculate the mean difference.
diff --git a/Code/Common/otbDrawLineSpatialObjectFilter.h b/Code/Common/otbDrawLineSpatialObjectFilter.h
index 521b49f7d1..23c2859849 100644
--- a/Code/Common/otbDrawLineSpatialObjectFilter.h
+++ b/Code/Common/otbDrawLineSpatialObjectFilter.h
@@ -39,51 +39,51 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
-class ITK_EXPORT DrawLineSpatialObjectFilter :
+class ITK_EXPORT DrawLineSpatialObjectFilter :
//public itk::SpatialObjectToImageFilter< itk::LineSpatialObject<2>, TOutputImage >
- public itk::ImageToImageFilter<TInputImage, TOutputImage >
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Extract dimensions as well of the images of entry of exit. */
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,
- unsigned int,
- TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension,
+ unsigned int,
+ TOutputImage::ImageDimension);
/** typedef for the classes standards. */
- typedef DrawLineSpatialObjectFilter Self;
+ typedef DrawLineSpatialObjectFilter Self;
//typedef itk::ImageTo< itk::LineSpatialObject<2>, TOutputImage > Superclass;
- typedef itk::ImageToImageFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for management of the "object factory". */
itkNewMacro(Self);
-
+
/** Return the name of the class. */
- itkTypeMacro(DrawLineSpatialObjectFilter, /*SpatialObjectToImageFilter*/itk::ImageToImageFilter);
-
+ itkTypeMacro(DrawLineSpatialObjectFilter, /*SpatialObjectToImageFilter*/ itk::ImageToImageFilter);
+
/** typedef Support for input & output image*/
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
+
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::PixelType OutputPixelType;
-
/** Support typedef for input & Output*/
- typedef itk::LineSpatialObject<2> InputLineType;
- typedef itk::ProcessObject ProcessObjectType;
+ typedef itk::LineSpatialObject<2> InputLineType;
+ typedef itk::ProcessObject ProcessObjectType;
/** Typedef Support for lineList Type*/
- typedef LineSpatialObjectList LineSpatialObjectListType;
- typedef typename LineSpatialObjectListType::Pointer LineSpatialObjectListPointer;
+ typedef LineSpatialObjectList LineSpatialObjectListType;
+ typedef typename LineSpatialObjectListType::Pointer LineSpatialObjectListPointer;
/** Typedef Support for drawLineSpatialObjectListFilter*/
- typedef otb::DrawLineSpatialObjectListFilter<InputImageType,OutputImageType > DrawLineSpatialObjectListFilterType;
- typedef typename DrawLineSpatialObjectListFilterType::Pointer DrawLineSpatialObjectListFilterPointerType;
+ typedef otb::DrawLineSpatialObjectListFilter<InputImageType, OutputImageType> DrawLineSpatialObjectListFilterType;
+ typedef typename DrawLineSpatialObjectListFilterType::Pointer
+ DrawLineSpatialObjectListFilterPointerType;
-
/** Set/Get the image input of this process object. */
/* virtual void SetInputImage(const InputImageType *image); */
/* const InputImageType * GetInputImage(void); */
@@ -92,25 +92,24 @@ public:
virtual void SetInputLine(const InputLineType *line);
InputLineType * GetInputLine(void);
-
/** Set/Get pixel value */
itkSetMacro(Value, OutputPixelType);
itkGetConstReferenceMacro(Value, OutputPixelType);
protected:
DrawLineSpatialObjectFilter();
- virtual ~DrawLineSpatialObjectFilter() {};
+ virtual ~DrawLineSpatialObjectFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
virtual void GenerateData();
private:
- DrawLineSpatialObjectFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ DrawLineSpatialObjectFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
OutputPixelType m_Value;
- DrawLineSpatialObjectListFilterPointerType m_DrawLineListFilter;
+ DrawLineSpatialObjectListFilterPointerType m_DrawLineListFilter;
};
} // end namespace otb
@@ -119,5 +118,4 @@ private:
#include "otbDrawLineSpatialObjectFilter.txx"
#endif
-
#endif
diff --git a/Code/Common/otbDrawLineSpatialObjectFilter.txx b/Code/Common/otbDrawLineSpatialObjectFilter.txx
index e68a5fb056..f96672e4c7 100644
--- a/Code/Common/otbDrawLineSpatialObjectFilter.txx
+++ b/Code/Common/otbDrawLineSpatialObjectFilter.txx
@@ -20,7 +20,6 @@
#include "otbDrawLineSpatialObjectFilter.h"
-
#include "itkDataObject.h"
#include "itkExceptionObject.h"
#include "itkImageRegionIterator.h"
@@ -29,7 +28,6 @@
#include <math.h>
-
namespace otb
{
@@ -52,45 +50,42 @@ DrawLineSpatialObjectFilter<TInputImage, TOutputImage>
::SetInputLine(const InputLineType *line)
{
this->ProcessObjectType::SetNthInput(1,
- const_cast< InputLineType * >( line ) );
+ const_cast<InputLineType *>(line));
}
-
template <class TInputImage, class TOutputImage>
typename DrawLineSpatialObjectFilter<TInputImage, TOutputImage>::InputLineType *
DrawLineSpatialObjectFilter<TInputImage, TOutputImage>
::GetInputLine(void)
{
return static_cast<InputLineType *>
- (this->ProcessObjectType::GetInput(1) );
+ (this->ProcessObjectType::GetInput(1));
}
-
template <class TInputImage, class TOutputImage>
void
DrawLineSpatialObjectFilter<TInputImage, TOutputImage>
::GenerateData(void)
{
- typename InputImageType::ConstPointer input = this->GetInput();
- InputLineType * line = this->GetInputLine();
-
- typename OutputImageType::Pointer output = this->GetOutput();
-
+ typename InputImageType::ConstPointer input = this->GetInput();
+ InputLineType * line = this->GetInputLine();
+
+ typename OutputImageType::Pointer output = this->GetOutput();
+
/** Create a new list line with one line*/
- LineSpatialObjectListPointer lineList = LineSpatialObjectListType::New();
+ LineSpatialObjectListPointer lineList = LineSpatialObjectListType::New();
lineList->push_back(line);
/** Invoke the DrawLineSpatialObjectListFilter to draw the line */
m_DrawLineListFilter->SetInput(input);
m_DrawLineListFilter->SetInputLineSpatialObjectList(lineList);
-
+
m_DrawLineListFilter->GraftOutput(this->GetOutput());
m_DrawLineListFilter->Update();
this->GraftOutput(m_DrawLineListFilter->GetOutput());
-
-}
+}
/**
* Standard "PrintSelf" method
@@ -103,8 +98,6 @@ DrawLineSpatialObjectFilter<TInputImage, TOutput>::PrintSelf(std::ostream& os, i
os << indent << "Path Value: " << m_Value << std::endl;
}
-
} // end namespace otb
-
#endif
diff --git a/Code/Common/otbDrawLineSpatialObjectListFilter.h b/Code/Common/otbDrawLineSpatialObjectListFilter.h
index 82c9e4db6e..4a9697f11b 100644
--- a/Code/Common/otbDrawLineSpatialObjectListFilter.h
+++ b/Code/Common/otbDrawLineSpatialObjectListFilter.h
@@ -35,36 +35,35 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
-class ITK_EXPORT DrawLineSpatialObjectListFilter :
- public itk::ImageToImageFilter< TInputImage, TOutputImage >
+class ITK_EXPORT DrawLineSpatialObjectListFilter :
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Extract dimensions as well of the images of entry of exit. */
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,
- unsigned int,
- TOutputImage::ImageDimension);
-
-
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension,
+ unsigned int,
+ TOutputImage::ImageDimension);
+
/** typedefs support for inputs & outputs*/
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
/** typedef for the classes standards. */
- typedef DrawLineSpatialObjectListFilter Self;
- typedef itk::ImageToImageFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef DrawLineSpatialObjectListFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef LineSpatialObjectList LinesListType;
- typedef LinesListType::LineType LineType;
- typedef LineType::PointListType PointListType;
- typedef typename LinesListType::const_iterator LineListIterator;
+ typedef LineSpatialObjectList LinesListType;
+ typedef LinesListType::LineType LineType;
+ typedef LineType::PointListType PointListType;
+ typedef typename LinesListType::const_iterator LineListIterator;
- typedef itk::ProcessObject ProcessObjectType;
+ typedef itk::ProcessObject ProcessObjectType;
/** Method for management of the "object factory". */
itkNewMacro(Self);
@@ -73,52 +72,56 @@ public:
itkTypeMacro(DrawLineSpatialObjectListFilter, ImageToImageFilter);
/** Definition of the input and output images */
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::IndexType OutputIndexType;
- typedef typename OutputIndexType::IndexValueType OutputIndexValueType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::IndexType OutputIndexType;
+ typedef typename OutputIndexType::IndexValueType OutputIndexValueType;
/** Set/Get the image input of this process object. */
virtual void SetInputLineSpatialObjectList(const LinesListType * list);
LinesListType * GetInputLineSpatialObjectList(void);
-
/** Get/Set m_Value*/
- itkGetMacro(Value,OutputPixelType );
- itkSetMacro(Value,OutputPixelType );
-
-
+ itkGetMacro(Value, OutputPixelType);
+ itkSetMacro(Value, OutputPixelType);
+
protected:
DrawLineSpatialObjectListFilter();
- virtual ~DrawLineSpatialObjectListFilter() {};
+ virtual ~DrawLineSpatialObjectListFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
- virtual void ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread, int threadId );
-
+ virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
+
/**
* compute the intersection of the segment to draw with the region
*/
- virtual void CropSegment(OutputIndexType *indexToCrop,OutputIndexType *otherIndex, const OutputImageRegionType *outputRegionForThread )const;
-
- virtual void CropRightSegment(OutputIndexType *indexToCrop,OutputIndexType *otherIndex, const OutputImageRegionType *outputRegionForThread )const;
-
+ virtual void CropSegment(OutputIndexType *indexToCrop,
+ OutputIndexType *otherIndex,
+ const OutputImageRegionType *outputRegionForThread) const;
- virtual bool IsUpsideTheRegion(OutputIndexType *indexToCrop, const OutputImageRegionType *outputRegionForThread ) const;
+ virtual void CropRightSegment(OutputIndexType *indexToCrop,
+ OutputIndexType *otherIndex,
+ const OutputImageRegionType *outputRegionForThread) const;
- virtual bool IsDownsideTheRegion(OutputIndexType *indexToCrop, const OutputImageRegionType *outputRegionForThread )const;
-
- virtual bool IsDownsideTheImage(OutputIndexType *indexToCrop )const;
-
-
- virtual bool IsColumnOutsideOfTheRegion(OutputIndexType *indexToCheck, OutputIndexType *otherToCheck, const OutputImageRegionType *outputRegionForThread)const;
+ virtual bool IsUpsideTheRegion(OutputIndexType *indexToCrop,
+ const OutputImageRegionType *outputRegionForThread) const;
+
+ virtual bool IsDownsideTheRegion(OutputIndexType *indexToCrop,
+ const OutputImageRegionType *outputRegionForThread) const;
+
+ virtual bool IsDownsideTheImage(OutputIndexType *indexToCrop) const;
+
+ virtual bool IsColumnOutsideOfTheRegion(OutputIndexType *indexToCheck,
+ OutputIndexType *otherToCheck,
+ const OutputImageRegionType *outputRegionForThread) const;
private:
- DrawLineSpatialObjectListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ DrawLineSpatialObjectListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- OutputPixelType m_Value;
- int m_Length;
- int m_Width;
+ OutputPixelType m_Value;
+ int m_Length;
+ int m_Width;
};
} // end namespace otb
@@ -127,5 +130,4 @@ private:
#include "otbDrawLineSpatialObjectListFilter.txx"
#endif
-
#endif
diff --git a/Code/Common/otbDrawLineSpatialObjectListFilter.txx b/Code/Common/otbDrawLineSpatialObjectListFilter.txx
index 3ff6b5395d..c9bfb4e5e7 100644
--- a/Code/Common/otbDrawLineSpatialObjectListFilter.txx
+++ b/Code/Common/otbDrawLineSpatialObjectListFilter.txx
@@ -49,7 +49,7 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutputImage>
::SetInputLineSpatialObjectList(const LinesListType * list)
{
this->ProcessObjectType::SetNthInput(1,
- const_cast< LinesListType * >( list ) );
+ const_cast<LinesListType *>(list));
}
@@ -59,104 +59,114 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutputImage>
::GetInputLineSpatialObjectList(void)
{
//ROMAIN
- return static_cast</*const*/ LinesListType* >
- (this->ProcessObjectType::GetInput(1) );
+ return static_cast</*const*/ LinesListType*>
+ (this->ProcessObjectType::GetInput(1));
}
template <class TInputImage, class TOutputImage>
void
DrawLineSpatialObjectListFilter<TInputImage, TOutputImage>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread, int threadId )
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
typename InputImageType::ConstPointer input = this->GetInput();
- typename OutputImageType::Pointer output = this->GetOutput();
- typename LinesListType::Pointer list = const_cast<LinesListType*>(this->GetInputLineSpatialObjectList());
-
+ typename OutputImageType::Pointer output = this->GetOutput();
+ typename LinesListType::Pointer list = const_cast<LinesListType*>(this->GetInputLineSpatialObjectList());
+
/** Copy the input requested region in the output requested region*/
- typedef itk::ImageRegionIterator< OutputImageType > OutputIteratorType;
- typedef itk::ImageRegionConstIterator< InputImageType > InputIteratorType;
+ typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
+ typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
+
+ OutputIteratorType outputIt(output, outputRegionForThread);
+ InputIteratorType inputIt(input, outputRegionForThread);
- OutputIteratorType outputIt( output, outputRegionForThread);
- InputIteratorType inputIt( input, outputRegionForThread);
-
outputIt.GoToBegin();
inputIt.GoToBegin();
- for (outputIt.GoToBegin(); !outputIt.IsAtEnd(); ++outputIt,++inputIt)
- outputIt.Set( static_cast<OutputPixelType>(inputIt.Get()) );
-
+ for (outputIt.GoToBegin(); !outputIt.IsAtEnd(); ++outputIt, ++inputIt)
+ outputIt.Set(static_cast<OutputPixelType>(inputIt.Get()));
+
/** Draw the lines in the output image using lineIterator*/
- typedef itk::LineIterator<OutputImageType> LineIteratorFilter;
- OutputIndexType indexBeginLine, indexEndLine;
- LineListIterator itList = list->begin();
+ typedef itk::LineIterator<OutputImageType> LineIteratorFilter;
+ OutputIndexType indexBeginLine, indexEndLine;
+ LineListIterator itList = list->begin();
typename InputImageType::SizeType size = input->GetLargestPossibleRegion().GetSize();
m_Length = size[1];
m_Width = size[0];
-
-
-
- while(itList != list->end())
- {
- PointListType & pointsList = (*itList)->GetPoints();
- typename PointListType::const_iterator itPoints = pointsList.begin();
- indexBeginLine[0] = static_cast<OutputIndexValueType>((*itPoints).GetPosition()[0]);
- indexBeginLine[1] = static_cast<OutputIndexValueType>((*itPoints).GetPosition()[1]);
-
- ++itPoints; //Get the second extremity of the segment
-
- indexEndLine[0] = static_cast<OutputIndexValueType>((*itPoints).GetPosition()[0]);
- indexEndLine[1] = static_cast<OutputIndexValueType>((*itPoints).GetPosition()[1]);
-
-
- /** Crop the segment if it is outside the region in the left*/
-
- if( !(this->IsColumnOutsideOfTheRegion(&indexBeginLine,&indexEndLine,&outputRegionForThread) && this->IsColumnOutsideOfTheRegion(&indexEndLine,&indexBeginLine,&outputRegionForThread)))
+ while (itList != list->end())
+ {
+ PointListType& pointsList = (*itList)->GetPoints();
+ typename PointListType::const_iterator itPoints = pointsList.begin();
+
+ indexBeginLine[0] = static_cast<OutputIndexValueType>((*itPoints).GetPosition()[0]);
+ indexBeginLine[1] = static_cast<OutputIndexValueType>((*itPoints).GetPosition()[1]);
+
+ ++itPoints; //Get the second extremity of the segment
+
+ indexEndLine[0] = static_cast<OutputIndexValueType>((*itPoints).GetPosition()[0]);
+ indexEndLine[1] = static_cast<OutputIndexValueType>((*itPoints).GetPosition()[1]);
+
+ /** Crop the segment if it is outside the region in the left*/
+
+ if (!(this->IsColumnOutsideOfTheRegion(&indexBeginLine, &indexEndLine,
+ &outputRegionForThread) &&
+ this->IsColumnOutsideOfTheRegion(&indexEndLine, &indexBeginLine, &outputRegionForThread)))
+ {
+ if (indexEndLine[0] >= static_cast<OutputIndexValueType>(size[0])) this->CropRightSegment(&indexEndLine,
+ &indexBeginLine,
+ &outputRegionForThread);
+
+ if (indexBeginLine[0] >= static_cast<OutputIndexValueType>(size[0])) this->CropRightSegment(
+ &indexBeginLine,
+ &indexEndLine,
+ &
+ outputRegionForThread);
+ }
+
+ /**
+ * If an extremity is under the region
+ * Technically, the X component of the index is inside the image
+ */
+ if (this->IsDownsideTheImage(&indexBeginLine) &&
+ input->GetLargestPossibleRegion().IsInside(indexEndLine)) this->CropSegment(&indexBeginLine,
+ &indexEndLine,
+ &outputRegionForThread);
+
+ if (this->IsDownsideTheImage(&indexEndLine) &&
+ input->GetLargestPossibleRegion().IsInside(indexBeginLine)) this->CropSegment(&indexEndLine,
+ &indexBeginLine,
+ &outputRegionForThread);
+
+ /** If the segments are not in the region (upside or downside the region)*/
+ if (!(this->IsUpsideTheRegion(&indexBeginLine,
+ &outputRegionForThread) &&
+ this->IsUpsideTheRegion(&indexEndLine, &outputRegionForThread)) &&
+ !(this->IsDownsideTheRegion(&indexBeginLine,
+ &outputRegionForThread) &&
+ this->IsDownsideTheRegion(&indexEndLine, &outputRegionForThread)) &&
+ !(this->IsColumnOutsideOfTheRegion(&indexBeginLine, &indexEndLine,
+ &outputRegionForThread) &&
+ this->IsColumnOutsideOfTheRegion(&indexEndLine, &indexBeginLine, &outputRegionForThread))
+ )
+ {
+
+ /** Instantiation of the line iterator with begin and ending index*/
+ LineIteratorFilter itLine(output, indexBeginLine, indexEndLine);
+
+ /** Iteration over the line and writing white lines */
+ while (!itLine.IsAtEnd())
{
- if(indexEndLine[0] >=static_cast<OutputIndexValueType>(size[0]))
- this->CropRightSegment(&indexEndLine,&indexBeginLine, &outputRegionForThread);
-
- if( indexBeginLine[0] >= static_cast<OutputIndexValueType>(size[0]) )
- this->CropRightSegment(&indexBeginLine,&indexEndLine, &outputRegionForThread);
+ if (outputRegionForThread.IsInside(itLine.GetIndex())) itLine.Set(m_Value);
+ ++itLine;
}
+ }
- /**
- * If an extremity is under the region
- * Technically, the X component of the index is inside the image
- */
- if(this->IsDownsideTheImage(&indexBeginLine) && input->GetLargestPossibleRegion().IsInside(indexEndLine))
- this->CropSegment(&indexBeginLine,&indexEndLine, &outputRegionForThread);
-
- if(this->IsDownsideTheImage(&indexEndLine) && input->GetLargestPossibleRegion().IsInside(indexBeginLine))
- this->CropSegment(&indexEndLine,&indexBeginLine, &outputRegionForThread);
-
-
- /** If the segments are not in the region (upside or downside the region)*/
- if(!(this->IsUpsideTheRegion(&indexBeginLine,&outputRegionForThread) && this->IsUpsideTheRegion(&indexEndLine,&outputRegionForThread)) &&
- !(this->IsDownsideTheRegion(&indexBeginLine,&outputRegionForThread) && this->IsDownsideTheRegion(&indexEndLine,&outputRegionForThread)) &&
- !(this->IsColumnOutsideOfTheRegion(&indexBeginLine,&indexEndLine, &outputRegionForThread) && this->IsColumnOutsideOfTheRegion(&indexEndLine,&indexBeginLine,&outputRegionForThread))
- )
- {
-
- /** Instantiation of the line iterator with begin and ending index*/
- LineIteratorFilter itLine(output,indexBeginLine ,indexEndLine );
-
- /** Iteration over the line and writing white lines */
- while(!itLine.IsAtEnd())
- {
- if(outputRegionForThread.IsInside(itLine.GetIndex()))
- itLine.Set(m_Value);
- ++itLine;
- }
- }
-
- ++itList;
+ ++itList;
}
}
-
/**
* Compute the intersection between the segment to draw and the region belonging to the current thread
* It is used if the segment abcisse is greater than the width of the image
@@ -165,21 +175,23 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutputImage>
template <class TInputImage, class TOutput>
void
DrawLineSpatialObjectListFilter<TInputImage, TOutput>
-::CropRightSegment(OutputIndexType *indexToCrop,OutputIndexType *otherIndex, const OutputImageRegionType *outputRegionForThread ) const
+::CropRightSegment(OutputIndexType *indexToCrop,
+ OutputIndexType *otherIndex,
+ const OutputImageRegionType *outputRegionForThread) const
{
- /** Dimensions of the buffered region*/
- typename OutputImageRegionType::SizeType size = outputRegionForThread->GetSize();
- typename OutputImageRegionType::IndexType start = outputRegionForThread->GetIndex();
-
- /** Equation of the line (Begin, End)*/
- double lengthSegment = -(*otherIndex)[1] + (*indexToCrop)[1];
- double slope = lengthSegment/( (*indexToCrop)[0] - (*otherIndex)[0]);
- double origin = (*otherIndex)[1] - (slope * (*otherIndex)[0]);
-
- (*indexToCrop)[0] = static_cast<OutputIndexValueType>(size[0]-1);
- (*indexToCrop)[1] = static_cast<OutputIndexValueType>(slope *(*indexToCrop)[0] + origin +0.5);
+ /** Dimensions of the buffered region*/
+ typename OutputImageRegionType::SizeType size = outputRegionForThread->GetSize();
+ typename OutputImageRegionType::IndexType start = outputRegionForThread->GetIndex();
+
+ /** Equation of the line (Begin, End)*/
+ double lengthSegment = -(*otherIndex)[1] + (*indexToCrop)[1];
+ double slope = lengthSegment / ((*indexToCrop)[0] - (*otherIndex)[0]);
+ double origin = (*otherIndex)[1] - (slope * (*otherIndex)[0]);
+
+ (*indexToCrop)[0] = static_cast<OutputIndexValueType>(size[0] - 1);
+ (*indexToCrop)[1] = static_cast<OutputIndexValueType>(slope * (*indexToCrop)[0] + origin + 0.5);
}
/**
@@ -189,7 +201,7 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutput>
template <class TInputImage, class TOutput>
bool
DrawLineSpatialObjectListFilter<TInputImage, TOutput>
-::IsUpsideTheRegion(OutputIndexType *indexToCrop, const OutputImageRegionType *outputRegionForThread ) const
+::IsUpsideTheRegion(OutputIndexType *indexToCrop, const OutputImageRegionType *outputRegionForThread) const
{
/** Dimensions of the buffered region*/
@@ -206,14 +218,14 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutput>
template <class TInputImage, class TOutput>
bool
DrawLineSpatialObjectListFilter<TInputImage, TOutput>
-::IsDownsideTheRegion(OutputIndexType *indexToCrop, const OutputImageRegionType *outputRegionForThread ) const
+::IsDownsideTheRegion(OutputIndexType *indexToCrop, const OutputImageRegionType *outputRegionForThread) const
{
/** Dimensions of the buffered region*/
typename OutputImageRegionType::SizeType size = outputRegionForThread->GetSize();
typename OutputImageRegionType::IndexType start = outputRegionForThread->GetIndex();
- return (*indexToCrop)[1] >= static_cast<OutputIndexValueType>(start[1]+size[1]); //The down limit of the region in the Y direction
+ return (*indexToCrop)[1] >= static_cast<OutputIndexValueType>(start[1] + size[1]); //The down limit of the region in the Y direction
}
/**
@@ -229,7 +241,6 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutput>
return (*indexToCrop)[1] >= static_cast<OutputIndexValueType>(m_Length); //The down limit of the Image in the Y direction
}
-
/**
*
*
@@ -237,28 +248,27 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutput>
template <class TInputImage, class TOutput>
bool
DrawLineSpatialObjectListFilter<TInputImage, TOutput>
-::IsColumnOutsideOfTheRegion(OutputIndexType *indexToCheck, OutputIndexType *otherToCheck, const OutputImageRegionType *outputRegionForThread) const
+::IsColumnOutsideOfTheRegion(OutputIndexType *indexToCheck,
+ OutputIndexType *otherToCheck,
+ const OutputImageRegionType *outputRegionForThread) const
{
/** Dimensions of the buffered region*/
typename OutputImageRegionType::SizeType size = outputRegionForThread->GetSize();
- bool res = false, res1= false , res2 = false;
-
- if ( ((*indexToCheck)[0]>=static_cast<OutputIndexValueType>(size[0])) && ((*otherToCheck)[0]>=static_cast<OutputIndexValueType>(size[0]) ))
- res = true;
-
- if((*indexToCheck)[0]>=static_cast<OutputIndexValueType>(size[0]) && this->IsUpsideTheRegion(otherToCheck,outputRegionForThread))
- res1 = true;
-
- if((*indexToCheck)[0]>=static_cast<OutputIndexValueType>(size[0]) && this->IsDownsideTheRegion(otherToCheck,outputRegionForThread) )
- res2 = true;
-
-
-
+ bool res = false, res1 = false, res2 = false;
+
+ if (((*indexToCheck)[0] >= static_cast<OutputIndexValueType>(size[0])) &&
+ ((*otherToCheck)[0] >= static_cast<OutputIndexValueType>(size[0]))) res = true;
+
+ if ((*indexToCheck)[0] >= static_cast<OutputIndexValueType>(size[0]) &&
+ this->IsUpsideTheRegion(otherToCheck, outputRegionForThread)) res1 = true;
+
+ if ((*indexToCheck)[0] >= static_cast<OutputIndexValueType>(size[0]) &&
+ this->IsDownsideTheRegion(otherToCheck, outputRegionForThread)) res2 = true;
+
return res || res1 || res2;
}
-
/**
* Compute the intersection between the segment to draw and the region belonging to the current thread
*
@@ -266,58 +276,53 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutput>
template <class TInputImage, class TOutput>
void
DrawLineSpatialObjectListFilter<TInputImage, TOutput>
-::CropSegment(OutputIndexType *indexToCrop,OutputIndexType *otherIndex, const OutputImageRegionType *outputRegionForThread) const
+::CropSegment(OutputIndexType *indexToCrop,
+ OutputIndexType *otherIndex,
+ const OutputImageRegionType *outputRegionForThread) const
{
OutputIndexType tempIndex;
tempIndex = *indexToCrop;
-
+
/** Dimensions of the buffered region*/
typename OutputImageRegionType::SizeType size = outputRegionForThread->GetSize();
typename OutputImageRegionType::IndexType start = outputRegionForThread->GetIndex();
/** Equation of the line (Begin, End)*/
double slope = 0.;
- double lengthSegment =0.;
+ double lengthSegment = 0.;
double origin = 0.;
- double tempOtherIndexX= 0.;
-
+ double tempOtherIndexX = 0.;
+
/** Equation of the first Line*/
- if(vcl_abs( (*otherIndex)[0] -(*indexToCrop)[0] ) <1e-4)
- tempOtherIndexX= 0.000001;
- else
- tempOtherIndexX = static_cast<double>((*otherIndex)[0]);
+ if (vcl_abs((*otherIndex)[0] - (*indexToCrop)[0]) < 1e-4) tempOtherIndexX = 0.000001;
+ else tempOtherIndexX = static_cast<double>((*otherIndex)[0]);
+ if ((*indexToCrop)[0] < (*otherIndex)[0]) lengthSegment = (*otherIndex)[1] - (*indexToCrop)[1];
+ else lengthSegment = (*indexToCrop)[1] - (*otherIndex)[1];
- if( (*indexToCrop)[0] < (*otherIndex)[0])
- lengthSegment = (*otherIndex)[1] -(*indexToCrop)[1];
- else
- lengthSegment = (*indexToCrop)[1] -(*otherIndex)[1];
-
- slope = lengthSegment/( tempOtherIndexX - static_cast<double>((*indexToCrop)[0]));
+ slope = lengthSegment / (tempOtherIndexX - static_cast<double>((*indexToCrop)[0]));
origin = (*indexToCrop)[1] - (slope * static_cast<double>((*indexToCrop)[0]));
-
- if((*indexToCrop)[1] < 0)
+ if ((*indexToCrop)[1] < 0)
{
- unsigned int Y = 0;
- tempIndex[1] = Y;
- tempIndex[0] = static_cast<unsigned int>((Y-origin) / slope); // X = (Y-B)/A
+ unsigned int Y = 0;
+ tempIndex[1] = Y;
+ tempIndex[0] = static_cast<unsigned int>((Y - origin) / slope); // X = (Y-B)/A
}
-
- if(this->IsDownsideTheImage(indexToCrop ))
+
+ if (this->IsDownsideTheImage(indexToCrop))
{
- double Y = static_cast<double>(m_Length-1)/*tstart[1]+size[1]-1*/;
- tempIndex[1] = static_cast<OutputIndexValueType>(Y);
- tempIndex[0] = static_cast<OutputIndexValueType>((Y-origin) / slope); // X = (Y-B)/A
+ double Y = static_cast<double>(m_Length - 1) /*tstart[1]+size[1]-1*/;
+ tempIndex[1] = static_cast<OutputIndexValueType>(Y);
+ tempIndex[0] = static_cast<OutputIndexValueType>((Y - origin) / slope); // X = (Y-B)/A
}
(*indexToCrop)[0] = tempIndex[0];
(*indexToCrop)[1] = tempIndex[1];
}
-
/**
* Standard "PrintSelf" method
*/
@@ -328,8 +333,6 @@ DrawLineSpatialObjectListFilter<TInputImage, TOutput>::PrintSelf(std::ostream& o
Superclass::PrintSelf(os, indent);
}
-
} // end namespace otb
-
#endif
diff --git a/Code/Common/otbDrawPathFilter.h b/Code/Common/otbDrawPathFilter.h
index 27f20f1dbf..62a1025d0c 100644
--- a/Code/Common/otbDrawPathFilter.h
+++ b/Code/Common/otbDrawPathFilter.h
@@ -37,13 +37,13 @@ namespace otb
* \ingroup ImageFilters
*/
-template <class TInputImage, class TInputPath,class TOutputImage>
-class ITK_EXPORT DrawPathFilter : public itk::ImageAndPathToImageFilter<TInputImage,TInputPath,TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
+class ITK_EXPORT DrawPathFilter : public itk::ImageAndPathToImageFilter<TInputImage, TInputPath, TOutputImage>
{
public:
/** Standard class typedefs. */
typedef DrawPathFilter Self;
- typedef itk::ImageAndPathToImageFilter<TInputImage,TInputPath,TOutputImage> Superclass;
+ typedef itk::ImageAndPathToImageFilter<TInputImage, TInputPath, TOutputImage> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -54,46 +54,45 @@ public:
itkTypeMacro(DrawPathFilter, itk::ImageAndPathToImageFilter);
/** Some convenient typedefs. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointer;
- typedef typename InputImageType::ConstPointer InputImageConstPointer;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef TInputPath InputPathType;
- typedef typename InputPathType::Pointer InputPathPointer;
- typedef typename InputPathType::ConstPointer InputPathConstPointer;
- typedef typename InputPathType::InputType InputPathInputType;
- typedef typename InputPathType::OutputType InputPathOutputType;
- typedef typename InputPathType::IndexType InputPathIndexType;
- typedef typename InputPathType::OffsetType InputPathOffsetType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::ConstPointer OutputImageConstPointer;
-
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputImagePixelType;
- typedef typename OutputImageType::ValueType OutputImageValueType;
-
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointer;
+ typedef typename InputImageType::ConstPointer InputImageConstPointer;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef TInputPath InputPathType;
+ typedef typename InputPathType::Pointer InputPathPointer;
+ typedef typename InputPathType::ConstPointer InputPathConstPointer;
+ typedef typename InputPathType::InputType InputPathInputType;
+ typedef typename InputPathType::OutputType InputPathOutputType;
+ typedef typename InputPathType::IndexType InputPathIndexType;
+ typedef typename InputPathType::OffsetType InputPathOffsetType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::ConstPointer OutputImageConstPointer;
+
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputImagePixelType;
+ typedef typename OutputImageType::ValueType OutputImageValueType;
itkSetMacro(Value, OutputImagePixelType);
itkGetConstReferenceMacro(Value, OutputImagePixelType);
/** Set/Get the path input of this process object.
Note: these methods are adding to get the proper name */
- void SetInputPath( const TInputPath * path);
+ void SetInputPath(const TInputPath * path);
const TInputPath * GetInputPath(void);
protected:
DrawPathFilter();
- virtual ~DrawPathFilter() {};
+ virtual ~DrawPathFilter() {}
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
virtual void GenerateData();
private:
- DrawPathFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ DrawPathFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
OutputImagePixelType m_Value;
};
@@ -105,4 +104,3 @@ private:
#endif
#endif
-
diff --git a/Code/Common/otbDrawPathFilter.txx b/Code/Common/otbDrawPathFilter.txx
index f232e6d966..fac98e7a12 100644
--- a/Code/Common/otbDrawPathFilter.txx
+++ b/Code/Common/otbDrawPathFilter.txx
@@ -27,41 +27,39 @@ namespace otb
/**
* Constructor
*/
-template <class TInputImage, class TInputPath,class TOutputImage>
-DrawPathFilter<TInputImage,TInputPath,TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
+DrawPathFilter<TInputImage, TInputPath, TOutputImage>
::DrawPathFilter()
{
m_Value = static_cast<OutputImagePixelType>(255.0);
}
-template <class TInputImage, class TInputPath,class TOutputImage>
-inline void DrawPathFilter<TInputImage,TInputPath,TOutputImage>
-::SetInputPath( const TInputPath * path)
+template <class TInputImage, class TInputPath, class TOutputImage>
+inline void DrawPathFilter<TInputImage, TInputPath, TOutputImage>
+::SetInputPath(const TInputPath * path)
{
this->SetPathInput(path);
}
-
-template <class TInputImage, class TInputPath,class TOutputImage>
-const TInputPath * DrawPathFilter<TInputImage,TInputPath,TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
+const TInputPath * DrawPathFilter<TInputImage, TInputPath, TOutputImage>
::GetInputPath(void)
{
return this->GetPathInput();
}
-
/**
* Main computation method.
*/
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
void
-DrawPathFilter<TInputImage,TInputPath,TOutputImage>
+DrawPathFilter<TInputImage, TInputPath, TOutputImage>
::GenerateData(void)
{
- typedef otb::DrawPathListFilter<TInputImage,TInputPath,TOutputImage> DrawListFilterType;
- typedef typename DrawListFilterType::InputPathListType PathListType;
+ typedef otb::DrawPathListFilter<TInputImage, TInputPath, TOutputImage> DrawListFilterType;
+ typedef typename DrawListFilterType::InputPathListType PathListType;
typename PathListType::Pointer list = PathListType::New();
- InputPathPointer path = const_cast<TInputPath*>(this->GetPathInput());
+ InputPathPointer path = const_cast<TInputPath*>(this->GetPathInput());
list->PushBack(path);
typename DrawListFilterType::Pointer drawer = DrawListFilterType::New();
@@ -76,9 +74,9 @@ DrawPathFilter<TInputImage,TInputPath,TOutputImage>
/**
* Printself Method
*/
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
void
-DrawPathFilter<TInputImage,TInputPath,TOutputImage>
+DrawPathFilter<TInputImage, TInputPath, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
@@ -87,4 +85,3 @@ DrawPathFilter<TInputImage,TInputPath,TOutputImage>
} // end namespace otb
#endif
-
diff --git a/Code/Common/otbDrawPathListFilter.h b/Code/Common/otbDrawPathListFilter.h
index b9c4ed2841..308e91cc84 100644
--- a/Code/Common/otbDrawPathListFilter.h
+++ b/Code/Common/otbDrawPathListFilter.h
@@ -42,30 +42,30 @@ namespace otb
* \ingroup PathLists
*/
-template <class TInputImage, class TInputPath,class TOutputImage>
-class ITK_EXPORT DrawPathListFilter : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
+class ITK_EXPORT DrawPathListFilter : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef DrawPathListFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef DrawPathListFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(DrawPathListFilter,ImageToImageFilter);
+ itkTypeMacro(DrawPathListFilter, ImageToImageFilter);
/** Some convenient typedefs. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename InputImageType::ConstPointer InputImageConstPointerType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef typename InputImageType::SizeType InputImageSizeType;
- typedef typename InputImageType::ValueType InputImageValueType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::ConstPointer InputImageConstPointerType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::SizeType InputImageSizeType;
+ typedef typename InputImageType::ValueType InputImageValueType;
typedef TInputPath InputPathType;
typedef typename InputPathType::Pointer InputPathPointerType;
@@ -73,27 +73,27 @@ public:
typedef typename InputPathListType::ConstPointer InputPathListConstPointerType;
typedef typename InputPathListType::Pointer InputPathListPointerType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
- typedef typename OutputImageType::ConstPointer OutputImageConstPointerType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputImagePixelType;
- typedef typename OutputImageType::SizeType OutputImageSizeType;
- typedef typename OutputImageType::ValueType OutputImageValueType;
- typedef typename OutputImageType::IndexType OutputImageIndexType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename OutputImageType::ConstPointer OutputImageConstPointerType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputImagePixelType;
+ typedef typename OutputImageType::SizeType OutputImageSizeType;
+ typedef typename OutputImageType::ValueType OutputImageValueType;
+ typedef typename OutputImageType::IndexType OutputImageIndexType;
typedef itk::ProcessObject ProcessObjectType;
- itkGetMacro(UseInternalPathValue,bool);
- itkSetMacro(UseInternalPathValue,bool);
+ itkGetMacro(UseInternalPathValue, bool);
+ itkSetMacro(UseInternalPathValue, bool);
itkBooleanMacro(UseInternalPathValue);
- itkGetMacro(AddValue,bool);
- itkSetMacro(AddValue,bool);
+ itkGetMacro(AddValue, bool);
+ itkSetMacro(AddValue, bool);
itkBooleanMacro(AddValue);
- itkSetMacro(PathValue,OutputImagePixelType);
- itkGetMacro(PathValue,OutputImagePixelType);
+ itkSetMacro(PathValue, OutputImagePixelType);
+ itkGetMacro(PathValue, OutputImagePixelType);
/** ImageDimension constants */
itkStaticConstMacro(InputImageDimension, unsigned int,
@@ -107,15 +107,15 @@ protected:
/** Constructor */
DrawPathListFilter();
/** Desctructor */
- virtual ~DrawPathListFilter() {};
+ virtual ~DrawPathListFilter() {}
/** Printself method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Main computation method */
virtual void GenerateData();
private:
- DrawPathListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ DrawPathListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Default value to draw */
OutputImagePixelType m_PathValue;
diff --git a/Code/Common/otbDrawPathListFilter.txx b/Code/Common/otbDrawPathListFilter.txx
index 63d92e6502..19edca86a8 100644
--- a/Code/Common/otbDrawPathListFilter.txx
+++ b/Code/Common/otbDrawPathListFilter.txx
@@ -31,8 +31,8 @@ namespace otb
/**
* Constructor
*/
-template <class TInputImage, class TInputPath,class TOutputImage>
-DrawPathListFilter<TInputImage,TInputPath,TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
+DrawPathListFilter<TInputImage, TInputPath, TOutputImage>
::DrawPathListFilter()
{
this->SetNumberOfRequiredInputs(2);
@@ -42,90 +42,90 @@ DrawPathListFilter<TInputImage,TInputPath,TOutputImage>
m_AddValue = false;
}
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
void
-DrawPathListFilter<TInputImage,TInputPath,TOutputImage>
-::SetInputPath( InputPathListType *path)
+DrawPathListFilter<TInputImage, TInputPath, TOutputImage>
+::SetInputPath(InputPathListType *path)
{
- this->ProcessObjectType::SetNthInput(1,const_cast<InputPathListType *>(path));
+ this->ProcessObjectType::SetNthInput(1, const_cast<InputPathListType *>(path));
}
-template <class TInputImage, class TInputPath,class TOutputImage>
-const typename DrawPathListFilter<TInputImage,TInputPath,TOutputImage>::InputPathListType *
-DrawPathListFilter<TInputImage,TInputPath,TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
+const typename DrawPathListFilter<TInputImage, TInputPath, TOutputImage>::InputPathListType *
+DrawPathListFilter<TInputImage, TInputPath, TOutputImage>
::GetInputPath(void)
{
if (this->GetNumberOfInputs() < 2)
- {
+ {
return 0;
- }
+ }
return static_cast<const InputPathListType *>(this->ProcessObjectType::GetInput(1));
}
/**
* Main computation method
*/
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
void
-DrawPathListFilter<TInputImage,TInputPath,TOutputImage>
+DrawPathListFilter<TInputImage, TInputPath, TOutputImage>
::GenerateData(void)
{
- OutputImagePointerType outputPtr = this->GetOutput();
- InputImageConstPointerType inputPtr = this->GetInput();
+ OutputImagePointerType outputPtr = this->GetOutput();
+ InputImageConstPointerType inputPtr = this->GetInput();
InputPathListConstPointerType pathListPtr = this->GetInputPath();
outputPtr->SetRegions(inputPtr->GetLargestPossibleRegion());
outputPtr->Allocate();
outputPtr->FillBuffer(itk::NumericTraits<OutputImagePixelType>::Zero);
// First, we copy input to output
- typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
- typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
- typedef typename InputPathListType::ConstIterator PathListIteratorType;
- typedef PolyLineImageIterator<OutputImageType,InputPathType> PolyLineIteratorType;
+ typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
+ typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
+ typedef typename InputPathListType::ConstIterator PathListIteratorType;
+ typedef PolyLineImageIterator<OutputImageType, InputPathType> PolyLineIteratorType;
- OutputIteratorType outIt(outputPtr,outputPtr->GetLargestPossibleRegion());
- InputIteratorType inIt(inputPtr,inputPtr->GetLargestPossibleRegion());
+ OutputIteratorType outIt(outputPtr, outputPtr->GetLargestPossibleRegion());
+ InputIteratorType inIt(inputPtr, inputPtr->GetLargestPossibleRegion());
- for (outIt.GoToBegin(),inIt.GoToBegin();
+ for (outIt.GoToBegin(), inIt.GoToBegin();
(!outIt.IsAtEnd() && !inIt.IsAtEnd());
- ++outIt,++inIt)
- {
+ ++outIt, ++inIt)
+ {
outIt.Set(static_cast<OutputImagePixelType>(inIt.Get()));
- }
+ }
// Then we use otb::PolyLineImageIterator to draw polylines
for (PathListIteratorType plIt = pathListPtr->Begin(); plIt != pathListPtr->End(); ++plIt)
- {
+ {
OutputImagePixelType value = itk::NumericTraits<OutputImagePixelType>::Zero;
if (m_UseInternalPathValue && plIt.Get()->GetMetaDataDictionary().HasKey("Value"))
- {
- itk::ExposeMetaData<OutputImagePixelType>(plIt.Get()->GetMetaDataDictionary(),"Value",value);
- }
+ {
+ itk::ExposeMetaData<OutputImagePixelType>(plIt.Get()->GetMetaDataDictionary(), "Value", value);
+ }
else
- {
- value = static_cast<OutputImagePixelType>(m_PathValue);
- }
- PolyLineIteratorType imageIt(outputPtr,plIt.Get());
- for (imageIt.GoToBegin();!imageIt.IsAtEnd();++imageIt)
- {
- if (m_AddValue)
{
- imageIt.Set(imageIt.Get()+1);
+ value = static_cast<OutputImagePixelType>(m_PathValue);
}
- else
+ PolyLineIteratorType imageIt(outputPtr, plIt.Get());
+ for (imageIt.GoToBegin(); !imageIt.IsAtEnd(); ++imageIt)
{
+ if (m_AddValue)
+ {
+ imageIt.Set(imageIt.Get() + 1);
+ }
+ else
+ {
imageIt.Set(value);
+ }
}
}
- }
}
/**
* Printself method
*/
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
void
-DrawPathListFilter<TInputImage,TInputPath,TOutputImage>
+DrawPathListFilter<TInputImage, TInputPath, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/Common/otbExtractROI.h b/Code/Common/otbExtractROI.h
index e891267eab..c75d75a032 100644
--- a/Code/Common/otbExtractROI.h
+++ b/Code/Common/otbExtractROI.h
@@ -34,39 +34,39 @@ namespace otb
*
*/
template <class TInputPixel, class TOutputPixel>
-class ITK_EXPORT ExtractROI:
- public ExtractROIBase<Image<TInputPixel,2> , Image<TOutputPixel,2> >
+class ITK_EXPORT ExtractROI :
+ public ExtractROIBase<Image<TInputPixel, 2>, Image<TOutputPixel, 2> >
{
public:
/** Standard class typedefs. */
- typedef ExtractROI Self;
- typedef ExtractROIBase<Image<TInputPixel,2> , Image<TOutputPixel,2> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ExtractROI Self;
+ typedef ExtractROIBase<Image<TInputPixel, 2>, Image<TOutputPixel, 2> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(ExtractROI,ExtractROIBase);
+ itkTypeMacro(ExtractROI, ExtractROIBase);
/** Image type information. */
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::OutputImageType OutputImageType;
/** Typedef to describe the output and input image region types. */
typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
/** Typedef to describe the type of pixel. */
typedef typename OutputImageType::PixelType OutputImagePixelType;
- typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
/** Typedef to describe the output and input image index and size types. */
typedef typename OutputImageType::IndexType OutputImageIndexType;
- typedef typename InputImageType::IndexType InputImageIndexType;
- typedef typename OutputImageType::SizeType OutputImageSizeType;
- typedef typename InputImageType::SizeType InputImageSizeType;
+ typedef typename InputImageType::IndexType InputImageIndexType;
+ typedef typename OutputImageType::SizeType OutputImageSizeType;
+ typedef typename InputImageType::SizeType InputImageSizeType;
/** ImageDimension enumeration */
itkStaticConstMacro(InputImageDimension, unsigned int,
@@ -75,12 +75,11 @@ public:
OutputImageType::ImageDimension);
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
-
+ int threadId);
protected:
ExtractROI();
- virtual ~ExtractROI() {};
+ virtual ~ExtractROI() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** ExtractROI
@@ -89,12 +88,11 @@ protected:
virtual void GenerateOutputInformation();
private:
- ExtractROI(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ExtractROI(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Common/otbExtractROI.txx b/Code/Common/otbExtractROI.txx
index 6cff421f3c..0f1c0b302a 100644
--- a/Code/Common/otbExtractROI.txx
+++ b/Code/Common/otbExtractROI.txx
@@ -43,10 +43,9 @@ void
ExtractROI<TInputPixel, TOutputPixel>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
/**
* ExtractROI can produce an image which is a different resolution
* than its input image. As such, ExtractROI needs to provide an
@@ -71,11 +70,11 @@ ExtractROI<TInputPixel, TOutputPixel>
::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
int threadId)
{
- itkDebugMacro(<<"Actually executing");
+ itkDebugMacro(<< "Actually executing");
// Get the input and output pointers
- typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
@@ -85,24 +84,23 @@ ExtractROI<TInputPixel, TOutputPixel>
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
// Define the iterators.
- typedef itk::ImageRegionIterator<OutputImageType> OutputIterator;
+ typedef itk::ImageRegionIterator<OutputImageType> OutputIterator;
typedef itk::ImageRegionConstIterator<InputImageType> InputIterator;
OutputIterator outIt(outputPtr, outputRegionForThread);
InputIterator inIt(inputPtr, inputRegionForThread);
// walk the output region, and sample the input image
- while ( !outIt.IsAtEnd() )
- {
+ while (!outIt.IsAtEnd())
+ {
// copy the input pixel to the output
- outIt.Set( inIt.Get());
+ outIt.Set(inIt.Get());
++outIt;
++inIt;
progress.CompletedPixel();
- }
+ }
}
-
} // end namespace otb
#endif
diff --git a/Code/Common/otbExtractROIBase.h b/Code/Common/otbExtractROIBase.h
index 44fb37161d..efb3bf9439 100644
--- a/Code/Common/otbExtractROIBase.h
+++ b/Code/Common/otbExtractROIBase.h
@@ -40,15 +40,15 @@ namespace otb
*
*/
template <class TInputImage, class TOutputImage>
-class ITK_EXPORT ExtractROIBase:
- public itk::ImageToImageFilter<TInputImage,TOutputImage>
+class ITK_EXPORT ExtractROIBase :
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef ExtractROIBase Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ExtractROIBase Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -62,17 +62,17 @@ public:
/** Typedef to describe the output and input image region types. */
typedef typename TOutputImage::RegionType OutputImageRegionType;
- typedef typename TInputImage::RegionType InputImageRegionType;
+ typedef typename TInputImage::RegionType InputImageRegionType;
/** Typedef to describe the type of pixel. */
typedef typename TOutputImage::PixelType OutputImagePixelType;
- typedef typename TInputImage::PixelType InputImagePixelType;
+ typedef typename TInputImage::PixelType InputImagePixelType;
/** Typedef to describe the output and input image index and size types. */
typedef typename TOutputImage::IndexType OutputImageIndexType;
- typedef typename TInputImage::IndexType InputImageIndexType;
- typedef typename TOutputImage::SizeType OutputImageSizeType;
- typedef typename TInputImage::SizeType InputImageSizeType;
+ typedef typename TInputImage::IndexType InputImageIndexType;
+ typedef typename TOutputImage::SizeType OutputImageSizeType;
+ typedef typename TInputImage::SizeType InputImageSizeType;
/** ImageDimension enumeration */
itkStaticConstMacro(InputImageDimension, unsigned int,
@@ -82,7 +82,8 @@ public:
typedef
itk::ImageToImageFilterDetail::ExtractImageFilterRegionCopier<itkGetStaticConstMacro(InputImageDimension),
- itkGetStaticConstMacro(OutputImageDimension)> ExtractROIBaseRegionCopierType;
+ itkGetStaticConstMacro(OutputImageDimension)>
+ ExtractROIBaseRegionCopierType;
itkGetMacro(ExtractionRegion, InputImageRegionType);
@@ -90,26 +91,23 @@ public:
void SetExtractionRegion(InputImageRegionType roi);
/** Set/Get Start methods */
- itkSetMacro(StartX,unsigned long);
- itkGetConstMacro(StartX,unsigned long);
- itkSetMacro(StartY,unsigned long);
- itkGetConstMacro(StartY,unsigned long);
+ itkSetMacro(StartX, unsigned long);
+ itkGetConstMacro(StartX, unsigned long);
+ itkSetMacro(StartY, unsigned long);
+ itkGetConstMacro(StartY, unsigned long);
/** Set/Get Size methods */
- itkSetMacro(SizeX,unsigned long);
- itkGetConstMacro(SizeX,unsigned long);
- itkSetMacro(SizeY,unsigned long);
- itkGetConstMacro(SizeY,unsigned long);
-
+ itkSetMacro(SizeX, unsigned long);
+ itkGetConstMacro(SizeX, unsigned long);
+ itkSetMacro(SizeY, unsigned long);
+ itkGetConstMacro(SizeY, unsigned long);
protected:
ExtractROIBase();
- virtual ~ExtractROIBase() {};
+ virtual ~ExtractROIBase() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
virtual void GenerateInputRequestedRegion();
-
/** ExtractROIBase can produce an image which is a different
* resolution than its input image. As such, ExtractROIBase
* needs to provide an implementation for
@@ -130,8 +128,8 @@ protected:
* support output images of a lower dimension that the input.
*
* \sa ImageToImageFilter::CallCopyRegion() */
- virtual void CallCopyOutputRegionToInputRegion(InputImageRegionType &destRegion,
- const OutputImageRegionType &srcRegion);
+ virtual void CallCopyOutputRegionToInputRegion(InputImageRegionType& destRegion,
+ const OutputImageRegionType& srcRegion);
/** ExtractROIBase can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData()
@@ -146,11 +144,11 @@ protected:
// ATTENTION bizarre
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId )
+ int threadId)
{
- };
+ }
/** Set/Get the output image region.
* If any of the ExtractionRegion.Size = 0 for any particular dimension dim,
@@ -159,13 +157,12 @@ protected:
* ExtractionRegion.Size = 0. */
void SetInternalExtractionRegion(InputImageRegionType extractRegion);
-
- InputImageRegionType m_ExtractionRegion;
+ InputImageRegionType m_ExtractionRegion;
OutputImageRegionType m_OutputImageRegion;
private:
- ExtractROIBase(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ExtractROIBase(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** X/Y coordinates of the first point of the region to extract. */
unsigned long m_StartX;
@@ -174,10 +171,8 @@ private:
unsigned long m_SizeX;
unsigned long m_SizeY;
-
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Common/otbExtractROIBase.txx b/Code/Common/otbExtractROIBase.txx
index e2f17d9507..75b537654c 100644
--- a/Code/Common/otbExtractROIBase.txx
+++ b/Code/Common/otbExtractROIBase.txx
@@ -33,59 +33,56 @@ namespace otb
*
*/
template <class TInputImage, class TOutputImage>
-ExtractROIBase<TInputImage,TOutputImage>
-::ExtractROIBase() : itk::ImageToImageFilter<TInputImage,TOutputImage>(),
- m_StartX(0),
- m_StartY(0),
- m_SizeX(0),
- m_SizeY(0)
+ExtractROIBase<TInputImage, TOutputImage>
+::ExtractROIBase() : itk::ImageToImageFilter<TInputImage, TOutputImage>(),
+ m_StartX(0),
+ m_StartY(0),
+ m_SizeX(0),
+ m_SizeY(0)
{
}
-
/**
*
*/
template <class TInputImage, class TOutputImage>
void
-ExtractROIBase<TInputImage,TOutputImage>
+ExtractROIBase<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "ExtractionRegion: " << m_ExtractionRegion << std::endl;
os << indent << "OutputImageRegion: " << m_OutputImageRegion << std::endl;
}
-
template<class TInputImage, class TOutputImage>
void
-ExtractROIBase<TInputImage,TOutputImage>
-::CallCopyOutputRegionToInputRegion(InputImageRegionType &destRegion,
- const OutputImageRegionType &srcRegion)
+ExtractROIBase<TInputImage, TOutputImage>
+::CallCopyOutputRegionToInputRegion(InputImageRegionType& destRegion,
+ const OutputImageRegionType& srcRegion)
{
destRegion = srcRegion;
OutputImageIndexType index = destRegion.GetIndex();
for (unsigned int i = 0; i < InputImageDimension; ++i)
- {
- index[i]+=m_ExtractionRegion.GetIndex()[i];
- }
+ {
+ index[i] += m_ExtractionRegion.GetIndex()[i];
+ }
destRegion.SetIndex(index);
}
-
template <class TInputImage, class TOutputImage>
void
-ExtractROIBase<TInputImage,TOutputImage>
+ExtractROIBase<TInputImage, TOutputImage>
::SetInternalExtractionRegion(InputImageRegionType extractRegion)
{
m_ExtractionRegion = extractRegion;
- unsigned int nonzeroSizeCount = 0;
- InputImageSizeType inputSize = extractRegion.GetSize();
- OutputImageSizeType outputSize;
+ unsigned int nonzeroSizeCount = 0;
+ InputImageSizeType inputSize = extractRegion.GetSize();
+ OutputImageSizeType outputSize;
OutputImageIndexType outputIndex;
/**
@@ -93,19 +90,19 @@ ExtractROIBase<TInputImage,TOutputImage>
* matches the number of dimensions in the output image.
**/
for (unsigned int i = 0; i < InputImageDimension; ++i)
- {
- if (inputSize[i])
{
+ if (inputSize[i])
+ {
outputSize[nonzeroSizeCount] = inputSize[i];
- outputIndex[nonzeroSizeCount] =0;
+ outputIndex[nonzeroSizeCount] = 0;
nonzeroSizeCount++;
+ }
}
- }
if (nonzeroSizeCount != OutputImageDimension)
- {
+ {
itkExceptionMacro("Extraction Region not consistent with output image");
- }
+ }
m_OutputImageRegion.SetSize(outputSize);
m_OutputImageRegion.SetIndex(outputIndex);
@@ -113,10 +110,9 @@ ExtractROIBase<TInputImage,TOutputImage>
this->Modified();
}
-
template <class TInputImage, class TOutputImage>
void
-ExtractROIBase<TInputImage,TOutputImage>
+ExtractROIBase<TInputImage, TOutputImage>
::SetExtractionRegion(InputImageRegionType roi)
{
m_SizeX = roi.GetSize()[0];
@@ -129,40 +125,39 @@ ExtractROIBase<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
void
-ExtractROIBase<TInputImage,TOutputImage>
+ExtractROIBase<TInputImage, TOutputImage>
::GenerateInputRequestedRegion()
{
Superclass::GenerateInputRequestedRegion();
typename Superclass::InputImagePointer inputPtr = const_cast<InputImageType*>(this->GetInput());
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr )
- {
+ if (!inputPtr)
+ {
return;
- }
- if ( !outputPtr )
- {
+ }
+ if (!outputPtr)
+ {
return;
- }
+ }
InputImageRegionType requestedRegion = outputPtr->GetRequestedRegion();
- InputImageIndexType index = requestedRegion.GetIndex();
- InputImageIndexType offset = m_ExtractionRegion.GetIndex();
+ InputImageIndexType index = requestedRegion.GetIndex();
+ InputImageIndexType offset = m_ExtractionRegion.GetIndex();
- for (unsigned int i=0; i < InputImageDimension; ++i)
- {
- index[i]+=offset[i];
- }
+ for (unsigned int i = 0; i < InputImageDimension; ++i)
+ {
+ index[i] += offset[i];
+ }
requestedRegion.SetIndex(index);
inputPtr->SetRequestedRegion(requestedRegion);
otbMsgDevMacro(<< "InputRequestedRegion (otbExtractROIBase): ");
- otbMsgDevMacro(<< " - index: " << requestedRegion.GetIndex() );
- otbMsgDevMacro(<< " - size: " << requestedRegion.GetSize() );
+ otbMsgDevMacro(<< " - index: " << requestedRegion.GetIndex());
+ otbMsgDevMacro(<< " - size: " << requestedRegion.GetSize());
}
-
/**
* ExtractROIBase can produce an image which is a different resolution
* than its input image. As such, ExtractROIBase needs to provide an
@@ -174,33 +169,33 @@ ExtractROIBase<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-ExtractROIBase<TInputImage,TOutputImage>
+ExtractROIBase<TInputImage, TOutputImage>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
-
+
// Compute the area to extract
// If SizeX/Y == 0, then set SizeX/Y to image size
- typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
+ typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
// Check if input exists or not before doing anything
if (!inputPtr)
- {
+ {
return;
- }
-
+ }
+
// Get the input image
//const InputImageRegionType& inputRegion = inputPtr->GetRequestedRegion();
const InputImageRegionType& inputRegion = inputPtr->GetLargestPossibleRegion();
- if ( (m_SizeX == 0) || (m_SizeX > (inputRegion.GetSize()[0] - m_StartX)) )
- {
+ if ((m_SizeX == 0) || (m_SizeX > (inputRegion.GetSize()[0] - m_StartX)))
+ {
m_SizeX = inputRegion.GetSize()[0] - m_StartX;
- }
- if ( (m_SizeY == 0) || (m_SizeY > (inputRegion.GetSize()[1] - m_StartY)) )
- {
+ }
+ if ((m_SizeY == 0) || (m_SizeY > (inputRegion.GetSize()[1] - m_StartY)))
+ {
m_SizeY = inputRegion.GetSize()[1] - m_StartY;
- }
+ }
InputImageIndexType start;
start[0] = m_StartX;
@@ -209,39 +204,38 @@ ExtractROIBase<TInputImage,TOutputImage>
size[0] = m_SizeX;
size[1] = m_SizeY;
InputImageRegionType desiredRegion;
- desiredRegion.SetSize( size );
- desiredRegion.SetIndex( start );
+ desiredRegion.SetSize(size);
+ desiredRegion.SetIndex(start);
// Call to the base class method for region initialization
- this->SetInternalExtractionRegion( desiredRegion );
-
+ this->SetInternalExtractionRegion(desiredRegion);
// do not call the superclass' implementation of this method since
// this filter allows the input the output to be of different dimensions
// get pointers to the input and output
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
// typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
- if ( !inputPtr )
- {
+ if (!inputPtr)
+ {
return;
- }
- if ( !outputPtr )
- {
+ }
+ if (!outputPtr)
+ {
return;
- }
+ }
// Set the output image size to the same value as the extraction region.
- outputPtr->SetLargestPossibleRegion( m_OutputImageRegion );
+ outputPtr->SetLargestPossibleRegion(m_OutputImageRegion);
// Set the output spacing and origin
const itk::ImageBase<InputImageDimension> *phyData;
phyData
- = dynamic_cast<const itk::ImageBase<InputImageDimension>*>(this->GetInput());
+ = dynamic_cast<const itk::ImageBase<InputImageDimension>*>(this->GetInput());
if (phyData)
- {
+ {
// Copy what we can from the image from spacing and origin of the input
// This logic needs to be augmented with logic that select which
// dimensions to copy
@@ -253,76 +247,75 @@ ExtractROIBase<TInputImage,TOutputImage>
const typename InputImageType::PointType&
inputOrigin = inputPtr->GetOrigin();
- typename OutputImageType::SpacingType outputSpacing;
+ typename OutputImageType::SpacingType outputSpacing;
typename OutputImageType::DirectionType outputDirection;
- typename OutputImageType::PointType outputOrigin;
+ typename OutputImageType::PointType outputOrigin;
- if ( static_cast<unsigned int>(OutputImageDimension) >
- static_cast<unsigned int>(InputImageDimension ) )
- {
+ if (static_cast<unsigned int>(OutputImageDimension) >
+ static_cast<unsigned int>(InputImageDimension))
+ {
// copy the input to the output and fill the rest of the
// output with zeros.
- for (i=0; i < InputImageDimension; ++i)
- {
+ for (i = 0; i < InputImageDimension; ++i)
+ {
outputSpacing[i] = inputSpacing[i];
- outputOrigin[i] = inputOrigin[i]+static_cast<double>(m_ExtractionRegion.GetIndex()[i])*outputSpacing[i];
+ outputOrigin[i] = inputOrigin[i] + static_cast<double>(m_ExtractionRegion.GetIndex()[i]) * outputSpacing[i];
for (unsigned int dim = 0; dim < InputImageDimension; ++dim)
- {
+ {
outputDirection[i][dim] = inputDirection[i][dim];
+ }
}
- }
for (; i < OutputImageDimension; ++i)
- {
+ {
outputSpacing[i] = 1.0;
outputOrigin[i] = 0.0;
for (unsigned int dim = 0; dim < InputImageDimension; ++dim)
- {
+ {
outputDirection[i][dim] = 0.0;
- }
+ }
outputDirection[i][i] = 1.0;
+ }
}
- }
else
- {
+ {
// copy the non-collapsed part of the input spacing and origing to the output
int nonZeroCount = 0;
- for (i=0; i < InputImageDimension; ++i)
- {
- if (m_ExtractionRegion.GetSize()[i])
+ for (i = 0; i < InputImageDimension; ++i)
{
+ if (m_ExtractionRegion.GetSize()[i])
+ {
outputSpacing[nonZeroCount] = inputSpacing[i];
- outputOrigin[nonZeroCount] = inputOrigin[i]+static_cast<double>(m_ExtractionRegion.GetIndex()[i])*outputSpacing[i];
+ outputOrigin[nonZeroCount] = inputOrigin[i] + static_cast<double>(m_ExtractionRegion.GetIndex()[i]) *
+ outputSpacing[i];
for (unsigned int dim = 0; dim < OutputImageDimension; ++dim)
- {
+ {
outputDirection[nonZeroCount][dim] =
inputDirection[nonZeroCount][dim];
- }
+ }
nonZeroCount++;
+ }
}
}
- }
// set the spacing and origin
- outputPtr->SetSpacing( outputSpacing );
- outputPtr->SetDirection( outputDirection );
- outputPtr->SetOrigin( outputOrigin );
+ outputPtr->SetSpacing(outputSpacing);
+ outputPtr->SetDirection(outputDirection);
+ outputPtr->SetOrigin(outputOrigin);
// THOMAS : dans ITK ce code est present, mais pas dans notre cas, car le nombre de composantes/pixel depend des canaux selectionnes par l'utilisateur
// ce parametre est renseignes dans les classes sous-jacentes
// outputPtr->SetNumberOfComponentsPerPixel(
// inputPtr->GetNumberOfComponentsPerPixel() );
- }
+ }
else
- {
+ {
// pointer could not be cast back down
itkExceptionMacro(<< "otb::ExtractROIBase::GenerateOutputInformation "
<< "cannot cast input to "
- << typeid(itk::ImageBase<InputImageDimension>*).name() );
- }
-
+ << typeid(itk::ImageBase<InputImageDimension>*).name());
+ }
}
-
} // end namespace otb
#endif
diff --git a/Code/Common/otbFilterWatcherBase.cxx b/Code/Common/otbFilterWatcherBase.cxx
index a85051f172..2e47d89fc3 100644
--- a/Code/Common/otbFilterWatcherBase.cxx
+++ b/Code/Common/otbFilterWatcherBase.cxx
@@ -46,11 +46,11 @@ FilterWatcherBase
// Assign the callbacks
m_StartFilterCommand->SetCallbackFunction(this,
- &FilterWatcherBase::StartFilter);
+ &FilterWatcherBase::StartFilter);
m_EndFilterCommand->SetCallbackFunction(this,
&FilterWatcherBase::EndFilter);
m_ProgressFilterCommand->SetCallbackFunction(this,
- &FilterWatcherBase::ShowProgress);
+ &FilterWatcherBase::ShowProgress);
// Add the commands as observers
m_StartTag = m_Process->AddObserver(itk::StartEvent(),
@@ -64,13 +64,13 @@ FilterWatcherBase
}
FilterWatcherBase
-::FilterWatcherBase( const FilterWatcherBase& watch)
+::FilterWatcherBase(const FilterWatcherBase& watch)
{
// Remove any observers we have on the old process object
if (m_Process)
- {
- m_Process->RemoveAllObservers();
- }
+ {
+ m_Process->RemoveAllObservers();
+ }
// Initialize state
m_TimeProbe = watch.m_TimeProbe;
@@ -83,36 +83,36 @@ FilterWatcherBase
// Create a series of commands
if (m_Process)
- {
+ {
m_StartFilterCommand = CommandType::New();
m_EndFilterCommand = CommandType::New();
m_ProgressFilterCommand = CommandType::New();
// Assign the callbacks
m_StartFilterCommand->SetCallbackFunction(this,
- &FilterWatcherBase::StartFilter);
+ &FilterWatcherBase::StartFilter);
m_EndFilterCommand->SetCallbackFunction(this,
&FilterWatcherBase::EndFilter);
m_ProgressFilterCommand->SetCallbackFunction(this,
- &FilterWatcherBase::ShowProgress);
+ &FilterWatcherBase::ShowProgress);
// Add the commands as observers
m_StartTag = m_Process->AddObserver(itk::StartEvent(), m_StartFilterCommand);
m_EndTag = m_Process->AddObserver(itk::EndEvent(), m_EndFilterCommand);
m_ProgressTag
- = m_Process->AddObserver(itk::ProgressEvent(), m_ProgressFilterCommand);
- }
+ = m_Process->AddObserver(itk::ProgressEvent(), m_ProgressFilterCommand);
+ }
}
void
FilterWatcherBase
-::operator=(const FilterWatcherBase &watch)
+::operator =(const FilterWatcherBase& watch)
{
// Remove any observers we have on the old process object
if (m_Process)
- {
- m_Process->RemoveAllObservers();
- }
+ {
+ m_Process->RemoveAllObservers();
+ }
// Initialize state
m_TimeProbe = watch.m_TimeProbe;
@@ -125,25 +125,25 @@ FilterWatcherBase
// Create a series of commands
if (m_Process)
- {
+ {
m_StartFilterCommand = CommandType::New();
m_EndFilterCommand = CommandType::New();
m_ProgressFilterCommand = CommandType::New();
// Assign the callbacks
m_StartFilterCommand->SetCallbackFunction(this,
- &FilterWatcherBase::StartFilter);
+ &FilterWatcherBase::StartFilter);
m_EndFilterCommand->SetCallbackFunction(this,
&FilterWatcherBase::EndFilter);
m_ProgressFilterCommand->SetCallbackFunction(this,
- &FilterWatcherBase::ShowProgress);
+ &FilterWatcherBase::ShowProgress);
// Add the commands as observers
m_StartTag = m_Process->AddObserver(itk::StartEvent(), m_StartFilterCommand);
m_EndTag = m_Process->AddObserver(itk::EndEvent(), m_EndFilterCommand);
m_ProgressTag
- = m_Process->AddObserver(itk::ProgressEvent(), m_ProgressFilterCommand);
- }
+ = m_Process->AddObserver(itk::ProgressEvent(), m_ProgressFilterCommand);
+ }
}
FilterWatcherBase
@@ -151,9 +151,9 @@ FilterWatcherBase
{
// Remove any observers we have on the old process object
if (m_Process)
- {
- m_Process->RemoveAllObservers();
- }
+ {
+ m_Process->RemoveAllObservers();
+ }
}
} // end namespace otb
diff --git a/Code/Common/otbFilterWatcherBase.h b/Code/Common/otbFilterWatcherBase.h
index a4740c60ac..5ffbc35b65 100644
--- a/Code/Common/otbFilterWatcherBase.h
+++ b/Code/Common/otbFilterWatcherBase.h
@@ -45,7 +45,7 @@ public:
/** Constructor. Takes a ProcessObject to monitor and an optional
* comment string that is prepended to each event message. */
FilterWatcherBase(itk::ProcessObject* process,
- const char *comment="");
+ const char *comment = "");
/** Default constructor */
FilterWatcherBase();
@@ -54,14 +54,14 @@ public:
FilterWatcherBase(const FilterWatcherBase&);
/** operator= */
- void operator=(const FilterWatcherBase& );
+ void operator =(const FilterWatcherBase&);
/** Destructor. */
virtual ~FilterWatcherBase();
/** Methods to access member data */
/** Get a pointer to the process object being watched. */
- itk::ProcessObject *GetProcess ()
+ itk::ProcessObject *GetProcess()
{
return m_Process.GetPointer();
}
@@ -73,7 +73,7 @@ public:
}
/** Get a reference to the TimeProbe */
- itk::TimeProbe &GetTimeProbe()
+ itk::TimeProbe& GetTimeProbe()
{
return m_TimeProbe;
}
diff --git a/Code/Common/otbGISConnectionImplementation.h b/Code/Common/otbGISConnectionImplementation.h
index 8e1eb4f323..4c484b690e 100644
--- a/Code/Common/otbGISConnectionImplementation.h
+++ b/Code/Common/otbGISConnectionImplementation.h
@@ -21,7 +21,6 @@
#include "itkDataObject.h"
#include "itkObjectFactory.h"
-
namespace otb
{
/** \class GISConnectionImplementation
@@ -36,16 +35,14 @@ class ITK_EXPORT GISConnectionImplementation
{
public:
/** Standard class typedefs */
- typedef GISConnectionImplementation Self;
- typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef GISConnectionImplementation Self;
+ typedef itk::DataObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
-
/** Standard macros */
itkNewMacro(Self);
- itkTypeMacro(GISConnectionImplementation,itk::DataObject);
-
+ itkTypeMacro(GISConnectionImplementation, itk::DataObject);
/** Acessors */
itkGetMacro(Host, std::string);
@@ -68,21 +65,19 @@ public:
/** Using the connection */
- virtual void ConnectToDB(){};
-
- virtual void PerformTransaction(const TransactorType& theTransaction) const {};
+ virtual void ConnectToDB(){}
+ virtual void PerformTransaction(const TransactorType& theTransaction) const {}
protected:
/** Constructor */
GISConnectionImplementation(){};
/** Destructor */
- virtual ~GISConnectionImplementation(){};
+ virtual ~GISConnectionImplementation(){}
private:
- GISConnectionImplementation(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ GISConnectionImplementation(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
std::string m_Host;
std::string m_DBName;
@@ -91,10 +86,7 @@ private:
std::string m_Port;
std::string m_Options;
-
};
-}// end namespace otb
-
+} // end namespace otb
#endif
-
diff --git a/Code/Common/otbGISTable.h b/Code/Common/otbGISTable.h
index b163fa5210..96a82f66b4 100644
--- a/Code/Common/otbGISTable.h
+++ b/Code/Common/otbGISTable.h
@@ -35,51 +35,47 @@ namespace otb
* \sa GISTableFileWriter
*
*/
-template <class TConnectionImplementation, class TPrecision = double, unsigned int SpatialDimension =2>
+template <class TConnectionImplementation, class TPrecision = double, unsigned int SpatialDimension = 2>
class GISTable
- : public itk::DataObject
+ : public itk::DataObject
{
public:
/** Standard class typedefs */
- typedef GISTable Self;
- typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef GISTable Self;
+ typedef itk::DataObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
-
/** Standard macros */
itkNewMacro(Self);
- itkTypeMacro(GISTable,DataObject);
+ itkTypeMacro(GISTable, DataObject);
itkStaticConstMacro(Dimension, unsigned int, SpatialDimension);
/** Typedefs */
typedef TPrecision PrecisionType;
-
-
-
- typedef TConnectionImplementation ConnectionType;
+
+ typedef TConnectionImplementation ConnectionType;
typedef typename ConnectionType::Pointer ConnectionPointerType;
-
+
//typedef TConnectionImplementation::TransactionType TransactionType;
-
- typedef itk::Point<TPrecision , SpatialDimension > PointType;
- typedef PolyLineParametricPathWithValue < TPrecision , SpatialDimension > LineType;
- typedef typename LineType::Pointer LinePointerType;
-
- typedef Polygon < TPrecision > PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
- typedef typename PolygonType::ConstPointer PolygonConstPointerType;
- typedef ObjectList< PolygonType > PolygonListType;
- typedef typename PolygonListType::Pointer PolygonListPointerType;
- typedef typename PolygonListType::ConstPointer PolygonListConstPointerType;
+
+ typedef itk::Point<TPrecision, SpatialDimension> PointType;
+ typedef PolyLineParametricPathWithValue <TPrecision, SpatialDimension> LineType;
+ typedef typename LineType::Pointer LinePointerType;
+
+ typedef Polygon <TPrecision> PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef typename PolygonType::ConstPointer PolygonConstPointerType;
+ typedef ObjectList<PolygonType> PolygonListType;
+ typedef typename PolygonListType::Pointer PolygonListPointerType;
+ typedef typename PolygonListType::ConstPointer PolygonListConstPointerType;
/** Acessors */
//itkStaticConstMacro(GISDimension, unsigned int, SpatialDimension);
-
itkGetConstMacro(TableName, std::string);
itkSetMacro(TableName, std::string);
-
+
itkGetConstMacro(Srid, int);
itkSetMacro(Srid, int);
@@ -87,59 +83,57 @@ public:
itkSetObjectMacro(Connection, ConnectionType);
/** Clear the vector data not implemented yet*/
- virtual bool Clear(){return true;};
-
+ virtual bool Clear(){return true; }
+
/** Get attributes of the Table*/ //TODO implement
-
+
/** Get srid of the geometric column*/ //TODO implement
//virtual
/** Add Point content to the GIS Table*/ //TODO implement
- virtual void InsertPoint( const PointType &pt, const std::string & attribute = 0 ){};
- virtual void InsertMultiPoint(){};
- virtual void InsertPolygons(PolygonConstPointerType polygonExtRing, PolygonListConstPointerType polygonListInteriorRing = 0, const std::string & attribute = 0){};
- virtual void InsertLineString(LinePointerType l, const std::string & attribute = 0){};
-
- virtual void CreateTable(bool dropExistingGISTable){};
-
- virtual void getGeometryType(){};
-
+ virtual void InsertPoint(const PointType& pt, const std::string& attribute = 0){}
+ virtual void InsertMultiPoint(){}
+ virtual void InsertPolygons(PolygonConstPointerType polygonExtRing,
+ PolygonListConstPointerType polygonListInteriorRing = 0,
+ const std::string& attribute = 0){}
+ virtual void InsertLineString(LinePointerType l, const std::string& attribute = 0){}
+
+ virtual void CreateTable(bool dropExistingGISTable){}
+
+ virtual void getGeometryType(){}
+
virtual void SetProjectionRef(std::string projectionRef);
virtual std::string GetProjectionRef() const;
-
+
/** Get string connection usable by OGR library*/
- virtual std::string GetOGRStrConnection() const {return 0;};
-
+ virtual std::string GetOGRStrConnection() const {return 0; }
+
/** Add an alpha numeric column to the table */
- virtual const std::string AddVarCharColumn(unsigned int size) {return 0;};
-
+ virtual const std::string AddVarCharColumn(unsigned int size) {return 0; }
+
/** Insert Alpha Numeric Data in the Car char column */
- virtual void AddStrDataToVarCharColumn(std::string data) {};
+ virtual void AddStrDataToVarCharColumn(std::string data) {}
protected:
/** Constructor */
GISTable();
/** Destructor */
- virtual ~GISTable() {};
+ virtual ~GISTable() {}
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
+
int m_Srid;
-
+
private:
GISTable(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ void operator =(const Self&); //purposely not implemented
- std::string m_TableName;
+ std::string m_TableName;
ConnectionPointerType m_Connection;
-
-
-};
-}// end namespace otb
+};
+} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbGISTable.txx"
#endif
#endif
-
diff --git a/Code/Common/otbGISTable.txx b/Code/Common/otbGISTable.txx
index c60e3ca334..410b80757a 100644
--- a/Code/Common/otbGISTable.txx
+++ b/Code/Common/otbGISTable.txx
@@ -26,7 +26,7 @@ namespace otb
{
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
- GISTable<TConnectionImplementation, TPrecision, SpatialDimension>
+GISTable<TConnectionImplementation, TPrecision, SpatialDimension>
::GISTable()
{
m_TableName = "";
@@ -34,45 +34,42 @@ template <class TConnectionImplementation, class TPrecision, unsigned int Spatia
m_Srid = -1;
}
-
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
void
GISTable<TConnectionImplementation, TPrecision, SpatialDimension>
- ::SetProjectionRef(std::string projectionRef)
+::SetProjectionRef(std::string projectionRef)
{
- itk::MetaDataDictionary & dict = this->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = this->GetMetaDataDictionary();
- itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef );
+ itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef);
this->Modified();
}
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
std::string
GISTable<TConnectionImplementation, TPrecision, SpatialDimension>
- ::GetProjectionRef() const
+::GetProjectionRef() const
{
- const itk::MetaDataDictionary & dict = this->GetMetaDataDictionary();
+ const itk::MetaDataDictionary& dict = this->GetMetaDataDictionary();
std::string projectionRef;
- itk::ExposeMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef );
+ itk::ExposeMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef);
return projectionRef;
}
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
void
- GISTable<TConnectionImplementation, TPrecision, SpatialDimension>
+GISTable<TConnectionImplementation, TPrecision, SpatialDimension>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << std::endl;
-
- os<<"Table name: "<< m_TableName<<std::endl;
+ os << "Table name: " << m_TableName << std::endl;
}
-
} // end namespace otb
#endif
diff --git a/Code/Common/otbGISTableSource.h b/Code/Common/otbGISTableSource.h
index d0b7170627..39f1b533a4 100644
--- a/Code/Common/otbGISTableSource.h
+++ b/Code/Common/otbGISTableSource.h
@@ -40,13 +40,13 @@ namespace otb
template <class TOutputGISTable>
class ITK_EXPORT GISTableSource : public itk::ProcessObject
{
- public :
+public:
/** Standard class typedefs. */
- typedef GISTableSource Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef GISTableSource Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -54,7 +54,7 @@ class ITK_EXPORT GISTableSource : public itk::ProcessObject
/** Run-time type information (and related methods). */
itkTypeMacro(GISTableSource, itk::ProcessObject);
- typedef TOutputGISTable OutputGISTableType;
+ typedef TOutputGISTable OutputGISTableType;
typedef typename TOutputGISTable::Pointer OutputGISTablePointer;
/** Overriding GetOutput() method */
@@ -71,8 +71,8 @@ protected:
virtual void AllocateOutputs();
private:
- GISTableSource(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ GISTableSource(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -82,4 +82,4 @@ private:
#include "otbGISTableSource.txx"
#endif
-#endif // __otbGISTableSource_h
\ No newline at end of file
+#endif // __otbGISTableSource_h
diff --git a/Code/Common/otbGISTableSource.txx b/Code/Common/otbGISTableSource.txx
index 965f4d7cc3..01021db95a 100644
--- a/Code/Common/otbGISTableSource.txx
+++ b/Code/Common/otbGISTableSource.txx
@@ -31,7 +31,7 @@ GISTableSource<TOutputGISTable>
::GISTableSource()
{
this->Superclass::SetNumberOfRequiredOutputs(1);
- this->Superclass::SetNthOutput(0,OutputGISTableType::New().GetPointer());
+ this->Superclass::SetNthOutput(0, OutputGISTableType::New().GetPointer());
}
template <class TOutputGISTable>
@@ -48,14 +48,13 @@ GISTableSource<TOutputGISTable>
OutputGISTablePointer outputPtr;
// Allocate the output memory
- for (unsigned int i=0; i < this->GetNumberOfOutputs(); ++i)
- {
+ for (unsigned int i = 0; i < this->GetNumberOfOutputs(); ++i)
+ {
outputPtr = this->GetOutput(i);
outputPtr->Clear();
- }
+ }
}
-
/**
* Get the output vector data
* \return The vector data produced.
@@ -65,10 +64,10 @@ typename GISTableSource<TOutputGISTable>::OutputGISTableType *
GISTableSource<TOutputGISTable>
::GetOutput(void)
{
- if (this->GetNumberOfOutputs()<1)
- {
+ if (this->GetNumberOfOutputs() < 1)
+ {
return 0;
- }
+ }
return static_cast<OutputGISTableType *> (this->ProcessObject::GetOutput(0));
}
@@ -78,7 +77,7 @@ GISTableSource<TOutputGISTable>
::GetOutput(unsigned int idx)
{
return static_cast<OutputGISTableType*>
- (this->Superclass::GetOutput(idx));
+ (this->Superclass::GetOutput(idx));
}
/**
@@ -89,9 +88,9 @@ void
GISTableSource<TOutputGISTable>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/Common/otbGISTableToGISTableFilter.h b/Code/Common/otbGISTableToGISTableFilter.h
index a7b0ca37a8..3cd436ffef 100644
--- a/Code/Common/otbGISTableToGISTableFilter.h
+++ b/Code/Common/otbGISTableToGISTableFilter.h
@@ -34,15 +34,15 @@ namespace otb
*
* \ingroup GISTableFilter
*/
-template <class TInputGISTable, class TOutputGISTable >
+template <class TInputGISTable, class TOutputGISTable>
class ITK_EXPORT GISTableToGISTableFilter : public otb::GISTableSource<TOutputGISTable>
{
public:
/** Standard class typedefs. */
- typedef GISTableToGISTableFilter Self;
- typedef otb::GISTableSource<TOutputGISTable> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef GISTableToGISTableFilter Self;
+ typedef otb::GISTableSource<TOutputGISTable> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -51,29 +51,27 @@ public:
itkTypeMacro(GISTableToGISTableFilter, GISTableSource);
/** Some typedefs. */
- typedef TInputGISTable InputGISTableType;
- typedef TOutputGISTable OutputGISTableType;
+ typedef TInputGISTable InputGISTableType;
+ typedef TOutputGISTable OutputGISTableType;
typedef typename TInputGISTable::ConstPointer InputGISTablePointer;
- typedef typename TOutputGISTable::Pointer OutputGISTablePointer;
+ typedef typename TOutputGISTable::Pointer OutputGISTablePointer;
typedef itk::DataObject::Pointer DataObjectPointer;
-
- virtual void SetInput( const InputGISTableType *input);
+ virtual void SetInput(const InputGISTableType *input);
const InputGISTableType * GetInput(void);
-
protected:
/** Constructor */
GISTableToGISTableFilter();
/** Destructor */
- virtual ~GISTableToGISTableFilter() {};
+ virtual ~GISTableToGISTableFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- GISTableToGISTableFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ GISTableToGISTableFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Common/otbGISTableToGISTableFilter.txx b/Code/Common/otbGISTableToGISTableFilter.txx
index cd2f16ef58..a4d4ee11c0 100644
--- a/Code/Common/otbGISTableToGISTableFilter.txx
+++ b/Code/Common/otbGISTableToGISTableFilter.txx
@@ -28,35 +28,34 @@ namespace otb
* Constructor
*/
template <class TInputGISTable, class TOutputGISTable>
-GISTableToGISTableFilter<TInputGISTable,TOutputGISTable>
+GISTableToGISTableFilter<TInputGISTable, TOutputGISTable>
::GISTableToGISTableFilter()
{
- this->SetNumberOfRequiredInputs( 1 );
+ this->SetNumberOfRequiredInputs(1);
}
-
template <class TInputGISTable, class TOutputGISTable>
void
-GISTableToGISTableFilter<TInputGISTable,TOutputGISTable>
+GISTableToGISTableFilter<TInputGISTable, TOutputGISTable>
::SetInput(const InputGISTableType *input)
{
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(0,
- const_cast< InputGISTableType * >( input ) );
+ const_cast<InputGISTableType *>(input));
}
template <class TInputGISTable, class TOutputGISTable>
-const typename GISTableToGISTableFilter<TInputGISTable,TOutputGISTable>::InputGISTableType *
-GISTableToGISTableFilter<TInputGISTable,TOutputGISTable>
+const typename GISTableToGISTableFilter<TInputGISTable, TOutputGISTable>::InputGISTableType *
+GISTableToGISTableFilter<TInputGISTable, TOutputGISTable>
::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TInputGISTable * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<const TInputGISTable *>
+ (this->itk::ProcessObject::GetInput(0));
}
/**
@@ -64,7 +63,7 @@ GISTableToGISTableFilter<TInputGISTable,TOutputGISTable>
*/
template <class TInputGISTable, class TOutputGISTable>
void
-GISTableToGISTableFilter<TInputGISTable,TOutputGISTable>
+GISTableToGISTableFilter<TInputGISTable, TOutputGISTable>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/Common/otbGISTableToLabelMapFilter.h b/Code/Common/otbGISTableToLabelMapFilter.h
index 08d691ff63..10d212ce5d 100644
--- a/Code/Common/otbGISTableToLabelMapFilter.h
+++ b/Code/Common/otbGISTableToLabelMapFilter.h
@@ -40,33 +40,33 @@ namespace otb {
* \sa LabelMapSource
* \ingroup Common, GeospatialAnalysis
*/
-template<class TGISTable, class TLabelMap >
+template<class TGISTable, class TLabelMap>
class ITK_EXPORT GISTableToLabelMapFilter :
- public LabelMapSource< TLabelMap >
+ public LabelMapSource<TLabelMap>
{
public:
/** Standard class typedefs. */
typedef GISTableToLabelMapFilter Self;
- typedef LabelMapSource< TLabelMap >
+ typedef LabelMapSource<TLabelMap>
Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/**typedefs related to the GISTableToVectorDataFilter*/
- typedef VectorData <typename TGISTable::PrecisionType , TGISTable::Dimension> TVectorData;
- typedef GISTableToVectorDataFilter<TGISTable, TVectorData> GISTableToVectorDataFilterType;
- typedef VectorDataToLabelMapFilter<TVectorData, TLabelMap> VectorDataToLabelMapFilterType;
+ typedef VectorData <typename TGISTable::PrecisionType, TGISTable::Dimension> TVectorData;
+ typedef GISTableToVectorDataFilter<TGISTable, TVectorData> GISTableToVectorDataFilterType;
+ typedef VectorDataToLabelMapFilter<TVectorData, TLabelMap> VectorDataToLabelMapFilterType;
/** Some convenient typedefs. */
- typedef TGISTable InputGISTableType;
- typedef TLabelMap OutputLabelMapType;
- typedef typename OutputLabelMapType::Pointer OutputLabelMapPointer;
- typedef typename OutputLabelMapType::ConstPointer OutputLabelMapConstPointer;
+ typedef TGISTable InputGISTableType;
+ typedef TLabelMap OutputLabelMapType;
+ typedef typename OutputLabelMapType::Pointer OutputLabelMapPointer;
+ typedef typename OutputLabelMapType::ConstPointer OutputLabelMapConstPointer;
- typedef typename InputGISTableType::ConnectionType ConnectionType;
+ typedef typename InputGISTableType::ConnectionType ConnectionType;
typedef typename InputGISTableType::ConnectionPointerType ConnectionPointerType;
- typedef typename OutputLabelMapType::PixelType OutputLabelMapPixelType;
- typedef typename OutputLabelMapType::IndexType IndexType;
+ typedef typename OutputLabelMapType::PixelType OutputLabelMapPixelType;
+ typedef typename OutputLabelMapType::IndexType IndexType;
/** Standard New method. */
itkNewMacro(Self);
@@ -75,12 +75,11 @@ public:
itkTypeMacro(GISTableToLabelMapFilter,
LabelMapSource);
-
/** Image size typedef. */
typedef itk::Size<TGISTable::Dimension> SizeType;
//typedef typename IndexType::Pointer IndexPointerType;
- typedef typename InputGISTableType::PointType PointType;
+ typedef typename InputGISTableType::PointType PointType;
/**
* Set/Get the value used as "background" in the output image.
@@ -90,14 +89,14 @@ public:
itkGetConstMacro(BackgroundValue, OutputLabelMapPixelType);
/** Set the size of the output image. */
- itkSetMacro( Size, SizeType );
+ itkSetMacro(Size, SizeType);
/** Set the starting index of the output image. */
- itkSetMacro( StartIndex, IndexType );
+ itkSetMacro(StartIndex, IndexType);
/** Set/Get the GISTable input of this process object. */
- virtual void SetInput( const InputGISTableType *input);
- virtual void SetInput( unsigned int idx, const InputGISTableType *input);
+ virtual void SetInput(const InputGISTableType *input);
+ virtual void SetInput(unsigned int idx, const InputGISTableType *input);
const InputGISTableType * GetInput(void);
const InputGISTableType * GetInput(unsigned int idx);
@@ -105,7 +104,7 @@ public:
protected:
GISTableToLabelMapFilter();
- virtual ~GISTableToLabelMapFilter() {};
+ virtual ~GISTableToLabelMapFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** GISTableToLabelMapFilter needs the entire input be
@@ -117,18 +116,17 @@ protected:
* to the OGR driver. */
void GenerateData();
-
private:
- GISTableToLabelMapFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ GISTableToLabelMapFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
typename GISTableToVectorDataFilterType::Pointer m_GISTableToVectorDataFilter;
typename VectorDataToLabelMapFilterType::Pointer m_VectorDataToLabelMapFilter;
OutputLabelMapPixelType m_BackgroundValue;
- SizeType m_Size;
- IndexType m_StartIndex;
+ SizeType m_Size;
+ IndexType m_StartIndex;
}; // end of class
} // end namespace otb
diff --git a/Code/Common/otbGISTableToLabelMapFilter.txx b/Code/Common/otbGISTableToLabelMapFilter.txx
index 5d4a9aace5..ca80d36b99 100644
--- a/Code/Common/otbGISTableToLabelMapFilter.txx
+++ b/Code/Common/otbGISTableToLabelMapFilter.txx
@@ -23,69 +23,68 @@
namespace otb {
-template<class TGISTable, class TLabelMap >
+template<class TGISTable, class TLabelMap>
GISTableToLabelMapFilter<TGISTable, TLabelMap>
- ::GISTableToLabelMapFilter()
+::GISTableToLabelMapFilter()
{
m_BackgroundValue = itk::NumericTraits<OutputLabelMapPixelType>::max();
m_GISTableToVectorDataFilter = GISTableToVectorDataFilterType::New();
m_VectorDataToLabelMapFilter = VectorDataToLabelMapFilterType::New();
-
+
m_VectorDataToLabelMapFilter->SetInput(m_GISTableToVectorDataFilter->GetOutput());
}
-
-template<class TGISTable, class TLabelMap >
+template<class TGISTable, class TLabelMap>
void
GISTableToLabelMapFilter<TGISTable, TLabelMap>
- ::SetInput(const InputGISTableType *input)
+::SetInput(const InputGISTableType *input)
{
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(0,
- const_cast< InputGISTableType * >( input ) );
+ const_cast<InputGISTableType *>(input));
}
-template<class TGISTable, class TLabelMap >
+template<class TGISTable, class TLabelMap>
void
GISTableToLabelMapFilter<TGISTable, TLabelMap>
- ::SetInput(unsigned int idx, const InputGISTableType *input)
+::SetInput(unsigned int idx, const InputGISTableType *input)
{
- // Process object is not const-correct so the const_cast is required here
+ // Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(idx,
- const_cast< InputGISTableType * >( input ) );
+ const_cast<InputGISTableType *>(input));
}
-template<class TGISTable, class TLabelMap >
- const typename GISTableToLabelMapFilter<TGISTable, TLabelMap>::InputGISTableType *
+template<class TGISTable, class TLabelMap>
+const typename GISTableToLabelMapFilter<TGISTable, TLabelMap>::InputGISTableType *
GISTableToLabelMapFilter<TGISTable, TLabelMap>
- ::GetInput(void)
+::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TGISTable * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<const TGISTable *>
+ (this->itk::ProcessObject::GetInput(0));
}
-template<class TGISTable, class TLabelMap >
+template<class TGISTable, class TLabelMap>
const typename GISTableToLabelMapFilter<TGISTable, TLabelMap>::InputGISTableType *
GISTableToLabelMapFilter<TGISTable, TLabelMap>
- ::GetInput(unsigned int idx)
+::GetInput(unsigned int idx)
{
- return static_cast<const TGISTable * >
- (this->itk::ProcessObject::GetInput(idx) );
+ return static_cast<const TGISTable *>
+ (this->itk::ProcessObject::GetInput(idx));
}
-template<class TGISTable, class TLabelMap >
+template<class TGISTable, class TLabelMap>
void
GISTableToLabelMapFilter<TGISTable, TLabelMap>
::GenerateInputRequestedRegion()
-{/*
+{ /*
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
-
+
// We need all the input.
InputImagePointer input = const_cast<InputImageType *>(this->GetInput());
if ( !input )
@@ -107,36 +106,34 @@ GISTableToLabelMapFilter<TGISTable, TLabelMap>
/**
* overloaded because pb during copyinformation
*/
-template <class TGISTable, class TLabelMap >
-void GISTableToLabelMapFilter<TGISTable, TLabelMap >
+template <class TGISTable, class TLabelMap>
+void GISTableToLabelMapFilter<TGISTable, TLabelMap>
::GenerateOutputInformation()
{
- // we can't call the superclass method here.
-
+ // we can't call the superclass method here.
+
// get pointers to the input and output
const InputGISTableType * inputPtr = this->GetInput();
- OutputLabelMapType * outputPtr = this->GetOutput();
-
+ OutputLabelMapType * outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
-
- // Set the size of the output region
+ }
+
+ // Set the size of the output region
typename OutputLabelMapType::RegionType outputLargestPossibleRegion;
- outputLargestPossibleRegion.SetSize( m_Size );
- outputLargestPossibleRegion.SetIndex( m_StartIndex );
- outputPtr->SetLargestPossibleRegion( outputLargestPossibleRegion );
-
- //Set spacing and origin
+ outputLargestPossibleRegion.SetSize(m_Size);
+ outputLargestPossibleRegion.SetIndex(m_StartIndex);
+ outputPtr->SetLargestPossibleRegion(outputLargestPossibleRegion);
+
+ //Set spacing and origin
outputPtr->SetSpacing(m_GISTableToVectorDataFilter->GetOutput()->GetSpacing());
outputPtr->SetOrigin(m_GISTableToVectorDataFilter->GetOutput()->GetOrigin());
-
}
-template<class TGISTable, class TLabelMap >
+template<class TGISTable, class TLabelMap>
void
GISTableToLabelMapFilter<TGISTable, TLabelMap>
::GenerateData()
@@ -149,32 +146,30 @@ GISTableToLabelMapFilter<TGISTable, TLabelMap>
m_GISTableToVectorDataFilter->SetInput(this->GetInput());
//With set background to numericTrait::max() //TODO use the value set by the user
m_BackgroundValue = itk::NumericTraits<OutputLabelMapPixelType>::max();
- m_VectorDataToLabelMapFilter->SetBackgroundValue( this->GetBackgroundValue() );
-
+ m_VectorDataToLabelMapFilter->SetBackgroundValue(this->GetBackgroundValue());
+
//Set size of the final image
m_VectorDataToLabelMapFilter->SetSize(m_Size);
m_VectorDataToLabelMapFilter->SetStartIndex(m_StartIndex);
-
-
+
OutputLabelMapType * output = this->GetOutput();
-
+
output = m_VectorDataToLabelMapFilter->GetOutput();
-
+
m_VectorDataToLabelMapFilter->Update();
-
-}
+}
-template<class TGISTable, class TLabelMap >
+template<class TGISTable, class TLabelMap>
void
GISTableToLabelMapFilter<TGISTable, TLabelMap>
-::PrintSelf(std::ostream &os, itk::Indent indent) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
os << indent << "GISTableToVectorData:" << this->m_GISTableToVectorDataFilter << std::endl;
-
+
}
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/Common/otbGISTableToVectorDataFilter.h b/Code/Common/otbGISTableToVectorDataFilter.h
index 7711836bd4..4497148226 100644
--- a/Code/Common/otbGISTableToVectorDataFilter.h
+++ b/Code/Common/otbGISTableToVectorDataFilter.h
@@ -38,28 +38,28 @@ namespace otb {
* \sa VectorDataSource
* \ingroup Common, GeospatialAnalysis
*/
-template<class TGISTable, class TVectorData >
+template<class TGISTable, class TVectorData>
class ITK_EXPORT GISTableToVectorDataFilter :
- public VectorDataSource< TVectorData >
+ public VectorDataSource<TVectorData>
{
public:
/** Standard class typedefs. */
typedef GISTableToVectorDataFilter Self;
- typedef VectorDataSource< TVectorData >
+ typedef VectorDataSource<TVectorData>
Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Some convenient typedefs. */
- typedef TGISTable InputGISTableType;
- typedef TVectorData OutputVectorDataType;
- typedef typename OutputVectorDataType::Pointer OutputVectorDataPointer;
- typedef typename OutputVectorDataType::ConstPointer OutputVectorDataConstPointer;
+ typedef TGISTable InputGISTableType;
+ typedef TVectorData OutputVectorDataType;
+ typedef typename OutputVectorDataType::Pointer OutputVectorDataPointer;
+ typedef typename OutputVectorDataType::ConstPointer OutputVectorDataConstPointer;
- typedef typename OutputVectorDataType::DataNodeType DataNodeType;
- typedef typename DataNodeType::Pointer DataNodePointerType;
+ typedef typename OutputVectorDataType::DataNodeType DataNodeType;
+ typedef typename DataNodeType::Pointer DataNodePointerType;
- typedef typename InputGISTableType::ConnectionType ConnectionType;
+ typedef typename InputGISTableType::ConnectionType ConnectionType;
typedef typename InputGISTableType::ConnectionPointerType ConnectionPointerType;
typedef OGRVectorDataIO<OutputVectorDataType> OGRVectorDataIOType;
@@ -68,7 +68,6 @@ public:
typedef VectorDataFileReader<OutputVectorDataType> VectorDataFileReaderType;
/** ImageDimension constants */
-
/** Standard New method. */
itkNewMacro(Self);
@@ -76,16 +75,15 @@ public:
itkTypeMacro(GISTableToVectorDataFilter,
VectorDataSource);
-
/** Set/Get the GISTable input of this process object. */
- virtual void SetInput( const InputGISTableType *input);
- virtual void SetInput( unsigned int idx, const InputGISTableType *input);
+ virtual void SetInput(const InputGISTableType *input);
+ virtual void SetInput(unsigned int idx, const InputGISTableType *input);
const InputGISTableType * GetInput(void);
const InputGISTableType * GetInput(unsigned int idx);
protected:
GISTableToVectorDataFilter();
- virtual ~GISTableToVectorDataFilter() {};
+ virtual ~GISTableToVectorDataFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** GISTableToVectorDataFilter needs the entire input be
@@ -97,10 +95,9 @@ protected:
* to the OGR driver. */
void GenerateData();
-
private:
- GISTableToVectorDataFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ GISTableToVectorDataFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
typename VectorDataFileReaderType::Pointer m_Reader;
}; // end of class
diff --git a/Code/Common/otbGISTableToVectorDataFilter.txx b/Code/Common/otbGISTableToVectorDataFilter.txx
index e2c6fef21d..a8d75d73eb 100644
--- a/Code/Common/otbGISTableToVectorDataFilter.txx
+++ b/Code/Common/otbGISTableToVectorDataFilter.txx
@@ -26,66 +26,65 @@
namespace otb {
-template<class TGISTable, class TVectorData >
+template<class TGISTable, class TVectorData>
GISTableToVectorDataFilter<TGISTable, TVectorData>
- ::GISTableToVectorDataFilter()
-{/*
+::GISTableToVectorDataFilter()
+{ /*
m_BackgroundValue = NumericTraits<OutputImagePixelType>::NonpositiveMin();*/
m_Reader = VectorDataFileReaderType::New();
}
-
-template<class TGISTable, class TVectorData >
+template<class TGISTable, class TVectorData>
void
GISTableToVectorDataFilter<TGISTable, TVectorData>
- ::SetInput(const InputGISTableType *input)
+::SetInput(const InputGISTableType *input)
{
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(0,
- const_cast< InputGISTableType * >( input ) );
+ const_cast<InputGISTableType *>(input));
}
-template<class TGISTable, class TVectorData >
+template<class TGISTable, class TVectorData>
void
GISTableToVectorDataFilter<TGISTable, TVectorData>
- ::SetInput(unsigned int idx, const InputGISTableType *input)
+::SetInput(unsigned int idx, const InputGISTableType *input)
{
- // Process object is not const-correct so the const_cast is required here
+ // Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(idx,
- const_cast< InputGISTableType * >( input ) );
+ const_cast<InputGISTableType *>(input));
}
-template<class TGISTable, class TVectorData >
- const typename GISTableToVectorDataFilter<TGISTable, TVectorData>::InputGISTableType *
+template<class TGISTable, class TVectorData>
+const typename GISTableToVectorDataFilter<TGISTable, TVectorData>::InputGISTableType *
GISTableToVectorDataFilter<TGISTable, TVectorData>
- ::GetInput(void)
+::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TGISTable * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<const TGISTable *>
+ (this->itk::ProcessObject::GetInput(0));
}
-template<class TGISTable, class TVectorData >
+template<class TGISTable, class TVectorData>
const typename GISTableToVectorDataFilter<TGISTable, TVectorData>::InputGISTableType *
GISTableToVectorDataFilter<TGISTable, TVectorData>
- ::GetInput(unsigned int idx)
+::GetInput(unsigned int idx)
{
- return static_cast<const TGISTable * >
- (this->itk::ProcessObject::GetInput(idx) );
+ return static_cast<const TGISTable *>
+ (this->itk::ProcessObject::GetInput(idx));
}
-template<class TGISTable, class TVectorData >
+template<class TGISTable, class TVectorData>
void
GISTableToVectorDataFilter<TGISTable, TVectorData>
::GenerateInputRequestedRegion()
-{/*
+{ /*
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
-
+
// We need all the input.
InputImagePointer input = const_cast<InputImageType *>(this->GetInput());
if ( !input )
@@ -104,18 +103,18 @@ GISTableToVectorDataFilter<TGISTable, TVectorData>
}
*/
-template<class TGISTable, class TVectorData >
+template<class TGISTable, class TVectorData>
void
GISTableToVectorDataFilter<TGISTable, TVectorData>
::GenerateData()
{
-
+
// Allocate the output
//this->AllocateOutputs();
-
- OutputVectorDataType * output = this->GetOutput();
+
+ OutputVectorDataType * output = this->GetOutput();
const InputGISTableType * input = this->GetInput();
-
+
/**Create usual root elements of the output vectordata*/
// DataNodePointerType document = DataNodeType::New();
// DataNodePointerType folder1 = DataNodeType::New();
@@ -127,41 +126,39 @@ GISTableToVectorDataFilter<TGISTable, TVectorData>
//
// output->GetDataTree()->Add(document,root);
// output->GetDataTree()->Add(folder1,document);
-
-
- OGRVectorDataIOPointerType gisReader=OGRVectorDataIOType::New();
-
- const std::string inputOGRConnStr=input->GetOGRStrConnection();
+
+ OGRVectorDataIOPointerType gisReader = OGRVectorDataIOType::New();
+
+ const std::string inputOGRConnStr = input->GetOGRStrConnection();
//Try if the Db is readable
// std::cout << "ogr connection: " << inputOGRConnStr[0] << std::endl;
- if ( gisReader->CanReadFile( inputOGRConnStr.data() ) )
- {
+ if (gisReader->CanReadFile(inputOGRConnStr.data()))
+ {
//Read GISTable data and copy in the output VectorData
-
+
gisReader->SetFileName(inputOGRConnStr);
// std::cout << "read ogr!!: " << inputOGRConnStr << std::endl;
gisReader->Read(output);
- }
+ }
else
- {
- itkExceptionMacro(<<"The OGR connection is not valid;ogrconnection = " << inputOGRConnStr);
- }
-
+ {
+ itkExceptionMacro(<< "The OGR connection is not valid;ogrconnection = " << inputOGRConnStr);
+ }
+
// const std::string inputOGRConnStr=input->GetOGRStrConnection();
- //Try if the Db is readable
- //std::cout << "ogr connection: " << inputOGRConnStr[0] << std::endl;
-
+//Try if the Db is readable
+//std::cout << "ogr connection: " << inputOGRConnStr[0] << std::endl;
+
// m_Reader->SetFileName( inputOGRConnStr.data() );
// m_Reader->Update();
-
+
output = m_Reader->GetOutput();
}
-
-template<class TGISTable, class TVectorData >
+template<class TGISTable, class TVectorData>
void
GISTableToVectorDataFilter<TGISTable, TVectorData>
-::PrintSelf(std::ostream &os, itk::Indent indent) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
/*
@@ -169,5 +166,5 @@ GISTableToVectorDataFilter<TGISTable, TVectorData>
*/
}
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/Common/otbGenericInterpolateImageFunction.h b/Code/Common/otbGenericInterpolateImageFunction.h
index 0358c524d1..dae21529aa 100644
--- a/Code/Common/otbGenericInterpolateImageFunction.h
+++ b/Code/Common/otbGenericInterpolateImageFunction.h
@@ -35,16 +35,17 @@ namespace otb
*
* \ingroup ImageFunctions ImageInterpolators
*/
-template <class TInputImage, class TFunction, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep = double>
+template <class TInputImage, class TFunction, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>,
+ class TCoordRep = double>
class ITK_EXPORT GenericInterpolateImageFunction :
- public itk::InterpolateImageFunction<TInputImage,TCoordRep>
+ public itk::InterpolateImageFunction<TInputImage, TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef GenericInterpolateImageFunction Self;
- typedef itk::InterpolateImageFunction<TInputImage,TCoordRep> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef GenericInterpolateImageFunction Self;
+ typedef itk::InterpolateImageFunction<TInputImage, TCoordRep> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(GenericInterpolateImageFunction, itk::InterpolateImageFunction);
@@ -60,18 +61,17 @@ public:
//itkStaticConstMacro(ImageDimension, unsigned int,Superclass::ImageDimension);
/** Index and typedef support. */
- typedef typename Superclass::IndexType IndexType;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename Superclass::RealType RealType;
- typedef TFunction FunctionType;
- typedef itk::ConstNeighborhoodIterator< InputImageType, TBoundaryCondition> IteratorType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename Superclass::RealType RealType;
+ typedef TFunction FunctionType;
+ typedef itk::ConstNeighborhoodIterator<InputImageType, TBoundaryCondition> IteratorType;
/** ContinuousIndex typedef support. */
typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
/** Dimension underlying input image. */
- itkStaticConstMacro(ImageDimension, unsigned int,Superclass::ImageDimension);
-
+ itkStaticConstMacro(ImageDimension, unsigned int, Superclass::ImageDimension);
/** Evaluate the function at a ContinuousIndex position
*
@@ -81,15 +81,14 @@ public:
*
* ImageFunction::IsInsideBuffer() can be used to check bounds before
* calling the method. */
- virtual OutputType EvaluateAtContinuousIndex( const ContinuousIndexType & index ) const;
-
+ virtual OutputType EvaluateAtContinuousIndex(const ContinuousIndexType& index) const;
/** Set/Get the window radius*/
virtual void SetRadius(unsigned int rad);
virtual unsigned int GetRadius() const
{
return m_Function.GetRadius();
- };
+ }
//unsigned int GetRadius() { return this->GetFunction().GetRadius();};
/** Set/Get the window radius*/
@@ -105,7 +104,6 @@ public:
/** Initialize tables: need to be call explicitely */
virtual void Initialize();
-
/** Weights normalization accessors*/
itkSetMacro(NormalizeWeight, bool);
itkGetMacro(NormalizeWeight, bool);
@@ -127,8 +125,8 @@ protected:
virtual void FillWeightOffsetTable();
private:
- GenericInterpolateImageFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ GenericInterpolateImageFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Store the window radius. */
//unsigned int m_Radius;
// Constant to store twice the radius
diff --git a/Code/Common/otbGenericInterpolateImageFunction.txx b/Code/Common/otbGenericInterpolateImageFunction.txx
index b69e38c947..ddeb257943 100644
--- a/Code/Common/otbGenericInterpolateImageFunction.txx
+++ b/Code/Common/otbGenericInterpolateImageFunction.txx
@@ -32,13 +32,13 @@ GenericInterpolateImageFunction<TInputImage, TFunction, TBoundaryCondition, TCoo
this->SetRadius(1);
m_OffsetTable = NULL;
m_WeightOffsetTable = NULL;
- m_TablesHaveBeenGenerated=false;
+ m_TablesHaveBeenGenerated = false;
m_NormalizeWeight = false;
}
/** Destructor */
template<class TInputImage, class TFunction, class TBoundaryCondition, class TCoordRep>
-GenericInterpolateImageFunction<TInputImage, TFunction,TBoundaryCondition, TCoordRep>
+GenericInterpolateImageFunction<TInputImage, TFunction, TBoundaryCondition, TCoordRep>
::~GenericInterpolateImageFunction()
{
this->ResetOffsetTable();
@@ -51,25 +51,24 @@ GenericInterpolateImageFunction<TInputImage, TFunction, TBoundaryCondition, TCoo
::ResetOffsetTable()
{
// Clear the offset table
- if (m_OffsetTable!=NULL)
- {
- delete [] m_OffsetTable;
- m_OffsetTable=NULL;
- }
+ if (m_OffsetTable != NULL)
+ {
+ delete[] m_OffsetTable;
+ m_OffsetTable = NULL;
+ }
// Clear the weights tales
- if (m_WeightOffsetTable!=NULL)
- {
- for (unsigned int i=0; i < m_OffsetTableSize; ++i)
+ if (m_WeightOffsetTable != NULL)
{
- delete [] m_WeightOffsetTable[i];
- }
+ for (unsigned int i = 0; i < m_OffsetTableSize; ++i)
+ {
+ delete[] m_WeightOffsetTable[i];
+ }
delete[] m_WeightOffsetTable;
m_WeightOffsetTable = NULL;
- }
+ }
}
-
template<class TInputImage, class TFunction, class TBoundaryCondition, class TCoordRep>
void
GenericInterpolateImageFunction<TInputImage, TFunction, TBoundaryCondition, TCoordRep>
@@ -99,20 +98,20 @@ GenericInterpolateImageFunction<TInputImage, TFunction, TBoundaryCondition, TCoo
{
// Compute the offset table size
m_OffsetTableSize = 1;
- for (unsigned dim=0;dim<ImageDimension;++dim)
- {
+ for (unsigned dim = 0; dim < ImageDimension; ++dim)
+ {
m_OffsetTableSize *= m_WindowSize;
- }
+ }
// Allocate the offset table
m_OffsetTable = new unsigned int[m_OffsetTableSize];
// Allocate the weights tables
m_WeightOffsetTable = new unsigned int *[m_OffsetTableSize];
- for (unsigned int i=0;i<m_OffsetTableSize;++i)
- {
+ for (unsigned int i = 0; i < m_OffsetTableSize; ++i)
+ {
m_WeightOffsetTable[i] = new unsigned int[ImageDimension];
- }
+ }
}
/** Fill the weight offset table*/
@@ -125,48 +124,48 @@ GenericInterpolateImageFunction<TInputImage, TFunction, TBoundaryCondition, TCoo
SizeType radius;
radius.Fill(this->GetRadius());
if (this->GetInputImage() != NULL)
- {
+ {
IteratorType it = IteratorType(radius, this->GetInputImage(), this->GetInputImage()->GetBufferedRegion());
// Compute the offset tables (we ignore all the zero indices
// in the neighborhood)
unsigned int iOffset = 0;
- int empty = static_cast<int>(this->GetRadius());
+ int empty = static_cast<int>(this->GetRadius());
for (unsigned int iPos = 0; iPos < it.Size(); ++iPos)
- {
+ {
// Get the offset (index)
typename IteratorType::OffsetType off = it.GetOffset(iPos);
// Check if the offset has zero weights
bool nonzero = true;
for (unsigned int dim = 0; dim < ImageDimension; ++dim)
- {
- if (off[dim] == -empty)
{
+ if (off[dim] == -empty)
+ {
nonzero = false;
break;
+ }
}
- }
// Only use offsets with non-zero indices
if (nonzero)
- {
+ {
// Set the offset index
m_OffsetTable[iOffset] = iPos;
// Set the weight table indices
for (unsigned int dim = 0; dim < ImageDimension; ++dim)
- {
+ {
m_WeightOffsetTable[iOffset][dim] = off[dim] + this->GetRadius() - 1;
- }
+ }
// Increment the index
iOffset++;
+ }
}
}
- }
else
- {
+ {
itkExceptionMacro(<< "An input has to be set");
- }
+ }
}
/** Initialize tables: need to be call explicitely */
@@ -191,55 +190,54 @@ GenericInterpolateImageFunction<TInputImage, TFunction, TBoundaryCondition, TCoo
::EvaluateAtContinuousIndex(const ContinuousIndexType& index) const
{
if (!m_TablesHaveBeenGenerated)
- {
+ {
itkExceptionMacro(<< "The Interpolation functor need to be explicitly intanciated with the method Initialize()");
- }
+ }
//unsigned int dim;
IndexType baseIndex;
- double distance[ImageDimension];
+ double distance[ImageDimension];
// Compute the integer index based on the continuous one by
// 'flooring' the index
- for ( unsigned int dim = 0; dim < ImageDimension; ++dim )
- {
+ for (unsigned int dim = 0; dim < ImageDimension; ++dim)
+ {
// The following "if" block is equivalent to the following line without
// having to call floor.
// baseIndex[dim] = (long) vcl_floor(index[dim] );
if (index[dim] >= 0.0)
- {
+ {
baseIndex[dim] = (long) index[dim];
- }
+ }
else
- {
+ {
long tIndex = (long) index[dim];
if (double(tIndex) != index[dim])
- {
+ {
tIndex--;
- }
+ }
baseIndex[dim] = tIndex;
+ }
+ distance[dim] = index[dim] - double(baseIndex[dim]);
}
- distance[dim] = index[dim] - double( baseIndex[dim] );
- }
-
// Position the neighborhood at the index of interest
SizeType radius;
radius.Fill(this->GetRadius());
- IteratorType nit = IteratorType( radius, this->GetInputImage(), this->GetInputImage()->GetBufferedRegion());
- nit.SetLocation( baseIndex );
+ IteratorType nit = IteratorType(radius, this->GetInputImage(), this->GetInputImage()->GetBufferedRegion());
+ nit.SetLocation(baseIndex);
- const unsigned int twiceRadius = static_cast<const unsigned int>(2*this->GetRadius());
+ const unsigned int twiceRadius = static_cast<const unsigned int>(2 * this->GetRadius());
/* double xWeight[ImageDimension][ twiceRadius];*/
- std::vector< std::vector<double> > xWeight;
+ std::vector<std::vector<double> > xWeight;
xWeight.resize(ImageDimension);
- for (unsigned int cpt=0; cpt < xWeight.size(); cpt++)
- {
+ for (unsigned int cpt = 0; cpt < xWeight.size(); cpt++)
+ {
xWeight[cpt].resize(twiceRadius);
- }
+ }
- for ( unsigned int dim = 0; dim < ImageDimension; ++dim )
- {
+ for (unsigned int dim = 0; dim < ImageDimension; ++dim)
+ {
// x is the offset, hence the parameter of the kernel
double x = distance[dim] + this->GetRadius();
@@ -257,44 +255,43 @@ GenericInterpolateImageFunction<TInputImage, TFunction, TBoundaryCondition, TCoo
{
*/
// i is the relative offset in dimension dim.
- for ( unsigned int i = 0; i < m_WindowSize; ++i)
- {
+ for (unsigned int i = 0; i < m_WindowSize; ++i)
+ {
// Increment the offset, taking it through the range
// (dist + rad - 1, ..., dist - rad), i.e. all x
// such that vcl_abs(x) <= rad
x -= 1.0;
// Compute the weight for this m
xWeight[dim][i] = m_Function(x);
- }
+ }
//}
- }
+ }
if (m_NormalizeWeight == true)
- {
- for ( unsigned int dim = 0; dim < ImageDimension; ++dim )
{
+ for (unsigned int dim = 0; dim < ImageDimension; ++dim)
+ {
double sum = 0.;
// Compute the weights sum
- for ( unsigned int i = 0; i < m_WindowSize; ++i)
- {
+ for (unsigned int i = 0; i < m_WindowSize; ++i)
+ {
sum += xWeight[dim][i];
- }
+ }
if (sum != 1.)
- {
- // Normalize the weights
- for ( unsigned int i = 0; i < m_WindowSize; ++i)
{
- xWeight[dim][i] = xWeight[dim][i]/sum;
+ // Normalize the weights
+ for (unsigned int i = 0; i < m_WindowSize; ++i)
+ {
+ xWeight[dim][i] = xWeight[dim][i] / sum;
+ }
}
}
}
- }
-
// Iterate over the neighborhood, taking the correct set
// of weights in each dimension
double xPixelValue = 0.0;
for (unsigned int j = 0; j < m_OffsetTableSize; ++j)
- {
+ {
// Get the offset for this neighbor
unsigned int off = m_OffsetTable[j];
@@ -304,27 +301,26 @@ GenericInterpolateImageFunction<TInputImage, TFunction, TBoundaryCondition, TCoo
// Multiply the intensity by each of the weights. Gotta hope
// that the compiler will unwrap this loop and pipeline this!
for (unsigned int dim = 0; dim < ImageDimension; ++dim)
- {
- xVal *= xWeight[ dim ][ m_WeightOffsetTable[j][dim] ];
- }
+ {
+ xVal *= xWeight[dim][m_WeightOffsetTable[j][dim]];
+ }
// Increment the pixel value
xPixelValue += xVal;
- }
+ }
// Return the interpolated value
return static_cast<OutputType>(xPixelValue);
}
-
template<class TInputImage, class TFunction, class TBoundaryCondition, class TCoordRep>
void
GenericInterpolateImageFunction<TInputImage, TFunction, TBoundaryCondition, TCoordRep>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
-}//namespace otb
+} //namespace otb
#endif
diff --git a/Code/Common/otbHistogramStatisticsFunction.h b/Code/Common/otbHistogramStatisticsFunction.h
index 3cff62570f..6b1124afcd 100644
--- a/Code/Common/otbHistogramStatisticsFunction.h
+++ b/Code/Common/otbHistogramStatisticsFunction.h
@@ -16,7 +16,6 @@
=========================================================================*/
-
#ifndef __otbHistogramStatisticsFunction_h
#define __otbHistogramStatisticsFunction_h
@@ -35,19 +34,19 @@ namespace otb
* \ingroup Function
*/
-template< class TInputHistogram, class TOutput >
+template<class TInputHistogram, class TOutput>
class HistogramStatisticsFunction :
- public itk::HistogramAlgorithmBase< TInputHistogram >
+ public itk::HistogramAlgorithmBase<TInputHistogram>
{
public:
/**Standard class typedefs. */
- typedef HistogramStatisticsFunction Self;
- typedef itk::HistogramAlgorithmBase<TInputHistogram> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef HistogramStatisticsFunction Self;
+ typedef itk::HistogramAlgorithmBase<TInputHistogram> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename TInputHistogram::MeasurementType MeasurementType;
- typedef typename TInputHistogram::FrequencyType FrequencyType;
+ typedef typename TInputHistogram::MeasurementType MeasurementType;
+ typedef typename TInputHistogram::FrequencyType FrequencyType;
typedef typename itk::NumericTraits<MeasurementType>::RealType RealType;
/**Standard Macros */
@@ -67,14 +66,14 @@ public:
OutputType GetCovariance();
/** Stores the histogram pointer */
- void SetInputHistogram( const TInputHistogram * histogram )
+ void SetInputHistogram(const TInputHistogram * histogram)
{
- if ( m_InputHistogram != histogram )
- {
+ if (m_InputHistogram != histogram)
+ {
m_InputHistogram = histogram;
this->Modified();
m_IsModified = true;
- }
+ }
}
protected:
@@ -100,7 +99,7 @@ private:
OutputType m_entropy;
OutputType m_mean;
OutputType m_covariance;
- bool m_IsModified;
+ bool m_IsModified;
/** Target histogram data pointer */
typename TInputHistogram::ConstPointer m_InputHistogram;
diff --git a/Code/Common/otbHistogramStatisticsFunction.txx b/Code/Common/otbHistogramStatisticsFunction.txx
index b5cf779cc0..bba06684f6 100644
--- a/Code/Common/otbHistogramStatisticsFunction.txx
+++ b/Code/Common/otbHistogramStatisticsFunction.txx
@@ -24,119 +24,116 @@
namespace otb
{
-template< class TInputHistogram, class TOutput >
-HistogramStatisticsFunction< TInputHistogram, TOutput>
+template<class TInputHistogram, class TOutput>
+HistogramStatisticsFunction<TInputHistogram, TOutput>
::HistogramStatisticsFunction()
{
m_IsModified = true;
}
-template< class TInputHistogram, class TOutput >
-typename HistogramStatisticsFunction< TInputHistogram, TOutput>::OutputType
-HistogramStatisticsFunction< TInputHistogram, TOutput>
+template<class TInputHistogram, class TOutput>
+typename HistogramStatisticsFunction<TInputHistogram, TOutput>::OutputType
+HistogramStatisticsFunction<TInputHistogram, TOutput>
::GetEntropy()
{
if (m_IsModified == true)
- {
+ {
this->Update();
- }
+ }
return m_entropy;
}
-template< class TInputHistogram, class TOutput >
-typename HistogramStatisticsFunction< TInputHistogram, TOutput>::OutputType
-HistogramStatisticsFunction< TInputHistogram, TOutput>
+template<class TInputHistogram, class TOutput>
+typename HistogramStatisticsFunction<TInputHistogram, TOutput>::OutputType
+HistogramStatisticsFunction<TInputHistogram, TOutput>
::GetMean()
{
if (m_IsModified == true)
- {
+ {
this->Update();
- }
+ }
return m_mean;
}
-template< class TInputHistogram, class TOutput >
-typename HistogramStatisticsFunction< TInputHistogram, TOutput>::OutputType
-HistogramStatisticsFunction< TInputHistogram, TOutput>
+template<class TInputHistogram, class TOutput>
+typename HistogramStatisticsFunction<TInputHistogram, TOutput>::OutputType
+HistogramStatisticsFunction<TInputHistogram, TOutput>
::GetCovariance()
{
if (m_IsModified == true)
- {
+ {
this->Update();
- }
+ }
return m_covariance;
}
-template< class TInputHistogram, class TOutput >
+template<class TInputHistogram, class TOutput>
void
-HistogramStatisticsFunction< TInputHistogram, TOutput>
+HistogramStatisticsFunction<TInputHistogram, TOutput>
::CalculateEntropy()
{
typename TInputHistogram::ConstPointer histogram = m_InputHistogram;
-
typename TInputHistogram::ConstIterator iter = histogram->Begin();
typename TInputHistogram::ConstIterator end = histogram->End();
- RealType entropy = itk::NumericTraits<RealType>::Zero;
+ RealType entropy = itk::NumericTraits<RealType>::Zero;
FrequencyType globalFrequency = histogram->GetTotalFrequency();
if (globalFrequency == 0)
- {
- itkExceptionMacro(<<"Histogram must contain at least 1 element.");
- }
+ {
+ itkExceptionMacro(<< "Histogram must contain at least 1 element.");
+ }
while (iter != end)
- {
+ {
RealType Proba = static_cast<RealType>(iter.GetFrequency());
Proba /= static_cast<RealType>(globalFrequency);
- if (Proba !=0.0)
- {
+ if (Proba != 0.0)
+ {
entropy -= Proba * vcl_log(Proba);
- }
+ }
++iter;
- }
+ }
m_entropy.resize(1);
m_entropy[0] = static_cast<TOutput>(entropy);
}
-
-template< class TInputHistogram, class TOutput >
+template<class TInputHistogram, class TOutput>
void
-HistogramStatisticsFunction< TInputHistogram, TOutput>
+HistogramStatisticsFunction<TInputHistogram, TOutput>
::CalculateMean()
{
typename TInputHistogram::ConstPointer histogram = m_InputHistogram;
-
unsigned int NumberOfDimension = histogram->GetSize().GetSizeDimension();
m_mean.resize(NumberOfDimension);
if (histogram->GetTotalFrequency() == 0)
- {
- itkExceptionMacro(<<"Histogram must contain at least 1 element.");
- }
+ {
+ itkExceptionMacro(<< "Histogram must contain at least 1 element.");
+ }
if (NumberOfDimension > 2)
- {
- itkExceptionMacro(<<"Histogram must have 1 or 2 dimension.");
- }
+ {
+ itkExceptionMacro(<< "Histogram must have 1 or 2 dimension.");
+ }
- for ( unsigned int noDim = 0; noDim < NumberOfDimension; noDim++ )
- {
+ for (unsigned int noDim = 0; noDim < NumberOfDimension; noDim++)
+ {
MeasurementType mean = itk::NumericTraits<MeasurementType>::Zero;
for (unsigned int i = 0; i < histogram->GetSize()[noDim]; ++i)
- {
+ {
MeasurementType val = histogram->GetMeasurement(i, noDim);
- FrequencyType freq = histogram->GetFrequency(i, noDim);
- mean += val*freq;
- }
+ FrequencyType freq = histogram->GetFrequency(i, noDim);
+ mean += val * freq;
+ }
mean /= histogram->GetTotalFrequency();
m_mean[noDim] = static_cast<TOutput>(mean);
- }
+ }
}
-template< class TInputHistogram, class TOutput >
+template<class TInputHistogram, class TOutput>
void
-HistogramStatisticsFunction< TInputHistogram, TOutput>
+HistogramStatisticsFunction<TInputHistogram, TOutput>
::CalculateCovariance()
{
CalculateMean();
@@ -144,38 +141,38 @@ HistogramStatisticsFunction< TInputHistogram, TOutput>
typename TInputHistogram::ConstPointer histogram = m_InputHistogram;
unsigned int NumberOfDimension = histogram->GetSize().GetSizeDimension();
- m_covariance.resize(NumberOfDimension*NumberOfDimension);
+ m_covariance.resize(NumberOfDimension * NumberOfDimension);
if (histogram->GetTotalFrequency() == 0)
- {
- itkExceptionMacro(<<"Histogram must contain at least 1 element.");
- }
-
- for ( unsigned int noDimX = 0; noDimX < NumberOfDimension; noDimX++ )
- for ( unsigned int noDimY = 0; noDimY < NumberOfDimension; noDimY++ )
{
+ itkExceptionMacro(<< "Histogram must contain at least 1 element.");
+ }
+
+ for (unsigned int noDimX = 0; noDimX < NumberOfDimension; noDimX++)
+ for (unsigned int noDimY = 0; noDimY < NumberOfDimension; noDimY++)
+ {
MeasurementType covariance = itk::NumericTraits<MeasurementType>::Zero;
for (unsigned int i = 0; i < histogram->GetSize()[noDimX]; ++i)
for (unsigned int j = 0; j < histogram->GetSize()[noDimY]; ++j)
- {
+ {
MeasurementType valX = histogram->GetMeasurement(i, noDimX);
MeasurementType valY = histogram->GetMeasurement(j, noDimY);
- FrequencyType freqX = histogram->GetFrequency(i, noDimX);
- FrequencyType freqY = histogram->GetFrequency(j, noDimY);
+ FrequencyType freqX = histogram->GetFrequency(i, noDimX);
+ FrequencyType freqY = histogram->GetFrequency(j, noDimY);
valX -= static_cast<MeasurementType>(m_mean[noDimX]);
valY -= static_cast<MeasurementType>(m_mean[noDimY]);
- covariance += ( (valX*freqX)*(valY*freqY) );
- }
+ covariance += ((valX * freqX) * (valY * freqY));
+ }
covariance /= histogram->GetTotalFrequency();
- m_covariance[noDimX*NumberOfDimension+noDimY] = static_cast<TOutput>(covariance);
- }
+ m_covariance[noDimX * NumberOfDimension + noDimY] = static_cast<TOutput>(covariance);
+ }
}
-template< class TInputHistogram, class TOutput >
+template<class TInputHistogram, class TOutput>
void
-HistogramStatisticsFunction< TInputHistogram, TOutput>
+HistogramStatisticsFunction<TInputHistogram, TOutput>
::GenerateData()
{
@@ -185,13 +182,12 @@ HistogramStatisticsFunction< TInputHistogram, TOutput>
m_IsModified = false;
}
-
-template< class TInputHistogram, class TOutput >
+template<class TInputHistogram, class TOutput>
void
-HistogramStatisticsFunction< TInputHistogram, TOutput>
+HistogramStatisticsFunction<TInputHistogram, TOutput>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/Common/otbI18n.h b/Code/Common/otbI18n.h
index 0a9ac658b4..6508fc6b65 100644
--- a/Code/Common/otbI18n.h
+++ b/Code/Common/otbI18n.h
@@ -27,62 +27,62 @@
#endif
//To enable stringization after macro replacement
-#define _QUOTEME(x) #x
+#define _QUOTEME(x) # x
#define QUOTEME(x) _QUOTEME(x)
#if defined(OTB_I18N)
// Don't use the setlocale() method for windows, it works another way.
#if defined(_WIN32)
#define otbI18nMacro() \
-{\
- typedef otb::ConfigurationFile ConfigurationType;\
- ConfigurationType::Pointer conf = ConfigurationType::GetInstance();\
- std::string lang;\
- try\
- {\
- lang = conf->GetParameter<std::string>("OTB_LANG");\
- }\
- catch(...)\
- {\
- lang = QUOTEME(OTB_LANG);\
- }\
- bindtextdomain( "otb", QUOTEME(OTB_LANG_LOCATION) );\
- textdomain( "otb" );\
- std::cout << "Language: " << lang << std::endl;\
- std::cout << "Language location: " << QUOTEME(OTB_LANG_LOCATION) << std::endl;\
-}
+ { \
+ typedef otb::ConfigurationFile ConfigurationType; \
+ ConfigurationType::Pointer conf = ConfigurationType::GetInstance(); \
+ std::string lang; \
+ try \
+ { \
+ lang = conf->GetParameter<std::string>("OTB_LANG"); \
+ } \
+ catch (...) \
+ { \
+ lang = QUOTEME(OTB_LANG); \
+ } \
+ bindtextdomain("otb", QUOTEME(OTB_LANG_LOCATION)); \
+ textdomain("otb"); \
+ std::cout << "Language: " << lang << std::endl; \
+ std::cout << "Language location: " << QUOTEME(OTB_LANG_LOCATION) << std::endl; \
+ }
#else
#define otbI18nMacro() \
-{\
- typedef otb::ConfigurationFile ConfigurationType;\
- ConfigurationType::Pointer conf = ConfigurationType::GetInstance();\
- std::string lang;\
- try\
- {\
- lang = conf->GetParameter<std::string>("OTB_LANG");\
- }\
- catch(...)\
- {\
- lang = QUOTEME(OTB_LANG);\
- }\
- setlocale( LC_MESSAGES, lang.c_str() );\
- bindtextdomain( "otb", QUOTEME(OTB_LANG_LOCATION) );\
- textdomain( "otb" );\
- std::cout << "Language: " << lang << std::endl;\
- std::cout << "Language location: " << QUOTEME(OTB_LANG_LOCATION) << std::endl;\
-}
+ { \
+ typedef otb::ConfigurationFile ConfigurationType; \
+ ConfigurationType::Pointer conf = ConfigurationType::GetInstance(); \
+ std::string lang; \
+ try \
+ { \
+ lang = conf->GetParameter<std::string>("OTB_LANG"); \
+ } \
+ catch (...) \
+ { \
+ lang = QUOTEME(OTB_LANG); \
+ } \
+ setlocale(LC_MESSAGES, lang.c_str()); \
+ bindtextdomain("otb", QUOTEME(OTB_LANG_LOCATION)); \
+ textdomain("otb"); \
+ std::cout << "Language: " << lang << std::endl; \
+ std::cout << "Language location: " << QUOTEME(OTB_LANG_LOCATION) << std::endl; \
+ }
#endif
#else
-#define otbI18nMacro()\
-std::cout << "No internationalization" << std::endl;
+#define otbI18nMacro() \
+ std::cout << "No internationalization" << std::endl;
#endif
#if defined(OTB_I18N)
-#define otbGetTextMacro(msgString)\
-gettext(msgString)
+#define otbGetTextMacro(msgString) \
+ gettext(msgString)
#else
-#define otbGetTextMacro(msgString)\
-msgString
+#define otbGetTextMacro(msgString) \
+ msgString
#endif
#endif
diff --git a/Code/Common/otbImageList.h b/Code/Common/otbImageList.h
index 6b46f9a8c1..aeece2eeba 100644
--- a/Code/Common/otbImageList.h
+++ b/Code/Common/otbImageList.h
@@ -32,51 +32,51 @@ namespace otb
template <class TImage>
class ITK_EXPORT ImageList
- : public ObjectList<TImage>
+ : public ObjectList<TImage>
{
public:
/** Standard typedefs */
- typedef ImageList Self;
- typedef ObjectList<TImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef ImageList Self;
+ typedef ObjectList<TImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
- itkTypeMacro(ImageList,ObjectList);
+ itkTypeMacro(ImageList, ObjectList);
/** Creation through object factory macro */
itkNewMacro(Self);
/** Template parameter typedefs */
- typedef TImage ImageType;
- typedef typename Superclass::ObjectPointerType ImagePointerType;
- typedef typename Superclass::Iterator Iterator;
- typedef typename Superclass::ConstIterator ConstIterator;
- typedef typename Superclass::ReverseIterator ReverseIterator;
+ typedef TImage ImageType;
+ typedef typename Superclass::ObjectPointerType ImagePointerType;
+ typedef typename Superclass::Iterator Iterator;
+ typedef typename Superclass::ConstIterator ConstIterator;
+ typedef typename Superclass::ReverseIterator ReverseIterator;
typedef typename Superclass::ReverseConstIterator ReverseConstIterator;
/**
* Update images in the list.
*/
virtual void UpdateOutputInformation(void);
- virtual void PropagateRequestedRegion(void) throw (itk::InvalidRequestedRegionError);
+ virtual void PropagateRequestedRegion(void)
+ throw (itk::InvalidRequestedRegionError);
virtual void UpdateOutputData(void);
-
protected:
/** Constructor */
ImageList() {};
/** Destructor */
- virtual ~ImageList() {};
+ virtual ~ImageList() {}
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- };
+ Superclass::PrintSelf(os, indent);
+ }
private:
- ImageList(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageList(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // End namespace otb
diff --git a/Code/Common/otbImageList.txx b/Code/Common/otbImageList.txx
index 0b8db4e023..8c0db0ae08 100644
--- a/Code/Common/otbImageList.txx
+++ b/Code/Common/otbImageList.txx
@@ -29,41 +29,41 @@ ImageList<TImage>
::UpdateOutputData()
{
Superclass::UpdateOutputData();
- for (ConstIterator it = this->Begin(); it!=this->End();++it)
- {
+ for (ConstIterator it = this->Begin(); it != this->End(); ++it)
+ {
if (it.Get()->GetUpdateMTime() < it.Get()->GetPipelineMTime()
|| it.Get()->GetDataReleased()
|| it.Get()->RequestedRegionIsOutsideOfTheBufferedRegion())
- {
- if (it.Get()->GetSource())
{
- it.Get()->GetSource()->PropagateRequestedRegion(it.Get());
-
- // Check that the requested region lies within the largest possible region
- if ( ! it.Get()->VerifyRequestedRegion() )
- {
- // invalid requested region, throw an exception
- itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
- e.SetLocation(ITK_LOCATION);
- e.SetDataObject(it.Get());
- e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
-
- throw e;
- }
-
- it.Get()->GetSource()->UpdateOutputData(it.Get());
+ if (it.Get()->GetSource())
+ {
+ it.Get()->GetSource()->PropagateRequestedRegion(it.Get());
+
+ // Check that the requested region lies within the largest possible region
+ if (!it.Get()->VerifyRequestedRegion())
+ {
+ // invalid requested region, throw an exception
+ itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
+ e.SetLocation(ITK_LOCATION);
+ e.SetDataObject(it.Get());
+ e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
+
+ throw e;
+ }
+
+ it.Get()->GetSource()->UpdateOutputData(it.Get());
+ }
}
}
- }
}
template <class TImage>
void
ImageList<TImage>
::PropagateRequestedRegion() throw (itk::InvalidRequestedRegionError)
-{
+ {
Superclass::PropagateRequestedRegion();
-}
+ }
template <class TImage>
void
@@ -74,19 +74,18 @@ ImageList<TImage>
Superclass::UpdateOutputInformation();
if (this->GetSource())
- {
+ {
this->GetSource()->UpdateOutputInformation();
- }
- for (ConstIterator it = this->Begin(); it!=this->End();++it)
- {
- if (it.Get()->GetSource())
+ }
+ for (ConstIterator it = this->Begin(); it != this->End(); ++it)
{
+ if (it.Get()->GetSource())
+ {
it.Get()->GetSource()->UpdateOutputInformation();
+ }
}
- }
}
-
} // end namespace otb
#endif
diff --git a/Code/Common/otbImageListSource.h b/Code/Common/otbImageListSource.h
index 69bb971c28..09f15312a2 100644
--- a/Code/Common/otbImageListSource.h
+++ b/Code/Common/otbImageListSource.h
@@ -33,18 +33,18 @@ namespace otb
*/
template <class TOutputImage>
class ITK_EXPORT ImageListSource
- : public itk::ProcessObject
+ : public itk::ProcessObject
{
public:
/** Standard typedefs */
- typedef ImageListSource Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageListSource Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(ImageListSource,itk::ProcessObject);
+ itkTypeMacro(ImageListSource, itk::ProcessObject);
/** Data object pointer type */
typedef itk::DataObject::Pointer DataObjectPointer;
/** Template parameter typedef*/
@@ -65,8 +65,8 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageListSource(const Self&);//purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageListSource(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // End namespace otb
diff --git a/Code/Common/otbImageListSource.txx b/Code/Common/otbImageListSource.txx
index 3b2e7af56e..507e1df87e 100644
--- a/Code/Common/otbImageListSource.txx
+++ b/Code/Common/otbImageListSource.txx
@@ -30,7 +30,7 @@ ImageListSource<TOutputImage>
::ImageListSource()
{
this->Superclass::SetNumberOfRequiredOutputs(1);
- this->Superclass::SetNthOutput(0,ImageList<TOutputImage>::New().GetPointer());
+ this->Superclass::SetNthOutput(0, ImageList<TOutputImage>::New().GetPointer());
}
/**
* Get the output image list
@@ -41,10 +41,10 @@ typename ImageListSource<TOutputImage>::OutputImageListType *
ImageListSource<TOutputImage>
::GetOutput(void)
{
- if (this->GetNumberOfOutputs()<1)
- {
+ if (this->GetNumberOfOutputs() < 1)
+ {
return 0;
- }
+ }
return static_cast<OutputImageListType *> (this->ProcessObject::GetOutput(0));
}
/**
@@ -55,7 +55,7 @@ void
ImageListSource<TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/Common/otbImageListToImageFilter.h b/Code/Common/otbImageListToImageFilter.h
index aa7f1b6543..fc049d2f40 100644
--- a/Code/Common/otbImageListToImageFilter.h
+++ b/Code/Common/otbImageListToImageFilter.h
@@ -33,51 +33,51 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT ImageListToImageFilter
- : public itk::ImageSource<TOutputImage>
+ : public itk::ImageSource<TOutputImage>
{
public:
/** Standard typedefs */
- typedef ImageListToImageFilter Self;
- typedef itk::ImageSource<TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageListToImageFilter Self;
+ typedef itk::ImageSource<TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
itkTypeMacro(ImageListToImageFilter, ImageSource);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::ConstPointer InputImagePointer;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::ValueType ValueType;
- typedef ImageList<InputImageType> InputImageListType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::ConstPointer InputImagePointer;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::ValueType ValueType;
+ typedef ImageList<InputImageType> InputImageListType;
typedef typename InputImageListType::ConstPointer InputImageListConstPointerType;
/** Derived typedefs */
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
/** InputImage dimension constant */
- itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/** Overiding the SetInput() and GetInput() methods */
- virtual void SetInput( const InputImageListType * image);
+ virtual void SetInput(const InputImageListType * image);
InputImageListType * GetInput(void);
protected:
/** Constructor */
ImageListToImageFilter();
/** Destructor */
- virtual ~ImageListToImageFilter() {};
+ virtual ~ImageListToImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageListToImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageListToImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbImageListToImageFilter.txx"
#endif
diff --git a/Code/Common/otbImageListToImageFilter.txx b/Code/Common/otbImageListToImageFilter.txx
index 56b0d8b9b1..8e5c4a538f 100644
--- a/Code/Common/otbImageListToImageFilter.txx
+++ b/Code/Common/otbImageListToImageFilter.txx
@@ -26,7 +26,7 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage>
-ImageListToImageFilter<TInputImage,TOutputImage>
+ImageListToImageFilter<TInputImage, TOutputImage>
::ImageListToImageFilter()
{
this->SetNumberOfRequiredInputs(1);
@@ -37,37 +37,37 @@ ImageListToImageFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-ImageListToImageFilter<TInputImage,TOutputImage>
+ImageListToImageFilter<TInputImage, TOutputImage>
::SetInput(const InputImageListType *image)
{
// A single input image
- this->itk::ProcessObject::SetNthInput(0,const_cast<InputImageListType*>(image));
+ this->itk::ProcessObject::SetNthInput(0, const_cast<InputImageListType*>(image));
}
/**
* Input image retrieval
* \return The input image.
*/
template <class TInputImage, class TOutputImage>
-typename ImageListToImageFilter<TInputImage,TOutputImage>::InputImageListType *
-ImageListToImageFilter<TInputImage,TOutputImage>
+typename ImageListToImageFilter<TInputImage, TOutputImage>::InputImageListType *
+ImageListToImageFilter<TInputImage, TOutputImage>
::GetInput(void)
{
// If there is no input
- if (this->GetNumberOfInputs()<1)
- {
+ if (this->GetNumberOfInputs() < 1)
+ {
// exit
return 0;
- }
+ }
// else return the first input
- return static_cast<InputImageListType * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<InputImageListType *>
+ (this->itk::ProcessObject::GetInput(0));
}
/**
* PrintSelf Method
*/
template <class TInputImage, class TOutputImage>
void
-ImageListToImageFilter<TInputImage,TOutputImage>
+ImageListToImageFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/Common/otbImageListToImageListFilter.h b/Code/Common/otbImageListToImageListFilter.h
index 89c173cb36..aef1b4b910 100644
--- a/Code/Common/otbImageListToImageListFilter.h
+++ b/Code/Common/otbImageListToImageListFilter.h
@@ -30,52 +30,52 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT ImageListToImageListFilter
- : public ImageListSource<TOutputImage>
+ : public ImageListSource<TOutputImage>
{
public:
/** Standard typedefs */
- typedef ImageListToImageListFilter Self;
- typedef ImageListSource<TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageListToImageListFilter Self;
+ typedef ImageListSource<TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
itkTypeMacro(ImageListToImageListFilter, ImageListSource);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::ConstPointer InputImagePointer;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::ValueType ValueType;
- typedef ImageList<InputImageType> InputImageListType;
- typedef typename InputImageListType::Pointer InputImageListPointerType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::ConstPointer InputImagePointer;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::ValueType ValueType;
+ typedef ImageList<InputImageType> InputImageListType;
+ typedef typename InputImageListType::Pointer InputImageListPointerType;
typedef typename InputImageListType::ConstPointer InputImageListConstPointer;
/** Derived typedefs */
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::OutputImageListType OutputImageListType;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::OutputImageListType OutputImageListType;
typedef typename Superclass::OutputImageListPointerType OutputImageListPointerType;
- typedef typename Superclass::OutputImagePointerType OutputImagePointer;
+ typedef typename Superclass::OutputImagePointerType OutputImagePointer;
/** InputImage dimension constant */
- itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/** Overiding the SetInput() and GetInput() methods */
- virtual void SetInput( const InputImageListType * imageList);
+ virtual void SetInput(const InputImageListType * imageList);
virtual InputImageListType * GetInput(void);
protected:
/** Constructor */
ImageListToImageListFilter();
/** Destructor */
- virtual ~ImageListToImageListFilter() {};
+ virtual ~ImageListToImageListFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageListToImageListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageListToImageListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbImageListToImageListFilter.txx"
#endif
diff --git a/Code/Common/otbImageListToImageListFilter.txx b/Code/Common/otbImageListToImageListFilter.txx
index f042c854be..c714b37865 100644
--- a/Code/Common/otbImageListToImageListFilter.txx
+++ b/Code/Common/otbImageListToImageListFilter.txx
@@ -26,7 +26,7 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage>
-ImageListToImageListFilter<TInputImage,TOutputImage>
+ImageListToImageListFilter<TInputImage, TOutputImage>
::ImageListToImageListFilter()
{
this->SetNumberOfRequiredInputs(1);
@@ -37,37 +37,37 @@ ImageListToImageListFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-ImageListToImageListFilter<TInputImage,TOutputImage>
+ImageListToImageListFilter<TInputImage, TOutputImage>
::SetInput(const InputImageListType *imageList)
{
// A single input image
- this->itk::ProcessObject::SetNthInput(0,const_cast<InputImageListType*>(imageList));
+ this->itk::ProcessObject::SetNthInput(0, const_cast<InputImageListType*>(imageList));
}
/**
* Input image retrieval
* \return The input image.
*/
template <class TInputImage, class TOutputImage>
-typename ImageListToImageListFilter<TInputImage,TOutputImage>::InputImageListType *
-ImageListToImageListFilter<TInputImage,TOutputImage>
+typename ImageListToImageListFilter<TInputImage, TOutputImage>::InputImageListType *
+ImageListToImageListFilter<TInputImage, TOutputImage>
::GetInput(void)
{
// If there is no input
- if (this->GetNumberOfInputs()<1)
- {
+ if (this->GetNumberOfInputs() < 1)
+ {
// exit
return 0;
- }
+ }
// else return the first input
- return static_cast<InputImageListType * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<InputImageListType *>
+ (this->itk::ProcessObject::GetInput(0));
}
/**
* PrintSelf Method
*/
template <class TInputImage, class TOutputImage>
void
-ImageListToImageListFilter<TInputImage,TOutputImage>
+ImageListToImageListFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.h b/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.h
index 77fc503133..49b9ec9dd9 100644
--- a/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.h
+++ b/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.h
@@ -32,15 +32,15 @@ namespace otb
* \todo Document this class
*/
template <class TInputImage, class TOutputImage>
-class ITK_EXPORT ImageOfVectorsToMonoChannelExtractROI:
- public ExtractROIBase< TInputImage , TOutputImage >
+class ITK_EXPORT ImageOfVectorsToMonoChannelExtractROI :
+ public ExtractROIBase<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef ImageOfVectorsToMonoChannelExtractROI Self;
- typedef ExtractROIBase< TInputImage , TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageOfVectorsToMonoChannelExtractROI Self;
+ typedef ExtractROIBase<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -49,29 +49,29 @@ public:
itkTypeMacro(ImageOfVectorsToMonoChannelExtractROI, ExtractROIBase);
/** Image type information. */
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::OutputImageType OutputImageType;
/** Pixel type information */
- typedef typename OutputImageType::ValueType OutputValueType;
+ typedef typename OutputImageType::ValueType OutputValueType;
/** Typedef to describe the output and input image region types. */
typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
/** Typedef to describe the type of pixel. */
typedef typename OutputImageType::PixelType OutputImagePixelType;
- typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
/** Typedef to describe the output and input image index and size types. */
typedef typename OutputImageType::IndexType OutputImageIndexType;
- typedef typename InputImageType::IndexType InputImageIndexType;
- typedef typename OutputImageType::SizeType OutputImageSizeType;
- typedef typename InputImageType::SizeType InputImageSizeType;
+ typedef typename InputImageType::IndexType InputImageIndexType;
+ typedef typename OutputImageType::SizeType OutputImageSizeType;
+ typedef typename InputImageType::SizeType InputImageSizeType;
/** Selectionne le canal a traiter */
- itkSetMacro(Channel,unsigned int);
- itkGetConstMacro(Channel,unsigned int);
+ itkSetMacro(Channel, unsigned int);
+ itkGetConstMacro(Channel, unsigned int);
/** ImageDimension enumeration */
itkStaticConstMacro(InputImageDimension, unsigned int,
@@ -81,7 +81,7 @@ public:
protected:
ImageOfVectorsToMonoChannelExtractROI();
- virtual ~ImageOfVectorsToMonoChannelExtractROI() {};
+ virtual ~ImageOfVectorsToMonoChannelExtractROI() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** ExtractImageFilter can produce an image which is a different
@@ -98,17 +98,16 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
private:
- ImageOfVectorsToMonoChannelExtractROI(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageOfVectorsToMonoChannelExtractROI(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Channel to process [1...] */
- unsigned int m_Channel;
+ unsigned int m_Channel;
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.txx b/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.txx
index 5469388037..6a84b8c771 100644
--- a/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.txx
+++ b/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.txx
@@ -27,7 +27,7 @@ namespace otb
*
*/
template<class TInputImage, class TOutputImage>
-ImageOfVectorsToMonoChannelExtractROI<TInputImage,TOutputImage>
+ImageOfVectorsToMonoChannelExtractROI<TInputImage, TOutputImage>
::ImageOfVectorsToMonoChannelExtractROI() : m_Channel(1)
{
@@ -38,13 +38,12 @@ ImageOfVectorsToMonoChannelExtractROI<TInputImage,TOutputImage>
*/
template<class TInputImage, class TOutputImage>
void
-ImageOfVectorsToMonoChannelExtractROI<TInputImage,TOutputImage>
+ImageOfVectorsToMonoChannelExtractROI<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
/**
* ExtractImageFilter can produce an image which is a different resolution
* than its input image. As such, ExtractImageFilter needs to provide an
@@ -56,34 +55,33 @@ ImageOfVectorsToMonoChannelExtractROI<TInputImage,TOutputImage>
*/
template<class TInputImage, class TOutputImage>
void
-ImageOfVectorsToMonoChannelExtractROI<TInputImage,TOutputImage>
+ImageOfVectorsToMonoChannelExtractROI<TInputImage, TOutputImage>
::GenerateOutputInformation()
{
- typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
+ typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
// Analyse du canal traité
- if ( (m_Channel <= 0) || (m_Channel > InputImagePixelType::Dimension ) )
- {
+ if ((m_Channel <= 0) || (m_Channel > InputImagePixelType::Dimension))
+ {
itkExceptionMacro(<< "otb::ExtractImImageOfVectorsToMonoChannelExtractROIageFilter::GenerateOutputInformation "
- << " Channel must be in the following range: [1;"<< InputImagePixelType::Dimension <<"] "
- << typeid(itk::ImageBase<InputImageDimension>*).name() );
- }
+ << " Channel must be in the following range: [1;" << InputImagePixelType::Dimension << "] "
+ << typeid(itk::ImageBase<InputImageDimension>*).name());
+ }
// Appel à la methode de la classe de base
Superclass::GenerateOutputInformation();
}
-
template<class TInputImage, class TOutputImage>
void
-ImageOfVectorsToMonoChannelExtractROI<TInputImage,TOutputImage>
+ImageOfVectorsToMonoChannelExtractROI<TInputImage, TOutputImage>
::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
int threadId)
{
- itkDebugMacro(<<"Actually executing");
+ itkDebugMacro(<< "Actually executing");
// Get the input and output pointers
- typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
@@ -93,30 +91,29 @@ ImageOfVectorsToMonoChannelExtractROI<TInputImage,TOutputImage>
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
// Define the iterators.
- typedef itk::ImageRegionIterator<OutputImageType> OutputIterator;
+ typedef itk::ImageRegionIterator<OutputImageType> OutputIterator;
typedef itk::ImageRegionConstIterator<InputImageType> InputIterator;
OutputIterator outIt(outputPtr, outputRegionForThread);
InputIterator inIt(inputPtr, inputRegionForThread);
// Parcours des canaux a traiter
- unsigned int channelIn(m_Channel-1);
+ unsigned int channelIn(m_Channel - 1);
- InputImagePixelType pixelInput;
- while ( !outIt.IsAtEnd() )
- {
+ InputImagePixelType pixelInput;
+ while (!outIt.IsAtEnd())
+ {
OutputImagePixelType pixelOutput;
pixelInput = inIt.Get();
pixelOutput = static_cast<OutputValueType>(pixelInput[channelIn]);
- outIt.Set( pixelOutput );
+ outIt.Set(pixelOutput);
++outIt;
++inIt;
progress.CompletedPixel();
- }
+ }
}
-
} // end namespace otb
#endif
diff --git a/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.h b/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.h
index 81155b046f..d229c436a9 100644
--- a/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.h
+++ b/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.h
@@ -61,29 +61,29 @@ namespace otb
*/
template <unsigned int VImageDimension>
-class ITK_EXPORT ImageRegionNonUniformMultidimensionalSplitter: public itk::ImageRegionSplitter<VImageDimension>
+class ITK_EXPORT ImageRegionNonUniformMultidimensionalSplitter : public itk::ImageRegionSplitter<VImageDimension>
{
public:
/** Standard class typedefs. */
- typedef ImageRegionNonUniformMultidimensionalSplitter Self;
- typedef itk::ImageRegionSplitter<VImageDimension> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageRegionNonUniformMultidimensionalSplitter Self;
+ typedef itk::ImageRegionSplitter<VImageDimension> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(ImageRegionNonUniformMultidimensionalSplitter,ImageRegionSplitter);
+ itkTypeMacro(ImageRegionNonUniformMultidimensionalSplitter, ImageRegionSplitter);
/** Dimension of the image available at compile time. */
itkStaticConstMacro(ImageDimension, unsigned int, VImageDimension);
/** Index typedef support. An index is used to access pixel values. */
- typedef itk::Index<VImageDimension> IndexType;
+ typedef itk::Index<VImageDimension> IndexType;
/** Size typedef support. A size is used to define region bounds. */
- typedef itk::Size<VImageDimension> SizeType;
+ typedef itk::Size<VImageDimension> SizeType;
/** Region typedef support. */
typedef itk::ImageRegion<VImageDimension> RegionType;
@@ -94,14 +94,14 @@ public:
* a certain dimensions, then some splits will not be possible. This
* method returns a number less than or equal to the requested number
* of pieces. */
- virtual unsigned int GetNumberOfSplits(const RegionType ®ion,
+ virtual unsigned int GetNumberOfSplits(const RegionType& region,
unsigned int requestedNumber);
/** Get a region definition that represents the ith piece a specified region.
* The "numberOfPieces" specified should be less than or equal to what
* GetNumberOfSplits() returns. */
virtual RegionType GetSplit(unsigned int i, unsigned int numberOfPieces,
- const RegionType ®ion);
+ const RegionType& region);
protected:
ImageRegionNonUniformMultidimensionalSplitter() {}
@@ -109,19 +109,18 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageRegionNonUniformMultidimensionalSplitter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageRegionNonUniformMultidimensionalSplitter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
// Define instantiation macro for this template.
#define ITK_TEMPLATE_ImageRegionNonUniformMultidimensionalSplitter(_, EXPORT, x, y) namespace otb { \
- _(1(class EXPORT ImageRegionNonUniformMultidimensionalSplitter< ITK_TEMPLATE_1 x >)) \
- namespace Templates { typedef ImageRegionNonUniformMultidimensionalSplitter< ITK_TEMPLATE_1 x > \
- ImageRegionNonUniformMultidimensionalSplitter##y; } \
+ _(1 (class EXPORT ImageRegionNonUniformMultidimensionalSplitter<ITK_TEMPLATE_1 x>)) \
+ namespace Templates { typedef ImageRegionNonUniformMultidimensionalSplitter<ITK_TEMPLATE_1 x> \
+ ImageRegionNonUniformMultidimensionalSplitter ## y; } \
}
#if ITK_TEMPLATE_EXPLICIT
@@ -133,4 +132,3 @@ private:
#endif
#endif
-
diff --git a/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.txx b/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.txx
index 4abf0b8a1d..13c5513f04 100644
--- a/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.txx
+++ b/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.txx
@@ -32,32 +32,32 @@ namespace otb
template <unsigned int VImageDimension>
unsigned int
ImageRegionNonUniformMultidimensionalSplitter<VImageDimension>
-::GetNumberOfSplits(const RegionType ®ion, unsigned int requestedNumber)
+::GetNumberOfSplits(const RegionType& region, unsigned int requestedNumber)
{
- const SizeType ®ionSize = region.GetSize();
+ const SizeType& regionSize = region.GetSize();
// requested number of splits per dimension
double splitsPerDimension[VImageDimension];
// ::ceil( vcl_pow((double) requestedNumber, 1.0/(double) VImageDimension));
- unsigned int numberOfPiecesLeft=requestedNumber;
+ unsigned int numberOfPiecesLeft = requestedNumber;
unsigned int j, numPieces;
numPieces = 1;
- for (j=VImageDimension;j>0;--j)
- {
- if (regionSize[j-1]<numberOfPiecesLeft)
+ for (j = VImageDimension; j > 0; --j)
{
- splitsPerDimension[j-1]=regionSize[j-1];
- }
+ if (regionSize[j - 1] < numberOfPiecesLeft)
+ {
+ splitsPerDimension[j - 1] = regionSize[j - 1];
+ }
else
- {
- splitsPerDimension[j-1]=numberOfPiecesLeft;
- }
+ {
+ splitsPerDimension[j - 1] = numberOfPiecesLeft;
+ }
numberOfPiecesLeft = (unsigned int)
- ::ceil(numberOfPiecesLeft/splitsPerDimension[j-1]);
- numPieces *= (unsigned int) splitsPerDimension[j-1];
- }
+ ::ceil(numberOfPiecesLeft / splitsPerDimension[j - 1]);
+ numPieces *= (unsigned int) splitsPerDimension[j - 1];
+ }
// if a given dimension has fewer pixels that splitsPerDimension, then
// only split number of pixels times
@@ -78,7 +78,6 @@ ImageRegionNonUniformMultidimensionalSplitter<VImageDimension>
return numPieces;
}
-
/**
*
*/
@@ -86,11 +85,11 @@ template <unsigned int VImageDimension>
itk::ImageRegion<VImageDimension>
ImageRegionNonUniformMultidimensionalSplitter<VImageDimension>
::GetSplit(unsigned int i, unsigned int numberOfPieces,
- const RegionType ®ion)
+ const RegionType& region)
{
RegionType splitRegion;
- IndexType splitIndex;
- SizeType splitSize, regionSize;
+ IndexType splitIndex;
+ SizeType splitSize, regionSize;
// Initialize the splitRegion to the requested region
splitRegion = region;
@@ -103,22 +102,22 @@ ImageRegionNonUniformMultidimensionalSplitter<VImageDimension>
double splitsPerDimension[VImageDimension];
// ::ceil( vcl_pow((double) numberOfPieces, 1.0/(double) VImageDimension));
- unsigned int numberOfPiecesLeft=numberOfPieces;
+ unsigned int numberOfPiecesLeft = numberOfPieces;
unsigned int j;
- for (j=VImageDimension;j>0;--j)
- {
- if (regionSize[j-1]<numberOfPiecesLeft)
+ for (j = VImageDimension; j > 0; --j)
{
- splitsPerDimension[j-1]=regionSize[j-1];
- }
+ if (regionSize[j - 1] < numberOfPiecesLeft)
+ {
+ splitsPerDimension[j - 1] = regionSize[j - 1];
+ }
else
- {
- splitsPerDimension[j-1]=numberOfPiecesLeft;
- }
+ {
+ splitsPerDimension[j - 1] = numberOfPiecesLeft;
+ }
numberOfPiecesLeft = (unsigned int)
- ::ceil(numberOfPiecesLeft/splitsPerDimension[j-1]);
- }
+ ::ceil(numberOfPiecesLeft / splitsPerDimension[j - 1]);
+ }
// if a given dimension has fewer pixels that splitsPerDimension, then
// only split number of pixels times
@@ -127,58 +126,57 @@ ImageRegionNonUniformMultidimensionalSplitter<VImageDimension>
unsigned int ijk[VImageDimension];
unsigned int offsetTable[VImageDimension];
numPieces = 1;
- for (j=0; j < VImageDimension; ++j)
- {
+ for (j = 0; j < VImageDimension; ++j)
+ {
offsetTable[j] = numPieces;
if (regionSize[j] < splitsPerDimension[j])
- {
+ {
splits[j] = regionSize[j];
pixelsPerSplit[j] = 1;
numPieces *= regionSize[j];
- }
+ }
else
- {
+ {
splits[j] = (unsigned int) splitsPerDimension[j];
pixelsPerSplit[j] = (unsigned int) ::ceil(regionSize[j]
- / (double) splits[j]);
+ / (double) splits[j]);
numPieces *= (unsigned int) splitsPerDimension[j];
+ }
}
- }
// determine which split we are in
unsigned int offset = i;
- for (j=VImageDimension-1; j > 0; j--)
- {
+ for (j = VImageDimension - 1; j > 0; j--)
+ {
ijk[j] = offset / offsetTable[j];
offset -= (ijk[j] * offsetTable[j]);
- }
+ }
ijk[0] = offset;
// compute the split
- for (j=0; j < VImageDimension; ++j)
- {
- splitIndex[j] += ijk[j]*pixelsPerSplit[j];
- if (ijk[j] < splits[j] - 1)
+ for (j = 0; j < VImageDimension; ++j)
{
+ splitIndex[j] += ijk[j] * pixelsPerSplit[j];
+ if (ijk[j] < splits[j] - 1)
+ {
splitSize[j] = pixelsPerSplit[j];
- }
+ }
else
- {
+ {
// this dimension is falling off the edge of the image
- splitSize[j] = splitSize[j] - ijk[j]*pixelsPerSplit[j];
+ splitSize[j] = splitSize[j] - ijk[j] * pixelsPerSplit[j];
+ }
}
- }
// set the split region ivars
- splitRegion.SetIndex( splitIndex );
- splitRegion.SetSize( splitSize );
+ splitRegion.SetIndex(splitIndex);
+ splitRegion.SetSize(splitSize);
- itkDebugMacro(" Split Piece: " << std::endl << splitRegion );
+ itkDebugMacro(" Split Piece: " << std::endl << splitRegion);
return splitRegion;
}
-
/**
*
*/
@@ -187,10 +185,9 @@ void
ImageRegionNonUniformMultidimensionalSplitter<VImageDimension>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
} // end namespace otb
#endif
diff --git a/Code/Common/otbImageRegionTileMapSplitter.h b/Code/Common/otbImageRegionTileMapSplitter.h
index 70870c060c..ae942999f5 100644
--- a/Code/Common/otbImageRegionTileMapSplitter.h
+++ b/Code/Common/otbImageRegionTileMapSplitter.h
@@ -69,7 +69,7 @@ namespace otb
*/
template <unsigned int VImageDimension>
-class ITK_EXPORT ImageRegionTileMapSplitter: public itk::ImageRegionSplitter<VImageDimension>
+class ITK_EXPORT ImageRegionTileMapSplitter : public itk::ImageRegionSplitter<VImageDimension>
{
public:
/** Standard class typedefs. */
@@ -82,7 +82,7 @@ public:
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(ImageRegionTileMapSplitter,itk::Object);
+ itkTypeMacro(ImageRegionTileMapSplitter, itk::Object);
/** Dimension of the image available at compile time. */
itkStaticConstMacro(ImageDimension, unsigned int, VImageDimension);
@@ -110,29 +110,28 @@ public:
* a certain dimensions, then some splits will not be possible. This
* method returns a number less than or equal to the requested number
* of pieces. */
- virtual unsigned int GetNumberOfSplits(const RegionType ®ion,
+ virtual unsigned int GetNumberOfSplits(const RegionType& region,
unsigned int requestedNumber);
/** Get a region definition that represents the ith piece a specified region.
* The "numberOfPieces" specified should be less than or equal to what
* GetNumberOfSplits() returns. */
virtual RegionType GetSplit(unsigned int i, unsigned int numberOfPieces,
- const RegionType ®ion);
+ const RegionType& region);
protected:
- ImageRegionTileMapSplitter(): m_AlignStep(256){}
+ ImageRegionTileMapSplitter() : m_AlignStep(256){}
virtual ~ImageRegionTileMapSplitter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageRegionTileMapSplitter(const ImageRegionTileMapSplitter&); //purposely not implemented
- void operator=(const ImageRegionTileMapSplitter&); //purposely not implemented
+ ImageRegionTileMapSplitter(const ImageRegionTileMapSplitter &); //purposely not implemented
+ void operator =(const ImageRegionTileMapSplitter&); //purposely not implemented
unsigned int m_SplitsPerDimension[VImageDimension];
unsigned int m_AlignStep;
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Common/otbImageRegionTileMapSplitter.txx b/Code/Common/otbImageRegionTileMapSplitter.txx
index 58917b3546..67edfdcbc1 100644
--- a/Code/Common/otbImageRegionTileMapSplitter.txx
+++ b/Code/Common/otbImageRegionTileMapSplitter.txx
@@ -31,10 +31,10 @@ namespace otb
template <unsigned int VImageDimension>
unsigned int
ImageRegionTileMapSplitter<VImageDimension>
-::GetNumberOfSplits(const RegionType ®ion, unsigned int requestedNumber)
+::GetNumberOfSplits(const RegionType& region, unsigned int requestedNumber)
{
- const SizeType ®ionSize = region.GetSize();
- const IndexType ®ionIndex = region.GetIndex();
+ const SizeType& regionSize = region.GetSize();
+ const IndexType& regionIndex = region.GetIndex();
// requested number of splits per dimension
unsigned int numPieces = 1;
@@ -44,13 +44,13 @@ ImageRegionTileMapSplitter<VImageDimension>
{
// otbMsgDevMacro(<< "*** Dimension: " << j-1);
unsigned long int remainingToDo = vcl_ceil((double) requestedNumber / numPieces);
- unsigned int maxPieces = (regionIndex[j - 1] + regionSize[j - 1] - 1) / m_AlignStep - regionIndex[j - 1]
- / m_AlignStep + 1;
+ unsigned int maxPieces = (regionIndex[j - 1] + regionSize[j - 1] - 1) / m_AlignStep - regionIndex[j - 1]
+ / m_AlignStep + 1;
unsigned int stepPerPiece = 1;
if (remainingToDo < maxPieces)
{
stepPerPiece = static_cast<unsigned int> (vcl_floor(static_cast<double> (maxPieces) / remainingToDo));
- if ((remainingToDo-1)*(stepPerPiece+1) < maxPieces )
+ if ((remainingToDo - 1) * (stepPerPiece + 1) < maxPieces)
{
stepPerPiece += 1;
}
@@ -65,18 +65,17 @@ ImageRegionTileMapSplitter<VImageDimension>
return numPieces;
}
-
/**
*
*/
template <unsigned int VImageDimension>
itk::ImageRegion<VImageDimension>
ImageRegionTileMapSplitter<VImageDimension>
-::GetSplit(unsigned int i, unsigned int numberOfPieces, const RegionType ®ion)
+::GetSplit(unsigned int i, unsigned int numberOfPieces, const RegionType& region)
{
RegionType splitRegion;
- IndexType splitIndex, regionIndex;
- SizeType splitSize, regionSize;
+ IndexType splitIndex, regionIndex;
+ SizeType splitSize, regionSize;
// Initialize the splitRegion to the requested region
splitRegion = region;
@@ -99,8 +98,10 @@ ImageRegionTileMapSplitter<VImageDimension>
unsigned int slicePos = (i % (stackSize * m_SplitsPerDimension[j])) / stackSize;
stackSize *= m_SplitsPerDimension[j];
- unsigned int generalSplitSize = static_cast<unsigned int> (vcl_ceil(static_cast<double> (regionSize[j]) / (m_SplitsPerDimension[j]
- * m_AlignStep))) * m_AlignStep;
+ unsigned int generalSplitSize =
+ static_cast<unsigned int> (vcl_ceil(static_cast<double> (regionSize[j]) / (m_SplitsPerDimension[j]
+ *
+ m_AlignStep))) * m_AlignStep;
if (slicePos == 0)
{
splitIndex[j] = regionIndex[j];
@@ -116,7 +117,7 @@ ImageRegionTileMapSplitter<VImageDimension>
else if (slicePos == m_SplitsPerDimension[j] - 1)
{
splitSize[j] = regionSize[j] - (generalSplitSize - (regionIndex[j] % generalSplitSize))
- - (m_SplitsPerDimension[j] - 2) * generalSplitSize;
+ - (m_SplitsPerDimension[j] - 2) * generalSplitSize;
}
else
{
@@ -131,7 +132,6 @@ ImageRegionTileMapSplitter<VImageDimension>
return splitRegion;
}
-
/**
*
*/
@@ -140,10 +140,9 @@ void
ImageRegionTileMapSplitter<VImageDimension>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
} // end namespace itk
#endif
diff --git a/Code/Common/otbImageToImageListFilter.h b/Code/Common/otbImageToImageListFilter.h
index 0f924a3216..4e0bb89348 100644
--- a/Code/Common/otbImageToImageListFilter.h
+++ b/Code/Common/otbImageToImageListFilter.h
@@ -32,48 +32,48 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT ImageToImageListFilter
- : public ImageListSource<TOutputImage>
+ : public ImageListSource<TOutputImage>
{
public:
/** Standard typedefs */
- typedef ImageToImageListFilter Self;
- typedef ImageListSource<TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageToImageListFilter Self;
+ typedef ImageListSource<TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
itkTypeMacro(ImageToImageListFilter, ImageListSource);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::ConstPointer InputImagePointer;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::ValueType ValueType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::ConstPointer InputImagePointer;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::ValueType ValueType;
/** Derived typedefs */
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::OutputImageListType OutputImageListType;
- typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::OutputImageListType OutputImageListType;
+ typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
/** InputImage dimension constant */
- itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/** Overiding the SetInput() and GetInput() methods */
- virtual void SetInput( const InputImageType * image);
+ virtual void SetInput(const InputImageType * image);
InputImageType * GetInput(void);
protected:
/** Constructor */
ImageToImageListFilter();
/** Destructor */
- virtual ~ImageToImageListFilter() {};
+ virtual ~ImageToImageListFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageToImageListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageToImageListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbImageToImageListFilter.txx"
#endif
diff --git a/Code/Common/otbImageToImageListFilter.txx b/Code/Common/otbImageToImageListFilter.txx
index 4596cbfc24..2edba9c5f6 100644
--- a/Code/Common/otbImageToImageListFilter.txx
+++ b/Code/Common/otbImageToImageListFilter.txx
@@ -26,7 +26,7 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage>
-ImageToImageListFilter<TInputImage,TOutputImage>
+ImageToImageListFilter<TInputImage, TOutputImage>
::ImageToImageListFilter()
{
this->SetNumberOfRequiredInputs(1);
@@ -37,37 +37,37 @@ ImageToImageListFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-ImageToImageListFilter<TInputImage,TOutputImage>
+ImageToImageListFilter<TInputImage, TOutputImage>
::SetInput(const InputImageType *image)
{
// A single input image
- this->itk::ProcessObject::SetNthInput(0,const_cast<InputImageType*>(image));
+ this->itk::ProcessObject::SetNthInput(0, const_cast<InputImageType*>(image));
}
/**
* Input image retrieval
* \return The input image.
*/
template <class TInputImage, class TOutputImage>
-typename ImageToImageListFilter<TInputImage,TOutputImage>::InputImageType *
-ImageToImageListFilter<TInputImage,TOutputImage>
+typename ImageToImageListFilter<TInputImage, TOutputImage>::InputImageType *
+ImageToImageListFilter<TInputImage, TOutputImage>
::GetInput(void)
{
// If there is no input
- if (this->GetNumberOfInputs()<1)
- {
+ if (this->GetNumberOfInputs() < 1)
+ {
// exit
return 0;
- }
+ }
// else return the first input
- return static_cast<TInputImage * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<TInputImage *>
+ (this->itk::ProcessObject::GetInput(0));
}
/**
* PrintSelf Method
*/
template <class TInputImage, class TOutputImage>
void
-ImageToImageListFilter<TInputImage,TOutputImage>
+ImageToImageListFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/Common/otbImageToLineSpatialObjectListFilter.h b/Code/Common/otbImageToLineSpatialObjectListFilter.h
index b7f041c9c4..94c07b78b1 100644
--- a/Code/Common/otbImageToLineSpatialObjectListFilter.h
+++ b/Code/Common/otbImageToLineSpatialObjectListFilter.h
@@ -36,41 +36,37 @@ namespace otb
*
*/
-
template <class TInputImage>
class ITK_EXPORT ImageToLineSpatialObjectListFilter : public itk::ProcessObject
{
public:
/** Extract dimensions as well of the images of entry of exit. */
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
-
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
typedef TInputImage InputImageType;
-
/** Standard class typedefs. */
- typedef ImageToLineSpatialObjectListFilter Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageToLineSpatialObjectListFilter Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(ImageToLineSpatialObjectListFilter,itk::ProcessObject);
+ itkTypeMacro(ImageToLineSpatialObjectListFilter, itk::ProcessObject);
/** Some convenient typedefs. */
- typedef LineSpatialObjectList LinesListType;
- typedef typename LinesListType::LineType LineType;
+ typedef LineSpatialObjectList LinesListType;
+ typedef typename LinesListType::LineType LineType;
/** Definition of the input and output images */
typedef typename InputImageType::PixelType InputPixelType;
-
/** Definition of the size of the images. */
typedef typename InputImageType::SizeType SizeType;
@@ -84,21 +80,17 @@ public:
void SetOutput(const LinesListType *list);
LinesListType * GetOutput(void);
-
protected:
ImageToLineSpatialObjectListFilter();
virtual ~ImageToLineSpatialObjectListFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
private:
- ImageToLineSpatialObjectListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ ImageToLineSpatialObjectListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Common/otbImageToLineSpatialObjectListFilter.txx b/Code/Common/otbImageToLineSpatialObjectListFilter.txx
index 941b05c33e..ab31f05868 100644
--- a/Code/Common/otbImageToLineSpatialObjectListFilter.txx
+++ b/Code/Common/otbImageToLineSpatialObjectListFilter.txx
@@ -33,7 +33,7 @@ ImageToLineSpatialObjectListFilter<TInputImage>::ImageToLineSpatialObjectListFil
this->SetNumberOfRequiredOutputs(1);
typename LinesListType::Pointer list = LinesListType::New();
- this->SetOutput( list );
+ this->SetOutput(list);
}
@@ -43,40 +43,36 @@ ImageToLineSpatialObjectListFilter<TInputImage>
::SetInput(const InputImageType *image)
{
this->itk::ProcessObject::SetNthInput(0,
- const_cast< InputImageType * >( image ) );
+ const_cast<InputImageType *>(image));
}
-
template <class TInputImage>
const typename ImageToLineSpatialObjectListFilter<TInputImage>::InputImageType *
ImageToLineSpatialObjectListFilter<TInputImage>
::GetInput(void)
{
return static_cast<const InputImageType *>
- (this->itk::ProcessObject::GetInput(0) );
+ (this->itk::ProcessObject::GetInput(0));
}
-
template <class TInputImage>
void
ImageToLineSpatialObjectListFilter<TInputImage>
::SetOutput(const LinesListType *list)
{
this->ProcessObjectType::SetNthOutput(0,
- const_cast< LinesListType * >( list ) );
+ const_cast<LinesListType *>(list));
}
-
template <class TInputImage>
typename ImageToLineSpatialObjectListFilter<TInputImage>::LinesListType *
ImageToLineSpatialObjectListFilter<TInputImage>
::GetOutput(void)
{
return static_cast<LinesListType *>
- (this->ProcessObjectType::GetOutput(0) );
+ (this->ProcessObjectType::GetOutput(0));
}
-
/**
*
*/
@@ -85,7 +81,7 @@ void
ImageToLineSpatialObjectListFilter<TInputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/Common/otbImageToPathFilter.h b/Code/Common/otbImageToPathFilter.h
index fdb9911bdf..c4ea22ac9f 100644
--- a/Code/Common/otbImageToPathFilter.h
+++ b/Code/Common/otbImageToPathFilter.h
@@ -29,7 +29,7 @@ namespace otb
*/
template <class TInputImage, class TOutputPath>
class ITK_EXPORT ImageToPathFilter
- : public itk::PathSource<TOutputPath>
+ : public itk::PathSource<TOutputPath>
{
public:
/// Standard class typedefs
@@ -41,7 +41,7 @@ public:
/// Method for creation through the object factory
itkNewMacro(Self);
/// Runtime information
- itkTypeMacro(PathToImageFilter,PathSource);
+ itkTypeMacro(PathToImageFilter, PathSource);
/// template parameters typedefs
typedef TInputImage InputImageType;
typedef typename InputImageType::Pointer InputImagePointerType;
@@ -55,14 +55,14 @@ public:
protected:
ImageToPathFilter();
- virtual ~ImageToPathFilter() {};
+ virtual ~ImageToPathFilter() {}
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageToPathFilter(const Self&);
- void operator=(const Self&);
+ ImageToPathFilter(const Self &);
+ void operator =(const Self&);
};
-}// end namespace otb
+} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbImageToPathFilter.txx"
diff --git a/Code/Common/otbImageToPathFilter.txx b/Code/Common/otbImageToPathFilter.txx
index 979110ed3f..45c6af20e5 100644
--- a/Code/Common/otbImageToPathFilter.txx
+++ b/Code/Common/otbImageToPathFilter.txx
@@ -39,7 +39,7 @@ void
ImageToPathFilter<TInputImage, TOutputPath>
::SetInput(const InputImageType * image)
{
- this->ProcessObjectType::SetNthInput(0,const_cast<InputImageType *>(image));
+ this->ProcessObjectType::SetNthInput(0, const_cast<InputImageType *>(image));
}
/**
* Input image getter.
@@ -56,11 +56,11 @@ ImageToPathFilter<TInputImage, TOutputPath>
*/
template <class TInputImage, class TOutputPath>
void
-ImageToPathFilter<TInputImage,TOutputPath>
+ImageToPathFilter<TInputImage, TOutputPath>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
}
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/Common/otbImageToPathListFilter.h b/Code/Common/otbImageToPathListFilter.h
index 7bdbc7c28b..382a241c03 100644
--- a/Code/Common/otbImageToPathListFilter.h
+++ b/Code/Common/otbImageToPathListFilter.h
@@ -35,10 +35,10 @@ class ITK_EXPORT ImageToPathListFilter : public PathListSource<TOutputPath>
{
public:
/** Standard class typedefs. */
- typedef ImageToPathListFilter Self;
- typedef PathListSource<TOutputPath> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageToPathListFilter Self;
+ typedef PathListSource<TOutputPath> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
typedef itk::ProcessObject ProcessObjectType;
@@ -49,34 +49,34 @@ public:
itkTypeMacro(ImageToPathListFilter, PathListSource);
/** Some convenient typedefs. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::ConstPointer InputImagePointer;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::ValueType ValueType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::ConstPointer InputImagePointer;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::ValueType ValueType;
- typedef typename Superclass::OutputPathType OutputPathType;
- typedef typename Superclass::OutputPathListType OutputPathListType;
- typedef typename Superclass::OutputPathPointerType OutputPathPointerType;
+ typedef typename Superclass::OutputPathType OutputPathType;
+ typedef typename Superclass::OutputPathListType OutputPathListType;
+ typedef typename Superclass::OutputPathPointerType OutputPathPointerType;
/** ImageDimension constants */
itkStaticConstMacro(InputImageDimension, unsigned int,
TInputImage::ImageDimension);
/** Set/Get the image input of this process object. */
- virtual void SetInput( const InputImageType * image);
+ virtual void SetInput(const InputImageType * image);
const InputImageType * GetInput(void);
protected:
ImageToPathListFilter();
- virtual ~ImageToPathListFilter() {};
+ virtual ~ImageToPathListFilter() {}
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageToPathListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageToPathListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
diff --git a/Code/Common/otbImageToPathListFilter.txx b/Code/Common/otbImageToPathListFilter.txx
index 09366ba917..1f6296792c 100644
--- a/Code/Common/otbImageToPathListFilter.txx
+++ b/Code/Common/otbImageToPathListFilter.txx
@@ -29,7 +29,7 @@ namespace otb
*
*/
template <class TInputImage, class TOutputPath>
-ImageToPathListFilter<TInputImage,TOutputPath>
+ImageToPathListFilter<TInputImage, TOutputPath>
::ImageToPathListFilter()
{
// Modify superclass default values, can be overridden by subclasses
@@ -41,29 +41,28 @@ ImageToPathListFilter<TInputImage,TOutputPath>
*/
template <class TInputImage, class TOutputPath>
void
-ImageToPathListFilter<TInputImage,TOutputPath>
+ImageToPathListFilter<TInputImage, TOutputPath>
::SetInput(const InputImageType *image)
{
// We have 1 input: an image
// Process object is not const-correct so the const_cast is required here
- this->ProcessObjectType::SetNthInput(0,const_cast< InputImageType * >( image ) );
+ this->ProcessObjectType::SetNthInput(0, const_cast<InputImageType *>(image));
}
template <class TInputImage, class TOutputPath>
-const typename ImageToPathListFilter<TInputImage,TOutputPath>::InputImageType *
-ImageToPathListFilter<TInputImage,TOutputPath>
+const typename ImageToPathListFilter<TInputImage, TOutputPath>::InputImageType *
+ImageToPathListFilter<TInputImage, TOutputPath>
::GetInput(void)
{
-
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TInputImage * >
- (this->ProcessObjectType::GetInput(0) );
+ return static_cast<const TInputImage *>
+ (this->ProcessObjectType::GetInput(0));
}
/**
@@ -71,13 +70,12 @@ ImageToPathListFilter<TInputImage,TOutputPath>
*/
template <class TInputImage, class TOutputPath>
void
-ImageToPathListFilter<TInputImage,TOutputPath>
+ImageToPathListFilter<TInputImage, TOutputPath>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
}
-
} // end namespace otb
#endif
diff --git a/Code/Common/otbImageToVectorImageCastFilter.h b/Code/Common/otbImageToVectorImageCastFilter.h
index 45d7a4417f..6a1bb4620b 100644
--- a/Code/Common/otbImageToVectorImageCastFilter.h
+++ b/Code/Common/otbImageToVectorImageCastFilter.h
@@ -37,18 +37,18 @@ class VectorCast
{
public:
typedef typename TOutput::ValueType OutputValueType;
- VectorCast() {};
- virtual ~VectorCast() {};
+ VectorCast() {}
+ virtual ~VectorCast() {}
- bool operator!=(const VectorCast&) const
+ bool operator !=(const VectorCast&) const
{
return false;
}
- bool operator==(const VectorCast& other) const
+ bool operator ==(const VectorCast& other) const
{
- return(*this != other);
+ return (*this != other);
}
- inline TOutput operator () (const TInput & A)
+ inline TOutput operator ()(const TInput& A)
{
TOutput output;
output.SetSize(1);
@@ -65,22 +65,25 @@ public:
*/
template <class TInputImage, class TOutputVectorImage>
class ITK_EXPORT ImageToVectorImageCastFilter
- : public itk::UnaryFunctorImageFilter<TInputImage, TOutputVectorImage,
- Functor::VectorCast<typename TInputImage::PixelType, typename TOutputVectorImage::PixelType> >
+ : public itk::UnaryFunctorImageFilter<TInputImage, TOutputVectorImage,
+ Functor::VectorCast<typename TInputImage::PixelType,
+ typename TOutputVectorImage::PixelType> >
{
public:
/// Standard class typedefs
typedef ImageToVectorImageCastFilter Self;
- typedef itk::UnaryFunctorImageFilter<TInputImage, TOutputVectorImage, Functor::VectorCast<typename TInputImage::PixelType,
- typename TOutputVectorImage::PixelType> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::UnaryFunctorImageFilter<TInputImage, TOutputVectorImage,
+ Functor::VectorCast<typename TInputImage::PixelType,
+ typename TOutputVectorImage
+ ::PixelType> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/// Method for creation through the object factory
itkNewMacro(Self);
/// Runtime information
- itkTypeMacro(ImageToVectorImageCastFilter,itk::UnaryFunctorImageFilter);
+ itkTypeMacro(ImageToVectorImageCastFilter, itk::UnaryFunctorImageFilter);
protected:
/// Constructor
@@ -97,17 +100,17 @@ protected:
virtual void GenerateInputRequestedRegion(void)
{
if (this->GetInput())
- {
+ {
typename TInputImage::Pointer input = const_cast<TInputImage *>(this->GetInput());
typename TInputImage::RegionType inputRegion;
- this->CallCopyOutputRegionToInputRegion(inputRegion,this->GetOutput()->GetRequestedRegion());
+ this->CallCopyOutputRegionToInputRegion(inputRegion, this->GetOutput()->GetRequestedRegion());
input->SetRequestedRegion(inputRegion);
- }
+ }
}
private:
- ImageToVectorImageCastFilter(const Self&); //purposely not implemented
- void operator = (const Self&); // purposely not implemented
+ ImageToVectorImageCastFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); // purposely not implemented
};
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/Common/otbLabelMapFeaturesFunctorImageFilter.h b/Code/Common/otbLabelMapFeaturesFunctorImageFilter.h
index 15f2fa1d68..5d5bd375e0 100644
--- a/Code/Common/otbLabelMapFeaturesFunctorImageFilter.h
+++ b/Code/Common/otbLabelMapFeaturesFunctorImageFilter.h
@@ -45,30 +45,30 @@ namespace otb {
*/
template<class TImage, class TFunctor>
class ITK_EXPORT LabelMapFeaturesFunctorImageFilter :
- public itk::InPlaceLabelMapFilter<TImage>
+ public itk::InPlaceLabelMapFilter<TImage>
{
public:
/** Standard class typedefs. */
- typedef LabelMapFeaturesFunctorImageFilter Self;
- typedef itk::InPlaceLabelMapFilter<TImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LabelMapFeaturesFunctorImageFilter Self;
+ typedef itk::InPlaceLabelMapFilter<TImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Some convenient typedefs. */
- typedef TImage ImageType;
- typedef typename ImageType::LabelObjectType LabelObjectType;
- typedef TFunctor FunctorType;
+ typedef TImage ImageType;
+ typedef typename ImageType::LabelObjectType LabelObjectType;
+ typedef TFunctor FunctorType;
/** ImageDimension constants */
- itkStaticConstMacro(ImageDimension, unsigned int,TImage::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, TImage::ImageDimension);
/** Runtime information support. */
- itkTypeMacro(LabelMapFeaturesFunctorImageFilter,InPlaceLabelMapFilter);
+ itkTypeMacro(LabelMapFeaturesFunctorImageFilter, InPlaceLabelMapFilter);
/** Set the functor */
void SetFunctor(FunctorType& functor)
{
- if(m_Functor != functor)
+ if (m_Functor != functor)
{
m_Functor = functor;
this->Modified();
@@ -76,17 +76,17 @@ public:
}
/** Get the functor (const version) */
- const FunctorType & GetFunctor() const
+ const FunctorType& GetFunctor() const
{
return m_Functor;
}
/** Get a reference to the functor (non const version) */
- FunctorType & GetFunctor()
+ FunctorType& GetFunctor()
{
return m_Functor;
}
-
+
protected:
/** Constructor */
LabelMapFeaturesFunctorImageFilter() : m_Functor() {}
@@ -95,9 +95,9 @@ protected:
~LabelMapFeaturesFunctorImageFilter() {}
/** Threaded generate data */
- virtual void ThreadedProcessLabelObject( LabelObjectType * labelObject )
+ virtual void ThreadedProcessLabelObject(LabelObjectType * labelObject)
{
- // Call the functor
+ // Call the functor
m_Functor(labelObject);
}
@@ -105,12 +105,12 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
// Call superclass implementation
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
- LabelMapFeaturesFunctorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LabelMapFeaturesFunctorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The functor */
FunctorType m_Functor;
@@ -120,5 +120,3 @@ private:
} // end namespace otb
#endif
-
-
diff --git a/Code/Common/otbLabelMapSource.h b/Code/Common/otbLabelMapSource.h
index ffd4a006b1..0946461aa7 100644
--- a/Code/Common/otbLabelMapSource.h
+++ b/Code/Common/otbLabelMapSource.h
@@ -40,13 +40,13 @@ namespace otb
template <class TOutputLabelMap>
class ITK_EXPORT LabelMapSource : public itk::ProcessObject
{
-public :
+public:
/** Standard class typedefs. */
- typedef LabelMapSource Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LabelMapSource Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -54,7 +54,7 @@ public :
/** Run-time type information (and related methods). */
itkTypeMacro(LabelMapSource, itk::ProcessObject);
- typedef TOutputLabelMap OutputLabelMapType;
+ typedef TOutputLabelMap OutputLabelMapType;
typedef typename TOutputLabelMap::Pointer OutputLabelMapPointer;
/** Overriding GetOutput() method */
@@ -71,8 +71,8 @@ protected:
virtual void AllocateOutputs();
private:
- LabelMapSource(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LabelMapSource(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -83,5 +83,3 @@ private:
#endif
#endif // __otbLabelMapSource_h
-
-
diff --git a/Code/Common/otbLabelMapSource.txx b/Code/Common/otbLabelMapSource.txx
index 2ad8201654..da4ce8ec0c 100644
--- a/Code/Common/otbLabelMapSource.txx
+++ b/Code/Common/otbLabelMapSource.txx
@@ -32,7 +32,7 @@ LabelMapSource<TOutputLabelMap>
{
//std::cout <<"labelsource constructor"<<std::endl;
this->Superclass::SetNumberOfRequiredOutputs(1);
- this->Superclass::SetNthOutput(0,OutputLabelMapType::New().GetPointer());
+ this->Superclass::SetNthOutput(0, OutputLabelMapType::New().GetPointer());
}
template <class TOutputLabelMap>
@@ -49,16 +49,15 @@ LabelMapSource<TOutputLabelMap>
OutputLabelMapPointer outputPtr;
// Allocate the output memory
- for (unsigned int i=0; i < this->GetNumberOfOutputs(); ++i)
- {
+ for (unsigned int i = 0; i < this->GetNumberOfOutputs(); ++i)
+ {
outputPtr = this->GetOutput(i);
-
+
//TODO Need to implement the Clear Method in the class itk::LabelMap
//outputPtr->Clear();
- }
+ }
}
-
/**
* Get the output LabelMap
* \return The LabelMap produced.
@@ -68,10 +67,10 @@ typename LabelMapSource<TOutputLabelMap>::OutputLabelMapType *
LabelMapSource<TOutputLabelMap>
::GetOutput(void)
{
- if (this->GetNumberOfOutputs()<1)
- {
+ if (this->GetNumberOfOutputs() < 1)
+ {
return 0;
- }
+ }
//std::cout << "labelsource: get output..." <<std::endl;
return static_cast<OutputLabelMapType *> (this->ProcessObject::GetOutput(0));
}
@@ -82,7 +81,7 @@ LabelMapSource<TOutputLabelMap>
::GetOutput(unsigned int idx)
{
return static_cast<OutputLabelMapType*>
- (this->Superclass::GetOutput(idx));
+ (this->Superclass::GetOutput(idx));
}
/**
@@ -93,9 +92,9 @@ void
LabelMapSource<TOutputLabelMap>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/Common/otbLabelMapToGISTableFilter.h b/Code/Common/otbLabelMapToGISTableFilter.h
index 23a3bac3b4..874d367268 100644
--- a/Code/Common/otbLabelMapToGISTableFilter.h
+++ b/Code/Common/otbLabelMapToGISTableFilter.h
@@ -49,42 +49,42 @@ namespace otb {
* \sa LabelMapToBinaryImageFilter, LabelMapMaskImageFilter
* \ingroup ImageEnhancement MathematicalMorphologyImageFilters
*/
-template<class TLabelMap , class TGISTable>
+template<class TLabelMap, class TGISTable>
class ITK_EXPORT LabelMapToGISTableFilter :
- public GISTableSource< TGISTable >
+ public GISTableSource<TGISTable>
{
public:
/** Standard class typedefs. */
typedef LabelMapToGISTableFilter Self;
- typedef GISTableSource< TGISTable >
+ typedef GISTableSource<TGISTable>
Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Some convenient typedefs. */
- typedef TLabelMap InputLabelMapType;
- typedef TGISTable OutputGISTableType;
- typedef typename InputLabelMapType::Pointer InputLabelMapPointer;
- typedef typename InputLabelMapType::ConstPointer InputLabelMapConstPointer;
- typedef typename OutputGISTableType::Pointer OutputGISTablePointer;
- typedef typename OutputGISTableType::ConstPointer OutputGISTableConstPointer;
+ typedef TLabelMap InputLabelMapType;
+ typedef TGISTable OutputGISTableType;
+ typedef typename InputLabelMapType::Pointer InputLabelMapPointer;
+ typedef typename InputLabelMapType::ConstPointer InputLabelMapConstPointer;
+ typedef typename OutputGISTableType::Pointer OutputGISTablePointer;
+ typedef typename OutputGISTableType::ConstPointer OutputGISTableConstPointer;
//typedef typename InputLabelMapType::DataTreeType::TreeNodeType InternalTreeNodeType;
//typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
//typedef typename InputLabelMapType::DataNodeType DataNodeType;
//typedef typename DataNodeType::Pointer DataNodePointerType;
- typedef typename InputLabelMapType::LabelObjectType LabelObjectType;
+ typedef typename InputLabelMapType::LabelObjectType LabelObjectType;
typedef typename OutputGISTableType::ConnectionType InputGISConnectionType;
- typedef typename InputGISConnectionType::Pointer InputGISConnectionPointerType;
+ typedef typename InputGISConnectionType::Pointer InputGISConnectionPointerType;
- typedef typename OutputGISTableType::PolygonType PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef typename OutputGISTableType::PolygonType PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
- typedef otb::Functor::LabelObjectToPolygonFunctor<LabelObjectType,PolygonType> FunctorType;
- typedef otb::SimplifyPathFunctor<PolygonType,PolygonType> SimplifyFunctorType;
- typedef ClosePathFunctor <PolygonType,PolygonType> CloseFunctorType;
- typedef CorrectPolygonFunctor <PolygonType> CorrectFunctorType;
+ typedef otb::Functor::LabelObjectToPolygonFunctor<LabelObjectType, PolygonType> FunctorType;
+ typedef otb::SimplifyPathFunctor<PolygonType, PolygonType> SimplifyFunctorType;
+ typedef ClosePathFunctor <PolygonType, PolygonType> CloseFunctorType;
+ typedef CorrectPolygonFunctor <PolygonType> CorrectFunctorType;
/** ImageDimension constants */
//itkStaticConstMacro(InputImageDimension, unsigned int,
// TInputImage::ImageDimension);
@@ -113,14 +113,14 @@ public:
//void setConnection
/** Set/Get the LabelMap input of this process object. */
- virtual void SetInput( const InputLabelMapType *input);
- virtual void SetInput( unsigned int idx, const InputLabelMapType *input);
+ virtual void SetInput(const InputLabelMapType *input);
+ virtual void SetInput(unsigned int idx, const InputLabelMapType *input);
const InputLabelMapType * GetInput(void);
const InputLabelMapType * GetInput(unsigned int idx);
protected:
LabelMapToGISTableFilter();
- virtual ~LabelMapToGISTableFilter() {};
+ virtual ~LabelMapToGISTableFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** LabelMapToAttributeImageFilter needs the entire input be
@@ -135,13 +135,11 @@ protected:
* to GrayscaleGeodesicErodeImageFilter. */
void GenerateData();
-
private:
- LabelMapToGISTableFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ LabelMapToGISTableFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- /** Remove table before insertion if true */
+ /** Remove table before insertion if true */
bool m_DropExistingGISTable;
/** Connection parameters to the db */
@@ -157,5 +155,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Common/otbLabelMapToGISTableFilter.txx b/Code/Common/otbLabelMapToGISTableFilter.txx
index 829bcf2217..d25651788c 100644
--- a/Code/Common/otbLabelMapToGISTableFilter.txx
+++ b/Code/Common/otbLabelMapToGISTableFilter.txx
@@ -27,69 +27,67 @@
namespace otb {
-template<class TLabelMap , class TGISTable>
-LabelMapToGISTableFilter< TLabelMap, TGISTable >
- ::LabelMapToGISTableFilter()
+template<class TLabelMap, class TGISTable>
+LabelMapToGISTableFilter<TLabelMap, TGISTable>
+::LabelMapToGISTableFilter()
{
m_InputGISConnection = InputGISConnectionType::New();
m_DropExistingGISTable = false;
//default value of the gis table name
m_GISTableName = "labelmap_to_gis_table";
}
-
-
-template<class TLabelMap , class TGISTable>
+template<class TLabelMap, class TGISTable>
void
-LabelMapToGISTableFilter< TLabelMap, TGISTable >
- ::SetInput(const InputLabelMapType *input)
+LabelMapToGISTableFilter<TLabelMap, TGISTable>
+::SetInput(const InputLabelMapType *input)
{
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(0,
- const_cast< InputLabelMapType * >( input ) );
+ const_cast<InputLabelMapType *>(input));
}
-template<class TLabelMap , class TGISTable>
+template<class TLabelMap, class TGISTable>
void
-LabelMapToGISTableFilter< TLabelMap, TGISTable >
- ::SetInput(unsigned int idx, const InputLabelMapType *input)
+LabelMapToGISTableFilter<TLabelMap, TGISTable>
+::SetInput(unsigned int idx, const InputLabelMapType *input)
{
- // Process object is not const-correct so the const_cast is required here
+ // Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(idx,
- const_cast< InputLabelMapType * >( input ) );
+ const_cast<InputLabelMapType *>(input));
}
-template<class TLabelMap , class TGISTable>
- const typename LabelMapToGISTableFilter< TLabelMap, TGISTable >::InputLabelMapType *
-LabelMapToGISTableFilter< TLabelMap, TGISTable >
- ::GetInput(void)
+template<class TLabelMap, class TGISTable>
+const typename LabelMapToGISTableFilter<TLabelMap, TGISTable>::InputLabelMapType *
+LabelMapToGISTableFilter<TLabelMap, TGISTable>
+::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TLabelMap * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<const TLabelMap *>
+ (this->itk::ProcessObject::GetInput(0));
}
-template<class TLabelMap , class TGISTable>
- const typename LabelMapToGISTableFilter< TLabelMap, TGISTable >::InputLabelMapType *
-LabelMapToGISTableFilter< TLabelMap, TGISTable >
- ::GetInput(unsigned int idx)
+template<class TLabelMap, class TGISTable>
+const typename LabelMapToGISTableFilter<TLabelMap, TGISTable>::InputLabelMapType *
+LabelMapToGISTableFilter<TLabelMap, TGISTable>
+::GetInput(unsigned int idx)
{
- return static_cast<const TLabelMap * >
- (this->itk::ProcessObject::GetInput(idx) );
+ return static_cast<const TLabelMap *>
+ (this->itk::ProcessObject::GetInput(idx));
}
-template<class TLabelMap , class TGISTable>
+template<class TLabelMap, class TGISTable>
void
-LabelMapToGISTableFilter< TLabelMap, TGISTable >
+LabelMapToGISTableFilter<TLabelMap, TGISTable>
::GenerateInputRequestedRegion()
-{/*
+{ /*
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
-
+
// We need all the input.
InputImagePointer input = const_cast<InputImageType *>(this->GetInput());
if ( !input )
@@ -109,76 +107,77 @@ LabelMapToLabelMapFilter<TInputImage, TLabelMap>
}
*/
-template<class TLabelMap , class TGISTable>
+template<class TLabelMap, class TGISTable>
void
-LabelMapToGISTableFilter< TLabelMap, TGISTable >
+LabelMapToGISTableFilter<TLabelMap, TGISTable>
::GenerateData()
{
-
+
// Allocate the output
this->AllocateOutputs();
//std::cout << "before GetOutput" << std::endl;
OutputGISTableType * output = this->GetOutput();
//std::cout << "after GetOutput" << std::endl;
const InputLabelMapType * input = this->GetInput();
-
+
//Set the filter's Postgres connection
output->SetConnection (this->GetInputGISConnection ());
-
+
//Connection to the database
output->GetConnection()->ConnectToDB();
-
+
//Name of the table is settedd automaticcaly to "vector_data_to_gis"
output->SetTableName (this->GetGISTableName());
-
+
//Create the PostgreSQL table
output->CreateTable(m_DropExistingGISTable);
-
+
FunctorType functor;
// SimplifyFunctorType simplifyFunctor;
// simplifyFunctor.SetTolerance (0.0);
//
// CloseFunctorType closeFunctor;
-
+
CorrectFunctorType correctFunctor;
// Lets begin by declaring the iterator for the objects in the image.
typename InputLabelMapType::LabelObjectContainerType::const_iterator it;
// And get the object container to reuse it later
- const typename InputLabelMapType::LabelObjectContainerType & labelObjectContainer = input->GetLabelObjectContainer();
- for( it = labelObjectContainer.begin(); it != labelObjectContainer.end(); it++ )
- {
+ const typename InputLabelMapType::LabelObjectContainerType& labelObjectContainer = input->GetLabelObjectContainer();
+ for (it = labelObjectContainer.begin(); it != labelObjectContainer.end(); it++)
+ {
// the label is there if we need it, but it can also be found at labelObject->GetLabel().
// const PType & label = it->first;
-
+
// the label object
- LabelObjectType * labelObject = it->second;
+ LabelObjectType * labelObject = it->second;
PolygonPointerType polygon = functor(labelObject);
/**Store the label in column 'genre' of the Db*/
std::ostringstream oss;
oss << labelObject->GetLabel();
//std::cout << "label : " << oss.str() << std::endl;
//std::cout << "polygon : " << polygon << std::endl;
-
+
//Simply polygon (erase aligned points)
// PolygonPointerType simplifyPolygon = simplifyFunctor(polygon);
//std::cout << "simplify polygon : " << simplifyPolygon << std::endl;
-
+
//Close polygon if necessary
// PolygonPointerType closePolygon = closeFunctor(simplifyPolygon);
PolygonPointerType correctPolygon = correctFunctor(polygon);
//std::cout << "simplify polygon : " << closePolygon << std::endl;
-
- this->GetOutput()->InsertPolygons( static_cast<typename TGISTable::PolygonConstPointerType> (correctPolygon), static_cast<typename TGISTable::PolygonListConstPointerType> (0), oss.str());
+
+ this->GetOutput()->InsertPolygons(static_cast<typename TGISTable::PolygonConstPointerType> (
+ correctPolygon),
+ static_cast<typename TGISTable::PolygonListConstPointerType> (0), oss.str());
//Add polygon to the gis table
- }
-
- }
+ }
+}
-template<class TLabelMap , class TGISTable>
+template<class TLabelMap, class TGISTable>
void
-LabelMapToGISTableFilter< TLabelMap, TGISTable >
-::PrintSelf(std::ostream &os, itk::Indent indent) const
+LabelMapToGISTableFilter<TLabelMap, TGISTable>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
//this->GetInputGISConnection()->PrintSelf (os, indent);
@@ -187,6 +186,5 @@ LabelMapToGISTableFilter< TLabelMap, TGISTable >
*/
}
-
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/Common/otbLabelMapToVectorDataFilter.h b/Code/Common/otbLabelMapToVectorDataFilter.h
index 3526b1e5f5..ffaea14dc2 100644
--- a/Code/Common/otbLabelMapToVectorDataFilter.h
+++ b/Code/Common/otbLabelMapToVectorDataFilter.h
@@ -45,36 +45,36 @@ namespace otb {
* \sa VectorDataSource
* \ingroup GeoSpatialAnalysis
*/
-template<class TLabelMap, class TVectorData >
+template<class TLabelMap, class TVectorData>
class ITK_EXPORT LabelMapToVectorDataFilter :
- public VectorDataSource< TVectorData >
+ public VectorDataSource<TVectorData>
{
public:
/** Standard class typedefs. */
typedef LabelMapToVectorDataFilter Self;
- typedef VectorDataSource< TVectorData >
+ typedef VectorDataSource<TVectorData>
Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Some convenient typedefs. */
- typedef TLabelMap InputLabelMapType;
- typedef TVectorData OutputVectorDataType;
- typedef typename OutputVectorDataType::Pointer OutputVectorDataPointer;
- typedef typename OutputVectorDataType::ConstPointer OutputVectorDataConstPointer;
+ typedef TLabelMap InputLabelMapType;
+ typedef TVectorData OutputVectorDataType;
+ typedef typename OutputVectorDataType::Pointer OutputVectorDataPointer;
+ typedef typename OutputVectorDataType::ConstPointer OutputVectorDataConstPointer;
- typedef typename InputLabelMapType::LabelObjectType LabelObjectType;
+ typedef typename InputLabelMapType::LabelObjectType LabelObjectType;
- typedef typename OutputVectorDataType::DataNodeType DataNodeType;
- typedef typename DataNodeType::Pointer DataNodePointerType;
- typedef typename DataNodeType::PolygonType PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef typename OutputVectorDataType::DataNodeType DataNodeType;
+ typedef typename DataNodeType::Pointer DataNodePointerType;
+ typedef typename DataNodeType::PolygonType PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
/** Some typedefs specific to functors*/
- typedef otb::Functor::LabelObjectToPolygonFunctor<LabelObjectType,PolygonType> FunctorType;
- typedef otb::CorrectPolygonFunctor<PolygonType> CorrectFunctorType;
+ typedef otb::Functor::LabelObjectToPolygonFunctor<LabelObjectType, PolygonType> FunctorType;
+ typedef otb::CorrectPolygonFunctor<PolygonType> CorrectFunctorType;
// typedef otb::SimplifyPathFunctor<PolygonType,PolygonType> SimplifyFunctorType;
// typedef ClosePathFunctor <PolygonType,PolygonType> CloseFunctorType;
- /** ImageDimension constants */
+/** ImageDimension constants */
/** Standard New method. */
itkNewMacro(Self);
@@ -83,16 +83,15 @@ public:
itkTypeMacro(LabelMapToVectorDataFilter,
VectorDataSource);
-
/** Set/Get the LabelMap input of this process object. */
- virtual void SetInput( const InputLabelMapType *input);
- virtual void SetInput( unsigned int idx, const InputLabelMapType *input);
+ virtual void SetInput(const InputLabelMapType *input);
+ virtual void SetInput(unsigned int idx, const InputLabelMapType *input);
const InputLabelMapType * GetInput(void);
const InputLabelMapType * GetInput(unsigned int idx);
protected:
LabelMapToVectorDataFilter();
- virtual ~LabelMapToVectorDataFilter() {};
+ virtual ~LabelMapToVectorDataFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** LabelMapToAttributeImageFilter needs the entire input be
@@ -106,11 +105,9 @@ protected:
/** Single-threaded version of GenerateData. The functor is not thread safe. */
void GenerateData();
-
private:
- LabelMapToVectorDataFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ LabelMapToVectorDataFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
}; // end of class
@@ -121,5 +118,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Common/otbLabelMapToVectorDataFilter.txx b/Code/Common/otbLabelMapToVectorDataFilter.txx
index 1285153723..f0366906af 100644
--- a/Code/Common/otbLabelMapToVectorDataFilter.txx
+++ b/Code/Common/otbLabelMapToVectorDataFilter.txx
@@ -20,68 +20,66 @@
#include "otbLabelMapToVectorDataFilter.h"
-
namespace otb {
-template<class TLabelMap, class TVectorData >
+template<class TLabelMap, class TVectorData>
LabelMapToVectorDataFilter<TLabelMap, TVectorData>
- ::LabelMapToVectorDataFilter()
-{/*
+::LabelMapToVectorDataFilter()
+{ /*
m_BackgroundValue = NumericTraits<OutputImagePixelType>::NonpositiveMin();*/
}
-
-template<class TLabelMap, class TVectorData >
+template<class TLabelMap, class TVectorData>
void
LabelMapToVectorDataFilter<TLabelMap, TVectorData>
- ::SetInput(const InputLabelMapType *input)
+::SetInput(const InputLabelMapType *input)
{
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(0,
- const_cast< InputLabelMapType * >( input ) );
+ const_cast<InputLabelMapType *>(input));
}
-template<class TLabelMap, class TVectorData >
+template<class TLabelMap, class TVectorData>
void
LabelMapToVectorDataFilter<TLabelMap, TVectorData>
- ::SetInput(unsigned int idx, const InputLabelMapType *input)
+::SetInput(unsigned int idx, const InputLabelMapType *input)
{
- // Process object is not const-correct so the const_cast is required here
+ // Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(idx,
- const_cast< InputLabelMapType * >( input ) );
+ const_cast<InputLabelMapType *>(input));
}
-template<class TLabelMap, class TVectorData >
- const typename LabelMapToVectorDataFilter<TLabelMap, TVectorData>::InputLabelMapType *
+template<class TLabelMap, class TVectorData>
+const typename LabelMapToVectorDataFilter<TLabelMap, TVectorData>::InputLabelMapType *
LabelMapToVectorDataFilter<TLabelMap, TVectorData>
- ::GetInput(void)
+::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TLabelMap * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<const TLabelMap *>
+ (this->itk::ProcessObject::GetInput(0));
}
-template<class TLabelMap, class TVectorData >
- const typename LabelMapToVectorDataFilter<TLabelMap, TVectorData>::InputLabelMapType *
+template<class TLabelMap, class TVectorData>
+const typename LabelMapToVectorDataFilter<TLabelMap, TVectorData>::InputLabelMapType *
LabelMapToVectorDataFilter<TLabelMap, TVectorData>
- ::GetInput(unsigned int idx)
+::GetInput(unsigned int idx)
{
- return static_cast<const TLabelMap * >
- (this->itk::ProcessObject::GetInput(idx) );
+ return static_cast<const TLabelMap *>
+ (this->itk::ProcessObject::GetInput(idx));
}
-template<class TLabelMap, class TVectorData >
+template<class TLabelMap, class TVectorData>
void
LabelMapToVectorDataFilter<TLabelMap, TVectorData>
::GenerateInputRequestedRegion()
-{/*
+{ /*
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
-
+
// We need all the input.
InputImagePointer input = const_cast<InputImageType *>(this->GetInput());
if ( !input )
@@ -100,16 +98,16 @@ LabelMapToVectorDataFilter<TInputImage, TVectorData>
}
*/
-template<class TLabelMap, class TVectorData >
+template<class TLabelMap, class TVectorData>
void
- LabelMapToVectorDataFilter<TLabelMap, TVectorData>
+LabelMapToVectorDataFilter<TLabelMap, TVectorData>
::GenerateData()
{
// std::cout << "ICI" << std::endl;
- /**Allocate the output*/
+/**Allocate the output*/
// this->AllocateOutputs();
// std::cout << "ICI" << std::endl;
- OutputVectorDataType * output = this->GetOutput();
+ OutputVectorDataType * output = this->GetOutput();
const InputLabelMapType * input = this->GetInput();
/**create functors */
FunctorType functor;
@@ -119,60 +117,59 @@ void
/**Create usual root elements of the output vectordata*/
DataNodePointerType document = DataNodeType::New();
DataNodePointerType folder1 = DataNodeType::New();
-
+
document->SetNodeType(DOCUMENT);
folder1->SetNodeType(FOLDER);
DataNodePointerType root = output->GetDataTree()->GetRoot()->Get();
- output->GetDataTree()->Add(document,root);
- output->GetDataTree()->Add(folder1,document);
-
+ output->GetDataTree()->Add(document, root);
+ output->GetDataTree()->Add(folder1, document);
+
// Lets begin by declaring the iterator for the objects in the image.
typename InputLabelMapType::LabelObjectContainerType::const_iterator it;
// And get the object container to reuse it later
- const typename InputLabelMapType::LabelObjectContainerType & labelObjectContainer = input->GetLabelObjectContainer();
- for( it = labelObjectContainer.begin(); it != labelObjectContainer.end(); it++ )
- {
+ const typename InputLabelMapType::LabelObjectContainerType& labelObjectContainer = input->GetLabelObjectContainer();
+ for (it = labelObjectContainer.begin(); it != labelObjectContainer.end(); it++)
+ {
// the label is there if we need it, but it can also be found at labelObject->GetLabel().
// const PType & label = it->first;
-
+
/**the label object*/
LabelObjectType * labelObject = it->second;
-
+
/**Get the polygon image of the labelobject using the functor*/
typename PolygonType::Pointer polygon = functor(labelObject);
-
+
/** Erase aligned points*/
// PolygonPointerType simplifyPolygon = simplifyFunctor(polygon);
-
-
+
/**Close polygon if necessary*/
// PolygonPointerType closePolygon = closeFunctor(simplifyPolygon);
-
+
/**correct polygon if necessary*/
PolygonPointerType correctPolygon = correctFunctor(polygon);
// std::cout << "correct polygon : " << correctPolygon << std::endl;
DataNodePointerType node = DataNodeType::New();
node->SetNodeType(otb::FEATURE_POLYGON);
-
+
/**Store the label in the NodeId*/
std::ostringstream oss;
oss << labelObject->GetLabel();
node->SetNodeId(oss.str());
//TODO hole in the polygon are not handle yet by the functor
node->SetPolygonExteriorRing(correctPolygon);
-
+
/**Add the polygon to the VectorData*/
- output->GetDataTree()->Add(node,folder1);
- }
+ output->GetDataTree()->Add(node, folder1);
+ }
}
-
-template<class TLabelMap, class TVectorData >
+
+template<class TLabelMap, class TVectorData>
void
LabelMapToVectorDataFilter<TLabelMap, TVectorData>
-::PrintSelf(std::ostream &os, itk::Indent indent) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
}
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/Common/otbLabelObjectToPolygonFunctor.h b/Code/Common/otbLabelObjectToPolygonFunctor.h
index 5751ceb09f..31621497ff 100644
--- a/Code/Common/otbLabelObjectToPolygonFunctor.h
+++ b/Code/Common/otbLabelObjectToPolygonFunctor.h
@@ -54,7 +54,7 @@ namespace Functor
* Please be aware that this functor is not thread-safe.
*
*/
-template <class TLabelObject, class TPolygon >
+template <class TLabelObject, class TPolygon>
class LabelObjectToPolygonFunctor
{
public:
@@ -66,106 +66,114 @@ public:
typedef TPolygon PolygonType;
typedef typename PolygonType::Pointer PolygonPointerType;
typedef typename PolygonType::VertexType VertexType;
- typedef itk::Point<double,2> PointType;
- typedef itk::Vector<double,2> SpacingType;
+ typedef itk::Point<double, 2> PointType;
+ typedef itk::Vector<double, 2> SpacingType;
typedef itk::Index<2> RegionIndexType;
-
+
/**
* \param labelObject the label object to vectorize
* \return The vectorized label object as a polygon.
*/
- inline PolygonType * operator()(const LabelObjectType * labelObject);
-
+ inline PolygonType * operator ()(const LabelObjectType * labelObject);
+
/** Set the start index of the underlying image */
- void SetStartIndex(const RegionIndexType & index)
+ void SetStartIndex(const RegionIndexType& index)
{
m_StartIndex = index;
}
/** Get the start index */
- const RegionIndexType & GetStartIndex() const
+ const RegionIndexType& GetStartIndex() const
{
return m_StartIndex;
}
/** Set the origin of the underlying image */
- void SetOrigin(const PointType & origin)
+ void SetOrigin(const PointType& origin)
{
m_Origin = origin;
}
/** Get the origin */
- const PointType & GetOrigin() const
+ const PointType& GetOrigin() const
{
return m_Origin;
}
/** Set the spacing of the underlying image */
- void SetSpacing(const SpacingType & spacing)
+ void SetSpacing(const SpacingType& spacing)
{
m_Spacing = spacing;
}
/** Get the spacing */
- const SpacingType & GetSpacing() const
+ const SpacingType& GetSpacing() const
{
return m_Spacing;
}
/** Constructor */
LabelObjectToPolygonFunctor() : m_Polygon(NULL),
- m_CurrentState(UP_LEFT),
- m_PositionFlag(LEFT_END),
- m_StartingPoint(),
- m_CurrentPoint(),
- m_CurrentRun(),
- m_CurrentLine(0),
- m_Solution(),
- m_LineOffset(0),
- m_StartIndex(),
- m_Origin(),
- m_Spacing(1.)
+ m_CurrentState(UP_LEFT),
+ m_PositionFlag(LEFT_END),
+ m_StartingPoint(),
+ m_CurrentPoint(),
+ m_CurrentRun(),
+ m_CurrentLine(0),
+ m_Solution(),
+ m_LineOffset(0),
+ m_StartIndex(),
+ m_Origin(),
+ m_Spacing(1.)
{}
/** Destructor */
virtual ~LabelObjectToPolygonFunctor(){}
-
+
private:
/// Internal structures
- typedef std::vector<LineType> RunsPerLineType;
- typedef std::vector<RunsPerLineType> RunsPerLineVectorType;
- typedef std::vector<IndexType> IndexVectorType;
+ typedef std::vector<LineType> RunsPerLineType;
+ typedef std::vector<RunsPerLineType> RunsPerLineVectorType;
+ typedef std::vector<IndexType> IndexVectorType;
/// Internal enums
- enum StateType{UP_LEFT,UP_RIGHT,DOWN_LEFT,DOWN_RIGHT};
- enum PositionFlagType{LEFT_END,RIGHT_END};
+ enum StateType {UP_LEFT, UP_RIGHT, DOWN_LEFT, DOWN_RIGHT};
+ enum PositionFlagType {LEFT_END, RIGHT_END};
- /// Compare two line in the lexicographical order
- static bool LexicographicalLineCompare(const LineType & l1, const LineType & l2);
+ /// Compare two line in the lexicographical order
+ static bool LexicographicalLineCompare(const LineType& l1, const LineType& l2);
/// Check if the given run index (index in line,line) is valid
- inline bool IsRunIndexValid(const IndexType & index) const;
+ inline bool IsRunIndexValid(const IndexType& index) const;
/// Check if the point lies within the range of the line
- inline IndexType Within(const IndexType & point, unsigned int line);
-
+ inline IndexType Within(const IndexType& point, unsigned int line);
+
/// Return the left-end of the run
- inline IndexType LeftEnd(const IndexType & runIndex) const;
+ inline IndexType LeftEnd(const IndexType& runIndex) const;
/// Return the right-end of the run
- inline IndexType RightEnd(const IndexType & runIndex) const;
-
+ inline IndexType RightEnd(const IndexType& runIndex) const;
+
/** Return the right-most run whose left end lies within the range of
* the given run.
*/
- inline IndexType RightMostLeftEndInside(unsigned int line, const IndexType & point, const IndexType & run) const;
+ inline IndexType RightMostLeftEndInside(unsigned int line, const IndexType& point, const IndexType& run) const;
/** Return the left-most run whose right end lies within the range of
* the given run.
*/
- inline IndexType LeftMostRightEndInside(unsigned int line, const IndexType & point, const IndexType & run) const;
-
+ inline IndexType LeftMostRightEndInside(unsigned int line, const IndexType& point, const IndexType& run) const;
+
/// Walk left to update the finite states machine.
- inline void WalkLeft(unsigned int line,const IndexType & startPoint, const IndexType & endPoint, PolygonType * polygon, const StateType state);
+ inline void WalkLeft(unsigned int line,
+ const IndexType& startPoint,
+ const IndexType& endPoint,
+ PolygonType * polygon,
+ const StateType state);
/// Walk right to update the finite states machine.
- inline void WalkRight(unsigned int line,const IndexType & startPoint, const IndexType & endPoint, PolygonType * polygon, const StateType state);
-
+ inline void WalkRight(unsigned int line,
+ const IndexType& startPoint,
+ const IndexType& endPoint,
+ PolygonType * polygon,
+ const StateType state);
+
// Apply origin and spacing
VertexType IndexToPoint(const VertexType& index) const;
@@ -175,34 +183,32 @@ private:
RunsPerLineVectorType m_InternalDataSet;
/// The current state
- StateType m_CurrentState;
+ StateType m_CurrentState;
/// The position flag
- PositionFlagType m_PositionFlag;
-
+ PositionFlagType m_PositionFlag;
+
// The starting point for vectorization
- IndexType m_StartingPoint;
-
+ IndexType m_StartingPoint;
+
/// The current point for vectorization
- IndexType m_CurrentPoint;
-
+ IndexType m_CurrentPoint;
+
/// The current run for vectorization
- IndexType m_CurrentRun;
-
+ IndexType m_CurrentRun;
+
/// The current line for vectorization
- unsigned int m_CurrentLine;
-
+ unsigned int m_CurrentLine;
+
/// The vector of vectorized boundaries
- IndexVectorType m_Solution;
+ IndexVectorType m_Solution;
/// The line offset from start of the region
- unsigned int m_LineOffset;
+ unsigned int m_LineOffset;
// The following will be used for coordinate transform
- RegionIndexType m_StartIndex;
- PointType m_Origin;
- SpacingType m_Spacing;
-
-
+ RegionIndexType m_StartIndex;
+ PointType m_Origin;
+ SpacingType m_Spacing;
}; // end class LabelObjectToPolygonFunctor
@@ -215,5 +221,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Common/otbLabelObjectToPolygonFunctor.txx b/Code/Common/otbLabelObjectToPolygonFunctor.txx
index 5415b9aa9e..b9f692a4b5 100644
--- a/Code/Common/otbLabelObjectToPolygonFunctor.txx
+++ b/Code/Common/otbLabelObjectToPolygonFunctor.txx
@@ -22,7 +22,6 @@
#include "otbLabelObjectToPolygonFunctor.h"
-
namespace otb
{
namespace Functor
@@ -30,52 +29,52 @@ namespace Functor
template<class TLabelObject, class TPolygon>
bool
-LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
-::LexicographicalLineCompare(const LineType & l1, const LineType & l2)
+LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
+::LexicographicalLineCompare(const LineType& l1, const LineType& l2)
{
- bool resp = l2.GetIndex()[1]> l1.GetIndex()[1];
+ bool resp = l2.GetIndex()[1] > l1.GetIndex()[1];
resp = resp
- || (l2.GetIndex()[1] == l1.GetIndex()[1]
- && (l1.GetIndex()[0]+ static_cast<long>(l1.GetLength())) < l2.GetIndex()[0]);
+ || (l2.GetIndex()[1] == l1.GetIndex()[1]
+ && (l1.GetIndex()[0] + static_cast<long>(l1.GetLength())) < l2.GetIndex()[0]);
return resp;
}
template<class TLabelObject, class TPolygon>
-inline typename LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
+inline typename LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
::PolygonType *
-LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
-::operator()(const LabelObjectType * labelObject)
-{
- // Clear any previous context
- m_CurrentState = DOWN_LEFT;
- m_PositionFlag = LEFT_END;
- m_InternalDataSet.clear();
+LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
+::operator() (const LabelObjectType * labelObject)
+ {
+ // Clear any previous context
+ m_CurrentState = DOWN_LEFT;
+ m_PositionFlag = LEFT_END;
+ m_InternalDataSet.clear();
- m_Polygon = PolygonType::New();
+ m_Polygon = PolygonType::New();
- // Get the internal container
- LineContainerType lcontainer = labelObject->GetLineContainer();
+ // Get the internal container
+ LineContainerType lcontainer = labelObject->GetLineContainer();
- // Sort it
- sort(lcontainer.begin(),lcontainer.end(),&LexicographicalLineCompare);
+ // Sort it
+ sort(lcontainer.begin(), lcontainer.end(), &LexicographicalLineCompare);
- // Step 1: Fill the internal data set
+ // Step 1: Fill the internal data set
- // Iterates on the line container
- typename LineContainerType::const_iterator lIt = lcontainer.begin();
+ // Iterates on the line container
+ typename LineContainerType::const_iterator lIt = lcontainer.begin();
- // Stores the current line
- long currentLine = (*lIt).GetIndex()[1];
- long lineIndex = 0;
+ // Stores the current line
+ long currentLine = (*lIt).GetIndex()[1];
+ long lineIndex = 0;
- // Push back the first line of runs
- RunsPerLineType firstRunsPerLine;
- m_InternalDataSet.push_back(firstRunsPerLine);
+ // Push back the first line of runs
+ RunsPerLineType firstRunsPerLine;
+ m_InternalDataSet.push_back(firstRunsPerLine);
- while(lIt!=lcontainer.end())
+ while (lIt != lcontainer.end())
{
// if we are still in the same image line
- if(currentLine == (*lIt).GetIndex()[1])
+ if (currentLine == (*lIt).GetIndex()[1])
{
m_InternalDataSet.back().push_back(*lIt);
}
@@ -90,521 +89,532 @@ LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
++lIt;
}
- // Begin the boundaries tracking procedure
- m_StartingPoint = m_InternalDataSet.at(0).at(0).GetIndex();
- m_LineOffset = m_StartingPoint[1];
- m_CurrentPoint = m_StartingPoint;
- m_CurrentRun.Fill(0);
- m_CurrentLine = 0;
+ // Begin the boundaries tracking procedure
+ m_StartingPoint = m_InternalDataSet.at(0).at(0).GetIndex();
+ m_LineOffset = m_StartingPoint[1];
+ m_CurrentPoint = m_StartingPoint;
+ m_CurrentRun.Fill(0);
+ m_CurrentLine = 0;
- bool goesOn = true;
+ bool goesOn = true;
- while(goesOn)
+ while (goesOn)
+ {
+ switch (m_CurrentState)
+ {
+ case UP_RIGHT:
+ {
+ // First candidate run
+ IndexType firstCandidateRun = Within(m_CurrentPoint, m_CurrentLine - 1);
+ if (IsRunIndexValid(firstCandidateRun))
+ {
+ // Second candidate run
+ IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine, RightEnd(m_CurrentRun), firstCandidateRun);
+ if (IsRunIndexValid(secondCandidateRun))
+ {
+ // Down-Right case
+ m_CurrentRun = secondCandidateRun;
+ m_CurrentState = DOWN_RIGHT;
+ m_PositionFlag = LEFT_END;
+ WalkRight(m_CurrentLine - 1, m_CurrentPoint, LeftEnd(m_CurrentRun), m_Polygon, m_CurrentState);
+
+ }
+ else
+ {
+ // Up-Right case
+ m_CurrentLine--;
+ m_CurrentRun = firstCandidateRun;
+ m_CurrentState = UP_RIGHT;
+ m_PositionFlag = RIGHT_END;
+ WalkRight(m_CurrentLine, m_CurrentPoint, RightEnd(m_CurrentRun), m_Polygon, m_CurrentState);
+
+ }
+ }
+ else
+ {
+ IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine - 1, RightEnd(m_CurrentRun), m_CurrentRun);
+
+ if (IsRunIndexValid(secondCandidateRun))
+ {
+ // Up-Left Case
+ m_CurrentState = UP_LEFT;
+ m_PositionFlag = RIGHT_END;
+ WalkLeft(m_CurrentLine, m_CurrentPoint, RightEnd(secondCandidateRun), m_Polygon, m_CurrentState);
+ m_CurrentLine--;
+ m_CurrentRun = secondCandidateRun;
+ }
+ else
+ {
+ // Down-Left case
+ m_CurrentState = DOWN_LEFT;
+ m_PositionFlag = LEFT_END;
+ WalkLeft(m_CurrentLine, m_CurrentPoint, LeftEnd(m_CurrentRun), m_Polygon, m_CurrentState);
+ }
+ }
+ break;
+ }
+ case DOWN_LEFT:
{
- switch(m_CurrentState)
- {
- case UP_RIGHT:
- {
- // First candidate run
- IndexType firstCandidateRun = Within(m_CurrentPoint,m_CurrentLine-1);
- if(IsRunIndexValid(firstCandidateRun))
- {
- // Second candidate run
- IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine,RightEnd(m_CurrentRun),firstCandidateRun);
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Down-Right case
- m_CurrentRun = secondCandidateRun;
- m_CurrentState = DOWN_RIGHT;
- m_PositionFlag = LEFT_END;
- WalkRight(m_CurrentLine-1,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
-
- }
- else
- {
- // Up-Right case
- m_CurrentLine--;
- m_CurrentRun = firstCandidateRun;
- m_CurrentState = UP_RIGHT;
- m_PositionFlag = RIGHT_END;
- WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),m_Polygon, m_CurrentState);
-
- }
- }
- else
- {
- IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine-1,RightEnd(m_CurrentRun),m_CurrentRun);
-
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Up-Left Case
- m_CurrentState = UP_LEFT;
- m_PositionFlag = RIGHT_END;
- WalkLeft(m_CurrentLine,m_CurrentPoint,RightEnd(secondCandidateRun),m_Polygon, m_CurrentState);
- m_CurrentLine--;
- m_CurrentRun = secondCandidateRun;
- }
- else
- {
- // Down-Left case
- m_CurrentState = DOWN_LEFT;
- m_PositionFlag = LEFT_END;
- WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
- }
- }
- break;
- }
- case DOWN_LEFT:
- {
- // First candidate run
- IndexType firstCandidateRun = Within(m_CurrentPoint,m_CurrentLine+1);
-
- if(IsRunIndexValid(firstCandidateRun))
- {
- // Second candidate run
- IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine,LeftEnd(m_CurrentRun),firstCandidateRun);
-
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Up-Left case
- m_CurrentRun = secondCandidateRun;
- m_CurrentState = UP_LEFT;
- m_PositionFlag = RIGHT_END;
- WalkLeft(m_CurrentLine+1,m_CurrentPoint,RightEnd(m_CurrentRun),m_Polygon, m_CurrentState);
- }
- else
- {
- // Down-Left case
- m_CurrentLine++;
- m_CurrentRun = firstCandidateRun;
- m_CurrentState = DOWN_LEFT;
- m_PositionFlag = LEFT_END;
- WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
-
- }
- }
- else
- {
- IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine+1,LeftEnd(m_CurrentRun),m_CurrentRun);
-
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Down-Right case
- m_CurrentRun = secondCandidateRun;
- m_CurrentLine++;
- m_CurrentState = DOWN_RIGHT;
- m_PositionFlag = LEFT_END;
- WalkRight(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
-
- }
- else
- {
- // Up-Right case
- m_CurrentState = UP_RIGHT;
- m_PositionFlag = RIGHT_END;
- WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),m_Polygon, m_CurrentState);
-
- }
- }
- break;
- }
- case DOWN_RIGHT:
- {
- IndexType firstCandidateRun = Within(m_CurrentPoint,m_CurrentLine+1);
-
- if(IsRunIndexValid(firstCandidateRun))
- {
- IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine,RightEnd(m_CurrentRun),firstCandidateRun);
-
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Up-Left case
- m_CurrentState = UP_LEFT;
- m_PositionFlag = RIGHT_END;
- m_CurrentRun = secondCandidateRun;
- WalkLeft(m_CurrentLine+1,m_CurrentPoint,RightEnd(m_CurrentRun),m_Polygon, m_CurrentState);
-
- }
- else
- {
- // Down-Left case
- m_CurrentLine++;
- m_CurrentRun = firstCandidateRun;
- m_CurrentState = DOWN_LEFT;
- m_PositionFlag = LEFT_END;
- WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
-
- }
- }
- else
- {
- IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine+1,LeftEnd(m_CurrentRun),m_CurrentRun);
-
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Down-Right case
- m_CurrentLine++;
- m_CurrentRun = secondCandidateRun;
- m_CurrentState = DOWN_RIGHT;
- m_PositionFlag = LEFT_END;
- WalkRight(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
- }
- else
- {
- // Up-Right case
- m_CurrentState = UP_RIGHT;
- m_PositionFlag = RIGHT_END;
- WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),m_Polygon, m_CurrentState);
-
- }
- }
- break;
- }
- case UP_LEFT:
- {
- IndexType firstCandidateRun = Within(m_CurrentPoint,m_CurrentLine-1);
-
- if(IsRunIndexValid(firstCandidateRun))
- {
- IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine,LeftEnd(m_CurrentRun),firstCandidateRun);
-
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Down-Right case
- m_CurrentRun = secondCandidateRun;
- m_CurrentState = DOWN_RIGHT;
- m_PositionFlag = LEFT_END;
- WalkRight(m_CurrentLine-1,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
-
- }
- else
- {
- // Up-Right case
- m_CurrentLine--;
- m_CurrentRun = firstCandidateRun;
- m_CurrentState = UP_RIGHT;
- m_PositionFlag = RIGHT_END;
- WalkRight(m_CurrentLine,m_CurrentPoint,RightEnd(m_CurrentRun),m_Polygon, m_CurrentState);
- }
- }
- else
- {
- IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine-1,RightEnd(m_CurrentRun),m_CurrentRun);
-
- if(IsRunIndexValid(secondCandidateRun))
- {
- // Up-Left case
- m_CurrentState = UP_LEFT;
- m_PositionFlag = RIGHT_END;
- WalkLeft(m_CurrentLine,m_CurrentPoint,RightEnd(secondCandidateRun),m_Polygon, m_CurrentState);
- m_CurrentLine--;
- m_CurrentRun = secondCandidateRun;
-
- }
- else
- {
- // Down-Left case
- m_CurrentState = DOWN_LEFT;
- m_PositionFlag = LEFT_END;
- WalkLeft(m_CurrentLine,m_CurrentPoint,LeftEnd(m_CurrentRun),m_Polygon, m_CurrentState);
-
- }
- }
- break;
- }
- }
- goesOn = m_CurrentPoint != m_StartingPoint;
+ // First candidate run
+ IndexType firstCandidateRun = Within(m_CurrentPoint, m_CurrentLine + 1);
+
+ if (IsRunIndexValid(firstCandidateRun))
+ {
+ // Second candidate run
+ IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine, LeftEnd(m_CurrentRun), firstCandidateRun);
+
+ if (IsRunIndexValid(secondCandidateRun))
+ {
+ // Up-Left case
+ m_CurrentRun = secondCandidateRun;
+ m_CurrentState = UP_LEFT;
+ m_PositionFlag = RIGHT_END;
+ WalkLeft(m_CurrentLine + 1, m_CurrentPoint, RightEnd(m_CurrentRun), m_Polygon, m_CurrentState);
+ }
+ else
+ {
+ // Down-Left case
+ m_CurrentLine++;
+ m_CurrentRun = firstCandidateRun;
+ m_CurrentState = DOWN_LEFT;
+ m_PositionFlag = LEFT_END;
+ WalkLeft(m_CurrentLine, m_CurrentPoint, LeftEnd(m_CurrentRun), m_Polygon, m_CurrentState);
+
+ }
+ }
+ else
+ {
+ IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine + 1, LeftEnd(m_CurrentRun), m_CurrentRun);
+
+ if (IsRunIndexValid(secondCandidateRun))
+ {
+ // Down-Right case
+ m_CurrentRun = secondCandidateRun;
+ m_CurrentLine++;
+ m_CurrentState = DOWN_RIGHT;
+ m_PositionFlag = LEFT_END;
+ WalkRight(m_CurrentLine, m_CurrentPoint, LeftEnd(m_CurrentRun), m_Polygon, m_CurrentState);
+
+ }
+ else
+ {
+ // Up-Right case
+ m_CurrentState = UP_RIGHT;
+ m_PositionFlag = RIGHT_END;
+ WalkRight(m_CurrentLine, m_CurrentPoint, RightEnd(m_CurrentRun), m_Polygon, m_CurrentState);
+
+ }
+ }
+ break;
}
+ case DOWN_RIGHT:
+ {
+ IndexType firstCandidateRun = Within(m_CurrentPoint, m_CurrentLine + 1);
+
+ if (IsRunIndexValid(firstCandidateRun))
+ {
+ IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine, RightEnd(m_CurrentRun), firstCandidateRun);
+
+ if (IsRunIndexValid(secondCandidateRun))
+ {
+ // Up-Left case
+ m_CurrentState = UP_LEFT;
+ m_PositionFlag = RIGHT_END;
+ m_CurrentRun = secondCandidateRun;
+ WalkLeft(m_CurrentLine + 1, m_CurrentPoint, RightEnd(m_CurrentRun), m_Polygon, m_CurrentState);
+
+ }
+ else
+ {
+ // Down-Left case
+ m_CurrentLine++;
+ m_CurrentRun = firstCandidateRun;
+ m_CurrentState = DOWN_LEFT;
+ m_PositionFlag = LEFT_END;
+ WalkLeft(m_CurrentLine, m_CurrentPoint, LeftEnd(m_CurrentRun), m_Polygon, m_CurrentState);
+
+ }
+ }
+ else
+ {
+ IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine + 1, LeftEnd(m_CurrentRun), m_CurrentRun);
+
+ if (IsRunIndexValid(secondCandidateRun))
+ {
+ // Down-Right case
+ m_CurrentLine++;
+ m_CurrentRun = secondCandidateRun;
+ m_CurrentState = DOWN_RIGHT;
+ m_PositionFlag = LEFT_END;
+ WalkRight(m_CurrentLine, m_CurrentPoint, LeftEnd(m_CurrentRun), m_Polygon, m_CurrentState);
+ }
+ else
+ {
+ // Up-Right case
+ m_CurrentState = UP_RIGHT;
+ m_PositionFlag = RIGHT_END;
+ WalkRight(m_CurrentLine, m_CurrentPoint, RightEnd(m_CurrentRun), m_Polygon, m_CurrentState);
+
+ }
+ }
+ break;
+ }
+ case UP_LEFT:
+ {
+ IndexType firstCandidateRun = Within(m_CurrentPoint, m_CurrentLine - 1);
+
+ if (IsRunIndexValid(firstCandidateRun))
+ {
+ IndexType secondCandidateRun = RightMostLeftEndInside(m_CurrentLine, LeftEnd(m_CurrentRun), firstCandidateRun);
+
+ if (IsRunIndexValid(secondCandidateRun))
+ {
+ // Down-Right case
+ m_CurrentRun = secondCandidateRun;
+ m_CurrentState = DOWN_RIGHT;
+ m_PositionFlag = LEFT_END;
+ WalkRight(m_CurrentLine - 1, m_CurrentPoint, LeftEnd(m_CurrentRun), m_Polygon, m_CurrentState);
+
+ }
+ else
+ {
+ // Up-Right case
+ m_CurrentLine--;
+ m_CurrentRun = firstCandidateRun;
+ m_CurrentState = UP_RIGHT;
+ m_PositionFlag = RIGHT_END;
+ WalkRight(m_CurrentLine, m_CurrentPoint, RightEnd(m_CurrentRun), m_Polygon, m_CurrentState);
+ }
+ }
+ else
+ {
+ IndexType secondCandidateRun = LeftMostRightEndInside(m_CurrentLine - 1, RightEnd(m_CurrentRun), m_CurrentRun);
+
+ if (IsRunIndexValid(secondCandidateRun))
+ {
+ // Up-Left case
+ m_CurrentState = UP_LEFT;
+ m_PositionFlag = RIGHT_END;
+ WalkLeft(m_CurrentLine, m_CurrentPoint, RightEnd(secondCandidateRun), m_Polygon, m_CurrentState);
+ m_CurrentLine--;
+ m_CurrentRun = secondCandidateRun;
+
+ }
+ else
+ {
+ // Down-Left case
+ m_CurrentState = DOWN_LEFT;
+ m_PositionFlag = LEFT_END;
+ WalkLeft(m_CurrentLine, m_CurrentPoint, LeftEnd(m_CurrentRun), m_Polygon, m_CurrentState);
+
+ }
+ }
+ break;
+ }
+ }
+ goesOn = m_CurrentPoint != m_StartingPoint;
+ }
- return m_Polygon;
-}
+ return m_Polygon;
+ }
template<class TLabelObject, class TPolygon>
inline bool
-LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
+LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
::IsRunIndexValid(const IndexType& index) const
{
- return (index[0]>=0 && index[1]>=0);
+ return (index[0] >= 0 && index[1] >= 0);
}
template<class TLabelObject, class TPolygon>
-inline typename LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
+inline typename LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
::IndexType
-LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
-::Within(const IndexType & point, unsigned int line)
- {
- unsigned int idx = 0;
- IndexType resp;
- resp[0]=-1;
+LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
+::Within(const IndexType& point, unsigned int line)
+{
+ unsigned int idx = 0;
+ IndexType resp;
+ resp[0] = -1;
- if(line < 0 || line >= m_InternalDataSet.size())
- {
- resp[1]=-1;
- return resp;
- }
+ if (line < 0 || line >= m_InternalDataSet.size())
+ {
+ resp[1] = -1;
+ return resp;
+ }
- long leftoffset = 0;
- long rightoffset = 0;
+ long leftoffset = 0;
+ long rightoffset = 0;
- switch(m_PositionFlag)
- {
- case LEFT_END:
- rightoffset=1;
- break;
+ switch (m_PositionFlag)
+ {
+ case LEFT_END:
+ rightoffset = 1;
+ break;
- case RIGHT_END:
- leftoffset=-1;
- break;
- }
+ case RIGHT_END:
+ leftoffset = -1;
+ break;
+ }
- typename RunsPerLineType::iterator it = m_InternalDataSet.at(line).begin();
- resp[1]=line;
+ typename RunsPerLineType::iterator it = m_InternalDataSet.at(line).begin();
+ resp[1] = line;
- while(resp[0] < 0 && it!= m_InternalDataSet.at(line).end())
+ while (resp[0] < 0 && it != m_InternalDataSet.at(line).end())
+ {
+ if (point[0] >= (it->GetIndex()[0]) + leftoffset && point[0] <
+ (it->GetIndex()[0] + static_cast<long>(it->GetLength())) + rightoffset)
{
- if( point[0]>=(it->GetIndex()[0])+leftoffset && point[0]<(it->GetIndex()[0]+static_cast<long>(it->GetLength()))+rightoffset)
- {
- resp[0]=idx;
- }
- ++idx;
- ++it;
+ resp[0] = idx;
}
- return resp;
- }
+ ++idx;
+ ++it;
+ }
+ return resp;
+}
template<class TLabelObject, class TPolygon>
-inline typename LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
+inline typename LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
::IndexType
-LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
-::LeftEnd(const IndexType & runIndex) const
+LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
+::LeftEnd(const IndexType& runIndex) const
{
return m_InternalDataSet.at(runIndex[1]).at(runIndex[0]).GetIndex();
}
template<class TLabelObject, class TPolygon>
-inline typename LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
+inline typename LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
::IndexType
-LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
-::RightEnd(const IndexType & runIndex) const
+LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
+::RightEnd(const IndexType& runIndex) const
{
IndexType point = m_InternalDataSet.at(runIndex[1]).at(runIndex[0]).GetIndex();
- point[0]+= static_cast<long>(m_InternalDataSet.at(runIndex[1]).at(runIndex[0]).GetLength()-1);
+ point[0] += static_cast<long>(m_InternalDataSet.at(runIndex[1]).at(runIndex[0]).GetLength() - 1);
return point;
}
template<class TLabelObject, class TPolygon>
-inline typename LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
+inline typename LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
::IndexType
-LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
-::RightMostLeftEndInside(unsigned int line, const IndexType & point, const IndexType & run) const
- {
- unsigned int idx = 0;
- IndexType resp;
- resp[0]=-1;
+LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
+::RightMostLeftEndInside(unsigned int line, const IndexType& point, const IndexType& run) const
+{
+ unsigned int idx = 0;
+ IndexType resp;
+ resp[0] = -1;
- if(line < 0 || line >= m_InternalDataSet.size())
- {
- resp[1]=-1;
- return resp;
- }
+ if (line < 0 || line >= m_InternalDataSet.size())
+ {
+ resp[1] = -1;
+ return resp;
+ }
- typename RunsPerLineType::const_iterator it = m_InternalDataSet.at(line).begin();
- resp[1]=line;
+ typename RunsPerLineType::const_iterator it = m_InternalDataSet.at(line).begin();
+ resp[1] = line;
- LineType lrun = m_InternalDataSet.at(run[1]).at(run[0]);
+ LineType lrun = m_InternalDataSet.at(run[1]).at(run[0]);
- while(resp[0]<0 && it!=m_InternalDataSet.at(line).end())
- {
- /// Index is a the right of point
- if(it->GetIndex()[0] > point[0]
+ while (resp[0] < 0 && it != m_InternalDataSet.at(line).end())
+ {
+ /// Index is a the right of point
+ if (it->GetIndex()[0] > point[0]
/// Index is inside run range
- && it->GetIndex()[0]-1 >= lrun.GetIndex()[0]
- && it->GetIndex()[0]-1 < lrun.GetIndex()[0]+ static_cast<long>(lrun.GetLength()))
- {
- resp[0]=idx;
- }
- ++idx;
- ++it;
+ && it->GetIndex()[0] - 1 >= lrun.GetIndex()[0]
+ && it->GetIndex()[0] - 1 < lrun.GetIndex()[0] + static_cast<long>(lrun.GetLength()))
+ {
+ resp[0] = idx;
}
- return resp;
- }
+ ++idx;
+ ++it;
+ }
+ return resp;
+}
template<class TLabelObject, class TPolygon>
-inline typename LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
+inline typename LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
::IndexType
-LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
-::LeftMostRightEndInside(unsigned int line, const IndexType & point, const IndexType & run) const
- {
- IndexType resp;
- resp[0]=-1;
+LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
+::LeftMostRightEndInside(unsigned int line, const IndexType& point, const IndexType& run) const
+{
+ IndexType resp;
+ resp[0] = -1;
- if(line < 0 || line >= m_InternalDataSet.size())
- {
- resp[1]=-1;
- return resp;
- }
- unsigned int idx = m_InternalDataSet.at(line).size()-1;
+ if (line < 0 || line >= m_InternalDataSet.size())
+ {
+ resp[1] = -1;
+ return resp;
+ }
+ unsigned int idx = m_InternalDataSet.at(line).size() - 1;
- typename RunsPerLineType::const_reverse_iterator it = m_InternalDataSet.at(line).rbegin();
- resp[1]=line;
+ typename RunsPerLineType::const_reverse_iterator it = m_InternalDataSet.at(line).rbegin();
+ resp[1] = line;
- LineType lrun = m_InternalDataSet.at(run[1]).at(run[0]);
+ LineType lrun = m_InternalDataSet.at(run[1]).at(run[0]);
- while(resp[0]<0 && it!=m_InternalDataSet.at(line).rend())
- {
- /// Index is a the left of point
- if(it->GetIndex()[0] + static_cast<long>(it->GetLength()) <= point[0]
+ while (resp[0] < 0 && it != m_InternalDataSet.at(line).rend())
+ {
+ /// Index is a the left of point
+ if (it->GetIndex()[0] + static_cast<long>(it->GetLength()) <= point[0]
/// right end is inside run range
- && it->GetIndex()[0]+ static_cast<long>(it->GetLength()) >= lrun.GetIndex()[0]
- && it->GetIndex()[0]+ static_cast<long>(it->GetLength()) < lrun.GetIndex()[0]+ static_cast<long>(lrun.GetLength()))
- {
- resp[0]=idx;
- }
- --idx;
- ++it;
+ && it->GetIndex()[0] + static_cast<long>(it->GetLength()) >= lrun.GetIndex()[0]
+ && it->GetIndex()[0] + static_cast<long>(it->GetLength()) < lrun.GetIndex()[0] +
+ static_cast<long>(lrun.GetLength()))
+ {
+ resp[0] = idx;
}
- return resp;
- }
+ --idx;
+ ++it;
+ }
+ return resp;
+}
template<class TLabelObject, class TPolygon>
void
-LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
-::WalkLeft(unsigned int line,const IndexType & startPoint, const IndexType & endPoint, PolygonType * polygon, const StateType state)
- {
- assert( vcl_abs(static_cast<long int>(line+m_LineOffset-endPoint[1]))<=1 && "End point not with +/-1 line from line");
-
- typename PolygonType::VertexType::VectorType offset;
-
- switch(state)
- {
- case UP_RIGHT:
- offset[1]=1;
- break;
- case UP_LEFT:
- offset[1]=1;
- break;
- case DOWN_RIGHT:
- offset[1]=0;
- break;
- case DOWN_LEFT:
- offset[1]=0;
- break;
- }
-
- switch(m_PositionFlag)
- {
- case LEFT_END:
- offset[0] = 0;
- break;
- case RIGHT_END:
- offset[0]=1;
- break;
- }
- typename PolygonType::VertexType newPoint;
+LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
+::WalkLeft(unsigned int line,
+ const IndexType& startPoint,
+ const IndexType& endPoint,
+ PolygonType * polygon,
+ const StateType state)
+{
+ assert(vcl_abs(static_cast<long int>(
+ line + m_LineOffset - endPoint[1])) <= 1 && "End point not with +/-1 line from line");
- m_CurrentPoint = startPoint;
- m_CurrentPoint[0]-=1;
+ typename PolygonType::VertexType::VectorType offset;
- if( m_CurrentPoint[0]> endPoint[0]+1)
- {
- m_CurrentPoint[1]=line+m_LineOffset;
- newPoint = m_CurrentPoint;
- newPoint+=offset;
- polygon->AddVertex(IndexToPoint(newPoint));
- }
+ switch (state)
+ {
+ case UP_RIGHT:
+ offset[1] = 1;
+ break;
+ case UP_LEFT:
+ offset[1] = 1;
+ break;
+ case DOWN_RIGHT:
+ offset[1] = 0;
+ break;
+ case DOWN_LEFT:
+ offset[1] = 0;
+ break;
+ }
- // if the end point is not on line n, add an intermediate point
- if(static_cast<int>(line+m_LineOffset) != endPoint[1] && m_CurrentPoint[0]> endPoint[0]+1)
- {
- m_CurrentPoint[0] = endPoint[0]+1;
- newPoint = m_CurrentPoint;
- newPoint+=offset;
- polygon->AddVertex(IndexToPoint(newPoint));
- }
+ switch (m_PositionFlag)
+ {
+ case LEFT_END:
+ offset[0] = 0;
+ break;
+ case RIGHT_END:
+ offset[0] = 1;
+ break;
+ }
+ typename PolygonType::VertexType newPoint;
- if(m_CurrentPoint != endPoint)
- {
- m_CurrentPoint = endPoint;
- newPoint = m_CurrentPoint;
- newPoint+=offset;
- polygon->AddVertex(IndexToPoint(newPoint));
+ m_CurrentPoint = startPoint;
+ m_CurrentPoint[0] -= 1;
- }
- }
+ if (m_CurrentPoint[0] > endPoint[0] + 1)
+ {
+ m_CurrentPoint[1] = line + m_LineOffset;
+ newPoint = m_CurrentPoint;
+ newPoint += offset;
+ polygon->AddVertex(IndexToPoint(newPoint));
+ }
+
+ // if the end point is not on line n, add an intermediate point
+ if (static_cast<int>(line + m_LineOffset) != endPoint[1] && m_CurrentPoint[0] > endPoint[0] + 1)
+ {
+ m_CurrentPoint[0] = endPoint[0] + 1;
+ newPoint = m_CurrentPoint;
+ newPoint += offset;
+ polygon->AddVertex(IndexToPoint(newPoint));
+ }
+
+ if (m_CurrentPoint != endPoint)
+ {
+ m_CurrentPoint = endPoint;
+ newPoint = m_CurrentPoint;
+ newPoint += offset;
+ polygon->AddVertex(IndexToPoint(newPoint));
+
+ }
+}
template<class TLabelObject, class TPolygon>
void
-LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
-::WalkRight(unsigned int line,const IndexType & startPoint, const IndexType & endPoint, PolygonType * polygon, const StateType state)
- {
- assert( vcl_abs(static_cast<long int>(line+m_LineOffset-endPoint[1]))<=1 && "End point not with +/-1 line from line");
-
- typename PolygonType::VertexType::VectorType offset;
-
- switch(state)
- {
- case UP_RIGHT:
- offset[0]=1;
- offset[1]=1;
- break;
- case UP_LEFT:
- offset[0]=0;
- offset[1]=1;
- break;
- case DOWN_RIGHT:
- offset[0]=1;
- offset[1]=0;
- break;
- case DOWN_LEFT:
- offset[0]=0;
- offset[1]=0;
- break;
- }
-
- typename PolygonType::VertexType newPoint;
-
- m_CurrentPoint = startPoint;
- m_CurrentPoint[0]+=1;
-
- if(m_CurrentPoint[0]< endPoint[0]-1)
- {
- m_CurrentPoint[1]=line+m_LineOffset;
- newPoint = m_CurrentPoint;
- newPoint+=offset;
- polygon->AddVertex(IndexToPoint(newPoint));
- }
+LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
+::WalkRight(unsigned int line,
+ const IndexType& startPoint,
+ const IndexType& endPoint,
+ PolygonType * polygon,
+ const StateType state)
+{
+ assert(vcl_abs(static_cast<long int>(
+ line + m_LineOffset - endPoint[1])) <= 1 && "End point not with +/-1 line from line");
- // if the end point is not on line n, add an intermediate point
- if( static_cast<int>(line+m_LineOffset) != endPoint[1] && m_CurrentPoint[0]< endPoint[0]-1 )
- {
- m_CurrentPoint[0] = endPoint[0]-1;
- newPoint = m_CurrentPoint;
- newPoint+=offset;
- polygon->AddVertex(IndexToPoint(newPoint));
- }
+ typename PolygonType::VertexType::VectorType offset;
- if(m_CurrentPoint!=endPoint)
- {
- m_CurrentPoint = endPoint;
- newPoint = m_CurrentPoint;
- newPoint+=offset;
- polygon->AddVertex(IndexToPoint(newPoint));
- }
- }
+ switch (state)
+ {
+ case UP_RIGHT:
+ offset[0] = 1;
+ offset[1] = 1;
+ break;
+ case UP_LEFT:
+ offset[0] = 0;
+ offset[1] = 1;
+ break;
+ case DOWN_RIGHT:
+ offset[0] = 1;
+ offset[1] = 0;
+ break;
+ case DOWN_LEFT:
+ offset[0] = 0;
+ offset[1] = 0;
+ break;
+ }
+
+ typename PolygonType::VertexType newPoint;
+
+ m_CurrentPoint = startPoint;
+ m_CurrentPoint[0] += 1;
+
+ if (m_CurrentPoint[0] < endPoint[0] - 1)
+ {
+ m_CurrentPoint[1] = line + m_LineOffset;
+ newPoint = m_CurrentPoint;
+ newPoint += offset;
+ polygon->AddVertex(IndexToPoint(newPoint));
+ }
+ // if the end point is not on line n, add an intermediate point
+ if (static_cast<int>(line + m_LineOffset) != endPoint[1] && m_CurrentPoint[0] < endPoint[0] - 1)
+ {
+ m_CurrentPoint[0] = endPoint[0] - 1;
+ newPoint = m_CurrentPoint;
+ newPoint += offset;
+ polygon->AddVertex(IndexToPoint(newPoint));
+ }
+
+ if (m_CurrentPoint != endPoint)
+ {
+ m_CurrentPoint = endPoint;
+ newPoint = m_CurrentPoint;
+ newPoint += offset;
+ polygon->AddVertex(IndexToPoint(newPoint));
+ }
+}
// Apply origin and spacing
template<class TLabelObject, class TPolygon>
-typename LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
-::VertexType
-LabelObjectToPolygonFunctor<TLabelObject,TPolygon>
+typename LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
+::VertexType
+LabelObjectToPolygonFunctor<TLabelObject, TPolygon>
::IndexToPoint(const VertexType& index) const
{
VertexType resp;
// Apply origin and spacing
- resp[0] = (index[0]-m_StartIndex[0])*m_Spacing[0]+m_Origin[0];
- resp[1] = (index[1]-m_StartIndex[1])*m_Spacing[1]+m_Origin[1];
+ resp[0] = (index[0] - m_StartIndex[0]) * m_Spacing[0] + m_Origin[0];
+ resp[1] = (index[1] - m_StartIndex[1]) * m_Spacing[1] + m_Origin[1];
return resp;
}
diff --git a/Code/Common/otbLineSpatialObject.h b/Code/Common/otbLineSpatialObject.h
index c1c7e6c84b..b4c2e26635 100644
--- a/Code/Common/otbLineSpatialObject.h
+++ b/Code/Common/otbLineSpatialObject.h
@@ -30,22 +30,22 @@ namespace otb
*
* \sa LineSpatialObjectPoint
*/
-template < unsigned int VDimension = 3 >
+template <unsigned int VDimension = 3>
class ITK_EXPORT LineSpatialObject
- : public itk::PointBasedSpatialObject<VDimension>
+ : public itk::PointBasedSpatialObject<VDimension>
{
public:
/** Standard typedefs */
typedef LineSpatialObject Self;
typedef itk::PointBasedSpatialObject<VDimension> Superclass;
- typedef itk::SmartPointer< Self > Pointer;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Method for creation through the object factory. */
- itkTypeMacro( LineSpatialObject, PointBasedSpatialObject );
+ itkTypeMacro(LineSpatialObject, PointBasedSpatialObject);
/** Superclass typedefs */
typedef typename Superclass::SpatialObjectPointType SpatialObjectPointType;
@@ -55,16 +55,16 @@ public:
/** Additional typedefs */
typedef double ScalarType;
- typedef itk::LineSpatialObjectPoint< VDimension > LinePointType;
- typedef std::vector< LinePointType > PointListType;
- typedef itk::VectorContainer<unsigned long,PointType> PointContainerType;
+ typedef itk::LineSpatialObjectPoint<VDimension> LinePointType;
+ typedef std::vector<LinePointType> PointListType;
+ typedef itk::VectorContainer<unsigned long, PointType> PointContainerType;
typedef itk::SmartPointer<PointContainerType> PointContainerPointer;
/** Returns a reference to the list of the Line points.*/
- PointListType & GetPoints( void );
+ PointListType& GetPoints(void);
/** Set the list of line points. */
- void SetPoints( PointListType & newPoints );
+ void SetPoints(PointListType& newPoints);
/** Return a point in the list given the index */
const SpatialObjectPointType* GetPoint(unsigned long id) const
@@ -86,24 +86,24 @@ public:
/** Returns true if the line is evaluable at the requested point,
* false otherwise. */
- bool IsEvaluableAt( const PointType & point,
- unsigned int depth=0, char * name=NULL ) const;
+ bool IsEvaluableAt(const PointType& point,
+ unsigned int depth = 0, char * name = NULL) const;
/** Returns the value of the line at that point.
* Currently this function returns a binary value,
* but it might want to return a degree of membership
* in case of fuzzy Lines. */
- bool ValueAt( const PointType & point, double & value,
- unsigned int depth=0, char * name=NULL ) const;
+ bool ValueAt(const PointType& point, double& value,
+ unsigned int depth = 0, char * name = NULL) const;
/** Returns true if the point is inside the line, false otherwise. */
- bool IsInside( const PointType & point,
- unsigned int depth, char * name) const;
+ bool IsInside(const PointType& point,
+ unsigned int depth, char * name) const;
/** Test whether a point is inside or outside the object
* For computational speed purposes, it is faster if the method does not
* check the name of the class and the current depth */
- virtual bool IsInside( const PointType & point) const;
+ virtual bool IsInside(const PointType& point) const;
/** Compute the boundaries of the line.*/
bool ComputeLocalBoundingBox() const;
@@ -114,16 +114,16 @@ protected:
/** Destructor */
virtual ~LineSpatialObject();
/** Method to print the object. */
- virtual void PrintSelf( std::ostream& os, itk::Indent indent ) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- LineSpatialObject(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LineSpatialObject(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Point list */
- PointListType m_Points;
+ PointListType m_Points;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbLineSpatialObject.txx"
#endif
diff --git a/Code/Common/otbLineSpatialObject.txx b/Code/Common/otbLineSpatialObject.txx
index cfd1003f9b..8d9fe4f107 100644
--- a/Code/Common/otbLineSpatialObject.txx
+++ b/Code/Common/otbLineSpatialObject.txx
@@ -28,8 +28,8 @@
namespace otb
{
/** Constructor */
-template< unsigned int VDimension >
-LineSpatialObject< VDimension >
+template<unsigned int VDimension>
+LineSpatialObject<VDimension>
::LineSpatialObject()
{
this->SetDimension(VDimension);
@@ -42,15 +42,15 @@ LineSpatialObject< VDimension >
}
/** Destructor */
-template< unsigned int VDimension >
-LineSpatialObject< VDimension >
+template<unsigned int VDimension>
+LineSpatialObject<VDimension>
::~LineSpatialObject()
{}
/** Returns a reference to the list of the Line points.*/
-template< unsigned int VDimension >
-typename LineSpatialObject< VDimension > ::PointListType &
-LineSpatialObject< VDimension >
+template<unsigned int VDimension>
+typename LineSpatialObject<VDimension>::PointListType&
+LineSpatialObject<VDimension>
::GetPoints()
{
// otbMsgDevMacro( "Getting LinePoint list" );
@@ -58,174 +58,193 @@ LineSpatialObject< VDimension >
}
/** Set the list of Line points. */
-template< unsigned int VDimension >
+template<unsigned int VDimension>
void
-LineSpatialObject< VDimension >
-::SetPoints( PointListType & points )
+LineSpatialObject<VDimension>
+::SetPoints(PointListType& points)
{
// in this function, passing a null pointer as argument will
// just clear the list...
m_Points.clear();
- typename PointListType::iterator it,end;
+ typename PointListType::iterator it, end;
it = points.begin();
end = points.end();
while (it != end)
- {
+ {
m_Points.push_back(*it);
it++;
- }
+ }
this->ComputeBoundingBox();
this->Modified();
}
/** Print the object. */
-template< unsigned int VDimension >
+template<unsigned int VDimension>
void
-LineSpatialObject< VDimension >
-::PrintSelf( std::ostream& os, itk::Indent indent ) const
+LineSpatialObject<VDimension>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
os << indent << "LineSpatialObject(" << this << ")" << std::endl;
os << indent << "ID: " << this->GetId() << std::endl;
- os << indent << "nb of points: "<< static_cast<unsigned long>( m_Points.size() ) << std::endl;
- Superclass::PrintSelf( os, indent );
+ os << indent << "nb of points: " << static_cast<unsigned long>(m_Points.size()) << std::endl;
+ Superclass::PrintSelf(os, indent);
}
/** Compute the boundaries of the line.*/
-template< unsigned int VDimension >
+template<unsigned int VDimension>
bool
-LineSpatialObject< VDimension >
+LineSpatialObject<VDimension>
::ComputeLocalBoundingBox() const
{
// tbMsgDevMacro( "Computing tube bounding box" );
- if ( this->GetBoundingBoxChildrenName().empty()
- || strstr(typeid(Self).name(), this->GetBoundingBoxChildrenName().c_str()) )
- {
+ if (this->GetBoundingBoxChildrenName().empty()
+ || strstr(typeid(Self).name(), this->GetBoundingBoxChildrenName().c_str()))
+ {
typename PointListType::const_iterator it = m_Points.begin();
typename PointListType::const_iterator end = m_Points.end();
if (it == end)
- {
+ {
return false;
- }
+ }
else
- {
+ {
PointType pt = this->GetIndexToWorldTransform()->TransformPoint((*it).GetPosition());
PointType ptmin;
PointType ptmax;
- ptmin[0]=pt[0]-1;
- ptmin[1]=pt[1]-1;
- ptmax[0]=pt[0]+1;
- ptmax[1]=pt[1]+1;
+ ptmin[0] = pt[0] - 1;
+ ptmin[1] = pt[1] - 1;
+ ptmax[0] = pt[0] + 1;
+ ptmax[1] = pt[1] + 1;
const_cast<BoundingBoxType *>(this->GetBounds())->SetMinimum(ptmin);
const_cast<BoundingBoxType *>(this->GetBounds())->SetMaximum(ptmax);
it++;
- while (it!= end)
- {
+ while (it != end)
+ {
PointType pt = this->GetIndexToWorldTransform()->TransformPoint((*it).GetPosition());
const_cast<BoundingBoxType *>(this->GetBounds())->ConsiderPoint(pt);
it++;
- }
+ }
+ }
}
- }
return true;
}
-
/** Test whether a point is inside or outside the object
* For computational speed purposes, it is faster if the method does not
* check the name of the class and the current depth */
-template< unsigned int VDimension >
+template<unsigned int VDimension>
bool
-LineSpatialObject< VDimension >
-::IsInside( const PointType & point) const
+LineSpatialObject<VDimension>
+::IsInside(const PointType& point) const
{
typename PointListType::const_iterator it1 = m_Points.begin();
typename PointListType::const_iterator end = m_Points.end();
- typename PointListType::const_iterator it2 = it1+1;
+ typename PointListType::const_iterator it2 = it1 + 1;
if (!this->GetIndexToWorldTransform()->GetInverse(const_cast<TransformType *>(this->GetInternalInverseTransform())))
- {
+ {
return false;
- }
+ }
PointType transformedPoint = this->GetInternalInverseTransform()->TransformPoint(point);
- if ( this->GetBounds()->IsInside(transformedPoint) )
- {
- while (it2 != end)
+ if (this->GetBounds()->IsInside(transformedPoint))
{
- if ((*it1).GetPosition()[0] < (*it2).GetPosition()[0])
+ while (it2 != end)
{
- if ( transformedPoint[1]==(int) ((*it1).GetPosition()[1]+(((*it2).GetPosition()[1]-(*it1).GetPosition()[1])/((*it2).GetPosition()[0]-(*it1).GetPosition()[0]))*(transformedPoint[0]-(*it1).GetPosition()[0])) && transformedPoint[0]>=(*it1).GetPosition()[0] && transformedPoint[0]<=(*it2).GetPosition()[0])
+ if ((*it1).GetPosition()[0] < (*it2).GetPosition()[0])
{
+ if (transformedPoint[1] ==
+ (int) ((*it1).GetPosition()[1] +
+ (((*it2).GetPosition()[1] -
+ (*it1).GetPosition()[1]) /
+ ((*it2).GetPosition()[0] - (*it1).GetPosition()[0])) * (transformedPoint[0] - (*it1).GetPosition()[0])) &&
+ transformedPoint[0] >= (*it1).GetPosition()[0] && transformedPoint[0] <= (*it2).GetPosition()[0])
+ {
return true;
+ }
}
- }
else
- {
- if (transformedPoint[1]==(int) ((((*it2).GetPosition()[1]-(*it1).GetPosition()[1])/((*it1).GetPosition()[0]-(*it2).GetPosition()[0]))*((*it1).GetPosition()[0]-transformedPoint[0])+(*it1).GetPosition()[1]) && transformedPoint[0]>=(*it2).GetPosition()[0] && transformedPoint[0]<=(*it1).GetPosition()[0])
{
+ if (transformedPoint[1] ==
+ (int) ((((*it2).GetPosition()[1] -
+ (*it1).GetPosition()[1]) /
+ ((*it1).GetPosition()[0] -
+ (*it2).GetPosition()[0])) * ((*it1).GetPosition()[0] - transformedPoint[0]) + (*it1).GetPosition()[1]) &&
+ transformedPoint[0] >= (*it2).GetPosition()[0] && transformedPoint[0] <= (*it1).GetPosition()[0])
+ {
return true;
+ }
}
- }
- if ((*it1).GetPosition()[1]<(*it2).GetPosition()[1])
- {
- if (transformedPoint[0]==(int) ((((*it2).GetPosition()[0]-(*it1).GetPosition()[0])/((*it2).GetPosition()[1]-(*it1).GetPosition()[1]))*(transformedPoint[1]-(*it1).GetPosition()[1])+(*it1).GetPosition()[0]) && transformedPoint[1]>=(*it1).GetPosition()[1] && transformedPoint[1]<=(*it2).GetPosition()[1])
+ if ((*it1).GetPosition()[1] < (*it2).GetPosition()[1])
{
+ if (transformedPoint[0] ==
+ (int) ((((*it2).GetPosition()[0] -
+ (*it1).GetPosition()[0]) /
+ ((*it2).GetPosition()[1] -
+ (*it1).GetPosition()[1])) * (transformedPoint[1] - (*it1).GetPosition()[1]) + (*it1).GetPosition()[0]) &&
+ transformedPoint[1] >= (*it1).GetPosition()[1] && transformedPoint[1] <= (*it2).GetPosition()[1])
+ {
return true;
+ }
}
- }
else
- {
- if (transformedPoint[0]==(int) ((((*it2).GetPosition()[0]-(*it1).GetPosition()[0])/((*it1).GetPosition()[1]-(*it2).GetPosition()[1]))*((*it1).GetPosition()[1]-transformedPoint[1])+(*it1).GetPosition()[0]) && transformedPoint[1]>=(*it2).GetPosition()[1] && transformedPoint[1]<=(*it1).GetPosition()[1])
{
+ if (transformedPoint[0] ==
+ (int) ((((*it2).GetPosition()[0] -
+ (*it1).GetPosition()[0]) /
+ ((*it1).GetPosition()[1] -
+ (*it2).GetPosition()[1])) * ((*it1).GetPosition()[1] - transformedPoint[1]) + (*it1).GetPosition()[0]) &&
+ transformedPoint[1] >= (*it2).GetPosition()[1] && transformedPoint[1] <= (*it1).GetPosition()[1])
+ {
return true;
+ }
}
- }
it1++;
it2++;
- }
+ }
- }
+ }
return false;
}
/** Check if a given point is inside a line
* return True only if the point is in the point list */
-template< unsigned int VDimension >
+template<unsigned int VDimension>
bool
-LineSpatialObject< VDimension >
-::IsInside( const PointType & point, unsigned int depth, char * name ) const
+LineSpatialObject<VDimension>
+::IsInside(const PointType& point, unsigned int depth, char * name) const
{
// otbMsgDevMacro( "Checking the point [" << point << "] is on the Line" );
if (name == NULL)
- {
- if (IsInside(point))
{
+ if (IsInside(point))
+ {
return true;
+ }
}
- }
else if (strstr(typeid(Self).name(), name))
- {
- if (IsInside(point))
{
+ if (IsInside(point))
+ {
return true;
+ }
}
- }
return Superclass::IsInside(point, depth, name);
}
/** Returns true if the line is evaluable at the requested point,
* false otherwise. */
-template< unsigned int VDimension >
+template<unsigned int VDimension>
bool
-LineSpatialObject< VDimension >
-::IsEvaluableAt( const PointType & point, unsigned int depth, char * name ) const
+LineSpatialObject<VDimension>
+::IsEvaluableAt(const PointType& point, unsigned int depth, char * name) const
{
// otbMsgDevMacro( "Checking if the tube is evaluable at " << point );
return IsInside(point, depth, name);
@@ -235,32 +254,32 @@ LineSpatialObject< VDimension >
* Currently this function returns a binary value,
* but it might want to return a degree of membership
* in case of fuzzy Lines. */
-template< unsigned int VDimension >
+template<unsigned int VDimension>
bool
-LineSpatialObject< VDimension >
-::ValueAt( const PointType & point, double & value, unsigned int depth,
- char * name ) const
+LineSpatialObject<VDimension>
+::ValueAt(const PointType& point, double& value, unsigned int depth,
+ char * name) const
{
// otbMsgDevMacro( "Getting the value of the tube at " << point );
- if ( IsInside(point, 0, name) )
- {
+ if (IsInside(point, 0, name))
+ {
value = this->GetDefaultInsideValue();
return true;
- }
+ }
else
- {
- if ( Superclass::IsEvaluableAt(point, depth, name) )
{
+ if (Superclass::IsEvaluableAt(point, depth, name))
+ {
Superclass::ValueAt(point, value, depth, name);
return true;
- }
+ }
else
- {
+ {
value = this->GetDefaultOutsideValue();
return false;
+ }
}
- }
return false;
}
} // end namespace otb
diff --git a/Code/Common/otbLineSpatialObjectList.h b/Code/Common/otbLineSpatialObjectList.h
index 1bc0bb670a..fbd1a7e029 100644
--- a/Code/Common/otbLineSpatialObjectList.h
+++ b/Code/Common/otbLineSpatialObjectList.h
@@ -32,38 +32,37 @@ namespace otb
/** \class LineSpatialObjectList
*/
-class ITK_EXPORT LineSpatialObjectList : public std::list< itk::LineSpatialObject<2>::Pointer >,
- public itk::DataObject
+class ITK_EXPORT LineSpatialObjectList : public std::list<itk::LineSpatialObject<2>::Pointer>,
+ public itk::DataObject
{
public:
/** Standard class typedefs. */
- typedef LineSpatialObjectList Self;
- typedef itk::DataObject Superclass;
+ typedef LineSpatialObjectList Self;
+ typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(LineSpatialObjectList,itk::DataObject);
+ itkTypeMacro(LineSpatialObjectList, itk::DataObject);
/** Some convenient typedefs. */
- typedef itk::LineSpatialObject<2> LineType;
+ typedef itk::LineSpatialObject<2> LineType;
-protected :
+protected:
LineSpatialObjectList() {};
- ~LineSpatialObjectList() {};
+ ~LineSpatialObjectList() {}
private:
- LineSpatialObjectList(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LineSpatialObjectList(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/Common/otbLineSpatialObjectListToPointSetFilter.h b/Code/Common/otbLineSpatialObjectListToPointSetFilter.h
index 8746649e76..3a3fe03aa3 100644
--- a/Code/Common/otbLineSpatialObjectListToPointSetFilter.h
+++ b/Code/Common/otbLineSpatialObjectListToPointSetFilter.h
@@ -35,58 +35,51 @@ namespace otb
*
*/
-
-template <class TLinesList , class TPointSet>
+template <class TLinesList, class TPointSet>
class ITK_EXPORT LineSpatialObjectListToPointSetFilter : public itk::ProcessObject
{
public:
/** Standard class typedefs. */
- typedef LineSpatialObjectListToPointSetFilter Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LineSpatialObjectListToPointSetFilter Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(LineSpatialObjectListToPointSetFilter,itk::ProcessObject);
+ itkTypeMacro(LineSpatialObjectListToPointSetFilter, itk::ProcessObject);
/** Some convenient typedefs. */
- typedef TLinesList LinesListType;
- typedef typename LinesListType::LineType LineType;
-
+ typedef TLinesList LinesListType;
+ typedef typename LinesListType::LineType LineType;
+
/** typedef support for output*/
- typedef TPointSet PointSetType;
-
- typedef itk::ProcessObject ProcessObjectType;
+ typedef TPointSet PointSetType;
+
+ typedef itk::ProcessObject ProcessObjectType;
/** Set/Get the input image */
virtual void SetInput(const LinesListType *list);
- virtual const LinesListType* GetInput(void);
+ virtual const LinesListType* GetInput(void);
/** Set/Get the list of LineSpatialObject of this process object. */
- virtual void SetOutput(const PointSetType *pointSet);
- virtual PointSetType* GetOutput(void);
-
+ virtual void SetOutput(const PointSetType *pointSet);
+ virtual PointSetType* GetOutput(void);
protected:
LineSpatialObjectListToPointSetFilter();
virtual ~LineSpatialObjectListToPointSetFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
private:
- LineSpatialObjectListToPointSetFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
-
-
+ LineSpatialObjectListToPointSetFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Common/otbLineSpatialObjectListToPointSetFilter.txx b/Code/Common/otbLineSpatialObjectListToPointSetFilter.txx
index 9330bbe588..8bd5bf634c 100644
--- a/Code/Common/otbLineSpatialObjectListToPointSetFilter.txx
+++ b/Code/Common/otbLineSpatialObjectListToPointSetFilter.txx
@@ -26,66 +26,62 @@ namespace otb
/**
*
*/
-template<class TLinesList , class TPointSet >
-LineSpatialObjectListToPointSetFilter<TLinesList,TPointSet>::LineSpatialObjectListToPointSetFilter()
+template<class TLinesList, class TPointSet>
+LineSpatialObjectListToPointSetFilter<TLinesList, TPointSet>::LineSpatialObjectListToPointSetFilter()
{
this->SetNumberOfRequiredInputs(1);
this->SetNumberOfRequiredOutputs(1);
- this->SetNthOutput(0,PointSetType::New());
+ this->SetNthOutput(0, PointSetType::New());
}
-template<class TLinesList , class TPointSet >
+template<class TLinesList, class TPointSet>
void
-LineSpatialObjectListToPointSetFilter<TLinesList,TPointSet>
+LineSpatialObjectListToPointSetFilter<TLinesList, TPointSet>
::SetInput(const LinesListType *list)
{
this->itk::ProcessObject::SetNthInput(0,
- const_cast<LinesListType * >( list ) );
+ const_cast<LinesListType *>(list));
}
-
-template<class TLinesList , class TPointSet >
-const typename LineSpatialObjectListToPointSetFilter<TLinesList,TPointSet>:: LinesListType*
-LineSpatialObjectListToPointSetFilter<TLinesList,TPointSet>
+template<class TLinesList, class TPointSet>
+const typename LineSpatialObjectListToPointSetFilter<TLinesList, TPointSet>::LinesListType*
+LineSpatialObjectListToPointSetFilter<TLinesList, TPointSet>
::GetInput(void)
{
return static_cast<const LinesListType *>
- (this->itk::ProcessObject::GetInput(0) );
+ (this->itk::ProcessObject::GetInput(0));
}
-
-template<class TLinesList , class TPointSet >
+template<class TLinesList, class TPointSet>
void
-LineSpatialObjectListToPointSetFilter<TLinesList,TPointSet>
+LineSpatialObjectListToPointSetFilter<TLinesList, TPointSet>
::SetOutput(const PointSetType *pointSet)
{
this->ProcessObjectType::SetNthOutput(0,
- const_cast< PointSetType * >( pointSet ) );
+ const_cast<PointSetType *>(pointSet));
}
-
-template<class TLinesList , class TPointSet >
-typename LineSpatialObjectListToPointSetFilter<TLinesList,TPointSet>:: PointSetType*
-LineSpatialObjectListToPointSetFilter<TLinesList,TPointSet>
+template<class TLinesList, class TPointSet>
+typename LineSpatialObjectListToPointSetFilter<TLinesList, TPointSet>::PointSetType*
+LineSpatialObjectListToPointSetFilter<TLinesList, TPointSet>
::GetOutput(void)
{
return static_cast<PointSetType *>
- (this->ProcessObjectType::GetOutput(0) );
+ (this->ProcessObjectType::GetOutput(0));
}
-
/**
*
*/
-template<class TLinesList , class TPointSet >
+template<class TLinesList, class TPointSet>
void
-LineSpatialObjectListToPointSetFilter<TLinesList,TPointSet>
+LineSpatialObjectListToPointSetFilter<TLinesList, TPointSet>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/Common/otbList.h b/Code/Common/otbList.h
index 8826fd4d91..9af0031d3b 100644
--- a/Code/Common/otbList.h
+++ b/Code/Common/otbList.h
@@ -18,14 +18,13 @@
#ifndef __otbList_h
#define __otbList_h
-
namespace otb
{
//For backward compatibility only
// otb::List is deprecated and otb::ObjectList should be used instead
template <class TObject>
class ITK_EXPORT List : public ObjectList<TObject>
- {};
+{};
}
-#endif
\ No newline at end of file
+#endif
diff --git a/Code/Common/otbMacro.h b/Code/Common/otbMacro.h
index 75e77fb4b0..328c316afe 100644
--- a/Code/Common/otbMacro.h
+++ b/Code/Common/otbMacro.h
@@ -16,7 +16,6 @@
=========================================================================*/
-
/**
* otbMacro.h defines standard system-wide macros, constants, and other
* parameters. One of its most important functions is to define macros used
@@ -39,7 +38,6 @@ namespace otb
{
} // end namespace otb - this is here for documentation purposes
-
/** This macro is used to print debug (or other information). They are
* also used to catch errors, etc. Example usage looks like:
* itkDebugMacro(<< "this is debug info" << this->SomeVariable); */
@@ -60,11 +58,11 @@ namespace otb
#define otbMsgDebugMacro(x)
#else
#define otbMsgDebugMacro(x) \
- { if ( this->GetDebug() && ::itk::Object::GetGlobalWarningDisplay()) \
- { ::itk::OStringStream itkmsg; \
- itkmsg << " Msg Debug: " x << "\n"; \
- ::itk::OutputWindowDisplayDebugText(itkmsg.str().c_str());} \
-}
+ { if (this->GetDebug() && ::itk::Object::GetGlobalWarningDisplay()) \
+ { ::itk::OStringStream itkmsg; \
+ itkmsg << " Msg Debug: " x << "\n"; \
+ ::itk::OutputWindowDisplayDebugText(itkmsg.str().c_str()); } \
+ }
#endif
#if defined(OTB_LEAN_AND_MEAN) || defined(__BORLANDC__)
@@ -73,11 +71,11 @@ namespace otb
#ifndef NDEBUG
#define otbGenericMsgDebugMacro(x) \
{ \
- if ( ::itk::Object::GetGlobalWarningDisplay()) \
- { ::itk::OStringStream itkmsg; \
- itkmsg << " Generic Msg Debug: " x << "\n"; \
- ::itk::OutputWindowDisplayDebugText(itkmsg.str().c_str());} \
- }
+ if (::itk::Object::GetGlobalWarningDisplay()) \
+ { ::itk::OStringStream itkmsg; \
+ itkmsg << " Generic Msg Debug: " x << "\n"; \
+ ::itk::OutputWindowDisplayDebugText(itkmsg.str().c_str()); } \
+ }
#else
#define otbGenericMsgDebugMacro(x)
#endif
@@ -85,25 +83,23 @@ namespace otb
#define otbGenericMsgTestingMacro(x) \
{ \
- std::cout x << std::endl; \
+ std::cout x << std::endl; \
}
-
#if defined(OTB_LEAN_AND_MEAN) || defined(__BORLANDC__)
#define otbMsgDevMacro(x)
#else
#ifdef OTB_SHOW_ALL_MSG_DEBUG
#define otbMsgDevMacro(x) \
- { { ::itk::OStringStream itkmsg; \
- itkmsg << " Msg Dev: (" << __FILE__ << ":" << __LINE__ << ") " x << "\n"; \
- ::itk::OutputWindowDisplayDebugText(itkmsg.str().c_str());} \
- }
+ { { ::itk::OStringStream itkmsg; \
+ itkmsg << " Msg Dev: (" << __FILE__ << ":" << __LINE__ << ") " x << "\n"; \
+ ::itk::OutputWindowDisplayDebugText(itkmsg.str().c_str()); } \
+ }
#else
#define otbMsgDevMacro(x)
#endif
#endif
-
/** This macro is used to print warning information (i.e., unusual circumstance
* but not necessarily fatal.) Example usage looks like:
* itkWarningMacro(<< "this is warning info" << this->SomeVariable); */
@@ -111,184 +107,188 @@ namespace otb
#define otbWarningMacro(x)
#else
#define otbWarningMacro(x) \
-{ if (itk::Object::GetGlobalWarningDisplay()) \
- { ::itk::OStringStream itkmsg; \
- itkmsg << "WARNING: In " __FILE__ ", line " << __LINE__ << "\n" \
- << this->GetNameOfClass() << " (" << this << "): " x \
- << "\n\n"; \
- itk::OutputWindowDisplayWarningText(itkmsg.str().c_str());} \
-}
+ { if (itk::Object::GetGlobalWarningDisplay()) \
+ { ::itk::OStringStream itkmsg; \
+ itkmsg << "WARNING: In " __FILE__ ", line " << __LINE__ << "\n" \
+ << this->GetNameOfClass() << " (" << this << "): " x \
+ << "\n\n"; \
+ itk::OutputWindowDisplayWarningText(itkmsg.str().c_str()); } \
+ }
#endif
/** This macro is used to control condition. It use ONLY by the OTB developpers
*
*/
#define otbControlConditionTestMacro(condition, message) \
-{ if( (condition) ) \
- itkGenericExceptionMacro(<<message);\
-}
-
+ { if ((condition)) itkGenericExceptionMacro(<< message); \
+ }
/** Set built-in type. Creates member Set"name"() (e.g., SetVisibility()); */
-#define otbSetObjectMemberMacro(object,name,type) \
- virtual void Set##name (const type _arg) \
-{ \
- itkDebugMacro("setting member " #name " to " << _arg); \
- this->m_##object->Set##name(_arg); \
+#define otbSetObjectMemberMacro(object, name, type) \
+ virtual void Set ## name (const type _arg) \
+ { \
+ itkDebugMacro("setting member " # name " to " << _arg); \
+ this->m_ ## object->Set ## name(_arg); \
this->Modified(); \
-}
+ }
/** Get built-in type. Creates member Get"name"() (e.g., GetVisibility()); */
-#define otbGetObjectMemberMacro(object,name,type) \
- virtual type Get##name () \
-{ \
- itkDebugMacro("returning " << #name " of " << this->m_##object->Get##name() ); \
- return this->m_##object->Get##name(); \
-}
+#define otbGetObjectMemberMacro(object, name, type) \
+ virtual type Get ## name () \
+ { \
+ itkDebugMacro("returning " << # name " of " << this->m_ ## object->Get ## name()); \
+ return this->m_ ## object->Get ## name(); \
+ }
/** Get built-in type. Creates member Get"name"() (e.g., GetVisibility());
* This is the "const" form of the itkGetMacro. It should be used unless
* the member can be changed through the "Get" access routine. */
-#define otbGetObjectMemberConstMacro(object,name,type) \
- virtual type Get##name () const \
-{ \
- itkDebugMacro("returning " << #name " of " << this->m_##object->Get##name() ); \
- return this->m_##object->Get##name(); \
-}
+#define otbGetObjectMemberConstMacro(object, name, type) \
+ virtual type Get ## name () const \
+ { \
+ itkDebugMacro("returning " << # name " of " << this->m_ ## object->Get ## name()); \
+ return this->m_ ## object->Get ## name(); \
+ }
/** Get built-in type. Creates member Get"name"() (e.g., GetVisibility());
* This is the "const" form of the itkGetMacro. It should be used unless
* the member can be changed through the "Get" access routine.
* This versions returns a const reference to the variable. */
-#define otbGetObjectMemberConstReferenceMacro(object,name,type) \
- virtual const type & Get##name () const \
-{ \
- itkDebugMacro("returning " << #name " of " << this->m_##object->Get##name() ); \
- return this->m_##object->Get##name(); \
-}
+#define otbGetObjectMemberConstReferenceMacro(object, name, type) \
+ virtual const type &Get ## name () const \
+ { \
+ itkDebugMacro("returning " << # name " of " << this->m_ ## object->Get ## name()); \
+ return this->m_ ## object->Get ## name(); \
+ }
/** Testing macro. This macro doesn't throw a exception if the called command
* generate a itk::ExceptionObject object. For alls others use cases, the macro
* generate a exception. */
#define otbTestingCheckValidCommand(command) \
- { \
- try \
- { \
- command;\
- } \
- catch( std::bad_alloc & err ) { throw err; } \
- catch( itk::ExceptionObject & e ) { throw e; } \
- catch( const std::exception & stde) { throw stde; } \
- catch( ... ) \
- { \
- ::itk::OStringStream message; \
- message << "otb::ERROR Unknow error while running "<<#command<<" (catch(...) )"; \
- ::itk::ExceptionObject e_(__FILE__, __LINE__, message.str().c_str(),ITK_LOCATION); \
- throw e_; \
- } \
- std::cout << " Checking valid command "<< #command " ok."<<std::endl; \
- }
+ { \
+ try \
+ { \
+ command; \
+ } \
+ catch (std::bad_alloc& err) { \
+ throw err; } \
+ catch (itk::ExceptionObject& e) { \
+ throw e; } \
+ catch (const std::exception& stde) { \
+ throw stde; } \
+ catch (...) \
+ { \
+ ::itk::OStringStream message; \
+ message << "otb::ERROR Unknow error while running " << # command << " (catch(...) )"; \
+ ::itk::ExceptionObject e_(__FILE__, __LINE__, message.str().c_str(), ITK_LOCATION); \
+ throw e_; \
+ } \
+ std::cout << " Checking valid command " << # command " ok." << std::endl; \
+ }
#define otbTestingCheckNotValidCommand(command) \
- { \
- int result(1); \
- try \
- { \
- command;\
- } \
- catch( std::bad_alloc & err ) { throw err; } \
- catch( itk::ExceptionObject &) { std::cout << "Checking not valid Command "<< #command " ok."<<std::endl; result = 0; } \
- catch( const std::exception & stde) { throw stde; } \
- catch( ... ) \
- { \
- ::itk::OStringStream message; \
- message << "otb::ERROR Unknow error while running "<<#command<<" (catch(...) )"; \
- ::itk::ExceptionObject e_(__FILE__, __LINE__, message.str().c_str(),ITK_LOCATION); \
- throw e_; \
- } \
- if(result == 1) \
- { \
- ::itk::OStringStream message; \
- message << "otb::ERROR: "<<#command<<" should be throwing an exception."; \
- ::itk::ExceptionObject e_(__FILE__, __LINE__, message.str().c_str(),ITK_LOCATION); \
- throw e_; \
- } \
- }
-
+ { \
+ int result(1); \
+ try \
+ { \
+ command; \
+ } \
+ catch (std::bad_alloc& err) { \
+ throw err; } \
+ catch (itk::ExceptionObject&) { std::cout << "Checking not valid Command " << # command " ok." << std::endl; \
+ result = 0; } \
+ catch (const std::exception& stde) { \
+ throw stde; } \
+ catch (...) \
+ { \
+ ::itk::OStringStream message; \
+ message << "otb::ERROR Unknow error while running " << # command << " (catch(...) )"; \
+ ::itk::ExceptionObject e_(__FILE__, __LINE__, message.str().c_str(), ITK_LOCATION); \
+ throw e_; \
+ } \
+ if (result == 1) \
+ { \
+ ::itk::OStringStream message; \
+ message << "otb::ERROR: " << # command << " should be throwing an exception."; \
+ ::itk::ExceptionObject e_(__FILE__, __LINE__, message.str().c_str(), ITK_LOCATION); \
+ throw e_; \
+ } \
+ }
#ifdef OTB_USE_VISU_GUI
#include <FL/Fl.H>
// Replace th Fl::run method
-#define otbFlRunMacro(condition) { while(condition) { Fl::wait(1e20); } }
+#define otbFlRunMacro(condition) { while (condition) { Fl::wait(1e20); } }
// Check if application running or will be stopped
#define otbRunningMacro() \
- private: \
- virtual void StartRunning() {this->m_Running = true; } \
- virtual void StopRunning() {this->m_Running = false; } \
- bool m_Running;\
- public: \
- virtual bool IsRunning() { return this->m_Running; }
-
-#define otbTestCallbackWithValue(view,button,button_value)\
- { \
- std::cout<<"Line "<<__LINE__<<", testing widget "<<#button<<" of view "<<view->GetNameOfClass()<<" with value "<<#button_value<<": ";\
- if(view->button->active() && (view->button->callback()))\
- {\
- std::cout<<" active, triggering callback."<<std::endl;\
- view->button->value(button_value);\
- view->button->do_callback(view->button);\
- Fl::check();\
- }\
- else \
- {\
- std::cout<<"inactive."<<std::endl; \
- }\
- }
+private: \
+ virtual void StartRunning() {this->m_Running = true; } \
+ virtual void StopRunning() {this->m_Running = false; } \
+ bool m_Running; \
+public: \
+ virtual bool IsRunning() { return this->m_Running; }
+
+#define otbTestCallbackWithValue(view, button, button_value) \
+ { \
+ std::cout << "Line " << __LINE__ << ", testing widget " << # button << " of view " << view->GetNameOfClass() << \
+ " with value " << # button_value << ": "; \
+ if (view->button->active() && (view->button->callback())) \
+ { \
+ std::cout << " active, triggering callback." << std::endl; \
+ view->button->value(button_value); \
+ view->button->do_callback(view->button); \
+ Fl::check(); \
+ } \
+ else \
+ { \
+ std::cout << "inactive." << std::endl; \
+ } \
+ }
-#define otbTestCallback(view,button)\
- { \
- std::cout<<"Line "<<__LINE__<<", testing widget "<<#button<<" of view "<<view->GetNameOfClass()<<": ";\
- if(view->button->active() && (view->button->callback()))\
- {\
- std::cout<<" active, triggering callback."<<std::endl;\
- view->button->do_callback(view->button);\
- Fl::check();\
- }\
- else \
- {\
- std::cout<<"inactive."<<std::endl; \
- }\
- }
+#define otbTestCallback(view, button) \
+ { \
+ std::cout << "Line " << __LINE__ << ", testing widget " << # button << " of view " << view->GetNameOfClass() << \
+ ": "; \
+ if (view->button->active() && (view->button->callback())) \
+ { \
+ std::cout << " active, triggering callback." << std::endl; \
+ view->button->do_callback(view->button); \
+ Fl::check(); \
+ } \
+ else \
+ { \
+ std::cout << "inactive." << std::endl; \
+ } \
+ }
-#define otbTestMenuItemCallback(view,menubar,button)\
- { \
- std::cout<<"Line "<<__LINE__<<", testing menu item "<<#button<<" from menu bar "<<#menubar<<" of view "<< view->GetNameOfClass()<<": ";\
- if(view->button->active() && (view->button->callback()))\
- {\
- std::cout<<" active, triggering callback."<<std::endl;\
- view->button->do_callback(view->menubar);\
- Fl::check();\
- }\
- else \
- {\
- std::cout<<"inactive."<<std::endl; \
- }\
- }
+#define otbTestMenuItemCallback(view, menubar, button) \
+ { \
+ std::cout << "Line " << __LINE__ << ", testing menu item " << # button << " from menu bar " << # menubar << \
+ " of view " << view->GetNameOfClass() << ": "; \
+ if (view->button->active() && (view->button->callback())) \
+ { \
+ std::cout << " active, triggering callback." << std::endl; \
+ view->button->do_callback(view->menubar); \
+ Fl::check(); \
+ } \
+ else \
+ { \
+ std::cout << "inactive." << std::endl; \
+ } \
+ }
#else
#define otbFlRunMacro(condition)
#define otbRunningMacro()
-#define otbTestCallbackWithValue(view,button,button_value)
-#define otbTestCallback(view,button)
-#define otbTestMenuItemCallback(view,menubar,button)
-
+#define otbTestCallbackWithValue(view, button, button_value)
+#define otbTestCallback(view, button)
+#define otbTestMenuItemCallback(view, menubar, button)
#endif
-
namespace otb
{
@@ -298,13 +298,13 @@ namespace otb
* portability.
*/
#if !defined(ITK_NO_ANSI_STRING_STREAM)
-class StringStream: public std::stringstream
+class StringStream : public std::stringstream
{
public:
StringStream() {}
private:
StringStream(const StringStream&);
- void operator=(const StringStream&);
+ void operator =(const StringStream&);
};
#else
namespace StringStreamDetail
@@ -312,7 +312,7 @@ namespace StringStreamDetail
class Cleanup
{
public:
- Cleanup(std::strstream& ostr): m_StrStream(ostr) {}
+ Cleanup(std::strstream& ostr) : m_StrStream(ostr) {}
virtual ~Cleanup()
{
m_StrStream.rdbuf()->freeze(0);
@@ -321,9 +321,9 @@ public:
protected:
std::strstream& m_StrStream;
};
-}//namespace OStringStreamDetail
+} //namespace OStringStreamDetail
-class StringStream: public std::strstream
+class StringStream : public std::strstream
{
public:
typedef std::strstream Superclass;
@@ -332,19 +332,16 @@ public:
{
StringStreamDetail::Cleanup cleanup(*this);
StringStreamDetail::Cleanup::IgnoreUnusedVariable(cleanup);
- int pcount = this->pcount();
+ int pcount = this->pcount();
const char* ptr = this->Superclass::str();
- return std::string(ptr?ptr:"", pcount);
+ return std::string(ptr ? ptr : "", pcount);
}
private:
StringStream(const StringStream&);
- void operator=(const StringStream&);
+ void operator =(const StringStream&);
};
#endif
-
-}//namespace otb
+} //namespace otb
#endif //end of otbMacro.h
-
-
diff --git a/Code/Common/otbMath.h b/Code/Common/otbMath.h
index 063af5b36b..979d294cf0 100644
--- a/Code/Common/otbMath.h
+++ b/Code/Common/otbMath.h
@@ -27,14 +27,13 @@
#include "vcl_cmath.h"
-namespace otb{
+namespace otb {
// For Windows MSVC, defines these macros.
#ifdef _USE_MATH_DEFINES
#define _MATH_DEFINES_DEFINED
#endif
-
/** Define constants if not define in the "vcl_cmath.h" */
/* Some useful constants. */
diff --git a/Code/Common/otbMirrorBoundaryCondition.h b/Code/Common/otbMirrorBoundaryCondition.h
index fd3b68ee53..fbe04c9f73 100644
--- a/Code/Common/otbMirrorBoundaryCondition.h
+++ b/Code/Common/otbMirrorBoundaryCondition.h
@@ -39,43 +39,43 @@ namespace otb
* \ingroup ImageObjects
*/
template<class TImage>
-class ITK_EXPORT MirrorBoundaryCondition
- : public itk::ImageBoundaryCondition<TImage>
+class ITK_EXPORT MirrorBoundaryCondition
+ : public itk::ImageBoundaryCondition<TImage>
{
public:
/** Standard class typedefs. */
- typedef MirrorBoundaryCondition Self;
+ typedef MirrorBoundaryCondition Self;
typedef itk::ImageBoundaryCondition<TImage> Superclass;
/** Extract information from the image type. */
- typedef typename Superclass::PixelType PixelType;
+ typedef typename Superclass::PixelType PixelType;
typedef typename Superclass::PixelPointerType PixelPointerType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::OffsetType OffsetType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::OffsetType OffsetType;
typedef typename Superclass::NeighborhoodType NeighborhoodType;
typedef typename Superclass::NeighborhoodAccessorFunctorType
NeighborhoodAccessorFunctorType;
/** Extract information from the image type. */
- itkStaticConstMacro(ImageDimension, unsigned int,Superclass::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, Superclass::ImageDimension);
/** Default constructor. */
MirrorBoundaryCondition() {}
/** Computes and returns a neighborhood of appropriate values from
* neighborhood iterator data.. */
- virtual PixelType operator()(const OffsetType& point_index,
- const OffsetType& boundary_offset,
- const NeighborhoodType *data) const;
+ virtual PixelType operator ()(const OffsetType& point_index,
+ const OffsetType& boundary_offset,
+ const NeighborhoodType *data) const;
/** Computes and returns the appropriate pixel value from
* neighborhood iterator data, using the functor. */
- virtual PixelType operator()(
+ virtual PixelType operator ()(
const OffsetType& point_index,
const OffsetType& boundary_offset,
const NeighborhoodType *data,
- const NeighborhoodAccessorFunctorType &neighborhoodAccessorFunctor) const;
+ const NeighborhoodAccessorFunctorType& neighborhoodAccessorFunctor) const;
};
} // end namespace itk
diff --git a/Code/Common/otbMirrorBoundaryCondition.txx b/Code/Common/otbMirrorBoundaryCondition.txx
index 1f7ed88bf9..3eb5dad064 100644
--- a/Code/Common/otbMirrorBoundaryCondition.txx
+++ b/Code/Common/otbMirrorBoundaryCondition.txx
@@ -27,24 +27,24 @@ namespace otb
template<class TImage>
typename MirrorBoundaryCondition<TImage>::PixelType
MirrorBoundaryCondition<TImage>
-::operator()(const OffsetType& point_index, const OffsetType& boundary_offset,
- const NeighborhoodType *data) const
+::operator() (const OffsetType &point_index, const OffsetType &boundary_offset,
+ const NeighborhoodType * data) const
{
typedef typename OffsetType::OffsetValueType OffsetValueType;
const itk::ConstNeighborhoodIterator<TImage> * iterator
- = dynamic_cast<const itk::ConstNeighborhoodIterator<TImage> *>(data);
+ = dynamic_cast<const itk::ConstNeighborhoodIterator<TImage> *>(data);
typename TImage::InternalPixelType *ptr;
- int linear_index = 0;
- unsigned int i;
+ int linear_index = 0;
+ unsigned int i;
// Find the pointer of the closest boundary pixel
// Return the value of the pixel at the closest boundary point.
for (i = 0; i < ImageDimension; ++i)
- {
+ {
linear_index += (point_index[i] + boundary_offset[i]) * data->GetStride(i);
- }
- ptr =data->operator[](linear_index);
+ }
+ ptr = data->operator[] (linear_index);
// Wrap the pointer around the image in the necessary dimensions. If we have
// reached this point, we can assume that we are on the edge of the BUFFERED
@@ -53,25 +53,24 @@ MirrorBoundaryCondition<TImage>
// These are the step sizes for increments in each dimension of the image.
const typename TImage::OffsetValueType * offset_table
- = iterator->GetImagePointer()->GetOffsetTable();
-
+ = iterator->GetImagePointer()->GetOffsetTable();
for (i = 0; i < ImageDimension; ++i)
- {
- if (boundary_offset[i] != 0)
{
+ if (boundary_offset[i] != 0)
+ {
// If the neighborhood overlaps on the low edge, then wrap from the
// high edge of the image.
if (point_index[i] < static_cast<OffsetValueType>(iterator->GetRadius(i)))
- {
+ {
ptr += boundary_offset[i] * offset_table[i];
- }
+ }
else // wrap from the low side of the image
- {
+ {
ptr -= boundary_offset[i] * offset_table[i];
+ }
}
}
- }
return *reinterpret_cast<PixelType *>(ptr);
}
@@ -79,28 +78,27 @@ MirrorBoundaryCondition<TImage>
template<class TImage>
typename MirrorBoundaryCondition<TImage>::PixelType
MirrorBoundaryCondition<TImage>
-::operator()(const OffsetType& point_index, const OffsetType& boundary_offset,
- const NeighborhoodType *data,
- const NeighborhoodAccessorFunctorType &neighborhoodAccessorFunctor) const
+::operator() (const OffsetType &point_index, const OffsetType &boundary_offset,
+ const NeighborhoodType * data,
+ const NeighborhoodAccessorFunctorType &neighborhoodAccessorFunctor) const
{
typedef typename OffsetType::OffsetValueType OffsetValueType;
const itk::ConstNeighborhoodIterator<TImage> * iterator
- = dynamic_cast<const itk::ConstNeighborhoodIterator<TImage> *>(data);
+ = dynamic_cast<const itk::ConstNeighborhoodIterator<TImage> *>(data);
typename TImage::InternalPixelType *ptr;
- int linear_index = 0;
- unsigned int i;
+ int linear_index = 0;
+ unsigned int i;
// Find the pointer of the closest boundary pixel
// std::cout << "Boundary offset = " << boundary_offset << std::endl;
// std::cout << "point index = " << point_index << std::endl;
-
// Return the value of the pixel at the closest boundary point.
for (i = 0; i < ImageDimension; ++i)
- {
+ {
linear_index += (point_index[i] + boundary_offset[i]) * data->GetStride(i);
- }
- ptr = data->operator[](linear_index);
+ }
+ ptr = data->operator[] (linear_index);
// Wrap the pointer around the image in the necessary dimensions. If we have
// reached this point, we can assume that we are on the edge of the BUFFERED
@@ -109,25 +107,24 @@ MirrorBoundaryCondition<TImage>
// These are the step sizes for increments in each dimension of the image.
const typename TImage::OffsetValueType * offset_table
- = iterator->GetImagePointer()->GetOffsetTable();
-
+ = iterator->GetImagePointer()->GetOffsetTable();
for (i = 0; i < ImageDimension; ++i)
- {
- if (boundary_offset[i] != 0)
{
+ if (boundary_offset[i] != 0)
+ {
// If the neighborhood overlaps on the low edge, then wrap from the
// high edge of the image.
if (point_index[i] < static_cast<OffsetValueType>(iterator->GetRadius(i)))
- {
+ {
ptr += boundary_offset[i] * offset_table[i];
- }
+ }
else // wrap from the low side of the image
- {
+ {
ptr -= boundary_offset[i] * offset_table[i];
+ }
}
}
- }
return neighborhoodAccessorFunctor.Get(ptr);
}
diff --git a/Code/Common/otbMultiChannelExtractROI.h b/Code/Common/otbMultiChannelExtractROI.h
index 41be14acb2..8ac8d3855f 100644
--- a/Code/Common/otbMultiChannelExtractROI.h
+++ b/Code/Common/otbMultiChannelExtractROI.h
@@ -38,15 +38,15 @@ namespace otb
* \note The image manipulated inside this class are of type otb::VectorImage.
*/
template <class TInputPixelType, class TOutputPixelType>
-class ITK_EXPORT MultiChannelExtractROI:
- public ExtractROIBase< VectorImage<TInputPixelType,2> , VectorImage<TOutputPixelType,2> >
+class ITK_EXPORT MultiChannelExtractROI :
+ public ExtractROIBase<VectorImage<TInputPixelType, 2>, VectorImage<TOutputPixelType, 2> >
{
public:
/** Standard class typedefs. */
- typedef MultiChannelExtractROI Self;
- typedef ExtractROIBase< VectorImage<TInputPixelType,2> , VectorImage<TOutputPixelType,2> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MultiChannelExtractROI Self;
+ typedef ExtractROIBase<VectorImage<TInputPixelType, 2>, VectorImage<TOutputPixelType, 2> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -55,30 +55,30 @@ public:
itkTypeMacro(MultiChannelExtractROI, ExtractROIBase);
/** Image type information. */
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::OutputImageType OutputImageType;
/** Pixel type information */
- typedef typename OutputImageType::InternalPixelType OutputValueType;
+ typedef typename OutputImageType::InternalPixelType OutputValueType;
/** Typedef to describe the output and input image region types. */
typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
/** Typedef to describe the type of pixel. */
typedef typename OutputImageType::PixelType OutputImagePixelType;
- typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
/** Typedef to describe the output and input image index and size types. */
typedef typename OutputImageType::IndexType OutputImageIndexType;
- typedef typename InputImageType::IndexType InputImageIndexType;
- typedef typename OutputImageType::SizeType OutputImageSizeType;
- typedef typename InputImageType::SizeType InputImageSizeType;
+ typedef typename InputImageType::IndexType InputImageIndexType;
+ typedef typename OutputImageType::SizeType OutputImageSizeType;
+ typedef typename InputImageType::SizeType InputImageSizeType;
void SetFirstChannel(unsigned int id);
- itkGetConstMacro(FirstChannel,unsigned int);
+ itkGetConstMacro(FirstChannel, unsigned int);
void SetLastChannel(unsigned int id);
- itkGetConstMacro(LastChannel,unsigned int);
+ itkGetConstMacro(LastChannel, unsigned int);
/** MultiChannelExtractROI can produce an image which is a different
* resolution than its input image. As such, MultiChannelExtractROI
@@ -94,13 +94,13 @@ public:
typedef typename std::vector<unsigned int> ChannelsType;
/** \return The list of processed channels */
- ChannelsType GetChannels()const
+ ChannelsType GetChannels() const
{
return (m_Channels);
}
/** \return The number of processed channels */
- unsigned int GetNbChannels()const
+ unsigned int GetNbChannels() const
{
return (m_Channels.size());
}
@@ -120,7 +120,7 @@ public:
protected:
MultiChannelExtractROI();
- virtual ~MultiChannelExtractROI() {};
+ virtual ~MultiChannelExtractROI() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Reinitialize channels vector for multiple Update.*/
@@ -132,25 +132,23 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
-
+ int threadId);
private:
- MultiChannelExtractROI(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MultiChannelExtractROI(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** First/ last channel to process [1...] */
- unsigned int m_FirstChannel;
- unsigned int m_LastChannel;
+ unsigned int m_FirstChannel;
+ unsigned int m_LastChannel;
/** List of channels to process [1...] */
- ChannelsType m_Channels;
+ ChannelsType m_Channels;
/** List of channels actually being processed [1...] */
- ChannelsType m_ChannelsWorks;
+ ChannelsType m_ChannelsWorks;
/** Used to know if the user has set m_First/LastChannel (1) or m_Channels (3)*/
int m_ChannelsKind;
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Common/otbMultiChannelExtractROI.txx b/Code/Common/otbMultiChannelExtractROI.txx
index 11034a8b7e..2d216ee09f 100644
--- a/Code/Common/otbMultiChannelExtractROI.txx
+++ b/Code/Common/otbMultiChannelExtractROI.txx
@@ -26,7 +26,6 @@
#include "itkExtractImageFilterRegionCopier.h"
#include "itkProgressReporter.h"
-
namespace otb
{
@@ -34,80 +33,76 @@ namespace otb
*
*/
template<class TInputPixelType, class TOutputPixelType>
-MultiChannelExtractROI<TInputPixelType,TOutputPixelType>
+MultiChannelExtractROI<TInputPixelType, TOutputPixelType>
::MultiChannelExtractROI() :
- ExtractROIBase< VectorImage<TInputPixelType,2> , VectorImage<TOutputPixelType,2> >(),
- m_FirstChannel(0),
- m_LastChannel(0),
- m_ChannelsKind(0)
+ ExtractROIBase<VectorImage<TInputPixelType, 2>, VectorImage<TOutputPixelType, 2> >(),
+ m_FirstChannel(0),
+ m_LastChannel(0),
+ m_ChannelsKind(0)
{
ClearChannels();
}
-
/**
*
*/
template<class TInputPixelType, class TOutputPixelType>
void
-MultiChannelExtractROI<TInputPixelType,TOutputPixelType>
+MultiChannelExtractROI<TInputPixelType, TOutputPixelType>
::SetChannel(unsigned int channel)
{
- if (m_ChannelsKind==1)
- {
+ if (m_ChannelsKind == 1)
+ {
itkExceptionMacro(<< "m_Channels already set using channels interval.");
- }
- m_Channels.push_back( channel );
- if (m_ChannelsKind==0)
- {
+ }
+ m_Channels.push_back(channel);
+ if (m_ChannelsKind == 0)
+ {
m_ChannelsKind = 2;
- }
+ }
this->Modified();
}
-
template<class TInputPixelType, class TOutputPixelType>
void
-MultiChannelExtractROI<TInputPixelType,TOutputPixelType>
+MultiChannelExtractROI<TInputPixelType, TOutputPixelType>
::SetFirstChannel(unsigned int id)
{
- if (m_ChannelsKind==2)
- {
+ if (m_ChannelsKind == 2)
+ {
itkExceptionMacro(<< "m_Channels already set using SetChannels method.");
- }
+ }
m_FirstChannel = id;
- if (m_ChannelsKind==0)
- {
+ if (m_ChannelsKind == 0)
+ {
m_ChannelsKind = 1;
- }
+ }
this->Modified();
}
-
template<class TInputPixelType, class TOutputPixelType>
void
-MultiChannelExtractROI<TInputPixelType,TOutputPixelType>
+MultiChannelExtractROI<TInputPixelType, TOutputPixelType>
::SetLastChannel(unsigned int id)
{
- if (m_ChannelsKind==2)
- {
+ if (m_ChannelsKind == 2)
+ {
itkExceptionMacro(<< "m_Channels already set using SetChannels method.");
- }
+ }
m_LastChannel = id;
- if (m_ChannelsKind==0)
- {
+ if (m_ChannelsKind == 0)
+ {
m_ChannelsKind = 1;
- }
+ }
this->Modified();
}
-
/**
*
*/
template<class TInputPixelType, class TOutputPixelType>
void
-MultiChannelExtractROI<TInputPixelType,TOutputPixelType>
+MultiChannelExtractROI<TInputPixelType, TOutputPixelType>
::ClearChannels(void)
{
m_FirstChannel = 0;
@@ -117,90 +112,87 @@ MultiChannelExtractROI<TInputPixelType,TOutputPixelType>
m_ChannelsWorks.clear();
}
-
/**
*
*/
template<class TInputPixelType, class TOutputPixelType>
void
-MultiChannelExtractROI<TInputPixelType,TOutputPixelType>
+MultiChannelExtractROI<TInputPixelType, TOutputPixelType>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
template<class TInputPixelType, class TOutputPixelType>
void
-MultiChannelExtractROI<TInputPixelType,TOutputPixelType>
+MultiChannelExtractROI<TInputPixelType, TOutputPixelType>
::ChannelsReInitialization()
{
// The following conditions can be gathered but we'd loose in comprehension
m_ChannelsWorks.clear();
// First passage in the method:
- if ( m_Channels.empty() == true )
- {
- // - User SetFirst/LastChannel()
- if ( m_ChannelsKind == 1)
+ if (m_Channels.empty() == true)
{
+ // - User SetFirst/LastChannel()
+ if (m_ChannelsKind == 1)
+ {
this->SetChannelsWorkWithLimits();
- }
+ }
else
- {
- // - User called SetChannels()
- if ( m_Channels.empty() == true && m_ChannelsKind == 2)
{
+ // - User called SetChannels()
+ if (m_Channels.empty() == true && m_ChannelsKind == 2)
+ {
m_ChannelsWorks = m_Channels;
+ }
}
}
- }
// Second passage in the method: Update already donne
else
- {
- // - User SetFirst/LastChannel()
- if ( m_ChannelsKind == 1)
{
+ // - User SetFirst/LastChannel()
+ if (m_ChannelsKind == 1)
+ {
m_Channels.clear();
this->SetChannelsWorkWithLimits();
- }
+ }
else
- {
- // - User called SetChannels()
- if ( m_ChannelsKind == 2)
{
+ // - User called SetChannels()
+ if (m_ChannelsKind == 2)
+ {
m_ChannelsWorks = m_Channels;
+ }
}
}
- }
}
template<class TInputPixelType, class TOutputPixelType>
void
-MultiChannelExtractROI<TInputPixelType,TOutputPixelType>
+MultiChannelExtractROI<TInputPixelType, TOutputPixelType>
::SetChannelsWorkWithLimits()
{
if ((m_FirstChannel == 0) || (m_LastChannel == 0))
- {
+ {
itkExceptionMacro(<< "otb::ExtractImageFilter::GenerateOutputInformation "
<< "Channels must reside into [1...] "
- << typeid(itk::ImageBase<InputImageDimension>*).name() );
- }
- if ( m_FirstChannel > m_LastChannel )
- {
+ << typeid(itk::ImageBase<InputImageDimension>*).name());
+ }
+ if (m_FirstChannel > m_LastChannel)
+ {
itkExceptionMacro(<< "otb::ExtractImageFilter::GenerateOutputInformation "
<< "FirstChannel is greater than LastChannel"
- << typeid(itk::ImageBase<InputImageDimension>*).name() );
- }
+ << typeid(itk::ImageBase<InputImageDimension>*).name());
+ }
- for ( unsigned int channel = m_FirstChannel; channel <= m_LastChannel; channel ++ )
- {
+ for (unsigned int channel = m_FirstChannel; channel <= m_LastChannel; channel++)
+ {
m_ChannelsWorks.push_back(channel);
- }
+ }
m_Channels = m_ChannelsWorks;
}
-
/**
* ExtractImageFilter can produce an image which is a different resolution
* than its input image. As such, ExtractImageFilter needs to provide an
@@ -212,69 +204,65 @@ MultiChannelExtractROI<TInputPixelType,TOutputPixelType>
*/
template<class TInputPixelType, class TOutputPixelType>
void
-MultiChannelExtractROI<TInputPixelType,TOutputPixelType>
+MultiChannelExtractROI<TInputPixelType, TOutputPixelType>
::GenerateOutputInformation()
{
// Call to the superclass implementation
Superclass::GenerateOutputInformation();
this->ChannelsReInitialization();
- typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
-
+ typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
unsigned int nbComponentsPerPixel = inputPtr->GetNumberOfComponentsPerPixel();
- if ( m_ChannelsKind != 0 )
- {
+ if (m_ChannelsKind != 0)
+ {
// Test if the asked channels index exists in the input image
- ChannelsType m_BadChannels;
+ ChannelsType m_BadChannels;
m_BadChannels.clear();
- for (unsigned int i=0; i < m_ChannelsWorks.size(); ++i)
- {
- if ( ( m_ChannelsWorks[i] < 1 )||(m_ChannelsWorks[i] > nbComponentsPerPixel) )
+ for (unsigned int i = 0; i < m_ChannelsWorks.size(); ++i)
{
- bool isInsideBadChannels = false;
- for (unsigned int j=0; j < m_BadChannels.size(); ++j)
+ if ((m_ChannelsWorks[i] < 1) || (m_ChannelsWorks[i] > nbComponentsPerPixel))
{
- if ( m_BadChannels[j]==m_ChannelsWorks[i] )
- isInsideBadChannels = true;
+ bool isInsideBadChannels = false;
+ for (unsigned int j = 0; j < m_BadChannels.size(); ++j)
+ {
+ if (m_BadChannels[j] == m_ChannelsWorks[i]) isInsideBadChannels = true;
+ }
+ if (!isInsideBadChannels) m_BadChannels.push_back(m_ChannelsWorks[i]);
}
- if ( !isInsideBadChannels)
- m_BadChannels.push_back(m_ChannelsWorks[i]);
}
- }
- if ( m_BadChannels.empty() == false )
- {
+ if (m_BadChannels.empty() == false)
+ {
itk::OStringStream oss;
oss << "otb::ExtractImageFilter::GenerateOutputInformation : ";
oss << "Channel(s) [ ";
- for (unsigned int i=0; i < m_BadChannels.size(); ++i)
- {
+ for (unsigned int i = 0; i < m_BadChannels.size(); ++i)
+ {
oss << m_BadChannels[i] << " ";
- }
+ }
oss << "] not authorized.";
oss << " Each channel index has to be in [1," << nbComponentsPerPixel << "].";
itkExceptionMacro(<< oss.str().c_str());
- }
+ }
nbComponentsPerPixel = m_ChannelsWorks.size();
- }
+ }
// initialize the number of channels of the output image
- outputPtr->SetNumberOfComponentsPerPixel( nbComponentsPerPixel );
+ outputPtr->SetNumberOfComponentsPerPixel(nbComponentsPerPixel);
}
-
template<class TInputPixelType, class TOutputPixelType>
void
-MultiChannelExtractROI<TInputPixelType,TOutputPixelType>
+MultiChannelExtractROI<TInputPixelType, TOutputPixelType>
::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
int threadId)
{
- itkDebugMacro(<<"Actually executing");
+ itkDebugMacro(<< "Actually executing");
// Get the input and output pointers
- typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
@@ -284,7 +272,7 @@ MultiChannelExtractROI<TInputPixelType,TOutputPixelType>
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
// Define the iterators.
- typedef itk::ImageRegionIterator<OutputImageType> OutputIterator;
+ typedef itk::ImageRegionIterator<OutputImageType> OutputIterator;
typedef itk::ImageRegionConstIterator<InputImageType> InputIterator;
OutputIterator outIt(outputPtr, outputRegionForThread);
@@ -294,47 +282,46 @@ MultiChannelExtractROI<TInputPixelType,TOutputPixelType>
inIt.GoToBegin();
// if default behaviour
- if ( m_ChannelsKind == 0 )
- {
- // walk the output region, and sample the input image
- while ( !outIt.IsAtEnd() )
+ if (m_ChannelsKind == 0)
{
- outIt.Set( inIt.Get() );
+ // walk the output region, and sample the input image
+ while (!outIt.IsAtEnd())
+ {
+ outIt.Set(inIt.Get());
++outIt;
++inIt;
progress.CompletedPixel();
+ }
}
- }
// Specific behaviour
else
- {
+ {
// for each channel to process
unsigned int channelIn(0);
unsigned int channelOut(0);
unsigned int nbChannels(0);
- InputImagePixelType pixelInput;
- while ( !outIt.IsAtEnd() )
- {
+ InputImagePixelType pixelInput;
+ while (!outIt.IsAtEnd())
+ {
OutputImagePixelType pixelOutput;
- pixelOutput.Reserve( outputPtr->GetVectorLength() );
+ pixelOutput.Reserve(outputPtr->GetVectorLength());
pixelInput = inIt.Get();
channelOut = 0;
- for ( nbChannels = 0; nbChannels < m_ChannelsWorks.size(); ++nbChannels)
- {
+ for (nbChannels = 0; nbChannels < m_ChannelsWorks.size(); ++nbChannels)
+ {
channelIn = m_ChannelsWorks[nbChannels] - 1;
pixelOutput[channelOut] = static_cast<OutputValueType>(pixelInput[channelIn]);
channelOut++;
- }
- outIt.Set( pixelOutput );
+ }
+ outIt.Set(pixelOutput);
++outIt;
++inIt;
progress.CompletedPixel();
+ }
}
- }
}
-
} // end namespace otb
#endif
diff --git a/Code/Common/otbMultiToMonoChannelExtractROI.h b/Code/Common/otbMultiToMonoChannelExtractROI.h
index f81a0e5c2d..501e37b667 100644
--- a/Code/Common/otbMultiToMonoChannelExtractROI.h
+++ b/Code/Common/otbMultiToMonoChannelExtractROI.h
@@ -37,17 +37,17 @@ namespace otb
* The input image has to be an otb::VectorImage, whereas the output image has to be an otb::Image.
*/
template <class TInputPixelType, class TOutputPixelType>
-class ITK_EXPORT MultiToMonoChannelExtractROI:
+class ITK_EXPORT MultiToMonoChannelExtractROI :
// public ExtractROIBase< itk::VectorImage<TInputPixelType,2> , itk::Image<TOutputPixelType,2> >
- public ExtractROIBase< VectorImage<TInputPixelType,2> , Image<TOutputPixelType,2> >
+ public ExtractROIBase<VectorImage<TInputPixelType, 2>, Image<TOutputPixelType, 2> >
{
public:
/** Standard class typedefs. */
- typedef MultiToMonoChannelExtractROI Self;
+ typedef MultiToMonoChannelExtractROI Self;
// typedef ExtractROIBase< itk::VectorImage<TInputPixelType,2> , itk::Image<TOutputPixelType,2> > Superclass;
- typedef ExtractROIBase< VectorImage<TInputPixelType,2> , Image<TOutputPixelType,2> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ExtractROIBase<VectorImage<TInputPixelType, 2>, Image<TOutputPixelType, 2> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -56,29 +56,29 @@ public:
itkTypeMacro(MultiToMonoChannelExtractROI, ExtractROIBase);
/** Image type information. */
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::OutputImageType OutputImageType;
/** Pixel type information */
- typedef typename OutputImageType::ValueType OutputValueType;
+ typedef typename OutputImageType::ValueType OutputValueType;
/** Typedef to describe the output and input image region types. */
typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
/** Typedef to describe the type of pixel. */
typedef typename OutputImageType::PixelType OutputImagePixelType;
- typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
/** Typedef to describe the output and input image index and size types. */
typedef typename OutputImageType::IndexType OutputImageIndexType;
- typedef typename InputImageType::IndexType InputImageIndexType;
- typedef typename OutputImageType::SizeType OutputImageSizeType;
- typedef typename InputImageType::SizeType InputImageSizeType;
+ typedef typename InputImageType::IndexType InputImageIndexType;
+ typedef typename OutputImageType::SizeType OutputImageSizeType;
+ typedef typename InputImageType::SizeType InputImageSizeType;
/** Selectionne le canal a traiter */
- itkSetMacro(Channel,unsigned int);
- itkGetConstMacro(Channel,unsigned int);
+ itkSetMacro(Channel, unsigned int);
+ itkGetConstMacro(Channel, unsigned int);
/** ImageDimension enumeration */
itkStaticConstMacro(InputImageDimension, unsigned int,
@@ -88,7 +88,7 @@ public:
protected:
MultiToMonoChannelExtractROI();
- virtual ~MultiToMonoChannelExtractROI() {};
+ virtual ~MultiToMonoChannelExtractROI() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** ExtractImageFilter can produce an image which is a different
@@ -105,17 +105,16 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
private:
- MultiToMonoChannelExtractROI(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MultiToMonoChannelExtractROI(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Channel to process [1...] */
- unsigned int m_Channel;
+ unsigned int m_Channel;
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Common/otbMultiToMonoChannelExtractROI.txx b/Code/Common/otbMultiToMonoChannelExtractROI.txx
index 12f64bcdb8..d426845e63 100644
--- a/Code/Common/otbMultiToMonoChannelExtractROI.txx
+++ b/Code/Common/otbMultiToMonoChannelExtractROI.txx
@@ -27,9 +27,9 @@ namespace otb
*
*/
template<class TInputPixelType, class TOutputPixelType>
-MultiToMonoChannelExtractROI<TInputPixelType,TOutputPixelType>
-::MultiToMonoChannelExtractROI() : ExtractROIBase< VectorImage<TInputPixelType,2> , Image<TOutputPixelType,2> >(),
- m_Channel(1)
+MultiToMonoChannelExtractROI<TInputPixelType, TOutputPixelType>
+::MultiToMonoChannelExtractROI() : ExtractROIBase<VectorImage<TInputPixelType, 2>, Image<TOutputPixelType, 2> >(),
+ m_Channel(1)
{
}
@@ -39,13 +39,12 @@ MultiToMonoChannelExtractROI<TInputPixelType,TOutputPixelType>
*/
template<class TInputPixelType, class TOutputPixelType>
void
-MultiToMonoChannelExtractROI<TInputPixelType,TOutputPixelType>
+MultiToMonoChannelExtractROI<TInputPixelType, TOutputPixelType>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
/**
* ExtractImageFilter can produce an image which is a different resolution
* than its input image. As such, ExtractImageFilter needs to provide an
@@ -57,34 +56,33 @@ MultiToMonoChannelExtractROI<TInputPixelType,TOutputPixelType>
*/
template<class TInputPixelType, class TOutputPixelType>
void
-MultiToMonoChannelExtractROI<TInputPixelType,TOutputPixelType>
+MultiToMonoChannelExtractROI<TInputPixelType, TOutputPixelType>
::GenerateOutputInformation()
{
- typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
+ typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
// Bounds checking for the channel to process
- if ( (m_Channel <= 0) || (m_Channel > inputPtr->GetVectorLength() ) )
- {
+ if ((m_Channel <= 0) || (m_Channel > inputPtr->GetVectorLength()))
+ {
itkExceptionMacro(<< "otb::MultiToMonoChannelExtractROI::GenerateOutputInformation "
- << "The selected channel must in the range [1;"<<inputPtr->GetVectorLength()<<"] "
- << typeid(itk::ImageBase<InputImageDimension>*).name() );
- }
+ << "The selected channel must in the range [1;" << inputPtr->GetVectorLength() << "] "
+ << typeid(itk::ImageBase<InputImageDimension>*).name());
+ }
// Calling the superclass method
Superclass::GenerateOutputInformation();
}
-
template<class TInputPixelType, class TOutputPixelType>
void
-MultiToMonoChannelExtractROI<TInputPixelType,TOutputPixelType>
+MultiToMonoChannelExtractROI<TInputPixelType, TOutputPixelType>
::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
int threadId)
{
- itkDebugMacro(<<"Actually executing");
+ itkDebugMacro(<< "Actually executing");
// Get the input and output pointers
- typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
@@ -94,30 +92,29 @@ MultiToMonoChannelExtractROI<TInputPixelType,TOutputPixelType>
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
// Define the iterators.
- typedef itk::ImageRegionIterator<OutputImageType> OutputIterator;
+ typedef itk::ImageRegionIterator<OutputImageType> OutputIterator;
typedef itk::ImageRegionConstIterator<InputImageType> InputIterator;
OutputIterator outIt(outputPtr, outputRegionForThread);
InputIterator inIt(inputPtr, inputRegionForThread);
// Parcours des canaux a traiter
- unsigned int channelIn(m_Channel-1);
+ unsigned int channelIn(m_Channel - 1);
- InputImagePixelType pixelInput;
- while ( !outIt.IsAtEnd() )
- {
+ InputImagePixelType pixelInput;
+ while (!outIt.IsAtEnd())
+ {
OutputImagePixelType pixelOutput;
pixelInput = inIt.Get();
pixelOutput = static_cast<OutputValueType>(pixelInput[channelIn]);
- outIt.Set( pixelOutput );
+ outIt.Set(pixelOutput);
++outIt;
++inIt;
progress.CompletedPixel();
- }
+ }
}
-
} // end namespace otb
#endif
diff --git a/Code/Common/otbObjectList.h b/Code/Common/otbObjectList.h
index 02ad0195fa..8d91617664 100644
--- a/Code/Common/otbObjectList.h
+++ b/Code/Common/otbObjectList.h
@@ -39,21 +39,21 @@ class ITK_EXPORT ObjectList : public itk::DataObject
{
public:
/** Standard typedefs */
- typedef ObjectList Self;
- typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ObjectList Self;
+ typedef itk::DataObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
- itkTypeMacro(ObjectList,DataObject);
+ itkTypeMacro(ObjectList, DataObject);
/** Creation through object factory macro */
itkNewMacro(Self);
/** Template parameter typedefs */
- typedef TObject ObjectType;
- typedef itk::SmartPointer<ObjectType> ObjectPointerType;
- typedef std::vector<ObjectPointerType> InternalContainerType;
+ typedef TObject ObjectType;
+ typedef itk::SmartPointer<ObjectType> ObjectPointerType;
+ typedef std::vector<ObjectPointerType> InternalContainerType;
/**
* Set the minimum capacity of the vector.
@@ -131,21 +131,20 @@ public:
* \param position A random access iterator
* \return An iterator that points to the newly insereted element.
*/
- Iterator Insert ( Iterator position, ObjectPointerType element );
+ Iterator Insert(Iterator position, ObjectPointerType element);
/**
* Insert an element at a given position
* \param position A reverse iterator
* \return A reverse iterator that points to the newly insereted element.
*/
- ReverseIterator Insert ( ReverseIterator position, ObjectPointerType element );
-
+ ReverseIterator Insert(ReverseIterator position, ObjectPointerType element);
/** \class Iterator
* \brief Iterator of the object list.
*/
class ITK_EXPORT Iterator
{
- public:
+public:
friend class ObjectList;
friend class ConstIterator;
/** typedef of the internal iterator */
@@ -154,9 +153,9 @@ public:
Iterator() {};
/** Constructor with iternal iterator parameter */
Iterator(InternalIteratorType iter)
- {
- m_Iter=iter;
- };
+ {
+ m_Iter = iter;
+ };
/**
* Get the current object.
* \return The current object pointed by the iterator.
@@ -164,11 +163,11 @@ public:
ObjectPointerType Get(void)
{
return (*m_Iter);
- };
+ }
/**
* Set the current object
*/
- void Set ( ObjectPointerType element )
+ void Set(ObjectPointerType element)
{
(*m_Iter) = element;
this->Modified();
@@ -176,74 +175,74 @@ public:
/**
* Increment.
*/
- Iterator& operator++()
+ Iterator & operator ++()
{
++m_Iter;
return *this;
- };
+ }
/**
* Decrement.
*/
- Iterator& operator--()
+ Iterator& operator --()
{
--m_Iter;
return *this;
- };
+ }
/**
* Add
*/
- Iterator operator+(int i)
+ Iterator operator +(int i)
{
- Iterator lIter(m_Iter+i);
+ Iterator lIter(m_Iter + i);
return lIter;
- };
+ }
/**
* Remove
*/
- Iterator operator-(int i)
+ Iterator operator -(int i)
{
- Iterator lIter(m_Iter-i);
+ Iterator lIter(m_Iter - i);
return lIter;
- };
+ }
/**
* Difference comparison operator.
*/
- bool operator!=(const Iterator &it)
+ bool operator !=(const Iterator& it)
{
return (m_Iter != it.m_Iter);
- };
+ }
/**
* Equality comparison operator.
*/
- bool operator==(const Iterator &it)
+ bool operator ==(const Iterator& it)
{
return (m_Iter == it.m_Iter);
- };
+ }
/**
* Instantiation operator.
*/
- Iterator& operator=(const Iterator &it)
+ Iterator& operator =(const Iterator& it)
{
m_Iter = it.m_Iter;
return *this;
- };
+ }
/**
* Copy operator.
*/
Iterator(const Iterator &it)
- {
- m_Iter=it.m_Iter;
- };
+ {
+ m_Iter = it.m_Iter;
+ };
/**
* Get the current internal iterator
*/
- InternalIteratorType & GetIter(void)
+ InternalIteratorType& GetIter(void)
{
- return(m_Iter);
+ return (m_Iter);
}
- private:
+private:
// Internal iterator.
InternalIteratorType m_Iter;
};
@@ -252,7 +251,7 @@ public:
*/
class ITK_EXPORT ConstIterator
{
- public:
+public:
friend class ObjectList;
friend class Iterator;
/** typedef of the internal iterator */
@@ -261,9 +260,9 @@ public:
ConstIterator() {};
/** Constructor with iternal iterator parameter */
ConstIterator(InternalConstIteratorType iter)
- {
- m_Iter=iter;
- };
+ {
+ m_Iter = iter;
+ };
/**
* Get the current object.
* \return The current object pointed by the iterator.
@@ -271,69 +270,69 @@ public:
ObjectPointerType Get(void)
{
return (*m_Iter);
- };
+ }
/**
* Increment.
*/
- ConstIterator& operator++()
+ ConstIterator& operator ++()
{
++m_Iter;
return *this;
- };
+ }
/**
* Decrement.
*/
- ConstIterator& operator--()
+ ConstIterator& operator --()
{
--m_Iter;
return *this;
- };
+ }
/**
* Difference comparison operator.
*/
- bool operator!=(const ConstIterator &it)
+ bool operator !=(const ConstIterator& it)
{
return (m_Iter != it.m_Iter);
- };
+ }
/**
* Equality comparison operator.
*/
- bool operator==(const ConstIterator &it)
+ bool operator ==(const ConstIterator& it)
{
return (m_Iter == it.m_Iter);
- };
+ }
/**
* Instantiation operator.
*/
- ConstIterator& operator=(const ConstIterator &it)
+ ConstIterator& operator =(const ConstIterator& it)
{
m_Iter = it.m_Iter;
return *this;
- };
+ }
/**
* Instantiation operator.
*/
- ConstIterator& operator=(const Iterator &it)
+ ConstIterator& operator =(const Iterator& it)
{
m_Iter = it.m_Iter;
return *this;
- };
+ }
/**
* Copy operator.
*/
ConstIterator(const ConstIterator &it)
- {
- m_Iter=it.m_Iter;
- };
+ {
+ m_Iter = it.m_Iter;
+ };
/**
* Copy operator.
*/
ConstIterator(const Iterator &it)
- {
- m_Iter=it.m_Iter;
- };
+ {
+ m_Iter = it.m_Iter;
+ };
- private:
+private:
// Internal iterator.
InternalConstIteratorType m_Iter;
};
@@ -342,7 +341,7 @@ public:
*/
class ITK_EXPORT ReverseIterator
{
- public:
+public:
friend class ObjectList;
friend class Iterator;
@@ -353,9 +352,9 @@ public:
ReverseIterator() {};
/** Constructor with iternal iterator parameter */
ReverseIterator(InternalReverseIteratorType iter)
- {
- m_Iter=iter;
- };
+ {
+ m_Iter = iter;
+ };
/**
* Get the current object.
* \return The current object pointed by the iterator.
@@ -363,69 +362,69 @@ public:
ObjectPointerType Get(void)
{
return (*m_Iter);
- };
+ }
/**
* Set the current object
*/
- void Set ( ObjectPointerType element )
+ void Set(ObjectPointerType element)
{
(*m_Iter) = element;
}
/**
* Increment.
*/
- ReverseIterator& operator++()
+ ReverseIterator & operator ++()
{
++m_Iter;
return *this;
- };
+ }
/**
* Decrement.
*/
- ReverseIterator& operator--()
+ ReverseIterator& operator --()
{
--m_Iter;
return *this;
- };
+ }
/**
* Difference comparison operator.
*/
- bool operator!=(const ReverseIterator &it)
+ bool operator !=(const ReverseIterator& it)
{
return (m_Iter != it.m_Iter);
- };
+ }
/**
* Equality comparison operator.
*/
- bool operator==(const ReverseIterator &it)
+ bool operator ==(const ReverseIterator& it)
{
return (m_Iter == it.m_Iter);
- };
+ }
/**
* Instantiation operator.
*/
- ReverseIterator& operator=(const ReverseIterator &it)
+ ReverseIterator& operator =(const ReverseIterator& it)
{
m_Iter = it.m_Iter;
return *this;
- };
+ }
/**
* Copy operator.
*/
ReverseIterator(const ReverseIterator &it)
- {
- m_Iter=it.m_Iter;
- };
+ {
+ m_Iter = it.m_Iter;
+ };
/**
* Get the current internal iterator
*/
- InternalReverseIteratorType & GetIter(void)
+ InternalReverseIteratorType& GetIter(void)
{
- return(m_Iter);
+ return (m_Iter);
}
- private:
+private:
// Internal iterator.
InternalReverseIteratorType m_Iter;
};
@@ -434,7 +433,7 @@ public:
*/
class ITK_EXPORT ReverseConstIterator
{
- public:
+public:
friend class ObjectList;
friend class Iterator;
friend class ConstIterator;
@@ -445,9 +444,9 @@ public:
ReverseConstIterator() {};
/** Constructor with iternal iterator parameter */
ReverseConstIterator(InternalReverseConstIteratorType iter)
- {
- m_Iter=iter;
- };
+ {
+ m_Iter = iter;
+ };
/**
* Get the current object.
* \return The current object pointed by the iterator.
@@ -455,69 +454,69 @@ public:
ObjectPointerType Get(void)
{
return (*m_Iter);
- };
+ }
/**
* Increment.
*/
- ReverseConstIterator& operator++()
+ ReverseConstIterator& operator ++()
{
++m_Iter;
return *this;
- };
+ }
/**
* Decrement.
*/
- ReverseConstIterator& operator--()
+ ReverseConstIterator& operator --()
{
--m_Iter;
return *this;
- };
+ }
/**
* Difference comparison operator.
*/
- bool operator!=(const ReverseConstIterator &it)
+ bool operator !=(const ReverseConstIterator& it)
{
return (m_Iter != it.m_Iter);
- };
+ }
/**
* Equality comparison operator.
*/
- bool operator==(const ReverseConstIterator &it)
+ bool operator ==(const ReverseConstIterator& it)
{
return (m_Iter == it.m_Iter);
- };
+ }
/**
* Instantiation operator.
*/
- ReverseConstIterator& operator=(const ReverseConstIterator &it)
+ ReverseConstIterator& operator =(const ReverseConstIterator& it)
{
m_Iter = it.m_Iter;
return *this;
- };
+ }
/**
* Instantiation operator.
*/
- ReverseConstIterator& operator=(const ReverseIterator &it)
+ ReverseConstIterator& operator =(const ReverseIterator& it)
{
m_Iter = it.m_Iter;
return *this;
- };
+ }
/**
* Copy operator.
*/
ReverseConstIterator(const ReverseConstIterator &it)
- {
- m_Iter=it.m_Iter;
- };
+ {
+ m_Iter = it.m_Iter;
+ };
/**
* Copy operator.
*/
ReverseConstIterator(const ReverseIterator &it)
- {
- m_Iter=it.m_Iter;
- };
+ {
+ m_Iter = it.m_Iter;
+ };
- private:
+private:
// Internal iterator.
InternalReverseConstIteratorType m_Iter;
};
@@ -578,13 +577,13 @@ protected:
/** Constructor */
ObjectList();
/** Destructor */
- ~ObjectList() {};
+ ~ObjectList() {}
/**PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ObjectList(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ObjectList(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The internal std::vector object container */
InternalContainerType m_InternalContainer;
};
@@ -595,5 +594,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Common/otbObjectList.txx b/Code/Common/otbObjectList.txx
index 020fa7e196..48fca8cf9a 100644
--- a/Code/Common/otbObjectList.txx
+++ b/Code/Common/otbObjectList.txx
@@ -95,11 +95,11 @@ void
ObjectList<TObject>
::PopBack(void)
{
- if ( m_InternalContainer.size() > 0 )
- {
+ if (m_InternalContainer.size() > 0)
+ {
m_InternalContainer.pop_back();
this->Modified();
- }
+ }
}
/**
@@ -110,13 +110,15 @@ ObjectList<TObject>
template <class TObject>
void
ObjectList<TObject>
-::SetNthElement(unsigned int index,ObjectPointerType element)
+::SetNthElement(unsigned int index, ObjectPointerType element)
{
- if ( index >= m_InternalContainer.size() )
- {
- itkExceptionMacro(<<"Impossible to SetNthElement with the index element "<<index<<"; this element don't exist, the size of the list is "<<m_InternalContainer.size()<<"." );
- }
- m_InternalContainer[index]=element;
+ if (index >= m_InternalContainer.size())
+ {
+ itkExceptionMacro(
+ << "Impossible to SetNthElement with the index element " << index <<
+ "; this element don't exist, the size of the list is " << m_InternalContainer.size() << ".");
+ }
+ m_InternalContainer[index] = element;
this->Modified();
}
/**
@@ -127,13 +129,15 @@ ObjectList<TObject>
template <class TObject>
void
ObjectList<TObject>
-::SetNthElement(unsigned int index,const ObjectType * element)
+::SetNthElement(unsigned int index, const ObjectType * element)
{
- if ( index >= m_InternalContainer.size() )
- {
- itkExceptionMacro(<<"Impossible to SetNthElement with the index element "<<index<<"; this element don't exist, the size of the list is "<<m_InternalContainer.size()<<"." );
- }
- m_InternalContainer[index]=const_cast<ObjectType*>(element);
+ if (index >= m_InternalContainer.size())
+ {
+ itkExceptionMacro(
+ << "Impossible to SetNthElement with the index element " << index <<
+ "; this element don't exist, the size of the list is " << m_InternalContainer.size() << ".");
+ }
+ m_InternalContainer[index] = const_cast<ObjectType*>(element);
this->Modified();
}
@@ -147,10 +151,12 @@ typename ObjectList<TObject>::ObjectPointerType
ObjectList<TObject>
::GetNthElement(unsigned int index) const
{
- if ( index >= m_InternalContainer.size() )
- {
- itkExceptionMacro(<<"Impossible to GetNthElement with the index element "<<index<<"; this element don't exist, the size of the list is "<<m_InternalContainer.size()<<"." );
- }
+ if (index >= m_InternalContainer.size())
+ {
+ itkExceptionMacro(
+ << "Impossible to GetNthElement with the index element " << index <<
+ "; this element don't exist, the size of the list is " << m_InternalContainer.size() << ".");
+ }
return m_InternalContainer[index];
}
/**
@@ -185,11 +191,13 @@ void
ObjectList<TObject>
::Erase(unsigned int index)
{
- if ( index >= m_InternalContainer.size() )
- {
- itkExceptionMacro(<<"Impossible to erase the index element "<<index<<"; the size of the list is "<<m_InternalContainer.size()<<"." );
- }
- m_InternalContainer.erase(m_InternalContainer.begin()+index);
+ if (index >= m_InternalContainer.size())
+ {
+ itkExceptionMacro(
+ << "Impossible to erase the index element " << index << "; the size of the list is " <<
+ m_InternalContainer.size() << ".");
+ }
+ m_InternalContainer.erase(m_InternalContainer.begin() + index);
this->Modified();
}
/**
@@ -212,7 +220,7 @@ typename ObjectList<TObject>::Iterator
ObjectList<TObject>
::Insert(Iterator position, ObjectPointerType element)
{
- Iterator iter ( m_InternalContainer.insert( position.GetIter(), element ) );
+ Iterator iter(m_InternalContainer.insert(position.GetIter(), element));
this->Modified();
return iter;
}
@@ -225,7 +233,7 @@ typename ObjectList<TObject>::ReverseIterator
ObjectList<TObject>
::Insert(ReverseIterator position, ObjectPointerType element)
{
- ReverseIterator iter ( m_InternalContainer.insert( position.GetIter(), element ) );
+ ReverseIterator iter(m_InternalContainer.insert(position.GetIter(), element));
this->Modified();
return iter;
}
@@ -261,7 +269,7 @@ ObjectList<TObject>
template <class TObject>
typename ObjectList<TObject>::ReverseIterator
ObjectList<TObject>
-:: ReverseBegin(void)
+::ReverseBegin(void)
{
ReverseIterator iter(m_InternalContainer.rbegin());
return iter;
@@ -285,7 +293,7 @@ ObjectList<TObject>
template <class TObject>
typename ObjectList<TObject>::Iterator
ObjectList<TObject>
-:: End(void)
+::End(void)
{
Iterator iter(m_InternalContainer.end());
return iter;
@@ -336,7 +344,7 @@ void
ObjectList<TObject>
::Erase(Iterator begin, Iterator end)
{
- m_InternalContainer.erase(begin.GetIter(),end.GetIter());
+ m_InternalContainer.erase(begin.GetIter(), end.GetIter());
this->Modified();
}
/**
@@ -358,18 +366,18 @@ void
ObjectList<TObject>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "Size: " << m_InternalContainer.size() << std::endl;
os << indent << "List contains : " << std::endl;
ConstIterator iter = this->Begin();
- while (iter!=this->End())
- {
+ while (iter != this->End())
+ {
os << indent.GetNextIndent() << iter.Get().GetPointer() << std::endl;
os << indent.GetNextIndent() << iter.Get() << std::endl;
// iter.Get()->PrintSelf(os,indent.GetNextIndent());
// iter.Get()->Print(os,indent.GetNextIndent());
++iter;
- }
+ }
}
} // end namespace otb
diff --git a/Code/Common/otbObjectListSource.h b/Code/Common/otbObjectListSource.h
index 782b18f534..713920524d 100644
--- a/Code/Common/otbObjectListSource.h
+++ b/Code/Common/otbObjectListSource.h
@@ -38,15 +38,15 @@ namespace otb
*
* \ingroup ObjectListFilter
*/
-template <class TOutputList >
+template <class TOutputList>
class ITK_EXPORT ObjectListSource : public itk::ProcessObject
{
public:
/** Standard class typedefs. */
- typedef ObjectListSource Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ObjectListSource Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -55,7 +55,7 @@ public:
itkTypeMacro(ObjectListSource, ProcessObject);
/** Some typedefs. */
- typedef TOutputList OutputListType;
+ typedef TOutputList OutputListType;
typedef typename TOutputList::Pointer OutputListPointer;
typedef itk::DataObject::Pointer DataObjectPointer;
@@ -162,12 +162,11 @@ public:
OutputListType * GetOutput(void);
OutputListType * GetOutput(unsigned int idx);
-
protected:
/** Constructor */
ObjectListSource();
/** Destructor */
- virtual ~ObjectListSource() {};
+ virtual ~ObjectListSource() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -186,10 +185,9 @@ protected:
* ImageToImageFilter::GenerateData() */
virtual void GenerateData(void);
-
private:
- ObjectListSource(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ObjectListSource(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Common/otbObjectListSource.txx b/Code/Common/otbObjectListSource.txx
index 17dd7fbfa6..a4b689a21a 100644
--- a/Code/Common/otbObjectListSource.txx
+++ b/Code/Common/otbObjectListSource.txx
@@ -35,7 +35,7 @@ ObjectListSource<TOutputList>
// Create the output. We use static_cast<> here because we know the default
// output must be of type TOutputImage
typename TOutputList::Pointer output
- = static_cast<TOutputList*>(this->MakeOutput(0).GetPointer());
+ = static_cast<TOutputList*>(this->MakeOutput(0).GetPointer());
this->Superclass::SetNumberOfRequiredOutputs(1);
this->Superclass::SetNthOutput(0, output.GetPointer());
@@ -61,12 +61,12 @@ ObjectListSource<TOutputList>
::GetOutput()
{
if (this->GetNumberOfOutputs() < 1)
- {
+ {
return 0;
- }
+ }
return static_cast<TOutputList*>
- (this->Superclass::GetOutput(0));
+ (this->Superclass::GetOutput(0));
}
/**
@@ -78,7 +78,7 @@ ObjectListSource<TOutputList>
::GetOutput(unsigned int idx)
{
return static_cast<TOutputList*>
- (this->Superclass::GetOutput(idx));
+ (this->Superclass::GetOutput(idx));
}
/**
@@ -100,21 +100,21 @@ void
ObjectListSource<TOutputList>
::GraftNthOutput(unsigned int idx, itk::DataObject *graft)
{
- if ( idx >= this->GetNumberOfOutputs() )
- {
- itkExceptionMacro(<<"Requested to graft output " << idx <<
+ if (idx >= this->GetNumberOfOutputs())
+ {
+ itkExceptionMacro(<< "Requested to graft output " << idx <<
" but this filter only has " << this->GetNumberOfOutputs() << " Outputs.");
- }
+ }
- if ( !graft )
- {
- itkExceptionMacro(<<"Requested to graft output that is a NULL pointer" );
- }
+ if (!graft)
+ {
+ itkExceptionMacro(<< "Requested to graft output that is a NULL pointer");
+ }
itk::DataObject * output = this->GetOutput(idx);
// Call GraftImage to copy meta-information, regions, and the pixel container
- output->Graft( graft );
+ output->Graft(graft);
}
//----------------------------------------------------------------------------
@@ -127,11 +127,11 @@ ObjectListSource<TOutputList>
OutputListPointer outputPtr;
// Allocate the output memory
- for (unsigned int i=0; i < this->GetNumberOfOutputs(); ++i)
- {
+ for (unsigned int i = 0; i < this->GetNumberOfOutputs(); ++i)
+ {
outputPtr = this->GetOutput(i);
outputPtr->Clear();
- }
+ }
}
/**
@@ -145,7 +145,6 @@ ObjectListSource<TOutputList>
itkExceptionMacro("subclass should override this method!!!");
}
-
/**
* PrintSelf Method
*/
@@ -154,7 +153,7 @@ void
ObjectListSource<TOutputList>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/Common/otbObjectListToObjectListFilter.h b/Code/Common/otbObjectListToObjectListFilter.h
index 0064ec93da..733b079082 100644
--- a/Code/Common/otbObjectListToObjectListFilter.h
+++ b/Code/Common/otbObjectListToObjectListFilter.h
@@ -37,15 +37,15 @@ namespace otb
*
* \ingroup ObjectListFilter
*/
-template <class TInputList, class TOutputList >
+template <class TInputList, class TOutputList>
class ITK_EXPORT ObjectListToObjectListFilter : public otb::ObjectListSource<TOutputList>
{
public:
/** Standard class typedefs. */
- typedef ObjectListToObjectListFilter Self;
- typedef otb::ObjectListSource<TOutputList> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ObjectListToObjectListFilter Self;
+ typedef otb::ObjectListSource<TOutputList> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -62,16 +62,16 @@ public:
typedef typename InputListType::ObjectType InputObjectType;
typedef typename OutputListType::ObjectType OutputObjectType;
- typedef itk::DataObject::Pointer DataObjectPointer;
+ typedef itk::DataObject::Pointer DataObjectPointer;
- virtual void SetInput( const InputListType *input);
+ virtual void SetInput(const InputListType *input);
const InputListType * GetInput(void);
protected:
/** Constructor */
ObjectListToObjectListFilter();
/** Destructor */
- virtual ~ObjectListToObjectListFilter() {};
+ virtual ~ObjectListToObjectListFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -83,7 +83,7 @@ protected:
virtual void BeforeThreadedGenerateData();
- virtual void AfterThreadedGenerateData() {};
+ virtual void AfterThreadedGenerateData() {}
virtual int SplitRequestedRegion(int threadId, int threadCount, unsigned int requestedElements,
unsigned int& startIndex, unsigned int& stopIndex);
@@ -95,7 +95,7 @@ protected:
/** Static function used as a "callback" by the MultiThreader. The threading
* library will call this routine for each thread, which will delegate the
* control to ThreadedGenerateData(). */
- static ITK_THREAD_RETURN_TYPE ThreaderCallback( void *arg );
+ static ITK_THREAD_RETURN_TYPE ThreaderCallback(void *arg);
/** Internal structure used for passing image data into the threading library */
struct ThreadStruct
@@ -107,10 +107,9 @@ protected:
/** End Multi-threading implementation */
-
private:
- ObjectListToObjectListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ObjectListToObjectListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Common/otbObjectListToObjectListFilter.txx b/Code/Common/otbObjectListToObjectListFilter.txx
index 995c3a24cb..4e066696bf 100644
--- a/Code/Common/otbObjectListToObjectListFilter.txx
+++ b/Code/Common/otbObjectListToObjectListFilter.txx
@@ -28,50 +28,54 @@ namespace otb
* Constructor
*/
template <class TInputList, class TOutputList>
-ObjectListToObjectListFilter<TInputList,TOutputList>
+ObjectListToObjectListFilter<TInputList, TOutputList>
::ObjectListToObjectListFilter()
{
- this->SetNumberOfRequiredInputs( 1 );
+ this->SetNumberOfRequiredInputs(1);
}
-
template <class TInputList, class TOutputList>
void
-ObjectListToObjectListFilter<TInputList,TOutputList>
+ObjectListToObjectListFilter<TInputList, TOutputList>
::SetInput(const InputListType *input)
{
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(0,
- const_cast< InputListType * >( input ) );
+ const_cast<InputListType *>(input));
}
template <class TInputList, class TOutputList>
-const typename ObjectListToObjectListFilter<TInputList,TOutputList>::InputListType *
-ObjectListToObjectListFilter<TInputList,TOutputList>
+const typename ObjectListToObjectListFilter<TInputList, TOutputList>::InputListType *
+ObjectListToObjectListFilter<TInputList, TOutputList>
::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TInputList * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<const TInputList *>
+ (this->itk::ProcessObject::GetInput(0));
}
template <class TInputList, class TOutputList>
int
-ObjectListToObjectListFilter<TInputList,TOutputList>
-::SplitRequestedRegion(int threadId, int threadCount, unsigned int requestedElements, unsigned int& startIndex, unsigned int& stopIndex )
+ObjectListToObjectListFilter<TInputList, TOutputList>
+::SplitRequestedRegion(int threadId,
+ int threadCount,
+ unsigned int requestedElements,
+ unsigned int& startIndex,
+ unsigned int& stopIndex)
{
- startIndex = static_cast<unsigned int>( vcl_floor(
- requestedElements*static_cast<double>(threadId)/static_cast<double>(threadCount)+0.5
- ));
+ startIndex = static_cast<unsigned int>(vcl_floor(
+ requestedElements * static_cast<double>(threadId) /
+ static_cast<double>(threadCount) + 0.5
+ ));
stopIndex = static_cast<unsigned int>(vcl_floor(
- requestedElements*static_cast<double>(threadId+1)/static_cast<double>(threadCount)+0.5
- ));
- if (stopIndex > requestedElements)
- stopIndex = requestedElements;
+ requestedElements *
+ static_cast<double>(threadId + 1) / static_cast<double>(threadCount) + 0.5
+ ));
+ if (stopIndex > requestedElements) stopIndex = requestedElements;
//Note: check the itkImageSource.txx for the compuration done there.
// for now, there is no requested region for ObjectListFilter, so we don't
@@ -79,13 +83,12 @@ ObjectListToObjectListFilter<TInputList,TOutputList>
return threadCount;
}
-
/**
* GenerateData
*/
template <class TInputList, class TOutputList>
void
-ObjectListToObjectListFilter<TInputList,TOutputList>
+ObjectListToObjectListFilter<TInputList, TOutputList>
::GenerateData(void)
{
// Call a method that can be overridden by a subclass to perform
@@ -99,8 +102,7 @@ ObjectListToObjectListFilter<TInputList,TOutputList>
// Initializing object per thread
OutputListPointer defaultList;
- this->m_ObjectListPerThread = OutputListForThreadType(this->GetNumberOfThreads(),defaultList);
-
+ this->m_ObjectListPerThread = OutputListForThreadType(this->GetNumberOfThreads(), defaultList);
// Setting up multithreader
this->GetMultiThreader()->SetNumberOfThreads(this->GetNumberOfThreads());
@@ -115,10 +117,9 @@ ObjectListToObjectListFilter<TInputList,TOutputList>
}
-
template <class TInputList, class TOutputList>
void
-ObjectListToObjectListFilter<TInputList,TOutputList>
+ObjectListToObjectListFilter<TInputList, TOutputList>
::BeforeThreadedGenerateData(void)
{
this->AllocateOutputs();
@@ -126,8 +127,8 @@ ObjectListToObjectListFilter<TInputList,TOutputList>
template <class TInputList, class TOutputList>
void
-ObjectListToObjectListFilter<TInputList,TOutputList>
-::ThreadedGenerateData(unsigned int /*startIndex*/, unsigned int /*stopIndex*/,int /*threadId*/)
+ObjectListToObjectListFilter<TInputList, TOutputList>
+::ThreadedGenerateData(unsigned int /*startIndex*/, unsigned int /*stopIndex*/, int /*threadId*/)
{
// The following code is equivalent to:
// itkExceptionMacro("subclass should override this method!!!");
@@ -135,39 +136,39 @@ ObjectListToObjectListFilter<TInputList,TOutputList>
// 'noreturn' function does return
itk::OStringStream message;
message << "itk::ERROR: " << this->GetNameOfClass()
- << "(" << this << "): " << "Subclass should override this method!!!";
- itk::ExceptionObject e_(__FILE__, __LINE__, message.str().c_str(),ITK_LOCATION);
+ << "(" << this << "): " << "Subclass should override this method!!!";
+ itk::ExceptionObject e_(__FILE__, __LINE__, message.str().c_str(), ITK_LOCATION);
throw e_;
}
template <class TInputList, class TOutputList>
ITK_THREAD_RETURN_TYPE
-ObjectListToObjectListFilter<TInputList,TOutputList>
-::ThreaderCallback( void *arg )
+ObjectListToObjectListFilter<TInputList, TOutputList>
+::ThreaderCallback(void *arg)
{
ThreadStruct *str;
- int threadId, threadCount;
- unsigned int total,start, stop;
- unsigned int requestedElements;
+ int threadId, threadCount;
+ unsigned int total, start, stop;
+ unsigned int requestedElements;
- threadId = ((itk::MultiThreader::ThreadInfoStruct *)(arg))->ThreadID;
- threadCount = ((itk::MultiThreader::ThreadInfoStruct *)(arg))->NumberOfThreads;
- str = (ThreadStruct *)(((itk::MultiThreader::ThreadInfoStruct *)(arg))->UserData);
+ threadId = ((itk::MultiThreader::ThreadInfoStruct *) (arg))->ThreadID;
+ threadCount = ((itk::MultiThreader::ThreadInfoStruct *) (arg))->NumberOfThreads;
+ str = (ThreadStruct *) (((itk::MultiThreader::ThreadInfoStruct *) (arg))->UserData);
requestedElements = str->Filter->GetInput()->Size();
total = str->Filter->SplitRequestedRegion(threadId, threadCount, requestedElements, start, stop);
if (threadId < static_cast<int>(total))
- {
+ {
// For very small list it might occur that start = stop. In this
// case the vertex at that index will be processed in the next strip.
- if (start!=stop)
- {
+ if (start != stop)
+ {
str->Filter->ThreadedGenerateData(start, stop, threadId);
+ }
}
- }
// else
// {
// otherwise don't use this thread. Sometimes the threads dont
@@ -178,13 +179,12 @@ ObjectListToObjectListFilter<TInputList,TOutputList>
return ITK_THREAD_RETURN_VALUE;
}
-
/**
* PrintSelf Method
*/
template <class TInputList, class TOutputList>
void
-ObjectListToObjectListFilter<TInputList,TOutputList>
+ObjectListToObjectListFilter<TInputList, TOutputList>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/Common/otbPathFunction.h b/Code/Common/otbPathFunction.h
index 5a35fa7839..129e359475 100644
--- a/Code/Common/otbPathFunction.h
+++ b/Code/Common/otbPathFunction.h
@@ -23,7 +23,6 @@
namespace otb
{
-
/** \class PathFunction
* \brief Evaluates a function of an image over a specific path.
*
@@ -41,17 +40,17 @@ namespace otb
* \ingroup PathFunction
*/
template <class TInputPath,
-class TOutput>
+ class TOutput>
class ITK_EXPORT PathFunction :
- public itk::FunctionBase< TInputPath, TOutput >
+ public itk::FunctionBase<TInputPath, TOutput>
{
public:
/** Standard class typedefs. */
- typedef PathFunction Self;
- typedef itk::FunctionBase< TInputPath,TOutput > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PathFunction Self;
+ typedef itk::FunctionBase<TInputPath, TOutput> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(PathFunction, itk::FunctionBase);
@@ -66,7 +65,7 @@ public:
typedef typename Superclass::OutputType OutputType;
/** Set the input path. */
- virtual void SetInputPath( const InputPathType * ptr );
+ virtual void SetInputPath(const InputPathType * ptr);
/** Get the input path. */
const InputPathType * GetInputPath() const
@@ -79,11 +78,11 @@ protected:
virtual ~PathFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
- InputPathConstPointer m_Path;
+ InputPathConstPointer m_Path;
private:
- PathFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PathFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Common/otbPathFunction.txx b/Code/Common/otbPathFunction.txx
index efc4bf8e77..b3d9086a80 100644
--- a/Code/Common/otbPathFunction.txx
+++ b/Code/Common/otbPathFunction.txx
@@ -27,13 +27,12 @@ namespace otb
* Constructor
*/
template <class TInputPath, class TOutput>
-PathFunction< TInputPath,TOutput>
+PathFunction<TInputPath, TOutput>
::PathFunction()
{
m_Path = NULL;
}
-
/**
* Standard "PrintSelf" method
*/
@@ -42,7 +41,7 @@ void
PathFunction<TInputPath, TOutput>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "InputPath: " << m_Path.GetPointer() << std::endl;
}
@@ -52,14 +51,12 @@ PathFunction<TInputPath, TOutput>
template <class TInputPath, class TOutput>
void
PathFunction<TInputPath, TOutput>
-::SetInputPath(const InputPathType * ptr )
+::SetInputPath(const InputPathType * ptr)
{
// set the input path
m_Path = ptr;
}
-
} // end namespace otb
#endif
-
diff --git a/Code/Common/otbPathListSource.h b/Code/Common/otbPathListSource.h
index 58ed4b86ad..401df329ef 100644
--- a/Code/Common/otbPathListSource.h
+++ b/Code/Common/otbPathListSource.h
@@ -36,24 +36,24 @@ namespace otb
* \ingroup Lists
*/
-template <class TOutputPath >
+template <class TOutputPath>
class ITK_EXPORT PathListSource : public ObjectListSource<ObjectList<TOutputPath> >
{
public:
/** Standard class typedefs. */
- typedef PathListSource Self;
- typedef ObjectListSource<ObjectList<TOutputPath> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PathListSource Self;
+ typedef ObjectListSource<ObjectList<TOutputPath> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(PathListSource,ObjectListSource);
+ itkTypeMacro(PathListSource, ObjectListSource);
/** Some convenient typedefs. */
- typedef itk::DataObject::Pointer DataObjectPointer;
+ typedef itk::DataObject::Pointer DataObjectPointer;
typedef TOutputPath OutputPathType;
typedef typename OutputPathType::Pointer OutputPathPointerType;
@@ -164,15 +164,14 @@ public:
* an implementation of MakeOutput(). */
// virtual DataObjectPointer MakeOutput(unsigned int idx);
-
protected:
PathListSource() {};
virtual ~PathListSource() {}
// void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- PathListSource(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PathListSource(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
diff --git a/Code/Common/otbPathListToHistogramGenerator.h b/Code/Common/otbPathListToHistogramGenerator.h
index c71f543fb5..fbd2c0d1be 100644
--- a/Code/Common/otbPathListToHistogramGenerator.h
+++ b/Code/Common/otbPathListToHistogramGenerator.h
@@ -19,7 +19,6 @@
#ifndef __otbPathListToHistogramGenerator_h
#define __otbPathListToHistogramGenerator_h
-
#include "itkListSampleToHistogramGenerator.h"
#include "itkObject.h"
#include "itkListSample.h"
@@ -29,7 +28,6 @@
namespace otb
{
-
/** \class PathListToHistogramGenerator
* \brief This class generates an histogram from a list of path.
*
@@ -40,16 +38,15 @@ namespace otb
*
*/
-
-template< class TPath,class TFunction >
+template<class TPath, class TFunction>
class PathListToHistogramGenerator : public itk::Object
{
public:
/** Standard typedefs */
- typedef PathListToHistogramGenerator Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PathListToHistogramGenerator Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(PathListToHistogramGenerator, itk::Object);
@@ -57,47 +54,45 @@ public:
/** standard New() method support */
itkNewMacro(Self);
- typedef TPath PathType;
- typedef typename PathType::Pointer PathPointer;
- typedef std::vector< PathPointer > PathListType;
-
- typedef PathListType * PathListPointer;
- typedef const PathListType * PathListConstPointer;
+ typedef TPath PathType;
+ typedef typename PathType::Pointer PathPointer;
+ typedef std::vector<PathPointer> PathListType;
- typedef TFunction FunctionType;
+ typedef PathListType * PathListPointer;
+ typedef const PathListType * PathListConstPointer;
- typedef typename TFunction::OutputType RealType;
+ typedef TFunction FunctionType;
- typedef RealType MeasurementType;
- typedef itk::Vector< MeasurementType ,1 > ListSampleVectorType;
- typedef itk::Statistics::ListSample< ListSampleVectorType > ListSampleType;
- typedef typename ListSampleType::Pointer ListSamplePointer;
- typedef typename ListSampleType::ConstPointer ListSampleConstPointer;
+ typedef typename TFunction::OutputType RealType;
- typedef itk::Statistics::DenseFrequencyContainer FrequencyContainerType;
+ typedef RealType MeasurementType;
+ typedef itk::Vector<MeasurementType, 1> ListSampleVectorType;
+ typedef itk::Statistics::ListSample<ListSampleVectorType> ListSampleType;
+ typedef typename ListSampleType::Pointer ListSamplePointer;
+ typedef typename ListSampleType::ConstPointer ListSampleConstPointer;
+ typedef itk::Statistics::DenseFrequencyContainer FrequencyContainerType;
typedef itk::Statistics::ListSampleToHistogramGenerator<
- ListSampleType,
- MeasurementType,
- FrequencyContainerType,1> GeneratorType;
+ ListSampleType,
+ MeasurementType,
+ FrequencyContainerType, 1> GeneratorType;
+ typedef typename GeneratorType::Pointer GeneratorPointer;
- typedef typename GeneratorType::Pointer GeneratorPointer;
-
- typedef typename GeneratorType::HistogramType HistogramType;
- typedef typename HistogramType::Pointer HistogramPointer;
- typedef typename HistogramType::ConstPointer HistogramConstPointer;
- typedef typename HistogramType::SizeType SizeType;
- typedef typename HistogramType::MeasurementVectorType MeasurementVectorType;
+ typedef typename GeneratorType::HistogramType HistogramType;
+ typedef typename HistogramType::Pointer HistogramPointer;
+ typedef typename HistogramType::ConstPointer HistogramConstPointer;
+ typedef typename HistogramType::SizeType SizeType;
+ typedef typename HistogramType::MeasurementVectorType MeasurementVectorType;
public:
/** Triggers the Computation of the histogram */
- void Compute( void );
+ void Compute(void);
/** Connects the input PathList for which the histogram is going to be computed */
- void SetInput( PathListPointer path);
+ void SetInput(PathListPointer path);
/** Return the histogram. o00
\warning This output is only valid after the Compute() method has been invoked
@@ -105,29 +100,26 @@ public:
const HistogramType * GetOutput() const;
/** Set number of histogram bins */
- void SetNumberOfBins( const SizeType & size );
+ void SetNumberOfBins(const SizeType& size);
/** Set marginal scale value to be passed to the histogram generator */
- void SetMarginalScale( double marginalScale );
- void SetHistogramMin(const MeasurementVectorType & histogramMin);
- void SetHistogramMax(const MeasurementVectorType & histogramMax);
+ void SetMarginalScale(double marginalScale);
+ void SetHistogramMin(const MeasurementVectorType& histogramMin);
+ void SetHistogramMax(const MeasurementVectorType& histogramMax);
void SetAutoMinMax(bool autoMinMax);
protected:
PathListToHistogramGenerator();
- virtual ~PathListToHistogramGenerator() {};
+ virtual ~PathListToHistogramGenerator() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
private:
- PathListPointer m_PathList;
- GeneratorPointer m_HistogramGenerator;
-
+ PathListPointer m_PathList;
+ GeneratorPointer m_HistogramGenerator;
};
-
} // end of namespace OTB
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Common/otbPathListToHistogramGenerator.txx b/Code/Common/otbPathListToHistogramGenerator.txx
index 35226960db..1ec2c2f6ef 100644
--- a/Code/Common/otbPathListToHistogramGenerator.txx
+++ b/Code/Common/otbPathListToHistogramGenerator.txx
@@ -21,125 +21,111 @@
#include "otbPathListToHistogramGenerator.h"
-
namespace otb
{
-
-template< class TPath,class TFunction >
-PathListToHistogramGenerator< TPath, TFunction >
+template<class TPath, class TFunction>
+PathListToHistogramGenerator<TPath, TFunction>
::PathListToHistogramGenerator()
{
m_HistogramGenerator = GeneratorType::New();
}
-
-template< class TPath,class TFunction >
+template<class TPath, class TFunction>
void
-PathListToHistogramGenerator< TPath, TFunction >
-::SetInput( PathListPointer path )
+PathListToHistogramGenerator<TPath, TFunction>
+::SetInput(PathListPointer path)
{
m_PathList = path;
}
-
-template< class TPath,class TFunction >
-const typename PathListToHistogramGenerator< TPath, TFunction >::HistogramType *
-PathListToHistogramGenerator< TPath, TFunction >
+template<class TPath, class TFunction>
+const typename PathListToHistogramGenerator<TPath, TFunction>::HistogramType *
+PathListToHistogramGenerator<TPath, TFunction>
::GetOutput() const
{
return m_HistogramGenerator->GetOutput();
}
-
-template< class TPath,class TFunction >
+template<class TPath, class TFunction>
void
-PathListToHistogramGenerator< TPath, TFunction >
+PathListToHistogramGenerator<TPath, TFunction>
::Compute()
{
PathPointer vertexList;
- ListSamplePointer ListSample = ListSampleType::New();
- int nbElementPathList = m_PathList->size();
+ ListSamplePointer ListSample = ListSampleType::New();
+ int nbElementPathList = m_PathList->size();
ListSampleVectorType ResultFunction;
typename TFunction::Pointer function = TFunction::New();
- for (int noPathList = 0; noPathList < nbElementPathList; noPathList++ )
- {
+ for (int noPathList = 0; noPathList < nbElementPathList; noPathList++)
+ {
vertexList = (*m_PathList)[noPathList];
- function->SetInputPath( vertexList );
+ function->SetInputPath(vertexList);
- ResultFunction[0] = static_cast<MeasurementType>( function->Evaluate() );
+ ResultFunction[0] = static_cast<MeasurementType>(function->Evaluate());
ListSample->PushBack(ResultFunction);
- }
+ }
- m_HistogramGenerator->SetListSample( ListSample );
+ m_HistogramGenerator->SetListSample(ListSample);
m_HistogramGenerator->Update();
}
-
-template< class TPath,class TFunction >
+template<class TPath, class TFunction>
void
-PathListToHistogramGenerator< TPath, TFunction >
-::SetNumberOfBins( const SizeType & size )
+PathListToHistogramGenerator<TPath, TFunction>
+::SetNumberOfBins(const SizeType& size)
{
- m_HistogramGenerator->SetNumberOfBins( size );
+ m_HistogramGenerator->SetNumberOfBins(size);
}
-
-template< class TPath,class TFunction >
+template<class TPath, class TFunction>
void
-PathListToHistogramGenerator< TPath, TFunction >
-::SetMarginalScale( double marginalScale )
+PathListToHistogramGenerator<TPath, TFunction>
+::SetMarginalScale(double marginalScale)
{
- m_HistogramGenerator->SetMarginalScale( marginalScale );
+ m_HistogramGenerator->SetMarginalScale(marginalScale);
}
-
-template< class TPath,class TFunction >
+template<class TPath, class TFunction>
void
-PathListToHistogramGenerator< TPath, TFunction >
-::SetHistogramMin(const MeasurementVectorType & histogramMin)
+PathListToHistogramGenerator<TPath, TFunction>
+::SetHistogramMin(const MeasurementVectorType& histogramMin)
{
m_HistogramGenerator->SetHistogramMin(histogramMin);
}
-
-template< class TPath,class TFunction >
+template<class TPath, class TFunction>
void
-PathListToHistogramGenerator< TPath, TFunction >
-::SetHistogramMax(const MeasurementVectorType & histogramMax)
+PathListToHistogramGenerator<TPath, TFunction>
+::SetHistogramMax(const MeasurementVectorType& histogramMax)
{
m_HistogramGenerator->SetHistogramMax(histogramMax);
}
-
-template< class TPath,class TFunction >
+template<class TPath, class TFunction>
void
-PathListToHistogramGenerator< TPath, TFunction >
+PathListToHistogramGenerator<TPath, TFunction>
::SetAutoMinMax(bool autoMinMax)
{
m_HistogramGenerator->SetAutoMinMax(autoMinMax);
}
-
-template< class TPath,class TFunction >
+template<class TPath, class TFunction>
void
-PathListToHistogramGenerator< TPath, TFunction >
+PathListToHistogramGenerator<TPath, TFunction>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << "PathList = " << m_PathList << std::endl;
os << "HistogramGenerator = " << m_HistogramGenerator << std::endl;
}
-
} // end of namespace otb
#endif
-
-
diff --git a/Code/Common/otbPathListToPathListFilter.h b/Code/Common/otbPathListToPathListFilter.h
index ceacb63c83..06cf8765e0 100644
--- a/Code/Common/otbPathListToPathListFilter.h
+++ b/Code/Common/otbPathListToPathListFilter.h
@@ -28,14 +28,14 @@ namespace otb
*/
template <class TPath>
class ITK_EXPORT PathListToPathListFilter
- : public ObjectListToObjectListFilter<ObjectList<TPath>, ObjectList<TPath> >
+ : public ObjectListToObjectListFilter<ObjectList<TPath>, ObjectList<TPath> >
{
public:
/** Standard typedefs */
- typedef PathListToPathListFilter Self;
- typedef ObjectListToObjectListFilter<ObjectList<TPath>, ObjectList<TPath> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PathListToPathListFilter Self;
+ typedef ObjectListToObjectListFilter<ObjectList<TPath>, ObjectList<TPath> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -44,26 +44,26 @@ public:
itkTypeMacro(PathListToPathListFilter, ObjectListToObjectListFilter);
/** Template parameters typedefs */
- typedef typename Superclass::InputObjectType PathType;
- typedef typename Superclass::InputListType PathListType;
- typedef typename PathType::Pointer PathPointerType;
- typedef typename PathListType::Pointer PathListPointerType;
- typedef typename PathListType::ConstPointer PathListConstPointerType;
- typedef typename Superclass::OutputObjectType OutputPathType;
- typedef typename PathType::Pointer OutputPathPointerType;
- typedef typename Superclass::OutputListType OutputPathListType;
+ typedef typename Superclass::InputObjectType PathType;
+ typedef typename Superclass::InputListType PathListType;
+ typedef typename PathType::Pointer PathPointerType;
+ typedef typename PathListType::Pointer PathListPointerType;
+ typedef typename PathListType::ConstPointer PathListConstPointerType;
+ typedef typename Superclass::OutputObjectType OutputPathType;
+ typedef typename PathType::Pointer OutputPathPointerType;
+ typedef typename Superclass::OutputListType OutputPathListType;
typedef typename Superclass::OutputListPointer OutputPathListPointerType;
protected:
/** Constructor */
PathListToPathListFilter() {};
/** Destructor */
- virtual ~PathListToPathListFilter() {};
+ virtual ~PathListToPathListFilter() {}
private:
- PathListToPathListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PathListToPathListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/Common/otbPersistentFilterStreamingDecorator.h b/Code/Common/otbPersistentFilterStreamingDecorator.h
index 141c33dc35..686e212341 100644
--- a/Code/Common/otbPersistentFilterStreamingDecorator.h
+++ b/Code/Common/otbPersistentFilterStreamingDecorator.h
@@ -40,33 +40,33 @@ namespace otb
*/
template <class TFilter>
class ITK_EXPORT PersistentFilterStreamingDecorator
- : public itk::ProcessObject
+ : public itk::ProcessObject
{
public:
/** Standard typedefs */
- typedef PersistentFilterStreamingDecorator Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PersistentFilterStreamingDecorator Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(PersistentFilterStreamingDecorator,ProcessObject);
+ itkTypeMacro(PersistentFilterStreamingDecorator, ProcessObject);
/** Template parameters typedefs */
- typedef TFilter FilterType;
- typedef typename FilterType::Pointer FilterPointerType;
+ typedef TFilter FilterType;
+ typedef typename FilterType::Pointer FilterPointerType;
typedef typename FilterType::InputImageType ImageType;
typedef StreamingImageVirtualWriter<ImageType> StreamerType;
- typedef typename StreamerType::Pointer StreamerPointerType;
+ typedef typename StreamerType::Pointer StreamerPointerType;
- itkSetObjectMacro(Filter,FilterType);
- itkGetObjectMacro(Filter,FilterType);
- itkGetConstObjectMacro(Filter,FilterType);
- itkGetObjectMacro(Streamer,StreamerType);
+ itkSetObjectMacro(Filter, FilterType);
+ itkGetObjectMacro(Filter, FilterType);
+ itkGetConstObjectMacro(Filter, FilterType);
+ itkGetObjectMacro(Streamer, StreamerType);
void SetInput(const ImageType *input);
const ImageType * GetInput(void);
@@ -78,15 +78,15 @@ protected:
/** Constructor */
PersistentFilterStreamingDecorator();
/** Destructor */
- virtual ~PersistentFilterStreamingDecorator() {};
+ virtual ~PersistentFilterStreamingDecorator() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
virtual void GenerateData(void);
private:
- PersistentFilterStreamingDecorator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PersistentFilterStreamingDecorator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/// Object responsible for streaming
StreamerPointerType m_Streamer;
@@ -94,7 +94,7 @@ private:
/// Object responsible for computation
FilterPointerType m_Filter;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbPersistentFilterStreamingDecorator.txx"
#endif
diff --git a/Code/Common/otbPersistentFilterStreamingDecorator.txx b/Code/Common/otbPersistentFilterStreamingDecorator.txx
index da4d5b2de2..3024bd5f87 100644
--- a/Code/Common/otbPersistentFilterStreamingDecorator.txx
+++ b/Code/Common/otbPersistentFilterStreamingDecorator.txx
@@ -38,7 +38,7 @@ PersistentFilterStreamingDecorator<TFilter>
::SetInput(const ImageType *input)
{
// ProcessObject is not const_correct so this cast is required here.
- this->ProcessObject::SetNthInput(0,const_cast<ImageType *>(input ) );
+ this->ProcessObject::SetNthInput(0, const_cast<ImageType *>(input));
}
template <class TFilter>
const typename PersistentFilterStreamingDecorator<TFilter>::ImageType *
@@ -46,9 +46,9 @@ PersistentFilterStreamingDecorator<TFilter>
::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
return static_cast<ImageType*>(this->ProcessObject::GetInput(0));
}
diff --git a/Code/Common/otbPersistentImageFilter.h b/Code/Common/otbPersistentImageFilter.h
index c27cf8a478..8df8f21b97 100644
--- a/Code/Common/otbPersistentImageFilter.h
+++ b/Code/Common/otbPersistentImageFilter.h
@@ -38,22 +38,22 @@ namespace otb
* \sa StatisticsImageFilter
* \sa StatisticsVectorImageFilter
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
class ITK_EXPORT PersistentImageFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef PersistentImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PersistentImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
- itkTypeMacro(PersistentImageFilter,ImageToImageFilter);
+ itkTypeMacro(PersistentImageFilter, ImageToImageFilter);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
/**
* Reset the persistent data of the filter.
@@ -68,17 +68,17 @@ protected:
/** Constructor */
PersistentImageFilter() {};
/** Destructor */
- virtual ~PersistentImageFilter() {};
+ virtual ~PersistentImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- };
+ Superclass::PrintSelf(os, indent);
+ }
private:
- PersistentImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PersistentImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/Common/otbPointSetAndValuesFunction.h b/Code/Common/otbPointSetAndValuesFunction.h
index 6a17d5444d..95c7dc5e05 100644
--- a/Code/Common/otbPointSetAndValuesFunction.h
+++ b/Code/Common/otbPointSetAndValuesFunction.h
@@ -30,16 +30,19 @@ namespace otb
/** \class PointSetAndValuesFunction
* \brief Base class for function needing a point set and a set of associated value to compute the output.
*/
-template <class TPointSet, class TValue, class TCoordRep=double>
+template <class TPointSet, class TValue, class TCoordRep = double>
class ITK_EXPORT PointSetAndValuesFunction
- : public itk::FunctionBase<itk::Point<TCoordRep,::itk::GetPointSetDimension<TPointSet>::PointDimension>,TValue>
+ : public itk::FunctionBase<itk::Point<TCoordRep, ::itk::GetPointSetDimension<TPointSet>::PointDimension>, TValue>
{
public:
/** Standard typedefs */
- typedef PointSetAndValuesFunction Self;
- typedef itk::FunctionBase<itk::Point<TCoordRep,::itk::GetPointSetDimension<TPointSet>::PointDimension>,TValue> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PointSetAndValuesFunction Self;
+ typedef itk::FunctionBase<itk::Point<TCoordRep,
+ ::itk::GetPointSetDimension<TPointSet>::PointDimension>, TValue> Superclass;
+ typedef itk::SmartPointer<Self>
+ Pointer;
+ typedef itk::SmartPointer<const Self>
+ ConstPointer;
/** New macro */
itkNewMacro(Self);
@@ -47,26 +50,26 @@ public:
/** Creation through object factory macro */
itkTypeMacro(PointSetAndValuesFunction, FunctionBase);
- typedef TPointSet PointSetType;
+ typedef TPointSet PointSetType;
typedef typename PointSetType::ConstPointer PointSetConstPointerType;
- typedef TValue ValueType;
- typedef TCoordRep CoordRepType;
- typedef typename PointSetType::PointType PointType;
+ typedef TValue ValueType;
+ typedef TCoordRep CoordRepType;
+ typedef typename PointSetType::PointType PointType;
- typedef itk::Index<PointType::PointDimension> IndexType;
- typedef itk::ContinuousIndex<CoordRepType,PointType::PointDimension> ContinuousIndexType;
+ typedef itk::Index<PointType::PointDimension> IndexType;
+ typedef itk::ContinuousIndex<CoordRepType, PointType::PointDimension> ContinuousIndexType;
- typedef itk::VectorContainer<unsigned long,ValueType> ValueVectorType;
- typedef typename ValueVectorType::ConstPointer ValueVectorPointerType;
+ typedef itk::VectorContainer<unsigned long, ValueType> ValueVectorType;
+ typedef typename ValueVectorType::ConstPointer ValueVectorPointerType;
- itkSetObjectMacro(ValueVector,ValueVectorType);
- itkGetObjectMacro(ValueVector,ValueVectorType);
+ itkSetObjectMacro(ValueVector, ValueVectorType);
+ itkGetObjectMacro(ValueVector, ValueVectorType);
/**
* Set the point set.
* \param the point set
*/
- virtual void SetPointSet( const PointSetType * ptr );
+ virtual void SetPointSet(const PointSetType * ptr);
/**
* Get the point set.
* \return the point set
@@ -78,37 +81,37 @@ public:
/** Evaluate the function at specified Point position.
* Subclasses must provide this method. */
- virtual TValue Evaluate( const PointType& point ) const = 0;
+ virtual TValue Evaluate(const PointType& point) const = 0;
/** Evaluate the function at specified Index position.
* Subclasses must provide this method. */
- virtual TValue EvaluateAtIndex( const IndexType & index ) const = 0;
+ virtual TValue EvaluateAtIndex(const IndexType& index) const = 0;
/** Evaluate the function at specified ContinousIndex position.
* Subclasses must provide this method. */
- virtual TValue EvaluateAtContinuousIndex( const ContinuousIndexType & index ) const = 0;
+ virtual TValue EvaluateAtContinuousIndex(const ContinuousIndexType& index) const = 0;
protected:
/** Constructor */
PointSetAndValuesFunction()
- {
+ {
m_PointSet = PointSetType::New();
m_ValueVector = ValueVectorType::New();
- }
+ }
/** Destructor */
- virtual ~PointSetAndValuesFunction() {};
+ virtual ~PointSetAndValuesFunction() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- PointSetAndValuesFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PointSetAndValuesFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** PointSet */
PointSetConstPointerType m_PointSet;
/** value vector */
ValueVectorPointerType m_ValueVector;
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/Common/otbPointSetSource.h b/Code/Common/otbPointSetSource.h
index 24a60e75b2..f3b15a6e6b 100644
--- a/Code/Common/otbPointSetSource.h
+++ b/Code/Common/otbPointSetSource.h
@@ -43,16 +43,16 @@ class ITK_EXPORT PointSetSource : public itk::ProcessObject
{
public:
/** Standard class typedefs. */
- typedef PointSetSource Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PointSetSource Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(PointSetSource,itk::ProcessObject);
+ itkTypeMacro(PointSetSource, itk::ProcessObject);
/** Some convenient typedefs. */
typedef itk::DataObject::Pointer DataObjectPointer;
@@ -132,8 +132,8 @@ protected:
void GenerateInputRequestedRegion();
private:
- PointSetSource(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PointSetSource(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Used by streaming: The requested region of the output being processed
* by the execute method. Set in the GenerateInputRequestedRegion method. */
@@ -141,7 +141,6 @@ private:
int m_GenerateDataNumberOfRegions;
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Common/otbPointSetSource.txx b/Code/Common/otbPointSetSource.txx
index a802af3a42..f3816b7e21 100644
--- a/Code/Common/otbPointSetSource.txx
+++ b/Code/Common/otbPointSetSource.txx
@@ -33,10 +33,10 @@ PointSetSource<TOutputPointSet>
// Create the output. We use static_cast<> here because we know the default
// output must be of type TOutputPointSet
OutputPointSetPointer output
- = static_cast<TOutputPointSet*>(this->MakeOutput(0).GetPointer());
+ = static_cast<TOutputPointSet*>(this->MakeOutput(0).GetPointer());
this->ProcessObject::SetNumberOfRequiredOutputs(1);
- this->ProcessObject::SetNthOutput( 0, output.GetPointer() );
+ this->ProcessObject::SetNthOutput(0, output.GetPointer());
m_GenerateDataRegion = 0;
m_GenerateDataNumberOfRegions = 0;
@@ -62,15 +62,14 @@ PointSetSource<TOutputPointSet>
::GetOutput(void)
{
if (this->GetNumberOfOutputs() < 1)
- {
+ {
return 0;
- }
+ }
return static_cast<TOutputPointSet*>
- (this->ProcessObject::GetOutput(0));
+ (this->ProcessObject::GetOutput(0));
}
-
/**
*
*/
@@ -80,10 +79,9 @@ PointSetSource<TOutputPointSet>
::GetOutput(unsigned int idx)
{
return static_cast<TOutputPointSet*>
- (this->ProcessObject::GetOutput(idx));
+ (this->ProcessObject::GetOutput(idx));
}
-
/**
*
*/
@@ -92,11 +90,12 @@ void
PointSetSource<TOutputPointSet>
::SetOutput(OutputPointSetType *output)
{
- itkWarningMacro(<< "SetOutput(): This method is slated to be removed from ITK. Please use GraftOutput() in possible combination with DisconnectPipeline() instead." );
+ itkWarningMacro(
+ <<
+ "SetOutput(): This method is slated to be removed from ITK. Please use GraftOutput() in possible combination with DisconnectPipeline() instead.");
this->ProcessObject::SetNthOutput(0, output);
}
-
/**
*
*/
@@ -108,7 +107,6 @@ PointSetSource<TOutputPointSet>
Superclass::GenerateInputRequestedRegion();
}
-
/**
*
*/
@@ -120,7 +118,6 @@ PointSetSource<TOutputPointSet>
this->GraftNthOutput(0, graft);
}
-
/**
*
*/
@@ -129,24 +126,23 @@ void
PointSetSource<TOutputPointSet>
::GraftNthOutput(unsigned int idx, itk::DataObject *graft)
{
- if ( idx >= this->GetNumberOfOutputs() )
- {
- itkExceptionMacro(<<"Requested to graft output " << idx <<
+ if (idx >= this->GetNumberOfOutputs())
+ {
+ itkExceptionMacro(<< "Requested to graft output " << idx <<
" but this filter only has " << this->GetNumberOfOutputs() << " Outputs.");
- }
+ }
- if ( !graft )
- {
- itkExceptionMacro(<<"Requested to graft output that is a NULL pointer" );
- }
+ if (!graft)
+ {
+ itkExceptionMacro(<< "Requested to graft output that is a NULL pointer");
+ }
- itk::DataObject * output = this->GetOutput( idx );
+ itk::DataObject * output = this->GetOutput(idx);
// Call Graft on the PointSet in order to copy meta-information, and containers.
- output->Graft( graft );
+ output->Graft(graft);
}
-
/**
*
*/
@@ -155,7 +151,7 @@ void
PointSetSource<TOutputPointSet>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/Common/otbPolyLineImageConstIterator.h b/Code/Common/otbPolyLineImageConstIterator.h
index ed5c5f9593..8cacbe554b 100644
--- a/Code/Common/otbPolyLineImageConstIterator.h
+++ b/Code/Common/otbPolyLineImageConstIterator.h
@@ -42,7 +42,7 @@ class ITK_EXPORT PolyLineImageConstIterator
{
public:
/** Standard typedefs */
- typedef PolyLineImageConstIterator Self;
+ typedef PolyLineImageConstIterator Self;
itkStaticConstMacro(ImageIteratorDimension, unsigned int,
TImage::ImageDimension);
@@ -82,7 +82,7 @@ public:
return m_InternalImageIterator.GetIndex();
}
/** Get the pixel value */
- const PixelType & Get(void) const
+ const PixelType& Get(void) const
{
return m_InternalImageIterator.Get();
}
@@ -95,14 +95,14 @@ public:
/** Move an iterator to the beginning of the line. */
void GoToBegin();
/** Walk forward along the line to the next index in the image. */
- void operator++();
+ void operator ++();
/** operator= is provided to make sure the handle to the image is properly
* reference counted. */
- Self &operator=(const Self& it);
+ Self& operator =(const Self& it);
/** Constructor establishes an iterator to walk along a line */
- PolyLineImageConstIterator(const ImageType *imagePtr,const PathType * pathPtr);
+ PolyLineImageConstIterator(const ImageType * imagePtr, const PathType * pathPtr);
/** Default Destructor. */
- virtual ~PolyLineImageConstIterator() {};
+ virtual ~PolyLineImageConstIterator() {}
protected: //made protected so other iterators can access
@@ -111,11 +111,11 @@ protected: //made protected so other iterators can access
/** Smart pointer to the path */
typename PathType::ConstPointer m_Path;
- InternalImageIteratorType m_InternalImageIterator;
- VertexIteratorType m_InternalVertexIterator;
+ InternalImageIteratorType m_InternalImageIterator;
+ VertexIteratorType m_InternalVertexIterator;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbPolyLineImageConstIterator.txx"
#endif
diff --git a/Code/Common/otbPolyLineImageConstIterator.txx b/Code/Common/otbPolyLineImageConstIterator.txx
index 8891ad00b1..fa82b3596d 100644
--- a/Code/Common/otbPolyLineImageConstIterator.txx
+++ b/Code/Common/otbPolyLineImageConstIterator.txx
@@ -28,46 +28,46 @@ namespace otb
*/
template <class TImage, class TPath>
PolyLineImageConstIterator<TImage, TPath>
-::PolyLineImageConstIterator(const ImageType *imagePtr,const PathType * pathPtr)
- : m_InternalImageIterator(const_cast<ImageType *>(imagePtr),
- imagePtr->GetLargestPossibleRegion().GetIndex(),
- imagePtr->GetLargestPossibleRegion().GetIndex())
+::PolyLineImageConstIterator(const ImageType *imagePtr, const PathType * pathPtr)
+ : m_InternalImageIterator(const_cast<ImageType *>(imagePtr),
+ imagePtr->GetLargestPossibleRegion().GetIndex(),
+ imagePtr->GetLargestPossibleRegion().GetIndex())
{
m_Image = imagePtr;
m_Path = pathPtr;
m_InternalVertexIterator = m_Path->GetVertexList()->Begin();
IndexType source, target;
for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
- {
+ {
source[i] = static_cast<unsigned int> (m_InternalVertexIterator.Value()[i]);
- }
+ }
++m_InternalVertexIterator;
if (m_InternalVertexIterator != m_Path->GetVertexList()->End())
- {
+ {
for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
- {
+ {
target[i] = static_cast<unsigned int> (m_InternalVertexIterator.Value()[i]);
+ }
}
- }
else
- {
+ {
target = source;
- }
+ }
m_InternalImageIterator = InternalImageIteratorType(const_cast<ImageType *> (m_Image.GetPointer()), source, target);
}
template <class TImage, class TPath>
-typename PolyLineImageConstIterator<TImage,TPath>
+typename PolyLineImageConstIterator<TImage, TPath>
::Self&
PolyLineImageConstIterator<TImage, TPath>
-::operator=(const Self& it)
-{
+::operator = (const Self &it)
+ {
m_Image = it.m_Image;
m_Path = it.m_Path;
m_InternalImageIterator = it.m_InternalImageIterator;
m_InternalVertexIterator = it.m_InternalVertexIterator;
-}
+ }
template <class TImage, class TPath>
void
@@ -77,58 +77,58 @@ PolyLineImageConstIterator<TImage, TPath>
m_InternalVertexIterator = m_Path->GetVertexList()->Begin();
IndexType source, target;
for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
- {
+ {
source[i] = static_cast<unsigned int> (m_InternalVertexIterator.Value()[i]);
- }
+ }
++m_InternalVertexIterator;
if (m_InternalVertexIterator != m_Path->GetVertexList()->End())
- {
+ {
for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
- {
+ {
target[i] = static_cast<unsigned int> (m_InternalVertexIterator.Value()[i]);
+ }
}
- }
else
- {
+ {
target = source;
- }
+ }
m_InternalImageIterator = InternalImageIteratorType(const_cast<ImageType *> (m_Image.GetPointer()), source, target);
}
template <class TImage, class TPath>
void
-PolyLineImageConstIterator<TImage,TPath>
-::operator++()
-{
+PolyLineImageConstIterator<TImage, TPath>
+::operator++ ()
+ {
// otbMsgDebugMacro(<<this->GetIndex());
++m_InternalImageIterator;
if (m_InternalImageIterator.IsAtEnd())
- {
- if (m_InternalVertexIterator != m_Path->GetVertexList()->End())
{
+ if (m_InternalVertexIterator != m_Path->GetVertexList()->End())
+ {
IndexType source;
for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
- {
+ {
source[i] = static_cast<unsigned int> (m_InternalVertexIterator.Value()[i]);
- }
+ }
// otbMsgDebugMacro(<<"Source: "<<source);
++m_InternalVertexIterator;
if (m_InternalVertexIterator != m_Path->GetVertexList()->End())
- {
+ {
IndexType target;
for (unsigned int i = 0; i < ImageType::ImageDimension; ++i)
- {
+ {
target[i] = static_cast<unsigned int> (m_InternalVertexIterator.Value()[i]);
- }
+ }
// otbMsgDebugMacro(<<"Target: "<<target);
m_InternalImageIterator = InternalImageIteratorType(const_cast<ImageType *> (m_Image.GetPointer()), source,
- target);
+ target);
++m_InternalImageIterator;
+ }
}
}
}
-}
} // End namespace otb
#endif
diff --git a/Code/Common/otbPolyLineImageIterator.h b/Code/Common/otbPolyLineImageIterator.h
index 71109e46a5..2b40a12dc2 100644
--- a/Code/Common/otbPolyLineImageIterator.h
+++ b/Code/Common/otbPolyLineImageIterator.h
@@ -39,12 +39,12 @@ namespace otb
*/
template <class TImage, class TPath>
class ITK_EXPORT PolyLineImageIterator
- : public PolyLineImageConstIterator<TImage,TPath>
+ : public PolyLineImageConstIterator<TImage, TPath>
{
public:
/** Standard typedefs */
- typedef PolyLineImageIterator Self;
- typedef PolyLineImageConstIterator<TImage,TPath> Superclass;
+ typedef PolyLineImageIterator Self;
+ typedef PolyLineImageConstIterator<TImage, TPath> Superclass;
itkStaticConstMacro(ImageIteratorDimension, unsigned int,
TImage::ImageDimension);
@@ -71,32 +71,32 @@ public:
typedef typename TImage::AccessorType AccessorType;
/** Run-time type information (and related methods). */
- itkTypeMacro(PolyLineImageIterator,PolyLineImageConstIterator);
+ itkTypeMacro(PolyLineImageIterator, PolyLineImageConstIterator);
/** Set the pixel value */
- void Set(const PixelType & value)
+ void Set(const PixelType& value)
{
this->m_InternalImageIterator.Set(value);
}
/** Return a reference to the pixel
* This method will provide the fastest access to pixel
* data, but it will NOT support ImageAdaptors. */
- PixelType & Value(void)
+ PixelType& Value(void)
{
return this->m_InternalImageIterator.Value();
}
- Self &operator=(const Self& it)
+ Self & operator =(const Self& it)
{
- this->Superclass::operator=(it);
+ this->Superclass::operator =(it);
return *this;
}
/** Constructor establishes an iterator to walk along a line */
- PolyLineImageIterator(ImageType *imagePtr,PathType * pathPtr)
- : Superclass(imagePtr,pathPtr) {};
+ PolyLineImageIterator(ImageType * imagePtr, PathType * pathPtr)
+ : Superclass(imagePtr, pathPtr) {};
/** Default Destructor. */
- virtual ~PolyLineImageIterator() {};
+ virtual ~PolyLineImageIterator() {}
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/Common/otbPolyLineParametricPathWithValue.h b/Code/Common/otbPolyLineParametricPathWithValue.h
index e1d6e9c41c..c85a066e30 100644
--- a/Code/Common/otbPolyLineParametricPathWithValue.h
+++ b/Code/Common/otbPolyLineParametricPathWithValue.h
@@ -33,16 +33,16 @@ namespace otb
*
* \sa itk::PolyLineParametricPath.
*/
-template < class TValue,unsigned int VDimension=2>
- class ITK_EXPORT PolyLineParametricPathWithValue
+template <class TValue, unsigned int VDimension = 2>
+class ITK_EXPORT PolyLineParametricPathWithValue
: public itk::PolyLineParametricPath<VDimension>
{
- public:
+public:
/** Standard typedefs */
- typedef PolyLineParametricPathWithValue Self;
- typedef itk::PolyLineParametricPath<VDimension> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PolyLineParametricPathWithValue Self;
+ typedef itk::PolyLineParametricPath<VDimension> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -54,36 +54,36 @@ template < class TValue,unsigned int VDimension=2>
typedef TValue ValueType;
/** Derived typedefs */
- typedef typename Superclass::VertexType VertexType;
- typedef typename Superclass::VertexListType VertexListType;
+ typedef typename Superclass::VertexType VertexType;
+ typedef typename Superclass::VertexListType VertexListType;
typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
typedef typename VertexListType::ConstIterator VertexListConstIteratorType;
// typedef itk::ImageRegion<2> RegionType;
- typedef otb::RemoteSensingRegion<double> RegionType;
- typedef typename RegionType::SizeType SizeType;
- typedef typename RegionType::IndexType IndexType;
+ typedef otb::RemoteSensingRegion<double> RegionType;
+ typedef typename RegionType::SizeType SizeType;
+ typedef typename RegionType::IndexType IndexType;
- itkGetMacro(Key,std::string);
+ itkGetMacro(Key, std::string);
void SetValue(ValueType value)
{
- itk::MetaDataDictionary & dict = this->GetMetaDataDictionary();
- itk::EncapsulateMetaData<ValueType>(dict,m_Key,value);
+ itk::MetaDataDictionary& dict = this->GetMetaDataDictionary();
+ itk::EncapsulateMetaData<ValueType>(dict, m_Key, value);
}
ValueType GetValue(void) const
{
- ValueType resp(0);
- const itk::MetaDataDictionary & dict = this->GetMetaDataDictionary();
+ ValueType resp(0);
+ const itk::MetaDataDictionary& dict = this->GetMetaDataDictionary();
if (dict.HasKey(m_Key))
- {
- itk::ExposeMetaData<ValueType>(dict,m_Key,resp);
- }
+ {
+ itk::ExposeMetaData<ValueType>(dict, m_Key, resp);
+ }
else
- {
- itkGenericExceptionMacro(<<"Key "<<m_Key<<" not found in metadata dictionary !");
- }
+ {
+ itkGenericExceptionMacro(<< "Key " << m_Key << " not found in metadata dictionary !");
+ }
return resp;
}
@@ -93,12 +93,12 @@ template < class TValue,unsigned int VDimension=2>
*/
virtual double GetLength() const;
- virtual void AddVertex (const ContinuousIndexType &vertex);
+ virtual void AddVertex(const ContinuousIndexType& vertex);
- /**
- * Compute the path bounding region.
- * \return The region.
- */
+ /**
+ * Compute the path bounding region.
+ * \return The region.
+ */
virtual RegionType GetBoundingRegion(void) const;
protected:
@@ -106,7 +106,7 @@ protected:
PolyLineParametricPathWithValue();
/** Destructor */
virtual ~PolyLineParametricPathWithValue()
- { }
+ {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -115,16 +115,16 @@ protected:
virtual void Modified();
private:
- PolyLineParametricPathWithValue(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
- std::string m_Key;
- mutable double m_Length;
- mutable bool m_LengthIsValid;
+ PolyLineParametricPathWithValue(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
+ std::string m_Key;
+ mutable double m_Length;
+ mutable bool m_LengthIsValid;
mutable RegionType m_BoundingRegion;
- mutable bool m_BoundingRegionIsValid;
+ mutable bool m_BoundingRegionIsValid;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbPolyLineParametricPathWithValue.txx"
diff --git a/Code/Common/otbPolyLineParametricPathWithValue.txx b/Code/Common/otbPolyLineParametricPathWithValue.txx
index 6062c0e74f..94ccd9813b 100644
--- a/Code/Common/otbPolyLineParametricPathWithValue.txx
+++ b/Code/Common/otbPolyLineParametricPathWithValue.txx
@@ -25,115 +25,113 @@ namespace otb
/**
* Constructor
*/
-template < class TValue,unsigned int VDimension>
-PolyLineParametricPathWithValue<TValue,VDimension>
+template <class TValue, unsigned int VDimension>
+PolyLineParametricPathWithValue<TValue, VDimension>
::PolyLineParametricPathWithValue() :
- m_Key("Value"),m_Length(-1.0),m_LengthIsValid(false),
- m_BoundingRegion(),m_BoundingRegionIsValid(false)
+ m_Key("Value"), m_Length(-1.0), m_LengthIsValid(false),
+ m_BoundingRegion(), m_BoundingRegionIsValid(false)
{
- itk::MetaDataDictionary & dict = this->GetMetaDataDictionary();
- itk::EncapsulateMetaData<ValueType>(dict,m_Key,0);
+ itk::MetaDataDictionary& dict = this->GetMetaDataDictionary();
+ itk::EncapsulateMetaData<ValueType>(dict, m_Key, 0);
}
-template < class TValue,unsigned int VDimension>
-void PolyLineParametricPathWithValue<TValue,VDimension>
-::AddVertex(const ContinuousIndexType &vertex)
+template <class TValue, unsigned int VDimension>
+void PolyLineParametricPathWithValue<TValue, VDimension>
+::AddVertex(const ContinuousIndexType& vertex)
{
Superclass::AddVertex(vertex);
this->Modified();
}
-template < class TValue,unsigned int VDimension>
-double PolyLineParametricPathWithValue<TValue,VDimension>
+template <class TValue, unsigned int VDimension>
+double PolyLineParametricPathWithValue<TValue, VDimension>
::GetLength() const
{
if (!m_LengthIsValid)
- {
+ {
ComputeLength();
- }
+ }
return m_Length;
}
-template < class TValue,unsigned int VDimension>
+template <class TValue, unsigned int VDimension>
void
-PolyLineParametricPathWithValue<TValue,VDimension>
+PolyLineParametricPathWithValue<TValue, VDimension>
::ComputeLength() const
{
- double length = 0.0;
+ double length = 0.0;
VertexListConstIteratorType it = this->GetVertexList()->Begin();
- if (this->GetVertexList()->Size()>1)
- {
-
+ if (this->GetVertexList()->Size() > 1)
+ {
- VertexType pt1 = it.Value();//just init, won't be used like that
+ VertexType pt1 = it.Value(); //just init, won't be used like that
VertexType pt2 = it.Value();
it++;
while (it != this->GetVertexList()->End())
- {
- pt1=pt2;
- pt2 = it.Value();
- double accum=0.0;
- for (unsigned int i=0; i<VDimension; ++i)
{
- accum += (pt1[i]-pt2[i])*(pt1[i]-pt2[i]);
- }
+ pt1 = pt2;
+ pt2 = it.Value();
+ double accum = 0.0;
+ for (unsigned int i = 0; i < VDimension; ++i)
+ {
+ accum += (pt1[i] - pt2[i]) * (pt1[i] - pt2[i]);
+ }
length += vcl_sqrt(accum);
it++;
- }
+ }
- }
+ }
else //if there is strictly less than 2 points, length is 0
- {
+ {
length = 0.0;
- }
+ }
m_Length = length;
m_LengthIsValid = true;
}
-
/**
* PrintSelf Method
*/
-template < class TValue,unsigned int VDimension>
+template <class TValue, unsigned int VDimension>
void
-PolyLineParametricPathWithValue<TValue,VDimension>
+PolyLineParametricPathWithValue<TValue, VDimension>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
VertexListConstIteratorType it = this->GetVertexList()->Begin();
while (it != this->GetVertexList()->End())
- {
+ {
os << it.Value() << " - ";
it++;
- }
+ }
os << std::endl;
}
-template < class TValue,unsigned int VDimension>
-typename PolyLineParametricPathWithValue<TValue,VDimension>
- ::RegionType
-PolyLineParametricPathWithValue<TValue,VDimension>
- ::GetBoundingRegion() const
+template <class TValue, unsigned int VDimension>
+typename PolyLineParametricPathWithValue<TValue, VDimension>
+::RegionType
+PolyLineParametricPathWithValue<TValue, VDimension>
+::GetBoundingRegion() const
{
if (!m_BoundingRegionIsValid)
- {
+ {
ComputeBoundingRegion();
- }
+ }
return m_BoundingRegion;
}
/**
* Bounding Box computation
*/
-template < class TValue,unsigned int VDimension>
+template <class TValue, unsigned int VDimension>
void
-PolyLineParametricPathWithValue<TValue,VDimension>
+PolyLineParametricPathWithValue<TValue, VDimension>
::ComputeBoundingRegion() const
{
- SizeType size;
+ SizeType size;
IndexType index;
size.Fill(0);
@@ -147,8 +145,8 @@ PolyLineParametricPathWithValue<TValue,VDimension>
double x = 0.0;
double y = 0.0;
- if (this->GetVertexList()->Size()>0)
- {
+ if (this->GetVertexList()->Size() > 0)
+ {
x = static_cast<double>(it.Value()[0]);
y = static_cast<double>(it.Value()[1]);
index[0] = x;
@@ -156,47 +154,47 @@ PolyLineParametricPathWithValue<TValue,VDimension>
++it;
while (it != this->GetVertexList()->End())
- {
+ {
x = static_cast<double>(it.Value()[0]);
y = static_cast<double>(it.Value()[1]);
// Index search
- if ( x < index[0] )
- {
+ if (x < index[0])
+ {
index[0] = x;
- }
- if ( y < index[1] )
- {
+ }
+ if (y < index[1])
+ {
index[1] = y;
- }
+ }
// Max Id search for size computation
- if ( x > maxId[0] )
- {
+ if (x > maxId[0])
+ {
maxId[0] = x;
- }
- if ( y > maxId[1] )
- {
+ }
+ if (y > maxId[1])
+ {
maxId[1] = y;
- }
+ }
++it;
- }
+ }
size[0] = maxId[0] - index[0];
size[1] = maxId[1] - index[1];
- }
+ }
m_BoundingRegion.SetSize(size);
m_BoundingRegion.SetOrigin(index);
m_BoundingRegionIsValid = true;
}
-template < class TValue,unsigned int VDimension>
- void
- PolyLineParametricPathWithValue<TValue,VDimension>
- ::Modified()
+template <class TValue, unsigned int VDimension>
+void
+PolyLineParametricPathWithValue<TValue, VDimension>
+::Modified()
{
- m_LengthIsValid=false;
- m_BoundingRegionIsValid=false;
+ m_LengthIsValid = false;
+ m_BoundingRegionIsValid = false;
}
} // end namespace otb
diff --git a/Code/Common/otbPolygon.h b/Code/Common/otbPolygon.h
index d43a1e01dc..2086fa81ab 100644
--- a/Code/Common/otbPolygon.h
+++ b/Code/Common/otbPolygon.h
@@ -20,7 +20,6 @@
#include "otbPolyLineParametricPathWithValue.h"
-
namespace otb
{
/** \class Polygon
@@ -36,17 +35,17 @@ namespace otb
*
* \sa otb::PolyLineParametricPathWithValue
*/
-template<class TValue=double>
+template<class TValue = double>
class ITK_EXPORT Polygon
- : public PolyLineParametricPathWithValue<TValue,2>
+ : public PolyLineParametricPathWithValue<TValue, 2>
{
public:
/** Standard typedefs */
- typedef Polygon Self;
- typedef PolyLineParametricPathWithValue<TValue,2> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef TValue ValueType;
+ typedef Polygon Self;
+ typedef PolyLineParametricPathWithValue<TValue, 2> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef TValue ValueType;
/** Type macro */
itkNewMacro(Self);
@@ -54,14 +53,13 @@ public:
itkTypeMacro(Polygon, PolyLineParametricPathWithValue);
/** Derived typedefs */
- typedef typename Superclass::VertexType VertexType;
- typedef typename Superclass::VertexListType VertexListType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::VertexListConstIteratorType VertexListConstIteratorType;
-
+ typedef typename Superclass::VertexType VertexType;
+ typedef typename Superclass::VertexListType VertexListType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
+ typedef typename Superclass::VertexListConstIteratorType VertexListConstIteratorType;
- itkSetMacro(Epsilon,double);
- itkGetMacro(Epsilon,double);
+ itkSetMacro(Epsilon, double);
+ itkGetMacro(Epsilon, double);
/**
* Check wether point is strictly inside the polygon.
@@ -113,7 +111,6 @@ public:
*/
bool IsTouching(VertexType a1, VertexType a2, VertexType b1, VertexType b2) const;
-
/**
* Return the polygon area.
* \return The area.
@@ -136,20 +133,19 @@ public:
*/
virtual double GetLength() const;
-
- void AddVertex (const ContinuousIndexType &vertex);
+ void AddVertex(const ContinuousIndexType& vertex);
protected:
/** Constructor */
Polygon()
- {
+ {
m_Epsilon = 0.000001;
m_Area = -1.0;
m_AreaIsValid = false;
- };
+ };
/** Destructor */
- virtual ~Polygon() {};
+ virtual ~Polygon() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -158,15 +154,15 @@ protected:
virtual void Modified();
private:
- Polygon(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ Polygon(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- double m_Epsilon;
+ double m_Epsilon;
mutable double m_Area;
- mutable bool m_AreaIsValid;
+ mutable bool m_AreaIsValid;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbPolygon.txx"
diff --git a/Code/Common/otbPolygon.txx b/Code/Common/otbPolygon.txx
index f217e2e58c..99c2e5b299 100644
--- a/Code/Common/otbPolygon.txx
+++ b/Code/Common/otbPolygon.txx
@@ -26,10 +26,10 @@ namespace otb
template<class TValue>
void
Polygon<TValue>
-::AddVertex(const ContinuousIndexType &vertex)
+::AddVertex(const ContinuousIndexType& vertex)
{
Superclass::AddVertex(vertex);
- m_AreaIsValid=false;
+ m_AreaIsValid = false;
}
/**
@@ -43,73 +43,73 @@ bool
Polygon<TValue>
::IsInside(VertexType point) const
{
- double x = point[0];
- double y = point[1];
- unsigned int crossingCount = 0;
+ double x = point[0];
+ double y = point[1];
+ unsigned int crossingCount = 0;
VertexListConstIteratorType it = this->GetVertexList()->Begin();
- double xa = it.Value()[0];
- double ya = it.Value()[1];
+ double xa = it.Value()[0];
+ double ya = it.Value()[1];
++it;
while (it != this->GetVertexList()->End())
- {
+ {
double xb = it.Value()[0];
double yb = it.Value()[1];
- if (vcl_abs(xb-xa)<m_Epsilon)
- {
- if (ya>yb && xa>x && y>=yb && y<ya)
+ if (vcl_abs(xb - xa) < m_Epsilon)
{
+ if (ya > yb && xa > x && y >= yb && y < ya)
+ {
++crossingCount;
- }
- else if (ya<yb && xa>x && y>=ya && y<yb)
- {
+ }
+ else if (ya < yb && xa > x && y >= ya && y < yb)
+ {
++crossingCount;
+ }
}
- }
- else if (vcl_abs(yb-ya)>=m_Epsilon)
- {
- double xcross = xa + (xb - xa)*(y - ya)/(yb-ya);
-
- if (ya>yb && xcross>x && y >= yb && y < ya)
+ else if (vcl_abs(yb - ya) >= m_Epsilon)
{
+ double xcross = xa + (xb - xa) * (y - ya) / (yb - ya);
+
+ if (ya > yb && xcross > x && y >= yb && y < ya)
+ {
++crossingCount;
- }
- else if (ya<yb && xcross>x && y >= ya && y < yb)
- {
+ }
+ else if (ya < yb && xcross > x && y >= ya && y < yb)
+ {
++crossingCount;
+ }
}
- }
xa = xb;
ya = yb;
++it;
- }
+ }
double xb = this->GetVertexList()->Begin().Value()[0];
double yb = this->GetVertexList()->Begin().Value()[1];
- if (vcl_abs(xb-xa)< m_Epsilon)
- {
- if (ya>yb && xa>x && y>=yb && y<ya)
+ if (vcl_abs(xb - xa) < m_Epsilon)
{
+ if (ya > yb && xa > x && y >= yb && y < ya)
+ {
++crossingCount;
- }
- else if (ya<yb && xa>x && y>=ya && y<yb)
- {
+ }
+ else if (ya < yb && xa > x && y >= ya && y < yb)
+ {
++crossingCount;
+ }
}
- }
- else if (vcl_abs(yb-ya)>=m_Epsilon)
- {
- double xcross = xa + (xb - xa)*(y - ya)/(yb-ya);
-
- if (ya>yb && xcross>x && y >= yb && y < ya)
+ else if (vcl_abs(yb - ya) >= m_Epsilon)
{
+ double xcross = xa + (xb - xa) * (y - ya) / (yb - ya);
+
+ if (ya > yb && xcross > x && y >= yb && y < ya)
+ {
++crossingCount;
- }
- else if (ya<yb && xcross>x && y >= ya && y < yb)
- {
+ }
+ else if (ya < yb && xcross > x && y >= ya && y < yb)
+ {
++crossingCount;
+ }
}
- }
//std::cout<<"Crossing count: "<<crossingCount<<std::endl;
- return (crossingCount%2 == 1);
+ return (crossingCount % 2 == 1);
}
/**
@@ -123,79 +123,79 @@ Polygon<TValue>
::IsOnEdge(VertexType point) const
{
//std::cout<<"Checking point "<<point<<std::endl;
- bool resp = false;
- double x = point[0];
- double y = point[1];
- double xb,yb;
+ bool resp = false;
+ double x = point[0];
+ double y = point[1];
+ double xb, yb;
VertexListConstIteratorType it = this->GetVertexList()->Begin();
- double xa = it.Value()[0];
- double ya = it.Value()[1];
- double xbegin = xa;
- double ybegin = ya;
+ double xa = it.Value()[0];
+ double ya = it.Value()[1];
+ double xbegin = xa;
+ double ybegin = ya;
++it;
while (!resp && it != this->GetVertexList()->End())
- {
+ {
xb = it.Value()[0];
yb = it.Value()[1];
- if (vcl_abs(xb-xa)>=m_Epsilon)
- {
- double cd = (yb - ya)/(xb - xa);
- double oo = (ya - cd * xa);
- double xmin = std::min(xa,xb);
- double xmax = std::max(xa,xb);
- if ((vcl_abs(y - cd * x - oo)<m_Epsilon)
- && ( x <= xmax)
- && ( x >= xmin))
+ if (vcl_abs(xb - xa) >= m_Epsilon)
{
+ double cd = (yb - ya) / (xb - xa);
+ double oo = (ya - cd * xa);
+ double xmin = std::min(xa, xb);
+ double xmax = std::max(xa, xb);
+ if ((vcl_abs(y - cd * x - oo) < m_Epsilon)
+ && (x <= xmax)
+ && (x >= xmin))
+ {
//std::cout<<"Case 1: Point is on segment "<<xa<<", "<<ya<<" <-> "<<xb<<", "<<yb<<std::endl;
resp = true;
+ }
}
- }
else
- {
- double ymin = std::min(ya,yb);
- double ymax = std::max(ya,yb);
- if ((vcl_abs(x-xa)<m_Epsilon)
- &&(y<=ymax)
- &&(y>=ymin))
{
+ double ymin = std::min(ya, yb);
+ double ymax = std::max(ya, yb);
+ if ((vcl_abs(x - xa) < m_Epsilon)
+ && (y <= ymax)
+ && (y >= ymin))
+ {
resp = true;
//std::cout<<"Case 2: Point is on segment "<<xa<<", "<<ya<<" <-> "<<xb<<", "<<yb<<std::endl;
+ }
}
- }
xa = xb;
ya = yb;
++it;
- }
+ }
xb = xbegin;
yb = ybegin;
- if (vcl_abs(xb-xa)>=m_Epsilon)
- {
- double cd = (yb - ya)/(xb - xa);
+ if (vcl_abs(xb - xa) >= m_Epsilon)
+ {
+ double cd = (yb - ya) / (xb - xa);
double oo = (ya - cd * xa);
- double xmin = std::min(xa,xb);
- double xmax = std::max(xa,xb);
+ double xmin = std::min(xa, xb);
+ double xmax = std::max(xa, xb);
- if ((vcl_abs(y - cd * x - oo)<m_Epsilon)
- && ( x <= xmax)
- && ( x >= xmin))
- {
+ if ((vcl_abs(y - cd * x - oo) < m_Epsilon)
+ && (x <= xmax)
+ && (x >= xmin))
+ {
resp = true;
//std::cout<<"Case 1: Point is on segment "<<xa<<", "<<ya<<" <-> "<<xb<<", "<<yb<<std::endl;
+ }
}
- }
else
- {
- double ymin = std::min(ya,yb);
- double ymax = std::max(ya,yb);
- if ((vcl_abs(x-xa)<=m_Epsilon)
- &&(y<=ymax)
- &&(y>=ymin))
{
+ double ymin = std::min(ya, yb);
+ double ymax = std::max(ya, yb);
+ if ((vcl_abs(x - xa) <= m_Epsilon)
+ && (y <= ymax)
+ && (y >= ymin))
+ {
resp = true;
//std::cout<<"Case 2: Point is on segment "<<xa<<", "<<ya<<" <-> "<<xb<<", "<<yb<<std::endl;
+ }
}
- }
//std::cout<<"Result: "<<resp<<std::endl;
return resp;
}
@@ -210,27 +210,27 @@ unsigned int
Polygon<TValue>
::NbCrossing(VertexType a, VertexType b) const
{
- unsigned int resp = 0;
+ unsigned int resp = 0;
VertexListConstIteratorType it = this->GetVertexList()->Begin();
VertexListConstIteratorType it_end = this->GetVertexList()->End();
- VertexType current = it.Value();
- VertexType first = current;
+ VertexType current = it.Value();
+ VertexType first = current;
++it;
- while ( it != it_end)
- {
- //std::cout<<"Testing Is crossing "<<a<<" "<<b<<current<<it.Value()<<" = "<<IsCrossing(a,b,current,it.Value())<<std::endl;
- if (IsCrossing(a,b,current,it.Value()))
+ while (it != it_end)
{
+ //std::cout<<"Testing Is crossing "<<a<<" "<<b<<current<<it.Value()<<" = "<<IsCrossing(a,b,current,it.Value())<<std::endl;
+ if (IsCrossing(a, b, current, it.Value()))
+ {
++resp;
- }
+ }
current = it.Value();
++it;
- }
+ }
//std::cout<<"Testing Is crossing "<<a<<" "<<b<<current<<first<<" = "<<IsCrossing(a,b,current,first)<<std::endl;
- if (IsCrossing(a,b,current,first))
- {
+ if (IsCrossing(a, b, current, first))
+ {
++resp;
- }
+ }
return resp;
}
/**
@@ -244,27 +244,27 @@ unsigned int
Polygon<TValue>
::NbTouching(VertexType a, VertexType b) const
{
- unsigned int resp = 0;
+ unsigned int resp = 0;
VertexListConstIteratorType it = this->GetVertexList()->Begin();
VertexListConstIteratorType it_end = this->GetVertexList()->End();
- VertexType current = it.Value();
- VertexType first = current;
+ VertexType current = it.Value();
+ VertexType first = current;
++it;
- while ( it != it_end)
- {
- //std::cout<<"IsTouching "<<a<<" "<<b<<", "<<current<<" "<<it.Value()<<" -> "<<IsTouching(a,b,current,it.Value())<<std::endl;
- if (IsTouching(a,b,current,it.Value()))
+ while (it != it_end)
{
+ //std::cout<<"IsTouching "<<a<<" "<<b<<", "<<current<<" "<<it.Value()<<" -> "<<IsTouching(a,b,current,it.Value())<<std::endl;
+ if (IsTouching(a, b, current, it.Value()))
+ {
++resp;
- }
+ }
current = it.Value();
++it;
- }
+ }
//std::cout<<"IsTouching "<<a<<" "<<b<<", "<<current<<" "<<first<<" -> "<<IsTouching(a,b,current,first)<<std::endl;
- if (IsTouching(a,b,current,first))
- {
+ if (IsTouching(a, b, current, first))
+ {
++resp;
- }
+ }
return resp;
}
/**
@@ -280,48 +280,48 @@ bool
Polygon<TValue>
::IsCrossing(VertexType a1, VertexType a2, VertexType b1, VertexType b2) const
{
- bool resp = false;
- double xbmin = std::min(b1[0],b2[0]);
- double xbmax = std::max(b1[0],b2[0]);
- double ybmin = std::min(b1[1],b2[1]);
- double ybmax = std::max(b1[1],b2[1]);
- double xamin = std::min(a1[0],a2[0]);
- double xamax = std::max(a1[0],a2[0]);
- double yamin = std::min(a1[1],a2[1]);
- double yamax = std::max(a1[1],a2[1]);
- if (vcl_abs(a1[0]-a2[0])<m_Epsilon && vcl_abs(b1[0]-b2[0])<m_Epsilon)
- {
+ bool resp = false;
+ double xbmin = std::min(b1[0], b2[0]);
+ double xbmax = std::max(b1[0], b2[0]);
+ double ybmin = std::min(b1[1], b2[1]);
+ double ybmax = std::max(b1[1], b2[1]);
+ double xamin = std::min(a1[0], a2[0]);
+ double xamax = std::max(a1[0], a2[0]);
+ double yamin = std::min(a1[1], a2[1]);
+ double yamax = std::max(a1[1], a2[1]);
+ if (vcl_abs(a1[0] - a2[0]) < m_Epsilon && vcl_abs(b1[0] - b2[0]) < m_Epsilon)
+ {
resp = false;
- }
- else if (vcl_abs(a1[0]-a2[0])<m_Epsilon)
- {
+ }
+ else if (vcl_abs(a1[0] - a2[0]) < m_Epsilon)
+ {
double cd2 = (b2[1] - b1[1]) / (b2[0] - b1[0]);
double oo2 = b1[1] - cd2 * b1[0];
double ycross = cd2 * a1[0] + oo2;
- resp = ( xbmin < a1[0] && xbmax > a1[0]
- && yamin < ycross && yamax > ycross);
- }
- else if (vcl_abs(b1[0]-b2[0])<m_Epsilon)
- {
+ resp = (xbmin <a1[0] && xbmax> a1[0]
+ && yamin <ycross && yamax> ycross);
+ }
+ else if (vcl_abs(b1[0] - b2[0]) < m_Epsilon)
+ {
double cd1 = (a2[1] - a1[1]) / (a2[0] - a1[0]);
double oo1 = a1[1] - cd1 * a1[0];
double ycross = cd1 * b1[0] + oo1;
- resp = ( xamin < b1[0] && xamax > b1[0]
- && ybmin < ycross && ybmax > ycross);
- }
+ resp = (xamin <b1[0] && xamax> b1[0]
+ && ybmin <ycross && ybmax> ycross);
+ }
else
- {
+ {
double cd1 = (a2[1] - a1[1]) / (a2[0] - a1[0]);
double oo1 = a1[1] - cd1 * a1[0];
double cd2 = (b2[1] - b1[1]) / (b2[0] - b1[0]);
double oo2 = b1[1] - cd2 * b1[0];
if (cd1 != cd2)
- {
+ {
double xcross = (oo2 - oo1) / (cd1 - cd2);
- resp = (xamin < xcross && xbmin < xcross
- && xamax > xcross && xbmax > xcross);
+ resp = (xamin <xcross && xbmin <xcross
+ && xamax> xcross && xbmax> xcross);
+ }
}
- }
return resp;
}
/**
@@ -335,90 +335,89 @@ Polygon<TValue>
template<class TValue>
bool
Polygon<TValue>
-::IsTouching(VertexType a1, VertexType a2, VertexType b1, VertexType b2) const
+::IsTouching(VertexType a1, VertexType a2, VertexType b1, VertexType b2) const
{
- bool resp = false;
- double xbmin = std::min(b1[0],b2[0]);
- double xbmax = std::max(b1[0],b2[0]);
- double ybmin = std::min(b1[1],b2[1]);
- double ybmax = std::max(b1[1],b2[1]);
- double xamin = std::min(a1[0],a2[0]);
- double xamax = std::max(a1[0],a2[0]);
- double yamin = std::min(a1[1],a2[1]);
- double yamax = std::max(a1[1],a2[1]);
- if (vcl_abs(a1[0]-a2[0])<m_Epsilon && vcl_abs(b1[0]-b2[0])<m_Epsilon)
- {
- resp = (vcl_abs(a1[0]-b1[0])<m_Epsilon)
- && ((a1[1]<=ybmax && a1[1]>=ybmin)
- || (a2[1]<=ybmax && a2[1]>=ybmin)
- || (b1[1]<=yamax && b1[1]>=yamin)
- || (b2[1]<=yamax && b2[1]>=yamin) );
- }
- else if (vcl_abs(a1[0]-a2[0])<m_Epsilon)
- {
+ bool resp = false;
+ double xbmin = std::min(b1[0], b2[0]);
+ double xbmax = std::max(b1[0], b2[0]);
+ double ybmin = std::min(b1[1], b2[1]);
+ double ybmax = std::max(b1[1], b2[1]);
+ double xamin = std::min(a1[0], a2[0]);
+ double xamax = std::max(a1[0], a2[0]);
+ double yamin = std::min(a1[1], a2[1]);
+ double yamax = std::max(a1[1], a2[1]);
+ if (vcl_abs(a1[0] - a2[0]) < m_Epsilon && vcl_abs(b1[0] - b2[0]) < m_Epsilon)
+ {
+ resp = (vcl_abs(a1[0] - b1[0]) < m_Epsilon)
+ && ((a1[1] <= ybmax && a1[1] >= ybmin)
+ || (a2[1] <= ybmax && a2[1] >= ybmin)
+ || (b1[1] <= yamax && b1[1] >= yamin)
+ || (b2[1] <= yamax && b2[1] >= yamin));
+ }
+ else if (vcl_abs(a1[0] - a2[0]) < m_Epsilon)
+ {
double cd2 = (b2[1] - b1[1]) / (b2[0] - b1[0]);
double oo2 = b1[1] - cd2 * b1[0];
- if (vcl_abs(a1[1]-cd2*a1[0]-oo2)<m_Epsilon)
- {
- resp = ( a1[0]>=xbmin && a1[0]<=xbmax);
+ if (vcl_abs(a1[1] - cd2 * a1[0] - oo2) < m_Epsilon)
+ {
+ resp = (a1[0] >= xbmin && a1[0] <= xbmax);
+ }
+ else if (vcl_abs(a2[1] - cd2 * a2[0] - oo2) < m_Epsilon)
+ {
+ resp = (a2[0] >= xbmin && a2[0] <= xbmax);
+ }
}
- else if (vcl_abs(a2[1]-cd2*a2[0]-oo2)<m_Epsilon)
+ else if (vcl_abs(b1[0] - b2[0]) < m_Epsilon)
{
- resp = ( a2[0]>=xbmin && a2[0]<=xbmax);
- }
- }
- else if (vcl_abs(b1[0]-b2[0])<m_Epsilon)
- {
double cd1 = (a2[1] - a1[1]) / (a2[0] - a1[0]);
double oo1 = a1[1] - cd1 * a1[0];
- if (vcl_abs(b1[1]-cd1*b1[0]-oo1)<m_Epsilon)
- {
- resp = ( b1[0]>=xamin && b1[0]<=xamax);
- }
- else if (vcl_abs(b2[1]-cd1*b2[0]-oo1)<m_Epsilon)
- {
- resp = ( b2[0]>=xamin && b2[0]<=xamax);
+ if (vcl_abs(b1[1] - cd1 * b1[0] - oo1) < m_Epsilon)
+ {
+ resp = (b1[0] >= xamin && b1[0] <= xamax);
+ }
+ else if (vcl_abs(b2[1] - cd1 * b2[0] - oo1) < m_Epsilon)
+ {
+ resp = (b2[0] >= xamin && b2[0] <= xamax);
+ }
}
- }
else
- {
+ {
double cd1 = (a2[1] - a1[1]) / (a2[0] - a1[0]);
double oo1 = a1[1] - cd1 * a1[0];
double cd2 = (b2[1] - b1[1]) / (b2[0] - b1[0]);
double oo2 = b1[1] - cd2 * b1[0];
- if (vcl_abs(cd1-cd2)<m_Epsilon && vcl_abs(oo1-oo2)<m_Epsilon)
- {
- resp =((xamin <= xbmax && xamin >= xbmin)
- || (xamax <= xbmax && xamax >= xbmin)
- || (xbmin <= xamax && xbmin >= xamin)
- || (xbmax <= xamax && xbmax >= xamin) );
- }
- else
- {
- if (vcl_abs(a1[1]-cd2*a1[0]-oo2)<m_Epsilon)
- {
- resp = ( a1[0]>=xbmin && a1[0]<=xbmax);
- }
- else if (vcl_abs(a2[1]-cd2*a2[0]-oo2)<m_Epsilon)
+ if (vcl_abs(cd1 - cd2) < m_Epsilon && vcl_abs(oo1 - oo2) < m_Epsilon)
{
- resp = ( a2[0]>=xbmin && a2[0]<=xbmax);
+ resp = ((xamin <= xbmax && xamin >= xbmin)
+ || (xamax <= xbmax && xamax >= xbmin)
+ || (xbmin <= xamax && xbmin >= xamin)
+ || (xbmax <= xamax && xbmax >= xamin));
}
- if (vcl_abs(b1[1]-cd1*b1[0]-oo1)<m_Epsilon)
- {
- resp = ( b1[0]>=xamin && b1[0]<=xamax);
- }
- else if (vcl_abs(b2[1]-cd1*b2[0]-oo1)<m_Epsilon)
+ else
{
- resp = ( b2[0]>=xamin && b2[0]<=xamax);
+ if (vcl_abs(a1[1] - cd2 * a1[0] - oo2) < m_Epsilon)
+ {
+ resp = (a1[0] >= xbmin && a1[0] <= xbmax);
+ }
+ else if (vcl_abs(a2[1] - cd2 * a2[0] - oo2) < m_Epsilon)
+ {
+ resp = (a2[0] >= xbmin && a2[0] <= xbmax);
+ }
+ if (vcl_abs(b1[1] - cd1 * b1[0] - oo1) < m_Epsilon)
+ {
+ resp = (b1[0] >= xamin && b1[0] <= xamax);
+ }
+ else if (vcl_abs(b2[1] - cd1 * b2[0] - oo1) < m_Epsilon)
+ {
+ resp = (b2[0] >= xamin && b2[0] <= xamax);
+ }
}
}
- }
return resp;
}
-
/**
* Area computation (for non convex polygons as well)
*/
@@ -429,35 +428,35 @@ Polygon<TValue>
{
VertexListConstIteratorType it = this->GetVertexList()->Begin();
- if (this->GetVertexList()->Size()>2)
- {
- double area=0.0;
+ if (this->GetVertexList()->Size() > 2)
+ {
+ double area = 0.0;
VertexType origin = it.Value();
it++;
VertexType pt1 = it.Value();
VertexType pt2 = it.Value();
while (it != this->GetVertexList()->End())
- {
- pt1=pt2;
+ {
+ pt1 = pt2;
pt2 = it.Value();
double vector1x = pt1[0] - origin[0];
double vector1y = pt1[1] - origin[1];
double vector2x = pt2[0] - origin[0];
double vector2y = pt2[1] - origin[1];
- double crossProdduct = vector1x*vector2y - vector2x*vector1y;
+ double crossProdduct = vector1x * vector2y - vector2x * vector1y;
area += crossProdduct;
it++;
- }
+ }
- m_Area = fabs(area/2.0);
+ m_Area = fabs(area / 2.0);
- }
+ }
else //if there is strictly less than 3 points, surface is 0
- {
+ {
m_Area = 0.0;
- }
+ }
m_AreaIsValid = true;
}
@@ -466,74 +465,72 @@ Polygon<TValue>
* Get surface
*/
template<class TValue>
- double
- Polygon<TValue>
- ::GetArea() const
+double
+Polygon<TValue>
+::GetArea() const
{
if (!m_AreaIsValid)
- {
+ {
ComputeArea();
- }
+ }
return m_Area;
}
-
/**
* Lenght computation (difference with path is in the last addition)
*/
-template < class TValue>
+template <class TValue>
double Polygon<TValue>
::GetLength() const
{
- double length = 0.0;
+ double length = 0.0;
VertexListConstIteratorType it = this->GetVertexList()->Begin();
VertexType origin = it.Value();
- if (this->GetVertexList()->Size()>1)
- {
-
+ if (this->GetVertexList()->Size() > 1)
+ {
- VertexType pt1 = it.Value();//just init, won't be used like that
+ VertexType pt1 = it.Value(); //just init, won't be used like that
VertexType pt2 = it.Value();
it++;
while (it != this->GetVertexList()->End())
- {
- pt1=pt2;
- pt2 = it.Value();
- double accum=0.0;
- for (int i=0; i<2; ++i)
{
- accum += (pt1[i]-pt2[i])*(pt1[i]-pt2[i]);
- }
+ pt1 = pt2;
+ pt2 = it.Value();
+ double accum = 0.0;
+ for (int i = 0; i < 2; ++i)
+ {
+ accum += (pt1[i] - pt2[i]) * (pt1[i] - pt2[i]);
+ }
length += vcl_sqrt(accum);
it++;
- }
+ }
//Adding the last segment (between first and last point)
- double accum=0.0;
- for (int i=0; i<2; ++i)
- {
- accum += (origin[i]-pt2[i])*(origin[i]-pt2[i]);
- }
+ double accum = 0.0;
+ for (int i = 0; i < 2; ++i)
+ {
+ accum += (origin[i] - pt2[i]) * (origin[i] - pt2[i]);
+ }
length += vcl_sqrt(accum);
- }
+ }
else //if there is strictly less than 2 points, length is 0
- {
+ {
length = 0.0;
- }
+ }
return length;
}
template <class TValue>
- void
- Polygon<TValue>
- ::Modified()
+void
+Polygon<TValue>
+::Modified()
{
Superclass::Modified();
- m_AreaIsValid=false;
+ m_AreaIsValid = false;
}
/**
@@ -547,7 +544,6 @@ Polygon<TValue>
Superclass::PrintSelf(os, indent);
}
-
} // End namespace otb
#endif
diff --git a/Code/Common/otbPostGISConnectionImplementation.cxx b/Code/Common/otbPostGISConnectionImplementation.cxx
index dec70da961..8d81de00f4 100644
--- a/Code/Common/otbPostGISConnectionImplementation.cxx
+++ b/Code/Common/otbPostGISConnectionImplementation.cxx
@@ -31,12 +31,11 @@ PostGISConnectionImplementation::PostGISConnectionImplementation()
m_Port = "5432";
m_Options = "";
-
}
PostGISConnectionImplementation::~PostGISConnectionImplementation()
{
-
+
}
void PostGISConnectionImplementation::ConnectToDB()
@@ -45,17 +44,13 @@ void PostGISConnectionImplementation::ConnectToDB()
connstring << "host=" << m_Host << " dbname=" << m_DBName << " user=" << m_User;
- if(m_Password!="")
- connstring << " password=" << m_Password;
+ if (m_Password != "") connstring << " password=" << m_Password;
- if(m_Port!="")
- connstring << " port=" << m_Port;
+ if (m_Port != "") connstring << " port=" << m_Port;
- if(m_Options!="")
- connstring << " options=" << m_Options;
+ if (m_Options != "") connstring << " options=" << m_Options;
- if(! m_PostGISConnection )
- delete m_PostGISConnection;
+ if (!m_PostGISConnection) delete m_PostGISConnection;
m_PostGISConnection = new BasicConnectionType(connstring.str().c_str());
@@ -72,13 +67,12 @@ PostGISConnectionImplementation::BasicConnectionType* PostGISConnectionImplement
return m_PostGISConnection;
}
-
void PostGISConnectionImplementation::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << std::endl;
- os<<"DB name: " << m_DBName <<std::endl;
+ os << "DB name: " << m_DBName << std::endl;
}
diff --git a/Code/Common/otbPostGISConnectionImplementation.h b/Code/Common/otbPostGISConnectionImplementation.h
index 21006434c4..43dce1156e 100644
--- a/Code/Common/otbPostGISConnectionImplementation.h
+++ b/Code/Common/otbPostGISConnectionImplementation.h
@@ -18,7 +18,6 @@
#ifndef __otbPostGISConnectionImplementation_h
#define __otbPostGISConnectionImplementation_h
-
#include "otbGISConnectionImplementation.h"
#include <pqxx/pqxx>
@@ -32,25 +31,23 @@ namespace otb
*/
class ITK_EXPORT PostGISConnectionImplementation
- : public GISConnectionImplementation< pqxx::transactor<pqxx::nontransaction > >
+ : public GISConnectionImplementation<pqxx::transactor<pqxx::nontransaction> >
{
public:
/** Standard class typedefs */
- typedef PostGISConnectionImplementation Self;
- typedef pqxx::transactor<pqxx::nontransaction> PQXXTransactorType;
+ typedef PostGISConnectionImplementation Self;
+ typedef pqxx::transactor<pqxx::nontransaction> PQXXTransactorType;
typedef GISConnectionImplementation<PQXXTransactorType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Standard macros */
itkNewMacro(Self);
itkTypeMacro(PostGISConnectionImplementation, GISConnectionImplementation);
-
/** Typedefs */
typedef pqxx::basic_connection<pqxx::connect_direct> BasicConnectionType;
- typedef PQXXTransactorType TransactorType;
+ typedef PQXXTransactorType TransactorType;
/** Acessors */
itkGetMacro(Host, std::string);
@@ -79,7 +76,6 @@ public:
BasicConnectionType* GetConnection() const;
-
protected:
/** Constructor */
PostGISConnectionImplementation();
@@ -89,9 +85,8 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- PostGISConnectionImplementation(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ PostGISConnectionImplementation(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
std::string m_Host;
std::string m_DBName;
@@ -102,10 +97,7 @@ private:
BasicConnectionType* m_PostGISConnection;
-
};
-}// end namespace otb
-
+} // end namespace otb
#endif
-
diff --git a/Code/Common/otbPostGISTable.h b/Code/Common/otbPostGISTable.h
index 185961f9c7..29a71afa43 100644
--- a/Code/Common/otbPostGISTable.h
+++ b/Code/Common/otbPostGISTable.h
@@ -31,40 +31,38 @@ namespace otb
* \sa GISTableFileWriter
*
*/
-template <class TConnectionImplementation, class TPrecision =double, unsigned int SpatialDimension =2>
+template <class TConnectionImplementation, class TPrecision = double, unsigned int SpatialDimension = 2>
class ITK_EXPORT PostGISTable
: public GISTable <TConnectionImplementation, TPrecision, SpatialDimension>
{
public:
/** Standard class typedefs */
- typedef PostGISTable Self;
+ typedef PostGISTable Self;
typedef GISTable <TConnectionImplementation, TPrecision, SpatialDimension> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Standard macros */
itkNewMacro(Self);
- itkTypeMacro(PostGISTable,GISTable);
+ itkTypeMacro(PostGISTable, GISTable);
itkStaticConstMacro(Dimension, unsigned int, SpatialDimension);
/** Some convenient typedefs */
- typedef TConnectionImplementation ConnectionType;
- typedef typename ConnectionType::Pointer ConnectionPointerType;
- typedef itk::Point<TPrecision , SpatialDimension > PointType;
- typedef PolyLineParametricPathWithValue < TPrecision , SpatialDimension > LineType;
- typedef typename LineType::Pointer LinePointerType;
- typedef Polygon < TPrecision > PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
- typedef typename PolygonType::ConstPointer PolygonConstPointerType;
- typedef ObjectList< PolygonType > PolygonListType;
- typedef typename PolygonListType::Pointer PolygonListPointerType;
- typedef typename PolygonListType::ConstPointer PolygonListConstPointerType;
-
+ typedef TConnectionImplementation ConnectionType;
+ typedef typename ConnectionType::Pointer ConnectionPointerType;
+ typedef itk::Point<TPrecision, SpatialDimension> PointType;
+ typedef PolyLineParametricPathWithValue <TPrecision, SpatialDimension> LineType;
+ typedef typename LineType::Pointer LinePointerType;
+ typedef Polygon <TPrecision> PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef typename PolygonType::ConstPointer PolygonConstPointerType;
+ typedef ObjectList<PolygonType> PolygonListType;
+ typedef typename PolygonListType::Pointer PolygonListPointerType;
+ typedef typename PolygonListType::ConstPointer PolygonListConstPointerType;
+
/** typedefs for correct polygon */
typedef otb::CorrectPolygonFunctor<PolygonType> CorrectFunctorType;
-
-
+
/** Acessors */
itkGetConstMacro(TableName, std::string);
@@ -76,39 +74,41 @@ public:
/** Clear the table not implemented yet*/
bool Clear();
-
+
/** Get attributes of the Table*/ //TODO implement
-
+
/** Get srid of the geometric column*/ //TODO implement
//virtual
/** Init basic SQL command*/
- void InsertBegin( std::stringstream & sqlCmd );
+ void InsertBegin(std::stringstream& sqlCmd);
/** Add Point content to the GIS Table*/
- void InsertPoint( const PointType &pt , const std::string & attribute = 0);
+ void InsertPoint(const PointType& pt, const std::string& attribute = 0);
//void InsertMultiPoint();
/** Add Polygons to the GIS Table (exterior and interior ring)*/
- void InsertPolygons(PolygonConstPointerType polygonExtRing, PolygonListConstPointerType polygonListInteriorRing=0, const std::string & attribute = 0);
+ void InsertPolygons(PolygonConstPointerType polygonExtRing,
+ PolygonListConstPointerType polygonListInteriorRing = 0,
+ const std::string& attribute = 0);
/** Add Line to the GIS Table*/
- void InsertLineString(LinePointerType l, const std::string & attribute = 0);
-
+ void InsertLineString(LinePointerType l, const std::string& attribute = 0);
+
/** Execute the sqlCmd which add geometric rows to the gis table*/
- void InsertGeometries (const std::string &sqlCmd );
+ void InsertGeometries(const std::string& sqlCmd);
/** Clean up SQL command*/
- void EraseLastChar (std::stringstream &sqlCmd );
+ void EraseLastChar(std::stringstream& sqlCmd);
/** Effective Creation of the table*/
- void CreateTable (bool dropExistingGISTable);
+ void CreateTable(bool dropExistingGISTable);
/** Get geometry column type Not implemented yet in progress */
void getGeometryType();
-
+
/** Get string connection usable by OGR library*/
std::string GetOGRStrConnection() const;
-
+
/** Get const string connection methos temp*/
//ConnectionPointerType GetConstConnection() const;
-
+
/** Add an alpha numeric column to the table */
// const std::string AddVarCharColumn(unsigned int size);
-
+
/** Insert Alpha Numeric Data in the Car char column */
// void AddStrDataToVarCharColumn(std::string data);
protected:
@@ -116,24 +116,22 @@ protected:
/** Constructor */
PostGISTable();
/** Destructor */
- virtual ~PostGISTable() {};
+ virtual ~PostGISTable() {}
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- PostGISTable(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PostGISTable(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- std::string m_TableName;
+ std::string m_TableName;
ConnectionPointerType m_Connection;
};
-}// end namespace otb
-
+} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbPostGISTable.txx"
#endif
#endif
-
diff --git a/Code/Common/otbPostGISTable.txx b/Code/Common/otbPostGISTable.txx
index b2bcc4dfcc..1c9981f7db 100644
--- a/Code/Common/otbPostGISTable.txx
+++ b/Code/Common/otbPostGISTable.txx
@@ -26,7 +26,6 @@
#include <sstream>
#include <string>
-
#include "otbPostGISFromStringTransactor.h"
#include "otbPostGISConnectionImplementation.h"
#include "otbPostGISCreateTableTransactor.h"
@@ -35,32 +34,29 @@ namespace otb
{
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
- PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
- ::PostGISTable()
+PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
+::PostGISTable()
{
m_Connection = ConnectionType::New();
this->SetSrid(-1);
}
-
-
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
void
- PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
+PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << std::endl;
-
- os<<"Table name: "<< m_TableName<<std::endl;
+ os << "Table name: " << m_TableName << std::endl;
}
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
bool
- PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
- ::Clear()
+PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
+::Clear()
{ //TODO implementation
return true;
}
@@ -68,7 +64,7 @@ bool
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
void
PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
-::InsertBegin( std::stringstream & sqlCmd )
+::InsertBegin(std::stringstream& sqlCmd)
{
sqlCmd.str("");
sqlCmd << "INSERT INTO \"" << this->GetTableName() << "\" ( \"the_geom\" , \"genre\" ) VALUES (";
@@ -77,53 +73,52 @@ PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
void
PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
- ::InsertPoint( const PointType &pt, const std::string & attribute )
+::InsertPoint(const PointType& pt, const std::string& attribute)
{
std::stringstream sqlCmd;
- this->InsertBegin( sqlCmd );
+ this->InsertBegin(sqlCmd);
sqlCmd << "POINT( ";
- for (uint i=0; i < SpatialDimension; i++)
- {
+ for (uint i = 0; i < SpatialDimension; i++)
+ {
sqlCmd << pt[i] << " ";
- }
-
+ }
+
//int this->GetSrid()=-1;
sqlCmd << ")'," << this->GetSrid() << ") ,'" << attribute << "');" << std::endl;
-
-
+
//Execute the query
this->InsertGeometries(sqlCmd.str());
}
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
- void
- PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
- ::InsertLineString( LinePointerType l, const std::string & attribute )
+void
+PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
+::InsertLineString(LinePointerType l, const std::string& attribute)
{
std::stringstream sqlCmd;
- this->InsertBegin ( sqlCmd );
+ this->InsertBegin (sqlCmd);
sqlCmd << "LINESTRING( ";
-
+
typedef typename LineType::VertexListConstIteratorType VertexIterator;
VertexIterator itVertex = l->GetVertexList()->Begin();
while (itVertex != l->GetVertexList()->End())
- {
- for (uint i=0; i < SpatialDimension; i++)
{
+ for (uint i = 0; i < SpatialDimension; i++)
+ {
sqlCmd << itVertex.Value()[i] << " ";
++itVertex;
- }
+ }
sqlCmd << ",";
- }
+ }
//Erase the last ','
- EraseLastChar ( sqlCmd );
-
+ EraseLastChar (sqlCmd);
+
//int this->GetSrid()=-1;
-
+
sqlCmd << ")'," << this->GetSrid() << ") ,'" << attribute << "');" << std::endl;
//Execute the query
this->InsertGeometries(sqlCmd.str());
-
+
/* Invalid (MULTI)Linestring */
}
@@ -131,78 +126,82 @@ template <class TConnectionImplementation, class TPrecision, unsigned int Spatia
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
void
PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
- ::InsertPolygons(PolygonConstPointerType polygonExtRing, PolygonListConstPointerType polygonListInteriorRing, const std::string & attribute)
+::InsertPolygons(PolygonConstPointerType polygonExtRing,
+ PolygonListConstPointerType polygonListInteriorRing,
+ const std::string& attribute)
{
-
+
/** correct polygon exterior ring */
CorrectFunctorType correct;
- PolygonPointerType correctPolygonExtRing = correct( polygonExtRing );
-
+ PolygonPointerType correctPolygonExtRing = correct(polygonExtRing);
+
std::stringstream sqlCmd;
- this->InsertBegin ( sqlCmd );
+ this->InsertBegin (sqlCmd);
sqlCmd << "POLYGON( ( ";
//std::cout << "sqlcmd: " << sqlCmd.str() << std::endl;
typedef typename PolygonType::VertexListConstIteratorType VertexIterator;
VertexIterator itVertex = correctPolygonExtRing->GetVertexList()->Begin();
//std::cout << "sizeof ext poly: " << polygonExtRing->GetVertexList()->Size()<< std::endl;
while (itVertex != correctPolygonExtRing->GetVertexList()->End())
- {
+ {
//polygon->line_to(itVertex.Value()[0],m_SensorModelFlip*itVertex.Value()[1]);
//std::cout << "vertex: " << itVertex.Value()<< std::endl;
- for (uint i=0; i < SpatialDimension; ++i)
- {
+ for (uint i = 0; i < SpatialDimension; ++i)
+ {
sqlCmd << itVertex.Value()[i] << " ";
//++itVertex;
- }
+ }
sqlCmd << ",";
++itVertex;
- }
+ }
//Erase the last ','
//std::cout << "avt erase : " << sqlCmd.str() << std::endl;
- EraseLastChar ( sqlCmd );
+ EraseLastChar (sqlCmd);
//std::cout << "apres arase " << sqlCmd.str() << std::endl;
sqlCmd << "),";
//std::cout << "ext polygon: " << sqlCmd.str() << std::endl;
//Add interior polygons
- if ( !polygonListInteriorRing.IsNull() )
- {
-
+ if (!polygonListInteriorRing.IsNull())
+ {
+
//get holes
//sqlCmd << ",";
- typedef typename PolygonListType::ConstIterator PolygonListConstIteratorType;
- for (PolygonListConstIteratorType itPolygonList = polygonListInteriorRing->Begin();itPolygonList!=polygonListInteriorRing->End();++itPolygonList)
- {
+ typedef typename PolygonListType::ConstIterator PolygonListConstIteratorType;
+ for (PolygonListConstIteratorType itPolygonList = polygonListInteriorRing->Begin();
+ itPolygonList != polygonListInteriorRing->End();
+ ++itPolygonList)
+ {
/** correct current polygon interior ring */
CorrectFunctorType correctCurrentInt;
- PolygonPointerType correctCurrentPolygonIntRing = correctCurrentInt( itPolygonList.Get() );
-
+ PolygonPointerType correctCurrentPolygonIntRing = correctCurrentInt(itPolygonList.Get());
+
sqlCmd << "(";
-
+
itVertex = correctCurrentPolygonIntRing->GetVertexList()->Begin();
while (itVertex != correctCurrentPolygonIntRing->GetVertexList()->End())
- {
- //polygon->line_to(itVertex.Value()[0],m_SensorModelFlip*itVertex.Value()[1]);
- for (uint i=0; i < SpatialDimension; i++)
{
+ //polygon->line_to(itVertex.Value()[0],m_SensorModelFlip*itVertex.Value()[1]);
+ for (uint i = 0; i < SpatialDimension; i++)
+ {
sqlCmd << itVertex.Value()[i] << " ";
++itVertex;
- }
+ }
sqlCmd << ",";
++itVertex;
- }
+ }
//Erase the last ','
- EraseLastChar ( sqlCmd );
-
+ EraseLastChar (sqlCmd);
+
sqlCmd << "),";
- }
+ }
//std::cout << "int polygon: " << sqlCmd.str() << std::endl;
-
- }
+
+ }
//Erase the last ','
- EraseLastChar ( sqlCmd );
-
+ EraseLastChar (sqlCmd);
+
//int this->GetSrid()=-1;
-
+
sqlCmd << ")'," << this->GetSrid() << ") ,'" << attribute << "');" << std::endl;
//std::cout << "sqlcmd polygon: " << sqlCmd.str() << std::endl;
//Insert the geometry
@@ -210,26 +209,25 @@ PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
//std::cout << "geometries!!" << std::endl;
}
-
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
void
PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
-::InsertGeometries (const std::string &sqlCmd )
+::InsertGeometries(const std::string& sqlCmd)
{
typedef otb::PostGISFromStringTransactor TransactorType;
TransactorType myStringTransactor;
//std::cout << "transactor string" << sqlCmd<< std::endl;
- myStringTransactor.SetTransactionString( sqlCmd );
+ myStringTransactor.SetTransactionString(sqlCmd);
//this->GetConnection()->ConnectToDB();
-this->GetConnection()->GetConnection()->perform( myStringTransactor );
+ this->GetConnection()->GetConnection()->perform(myStringTransactor);
// this->GetConnection()->PerformTransaction( myStringTransactor );
- //myStringTransactor ( *( this->GetConnection()->GetConnection() ) );
+//myStringTransactor ( *( this->GetConnection()->GetConnection() ) );
}
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
void
PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
-::EraseLastChar (std::stringstream &sqlCmd )
+::EraseLastChar(std::stringstream& sqlCmd)
{
std::string EraseCmd = sqlCmd.str();
EraseCmd.erase(EraseCmd.length() - 1);
@@ -239,26 +237,26 @@ PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
}
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
- void
- PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
- ::CreateTable (bool dropExistingGISTable)
+void
+PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
+::CreateTable(bool dropExistingGISTable)
{
typedef otb::PostGISCreateTableTransactor TransactorType;
//Instantiation
TransactorType myTransactor;
-
- myTransactor.SetDimension( SpatialDimension );
+
+ myTransactor.SetDimension(SpatialDimension);
//std::string name = "mytable";
- myTransactor.SetTableName( this->GetTableName() );
+ myTransactor.SetTableName(this->GetTableName());
//int this->GetSrid() = -1;
- myTransactor.SetSRID( this->GetSrid() );
+ myTransactor.SetSRID(this->GetSrid());
- myTransactor.SetRemoveExistingTable( dropExistingGISTable );
+ myTransactor.SetRemoveExistingTable(dropExistingGISTable);
- this->GetConnection()->GetConnection()->perform( myTransactor );
+ this->GetConnection()->GetConnection()->perform(myTransactor);
//this->GetConnection()->PerformTransaction( myTransactor );
}
@@ -268,20 +266,19 @@ PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
::getGeometryType()
{
//the geomtric column name is the_geom
- std::string query="SELECT DISTINCT geometrytype(\"the_geom\") "
- "FROM \""+ this->GetTableName() + "\" WHERE NOT geometrytype(\"the_geom\") IS NULL";
-
+ std::string query = "SELECT DISTINCT geometrytype(\"the_geom\") "
+ "FROM \"" + this->GetTableName() + "\" WHERE NOT geometrytype(\"the_geom\") IS NULL";
+
typedef otb::PostGISFromStringTransactor TransactorType;
TransactorType myStringTransactor;
//std::cout << "transactor string" << sqlCmd<< std::endl;
- myStringTransactor.SetTransactionString( query );
+ myStringTransactor.SetTransactionString(query);
//this->GetConnection()->ConnectToDB();
-
+
//typedef pqxx::result ResultType;
//ResultType R = this->GetConnection()->GetConnection()->perform( myStringTransactor );
-
-}
+}
template <class TConnectionImplementation, class TPrecision, unsigned int SpatialDimension>
std::string
@@ -289,34 +286,35 @@ PostGISTable<TConnectionImplementation, TPrecision, SpatialDimension>
::GetOGRStrConnection() const
{
//std::cout << "getOGR: " << m_Connection << std::endl;
- std::string connectionSTR="";
- connectionSTR +="PG:";
-
- connectionSTR +="dbname='";
+ std::string connectionSTR = "";
+ connectionSTR += "PG:";
+
+ connectionSTR += "dbname='";
connectionSTR += m_Connection->GetDBName();
connectionSTR += "' ";
- connectionSTR +="host='";
+ connectionSTR += "host='";
connectionSTR += m_Connection->GetHost();
connectionSTR += "' ";
- connectionSTR +="port='";
+ connectionSTR += "port='";
connectionSTR += m_Connection->GetPort();
connectionSTR += "' ";
- connectionSTR +="user='";
+ connectionSTR += "user='";
connectionSTR += m_Connection->GetUser();
connectionSTR += "' ";
- connectionSTR +="password='";
+ connectionSTR += "password='";
connectionSTR += m_Connection->GetPassword();
connectionSTR += "' ";
- if ( !m_TableName.empty() ) {
- connectionSTR +="tables=";
+ if (!m_TableName.empty())
+ {
+ connectionSTR += "tables=";
connectionSTR += m_TableName;
// connectionSTR += "' ";
- }
-
- otbGenericMsgDebugMacro(<<"OGR connection string " << connectionSTR);
-
+ }
+
+ otbGenericMsgDebugMacro(<< "OGR connection string " << connectionSTR);
+
return connectionSTR;
}
} // end namespace otb
-#endif
\ No newline at end of file
+#endif
diff --git a/Code/Common/otbQuickLookImageGenerator.h b/Code/Common/otbQuickLookImageGenerator.h
index 5af0ea483b..6f407ebce2 100644
--- a/Code/Common/otbQuickLookImageGenerator.h
+++ b/Code/Common/otbQuickLookImageGenerator.h
@@ -26,19 +26,18 @@
#include "otbStreamingShrinkImageFilter.h"
#include "itkDiscreteGaussianImageFilter.h"
-
namespace otb
{
- /** \class QuickLookImageGenerator
- * \brief This functor computes a quicklook using discrete gaussian transform
- */
+/** \class QuickLookImageGenerator
+ * \brief This functor computes a quicklook using discrete gaussian transform
+ */
template <class TInputImage, class TOutputImage>
class ITK_EXPORT QuickLookImageGenerator :
-public itk::ImageToImageFilter< TInputImage, TOutputImage >
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef QuickLookImageGenerator Self;
+ typedef QuickLookImageGenerator Self;
typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
typedef typename InputImageType::PixelType InputPixelType;
@@ -49,76 +48,71 @@ public:
/** Method for creation through the object factory. */
itkNewMacro(Self);
-
- typedef Image<double, 2> InternSingleImageType;
- typedef itk::DiscreteGaussianImageFilter<InternSingleImageType,InternSingleImageType> GaussianFilterType;
- typedef typename GaussianFilterType::Pointer GaussianFilterPointerType;
- typedef PerBandVectorImageFilter<InputImageType, InputImageType, GaussianFilterType> PerBandFilterType;
- typedef typename PerBandFilterType::Pointer PerBandFilterPointerType;
- typedef StreamingShrinkImageFilter<InputImageType, InputImageType> ShrinkImageFilterType;
- typedef typename ShrinkImageFilterType::Pointer ShrinkImageFilterPointerType;
+ typedef Image<double, 2> InternSingleImageType;
+ typedef itk::DiscreteGaussianImageFilter<InternSingleImageType, InternSingleImageType> GaussianFilterType;
+ typedef typename GaussianFilterType::Pointer GaussianFilterPointerType;
+ typedef PerBandVectorImageFilter<InputImageType, InputImageType, GaussianFilterType> PerBandFilterType;
+ typedef typename PerBandFilterType::Pointer PerBandFilterPointerType;
+ typedef StreamingShrinkImageFilter<InputImageType, InputImageType> ShrinkImageFilterType;
+ typedef typename ShrinkImageFilterType::Pointer ShrinkImageFilterPointerType;
void SetVariance(double var)
- {
- m_Variance = var;
- m_GaussianFilter->SetVariance(m_Variance);
- this->Modified();
- };
+ {
+ m_Variance = var;
+ m_GaussianFilter->SetVariance(m_Variance);
+ this->Modified();
+ }
itkGetMacro(Variance, double);
-
+
void UseImageSpacing(bool boo)
- {
- m_UseImageSpacing = boo;
- if (boo)
- m_GaussianFilter->SetUseImageSpacingOn();
- else
- m_GaussianFilter->SetUseImageSpacingOff();
-
- this->Modified();
- }
+ {
+ m_UseImageSpacing = boo;
+ if (boo) m_GaussianFilter->SetUseImageSpacingOn();
+ else m_GaussianFilter->SetUseImageSpacingOff();
+
+ this->Modified();
+ }
itkGetMacro(UseImageSpacing, bool);
void SetMaximumKernelWidth(unsigned int width)
- {
- m_MaximumKernelWidth = width;
- m_GaussianFilter->SetMaximumKernelWidth( m_MaximumKernelWidth );
- this->Modified();
- }
+ {
+ m_MaximumKernelWidth = width;
+ m_GaussianFilter->SetMaximumKernelWidth(m_MaximumKernelWidth);
+ this->Modified();
+ }
itkGetMacro(MaximumKernelWidth, unsigned int);
- void SetMaximumError(double error)
- {
- m_MaximumError = error;
- m_GaussianFilter->SetMaximumError( m_MaximumError );
- this->Modified();
- }
+ void SetMaximumError(double error)
+ {
+ m_MaximumError = error;
+ m_GaussianFilter->SetMaximumError(m_MaximumError);
+ this->Modified();
+ }
itkGetMacro(MaximumError, double);
void SetSampleRatio(unsigned int sr)
- {
- m_SampleRatio = sr;
- m_ShrinkFilter->SetShrinkFactor( m_SampleRatio );
- this->Modified();
- }
+ {
+ m_SampleRatio = sr;
+ m_ShrinkFilter->SetShrinkFactor(m_SampleRatio);
+ this->Modified();
+ }
itkGetMacro(SampleRatio, unsigned int);
-
protected:
QuickLookImageGenerator();
- virtual ~QuickLookImageGenerator(){};
+ virtual ~QuickLookImageGenerator(){}
/** Actually process the input */
virtual void GenerateData();
virtual void GenerateOutputInformation();
-
-
+
/** Display */
- void PrintSelf( std::ostream& os, itk::Indent indent ) const;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- QuickLookImageGenerator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ QuickLookImageGenerator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Internal filters*/
PerBandFilterPointerType m_PerBandFilter;
@@ -130,17 +124,16 @@ private:
/** Use spacing to compute Gaussain filter*/
bool m_UseImageSpacing;
/** Maximum kernel width for Gaussian filter*/
- double m_MaximumError;
- /** Maximum error tolerate for Gaussian filter*/
+ double m_MaximumError;
+ /** Maximum error tolerate for Gaussian filter*/
unsigned int m_MaximumKernelWidth;
/** Sample Ratio*/
unsigned int m_SampleRatio;
-
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbQuickLookImageGenerator.txx"
#endif
diff --git a/Code/Common/otbQuickLookImageGenerator.txx b/Code/Common/otbQuickLookImageGenerator.txx
index 68434a0980..51fb865f35 100644
--- a/Code/Common/otbQuickLookImageGenerator.txx
+++ b/Code/Common/otbQuickLookImageGenerator.txx
@@ -40,34 +40,33 @@ QuickLookImageGenerator<TInputImage, TOutputImage>
m_PerBandFilter = PerBandFilterType::New();
m_ShrinkFilter = ShrinkImageFilterType::New();
m_GaussianFilter = GaussianFilterType::New();
-
- m_PerBandFilter->SetFilter( m_GaussianFilter );
- m_ShrinkFilter->SetInput( m_PerBandFilter->GetOutput() );
+
+ m_PerBandFilter->SetFilter(m_GaussianFilter);
+ m_ShrinkFilter->SetInput(m_PerBandFilter->GetOutput());
}
-
template <class TInputImage, class TOutputImage>
void
-QuickLookImageGenerator<TInputImage,TOutputImage>
+QuickLookImageGenerator<TInputImage, TOutputImage>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
-
+
m_PerBandFilter->SetInput(this->GetInput());
m_PerBandFilter->GenerateOutputInformation();
m_ShrinkFilter->GenerateOutputInformation();
- this->GetOutput()->SetLargestPossibleRegion( m_ShrinkFilter->GetOutput()->GetLargestPossibleRegion() );
+ this->GetOutput()->SetLargestPossibleRegion(m_ShrinkFilter->GetOutput()->GetLargestPossibleRegion());
}
-
+
template <class TInputImage, class TOutputImage>
void
-QuickLookImageGenerator<TInputImage,TOutputImage>
+QuickLookImageGenerator<TInputImage, TOutputImage>
::GenerateData()
{
m_PerBandFilter->SetInput(this->GetInput());
-
+
m_ShrinkFilter->GraftOutput(this->GetOutput());
-
+
m_ShrinkFilter->Update();
this->GraftOutput(m_ShrinkFilter->GetOutput());
}
@@ -75,18 +74,17 @@ QuickLookImageGenerator<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
void
QuickLookImageGenerator<TInputImage, TOutputImage>::
-PrintSelf( std::ostream& os, itk::Indent indent ) const
+PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
- os << "Sample Ratio : "<< m_SampleRatio<<std::endl;
- os << "Gaussian Filter Parameters : "<<std::endl;
- os << "Variance : "<< m_Variance<<std::endl;
- os << "Maximum Kernel Width : "<< m_MaximumKernelWidth<<std::endl;
- os << "Maximum Error : "<< m_MaximumError<<std::endl;
- os << "Use Image Spacing : "<< m_UseImageSpacing<<std::endl;
+ os << "Sample Ratio : " << m_SampleRatio << std::endl;
+ os << "Gaussian Filter Parameters : " << std::endl;
+ os << "Variance : " << m_Variance << std::endl;
+ os << "Maximum Kernel Width : " << m_MaximumKernelWidth << std::endl;
+ os << "Maximum Error : " << m_MaximumError << std::endl;
+ os << "Use Image Spacing : " << m_UseImageSpacing << std::endl;
}
-
} // End namespace otb
#endif
diff --git a/Code/Common/otbRadiometricAttributesLabelMapFilter.h b/Code/Common/otbRadiometricAttributesLabelMapFilter.h
index 219cc55c8a..872489e7db 100644
--- a/Code/Common/otbRadiometricAttributesLabelMapFilter.h
+++ b/Code/Common/otbRadiometricAttributesLabelMapFilter.h
@@ -35,18 +35,18 @@ namespace Functor
{
/** \class MultiStatsAttributesLabelObjectFunctor
* \brief Functor to compute multiple statistics attributes.
-*
+*
* For one label object, this functors applies the
* StatisticsAttributesLabelObjectFunctor
* for a set of feature images along with their feature names.
-*
+*
* As such, it allows to compute in one pass statistics related to
* mulitple features. It is used in the
* RadiometricAttributesLabelMapFilter.
-*
+*
* Features can be added, removed or cleared via the appropriate
* methods.
-*
+*
* \sa RadiometricAttributesLabelMapFilter
* \sa StatisticsAttributesLabelObjectFunctor
*/
@@ -55,24 +55,24 @@ class MultiStatsAttributesLabelObjectFunctor
{
public:
// Self typedef
- typedef MultiStatsAttributesLabelObjectFunctor Self;
+ typedef MultiStatsAttributesLabelObjectFunctor Self;
/// Typedef of the feature image type
- typedef typename TFeatureImage::PixelType FeatureType;
+ typedef typename TFeatureImage::PixelType FeatureType;
/// Typedef of the label object
- typedef TLabelObject LabelObjectType;
+ typedef TLabelObject LabelObjectType;
/// Feature image const pointer
- typedef typename TFeatureImage::ConstPointer FeatureImageConstPointer;
+ typedef typename TFeatureImage::ConstPointer FeatureImageConstPointer;
/// Statistics functor
typedef StatisticsAttributesLabelObjectFunctor
- <TLabelObject,TFeatureImage> StatsFunctorType;
+ <TLabelObject, TFeatureImage> StatsFunctorType;
/// Map to store the functors
- typedef std::map<std::string,StatsFunctorType> StatsFunctorsMapType;
-
+ typedef std::map<std::string, StatsFunctorType> StatsFunctorsMapType;
+
/** Constructor */
MultiStatsAttributesLabelObjectFunctor();
@@ -80,23 +80,23 @@ public:
virtual ~MultiStatsAttributesLabelObjectFunctor();
/** The comparators */
- bool operator!=(const Self& self);
- bool operator==(const Self& self);
+ bool operator !=(const Self& self);
+ bool operator ==(const Self& self);
/** This is the functor implementation
- * Calling the functor on a label object
+ * Calling the functor on a label object
* will update its statistics attributes */
- inline void operator()(LabelObjectType * lo) const;
+ inline void operator ()(LabelObjectType * lo) const;
/** Add a feature with the given name */
- void AddFeature(const std::string & name, const TFeatureImage * img);
+ void AddFeature(const std::string& name, const TFeatureImage * img);
/** Remove the feature with this name if it exists */
- bool RemoveFeature(const std::string & name);
+ bool RemoveFeature(const std::string& name);
/** Get the feature image with this name */
- const TFeatureImage * GetFeature(const std::string & name) const;
-
+ const TFeatureImage * GetFeature(const std::string& name) const;
+
/** Clear all the features */
void ClearAllFeatures();
@@ -109,7 +109,7 @@ public:
/** Get the reduced attribute set */
bool GetReducedAttributeSet() const;
-private:
+private:
/// True to compute only a reduced attribute set
bool m_ReducedAttributeSet;
@@ -118,7 +118,6 @@ private:
};
} // End namespace Functor
-
/** \class RadiometricAttributesLabelMapFilter
* \brief This filter computes radiometric attributes for each object.
*
@@ -146,95 +145,94 @@ private:
* \ingroup ImageEnhancement MathematicalMorphologyImageFilters
*/
template<class TImage, class TFeatureImage>
-class ITK_EXPORT RadiometricAttributesLabelMapFilter
+class ITK_EXPORT RadiometricAttributesLabelMapFilter
: public LabelMapFeaturesFunctorImageFilter
-< TImage,
- typename Functor::MultiStatsAttributesLabelObjectFunctor
- < typename TImage::LabelObjectType, otb::Image<double,2> > >
+ <TImage,
+ typename Functor::MultiStatsAttributesLabelObjectFunctor
+ <typename TImage::LabelObjectType, otb::Image<double, 2> > >
{
public:
/** Some convenient typedefs. */
- typedef TImage ImageType;
- typedef typename ImageType::LabelObjectType LabelObjectType;
- typedef TFeatureImage FeatureImageType;
- typedef typename FeatureImageType::InternalPixelType FeatureInternalPixelType;
- typedef double InternalPrecisionType;
- typedef Image<InternalPrecisionType,2> InternalImageType;
+ typedef TImage ImageType;
+ typedef typename ImageType::LabelObjectType LabelObjectType;
+ typedef TFeatureImage FeatureImageType;
+ typedef typename FeatureImageType::InternalPixelType FeatureInternalPixelType;
+ typedef double InternalPrecisionType;
+ typedef Image<InternalPrecisionType, 2> InternalImageType;
/** Functor typedef */
typedef Functor::MultiStatsAttributesLabelObjectFunctor
- <LabelObjectType,InternalImageType> FunctorType;
+ <LabelObjectType, InternalImageType> FunctorType;
/** Standard class typedefs. */
- typedef RadiometricAttributesLabelMapFilter Self;
+ typedef RadiometricAttributesLabelMapFilter Self;
typedef LabelMapFeaturesFunctorImageFilter
- <ImageType,FunctorType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ <ImageType, FunctorType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** ImageDimension constants */
- itkStaticConstMacro(ImageDimension, unsigned int,TImage::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, TImage::ImageDimension);
/** Standard New method. */
itkNewMacro(Self);
/** Runtime information support. */
- itkTypeMacro(RadiometricAttributesLabelMapFilter,LabelMapFeaturesFunctorImageFilter);
+ itkTypeMacro(RadiometricAttributesLabelMapFilter, LabelMapFeaturesFunctorImageFilter);
/// Fuctors typedef
-
+
// GEMI
typedef Functor::GEMI <FeatureInternalPixelType,
- FeatureInternalPixelType,InternalPrecisionType> GEMIFunctorType;
+ FeatureInternalPixelType, InternalPrecisionType> GEMIFunctorType;
typedef MultiChannelRAndNIRIndexImageFilter
- <FeatureImageType,InternalImageType, GEMIFunctorType> GEMIFilterType;
- typedef typename GEMIFilterType::Pointer GEMIFilterPointerType;
-
+ <FeatureImageType, InternalImageType, GEMIFunctorType> GEMIFilterType;
+ typedef typename GEMIFilterType::Pointer GEMIFilterPointerType;
+
// NDVI
typedef Functor::NDVI <FeatureInternalPixelType,
- FeatureInternalPixelType,InternalPrecisionType> NDVIFunctorType;
+ FeatureInternalPixelType, InternalPrecisionType> NDVIFunctorType;
typedef MultiChannelRAndNIRIndexImageFilter
- <FeatureImageType,InternalImageType, NDVIFunctorType> NDVIFilterType;
- typedef typename NDVIFilterType::Pointer NDVIFilterPointerType;
-
+ <FeatureImageType, InternalImageType, NDVIFunctorType> NDVIFilterType;
+ typedef typename NDVIFilterType::Pointer NDVIFilterPointerType;
+
// IR
typedef Functor::IR <FeatureInternalPixelType,
- FeatureInternalPixelType,InternalPrecisionType> IRFunctorType;
+ FeatureInternalPixelType, InternalPrecisionType> IRFunctorType;
typedef MultiChannelGAndRIndexImageFilter
- <FeatureImageType,InternalImageType, IRFunctorType> IRFilterType;
- typedef typename IRFilterType::Pointer IRFilterPointerType;
+ <FeatureImageType, InternalImageType, IRFunctorType> IRFilterType;
+ typedef typename IRFilterType::Pointer IRFilterPointerType;
// IC
typedef Functor::IC <FeatureInternalPixelType,
- FeatureInternalPixelType,InternalPrecisionType> ICFunctorType;
+ FeatureInternalPixelType, InternalPrecisionType> ICFunctorType;
typedef MultiChannelGAndRIndexImageFilter
- <FeatureImageType,InternalImageType, ICFunctorType> ICFilterType;
- typedef typename ICFilterType::Pointer ICFilterPointerType;
+ <FeatureImageType, InternalImageType, ICFunctorType> ICFilterType;
+ typedef typename ICFilterType::Pointer ICFilterPointerType;
// IB
typedef Functor::IB <FeatureInternalPixelType,
- FeatureInternalPixelType,InternalPrecisionType> IBFunctorType;
+ FeatureInternalPixelType, InternalPrecisionType> IBFunctorType;
typedef MultiChannelGAndRIndexImageFilter
- <FeatureImageType,InternalImageType, IBFunctorType> IBFilterType;
- typedef typename IBFilterType::Pointer IBFilterPointerType;
+ <FeatureImageType, InternalImageType, IBFunctorType> IBFilterType;
+ typedef typename IBFilterType::Pointer IBFilterPointerType;
// NDWI2
typedef Functor::NDWI2 <FeatureInternalPixelType,
- FeatureInternalPixelType,InternalPrecisionType> NDWI2FunctorType;
+ FeatureInternalPixelType, InternalPrecisionType> NDWI2FunctorType;
typedef itk::UnaryFunctorImageFilter
- <FeatureImageType,InternalImageType, NDWI2FunctorType> NDWI2FilterType;
- typedef typename NDWI2FilterType::Pointer NDWI2FilterPointerType;
+ <FeatureImageType, InternalImageType, NDWI2FunctorType> NDWI2FilterType;
+ typedef typename NDWI2FilterType::Pointer NDWI2FilterPointerType;
// Intensity
typedef VectorImageToIntensityImageFilter
- <FeatureImageType,InternalImageType> IntensityFilterType;
- typedef typename IntensityFilterType::Pointer IntensityFilterPointerType;
-
+ <FeatureImageType, InternalImageType> IntensityFilterType;
+ typedef typename IntensityFilterType::Pointer IntensityFilterPointerType;
+
// Channels
typedef MultiToMonoChannelExtractROI
- <FeatureInternalPixelType,InternalPrecisionType> ChannelFilterType;
- typedef typename ChannelFilterType::Pointer ChannelFilterPointerType;
-
+ <FeatureInternalPixelType, InternalPrecisionType> ChannelFilterType;
+ typedef typename ChannelFilterType::Pointer ChannelFilterPointerType;
/** Set the feature image */
void SetFeatureImage(const TFeatureImage *input);
@@ -255,44 +253,44 @@ public:
const TFeatureImage * GetInput2() const;
/** Set/Get the red channel index */
- itkSetMacro(RedChannelIndex,unsigned int);
- itkGetMacro(RedChannelIndex,unsigned int);
+ itkSetMacro(RedChannelIndex, unsigned int);
+ itkGetMacro(RedChannelIndex, unsigned int);
/** Set/Get the blue channel index */
- itkSetMacro(BlueChannelIndex,unsigned int);
- itkGetMacro(BlueChannelIndex,unsigned int);
+ itkSetMacro(BlueChannelIndex, unsigned int);
+ itkGetMacro(BlueChannelIndex, unsigned int);
/** Set/Get the green channel index */
- itkSetMacro(GreenChannelIndex,unsigned int);
- itkGetMacro(GreenChannelIndex,unsigned int);
+ itkSetMacro(GreenChannelIndex, unsigned int);
+ itkGetMacro(GreenChannelIndex, unsigned int);
/** Set/Get the near infra-red channel index */
- itkSetMacro(NIRChannelIndex,unsigned int);
- itkGetMacro(NIRChannelIndex,unsigned int);
+ itkSetMacro(NIRChannelIndex, unsigned int);
+ itkGetMacro(NIRChannelIndex, unsigned int);
- /** Set the reduced attribute set */
+ /** Set the reduced attribute set */
void SetReducedAttributeSet(bool flag);
/** Get the reduced attribute set */
bool GetReducedAttributeSet() const;
-
+
itkBooleanMacro(ReducedAttributeSet);
protected:
/** Constructor */
RadiometricAttributesLabelMapFilter();
/** Destructor */
- ~RadiometricAttributesLabelMapFilter() {};
+ ~RadiometricAttributesLabelMapFilter() {}
/** Before threaded data generation */
virtual void BeforeThreadedGenerateData();
-
+
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- RadiometricAttributesLabelMapFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ RadiometricAttributesLabelMapFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The red channel index */
unsigned int m_RedChannelIndex;
@@ -308,11 +306,9 @@ private:
}; // end of class
} // end namespace itk
-
+
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbRadiometricAttributesLabelMapFilter.txx"
#endif
#endif
-
-
diff --git a/Code/Common/otbRadiometricAttributesLabelMapFilter.txx b/Code/Common/otbRadiometricAttributesLabelMapFilter.txx
index e33375f9c9..ab42c48791 100644
--- a/Code/Common/otbRadiometricAttributesLabelMapFilter.txx
+++ b/Code/Common/otbRadiometricAttributesLabelMapFilter.txx
@@ -27,47 +27,47 @@ namespace Functor
{
/** Constructor */
template <class TLabelObject, class TFeatureImage>
-MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
+MultiStatsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
::MultiStatsAttributesLabelObjectFunctor() : m_ReducedAttributeSet(true),
- m_StatsFunctorsMap()
+ m_StatsFunctorsMap()
{}
/** Destructor */
template <class TLabelObject, class TFeatureImage>
-MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
+MultiStatsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
::~MultiStatsAttributesLabelObjectFunctor(){}
/** The comparators */
template <class TLabelObject, class TFeatureImage>
bool
-MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
-::operator!=(const Self& self)
-{
+MultiStatsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
+::operator != (const Self &self)
+ {
bool resp = true;
resp = resp && (m_ReducedAttributeSet != self.m_ReducedAttributeSet);
resp = resp && (m_StatsFunctorsMap != self.m_StatsFunctorsMap);
return resp;
-}
+ }
template <class TLabelObject, class TFeatureImage>
-bool
-MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
-::operator==(const Self& self)
-{
+bool
+MultiStatsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
+::operator == (const Self &self)
+ {
return !(this != self);
-}
+ }
/** This is the functor implementation
- * Calling the functor on a label object
+ * Calling the functor on a label object
* will update its statistics attributes */
template <class TLabelObject, class TFeatureImage>
-void
-MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
-:: operator()(LabelObjectType * lo) const
+void
+MultiStatsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
+::operator() (LabelObjectType * lo) const
{
// Walk every registered functors
- for(typename StatsFunctorsMapType::const_iterator it = m_StatsFunctorsMap.begin();
- it!=m_StatsFunctorsMap.end(); ++it)
+ for (typename StatsFunctorsMapType::const_iterator it = m_StatsFunctorsMap.begin();
+ it != m_StatsFunctorsMap.end(); ++it)
{
(it->second)(lo);
}
@@ -76,15 +76,15 @@ MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
/** Add a feature with the given name */
template <class TLabelObject, class TFeatureImage>
void
-MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
-::AddFeature(const std::string & name, const TFeatureImage * img)
+MultiStatsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
+::AddFeature(const std::string& name, const TFeatureImage * img)
{
// Create a new functor
StatsFunctorType newFunctor;
// Set the reduced attribute set option
newFunctor.SetReducedAttributeSet(m_ReducedAttributeSet);
-
+
// Set the feature and its name
newFunctor.SetFeatureName(name);
@@ -92,35 +92,35 @@ MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
newFunctor.SetFeatureImage(img);
// Add it to the map
- m_StatsFunctorsMap[name]=newFunctor;
+ m_StatsFunctorsMap[name] = newFunctor;
}
/** Remove the feature with this name if it exists */
template <class TLabelObject, class TFeatureImage>
bool
-MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
-::RemoveFeature(const std::string & name)
+MultiStatsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
+::RemoveFeature(const std::string& name)
{
return (m_StatsFunctorsMap.erase(name) == 1);
}
/** Get the feature image with this name */
template <class TLabelObject, class TFeatureImage>
-const TFeatureImage *
-MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
-::GetFeature(const std::string & name) const
+const TFeatureImage *
+MultiStatsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
+::GetFeature(const std::string& name) const
{
- if(m_StatsFunctorsMap.count(name) == 0)
+ if (m_StatsFunctorsMap.count(name) == 0)
{
- itkGenericExceptionMacro(<<"No feature named "<<name<<" in map.");
+ itkGenericExceptionMacro(<< "No feature named " << name << " in map.");
}
return m_StatsFunctorsMap[name].GetFeatureImage();
}
-
+
/** Clear all the features */
template <class TLabelObject, class TFeatureImage>
-void
-MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
+void
+MultiStatsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
::ClearAllFeatures()
{
m_StatsFunctorsMap.clear();
@@ -129,7 +129,7 @@ MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
/** Get the number of features */
template <class TLabelObject, class TFeatureImage>
unsigned int
-MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
+MultiStatsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
::GetNumberOfFeatures() const
{
return m_StatsFunctorsMap.size();
@@ -138,36 +138,35 @@ MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
/** Set the reduced attribute set */
template <class TLabelObject, class TFeatureImage>
void
-MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
+MultiStatsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
::SetReducedAttributeSet(bool flag)
{
// Set the flag
m_ReducedAttributeSet = flag;
// Set the flag to all the already existing functors
- for(typename StatsFunctorsMapType::iterator it = m_StatsFunctorsMap.begin();
- it!=m_StatsFunctorsMap.end(); ++it)
+ for (typename StatsFunctorsMapType::iterator it = m_StatsFunctorsMap.begin();
+ it != m_StatsFunctorsMap.end(); ++it)
{
it->second.SetReducedAttributeSet(m_ReducedAttributeSet);
}
}
/** Get the reduced attribute set */
template <class TLabelObject, class TFeatureImage>
-bool
-MultiStatsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
+bool
+MultiStatsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
::GetReducedAttributeSet() const
{
return m_ReducedAttributeSet;
}
} // End namespace Functor
-
template <class TImage, class TFeatureImage>
RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
-::RadiometricAttributesLabelMapFilter() : m_RedChannelIndex(2),
- m_GreenChannelIndex(1),
- m_BlueChannelIndex(0),
- m_NIRChannelIndex(3)
+::RadiometricAttributesLabelMapFilter() : m_RedChannelIndex(2),
+ m_GreenChannelIndex(1),
+ m_BlueChannelIndex(0),
+ m_NIRChannelIndex(3)
{
this->SetNumberOfRequiredInputs(2);
}
@@ -179,22 +178,22 @@ RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
::SetFeatureImage(const TFeatureImage *input)
{
// Set the Nth input
- this->SetNthInput(1,const_cast<TFeatureImage*>(input));
+ this->SetNthInput(1, const_cast<TFeatureImage*>(input));
}
/** Get the feature image */
template <class TImage, class TFeatureImage>
const typename RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
-::FeatureImageType *
+::FeatureImageType *
RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
::GetFeatureImage() const
{
- return static_cast<const TFeatureImage *>(this->itk::ProcessObject::GetInput(1));
+ return static_cast<const TFeatureImage *>(this->itk::ProcessObject::GetInput(1));
}
/** Set Input1 (for backward compatibility) */
template <class TImage, class TFeatureImage>
-void
+void
RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
::SetInput1(const TImage * input)
{
@@ -203,7 +202,7 @@ RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
/** Get Input1 (for backward compatibility) */
template <class TImage, class TFeatureImage>
-const TImage *
+const TImage *
RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
::GetInput1() const
{
@@ -212,7 +211,7 @@ RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
/** Set Input2 (for backward compatibility) */
template <class TImage, class TFeatureImage>
-void
+void
RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
::SetInput2(const TFeatureImage * input)
{
@@ -221,7 +220,7 @@ RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
/** Get Input2 (for backward compatibility) */
template <class TImage, class TFeatureImage>
-const TFeatureImage *
+const TFeatureImage *
RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
::GetInput2() const
{
@@ -230,11 +229,11 @@ RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
/** Set the reduced attribute set */
template <class TImage, class TFeatureImage>
-void
+void
RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
::SetReducedAttributeSet(bool flag)
{
- if(this->GetFunctor().GetReducedAttributeSet() != flag)
+ if (this->GetFunctor().GetReducedAttributeSet() != flag)
{
this->GetFunctor().SetReducedAttributeSet(flag);
this->Modified();
@@ -243,7 +242,7 @@ RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
/** Get the reduced attribute set */
template <class TImage, class TFeatureImage>
-bool
+bool
RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
::GetReducedAttributeSet() const
{
@@ -263,89 +262,89 @@ RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
// Gemi
GEMIFilterPointerType gemi = GEMIFilterType::New();
- gemi->SetRedIndex(m_RedChannelIndex+1);
- gemi->SetNIRIndex(m_NIRChannelIndex+1);
+ gemi->SetRedIndex(m_RedChannelIndex + 1);
+ gemi->SetNIRIndex(m_NIRChannelIndex + 1);
gemi->SetInput(this->GetFeatureImage());
gemi->GetOutput()->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
gemi->Update();
- this->GetFunctor().AddFeature("Gemi",gemi->GetOutput());
+ this->GetFunctor().AddFeature("Gemi", gemi->GetOutput());
// Ndvi
NDVIFilterPointerType ndvi = NDVIFilterType::New();
- ndvi->SetRedIndex(m_RedChannelIndex+1);
- ndvi->SetNIRIndex(m_NIRChannelIndex+1);
+ ndvi->SetRedIndex(m_RedChannelIndex + 1);
+ ndvi->SetNIRIndex(m_NIRChannelIndex + 1);
ndvi->SetInput(this->GetFeatureImage());
ndvi->GetOutput()->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
ndvi->Update();
- this->GetFunctor().AddFeature("Ndvi",ndvi->GetOutput());
-
+ this->GetFunctor().AddFeature("Ndvi", ndvi->GetOutput());
+
// IR
IRFilterPointerType ir = IRFilterType::New();
- ir->SetGreenIndex(m_GreenChannelIndex+1);
- ir->SetRedIndex(m_RedChannelIndex+1);
+ ir->SetGreenIndex(m_GreenChannelIndex + 1);
+ ir->SetRedIndex(m_RedChannelIndex + 1);
ir->SetInput(this->GetFeatureImage());
ir->GetOutput()->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
ir->Update();
- this->GetFunctor().AddFeature("Redness",ir->GetOutput());
-
+ this->GetFunctor().AddFeature("Redness", ir->GetOutput());
+
// IC
ICFilterPointerType ic = ICFilterType::New();
- ic->SetGreenIndex(m_GreenChannelIndex+1);
- ic->SetRedIndex(m_RedChannelIndex+1);
+ ic->SetGreenIndex(m_GreenChannelIndex + 1);
+ ic->SetRedIndex(m_RedChannelIndex + 1);
ic->SetInput(this->GetFeatureImage());
ic->GetOutput()->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
ic->Update();
- this->GetFunctor().AddFeature("Color",ic->GetOutput());
+ this->GetFunctor().AddFeature("Color", ic->GetOutput());
// IB
IBFilterPointerType ib = IBFilterType::New();
- ib->SetGreenIndex(m_GreenChannelIndex+1);
- ib->SetRedIndex(m_RedChannelIndex+1);
+ ib->SetGreenIndex(m_GreenChannelIndex + 1);
+ ib->SetRedIndex(m_RedChannelIndex + 1);
ib->SetInput(this->GetFeatureImage());
ib->GetOutput()->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
ib->Update();
- this->GetFunctor().AddFeature("Brightness",ib->GetOutput());
+ this->GetFunctor().AddFeature("Brightness", ib->GetOutput());
// NDWI2
NDWI2FilterPointerType ndwi2 = NDWI2FilterType::New();
- ndwi2->GetFunctor().SetGIndex(m_GreenChannelIndex+1);
- ndwi2->GetFunctor().SetNIRIndex(m_NIRChannelIndex+1);
+ ndwi2->GetFunctor().SetGIndex(m_GreenChannelIndex + 1);
+ ndwi2->GetFunctor().SetNIRIndex(m_NIRChannelIndex + 1);
ndwi2->SetInput(this->GetFeatureImage());
ndwi2->GetOutput()->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
ndwi2->Update();
- this->GetFunctor().AddFeature("Ndwi2",ndwi2->GetOutput());
-
+ this->GetFunctor().AddFeature("Ndwi2", ndwi2->GetOutput());
+
// Red
ChannelFilterPointerType red = ChannelFilterType::New();
- red->SetChannel(m_RedChannelIndex+1);
+ red->SetChannel(m_RedChannelIndex + 1);
red->SetInput(this->GetFeatureImage());
red->GetOutput()->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
red->Update();
- this->GetFunctor().AddFeature("Red",red->GetOutput());
+ this->GetFunctor().AddFeature("Red", red->GetOutput());
// Green
ChannelFilterPointerType green = ChannelFilterType::New();
- green->SetChannel(m_GreenChannelIndex+1);
+ green->SetChannel(m_GreenChannelIndex + 1);
green->SetInput(this->GetFeatureImage());
green->GetOutput()->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
green->Update();
- this->GetFunctor().AddFeature("Green",green->GetOutput());
+ this->GetFunctor().AddFeature("Green", green->GetOutput());
// Blue
ChannelFilterPointerType blue = ChannelFilterType::New();
- blue->SetChannel(m_BlueChannelIndex+1);
+ blue->SetChannel(m_BlueChannelIndex + 1);
blue->SetInput(this->GetFeatureImage());
blue->GetOutput()->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
blue->Update();
- this->GetFunctor().AddFeature("Blue",blue->GetOutput());
+ this->GetFunctor().AddFeature("Blue", blue->GetOutput());
// Nir
ChannelFilterPointerType nir = ChannelFilterType::New();
- nir->SetChannel(m_NIRChannelIndex+1);
+ nir->SetChannel(m_NIRChannelIndex + 1);
nir->SetInput(this->GetFeatureImage());
nir->GetOutput()->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
nir->Update();
- this->GetFunctor().AddFeature("NIR",nir->GetOutput());
+ this->GetFunctor().AddFeature("NIR", nir->GetOutput());
}
template <class TImage, class TFeatureImage>
@@ -353,8 +352,8 @@ void
RadiometricAttributesLabelMapFilter<TImage, TFeatureImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-}// end namespace itk
+} // end namespace itk
#endif
diff --git a/Code/Common/otbRectangle.h b/Code/Common/otbRectangle.h
index 7b86f9895e..72581b6be0 100644
--- a/Code/Common/otbRectangle.h
+++ b/Code/Common/otbRectangle.h
@@ -24,102 +24,99 @@
#include "itkContinuousIndex.h"
#include "itkVectorContainer.h"
-
namespace otb
{
- /** \class Rectangle
- * \brief This class represent a Rectangle.
- *
- * A rectangle is defined by the median of the width, an orientation and a width
- *
+/** \class Rectangle
+ * \brief This class represent a Rectangle.
+ *
+ * A rectangle is defined by the median of the width, an orientation and a width
+ *
+ */
+template<class TValue = double>
+class ITK_EXPORT Rectangle
+ : public itk::Object
+{
+public:
+ /** Standard typedefs */
+ typedef Rectangle Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ typedef TValue ValueType;
+
+ /** Type macro */
+ itkNewMacro(Self);
+
+ /** Creation through object factory macro */
+ itkTypeMacro(Rectangle, itk::Object);
+
+ /** Derived typedefs */
+ typedef itk::ContinuousIndex<ValueType, 2> ContinuousIndexType;
+ typedef ContinuousIndexType VertexType;
+ typedef itk::VectorContainer<unsigned, VertexType> VertexListType;
+ typedef typename VertexListType::Pointer VertexListPointerType;
+ typedef typename VertexListType::ConstIterator VertexListConstIteratorType;
+
+ /* typedef typename Superclass::VertexType VertexType; */
+ /* typedef typename Superclass::VertexListType VertexListType; */
+ /* typedef typename VertexListType::Pointer VertexListPointerType; */
+ /* typedef typename Superclass::ContinuousIndexType ContinuousIndexType; */
+ /* typedef typename Superclass::VertexListConstIteratorType VertexListConstIteratorType; */
+
+ typedef itk::ImageRegion<2> RegionType;
+
+ /**
+ * Set/Get the parameters the a rectangle
+ * - width and orientation
+ */
+
+ itkGetMacro(Width, ValueType);
+ itkSetMacro(Width, ValueType);
+
+ itkSetMacro(Orientation, ValueType);
+ itkGetMacro(Orientation, ValueType);
+
+ /**
+ * Check wether point is strictly inside the rectangle.
+ * \param point The point to check.
+ * \return True if the point is inside the polygon.
*/
- template<class TValue=double>
- class ITK_EXPORT Rectangle
- : public itk::Object
+ bool IsInside(VertexType point) const;
+
+ virtual void AddVertex(const ContinuousIndexType& vertex);
+
+ /** GetBounding region*/
+ virtual RegionType GetBoundingRegion() const;
+
+protected:
+ /** Constructor */
+ Rectangle()
{
- public:
- /** Standard typedefs */
- typedef Rectangle Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- typedef TValue ValueType;
-
- /** Type macro */
- itkNewMacro(Self);
-
- /** Creation through object factory macro */
- itkTypeMacro(Rectangle, itk::Object);
-
- /** Derived typedefs */
- typedef itk::ContinuousIndex<ValueType,2> ContinuousIndexType;
- typedef ContinuousIndexType VertexType;
- typedef itk::VectorContainer<unsigned, VertexType> VertexListType;
- typedef typename VertexListType::Pointer VertexListPointerType;
- typedef typename VertexListType::ConstIterator VertexListConstIteratorType;
-
-
- /* typedef typename Superclass::VertexType VertexType; */
- /* typedef typename Superclass::VertexListType VertexListType; */
- /* typedef typename VertexListType::Pointer VertexListPointerType; */
- /* typedef typename Superclass::ContinuousIndexType ContinuousIndexType; */
- /* typedef typename Superclass::VertexListConstIteratorType VertexListConstIteratorType; */
-
- typedef itk::ImageRegion<2> RegionType;
-
- /**
- * Set/Get the parameters the a rectangle
- * - width and orientation
- */
-
- itkGetMacro(Width,ValueType);
- itkSetMacro(Width,ValueType);
-
- itkSetMacro(Orientation,ValueType);
- itkGetMacro(Orientation,ValueType);
-
- /**
- * Check wether point is strictly inside the rectangle.
- * \param point The point to check.
- * \return True if the point is inside the polygon.
- */
- bool IsInside(VertexType point) const;
-
- virtual void AddVertex (const ContinuousIndexType &vertex);
-
- /** GetBounding region*/
- virtual RegionType GetBoundingRegion() const;
-
- protected:
- /** Constructor */
- Rectangle()
- {
- m_VertexList = VertexListType::New();
- };
-
- /** Destructor */
- virtual ~Rectangle() {};
-
- /**PrintSelf method */
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
- /** */
- virtual double ComputeEuclideanDistanceToSegment(VertexType q1, VertexType q2, VertexType p) const;
-
- /** */
-
-
- private:
- Rectangle(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
- ValueType m_Orientation;
- ValueType m_Width;
-
- VertexListPointerType m_VertexList;
+ m_VertexList = VertexListType::New();
};
-}// End namespace otb
+
+ /** Destructor */
+ virtual ~Rectangle() {}
+
+ /**PrintSelf method */
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+
+ /** */
+ virtual double ComputeEuclideanDistanceToSegment(VertexType q1, VertexType q2, VertexType p) const;
+
+ /** */
+
+private:
+ Rectangle(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
+
+ ValueType m_Orientation;
+ ValueType m_Width;
+
+ VertexListPointerType m_VertexList;
+};
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbRectangle.txx"
diff --git a/Code/Common/otbRectangle.txx b/Code/Common/otbRectangle.txx
index 8c1e56671c..0282207ce3 100644
--- a/Code/Common/otbRectangle.txx
+++ b/Code/Common/otbRectangle.txx
@@ -23,7 +23,6 @@
namespace otb
{
-
/**
* Check wether point is strictly inside the polygon.
* \param point The point to check.
@@ -36,8 +35,8 @@ Rectangle<TValue>
::IsInside(VertexType point) const
{
/*Iterate through the inputVertexList*/
- if(m_VertexList->Size()<2)
- itkGenericExceptionMacro(<<"Rectangle needs TWO vertex, up-to-date the start and the end of the segments with AdDVertex Method ");
+ if (m_VertexList->Size() < 2) itkGenericExceptionMacro(
+ << "Rectangle needs TWO vertex, up-to-date the start and the end of the segments with AdDVertex Method ");
VertexListConstIteratorType it = m_VertexList->Begin();
@@ -45,167 +44,160 @@ Rectangle<TValue>
++it;
VertexType p2 = it.Value();
-
/** Compute Length of the rectangle*/
- double lengthSeg = vcl_sqrt( (p1[0]-p2[0])* (p1[0]-p2[0]) + (p1[1]-p2[1])* (p1[1]-p2[1]) );
-
+ double lengthSeg = vcl_sqrt((p1[0] - p2[0]) * (p1[0] - p2[0]) + (p1[1] - p2[1]) * (p1[1] - p2[1]));
+
/** Orthogonal segment containing the middle of the segment */
VertexType middleP;
- middleP[0] = (p1[0] + p2[0])/2.;
- middleP[1] = (p1[1] + p2[1])/2.;
-
+ middleP[0] = (p1[0] + p2[0]) / 2.;
+ middleP[1] = (p1[1] + p2[1]) / 2.;
VertexType corner;
- corner[0] = middleP[0] + (m_Width/2)*vcl_sin(m_Orientation);
- corner[1] = middleP[1] - (m_Width/2)*vcl_cos(m_Orientation);
-
-
+ corner[0] = middleP[0] + (m_Width / 2) * vcl_sin(m_Orientation);
+ corner[1] = middleP[1] - (m_Width / 2) * vcl_cos(m_Orientation);
+
/** Compute the distance to the orthogonal median of the rectangle*/
- if( this->ComputeEuclideanDistanceToSegment( p1, p2 , point) - (m_Width/2.) < 1e-10
- && this->ComputeEuclideanDistanceToSegment(middleP , corner, point) - (lengthSeg/2.) < 1e-10)
- return true;
- else
- return false;
+ if (this->ComputeEuclideanDistanceToSegment(p1, p2, point) - (m_Width / 2.) < 1e-10
+ && this->ComputeEuclideanDistanceToSegment(middleP, corner, point) - (lengthSeg / 2.) < 1e-10) return true;
+ else return false;
}
+/**
+ * Method to compute the distance between a point and a segment
+ */
+template<class TValue>
+double
+Rectangle<TValue>
+::ComputeEuclideanDistanceToSegment(VertexType q1, VertexType q2, VertexType p) const
+{
+ double Xq1 = q1[0];
+ double Yq1 = q1[1];
+ double Xq2 = q2[0];
+ double Yq2 = q2[1];
+ double xp = p[0];
+ double yp = p[1];
+
+ double SegmentLength = vcl_sqrt((Xq1 - Xq2) * (Xq1 - Xq2) + (Yq1 - Yq2) * (Yq1 - Yq2));
+ double CrossProduct = Xq1 * Yq2 - Xq2 * Yq1;
+ double Num = vcl_abs(xp * (Yq1 - Yq2) + yp * (Xq2 - Xq1) + CrossProduct);
+
+ /** distance from Point P to Segment Q1Q2*/
+ return (Num / SegmentLength);
+}
+
+/**
+ * Method to compute the Bounding region of a rectangle
+ */
+
+template<class TValue>
+typename Rectangle<TValue>::
+RegionType
+Rectangle<TValue>
+::GetBoundingRegion() const
+{
+ VertexListConstIteratorType it = m_VertexList->Begin();
+
+ VertexType p1 = it.Value();
+ ++it;
+ VertexType p2 = it.Value();
+
+ /** Compute the four corners of the recatangle*/
+ double dx = vcl_cos(m_Orientation);
+ double dy = vcl_sin(m_Orientation);
+ double halfWidth = m_Width / 2;
- /**
- * Method to compute the distance between a point and a segment
- */
- template<class TValue>
- double
- Rectangle<TValue>
- ::ComputeEuclideanDistanceToSegment(VertexType q1, VertexType q2, VertexType p) const
- {
- double Xq1 = q1[0];
- double Yq1 = q1[1];
- double Xq2 = q2[0];
- double Yq2 = q2[1];
- double xp = p[0];
- double yp = p[1];
-
- double SegmentLength = vcl_sqrt((Xq1-Xq2)* (Xq1-Xq2) + (Yq1-Yq2) *(Yq1-Yq2));
- double CrossProduct = Xq1*Yq2 - Xq2*Yq1;
- double Num = vcl_abs(xp*(Yq1-Yq2) + yp*(Xq2-Xq1) + CrossProduct);
-
- /** distance from Point P to Segment Q1Q2*/
- return (Num/SegmentLength);
- }
-
- /**
- * Method to compute the Bounding region of a rectangle
- */
-
- template<class TValue>
- typename Rectangle<TValue>::
- RegionType
- Rectangle<TValue>
- ::GetBoundingRegion() const
- {
- VertexListConstIteratorType it = m_VertexList->Begin();
-
- VertexType p1 = it.Value();
- ++it;
- VertexType p2 = it.Value();
-
- /** Compute the four corners of the recatangle*/
- double dx = vcl_cos(m_Orientation);
- double dy = vcl_sin(m_Orientation);
- double halfWidth = m_Width/2;
-
-
- VertexListPointerType cornersVertex = VertexListType::New();
- VertexType tempCorner;
-
- tempCorner[0] = p1[0] + dy* halfWidth;
- tempCorner[1] = p1[1] - dx* halfWidth;
- cornersVertex->InsertElement(cornersVertex->Size(),tempCorner);
-
- tempCorner[0] = p1[0] - dy* halfWidth;
- tempCorner[1] = p1[1] + dx* halfWidth;
- cornersVertex->InsertElement(cornersVertex->Size(),tempCorner);
-
- tempCorner[0] = p2[0] + dy* halfWidth;
- tempCorner[1] = p2[1] - dx* halfWidth;
- cornersVertex->InsertElement(cornersVertex->Size(),tempCorner);
-
- tempCorner[0] = p2[0] - dy* halfWidth;
- tempCorner[1] = p2[1] + dx* halfWidth;
- cornersVertex->InsertElement(cornersVertex->Size(),tempCorner);
-
- /** Compute the bounding region*/
- RegionType region;
- typename RegionType::SizeType size;
- typename RegionType::IndexType index;
- typename RegionType::IndexType maxId;
-
- size.Fill(0);
- index.Fill(0);
- maxId.Fill(0);
-
- VertexListConstIteratorType itCorners = cornersVertex->Begin();
-
- long int x = 0,y = 0;
-
- if ( cornersVertex->Size()>0)
+ VertexListPointerType cornersVertex = VertexListType::New();
+ VertexType tempCorner;
+
+ tempCorner[0] = p1[0] + dy * halfWidth;
+ tempCorner[1] = p1[1] - dx * halfWidth;
+ cornersVertex->InsertElement(cornersVertex->Size(), tempCorner);
+
+ tempCorner[0] = p1[0] - dy * halfWidth;
+ tempCorner[1] = p1[1] + dx * halfWidth;
+ cornersVertex->InsertElement(cornersVertex->Size(), tempCorner);
+
+ tempCorner[0] = p2[0] + dy * halfWidth;
+ tempCorner[1] = p2[1] - dx * halfWidth;
+ cornersVertex->InsertElement(cornersVertex->Size(), tempCorner);
+
+ tempCorner[0] = p2[0] - dy * halfWidth;
+ tempCorner[1] = p2[1] + dx * halfWidth;
+ cornersVertex->InsertElement(cornersVertex->Size(), tempCorner);
+
+ /** Compute the bounding region*/
+ RegionType region;
+ typename RegionType::SizeType size;
+ typename RegionType::IndexType index;
+ typename RegionType::IndexType maxId;
+
+ size.Fill(0);
+ index.Fill(0);
+ maxId.Fill(0);
+
+ VertexListConstIteratorType itCorners = cornersVertex->Begin();
+
+ long int x = 0, y = 0;
+
+ if (cornersVertex->Size() > 0)
+ {
+ x = static_cast<long int>(itCorners.Value()[0]);
+ y = static_cast<long int>(itCorners.Value()[1]);
+ index[0] = x;
+ index[1] = y;
+
+ ++itCorners;
+ while (itCorners != cornersVertex->End())
{
- x = static_cast<long int>(itCorners.Value()[0]);
- y = static_cast<long int>(itCorners.Value()[1]);
+ x = static_cast<long int>(itCorners.Value()[0]);
+ y = static_cast<long int>(itCorners.Value()[1]);
+
+ // Index search
+ if (x < index[0])
+ {
index[0] = x;
+ }
+ if (y < index[1])
+ {
index[1] = y;
-
- ++itCorners;
- while (itCorners != cornersVertex->End())
- {
- x = static_cast<long int>(itCorners.Value()[0]);
- y = static_cast<long int>(itCorners.Value()[1]);
-
- // Index search
- if ( x < index[0] )
- {
- index[0] = x;
- }
- if ( y < index[1] )
- {
- index[1] = y;
- }
- // Max Id search for size computation
- if ( x > maxId[0] )
- {
- maxId[0] = x;
- }
- if ( y > maxId[1] )
- {
- maxId[1] = y;
- }
-
- ++itCorners;
- }
-
- size[0] = maxId[0] - index[0];
- size[1] = maxId[1] - index[1];
+ }
+ // Max Id search for size computation
+ if (x > maxId[0])
+ {
+ maxId[0] = x;
+ }
+ if (y > maxId[1])
+ {
+ maxId[1] = y;
+ }
+
+ ++itCorners;
}
- region.SetSize(size);
- region.SetIndex(index);
- return region;
-
- }
-
- /*
- * Method add vertex
- *
- */
+
+ size[0] = maxId[0] - index[0];
+ size[1] = maxId[1] - index[1];
+ }
+ region.SetSize(size);
+ region.SetIndex(index);
+ return region;
+
+}
+
+/*
+ * Method add vertex
+ *
+ */
template<class TValue>
void
Rectangle<TValue>
-::AddVertex(const ContinuousIndexType &vertex)
+::AddVertex(const ContinuousIndexType& vertex)
{
- if(m_VertexList->Size() > 1 )
- itkGenericExceptionMacro(<<"Rectangle needs only TWO vertex, a width and an orientation ");
-
+ if (m_VertexList->Size() > 1) itkGenericExceptionMacro(
+ << "Rectangle needs only TWO vertex, a width and an orientation ");
+
m_VertexList->InsertElement(m_VertexList->Size(), vertex);
}
-
+
/**
* PrintSelf Method
*/
@@ -214,10 +206,9 @@ void
Rectangle<TValue>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- os << indent << "Verticies: " << m_VertexList << std::endl;
+ os << indent << "Verticies: " << m_VertexList << std::endl;
}
-
} // End namespace otb
#endif
diff --git a/Code/Common/otbRemoteSensingRegion.h b/Code/Common/otbRemoteSensingRegion.h
index 5e11305312..ffc02c5a00 100644
--- a/Code/Common/otbRemoteSensingRegion.h
+++ b/Code/Common/otbRemoteSensingRegion.h
@@ -52,34 +52,34 @@ namespace otb
*/
template <class TType>
- class ITK_EXPORT RemoteSensingRegion : public itk::Region
+class ITK_EXPORT RemoteSensingRegion : public itk::Region
{
public:
/** Standard class typedefs. */
- typedef otb::RemoteSensingRegion<TType> Self;
- typedef itk::Region Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef otb::RemoteSensingRegion<TType> Self;
+ typedef itk::Region Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Standard part of all itk objects. */
- itkTypeMacro(RemoteSensingRegion, itk:Region);
+ itkTypeMacro(RemoteSensingRegion, itk : Region);
/** Typedef Support*/
- typedef TType Type;
+ typedef TType Type;
/** Index typedef support. An index is used to access pixel values. */
- typedef itk::ContinuousIndex<Type> IndexType;
- typedef itk::Point<Type, 2> PointType;
+ typedef itk::ContinuousIndex<Type> IndexType;
+ typedef itk::Point<Type, 2> PointType;
/** Size typedef support. A size is used to define region bounds. */
- typedef itk::ContinuousIndex<Type> SizeType;
+ typedef itk::ContinuousIndex<Type> SizeType;
// typedef itk::Size<2> StandardSizeType;
/** ImageRegion typedef needed by the GetImageRegion() method */
- typedef itk::ImageRegion<2> ImageRegionType;
+ typedef itk::ImageRegion<2> ImageRegionType;
virtual typename Superclass::RegionType GetRegionType() const
- {return Superclass::ITK_STRUCTURED_REGION;}
+ {return Superclass::ITK_STRUCTURED_REGION; }
/** Constructor. RemoteSensingRegion is a lightweight object that is not reference
* counted, so the constructor is public. */
@@ -94,37 +94,35 @@ public:
* counted, so the constructor is public. Default dimension is 2. */
RemoteSensingRegion()
{
- m_InputProjectionRef = "";
- m_Size.Fill(0.);
- m_Index.Fill(0.);
+ m_InputProjectionRef = "";
+ m_Size.Fill(0.);
+ m_Index.Fill(0.);
}
-
- /** Constructor. RemoteSensingRegion is a lightweight object that is not reference
- * counted, so the constructor is public. Default dimension is 2. */
- RemoteSensingRegion(const itk::ImageRegion<2>& region)
+ /** Constructor. RemoteSensingRegion is a lightweight object that is not reference
+ * counted, so the constructor is public. Default dimension is 2. */
+ RemoteSensingRegion(const itk::ImageRegion<2>®ion)
{
- m_InputProjectionRef = "";
- m_Size[0] = region.GetSize()[0];
- m_Size[1] = region.GetSize()[1];
- m_Index[0] = region.GetIndex()[0];
- m_Index[1] = region.GetIndex()[1];
+ m_InputProjectionRef = "";
+ m_Size[0] = region.GetSize()[0];
+ m_Size[1] = region.GetSize()[1];
+ m_Index[0] = region.GetIndex()[0];
+ m_Index[1] = region.GetIndex()[1];
}
/** Destructor. RemoteSensingRegion is a lightweight object that is not reference
* counted, so the destructor is public. */
- virtual ~RemoteSensingRegion(){};
-
+ virtual ~RemoteSensingRegion(){}
/** operator=. RemoteSensingRegion is a lightweight object that is not reference
* counted, so operator= is public. */
- void operator=(const Self& region)
- {
+ void operator =(const Self& region)
+ {
m_Index = region.m_Index;
m_Size = region.m_Size;
m_InputProjectionRef = region.m_InputProjectionRef;
m_KeywordList = region.m_KeywordList;
- }
+ }
/** This method provides explicit conversion to itk::ImageRegion<2>,
* so as to allow to use RemoteSensingRegion to specify requested
@@ -134,12 +132,12 @@ public:
{
ImageRegionType imageRegion;
typename ImageRegionType::IndexType irIndex;
- typename ImageRegionType::SizeType irSize;
+ typename ImageRegionType::SizeType irSize;
- irIndex[0]=static_cast<unsigned long>(vcl_floor(m_Index[0]));
- irIndex[1]=static_cast<unsigned long>(vcl_floor(m_Index[1]));
- irSize[0] =static_cast<unsigned long>(vcl_ceil(m_Size[0]));
- irSize[1] =static_cast<unsigned long>(vcl_ceil(m_Size[1]));
+ irIndex[0] = static_cast<unsigned long>(vcl_floor(m_Index[0]));
+ irIndex[1] = static_cast<unsigned long>(vcl_floor(m_Index[1]));
+ irSize[0] = static_cast<unsigned long>(vcl_ceil(m_Size[0]));
+ irSize[1] = static_cast<unsigned long>(vcl_ceil(m_Size[1]));
imageRegion.SetIndex(irIndex);
imageRegion.SetSize(irSize);
@@ -148,26 +146,26 @@ public:
}
/** Set the index defining the corner of the region. */
- void SetOrigin(const IndexType &index)
- {
+ void SetOrigin(const IndexType& index)
+ {
m_Index = index;
- }
+ }
/** Set the index defining the corner of the region. */
- void SetOrigin(const PointType &index)
- {
- m_Index[0] = index[0];
- m_Index[1] = index[1];
- }
+ void SetOrigin(const PointType& index)
+ {
+ m_Index[0] = index[0];
+ m_Index[1] = index[1];
+ }
/** Get index defining the corner of the region. */
const IndexType& GetOrigin() const
- {
+ {
return m_Index;
- }
+ }
/** Set the index defining the corner of the region. */
- void SetIndex(const IndexType &index)
+ void SetIndex(const IndexType& index)
{
m_Index = index;
}
@@ -180,10 +178,10 @@ public:
/** Set the size of the region. This plus the index determines the
* rectangular shape, or extent, of the region. */
- void SetSize(const SizeType &size)
- {
+ void SetSize(const SizeType& size)
+ {
m_Size = size;
- }
+ }
// void SetSize(const StandardSizeType &size)
// {
@@ -193,153 +191,152 @@ public:
/** Get the size of the region. */
const SizeType& GetSize() const
- {
+ {
return m_Size;
- }
+ }
/** Convenience methods to get the size of the image in a particular
* coordinate direction i. Do not try to access image sizes beyond the
* the ImageDimension. */
- Type GetSize( unsigned int i) const
- {
+ Type GetSize(unsigned int i) const
+ {
return m_Size[i];
- }
- Type GetOrigin( unsigned int i) const
- {
+ }
+ Type GetOrigin(unsigned int i) const
+ {
return m_Index[i];
- }
+ }
void SetSize(const unsigned int i, Type size)
- {
+ {
m_Size[i] = size;
- }
- void SetOrigin(const unsigned int i, Type idx)
- {
+ }
+ void SetOrigin(const unsigned int i, Type idx)
+ {
m_Index[i] = idx;
- }
-
+ }
- const ImageKeywordlist & GetKeywordList() const
- {
- return m_KeywordList;
- }
+ const ImageKeywordlist& GetKeywordList() const
+ {
+ return m_KeywordList;
+ }
- void SetKeywordList(const ImageKeywordlist& kwl)
- {
- this->m_KeywordList = kwl;
- }
+ void SetKeywordList(const ImageKeywordlist& kwl)
+ {
+ this->m_KeywordList = kwl;
+ }
/** Compare two regions. */
bool
- operator==(const Self ®ion) const
- {
+ operator ==(const Self& region) const
+ {
bool same = 1;
same = (m_Index == region.m_Index);
same = same && (m_Size == region.m_Size);
return same;
- }
+ }
/** Compare two regions. */
bool
- operator!=(const Self ®ion) const
- {
+ operator !=(const Self& region) const
+ {
bool same = 1;
same = (m_Index == region.m_Index);
same = same && (m_Size == region.m_Size);
return !same;
- }
+ }
/** Test if an index is inside */
bool
- IsInside(const IndexType &index) const
- {
- for(unsigned int i=0; i<IndexType::IndexDimension; ++i)
+ IsInside(const IndexType& index) const
+ {
+ for (unsigned int i = 0; i < IndexType::IndexDimension; ++i)
{
- if(( index[i] < m_Index[i] )
- && (index[i] < m_Index[i] + m_Size[i]))
+ if ((index[i] < m_Index[i])
+ && (index[i] < m_Index[i] + m_Size[i]))
{
return false;
}
- if(( index[i] >= m_Index[i] )
- && (index[i] >= m_Index[i] + m_Size[i] ))
+ if ((index[i] >= m_Index[i])
+ && (index[i] >= m_Index[i] + m_Size[i]))
{
return false;
}
}
return true;
- }
-
+ }
/**Get/Set InputProjectionRef std::string*/
- void SetRegionProjection(std::string projection)
- {m_InputProjectionRef = projection;}
+ void SetRegionProjection(std::string projection)
+ {m_InputProjectionRef = projection; }
std::string
- GetRegionProjection()
- {
- return m_InputProjectionRef;
- }
+ GetRegionProjection()
+ {
+ return m_InputProjectionRef;
+ }
/**
* Crop
*/
bool
- Crop(const Self & region)
- {
- Type crop;
- bool cropPossible = true;
-
- // Can we crop?
- for (unsigned int i = 0; i < IndexType::IndexDimension && cropPossible; ++i)
- {
+ Crop(const Self& region)
+ {
+ Type crop;
+ bool cropPossible = true;
- if (
- ((region.GetOrigin()[i] <= m_Index[i])
- && (region.GetOrigin()[i] <= m_Index[i] + static_cast<Type>(m_Size[i]))
- && ((region.GetOrigin()[i]+ static_cast<Type>(region.GetSize()[i])) <= m_Index[i])
- && ((region.GetOrigin()[i]+ static_cast<Type>(region.GetSize()[i])) <= m_Index[i] + static_cast<Type>(m_Size[i]))
- )
- ||
- ((region.GetOrigin()[i] >= m_Index[i])
- && (region.GetOrigin()[i] >= m_Index[i] + static_cast<Type>(m_Size[i]))
- && ((region.GetOrigin()[i]+ static_cast<Type>(region.GetSize()[i])) >= m_Index[i])
- && ((region.GetOrigin()[i]+ static_cast<Type>(region.GetSize()[i])) >= m_Index[i] + static_cast<Type>(m_Size[i]))
- )
- )
- {
- return false;
- }
+ // Can we crop?
+ for (unsigned int i = 0; i < IndexType::IndexDimension && cropPossible; ++i)
+ {
+ if (
+ ((region.GetOrigin()[i] <= m_Index[i])
+ && (region.GetOrigin()[i] <= m_Index[i] + static_cast<Type>(m_Size[i]))
+ && ((region.GetOrigin()[i] + static_cast<Type>(region.GetSize()[i])) <= m_Index[i])
+ && ((region.GetOrigin()[i] +
+ static_cast<Type>(region.GetSize()[i])) <= m_Index[i] + static_cast<Type>(m_Size[i]))
+ )
+ ||
+ ((region.GetOrigin()[i] >= m_Index[i])
+ && (region.GetOrigin()[i] >= m_Index[i] + static_cast<Type>(m_Size[i]))
+ && ((region.GetOrigin()[i] + static_cast<Type>(region.GetSize()[i])) >= m_Index[i])
+ && ((region.GetOrigin()[i] +
+ static_cast<Type>(region.GetSize()[i])) >= m_Index[i] + static_cast<Type>(m_Size[i]))
+ )
+ )
+ {
+ return false;
}
- // we can crop, so crop
- for (unsigned int i=0; i < IndexType::IndexDimension; ++i)
+ }
+
+ // we can crop, so crop
+ for (unsigned int i = 0; i < IndexType::IndexDimension; ++i)
+ {
+ // first check the start index
+ if (m_Index[i] < region.GetOrigin()[i])
{
- // first check the start index
- if (m_Index[i] < region.GetOrigin()[i])
- {
- // how much do we need to adjust
- crop = region.GetOrigin()[i] - m_Index[i];
-
- // adjust the start index and the size of the current region
- m_Index[i] += crop;
- m_Size[i] -= static_cast<Type>(crop);
- }
- // now check the final size
- if (m_Index[i] + static_cast<Type>(m_Size[i])
- > region.GetOrigin()[i] + static_cast<Type>(region.GetSize()[i]))
- {
- // how much do we need to adjust
- crop = m_Index[i] + static_cast<Type>(m_Size[i])
- - region.GetOrigin()[i] - static_cast<Type>(region.GetSize()[i]);
-
- // adjust the size
- m_Size[i] -= static_cast<Type>(crop);
- }
+ // how much do we need to adjust
+ crop = region.GetOrigin()[i] - m_Index[i];
+
+ // adjust the start index and the size of the current region
+ m_Index[i] += crop;
+ m_Size[i] -= static_cast<Type>(crop);
}
+ // now check the final size
+ if (m_Index[i] + static_cast<Type>(m_Size[i])
+ > region.GetOrigin()[i] + static_cast<Type>(region.GetSize()[i]))
+ {
+ // how much do we need to adjust
+ crop = m_Index[i] + static_cast<Type>(m_Size[i])
+ - region.GetOrigin()[i] - static_cast<Type>(region.GetSize()[i]);
- return cropPossible;
- }
+ // adjust the size
+ m_Size[i] -= static_cast<Type>(crop);
+ }
+ }
+ return cropPossible;
+ }
protected:
@@ -350,22 +347,21 @@ protected:
os << indent << "Index:" << this->m_Index << std::endl;
os << indent << "Size:" << this->m_Size << std::endl;
os << indent << "Projection:" << this->m_InputProjectionRef << std::endl;
- os << indent << "Keywordlist: "<<this->m_KeywordList<<std::endl;
+ os << indent << "Keywordlist: " << this->m_KeywordList << std::endl;
}
-
private:
IndexType m_Index;
SizeType m_Size;
- std::string m_InputProjectionRef;
+ std::string m_InputProjectionRef;
ImageKeywordlist m_KeywordList; //if we want to specify the region in term of sensor geometry
};
//extern std::ostream & operator<<(std::ostream &os, const RemoteSensingRegion ®ion);
template<class TType>
- std::ostream & operator<<(std::ostream &os, const RemoteSensingRegion<TType> ®ion)
+std::ostream & operator <<(std::ostream& os, const RemoteSensingRegion<TType>& region)
{
region.Print(os);
return os;
diff --git a/Code/Common/otbShapeAttributesLabelMapFilter.h b/Code/Common/otbShapeAttributesLabelMapFilter.h
index c586cc8f01..33269b5437 100644
--- a/Code/Common/otbShapeAttributesLabelMapFilter.h
+++ b/Code/Common/otbShapeAttributesLabelMapFilter.h
@@ -27,7 +27,7 @@
#include "otbPolygon.h"
#include "otbLabelObjectToPolygonFunctor.h"
#include "otbFlusserPathFunction.h"
-
+
namespace otb
{
@@ -35,31 +35,31 @@ namespace Functor
{
/** \class ShapeAttributesLabelObjectFunctor
* \brief Functor to compute shape attributes of one LabelObject.
-*
+*
* \sa ShapeAttributesLabelMapFilter
*/
template <class TLabelObject, class TLabelImage>
class ShapeAttributesLabelObjectFunctor
{
- public:
+public:
/** Self typedef */
- typedef ShapeAttributesLabelObjectFunctor Self;
+ typedef ShapeAttributesLabelObjectFunctor Self;
/** LabelObject typedef */
- typedef TLabelObject LabelObjectType;
+ typedef TLabelObject LabelObjectType;
/** Labeled image type */
- typedef TLabelImage LabelImageType;
+ typedef TLabelImage LabelImageType;
/** Flusser moments typedef */
- typedef typename TLabelObject::PolygonType PolygonType;
+ typedef typename TLabelObject::PolygonType PolygonType;
typedef Functor::LabelObjectToPolygonFunctor
- <LabelObjectType,PolygonType> PolygonFunctorType;
- typedef FlusserPathFunction<PolygonType> FlusserPathFunctionType;
-
+ <LabelObjectType, PolygonType> PolygonFunctorType;
+ typedef FlusserPathFunction<PolygonType> FlusserPathFunctionType;
+
/** Perimeter calculator */
typedef itk::LabelPerimeterEstimationCalculator
- < LabelImageType > PerimeterCalculatorType;
+ <LabelImageType> PerimeterCalculatorType;
/** Constructor */
ShapeAttributesLabelObjectFunctor();
@@ -68,8 +68,8 @@ class ShapeAttributesLabelObjectFunctor
virtual ~ShapeAttributesLabelObjectFunctor() {}
/** The comparators */
- bool operator!=(const Self& self);
- bool operator==(const Self& self);
+ bool operator !=(const Self& self);
+ bool operator ==(const Self& self);
/** Set the compute perimeter flag */
void SetComputePerimeter(bool flag);
@@ -79,17 +79,17 @@ class ShapeAttributesLabelObjectFunctor
/** Set the compute feret diameter flag */
void SetComputeFeretDiameter(bool flag);
-
+
/** Get the compute feret diameter flag */
bool GetComputeFeretDiameter() const;
-
+
/** Set the compute reduced attributes set flag */
void SetReducedAttributeSet(bool flag);
/** Get the compute reduced attributes set flag */
bool GetReducedAttributeSet() const;
- /** Set the label image (used only to compute
+ /** Set the label image (used only to compute
* the Feret diameter */
void SetLabelImage(const TLabelImage * image);
@@ -100,35 +100,35 @@ class ShapeAttributesLabelObjectFunctor
void SetPerimeterCalculator(const PerimeterCalculatorType * pc);
/** This is the functor implementation
- * Calling the functor on a label object
+ * Calling the functor on a label object
* will update its shape attributes */
- inline void operator()(LabelObjectType * lo) const;
+ inline void operator ()(LabelObjectType * lo) const;
- private:
+private:
/** Convenience internal method */
- static long factorial( long n );
-
+ static long factorial(long n);
+
/** Convenience internal method */
- static long doubleFactorial( long n );
-
+ static long doubleFactorial(long n);
+
/** Convenience internal method */
- static double gammaN2p1( long n );
-
+ static double gammaN2p1(long n);
+
/** Convenience internal method */
- static double hyperSphereVolume( double radius );
-
+ static double hyperSphereVolume(double radius);
+
/** Convenience internal method */
- static double hyperSpherePerimeter( double radius );
-
+ static double hyperSpherePerimeter(double radius);
+
/** Convenience internal method */
- static double hyperSphereRadiusFromVolume( double volume );
+ static double hyperSphereRadiusFromVolume(double volume);
/** Do we compute the feret diameter ? */
bool m_ComputeFeretDiameter;
/** Du we compute the perimeter ? */
bool m_ComputePerimeter;
-
+
/** Compute only a reduced attribute set */
bool m_ReducedAttributeSet;
@@ -159,45 +159,45 @@ class ShapeAttributesLabelObjectFunctor
* For the sake of speed optimization, the original label image must
* be giben to the filter. If not, the filter will convert the
* LabelObjectMap back to a LabelImage structure.
- *
+ *
* \sa itk::ShapeLabelMapFilter
*
* \ingroup ImageEnhancement MathematicalMorphologyImageFilters
*/
-template<class TImage,
- class TLabelImage = Image< typename TImage::PixelType,
- TImage::ImageDimension > >
-class ITK_EXPORT ShapeAttributesLabelMapFilter
+template<class TImage,
+ class TLabelImage = Image<typename TImage::PixelType,
+ TImage::ImageDimension> >
+class ITK_EXPORT ShapeAttributesLabelMapFilter
: public otb::LabelMapFeaturesFunctorImageFilter
- <TImage,
- typename Functor::ShapeAttributesLabelObjectFunctor
- <typename TImage::LabelObjectType, TLabelImage > >
+ <TImage,
+ typename Functor::ShapeAttributesLabelObjectFunctor
+ <typename TImage::LabelObjectType, TLabelImage> >
{
public:
/** Template parameters typedefs */
- typedef TImage ImageType;
- typedef typename ImageType::LabelObjectType LabelObjectType;
- typedef TLabelImage LabelImageType;
+ typedef TImage ImageType;
+ typedef typename ImageType::LabelObjectType LabelObjectType;
+ typedef TLabelImage LabelImageType;
typedef Functor::ShapeAttributesLabelObjectFunctor
- <LabelObjectType,LabelImageType> FunctorType;
+ <LabelObjectType, LabelImageType> FunctorType;
typedef typename FunctorType::PerimeterCalculatorType PerimeterCalculatorType;
-
+
/** Standard class typedefs. */
- typedef ShapeAttributesLabelMapFilter Self;
+ typedef ShapeAttributesLabelMapFilter Self;
typedef LabelMapFeaturesFunctorImageFilter
- <ImageType,FunctorType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ <ImageType, FunctorType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** ImageDimension constants */
- itkStaticConstMacro(ImageDimension, unsigned int,TImage::ImageDimension);
-
+ itkStaticConstMacro(ImageDimension, unsigned int, TImage::ImageDimension);
+
/** Standard New method. */
itkNewMacro(Self);
-
+
/** Runtime information support. */
- itkTypeMacro(ShapeAttributesLabelMapFilter,LabelMapFeaturesFunctorImageFilter);
-
+ itkTypeMacro(ShapeAttributesLabelMapFilter, LabelMapFeaturesFunctorImageFilter);
+
/**
* Set/Get whether the maximum Feret diameter should be computed or not. The
* defaut value is false, because of the high computation time required.
@@ -223,14 +223,14 @@ public:
* diameter) */
void SetLabelImage(const TLabelImage *);
const TLabelImage * GetLabelImage() const;
-
+
protected:
/** Constructor */
ShapeAttributesLabelMapFilter(){}
-
+
/** Destructor */
virtual ~ShapeAttributesLabelMapFilter(){}
-
+
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -238,17 +238,15 @@ protected:
virtual void BeforeThreadedGenerateData();
private:
- ShapeAttributesLabelMapFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ShapeAttributesLabelMapFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
}; // end of class
} // end namespace otb
-
+
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbShapeAttributesLabelMapFilter.txx"
#endif
#endif
-
-
diff --git a/Code/Common/otbShapeAttributesLabelMapFilter.txx b/Code/Common/otbShapeAttributesLabelMapFilter.txx
index 16b1062f08..14f84b03c3 100644
--- a/Code/Common/otbShapeAttributesLabelMapFilter.txx
+++ b/Code/Common/otbShapeAttributesLabelMapFilter.txx
@@ -37,20 +37,20 @@ namespace otb {
namespace Functor {
template <class TLabelObject, class TLabelImage>
-ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
+ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
::ShapeAttributesLabelObjectFunctor() : m_ComputeFeretDiameter(false),
- m_ComputePerimeter(false),
- m_ReducedAttributeSet(true),
- m_PerimeterCalculator(NULL),
- m_LabelImage(NULL)
+ m_ComputePerimeter(false),
+ m_ReducedAttributeSet(true),
+ m_PerimeterCalculator(NULL),
+ m_LabelImage(NULL)
{}
/** The comparator (!=) */
template <class TLabelObject, class TLabelImage>
-bool
-ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
-::operator!=(const Self& self)
-{
+bool
+ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
+::operator != (const Self &self)
+ {
// Initialize response
bool resp = true;
@@ -62,22 +62,22 @@ ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
// Return
return resp;
-}
+ }
/** The comparator (==)*/
template <class TLabelObject, class TLabelImage>
-bool
-ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
-::operator==(const Self& self)
-{
+bool
+ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
+::operator == (const Self &self)
+ {
// Call the != implementation
return !(this != self);
-}
-
+ }
+
/** Set the compute perimeter flag */
template <class TLabelObject, class TLabelImage>
-void
-ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
+void
+ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
::SetComputePerimeter(bool flag)
{
m_ComputePerimeter = flag;
@@ -85,8 +85,8 @@ ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
/** Get the compute perimeter flag */
template <class TLabelObject, class TLabelImage>
-bool
-ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
+bool
+ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
::GetComputePerimeter() const
{
return m_ComputePerimeter;
@@ -95,25 +95,25 @@ ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
/** Set the compute feret diameter flag */
template <class TLabelObject, class TLabelImage>
void
-ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
+ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
::SetComputeFeretDiameter(bool flag)
{
m_ComputeFeretDiameter = flag;
}
-
+
/** Get the compute feret diameter flag */
template <class TLabelObject, class TLabelImage>
-bool
-ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
+bool
+ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
::GetComputeFeretDiameter() const
{
return m_ComputeFeretDiameter;
}
-
+
/** Set the compute reduced attributes set flag */
template <class TLabelObject, class TLabelImage>
void
-ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
+ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
::SetReducedAttributeSet(bool flag)
{
m_ReducedAttributeSet = flag;
@@ -122,17 +122,17 @@ ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
/** Get the compute reduced attributes set flag */
template <class TLabelObject, class TLabelImage>
bool
-ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
+ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
::GetReducedAttributeSet() const
{
return m_ReducedAttributeSet;
}
-/** Set the label image (used only to compute
+/** Set the label image (used only to compute
* the Feret diameter */
template <class TLabelObject, class TLabelImage>
void
-ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
+ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
::SetLabelImage(const TLabelImage * image)
{
m_LabelImage = image;
@@ -140,8 +140,8 @@ ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
/** Get the label image */
template <class TLabelObject, class TLabelImage>
-const TLabelImage *
-ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
+const TLabelImage *
+ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
::GetLabelImage() const
{
return m_LabelImage;
@@ -149,108 +149,108 @@ ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
template <class TLabelObject, class TLabelImage>
void
-ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
+ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
::SetPerimeterCalculator(const PerimeterCalculatorType * pc)
{
m_PerimeterCalculator = pc;
}
/** This is the functor implementation
- * Calling the functor on a label object
+ * Calling the functor on a label object
* will update its shape attributes */
template <class TLabelObject, class TLabelImage>
void
-ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
-::operator()(LabelObjectType * lo) const
+ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
+::operator() (LabelObjectType * lo) const
{
- const typename LabelObjectType::LabelType & label = lo->GetLabel();
+ const typename LabelObjectType::LabelType& label = lo->GetLabel();
// TODO: compute sizePerPixel, borderMin and borderMax in BeforeThreadedGenerateData() ?
// compute the size per pixel, to be used later
double sizePerPixel = 1;
- for( int i=0; i<LabelObjectType::ImageDimension; i++ )
+ for (int i = 0; i < LabelObjectType::ImageDimension; i++)
{
sizePerPixel *= vcl_abs(m_LabelImage->GetSpacing()[i]);
}
-
- typename std::vector< double > sizePerPixelPerDimension;
- for( int i=0; i<LabelObjectType::ImageDimension; i++ )
+
+ typename std::vector<double> sizePerPixelPerDimension;
+ for (int i = 0; i < LabelObjectType::ImageDimension; i++)
{
- sizePerPixelPerDimension.push_back( sizePerPixel / vcl_abs(m_LabelImage->GetSpacing()[i]) );
+ sizePerPixelPerDimension.push_back(sizePerPixel / vcl_abs(m_LabelImage->GetSpacing()[i]));
}
-
+
// compute the max the index on the border of the image
typename LabelObjectType::IndexType borderMin = m_LabelImage->GetLargestPossibleRegion().GetIndex();
typename LabelObjectType::IndexType borderMax = borderMin;
- for( int i=0; i<LabelObjectType::ImageDimension; i++ )
+ for (int i = 0; i < LabelObjectType::ImageDimension; i++)
{
borderMax[i] += borderMin[i] + m_LabelImage->GetLargestPossibleRegion().GetSize()[i] - 1;
}
// init the vars
- unsigned long size = 0;
- itk::ContinuousIndex< double, LabelObjectType::ImageDimension> centroid;
- centroid.Fill( 0 );
+ unsigned long size = 0;
+ itk::ContinuousIndex<double, LabelObjectType::ImageDimension> centroid;
+ centroid.Fill(0);
typename LabelObjectType::IndexType mins;
- mins.Fill( itk::NumericTraits< long >::max() );
+ mins.Fill(itk::NumericTraits<long>::max());
typename LabelObjectType::IndexType maxs;
- maxs.Fill( itk::NumericTraits< long >::NonpositiveMin() );
- unsigned long sizeOnBorder = 0;
- double physicalSizeOnBorder = 0;
- itk::Matrix<double,LabelObjectType::ImageDimension,LabelObjectType::ImageDimension> centralMoments;
- centralMoments.Fill( 0 );
+ maxs.Fill(itk::NumericTraits<long>::NonpositiveMin());
+ unsigned long sizeOnBorder = 0;
+ double physicalSizeOnBorder = 0;
+ itk::Matrix<double, LabelObjectType::ImageDimension, LabelObjectType::ImageDimension> centralMoments;
+ centralMoments.Fill(0);
typename LabelObjectType::LineContainerType::const_iterator lit;
- typename LabelObjectType::LineContainerType & lineContainer = lo->GetLineContainer();
+ typename LabelObjectType::LineContainerType& lineContainer = lo->GetLineContainer();
// iterate over all the lines
- for( lit = lineContainer.begin(); lit != lineContainer.end(); lit++ )
+ for (lit = lineContainer.begin(); lit != lineContainer.end(); lit++)
{
- const typename LabelObjectType::IndexType & idx = lit->GetIndex();
- unsigned long length = lit->GetLength();
+ const typename LabelObjectType::IndexType& idx = lit->GetIndex();
+ unsigned long length = lit->GetLength();
// update the size
size += length;
// update the centroid - and report the progress
// first, update the axes which are not 0
- for( int i=1; i<LabelObjectType::ImageDimension; i++ )
+ for (int i = 1; i < LabelObjectType::ImageDimension; i++)
{
centroid[i] += length * idx[i];
}
// then, update the axis 0
- centroid[0] += idx[0] * length + ( length * ( length - 1 ) ) / 2.0;
+ centroid[0] += idx[0] * length + (length * (length - 1)) / 2.0;
// update the mins and maxs
- for( int i=0; i<LabelObjectType::ImageDimension; i++)
+ for (int i = 0; i < LabelObjectType::ImageDimension; i++)
{
- if( idx[i] < mins[i] )
+ if (idx[i] < mins[i])
{
mins[i] = idx[i];
}
- if( idx[i] > maxs[i] )
+ if (idx[i] > maxs[i])
{
maxs[i] = idx[i];
}
}
// must fix the max for the axis 0
- if( idx[0] + (long)length > maxs[0] )
+ if (idx[0] + (long) length > maxs[0])
{
maxs[0] = idx[0] + length - 1;
}
// object is on a border ?
bool isOnBorder = false;
- for( int i=1; i<LabelObjectType::ImageDimension; i++)
+ for (int i = 1; i < LabelObjectType::ImageDimension; i++)
{
- if( idx[i] == borderMin[i] || idx[i] == borderMax[i])
+ if (idx[i] == borderMin[i] || idx[i] == borderMax[i])
{
isOnBorder = true;
break;
}
}
- if( isOnBorder )
+ if (isOnBorder)
{
// the line touch a border on a dimension other than 0, so
// all the line touch a border
@@ -260,51 +260,50 @@ ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
{
// we must check for the dimension 0
bool isOnBorder0 = false;
- if( idx[0] == borderMin[0] )
+ if (idx[0] == borderMin[0])
{
// one more pixel on the border
sizeOnBorder++;
isOnBorder0 = true;
}
- if( !isOnBorder0 || length > 1 )
+ if (!isOnBorder0 || length > 1)
{
// we can check for the end of the line
- if( idx[0] + (long)length - 1 == borderMax[0] )
+ if (idx[0] + (long) length - 1 == borderMax[0])
{
// one more pixel on the border
sizeOnBorder++;
}
}
}
-
+
// physical size on border
// first, the dimension 0
- if( idx[0] == borderMin[0] )
+ if (idx[0] == borderMin[0])
{
// the begining of the line
physicalSizeOnBorder += sizePerPixelPerDimension[0];
}
- if( idx[0] + (long)length - 1 == borderMax[0] )
+ if (idx[0] + (long) length - 1 == borderMax[0])
{
// and the end of the line
physicalSizeOnBorder += sizePerPixelPerDimension[0];
}
// then the other dimensions
- for( int i=1; i<LabelObjectType::ImageDimension; i++ )
+ for (int i = 1; i < LabelObjectType::ImageDimension; i++)
{
- if( idx[i] == borderMin[i] )
+ if (idx[i] == borderMin[i])
{
// one border
physicalSizeOnBorder += sizePerPixelPerDimension[i] * length;
}
- if( idx[i] == borderMax[i] )
+ if (idx[i] == borderMax[i])
{
// and the other
physicalSizeOnBorder += sizePerPixelPerDimension[i] * length;
}
}
-
/*
// moments computation
// ****************************************************************
@@ -330,22 +329,23 @@ ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
// get the physical position and the spacing - they are used several times later
typename TLabelImage::PointType physicalPosition;
- m_LabelImage->TransformIndexToPhysicalPoint( idx, physicalPosition );
- const typename TLabelImage::SpacingType & spacing = m_LabelImage->GetSpacing();
+ m_LabelImage->TransformIndexToPhysicalPoint(idx, physicalPosition);
+ const typename TLabelImage::SpacingType& spacing = m_LabelImage->GetSpacing();
// the sum of x positions, also reused several times
- double sumX = length * ( physicalPosition[0] + ( spacing[0] * ( length - 1 ) ) / 2.0 );
+ double sumX = length * (physicalPosition[0] + (spacing[0] * (length - 1)) / 2.0);
// the real job - the sum of square of x positions
// that's the central moments for dims 0, 0
- centralMoments[0][0] += length * ( physicalPosition[0] * physicalPosition[0]
- + spacing[0] * ( length - 1 ) * ( ( spacing[0] * ( 2 * length - 1 ) ) / 6.0 + physicalPosition[0] ) );
+ centralMoments[0][0] += length * (physicalPosition[0] * physicalPosition[0]
+ + spacing[0] *
+ (length - 1) * ((spacing[0] * (2 * length - 1)) / 6.0 + physicalPosition[0]));
// the other ones
- for( int i=1; i<LabelObjectType::ImageDimension; i++ )
+ for (int i = 1; i < LabelObjectType::ImageDimension; i++)
{
// do this one here to avoid the double assigment in the following loop
// when i == j
centralMoments[i][i] += length * physicalPosition[i] * physicalPosition[i];
- // central moments are symetrics, so avoid to compute them 2 times
- for( int j=i+1; j<LabelObjectType::ImageDimension; j++ )
+ // central moments are symetrics, so avoid to compute them 2 times
+ for (int j = i + 1; j < LabelObjectType::ImageDimension; j++)
{
// note that we won't use that code if the image dimension is less than 3
// --> the tests should be in 3D at least
@@ -363,99 +363,100 @@ ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
// final computation
typename TLabelImage::SizeType regionSize;
- double minSize = itk::NumericTraits< double >::max();
- double maxSize = itk::NumericTraits< double >::NonpositiveMin();
- for( int i=0; i<LabelObjectType::ImageDimension; i++ )
+ double minSize = itk::NumericTraits<double>::max();
+ double maxSize = itk::NumericTraits<double>::NonpositiveMin();
+ for (int i = 0; i < LabelObjectType::ImageDimension; i++)
{
centroid[i] /= size;
regionSize[i] = maxs[i] - mins[i] + 1;
double s = regionSize[i] * vcl_abs(m_LabelImage->GetSpacing()[i]);
- minSize = std::min( s, minSize );
- maxSize = std::max( s, maxSize );
- for(unsigned int j=0; j<LabelObjectType::ImageDimension; j++)
+ minSize = std::min(s, minSize);
+ maxSize = std::max(s, maxSize);
+ for (unsigned int j = 0; j < LabelObjectType::ImageDimension; j++)
{
centralMoments[i][j] /= size;
}
}
- typename TLabelImage::RegionType region( mins, regionSize );
+ typename TLabelImage::RegionType region(mins, regionSize);
typename TLabelImage::PointType physicalCentroid;
- m_LabelImage->TransformContinuousIndexToPhysicalPoint( centroid, physicalCentroid );
+ m_LabelImage->TransformContinuousIndexToPhysicalPoint(centroid, physicalCentroid);
// Center the second order moments
- for(unsigned int i=0; i<LabelObjectType::ImageDimension; i++)
+ for (unsigned int i = 0; i < LabelObjectType::ImageDimension; i++)
{
- for(unsigned int j=0; j<LabelObjectType::ImageDimension; j++)
+ for (unsigned int j = 0; j < LabelObjectType::ImageDimension; j++)
{
centralMoments[i][j] -= physicalCentroid[i] * physicalCentroid[j];
}
}
-
// Compute principal moments and axes
- itk::Vector<double,LabelObjectType::ImageDimension> principalMoments;
- vnl_symmetric_eigensystem<double> eigen( centralMoments.GetVnlMatrix() );
+ itk::Vector<double, LabelObjectType::ImageDimension> principalMoments;
+ vnl_symmetric_eigensystem<double> eigen(centralMoments.GetVnlMatrix());
vnl_diag_matrix<double> pm = eigen.D;
- for(unsigned int i=0; i<LabelObjectType::ImageDimension; i++)
+ for (unsigned int i = 0; i < LabelObjectType::ImageDimension; i++)
{
// principalMoments[i] = 4 * vcl_sqrt( pm(i,i) );
- principalMoments[i] = pm(i,i);
+ principalMoments[i] = pm(i, i);
}
- itk::Matrix<double,LabelObjectType::ImageDimension,LabelObjectType::ImageDimension>
- principalAxes = eigen.V.transpose();
+ itk::Matrix<double, LabelObjectType::ImageDimension, LabelObjectType::ImageDimension>
+ principalAxes = eigen.V.transpose();
// Add a final reflection if needed for a proper rotation,
// by multiplying the last row by the determinant
- vnl_real_eigensystem eigenrot( principalAxes.GetVnlMatrix() );
- vnl_diag_matrix< vcl_complex<double> > eigenval = eigenrot.D;
- vcl_complex<double> det( 1.0, 0.0 );
+ vnl_real_eigensystem eigenrot(principalAxes.GetVnlMatrix());
+ vnl_diag_matrix<vcl_complex<double> > eigenval = eigenrot.D;
+ vcl_complex<double> det(1.0, 0.0);
- for(unsigned int i=0; i<LabelObjectType::ImageDimension; i++)
+ for (unsigned int i = 0; i < LabelObjectType::ImageDimension; i++)
{
- det *= eigenval( i, i );
+ det *= eigenval(i, i);
}
- for(unsigned int i=0; i<LabelObjectType::ImageDimension; i++)
+ for (unsigned int i = 0; i < LabelObjectType::ImageDimension; i++)
{
- principalAxes[ LabelObjectType::ImageDimension-1 ][i] *= std::real( det );
+ principalAxes[LabelObjectType::ImageDimension - 1][i] *= std::real(det);
}
double elongation = 0;
- if( principalMoments[LabelObjectType::ImageDimension-2] != 0 )
+ if (principalMoments[LabelObjectType::ImageDimension - 2] != 0)
{
- elongation = vcl_sqrt(principalMoments[LabelObjectType::ImageDimension-1] / principalMoments[LabelObjectType::ImageDimension-2]);
+ elongation =
+ vcl_sqrt(principalMoments[LabelObjectType::ImageDimension -
+ 1] / principalMoments[LabelObjectType::ImageDimension - 2]);
}
double physicalSize = size * sizePerPixel;
- double equivalentRadius = hyperSphereRadiusFromVolume( physicalSize );
- double equivalentPerimeter = hyperSpherePerimeter( equivalentRadius );
+ double equivalentRadius = hyperSphereRadiusFromVolume(physicalSize);
+ double equivalentPerimeter = hyperSpherePerimeter(equivalentRadius);
// compute equilalent ellipsoid radius
- itk::Vector<double,LabelObjectType::ImageDimension> ellipsoidSize;
- double edet = 1.0;
- for(unsigned int i=0; i<LabelObjectType::ImageDimension; i++)
+ itk::Vector<double, LabelObjectType::ImageDimension> ellipsoidSize;
+ double edet = 1.0;
+ for (unsigned int i = 0; i < LabelObjectType::ImageDimension; i++)
{
edet *= principalMoments[i];
}
- edet = vcl_pow( edet, 1.0/LabelObjectType::ImageDimension );
- for(unsigned int i=0; i<LabelObjectType::ImageDimension; i++)
+ edet = vcl_pow(edet, 1.0 / LabelObjectType::ImageDimension);
+ for (unsigned int i = 0; i < LabelObjectType::ImageDimension; i++)
{
- ellipsoidSize[i] = 2.0 * equivalentRadius * vcl_sqrt( principalMoments[i] / edet );
+ ellipsoidSize[i] = 2.0 * equivalentRadius * vcl_sqrt(principalMoments[i] / edet);
}
// Flusser moments (only make sense when ImageDimension == 2)
if (LabelObjectType::ImageDimension == 2)
{
// complex centered moments
- std::complex<double> c11,c20,c12,c21,c22,c30,c31,c40;
- c11 = c20 = c12 = c21 = c22 = c30 = c31 = c40 = std::complex<double>(0,0);
- for( lit = lineContainer.begin(); lit != lineContainer.end(); lit++ )
+ std::complex<double> c11, c20, c12, c21, c22, c30, c31, c40;
+ c11 = c20 = c12 = c21 = c22 = c30 = c31 = c40 = std::complex<double>(0, 0);
+ for (lit = lineContainer.begin(); lit != lineContainer.end(); lit++)
{
- const typename LabelObjectType::IndexType & idx = lit->GetIndex();
- unsigned long length = lit->GetLength();
+ const typename LabelObjectType::IndexType& idx = lit->GetIndex();
+ unsigned long length = lit->GetLength();
//
long endIdx0 = idx[0] + length;
- for( typename LabelObjectType::IndexType iidx = idx; iidx[0]<endIdx0; iidx[0]++ )
+ for (typename LabelObjectType::IndexType iidx = idx; iidx[0] < endIdx0; iidx[0]++)
{
typename TLabelImage::PointType cPP;
m_LabelImage->TransformIndexToPhysicalPoint(iidx, cPP);
@@ -477,28 +478,26 @@ ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
// normalize
c11 /= physicalSize * physicalSize;
c20 /= physicalSize * physicalSize;
- c12 /= vcl_pow(physicalSize, 5.0/2);
- c21 /= vcl_pow(physicalSize, 5.0/2);
- c30 /= vcl_pow(physicalSize, 5.0/2);
+ c12 /= vcl_pow(physicalSize, 5.0 / 2);
+ c21 /= vcl_pow(physicalSize, 5.0 / 2);
+ c30 /= vcl_pow(physicalSize, 5.0 / 2);
c22 /= vcl_pow(physicalSize, 3);
c31 /= vcl_pow(physicalSize, 3);
c40 /= vcl_pow(physicalSize, 3);
-
- lo->SetAttribute( "SHAPE::Flusser01" , c11.real() );
- lo->SetAttribute( "SHAPE::Flusser02" , (c21 * c12).real() );
- lo->SetAttribute( "SHAPE::Flusser03" , (c20 * vcl_pow(c12,2)).real() );
- lo->SetAttribute( "SHAPE::Flusser04" , (c20 * vcl_pow(c12,2)).imag() );
- lo->SetAttribute( "SHAPE::Flusser05" , (c30 * vcl_pow(c12,3)).real() );
- lo->SetAttribute( "SHAPE::Flusser06" , (c30 * vcl_pow(c12,3)).imag() );
- lo->SetAttribute( "SHAPE::Flusser07" , c22.real() );
- lo->SetAttribute( "SHAPE::Flusser08" , (c31 * vcl_pow(c12,2)).real() );
- lo->SetAttribute( "SHAPE::Flusser09" , (c31 * vcl_pow(c12,2)).imag() );
- lo->SetAttribute( "SHAPE::Flusser10" , (c40 * vcl_pow(c12,4)).real() );
- lo->SetAttribute( "SHAPE::Flusser11" , (c40 * vcl_pow(c12,4)).imag() );
+ lo->SetAttribute("SHAPE::Flusser01", c11.real());
+ lo->SetAttribute("SHAPE::Flusser02", (c21 * c12).real());
+ lo->SetAttribute("SHAPE::Flusser03", (c20 * vcl_pow(c12, 2)).real());
+ lo->SetAttribute("SHAPE::Flusser04", (c20 * vcl_pow(c12, 2)).imag());
+ lo->SetAttribute("SHAPE::Flusser05", (c30 * vcl_pow(c12, 3)).real());
+ lo->SetAttribute("SHAPE::Flusser06", (c30 * vcl_pow(c12, 3)).imag());
+ lo->SetAttribute("SHAPE::Flusser07", c22.real());
+ lo->SetAttribute("SHAPE::Flusser08", (c31 * vcl_pow(c12, 2)).real());
+ lo->SetAttribute("SHAPE::Flusser09", (c31 * vcl_pow(c12, 2)).imag());
+ lo->SetAttribute("SHAPE::Flusser10", (c40 * vcl_pow(c12, 4)).real());
+ lo->SetAttribute("SHAPE::Flusser11", (c40 * vcl_pow(c12, 4)).imag());
}
-
// Set the attributes
PolygonFunctorType polygonFunctor;
polygonFunctor.SetStartIndex(m_LabelImage->GetLargestPossibleRegion().GetIndex());
@@ -508,40 +507,40 @@ ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
lo->SetPolygon(polygon);
// Physical size
- lo->SetAttribute("SHAPE::PhysicalSize", physicalSize );
-
+ lo->SetAttribute("SHAPE::PhysicalSize", physicalSize);
+
// Elongation
- lo->SetAttribute("SHAPE::Elongation", elongation );
+ lo->SetAttribute("SHAPE::Elongation", elongation);
- if( m_ComputeFeretDiameter )
+ if (m_ComputeFeretDiameter)
{
// init the vars
unsigned long size = 0;
- typedef typename std::deque< typename LabelObjectType::IndexType > IndexListType;
+ typedef typename std::deque<typename LabelObjectType::IndexType> IndexListType;
IndexListType idxList;
-
+
// the iterators
typename LabelObjectType::LineContainerType::const_iterator lit;
- typename LabelObjectType::LineContainerType & lineContainer = lo->GetLineContainer();
+ typename LabelObjectType::LineContainerType& lineContainer = lo->GetLineContainer();
- typedef typename itk::ConstNeighborhoodIterator< LabelImageType > NeighborIteratorType;
+ typedef typename itk::ConstNeighborhoodIterator<LabelImageType> NeighborIteratorType;
typename TLabelImage::SizeType neighborHoodRadius;
- neighborHoodRadius.Fill( 1 );
- NeighborIteratorType it( neighborHoodRadius, m_LabelImage, m_LabelImage->GetBufferedRegion() );
+ neighborHoodRadius.Fill(1);
+ NeighborIteratorType it(neighborHoodRadius, m_LabelImage, m_LabelImage->GetBufferedRegion());
itk::ConstantBoundaryCondition<LabelImageType> lcbc;
// use label + 1 to have a label different of the current label on the border
- lcbc.SetConstant( label + 1 );
- it.OverrideBoundaryCondition( &lcbc );
+ lcbc.SetConstant(label + 1);
+ it.OverrideBoundaryCondition(&lcbc);
it.GoToBegin();
// iterate over all the lines
- for( lit = lineContainer.begin(); lit != lineContainer.end(); lit++ )
+ for (lit = lineContainer.begin(); lit != lineContainer.end(); lit++)
{
- const typename LabelObjectType::IndexType & firstIdx = lit->GetIndex();
- unsigned long length = lit->GetLength();
+ const typename LabelObjectType::IndexType& firstIdx = lit->GetIndex();
+ unsigned long length = lit->GetLength();
long endIdx0 = firstIdx[0] + length;
- for( typename LabelObjectType::IndexType idx = firstIdx; idx[0]<endIdx0; idx[0]++)
+ for (typename LabelObjectType::IndexType idx = firstIdx; idx[0] < endIdx0; idx[0]++)
{
// move the iterator to the new location
@@ -550,9 +549,9 @@ ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
// push the pixel in the list if it is on the border of the object
for (unsigned i = 0; i < it.Size(); i++)
{
- if( it.GetPixel(i) != label )
+ if (it.GetPixel(i) != label)
{
- idxList.push_back( idx );
+ idxList.push_back(idx);
size++;
break;
}
@@ -562,158 +561,157 @@ ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
// we can now search the feret diameter
double feretDiameter = 0;
- for( typename IndexListType::const_iterator iIt1 = idxList.begin();
- iIt1 != idxList.end();
- iIt1++ )
+ for (typename IndexListType::const_iterator iIt1 = idxList.begin();
+ iIt1 != idxList.end();
+ iIt1++)
{
typename IndexListType::const_iterator iIt2 = iIt1;
- for( iIt2++; iIt2 != idxList.end(); iIt2++ )
+ for (iIt2++; iIt2 != idxList.end(); iIt2++)
{
// Compute the length between the 2 indexes
double length = 0;
- for( int i=0; i<LabelObjectType::ImageDimension; i++ )
+ for (int i = 0; i < LabelObjectType::ImageDimension; i++)
{
- length += vcl_pow( ( iIt1->operator[]( i ) - iIt2->operator[]( i ) ) * m_LabelImage->GetSpacing()[i], 2 );
+ length += vcl_pow((iIt1->operator[] (i) - iIt2->operator[] (i)) * m_LabelImage->GetSpacing()[i], 2);
}
- if( feretDiameter < length )
+ if (feretDiameter < length)
{
feretDiameter = length;
}
}
}
// final computation
- feretDiameter = vcl_sqrt( feretDiameter );
+ feretDiameter = vcl_sqrt(feretDiameter);
// finally put the values in the label object
- lo->SetAttribute("SHAPE::FeretDiameter",feretDiameter );
+ lo->SetAttribute("SHAPE::FeretDiameter", feretDiameter);
}
-
// be sure tha the calculator has the perimeter estimation for that label.
// The calculator may not have the label if the object is only on a border.
// It will occurre for sure when processing a 2D image with a 3D filter.
- if( m_ComputePerimeter && m_PerimeterCalculator->HasLabel( label ) )
+ if (m_ComputePerimeter && m_PerimeterCalculator->HasLabel(label))
{
- double perimeter = m_PerimeterCalculator->GetPerimeter( label );
- lo->SetAttribute("SHAPE::Perimeter", perimeter );
- lo->SetAttribute("SHAPE::Roudness", equivalentPerimeter / perimeter );
+ double perimeter = m_PerimeterCalculator->GetPerimeter(label);
+ lo->SetAttribute("SHAPE::Perimeter", perimeter);
+ lo->SetAttribute("SHAPE::Roudness", equivalentPerimeter / perimeter);
}
// Complete feature set
- if(!m_ReducedAttributeSet)
+ if (!m_ReducedAttributeSet)
{
- lo->SetAttribute("SHAPE::Size", size );
+ lo->SetAttribute("SHAPE::Size", size);
itk::OStringStream oss;
- for(unsigned int dim = 0;dim < LabelObjectType::ImageDimension;++dim)
+ for (unsigned int dim = 0; dim < LabelObjectType::ImageDimension; ++dim)
{
oss.str("");
- oss<<"SHAPE::RegionIndex"<<dim;
+ oss << "SHAPE::RegionIndex" << dim;
lo->SetAttribute(oss.str().c_str(), region.GetIndex()[dim]);
oss.str("");
- oss<<"SHAPE::RegionSize"<<dim;
+ oss << "SHAPE::RegionSize" << dim;
lo->SetAttribute(oss.str().c_str(), region.GetSize()[dim]);
oss.str("");
- oss<<"SHAPE::PhysicalCentroid"<<dim;
+ oss << "SHAPE::PhysicalCentroid" << dim;
lo->SetAttribute(oss.str().c_str(), physicalCentroid[dim]);
oss.str("");
- oss<<"SHAPE::EquivalentEllipsoidRadius"<<dim;
- lo->SetAttribute(oss.str().c_str(), ellipsoidSize[dim] );
+ oss << "SHAPE::EquivalentEllipsoidRadius" << dim;
+ lo->SetAttribute(oss.str().c_str(), ellipsoidSize[dim]);
oss.str("");
- oss<<"SHAPE::PrincipalMoments"<<dim;
- lo->SetAttribute( oss.str().c_str(),principalMoments[dim]);
-
- for(unsigned int dim2 = 0;dim2 < LabelObjectType::ImageDimension;++dim2)
- {
- oss.str("");
- oss<<"SHAPE::PrincipalAxis"<<dim<<dim2;
- lo->SetAttribute( oss.str().c_str(),principalAxes(dim,dim2));
- }
+ oss << "SHAPE::PrincipalMoments" << dim;
+ lo->SetAttribute(oss.str().c_str(), principalMoments[dim]);
+
+ for (unsigned int dim2 = 0; dim2 < LabelObjectType::ImageDimension; ++dim2)
+ {
+ oss.str("");
+ oss << "SHAPE::PrincipalAxis" << dim << dim2;
+ lo->SetAttribute(oss.str().c_str(), principalAxes(dim, dim2));
+ }
}
-
- lo->SetAttribute("SHAPE::RegionElongation", maxSize / minSize );
- lo->SetAttribute("SHAPE::RegionRatio", size / (double)region.GetNumberOfPixels() );
- lo->SetAttribute("SHAPE::SizeOnBorder", sizeOnBorder );
- lo->SetAttribute("SHAPE::PhysicalSizeOnBorder",physicalSizeOnBorder );
- lo->SetAttribute("SHAPE::EquivalentPerimeter", equivalentPerimeter );
+
+ lo->SetAttribute("SHAPE::RegionElongation", maxSize / minSize);
+ lo->SetAttribute("SHAPE::RegionRatio", size / (double) region.GetNumberOfPixels());
+ lo->SetAttribute("SHAPE::SizeOnBorder", sizeOnBorder);
+ lo->SetAttribute("SHAPE::PhysicalSizeOnBorder", physicalSizeOnBorder);
+ lo->SetAttribute("SHAPE::EquivalentPerimeter", equivalentPerimeter);
lo->SetAttribute("SHAPE::EquivalentRadius", equivalentRadius);
}
}
/** Convenience internal method */
template <class TLabelObject, class TLabelImage>
-long ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
-::factorial( long n )
+long ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
+::factorial(long n)
{
- if( n < 1 )
+ if (n < 1)
{
return 1;
}
- return n * factorial( n - 1 );
+ return n * factorial(n - 1);
}
-
+
/** Convenience internal method */
template <class TLabelObject, class TLabelImage>
-long ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
-::doubleFactorial( long n )
+long ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
+::doubleFactorial(long n)
{
- if( n < 2 )
+ if (n < 2)
{
return 1;
}
- return n * doubleFactorial( n - 2 );
+ return n * doubleFactorial(n - 2);
}
-
+
/** Convenience internal method */
template <class TLabelObject, class TLabelImage>
-double ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
-::gammaN2p1( long n )
+double ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
+::gammaN2p1(long n)
{
bool even = n % 2 == 0;
- if( even )
+ if (even)
{
- return factorial( n / 2 );
+ return factorial(n / 2);
}
else
{
- return vcl_sqrt( M_PI ) * doubleFactorial( n ) / vcl_pow( 2, ( n + 1 ) / 2.0 );
+ return vcl_sqrt(M_PI) * doubleFactorial(n) / vcl_pow(2, (n + 1) / 2.0);
}
}
/** Convenience internal method */
template <class TLabelObject, class TLabelImage>
-double ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
-::hyperSphereVolume( double radius )
+double ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
+::hyperSphereVolume(double radius)
{
- return vcl_pow( M_PI, LabelObjectType::ImageDimension / 2.0 ) * vcl_pow( radius, LabelObjectType::ImageDimension ) / gammaN2p1( LabelObjectType::ImageDimension );
+ return vcl_pow(M_PI, LabelObjectType::ImageDimension /
+ 2.0) * vcl_pow(radius, LabelObjectType::ImageDimension) / gammaN2p1(LabelObjectType::ImageDimension);
}
-
+
/** Convenience internal method */
template <class TLabelObject, class TLabelImage>
-double ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
-::hyperSpherePerimeter( double radius )
+double ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
+::hyperSpherePerimeter(double radius)
{
- return LabelObjectType::ImageDimension * hyperSphereVolume( radius ) / radius;
+ return LabelObjectType::ImageDimension * hyperSphereVolume(radius) / radius;
}
-
+
/** Convenience internal method */
template <class TLabelObject, class TLabelImage>
-double ShapeAttributesLabelObjectFunctor<TLabelObject,TLabelImage>
-::hyperSphereRadiusFromVolume( double volume )
+double ShapeAttributesLabelObjectFunctor<TLabelObject, TLabelImage>
+::hyperSphereRadiusFromVolume(double volume)
{
- return vcl_pow( volume * gammaN2p1( LabelObjectType::ImageDimension ) / vcl_pow( M_PI, LabelObjectType::ImageDimension / 2.0 ), 1.0 / LabelObjectType::ImageDimension );
+ return vcl_pow(volume * gammaN2p1(LabelObjectType::ImageDimension) /
+ vcl_pow(M_PI, LabelObjectType::ImageDimension / 2.0), 1.0 / LabelObjectType::ImageDimension);
}
-
} // End namespace Functor
-
template<class TImage, class TLabelImage>
void
ShapeAttributesLabelMapFilter<TImage, TLabelImage>
::SetComputeFeretDiameter(bool flag)
{
- if(this->GetFunctor().GetComputeFeretDiameter() != flag)
+ if (this->GetFunctor().GetComputeFeretDiameter() != flag)
{
this->GetFunctor().SetComputeFeretDiameter(flag);
this->Modified();
@@ -733,7 +731,7 @@ void
ShapeAttributesLabelMapFilter<TImage, TLabelImage>
::SetComputePerimeter(bool flag)
{
- if(this->GetFunctor().GetComputePerimeter() != flag)
+ if (this->GetFunctor().GetComputePerimeter() != flag)
{
this->GetFunctor().SetComputePerimeter(flag);
this->Modified();
@@ -753,7 +751,7 @@ void
ShapeAttributesLabelMapFilter<TImage, TLabelImage>
::SetReducedAttributeSet(bool flag)
{
- if(this->GetFunctor().GetReducedAttributeSet() != flag)
+ if (this->GetFunctor().GetReducedAttributeSet() != flag)
{
this->GetFunctor().SetReducedAttributeSet(flag);
this->Modified();
@@ -773,7 +771,7 @@ void
ShapeAttributesLabelMapFilter<TImage, TLabelImage>
::SetLabelImage(const TLabelImage * img)
{
- if(this->GetFunctor().GetLabelImage() != img)
+ if (this->GetFunctor().GetLabelImage() != img)
{
this->GetFunctor().SetLabelImage(img);
this->Modified();
@@ -788,48 +786,46 @@ ShapeAttributesLabelMapFilter<TImage, TLabelImage>
return this->GetFunctor().GetLabelImage();
}
-
template<class TImage, class TLabelImage>
void
ShapeAttributesLabelMapFilter<TImage, TLabelImage>
::BeforeThreadedGenerateData()
{
Superclass::BeforeThreadedGenerateData();
-
- if( !this->GetFunctor().GetLabelImage() )
+
+ if (!this->GetFunctor().GetLabelImage())
{
// generate an image of the labelized image
- typedef itk::LabelMapToLabelImageFilter< TImage, TLabelImage > LCI2IType;
+ typedef itk::LabelMapToLabelImageFilter<TImage, TLabelImage> LCI2IType;
typename LCI2IType::Pointer lci2i = LCI2IType::New();
- lci2i->SetInput( this->GetInput() );
+ lci2i->SetInput(this->GetInput());
// respect the number of threads of the filter
- lci2i->SetNumberOfThreads( this->GetNumberOfThreads() );
+ lci2i->SetNumberOfThreads(this->GetNumberOfThreads());
lci2i->Update();
this->GetFunctor().SetLabelImage(lci2i->GetOutput());
}
// delegate the computation of the perimeter to a dedicated calculator
- if( this->GetFunctor().GetComputePerimeter() )
+ if (this->GetFunctor().GetComputePerimeter())
{
typename PerimeterCalculatorType::Pointer pc = PerimeterCalculatorType::New();
- pc->SetImage( this->GetFunctor().GetLabelImage() );
+ pc->SetImage(this->GetFunctor().GetLabelImage());
pc->Compute();
this->GetFunctor().SetPerimeterCalculator(pc);
}
}
-
template<class TImage, class TLabelImage>
void
ShapeAttributesLabelMapFilter<TImage, TLabelImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
-
+ Superclass::PrintSelf(os, indent);
+
os << indent << "ComputeFeretDiameter: " << this->GetFunctor().GetComputeFeretDiameter() << std::endl;
os << indent << "ComputePerimeter: " << this->GetFunctor().GetComputePerimeter() << std::endl;
}
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/Common/otbShiftScaleImageAdaptor.h b/Code/Common/otbShiftScaleImageAdaptor.h
index de2634d2fc..f4fe97a4b4 100644
--- a/Code/Common/otbShiftScaleImageAdaptor.h
+++ b/Code/Common/otbShiftScaleImageAdaptor.h
@@ -22,7 +22,6 @@
#include <itkImageAdaptor.h>
#include "vnl/vnl_math.h"
-
namespace otb
{
@@ -42,7 +41,7 @@ namespace Accessor
*
* \ingroup ImageAdaptors
*/
-template <class TPixelType, class TExternalType >
+template <class TPixelType, class TExternalType>
class ITK_EXPORT ShiftScalePixelAccessor
{
public:
@@ -72,15 +71,14 @@ public:
m_Scale = value;
}
-
- inline void Set(InternalType & output, const ExternalType & input)
+ inline void Set(InternalType& output, const ExternalType& input)
{
- output = static_cast<InternalType>(m_Scale*(static_cast<InternalType>(input)+m_Shift));
+ output = static_cast<InternalType>(m_Scale * (static_cast<InternalType>(input) + m_Shift));
}
- inline const ExternalType Get(const InternalType & input) const
+ inline const ExternalType Get(const InternalType& input) const
{
- return static_cast<ExternalType>(m_Scale*(static_cast<InternalType>(input)+m_Shift));
+ return static_cast<ExternalType>(m_Scale * (static_cast<InternalType>(input) + m_Shift));
}
private:
@@ -101,63 +99,62 @@ private:
*/
template <class TImage, class TOutputPixelType>
class ITK_EXPORT ShiftScaleImageAdaptor : public
- itk::ImageAdaptor<TImage, Accessor::ShiftScalePixelAccessor<
- typename TImage::PixelType,
- TOutputPixelType > >
+ itk::ImageAdaptor<TImage, Accessor::ShiftScalePixelAccessor<
+ typename TImage::PixelType,
+ TOutputPixelType> >
{
public:
/** Standard class typedefs. */
- typedef ShiftScaleImageAdaptor Self;
+ typedef ShiftScaleImageAdaptor Self;
typedef itk::ImageAdaptor<
- TImage,
- Accessor::ShiftScalePixelAccessor< typename TImage::PixelType, TOutputPixelType >
- > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename TImage::PixelType InternalType;
- typedef typename Superclass::IndexType IndexType;
+ TImage,
+ Accessor::ShiftScalePixelAccessor<typename TImage::PixelType, TOutputPixelType>
+ > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef typename TImage::PixelType InternalType;
+ typedef typename Superclass::IndexType IndexType;
typedef typename Accessor::ShiftScalePixelAccessor<
- typename TImage::PixelType,
- TOutputPixelType > AccessorType;
- typedef typename AccessorType::ExternalType PixelType;
+ typename TImage::PixelType,
+ TOutputPixelType> AccessorType;
+ typedef typename AccessorType::ExternalType PixelType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( ShiftScaleImageAdaptor, ImageAdaptor );
+ itkTypeMacro(ShiftScaleImageAdaptor, ImageAdaptor);
- typename TImage::PixelType GetShift () const
+ typename TImage::PixelType GetShift() const
{
- itkDebugMacro("returning " << " m_Shift of " << this->GetPixelAccessor().GetShift() );
+ itkDebugMacro("returning " << " m_Shift of " << this->GetPixelAccessor().GetShift());
return this->GetPixelAccessor().GetShift();
}
- virtual void SetShift (typename TImage::PixelType value)
+ virtual void SetShift(typename TImage::PixelType value)
{
itkDebugMacro("setting m_Shift to " << value);
if (this->GetPixelAccessor().GetShift() != value)
- {
+ {
this->GetPixelAccessor().SetShift(value);
this->Modified();
- }
+ }
}
- typename TImage::PixelType GetScale () const
+ typename TImage::PixelType GetScale() const
{
- itkDebugMacro("returning " << " m_Scale of " << this->GetPixelAccessor().GetScale() );
+ itkDebugMacro("returning " << " m_Scale of " << this->GetPixelAccessor().GetScale());
return this->GetPixelAccessor().GetScale();
}
-
- virtual void SetScale (typename TImage::PixelType value)
+ virtual void SetScale(typename TImage::PixelType value)
{
itkDebugMacro("setting m_Scale to " << value);
if (this->GetPixelAccessor().GetScale() != value)
- {
+ {
this->GetPixelAccessor().SetScale(value);
this->Modified();
- }
+ }
}
protected:
@@ -165,8 +162,8 @@ protected:
virtual ~ShiftScaleImageAdaptor() {}
private:
- ShiftScaleImageAdaptor(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ShiftScaleImageAdaptor(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Common/otbSpatialObjectSource.h b/Code/Common/otbSpatialObjectSource.h
index 468b818c6e..761d9d06ce 100644
--- a/Code/Common/otbSpatialObjectSource.h
+++ b/Code/Common/otbSpatialObjectSource.h
@@ -30,23 +30,23 @@ namespace otb
*/
template <class TSpatialObject>
class ITK_EXPORT SpatialObjectSource
- : public itk::ProcessObject
+ : public itk::ProcessObject
{
public:
/** Standard typedefs */
- typedef SpatialObjectSource Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef SpatialObjectSource Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation througth the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(SpatialObjectSource,itk::ProcessObject);
+ itkTypeMacro(SpatialObjectSource, itk::ProcessObject);
/** Template parameters typedefs */
- typedef TSpatialObject SpatialObjectType;
+ typedef TSpatialObject SpatialObjectType;
typedef typename SpatialObjectType::Pointer SpatialObjectPointerType;
/** Data object pointer */
@@ -58,7 +58,6 @@ public:
*/
virtual SpatialObjectType * GetOutput(void);
-
protected:
/** Constructor */
SpatialObjectSource();
@@ -68,8 +67,8 @@ protected:
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- SpatialObjectSource(const Self&);//purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SpatialObjectSource(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
diff --git a/Code/Common/otbSpatialObjectSource.txx b/Code/Common/otbSpatialObjectSource.txx
index 4a4016f6af..e35e738bd2 100644
--- a/Code/Common/otbSpatialObjectSource.txx
+++ b/Code/Common/otbSpatialObjectSource.txx
@@ -30,7 +30,7 @@ SpatialObjectSource<TSpatialObject>
::SpatialObjectSource()
{
this->Superclass::SetNumberOfRequiredOutputs(1);
- this->Superclass::SetNthOutput(0,TSpatialObject::New().GetPointer());
+ this->Superclass::SetNthOutput(0, TSpatialObject::New().GetPointer());
}
/**
* Get the output image list
@@ -41,10 +41,10 @@ typename SpatialObjectSource<TSpatialObject>::SpatialObjectType *
SpatialObjectSource<TSpatialObject>
::GetOutput(void)
{
- if (this->GetNumberOfOutputs()<1)
- {
+ if (this->GetNumberOfOutputs() < 1)
+ {
return 0;
- }
+ }
return static_cast<SpatialObjectType *> (this->ProcessObject::GetOutput(0));
}
/**
@@ -55,7 +55,7 @@ void
SpatialObjectSource<TSpatialObject>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/Common/otbStandardFilterWatcher.cxx b/Code/Common/otbStandardFilterWatcher.cxx
index fc9d657d96..e2c337a7e8 100644
--- a/Code/Common/otbStandardFilterWatcher.cxx
+++ b/Code/Common/otbStandardFilterWatcher.cxx
@@ -26,13 +26,13 @@ namespace otb
StandardFilterWatcher
::StandardFilterWatcher(itk::ProcessObject* process,
const char *comment)
- : FilterWatcherBase(process, comment)
+ : FilterWatcherBase(process, comment)
{
m_StarsCount = 50;
}
StandardFilterWatcher
-::StandardFilterWatcher( const StandardFilterWatcher& watch)
+::StandardFilterWatcher(const StandardFilterWatcher& watch)
{
// Initialize state
m_StarsCount = watch.m_StarsCount;
@@ -40,7 +40,7 @@ StandardFilterWatcher
void
StandardFilterWatcher
-::operator=(const StandardFilterWatcher &watch)
+::operator =(const StandardFilterWatcher& watch)
{
// Initialize state
m_StarsCount = watch.m_StarsCount;
@@ -51,30 +51,30 @@ StandardFilterWatcher
::ShowProgress()
{
if (m_Process)
- {
- int progressPercent = static_cast<int>(m_Process->GetProgress()*100);
- int nbStars = static_cast<int>(m_Process->GetProgress()*m_StarsCount);
- int nbBlanks = m_StarsCount - nbStars;
-
- if(nbBlanks < 0)
- {
- nbBlanks = 0;
- }
-
- if(nbStars > m_StarsCount)
- {
- nbStars = m_StarsCount;
- }
-
- if(progressPercent > 100)
- {
- progressPercent = 100;
- }
-
- std::string stars(nbStars,'*');
- std::string blanks(nbBlanks,' ');
- std::cout << "\rProcessing progress: " << progressPercent << "% [" << stars << blanks<< "]" << std::flush;
- }
+ {
+ int progressPercent = static_cast<int>(m_Process->GetProgress() * 100);
+ int nbStars = static_cast<int>(m_Process->GetProgress() * m_StarsCount);
+ int nbBlanks = m_StarsCount - nbStars;
+
+ if (nbBlanks < 0)
+ {
+ nbBlanks = 0;
+ }
+
+ if (nbStars > m_StarsCount)
+ {
+ nbStars = m_StarsCount;
+ }
+
+ if (progressPercent > 100)
+ {
+ progressPercent = 100;
+ }
+
+ std::string stars(nbStars, '*');
+ std::string blanks(nbBlanks, ' ');
+ std::cout << "\rProcessing progress: " << progressPercent << "% [" << stars << blanks << "]" << std::flush;
+ }
}
void
@@ -90,9 +90,9 @@ void
StandardFilterWatcher
::EndFilter()
{
- m_TimeProbe.Stop();
- std::cout << std::endl << "Filter took "
- << m_TimeProbe.GetMeanTime()
- << " seconds." << std::endl;
+ m_TimeProbe.Stop();
+ std::cout << std::endl << "Filter took "
+ << m_TimeProbe.GetMeanTime()
+ << " seconds." << std::endl;
}
} // end namespace otb
diff --git a/Code/Common/otbStandardFilterWatcher.h b/Code/Common/otbStandardFilterWatcher.h
index d0ff7a91cb..53baf7902c 100644
--- a/Code/Common/otbStandardFilterWatcher.h
+++ b/Code/Common/otbStandardFilterWatcher.h
@@ -53,16 +53,16 @@ public:
/** Constructor. Takes a ProcessObject to monitor and an optional
* comment string that is prepended to each event message. */
StandardFilterWatcher(itk::ProcessObject* process,
- const char *comment="");
+ const char *comment = "");
/** Copy constructor */
StandardFilterWatcher(const StandardFilterWatcher&);
/** operator= */
- void operator=(const StandardFilterWatcher& );
+ void operator =(const StandardFilterWatcher&);
/** Get/Set number of stars */
- void SetStars( int count )
+ void SetStars(int count)
{
m_StarsCount = count;
}
diff --git a/Code/Common/otbStandardWriterWatcher.cxx b/Code/Common/otbStandardWriterWatcher.cxx
index b734a75f23..65714072bd 100644
--- a/Code/Common/otbStandardWriterWatcher.cxx
+++ b/Code/Common/otbStandardWriterWatcher.cxx
@@ -26,21 +26,21 @@ namespace otb
StandardWriterWatcher
::StandardWriterWatcher(itk::ProcessObject* process,
const char *comment)
- : WriterWatcherBase(process, comment)
+ : WriterWatcherBase(process, comment)
{
m_StarsCount = 50;
}
StandardWriterWatcher
-::StandardWriterWatcher(itk::ProcessObject* process,itk::ProcessObject * source,
+::StandardWriterWatcher(itk::ProcessObject* process, itk::ProcessObject * source,
const char *comment)
- : WriterWatcherBase(process,source,comment)
+ : WriterWatcherBase(process, source, comment)
{
m_StarsCount = 50;
}
StandardWriterWatcher
-::StandardWriterWatcher( const StandardWriterWatcher& watch)
+::StandardWriterWatcher(const StandardWriterWatcher& watch)
{
// Initialize state
m_StarsCount = watch.m_StarsCount;
@@ -48,7 +48,7 @@ StandardWriterWatcher
void
StandardWriterWatcher
-::operator=(const StandardWriterWatcher &watch)
+::operator =(const StandardWriterWatcher& watch)
{
// Initialize state
m_StarsCount = watch.m_StarsCount;
@@ -74,55 +74,55 @@ StandardWriterWatcher
{
itk::OStringStream oss;
oss.str("");
- oss<<"\r";
+ oss << "\r";
if (m_SourceProcess)
- {
- double progress = m_SourceProcess->GetProgress();
- int progressPercent = static_cast<int>(progress*100);
- std::string stars(static_cast<int>(progress*m_StarsCount),'*');
- std::string blanks(m_StarsCount - stars.length(),' ');
- oss << "Current Tile: ";
- if (progressPercent<10)
- {
- oss<<" ";
- }
- if (progressPercent<100)
{
- oss<<" ";
+ double progress = m_SourceProcess->GetProgress();
+ int progressPercent = static_cast<int>(progress * 100);
+ std::string stars(static_cast<int>(progress * m_StarsCount), '*');
+ std::string blanks(m_StarsCount - stars.length(), ' ');
+ oss << "Current Tile: ";
+ if (progressPercent < 10)
+ {
+ oss << " ";
+ }
+ if (progressPercent < 100)
+ {
+ oss << " ";
+ }
+ oss << progressPercent << "% [" << stars << blanks << "] ";
}
- oss<<progressPercent << "% [" << stars << blanks << "] ";
- }
if (m_Process)
- {
- double progress = m_Process->GetProgress();
- int progressPercent = static_cast<int>(progress*100);
- std::string stars(static_cast<int>(progress*m_StarsCount),'*');
- std::string blanks(m_StarsCount - stars.length(),' ');
- oss << "Writing: ";
- if (progressPercent<10)
{
- oss<<" ";
- }
- if (progressPercent<100)
- {
- oss<<" ";
+ double progress = m_Process->GetProgress();
+ int progressPercent = static_cast<int>(progress * 100);
+ std::string stars(static_cast<int>(progress * m_StarsCount), '*');
+ std::string blanks(m_StarsCount - stars.length(), ' ');
+ oss << "Writing: ";
+ if (progressPercent < 10)
+ {
+ oss << " ";
+ }
+ if (progressPercent < 100)
+ {
+ oss << " ";
+ }
+ oss << progressPercent << "% [" << stars << blanks << "]" << std::flush;
}
- oss<< progressPercent << "% [" << stars << blanks << "]" << std::flush;
- }
- std::cout<<oss.str();
+ std::cout << oss.str();
}
-
void
StandardWriterWatcher
::StartWriter()
{
m_TimeProbe.Start();
- std::cout<<"Writing task: "<< " \"" << m_Comment << "\" " << std::endl;
- std::cout << "Writer type: "<<(m_Process.GetPointer() ? m_Process->GetNameOfClass() : "None")<< std::endl;
- std::cout << "Filter type: "<<(m_SourceProcess.GetPointer() ? m_SourceProcess->GetNameOfClass() : "None")<< std::endl;
+ std::cout << "Writing task: " << " \"" << m_Comment << "\" " << std::endl;
+ std::cout << "Writer type: " << (m_Process.GetPointer() ? m_Process->GetNameOfClass() : "None") << std::endl;
+ std::cout << "Filter type: " << (m_SourceProcess.GetPointer() ? m_SourceProcess->GetNameOfClass() : "None") <<
+ std::endl;
}
void
diff --git a/Code/Common/otbStandardWriterWatcher.h b/Code/Common/otbStandardWriterWatcher.h
index 6232cdc8fc..9ba8c8c19e 100644
--- a/Code/Common/otbStandardWriterWatcher.h
+++ b/Code/Common/otbStandardWriterWatcher.h
@@ -53,18 +53,18 @@ public:
/** Constructor. Takes a ProcessObject to monitor and an optional
* comment string that is prepended to each event message. */
StandardWriterWatcher(itk::ProcessObject* process,
- const char *comment="");
- StandardWriterWatcher(itk::ProcessObject* process,itk::ProcessObject * source,
- const char *comment="");
+ const char *comment = "");
+ StandardWriterWatcher(itk::ProcessObject* process, itk::ProcessObject * source,
+ const char *comment = "");
/** Copy constructor */
StandardWriterWatcher(const StandardWriterWatcher&);
/** operator= */
- void operator=(const StandardWriterWatcher& );
+ void operator =(const StandardWriterWatcher&);
/** Get/Set number of stars */
- void SetStars( int count )
+ void SetStars(int count)
{
m_StarsCount = count;
}
@@ -88,10 +88,10 @@ protected:
virtual void ShowFilterProgress();
/** Callback method to show the StartEvent */
- virtual void StartFilter() {};
+ virtual void StartFilter() {}
/** Callback method to show the EndEvent */
- virtual void EndFilter() {};
+ virtual void EndFilter() {}
/** This is the method invoked by ShowFilterProgress() and ShowWriterProgress() */
virtual void ShowProgress();
diff --git a/Code/Common/otbStatisticsAttributesLabelMapFilter.h b/Code/Common/otbStatisticsAttributesLabelMapFilter.h
index 0a870895ee..f8ebb6e9b7 100644
--- a/Code/Common/otbStatisticsAttributesLabelMapFilter.h
+++ b/Code/Common/otbStatisticsAttributesLabelMapFilter.h
@@ -25,13 +25,13 @@
#include "itkMatrix.h"
#include "itkVector.h"
-namespace otb
+namespace otb
{
namespace Functor
{
/** \class StatisticsAttributesLabelObjectFunctor
* \brief Functor to compute statistics attributes of one LabelObject.
-*
+*
* \sa StatisticsAttributesLabelMapFilter
*/
template <class TLabelObject, class TFeatureImage>
@@ -39,21 +39,21 @@ class StatisticsAttributesLabelObjectFunctor
{
public:
// Self typedef
- typedef StatisticsAttributesLabelObjectFunctor Self;
+ typedef StatisticsAttributesLabelObjectFunctor Self;
// Matrix typedef
typedef typename itk::Matrix<double,
TFeatureImage::ImageDimension,
- TFeatureImage::ImageDimension> MatrixType;
+ TFeatureImage::ImageDimension> MatrixType;
// Vector typedef
typedef typename itk::Vector<double,
- TFeatureImage::ImageDimension> VectorType;
+ TFeatureImage::ImageDimension> VectorType;
/// Typedef of the feature image type
- typedef typename TFeatureImage::PixelType FeatureType;
+ typedef typename TFeatureImage::PixelType FeatureType;
/// Typedef of the label object
- typedef TLabelObject LabelObjectType;
+ typedef TLabelObject LabelObjectType;
/** Constructor */
StatisticsAttributesLabelObjectFunctor();
@@ -62,19 +62,19 @@ public:
virtual ~StatisticsAttributesLabelObjectFunctor();
/** The comparators */
- bool operator!=(const Self& self);
- bool operator==(const Self& self);
+ bool operator !=(const Self& self);
+ bool operator ==(const Self& self);
/** This is the functor implementation
- * Calling the functor on a label object
+ * Calling the functor on a label object
* will update its statistics attributes */
- inline void operator()(LabelObjectType * lo) const;
+ inline void operator ()(LabelObjectType * lo) const;
/** Set the name of the feature */
- void SetFeatureName(const std::string & name);
+ void SetFeatureName(const std::string& name);
/** Get the feature name */
- const std::string & GetFeatureName() const;
+ const std::string& GetFeatureName() const;
/** Set the feature image */
void SetFeatureImage(const TFeatureImage * img);
@@ -88,7 +88,7 @@ public:
/** Get the reduced attribute set */
bool GetReducedAttributeSet() const;
-private:
+private:
// The name of the feature
std::string m_FeatureName;
@@ -100,7 +100,6 @@ private:
};
} // End namespace Functor
-
/** \class StatisticsAttributesLabelMapFilter
* \brief This class is a fork of itk::StasticsLabelMapFilter to support AttributesMapLabelObject.
*
@@ -121,37 +120,37 @@ private:
template<class TImage, class TFeatureImage>
class ITK_EXPORT StatisticsAttributesLabelMapFilter :
public LabelMapFeaturesFunctorImageFilter
- < TImage,
- typename Functor::StatisticsAttributesLabelObjectFunctor
- < typename TImage::LabelObjectType, TFeatureImage > >
+ <TImage,
+ typename Functor::StatisticsAttributesLabelObjectFunctor
+ <typename TImage::LabelObjectType, TFeatureImage> >
{
public:
/** Some convenient typedefs. */
- typedef TImage ImageType;
- typedef typename ImageType::LabelObjectType LabelObjectType;
- typedef TFeatureImage FeatureImageType;
-
+ typedef TImage ImageType;
+ typedef typename ImageType::LabelObjectType LabelObjectType;
+ typedef TFeatureImage FeatureImageType;
+
/** Functor typedef */
typedef Functor::StatisticsAttributesLabelObjectFunctor
- <LabelObjectType,FeatureImageType> FunctorType;
+ <LabelObjectType, FeatureImageType> FunctorType;
/** Standard class typedefs. */
- typedef StatisticsAttributesLabelMapFilter Self;
+ typedef StatisticsAttributesLabelMapFilter Self;
typedef LabelMapFeaturesFunctorImageFilter
- <ImageType,FunctorType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ <ImageType, FunctorType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** ImageDimension constants */
- itkStaticConstMacro(ImageDimension, unsigned int,TImage::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, TImage::ImageDimension);
/** Standard New method. */
itkNewMacro(Self);
/** Runtime information support. */
- itkTypeMacro(StatisticsAttributesLabelMapFilter,LabelMapFeaturesFunctorImageFilter);
+ itkTypeMacro(StatisticsAttributesLabelMapFilter, LabelMapFeaturesFunctorImageFilter);
- /** Set the feature image */
+ /** Set the feature image */
void SetFeatureImage(const TFeatureImage *input);
/** Get the feature image */
@@ -170,17 +169,17 @@ public:
const TFeatureImage * GetInput2() const;
/** Set the name of the feature */
- void SetFeatureName(const std::string & name);
+ void SetFeatureName(const std::string& name);
/** Get the feature name */
- const std::string & GetFeatureName() const;
+ const std::string& GetFeatureName() const;
/** Set the reduced attribute set */
void SetReducedAttributeSet(bool flag);
/** Get the reduced attribute set */
bool GetReducedAttributeSet() const;
-
+
itkBooleanMacro(ReducedAttributeSet);
protected:
@@ -197,16 +196,14 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- StatisticsAttributesLabelMapFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ StatisticsAttributesLabelMapFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
}; // end of class
} // end namespace otb
-
+
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbStatisticsAttributesLabelMapFilter.txx"
#endif
#endif
-
-
diff --git a/Code/Common/otbStatisticsAttributesLabelMapFilter.txx b/Code/Common/otbStatisticsAttributesLabelMapFilter.txx
index a27e32e820..b3169c545a 100644
--- a/Code/Common/otbStatisticsAttributesLabelMapFilter.txx
+++ b/Code/Common/otbStatisticsAttributesLabelMapFilter.txx
@@ -32,93 +32,93 @@ namespace Functor
{
/** Constructor */
template <class TLabelObject, class TFeatureImage>
-StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
+StatisticsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
::StatisticsAttributesLabelObjectFunctor() : m_FeatureName("Default"),
- m_FeatureImage(),
- m_ReducedAttributeSet(true)
+ m_FeatureImage(),
+ m_ReducedAttributeSet(true)
{}
/** Destructor */
template <class TLabelObject, class TFeatureImage>
-StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
-:: ~StatisticsAttributesLabelObjectFunctor()
+StatisticsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
+::~StatisticsAttributesLabelObjectFunctor()
{}
/** The comparators */
template <class TLabelObject, class TFeatureImage>
-bool
-StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
-::operator!=(const Self& self)
-{
+bool
+StatisticsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
+::operator != (const Self &self)
+ {
// Initialize response
bool resp = true;
-
+
resp = resp && (m_FeatureName != self.m_FeatureName);
resp = resp && (m_FeatureImage != self.m_FeatureImage);
// Return
return resp;
-}
+ }
template <class TLabelObject, class TFeatureImage>
-bool
-StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
-::operator==(const Self& self)
-{
+bool
+StatisticsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
+::operator == (const Self &self)
+ {
// Call the != implementation
return !(this != self);
-}
+ }
/** This is the functor implementation
- * Calling the functor on a label object
+ * Calling the functor on a label object
* will update its statistics attributes */
template <class TLabelObject, class TFeatureImage>
void
-StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
-::operator()(LabelObjectType * lo) const
+StatisticsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
+::operator() (LabelObjectType * lo) const
{
typename LabelObjectType::LineContainerType::const_iterator lit;
- typename LabelObjectType::LineContainerType & lineContainer = lo->GetLineContainer();
-
- FeatureType min = itk::NumericTraits< FeatureType >::max();
- FeatureType max = itk::NumericTraits< FeatureType >::NonpositiveMin();
- double sum = 0;
- double sum2 = 0;
- double sum3 = 0;
- double sum4 = 0;
- unsigned int totalFreq = 0;
+ typename LabelObjectType::LineContainerType& lineContainer = lo->GetLineContainer();
+
+ FeatureType min = itk::NumericTraits<FeatureType>::max();
+ FeatureType max = itk::NumericTraits<FeatureType>::NonpositiveMin();
+ double sum = 0;
+ double sum2 = 0;
+ double sum3 = 0;
+ double sum4 = 0;
+ unsigned int totalFreq = 0;
typename TFeatureImage::IndexType minIdx;
- minIdx.Fill( 0 );
+ minIdx.Fill(0);
typename TFeatureImage::IndexType maxIdx;
- maxIdx.Fill( 0 );
+ maxIdx.Fill(0);
typename TFeatureImage::PointType centerOfGravity;
- centerOfGravity.Fill( 0 );
+ centerOfGravity.Fill(0);
MatrixType centralMoments;
- centralMoments.Fill( 0 );
+ centralMoments.Fill(0);
MatrixType principalAxes;
- principalAxes.Fill( 0 );
+ principalAxes.Fill(0);
VectorType principalMoments;
- principalMoments.Fill( 0 );
+ principalMoments.Fill(0);
// iterate over all the lines
- for( lit = lineContainer.begin(); lit != lineContainer.end(); lit++ )
+ for (lit = lineContainer.begin(); lit != lineContainer.end(); lit++)
{
- const typename TFeatureImage::IndexType & firstIdx = lit->GetIndex();
- unsigned long length = lit->GetLength();
+ const typename TFeatureImage::IndexType& firstIdx = lit->GetIndex();
+ unsigned long length = lit->GetLength();
long endIdx0 = firstIdx[0] + length;
- for( typename TFeatureImage::IndexType idx = firstIdx; idx[0]<endIdx0; idx[0]++)
+ for (typename TFeatureImage::IndexType idx = firstIdx; idx[0] < endIdx0; idx[0]++)
{
- const FeatureType & v = m_FeatureImage->GetPixel( idx );
+ const FeatureType& v = m_FeatureImage->GetPixel(idx);
++totalFreq;
// update min and max
- if( v <= min )
+ if (v <= min)
{
min = v;
minIdx = idx;
}
- if( v >= max )
+ if (v >= max)
{
max = v;
maxIdx = idx;
@@ -126,18 +126,18 @@ StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
//increase the sums
sum += v;
- sum2 += vcl_pow( (double)v, 2 );
- sum3 += vcl_pow( (double)v, 3 );
- sum4 += vcl_pow( (double)v, 4 );
+ sum2 += vcl_pow((double) v, 2);
+ sum3 += vcl_pow((double) v, 3);
+ sum4 += vcl_pow((double) v, 4);
// moments
typename TFeatureImage::PointType physicalPosition;
m_FeatureImage->TransformIndexToPhysicalPoint(idx, physicalPosition);
- for(unsigned int i=0; i<TFeatureImage::ImageDimension; i++)
+ for (unsigned int i = 0; i < TFeatureImage::ImageDimension; i++)
{
centerOfGravity[i] += physicalPosition[i] * v;
centralMoments[i][i] += v * physicalPosition[i] * physicalPosition[i];
- for(unsigned int j=i+1; j<TFeatureImage::ImageDimension; j++)
+ for (unsigned int j = i + 1; j < TFeatureImage::ImageDimension; j++)
{
double weight = v * physicalPosition[i] * physicalPosition[j];
centralMoments[i][j] += weight;
@@ -150,82 +150,84 @@ StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
// final computations
double mean = sum / totalFreq;
- double variance = ( sum2 - ( vcl_pow( sum, 2 ) / totalFreq ) ) / ( totalFreq - 1 );
- double sigma = vcl_sqrt( variance );
+ double variance = (sum2 - (vcl_pow(sum, 2) / totalFreq)) / (totalFreq - 1);
+ double sigma = vcl_sqrt(variance);
double mean2 = mean * mean;
double skewness = 0;
double kurtosis = 0;
const double epsilon = 1E-10;
- if ( vcl_abs(variance) > epsilon )
- {
- skewness = ( ( sum3 - 3.0 * mean * sum2) / totalFreq + 2.0 * mean * mean2 ) / ( variance * sigma );
- kurtosis = ( ( sum4 - 4.0 * mean * sum3 + 6.0 * mean2 * sum2) / totalFreq - 3.0 * mean2 * mean2 ) / ( variance * variance ) - 3.0;
+ if (vcl_abs(variance) > epsilon)
+ {
+ skewness = ((sum3 - 3.0 * mean * sum2) / totalFreq + 2.0 * mean * mean2) / (variance * sigma);
+ kurtosis =
+ ((sum4 - 4.0 * mean * sum3 + 6.0 * mean2 *
+ sum2) / totalFreq - 3.0 * mean2 * mean2) / (variance * variance) - 3.0;
}
double elongation = 0;
- if( sum != 0 )
+ if (sum != 0)
{
// Normalize using the total mass
- for(unsigned int i=0; i<TFeatureImage::ImageDimension; i++)
+ for (unsigned int i = 0; i < TFeatureImage::ImageDimension; i++)
{
centerOfGravity[i] /= sum;
- for(unsigned int j=0; j<TFeatureImage::ImageDimension; j++)
+ for (unsigned int j = 0; j < TFeatureImage::ImageDimension; j++)
{
centralMoments[i][j] /= sum;
}
}
-
+
// Center the second order moments
- for(unsigned int i=0; i<TFeatureImage::ImageDimension; i++)
+ for (unsigned int i = 0; i < TFeatureImage::ImageDimension; i++)
{
- for(unsigned int j=0; j<TFeatureImage::ImageDimension; j++)
+ for (unsigned int j = 0; j < TFeatureImage::ImageDimension; j++)
{
centralMoments[i][j] -= centerOfGravity[i] * centerOfGravity[j];
}
}
-
+
// Compute principal moments and axes
- vnl_symmetric_eigensystem<double> eigen( centralMoments.GetVnlMatrix() );
+ vnl_symmetric_eigensystem<double> eigen(centralMoments.GetVnlMatrix());
vnl_diag_matrix<double> pm = eigen.D;
- for(unsigned int i=0; i<TFeatureImage::ImageDimension; i++)
+ for (unsigned int i = 0; i < TFeatureImage::ImageDimension; i++)
{
- // principalMoments[i] = 4 * vcl_sqrt( pm(i,i) );
- principalMoments[i] = pm(i,i);
+ // principalMoments[i] = 4 * vcl_sqrt( pm(i,i) );
+ principalMoments[i] = pm(i, i);
}
principalAxes = eigen.V.transpose();
-
+
// Add a final reflection if needed for a proper rotation,
// by multiplying the last row by the determinant
- vnl_real_eigensystem eigenrot( principalAxes.GetVnlMatrix() );
- vnl_diag_matrix< vcl_complex<double> > eigenval = eigenrot.D;
- vcl_complex<double> det( 1.0, 0.0 );
-
- for(unsigned int i=0; i<TFeatureImage::ImageDimension; i++)
+ vnl_real_eigensystem eigenrot(principalAxes.GetVnlMatrix());
+ vnl_diag_matrix<vcl_complex<double> > eigenval = eigenrot.D;
+ vcl_complex<double> det(1.0, 0.0);
+
+ for (unsigned int i = 0; i < TFeatureImage::ImageDimension; i++)
{
- det *= eigenval( i, i );
+ det *= eigenval(i, i);
}
-
- for(unsigned int i=0; i<TFeatureImage::ImageDimension; i++)
+
+ for (unsigned int i = 0; i < TFeatureImage::ImageDimension; i++)
{
- principalAxes[ TFeatureImage::ImageDimension-1 ][i] *= std::real( det );
+ principalAxes[TFeatureImage::ImageDimension - 1][i] *= std::real(det);
}
-
- if( principalMoments[0] != 0 )
+
+ if (principalMoments[0] != 0)
{
- // elongation = principalMoments[TFeatureImage::ImageDimension-1] / principalMoments[0];
- elongation = vcl_sqrt(principalMoments[TFeatureImage::ImageDimension-1] / principalMoments[0]);
+ // elongation = principalMoments[TFeatureImage::ImageDimension-1] / principalMoments[0];
+ elongation = vcl_sqrt(principalMoments[TFeatureImage::ImageDimension - 1] / principalMoments[0]);
}
}
else
{
// can't compute anything in that case - just set everything to a default value
// Normalize using the total mass
- for(unsigned int i=0; i<TFeatureImage::ImageDimension; i++)
+ for (unsigned int i = 0; i < TFeatureImage::ImageDimension; i++)
{
centerOfGravity[i] = 0;
principalMoments[i] = 0;
- for(unsigned int j=0; j<TFeatureImage::ImageDimension; j++)
+ for (unsigned int j = 0; j < TFeatureImage::ImageDimension; j++)
{
principalAxes[i][j] = 0;
}
@@ -235,99 +237,99 @@ StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
// finally put the values in the label object
oss.str("");
- oss<<"STATS::"<<m_FeatureName<<"::Mean";
- lo->SetAttribute(oss.str().c_str(), mean );
-
+ oss << "STATS::" << m_FeatureName << "::Mean";
+ lo->SetAttribute(oss.str().c_str(), mean);
+
oss.str("");
- oss<<"STATS::"<<m_FeatureName<<"::Variance";
- lo->SetAttribute(oss.str().c_str(), variance );
+ oss << "STATS::" << m_FeatureName << "::Variance";
+ lo->SetAttribute(oss.str().c_str(), variance);
oss.str("");
- oss<<"STATS::"<<m_FeatureName<<"::Skewness";
- lo->SetAttribute(oss.str().c_str(), skewness );
+ oss << "STATS::" << m_FeatureName << "::Skewness";
+ lo->SetAttribute(oss.str().c_str(), skewness);
oss.str("");
- oss<<"STATS::"<<m_FeatureName<<"::Kurtosis";
- lo->SetAttribute(oss.str().c_str(), kurtosis );
+ oss << "STATS::" << m_FeatureName << "::Kurtosis";
+ lo->SetAttribute(oss.str().c_str(), kurtosis);
// If we want all the features
- if(!m_ReducedAttributeSet)
+ if (!m_ReducedAttributeSet)
{
oss.str("");
- oss<<"STATS::"<<m_FeatureName<<"::Minimum";
- lo->SetAttribute(oss.str().c_str(),(double)min );
-
+ oss << "STATS::" << m_FeatureName << "::Minimum";
+ lo->SetAttribute(oss.str().c_str(), (double) min);
+
oss.str("");
- oss<<"STATS::"<<m_FeatureName<<"::Maximum";
- lo->SetAttribute(oss.str().c_str(), (double)max );
-
+ oss << "STATS::" << m_FeatureName << "::Maximum";
+ lo->SetAttribute(oss.str().c_str(), (double) max);
+
oss.str("");
- oss<<"STATS::"<<m_FeatureName<<"::Sum";
- lo->SetAttribute(oss.str().c_str(), sum );
-
+ oss << "STATS::" << m_FeatureName << "::Sum";
+ lo->SetAttribute(oss.str().c_str(), sum);
+
oss.str("");
- oss<<"STATS::"<<m_FeatureName<<"::Sigma";
- lo->SetAttribute(oss.str().c_str(), sigma );
-
- for(unsigned int dim = 0;dim < TFeatureImage::ImageDimension;++dim)
+ oss << "STATS::" << m_FeatureName << "::Sigma";
+ lo->SetAttribute(oss.str().c_str(), sigma);
+
+ for (unsigned int dim = 0; dim < TFeatureImage::ImageDimension; ++dim)
{
oss.str("");
- oss<<"STATS::"<<m_FeatureName<<"::CenterOfGravity"<<dim;
+ oss << "STATS::" << m_FeatureName << "::CenterOfGravity" << dim;
lo->SetAttribute(oss.str().c_str(), centerOfGravity[dim]);
-
+
oss.str("");
- oss<<"STATS::"<<m_FeatureName<<"::PrincipalMoments"<<dim;
- lo->SetAttribute( oss.str().c_str(),principalMoments[dim]);
-
+ oss << "STATS::" << m_FeatureName << "::PrincipalMoments" << dim;
+ lo->SetAttribute(oss.str().c_str(), principalMoments[dim]);
+
oss.str("");
- oss<<"STATS::"<<m_FeatureName<<"::FirstMinimumIndex"<<dim;
- lo->SetAttribute(oss.str().c_str(), minIdx[dim] );
-
+ oss << "STATS::" << m_FeatureName << "::FirstMinimumIndex" << dim;
+ lo->SetAttribute(oss.str().c_str(), minIdx[dim]);
+
oss.str("");
- oss<<"STATS::"<<m_FeatureName<<"::FirstMaximumIndex"<<dim;
+ oss << "STATS::" << m_FeatureName << "::FirstMaximumIndex" << dim;
lo->SetAttribute(oss.str().c_str(), maxIdx[dim]);
-
- for(unsigned int dim2 = 0;dim2 < TFeatureImage::ImageDimension;++dim2)
- {
- oss.str("");
- oss<<"STATS::"<<m_FeatureName<<"::PrincipalAxis"<<dim<<dim2;
- lo->SetAttribute( oss.str().c_str(),principalAxes(dim,dim2));
- }
+
+ for (unsigned int dim2 = 0; dim2 < TFeatureImage::ImageDimension; ++dim2)
+ {
+ oss.str("");
+ oss << "STATS::" << m_FeatureName << "::PrincipalAxis" << dim << dim2;
+ lo->SetAttribute(oss.str().c_str(), principalAxes(dim, dim2));
+ }
}
}
}
/** Set the name of the feature */
template <class TLabelObject, class TFeatureImage>
-void
-StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
-::SetFeatureName(const std::string & name)
+void
+StatisticsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
+::SetFeatureName(const std::string& name)
{
m_FeatureName = name;
}
/** Get the feature name */
template <class TLabelObject, class TFeatureImage>
-const std::string &
-StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
+const std::string&
+StatisticsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
::GetFeatureName() const
{
return m_FeatureName;
}
- /** Set the feature image */
+/** Set the feature image */
template <class TLabelObject, class TFeatureImage>
-void
-StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
+void
+StatisticsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
::SetFeatureImage(const TFeatureImage * img)
{
m_FeatureImage = img;
}
- /** Get the feature image */
+/** Get the feature image */
template <class TLabelObject, class TFeatureImage>
-const TFeatureImage *
-StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
+const TFeatureImage *
+StatisticsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
::GetFeatureImage() const
{
return m_FeatureImage;
@@ -335,8 +337,8 @@ StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
/** Set the reduced attribute set */
template <class TLabelObject, class TFeatureImage>
-void
-StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
+void
+StatisticsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
::SetReducedAttributeSet(bool flag)
{
m_ReducedAttributeSet = flag;
@@ -345,14 +347,13 @@ StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
/** Get the reduced attribute set */
template <class TLabelObject, class TFeatureImage>
bool
-StatisticsAttributesLabelObjectFunctor<TLabelObject,TFeatureImage>
+StatisticsAttributesLabelObjectFunctor<TLabelObject, TFeatureImage>
::GetReducedAttributeSet() const
{
return m_ReducedAttributeSet;
}
} // End namespace Functor
-
template <class TImage, class TFeatureImage>
StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
::StatisticsAttributesLabelMapFilter()
@@ -365,26 +366,26 @@ StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
/** Set the feature image */
template <class TImage, class TFeatureImage>
-void
+void
StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
::SetFeatureImage(const TFeatureImage *input)
{
// Set the Nth input
- this->SetNthInput(1,const_cast<TFeatureImage*>(input));
+ this->SetNthInput(1, const_cast<TFeatureImage*>(input));
}
/** Get the feature image */
template <class TImage, class TFeatureImage>
const typename StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
-:: FeatureImageType * StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
+::FeatureImageType * StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
::GetFeatureImage() const
{
- return static_cast<const TFeatureImage *>(this->itk::ProcessObject::GetInput(1));
+ return static_cast<const TFeatureImage *>(this->itk::ProcessObject::GetInput(1));
}
/** Set Input1 (for backward compatibility) */
template <class TImage, class TFeatureImage>
-void
+void
StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
::SetInput1(const TImage * input)
{
@@ -393,7 +394,7 @@ StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
/** Get Input1 (for backward compatibility) */
template <class TImage, class TFeatureImage>
-const TImage *
+const TImage *
StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
::GetInput1() const
{
@@ -402,7 +403,7 @@ StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
/** Set Input2 (for backward compatibility) */
template <class TImage, class TFeatureImage>
-void
+void
StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
::SetInput2(const TFeatureImage * input)
{
@@ -411,21 +412,20 @@ StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
/** Get Input2 (for backward compatibility) */
template <class TImage, class TFeatureImage>
-const TFeatureImage *
+const TFeatureImage *
StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
::GetInput2() const
{
return this->GetFeatureImage();
}
-
/** Set the name of the feature */
template <class TImage, class TFeatureImage>
void StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
-::SetFeatureName(const std::string & name)
+::SetFeatureName(const std::string& name)
{
- if(name != this->GetFunctor().GetFeatureName())
+ if (name != this->GetFunctor().GetFeatureName())
{
this->GetFunctor().SetFeatureName(name);
this->Modified();
@@ -435,7 +435,7 @@ void StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
/** Get the feature name */
template <class TImage, class TFeatureImage>
-const std::string & StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
+const std::string& StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
::GetFeatureName() const
{
return this->GetFunctor().GetFeatureName();
@@ -447,7 +447,7 @@ template <class TImage, class TFeatureImage>
void StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
::SetReducedAttributeSet(bool flag)
{
- if(this->GetFunctor().GetReducedAttributeSet() != flag)
+ if (this->GetFunctor().GetReducedAttributeSet() != flag)
{
this->GetFunctor().SetReducedAttributeSet(flag);
this->Modified();
@@ -480,9 +480,8 @@ void
StatisticsAttributesLabelMapFilter<TImage, TFeatureImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
-}// end namespace itk
+} // end namespace itk
#endif
diff --git a/Code/Common/otbStreamingTraits.h b/Code/Common/otbStreamingTraits.h
index 69ffb0fd17..133d6d666f 100644
--- a/Code/Common/otbStreamingTraits.h
+++ b/Code/Common/otbStreamingTraits.h
@@ -42,14 +42,14 @@ namespace otb
* this enum defines the different streaming mode available in OTB.
*/
typedef enum
-{
+ {
SET_NUMBER_OF_STREAM_DIVISIONS = 1,
SET_BUFFER_MEMORY_SIZE = 2,
SET_BUFFER_NUMBER_OF_LINES = 3,
SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS = 4,
SET_TILING_WITH_SET_NUMBER_OF_STREAM_DIVISIONS = 5,
SET_TILING_WITH_SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS = 6
-} StreamingMode;
+ } StreamingMode;
/** \class StreamingTraits
* \brief This class is a helper class for terminal streaming filter implementation.
@@ -61,11 +61,11 @@ class ITK_EXPORT StreamingTraits
{
public:
/** Standard class typedefs. */
- typedef StreamingTraits Self;
+ typedef StreamingTraits Self;
- typedef TImage ImageType;
- typedef typename ImageType::Pointer ImagePointerType;
- typedef typename ImageType::RegionType RegionType;
+ typedef TImage ImageType;
+ typedef typename ImageType::Pointer ImagePointerType;
+ typedef typename ImageType::RegionType RegionType;
typedef typename ImageType::InternalPixelType PixelType;
typedef StreamingMode StreamingModeType;
@@ -74,28 +74,27 @@ public:
itkStaticConstMacro(ImageDimension, unsigned int,
ImageType::ImageDimension);
- typedef itk::ImageRegionSplitter<itkGetStaticConstMacro(ImageDimension)> SplitterType;
+ typedef itk::ImageRegionSplitter<itkGetStaticConstMacro(ImageDimension)> SplitterType;
// ITK Interpolators
- typedef itk::InterpolateImageFunction<TImage,double> InterpolationType;
- typedef itk::BSplineInterpolateImageFunction<TImage,double> BSplineInterpolationType;
- typedef itk::LinearInterpolateImageFunction<TImage,double> LinearInterpolationType;
- typedef itk::NearestNeighborInterpolateImageFunction<TImage,double> NearestNeighborInterpolationType;
+ typedef itk::InterpolateImageFunction<TImage, double> InterpolationType;
+ typedef itk::BSplineInterpolateImageFunction<TImage, double> BSplineInterpolationType;
+ typedef itk::LinearInterpolateImageFunction<TImage, double> LinearInterpolationType;
+ typedef itk::NearestNeighborInterpolateImageFunction<TImage, double> NearestNeighborInterpolationType;
// OTB Interpolators
// Gaussian Interpolators
- typedef WindowedSincInterpolateImageGaussianFunction<ImageType> GaussianInterpolationType;
+ typedef WindowedSincInterpolateImageGaussianFunction<ImageType> GaussianInterpolationType;
// Cosine Interpolators
- typedef WindowedSincInterpolateImageCosineFunction<ImageType> CosineInterpolationType;
+ typedef WindowedSincInterpolateImageCosineFunction<ImageType> CosineInterpolationType;
// Hamming Interpolators
- typedef WindowedSincInterpolateImageHammingFunction<ImageType> HammingInterpolationType;
+ typedef WindowedSincInterpolateImageHammingFunction<ImageType> HammingInterpolationType;
// Welch
- typedef WindowedSincInterpolateImageWelchFunction<ImageType> WelchInterpolationType;
+ typedef WindowedSincInterpolateImageWelchFunction<ImageType> WelchInterpolationType;
// Lanczos
- typedef WindowedSincInterpolateImageLanczosFunction<ImageType> LanczosInterpolationType;
+ typedef WindowedSincInterpolateImageLanczosFunction<ImageType> LanczosInterpolationType;
// Blackman
- typedef WindowedSincInterpolateImageBlackmanFunction<ImageType> BlackmanInterpolationType;
+ typedef WindowedSincInterpolateImageBlackmanFunction<ImageType> BlackmanInterpolationType;
// Prolate
- typedef otb::ProlateInterpolateImageFunction<ImageType> ProlateInterpolationType;
-
+ typedef otb::ProlateInterpolateImageFunction<ImageType> ProlateInterpolationType;
/**
* This method computes the number of streaming divisions, based on
@@ -111,24 +110,22 @@ public:
* \return The number of streaming divisions.
*/
static unsigned long CalculateNumberOfStreamDivisions(const TImage * image,
- RegionType region,
- SplitterType * splitter,
- StreamingModeType mode,
- unsigned long numberOfStreamDivision,
- unsigned long bufferMemorySize,
- unsigned long bufferNumberOfLinesDivisions);
-
+ RegionType region,
+ SplitterType * splitter,
+ StreamingModeType mode,
+ unsigned long numberOfStreamDivision,
+ unsigned long bufferMemorySize,
+ unsigned long bufferNumberOfLinesDivisions);
static unsigned int CalculateNeededRadiusForInterpolator(const InterpolationType* interpolator);
static std::string GetMethodUseToCalculateNumberOfStreamDivisions(StreamingModeType mode);
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbStreamingTraits.txx"
#endif
-
#endif
diff --git a/Code/Common/otbStreamingTraits.txx b/Code/Common/otbStreamingTraits.txx
index f0dff8a8c6..f488b84c22 100644
--- a/Code/Common/otbStreamingTraits.txx
+++ b/Code/Common/otbStreamingTraits.txx
@@ -31,7 +31,6 @@
namespace otb
{
-
template <class TImage>
unsigned long StreamingTraits<TImage>
::CalculateNumberOfStreamDivisions(const TImage * image,
@@ -45,214 +44,219 @@ unsigned long StreamingTraits<TImage>
unsigned long numDivisions(0);
switch (mode)
- {
- case SET_TILING_WITH_SET_NUMBER_OF_STREAM_DIVISIONS : // Just like SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS
- case SET_NUMBER_OF_STREAM_DIVISIONS :
- {
+ {
+ case SET_TILING_WITH_SET_NUMBER_OF_STREAM_DIVISIONS: // Just like SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS
+ case SET_NUMBER_OF_STREAM_DIVISIONS:
+ {
numDivisions = numberOfStreamDivision;
- }
- break;
- case SET_BUFFER_MEMORY_SIZE :
- {
- const unsigned long bufferMemorySizeOctet = bufferMemorySize/8;
- unsigned long numberColumnsOfRegion = region.GetSize()[0]; // X dimension
+ }
+ break;
+ case SET_BUFFER_MEMORY_SIZE:
+ {
+ const unsigned long bufferMemorySizeOctet = bufferMemorySize / 8;
+ unsigned long numberColumnsOfRegion = region.GetSize()[0]; // X dimension
const unsigned long sizeLine = numberColumnsOfRegion * \
image->GetNumberOfComponentsPerPixel() * \
sizeof(PixelType);
unsigned long regionSize = region.GetSize()[1] * sizeLine;
- otbMsgDevMacro(<<"image->GetNumberOfComponentsPerPixel() = "<<image->GetNumberOfComponentsPerPixel());
- otbMsgDevMacro(<<"sizeof(PixelType) = "<<sizeof(PixelType));
- otbMsgDevMacro(<<"numberColumnsOfRegion = "<<numberColumnsOfRegion);
- otbMsgDevMacro(<<"sizeLine = "<<sizeLine);
- otbMsgDevMacro(<<"regionSize = "<<regionSize);
- otbMsgDevMacro(<<"BufferMemorySize = "<<bufferMemorySize);
- otbMsgDevMacro(<<"bufferMemorySizeOctet = "<<bufferMemorySizeOctet);
+ otbMsgDevMacro(<< "image->GetNumberOfComponentsPerPixel() = " << image->GetNumberOfComponentsPerPixel());
+ otbMsgDevMacro(<< "sizeof(PixelType) = " << sizeof(PixelType));
+ otbMsgDevMacro(<< "numberColumnsOfRegion = " << numberColumnsOfRegion);
+ otbMsgDevMacro(<< "sizeLine = " << sizeLine);
+ otbMsgDevMacro(<< "regionSize = " << regionSize);
+ otbMsgDevMacro(<< "BufferMemorySize = " << bufferMemorySize);
+ otbMsgDevMacro(<< "bufferMemorySizeOctet = " << bufferMemorySizeOctet);
//Active streaming
- if ( regionSize > bufferMemorySizeOctet )
- {
- //The regionSize must be at list equal to the sizeLine
- if ( regionSize < sizeLine )
+ if (regionSize > bufferMemorySizeOctet)
{
- otbMsgDevMacro(<<"Force buffer size.");
+ //The regionSize must be at list equal to the sizeLine
+ if (regionSize < sizeLine)
+ {
+ otbMsgDevMacro(<< "Force buffer size.");
regionSize = sizeLine;
- }
+ }
//Calculate NumberOfStreamDivisions
numDivisions = static_cast<unsigned long>(
- vcl_ceil(static_cast<double>(regionSize)/static_cast<double>(bufferMemorySizeOctet))
- );
- }
+ vcl_ceil(static_cast<double>(regionSize) / static_cast<double>(bufferMemorySizeOctet))
+ );
+ }
else
- {
+ {
//Non streaming
numDivisions = 1;
- }
+ }
- }
- break;
- case SET_BUFFER_NUMBER_OF_LINES :
- {
- if ( bufferNumberOfLinesDivisions < 1 )
- {
- itkGenericExceptionMacro(<<"Buffer number of lines division must be greater than 0 !");
}
+ break;
+ case SET_BUFFER_NUMBER_OF_LINES:
+ {
+ if (bufferNumberOfLinesDivisions < 1)
+ {
+ itkGenericExceptionMacro(<< "Buffer number of lines division must be greater than 0 !");
+ }
/* Calculate number of split */
unsigned long numberLinesOfRegion = region.GetSize()[1]; // Y dimension
- if ( numberLinesOfRegion > bufferNumberOfLinesDivisions )
- {
- numDivisions = static_cast<unsigned long>(vcl_ceil(static_cast<double>(numberLinesOfRegion)/static_cast<double>(bufferNumberOfLinesDivisions)));
- }
+ if (numberLinesOfRegion > bufferNumberOfLinesDivisions)
+ {
+ numDivisions =
+ static_cast<unsigned long>(vcl_ceil(static_cast<double>(numberLinesOfRegion) /
+ static_cast<double>(bufferNumberOfLinesDivisions)));
+ }
else
- {
+ {
//Non streaming
numDivisions = 1;
+ }
}
- }
- break;
- case SET_TILING_WITH_SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS : // Just like SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS
- case SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS :
- {
- typedef otb::ConfigurationFile ConfigurationType;
+ break;
+ case SET_TILING_WITH_SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS: // Just like SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS
+ case SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS:
+ {
+ typedef otb::ConfigurationFile ConfigurationType;
ConfigurationType::Pointer conf = ConfigurationType::GetInstance();
- std::streamoff streamMaxSizeBufferForStreamingBytes;
- std::streamoff streamImageSizeToActivateStreamingBytes;
+ std::streamoff streamMaxSizeBufferForStreamingBytes;
+ std::streamoff streamImageSizeToActivateStreamingBytes;
try
- {
- streamMaxSizeBufferForStreamingBytes = conf->GetParameter<std::streamoff>("OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING");
- streamImageSizeToActivateStreamingBytes = conf->GetParameter<std::streamoff>("OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING");
- }
+ {
+ streamMaxSizeBufferForStreamingBytes = conf->GetParameter<std::streamoff>(
+ "OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING");
+ streamImageSizeToActivateStreamingBytes = conf->GetParameter<std::streamoff>(
+ "OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING");
+ }
catch(...)
- {
- // We should never have to go here if the configuration file is
- // correct and found. In case it is not fallback on the cmake
- // defined constants.
+ {
+ // We should never have to go here if the configuration file is
+ // correct and found. In case it is not fallback on the cmake
+ // defined constants.
streamMaxSizeBufferForStreamingBytes = OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING;
streamImageSizeToActivateStreamingBytes = OTB_STREAM_IMAGE_SIZE_TO_ACTIVATE_STREAMING;
- }
+ }
//Convert in octet unit
- std::streamoff streamMaxSizeBufferForStreaming = streamMaxSizeBufferForStreamingBytes/8;
- const std::streamoff streamImageSizeToActivateStreaming = streamImageSizeToActivateStreamingBytes/8;
+ std::streamoff streamMaxSizeBufferForStreaming = streamMaxSizeBufferForStreamingBytes / 8;
+ const std::streamoff streamImageSizeToActivateStreaming = streamImageSizeToActivateStreamingBytes / 8;
- std::streamoff numberColumnsOfRegion = region.GetSize()[0]; // X dimension
+ std::streamoff numberColumnsOfRegion = region.GetSize()[0]; // X dimension
const std::streamoff sizeLine = static_cast<std::streamoff>(numberColumnsOfRegion) * \
- static_cast<std::streamoff>(image->GetNumberOfComponentsPerPixel()) * \
- static_cast<std::streamoff>(sizeof(PixelType));
+ static_cast<std::streamoff>(image->GetNumberOfComponentsPerPixel()) * \
+ static_cast<std::streamoff>(sizeof(PixelType));
const std::streamoff regionSize = region.GetSize()[1] * sizeLine;
- otbMsgDevMacro(<<"streamImageSizeToActivateStreaming in Bytes = "<<streamImageSizeToActivateStreamingBytes);
- otbMsgDevMacro(<<"streamMaxSizeBufferForStreaming in Bytes = "<<streamMaxSizeBufferForStreamingBytes);
- otbMsgDevMacro(<<"streamImageSizeToActivateStreaming = "<<streamImageSizeToActivateStreaming);
- otbMsgDevMacro(<<"streamMaxSizeBufferForStreaming = "<<streamMaxSizeBufferForStreaming);
- otbMsgDevMacro(<<"image->GetNumberOfComponentsPerPixel() = "<<image->GetNumberOfComponentsPerPixel());
- otbMsgDevMacro(<<"sizeof(PixelType) = "<<sizeof(PixelType));
- otbMsgDevMacro(<<"numberColumnsOfRegion = "<<numberColumnsOfRegion);
- otbMsgDevMacro(<<"sizeLine = "<<sizeLine);
- otbMsgDevMacro(<<"regionSize = "<<regionSize);
+ otbMsgDevMacro(<< "streamImageSizeToActivateStreaming in Bytes = " << streamImageSizeToActivateStreamingBytes);
+ otbMsgDevMacro(<< "streamMaxSizeBufferForStreaming in Bytes = " << streamMaxSizeBufferForStreamingBytes);
+ otbMsgDevMacro(<< "streamImageSizeToActivateStreaming = " << streamImageSizeToActivateStreaming);
+ otbMsgDevMacro(<< "streamMaxSizeBufferForStreaming = " << streamMaxSizeBufferForStreaming);
+ otbMsgDevMacro(<< "image->GetNumberOfComponentsPerPixel() = " << image->GetNumberOfComponentsPerPixel());
+ otbMsgDevMacro(<< "sizeof(PixelType) = " << sizeof(PixelType));
+ otbMsgDevMacro(<< "numberColumnsOfRegion = " << numberColumnsOfRegion);
+ otbMsgDevMacro(<< "sizeLine = " << sizeLine);
+ otbMsgDevMacro(<< "regionSize = " << regionSize);
//Active streaming
- if ( regionSize > streamImageSizeToActivateStreaming )
- {
- //On s'assure que la taille du bandeau fait au moins une ligne de l'image si pas TILING
- if ( (mode != SET_TILING_WITH_SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS)
- && (streamMaxSizeBufferForStreaming < sizeLine) )
+ if (regionSize > streamImageSizeToActivateStreaming)
{
- otbMsgDevMacro(<<"Force buffer size.");
+ //On s'assure que la taille du bandeau fait au moins une ligne de l'image si pas TILING
+ if ((mode != SET_TILING_WITH_SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS)
+ && (streamMaxSizeBufferForStreaming < sizeLine))
+ {
+ otbMsgDevMacro(<< "Force buffer size.");
streamMaxSizeBufferForStreaming = sizeLine;
- }
- otbMsgDevMacro(<<"Buffer size : "<<streamMaxSizeBufferForStreaming);
+ }
+ otbMsgDevMacro(<< "Buffer size : " << streamMaxSizeBufferForStreaming);
//Calculate NumberOfStreamDivisions
- numDivisions = static_cast<unsigned long>(vcl_ceil(static_cast<double>(regionSize)/static_cast<double>(streamMaxSizeBufferForStreaming)));
- }
+ numDivisions =
+ static_cast<unsigned long>(vcl_ceil(static_cast<double>(regionSize) /
+ static_cast<double>(streamMaxSizeBufferForStreaming)));
+ }
else
- {
+ {
//Non streaming
numDivisions = 1;
- }
+ }
- }
- break;
- default :
- itkGenericExceptionMacro(<<"Method use to calculate number of stream divisions is not set !");
+ }
break;
- }
- if ( numDivisions == 0) numDivisions = 1;
- otbMsgDevMacro(<<" -> Resume : method : "<<mode<<"\n -> Number of divisions = "<<numDivisions);
+ default:
+ itkGenericExceptionMacro(<< "Method use to calculate number of stream divisions is not set !");
+ break;
+ }
+ if (numDivisions == 0) numDivisions = 1;
+ otbMsgDevMacro(<< " -> Resume : method : " << mode << "\n -> Number of divisions = " << numDivisions);
// Compute real number of splitter
unsigned int numDivisionsFromSplitter = splitter->GetNumberOfSplits(region, numDivisions);
/** In tiling streaming mode, we keep the number of divisions calculed by splitter */
if ((numDivisionsFromSplitter < numDivisions)
- ||(mode==SET_TILING_WITH_SET_NUMBER_OF_STREAM_DIVISIONS)
- ||(mode==SET_TILING_WITH_SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS)
- )
- {
+ || (mode == SET_TILING_WITH_SET_NUMBER_OF_STREAM_DIVISIONS)
+ || (mode == SET_TILING_WITH_SET_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS)
+ )
+ {
numDivisions = numDivisionsFromSplitter;
- }
+ }
- return(numDivisions);
+ return (numDivisions);
}
-
template <class TImage>
unsigned int StreamingTraits<TImage>
::CalculateNeededRadiusForInterpolator(const InterpolationType* interpolator)
{
unsigned int neededRadius = 0;
- std::string className;
+ std::string className;
className = interpolator->GetNameOfClass();
if (className == "LinearInterpolateImageFunction")
- {
- otbMsgDevMacro(<<"Linear Interpolator");
+ {
+ otbMsgDevMacro(<< "Linear Interpolator");
neededRadius = 1;
- }
+ }
else if (className == "NearestNeighborInterpolateImageFunction")
- {
- otbMsgDevMacro(<<"Nearest Neighbor Interpolator");
+ {
+ otbMsgDevMacro(<< "Nearest Neighbor Interpolator");
neededRadius = 1;
- }
+ }
else if (className == "BSplineInterpolateImageFunction")
- {
- otbMsgDevMacro(<<"Nearest Neighbor Interpolator");
+ {
+ otbMsgDevMacro(<< "Nearest Neighbor Interpolator");
neededRadius = 2;
- }
+ }
else if (className == "ProlateInterpolateImageFunction")
- {
- otbMsgDevMacro(<<"Prolate Interpolator");
+ {
+ otbMsgDevMacro(<< "Prolate Interpolator");
neededRadius = dynamic_cast<const ProlateInterpolationType *>(interpolator)->GetRadius();
- }
+ }
else if (className == "WindowedSincInterpolateImageGaussianFunction")
- {
- otbMsgDevMacro(<<"Gaussian Windowed Interpolator");
+ {
+ otbMsgDevMacro(<< "Gaussian Windowed Interpolator");
neededRadius = dynamic_cast<const GaussianInterpolationType *>(interpolator)->GetRadius();
- }
+ }
else if (className == "WindowedSincInterpolateImageHammingFunction")
- {
- otbMsgDevMacro(<<"Hamming Windowed Interpolator");
+ {
+ otbMsgDevMacro(<< "Hamming Windowed Interpolator");
neededRadius = dynamic_cast<const HammingInterpolationType *>(interpolator)->GetRadius();
- }
+ }
else if (className == "WindowedSincInterpolateImageCosineFunction")
- {
- otbMsgDevMacro(<<"Cosine Windowed Interpolator");
+ {
+ otbMsgDevMacro(<< "Cosine Windowed Interpolator");
neededRadius = dynamic_cast<const CosineInterpolationType *>(interpolator)->GetRadius();
- }
+ }
else if (className == "WindowedSincInterpolateImageWelchFunction")
- {
- otbMsgDevMacro(<<"Welch Windowed Interpolator");
+ {
+ otbMsgDevMacro(<< "Welch Windowed Interpolator");
neededRadius = dynamic_cast<const WelchInterpolationType *>(interpolator)->GetRadius();
- }
+ }
else if (className == "WindowedSincInterpolateImageLanczosFunction")
- {
- otbMsgDevMacro(<<"Lanczos Windowed Interpolator");
+ {
+ otbMsgDevMacro(<< "Lanczos Windowed Interpolator");
neededRadius = dynamic_cast<const LanczosInterpolationType *>(interpolator)->GetRadius();
- }
+ }
else if (className == "WindowedSincInterpolateImageBlackmanFunction")
- {
- otbMsgDevMacro(<<"Blackman Windowed Interpolator");
+ {
+ otbMsgDevMacro(<< "Blackman Windowed Interpolator");
neededRadius = dynamic_cast<const BlackmanInterpolationType *>(interpolator)->GetRadius();
- }
+ }
/*else if (className == "WindowedSincInterpolateImageFunction")
{
@@ -268,13 +272,12 @@ unsigned int StreamingTraits<TImage>
return neededRadius;
}
-
template <class TImage>
std::string StreamingTraits<TImage>
-::GetMethodUseToCalculateNumberOfStreamDivisions( StreamingModeType mode )
+::GetMethodUseToCalculateNumberOfStreamDivisions(StreamingModeType mode)
{
switch (mode)
- {
+ {
case SET_NUMBER_OF_STREAM_DIVISIONS:
return "CalculationDivisionEnumType::SET_NUMBER_OF_STREAM_DIVISIONS";
break;
@@ -296,11 +299,10 @@ std::string StreamingTraits<TImage>
default:
return "unknown";
break;
- }
+ }
}
-
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/Common/otbSubsampledImageRegionConstIterator.h b/Code/Common/otbSubsampledImageRegionConstIterator.h
index 9eaa883efd..97a8ccb74c 100644
--- a/Code/Common/otbSubsampledImageRegionConstIterator.h
+++ b/Code/Common/otbSubsampledImageRegionConstIterator.h
@@ -37,13 +37,13 @@ namespace otb {
* \ingroup ImageIterator
* \sa WaveletFilterBank
*/
-template < class TImage >
+template <class TImage>
class ITK_EXPORT SubsampledImageRegionConstIterator
- : public itk::ImageRegionConstIterator< TImage >
+ : public itk::ImageRegionConstIterator<TImage>
{
public:
/** Standard typedef. */
- typedef SubsampledImageRegionConstIterator Self;
+ typedef SubsampledImageRegionConstIterator Self;
typedef itk::ImageRegionConstIterator<TImage> Superclass;
/** Run-time type information (and related methods). */
@@ -65,7 +65,7 @@ public:
typedef typename Superclass::SizeType SizeType;
/** Region typedef support. */
- typedef typename Superclass::RegionType RegionType;
+ typedef typename Superclass::RegionType RegionType;
/** Image typedef support. While this was already typdef'ed in the superclass
* it needs to be redone here for this subclass to compile properly with gcc. */
@@ -76,22 +76,21 @@ public:
//typedef typename Superclass::OffsetType OffsetType;
typedef unsigned long OffsetType;
-
/** PixelContainer typedef support. Used to refer to the container for
* the pixel data. While this was already typdef'ed in the superclass
* it needs to be redone here for this subclass to compile properly with gcc. */
- typedef typename Superclass::PixelContainer PixelContainer;
- typedef typename Superclass::PixelContainerPointer PixelContainerPointer;
-
+ typedef typename Superclass::PixelContainer PixelContainer;
+ typedef typename Superclass::PixelContainerPointer PixelContainerPointer;
+
/** Internal Pixel Type */
- typedef typename Superclass::InternalPixelType InternalPixelType;
+ typedef typename Superclass::InternalPixelType InternalPixelType;
/** External Pixel Type */
- typedef typename Superclass::PixelType PixelType;
+ typedef typename Superclass::PixelType PixelType;
/** Accessor type that convert data between internal and external
* representations. */
- typedef typename Superclass::AccessorType AccessorType;
+ typedef typename Superclass::AccessorType AccessorType;
/** Index value used for pixel location */
typedef typename Superclass::IndexValueType IndexValueType;
@@ -101,7 +100,7 @@ public:
/** Constructor establishes an iterator to walk a particular image and a
* particular region of that image. */
- SubsampledImageRegionConstIterator ( const ImageType *ptr, const RegionType ®ion);
+ SubsampledImageRegionConstIterator (const ImageType * ptr, const RegionType ®ion);
/** Constructor that can be used to cast from an ImageIterator to an
* SubsampledImageRegionConstIterator. Many routines return an ImageIterator
@@ -109,7 +108,7 @@ public:
* Rather than provide overloaded APIs that return different types of Iterators, itk
* returns ImageIterators and uses constructors to cast from an
* ImageIterator to a SubsampledImageRegionConstIterator. */
- SubsampledImageRegionConstIterator( const itk::ImageIterator<TImage> &it );
+ SubsampledImageRegionConstIterator(const itk::ImageIterator<TImage> &it);
/** Constructor that can be used to cast from an ImageConstIterator to an
* SubsampledImageRegionConstIterator. Many routines return an ImageIterator
@@ -117,15 +116,15 @@ public:
* Rather than provide overloaded APIs that return different types of Iterators, itk
* returns ImageIterators and uses constructors to cast from an
* ImageIterator to a SubsampledImageRegionConstIterator. */
- SubsampledImageRegionConstIterator( const itk::ImageConstIterator<TImage> &it );
+ SubsampledImageRegionConstIterator(const itk::ImageConstIterator<TImage> &it);
/** Set an isotropic subsampling factor */
- void SetSubsampleFactor ( typename IndexType::IndexValueType factor );
+ void SetSubsampleFactor (typename IndexType::IndexValueType factor);
/** Set / Get the subsample factor */
- void SetSubsampleFactor ( const IndexType & factor );
+ void SetSubsampleFactor(const IndexType& factor);
- const IndexType & GetSubsampleFactor () const
+ const IndexType& GetSubsampleFactor() const
{
return this->m_SubsampleFactor;
}
@@ -146,9 +145,9 @@ public:
*/
bool IsAtBegin(void) const
{
- return ( this->m_Offset <= m_SubSampledBeginOffset );
+ return (this->m_Offset <= m_SubSampledBeginOffset);
}
-
+
/** Is the iterator at the end of the region?
* "End" is defined as past the last candidate pixel
* of the region (under the subsample point of view).
@@ -158,13 +157,13 @@ public:
*/
bool IsAtEnd(void) const
{
- return ( this->m_Offset >= m_SubSampledEndOffset );
+ return (this->m_Offset >= m_SubSampledEndOffset);
}
/** Set the index.
* It is moved to the next available (usable) index.
* \sa GetIndex */
- void SetIndex(const IndexType &ind);
+ void SetIndex(const IndexType& ind);
/** Get the Index. */
IndexType GetIndex() const
@@ -172,7 +171,6 @@ public:
return Superclass::GetIndex();
}
-
/** Increment (prefix) the fastest moving dimension of the iterator's index.
* This operator will constrain the iterator within the region (i.e. the
* iterator will automatically wrap from the end of the row of the region
@@ -180,19 +178,19 @@ public:
* tries to moves past the last pixel of the region. Here, the iterator
* will be set to be one pixel past the end of the region.
* \sa operator++(int) */
- Self & operator++()
+ Self & operator ++()
{
// On the contrary to itk::ImageRegionConstIterator, m_Offset to
// not incremented before the test
- if( this->m_Offset + m_SubsampleFactor[0] >= this->m_SpanEndOffset )
- {
+ if (this->m_Offset + m_SubsampleFactor[0] >= this->m_SpanEndOffset)
+ {
this->Increment();
- }
+ }
else
- {
+ {
// Now, the increment is performed
this->m_Offset += m_SubsampleFactor[0];
- }
+ }
return *this;
}
@@ -203,27 +201,27 @@ public:
* tries to moves past the first pixel of the region. Here, the iterator
* will be set to be one pixel past the beginning of the region.
* \sa operator--(int) */
- Self & operator--()
+ Self & operator --()
{
// On the contrary to itk::ImageRegionConstIterator, m_Offset
// is not decremented here (it may become negative!)
- if ( this->m_Offset < this->m_SpanBeginOffset + m_SubsampleFactor[0] )
- {
+ if (this->m_Offset < this->m_SpanBeginOffset + m_SubsampleFactor[0])
+ {
this->Decrement();
- }
+ }
else
- {
+ {
// Now we can
this->m_Offset -= m_SubsampleFactor[0];
- }
+ }
return *this;
}
/** This iterator give the possibility to Set/Get the current location if scanning.
* No Bound checking is performed when setting the position.
*/
- void SetOffset ( const OffsetType & offset );
- const OffsetType & GetOffset() const
+ void SetOffset(const OffsetType& offset);
+ const OffsetType& GetOffset() const
{
return this->m_Offset;
}
@@ -231,15 +229,15 @@ public:
/** GenerateOutputInformation.
* In order to help copy into a new Image, give the new region parameters
*/
- RegionType GenerateOutputInformation () const;
+ RegionType GenerateOutputInformation() const;
protected:
- IndexType m_SubsampleFactor;
+ IndexType m_SubsampleFactor;
unsigned long m_SubSampledBeginOffset;
//unsigned long m_SubSampledReverseEndOffset;
unsigned long m_SubSampledEndOffset;
- IndexType m_FirstUsableIndex;
- IndexType m_LastUsableIndex;
+ IndexType m_FirstUsableIndex;
+ IndexType m_LastUsableIndex;
private:
void Increment(); // jump in a direction other than the fastest moving
@@ -253,4 +251,3 @@ private:
#endif
#endif
-
diff --git a/Code/Common/otbSubsampledImageRegionConstIterator.txx b/Code/Common/otbSubsampledImageRegionConstIterator.txx
index 6e1b8203b1..7feeff2e31 100644
--- a/Code/Common/otbSubsampledImageRegionConstIterator.txx
+++ b/Code/Common/otbSubsampledImageRegionConstIterator.txx
@@ -25,9 +25,8 @@
namespace otb {
-
-template < class TImage >
-SubsampledImageRegionConstIterator< TImage >
+template <class TImage>
+SubsampledImageRegionConstIterator<TImage>
::SubsampledImageRegionConstIterator()
: itk::ImageRegionConstIterator<TImage> ()
{
@@ -35,112 +34,112 @@ SubsampledImageRegionConstIterator< TImage >
m_SubSampledEndOffset = this->m_EndOffset;
const IndexType& startIndex = this->m_Region.GetIndex();
- const SizeType& size = this->m_Region.GetSize();
+ const SizeType& size = this->m_Region.GetSize();
- for ( unsigned int i = 0; i < ImageIteratorDimension; ++i )
- {
+ for (unsigned int i = 0; i < ImageIteratorDimension; ++i)
+ {
m_FirstUsableIndex[i] = startIndex[i];
- m_LastUsableIndex[i] = startIndex[i] + static_cast<IndexValueType>( size[i]-1 );
- }
+ m_LastUsableIndex[i] = startIndex[i] + static_cast<IndexValueType>(size[i] - 1);
+ }
}
-template < class TImage >
-SubsampledImageRegionConstIterator< TImage >
-::SubsampledImageRegionConstIterator ( const ImageType *ptr, const RegionType ®ion)
- : itk::ImageRegionConstIterator< TImage > ( ptr, region )
+template <class TImage>
+SubsampledImageRegionConstIterator<TImage>
+::SubsampledImageRegionConstIterator (const ImageType *ptr, const RegionType& region)
+ : itk::ImageRegionConstIterator<TImage> (ptr, region)
{
- m_SubsampleFactor.Fill( 1 );
+ m_SubsampleFactor.Fill(1);
m_SubSampledEndOffset = this->m_EndOffset;
const IndexType& startIndex = this->m_Region.GetIndex();
- const SizeType& size = this->m_Region.GetSize();
+ const SizeType& size = this->m_Region.GetSize();
- for ( unsigned int i = 0; i < ImageIteratorDimension; ++i )
- {
+ for (unsigned int i = 0; i < ImageIteratorDimension; ++i)
+ {
m_FirstUsableIndex[i] = startIndex[i];
- m_LastUsableIndex[i] = startIndex[i] + static_cast<IndexValueType>( size[i]-1 );
- }
+ m_LastUsableIndex[i] = startIndex[i] + static_cast<IndexValueType>(size[i] - 1);
+ }
}
-template < class TImage >
-SubsampledImageRegionConstIterator< TImage >
-::SubsampledImageRegionConstIterator( const itk::ImageIterator<TImage> &it )
- : itk::ImageRegionConstIterator< TImage >( it )
+template <class TImage>
+SubsampledImageRegionConstIterator<TImage>
+::SubsampledImageRegionConstIterator(const itk::ImageIterator<TImage>& it)
+ : itk::ImageRegionConstIterator<TImage>(it)
{
- m_SubsampleFactor.Fill( 1 );
+ m_SubsampleFactor.Fill(1);
m_SubSampledEndOffset = this->m_EndOffset;
const IndexType& startIndex = this->m_Region.GetIndex();
- const SizeType& size = this->m_Region.GetSize();
+ const SizeType& size = this->m_Region.GetSize();
- for ( unsigned int i = 0; i < ImageIteratorDimension; ++i )
- {
+ for (unsigned int i = 0; i < ImageIteratorDimension; ++i)
+ {
m_FirstUsableIndex[i] = startIndex[i];
- m_LastUsableIndex[i] = startIndex[i] + static_cast<IndexValueType>( size[i]-1 );
- }
+ m_LastUsableIndex[i] = startIndex[i] + static_cast<IndexValueType>(size[i] - 1);
+ }
}
-template < class TImage >
-SubsampledImageRegionConstIterator< TImage >
-::SubsampledImageRegionConstIterator( const itk::ImageConstIterator<TImage> &it )
- : itk::ImageRegionConstIterator< TImage >( it )
+template <class TImage>
+SubsampledImageRegionConstIterator<TImage>
+::SubsampledImageRegionConstIterator(const itk::ImageConstIterator<TImage>& it)
+ : itk::ImageRegionConstIterator<TImage>(it)
{
- m_SubsampleFactor.Fill( 1 );
+ m_SubsampleFactor.Fill(1);
const IndexType& startIndex = this->m_Region.GetIndex();
- const SizeType& size = this->m_Region.GetSize();
+ const SizeType& size = this->m_Region.GetSize();
- for ( unsigned int i = 0; i < ImageIteratorDimension; ++i )
- {
+ for (unsigned int i = 0; i < ImageIteratorDimension; ++i)
+ {
m_FirstUsableIndex[i] = startIndex[i];
- m_LastUsableIndex[i] = startIndex[i] + static_cast<IndexValueType>( size[i]-1 );
- }
+ m_LastUsableIndex[i] = startIndex[i] + static_cast<IndexValueType>(size[i] - 1);
+ }
- m_SubSampledEndOffset = this->m_Image->ComputeOffset( m_LastUsableIndex ) + 1;
+ m_SubSampledEndOffset = this->m_Image->ComputeOffset(m_LastUsableIndex) + 1;
}
-template < class TImage >
+template <class TImage>
void
-SubsampledImageRegionConstIterator< TImage >
-::SetSubsampleFactor ( typename IndexType::IndexValueType factor )
+SubsampledImageRegionConstIterator<TImage>
+::SetSubsampleFactor(typename IndexType::IndexValueType factor)
{
IndexType index;
- index.Fill( factor );
- SetSubsampleFactor( index );
+ index.Fill(factor);
+ SetSubsampleFactor(index);
}
-template < class TImage >
+template <class TImage>
void
-SubsampledImageRegionConstIterator< TImage >
-::SetSubsampleFactor ( const IndexType & factor )
+SubsampledImageRegionConstIterator<TImage>
+::SetSubsampleFactor(const IndexType& factor)
{
this->m_SubsampleFactor = factor;
// Evaluate the last possible pixel.
const IndexType& startIndex = this->m_Region.GetIndex();
- const SizeType& size = this->m_Region.GetSize();
+ const SizeType& size = this->m_Region.GetSize();
- for ( unsigned int i = 0; i < ImageIteratorDimension; ++i )
- {
- m_FirstUsableIndex[i] = startIndex[i];
- while ( m_FirstUsableIndex[i]
- != ( m_SubsampleFactor[i] * ( m_FirstUsableIndex[i] / m_SubsampleFactor[i] ) ) )
+ for (unsigned int i = 0; i < ImageIteratorDimension; ++i)
{
+ m_FirstUsableIndex[i] = startIndex[i];
+ while (m_FirstUsableIndex[i]
+ != (m_SubsampleFactor[i] * (m_FirstUsableIndex[i] / m_SubsampleFactor[i])))
+ {
++m_FirstUsableIndex[i];
- }
+ }
m_LastUsableIndex[i] = startIndex[i]
- + static_cast<IndexValueType>( m_SubsampleFactor[i] * ( (size[i]-1) / m_SubsampleFactor[i] ) );
- }
+ + static_cast<IndexValueType>(m_SubsampleFactor[i] * ((size[i] - 1) / m_SubsampleFactor[i]));
+ }
- m_SubSampledBeginOffset = this->m_Image->ComputeOffset( m_FirstUsableIndex );
+ m_SubSampledBeginOffset = this->m_Image->ComputeOffset(m_FirstUsableIndex);
//m_SubSampledReverseEndOffset = m_SubSampledBeginOffset - 1;
- m_SubSampledEndOffset = this->m_Image->ComputeOffset( m_LastUsableIndex ) + 1;
+ m_SubSampledEndOffset = this->m_Image->ComputeOffset(m_LastUsableIndex) + 1;
}
-template < class TImage >
+template <class TImage>
void
-SubsampledImageRegionConstIterator< TImage >
+SubsampledImageRegionConstIterator<TImage>
::GoToBegin()
{
this->m_Offset = m_SubSampledBeginOffset;
@@ -149,13 +148,13 @@ SubsampledImageRegionConstIterator< TImage >
this->m_SpanBeginOffset = this->m_Offset;
this->m_SpanEndOffset = this->m_Offset
- + static_cast<IndexValueType>( m_SubsampleFactor[0] * ((size[0]-1) / m_SubsampleFactor[0]) )
+ + static_cast<IndexValueType>(m_SubsampleFactor[0] * ((size[0] - 1) / m_SubsampleFactor[0]))
+ 1;
}
-template < class TImage >
+template <class TImage>
void
-SubsampledImageRegionConstIterator< TImage >
+SubsampledImageRegionConstIterator<TImage>
::GoToEnd()
{
this->m_Offset = m_SubSampledEndOffset - 1;
@@ -163,44 +162,43 @@ SubsampledImageRegionConstIterator< TImage >
this->m_SpanBeginOffset = this->m_Offset - m_LastUsableIndex[0];
}
-template < class TImage >
+template <class TImage>
void
-SubsampledImageRegionConstIterator< TImage >
-::SetIndex ( const IndexType & ind )
+SubsampledImageRegionConstIterator<TImage>
+::SetIndex(const IndexType& ind)
{
IndexType theIndex = ind;
- for ( unsigned int i = 0; i < ImageIteratorDimension; ++i )
- {
- while ( theIndex[i]
- != ( m_SubsampleFactor[i] * ( theIndex[i] / m_SubsampleFactor[i] ) ) )
+ for (unsigned int i = 0; i < ImageIteratorDimension; ++i)
{
+ while (theIndex[i]
+ != (m_SubsampleFactor[i] * (theIndex[i] / m_SubsampleFactor[i])))
+ {
++theIndex[i];
- }
+ }
- if ( theIndex[i] > static_cast<IndexValueType>( this->m_Region.GetIndex()[i] + this->m_Region.GetSize()[i] ) )
- {
- theIndex[i] = ind[i];
- while ( theIndex[i]
- != ( m_SubsampleFactor[i] * ( theIndex[i] / m_SubsampleFactor[i] ) ) )
+ if (theIndex[i] > static_cast<IndexValueType>(this->m_Region.GetIndex()[i] + this->m_Region.GetSize()[i]))
{
+ theIndex[i] = ind[i];
+ while (theIndex[i]
+ != (m_SubsampleFactor[i] * (theIndex[i] / m_SubsampleFactor[i])))
+ {
--theIndex[i];
- }
+ }
- if ( theIndex[i] < this->m_Region.GetIndex()[i] )
- theIndex[i] = ind[i];
+ if (theIndex[i] < this->m_Region.GetIndex()[i]) theIndex[i] = ind[i];
+ }
}
- }
//Superclass::SetIndex( theIndex );
- OffsetType theOffset = this->m_Image->ComputeOffset( theIndex );
- SetOffset( theOffset );
+ OffsetType theOffset = this->m_Image->ComputeOffset(theIndex);
+ SetOffset(theOffset);
}
-template < class TImage >
+template <class TImage>
void
-SubsampledImageRegionConstIterator< TImage >
-::SetOffset( const OffsetType & offset )
+SubsampledImageRegionConstIterator<TImage>
+::SetOffset(const OffsetType& offset)
{
this->m_Offset = offset;
@@ -208,76 +206,76 @@ SubsampledImageRegionConstIterator< TImage >
this->m_SpanBeginOffset = this->m_Offset;
this->m_SpanEndOffset = this->m_Offset
- + static_cast<IndexValueType>( m_SubsampleFactor[0] * ((size[0]-1) / m_SubsampleFactor[0]) )
+ + static_cast<IndexValueType>(m_SubsampleFactor[0] * ((size[0] - 1) / m_SubsampleFactor[0]))
+ 1;
}
-template < class TImage >
-typename SubsampledImageRegionConstIterator< TImage >::RegionType
-SubsampledImageRegionConstIterator< TImage >
-::GenerateOutputInformation () const
+template <class TImage>
+typename SubsampledImageRegionConstIterator<TImage>::RegionType
+SubsampledImageRegionConstIterator<TImage>
+::GenerateOutputInformation() const
{
IndexType startIndex = this->m_Region.GetIndex();
- SizeType size = this->m_Region.GetSize();
+ SizeType size = this->m_Region.GetSize();
- for ( unsigned int i = 0; i < ImageIteratorDimension; ++i )
- {
+ for (unsigned int i = 0; i < ImageIteratorDimension; ++i)
+ {
startIndex[i] /= m_SubsampleFactor[i];
--size[i];
size[i] /= m_SubsampleFactor[i];
++size[i];
- }
+ }
RegionType newRegion;
- newRegion.SetIndex( startIndex );
- newRegion.SetSize( size );
+ newRegion.SetIndex(startIndex);
+ newRegion.SetSize(size);
#if 0
// #ifndef NDEBUG
std::cerr << "InitialImageSize (";
- for ( unsigned int i = 0; i < ImageIteratorDimension-1; i++ )
+ for (unsigned int i = 0; i < ImageIteratorDimension - 1; i++)
std::cerr << this->m_Region.GetSize()[i] << ", ";
- std::cerr << this->m_Region.GetSize()[ImageIteratorDimension-1] << ") with index (";
- for ( unsigned int i = 0; i < ImageIteratorDimension-1; i++ )
+ std::cerr << this->m_Region.GetSize()[ImageIteratorDimension - 1] << ") with index (";
+ for (unsigned int i = 0; i < ImageIteratorDimension - 1; i++)
std::cerr << this->m_Region.GetIndex()[i] << ", ";
- std::cerr << this->m_Region.GetIndex()[ImageIteratorDimension-1] << ")\n";
+ std::cerr << this->m_Region.GetIndex()[ImageIteratorDimension - 1] << ")\n";
std::cerr << "NewRegionSize (";
- for ( unsigned int i = 0; i < ImageIteratorDimension-1; i++ )
+ for (unsigned int i = 0; i < ImageIteratorDimension - 1; i++)
std::cerr << size[i] << ", ";
- std::cerr << size[ImageIteratorDimension-1] << ") with index (";
- for ( unsigned int i = 0; i < ImageIteratorDimension-1; i++ )
+ std::cerr << size[ImageIteratorDimension - 1] << ") with index (";
+ for (unsigned int i = 0; i < ImageIteratorDimension - 1; i++)
std::cerr << startIndex[i] << ", ";
- std::cerr << startIndex[ImageIteratorDimension-1] << ")\n";
+ std::cerr << startIndex[ImageIteratorDimension - 1] << ")\n";
std::cerr << "FirstIndex (";
- for ( unsigned int i = 0; i < ImageIteratorDimension-1; i++ )
+ for (unsigned int i = 0; i < ImageIteratorDimension - 1; i++)
std::cerr << m_FirstUsableIndex[i] << ", ";
- std::cerr << m_FirstUsableIndex[ImageIteratorDimension-1] << ") offset=";
+ std::cerr << m_FirstUsableIndex[ImageIteratorDimension - 1] << ") offset=";
std::cerr << m_SubSampledBeginOffset << "\n";
std::cerr << "LastIndex (";
- for ( unsigned int i = 0; i < ImageIteratorDimension-1; i++ )
+ for (unsigned int i = 0; i < ImageIteratorDimension - 1; i++)
std::cerr << m_LastUsableIndex[i] << ", ";
- std::cerr << m_LastUsableIndex[ImageIteratorDimension-1] << ") offset=";
+ std::cerr << m_LastUsableIndex[ImageIteratorDimension - 1] << ") offset=";
std::cerr << m_SubSampledEndOffset << "\n";
#endif
return newRegion;
}
-template < class TImage >
+template <class TImage>
void
-SubsampledImageRegionConstIterator< TImage >
-::Increment ()
+SubsampledImageRegionConstIterator<TImage>
+::Increment()
{
// Get the index of the last pixel on the span (row)
IndexType ind = this->m_Image->ComputeIndex(
- static_cast<typename Superclass::OffsetValueType>(this->m_Offset) );
+ static_cast<typename Superclass::OffsetValueType>(this->m_Offset));
const IndexType& startIndex = this->m_Region.GetIndex();
- const SizeType& size = this->m_Region.GetSize();
+ const SizeType& size = this->m_Region.GetSize();
// Increment along a row, then wrap at the end of the region row.
unsigned int dim;
@@ -285,74 +283,72 @@ SubsampledImageRegionConstIterator< TImage >
// Check to see if we are past the last pixel in the region
// Note that ++ind[0] moves to the next pixel along the row.
ind[0] += m_SubsampleFactor[0];
- bool done = (ind[0] > m_LastUsableIndex[0] );
- for (unsigned int i=1; done && i < ImageIteratorDimension; ++i)
- {
+ bool done = (ind[0] > m_LastUsableIndex[0]);
+ for (unsigned int i = 1; done && i < ImageIteratorDimension; ++i)
+ {
done = (ind[i] >= m_LastUsableIndex[i]);
- }
-
+ }
+
// if the iterator is outside the region (but not past region end) then
// we need to wrap around the region
dim = 0;
if (!done)
- {
- while ( ( dim+1 < ImageIteratorDimension )
- && (ind[dim] > m_LastUsableIndex[dim]) )
{
+ while ((dim + 1 < ImageIteratorDimension)
+ && (ind[dim] > m_LastUsableIndex[dim]))
+ {
ind[dim] = startIndex[dim];
++dim;
ind[dim] += m_SubsampleFactor[dim];
+ }
}
- }
- this->m_Offset = this->m_Image->ComputeOffset( ind );
+ this->m_Offset = this->m_Image->ComputeOffset(ind);
this->m_SpanEndOffset = this->m_Offset
- + static_cast<IndexValueType>( m_SubsampleFactor[0] * ((size[0]-1) / m_SubsampleFactor[0]) )
- + 1;
+ + static_cast<IndexValueType>(m_SubsampleFactor[0] * ((size[0] - 1) / m_SubsampleFactor[0]))
+ + 1;
this->m_SpanBeginOffset = this->m_Offset;
}
-template < class TImage >
+template <class TImage>
void
-SubsampledImageRegionConstIterator< TImage >
-::Decrement ()
+SubsampledImageRegionConstIterator<TImage>
+::Decrement()
{
// Get the index of the first pixel on the span (row)
- IndexType ind = this->m_Image->ComputeIndex( static_cast<IndexValueType>(this->m_Offset) );
+ IndexType ind = this->m_Image->ComputeIndex(static_cast<IndexValueType>(this->m_Offset));
IndexType& startIndex = this->m_Region.GetIndex();
// Deccrement along a row, then wrap at the beginning of the region row.
- bool done;
+ bool done;
unsigned int dim;
// Check to see if we are past the first pixel in the region
// Note that --ind[0] moves to the previous pixel along the row.
ind[0] -= m_SubsampleFactor[0];
done = (ind[0] <= startIndex[0] - 1);
- for (unsigned int i=1; done && i < ImageIteratorDimension; ++i)
- {
+ for (unsigned int i = 1; done && i < ImageIteratorDimension; ++i)
+ {
done = (ind[i] <= startIndex[i]);
- }
-
+ }
+
// if the iterator is outside the region (but not past region begin) then
// we need to wrap around the region
dim = 0;
if (!done)
- {
- while ( (dim < ImageIteratorDimension - 1)
- && (ind[dim] < startIndex[dim]) )
{
+ while ((dim < ImageIteratorDimension - 1)
+ && (ind[dim] < startIndex[dim]))
+ {
ind[dim] = m_LastUsableIndex[dim];
++dim;
ind[dim] -= m_SubsampleFactor[dim];
+ }
}
- }
- this->m_Offset = this->m_Image->ComputeOffset( ind );
+ this->m_Offset = this->m_Image->ComputeOffset(ind);
this->m_SpanEndOffset = this->m_Offset + 1;
this->m_SpanBeginOffset = this->m_Offset - m_LastUsableIndex[0];
}
} // end of namespace otb
-
#endif
-
diff --git a/Code/Common/otbSubsampledImageRegionIterator.h b/Code/Common/otbSubsampledImageRegionIterator.h
index e990a869c9..d5cd8ce061 100644
--- a/Code/Common/otbSubsampledImageRegionIterator.h
+++ b/Code/Common/otbSubsampledImageRegionIterator.h
@@ -37,14 +37,14 @@ namespace otb {
* \ingroup ImageIterator
* \sa SubsampledImageRegionConstIterator
*/
-template < class TImage >
+template <class TImage>
class ITK_EXPORT SubsampledImageRegionIterator
- : public SubsampledImageRegionConstIterator< TImage >
+ : public SubsampledImageRegionConstIterator<TImage>
{
public:
/** Standard typedef. */
- typedef SubsampledImageRegionIterator Self;
- typedef SubsampledImageRegionConstIterator< TImage > Superclass;
+ typedef SubsampledImageRegionIterator Self;
+ typedef SubsampledImageRegionConstIterator<TImage> Superclass;
/** Run-time type information (and related methods). */
itkTypeMacro(SubsampledImageRegionConstIterator, SubsampledImageRegionConstIterator);
@@ -53,44 +53,44 @@ public:
Superclass::ImageIteratorDimension);
// typedef redefinition from superclass
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::SizeType SizeType;
- typedef typename Superclass::RegionType RegionType;
- typedef typename Superclass::OffsetType OffsetType;
- typedef typename Superclass::ImageType ImageType;
- typedef typename Superclass::PixelContainer PixelContainer;
- typedef typename Superclass::PixelContainerPointer PixelContainerPointer;
- typedef typename Superclass::InternalPixelType InternalPixelType;
- typedef typename Superclass::PixelType PixelType;
- typedef typename Superclass::AccessorType AccessorType;
- typedef typename Superclass::IndexValueType IndexValueType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::RegionType RegionType;
+ typedef typename Superclass::OffsetType OffsetType;
+ typedef typename Superclass::ImageType ImageType;
+ typedef typename Superclass::PixelContainer PixelContainer;
+ typedef typename Superclass::PixelContainerPointer PixelContainerPointer;
+ typedef typename Superclass::InternalPixelType InternalPixelType;
+ typedef typename Superclass::PixelType PixelType;
+ typedef typename Superclass::AccessorType AccessorType;
+ typedef typename Superclass::IndexValueType IndexValueType;
// Constructors
SubsampledImageRegionIterator()
- : SubsampledImageRegionConstIterator< TImage > () { }
+ : SubsampledImageRegionConstIterator<TImage> () {}
- SubsampledImageRegionIterator ( const ImageType *ptr, const RegionType ®ion )
- : SubsampledImageRegionConstIterator< TImage > ( ptr, region )
- {}
+ SubsampledImageRegionIterator (const ImageType * ptr, const RegionType ®ion)
+ : SubsampledImageRegionConstIterator<TImage> (ptr, region)
+ {}
- SubsampledImageRegionIterator( const itk::ImageIterator<TImage> &it )
- : SubsampledImageRegionConstIterator< TImage > ( it )
- {}
+ SubsampledImageRegionIterator(const itk::ImageIterator<TImage> &it)
+ : SubsampledImageRegionConstIterator<TImage> (it)
+ {}
- SubsampledImageRegionIterator( const itk::ImageConstIterator<TImage> &it )
- : SubsampledImageRegionConstIterator< TImage > ( it )
- {}
+ SubsampledImageRegionIterator(const itk::ImageConstIterator<TImage> &it)
+ : SubsampledImageRegionConstIterator<TImage> (it)
+ {}
/** Set the current pixel value */
- void Set( const PixelType & value) const
+ void Set(const PixelType& value) const
{
- this->m_PixelAccessorFunctor.Set( *(const_cast<InternalPixelType *>(
- this->m_Buffer + this->m_Offset ) ), value );
+ this->m_PixelAccessorFunctor.Set(*(const_cast<InternalPixelType *>(
+ this->m_Buffer + this->m_Offset)), value);
}
- PixelType & Value(void)
+ PixelType& Value(void)
{
- return *(const_cast<InternalPixelType *>(this->m_Buffer+this->m_Offset));
+ return *(const_cast<InternalPixelType *>(this->m_Buffer + this->m_Offset));
}
}; // end of class
@@ -98,5 +98,3 @@ public:
} // end of namespace otb
#endif
-
-
diff --git a/Code/Common/otbSystem.cxx b/Code/Common/otbSystem.cxx
index acac755d37..52b94ca085 100644
--- a/Code/Common/otbSystem.cxx
+++ b/Code/Common/otbSystem.cxx
@@ -20,7 +20,6 @@
#include <string.h> // strdup
#include <ctype.h> //toupper, tolower
-
#if (defined(WIN32) || defined(WIN32CE)) && !defined(__CYGWIN__) && !defined(__MINGW32__)
/*=====================================================================
@@ -39,95 +38,91 @@
#include <dirent.h>
#endif
-
namespace otb
{
-
//GetExtension from uiig library.
std::string
-System::GetExtension( const std::string& filename )
+System::GetExtension(const std::string& filename)
{
// This assumes that the final '.' in a file name is the delimiter
// for the file's extension type
- const std::string::size_type it = filename.find_last_of( "." );
+ const std::string::size_type it = filename.find_last_of(".");
// This determines the file's type by creating a new string
// who's value is the extension of the input filename
// eg. "myimage.gif" has an extension of "gif"
- std::string fileExt( filename, it+1, filename.length() );
+ std::string fileExt(filename, it + 1, filename.length());
- return( fileExt );
+ return (fileExt);
}
//GetRootName from uiig library.
std::string
-System::GetRootName( const std::string& filename )
+System::GetRootName(const std::string& filename)
{
const std::string fileExt = GetExtension(filename);
// Create a base filename
// i.e Image.ent --> Image
- if ( fileExt.length() > 0 )
- {
- const std::string::size_type it = filename.find_last_of( fileExt );
- std::string baseName( filename, 0, it-fileExt.length() );
- return( baseName );
- }
+ if (fileExt.length() > 0)
+ {
+ const std::string::size_type it = filename.find_last_of(fileExt);
+ std::string baseName(filename, 0, it - fileExt.length());
+ return (baseName);
+ }
//Default to return same as input when the extension is nothing (Analyze)
- return( filename );
+ return (filename);
}
bool System::IsAFileName(const std::string& pszPath)
{
- return( ! IsADirName(pszPath) );
+ return (!IsADirName(pszPath));
}
-
//GetPathName.
std::string
-System::GetPathName( const std::string& filename )
+System::GetPathName(const std::string& filename)
{
- const std::string::size_type it = filename.find_last_of( OTB_FILE_SEPARATOR );
- std::string pathName( filename, 0, it );
+ const std::string::size_type it = filename.find_last_of(OTB_FILE_SEPARATOR);
+ std::string pathName(filename, 0, it);
- return( pathName );
+ return (pathName);
}
//GetExtension from uiig library.
std::string
-System::GetShortFileName( const std::string& filename )
+System::GetShortFileName(const std::string& filename)
{
- const std::string::size_type it = filename.find_last_of( OTB_FILE_SEPARATOR );
- std::string shortFileName( filename, it+1, filename.length() );
+ const std::string::size_type it = filename.find_last_of(OTB_FILE_SEPARATOR);
+ std::string shortFileName(filename, it + 1, filename.length());
- return( shortFileName );
+ return (shortFileName);
}
// Set to upper a string
-std::string System::SetToUpper( const std::string& str )
+std::string System::SetToUpper(const std::string& str)
{
std::string lString(str);
- for (unsigned int i=0; i<lString.size(); ++i)
- {
- lString[i]=toupper(lString[i]);
- }
- return(lString);
+ for (unsigned int i = 0; i < lString.size(); ++i)
+ {
+ lString[i] = toupper(lString[i]);
+ }
+ return (lString);
}
// Set to lower a string
-std::string System::SetToLower( const std::string& str )
+std::string System::SetToLower(const std::string& str)
{
std::string lString(str);
- for (unsigned int i=0; i<lString.size(); ++i)
- {
- lString[i]=tolower(lString[i]);
- }
- return(lString);
+ for (unsigned int i = 0; i < lString.size(); ++i)
+ {
+ lString[i] = tolower(lString[i]);
+ }
+ return (lString);
}
-
#if (defined(WIN32) || defined(WIN32CE)) && !defined(__CYGWIN__) && !defined(__MINGW32__)
/*=====================================================================
@@ -137,52 +132,50 @@ std::string System::SetToLower( const std::string& str )
bool System::IsADirName(const std::string& pszPath)
{
struct _finddata_t c_file;
- long hFile;
- bool isADir(false);
- std::string pszFileSpec;
- std::string path(pszPath);
+ long hFile;
+ bool isADir(false);
+ std::string pszFileSpec;
+ std::string path(pszPath);
- if (pszPath.empty() == true)
- path = ".";
+ if (pszPath.empty() == true) path = ".";
pszFileSpec = path + "\\*.*";
- if ( (hFile = _findfirst( pszFileSpec.c_str(), &c_file )) != -1L )
- {
+ if ((hFile = _findfirst(pszFileSpec.c_str(), &c_file)) != -1L)
+ {
isADir = true;
- _findclose( hFile );
- }
+ _findclose(hFile);
+ }
else
- {
+ {
isADir = false;
- }
+ }
return isADir;
}
std::vector<std::string> System::Readdir(const std::string& pszPath)
{
- struct _finddata_t c_file;
- long hFile;
- std::vector<std::string> listFileFind;
- std::string pszFileSpec;
- std::string path(pszPath);
+ struct _finddata_t c_file;
+ long hFile;
+ std::vector<std::string> listFileFind;
+ std::string pszFileSpec;
+ std::string path(pszPath);
- if (pszPath.empty() == true)
- path = ".";
+ if (pszPath.empty() == true) path = ".";
pszFileSpec = path + "\\*.*";
- if ( (hFile = _findfirst( pszFileSpec.c_str(), &c_file )) != -1L )
- {
- do
+ if ((hFile = _findfirst(pszFileSpec.c_str(), &c_file)) != -1L)
{
+ do
+ {
listFileFind.push_back(c_file.name);
- }
- while ( _findnext( hFile, &c_file ) == 0 );
+ }
+ while (_findnext(hFile, &c_file) == 0);
- _findclose( hFile );
- }
+ _findclose(hFile);
+ }
return listFileFind;
}
@@ -195,22 +188,21 @@ std::vector<std::string> System::Readdir(const std::string& pszPath)
bool System::IsADirName(const std::string& pszPath)
{
- bool isADir(false);
- DIR *hDir;
+ bool isADir(false);
+ DIR * hDir;
std::string path(pszPath);
- if (pszPath.empty() == true)
- path = ".";
+ if (pszPath.empty() == true) path = ".";
- if ( (hDir = opendir(path.c_str())) != NULL )
- {
+ if ((hDir = opendir(path.c_str())) != NULL)
+ {
isADir = true;
- closedir( hDir );
- }
+ closedir(hDir);
+ }
else
- {
+ {
isADir = false;
- }
+ }
return isADir;
}
@@ -233,27 +225,25 @@ bool System::IsADirName(const std::string& pszPath)
std::vector<std::string> System::Readdir(const std::string& pszPath)
{
- DIR *hDir;
- std::vector<std::string> listFileFind;
- struct dirent *psDirEntry;
- std::string path(pszPath);
+ DIR * hDir;
+ std::vector<std::string> listFileFind;
+ struct dirent * psDirEntry;
+ std::string path(pszPath);
- if (pszPath.empty() == true)
- path = ".";
+ if (pszPath.empty() == true) path = ".";
- if ( (hDir = opendir(path.c_str())) != NULL )
- {
- while ( (psDirEntry = readdir(hDir)) != NULL )
+ if ((hDir = opendir(path.c_str())) != NULL)
{
+ while ((psDirEntry = readdir(hDir)) != NULL)
+ {
listFileFind.push_back(psDirEntry->d_name);
- }
+ }
- closedir( hDir );
- }
+ closedir(hDir);
+ }
return listFileFind;
}
#endif
-
}
diff --git a/Code/Common/otbSystem.h b/Code/Common/otbSystem.h
index b8f45f9d86..bcc20283a9 100644
--- a/Code/Common/otbSystem.h
+++ b/Code/Common/otbSystem.h
@@ -23,7 +23,6 @@
#include "itkWin32Header.h"
-
#ifdef _WIN
#define OTB_FILE_SEPARATOR '\\'
#else
@@ -33,7 +32,6 @@
namespace otb
{
-
/** \class System
* \brief System operations.
*
@@ -45,24 +43,24 @@ class ITK_EXPORT System
public:
/** Standard class typedefs. */
- typedef System Self;
+ typedef System Self;
/** Return true if the parameter 'pszPath' specify a directory name) */
static bool IsADirName(const std::string& pszPath);
/** Return true if the parameter 'pszPath' specify a file name) */
static bool IsAFileName(const std::string& pszPath);
/** Get the extension of the file name */
- static std::string GetExtension( const std::string& filename );
+ static std::string GetExtension(const std::string& filename);
/** Get the root name */
- static std::string GetRootName( const std::string& filename );
+ static std::string GetRootName(const std::string& filename);
/** Get the Path of the file name */
- static std::string GetPathName( const std::string& filename );
+ static std::string GetPathName(const std::string& filename);
/** Get the short filename of the file name */
- static std::string GetShortFileName( const std::string& filename );
+ static std::string GetShortFileName(const std::string& filename);
/** Set to upper a string */
- static std::string SetToUpper( const std::string& str );
+ static std::string SetToUpper(const std::string& str);
/** Set to upper a string */
- static std::string SetToLower( const std::string& str );
+ static std::string SetToLower(const std::string& str);
/** Get list of file find in a directory */
static std::vector<std::string> Readdir(const std::string& pszPath);
@@ -70,5 +68,4 @@ public:
} // namespace otb
-
#endif
diff --git a/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.h b/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.h
index 08951597f8..e2c78cc38d 100644
--- a/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.h
+++ b/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.h
@@ -34,23 +34,22 @@ namespace otb
*
* \ingroup IntensityImageFilters Multithreaded
*/
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
class ITK_EXPORT UnaryFunctorNeighborhoodImageFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef UnaryFunctorNeighborhoodImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef UnaryFunctorNeighborhoodImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(UnaryFunctorNeighborhoodImageFilter,ImageToImageFilter);
-
+ itkTypeMacro(UnaryFunctorNeighborhoodImageFilter, ImageToImageFilter);
/** Some convenient typedefs. */
typedef TFunction FunctorType;
@@ -67,8 +66,8 @@ public:
typedef itk::ProcessObject ProcessObjectType;
/**Set/Get the radius of neighborhood.*/
- itkSetMacro(Radius,InputImageSizeType);
- itkGetMacro(Radius,InputImageSizeType);
+ itkSetMacro(Radius, InputImageSizeType);
+ itkGetMacro(Radius, InputImageSizeType);
/** Set unsinged int radius */
void SetRadius(unsigned int radius)
@@ -93,7 +92,7 @@ public:
const FunctorType& GetFunctor() const
{
return m_Functor;
- };
+ }
/** Set the functor object. This replaces the current Functor with a
* copy of the specified Functor. This allows the user to specify a
@@ -107,9 +106,9 @@ public:
this->Modified();
}
- typedef itk::ConstNeighborhoodIterator<TInputImage> NeighborhoodIteratorType;
- typedef typename NeighborhoodIteratorType::RadiusType RadiusType;
- typedef unsigned char RadiusSizeType;
+ typedef itk::ConstNeighborhoodIterator<TInputImage> NeighborhoodIteratorType;
+ typedef typename NeighborhoodIteratorType::RadiusType RadiusType;
+ typedef unsigned char RadiusSizeType;
protected:
/**
@@ -119,7 +118,7 @@ protected:
/**
* Destructor
*/
- virtual ~UnaryFunctorNeighborhoodImageFilter() {};
+ virtual ~UnaryFunctorNeighborhoodImageFilter() {}
/** UnaryFunctorNeighborhoodImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -131,7 +130,7 @@ protected:
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
+ virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
/**
* Pad the input requested region by radius
@@ -139,11 +138,11 @@ protected:
virtual void GenerateInputRequestedRegion(void);
private:
- UnaryFunctorNeighborhoodImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ UnaryFunctorNeighborhoodImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
InputImageSizeType m_Radius;
- FunctorType m_Functor;
+ FunctorType m_Functor;
};
} // namespace otb
@@ -152,5 +151,4 @@ private:
#include "otbUnaryFunctorNeighborhoodImageFilter.txx"
#endif
-
#endif
diff --git a/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx b/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx
index adcae919c9..02f78bf613 100644
--- a/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx
+++ b/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx
@@ -32,98 +32,95 @@ namespace otb
/**
* Constructor
*/
-template <class TInputImage, class TOutputImage, class TFunction >
-UnaryFunctorNeighborhoodImageFilter<TInputImage,TOutputImage,TFunction>
+template <class TInputImage, class TOutputImage, class TFunction>
+UnaryFunctorNeighborhoodImageFilter<TInputImage, TOutputImage, TFunction>
::UnaryFunctorNeighborhoodImageFilter()
{
- this->SetNumberOfRequiredInputs( 1 );
+ this->SetNumberOfRequiredInputs(1);
m_Radius.Fill(1);
}
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
-UnaryFunctorNeighborhoodImageFilter<TInputImage,TOutputImage,TFunction>
+UnaryFunctorNeighborhoodImageFilter<TInputImage, TOutputImage, TFunction>
::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- typename Superclass::InputImagePointer inputPtr =
- const_cast< TInputImage * >( this->GetInput());
+ typename Superclass::InputImagePointer inputPtr =
+ const_cast<TInputImage *>(this->GetInput());
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
typename TInputImage::RegionType inputRequestedRegion;
inputRequestedRegion = inputPtr->GetRequestedRegion();
// pad the input requested region by the operator radius
- inputRequestedRegion.PadByRadius( m_Radius );
-
+ inputRequestedRegion.PadByRadius(m_Radius);
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << this->GetNameOfClass()
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
- }
+ }
}
/**
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
UnaryFunctorNeighborhoodImageFilter<TInputImage, TOutputImage, TFunction>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread, int threadId)
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
itk::ZeroFluxNeumannBoundaryCondition<TInputImage> nbc;
// We use dynamic_cast since inputs are stored as DataObjects. The
- // ImageToImageFilter::GetInput(int) always returns a pointer to a
- // TInputImage so it cannot be used for the second input.
+// ImageToImageFilter::GetInput(int) always returns a pointer to a
+// TInputImage so it cannot be used for the second input.
InputImagePointer inputPtr
- = dynamic_cast<const TInputImage*>(ProcessObjectType::GetInput(0));
+ = dynamic_cast<const TInputImage*>(ProcessObjectType::GetInput(0));
OutputImagePointer outputPtr = this->GetOutput(0);
RadiusType r;
- r[0]=m_Radius[0];
- r[1]=m_Radius[1];
+ r[0] = m_Radius[0];
+ r[1] = m_Radius[1];
NeighborhoodIteratorType neighInputIt;
itk::ImageRegionIterator<TOutputImage> outputIt;
-
// Find the data-set boundary "faces"
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage>::FaceListType faceList;
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage> bC;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage> bC;
faceList = bC(inputPtr, outputRegionForThread, r);
-
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage>::FaceListType::iterator fit;
// support progress methods/callbacks
@@ -131,24 +128,24 @@ UnaryFunctorNeighborhoodImageFilter<TInputImage, TOutputImage, TFunction>
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
- for (fit=faceList.begin(); fit != faceList.end(); ++fit)
- {
+ for (fit = faceList.begin(); fit != faceList.end(); ++fit)
+ {
neighInputIt = itk::ConstNeighborhoodIterator<TInputImage>(r, inputPtr, *fit);
outputIt = itk::ImageRegionIterator<TOutputImage>(outputPtr, *fit);
neighInputIt.OverrideBoundaryCondition(&nbc);
neighInputIt.GoToBegin();
- while ( ! outputIt.IsAtEnd() )
- {
+ while (!outputIt.IsAtEnd())
+ {
- outputIt.Set( m_Functor( neighInputIt) );
+ outputIt.Set(m_Functor(neighInputIt));
++neighInputIt;
++outputIt;
progress.CompletedPixel();
+ }
}
- }
}
} // end namespace otb
diff --git a/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h b/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
index 4b3ada3abb..9061db7c74 100644
--- a/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
+++ b/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
@@ -34,23 +34,22 @@ namespace otb
*
* \ingroup IntensityImageFilters Multithreaded
*/
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
class ITK_EXPORT UnaryFunctorNeighborhoodWithOffsetImageFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef UnaryFunctorNeighborhoodWithOffsetImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef UnaryFunctorNeighborhoodWithOffsetImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(UnaryFunctorNeighborhoodWithOffsetImageFilter,ImageToImageFilter);
-
+ itkTypeMacro(UnaryFunctorNeighborhoodWithOffsetImageFilter, ImageToImageFilter);
/** Some convenient typedefs. */
typedef TFunction FunctorType;
@@ -68,8 +67,8 @@ public:
typedef itk::ProcessObject ProcessObjectType;
/**Set/Get the radius of neighborhood.*/
- itkSetMacro(Radius,InputImageSizeType);
- itkGetMacro(Radius,InputImageSizeType);
+ itkSetMacro(Radius, InputImageSizeType);
+ itkGetMacro(Radius, InputImageSizeType);
/** Set unsigned int radius */
void SetRadius(unsigned int radius)
@@ -77,15 +76,14 @@ public:
m_Radius.Fill(radius);
}
-
/** Set/Get the offset */
virtual void SetOffset(InputImageOffsetType off)
{
m_Offset = off;
this->GetFunctor().SetOffset(off);
this->Modified();
- };
- itkGetMacro(Offset,InputImageOffsetType);
+ }
+ itkGetMacro(Offset, InputImageOffsetType);
/** Get the functor object. The functor is returned by reference.
* (Functors do not have to derive from itk::LightObject, so they do
@@ -104,7 +102,7 @@ public:
const FunctorType& GetFunctor() const
{
return m_Functor;
- };
+ }
/** Set the functor object. This replaces the current Functor with a
* copy of the specified Functor. This allows the user to specify a
@@ -118,9 +116,9 @@ public:
this->Modified();
}
- typedef itk::ConstNeighborhoodIterator<TInputImage> NeighborhoodIteratorType;
- typedef typename NeighborhoodIteratorType::RadiusType RadiusType;
- typedef unsigned char RadiusSizeType;
+ typedef itk::ConstNeighborhoodIterator<TInputImage> NeighborhoodIteratorType;
+ typedef typename NeighborhoodIteratorType::RadiusType RadiusType;
+ typedef unsigned char RadiusSizeType;
protected:
/**
@@ -130,7 +128,7 @@ protected:
/**
* Destructor
*/
- virtual ~UnaryFunctorNeighborhoodWithOffsetImageFilter() {};
+ virtual ~UnaryFunctorNeighborhoodWithOffsetImageFilter() {}
virtual void BeforeThreadedGenerateData();
@@ -144,7 +142,7 @@ protected:
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
+ virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
/**
* Pad the input requested region by radius
@@ -153,14 +151,13 @@ protected:
std::vector<FunctorType> m_FunctorList;
private:
- UnaryFunctorNeighborhoodWithOffsetImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ UnaryFunctorNeighborhoodWithOffsetImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
InputImageSizeType m_Radius;
FunctorType m_Functor;
-
InputImageOffsetType m_Offset;
};
@@ -170,5 +167,4 @@ private:
#include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx"
#endif
-
#endif
diff --git a/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx b/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx
index d0c9442bf3..57a5850ab4 100644
--- a/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx
+++ b/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx
@@ -32,48 +32,46 @@ namespace otb
/**
* Constructor
*/
-template <class TInputImage, class TOutputImage, class TFunction >
-UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage,TOutputImage,TFunction>
+template <class TInputImage, class TOutputImage, class TFunction>
+UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage, TOutputImage, TFunction>
::UnaryFunctorNeighborhoodWithOffsetImageFilter()
{
- this->SetNumberOfRequiredInputs( 1 );
+ this->SetNumberOfRequiredInputs(1);
m_Radius.Fill(1);
m_Offset.Fill(1);
m_FunctorList.clear();
}
-
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
-UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage,TOutputImage,TFunction>
+UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage, TOutputImage, TFunction>
::BeforeThreadedGenerateData()
{
Superclass::BeforeThreadedGenerateData();
- for (int i =0; i<this->GetNumberOfThreads(); ++i)
- {
+ for (int i = 0; i < this->GetNumberOfThreads(); ++i)
+ {
m_FunctorList.push_back(m_Functor);
- }
+ }
}
-
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
-UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage,TOutputImage,TFunction>
+UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage, TOutputImage, TFunction>
::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- typename Superclass::InputImagePointer inputPtr =
- const_cast< TInputImage * >( this->GetInput());
+ typename Superclass::InputImagePointer inputPtr =
+ const_cast<TInputImage *>(this->GetInput());
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
typename TInputImage::RegionType inputRequestedRegion;
@@ -82,53 +80,53 @@ UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage,TOutputImage,TFunction
// pad the input requested region by the operator radius
InputImageSizeType maxRad;
maxRad[0] = m_Radius[0] + vcl_abs(m_Offset[0]);
- maxRad[1] = m_Radius[1] + vcl_abs(m_Offset[1]);;
- inputRequestedRegion.PadByRadius( maxRad );
+ maxRad[1] = m_Radius[1] + vcl_abs(m_Offset[1]);
+ inputRequestedRegion.PadByRadius(maxRad);
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << this->GetNameOfClass()
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
- }
+ }
}
/**
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage, TOutputImage, TFunction>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread, int threadId)
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
itk::ZeroFluxNeumannBoundaryCondition<TInputImage> nbc;
itk::ZeroFluxNeumannBoundaryCondition<TInputImage> nbcOff;
// We use dynamic_cast since inputs are stored as DataObjects. The
// ImageToImageFilter::GetInput(int) always returns a pointer to a
// TInputImage so it cannot be used for the second input.
- InputImagePointer inputPtr = dynamic_cast<const TInputImage*>(ProcessObjectType::GetInput(0));
+ InputImagePointer inputPtr = dynamic_cast<const TInputImage*>(ProcessObjectType::GetInput(0));
OutputImagePointer outputPtr = this->GetOutput(0);
itk::ImageRegionIterator<TOutputImage> outputIt;
-
+
// Neighborhood+offset iterator
RadiusType rOff;
rOff[0] = m_Radius[0] + vcl_abs(m_Offset[0]);
@@ -136,7 +134,7 @@ UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage, TOutputImage, TFuncti
NeighborhoodIteratorType neighInputOffIt;
// Find the data-set boundary "faces"
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage>::FaceListType faceListOff;
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage> bCOff;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage> bCOff;
faceListOff = bCOff(inputPtr, outputRegionForThread, rOff);
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage>::FaceListType::iterator fitOff;
@@ -145,10 +143,10 @@ UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage, TOutputImage, TFuncti
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
- fitOff=faceListOff.begin();
+ fitOff = faceListOff.begin();
- while ( fitOff!=faceListOff.end() )
- {
+ while (fitOff != faceListOff.end())
+ {
// Neighborhood+offset iterator
neighInputOffIt = itk::ConstNeighborhoodIterator<TInputImage>(rOff, inputPtr, *fitOff);
neighInputOffIt.OverrideBoundaryCondition(&nbcOff);
@@ -156,17 +154,17 @@ UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage, TOutputImage, TFuncti
outputIt = itk::ImageRegionIterator<TOutputImage>(outputPtr, *fitOff);
- while ( ! outputIt.IsAtEnd() )
- {
+ while (!outputIt.IsAtEnd())
+ {
- outputIt.Set( m_FunctorList[threadId]( neighInputOffIt.GetNeighborhood() ) );
+ outputIt.Set(m_FunctorList[threadId](neighInputOffIt.GetNeighborhood()));
++neighInputOffIt;
++outputIt;
progress.CompletedPixel();
- }
+ }
++fitOff;
- }
+ }
}
} // end namespace otb
diff --git a/Code/Common/otbUnaryFunctorWithIndexImageFilter.h b/Code/Common/otbUnaryFunctorWithIndexImageFilter.h
index ba6f3d68f3..963921f61e 100644
--- a/Code/Common/otbUnaryFunctorWithIndexImageFilter.h
+++ b/Code/Common/otbUnaryFunctorWithIndexImageFilter.h
@@ -33,23 +33,22 @@ namespace otb
*
* \ingroup IntensityImageFilters Multithreaded
*/
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
class ITK_EXPORT UnaryFunctorWithIndexImageFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef UnaryFunctorWithIndexImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef UnaryFunctorWithIndexImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(UnaryFunctorWithIndexImageFilter,ImageToImageFilter);
-
+ itkTypeMacro(UnaryFunctorWithIndexImageFilter, ImageToImageFilter);
/** Some convenient typedefs. */
typedef TFunction FunctorType;
@@ -83,7 +82,7 @@ public:
const FunctorType& GetFunctor() const
{
return m_Functor;
- };
+ }
/** Set the functor object. This replaces the current Functor with a
* copy of the specified Functor. This allows the user to specify a
@@ -97,7 +96,7 @@ public:
this->Modified();
}
- typedef itk::ImageRegionConstIteratorWithIndex<TInputImage> IteratorType;
+ typedef itk::ImageRegionConstIteratorWithIndex<TInputImage> IteratorType;
protected:
/**
@@ -107,7 +106,7 @@ protected:
/**
* Destructor
*/
- virtual ~UnaryFunctorWithIndexImageFilter() {};
+ virtual ~UnaryFunctorWithIndexImageFilter() {}
/** UnaryFunctorWithIndexImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -119,7 +118,7 @@ protected:
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
+ virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
/**
* Pad the input requested region by radius
@@ -127,8 +126,8 @@ protected:
virtual void GenerateInputRequestedRegion(void);
private:
- UnaryFunctorWithIndexImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ UnaryFunctorWithIndexImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
FunctorType m_Functor;
};
@@ -139,5 +138,4 @@ private:
#include "otbUnaryFunctorWithIndexImageFilter.txx"
#endif
-
#endif
diff --git a/Code/Common/otbUnaryFunctorWithIndexImageFilter.txx b/Code/Common/otbUnaryFunctorWithIndexImageFilter.txx
index 4ddb04eb81..d6d0fd0d56 100644
--- a/Code/Common/otbUnaryFunctorWithIndexImageFilter.txx
+++ b/Code/Common/otbUnaryFunctorWithIndexImageFilter.txx
@@ -22,82 +22,81 @@
#include "itkImageRegionIterator.h"
#include "itkProgressReporter.h"
-
namespace otb
{
/**
* Constructor
*/
-template <class TInputImage, class TOutputImage, class TFunction >
-UnaryFunctorWithIndexImageFilter<TInputImage,TOutputImage,TFunction>
+template <class TInputImage, class TOutputImage, class TFunction>
+UnaryFunctorWithIndexImageFilter<TInputImage, TOutputImage, TFunction>
::UnaryFunctorWithIndexImageFilter()
{
- this->SetNumberOfRequiredInputs( 1 );
+ this->SetNumberOfRequiredInputs(1);
}
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
-UnaryFunctorWithIndexImageFilter<TInputImage,TOutputImage,TFunction>
+UnaryFunctorWithIndexImageFilter<TInputImage, TOutputImage, TFunction>
::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- typename Superclass::InputImagePointer inputPtr =
- const_cast< TInputImage * >( this->GetInput());
+ typename Superclass::InputImagePointer inputPtr =
+ const_cast<TInputImage *>(this->GetInput());
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
typename TInputImage::RegionType inputRequestedRegion;
inputRequestedRegion = inputPtr->GetRequestedRegion();
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << this->GetNameOfClass()
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
- }
+ }
}
/**
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
UnaryFunctorWithIndexImageFilter<TInputImage, TOutputImage, TFunction>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread, int threadId)
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
- InputImagePointer inputPtr = dynamic_cast<const TInputImage*>(ProcessObjectType::GetInput(0));
+ InputImagePointer inputPtr = dynamic_cast<const TInputImage*>(ProcessObjectType::GetInput(0));
OutputImagePointer outputPtr = this->GetOutput(0);
InputImageRegionType inputRegionForThread;
this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
-
+
// Define the iterators
- IteratorType inputIt = IteratorType(inputPtr, inputRegionForThread);
+ IteratorType inputIt = IteratorType(inputPtr, inputRegionForThread);
itk::ImageRegionIterator<TOutputImage> outputIt(outputPtr, outputRegionForThread);
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
@@ -105,14 +104,14 @@ UnaryFunctorWithIndexImageFilter<TInputImage, TOutputImage, TFunction>
inputIt.GoToBegin();
outputIt.GoToBegin();
- while( !inputIt.IsAtEnd() )
+ while (!inputIt.IsAtEnd())
{
- outputIt.Set( m_Functor( inputIt.Get(), inputIt.GetIndex() ) );
- ++inputIt;
- ++outputIt;
- progress.CompletedPixel(); // potential exception thrown here
+ outputIt.Set(m_Functor(inputIt.Get(), inputIt.GetIndex()));
+ ++inputIt;
+ ++outputIt;
+ progress.CompletedPixel(); // potential exception thrown here
}
-
+
}
} // end namespace otb
diff --git a/Code/Common/otbVectorData.h b/Code/Common/otbVectorData.h
index 8ebdf86e54..65f5638301 100644
--- a/Code/Common/otbVectorData.h
+++ b/Code/Common/otbVectorData.h
@@ -51,42 +51,40 @@ namespace otb
* \sa VectorDataFileWriter
*
*/
-template <class TPrecision = double, unsigned int VDimension =2, class TValuePrecision = double>
+template <class TPrecision = double, unsigned int VDimension = 2, class TValuePrecision = double>
class VectorData
- : public itk::DataObject
+ : public itk::DataObject
{
public:
/** Standard class typedefs */
- typedef VectorData Self;
- typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef VectorData Self;
+ typedef itk::DataObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
-
/** Standard macros */
itkNewMacro(Self);
- itkTypeMacro(VectorData,DataObject);
+ itkTypeMacro(VectorData, DataObject);
itkStaticConstMacro(Dimension, unsigned int, VDimension);
/** Template parameters typedef */
- typedef TPrecision PrecisionType;
+ typedef TPrecision PrecisionType;
typedef TValuePrecision ValuePrecisionType;
//define VDimension Dimension;
- typedef otb::DataNode<TPrecision,VDimension,TValuePrecision> DataNodeType;
- typedef typename DataNodeType::Pointer DataNodePointerType;
- typedef itk::TreeContainer<DataNodePointerType> DataTreeType;
- typedef typename DataTreeType::Pointer DataTreePointerType;
+ typedef otb::DataNode<TPrecision, VDimension, TValuePrecision> DataNodeType;
+ typedef typename DataNodeType::Pointer DataNodePointerType;
+ typedef itk::TreeContainer<DataNodePointerType> DataTreeType;
+ typedef typename DataTreeType::Pointer DataTreePointerType;
- typedef typename DataNodeType::PointType PointType;
- typedef typename DataNodeType::LineType LineType;
+ typedef typename DataNodeType::PointType PointType;
+ typedef typename DataNodeType::LineType LineType;
typedef typename DataNodeType::PolygonType PolygonType;
-
typedef itk::Vector<double, 2> SpacingType;
- typedef itk::Point<double, 2> OriginType;
+ typedef itk::Point<double, 2> OriginType;
- itkGetObjectMacro(DataTree,DataTreeType);
- itkGetConstObjectMacro(DataTree,DataTreeType);
+ itkGetObjectMacro(DataTree, DataTreeType);
+ itkGetConstObjectMacro(DataTree, DataTreeType);
virtual void SetProjectionRef(std::string projectionRef);
virtual std::string GetProjectionRef() const;
@@ -95,22 +93,20 @@ public:
* image coordinates
* \sa GetOrigin() */
itkSetMacro(Origin, OriginType);
- virtual void SetOrigin( const double origin[2] );
- virtual void SetOrigin( const float origin[2] );
+ virtual void SetOrigin(const double origin[2]);
+ virtual void SetOrigin(const float origin[2]);
itkGetConstReferenceMacro(Origin, OriginType);
-
/** Set the spacing of the vector data to put it in the corresponding
* image coordinates
* \sa GetSpacing() */
- virtual void SetSpacing( const SpacingType & spacing );
- virtual void SetSpacing( const double spacing[2] );
- virtual void SetSpacing( const float spacing[2] );
+ virtual void SetSpacing(const SpacingType& spacing);
+ virtual void SetSpacing(const double spacing[2]);
+ virtual void SetSpacing(const float spacing[2]);
itkGetConstReferenceMacro(Spacing, SpacingType);
-
/** Clear the vector data */
virtual bool Clear();
@@ -127,27 +123,24 @@ protected:
/** Constructor */
VectorData();
/** Destructor */
- virtual ~VectorData() {};
+ virtual ~VectorData() {}
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
VectorData(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Data tree */
DataTreePointerType m_DataTree;
-
- SpacingType m_Spacing;
- OriginType m_Origin;
+ SpacingType m_Spacing;
+ OriginType m_Origin;
};
-}// end namespace otb
-
+} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbVectorData.txx"
#endif
#endif
-
diff --git a/Code/Common/otbVectorData.txx b/Code/Common/otbVectorData.txx
index 0070cbb162..ea804149ac 100644
--- a/Code/Common/otbVectorData.txx
+++ b/Code/Common/otbVectorData.txx
@@ -26,7 +26,7 @@ namespace otb
{
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
-VectorData<TPrecision,VDimension,TValuePrecision>
+VectorData<TPrecision, VDimension, TValuePrecision>
::VectorData()
{
m_DataTree = DataTreeType::New();
@@ -39,89 +39,84 @@ VectorData<TPrecision,VDimension,TValuePrecision>
template<class TPrecision, unsigned int VDimension, class TValuePrecision>
void
-VectorData<TPrecision,VDimension,TValuePrecision>
+VectorData<TPrecision, VDimension, TValuePrecision>
::SetProjectionRef(std::string projectionRef)
{
- itk::MetaDataDictionary & dict = this->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = this->GetMetaDataDictionary();
- itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef );
+ itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef);
this->Modified();
}
template<class TPrecision, unsigned int VDimension, class TValuePrecision>
std::string
-VectorData<TPrecision,VDimension,TValuePrecision>
+VectorData<TPrecision, VDimension, TValuePrecision>
::GetProjectionRef() const
{
- const itk::MetaDataDictionary & dict = this->GetMetaDataDictionary();
+ const itk::MetaDataDictionary& dict = this->GetMetaDataDictionary();
std::string projectionRef;
- itk::ExposeMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef );
+ itk::ExposeMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef);
return projectionRef;
}
-
template<class TPrecision, unsigned int VDimension, class TValuePrecision>
- void
- VectorData<TPrecision,VDimension,TValuePrecision>
- ::SetSpacing(const SpacingType & spacing )
+void
+VectorData<TPrecision, VDimension, TValuePrecision>
+::SetSpacing(const SpacingType& spacing)
{
itkDebugMacro("setting Spacing to " << spacing);
- if ( this->m_Spacing != spacing )
- {
+ if (this->m_Spacing != spacing)
+ {
this->m_Spacing = spacing;
this->Modified();
- }
+ }
}
-
template<class TPrecision, unsigned int VDimension, class TValuePrecision>
- void
- VectorData<TPrecision,VDimension,TValuePrecision>
- ::SetSpacing(const double spacing[2] )
+void
+VectorData<TPrecision, VDimension, TValuePrecision>
+::SetSpacing(const double spacing[2])
{
SpacingType s(spacing);
this->SetSpacing(s);
}
-
template<class TPrecision, unsigned int VDimension, class TValuePrecision>
- void
- VectorData<TPrecision,VDimension,TValuePrecision>
- ::SetSpacing(const float spacing[2] )
+void
+VectorData<TPrecision, VDimension, TValuePrecision>
+::SetSpacing(const float spacing[2])
{
itk::Vector<float, 2> sf(spacing);
SpacingType s;
- s.CastFrom( sf );
+ s.CastFrom(sf);
this->SetSpacing(s);
}
template<class TPrecision, unsigned int VDimension, class TValuePrecision>
- void
- VectorData<TPrecision,VDimension,TValuePrecision>
- ::SetOrigin(const double origin[2] )
+void
+VectorData<TPrecision, VDimension, TValuePrecision>
+::SetOrigin(const double origin[2])
{
OriginType p(origin);
- this->SetOrigin( p );
+ this->SetOrigin(p);
}
-
template<class TPrecision, unsigned int VDimension, class TValuePrecision>
- void
- VectorData<TPrecision,VDimension,TValuePrecision>
- ::SetOrigin(const float origin[2] )
+void
+VectorData<TPrecision, VDimension, TValuePrecision>
+::SetOrigin(const float origin[2])
{
itk::Point<float, 2> of(origin);
OriginType p;
- p.CastFrom( of );
- this->SetOrigin( p );
+ p.CastFrom(of);
+ this->SetOrigin(p);
}
-
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
bool
-VectorData<TPrecision,VDimension,TValuePrecision>
+VectorData<TPrecision, VDimension, TValuePrecision>
::Clear()
{
return m_DataTree->Clear();
@@ -129,7 +124,7 @@ VectorData<TPrecision,VDimension,TValuePrecision>
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
int
-VectorData<TPrecision,VDimension,TValuePrecision>
+VectorData<TPrecision, VDimension, TValuePrecision>
::Size() const
{
return m_DataTree->Count();
@@ -137,27 +132,27 @@ VectorData<TPrecision,VDimension,TValuePrecision>
template <class TPrecision, unsigned int VDimension, class TValuePrecision>
void
-VectorData<TPrecision,VDimension,TValuePrecision>
+VectorData<TPrecision, VDimension, TValuePrecision>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << std::endl;
itk::PreOrderTreeIterator<DataTreeType> it(m_DataTree);
it.GoToBegin();
while (!it.IsAtEnd())
- {
- itk::PreOrderTreeIterator<DataTreeType> itParent = it;
- bool goesOn = true;
- while (itParent.HasParent() && goesOn )
{
- os<<indent;
+ itk::PreOrderTreeIterator<DataTreeType> itParent = it;
+ bool goesOn = true;
+ while (itParent.HasParent() && goesOn)
+ {
+ os << indent;
goesOn = itParent.GoToParent();
- }
- os<<"+"<<it.Get()->GetNodeTypeAsString()<<std::endl;
+ }
+ os << "+" << it.Get()->GetNodeTypeAsString() << std::endl;
++it;
- }
+ }
}
} // end namespace otb
diff --git a/Code/Common/otbVectorDataExtractROI.h b/Code/Common/otbVectorDataExtractROI.h
index b422b1c457..e2b76baa16 100644
--- a/Code/Common/otbVectorDataExtractROI.h
+++ b/Code/Common/otbVectorDataExtractROI.h
@@ -45,106 +45,101 @@ namespace otb
* \example Projections/VectorDataExtractROIExample.cxx
*/
template <class TVectorData>
-class ITK_EXPORT VectorDataExtractROI:
- public VectorDataToVectorDataFilter<TVectorData ,TVectorData >
+class ITK_EXPORT VectorDataExtractROI :
+ public VectorDataToVectorDataFilter<TVectorData, TVectorData>
{
public:
/** Standard class typedefs. */
- typedef VectorDataExtractROI Self;
- typedef VectorDataToVectorDataFilter<TVectorData ,TVectorData > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef VectorDataExtractROI Self;
+ typedef VectorDataToVectorDataFilter<TVectorData, TVectorData> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(VectorDataExtractROI,VectorDataToVectorDataFilter);
+ itkTypeMacro(VectorDataExtractROI, VectorDataToVectorDataFilter);
/** Image type information*/
- typedef TVectorData VectorDataType;
- typedef typename VectorDataType::DataNodeType DataNodeType;
- typedef typename DataNodeType::Pointer DataNodePointerType;
- typedef typename VectorDataType::DataTreeType DataTreeType;
- typedef typename DataNodeType::PolygonPointerType PolygonPointerType;
- typedef typename DataNodeType::PolygonType PolygonType;
- typedef typename DataNodeType::LinePointerType LinePointerType;
- typedef typename DataNodeType::PointType PointType;
+ typedef TVectorData VectorDataType;
+ typedef typename VectorDataType::DataNodeType DataNodeType;
+ typedef typename DataNodeType::Pointer DataNodePointerType;
+ typedef typename VectorDataType::DataTreeType DataTreeType;
+ typedef typename DataNodeType::PolygonPointerType PolygonPointerType;
+ typedef typename DataNodeType::PolygonType PolygonType;
+ typedef typename DataNodeType::LinePointerType LinePointerType;
+ typedef typename DataNodeType::PointType PointType;
/** Need Vertex and Vertex List Type*/
- typedef typename PolygonType::VertexType VertexType;
- typedef typename PolygonType::VertexListType VertexListType;
- typedef typename PolygonType::VertexListPointer VertexListPointer;
-
+ typedef typename PolygonType::VertexType VertexType;
+ typedef typename PolygonType::VertexListType VertexListType;
+ typedef typename PolygonType::VertexListPointer VertexListPointer;
/** TODO : automatize the dimension of the region*/
- typedef otb::RemoteSensingRegion<typename VertexType::CoordRepType> RegionType;
- typedef typename RegionType::IndexType IndexType;
- typedef typename RegionType::SizeType SizeType;
+ typedef otb::RemoteSensingRegion<typename VertexType::CoordRepType> RegionType;
+ typedef typename RegionType::IndexType IndexType;
+ typedef typename RegionType::SizeType SizeType;
- typedef itk::Point<typename VertexType::CoordRepType ,IndexType::IndexDimension> ProjPointType;
+ typedef itk::Point<typename VertexType::CoordRepType, IndexType::IndexDimension> ProjPointType;
typedef itk::PreOrderTreeIterator<typename VectorDataType::DataTreeType> InputTreeIteratorType;
- typedef typename VectorDataType::DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
-
+ typedef typename VectorDataType::DataTreeType::TreeNodeType InternalTreeNodeType;
+ typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
/** Method to Set/Get the Region of intereset*/
- void SetRegion(const RegionType& region)
- {
- m_ROI = region;
- }
+ void SetRegion(const RegionType& region)
+ {
+ m_ROI = region;
+ }
- const RegionType & GetRegion()
- {return m_ROI;}
+ const RegionType& GetRegion()
+ {return m_ROI; }
itkSetStringMacro(DEMDirectory);
itkGetStringMacro(DEMDirectory);
protected:
VectorDataExtractROI();
- virtual ~VectorDataExtractROI() {};
+ virtual ~VectorDataExtractROI() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
- /** Method to compare the projection embedded in the cartoRegion And the the InputVectorData*/
- virtual void CompareInputAndRegionProjection();
+ /** Method to compare the projection embedded in the cartoRegion And the the InputVectorData*/
+ virtual void CompareInputAndRegionProjection();
- /** Method to project from carto reference to Geo axis*/
- virtual void ProjectRegionToInputVectorProjection();
+ /** Method to project from carto reference to Geo axis*/
+ virtual void ProjectRegionToInputVectorProjection();
- /** Improve the Projected roi*/
- virtual RegionType ComputeVertexListBoundingRegion(typename VertexListType::ConstPointer vertexlist);
+ /** Improve the Projected roi*/
+ virtual RegionType ComputeVertexListBoundingRegion(typename VertexListType::ConstPointer vertexlist);
- /** Method to transform itk::Point to itk::ContinuousIndex*/
- virtual VertexType PointToContinuousIndex(ProjPointType point);
+ /** Method to transform itk::Point to itk::ContinuousIndex*/
+ virtual VertexType PointToContinuousIndex(ProjPointType point);
/** Prototype of the generate data method*/
- virtual void GenerateData(void );
+ virtual void GenerateData(void);
/** Method to check if the polygon Bounding Box ha ve a non-null intersection with the ROI*/
- virtual bool IsPolygonIntersectionNotNull(PolygonPointerType polygon);
-
- /** Method to check if the line Bounding Box ha ve a non-null intersection with the ROI*/
- virtual bool IsLineIntersectionNotNull(LinePointerType line);
+ virtual bool IsPolygonIntersectionNotNull(PolygonPointerType polygon);
+ /** Method to check if the line Bounding Box ha ve a non-null intersection with the ROI*/
+ virtual bool IsLineIntersectionNotNull(LinePointerType line);
virtual void ProcessNode(InternalTreeNodeType * source, InternalTreeNodeType * destination);
private:
- VectorDataExtractROI(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorDataExtractROI(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
-
- bool m_ProjectionNeeded;
- RegionType m_ROI;
- RegionType m_GeoROI;
- std::string m_DEMDirectory;
+ bool m_ProjectionNeeded;
+ RegionType m_ROI;
+ RegionType m_GeoROI;
+ std::string m_DEMDirectory;
unsigned int m_Kept;
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Common/otbVectorDataExtractROI.txx b/Code/Common/otbVectorDataExtractROI.txx
index c5f1e9d064..282fac9f72 100644
--- a/Code/Common/otbVectorDataExtractROI.txx
+++ b/Code/Common/otbVectorDataExtractROI.txx
@@ -30,7 +30,6 @@
#include "itkProgressReporter.h"
#include "itkTimeProbe.h"
-
namespace otb
{
@@ -40,11 +39,11 @@ namespace otb
template <class TVectorData>
VectorDataExtractROI<TVectorData>
::VectorDataExtractROI() :
- m_ProjectionNeeded(false),
- m_ROI(),
- m_GeoROI(),
- m_DEMDirectory(""),
- m_Kept(0)
+ m_ProjectionNeeded(false),
+ m_ROI(),
+ m_GeoROI(),
+ m_DEMDirectory(""),
+ m_Kept(0)
{
}
@@ -56,7 +55,7 @@ void
VectorDataExtractROI<TVectorData>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
/**
@@ -71,28 +70,26 @@ VectorDataExtractROI<TVectorData>
typename VectorDataType::ConstPointer inputPtr = this->GetInput();
typename VectorDataType::Pointer outputPtr = this->GetOutput();
-
// Find out the projection needed
- if(!inputPtr->GetProjectionRef().empty())
- outputPtr->SetProjectionRef(inputPtr->GetProjectionRef());
+ if (!inputPtr->GetProjectionRef().empty()) outputPtr->SetProjectionRef(inputPtr->GetProjectionRef());
/** Need to check if it is necessary to project the roi*/
this->CompareInputAndRegionProjection();
/** If Projection of the region is needed, we project on the vectorData coordinate axis*/
- if(m_ProjectionNeeded)
+ if (m_ProjectionNeeded)
{
- otbMsgDevMacro( << "Reprojecting region in vector data projection");
+ otbMsgDevMacro(<< "Reprojecting region in vector data projection");
this->ProjectRegionToInputVectorProjection();
}
else
{
- otbMsgDevMacro( << "Region and vector data projection are similar");
+ otbMsgDevMacro(<< "Region and vector data projection are similar");
m_GeoROI = m_ROI;
}
- otbMsgDevMacro( << "ROI: " << this->m_ROI);
- otbMsgDevMacro( << "GeoROI: " << this->m_GeoROI);
+ otbMsgDevMacro(<< "ROI: " << this->m_ROI);
+ otbMsgDevMacro(<< "GeoROI: " << this->m_GeoROI);
// Retrieve the output tree
typename VectorDataType::DataTreePointerType tree = outputPtr->GetDataTree();
@@ -105,7 +102,6 @@ VectorDataExtractROI<TVectorData>
newDataNode->SetNodeType(inputRoot->Get()->GetNodeType());
newDataNode->SetNodeId(inputRoot->Get()->GetNodeId());
-
typename InternalTreeNodeType::Pointer outputRoot = InternalTreeNodeType::New();
outputRoot->Set(newDataNode);
tree->SetRoot(outputRoot);
@@ -115,11 +111,11 @@ VectorDataExtractROI<TVectorData>
// Start recursive processing
itk::TimeProbe chrono;
chrono.Start();
- ProcessNode(inputRoot,outputRoot);
+ ProcessNode(inputRoot, outputRoot);
chrono.Stop();
- otbMsgDevMacro(<<"VectorDataExtractROI: "<<m_Kept<<" Features processed in "<<chrono.GetMeanTime()<<" seconds.");
-}/*End GenerateData()*/
-
+ otbMsgDevMacro(
+ << "VectorDataExtractROI: " << m_Kept << " Features processed in " << chrono.GetMeanTime() << " seconds.");
+} /*End GenerateData()*/
template <class TVectorData>
void
@@ -129,8 +125,8 @@ VectorDataExtractROI<TVectorData>
// Get the children list from the input node
ChildrenListType children = source->GetChildrenList();
// For each child
- for(typename ChildrenListType::iterator it = children.begin(); it!=children.end();++it)
- {
+ for (typename ChildrenListType::iterator it = children.begin(); it != children.end(); ++it)
+ {
typename InternalTreeNodeType::Pointer newContainer;
DataNodePointerType dataNode = (*it)->Get();
@@ -139,110 +135,110 @@ VectorDataExtractROI<TVectorData>
newDataNode->SetNodeId(dataNode->GetNodeId());
newDataNode->SetMetaDataDictionary(dataNode->GetMetaDataDictionary());
- switch(dataNode->GetNodeType())
- {
- case ROOT:
+ switch (dataNode->GetNodeType())
{
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it),newContainer);
- ++m_Kept;
- break;
- }
- case DOCUMENT:
+ case ROOT:
{
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ++m_Kept;
- ProcessNode((*it),newContainer);
- break;
+ newContainer = InternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ ProcessNode((*it), newContainer);
+ ++m_Kept;
+ break;
}
- case FOLDER:
+ case DOCUMENT:
{
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ++m_Kept;
- ProcessNode((*it),newContainer);
- break;
- }
- case FEATURE_POINT:
- {
- if(m_GeoROI.IsInside(this->PointToContinuousIndex(dataNode->GetPoint())))
- {
- newDataNode->SetPoint(dataNode->GetPoint());
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ++m_Kept;
- }
- break;
+ newContainer = InternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ ++m_Kept;
+ ProcessNode((*it), newContainer);
+ break;
}
- case FEATURE_LINE:
+ case FOLDER:
{
- if(this->IsLineIntersectionNotNull(dataNode->GetLine()))
- {
- newDataNode->SetLine(dataNode->GetLine());
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ++m_Kept;
- }
- break;
+ newContainer = InternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ ++m_Kept;
+ ProcessNode((*it), newContainer);
+ break;
}
- case FEATURE_POLYGON:
+ case FEATURE_POINT:
{
- if(this->IsPolygonIntersectionNotNull(dataNode->GetPolygonExteriorRing()))
+ if (m_GeoROI.IsInside(this->PointToContinuousIndex(dataNode->GetPoint())))
{
- newDataNode->SetPolygonExteriorRing(dataNode->GetPolygonExteriorRing());
- newDataNode->SetPolygonInteriorRings(dataNode->GetPolygonInteriorRings());
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ++m_Kept;
- }
- break;
- }
- case FEATURE_MULTIPOINT:
- {
+ newDataNode->SetPoint(dataNode->GetPoint());
newContainer = InternalTreeNodeType::New();
newContainer->Set(newDataNode);
destination->AddChild(newContainer);
++m_Kept;
- ProcessNode((*it),newContainer);
- break;
+ }
+ break;
}
- case FEATURE_MULTILINE:
+ case FEATURE_LINE:
{
+ if (this->IsLineIntersectionNotNull(dataNode->GetLine()))
+ {
+ newDataNode->SetLine(dataNode->GetLine());
newContainer = InternalTreeNodeType::New();
newContainer->Set(newDataNode);
destination->AddChild(newContainer);
++m_Kept;
- ProcessNode((*it),newContainer);
- break;
+ }
+ break;
}
- case FEATURE_MULTIPOLYGON:
+ case FEATURE_POLYGON:
{
+ if (this->IsPolygonIntersectionNotNull(dataNode->GetPolygonExteriorRing()))
+ {
+ newDataNode->SetPolygonExteriorRing(dataNode->GetPolygonExteriorRing());
+ newDataNode->SetPolygonInteriorRings(dataNode->GetPolygonInteriorRings());
newContainer = InternalTreeNodeType::New();
newContainer->Set(newDataNode);
destination->AddChild(newContainer);
++m_Kept;
- ProcessNode((*it),newContainer);
- break;
+ }
+ break;
}
- case FEATURE_COLLECTION:
+ case FEATURE_MULTIPOINT:
{
- newContainer = InternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ++m_Kept;
- ProcessNode((*it),newContainer);
- break;
+ newContainer = InternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ ++m_Kept;
+ ProcessNode((*it), newContainer);
+ break;
+ }
+ case FEATURE_MULTILINE:
+ {
+ newContainer = InternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ ++m_Kept;
+ ProcessNode((*it), newContainer);
+ break;
+ }
+ case FEATURE_MULTIPOLYGON:
+ {
+ newContainer = InternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ ++m_Kept;
+ ProcessNode((*it), newContainer);
+ break;
+ }
+ case FEATURE_COLLECTION:
+ {
+ newContainer = InternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ ++m_Kept;
+ ProcessNode((*it), newContainer);
+ break;
+ }
}
}
- }
}
/**
@@ -284,10 +280,8 @@ VectorDataExtractROI<TVectorData>
//FIXME: the string comparison is not sufficient to say that two
//projections are different
- if(regionProjection == inputVectorProjection)
- m_ProjectionNeeded = false;
- else
- m_ProjectionNeeded = true;
+ if (regionProjection == inputVectorProjection) m_ProjectionNeeded = false;
+ else m_ProjectionNeeded = true;
}
/**
@@ -299,14 +293,14 @@ VectorDataExtractROI<TVectorData>
::ProjectRegionToInputVectorProjection()
{
/* Use the RS Generic projection */
- typedef otb::GenericRSTransform<> GenericRSTransformType;
+ typedef otb::GenericRSTransform<> GenericRSTransformType;
typename GenericRSTransformType::Pointer genericTransform = GenericRSTransformType::New();
/** Set up the projection */
- genericTransform->SetInputProjectionRef( m_ROI.GetRegionProjection());
+ genericTransform->SetInputProjectionRef(m_ROI.GetRegionProjection());
genericTransform->SetInputKeywordList(m_ROI.GetKeywordList());
- genericTransform->SetOutputProjectionRef(this->GetInput()->GetProjectionRef() );
- const itk::MetaDataDictionary &inputDict = this->GetInput()->GetMetaDataDictionary();
+ genericTransform->SetOutputProjectionRef(this->GetInput()->GetProjectionRef());
+ const itk::MetaDataDictionary& inputDict = this->GetInput()->GetMetaDataDictionary();
genericTransform->SetOutputDictionary(inputDict);
genericTransform->SetOutputOrigin(this->GetInput()->GetOrigin());
genericTransform->SetOutputSpacing(this->GetInput()->GetSpacing());
@@ -314,29 +308,33 @@ VectorDataExtractROI<TVectorData>
genericTransform->InstanciateTransform();
- otbMsgDevMacro( << genericTransform );
+ otbMsgDevMacro(<< genericTransform);
- typename VertexListType::Pointer regionCorners = VertexListType::New();
- ProjPointType point1, point2 , point3, point4;
+ typename VertexListType::Pointer regionCorners = VertexListType::New();
+ ProjPointType point1, point2, point3, point4;
/** Compute the extremities of the region*/
point1[0] = m_ROI.GetOrigin()[0];
point1[1] = m_ROI.GetOrigin()[1];
- point2[0] = m_ROI.GetOrigin()[0]+ m_ROI.GetSize()[0];
+ point2[0] = m_ROI.GetOrigin()[0] + m_ROI.GetSize()[0];
point2[1] = m_ROI.GetOrigin()[1];
- point3[0] = m_ROI.GetOrigin()[0]+ m_ROI.GetSize()[0];
- point3[1] = m_ROI.GetOrigin()[1]+ m_ROI.GetSize()[1];
+ point3[0] = m_ROI.GetOrigin()[0] + m_ROI.GetSize()[0];
+ point3[1] = m_ROI.GetOrigin()[1] + m_ROI.GetSize()[1];
point4[0] = m_ROI.GetOrigin()[0];
- point4[1] = m_ROI.GetOrigin()[1]+ m_ROI.GetSize()[1];
+ point4[1] = m_ROI.GetOrigin()[1] + m_ROI.GetSize()[1];
/** Fill the vertex List : First Convert Point To*/
- regionCorners->InsertElement(regionCorners->Size(),this->PointToContinuousIndex(genericTransform->TransformPoint(point1)));
- regionCorners->InsertElement(regionCorners->Size(),this->PointToContinuousIndex(genericTransform->TransformPoint(point2)));
- regionCorners->InsertElement(regionCorners->Size(),this->PointToContinuousIndex(genericTransform->TransformPoint(point3)));
- regionCorners->InsertElement(regionCorners->Size(),this->PointToContinuousIndex(genericTransform->TransformPoint(point4)));
+ regionCorners->InsertElement(regionCorners->Size(),
+ this->PointToContinuousIndex(genericTransform->TransformPoint(point1)));
+ regionCorners->InsertElement(regionCorners->Size(),
+ this->PointToContinuousIndex(genericTransform->TransformPoint(point2)));
+ regionCorners->InsertElement(regionCorners->Size(),
+ this->PointToContinuousIndex(genericTransform->TransformPoint(point3)));
+ regionCorners->InsertElement(regionCorners->Size(),
+ this->PointToContinuousIndex(genericTransform->TransformPoint(point4)));
/** Due to The projection : the Projected ROI can be rotated */
m_GeoROI = this->ComputeVertexListBoundingRegion(regionCorners.GetPointer());
@@ -349,7 +347,7 @@ template <class TVectorData>
typename VectorDataExtractROI<TVectorData>
::VertexType
VectorDataExtractROI<TVectorData>
-::PointToContinuousIndex(ProjPointType point)
+::PointToContinuousIndex(ProjPointType point)
{
VertexType vertex;
@@ -369,10 +367,10 @@ typename VectorDataExtractROI<TVectorData>
VectorDataExtractROI<TVectorData>
::ComputeVertexListBoundingRegion(typename VertexListType::ConstPointer vertexlist)
{
- double x = 0.,y = 0.;
- IndexType index;
- IndexType maxId;
- SizeType size;
+ double x = 0., y = 0.;
+ IndexType index;
+ IndexType maxId;
+ SizeType size;
index.Fill(0.);
maxId.Fill(0.);
@@ -380,55 +378,54 @@ VectorDataExtractROI<TVectorData>
typename VertexListType::ConstIterator it = vertexlist->Begin();
- if (vertexlist->Size() > 0 )
+ if (vertexlist->Size() > 0)
{
+ x = static_cast<double>(it.Value()[0]);
+ y = static_cast<double>(it.Value()[1]);
+ index[0] = x;
+ index[1] = y;
+ maxId[0] = x;
+ maxId[1] = y;
+
+ ++it;
+ while (it != vertexlist->End())
+ {
x = static_cast<double>(it.Value()[0]);
y = static_cast<double>(it.Value()[1]);
- index[0] = x;
- index[1] = y;
- maxId[0] = x;
- maxId[1] = y;
- ++it;
- while (it != vertexlist->End())
+ // Index search
+ if (x < index[0])
+ {
+ index[0] = x;
+ }
+ if (y > index[1])
+ {
+ index[1] = y;
+ }
+ // Max Id search for size computation
+ if (x > maxId[0])
{
- x = static_cast<double>(it.Value()[0]);
- y = static_cast<double>(it.Value()[1]);
-
- // Index search
- if ( x < index[0] )
- {
- index[0] = x;
- }
- if ( y > index[1] )
- {
- index[1] = y;
- }
- // Max Id search for size computation
- if ( x > maxId[0] )
- {
- maxId[0] = x;
- }
- if ( y < maxId[1] )
- {
- maxId[1] = y;
- }
-
- ++it;
+ maxId[0] = x;
+ }
+ if (y < maxId[1])
+ {
+ maxId[1] = y;
}
- size[0] = maxId[0] - index[0];
- size[1] = maxId[1] - index[1];
- }
+ ++it;
+ }
- RegionType region;
+ size[0] = maxId[0] - index[0];
+ size[1] = maxId[1] - index[1];
+ }
+
+ RegionType region;
region.SetSize(size);
region.SetOrigin(index);
return region;
}
-
} // end namespace otb
#endif
diff --git a/Code/Common/otbVectorDataProperties.h b/Code/Common/otbVectorDataProperties.h
index ca10f7a408..05aaa39269 100644
--- a/Code/Common/otbVectorDataProperties.h
+++ b/Code/Common/otbVectorDataProperties.h
@@ -33,70 +33,68 @@ namespace otb
* \sa VectorData
*/
-
-template <class TVectorData >
+template <class TVectorData>
class ITK_EXPORT VectorDataProperties : public itk::DataObject
{
- public:
- /** Standard class typedefs. */
- typedef VectorDataProperties Self;
- typedef itk::LightObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
-
- /** Convenient typedefs */
- typedef TVectorData VectorDataType;
- typedef typename VectorDataType::Pointer VectorDataPointerType;
- typedef typename VectorDataType::ConstPointer InputVectorDataConstPointer;
- typedef typename VectorDataType::DataNodeType DataNodeType;
- typedef typename DataNodeType::Pointer DataNodePointerType;
- typedef typename DataNodeType::PolygonType PolygonType;
-
- typedef typename VectorDataType::DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
-
- typedef typename PolygonType::RegionType RegionType;
- typedef typename RegionType::Pointer RegionPointerType;
- typedef typename RegionType::IndexType IndexType;
- typedef typename RegionType::SizeType SizeType;
- typedef typename RegionType::Type Type;
- /** Method for creation through the object factory. */
- itkNewMacro(Self);
-
- /** Run-time type information (and related methods). */
- itkTypeMacro(VectorDataProperties, LightObject);
-
- /** Number of dimensions. */
- itkStaticConstMacro(VectorDataDimension, unsigned int,
- TVectorData::Dimension);
-
- /** Get/Set the VectorData. */
+public:
+ /** Standard class typedefs. */
+ typedef VectorDataProperties Self;
+ typedef itk::LightObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ /** Convenient typedefs */
+ typedef TVectorData VectorDataType;
+ typedef typename VectorDataType::Pointer VectorDataPointerType;
+ typedef typename VectorDataType::ConstPointer InputVectorDataConstPointer;
+ typedef typename VectorDataType::DataNodeType DataNodeType;
+ typedef typename DataNodeType::Pointer DataNodePointerType;
+ typedef typename DataNodeType::PolygonType PolygonType;
+
+ typedef typename VectorDataType::DataTreeType::TreeNodeType InternalTreeNodeType;
+ typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
+
+ typedef typename PolygonType::RegionType RegionType;
+ typedef typename RegionType::Pointer RegionPointerType;
+ typedef typename RegionType::IndexType IndexType;
+ typedef typename RegionType::SizeType SizeType;
+ typedef typename RegionType::Type Type;
+ /** Method for creation through the object factory. */
+ itkNewMacro(Self);
+
+ /** Run-time type information (and related methods). */
+ itkTypeMacro(VectorDataProperties, LightObject);
+
+ /** Number of dimensions. */
+ itkStaticConstMacro(VectorDataDimension, unsigned int,
+ TVectorData::Dimension);
+
+ /** Get/Set the VectorData. */
// itkGetObjectMacro(VectorDataObject, VectorDataType);
- void SetVectorDataObject(const VectorDataType * v) {m_VectorDataObject=const_cast <VectorDataType *>(v); }
+ void SetVectorDataObject(const VectorDataType * v) {m_VectorDataObject = const_cast <VectorDataType *>(v); }
//
- RegionType GetBoundingRegion() {return m_BoundingRegion;}
- void SetBoundingRegion(RegionType & region) {m_BoundingRegion=region; }
-
- void AddRegion(const RegionType & region);
- void ComputeBoundingRegion();
- protected:
- /** Constructor */
- VectorDataProperties(){};
- /** Destructor */
- virtual ~VectorDataProperties() {};
- /**PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
- void ProcessNode(InternalTreeNodeType * source);
- bool IsBoundingRegionNull();
- private:
- VectorDataProperties(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
- //Pointer to the VectorData
- VectorDataType * m_VectorDataObject;
- RegionType m_BoundingRegion;
+ RegionType GetBoundingRegion() {return m_BoundingRegion; }
+ void SetBoundingRegion(RegionType& region) {m_BoundingRegion = region; }
+
+ void AddRegion(const RegionType& region);
+ void ComputeBoundingRegion();
+protected:
+ /** Constructor */
+ VectorDataProperties(){};
+ /** Destructor */
+ virtual ~VectorDataProperties() {}
+ /**PrintSelf method */
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
+
+ void ProcessNode(InternalTreeNodeType * source);
+ bool IsBoundingRegionNull();
+private:
+ VectorDataProperties(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
+
+ //Pointer to the VectorData
+ VectorDataType * m_VectorDataObject;
+ RegionType m_BoundingRegion;
}; // end class
} // end namespace otb
diff --git a/Code/Common/otbVectorDataProperties.txx b/Code/Common/otbVectorDataProperties.txx
index 6253ccdad0..10f28d3f88 100644
--- a/Code/Common/otbVectorDataProperties.txx
+++ b/Code/Common/otbVectorDataProperties.txx
@@ -24,8 +24,8 @@
namespace otb
{
-
- /*
+
+/*
template<class TVectorData>
VectorDataProperties<TVectorData>
::VectorDataProperties()
@@ -34,16 +34,16 @@ VectorDataProperties<TVectorData>
// m_DropExistingGISTable = false;
// m_GISTableName = "otb_to_gis_sample";
}
- */
+ */
template <class TVectorData>
bool VectorDataProperties<TVectorData>
::IsBoundingRegionNull()
{
- for (unsigned int i = 0;i<VectorDataDimension;++i)
- {
- if ( ( m_BoundingRegion.GetOrigin(i) != itk::NumericTraits<Type>::ZeroValue()) || ( m_BoundingRegion.GetSize(i) != itk::NumericTraits<Type>::ZeroValue() ) )
- return false;
- }
+ for (unsigned int i = 0; i < VectorDataDimension; ++i)
+ {
+ if ((m_BoundingRegion.GetOrigin(i) != itk::NumericTraits<Type>::ZeroValue()) ||
+ (m_BoundingRegion.GetSize(i) != itk::NumericTraits<Type>::ZeroValue())) return false;
+ }
return true;
}
/**
@@ -52,23 +52,26 @@ bool VectorDataProperties<TVectorData>
template <class TVectorData>
void
VectorDataProperties<TVectorData>
-::AddRegion(const RegionType & region)
+::AddRegion(const RegionType& region)
{
// std::cout << "add region: " << region << std::endl;
- if (this->IsBoundingRegionNull() )
- {
+ if (this->IsBoundingRegionNull())
+ {
m_BoundingRegion = region;
- }
+ }
else
- {
- Type index;
- for (unsigned int i = 0;i<VectorDataDimension;++i)
{
- index = std::min ( m_BoundingRegion.GetOrigin(i), region.GetOrigin(i) );
- m_BoundingRegion.SetSize(i, std::max ( m_BoundingRegion.GetOrigin(i) + m_BoundingRegion.GetSize(i) , region.GetOrigin(i)+ region.GetSize(i) ) - index );
+ Type index;
+ for (unsigned int i = 0; i < VectorDataDimension; ++i)
+ {
+ index = std::min (m_BoundingRegion.GetOrigin(i), region.GetOrigin(i));
+ m_BoundingRegion.SetSize(i,
+ std::max (m_BoundingRegion.GetOrigin(i) + m_BoundingRegion.GetSize(i),
+ region.GetOrigin(i) + region.GetSize(
+ i)) - index);
m_BoundingRegion.SetOrigin(i, index);
+ }
}
- }
}
/**
* Compute the complete bounding box of the dataset
@@ -80,12 +83,12 @@ VectorDataProperties<TVectorData>
{
/** Initialize the bouding region to null*/
IndexType index;
- SizeType size;
- index.Fill( itk::NumericTraits<Type>::ZeroValue() );
- size.Fill( itk::NumericTraits<Type>::ZeroValue() );
+ SizeType size;
+ index.Fill(itk::NumericTraits<Type>::ZeroValue());
+ size.Fill(itk::NumericTraits<Type>::ZeroValue());
m_BoundingRegion.SetIndex(index);
m_BoundingRegion.SetSize(size);
-
+
/** Compute the bounding region*/
InternalTreeNodeType * inputRoot = const_cast<InternalTreeNodeType *>(m_VectorDataObject->GetDataTree()->GetRoot());
ProcessNode(inputRoot);
@@ -98,93 +101,98 @@ VectorDataProperties<TVectorData>
{
// Get the children list from the input node
ChildrenListType children = source->GetChildrenList();
-
+
// For each child
- for(typename ChildrenListType::iterator it = children.begin(); it!=children.end();++it)
- {
+ for (typename ChildrenListType::iterator it = children.begin(); it != children.end(); ++it)
+ {
// Copy input DataNode info
DataNodePointerType dataNode = (*it)->Get();
- switch(dataNode->GetNodeType())
- {
- case otb::ROOT:
+ switch (dataNode->GetNodeType())
{
- ProcessNode((*it));
- break;
+ case otb::ROOT:
+ {
+ ProcessNode((*it));
+ break;
}
- case otb::DOCUMENT:
+ case otb::DOCUMENT:
{
- ProcessNode((*it));
- break;
+ ProcessNode((*it));
+ break;
}
- case otb::FOLDER:
+ case otb::FOLDER:
{
- ProcessNode((*it));
- break;
+ ProcessNode((*it));
+ break;
}
- case FEATURE_POINT:
+ case FEATURE_POINT:
{
// otbGenericMsgDebugMacro(<<"Insert Point from vectorData");
- IndexType start;
- for (unsigned int i = 0;i<VectorDataDimension;++i)
+ IndexType start;
+ for (unsigned int i = 0; i < VectorDataDimension; ++i)
{
- start[i] = dataNode->GetPoint()[i];
+ start[i] = dataNode->GetPoint()[i];
}
-
- SizeType size;
- size.Fill(itk::NumericTraits<Type>::ZeroValue());
- RegionType region;
- region.SetSize( size );
- region.SetIndex( start );
- this->AddRegion( region );
- break;
+
+ SizeType size;
+ size.Fill(itk::NumericTraits<Type>::ZeroValue());
+ RegionType region;
+ region.SetSize(size);
+ region.SetIndex(start);
+ this->AddRegion(region);
+ break;
}
- case otb::FEATURE_LINE:
+ case otb::FEATURE_LINE:
{
// this->GetOutput()->InsertLineString( static_cast<typename TGISTable::LinePointerType> (dataNode->GetLine()), dataNode->GetNodeId() );
- this->AddRegion( dataNode->GetLine()->GetBoundingRegion() );
- break;
+ this->AddRegion(dataNode->GetLine()->GetBoundingRegion());
+ break;
}
- case FEATURE_POLYGON:
+ case FEATURE_POLYGON:
{
- //otbGenericMsgDebugMacro(<<"Insert polygons from vectorData");
- this->AddRegion( dataNode->GetPolygonExteriorRing()->GetBoundingRegion() );
- break;
+ //otbGenericMsgDebugMacro(<<"Insert polygons from vectorData");
+ this->AddRegion(dataNode->GetPolygonExteriorRing()->GetBoundingRegion());
+ break;
}
- case FEATURE_MULTIPOINT:
+ case FEATURE_MULTIPOINT:
{
- itkExceptionMacro(<<"This type (FEATURE_MULTIPOINT) is not handle (yet) by VectorDataToGISTableFilter(), please request for it");
- break;
+ itkExceptionMacro(
+ << "This type (FEATURE_MULTIPOINT) is not handle (yet) by VectorDataToGISTableFilter(), please request for it");
+ break;
}
- case FEATURE_MULTILINE:
+ case FEATURE_MULTILINE:
{
- itkExceptionMacro(<<"This type (FEATURE_MULTILINE) is not handle (yet) by VectorDataToGISTableFilter(), please request for it");
- break;
+ itkExceptionMacro(
+ << "This type (FEATURE_MULTILINE) is not handle (yet) by VectorDataToGISTableFilter(), please request for it");
+ break;
}
- case FEATURE_MULTIPOLYGON:
+ case FEATURE_MULTIPOLYGON:
{
- itkExceptionMacro(<<"This type (FEATURE_MULTIPOLYGON) is not handle (yet) by VectorDataToGISTableFilter(), please request for it");
- break;
+ itkExceptionMacro(
+ <<
+ "This type (FEATURE_MULTIPOLYGON) is not handle (yet) by VectorDataToGISTableFilter(), please request for it");
+ break;
}
- case FEATURE_COLLECTION:
+ case FEATURE_COLLECTION:
{
- itkExceptionMacro(<<"This type (FEATURE_COLLECTION) is not handle (yet) by VectorDataToGISTableFilter(), please request for it");
- break;
+ itkExceptionMacro(
+ << "This type (FEATURE_COLLECTION) is not handle (yet) by VectorDataToGISTableFilter(), please request for it");
+ break;
+ }
}
}
- }
}
template<class TVectorData>
void
-VectorDataProperties< TVectorData >
-::PrintSelf(std::ostream &os, itk::Indent indent) const
+VectorDataProperties<TVectorData>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
os << indent << "Properties VectorData: " << m_VectorDataObject << std::endl;
os << indent << "Properties Bounding Region: " << m_BoundingRegion << std::endl;
}
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/Common/otbVectorDataSource.h b/Code/Common/otbVectorDataSource.h
index 949d1ad36c..b028e9d78c 100644
--- a/Code/Common/otbVectorDataSource.h
+++ b/Code/Common/otbVectorDataSource.h
@@ -40,13 +40,13 @@ namespace otb
template <class TOutputVectorData>
class ITK_EXPORT VectorDataSource : public itk::ProcessObject
{
- public :
+public:
/** Standard class typedefs. */
- typedef VectorDataSource Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef VectorDataSource Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -71,8 +71,8 @@ protected:
virtual void AllocateOutputs();
private:
- VectorDataSource(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorDataSource(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Common/otbVectorDataSource.txx b/Code/Common/otbVectorDataSource.txx
index 74bffc5733..bc5560d0ed 100644
--- a/Code/Common/otbVectorDataSource.txx
+++ b/Code/Common/otbVectorDataSource.txx
@@ -31,7 +31,7 @@ VectorDataSource<TOutputVectorData>
::VectorDataSource()
{
this->Superclass::SetNumberOfRequiredOutputs(1);
- this->Superclass::SetNthOutput(0,OutputVectorDataType::New().GetPointer());
+ this->Superclass::SetNthOutput(0, OutputVectorDataType::New().GetPointer());
}
template <class TOutputVectorData>
@@ -48,14 +48,13 @@ VectorDataSource<TOutputVectorData>
OutputVectorDataPointer outputPtr;
// Allocate the output memory
- for (unsigned int i=0; i < this->GetNumberOfOutputs(); ++i)
- {
+ for (unsigned int i = 0; i < this->GetNumberOfOutputs(); ++i)
+ {
outputPtr = this->GetOutput(i);
outputPtr->Clear();
- }
+ }
}
-
/**
* Get the output vector data
* \return The vector data produced.
@@ -65,10 +64,10 @@ typename VectorDataSource<TOutputVectorData>::OutputVectorDataType *
VectorDataSource<TOutputVectorData>
::GetOutput(void)
{
- if (this->GetNumberOfOutputs()<1)
- {
+ if (this->GetNumberOfOutputs() < 1)
+ {
return 0;
- }
+ }
return static_cast<OutputVectorDataType *> (this->ProcessObject::GetOutput(0));
}
@@ -78,7 +77,7 @@ VectorDataSource<TOutputVectorData>
::GetOutput(unsigned int idx)
{
return static_cast<OutputVectorDataType*>
- (this->Superclass::GetOutput(idx));
+ (this->Superclass::GetOutput(idx));
}
/**
@@ -89,9 +88,9 @@ void
VectorDataSource<TOutputVectorData>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/Common/otbVectorDataStyle.cxx b/Code/Common/otbVectorDataStyle.cxx
index 4631b75a0b..058407f4e2 100644
--- a/Code/Common/otbVectorDataStyle.cxx
+++ b/Code/Common/otbVectorDataStyle.cxx
@@ -21,2028 +21,2041 @@
namespace otb
{
- /**
- * PrintSelf Method
- */
+/**
+* PrintSelf Method
+ */
void
- VectorDataStyle
+VectorDataStyle
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
}
void
- VectorDataStyle
+VectorDataStyle
::LoadOSMStyle(mapnik::Map& mapnikMap) const
{
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(250000000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(600000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(250000000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(600000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#f2efe9"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("world", style);
}
- mapnikMap.insert_style("world",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(600000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(600000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#f2efe9"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("coast-poly", style);
}
- mapnikMap.insert_style("coast-poly",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(2500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(2500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#ddd"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("builtup", style);
}
- mapnikMap.insert_style("builtup",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[highway]='turning_circle'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[highway]='turning_circle'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("turning_circle", style);
}
- mapnikMap.insert_style("turning_circle",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(250000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(250000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='station' and not [disused]='yes'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='station' and not [disused]='yes'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='station' and [disused]='yes'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='station' and not [disused]='yes'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='halt' or [railway]='tram_stop' or [aerialway]='station'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='halt' or [railway]='tram_stop' or [aerialway]='station'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='halt' or [railway]='tram_stop' or [aerialway]='station'"));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 8, mapnik::color("#66f"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,-8);
+ textSymb0.set_displacement(0.0, -8);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway] ='halt' or [railway]='tram_stop' or [aerialway]='station'"));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#66f"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,-10);
+ textSymb0.set_displacement(0.0, -10);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='station' and not [disused]='yes'"));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Bold", 9, mapnik::color("#66f"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,-8);
+ textSymb0.set_displacement(0.0, -8);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='station' and not [disused]='yes'"));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Bold", 11, mapnik::color("#66f"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,-14);
+ textSymb0.set_displacement(0.0, -14);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='station' and [disused]='yes'"));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Bold", 9, mapnik::color("grey"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,-9);
+ textSymb0.set_displacement(0.0, -9);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='level_crossing'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("stations", style);
}
- mapnikMap.insert_style("stations",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[aeroway]='airport'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Bold", 8, mapnik::color("#6692da"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,-12);
+ textSymb0.set_displacement(0.0, -12);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[aeroway]='airport'"));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Bold", 9, mapnik::color("#6692da"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[aeroway]='aerodrome'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Oblique", 8, mapnik::color("#6692da"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,-12);
+ textSymb0.set_displacement(0.0, -12);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[aeroway]='aerodrome'"));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Oblique", 8, mapnik::color("#6692da"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='level_crossing'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='level_crossing'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[man_made]='lighthouse'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[natural]='peak'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[natural]='tree'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("[man_made]='power_wind' or ([power]='generator' and [power_source] = 'wind')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "[man_made]='power_wind' or ([power]='generator' and [power_source] = 'wind')"));
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[man_made]='windmill'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[man_made]='mast'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[highway]='mini_roundabout'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[highway]='gate' or [barrier]='gate'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("symbols", style);
}
- mapnikMap.insert_style("symbols",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='atm'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='bank'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='bar'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='bus_stop' or [highway]='bus_stop'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='cafe'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[tourism]='camp_site'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='cinema'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='fuel'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='hospital'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[tourism]='hotel'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='library'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[man_made]='mast'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[tourism]='museum'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='parking'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='pharmacy'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='place_of_worship' and [religion] = 'christian'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='place_of_worship' and [religion] = 'muslim'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='place_of_worship' and [religion] = 'sikh'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='place_of_worship' and [religion] = 'jewish'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='place_of_worship'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='post_box'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='post_office'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='pub'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='recycling'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='restaurant' or [amenity]='fast_food'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='telephone'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='theatre'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[amenity]='toilets'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[tourism]='viewpoint'"));
- {
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("points", style);
}
- mapnikMap.insert_style("points",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'residential' or [highway]='unclassified'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' or [highway]='service' or [highway]='footway'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("highway-area-casing", style);
}
- mapnikMap.insert_style("highway-area-casing",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'living_street'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#bbb"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'residential' or [highway]='unclassified' or [highway]='service'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'residential' or [highway]='unclassified' or [highway]='service'"));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#fff"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' or [highway]='footway'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#ededed"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("highway-area-fill", style);
}
- mapnikMap.insert_style("highway-area-fill",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[leisure] = 'marina'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#b5d0d0"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[man_made] = 'pier'"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#f2efe9"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[leisure] = 'playground'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#ccffff"));
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#666"), 0.3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#666"), 0.3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[tourism] = 'camp_site' or [tourism]='caravan_site' or [tourism] = 'picnic_site'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[tourism] = 'camp_site' or [tourism]='caravan_site' or [tourism] = 'picnic_site'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#ccff99"));
geom.set_opacity(0.5);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#666"), 0.3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#666"), 0.3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tourism] = 'attraction'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#f2caea"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse] = 'quarry'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 0.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 0.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[leisure] = 'nature_reserve' or [landuse] = 'vineyard'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#abdf96"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse] = 'vineyard'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse] = 'vineyard'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[leisure] = 'nature_reserve'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[leisure] = 'nature_reserve'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("[landuse] = 'cemetery' or [landuse] = 'grave_yard' or [amenity]='grave_yard'"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "[landuse] = 'cemetery' or [landuse] = 'grave_yard' or [amenity]='grave_yard'"));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#aacbaf"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[landuse] = 'residential'"));
- {
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#ddd"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[military] = 'barracks'"));
- {
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#ff8f8f"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[landuse]='military'"));
- {
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#ffa8a8"));
geom.set_opacity(0.4);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[landuse]='field' or [natural]='field'"));
- {
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#666600"));
geom.set_opacity(0.2);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[landuse]='field' or [natural]='field'"));
- {
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#666600"));
geom.set_opacity(0.2);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#660"), 0.3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#660"), 0.3);
stroke.set_opacity (0.4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[military] = 'danger_area'"));
- {
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("pink"));
geom.set_opacity(0.3);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[military] = 'danger_area'"));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("[landuse] = 'cemetery' or [landuse] = 'grave_yard' or [amenity]='grave_yard'"));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "[landuse] = 'cemetery' or [landuse] = 'grave_yard' or [amenity]='grave_yard'"));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[landuse] = 'meadow' or [landuse] = 'grass'"));
- {
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#cfeca8"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[leisure] = 'park' or [leisure] = 'recreation_ground'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#b6fdb6"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tourism] = 'zoo'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[leisure] = 'common'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#cfeca8"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[leisure] = 'garden'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#cfeca8"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[leisure] = 'golf_course'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#b5e3b5"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse] = 'allotments'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#c8b084"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse] = 'forest'"));
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#8dc56c"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse] = 'forest'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse]='farmyard'"));
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#ddbf92"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse] = 'farm' or [landuse]='farmland'"));
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#ead8bd"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse] = 'recreation_ground' or [landuse] = 'conservation'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#cfeca8"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse] = 'village_green'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#cfeca8"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse] = 'retail'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#f1dada"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse] = 'retail'"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("red"), 0.3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("red"), 0.3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse] = 'industrial' or [landuse]='railway'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#dfd1d6"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[power] = 'station'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#bbb"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[power] = 'station'"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#bbb"));
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#555"), 0.4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#555"), 0.4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[power] = 'sub_station'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#bbb"));
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#555"), 0.4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#555"), 0.4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[natural] = 'glacier'"));
- rule.set_max_scale(static_cast<unsigned long long>(10000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(2500000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(10000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(2500000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#9cf"), 1.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#9cf"), 1.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[natural] = 'glacier'"));
- rule.set_max_scale(static_cast<unsigned long long>(2500000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(2500000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#9cf"), 1.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#9cf"), 1.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#99f"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(20);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse] = 'commercial'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#efc8c8"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[landuse] = 'brownfield' or [landuse]='landfill' or [landuse] = 'greenfield' or [landuse]='construction'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[landuse] = 'brownfield' or [landuse]='landfill' or [landuse] = 'greenfield' or [landuse]='construction'"));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#9d9d6c"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[natural] = 'wood' or [landuse] = 'wood'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#aed1a0"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[natural] = 'heath'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#ffffc0"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[landuse] = 'basin'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#b5d0d0"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[amenity] = 'university' or [amenity] = 'college' or [amenity] = 'school' or [amenity]='hospital'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[amenity] = 'university' or [amenity] = 'college' or [amenity] = 'school' or [amenity]='hospital'"));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#f0f0d8"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[amenity] = 'university' or [amenity] = 'college' or [amenity] = 'school' or [amenity]='hospital'"));
- rule.set_max_scale(static_cast<unsigned long long>(250000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[amenity] = 'university' or [amenity] = 'college' or [amenity] = 'school' or [amenity]='hospital'"));
+ rule.set_max_scale(static_cast<unsigned long long>(250000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("brown"), 0.3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("brown"), 0.3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[amenity] = 'parking'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#f7efb7"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[amenity] = 'parking'"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#eeeed1"), 0.3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#eeeed1"), 0.3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[aeroway] = 'apron'"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#f0e0ff"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[natural] = 'beach'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[natural] = 'mud'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("leisure", style);
}
- mapnikMap.insert_style("leisure",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[leisure] = 'sports_centre' or [leisure]='stadium'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#33cc99"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("sports_grounds", style);
}
- mapnikMap.insert_style("sports_grounds",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[leisure] = 'pitch'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#8ad3af"));
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#888"), 0.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#888"), 0.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[railway] = 'station' or [building] = 'station'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#d4aaaa"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[building] = 'supermarket'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("pink"));
geom.set_opacity(0.5);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[amenity] = 'place_of_worship'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#777"));
geom.set_opacity(0.5);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[amenity] = 'place_of_worship'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#777"));
geom.set_opacity(0.5);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#111"), 0.3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#111"), 0.3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[leisure]='track'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#74dcba"));
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#888"), 0.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#888"), 0.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[building] <> 'station' and [building] <> 'supermarket' and [building] <> ''"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[building] <> 'station' and [building] <> 'supermarket' and [building] <> ''"));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#cc9999"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[aeroway] = 'terminal'"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#cc99ff"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[aeroway] = 'terminal'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#330066"), 0.2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#330066"), 0.2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("buildings", style);
}
- mapnikMap.insert_style("buildings",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[military] = 'danger_area'"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Bold", 9, mapnik::color("pink"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(10);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[amenity] = 'university'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Bold", 9, mapnik::color("#000033"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(16);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[amenity] = 'college'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#000033"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(14);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[way_area] >= 150000 and not [waterway]='riverbank'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#000033"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(20);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([way_area] >= 80000 and [way_area] < 150000) and not [waterway]='riverbank'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ }
+ {
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([way_area] >= 80000 and [way_area] < 150000) and not [waterway]='riverbank'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#000033"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(20);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([way_area] >= 20000 and [way_area] < 80000) and not [waterway]='riverbank'"));
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([way_area] >= 20000 and [way_area] < 80000) and not [waterway]='riverbank'"));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#000033"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(20);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[way_area] < 20000 and not [waterway]='riverbank'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#000033"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(20);
rule.append(textSymb0);
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("area-text", style);
}
- mapnikMap.insert_style("area-text",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'country'"));
- rule.set_max_scale(static_cast<unsigned long long>(200000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#9d6c9d"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,0);
+ textSymb0.set_displacement(0.0, 0);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'country'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 11, mapnik::color("#9d6c9d"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,0);
+ textSymb0.set_displacement(0.0, 0);
rule.append(textSymb0);
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("country", style);
}
- mapnikMap.insert_style("country",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'city' and [capital]='yes'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#000"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,0);
+ textSymb0.set_displacement(0.0, 0);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'city' and [capital]='yes'"));
- rule.set_max_scale(static_cast<unsigned long long>(10000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 11, mapnik::color("#000"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,0);
+ textSymb0.set_displacement(0.0, 0);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'city' and not [capital]='yes'"));
- rule.set_max_scale(static_cast<unsigned long long>(10000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 8, mapnik::color("#000"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,0);
+ textSymb0.set_displacement(0.0, 0);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'city'"));
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 11, mapnik::color("#000"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,0);
+ textSymb0.set_displacement(0.0, 0);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'city'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 14, mapnik::color("#000"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,0);
+ textSymb0.set_displacement(0.0, 0);
rule.append(textSymb0);
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("city", style);
}
- mapnikMap.insert_style("city",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'town'"));
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 8, mapnik::color("#000"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(20);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'town'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#000"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(20);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'town'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 14, mapnik::color("#777777"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(20);
rule.append(textSymb0);
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("town", style);
}
- mapnikMap.insert_style("town",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'suburb'"));
- rule.set_max_scale(static_cast<unsigned long long>(250000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(250000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#000"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'suburb'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 13, mapnik::color("#777777"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
rule.append(textSymb0);
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("suburb", style);
}
- mapnikMap.insert_style("suburb",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'village'"));
- rule.set_max_scale(static_cast<unsigned long long>(250000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(250000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#000"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'village'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 12, mapnik::color("#777777"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
rule.append(textSymb0);
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("village", style);
}
- mapnikMap.insert_style("village",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'hamlet' or [place] = 'locality'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 8, mapnik::color("#000"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'hamlet' or [place] = 'locality'"));
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 11, mapnik::color("#777777"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
rule.append(textSymb0);
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("hamlet", style);
}
- mapnikMap.insert_style("hamlet",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[addr:interpolation] <> ''"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#555"), 1);
- stroke.add_dash(2,4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#555"), 1);
+ stroke.add_dash(2, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("interpolation", style);
}
- mapnikMap.insert_style("interpolation",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[addr:housenumber] <> '' and [building] <> ''"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("addr:housenumber", "DejaVu Sans Book", 9, mapnik::color("#555"));
textSymb0.set_halo_radius(0);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,0);
+ textSymb0.set_displacement(0.0, 0);
rule.append(textSymb0);
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("way_numbers", style);
}
- mapnikMap.insert_style("way_numbers",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[addr:housenumber] <> ''"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("addr:housenumber", "DejaVu Sans Book", 9, mapnik::color("#555"));
textSymb0.set_halo_radius(1);
textSymb0.set_halo_fill(mapnik::color("#eee"));
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,0);
+ textSymb0.set_displacement(0.0, 0);
rule.append(textSymb0);
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("node_numbers", style);
}
- mapnikMap.insert_style("node_numbers",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[place] = 'island'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Oblique", 9, mapnik::color("#000"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,0);
+ textSymb0.set_displacement(0.0, 0);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[amenity]='pub' or [amenity]='restaurant' or [amenity]='cafe' or [amenity]='bar' or [amenity]='fast_food'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "[amenity]='pub' or [amenity]='restaurant' or [amenity]='cafe' or [amenity]='bar' or [amenity]='fast_food'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Bold", 10, mapnik::color("#734a08"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,14);
+ textSymb0.set_displacement(0.0, 14);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[amenity]='cinema' or [amenity]='library' or [amenity]='theatre'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Bold", 10, mapnik::color("#734a08"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,18);
+ textSymb0.set_displacement(0.0, 18);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[amenity] = 'place_of_worship' or [amenity] = 'police'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#000033"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(30);
- textSymb0.set_displacement(0.0,16);
+ textSymb0.set_displacement(0.0, 16);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[leisure] <> '' or [landuse] <> '' "));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#000"));
textSymb0.set_halo_radius(2);
textSymb0.set_wrap_width(10);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[natural] = 'wood'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#000"));
textSymb0.set_halo_radius(2);
textSymb0.set_wrap_width(10);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[natural] = 'peak'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("brown"));
textSymb0.set_halo_radius(1);
- textSymb0.set_displacement(0.0,10);
+ textSymb0.set_displacement(0.0, 10);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[natural] = 'peak'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("ele", "DejaVu Sans Oblique", 9, mapnik::color("brown"));
textSymb0.set_halo_radius(1);
- textSymb0.set_displacement(0.0,20);
+ textSymb0.set_displacement(0.0, 20);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[natural] = 'water' or [natural] = 'lake' or [landuse] = 'reservoir' or [landuse] = 'basin'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "[natural] = 'water' or [natural] = 'lake' or [landuse] = 'reservoir' or [landuse] = 'basin'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#6699cc"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(20);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tourism] = 'hotel'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#0092da"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,16);
+ textSymb0.set_displacement(0.0, 16);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[amenity] = 'fuel'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#0092da"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,14);
+ textSymb0.set_displacement(0.0, 14);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tourism] = 'camp_site'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#0092da"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(70);
- textSymb0.set_displacement(0.0,15);
+ textSymb0.set_displacement(0.0, 15);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tourism]='museum'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#734a08"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(0);
- textSymb0.set_displacement(0.0,16);
+ textSymb0.set_displacement(0.0, 16);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tourism] = 'attraction'"));
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#660033"));
textSymb0.set_halo_radius(2);
textSymb0.set_wrap_width(10);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[amenity] = 'university'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#000033"));
textSymb0.set_halo_radius(2);
textSymb0.set_wrap_width(12);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[amenity] = 'school' or [amenity] = 'college'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 8, mapnik::color("#000033"));
textSymb0.set_halo_radius(2);
textSymb0.set_wrap_width(12);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[man_made] = 'lighthouse'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#000033"));
textSymb0.set_halo_radius(2);
textSymb0.set_wrap_width(12);
- textSymb0.set_displacement(0.0,16);
+ textSymb0.set_displacement(0.0, 16);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[amenity] = 'hospital'"));
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 8, mapnik::color("#da0092"));
textSymb0.set_halo_radius(2);
textSymb0.set_wrap_width(12);
- textSymb0.set_displacement(0.0,16);
+ textSymb0.set_displacement(0.0, 16);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[amenity] = 'pharmacy'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 8, mapnik::color("#da0092"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(12);
- textSymb0.set_displacement(0.0,12);
+ textSymb0.set_displacement(0.0, 12);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway_junction'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("ref", "DejaVu Sans Book", 9, mapnik::color("#6666ff"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(12);
textSymb0.set_minimum_distance (20);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway_junction'"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("ref", "DejaVu Sans Book", 9, mapnik::color("#6666ff"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(12);
@@ -2051,15 +2064,15 @@ void
mapnik::text_symbolizer textSymb1("name", "DejaVu Sans Book", 8, mapnik::color("#6666ff"));
textSymb1.set_halo_radius(1);
textSymb1.set_wrap_width(12);
- textSymb1.set_displacement(0.0,-8);
+ textSymb1.set_displacement(0.0, -8);
textSymb1.set_minimum_distance (20);
rule.append(textSymb1);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway_junction'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("ref", "DejaVu Sans Book", 13, mapnik::color("#6666ff"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(12);
@@ -2068,7440 +2081,7628 @@ void
mapnik::text_symbolizer textSymb1("name", "DejaVu Sans Book", 14, mapnik::color("#6666ff"));
textSymb1.set_halo_radius(1);
textSymb1.set_wrap_width(12);
- textSymb1.set_displacement(0.0,-14);
+ textSymb1.set_displacement(0.0, -14);
textSymb1.set_minimum_distance (20);
rule.append(textSymb1);
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("text", style);
}
- mapnikMap.insert_style("text",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[waterway] = 'dock' or [landuse] = 'reservoir' or [landuse] = 'water' or [waterway] = 'mill_pond' or [waterway] = 'riverbank'"));
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[waterway] = 'dock' or [landuse] = 'reservoir' or [landuse] = 'water' or [waterway] = 'mill_pond' or [waterway] = 'riverbank'"));
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#b5d0d0"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[natural] = 'lake' or [natural] = 'water'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#b5d0d0"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[natural] = 'marsh'"));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[natural] = 'scrub'"));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[natural] = 'land'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("#f2efe9"));
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("water_areas", style);
}
- mapnikMap.insert_style("water_areas",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[waterway]='weir'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 2);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[waterway]='river'"));
- rule.set_max_scale(static_cast<unsigned long long>(250000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(250000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 2);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[waterway]='canal' and not [disused]='yes'"));
- rule.set_max_scale(static_cast<unsigned long long>(250000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(250000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[waterway]='canal' and not [disused]='yes'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 8, mapnik::color("#6699cc"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_else(true);
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[waterway]='river'"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 10);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 10);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#6699cc"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
textSymb0.set_minimum_distance (200);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[waterway]='canal' and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 7);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 7);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#6699cc"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[waterway]='canal' and not ([tunnel] = 'yes' or [tunnel] ='true' or [disused]='yes')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[waterway]='canal' and not ([tunnel] = 'yes' or [tunnel] ='true' or [disused]='yes')"));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 7);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#6699cc"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[waterway]='canal' and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter("[waterway]='canal' and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 11);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 11);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#6699cc"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[waterway]='canal' and not ([tunnel] = 'yes' or [tunnel] ='true' or [disused]='yes')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[waterway]='canal' and not ([tunnel] = 'yes' or [tunnel] ='true' or [disused]='yes')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 11);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#6699cc"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[waterway]='derelict_canal' or ([waterway]='canal' and [disused]='yes')"));
- rule.set_max_scale(static_cast<unsigned long long>(250000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(250000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5e4d0"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5e4d0"), 1.5);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(4,4);
+ stroke.add_dash(4, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[waterway]='derelict_canal' or ([waterway]='canal' and [disused]='yes')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5e4d0"), 2.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5e4d0"), 2.5);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(4,6);
+ stroke.add_dash(4, 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#80d1ae"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
textSymb0.set_label_spacing(600);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[waterway]='derelict_canal' or ([waterway]='canal' and [disused]='yes')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5e4d0"), 4.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5e4d0"), 4.5);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(4,8);
+ stroke.add_dash(4, 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("#80d1ae"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
textSymb0.set_label_spacing(600);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([waterway]='stream' or [waterway]='drain') and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([waterway]='stream' or [waterway]='drain') and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 2.2);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 2.2);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 1.4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 1.4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_else(true);
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 8, mapnik::color("#6699cc"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
rule.append(textSymb0);
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("water_lines", style);
}
- mapnikMap.insert_style("water_lines",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#777"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#777"), 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#777"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#777"), 1.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("power", style);
}
- mapnikMap.insert_style("power",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 4);
stroke.set_opacity (0.8);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 6);
stroke.set_opacity (0.8);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 9);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 9);
stroke.set_opacity (0.8);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("citywalls", style);
}
- mapnikMap.insert_style("citywalls",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::point_symbolizer geom = mapnik::point_symbolizer();
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("power_towers", style);
}
- mapnikMap.insert_style("power_towers",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 3);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 3);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 6.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 6.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 10);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 10);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 13);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 13);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 4);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 4);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 8);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 8);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 11);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 11);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 14);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 14);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 4);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 4);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 8);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 8);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 11);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 11);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 14);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 14);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(150000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(150000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 4);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 4);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 10);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 10);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 12);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 12);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 17);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 17);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("tunnels-casing", style);
}
- mapnikMap.insert_style("tunnels-casing",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#d6dfea"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#d6dfea"), 2);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway] = 'motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway] = 'motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#d6dfea"), 5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#d6dfea"), 5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway] = 'motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway] = 'motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#d6dfea"), 8.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#d6dfea"), 8.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway] = 'motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway] = 'motorway_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#d6dfea"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#d6dfea"), 11);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cdeacd"), 2.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cdeacd"), 2.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cdeacd"), 6.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cdeacd"), 6.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cdeacd"), 9);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cdeacd"), 9);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway] = 'trunk_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cdeacd"), 12);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cdeacd"), 12);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#f4c3c4"), 2.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#f4c3c4"), 2.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#f4c3c4"), 6.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#f4c3c4"), 6.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#f4c3c4"), 9);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#f4c3c4"), 9);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway] = 'primary_link') and ([tunnel] = 'yes' or [tunnel] ='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#f4c3c4"), 12);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#f4c3c4"), 12);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(150000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(150000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fee0b8"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fee0b8"), 2);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fee0b8"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fee0b8"), 8);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fee0b8"), 10);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fee0b8"), 10);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'secondary' or [highway] = 'secondary_link') and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fee0b8"), 14);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fee0b8"), 14);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("tunnels-fill", style);
}
- mapnikMap.insert_style("tunnels-fill",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway]='motorway_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 1.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway]='motorway_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 4.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 4.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway]='motorway_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 8);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway]='motorway_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 11);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'trunk_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'trunk_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'trunk_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'trunk_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 7.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 7.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'trunk_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'trunk_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 11.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 11.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'trunk_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'trunk_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 16);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 16);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'primary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'primary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'primary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'primary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 7.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 7.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'primary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'primary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 11.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 11.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'primary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'primary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 16);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 16);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'secondary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(150000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'secondary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(150000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 2.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 2.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'secondary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'secondary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 8.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 8.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'secondary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'secondary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 11.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 11.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'secondary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'secondary_link' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 16);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 16);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("minor-roads-casing-links", style);
}
- mapnikMap.insert_style("minor-roads-casing-links",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'trunk' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'primary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'primary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(150000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'secondary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(150000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 2.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 2.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 6.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 6.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'trunk' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 7.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 7.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'primary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'primary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 7.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 7.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'secondary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 8.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 8.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 10);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 10);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'trunk' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 11.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 11.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'primary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'primary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 11.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 11.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'secondary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 11.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 11.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 13);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 13);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'trunk' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 16);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 16);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'primary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'primary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 16);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 16);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'secondary' and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 16);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a37b48"), 16);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 6);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 6);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 6);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and not ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 3);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 3);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 7.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 7.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 7.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 7.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and not ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 4.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 4.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 4.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 4.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'tertiary' or [highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'tertiary' or [highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and not ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 11);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'tertiary' or [highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'tertiary' or [highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 11);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 11);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'tertiary' or [highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'tertiary' or [highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and not ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 16);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 16);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'tertiary' or [highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'tertiary' or [highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 16);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 16);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'service' and not ([service]='parking_aisle' or [tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'service' and not ([service]='parking_aisle' or [tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'service' and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 3);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 3);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'service' and not ([service]='parking_aisle' or[tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'service' and not ([service]='parking_aisle' or[tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 8);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'service' and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 8);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 8);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'service' and [service]='parking_aisle'"));
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 2);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 2);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 2);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 3.6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 3.6);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 3.6);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 3.6);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 6.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 6.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 6.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 6.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 9);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 9);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 9);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 9);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("minor-roads-casing", style);
}
- mapnikMap.insert_style("minor-roads-casing",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway]='motorway_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 0.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 0.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 6.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 6.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 9);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 9);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 2.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 2.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 7);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 11);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 15.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 15.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 2.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 2.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 7);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 11);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary_link' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 15.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 15.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary_link' and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(150000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(150000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 2);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary_link' and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 8);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary_link' and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 11);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary_link' and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 15.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 15.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("minor-roads-fill-links", style);
}
- mapnikMap.insert_style("minor-roads-fill-links",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and not [construction] <>''"));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and not [construction] <>''"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#9cc"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#9cc"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='motorway' or [construction]='motorway_link')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='motorway' or [construction]='motorway_link')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='trunk' or [construction]='trunk_link')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='trunk' or [construction]='trunk_link')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='primary' or [construction]='primary_link')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='primary' or [construction]='primary_link')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='secondary' or [construction]='secondary_link')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='secondary' or [construction]='secondary_link')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and not [construction] <>''"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and not [construction] <>''"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#9cc"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#9cc"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
- stroke.add_dash(6,4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
+ stroke.add_dash(6, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='motorway' or [construction]='motorway_link')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='motorway' or [construction]='motorway_link')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
- stroke.add_dash(6,4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
+ stroke.add_dash(6, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='trunk' or [construction]='trunk_link')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='trunk' or [construction]='trunk_link')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
- stroke.add_dash(6,4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
+ stroke.add_dash(6, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='primary' or [construction]='primary_link')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='primary' or [construction]='primary_link')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
- stroke.add_dash(6,4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
+ stroke.add_dash(6, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='secondary' or [construction]='secondary_link')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='secondary' or [construction]='secondary_link')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
- stroke.add_dash(6,4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
+ stroke.add_dash(6, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='tertiary' or [construction]='tertiary_link')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='tertiary' or [construction]='tertiary_link')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
- stroke.add_dash(6,4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
+ stroke.add_dash(6, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='residential' or [construction]='unclassified' or [construction]='living_street' or [construction]='service')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='residential' or [construction]='unclassified' or [construction]='living_street' or [construction]='service')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
- stroke.add_dash(6,4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
+ stroke.add_dash(6, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and not [construction] <>''"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and not [construction] <>''"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#9cc"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#9cc"), 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
- stroke.add_dash(8,6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
+ stroke.add_dash(8, 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='motorway' or [construction]='motorway_link')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='motorway' or [construction]='motorway_link')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
- stroke.add_dash(8,6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
+ stroke.add_dash(8, 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='trunk' or [construction]='trunk_link')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='trunk' or [construction]='trunk_link')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
- stroke.add_dash(8,6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
+ stroke.add_dash(8, 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='primary' or [construction]='primary_link')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='primary' or [construction]='primary_link')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
- stroke.add_dash(8,6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
+ stroke.add_dash(8, 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='secondary' or [construction]='secondary_link')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='secondary' or [construction]='secondary_link')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
- stroke.add_dash(8,6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
+ stroke.add_dash(8, 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='tertiary' or [construction]='tertiary_link')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='tertiary' or [construction]='tertiary_link')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
- stroke.add_dash(8,6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
+ stroke.add_dash(8, 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([highway] = 'proposed' or [highway]='construction') and ([construction]='residential' or [construction]='unclassified' or [construction]='living_street' or [construction]='service')"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'proposed' or [highway]='construction') and ([construction]='residential' or [construction]='unclassified' or [construction]='living_street' or [construction]='service')"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
- stroke.add_dash(8,6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 7);
+ stroke.add_dash(8, 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 8.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 8.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 11);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 2.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 2.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 7);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 11);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 15.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 15.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 2.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 2.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 7);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 11);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 15.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 15.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(150000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(150000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 2);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 8);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 11);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 15.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 15.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway] = 'rail' and ([tunnel] = 'yes' or [tunnel] = 'true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffff"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffff"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(1,9);
+ stroke.add_dash(1, 9);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fdfdfd"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fdfdfd"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(0,1);
- stroke.add_dash(1,8);
+ stroke.add_dash(0, 1);
+ stroke.add_dash(1, 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ececec"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ececec"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(0,2);
- stroke.add_dash(1,7);
+ stroke.add_dash(0, 2);
+ stroke.add_dash(1, 7);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cacaca"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cacaca"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(0,3);
- stroke.add_dash(1,6);
+ stroke.add_dash(0, 3);
+ stroke.add_dash(1, 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#afafaf"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#afafaf"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(0,4);
- stroke.add_dash(1,5);
+ stroke.add_dash(0, 4);
+ stroke.add_dash(1, 5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a1a1a1"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a1a1a1"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(0,5);
- stroke.add_dash(1,4);
+ stroke.add_dash(0, 5);
+ stroke.add_dash(1, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#9b9b9b"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#9b9b9b"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(0,6);
- stroke.add_dash(1,3);
+ stroke.add_dash(0, 6);
+ stroke.add_dash(1, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([railway] = 'disused' or [railway] = 'abandoned' or [railway]='construction') and not [highway] <> ''"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([railway] = 'disused' or [railway] = 'abandoned' or [railway]='construction') and not [highway] <> ''"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 2);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(2,4);
+ stroke.add_dash(2, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("([railway] = 'disused' or [railway] = 'abandoned' or [railway]='construction') and not [highway] <> '' and [bridge]='yes'"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "([railway] = 'disused' or [railway] = 'abandoned' or [railway]='construction') and not [highway] <> '' and [bridge]='yes'"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 2);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(2,4);
+ stroke.add_dash(2, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway] = 'rail' and not ([tunnel] = 'yes' or [tunnel] = 'true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999999"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999999"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 1);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(8,12);
+ stroke.add_dash(8, 12);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway] = 'rail' and ([bridge] = 'yes' or [bridge]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 7);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 5);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway] = 'rail' and not ([tunnel]='yes' or [tunnel] = 'true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999999"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999999"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 1);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(0,11);
- stroke.add_dash(8,1);
+ stroke.add_dash(0, 11);
+ stroke.add_dash(8, 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway] = 'rail' and ([tunnel] = 'yes' or [tunnel] = 'true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffff"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffff"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(1,9);
+ stroke.add_dash(1, 9);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fdfdfd"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fdfdfd"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(0,1);
- stroke.add_dash(1,8);
+ stroke.add_dash(0, 1);
+ stroke.add_dash(1, 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ececec"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ececec"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(0,2);
- stroke.add_dash(1,7);
+ stroke.add_dash(0, 2);
+ stroke.add_dash(1, 7);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cacaca"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cacaca"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(0,3);
- stroke.add_dash(1,6);
+ stroke.add_dash(0, 3);
+ stroke.add_dash(1, 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#afafaf"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#afafaf"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(0,4);
- stroke.add_dash(1,5);
+ stroke.add_dash(0, 4);
+ stroke.add_dash(1, 5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a1a1a1"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a1a1a1"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(0,5);
- stroke.add_dash(1,4);
+ stroke.add_dash(0, 5);
+ stroke.add_dash(1, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#9b9b9b"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#9b9b9b"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(0,6);
- stroke.add_dash(1,3);
+ stroke.add_dash(0, 6);
+ stroke.add_dash(1, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='narrow_gauge' and not ([tunnel]='yes' or [tunnel] = 'true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#666"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#666"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='narrow_gauge' and ([tunnel]='yes' or [tunnel] = 'true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#666"), 5);
- stroke.add_dash(5,3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#666"), 5);
+ stroke.add_dash(5, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 1.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='tram' and ([tunnel]='yes' or [tunnel]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#444"), 1);
- stroke.add_dash(5,3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#444"), 1);
+ stroke.add_dash(5, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='tram' and ([tunnel]='yes' or [tunnel]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#444"), 2);
- stroke.add_dash(5,3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#444"), 2);
+ stroke.add_dash(5, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='light_rail' and ([tunnel] = 'yes' or [tunnel]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#666"), 2);
- stroke.add_dash(5,3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#666"), 2);
+ stroke.add_dash(5, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='light_rail' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#666"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#666"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='subway' and ([tunnel] = 'yes' or [tunnel]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 2);
- stroke.add_dash(5,3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 2);
+ stroke.add_dash(5, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='subway' and not ([tunnel] = 'yes' or [tunnel]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' or [highway] = 'residential' or [highway] = 'unclassified' or [highway] = 'road'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'tertiary' or [highway] = 'residential' or [highway] = 'unclassified' or [highway] = 'road'"));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'road'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ddd"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ddd"), 2);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'road'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ddd"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ddd"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'road'"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ddd"), 9.4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ddd"), 9.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'road'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ddd"), 13);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ddd"), 13);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 2);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(15000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified'"));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(15000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified'"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified'"));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 9.4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 9.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 13);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 13);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'living_street'"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 1.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'living_street'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(15000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(15000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'living_street'"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 9.4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 9.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'living_street'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 13);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbb"), 13);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 4.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 4.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 6);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary'"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 9.4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 9.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 13);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 13);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'service' and not [service]='parking_aisle'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbbbbb"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbbbbb"), 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'service' and not [service]='parking_aisle'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'service' and not [service]='parking_aisle'"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 6);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'service' and [service]='parking_aisle'"));
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 1.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 5.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 5.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian'"));
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 8);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'steps'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("salmon"), 5.0);
- stroke.add_dash(2,1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("salmon"), 5.0);
+ stroke.add_dash(2, 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'bridleway' or ([highway] = 'path' and [horse] = 'designated')) and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'bridleway' or ([highway] = 'path' and [horse] = 'designated')) and not ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("green"), 1.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("green"), 1.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'footway' or ([highway] = 'path' and [foot] = 'designated')) and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'footway' or ([highway] = 'path' and [foot] = 'designated')) and not ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 6);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("salmon"), 2.0);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("salmon"), 2.0);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(1,3);
+ stroke.add_dash(1, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'path' and not ([bicycle] = 'designated' or [foot] = 'designated' or [horse] = 'designated') and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'path' and not ([bicycle] = 'designated' or [foot] = 'designated' or [horse] = 'designated') and not ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 1.0);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 1.0);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 0.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(6,3);
+ stroke.add_dash(6, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'steps'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 6);
stroke.set_opacity (0.4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("salmon"), 2.0);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("salmon"), 2.0);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(1,3);
+ stroke.add_dash(1, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'cycleway' or ([highway] = 'path' and [bicycle] = 'designated')) and not ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'cycleway' or ([highway] = 'path' and [bicycle] = 'designated')) and not ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 4);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("blue"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("blue"), 1.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(1,3);
+ stroke.add_dash(1, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'byway'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 6);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffcc00"), 2.0);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffcc00"), 2.0);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(3,4);
+ stroke.add_dash(3, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'track'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 1.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(3,4);
+ stroke.add_dash(3, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'unsurfaced'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#debd9c"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#debd9c"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(2,4);
+ stroke.add_dash(2, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'unsurfaced'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 5);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#debd9c"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#debd9c"), 4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(4,6);
+ stroke.add_dash(4, 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[route] = 'ferry'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#66f"), 0.4);
- stroke.add_dash(4,4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#66f"), 0.4);
+ stroke.add_dash(4, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[route] = 'ferry'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#66f"), 0.8);
- stroke.add_dash(6,6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#66f"), 0.8);
+ stroke.add_dash(6, 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[aeroway] = 'runway'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[aeroway] = 'runway'"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 7);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[aeroway] = 'runway' and not ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 18);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 18);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[aeroway] = 'taxiway'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[aeroway] = 'taxiway' and not ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[aeroway] = 'taxiway' and not ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("minor-roads-fill", style);
}
- mapnikMap.insert_style("minor-roads-fill",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[access] = 'permissive' and ([highway]='unclassified' or [highway]='residential' or [highway]='service')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[access] = 'permissive' and ([highway]='unclassified' or [highway]='residential' or [highway]='service')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cf9"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cf9"), 6);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(6,8);
+ stroke.add_dash(6, 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[access] = 'permissive' and [highway]='footway'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cf9"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#cf9"), 6);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(6,8);
+ stroke.add_dash(6, 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[access]='destination' and ([highway]='unclassified' or [highway]='residential' or [highway]='service')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[access]='destination' and ([highway]='unclassified' or [highway]='residential' or [highway]='service')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#c2e0ff"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#c2e0ff"), 6);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(6,8);
+ stroke.add_dash(6, 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[access] = 'private' or [access] = 'no'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#efa9a9"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#efa9a9"), 6);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(6,8);
+ stroke.add_dash(6, 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("access", style);
}
- mapnikMap.insert_style("access",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[aerialway] = 'cable_car' or [aerialway]='gondola'"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[aerialway] = 'chair_lift' or [aerialway]='drag_lift'"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("aerialways", style);
}
- mapnikMap.insert_style("aerialways",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'bridleway' or ([highway] = 'path' and [horse] = 'designated')) and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'bridleway' or ([highway] = 'path' and [horse] = 'designated')) and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("green"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("green"), 2);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(4,2);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'footway' or ([highway] = 'path' and [foot] = 'designated')) and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'footway' or ([highway] = 'path' and [foot] = 'designated')) and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 5.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 5.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 3.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 3.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("salmon"), 2.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("salmon"), 2.5);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(1,3);
+ stroke.add_dash(1, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'path' and not ([bicycle] = 'designated' or [foot] = 'designated' or [horse] = 'designated') and ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'path' and not ([bicycle] = 'designated' or [foot] = 'designated' or [horse] = 'designated') and ([tunnel] = 'yes' or [tunnel] = 'true' or [tunnel] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 5.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 5.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 1.0);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 1.0);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 0.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(6,3);
+ stroke.add_dash(6, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'cycleway' or ([highway] = 'path' and [bicycle] = 'designated')) and ([tunnel]='yes' or [tunnel]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'cycleway' or ([highway] = 'path' and [bicycle] = 'designated')) and ([tunnel]='yes' or [tunnel]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("blue"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("blue"), 2);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(1,3);
+ stroke.add_dash(1, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("footbikecycle-tunnels", style);
}
- mapnikMap.insert_style("footbikecycle-tunnels",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade1'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
stroke.set_opacity (0.4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b37700"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b37700"), 2);
stroke.set_opacity (0.7);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade2'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a87000"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a87000"), 1.5);
stroke.set_opacity (0.8);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(9,4);
+ stroke.add_dash(9, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade3'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 1.5);
stroke.set_opacity (0.8);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(3,4);
+ stroke.add_dash(3, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade4'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
stroke.set_opacity (0.8);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(4,7);
- stroke.add_dash(1,5);
+ stroke.add_dash(4, 7);
+ stroke.add_dash(1, 5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade5'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
stroke.set_opacity (0.8);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(1,5);
+ stroke.add_dash(1, 5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_else(true);
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 1.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(3,4);
+ stroke.add_dash(3, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("tracks-notunnel-nobridge", style);
}
- mapnikMap.insert_style("tracks-notunnel-nobridge",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade1'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b37700"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b37700"), 2);
stroke.set_opacity (0.7);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade2'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 4.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 4.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a87000"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a87000"), 1.5);
stroke.set_opacity (0.8);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(3,4);
+ stroke.add_dash(3, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade3'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 4.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 4.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
stroke.set_opacity (0.7);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade4'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 4.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 4.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
stroke.set_opacity (0.8);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(4,7);
- stroke.add_dash(1,5);
+ stroke.add_dash(4, 7);
+ stroke.add_dash(1, 5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade5'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 4.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 4.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
stroke.set_opacity (0.8);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(1,5);
+ stroke.add_dash(1, 5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_else(true);
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_else(true);
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 4.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 4.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 1.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(3,4);
+ stroke.add_dash(3, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("tracks-bridges", style);
}
- mapnikMap.insert_style("tracks-bridges",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade1'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b37700"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b37700"), 2);
stroke.set_opacity (0.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade2'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 4.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 4.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a87000"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a87000"), 1.5);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(3,4);
+ stroke.add_dash(3, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade3'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 4.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 4.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade4'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 4.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 4.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(4,7);
- stroke.add_dash(1,5);
+ stroke.add_dash(4, 7);
+ stroke.add_dash(1, 5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[tracktype]='grade5'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 4.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 4.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 2);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(1,5);
+ stroke.add_dash(1, 5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_else(true);
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 4.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("grey"), 4.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#996600"), 1.5);
stroke.set_opacity (0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(3,4);
+ stroke.add_dash(3, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("tracks-tunnels", style);
}
- mapnikMap.insert_style("tracks-tunnels",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#506077"), 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#477147"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 11);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 16);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 16);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#8d4346"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'secondary' or [highway]='secondary_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'secondary' or [highway]='secondary_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 10);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 10);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'secondary' or [highway]='secondary_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'secondary' or [highway]='secondary_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 12);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 12);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'secondary' or [highway]='secondary_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'secondary' or [highway]='secondary_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 16);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 16);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 7.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 7.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 11);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 16);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 16);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 4.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 4.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 11);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified' or [highway] = 'road') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 16);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 16);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'service' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'service' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 2.2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 2.2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 3.8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 3.8);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 7);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 9.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 9.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("road-bridges-casing", style);
}
- mapnikMap.insert_style("road-bridges-casing",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 2);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 7);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 9.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 9.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'trunk' or [highway]='trunk_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 14.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 14.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'secondary' or [highway] = 'secondary_link') and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'secondary' or [highway] = 'secondary_link') and ([bridge]='yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 9);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 9);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'secondary' or [highway] = 'secondary_link') and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'secondary' or [highway] = 'secondary_link') and ([bridge]='yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 10.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 10.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'secondary' or [highway] = 'secondary_link') and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'secondary' or [highway] = 'secondary_link') and ([bridge]='yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 14.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fed7a5"), 14.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 6);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 9.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 9.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 14);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffffb3"), 14);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'road' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ddd"), 3.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ddd"), 3.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'road' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ddd"), 9.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ddd"), 9.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'road' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ddd"), 14);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ddd"), 14);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 3.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 9.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 9.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'residential' or [highway] = 'minor' or [highway] = 'unclassified') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 14);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 14);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'service' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'service' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 6);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 1.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 5.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 5.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'pedestrian' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ededed"), 8);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("road-bridges-fill", style);
}
- mapnikMap.insert_style("road-bridges-fill",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[waterway]='canal' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#000"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#000"), 7);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 6);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#6699cc"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[waterway]='canal' and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#000"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#000"), 11);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 10);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#b5d0d0"), 10);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#6699cc"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
rule.append(textSymb0);
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("waterway-bridges", style);
}
- mapnikMap.insert_style("waterway-bridges",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[aeroway] = 'runway' and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 19);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 19);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 18);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 18);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[aeroway] = 'taxiway' and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[aeroway] = 'taxiway' and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 7);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#bbc"), 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='subway' and ([bridge] = 'yes' or [bridge]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 5.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 5.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='light_rail' and ([bridge]='yes' or [bridge]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#555"), 5.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#555"), 5.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#666"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#666"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'unsurfaced' and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#debd9c"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#debd9c"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(2,4);
+ stroke.add_dash(2, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'unsurfaced' and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#debd9c"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#debd9c"), 4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(4,6);
+ stroke.add_dash(4, 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'bridleway' or ([highway] = 'path' and [horse] = 'designated')) and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'bridleway' or ([highway] = 'path' and [horse] = 'designated')) and ([bridge]='yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 5.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 5.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("green"), 1.5);
- stroke.add_dash(4,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("green"), 1.5);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'footway' or ([highway] = 'path' and [foot] = 'designated')) and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'footway' or ([highway] = 'path' and [foot] = 'designated')) and ([bridge]='yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("salmon"), 2.0);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("salmon"), 2.0);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(1,3);
+ stroke.add_dash(1, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("[highway] = 'path' and not ([bicycle] = 'designated' or [foot] = 'designated' or [horse] = 'designated') and ([bridge] = 'yes' or [bridge] = 'true' or [bridge] = '1')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "[highway] = 'path' and not ([bicycle] = 'designated' or [foot] = 'designated' or [horse] = 'designated') and ([bridge] = 'yes' or [bridge] = 'true' or [bridge] = '1')"));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 2.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 0.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 0.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(6,3);
+ stroke.add_dash(6, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'cycleway' or ([highway] = 'path' and [bicycle] = 'designated')) and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'cycleway' or ([highway] = 'path' and [bicycle] = 'designated')) and ([bridge]='yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 5.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 5.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("blue"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("blue"), 1.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(1,3);
+ stroke.add_dash(1, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'byway' and ([bridge]='yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 5.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 5.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffcc00"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ffcc00"), 1.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(3,4);
+ stroke.add_dash(3, 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("noncased-ways-bridges", style);
}
- mapnikMap.insert_style("noncased-ways-bridges",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 9);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 9);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 12);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 12);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("mwaybridge_layer0_casing", style);
}
- mapnikMap.insert_style("mwaybridge_layer0_casing",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 5.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 5.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 7.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 7.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 10);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 10);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("mwaybridge_layer0_fill", style);
}
- mapnikMap.insert_style("mwaybridge_layer0_fill",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 9);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 9);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 12);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 12);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("mwaybridge_layer1_casing", style);
}
- mapnikMap.insert_style("mwaybridge_layer1_casing",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 5.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 5.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 7.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 7.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 10);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 10);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("mwaybridge_layer1_fill", style);
}
- mapnikMap.insert_style("mwaybridge_layer1_fill",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 9);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 9);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 12);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 12);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("mwaybridge_layer2_casing", style);
}
- mapnikMap.insert_style("mwaybridge_layer2_casing",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 5.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 5.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 7.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 7.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 10);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 10);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("mwaybridge_layer2_fill", style);
}
- mapnikMap.insert_style("mwaybridge_layer2_fill",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='3'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='3'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='3'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='3'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 9);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 9);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='3'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='3'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 12);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 12);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("mwaybridge_layer3_casing", style);
}
- mapnikMap.insert_style("mwaybridge_layer3_casing",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='3'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='3'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 5.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 5.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='3'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='3'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 7.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 7.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='3'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='3'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 10);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 10);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("mwaybridge_layer3_fill", style);
}
- mapnikMap.insert_style("mwaybridge_layer3_fill",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='4'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='4'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='4'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='4'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 9);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 9);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='4'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='4'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 12);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 12);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("mwaybridge_layer4_casing", style);
}
- mapnikMap.insert_style("mwaybridge_layer4_casing",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='4'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='4'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 5.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 5.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='4'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='4'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 7.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 7.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='4'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='4'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 10);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 10);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("mwaybridge_layer4_fill", style);
}
- mapnikMap.insert_style("mwaybridge_layer4_fill",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='5'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='5'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 6.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='5'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='5'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 9);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 9);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='5'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='5'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 12);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 12);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("mwaybridge_layer5_casing", style);
}
- mapnikMap.insert_style("mwaybridge_layer5_casing",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='5'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='5'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 5.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 5.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='5'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='5'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 7.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 7.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='5'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'motorway' or [highway]='motorway_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='5'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 10);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 10);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("mwaybridge_layer5_fill", style);
}
- mapnikMap.insert_style("mwaybridge_layer5_fill",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 11);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 16);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 16);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("primarybridge_layer0_casing", style);
}
- mapnikMap.insert_style("primarybridge_layer0_casing",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 7);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 9.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 9.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true')"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 14.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 14.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("primarybridge_layer0_fill", style);
}
- mapnikMap.insert_style("primarybridge_layer0_fill",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 11);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 16);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 16);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("primarybridge_layer1_casing", style);
}
- mapnikMap.insert_style("primarybridge_layer1_casing",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 7);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 9.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 9.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='1'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 14.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 14.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("primarybridge_layer1_fill", style);
}
- mapnikMap.insert_style("primarybridge_layer1_fill",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 8);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 8);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 11);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 11);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 16);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 16);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("primarybridge_layer2_casing", style);
}
- mapnikMap.insert_style("primarybridge_layer2_casing",style);
- }
- {
- mapnik::feature_type_style style;
{
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ mapnik::feature_type_style style;
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 7);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 9.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 9.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_filter(mapnik::create_filter("([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_filter(mapnik::create_filter(
+ "([highway] = 'primary' or [highway]='primary_link') and ([bridge] = 'yes' or [bridge]='true') and [layer]='2'"));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 14.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 14.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("primarybridge_layer2_fill", style);
}
- mapnikMap.insert_style("primarybridge_layer2_fill",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' or [highway] = 'motorway_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(25000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 0.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 0.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' or [highway] = 'motorway_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' or [highway] = 'motorway_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 1.4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 1.4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' or [highway] = 'motorway_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' or [highway] = 'motorway_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 2.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#809bc0"), 2.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' or [highway] = 'trunk_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(25000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(25000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 0.4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#a9dba9"), 0.4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' or [highway] = 'trunk_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#97d397"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#97d397"), 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' or [highway] = 'trunk_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#97d397"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#97d397"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' or [highway] = 'trunk_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#97d397"), 2.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#97d397"), 2.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' or [highway] = 'primary_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 0.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 0.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' or [highway] = 'primary_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 1.2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 1.2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' or [highway] = 'primary_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' or [highway] = 'primary_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 2.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ec989a"), 2.5);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary' or [highway] = 'secondary_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fecc8b"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fecc8b"), 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary' or [highway] = 'secondary_link'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fecc8b"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fecc8b"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway] = 'rail'"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 0.6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 0.6);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway] = 'rail' and not ([tunnel]='yes' or [tunnel]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway] = 'rail' and ([tunnel]='yes' or [tunnel]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 1);
- stroke.add_dash(5,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 1);
+ stroke.add_dash(5, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(2500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("[railway] = 'tram' or [railway] = 'light_rail' or [railway] = 'narrow_gauge'"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(2500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "[railway] = 'tram' or [railway] = 'light_rail' or [railway] = 'narrow_gauge'"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ccc"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#ccc"), 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway] = 'rail' and not ([tunnel]='yes' or [tunnel]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway] = 'rail' and ([tunnel]='yes' or [tunnel]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 2);
- stroke.add_dash(5,2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 2);
+ stroke.add_dash(5, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
- mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_filter(mapnik::create_filter("[railway] = 'tram' or [railway] = 'light_rail' or [railway] = 'narrow_gauge'"));
+ }
{
+ mapnik::rule_type rule;
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_filter(mapnik::create_filter(
+ "[railway] = 'tram' or [railway] = 'light_rail' or [railway] = 'narrow_gauge'"));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway] = 'preserved'"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#aaa"), 1.5);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway] = 'preserved'"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999999"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#999999"), 3);
stroke.set_line_join(mapnik::ROUND_JOIN);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("white"), 1);
stroke.set_line_join(mapnik::ROUND_JOIN);
- stroke.add_dash(0,1);
- stroke.add_dash(8,1);
+ stroke.add_dash(0, 1);
+ stroke.add_dash(8, 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='monorail'"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#fff"), 4);
stroke.set_opacity (0.4);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#777"), 3.0);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#777"), 3.0);
stroke.set_line_join(mapnik::ROUND_JOIN);
stroke.set_line_cap(mapnik::ROUND_CAP);
- stroke.add_dash(2,3);
+ stroke.add_dash(2, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("roads", style);
}
- mapnikMap.insert_style("roads",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='tram' and not ([tunnel]='yes' or [tunnel]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#444"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#444"), 1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[railway]='tram' and not ([tunnel]='yes' or [tunnel]='true')"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#444"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#444"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("trams", style);
}
- mapnikMap.insert_style("trams",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and [length] = 1"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and [length] = 2"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and [length] = 3"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and [length] = 4"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and [length] = 5"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and [length] = 6"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and [length] = 7"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'motorway' and [length] = 8"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and [length] = 1"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and [length] = 2"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and [length] = 3"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and [length] = 4"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and [length] = 5"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and [length] = 6"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and [length] = 7"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' and [length] = 8"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' and [length] = 1"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' and [length] = 2"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' and [length] = 3"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' and [length] = 4"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' and [length] = 5"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' and [length] = 6"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' and [length] = 7"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'primary' and [length] = 8"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and [length] = 1"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and [length] = 2"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and [length] = 3"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and [length] = 4"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
- style.add_rule(rule);
- }
- {
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
+ style.add_rule(rule);
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and [length] = 5"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and [length] = 6"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and [length] = 7"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary' and [length] = 8"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and [length] = 1"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and [length] = 2"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and [length] = 3"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and [length] = 4"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and [length] = 5"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and [length] = 6"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and [length] = 7"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary' and [length] = 8"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' or [highway] = 'primary'"));
- rule.set_max_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 8, mapnik::color("black"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(0);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary'"));
- rule.set_max_scale(static_cast<unsigned long long>(75000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(75000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 8, mapnik::color("black"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
textSymb0.set_halo_fill(mapnik::color("#fed7a5"));
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' or [highway] = 'primary'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("black"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(0);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'trunk' or [highway] = 'primary'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("black"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(0);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary'"));
- rule.set_max_scale(static_cast<unsigned long long>(50000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(50000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("black"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
textSymb0.set_halo_fill(mapnik::color("#fed7a5"));
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'secondary'"));
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 10, mapnik::color("black"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
textSymb0.set_halo_fill(mapnik::color("#fed7a5"));
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary'"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#000"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'tertiary'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 11, mapnik::color("#000"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[highway] = 'proposed' or [highway]='construction'"));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#000"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[highway] = 'proposed' or [highway]='construction'"));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 11, mapnik::color("#000"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'unclassified' or [highway] = 'residential'"));
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#000"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
textSymb0.set_label_spacing(300);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[highway] = 'unclassified' or [highway] = 'residential'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 11, mapnik::color("#000"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
textSymb0.set_label_spacing(400);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_else(true);
- rule.set_max_scale(static_cast<unsigned long long>(25000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(25000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 9, mapnik::color("#000"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_else(true);
- rule.set_max_scale(static_cast<unsigned long long>(5000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(5000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Book", 11, mapnik::color("#000"));
textSymb0.set_label_placement(mapnik::LINE_PLACEMENT);
textSymb0.set_halo_radius(1);
rule.append(textSymb0);
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("roads-text", style);
}
- mapnikMap.insert_style("roads-text",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[man_made] = 'pier'"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#f2efe9"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#f2efe9"), 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[man_made] = 'pier'"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#f2efe9"), 4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#f2efe9"), 4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[man_made] = 'pier'"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#f2efe9"), 7);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#f2efe9"), 7);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("piers", style);
}
- mapnikMap.insert_style("piers",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[natural] = 'cliff'"));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[natural] = 'cliff'"));
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(20000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(20000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[man_made] = 'embankment'"));
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("cliffs", style);
}
- mapnikMap.insert_style("cliffs",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
rule.set_filter(mapnik::create_filter("[barrier] <> '' or [natural]='hedge'"));
- {
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 0.4);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("black"), 0.4);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("barriers", style);
}
- mapnikMap.insert_style("barriers",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[oneway] = 'yes' or [oneway] = 'true' or [oneway] = '1'"));
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 1);
- stroke.add_dash(0,12);
- stroke.add_dash(10,152);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 1);
+ stroke.add_dash(0, 12);
+ stroke.add_dash(10, 152);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 2);
- stroke.add_dash(0,12);
- stroke.add_dash(9,153);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 2);
+ stroke.add_dash(0, 12);
+ stroke.add_dash(9, 153);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 3);
- stroke.add_dash(0,18);
- stroke.add_dash(2,154);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 3);
+ stroke.add_dash(0, 18);
+ stroke.add_dash(2, 154);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 4);
- stroke.add_dash(0,18);
- stroke.add_dash(1,155);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 4);
+ stroke.add_dash(0, 18);
+ stroke.add_dash(1, 155);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[oneway] = '-1'"));
- rule.set_max_scale(static_cast<unsigned long long>(10000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(10000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 1);
- stroke.add_dash(0,12);
- stroke.add_dash(10,152);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 1);
+ stroke.add_dash(0, 12);
+ stroke.add_dash(10, 152);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 2);
- stroke.add_dash(0,13);
- stroke.add_dash(9,152);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 2);
+ stroke.add_dash(0, 13);
+ stroke.add_dash(9, 152);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 3);
- stroke.add_dash(0,14);
- stroke.add_dash(2,158);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 3);
+ stroke.add_dash(0, 14);
+ stroke.add_dash(2, 158);
geom.set_stroke(stroke);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 4);
- stroke.add_dash(0,15);
- stroke.add_dash(1,158);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("#6c70d5"), 4);
+ stroke.add_dash(0, 15);
+ stroke.add_dash(1, 158);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("directions", style);
}
- mapnikMap.insert_style("directions",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[boundary]='national_park'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("green"));
geom.set_opacity(0.05);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("green"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("green"), 1.5);
stroke.set_opacity (0.15);
- stroke.add_dash(4,2);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[boundary]='national_park'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::polygon_symbolizer geom = mapnik::polygon_symbolizer();
geom.set_fill(mapnik::color("green"));
geom.set_opacity(0.05);
rule.append(geom);
- }
- {
+ }
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("green"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("green"), 3);
stroke.set_opacity (0.15);
- stroke.add_dash(6,2);
+ stroke.add_dash(6, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[boundary]='national_park'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("green"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("green"), 3);
stroke.set_opacity (0.15);
- stroke.add_dash(6,2);
+ stroke.add_dash(6, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[boundary]='national_park'"));
- rule.set_max_scale(static_cast<unsigned long long>(2500000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(2500000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Bold", 8, mapnik::color("#9c9"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(14);
- textSymb0.set_displacement(0.0,-8);
+ textSymb0.set_displacement(0.0, -8);
rule.append(textSymb0);
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[boundary]='national_park'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
mapnik::text_symbolizer textSymb0("name", "DejaVu Sans Bold", 11, mapnik::color("#9c9"));
textSymb0.set_halo_radius(1);
textSymb0.set_wrap_width(14);
rule.append(textSymb0);
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("boundary", style);
}
- mapnikMap.insert_style("boundary",style);
- }
- {
- mapnik::feature_type_style style;
{
+ mapnik::feature_type_style style;
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[admin_level]='2' or [admin_level]='3'"));
- rule.set_max_scale(static_cast<unsigned long long>(200000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(5000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(200000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(5000000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 0.6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 0.6);
stroke.set_opacity (0.2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[admin_level]='2' or [admin_level]='3'"));
- rule.set_max_scale(static_cast<unsigned long long>(5000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(5000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 2);
stroke.set_opacity (0.2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[admin_level]='2'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 6);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 6);
stroke.set_opacity (0.1);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[admin_level]='3'"));
- rule.set_max_scale(static_cast<unsigned long long>(1000000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(1000000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 5);
stroke.set_opacity (0.1);
- stroke.add_dash(4,2);
+ stroke.add_dash(4, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[admin_level]='4'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 3);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 3);
stroke.set_opacity (0.2);
- stroke.add_dash(4,3);
+ stroke.add_dash(4, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[admin_level]='5'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 2);
stroke.set_opacity (0.3);
- stroke.add_dash(6,3);
- stroke.add_dash(2,3);
- stroke.add_dash(2,3);
+ stroke.add_dash(6, 3);
+ stroke.add_dash(2, 3);
+ stroke.add_dash(2, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[admin_level]='6'"));
- rule.set_max_scale(static_cast<unsigned long long>(500000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(500000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 2);
stroke.set_opacity (0.3);
- stroke.add_dash(6,3);
- stroke.add_dash(2,3);
+ stroke.add_dash(6, 3);
+ stroke.add_dash(2, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[admin_level]='8' or [admin_level]='7'"));
- rule.set_max_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 1.5);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 1.5);
stroke.set_opacity (0.3);
- stroke.add_dash(5,2);
+ stroke.add_dash(5, 2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("[admin_level]='10' or [admin_level]='9'"));
- rule.set_max_scale(static_cast<unsigned long long>(100000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(100000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 2);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 2);
stroke.set_opacity (0.3);
- stroke.add_dash(2,3);
+ stroke.add_dash(2, 3);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
- }
- {
+ }
+ {
mapnik::rule_type rule;
rule.set_filter(mapnik::create_filter("not [admin_level] <>''"));
- rule.set_max_scale(static_cast<unsigned long long>(2000000LLU/m_ScaleFactor));
- rule.set_min_scale(static_cast<unsigned long long>(200000LLU/m_ScaleFactor));
- {
+ rule.set_max_scale(static_cast<unsigned long long>(2000000LLU / m_ScaleFactor));
+ rule.set_min_scale(static_cast<unsigned long long>(200000LLU / m_ScaleFactor));
+ {
mapnik::line_symbolizer geom = mapnik::line_symbolizer();
- mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 1);
+ mapnik::stroke stroke = mapnik::stroke(mapnik::color("purple"), 1);
stroke.set_opacity (0.2);
geom.set_stroke(stroke);
rule.append(geom);
- }
+ }
style.add_rule(rule);
+ }
+ mapnikMap.insert_style("admin", style);
}
- mapnikMap.insert_style("admin",style);
- }
-
}
-}//namespace otb
-
+} //namespace otb
diff --git a/Code/Common/otbVectorDataStyle.h b/Code/Common/otbVectorDataStyle.h
index fd461db6f5..5b1d7cd506 100644
--- a/Code/Common/otbVectorDataStyle.h
+++ b/Code/Common/otbVectorDataStyle.h
@@ -31,53 +31,51 @@ namespace otb
* \sa VectorDataToImageFilter
*/
-
class ITK_EXPORT VectorDataStyle : public itk::LightObject
{
- public:
- /** Standard class typedefs. */
- typedef VectorDataStyle Self;
- typedef itk::LightObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- /** Method for creation through the object factory. */
- itkNewMacro(Self);
-
- /** Run-time type information (and related methods). */
- itkTypeMacro(VectorDataStyle, LightObject);
-
- void LoadOSMStyle(mapnik::Map& mapnikMap) const;
-
- /** Get/Set the size of the scale factor. */
- double GetScaleFactor() const
- {
- return m_ScaleFactor;
- }
- void SetScaleFactor( double scale )
- {
- m_ScaleFactor = scale;
- }
-
- protected:
- /** Constructor */
- VectorDataStyle():
- m_ScaleFactor(1.0){};
- /** Destructor */
- virtual ~VectorDataStyle() {};
- /**PrintSelf method */
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
- private:
- VectorDataStyle(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
- //this parameter is used only in the case of sensor geometry
- //to adjust the scale
- double m_ScaleFactor;
+public:
+ /** Standard class typedefs. */
+ typedef VectorDataStyle Self;
+ typedef itk::LightObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ /** Method for creation through the object factory. */
+ itkNewMacro(Self);
+
+ /** Run-time type information (and related methods). */
+ itkTypeMacro(VectorDataStyle, LightObject);
+
+ void LoadOSMStyle(mapnik::Map& mapnikMap) const;
+
+ /** Get/Set the size of the scale factor. */
+ double GetScaleFactor() const
+ {
+ return m_ScaleFactor;
+ }
+ void SetScaleFactor(double scale)
+ {
+ m_ScaleFactor = scale;
+ }
+
+protected:
+ /** Constructor */
+ VectorDataStyle() :
+ m_ScaleFactor(1.0){};
+ /** Destructor */
+ virtual ~VectorDataStyle() {}
+ /**PrintSelf method */
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+
+private:
+ VectorDataStyle(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
+
+ //this parameter is used only in the case of sensor geometry
+ //to adjust the scale
+ double m_ScaleFactor;
}; // end class
} // end namespace otb
-
-#endif
\ No newline at end of file
+#endif
diff --git a/Code/Common/otbVectorDataToGISTableFilter.h b/Code/Common/otbVectorDataToGISTableFilter.h
index 6174f1ad60..ce8272bd62 100644
--- a/Code/Common/otbVectorDataToGISTableFilter.h
+++ b/Code/Common/otbVectorDataToGISTableFilter.h
@@ -45,36 +45,35 @@ namespace otb {
* \sa GISTableSource
* \ingroup Common, GeospatialAnalysis
*/
-template<class TVectorData , class TGISTable>
+template<class TVectorData, class TGISTable>
class ITK_EXPORT VectorDataToGISTableFilter :
- public GISTableSource< TGISTable >
+ public GISTableSource<TGISTable>
{
public:
/** Standard class typedefs. */
typedef VectorDataToGISTableFilter Self;
- typedef GISTableSource< TGISTable >
+ typedef GISTableSource<TGISTable>
Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Some convenient typedefs. */
- typedef TVectorData InputVectorDataType;
- typedef TGISTable OutputGISTableType;
- typedef typename InputVectorDataType::Pointer InputVectorDataPointer;
- typedef typename InputVectorDataType::ConstPointer InputVectorDataConstPointer;
- typedef typename OutputGISTableType::Pointer OutputGISTablePointer;
- typedef typename OutputGISTableType::ConstPointer OutputGISTableConstPointer;
-
- typedef typename InputVectorDataType::DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
- typedef typename InputVectorDataType::DataNodeType DataNodeType;
- typedef typename DataNodeType::Pointer DataNodePointerType;
-
+ typedef TVectorData InputVectorDataType;
+ typedef TGISTable OutputGISTableType;
+ typedef typename InputVectorDataType::Pointer InputVectorDataPointer;
+ typedef typename InputVectorDataType::ConstPointer InputVectorDataConstPointer;
+ typedef typename OutputGISTableType::Pointer OutputGISTablePointer;
+ typedef typename OutputGISTableType::ConstPointer OutputGISTableConstPointer;
+
+ typedef typename InputVectorDataType::DataTreeType::TreeNodeType InternalTreeNodeType;
+ typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
+ typedef typename InputVectorDataType::DataNodeType DataNodeType;
+ typedef typename DataNodeType::Pointer DataNodePointerType;
typedef typename OutputGISTableType::ConnectionType InputGISConnectionType;
- typedef typename InputGISConnectionType::Pointer InputGISConnectionPointerType;
+ typedef typename InputGISConnectionType::Pointer InputGISConnectionPointerType;
- typedef OGRVectorDataIO<InputVectorDataType> OGRVectorDataIOType;
+ typedef OGRVectorDataIO<InputVectorDataType> OGRVectorDataIOType;
typedef typename OGRVectorDataIOType::Pointer OGRVectorDataIOPointerType;
/** Standard New method. */
@@ -99,14 +98,14 @@ public:
//void setConnection
/** Set/Get the VectorData input of this process object. */
- virtual void SetInput( const InputVectorDataType *input);
- virtual void SetInput( unsigned int idx, const InputVectorDataType *input);
+ virtual void SetInput(const InputVectorDataType *input);
+ virtual void SetInput(unsigned int idx, const InputVectorDataType *input);
const InputVectorDataType * GetInput(void);
const InputVectorDataType * GetInput(unsigned int idx);
protected:
VectorDataToGISTableFilter();
- virtual ~VectorDataToGISTableFilter() {};
+ virtual ~VectorDataToGISTableFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** VectorDataToGISTAbleFilter needs the entire input be
@@ -114,17 +113,14 @@ protected:
* GenerateInputRequestedRegion(). */
void GenerateInputRequestedRegion();
-
/** Single-threaded version of GenerateData. */
void GenerateData();
-
private:
- VectorDataToGISTableFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorDataToGISTableFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
-
- /** Remove table before insertion if true (Not use for now, need access to specific options of OGR connection*/
+ /** Remove table before insertion if true (Not use for now, need access to specific options of OGR connection*/
bool m_DropExistingGISTable;
/** Connection parameters to the db*/
@@ -140,5 +136,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Common/otbVectorDataToGISTableFilter.txx b/Code/Common/otbVectorDataToGISTableFilter.txx
index ff3cb10ea5..4534015094 100644
--- a/Code/Common/otbVectorDataToGISTableFilter.txx
+++ b/Code/Common/otbVectorDataToGISTableFilter.txx
@@ -23,68 +23,66 @@
namespace otb {
-template<class TVectorData , class TGISTable>
-VectorDataToGISTableFilter< TVectorData, TGISTable >
- ::VectorDataToGISTableFilter()
+template<class TVectorData, class TGISTable>
+VectorDataToGISTableFilter<TVectorData, TGISTable>
+::VectorDataToGISTableFilter()
{
m_InputGISConnection = InputGISConnectionType::New();
m_DropExistingGISTable = false;
m_GISTableName = "vectordata_to_gis";
}
-
-
-template<class TVectorData , class TGISTable>
+template<class TVectorData, class TGISTable>
void
-VectorDataToGISTableFilter< TVectorData, TGISTable >
- ::SetInput(const InputVectorDataType *input)
+VectorDataToGISTableFilter<TVectorData, TGISTable>
+::SetInput(const InputVectorDataType *input)
{
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(0,
- const_cast< InputVectorDataType * >( input ) );
+ const_cast<InputVectorDataType *>(input));
}
-template<class TVectorData , class TGISTable>
+template<class TVectorData, class TGISTable>
void
-VectorDataToGISTableFilter< TVectorData, TGISTable >
- ::SetInput(unsigned int idx, const InputVectorDataType *input)
+VectorDataToGISTableFilter<TVectorData, TGISTable>
+::SetInput(unsigned int idx, const InputVectorDataType *input)
{
- // Process object is not const-correct so the const_cast is required here
+ // Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(idx,
- const_cast< InputVectorDataType * >( input ) );
+ const_cast<InputVectorDataType *>(input));
}
-template<class TVectorData , class TGISTable>
- const typename VectorDataToGISTableFilter< TVectorData, TGISTable >::InputVectorDataType *
-VectorDataToGISTableFilter< TVectorData, TGISTable >
- ::GetInput(void)
+template<class TVectorData, class TGISTable>
+const typename VectorDataToGISTableFilter<TVectorData, TGISTable>::InputVectorDataType *
+VectorDataToGISTableFilter<TVectorData, TGISTable>
+::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TVectorData * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<const TVectorData *>
+ (this->itk::ProcessObject::GetInput(0));
}
-template<class TVectorData , class TGISTable>
- const typename VectorDataToGISTableFilter< TVectorData, TGISTable >::InputVectorDataType *
-VectorDataToGISTableFilter< TVectorData, TGISTable >
- ::GetInput(unsigned int idx)
+template<class TVectorData, class TGISTable>
+const typename VectorDataToGISTableFilter<TVectorData, TGISTable>::InputVectorDataType *
+VectorDataToGISTableFilter<TVectorData, TGISTable>
+::GetInput(unsigned int idx)
{
- return static_cast<const TVectorData * >
- (this->itk::ProcessObject::GetInput(idx) );
+ return static_cast<const TVectorData *>
+ (this->itk::ProcessObject::GetInput(idx));
}
-template<class TVectorData , class TGISTable>
+template<class TVectorData, class TGISTable>
void
-VectorDataToGISTableFilter< TVectorData, TGISTable >
+VectorDataToGISTableFilter<TVectorData, TGISTable>
::GenerateInputRequestedRegion()
-{/*
+{ /*
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
-
+
// We need all the input.
InputImagePointer input = const_cast<InputImageType *>(this->GetInput());
if ( !input )
@@ -103,84 +101,82 @@ LabelMapToVectorDataFilter<TInputImage, TVectorData>
}
*/
-template<class TVectorData , class TGISTable>
+template<class TVectorData, class TGISTable>
void
-VectorDataToGISTableFilter< TVectorData, TGISTable >
+VectorDataToGISTableFilter<TVectorData, TGISTable>
::GenerateData()
{
-
+
/** Allocate the output*/
this->AllocateOutputs();
-
+
OutputGISTableType * output = this->GetOutput();
-
+
const InputVectorDataType * input = this->GetInput();
-
+
/**Set the connection associated to the table*/
output->SetConnection (this->GetInputGISConnection ());
-
-
+
/**Set the projection of the GIS table with the vector data projection informations*/
output->SetProjectionRef(input->GetProjectionRef());
-
+
/**Connection to the database (create a transactor to manage the connection)*/
output->GetConnection()->ConnectToDB();
-
+
/**Name of the table is settedd automaticcaly to "vector_data_to_gis"*/
// output->SetTableName ("vector_data_to_gis");
- //output->SetTableName (this->GetGISTableName());
+//output->SetTableName (this->GetGISTableName());
output->SetTableName ("");
/**Create the PostgreSQL table*/
//output->CreateTable(m_DropExistingGISTable);
-
+
/**Process filter for all inputs*/
for (unsigned int idx = 0; idx < this->GetNumberOfInputs(); ++idx)
- {
- if (this->GetInput(idx))
{
+ if (this->GetInput(idx))
+ {
InputVectorDataConstPointer input = this->GetInput(idx);
- InternalTreeNodeType * inputRoot = const_cast<InternalTreeNodeType *>(input->GetDataTree()->GetRoot());
-
+ InternalTreeNodeType * inputRoot = const_cast<InternalTreeNodeType *>(input->GetDataTree()->GetRoot());
+
//Old methods for processing translation to GIS table
//ProcessNode(inputRoot);
/**New method for the filter, call the OGR driver for writing data to the Db*/
- OGRVectorDataIOPointerType gisWriter=OGRVectorDataIOType::New();
-
+ OGRVectorDataIOPointerType gisWriter = OGRVectorDataIOType::New();
+
/**Transform connection parametrers to the DB to an OGR connection string (based on PG: for PostGIS)"*/
- const std::string outputOGRConnStr=output->GetOGRStrConnection();
-
+ const std::string outputOGRConnStr = output->GetOGRStrConnection();
+
/**Test if the driver is available*/
- if ( gisWriter->CanWriteFile(outputOGRConnStr.data()) ) {
+ if (gisWriter->CanWriteFile(outputOGRConnStr.data()))
+ {
//Write VectorData to the GIS Table using OGR translation
gisWriter->SetFileName(outputOGRConnStr);
- otbGenericMsgDebugMacro(<<"Write vector data to GIS table " << outputOGRConnStr);
-
-
+ otbGenericMsgDebugMacro(<< "Write vector data to GIS table " << outputOGRConnStr);
+
//Write with overwrite =true option
std::string overStr("OVERWRITE=yes");
- char *overOptions[]={ const_cast <char *> (overStr.c_str()) };
+ char *overOptions[] = { const_cast <char *> (overStr.c_str()) };
// std::cout << *overOptions << std::endl;
gisWriter->Write(input, overOptions);
-
+
output->SetTableName (inputRoot->Get()->GetNodeId());
std::cout << "tablename " << output->GetTableName() << std::endl;
- }
+ }
else
- {
+ {
itkGenericExceptionMacro(<< "Not valid connection string (PG:*) " << outputOGRConnStr);
+ }
}
}
- }
-
- }
+}
-template<class TVectorData , class TGISTable>
+template<class TVectorData, class TGISTable>
void
-VectorDataToGISTableFilter< TVectorData, TGISTable >
-::PrintSelf(std::ostream &os, itk::Indent indent) const
+VectorDataToGISTableFilter<TVectorData, TGISTable>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
}
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/Common/otbVectorDataToImageFilter.h b/Code/Common/otbVectorDataToImageFilter.h
index 0ff1ced141..3b9d4ee77a 100644
--- a/Code/Common/otbVectorDataToImageFilter.h
+++ b/Code/Common/otbVectorDataToImageFilter.h
@@ -38,150 +38,146 @@ namespace otb
*
*/
-
template <class TVectorData, class TImage>
- class ITK_EXPORT VectorDataToImageFilter : public itk::ImageSource<TImage>
+class ITK_EXPORT VectorDataToImageFilter : public itk::ImageSource<TImage>
{
- public:
- /** Standard class typedefs. */
- typedef VectorDataToImageFilter Self;
- typedef itk::ImageSource<TImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- /** Method for creation through the object factory. */
- itkNewMacro(Self);
-
- /** Run-time type information (and related methods). */
- itkTypeMacro(VectorDataToImageFilter, ImageSource);
-
- /** Some typedefs. */
- typedef TVectorData VectorDataType;
- typedef TImage ImageType;
- typedef typename ImageType::Pointer ImagePointer;
- typedef typename VectorDataType::ConstPointer VectorDataConstPointer;
- typedef typename VectorDataType::DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
-
- /** Number of dimensions. */
- itkStaticConstMacro(ImageDimension, unsigned int,
- TImage::ImageDimension);
-
- /** Image size typedef. */
- typedef itk::Size<itkGetStaticConstMacro(ImageDimension)> SizeType;
-
- /** Image index typedef. */
- typedef typename TImage::IndexType IndexType;
-
- /** Image spacing,origin and direction typedef */
- typedef typename TImage::SpacingType SpacingType;
- typedef typename TImage::PointType OriginType;
- typedef typename TImage::DirectionType DirectionType;
-
- /** Region typedef */
- typedef typename TImage::RegionType RegionType;
-
- /** typedef specific to mapnik */
- typedef boost::shared_ptr<mapnik::memory_datasource> datasource_ptr;
-
- /** Set/Get the vector data input of this process object. */
- virtual void SetInput( const VectorDataType *input);
- virtual void SetInput( unsigned int idx, const VectorDataType *input);
- const VectorDataType * GetInput(void);
- const VectorDataType * GetInput(unsigned int idx);
-
- /** Set the size of the output image. */
- itkSetMacro( Size, SizeType );
-
- /** Get the size of the output image. */
- itkGetConstReferenceMacro( Size, SizeType );
-
- /** Set the origin of the vector data.
- * \sa GetOrigin() */
- itkSetMacro(Origin, OriginType);
- virtual void SetOrigin( const double origin[2] );
- virtual void SetOrigin( const float origin[2] );
-
- itkGetConstReferenceMacro(Origin, OriginType);
-
-
- /** Set the spacing (size of a pixel) of the vector data.
- * \sa GetSpacing() */
- virtual void SetSpacing (const SpacingType & spacing);
- virtual void SetSpacing (const double spacing[2]);
- virtual void SetSpacing (const float spacing[2]);
-
- itkGetConstReferenceMacro(Spacing, SpacingType);
-
- /** Get/Set methods for the scale factor */
- itkSetMacro(ScaleFactor, double);
- itkGetMacro(ScaleFactor, double);
-
- /** */
- void AddStyle(std::string style)
- {
- m_StyleList.push_back(style);
- }
-
- /** Clear the style list */
- void ClearStyleList()
- {
- m_StyleList.clear();
- }
-
- /** Specify if the output image is to be uses as an overlar
- * (with transparent background) or not (with blue background).
- */
- itkSetMacro(UseAsOverlay, bool);
- itkGetMacro(UseAsOverlay, bool);
- itkBooleanMacro(UseAsOverlay);
-
- protected:
- /** Constructor */
- VectorDataToImageFilter();
- /** Destructor */
- virtual ~VectorDataToImageFilter() {};
- /**PrintSelf method */
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
- virtual void GenerateOutputInformation();
-
- virtual void GenerateData(void);
-
- virtual void BeforeThreadedGenerateData();
+public:
+ /** Standard class typedefs. */
+ typedef VectorDataToImageFilter Self;
+ typedef itk::ImageSource<TImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ /** Method for creation through the object factory. */
+ itkNewMacro(Self);
+
+ /** Run-time type information (and related methods). */
+ itkTypeMacro(VectorDataToImageFilter, ImageSource);
+
+ /** Some typedefs. */
+ typedef TVectorData VectorDataType;
+ typedef TImage ImageType;
+ typedef typename ImageType::Pointer ImagePointer;
+ typedef typename VectorDataType::ConstPointer VectorDataConstPointer;
+ typedef typename VectorDataType::DataTreeType::TreeNodeType InternalTreeNodeType;
+ typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
+
+ /** Number of dimensions. */
+ itkStaticConstMacro(ImageDimension, unsigned int,
+ TImage::ImageDimension);
+
+ /** Image size typedef. */
+ typedef itk::Size<itkGetStaticConstMacro(ImageDimension)> SizeType;
+
+ /** Image index typedef. */
+ typedef typename TImage::IndexType IndexType;
+
+ /** Image spacing,origin and direction typedef */
+ typedef typename TImage::SpacingType SpacingType;
+ typedef typename TImage::PointType OriginType;
+ typedef typename TImage::DirectionType DirectionType;
+
+ /** Region typedef */
+ typedef typename TImage::RegionType RegionType;
+
+ /** typedef specific to mapnik */
+ typedef boost::shared_ptr<mapnik::memory_datasource> datasource_ptr;
+
+ /** Set/Get the vector data input of this process object. */
+ virtual void SetInput(const VectorDataType *input);
+ virtual void SetInput(unsigned int idx, const VectorDataType *input);
+ const VectorDataType * GetInput(void);
+ const VectorDataType * GetInput(unsigned int idx);
+
+ /** Set the size of the output image. */
+ itkSetMacro(Size, SizeType);
+
+ /** Get the size of the output image. */
+ itkGetConstReferenceMacro(Size, SizeType);
+
+ /** Set the origin of the vector data.
+ * \sa GetOrigin() */
+ itkSetMacro(Origin, OriginType);
+ virtual void SetOrigin(const double origin[2]);
+ virtual void SetOrigin(const float origin[2]);
+
+ itkGetConstReferenceMacro(Origin, OriginType);
+
+ /** Set the spacing (size of a pixel) of the vector data.
+ * \sa GetSpacing() */
+ virtual void SetSpacing(const SpacingType& spacing);
+ virtual void SetSpacing(const double spacing[2]);
+ virtual void SetSpacing(const float spacing[2]);
+
+ itkGetConstReferenceMacro(Spacing, SpacingType);
+
+ /** Get/Set methods for the scale factor */
+ itkSetMacro(ScaleFactor, double);
+ itkGetMacro(ScaleFactor, double);
+
+ /** */
+ void AddStyle(std::string style)
+ {
+ m_StyleList.push_back(style);
+ }
+
+ /** Clear the style list */
+ void ClearStyleList()
+ {
+ m_StyleList.clear();
+ }
+
+ /** Specify if the output image is to be uses as an overlar
+ * (with transparent background) or not (with blue background).
+ */
+ itkSetMacro(UseAsOverlay, bool);
+ itkGetMacro(UseAsOverlay, bool);
+ itkBooleanMacro(UseAsOverlay);
+
+protected:
+ /** Constructor */
+ VectorDataToImageFilter();
+ /** Destructor */
+ virtual ~VectorDataToImageFilter() {}
+ /**PrintSelf method */
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+
+ virtual void GenerateOutputInformation();
+ virtual void GenerateData(void);
- private:
- VectorDataToImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ virtual void BeforeThreadedGenerateData();
- void ProcessNode(InternalTreeNodeType * source, datasource_ptr mDatasource);
+private:
+ VectorDataToImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- SpacingType m_Spacing;
- OriginType m_Origin;
- SizeType m_Size;
- IndexType m_StartIndex;
- DirectionType m_Direction;
+ void ProcessNode(InternalTreeNodeType * source, datasource_ptr mDatasource);
- mapnik::Map m_Map;
+ SpacingType m_Spacing;
+ OriginType m_Origin;
+ SizeType m_Size;
+ IndexType m_StartIndex;
+ DirectionType m_Direction;
- //This factor is used to flip the data on the Y axis when using a
- //sensor model geometry (where the Y coordinate increases top-down)
- int m_SensorModelFlip;
+ mapnik::Map m_Map;
- //this parameter is used only in the case of sensor geometry
- //to adjust the scale
- double m_ScaleFactor;
+ //This factor is used to flip the data on the Y axis when using a
+ //sensor model geometry (where the Y coordinate increases top-down)
+ int m_SensorModelFlip;
- //style list
- std::vector<std::string> m_StyleList;
+ //this parameter is used only in the case of sensor geometry
+ //to adjust the scale
+ double m_ScaleFactor;
- //Overlay option: change the backgroup (blue or transparent)
- bool m_UseAsOverlay;
+ //style list
+ std::vector<std::string> m_StyleList;
- //Projection in the proj.4 format (for mapnik)
- std::string m_VectorDataProjectionProj4;
+ //Overlay option: change the backgroup (blue or transparent)
+ bool m_UseAsOverlay;
+ //Projection in the proj.4 format (for mapnik)
+ std::string m_VectorDataProjectionProj4;
}; // end class
} // end namespace otb
diff --git a/Code/Common/otbVectorDataToImageFilter.txx b/Code/Common/otbVectorDataToImageFilter.txx
index 6119f92f40..2b609bb21e 100644
--- a/Code/Common/otbVectorDataToImageFilter.txx
+++ b/Code/Common/otbVectorDataToImageFilter.txx
@@ -44,441 +44,429 @@ namespace otb
/**
* Constructor
*/
- template <class TVectorData, class TImage>
- VectorDataToImageFilter<TVectorData, TImage>
- ::VectorDataToImageFilter() :
- m_StyleList(),
- m_UseAsOverlay(true)
- {
- this->SetNumberOfRequiredInputs( 1 );
- m_Spacing.Fill(1.0);
- m_Origin.Fill(0.0);
- m_Direction.SetIdentity();
- m_Size.Fill( 0 );
- m_StartIndex.Fill( 0 );
- m_Map = mapnik::Map();
- m_SensorModelFlip = 1;
- m_ScaleFactor = 1.0;
- m_VectorDataProjectionProj4 = "";
- }
-
-
- template <class TVectorData, class TImage>
- void
- VectorDataToImageFilter<TVectorData, TImage>
- ::SetInput(const VectorDataType *input)
- {
+template <class TVectorData, class TImage>
+VectorDataToImageFilter<TVectorData, TImage>
+::VectorDataToImageFilter() :
+ m_StyleList(),
+ m_UseAsOverlay(true)
+{
+ this->SetNumberOfRequiredInputs(1);
+ m_Spacing.Fill(1.0);
+ m_Origin.Fill(0.0);
+ m_Direction.SetIdentity();
+ m_Size.Fill(0);
+ m_StartIndex.Fill(0);
+ m_Map = mapnik::Map();
+ m_SensorModelFlip = 1;
+ m_ScaleFactor = 1.0;
+ m_VectorDataProjectionProj4 = "";
+}
+
+template <class TVectorData, class TImage>
+void
+VectorDataToImageFilter<TVectorData, TImage>
+::SetInput(const VectorDataType *input)
+{
// Process object is not const-correct so the const_cast is required here
- this->itk::ProcessObject::SetNthInput(0,
- const_cast< VectorDataType * >( input ) );
- }
-
- template <class TVectorData, class TImage>
- void
- VectorDataToImageFilter<TVectorData, TImage>
- ::SetInput(unsigned int idx, const VectorDataType *input)
- {
- // Process object is not const-correct so the const_cast is required here
- this->itk::ProcessObject::SetNthInput(idx,
- const_cast< VectorDataType * >( input ) );
- }
-
- template <class TVectorData, class TImage>
- const typename VectorDataToImageFilter<TVectorData, TImage>::VectorDataType *
- VectorDataToImageFilter<TVectorData, TImage>
- ::GetInput(void)
- {
- if (this->GetNumberOfInputs() < 1)
+ this->itk::ProcessObject::SetNthInput(0,
+ const_cast<VectorDataType *>(input));
+}
+
+template <class TVectorData, class TImage>
+void
+VectorDataToImageFilter<TVectorData, TImage>
+::SetInput(unsigned int idx, const VectorDataType *input)
+{
+ // Process object is not const-correct so the const_cast is required here
+ this->itk::ProcessObject::SetNthInput(idx,
+ const_cast<VectorDataType *>(input));
+}
+
+template <class TVectorData, class TImage>
+const typename VectorDataToImageFilter<TVectorData, TImage>::VectorDataType *
+VectorDataToImageFilter<TVectorData, TImage>
+::GetInput(void)
+{
+ if (this->GetNumberOfInputs() < 1)
{
- return 0;
+ return 0;
}
- return static_cast<const TVectorData * >
- (this->itk::ProcessObject::GetInput(0) );
- }
+ return static_cast<const TVectorData *>
+ (this->itk::ProcessObject::GetInput(0));
+}
- template <class TVectorData, class TImage>
- const typename VectorDataToImageFilter<TVectorData, TImage>::VectorDataType *
- VectorDataToImageFilter<TVectorData, TImage>
- ::GetInput(unsigned int idx)
- {
- return static_cast<const TVectorData * >
- (this->itk::ProcessObject::GetInput(idx) );
- }
+template <class TVectorData, class TImage>
+const typename VectorDataToImageFilter<TVectorData, TImage>::VectorDataType *
+VectorDataToImageFilter<TVectorData, TImage>
+::GetInput(unsigned int idx)
+{
+ return static_cast<const TVectorData *>
+ (this->itk::ProcessObject::GetInput(idx));
+}
//----------------------------------------------------------------------------
- template <class TVectorData, class TImage>
- void
- VectorDataToImageFilter<TVectorData, TImage>
- ::SetSpacing(const SpacingType & spacing )
- {
- if ( this->m_Spacing != spacing )
+template <class TVectorData, class TImage>
+void
+VectorDataToImageFilter<TVectorData, TImage>
+::SetSpacing(const SpacingType& spacing)
+{
+ if (this->m_Spacing != spacing)
{
- this->m_Spacing = spacing;
- this->Modified();
+ this->m_Spacing = spacing;
+ this->Modified();
}
- }
-
+}
//----------------------------------------------------------------------------
- template <class TVectorData, class TImage>
- void
- VectorDataToImageFilter<TVectorData, TImage>
- ::SetSpacing(const double spacing[2] )
- {
- SpacingType s(spacing);
- this->SetSpacing(s);
- }
-
+template <class TVectorData, class TImage>
+void
+VectorDataToImageFilter<TVectorData, TImage>
+::SetSpacing(const double spacing[2])
+{
+ SpacingType s(spacing);
+ this->SetSpacing(s);
+}
//----------------------------------------------------------------------------
- template <class TVectorData, class TImage>
- void
- VectorDataToImageFilter<TVectorData, TImage>
- ::SetSpacing(const float spacing[2] )
- {
- itk::Vector<float, 2> sf(spacing);
- SpacingType s;
- s.CastFrom( sf );
- this->SetSpacing(s);
- }
+template <class TVectorData, class TImage>
+void
+VectorDataToImageFilter<TVectorData, TImage>
+::SetSpacing(const float spacing[2])
+{
+ itk::Vector<float, 2> sf(spacing);
+ SpacingType s;
+ s.CastFrom(sf);
+ this->SetSpacing(s);
+}
//----------------------------------------------------------------------------
- template <class TVectorData, class TImage>
- void
- VectorDataToImageFilter<TVectorData, TImage>
- ::SetOrigin(const double origin[2] )
- {
- OriginType p(origin);
- this->SetOrigin( p );
- }
-
+template <class TVectorData, class TImage>
+void
+VectorDataToImageFilter<TVectorData, TImage>
+::SetOrigin(const double origin[2])
+{
+ OriginType p(origin);
+ this->SetOrigin(p);
+}
//----------------------------------------------------------------------------
- template <class TVectorData, class TImage>
- void
- VectorDataToImageFilter<TVectorData, TImage>
- ::SetOrigin(const float origin[2] )
- {
- itk::Point<float, 2> of(origin);
- OriginType p;
- p.CastFrom( of );
- this->SetOrigin( p );
- }
+template <class TVectorData, class TImage>
+void
+VectorDataToImageFilter<TVectorData, TImage>
+::SetOrigin(const float origin[2])
+{
+ itk::Point<float, 2> of(origin);
+ OriginType p;
+ p.CastFrom(of);
+ this->SetOrigin(p);
+}
/**
* Inform pipeline of required output region
*/
- template <class TVectorData, class TImage>
- void
- VectorDataToImageFilter<TVectorData, TImage>
- ::GenerateOutputInformation()
- {
+template <class TVectorData, class TImage>
+void
+VectorDataToImageFilter<TVectorData, TImage>
+::GenerateOutputInformation()
+{
- // we can't call the superclass method here.
+ // we can't call the superclass method here.
- // get pointers to the input and output
- ImagePointer outputPtr = this->GetOutput();
- if ( !outputPtr )
+ // get pointers to the input and output
+ ImagePointer outputPtr = this->GetOutput();
+ if (!outputPtr)
{
- return;
+ return;
}
- // Set the size of the output region
- typename TImage::RegionType outputLargestPossibleRegion;
- outputLargestPossibleRegion.SetSize( m_Size );
- outputLargestPossibleRegion.SetIndex( m_StartIndex );
- outputPtr->SetLargestPossibleRegion( outputLargestPossibleRegion );
+ // Set the size of the output region
+ typename TImage::RegionType outputLargestPossibleRegion;
+ outputLargestPossibleRegion.SetSize(m_Size);
+ outputLargestPossibleRegion.SetIndex(m_StartIndex);
+ outputPtr->SetLargestPossibleRegion(outputLargestPossibleRegion);
- // Set spacing and origin
- outputPtr->SetSpacing( m_Spacing );
- outputPtr->SetOrigin( m_Origin );
- outputPtr->SetDirection( m_Direction );
+ // Set spacing and origin
+ outputPtr->SetSpacing(m_Spacing);
+ outputPtr->SetOrigin(m_Origin);
+ outputPtr->SetDirection(m_Direction);
+ //TODO update or check the projection information
- //TODO update or check the projection information
-
- return;
- }
-
+ return;
+}
- /**
- * BeforeThreadedGenerateData
- */
- template <class TVectorData, class TImage>
- void
- VectorDataToImageFilter<TVectorData, TImage>
- ::BeforeThreadedGenerateData(void)
- {
+/**
+* BeforeThreadedGenerateData
+*/
+template <class TVectorData, class TImage>
+void
+VectorDataToImageFilter<TVectorData, TImage>
+::BeforeThreadedGenerateData(void)
+{
- Superclass::BeforeThreadedGenerateData();
+ Superclass::BeforeThreadedGenerateData();
- mapnik::freetype_engine::register_font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf");
+ mapnik::freetype_engine::register_font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf");
- if(m_UseAsOverlay)
+ if (m_UseAsOverlay)
{
- //Set the default backgroup to transparent
- m_Map.set_background(mapnik::color(255,255,255,0));
+ //Set the default backgroup to transparent
+ m_Map.set_background(mapnik::color(255, 255, 255, 0));
}
- else
+ else
{
- m_Map.set_background(mapnik::color("#b5d0d0"));
+ m_Map.set_background(mapnik::color("#b5d0d0"));
}
- //Load the OSM styles using helper class
- otb::VectorDataStyle::Pointer styleLoader = otb::VectorDataStyle::New();
- styleLoader->SetScaleFactor(m_ScaleFactor);
- styleLoader->LoadOSMStyle(m_Map);
-
- //We assume that all the data are reprojected before using OTB.
- VectorDataConstPointer input = this->GetInput();
- //Converting the projection string to the proj.4 format
- std::string vectorDataProjectionWKT;
- itk::ExposeMetaData<std::string>(input->GetMetaDataDictionary(), MetaDataKey::ProjectionRefKey, vectorDataProjectionWKT);
- std::cout << "WKT -> " << vectorDataProjectionWKT << std::endl;
- m_SensorModelFlip = 1;
-
- if (vectorDataProjectionWKT == "")
+ //Load the OSM styles using helper class
+ otb::VectorDataStyle::Pointer styleLoader = otb::VectorDataStyle::New();
+ styleLoader->SetScaleFactor(m_ScaleFactor);
+ styleLoader->LoadOSMStyle(m_Map);
+
+ //We assume that all the data are reprojected before using OTB.
+ VectorDataConstPointer input = this->GetInput();
+ //Converting the projection string to the proj.4 format
+ std::string vectorDataProjectionWKT;
+ itk::ExposeMetaData<std::string>(
+ input->GetMetaDataDictionary(), MetaDataKey::ProjectionRefKey, vectorDataProjectionWKT);
+ std::cout << "WKT -> " << vectorDataProjectionWKT << std::endl;
+ m_SensorModelFlip = 1;
+
+ if (vectorDataProjectionWKT == "")
{
- //We assume that it is an image in sensor model geometry
- //and tell mapnik that this is utm
- //(with a resolution of 1m per unit)
- m_VectorDataProjectionProj4 = "+proj=utm +zone=31 +ellps=WGS84";
- m_SensorModelFlip = -1;
- otbMsgDevMacro(<<"The output map will be in sensor geometry");
+ //We assume that it is an image in sensor model geometry
+ //and tell mapnik that this is utm
+ //(with a resolution of 1m per unit)
+ m_VectorDataProjectionProj4 = "+proj=utm +zone=31 +ellps=WGS84";
+ m_SensorModelFlip = -1;
+ otbMsgDevMacro(<< "The output map will be in sensor geometry");
}
- else
+ else
{
- OGRSpatialReference oSRS(vectorDataProjectionWKT.c_str());
- char * pszProj4;
- oSRS.exportToProj4(&pszProj4);
- m_VectorDataProjectionProj4 = pszProj4;
- CPLFree(pszProj4);
- m_SensorModelFlip = 1;
- otbMsgDevMacro(<<"The output map will be carto/geo geometry");
+ OGRSpatialReference oSRS(vectorDataProjectionWKT.c_str());
+ char * pszProj4;
+ oSRS.exportToProj4(&pszProj4);
+ m_VectorDataProjectionProj4 = pszProj4;
+ CPLFree(pszProj4);
+ m_SensorModelFlip = 1;
+ otbMsgDevMacro(<< "The output map will be carto/geo geometry");
}
- std::cout << "Proj.4 -> " << m_VectorDataProjectionProj4 << std::endl;
-
+ std::cout << "Proj.4 -> " << m_VectorDataProjectionProj4 << std::endl;
- m_Map.set_srs(m_VectorDataProjectionProj4);
+ m_Map.set_srs(m_VectorDataProjectionProj4);
- }
+}
- /**
- * Generate Data
- */
- template <class TVectorData, class TImage>
- void
- VectorDataToImageFilter<TVectorData, TImage>
- ::GenerateData(void)
- {
- this->AllocateOutputs();
+/**
+ * Generate Data
+ */
+template <class TVectorData, class TImage>
+void
+VectorDataToImageFilter<TVectorData, TImage>
+::GenerateData(void)
+{
+ this->AllocateOutputs();
- this->BeforeThreadedGenerateData();
+ this->BeforeThreadedGenerateData();
- ImagePointer output = this->GetOutput();
- RegionType requestedRegion = output->GetRequestedRegion();
- otbMsgDevMacro("requestedRegion: " << requestedRegion);
+ ImagePointer output = this->GetOutput();
+ RegionType requestedRegion = output->GetRequestedRegion();
+ otbMsgDevMacro("requestedRegion: " << requestedRegion);
- if ((requestedRegion.GetSize()[0] > (16LU << 10)) || (requestedRegion.GetSize()[1] > (16LU << 10)))
+ if ((requestedRegion.GetSize()[0] > (16LU << 10)) || (requestedRegion.GetSize()[1] > (16LU << 10)))
{
- //Limitation in mapnik/map.hpp, where we have
- // static const unsigned MIN_MAPSIZE=16;
- // static const unsigned MAX_MAPSIZE=MIN_MAPSIZE<<11;
- itkExceptionMacro(<<"Mapnik does not support the generation of tiles bigger than 16 384");
+ //Limitation in mapnik/map.hpp, where we have
+ // static const unsigned MIN_MAPSIZE=16;
+ // static const unsigned MAX_MAPSIZE=MIN_MAPSIZE<<11;
+ itkExceptionMacro(<< "Mapnik does not support the generation of tiles bigger than 16 384");
}
- //Delete the previous layers from the map
- int numberLayer = m_Map.layerCount();
- for (int i = numberLayer-1; i>=0; i--)//yes, int.
+ //Delete the previous layers from the map
+ int numberLayer = m_Map.layerCount();
+ for (int i = numberLayer - 1; i >= 0; i--) //yes, int.
{
- m_Map.removeLayer(i);
+ m_Map.removeLayer(i);
}
- m_Map.resize(requestedRegion.GetSize()[0],requestedRegion.GetSize()[1]);
+ m_Map.resize(requestedRegion.GetSize()[0], requestedRegion.GetSize()[1]);
-
- for (unsigned int idx = 0; idx < this->GetNumberOfInputs(); ++idx)
+ for (unsigned int idx = 0; idx < this->GetNumberOfInputs(); ++idx)
{
- if (this->GetInput(idx))
+ if (this->GetInput(idx))
{
- datasource_ptr mDatasource = datasource_ptr(new mapnik::memory_datasource);
-
- VectorDataConstPointer input = this->GetInput(idx);
- InternalTreeNodeType * inputRoot = const_cast<InternalTreeNodeType *>(input->GetDataTree()->GetRoot());
-
- ProcessNode(inputRoot,mDatasource);
- otbMsgDevMacro( "Datasource size: " << mDatasource->size());
-
- std::stringstream layerName;
- layerName << "layer-" << idx;
- mapnik::Layer lyr(layerName.str());
- lyr.set_srs(m_VectorDataProjectionProj4);
- lyr.set_datasource(mDatasource);
- // lyr.add_style("river");
- // lyr.add_style("minor-roads-casing");
- // lyr.add_style("minor-roads");
- // lyr.add_style("roads");
- // lyr.add_style("roads-text");
- // lyr.add_style("world");
-
- if (m_StyleList.size() == 0)
+ datasource_ptr mDatasource = datasource_ptr(new mapnik::memory_datasource);
+
+ VectorDataConstPointer input = this->GetInput(idx);
+ InternalTreeNodeType * inputRoot = const_cast<InternalTreeNodeType *>(input->GetDataTree()->GetRoot());
+
+ ProcessNode(inputRoot, mDatasource);
+ otbMsgDevMacro("Datasource size: " << mDatasource->size());
+
+ std::stringstream layerName;
+ layerName << "layer-" << idx;
+ mapnik::Layer lyr(layerName.str());
+ lyr.set_srs(m_VectorDataProjectionProj4);
+ lyr.set_datasource(mDatasource);
+ // lyr.add_style("river");
+ // lyr.add_style("minor-roads-casing");
+ // lyr.add_style("minor-roads");
+ // lyr.add_style("roads");
+ // lyr.add_style("roads-text");
+ // lyr.add_style("world");
+
+ if (m_StyleList.size() == 0)
{
- itkExceptionMacro(<<"No style is provided for the vector data");
+ itkExceptionMacro(<< "No style is provided for the vector data");
}
- for (unsigned int i=0; i<m_StyleList.size(); ++i)
+ for (unsigned int i = 0; i < m_StyleList.size(); ++i)
{
- lyr.add_style(m_StyleList[i]);
+ lyr.add_style(m_StyleList[i]);
}
-
- m_Map.addLayer(lyr);
+ m_Map.addLayer(lyr);
}
}
- assert( (m_SensorModelFlip == 1)||(m_SensorModelFlip == -1) );
-
+ assert((m_SensorModelFlip == 1) || (m_SensorModelFlip == -1));
- mapnik::Envelope<double> envelope(
- m_Origin[0]+requestedRegion.GetIndex()[0]*m_Spacing[0],
- m_SensorModelFlip*(m_Origin[1]+requestedRegion.GetIndex()[1]*m_Spacing[1]+m_Spacing[1]*requestedRegion.GetSize()[1]),
- m_Origin[0]+requestedRegion.GetIndex()[0]*m_Spacing[0]+m_Spacing[0]*requestedRegion.GetSize()[0],
- m_SensorModelFlip*(m_Origin[1]+requestedRegion.GetIndex()[1]*m_Spacing[1])
- );
+ mapnik::Envelope<double> envelope(
+ m_Origin[0] + requestedRegion.GetIndex()[0]*m_Spacing[0],
+ m_SensorModelFlip*(m_Origin[1] + requestedRegion.GetIndex()[1] * m_Spacing[1] + m_Spacing[1] *
+ requestedRegion.GetSize()[1]),
+ m_Origin[0] + requestedRegion.GetIndex()[0]*m_Spacing[0] + m_Spacing[0]*requestedRegion.GetSize()[0],
+ m_SensorModelFlip*(m_Origin[1] + requestedRegion.GetIndex()[1] * m_Spacing[1])
+ );
- m_Map.zoomToBox(envelope);
+ m_Map.zoomToBox(envelope);
// std::cout << "Envelope: " << lyr.envelope() << std::endl;
- std::cout << "Envelope: " << envelope << std::endl;
+ std::cout << "Envelope: " << envelope << std::endl;
- std::cout << "Map scale: " << m_Map.scale_denominator() << std::endl;
- mapnik::Image32 buf(m_Map.getWidth(),m_Map.getHeight());
- mapnik::agg_renderer<mapnik::Image32> ren(m_Map,buf);
- ren.apply();
+ std::cout << "Map scale: " << m_Map.scale_denominator() << std::endl;
+ mapnik::Image32 buf(m_Map.getWidth(), m_Map.getHeight());
+ mapnik::agg_renderer<mapnik::Image32> ren(m_Map, buf);
+ ren.apply();
- const unsigned char * src = buf.raw_data();
+ const unsigned char * src = buf.raw_data();
+ itk::ImageRegionIterator<ImageType> it(output, output->GetRequestedRegion());
- itk::ImageRegionIterator<ImageType> it(output, output->GetRequestedRegion());
-
- for (it.GoToBegin(); !it.IsAtEnd(); ++it)
+ for (it.GoToBegin(); !it.IsAtEnd(); ++it)
{
- itk::RGBAPixel<unsigned char> pix;
- pix[0] = *src;
- ++src;
- pix[1] = *src;
- ++src;
- pix[2] = *src;
- ++src;
- pix[3] = *src;
- ++src;
- it.Set(pix);
+ itk::RGBAPixel<unsigned char> pix;
+ pix[0] = *src;
+ ++src;
+ pix[1] = *src;
+ ++src;
+ pix[2] = *src;
+ ++src;
+ pix[3] = *src;
+ ++src;
+ it.Set(pix);
}
- this->AfterThreadedGenerateData();
- }
-
+ this->AfterThreadedGenerateData();
+}
- template <class TVectorData, class TImage>
- void
- VectorDataToImageFilter<TVectorData, TImage>
- ::ProcessNode(InternalTreeNodeType * source, datasource_ptr mDatasource)
- {
+template <class TVectorData, class TImage>
+void
+VectorDataToImageFilter<TVectorData, TImage>
+::ProcessNode(InternalTreeNodeType * source, datasource_ptr mDatasource)
+{
- typedef otb::DataNode<double,2,double> DataNodeType; //FIXME check if it should be infered from the input type
- typedef typename DataNodeType::Pointer DataNodePointerType;
+ typedef otb::DataNode<double, 2, double> DataNodeType; //FIXME check if it should be infered from the input type
+ typedef typename DataNodeType::Pointer DataNodePointerType;
// Get the children list from the input node
- ChildrenListType children = source->GetChildrenList();
+ ChildrenListType children = source->GetChildrenList();
// For each child
- for(typename ChildrenListType::iterator it = children.begin(); it!=children.end();++it)
+ for (typename ChildrenListType::iterator it = children.begin(); it != children.end(); ++it)
{
// Copy input DataNode info
- DataNodePointerType dataNode = (*it)->Get();
+ DataNodePointerType dataNode = (*it)->Get();
- switch(dataNode->GetNodeType())
+ switch (dataNode->GetNodeType())
+ {
+ case otb::ROOT:
+ {
+ ProcessNode((*it), mDatasource);
+ break;
+ }
+ case otb::DOCUMENT:
+ {
+ ProcessNode((*it), mDatasource);
+ break;
+ }
+ case otb::FOLDER:
+ {
+ ProcessNode((*it), mDatasource);
+ break;
+ }
+ case FEATURE_POINT:
{
- case otb::ROOT:
- {
- ProcessNode((*it),mDatasource);
- break;
- }
- case otb::DOCUMENT:
- {
- ProcessNode((*it),mDatasource);
- break;
- }
- case otb::FOLDER:
- {
- ProcessNode((*it),mDatasource);
- break;
- }
- case FEATURE_POINT:
- {
// itkExceptionMacro(<<"This type (FEATURE_POINT) is not handle (yet) by VectorDataToImageFilter(), please request for it");
// std::cout << std::setprecision(15);
// std::cout << " ** Inserting new point **" << std::endl;
- typedef mapnik::vertex<double,2> vertex2d;
- typedef mapnik::point<vertex2d> point2d;
- typedef boost::shared_ptr<point2d> point_ptr;
- mapnik::geometry2d * point = new point2d;
+ typedef mapnik::vertex<double, 2> vertex2d;
+ typedef mapnik::point<vertex2d> point2d;
+ typedef boost::shared_ptr<point2d> point_ptr;
+ mapnik::geometry2d * point = new point2d;
- point->move_to(dataNode->GetPoint()[0],dataNode->GetPoint()[1]);
+ point->move_to(dataNode->GetPoint()[0], dataNode->GetPoint()[1]);
// std::cout << dataNode->GetPoint()[0] << ", " << dataNode->GetPoint()[1] << std::endl;
+ typedef boost::shared_ptr<mapnik::raster> raster_ptr;
+ typedef mapnik::feature<mapnik::geometry2d, raster_ptr> Feature;
+ typedef boost::shared_ptr<Feature> feature_ptr;
- typedef boost::shared_ptr<mapnik::raster> raster_ptr;
- typedef mapnik::feature<mapnik::geometry2d,raster_ptr> Feature;
- typedef boost::shared_ptr<Feature> feature_ptr;
-
- feature_ptr mfeature = feature_ptr(new Feature(1));
- mfeature->add_geometry(point);
+ feature_ptr mfeature = feature_ptr(new Feature(1));
+ mfeature->add_geometry(point);
- mapnik::transcoder tr("ISO-8859-15");
+ mapnik::transcoder tr("ISO-8859-15");
- if (dataNode->HasField("place_name"))
- boost::put(*mfeature, "name", tr.transcode((dataNode->GetFieldAsString("place_name")).c_str()));
+ if (dataNode->HasField("place_name")) boost::put(*mfeature, "name",
+ tr.transcode((dataNode->GetFieldAsString("place_name")).c_str()));
- boost::put(*mfeature, "place", tr.transcode("city"));
- boost::put(*mfeature, "capital", tr.transcode("yes"));//FIXME more a question of style
+ boost::put(*mfeature, "place", tr.transcode("city"));
+ boost::put(*mfeature, "capital", tr.transcode("yes")); //FIXME more a question of style
- mDatasource->push(mfeature);
+ mDatasource->push(mfeature);
- break;
- }
- case otb::FEATURE_LINE:
- {
+ break;
+ }
+ case otb::FEATURE_LINE:
+ {
// std::cout << std::setprecision(15);
// std::cout << " ** Inserting new line **" << std::endl;
- typedef mapnik::vertex<double,2> vertex2d;
- typedef mapnik::line_string<vertex2d,mapnik::vertex_vector2> line2d;
- typedef boost::shared_ptr<line2d> line_ptr;
- mapnik::geometry2d * line = new line2d;
-
- typedef DataNodeType::LineType::VertexListConstIteratorType VertexIterator;
- VertexIterator itVertex = dataNode->GetLine()->GetVertexList()->Begin();
- while (itVertex != dataNode->GetLine()->GetVertexList()->End())
- {
+ typedef mapnik::vertex<double, 2> vertex2d;
+ typedef mapnik::line_string<vertex2d, mapnik::vertex_vector2> line2d;
+ typedef boost::shared_ptr<line2d> line_ptr;
+ mapnik::geometry2d * line = new line2d;
+
+ typedef DataNodeType::LineType::VertexListConstIteratorType VertexIterator;
+ VertexIterator itVertex = dataNode->GetLine()->GetVertexList()->Begin();
+ while (itVertex != dataNode->GetLine()->GetVertexList()->End())
+ {
// std::cout << itVertex.Value()[0] << ", " << itVertex.Value()[1] << std::endl;
- line->line_to(itVertex.Value()[0],m_SensorModelFlip*itVertex.Value()[1]);
- ++itVertex;
- }
+ line->line_to(itVertex.Value()[0], m_SensorModelFlip * itVertex.Value()[1]);
+ ++itVertex;
+ }
// std::cout << "Num points: " << line->num_points() << std::endl;
+ typedef boost::shared_ptr<mapnik::raster> raster_ptr;
+ typedef mapnik::feature<mapnik::geometry2d, raster_ptr> Feature;
+ typedef boost::shared_ptr<Feature> feature_ptr;
- typedef boost::shared_ptr<mapnik::raster> raster_ptr;
- typedef mapnik::feature<mapnik::geometry2d,raster_ptr> Feature;
- typedef boost::shared_ptr<Feature> feature_ptr;
-
- feature_ptr mfeature = feature_ptr(new Feature(1));
- mfeature->add_geometry(line);
+ feature_ptr mfeature = feature_ptr(new Feature(1));
+ mfeature->add_geometry(line);
- mapnik::transcoder tr("ISO-8859-15");
+ mapnik::transcoder tr("ISO-8859-15");
- if (dataNode->HasField("name"))
- boost::put(*mfeature, "name", tr.transcode((dataNode->GetFieldAsString("name")).c_str()));
- if (dataNode->HasField("NAME"))
- boost::put(*mfeature, "name", tr.transcode((dataNode->GetFieldAsString("NAME")).c_str()));
+ if (dataNode->HasField("name")) boost::put(*mfeature, "name",
+ tr.transcode((dataNode->GetFieldAsString("name")).c_str()));
+ if (dataNode->HasField("NAME")) boost::put(*mfeature, "name",
+ tr.transcode((dataNode->GetFieldAsString("NAME")).c_str()));
// std::cout << mfeature->props().size() << std::endl;
// std::cout << " -> " << (*mfeature)["name"] << std::endl;
@@ -487,76 +475,79 @@ namespace otb
// std::cout << "Type: " << dataNode->GetFieldAsString("TYPE") << std::endl;
// std::cout << "OSM ID: " << dataNode->GetFieldAsString("osm_id") << std::endl;
- if (dataNode->HasField("type"))
- boost::put(*mfeature, "highway", tr.transcode((dataNode->GetFieldAsString("type")).c_str()));
- if (dataNode->HasField("TYPE"))
- boost::put(*mfeature, "highway", tr.transcode((dataNode->GetFieldAsString("TYPE")).c_str()));
+ if (dataNode->HasField("type")) boost::put(*mfeature, "highway",
+ tr.transcode((dataNode->GetFieldAsString("type")).c_str()));
+ if (dataNode->HasField("TYPE")) boost::put(*mfeature, "highway",
+ tr.transcode((dataNode->GetFieldAsString("TYPE")).c_str()));
+ mDatasource->push(mfeature);
- mDatasource->push(mfeature);
-
- break;
- }
- case FEATURE_POLYGON:
+ break;
+ }
+ case FEATURE_POLYGON:
{
// itkExceptionMacro(<<"This type (FEATURE_POLYGON) is not handle (yet) by VectorDataToImageFilter(), please request for it");
- typedef mapnik::vertex<double,2> vertex2d;
- typedef mapnik::polygon<vertex2d,mapnik::vertex_vector2> polygon2d;
- typedef boost::shared_ptr<polygon2d> polygon_ptr;
- mapnik::geometry2d * polygon = new polygon2d;
-
- typedef DataNodeType::PolygonType::VertexListConstIteratorType VertexIterator;
- VertexIterator itVertex = dataNode->GetPolygonExteriorRing()->GetVertexList()->Begin();
- while (itVertex != dataNode->GetPolygonExteriorRing()->GetVertexList()->End())
+ typedef mapnik::vertex<double, 2> vertex2d;
+ typedef mapnik::polygon<vertex2d, mapnik::vertex_vector2> polygon2d;
+ typedef boost::shared_ptr<polygon2d> polygon_ptr;
+ mapnik::geometry2d * polygon = new polygon2d;
+
+ typedef DataNodeType::PolygonType::VertexListConstIteratorType VertexIterator;
+ VertexIterator itVertex = dataNode->GetPolygonExteriorRing()->GetVertexList()->Begin();
+ while (itVertex != dataNode->GetPolygonExteriorRing()->GetVertexList()->End())
{
- polygon->line_to(itVertex.Value()[0],m_SensorModelFlip*itVertex.Value()[1]);
- ++itVertex;
+ polygon->line_to(itVertex.Value()[0], m_SensorModelFlip * itVertex.Value()[1]);
+ ++itVertex;
}
- typedef boost::shared_ptr<mapnik::raster> raster_ptr;
- typedef mapnik::feature<mapnik::geometry2d,raster_ptr> Feature;
- typedef boost::shared_ptr<Feature> feature_ptr;
+ typedef boost::shared_ptr<mapnik::raster> raster_ptr;
+ typedef mapnik::feature<mapnik::geometry2d, raster_ptr> Feature;
+ typedef boost::shared_ptr<Feature> feature_ptr;
- feature_ptr mfeature = feature_ptr(new Feature(1));
- mfeature->add_geometry(polygon);
- mDatasource->push(mfeature);
+ feature_ptr mfeature = feature_ptr(new Feature(1));
+ mfeature->add_geometry(polygon);
+ mDatasource->push(mfeature);
- break;
+ break;
}
- case FEATURE_MULTIPOINT:
+ case FEATURE_MULTIPOINT:
{
- itkExceptionMacro(<<"This type (FEATURE_MULTIPOINT) is not handle (yet) by VectorDataToImageFilter(), please request for it");
- break;
+ itkExceptionMacro(
+ << "This type (FEATURE_MULTIPOINT) is not handle (yet) by VectorDataToImageFilter(), please request for it");
+ break;
}
- case FEATURE_MULTILINE:
+ case FEATURE_MULTILINE:
{
- itkExceptionMacro(<<"This type (FEATURE_MULTILINE) is not handle (yet) by VectorDataToImageFilter(), please request for it");
- break;
+ itkExceptionMacro(
+ << "This type (FEATURE_MULTILINE) is not handle (yet) by VectorDataToImageFilter(), please request for it");
+ break;
}
- case FEATURE_MULTIPOLYGON:
+ case FEATURE_MULTIPOLYGON:
{
- itkExceptionMacro(<<"This type (FEATURE_MULTIPOLYGON) is not handle (yet) by VectorDataToImageFilter(), please request for it");
- break;
+ itkExceptionMacro(
+ << "This type (FEATURE_MULTIPOLYGON) is not handle (yet) by VectorDataToImageFilter(), please request for it");
+ break;
}
- case FEATURE_COLLECTION:
+ case FEATURE_COLLECTION:
{
- itkExceptionMacro(<<"This type (FEATURE_COLLECTION) is not handle (yet) by VectorDataToImageFilter(), please request for it");
- break;
+ itkExceptionMacro(
+ << "This type (FEATURE_COLLECTION) is not handle (yet) by VectorDataToImageFilter(), please request for it");
+ break;
}
}
}
- }
-
- /**
- * PrintSelf Method
- */
- template <class TVectorData, class TImage>
- void
- VectorDataToImageFilter<TVectorData, TImage>
- ::PrintSelf(std::ostream& os, itk::Indent indent) const
- {
- Superclass::PrintSelf(os, indent);
- }
}
-#endif
\ No newline at end of file
+/**
+ * PrintSelf Method
+ */
+template <class TVectorData, class TImage>
+void
+VectorDataToImageFilter<TVectorData, TImage>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
+{
+ Superclass::PrintSelf(os, indent);
+}
+}
+
+#endif
diff --git a/Code/Common/otbVectorDataToLabelMapFilter.h b/Code/Common/otbVectorDataToLabelMapFilter.h
index 1805e9e342..92855b5078 100644
--- a/Code/Common/otbVectorDataToLabelMapFilter.h
+++ b/Code/Common/otbVectorDataToLabelMapFilter.h
@@ -35,7 +35,6 @@
// #include "itkImageToImageFilter.h"
-
namespace otb
{
@@ -50,71 +49,67 @@ namespace otb
* \sa LabelMapSource
*/
-template <class TVectorData, class TLabelMap >
+template <class TVectorData, class TLabelMap>
class ITK_EXPORT VectorDataToLabelMapFilter :
- public LabelMapSource < TLabelMap >
+ public LabelMapSource <TLabelMap>
{
public:
/**
* Standard "Self" & Superclass typedef.
*/
- typedef VectorDataToLabelMapFilter Self;
- typedef LabelMapSource < TLabelMap > Superclass;
+ typedef VectorDataToLabelMapFilter Self;
+ typedef LabelMapSource <TLabelMap> Superclass;
/** Some convenient typedefs. */
- typedef TVectorData InputVectorDataType;
- typedef TLabelMap OutputLabelMapType;
- typedef typename InputVectorDataType::Pointer InputVectorDataPointer;
- typedef typename InputVectorDataType::ConstPointer InputVectorDataConstPointer;
-
- typedef typename OutputLabelMapType::Pointer OutputLabelMapPointer;
- typedef typename OutputLabelMapType::ConstPointer OutputLabelMapConstPointer;
-
- typedef typename InputVectorDataType::DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
- typedef typename InputVectorDataType::DataNodeType DataNodeType;
- typedef typename DataNodeType::Pointer DataNodePointerType;
- typedef typename DataNodeType::PolygonType PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
- typedef typename OutputLabelMapType::LabelType LabelType;
-
-
- typedef typename OutputLabelMapType::IndexType IndexType;
- typedef typename OutputLabelMapType::PixelType OutputLabelMapPixelType;
- typedef typename OutputLabelMapType::PointType OriginType;
- typedef typename OutputLabelMapType::SpacingType SpacingType;
- typedef typename OutputLabelMapType::DirectionType DirectionType;
-
+ typedef TVectorData InputVectorDataType;
+ typedef TLabelMap OutputLabelMapType;
+ typedef typename InputVectorDataType::Pointer InputVectorDataPointer;
+ typedef typename InputVectorDataType::ConstPointer InputVectorDataConstPointer;
+
+ typedef typename OutputLabelMapType::Pointer OutputLabelMapPointer;
+ typedef typename OutputLabelMapType::ConstPointer OutputLabelMapConstPointer;
+
+ typedef typename InputVectorDataType::DataTreeType::TreeNodeType InternalTreeNodeType;
+ typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
+ typedef typename InputVectorDataType::DataNodeType DataNodeType;
+ typedef typename DataNodeType::Pointer DataNodePointerType;
+ typedef typename DataNodeType::PolygonType PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef typename OutputLabelMapType::LabelType LabelType;
+
+ typedef typename OutputLabelMapType::IndexType IndexType;
+ typedef typename OutputLabelMapType::PixelType OutputLabelMapPixelType;
+ typedef typename OutputLabelMapType::PointType OriginType;
+ typedef typename OutputLabelMapType::SpacingType SpacingType;
+ typedef typename OutputLabelMapType::DirectionType DirectionType;
/** typedefs for correct polygon */
- typedef otb::CorrectPolygonFunctor<PolygonType> CorrectFunctorType;
+ typedef otb::CorrectPolygonFunctor<PolygonType> CorrectFunctorType;
/** Number of dimensions. */
itkStaticConstMacro(VectorDataDimension, unsigned int,
TVectorData::Dimension);
/** Image size typedef. */
- typedef itk::Size<itkGetStaticConstMacro(VectorDataDimension)> SizeType;
-
+ typedef itk::Size<itkGetStaticConstMacro(VectorDataDimension)> SizeType;
- typedef typename InputVectorDataType::PointType PointType;
+ typedef typename InputVectorDataType::PointType PointType;
/**
* Smart pointer typedef support
*/
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Set the size of the output image. */
// itkSetMacro( Size, SizeType );
/** Set the starting index of the output image. */
// itkSetMacro( StartIndex, IndexType );
- /**
- * Run-time type information (and related methods)
- */
+/**
+ * Run-time type information (and related methods)
+ */
itkTypeMacro(VectorDataToLabelMapFilter, ImageToImageFilter);
/**
@@ -130,33 +125,33 @@ public:
itkGetConstMacro(BackgroundValue, OutputLabelMapPixelType);
/** Set the size of the output image. */
- itkSetMacro( Size, SizeType );
+ itkSetMacro(Size, SizeType);
/** Get the size of the output image. */
- itkGetConstReferenceMacro( Size, SizeType );
+ itkGetConstReferenceMacro(Size, SizeType);
- /** Set the origin of the vector data.
- * \sa GetOrigin() */
+ /** Set the origin of the vector data.
+ * \sa GetOrigin() */
itkSetMacro(Origin, OriginType);
- virtual void SetOrigin( const double origin[2] );
- virtual void SetOrigin( const float origin[2] );
+ virtual void SetOrigin(const double origin[2]);
+ virtual void SetOrigin(const float origin[2]);
itkGetConstReferenceMacro(Origin, OriginType);
/** Get/Set start index*/
- itkGetConstReferenceMacro( StartIndex, IndexType );
+ itkGetConstReferenceMacro(StartIndex, IndexType);
itkSetMacro(StartIndex, IndexType);
- /** Set the spacing (size of a pixel) of the vector data.
- * \sa GetSpacing() */
- virtual void SetSpacing (const SpacingType & spacing);
- virtual void SetSpacing (const double spacing[2]);
- virtual void SetSpacing (const float spacing[2]);
+ /** Set the spacing (size of a pixel) of the vector data.
+ * \sa GetSpacing() */
+ virtual void SetSpacing(const SpacingType& spacing);
+ virtual void SetSpacing(const double spacing[2]);
+ virtual void SetSpacing(const float spacing[2]);
itkGetConstReferenceMacro(Spacing, SpacingType);
/** Set/Get the Vector data input of this process object. */
- virtual void SetInput( const InputVectorDataType *input);
- virtual void SetInput( unsigned int idx, const InputVectorDataType *input);
+ virtual void SetInput(const InputVectorDataType *input);
+ virtual void SetInput(unsigned int idx, const InputVectorDataType *input);
const InputVectorDataType * GetInput(void);
const InputVectorDataType * GetInput(unsigned int idx);
@@ -171,7 +166,6 @@ protected:
* Standard pipeline method.
*/
-
virtual void GenerateData();
/** VectorDataToLabelMapFilter needs the entire input. Therefore
@@ -185,10 +179,9 @@ protected:
* \sa ProcessObject::EnlargeOutputRequestedRegion() */
// void EnlargeOutputRequestedRegion(itk::DataObject *itkNotUsed(output));
-
private:
- VectorDataToLabelMapFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorDataToLabelMapFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
void ProcessNode(InternalTreeNodeType * source);
@@ -196,15 +189,15 @@ private:
LabelType m_lab;
//TODO donc need this attribute now compute with VectorDataProperties
- SpacingType m_Spacing;
- OriginType m_Origin;
- SizeType m_Size;
- IndexType m_StartIndex;
- DirectionType m_Direction;
+ SpacingType m_Spacing;
+ OriginType m_Origin;
+ SizeType m_Size;
+ IndexType m_StartIndex;
+ DirectionType m_Direction;
/** Background value, not use actually, background value=itk::NumericTraits<LabelType>::max()*/
OutputLabelMapPixelType m_BackgroundValue;
- };
+};
} // end namespace itk
diff --git a/Code/Common/otbVectorDataToLabelMapFilter.txx b/Code/Common/otbVectorDataToLabelMapFilter.txx
index 8968742a75..e5bfa9bce9 100644
--- a/Code/Common/otbVectorDataToLabelMapFilter.txx
+++ b/Code/Common/otbVectorDataToLabelMapFilter.txx
@@ -26,115 +26,110 @@
namespace otb
{
-template <class TVectorData, class TLabelMap >
-VectorDataToLabelMapFilter<TVectorData, TLabelMap >
- ::VectorDataToLabelMapFilter()
- {
- m_BackgroundValue = itk::NumericTraits<OutputLabelMapPixelType>::max();
- this->SetNumberOfRequiredInputs( 1 );
- m_Spacing.Fill(1.0);
- m_Origin.Fill(0.0);
- m_Direction.SetIdentity();
- m_Size.Fill( 0 );
- m_StartIndex.Fill( 0 );
- m_lab = itk::NumericTraits<LabelType>::Zero;
- }
+template <class TVectorData, class TLabelMap>
+VectorDataToLabelMapFilter<TVectorData, TLabelMap>
+::VectorDataToLabelMapFilter()
+{
+ m_BackgroundValue = itk::NumericTraits<OutputLabelMapPixelType>::max();
+ this->SetNumberOfRequiredInputs(1);
+ m_Spacing.Fill(1.0);
+ m_Origin.Fill(0.0);
+ m_Direction.SetIdentity();
+ m_Size.Fill(0);
+ m_StartIndex.Fill(0);
+ m_lab = itk::NumericTraits<LabelType>::Zero;
+}
//----------------------------------------------------------------------------
-template <class TVectorData, class TLabelMap >
+template <class TVectorData, class TLabelMap>
void
-VectorDataToLabelMapFilter<TVectorData, TLabelMap >
-::SetSpacing(const SpacingType & spacing )
- {
- if ( this->m_Spacing != spacing )
+VectorDataToLabelMapFilter<TVectorData, TLabelMap>
+::SetSpacing(const SpacingType& spacing)
+{
+ if (this->m_Spacing != spacing)
{
- this->m_Spacing = spacing;
- this->Modified();
+ this->m_Spacing = spacing;
+ this->Modified();
}
- }
-
+}
//----------------------------------------------------------------------------
-template <class TVectorData, class TLabelMap >
+template <class TVectorData, class TLabelMap>
void
-VectorDataToLabelMapFilter<TVectorData, TLabelMap >
-::SetSpacing(const double spacing[2] )
- {
- SpacingType s(spacing);
- this->SetSpacing(s);
- }
-
+VectorDataToLabelMapFilter<TVectorData, TLabelMap>
+::SetSpacing(const double spacing[2])
+{
+ SpacingType s(spacing);
+ this->SetSpacing(s);
+}
//----------------------------------------------------------------------------
-template <class TVectorData, class TLabelMap >
+template <class TVectorData, class TLabelMap>
void
-VectorDataToLabelMapFilter<TVectorData, TLabelMap >
-::SetSpacing(const float spacing[2] )
- {
- itk::Vector<float, 2> sf(spacing);
- SpacingType s;
- s.CastFrom( sf );
- this->SetSpacing(s);
- }
+VectorDataToLabelMapFilter<TVectorData, TLabelMap>
+::SetSpacing(const float spacing[2])
+{
+ itk::Vector<float, 2> sf(spacing);
+ SpacingType s;
+ s.CastFrom(sf);
+ this->SetSpacing(s);
+}
//----------------------------------------------------------------------------
-template <class TVectorData, class TLabelMap >
+template <class TVectorData, class TLabelMap>
void
-VectorDataToLabelMapFilter<TVectorData, TLabelMap >
-::SetOrigin(const double origin[2] )
- {
- OriginType p(origin);
- this->SetOrigin( p );
- }
-
+VectorDataToLabelMapFilter<TVectorData, TLabelMap>
+::SetOrigin(const double origin[2])
+{
+ OriginType p(origin);
+ this->SetOrigin(p);
+}
//----------------------------------------------------------------------------
-template <class TVectorData, class TLabelMap >
+template <class TVectorData, class TLabelMap>
void
-VectorDataToLabelMapFilter<TVectorData, TLabelMap >
-::SetOrigin(const float origin[2] )
- {
- itk::Point<float, 2> of(origin);
- OriginType p;
- p.CastFrom( of );
- this->SetOrigin( p );
- }
-
+VectorDataToLabelMapFilter<TVectorData, TLabelMap>
+::SetOrigin(const float origin[2])
+{
+ itk::Point<float, 2> of(origin);
+ OriginType p;
+ p.CastFrom(of);
+ this->SetOrigin(p);
+}
/**
* overloaded because pb during copyinformation
*/
- template <class TVectorData, class TLabelMap >
- void VectorDataToLabelMapFilter<TVectorData, TLabelMap >
- ::GenerateOutputInformation()
- {
- // we can't call the superclass method here.
+template <class TVectorData, class TLabelMap>
+void VectorDataToLabelMapFilter<TVectorData, TLabelMap>
+::GenerateOutputInformation()
+{
+ // we can't call the superclass method here.
- // get pointers to the input and output
- OutputLabelMapType * outputPtr = this->GetOutput();
+ // get pointers to the input and output
+ OutputLabelMapType * outputPtr = this->GetOutput();
- if ( !outputPtr )
+ if (!outputPtr)
{
- return;
+ return;
}
- // Set the size of the output region
- typename OutputLabelMapType::RegionType outputLargestPossibleRegion;
- outputLargestPossibleRegion.SetSize( m_Size );
- outputLargestPossibleRegion.SetIndex( m_StartIndex );
- outputPtr->SetLargestPossibleRegion( outputLargestPossibleRegion );
+ // Set the size of the output region
+ typename OutputLabelMapType::RegionType outputLargestPossibleRegion;
+ outputLargestPossibleRegion.SetSize(m_Size);
+ outputLargestPossibleRegion.SetIndex(m_StartIndex);
+ outputPtr->SetLargestPossibleRegion(outputLargestPossibleRegion);
- otbGenericMsgDebugMacro(<<"LargestPossibleRegion " << outputPtr->GetLargestPossibleRegion());
+ otbGenericMsgDebugMacro(<< "LargestPossibleRegion " << outputPtr->GetLargestPossibleRegion());
- // Set spacing and origin
- outputPtr->SetSpacing( m_Spacing );
- outputPtr->SetOrigin( m_Origin );
- outputPtr->SetDirection( m_Direction );
+ // Set spacing and origin
+ outputPtr->SetSpacing(m_Spacing);
+ outputPtr->SetOrigin(m_Origin);
+ outputPtr->SetDirection(m_Direction);
-
- return;
- }
+ return;
+}
/*
template <class TVectorData, class TLabelMap >
void
@@ -165,52 +160,52 @@ VectorDataToLabelMapFilter<TVectorData, TLabelMap >
}
*/
-template<class TVectorData , class TLabelMap>
- void
- VectorDataToLabelMapFilter< TVectorData, TLabelMap >
- ::SetInput(const InputVectorDataType *input)
+template<class TVectorData, class TLabelMap>
+void
+VectorDataToLabelMapFilter<TVectorData, TLabelMap>
+::SetInput(const InputVectorDataType *input)
{
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(0,
- const_cast< InputVectorDataType * >( input ) );
+ const_cast<InputVectorDataType *>(input));
}
-template<class TVectorData , class TLabelMap>
- void
- VectorDataToLabelMapFilter< TVectorData, TLabelMap >
- ::SetInput(unsigned int idx, const InputVectorDataType *input)
+template<class TVectorData, class TLabelMap>
+void
+VectorDataToLabelMapFilter<TVectorData, TLabelMap>
+::SetInput(unsigned int idx, const InputVectorDataType *input)
{
- // Process object is not const-correct so the const_cast is required here
+ // Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(idx,
- const_cast< InputVectorDataType * >( input ) );
+ const_cast<InputVectorDataType *>(input));
}
-template<class TVectorData , class TLabelMap>
- const typename VectorDataToLabelMapFilter< TVectorData, TLabelMap >::InputVectorDataType *
- VectorDataToLabelMapFilter< TVectorData, TLabelMap >
- ::GetInput(void)
+template<class TVectorData, class TLabelMap>
+const typename VectorDataToLabelMapFilter<TVectorData, TLabelMap>::InputVectorDataType *
+VectorDataToLabelMapFilter<TVectorData, TLabelMap>
+::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TVectorData * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<const TVectorData *>
+ (this->itk::ProcessObject::GetInput(0));
}
-template<class TVectorData , class TLabelMap>
- const typename VectorDataToLabelMapFilter< TVectorData, TLabelMap >::InputVectorDataType *
- VectorDataToLabelMapFilter< TVectorData, TLabelMap >
- ::GetInput(unsigned int idx)
+template<class TVectorData, class TLabelMap>
+const typename VectorDataToLabelMapFilter<TVectorData, TLabelMap>::InputVectorDataType *
+VectorDataToLabelMapFilter<TVectorData, TLabelMap>
+::GetInput(unsigned int idx)
{
- return static_cast<const TVectorData * >
- (this->itk::ProcessObject::GetInput(idx) );
+ return static_cast<const TVectorData *>
+ (this->itk::ProcessObject::GetInput(idx));
}
-template <class TVectorData, class TLabelMap >
+template <class TVectorData, class TLabelMap>
void
- VectorDataToLabelMapFilter<TVectorData, TLabelMap >
+VectorDataToLabelMapFilter<TVectorData, TLabelMap>
::GenerateData()
{
// Allocate the output
@@ -220,14 +215,14 @@ void
//For each input
for (unsigned int idx = 0; idx < this->GetNumberOfInputs(); ++idx)
- {
- if (this->GetInput(idx))
{
+ if (this->GetInput(idx))
+ {
InputVectorDataConstPointer input = this->GetInput(idx);
- InternalTreeNodeType * inputRoot = const_cast<InternalTreeNodeType *>(input->GetDataTree()->GetRoot());
+ InternalTreeNodeType * inputRoot = const_cast<InternalTreeNodeType *>(input->GetDataTree()->GetRoot());
//Use our own value for the background
- output->SetBackgroundValue( itk::NumericTraits<OutputLabelMapPixelType>::max() );
+ output->SetBackgroundValue(itk::NumericTraits<OutputLabelMapPixelType>::max());
//Set the value of the first label
m_lab = itk::NumericTraits<LabelType>::Zero;
// otbGenericMsgDebugMacro(<<"input " << idx);
@@ -236,147 +231,154 @@ void
output->SetMetaDataDictionary(input->GetMetaDataDictionary());
ProcessNode(inputRoot);
+ }
}
- }
}
-
-template<class TVectorData , class TLabelMap>
+template<class TVectorData, class TLabelMap>
void
-VectorDataToLabelMapFilter< TVectorData, TLabelMap >
+VectorDataToLabelMapFilter<TVectorData, TLabelMap>
::ProcessNode(InternalTreeNodeType * source)
{
-
// Get the children list from the input node
ChildrenListType children = source->GetChildrenList();
// For each child
- for(typename ChildrenListType::iterator it = children.begin(); it!=children.end();++it)
- {
+ for (typename ChildrenListType::iterator it = children.begin(); it != children.end(); ++it)
+ {
// Copy input DataNode info
DataNodePointerType dataNode = (*it)->Get();
- otbGenericMsgDebugMacro(<<"Type of node " << dataNode->GetNodeType() << " id" << dataNode->GetNodeId());
- switch(dataNode->GetNodeType())
- {
- case otb::ROOT:
+ otbGenericMsgDebugMacro(<< "Type of node " << dataNode->GetNodeType() << " id" << dataNode->GetNodeId());
+ switch (dataNode->GetNodeType())
+ {
+ case otb::ROOT:
{
- ProcessNode((*it));
- break;
+ ProcessNode((*it));
+ break;
}
- case otb::DOCUMENT:
+ case otb::DOCUMENT:
{
- ProcessNode((*it));
- break;
+ ProcessNode((*it));
+ break;
}
- case otb::FOLDER:
+ case otb::FOLDER:
{
- ProcessNode((*it));
- break;
+ ProcessNode((*it));
+ break;
}
- case FEATURE_POINT:
+ case FEATURE_POINT:
{
- otbGenericMsgDebugMacro(<<"Insert Point from vectorData");
- IndexType index;
- this->GetOutput()->TransformPhysicalPointToIndex(dataNode->GetPoint(), index);
+ otbGenericMsgDebugMacro(<< "Insert Point from vectorData");
+ IndexType index;
+ this->GetOutput()->TransformPhysicalPointToIndex(dataNode->GetPoint(), index);
- this->GetOutput()->SetPixel( index ,m_lab);
- m_lab+=10;
- break;
+ this->GetOutput()->SetPixel(index, m_lab);
+ m_lab += 10;
+ break;
}
- case otb::FEATURE_LINE:
+ case otb::FEATURE_LINE:
{
- //TODO Bresenham
- itkExceptionMacro(<<"This type (FEATURE_LINE) is not handle (yet) by VectorDataToLabelMapFilter(), please request for it");
- break;
+ //TODO Bresenham
+ itkExceptionMacro(
+ << "This type (FEATURE_LINE) is not handle (yet) by VectorDataToLabelMapFilter(), please request for it");
+ break;
}
- case FEATURE_POLYGON:
+ case FEATURE_POLYGON:
{
- /** correct polygon exterior ring (simplify and close the pokygon)*/
- CorrectFunctorType correct;
- PolygonPointerType correctPolygonExtRing = correct( dataNode->GetPolygonExteriorRing() );
-
-
- typedef typename DataNodeType::PolygonType PolygonType;
- typedef typename PolygonType::RegionType RegionType;
- typedef typename PolygonType::VertexType VertexType;
- typedef typename IndexType::IndexValueType IndexValueType;
- typedef typename VertexType::ValueType VertexValueType;
- RegionType polygonExtRingBoundReg = correctPolygonExtRing->GetBoundingRegion();
-
-
- VertexType vertex;
- std::cout << "Polygon bounding region " << polygonExtRingBoundReg<< std::endl;
- std::cout << "output origin " << this->GetOutput()->GetOrigin()<< std::endl;
- std::cout << "spacing " << this->GetOutput()->GetSpacing()<< std::endl;
- // For each position in the bounding region of the polygon
-
- for (double i = polygonExtRingBoundReg.GetOrigin(0);i < polygonExtRingBoundReg.GetOrigin(0) + polygonExtRingBoundReg.GetSize(0);i+=this->GetOutput()->GetSpacing()[0])
+ /** correct polygon exterior ring (simplify and close the pokygon)*/
+ CorrectFunctorType correct;
+ PolygonPointerType correctPolygonExtRing = correct(dataNode->GetPolygonExteriorRing());
+
+ typedef typename DataNodeType::PolygonType PolygonType;
+ typedef typename PolygonType::RegionType RegionType;
+ typedef typename PolygonType::VertexType VertexType;
+ typedef typename IndexType::IndexValueType IndexValueType;
+ typedef typename VertexType::ValueType VertexValueType;
+ RegionType polygonExtRingBoundReg = correctPolygonExtRing->GetBoundingRegion();
+
+ VertexType vertex;
+ std::cout << "Polygon bounding region " << polygonExtRingBoundReg << std::endl;
+ std::cout << "output origin " << this->GetOutput()->GetOrigin() << std::endl;
+ std::cout << "spacing " << this->GetOutput()->GetSpacing() << std::endl;
+ // For each position in the bounding region of the polygon
+
+ for (double i = polygonExtRingBoundReg.GetOrigin(0);
+ i < polygonExtRingBoundReg.GetOrigin(0) + polygonExtRingBoundReg.GetSize(0);
+ i += this->GetOutput()->GetSpacing()[0])
{
- vertex[0] = static_cast<VertexValueType>(i);
- for (double j = polygonExtRingBoundReg.GetOrigin(1);j<polygonExtRingBoundReg.GetOrigin(1) + polygonExtRingBoundReg.GetSize(1);j+=this->GetOutput()->GetSpacing()[1])
+ vertex[0] = static_cast<VertexValueType>(i);
+ for (double j = polygonExtRingBoundReg.GetOrigin(1);
+ j < polygonExtRingBoundReg.GetOrigin(1) + polygonExtRingBoundReg.GetSize(1);
+ j += this->GetOutput()->GetSpacing()[1])
{
- vertex[1] = static_cast<VertexValueType>(j);
+ vertex[1] = static_cast<VertexValueType>(j);
- if (correctPolygonExtRing->IsInside(vertex) || correctPolygonExtRing->IsOnEdge (vertex))
+ if (correctPolygonExtRing->IsInside(vertex) || correctPolygonExtRing->IsOnEdge (vertex))
{
- IndexType index;
- index[0] = static_cast<IndexValueType>(vertex[0] - polygonExtRingBoundReg.GetOrigin(0));
- index[1] = static_cast<IndexValueType>(vertex[1] - polygonExtRingBoundReg.GetOrigin(1));
+ IndexType index;
+ index[0] = static_cast<IndexValueType>(vertex[0] - polygonExtRingBoundReg.GetOrigin(0));
+ index[1] = static_cast<IndexValueType>(vertex[1] - polygonExtRingBoundReg.GetOrigin(1));
// index[0] += this->GetOutput()->GetOrigin()[0];
// index[1] += this->GetOutput()->GetOrigin()[1];
// std::cout << "index " << index << std::endl;
- if (this->GetOutput()->HasLabel( m_lab ) )
+ if (this->GetOutput()->HasLabel(m_lab))
{
- if (!this->GetOutput()->GetLabelObject( m_lab )->HasIndex( index ))
+ if (!this->GetOutput()->GetLabelObject(m_lab)->HasIndex(index))
{ //Add a pixel to the current labelObject
- this->GetOutput()->SetPixel(index ,m_lab);
+ this->GetOutput()->SetPixel(index, m_lab);
}
}
- else
+ else
{
- //Add a pixel to the current labelObject
- this->GetOutput()->SetPixel(index ,m_lab);
+ //Add a pixel to the current labelObject
+ this->GetOutput()->SetPixel(index, m_lab);
}
}
}
}
- //Modify the label for the next layer
- m_lab+=10;
- break;
+ //Modify the label for the next layer
+ m_lab += 10;
+ break;
}
- case FEATURE_MULTIPOINT:
+ case FEATURE_MULTIPOINT:
{
- itkExceptionMacro(<<"This type (FEATURE_MULTIPOINT) is not handle (yet) by VectorDataToLabelMapFilter(), please request for it");
- break;
+ itkExceptionMacro(
+ << "This type (FEATURE_MULTIPOINT) is not handle (yet) by VectorDataToLabelMapFilter(), please request for it");
+ break;
}
- case FEATURE_MULTILINE:
+ case FEATURE_MULTILINE:
{
- itkExceptionMacro(<<"This type (FEATURE_MULTILINE) is not handle (yet) by VectorDataToLabelMapFilter(), please request for it");
- break;
+ itkExceptionMacro(
+ << "This type (FEATURE_MULTILINE) is not handle (yet) by VectorDataToLabelMapFilter(), please request for it");
+ break;
}
- case FEATURE_MULTIPOLYGON:
+ case FEATURE_MULTIPOLYGON:
{
- itkExceptionMacro(<<"This type (FEATURE_MULTIPOLYGON) is not handle (yet) by VectorDataToLabelMapFilter(), please request for it");
- break;
+ itkExceptionMacro(
+ <<
+ "This type (FEATURE_MULTIPOLYGON) is not handle (yet) by VectorDataToLabelMapFilter(), please request for it");
+ break;
}
- case FEATURE_COLLECTION:
+ case FEATURE_COLLECTION:
{
- itkExceptionMacro(<<"This type (FEATURE_COLLECTION) is not handle (yet) by VectorDataToLabelMapFilter(), please request for it");
- break;
+ itkExceptionMacro(
+ << "This type (FEATURE_COLLECTION) is not handle (yet) by VectorDataToLabelMapFilter(), please request for it");
+ break;
+ }
}
}
- }
}
-template <class TVectorData, class TLabelMap >
+template <class TVectorData, class TLabelMap>
void
-VectorDataToLabelMapFilter<TVectorData, TLabelMap >
- ::PrintSelf(std::ostream& os, itk::Indent indent) const
+VectorDataToLabelMapFilter<TVectorData, TLabelMap>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os << indent << "BackgroundValue: " << static_cast<typename itk::NumericTraits<OutputLabelMapPixelType>::PrintType>(m_BackgroundValue) << std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "BackgroundValue: " << static_cast<typename itk::NumericTraits<OutputLabelMapPixelType>::PrintType>(
+ m_BackgroundValue) << std::endl;
}
} // end namespace otb
diff --git a/Code/Common/otbVectorDataToVectorDataFilter.h b/Code/Common/otbVectorDataToVectorDataFilter.h
index 2afa64b329..545d6b0e0e 100644
--- a/Code/Common/otbVectorDataToVectorDataFilter.h
+++ b/Code/Common/otbVectorDataToVectorDataFilter.h
@@ -34,15 +34,15 @@ namespace otb
*
* \ingroup VectorDataFilter
*/
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
class ITK_EXPORT VectorDataToVectorDataFilter : public otb::VectorDataSource<TOutputVectorData>
{
public:
/** Standard class typedefs. */
- typedef VectorDataToVectorDataFilter Self;
- typedef otb::VectorDataSource<TOutputVectorData> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef VectorDataToVectorDataFilter Self;
+ typedef otb::VectorDataSource<TOutputVectorData> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -51,29 +51,27 @@ public:
itkTypeMacro(VectorDataToVectorDataFilter, VectorDataSource);
/** Some typedefs. */
- typedef TInputVectorData InputVectorDataType;
- typedef TOutputVectorData OutputVectorDataType;
+ typedef TInputVectorData InputVectorDataType;
+ typedef TOutputVectorData OutputVectorDataType;
typedef typename TInputVectorData::ConstPointer InputVectorDataPointer;
- typedef typename TOutputVectorData::Pointer OutputVectorDataPointer;
+ typedef typename TOutputVectorData::Pointer OutputVectorDataPointer;
typedef itk::DataObject::Pointer DataObjectPointer;
-
- virtual void SetInput( const InputVectorDataType *input);
+ virtual void SetInput(const InputVectorDataType *input);
const InputVectorDataType * GetInput(void);
-
protected:
/** Constructor */
VectorDataToVectorDataFilter();
/** Destructor */
- virtual ~VectorDataToVectorDataFilter() {};
+ virtual ~VectorDataToVectorDataFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- VectorDataToVectorDataFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorDataToVectorDataFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Common/otbVectorDataToVectorDataFilter.txx b/Code/Common/otbVectorDataToVectorDataFilter.txx
index fa837c244c..2c1de47b6e 100644
--- a/Code/Common/otbVectorDataToVectorDataFilter.txx
+++ b/Code/Common/otbVectorDataToVectorDataFilter.txx
@@ -28,35 +28,34 @@ namespace otb
* Constructor
*/
template <class TInputVectorData, class TOutputVectorData>
-VectorDataToVectorDataFilter<TInputVectorData,TOutputVectorData>
+VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData>
::VectorDataToVectorDataFilter()
{
- this->SetNumberOfRequiredInputs( 1 );
+ this->SetNumberOfRequiredInputs(1);
}
-
template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataToVectorDataFilter<TInputVectorData,TOutputVectorData>
+VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData>
::SetInput(const InputVectorDataType *input)
{
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(0,
- const_cast< InputVectorDataType * >( input ) );
+ const_cast<InputVectorDataType *>(input));
}
template <class TInputVectorData, class TOutputVectorData>
-const typename VectorDataToVectorDataFilter<TInputVectorData,TOutputVectorData>::InputVectorDataType *
-VectorDataToVectorDataFilter<TInputVectorData,TOutputVectorData>
+const typename VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData>::InputVectorDataType *
+VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData>
::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TInputVectorData * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<const TInputVectorData *>
+ (this->itk::ProcessObject::GetInput(0));
}
/**
@@ -64,7 +63,7 @@ VectorDataToVectorDataFilter<TInputVectorData,TOutputVectorData>
*/
template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataToVectorDataFilter<TInputVectorData,TOutputVectorData>
+VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/Common/otbVectorImageToASImageAdaptor.h b/Code/Common/otbVectorImageToASImageAdaptor.h
index db1f481248..bd9cba4338 100644
--- a/Code/Common/otbVectorImageToASImageAdaptor.h
+++ b/Code/Common/otbVectorImageToASImageAdaptor.h
@@ -25,7 +25,6 @@
namespace otb
{
-
/** \class VectorImageToASImageAdaptor
* \brief Presents an image of pixel type Vector as being and image of
* FixelArray<unsigned short,3> type.
@@ -35,29 +34,29 @@ namespace otb
*/
template <class TImage>
class ITK_EXPORT VectorImageToASImageAdaptor : public
- itk::ImageAdaptor<TImage,otb::Accessor::VectorImageToASPixelAccessor<
- typename TImage::PixelType::ValueType> >
+ itk::ImageAdaptor<TImage, otb::Accessor::VectorImageToASPixelAccessor<
+ typename TImage::PixelType::ValueType> >
{
public:
/** Standard class typedefs. */
- typedef VectorImageToASImageAdaptor Self;
+ typedef VectorImageToASImageAdaptor Self;
typedef itk::ImageAdaptor<TImage,
- otb::Accessor::VectorImageToASPixelAccessor<
- typename TImage::PixelType::ValueType
- > > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ otb::Accessor::VectorImageToASPixelAccessor<
+ typename TImage::PixelType::ValueType
+ > > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( VectorImageToASImageAdaptor, ImageAdaptor );
+ itkTypeMacro(VectorImageToASImageAdaptor, ImageAdaptor);
/** PixelContainer typedef support. Used to construct a container for
* the pixel data. */
- typedef typename Superclass::PixelContainer PixelContainer;
- typedef typename Superclass::PixelContainerPointer PixelContainerPointer;
+ typedef typename Superclass::PixelContainer PixelContainer;
+ typedef typename Superclass::PixelContainerPointer PixelContainerPointer;
typedef typename Superclass::PixelContainerConstPointer PixelContainerConstPointer;
protected:
@@ -65,8 +64,8 @@ protected:
virtual ~VectorImageToASImageAdaptor() {}
private:
- VectorImageToASImageAdaptor(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorImageToASImageAdaptor(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Common/otbVectorImageToASPixelAccessor.h b/Code/Common/otbVectorImageToASPixelAccessor.h
index 2f85135f6d..6f6a819331 100644
--- a/Code/Common/otbVectorImageToASPixelAccessor.h
+++ b/Code/Common/otbVectorImageToASPixelAccessor.h
@@ -16,15 +16,12 @@
=========================================================================*/
-
#ifndef __otbVectorImageToASPixelAccessor_h
#define __otbVectorImageToASPixelAccessor_h
-
#include "itkFixedArray.h"
#include "itkVector.h"
-
namespace otb
{
namespace Accessor
@@ -47,18 +44,18 @@ class ITK_EXPORT VectorImageToASPixelAccessor
{
public:
/** Standard class typedefs. */
- typedef VectorImageToASPixelAccessor Self;
+ typedef VectorImageToASPixelAccessor Self;
/** External typedef. It defines the external aspect
* that this class will exhibit */
- typedef itk::FixedArray<T,3> ExternalType;
+ typedef itk::FixedArray<T, 3> ExternalType;
/** Internal typedef. It defines the internal real
* representation of data */
- typedef itk::Vector<T,3> InternalType;
+ typedef itk::Vector<T, 3> InternalType;
/** Write access to the VectorToRGB component */
- inline void Set( InternalType & output, const ExternalType & input ) const
+ inline void Set(InternalType& output, const ExternalType& input) const
{
output[0] = input[0];
output[1] = input[1];
@@ -66,7 +63,7 @@ public:
}
/** Read access to the VectorToRGB component */
- inline ExternalType Get( const InternalType & input ) const
+ inline ExternalType Get(const InternalType& input) const
{
ExternalType rgb(input.GetDataPointer());
return rgb;
@@ -79,4 +76,3 @@ private:
} // end namespace otb
#endif
-
diff --git a/Code/Common/otbWriterWatcherBase.cxx b/Code/Common/otbWriterWatcherBase.cxx
index 924357e69d..ecc55be7ee 100644
--- a/Code/Common/otbWriterWatcherBase.cxx
+++ b/Code/Common/otbWriterWatcherBase.cxx
@@ -49,43 +49,43 @@ WriterWatcherBase
// Assign the callbacks
m_StartFilterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::StartFilter);
+ &WriterWatcherBase::StartFilter);
m_EndFilterCommand->SetCallbackFunction(this,
&WriterWatcherBase::EndFilter);
m_ProgressFilterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::ShowFilterProgress);
+ &WriterWatcherBase::ShowFilterProgress);
m_StartWriterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::StartWriter);
+ &WriterWatcherBase::StartWriter);
m_EndWriterCommand->SetCallbackFunction(this,
&WriterWatcherBase::EndWriter);
m_ProgressWriterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::ShowWriterProgress);
+ &WriterWatcherBase::ShowWriterProgress);
// Add the commands as observers
m_StartWriterTag = m_Process->AddObserver(itk::StartEvent(),
- m_StartWriterCommand);
+ m_StartWriterCommand);
m_EndWriterTag = m_Process->AddObserver(itk::EndEvent(),
m_EndWriterCommand);
m_ProgressWriterTag = m_Process->AddObserver(itk::ProgressEvent(),
- m_ProgressWriterCommand);
+ m_ProgressWriterCommand);
// Try to get the filter that is wired to m_Process.
if (m_Process->GetInputs()[0]->GetSource())
- {
+ {
m_SourceProcess = m_Process->GetInputs()[0]->GetSource();
// Add the commands as observers
m_StartFilterTag = m_SourceProcess->AddObserver(itk::StartEvent(),
- m_StartFilterCommand);
+ m_StartFilterCommand);
m_EndFilterTag = m_SourceProcess->AddObserver(itk::EndEvent(),
- m_EndFilterCommand);
+ m_EndFilterCommand);
m_ProgressFilterTag = m_SourceProcess->AddObserver(itk::ProgressEvent(),
- m_ProgressFilterCommand);
- }
+ m_ProgressFilterCommand);
+ }
}
WriterWatcherBase
@@ -106,76 +106,75 @@ WriterWatcherBase
// Assign the callbacks
m_StartFilterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::StartFilter);
+ &WriterWatcherBase::StartFilter);
m_EndFilterCommand->SetCallbackFunction(this,
&WriterWatcherBase::EndFilter);
m_ProgressFilterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::ShowFilterProgress);
+ &WriterWatcherBase::ShowFilterProgress);
m_StartWriterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::StartWriter);
+ &WriterWatcherBase::StartWriter);
m_EndWriterCommand->SetCallbackFunction(this,
&WriterWatcherBase::EndWriter);
m_ProgressWriterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::ShowWriterProgress);
+ &WriterWatcherBase::ShowWriterProgress);
// Add the commands as observers
m_StartWriterTag = m_Process->AddObserver(itk::StartEvent(),
- m_StartWriterCommand);
+ m_StartWriterCommand);
m_EndWriterTag = m_Process->AddObserver(itk::EndEvent(),
m_EndWriterCommand);
m_ProgressWriterTag = m_Process->AddObserver(itk::ProgressEvent(),
- m_ProgressWriterCommand);
+ m_ProgressWriterCommand);
m_SourceProcess = source;
// Add the commands as observers
m_StartFilterTag = m_SourceProcess->AddObserver(itk::StartEvent(),
- m_StartFilterCommand);
+ m_StartFilterCommand);
m_EndFilterTag = m_SourceProcess->AddObserver(itk::EndEvent(),
- m_EndFilterCommand);
+ m_EndFilterCommand);
m_ProgressFilterTag = m_SourceProcess->AddObserver(itk::ProgressEvent(),
- m_ProgressFilterCommand);
+ m_ProgressFilterCommand);
}
-
WriterWatcherBase
-::WriterWatcherBase( const WriterWatcherBase& watch)
+::WriterWatcherBase(const WriterWatcherBase& watch)
{
// Remove any observers we have on the old process object
if (m_Process)
- {
- if (m_StartWriterCommand)
{
+ if (m_StartWriterCommand)
+ {
m_Process->RemoveObserver(m_StartWriterTag);
- }
+ }
if (m_EndWriterCommand)
- {
+ {
m_Process->RemoveObserver(m_EndWriterTag);
- }
+ }
if (m_ProgressWriterCommand)
- {
+ {
m_Process->RemoveObserver(m_ProgressWriterTag);
+ }
}
- }
if (m_SourceProcess)
- {
- if (m_StartFilterCommand)
{
+ if (m_StartFilterCommand)
+ {
m_SourceProcess->RemoveObserver(m_StartFilterTag);
- }
+ }
if (m_EndFilterCommand)
- {
+ {
m_SourceProcess->RemoveObserver(m_EndFilterTag);
- }
+ }
if (m_ProgressFilterCommand)
- {
+ {
m_SourceProcess->RemoveObserver(m_ProgressFilterTag);
+ }
}
- }
// Initialize state
m_TimeProbe = watch.m_TimeProbe;
@@ -192,83 +191,83 @@ WriterWatcherBase
// Create a series of commands
if (m_Process)
- {
+ {
m_StartWriterCommand = CommandType::New();
m_EndWriterCommand = CommandType::New();
m_ProgressWriterCommand = CommandType::New();
// Assign the callbacks
m_StartWriterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::StartWriter);
+ &WriterWatcherBase::StartWriter);
m_EndWriterCommand->SetCallbackFunction(this,
&WriterWatcherBase::EndWriter);
m_ProgressWriterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::ShowWriterProgress);
+ &WriterWatcherBase::ShowWriterProgress);
// Add the commands as observers
m_StartWriterTag = m_Process->AddObserver(itk::StartEvent(), m_StartWriterCommand);
m_EndWriterTag = m_Process->AddObserver(itk::EndEvent(), m_EndWriterCommand);
m_ProgressWriterTag
- = m_Process->AddObserver(itk::ProgressEvent(), m_ProgressWriterCommand);
- }
+ = m_Process->AddObserver(itk::ProgressEvent(), m_ProgressWriterCommand);
+ }
if (m_SourceProcess)
- {
+ {
m_StartFilterCommand = CommandType::New();
m_EndFilterCommand = CommandType::New();
m_ProgressFilterCommand = CommandType::New();
// Assign the callbacks
m_StartFilterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::StartFilter);
+ &WriterWatcherBase::StartFilter);
m_EndFilterCommand->SetCallbackFunction(this,
&WriterWatcherBase::EndFilter);
m_ProgressFilterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::ShowFilterProgress);
+ &WriterWatcherBase::ShowFilterProgress);
// Add the commands as observers
m_StartFilterTag = m_SourceProcess->AddObserver(itk::StartEvent(), m_StartFilterCommand);
m_EndFilterTag = m_SourceProcess->AddObserver(itk::EndEvent(), m_EndFilterCommand);
m_ProgressFilterTag
- = m_SourceProcess->AddObserver(itk::ProgressEvent(), m_ProgressFilterCommand);
- }
+ = m_SourceProcess->AddObserver(itk::ProgressEvent(), m_ProgressFilterCommand);
+ }
}
void
WriterWatcherBase
-::operator=(const WriterWatcherBase &watch)
+::operator =(const WriterWatcherBase& watch)
{
// Remove any observers we have on the old process object
if (m_Process)
- {
- if (m_StartWriterCommand)
{
+ if (m_StartWriterCommand)
+ {
m_Process->RemoveObserver(m_StartWriterTag);
- }
+ }
if (m_EndWriterCommand)
- {
+ {
m_Process->RemoveObserver(m_EndWriterTag);
- }
+ }
if (m_ProgressWriterCommand)
- {
+ {
m_Process->RemoveObserver(m_ProgressWriterTag);
+ }
}
- }
if (m_SourceProcess)
- {
- if (m_StartFilterCommand)
{
+ if (m_StartFilterCommand)
+ {
m_SourceProcess->RemoveObserver(m_StartFilterTag);
- }
+ }
if (m_EndFilterCommand)
- {
+ {
m_SourceProcess->RemoveObserver(m_EndFilterTag);
- }
+ }
if (m_ProgressFilterCommand)
- {
+ {
m_SourceProcess->RemoveObserver(m_ProgressFilterTag);
+ }
}
- }
// Initialize state
m_TimeProbe = watch.m_TimeProbe;
@@ -285,45 +284,45 @@ WriterWatcherBase
// Create a series of commands
if (m_Process)
- {
+ {
m_StartWriterCommand = CommandType::New();
m_EndWriterCommand = CommandType::New();
m_ProgressWriterCommand = CommandType::New();
// Assign the callbacks
m_StartWriterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::StartWriter);
+ &WriterWatcherBase::StartWriter);
m_EndWriterCommand->SetCallbackFunction(this,
&WriterWatcherBase::EndWriter);
m_ProgressWriterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::ShowWriterProgress);
+ &WriterWatcherBase::ShowWriterProgress);
// Add the commands as observers
m_StartWriterTag = m_Process->AddObserver(itk::StartEvent(), m_StartWriterCommand);
m_EndWriterTag = m_Process->AddObserver(itk::EndEvent(), m_EndWriterCommand);
m_ProgressWriterTag
- = m_Process->AddObserver(itk::ProgressEvent(), m_ProgressWriterCommand);
- }
+ = m_Process->AddObserver(itk::ProgressEvent(), m_ProgressWriterCommand);
+ }
if (m_SourceProcess)
- {
+ {
m_StartFilterCommand = CommandType::New();
m_EndFilterCommand = CommandType::New();
m_ProgressFilterCommand = CommandType::New();
// Assign the callbacks
m_StartFilterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::StartFilter);
+ &WriterWatcherBase::StartFilter);
m_EndFilterCommand->SetCallbackFunction(this,
&WriterWatcherBase::EndFilter);
m_ProgressFilterCommand->SetCallbackFunction(this,
- &WriterWatcherBase::ShowFilterProgress);
+ &WriterWatcherBase::ShowFilterProgress);
// Add the commands as observers
m_StartFilterTag = m_SourceProcess->AddObserver(itk::StartEvent(), m_StartFilterCommand);
m_EndFilterTag = m_SourceProcess->AddObserver(itk::EndEvent(), m_EndFilterCommand);
m_ProgressFilterTag
- = m_SourceProcess->AddObserver(itk::ProgressEvent(), m_ProgressFilterCommand);
- }
+ = m_SourceProcess->AddObserver(itk::ProgressEvent(), m_ProgressFilterCommand);
+ }
}
WriterWatcherBase
@@ -331,35 +330,35 @@ WriterWatcherBase
{
// Remove any observers we have on the old process object
if (m_Process)
- {
- if (m_StartWriterCommand)
{
+ if (m_StartWriterCommand)
+ {
m_Process->RemoveObserver(m_StartWriterTag);
- }
+ }
if (m_EndWriterCommand)
- {
+ {
m_Process->RemoveObserver(m_EndWriterTag);
- }
+ }
if (m_ProgressWriterCommand)
- {
+ {
m_Process->RemoveObserver(m_ProgressWriterTag);
+ }
}
- }
if (m_SourceProcess)
- {
- if (m_StartFilterCommand)
{
+ if (m_StartFilterCommand)
+ {
m_SourceProcess->RemoveObserver(m_StartFilterTag);
- }
+ }
if (m_EndFilterCommand)
- {
+ {
m_SourceProcess->RemoveObserver(m_EndFilterTag);
- }
+ }
if (m_ProgressFilterCommand)
- {
+ {
m_SourceProcess->RemoveObserver(m_ProgressFilterTag);
+ }
}
- }
}
} // end namespace otb
diff --git a/Code/Common/otbWriterWatcherBase.h b/Code/Common/otbWriterWatcherBase.h
index befb2ca66d..0c490fb416 100644
--- a/Code/Common/otbWriterWatcherBase.h
+++ b/Code/Common/otbWriterWatcherBase.h
@@ -48,11 +48,11 @@ public:
/** Constructor. Takes a ProcessObject to monitor and an optional
* comment string that is prepended to each event message. */
WriterWatcherBase(itk::ProcessObject* process,
- const char *comment="");
+ const char *comment = "");
/** This other constructor is provided so that the user can set a different processing filter than the one
just before process in the pipeline */
- WriterWatcherBase(itk::ProcessObject* process, itk::ProcessObject * source,const char *comment="");
+ WriterWatcherBase(itk::ProcessObject* process, itk::ProcessObject * source, const char *comment = "");
/** Default constructor */
WriterWatcherBase();
@@ -61,14 +61,14 @@ public:
WriterWatcherBase(const WriterWatcherBase&);
/** operator= */
- void operator=(const WriterWatcherBase& );
+ void operator =(const WriterWatcherBase&);
/** Destructor. */
virtual ~WriterWatcherBase();
/** Methods to access member data */
/** Get a pointer to the process object being watched. */
- itk::ProcessObject *GetProcess ()
+ itk::ProcessObject *GetProcess()
{
return m_Process.GetPointer();
}
@@ -80,7 +80,7 @@ public:
}
/** Get a reference to the TimeProbe */
- itk::TimeProbe &GetTimeProbe()
+ itk::TimeProbe& GetTimeProbe()
{
return m_TimeProbe;
}
diff --git a/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.h b/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.h
index bd97df8b8a..90e1f0dcea 100644
--- a/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.h
@@ -30,48 +30,48 @@ namespace otb
*/
template <class TPointSet, class TDeformationField>
class ITK_EXPORT BSplinesInterpolateDeformationFieldGenerator
- : public PointSetToDeformationFieldGenerator<TPointSet, TDeformationField>
+ : public PointSetToDeformationFieldGenerator<TPointSet, TDeformationField>
{
public:
/** Standard typedefs */
- typedef BSplinesInterpolateDeformationFieldGenerator Self;
- typedef PointSetToDeformationFieldGenerator<TPointSet,TDeformationField> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef BSplinesInterpolateDeformationFieldGenerator Self;
+ typedef PointSetToDeformationFieldGenerator<TPointSet, TDeformationField> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(BSplinesInterpolateDeformationFieldGenerator,PointSetToDeformationFieldGenerator);
+ itkTypeMacro(BSplinesInterpolateDeformationFieldGenerator, PointSetToDeformationFieldGenerator);
/** Template parameters typedefs */
- typedef typename Superclass::PointSetType PointSetType;
- typedef typename Superclass::PointSetPointerType PointSetPointerType;
- typedef typename Superclass::DeformationFieldType DeformationFieldType;
+ typedef typename Superclass::PointSetType PointSetType;
+ typedef typename Superclass::PointSetPointerType PointSetPointerType;
+ typedef typename Superclass::DeformationFieldType DeformationFieldType;
typedef typename Superclass::DeformationFieldPointerType DeformationFieldPointerType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename DeformationFieldType::PixelType PixelType;
- typedef typename Superclass::ValueType ValueType;
- typedef typename Superclass::PointType PointType;
- typedef typename Superclass::IndexVectorType IndexVectorType;
- typedef typename Superclass::DistanceVectorType DistanceVectorType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename DeformationFieldType::PixelType PixelType;
+ typedef typename Superclass::ValueType ValueType;
+ typedef typename Superclass::PointType PointType;
+ typedef typename Superclass::IndexVectorType IndexVectorType;
+ typedef typename Superclass::DistanceVectorType DistanceVectorType;
protected:
/** Constructor */
BSplinesInterpolateDeformationFieldGenerator() {};
/** Destructor */
- virtual ~BSplinesInterpolateDeformationFieldGenerator() {};
+ virtual ~BSplinesInterpolateDeformationFieldGenerator() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Main computation method */
virtual void GenerateData();
private:
- BSplinesInterpolateDeformationFieldGenerator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ BSplinesInterpolateDeformationFieldGenerator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbBSplinesInterpolateDeformationFieldGenerator.txx"
#endif
diff --git a/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.txx b/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.txx
index 232058a224..84d6420316 100644
--- a/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.txx
@@ -33,57 +33,57 @@
#include "otbImage.h"
#include "itkImageRegionIterator.h"
-
namespace otb
{
/** Main computation method */
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
BSplinesInterpolateDeformationFieldGenerator<TPointSet, TDeformationField>
::GenerateData(void)
{
DeformationFieldPointerType outputPtr = this->GetOutput();
- typedef itk::Vector< ValueType,2 > VectorType;
- typedef otb::Image< VectorType,DeformationFieldType::ImageDimension> ImageType;
- typedef itk::DeformationFieldSource<ImageType> DeformationFieldSourceType;
+ typedef itk::Vector<ValueType, 2> VectorType;
+ typedef otb::Image<VectorType, DeformationFieldType::ImageDimension> ImageType;
+ typedef itk::DeformationFieldSource<ImageType> DeformationFieldSourceType;
typedef typename DeformationFieldSourceType::LandmarkContainerPointer LandmarkContainerPointer;
- typedef typename DeformationFieldSourceType::LandmarkContainer LandmarkContainerType;
- typedef typename DeformationFieldSourceType::LandmarkPointType LandmarkPointType;
- typedef typename PointSetType::PointsContainer PointsContainer;
- typedef typename PointsContainer::ConstIterator PointsIterator;
- typedef typename PointSetType::PointDataContainer PointDataContainer;
- typedef typename PointDataContainer::ConstIterator PointDataIterator;
+ typedef typename DeformationFieldSourceType::LandmarkContainer LandmarkContainerType;
+ typedef typename DeformationFieldSourceType::LandmarkPointType LandmarkPointType;
+ typedef typename PointSetType::PointsContainer PointsContainer;
+ typedef typename PointsContainer::ConstIterator PointsIterator;
+ typedef typename PointSetType::PointDataContainer PointDataContainer;
+ typedef typename PointDataContainer::ConstIterator PointDataIterator;
typename LandmarkContainerType::Pointer sourceLandmarks = LandmarkContainerType::New();
typename LandmarkContainerType::Pointer targetLandmarks = LandmarkContainerType::New();
- LandmarkPointType sourcePoint;
- LandmarkPointType targetPoint;
+ LandmarkPointType sourcePoint;
+ LandmarkPointType targetPoint;
PointsIterator pointIterator = this->GetPointSet()->GetPoints()->Begin();
PointsIterator end = this->GetPointSet()->GetPoints()->End();
- unsigned int pointId = 0;
+ unsigned int pointId = 0;
- PointDataIterator pointDataIterator = this->GetPointSet()->GetPointData()->Begin();
+ PointDataIterator pointDataIterator = this->GetPointSet()->GetPointData()->Begin();
- while ( pointIterator != end )
- {
+ while (pointIterator != end)
+ {
typename PointDataContainer::Element valueAndDeformations = pointDataIterator.Value();
- if (vcl_abs(valueAndDeformations[0])>=this->GetMetricThreshold())
- {
+ if (vcl_abs(valueAndDeformations[0]) >= this->GetMetricThreshold())
+ {
typename PointSetType::PointType p = pointIterator.Value(); // access the point
sourcePoint[0] = p[0];
sourcePoint[1] = p[1];
targetPoint[0] = p[0] - valueAndDeformations[1];
targetPoint[1] = p[1] - valueAndDeformations[2];
- otbMsgDebugMacro(<<"Adding landmark "<<pointId<<", source point: "<<sourcePoint<<", targetpoint: "<<targetPoint);
- sourceLandmarks->InsertElement( pointId, sourcePoint );
- targetLandmarks->InsertElement( pointId, targetPoint );
+ otbMsgDebugMacro(
+ << "Adding landmark " << pointId << ", source point: " << sourcePoint << ", targetpoint: " << targetPoint);
+ sourceLandmarks->InsertElement(pointId, sourcePoint);
+ targetLandmarks->InsertElement(pointId, targetPoint);
++pointId;
- }
+ }
++pointIterator;
++pointDataIterator;
- }
+ }
typename DeformationFieldSourceType::Pointer deformer = DeformationFieldSourceType::New();
deformer->SetOutputSpacing(this->GetOutputSpacing());
@@ -98,28 +98,28 @@ BSplinesInterpolateDeformationFieldGenerator<TPointSet, TDeformationField>
defaultPixel.SetSize(2);
defaultPixel.Fill(this->GetDefaultValue());
outputPtr->FillBuffer(defaultPixel);
- typedef itk::ImageRegionIterator<ImageType> ImageIteratorType;
+ typedef itk::ImageRegionIterator<ImageType> ImageIteratorType;
typedef itk::ImageRegionIterator<DeformationFieldType> OutputIteratorType;
- ImageIteratorType inIt(deformer->GetOutput(),outputPtr->GetRequestedRegion());
- OutputIteratorType outIt(outputPtr,outputPtr->GetRequestedRegion());
- int i=0;
+ ImageIteratorType inIt(deformer->GetOutput(), outputPtr->GetRequestedRegion());
+ OutputIteratorType outIt(outputPtr, outputPtr->GetRequestedRegion());
+ int i = 0;
// Casting otb::Image<itt::Vector<ValueType,2>,2> to otb::VectorImage<ValueType,2>
- for (inIt.GoToBegin(),outIt.GoToBegin();(!inIt.IsAtEnd())&&(!outIt.IsAtEnd());++inIt,++outIt,++i)
- {
+ for (inIt.GoToBegin(), outIt.GoToBegin(); (!inIt.IsAtEnd()) && (!outIt.IsAtEnd()); ++inIt, ++outIt, ++i)
+ {
typename ImageType::PixelType inPixel;
inPixel = inIt.Get();
PixelType outPixel;
outPixel.SetSize(2);
- outPixel[0]=-inPixel[0];
- outPixel[1]=-inPixel[1];
+ outPixel[0] = -inPixel[0];
+ outPixel[1] = -inPixel[1];
outIt.Set(outPixel);
- }
+ }
}
/**
* PrintSelf Method
*/
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
BSplinesInterpolateDeformationFieldGenerator<TPointSet, TDeformationField>
::PrintSelf(std::ostream& os, itk::Indent indent) const
diff --git a/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.h b/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.h
index b26255c899..1dfbc19297 100644
--- a/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.h
@@ -40,39 +40,39 @@ namespace otb
*/
template <class TPointSet, class TDeformationField>
class ITK_EXPORT BSplinesInterpolateTransformDeformationFieldGenerator
- : public PointSetWithTransformToDeformationFieldGenerator<TPointSet, TDeformationField>
+ : public PointSetWithTransformToDeformationFieldGenerator<TPointSet, TDeformationField>
{
public:
/** Standard typedefs */
- typedef BSplinesInterpolateTransformDeformationFieldGenerator Self;
- typedef PointSetWithTransformToDeformationFieldGenerator<TPointSet,TDeformationField> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef BSplinesInterpolateTransformDeformationFieldGenerator Self;
+ typedef PointSetWithTransformToDeformationFieldGenerator<TPointSet, TDeformationField> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(BSplinesInterpolateTransformDeformationFieldGenerator,PointSetWithTransformsToDeformationFieldGenerator);
+ itkTypeMacro(BSplinesInterpolateTransformDeformationFieldGenerator, PointSetWithTransformsToDeformationFieldGenerator);
/** Template parameters typedefs */
- typedef typename Superclass::PointSetType PointSetType;
- typedef typename Superclass::PointSetPointerType PointSetPointerType;
- typedef typename Superclass::DeformationFieldType DeformationFieldType;
+ typedef typename Superclass::PointSetType PointSetType;
+ typedef typename Superclass::PointSetPointerType PointSetPointerType;
+ typedef typename Superclass::DeformationFieldType DeformationFieldType;
typedef typename Superclass::DeformationFieldPointerType DeformationFieldPointerType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename DeformationFieldType::PixelType PixelType;
- typedef typename Superclass::ValueType ValueType;
- typedef typename Superclass::PointType PointType;
- typedef typename Superclass::IndexVectorType IndexVectorType;
- typedef typename Superclass::DistanceVectorType DistanceVectorType;
- typedef typename Superclass::ParametersType ParametersType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename DeformationFieldType::PixelType PixelType;
+ typedef typename Superclass::ValueType ValueType;
+ typedef typename Superclass::PointType PointType;
+ typedef typename Superclass::IndexVectorType IndexVectorType;
+ typedef typename Superclass::DistanceVectorType DistanceVectorType;
+ typedef typename Superclass::ParametersType ParametersType;
/** Filters definition */
- typedef itk::Vector<ValueType,2> PointSetDataType;
- typedef otb::Image<PointSetDataType,DeformationFieldType::ImageDimension> InternalImageType;
- typedef itk::PointSet<PointSetDataType,PointSetType::PointDimension> InternalPointSetType;
- typedef itk::BSplineScatteredDataPointSetToImageFilter<InternalPointSetType,InternalImageType>
+ typedef itk::Vector<ValueType, 2> PointSetDataType;
+ typedef otb::Image<PointSetDataType, DeformationFieldType::ImageDimension> InternalImageType;
+ typedef itk::PointSet<PointSetDataType, PointSetType::PointDimension> InternalPointSetType;
+ typedef itk::BSplineScatteredDataPointSetToImageFilter<InternalPointSetType, InternalImageType>
SPlineInterpolateFilterType;
typedef typename SPlineInterpolateFilterType::Pointer SPlineInterpolateFilterPointerType;
@@ -87,18 +87,18 @@ public:
*/
void RemoveAngularParameter(unsigned int index);
- itkSetMacro(SplineOrder,unsigned int);
- itkGetMacro(SplineOrder,unsigned int);
- itkSetMacro(NumberOfControlPoints,unsigned int);
- itkGetMacro(NumberOfControlPoints,unsigned int);
- itkSetMacro(NumberOfLevels,unsigned int);
- itkGetMacro(NumberOfLevels,unsigned int);
+ itkSetMacro(SplineOrder, unsigned int);
+ itkGetMacro(SplineOrder, unsigned int);
+ itkSetMacro(NumberOfControlPoints, unsigned int);
+ itkGetMacro(NumberOfControlPoints, unsigned int);
+ itkSetMacro(NumberOfLevels, unsigned int);
+ itkGetMacro(NumberOfLevels, unsigned int);
protected:
/** Constructor */
BSplinesInterpolateTransformDeformationFieldGenerator();
/** Destructor */
- virtual ~BSplinesInterpolateTransformDeformationFieldGenerator() {};
+ virtual ~BSplinesInterpolateTransformDeformationFieldGenerator() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Main computation method */
@@ -113,8 +113,8 @@ protected:
bool IsAngular(unsigned int index);
private:
- BSplinesInterpolateTransformDeformationFieldGenerator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ BSplinesInterpolateTransformDeformationFieldGenerator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
IndexVectorType m_AngularParameters;
@@ -122,7 +122,7 @@ private:
unsigned int m_NumberOfControlPoints;
unsigned int m_NumberOfLevels;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbBSplinesInterpolateTransformDeformationFieldGenerator.txx"
#endif
diff --git a/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.txx b/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.txx
index b360c955f2..c30865fcb4 100644
--- a/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.txx
@@ -27,10 +27,9 @@
#include "otbMath.h"
#include "otbImageFileWriter.h"
-
namespace otb
{
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
BSplinesInterpolateTransformDeformationFieldGenerator<TPointSet, TDeformationField>
::BSplinesInterpolateTransformDeformationFieldGenerator()
{
@@ -39,7 +38,7 @@ BSplinesInterpolateTransformDeformationFieldGenerator<TPointSet, TDeformationFie
m_NumberOfLevels = 10;
}
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
BSplinesInterpolateTransformDeformationFieldGenerator<TPointSet, TDeformationField>
::GenerateOutputInformation()
@@ -48,9 +47,8 @@ BSplinesInterpolateTransformDeformationFieldGenerator<TPointSet, TDeformationFie
this->GetOutput()->SetNumberOfComponentsPerPixel(2);
}
-
/** Main computation method */
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
BSplinesInterpolateTransformDeformationFieldGenerator<TPointSet, TDeformationField>
::GenerateData(void)
@@ -63,50 +61,56 @@ BSplinesInterpolateTransformDeformationFieldGenerator<TPointSet, TDeformationFie
outputPtr->Allocate();
outputPtr->FillBuffer(defaultValue);
- typedef otb::ObjectList<SPlineInterpolateFilterType> SPlineInterpolatorListType;
+ typedef otb::ObjectList<SPlineInterpolateFilterType> SPlineInterpolatorListType;
typedef typename PointSetType::PointsContainer::ConstIterator PointSetIteratorType;
- typedef typename PointSetType::PointsContainer PointsContainerType;
+ typedef typename PointSetType::PointsContainer PointsContainerType;
// Initialization of the splines interpolator
typename SPlineInterpolatorListType::Pointer splineIntList = SPlineInterpolatorListType::New();
- for (unsigned int paramIndex = 0;paramIndex<this->GetTransform()->GetNumberOfParameters();++paramIndex)
- {
+ for (unsigned int paramIndex = 0; paramIndex < this->GetTransform()->GetNumberOfParameters(); ++paramIndex)
+ {
// Create a new interpolator
splineIntList->PushBack(SPlineInterpolateFilterType::New());
// Create a new point set
typename InternalPointSetType::Pointer tmpPointSet = InternalPointSetType::New();
tmpPointSet->Initialize();
unsigned int pointDataCounter = 0;
- for (PointSetIteratorType it = this->GetPointSet()->GetPoints()->Begin();it!=this->GetPointSet()->GetPoints()->End();++it)
- {
- if (vcl_abs(this->GetPointSet()->GetPointData()->GetElement(pointDataCounter)[0])>=this->GetMetricThreshold())
+ for (PointSetIteratorType it = this->GetPointSet()->GetPoints()->Begin();
+ it != this->GetPointSet()->GetPoints()->End();
+ ++it)
{
+ if (vcl_abs(this->GetPointSet()->GetPointData()->GetElement(pointDataCounter)[0]) >= this->GetMetricThreshold())
+ {
typename InternalPointSetType::PixelType V(0.0);
if (!IsAngular(paramIndex))
- {
- V[0] = this->GetPointSet()->GetPointData()->GetElement(pointDataCounter)[paramIndex+3];
- V[1] = this->GetPointSet()->GetPointData()->GetElement(pointDataCounter)[paramIndex+3];
- }
+ {
+ V[0] = this->GetPointSet()->GetPointData()->GetElement(pointDataCounter)[paramIndex + 3];
+ V[1] = this->GetPointSet()->GetPointData()->GetElement(pointDataCounter)[paramIndex + 3];
+ }
else
- {
- V[0] = static_cast<ValueType>(vcl_cos(this->GetPointSet()->GetPointData()->GetElement(pointDataCounter)[paramIndex+3]));
- V[1] = static_cast<ValueType>(vcl_sin( this->GetPointSet()->GetPointData()->GetElement(pointDataCounter)[paramIndex+3]));
- }
+ {
+ V[0] =
+ static_cast<ValueType>(vcl_cos(this->GetPointSet()->GetPointData()->GetElement(pointDataCounter)[paramIndex
+ + 3]));
+ V[1] =
+ static_cast<ValueType>(vcl_sin(this->GetPointSet()->GetPointData()->GetElement(pointDataCounter)[paramIndex
+ + 3]));
+ }
unsigned long nbPoints = tmpPointSet->GetNumberOfPoints();
- tmpPointSet->SetPoint( nbPoints, it.Value());
- tmpPointSet->SetPointData( nbPoints, V );
- }
+ tmpPointSet->SetPoint(nbPoints, it.Value());
+ tmpPointSet->SetPointData(nbPoints, V);
+ }
++pointDataCounter;
- }
+ }
// Set the interpolator parameters
splineIntList->Back()->SetInput(tmpPointSet);
splineIntList->Back()->SetSplineOrder(m_SplineOrder);
typename SPlineInterpolateFilterType::ArrayType ncps;
ncps.Fill(m_NumberOfControlPoints);
- splineIntList->Back()->SetNumberOfControlPoints( ncps );
+ splineIntList->Back()->SetNumberOfControlPoints(ncps);
splineIntList->Back()->SetNumberOfLevels(m_NumberOfLevels);
// splineIntList->Back()->SetGenerateOutputImage(false);
@@ -115,77 +119,76 @@ BSplinesInterpolateTransformDeformationFieldGenerator<TPointSet, TDeformationFie
splineIntList->Back()->SetSpacing(this->GetOutput()->GetSpacing());
splineIntList->Back()->SetSize(this->GetOutput()->GetLargestPossibleRegion().GetSize());
splineIntList->Back()->Update();
- }
+ }
// Interpolation
typedef itk::ImageRegionIteratorWithIndex<DeformationFieldType> IteratorType;
- IteratorType outIt(outputPtr,outputPtr->GetRequestedRegion());
-
+ IteratorType outIt(outputPtr, outputPtr->GetRequestedRegion());
// main loop
- for (outIt.GoToBegin();!outIt.IsAtEnd();++outIt)
- {
+ for (outIt.GoToBegin(); !outIt.IsAtEnd(); ++outIt)
+ {
// Index of the pixel
IndexType index = outIt.GetIndex();
// parameters vector
ParametersType params(this->GetTransform()->GetNumberOfParameters());
// we iterate over the number of parameters of the transform
- for (unsigned int paramIndex = 0;paramIndex<this->GetTransform()->GetNumberOfParameters();++paramIndex)
- {
+ for (unsigned int paramIndex = 0; paramIndex < this->GetTransform()->GetNumberOfParameters(); ++paramIndex)
+ {
typename InternalPointSetType::PointType p;
- this->GetOutput()->TransformIndexToPhysicalPoint(index,p);
+ this->GetOutput()->TransformIndexToPhysicalPoint(index, p);
typename InternalPointSetType::PixelType V(0.0);
// For each parameter we use the associated spline interpolator
if (!IsAngular(paramIndex))
- {
- splineIntList->GetNthElement(paramIndex)->EvaluateAtPoint(p,V);
- params[paramIndex]=V[0];
- }
+ {
+ splineIntList->GetNthElement(paramIndex)->EvaluateAtPoint(p, V);
+ params[paramIndex] = V[0];
+ }
else
- {
- splineIntList->GetNthElement(paramIndex)->EvaluateAtPoint(p,V);
- params[paramIndex]=vcl_atan2(V[1],V[0]);
- }
+ {
+ splineIntList->GetNthElement(paramIndex)->EvaluateAtPoint(p, V);
+ params[paramIndex] = vcl_atan2(V[1], V[0]);
+ }
// We then compute the target point using the transform
this->GetTransform()->SetParameters(params);
- PointType sourcePoint,targetPoint;
- outputPtr->TransformIndexToPhysicalPoint(index,sourcePoint);
+ PointType sourcePoint, targetPoint;
+ outputPtr->TransformIndexToPhysicalPoint(index, sourcePoint);
targetPoint = this->GetTransform()->TransformPoint(sourcePoint);
// And the deformation
PixelType pixel;
pixel.SetSize(2);
- pixel[0] = static_cast<ValueType>(targetPoint[0]-sourcePoint[0]);
- pixel[1] = static_cast<ValueType>(targetPoint[1]-sourcePoint[1]);
+ pixel[0] = static_cast<ValueType>(targetPoint[0] - sourcePoint[0]);
+ pixel[1] = static_cast<ValueType>(targetPoint[1] - sourcePoint[1]);
outIt.Set(pixel);
+ }
}
- }
}
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
BSplinesInterpolateTransformDeformationFieldGenerator<TPointSet, TDeformationField>
::AddAngularParameter(unsigned int index)
{
m_AngularParameters.push_back(index);
}
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
BSplinesInterpolateTransformDeformationFieldGenerator<TPointSet, TDeformationField>
::RemoveAngularParameter(unsigned int index)
{
m_AngularParameters.erase(index);
}
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
bool
BSplinesInterpolateTransformDeformationFieldGenerator<TPointSet, TDeformationField>
::IsAngular(unsigned int index)
{
- bool resp = std::binary_search(m_AngularParameters.begin(),m_AngularParameters.end(),index);
+ bool resp = std::binary_search(m_AngularParameters.begin(), m_AngularParameters.end(), index);
return resp;
}
/**
* PrintSelf Method
*/
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
BSplinesInterpolateTransformDeformationFieldGenerator<TPointSet, TDeformationField>
::PrintSelf(std::ostream& os, itk::Indent indent) const
diff --git a/Code/DisparityMap/otbDisparityMapEstimationMethod.h b/Code/DisparityMap/otbDisparityMapEstimationMethod.h
index 0b3043b7c7..8ec1f1021d 100644
--- a/Code/DisparityMap/otbDisparityMapEstimationMethod.h
+++ b/Code/DisparityMap/otbDisparityMapEstimationMethod.h
@@ -48,14 +48,14 @@ namespace otb
*/
template <class TFixedImage, class TMovingImage, class TPointSet>
class ITK_EXPORT DisparityMapEstimationMethod
- : public PointSetSource<TPointSet>
+ : public PointSetSource<TPointSet>
{
public:
/** Standard class typedefs. */
typedef DisparityMapEstimationMethod Self;
- typedef PointSetSource<TPointSet> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PointSetSource<TPointSet> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -64,41 +64,41 @@ public:
itkTypeMacro(DisparityMapEstimationMethod, ProcessObject);
/** Typedef for the Fixed image. */
- typedef TFixedImage FixedImageType;
- typedef typename FixedImageType::Pointer FixedImagePointerType;
+ typedef TFixedImage FixedImageType;
+ typedef typename FixedImageType::Pointer FixedImagePointerType;
typedef typename FixedImageType::PixelType FixedPixelType;
- typedef typename FixedImageType::SizeType SizeType;
+ typedef typename FixedImageType::SizeType SizeType;
/** Typedef for the Moving image. */
- typedef TMovingImage MovingImageType;
- typedef typename MovingImageType::Pointer MovingImagePointerType;
+ typedef TMovingImage MovingImageType;
+ typedef typename MovingImageType::Pointer MovingImagePointerType;
typedef typename MovingImageType::PixelType MovingPixelType;
/** Typedef for the input and ouptut point set */
- typedef TPointSet PointSetType;
+ typedef TPointSet PointSetType;
typedef typename PointSetType::Pointer PointSetPointerType;
/** Typedef for the generic metric. */
- typedef itk::ImageToImageMetric<FixedImageType,MovingImageType> MetricType;
- typedef typename MetricType::Pointer MetricPointerType;
- typedef typename MetricType::FixedImageRegionType FixedImageRegionType;
+ typedef itk::ImageToImageMetric<FixedImageType, MovingImageType> MetricType;
+ typedef typename MetricType::Pointer MetricPointerType;
+ typedef typename MetricType::FixedImageRegionType FixedImageRegionType;
/** Typedef for the generic transform . */
typedef typename MetricType::TransformType TransformType;
- typedef typename TransformType::Pointer TransformPointerType;
+ typedef typename TransformType::Pointer TransformPointerType;
/** Using Decorator pattern for enabling the Transform to be passed in the data pipeline */
- typedef itk::DataObjectDecorator<TransformType> TransformOutputType;
- typedef typename TransformOutputType::Pointer TransformOutputPointerType;
+ typedef itk::DataObjectDecorator<TransformType> TransformOutputType;
+ typedef typename TransformOutputType::Pointer TransformOutputPointerType;
typedef typename TransformOutputType::ConstPointer TransformOutputConstPointerType;
/** Typedef for the generic interpolator. */
typedef typename MetricType::InterpolatorType InterpolatorType;
- typedef typename InterpolatorType::Pointer InterpolatorPointerType;
+ typedef typename InterpolatorType::Pointer InterpolatorPointerType;
/** Typedef for the generic optimizer. */
typedef itk::SingleValuedNonLinearOptimizer OptimizerType;
- typedef typename OptimizerType::Pointer OptimizerPointerType;
+ typedef typename OptimizerType::Pointer OptimizerPointerType;
/** Type of the Transformation parameters This is the same type used to
* represent the search space of the optimization algorithm */
@@ -108,32 +108,32 @@ public:
typedef typename itk::DataObject::Pointer DataObjectPointer;
/** Set/Get the Optimizer. */
- itkSetObjectMacro(Optimizer,OptimizerType);
- itkGetObjectMacro(Optimizer,OptimizerType);
+ itkSetObjectMacro(Optimizer, OptimizerType);
+ itkGetObjectMacro(Optimizer, OptimizerType);
/** Set/Get the Metric. */
itkSetObjectMacro(Metric, MetricType);
- itkGetObjectMacro(Metric,MetricType);
+ itkGetObjectMacro(Metric, MetricType);
/** Set/Get the Transfrom. */
- itkSetObjectMacro(Transform,TransformType);
- itkGetObjectMacro(Transform,TransformType);
+ itkSetObjectMacro(Transform, TransformType);
+ itkGetObjectMacro(Transform, TransformType);
/** Set/Get the Interpolator. */
- itkSetObjectMacro(Interpolator,InterpolatorType);
- itkGetObjectMacro(Interpolator,InterpolatorType);
+ itkSetObjectMacro(Interpolator, InterpolatorType);
+ itkGetObjectMacro(Interpolator, InterpolatorType);
/** Set/Get the window radius */
- itkSetMacro(WinSize,SizeType);
- itkGetMacro(WinSize,SizeType);
+ itkSetMacro(WinSize, SizeType);
+ itkGetMacro(WinSize, SizeType);
/** Set/Get the exploration area radius */
- itkSetMacro(ExploSize,SizeType);
- itkGetMacro(ExploSize,SizeType);
+ itkSetMacro(ExploSize, SizeType);
+ itkGetMacro(ExploSize, SizeType);
/** Set/Get the initial transformation parameters. */
- itkSetMacro(InitialTransformParameters,ParametersType);
- itkGetConstReferenceMacro(InitialTransformParameters,ParametersType);
+ itkSetMacro(InitialTransformParameters, ParametersType);
+ itkGetConstReferenceMacro(InitialTransformParameters, ParametersType);
/**
* Set the source pointset.
@@ -170,7 +170,6 @@ public:
**/
const TMovingImage * GetMovingImage(void);
-
protected:
/**
* Constructor.
@@ -187,23 +186,23 @@ protected:
/**
* Main computation method.
*/
- void GenerateData ();
+ void GenerateData();
private:
- DisparityMapEstimationMethod(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ DisparityMapEstimationMethod(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/**
* The metric used for local registration.
*/
- MetricPointerType m_Metric;
+ MetricPointerType m_Metric;
/**
* The optimizer used for local registration.
*/
- OptimizerPointerType m_Optimizer;
+ OptimizerPointerType m_Optimizer;
/**
* The transform used for local registration.
*/
- TransformPointerType m_Transform;
+ TransformPointerType m_Transform;
/**
* The interpolator used for local registration.
*/
@@ -211,17 +210,17 @@ private:
/**
* The initial transform parameters.
*/
- ParametersType m_InitialTransformParameters;
+ ParametersType m_InitialTransformParameters;
/**
* The size of the exploration area
*/
- SizeType m_ExploSize;
+ SizeType m_ExploSize;
/**
* The size of the window
*/
- SizeType m_WinSize;
+ SizeType m_WinSize;
};
-}// end namespace otb
+} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbDisparityMapEstimationMethod.txx"
#endif
diff --git a/Code/DisparityMap/otbDisparityMapEstimationMethod.txx b/Code/DisparityMap/otbDisparityMapEstimationMethod.txx
index 67d601829a..d96ea760f5 100644
--- a/Code/DisparityMap/otbDisparityMapEstimationMethod.txx
+++ b/Code/DisparityMap/otbDisparityMapEstimationMethod.txx
@@ -31,8 +31,8 @@ namespace otb
/*
* Constructor.
*/
-template < typename TFixedImage, typename TMovingImage, class TPointSet >
-DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
+template <typename TFixedImage, typename TMovingImage, class TPointSet>
+DisparityMapEstimationMethod<TFixedImage, TMovingImage, TPointSet>
::DisparityMapEstimationMethod()
{
this->SetNumberOfRequiredInputs(3);
@@ -46,33 +46,33 @@ DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
m_WinSize.Fill(15);
m_ExploSize.Fill(10);
m_InitialTransformParameters = ParametersType(1);
- m_InitialTransformParameters.Fill( 0.0f );
+ m_InitialTransformParameters.Fill(0.0f);
}
/*
* Destructor.
*/
-template < class TFixedImage, class TMovingImage, class TPointSet >
-DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
+template <class TFixedImage, class TMovingImage, class TPointSet>
+DisparityMapEstimationMethod<TFixedImage, TMovingImage, TPointSet>
::~DisparityMapEstimationMethod()
{}
/**
* Set the source pointset.
* \param pointset The source pointset.
*/
-template < class TFixedImage, class TMovingImage, class TPointSet >
+template <class TFixedImage, class TMovingImage, class TPointSet>
void
-DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
+DisparityMapEstimationMethod<TFixedImage, TMovingImage, TPointSet>
::SetPointSet(const TPointSet * pointset)
{
- this->itk::ProcessObject::SetNthInput(0,const_cast<PointSetType *>(pointset));
+ this->itk::ProcessObject::SetNthInput(0, const_cast<PointSetType *>(pointset));
}
/**
* Get the source pointset.
* \return The source pointset.
*/
-template < class TFixedImage, class TMovingImage, class TPointSet >
+template <class TFixedImage, class TMovingImage, class TPointSet>
const TPointSet *
-DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
+DisparityMapEstimationMethod<TFixedImage, TMovingImage, TPointSet>
::GetPointSet(void)
{
return static_cast<const PointSetType *>(this->itk::ProcessObject::GetInput(0));
@@ -81,20 +81,20 @@ DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
* Set the fixed image.
* \param image The fixed image.
**/
-template < class TFixedImage, class TMovingImage, class TPointSet >
+template <class TFixedImage, class TMovingImage, class TPointSet>
void
-DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
+DisparityMapEstimationMethod<TFixedImage, TMovingImage, TPointSet>
::SetFixedImage(const TFixedImage * image)
{
- this->itk::ProcessObject::SetNthInput(1,const_cast<FixedImageType *>(image));
+ this->itk::ProcessObject::SetNthInput(1, const_cast<FixedImageType *>(image));
}
/**
* Get the fixed image.
* \return The fixed image.
**/
-template < class TFixedImage, class TMovingImage, class TPointSet >
+template <class TFixedImage, class TMovingImage, class TPointSet>
const TFixedImage *
-DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
+DisparityMapEstimationMethod<TFixedImage, TMovingImage, TPointSet>
::GetFixedImage(void)
{
return static_cast<const FixedImageType *>(this->itk::ProcessObject::GetInput(1));
@@ -103,81 +103,84 @@ DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
* Set the moving image.
* \param image The mobing image.
**/
-template < class TFixedImage, class TMovingImage, class TPointSet >
+template <class TFixedImage, class TMovingImage, class TPointSet>
void
-DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
+DisparityMapEstimationMethod<TFixedImage, TMovingImage, TPointSet>
::SetMovingImage(const TMovingImage * image)
{
- this->itk::ProcessObject::SetNthInput(2,const_cast<MovingImageType *>(image));
+ this->itk::ProcessObject::SetNthInput(2, const_cast<MovingImageType *>(image));
}
/**
* Get the fixed image.
* \return The fixed image.
**/
-template < class TFixedImage, class TMovingImage, class TPointSet >
+template <class TFixedImage, class TMovingImage, class TPointSet>
const TMovingImage *
-DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
+DisparityMapEstimationMethod<TFixedImage, TMovingImage, TPointSet>
::GetMovingImage(void)
{
return static_cast<const MovingImageType *>(this->itk::ProcessObject::GetInput(2));
}
-
/**
* Main computation method.
*/
-template < class TFixedImage, class TMovingImage, class TPointSet >
+template <class TFixedImage, class TMovingImage, class TPointSet>
void
-DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
+DisparityMapEstimationMethod<TFixedImage, TMovingImage, TPointSet>
::GenerateData(void)
{
// inputs pointers
- const FixedImageType * fixed = this->GetFixedImage();
+ const FixedImageType * fixed = this->GetFixedImage();
const MovingImageType * moving = this->GetMovingImage();
- const PointSetType * pointSet = this->GetPointSet();
- PointSetType* output = this->GetOutput();
+ const PointSetType * pointSet = this->GetPointSet();
+ PointSetType* output = this->GetOutput();
// Typedefs
- typedef typename PointSetType::PointsContainer PointsContainer;
- typedef typename PointsContainer::ConstIterator PointsIterator;
- typedef itk::ImageRegistrationMethod<FixedImageType,MovingImageType> RegistrationType;
- typedef otb::ExtractROI<FixedPixelType,FixedPixelType> FixedExtractType;
- typedef otb::ExtractROI<MovingPixelType,MovingPixelType> MovingExtractType;
+ typedef typename PointSetType::PointsContainer PointsContainer;
+ typedef typename PointsContainer::ConstIterator PointsIterator;
+ typedef itk::ImageRegistrationMethod<FixedImageType, MovingImageType> RegistrationType;
+ typedef otb::ExtractROI<FixedPixelType, FixedPixelType> FixedExtractType;
+ typedef otb::ExtractROI<MovingPixelType, MovingPixelType> MovingExtractType;
// points retrieving
typename PointsContainer::ConstPointer points = pointSet->GetPoints();
// Iterator set up
- PointsIterator pointIterator = points->Begin();
+ PointsIterator pointIterator = points->Begin();
PointsIterator end = points->End();
- unsigned int dataId = 0;
+ unsigned int dataId = 0;
- otbMsgDevMacro(<<"Starting registration");
+ otbMsgDevMacro(<< "Starting registration");
/// Iterate through the point set
- while (pointIterator!= end)
- {
+ while (pointIterator != end)
+ {
typename PointSetType::PointType p = pointIterator.Value(); // access the point
// Extract the needed sub-images
- typename FixedExtractType::Pointer fixedExtractor = FixedExtractType::New();
+ typename FixedExtractType::Pointer fixedExtractor = FixedExtractType::New();
typename MovingExtractType::Pointer movingExtractor = MovingExtractType::New();
fixedExtractor->SetInput(fixed);
movingExtractor->SetInput(moving);
// Fixed extractor setup
- fixedExtractor->SetStartX(static_cast<unsigned long>(p[0]-m_ExploSize[0]));
- fixedExtractor->SetStartY(static_cast<unsigned long>(p[1]-m_ExploSize[1]));
- fixedExtractor->SetSizeX(static_cast<unsigned long>(2*m_ExploSize[0]+1));
- fixedExtractor->SetSizeY(static_cast<unsigned long>(2*m_ExploSize[1]+1));
- otbMsgDevMacro(<<"Point id: "<<dataId);
- otbMsgDevMacro(<<"Fixed region: origin("<<p[0]-m_ExploSize[0]<<", "<<p[1]-m_ExploSize[1]<<") size("<<2*m_ExploSize[0]+1<<", "<<2*m_ExploSize[1]+1<<")");
+ fixedExtractor->SetStartX(static_cast<unsigned long>(p[0] - m_ExploSize[0]));
+ fixedExtractor->SetStartY(static_cast<unsigned long>(p[1] - m_ExploSize[1]));
+ fixedExtractor->SetSizeX(static_cast<unsigned long>(2 * m_ExploSize[0] + 1));
+ fixedExtractor->SetSizeY(static_cast<unsigned long>(2 * m_ExploSize[1] + 1));
+ otbMsgDevMacro(<< "Point id: " << dataId);
+ otbMsgDevMacro(
+ << "Fixed region: origin(" << p[0] - m_ExploSize[0] << ", " << p[1] - m_ExploSize[1] << ") size(" << 2 *
+ m_ExploSize[0] + 1 << ", " << 2 * m_ExploSize[1] + 1 << ")");
// Moving extractor setup
- movingExtractor->SetStartX(static_cast<unsigned long>(p[0]-m_WinSize[0]));
- movingExtractor->SetStartY(static_cast<unsigned long>(p[1]-m_WinSize[1]));
- movingExtractor->SetSizeX(static_cast<unsigned long>(2*m_WinSize[0]+1));
- movingExtractor->SetSizeY(static_cast<unsigned long>(2*m_WinSize[1]+1));
- otbMsgDevMacro(<<"Moving region: origin("<<p[0]-m_WinSize[0]<<", "<<p[1]-m_WinSize[1]<<") size("<<2*m_WinSize[0]+1<<", "<<2*m_WinSize[1]+1<<")");
+ movingExtractor->SetStartX(static_cast<unsigned long>(p[0] - m_WinSize[0]));
+ movingExtractor->SetStartY(static_cast<unsigned long>(p[1] - m_WinSize[1]));
+ movingExtractor->SetSizeX(static_cast<unsigned long>(2 * m_WinSize[0] + 1));
+ movingExtractor->SetSizeY(static_cast<unsigned long>(2 * m_WinSize[1] + 1));
+ otbMsgDevMacro(
+ << "Moving region: origin(" << p[0] - m_WinSize[0] << ", " << p[1] - m_WinSize[1] << ") size(" << 2 *
+ m_WinSize[0] + 1 << ", " << 2 * m_WinSize[1] + 1 << ")");
// update the extractors
fixedExtractor->Update();
movingExtractor->Update();
@@ -187,7 +190,6 @@ DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
// std::cout<<"Moving extract origin: "<<movingExtractor->GetOutput()->GetOrigin()<<std::endl;
// std::cout<<"Moving extract spacing: "<<movingExtractor->GetOutput()->GetSpacing()<<std::endl;
-
// typedef otb::StreamingImageFileWriter<FixedImageType> FixedWriterType;
// typedef otb::StreamingImageFileWriter<MovingImageType> MovingWriterType;
@@ -208,7 +210,7 @@ DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
// mwriter->Update();
// Registration filter definition
- typename RegistrationType::Pointer registration = RegistrationType::New();
+ typename RegistrationType::Pointer registration = RegistrationType::New();
// Registration filter setup
registration->SetOptimizer(m_Optimizer);
@@ -219,7 +221,7 @@ DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
registration->SetMovingImage(movingExtractor->GetOutput());
// initial transform parameters setup
- registration->SetInitialTransformParameters( m_InitialTransformParameters);
+ registration->SetInitialTransformParameters(m_InitialTransformParameters);
m_Interpolator->SetInputImage(movingExtractor->GetOutput());
// Perform the registration
@@ -227,48 +229,49 @@ DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
// Retrieve the final parameters
ParametersType finalParameters = registration->GetLastTransformParameters();
- double value = m_Optimizer->GetValue(registration->GetLastTransformParameters());
+ double value = m_Optimizer->GetValue(registration->GetLastTransformParameters());
// Computing moving image point
- typename FixedImageType::PointType inputPoint,outputPoint;
+ typename FixedImageType::PointType inputPoint, outputPoint;
typename FixedImageType::IndexType inputIndex;
// ensure that we have the right coord rep type
inputIndex[0] = static_cast<unsigned int>(p[0]);
inputIndex[1] = static_cast<unsigned int>(p[1]);
- fixed->TransformIndexToPhysicalPoint(inputIndex,inputPoint);
+ fixed->TransformIndexToPhysicalPoint(inputIndex, inputPoint);
m_Transform->SetParameters(finalParameters);
outputPoint = m_Transform->TransformPoint(inputPoint);
- otbMsgDevMacro(<<"Metric value: "<<value);
- otbMsgDevMacro(<<"Transform parameters: "<<finalParameters);
- otbMsgDevMacro(<<"Deformation: ("<<outputPoint[0]-inputPoint[0]<<", "<<outputPoint[1]-inputPoint[1]<<")");
- otbMsgDevMacro(<<"Final parameters: "<<finalParameters);
+ otbMsgDevMacro(<< "Metric value: " << value);
+ otbMsgDevMacro(<< "Transform parameters: " << finalParameters);
+ otbMsgDevMacro(
+ << "Deformation: (" << outputPoint[0] - inputPoint[0] << ", " << outputPoint[1] - inputPoint[1] << ")");
+ otbMsgDevMacro(<< "Final parameters: " << finalParameters);
- ParametersType data(finalParameters.GetSize()+3);
+ ParametersType data(finalParameters.GetSize() + 3);
data[0] = value;
- data[1] = outputPoint[0]-inputPoint[0];
- data[2] = outputPoint[1]-inputPoint[1];
+ data[1] = outputPoint[0] - inputPoint[0];
+ data[2] = outputPoint[1] - inputPoint[1];
- for (unsigned int i = 0;i<finalParameters.GetSize();++i)
- {
- data[i+3] = finalParameters[i];
- }
+ for (unsigned int i = 0; i < finalParameters.GetSize(); ++i)
+ {
+ data[i + 3] = finalParameters[i];
+ }
// Set the parameters value in the point set data container.
- output->SetPoint(dataId,p);
- output->SetPointData(dataId,data);
+ output->SetPoint(dataId, p);
+ output->SetPointData(dataId, data);
// otbMsgDevMacro(<<"Point "<<dataId<<": "<<finalParameters);
- ++pointIterator;// advance to next point
+ ++pointIterator; // advance to next point
++dataId;
- }
+ }
}
-template < class TFixedImage, class TMovingImage, class TPointSet >
+template <class TFixedImage, class TMovingImage, class TPointSet>
void
-DisparityMapEstimationMethod<TFixedImage,TMovingImage,TPointSet>
+DisparityMapEstimationMethod<TFixedImage, TMovingImage, TPointSet>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/DisparityMap/otbNCCRegistrationFilter.h b/Code/DisparityMap/otbNCCRegistrationFilter.h
index 7900c0e59f..a4d6ef4026 100644
--- a/Code/DisparityMap/otbNCCRegistrationFilter.h
+++ b/Code/DisparityMap/otbNCCRegistrationFilter.h
@@ -65,34 +65,34 @@ namespace otb
*/
template<class TFixedImage, class TMovingImage, class TDeformationField>
class ITK_EXPORT NCCRegistrationFilter :
- public itk::PDEDeformableRegistrationFilter< TFixedImage, TMovingImage,
- TDeformationField>
+ public itk::PDEDeformableRegistrationFilter<TFixedImage, TMovingImage,
+ TDeformationField>
{
public:
/** Standard class typedefs. */
- typedef NCCRegistrationFilter Self;
+ typedef NCCRegistrationFilter Self;
typedef itk::PDEDeformableRegistrationFilter<
- TFixedImage, TMovingImage,TDeformationField> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ TFixedImage, TMovingImage, TDeformationField> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( NCCRegistrationFilter,
- itk::PDEDeformableRegistrationFilter );
+ itkTypeMacro(NCCRegistrationFilter,
+ itk::PDEDeformableRegistrationFilter);
/** Inherit types from superclass. */
- typedef typename Superclass::TimeStepType TimeStepType;
+ typedef typename Superclass::TimeStepType TimeStepType;
/** FixedImage image type. */
- typedef typename Superclass::FixedImageType FixedImageType;
- typedef typename Superclass::FixedImagePointer FixedImagePointer;
+ typedef typename Superclass::FixedImageType FixedImageType;
+ typedef typename Superclass::FixedImagePointer FixedImagePointer;
/** MovingImage image type. */
typedef typename Superclass::MovingImageType MovingImageType;
- typedef typename Superclass::MovingImagePointer MovingImagePointer;
+ typedef typename Superclass::MovingImagePointer MovingImagePointer;
/** Deformation field type. */
typedef typename Superclass::DeformationFieldType
@@ -105,8 +105,8 @@ public:
FiniteDifferenceFunctionType;
/** NCCRegistrationFilterFunction type. */
- typedef NCCRegistrationFunction<FixedImageType,MovingImageType,
- DeformationFieldType> NCCRegistrationFunctionType;
+ typedef NCCRegistrationFunction<FixedImageType, MovingImageType,
+ DeformationFieldType> NCCRegistrationFunctionType;
typedef typename NCCRegistrationFunctionType::RadiusType RadiusType;
@@ -141,19 +141,15 @@ protected:
/** Apply update. */
virtual void ApplyUpdate(TimeStepType dt);
-
/** Update the Input requested region. */
virtual void GenerateInputRequestedRegion();
-
private:
- NCCRegistrationFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ NCCRegistrationFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#ifndef ITK_MANUAL_INSTANTIATION
diff --git a/Code/DisparityMap/otbNCCRegistrationFilter.txx b/Code/DisparityMap/otbNCCRegistrationFilter.txx
index c986a09c5c..f0aa573d79 100644
--- a/Code/DisparityMap/otbNCCRegistrationFilter.txx
+++ b/Code/DisparityMap/otbNCCRegistrationFilter.txx
@@ -26,38 +26,36 @@ namespace otb
* Default constructor
*/
template <class TFixedImage, class TMovingImage, class TDeformationField>
-NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
+NCCRegistrationFilter<TFixedImage, TMovingImage, TDeformationField>
::NCCRegistrationFilter()
{
typename NCCRegistrationFunctionType::Pointer drfp;
drfp = NCCRegistrationFunctionType::New();
- drfp->SetDeformationField( this->GetDeformationField() );
+ drfp->SetDeformationField(this->GetDeformationField());
- this->SetDifferenceFunction( static_cast<FiniteDifferenceFunctionType *>(
- drfp.GetPointer() ) );
+ this->SetDifferenceFunction(static_cast<FiniteDifferenceFunctionType *>(
+ drfp.GetPointer()));
}
-
template <class TFixedImage, class TMovingImage, class TDeformationField>
void
-NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
+NCCRegistrationFilter<TFixedImage, TMovingImage, TDeformationField>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "NCC Radius: " <<
this->GetNCCRadius() << std::endl;
}
-
/*
* Set the function state values before each iteration
*/
template <class TFixedImage, class TMovingImage, class TDeformationField>
void
-NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
+NCCRegistrationFilter<TFixedImage, TMovingImage, TDeformationField>
::InitializeIteration()
{
@@ -67,14 +65,13 @@ NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
// set the gradient selection flag
NCCRegistrationFunctionType *drfp =
dynamic_cast<NCCRegistrationFunctionType *>
- (this->GetDifferenceFunction().GetPointer());
-
- if ( !drfp )
- {
- itkExceptionMacro( <<
- "Could not cast difference function to NCCRegistrationFunction" );
- }
+ (this->GetDifferenceFunction().GetPointer());
+ if (!drfp)
+ {
+ itkExceptionMacro(<<
+ "Could not cast difference function to NCCRegistrationFunction");
+ }
/*
* Smooth the deformation field
@@ -86,49 +83,47 @@ NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
*/
}
-
/*
* Get the metric value from the difference function
*/
template <class TFixedImage, class TMovingImage, class TDeformationField>
double
-NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
+NCCRegistrationFilter<TFixedImage, TMovingImage, TDeformationField>
::GetMetric() const
{
NCCRegistrationFunctionType *drfp =
dynamic_cast<NCCRegistrationFunctionType *>
- (this->GetDifferenceFunction().GetPointer());
+ (this->GetDifferenceFunction().GetPointer());
- if ( !drfp )
- {
- itkExceptionMacro( <<
- "Could not cast difference function to NCCRegistrationFunction" );
- }
+ if (!drfp)
+ {
+ itkExceptionMacro(<<
+ "Could not cast difference function to NCCRegistrationFunction");
+ }
return drfp->GetEnergy();
}
-
/*
*
*/
template <class TFixedImage, class TMovingImage, class TDeformationField>
-typename NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>::RadiusType
-NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
+typename NCCRegistrationFilter<TFixedImage, TMovingImage, TDeformationField>::RadiusType
+NCCRegistrationFilter<TFixedImage, TMovingImage, TDeformationField>
::GetNCCRadius() const
{
NCCRegistrationFunctionType *drfp =
dynamic_cast<NCCRegistrationFunctionType *>
- (this->GetDifferenceFunction().GetPointer());
+ (this->GetDifferenceFunction().GetPointer());
- if ( !drfp )
- {
- itkExceptionMacro( <<
- "Could not cast difference function to NCCRegistrationFunction" );
- }
+ if (!drfp)
+ {
+ itkExceptionMacro(<<
+ "Could not cast difference function to NCCRegistrationFunction");
+ }
return drfp->GetRadius();
@@ -139,19 +134,19 @@ NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
*/
template <class TFixedImage, class TMovingImage, class TDeformationField>
void
-NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
+NCCRegistrationFilter<TFixedImage, TMovingImage, TDeformationField>
::SetNCCRadius(RadiusType radius)
{
NCCRegistrationFunctionType *drfp =
dynamic_cast<NCCRegistrationFunctionType *>
- (this->GetDifferenceFunction().GetPointer());
+ (this->GetDifferenceFunction().GetPointer());
- if ( !drfp )
- {
- itkExceptionMacro( <<
- "Could not cast difference function to NCCRegistrationFunction" );
- }
+ if (!drfp)
+ {
+ itkExceptionMacro(<<
+ "Could not cast difference function to NCCRegistrationFunction");
+ }
drfp->SetRadius(radius);
@@ -160,20 +155,20 @@ NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
template <class TFixedImage, class TMovingImage, class TDeformationField>
void
-NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
+NCCRegistrationFilter<TFixedImage, TMovingImage, TDeformationField>
::GenerateInputRequestedRegion()
{
// get pointers to the input and output
typename Superclass::FixedImagePointer fixedPtr =
- const_cast< TFixedImage * >( this->GetFixedImage() );
+ const_cast<TFixedImage *>(this->GetFixedImage());
typename Superclass::MovingImagePointer movingPtr =
- const_cast< TMovingImage * >( this->GetMovingImage() );
+ const_cast<TMovingImage *>(this->GetMovingImage());
typename TDeformationField::Pointer outputPtr = this->GetOutput();
- if ( !fixedPtr || !movingPtr || !outputPtr )
- {
+ if (!fixedPtr || !movingPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
@@ -181,41 +176,42 @@ NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
requestedRegion = outputPtr->GetRequestedRegion();
// pad the input requested region by the operator radius
- requestedRegion.PadByRadius( this->GetNCCRadius() );
+ requestedRegion.PadByRadius(this->GetNCCRadius());
// crop the input requested region at the input's largest possible region
- if ( requestedRegion.Crop(fixedPtr->GetLargestPossibleRegion()))
- {
- if ( requestedRegion.Crop(movingPtr->GetLargestPossibleRegion()))
+ if (requestedRegion.Crop(fixedPtr->GetLargestPossibleRegion()))
{
- fixedPtr->SetRequestedRegion( requestedRegion );
- movingPtr->SetRequestedRegion( requestedRegion );
+ if (requestedRegion.Crop(movingPtr->GetLargestPossibleRegion()))
+ {
+ fixedPtr->SetRequestedRegion(requestedRegion);
+ movingPtr->SetRequestedRegion(requestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- movingPtr->SetRequestedRegion( requestedRegion );
+ movingPtr->SetRequestedRegion(requestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
e.SetLocation(ITK_LOCATION);
- e.SetDescription("Requested region is (at least partially) outside the largest possible region of the moving image.");
+ e.SetDescription(
+ "Requested region is (at least partially) outside the largest possible region of the moving image.");
e.SetDataObject(movingPtr);
throw e;
+ }
}
- }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- fixedPtr->SetRequestedRegion( requestedRegion );
+ fixedPtr->SetRequestedRegion(requestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
@@ -223,7 +219,7 @@ NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
e.SetDescription("Requested region is (at least partially) outside the largest possible region of the fixed image.");
e.SetDataObject(fixedPtr);
throw e;
- }
+ }
}
/*
@@ -231,7 +227,7 @@ NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
*/
template <class TFixedImage, class TMovingImage, class TDeformationField>
void
-NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
+NCCRegistrationFilter<TFixedImage, TMovingImage, TDeformationField>
::ApplyUpdate(TimeStepType dt)
{
// If we smooth the update buffer before applying it, then the are
@@ -245,19 +241,18 @@ NCCRegistrationFilter<TFixedImage,TMovingImage,TDeformationField>
NCCRegistrationFunctionType *drfp =
dynamic_cast<NCCRegistrationFunctionType *>
- (this->GetDifferenceFunction().GetPointer());
+ (this->GetDifferenceFunction().GetPointer());
- if ( !drfp )
- {
- itkExceptionMacro( <<
- "Could not cast difference function to NCCRegistrationFunction" );
- }
+ if (!drfp)
+ {
+ itkExceptionMacro(<<
+ "Could not cast difference function to NCCRegistrationFunction");
+ }
// this->SetRMSChange( drfp->GetRMSChange() );
}
-
} // end namespace otb
#endif
diff --git a/Code/DisparityMap/otbNCCRegistrationFunction.h b/Code/DisparityMap/otbNCCRegistrationFunction.h
index 48017ee82e..84fa2a297a 100644
--- a/Code/DisparityMap/otbNCCRegistrationFunction.h
+++ b/Code/DisparityMap/otbNCCRegistrationFunction.h
@@ -46,68 +46,68 @@ namespace otb
*/
template<class TFixedImage, class TMovingImage, class TDeformationField>
class ITK_EXPORT NCCRegistrationFunction :
- public itk::PDEDeformableRegistrationFunction< TFixedImage,
- TMovingImage, TDeformationField>
+ public itk::PDEDeformableRegistrationFunction<TFixedImage,
+ TMovingImage, TDeformationField>
{
public:
/** Standard class typedefs. */
- typedef NCCRegistrationFunction Self;
- typedef itk::PDEDeformableRegistrationFunction< TFixedImage,
- TMovingImage, TDeformationField > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef NCCRegistrationFunction Self;
+ typedef itk::PDEDeformableRegistrationFunction<TFixedImage,
+ TMovingImage, TDeformationField> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( NCCRegistrationFunction,
- PDEDeformableRegistrationFunction );
+ itkTypeMacro(NCCRegistrationFunction,
+ PDEDeformableRegistrationFunction);
/** MovingImage image type. */
- typedef typename Superclass::MovingImageType MovingImageType;
- typedef typename Superclass::MovingImagePointer MovingImagePointer;
+ typedef typename Superclass::MovingImageType MovingImageType;
+ typedef typename Superclass::MovingImagePointer MovingImagePointer;
/** FixedImage image type. */
- typedef typename Superclass::FixedImageType FixedImageType;
- typedef typename Superclass::FixedImagePointer FixedImagePointer;
- typedef typename FixedImageType::IndexType IndexType;
- typedef typename FixedImageType::SizeType SizeType;
- typedef typename FixedImageType::SpacingType SpacingType;
+ typedef typename Superclass::FixedImageType FixedImageType;
+ typedef typename Superclass::FixedImagePointer FixedImagePointer;
+ typedef typename FixedImageType::IndexType IndexType;
+ typedef typename FixedImageType::SizeType SizeType;
+ typedef typename FixedImageType::SpacingType SpacingType;
/** Deformation field type. */
- typedef typename Superclass::DeformationFieldType DeformationFieldType;
+ typedef typename Superclass::DeformationFieldType DeformationFieldType;
typedef typename Superclass::DeformationFieldTypePointer
DeformationFieldTypePointer;
/** Inherit some enums from the superclass. */
- itkStaticConstMacro(ImageDimension, unsigned int,Superclass::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, Superclass::ImageDimension);
/** Inherit some enums from the superclass. */
- typedef typename Superclass::PixelType PixelType;
- typedef typename Superclass::RadiusType RadiusType;
- typedef typename Superclass::NeighborhoodType NeighborhoodType;
+ typedef typename Superclass::PixelType PixelType;
+ typedef typename Superclass::RadiusType RadiusType;
+ typedef typename Superclass::NeighborhoodType NeighborhoodType;
// typedef typename Superclass::NeighborhoodType BoundaryNeighborhoodType;
- typedef typename Superclass::FloatOffsetType FloatOffsetType;
- typedef typename Superclass::TimeStepType TimeStepType;
+ typedef typename Superclass::FloatOffsetType FloatOffsetType;
+ typedef typename Superclass::TimeStepType TimeStepType;
/** Interpolator type. */
- typedef double CoordRepType;
- typedef itk::InterpolateImageFunction<MovingImageType,CoordRepType> InterpolatorType;
- typedef typename InterpolatorType::Pointer InterpolatorPointer;
- typedef typename InterpolatorType::PointType PointType;
- typedef itk::LinearInterpolateImageFunction<MovingImageType,CoordRepType>
+ typedef double CoordRepType;
+ typedef itk::InterpolateImageFunction<MovingImageType, CoordRepType> InterpolatorType;
+ typedef typename InterpolatorType::Pointer InterpolatorPointer;
+ typedef typename InterpolatorType::PointType PointType;
+ typedef itk::LinearInterpolateImageFunction<MovingImageType, CoordRepType>
DefaultInterpolatorType;
/** Covariant vector type. */
- typedef itk::CovariantVector<double,itkGetStaticConstMacro(ImageDimension)> CovariantVectorType;
+ typedef itk::CovariantVector<double, itkGetStaticConstMacro(ImageDimension)> CovariantVectorType;
/** Gradient calculator type. */
typedef itk::CentralDifferenceImageFunction<FixedImageType> GradientCalculatorType;
- typedef typename GradientCalculatorType::Pointer GradientCalculatorPointer;
+ typedef typename GradientCalculatorType::Pointer GradientCalculatorPointer;
/** Set the moving image interpolator. */
- void SetMovingImageInterpolator( InterpolatorType * ptr )
+ void SetMovingImageInterpolator(InterpolatorType * ptr)
{
m_MovingImageInterpolator = ptr;
}
@@ -133,7 +133,7 @@ public:
}
/** Release memory for global data structure. */
- virtual void ReleaseGlobalDataPointer( void *GlobalData ) const
+ virtual void ReleaseGlobalDataPointer(void *GlobalData) const
{
delete (GlobalDataStruct *) GlobalData;
}
@@ -143,9 +143,9 @@ public:
/** This method is called by a finite difference solver image filter at
* each pixel that does not lie on a data set boundary */
- virtual PixelType ComputeUpdate(const NeighborhoodType &neighborhood,
+ virtual PixelType ComputeUpdate(const NeighborhoodType& neighborhood,
void *globalData,
- const FloatOffsetType &offset = FloatOffsetType(0.0));
+ const FloatOffsetType& offset = FloatOffsetType(0.0));
protected:
NCCRegistrationFunction();
@@ -159,39 +159,36 @@ protected:
* iterators for the fixed image. */
struct GlobalDataStruct
{
- FixedImageNeighborhoodIteratorType m_FixedImageIterator;
+ FixedImageNeighborhoodIteratorType m_FixedImageIterator;
};
-
private:
- NCCRegistrationFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ NCCRegistrationFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Cache fixed image information. */
- SpacingType m_FixedImageSpacing;
- PointType m_FixedImageOrigin;
+ SpacingType m_FixedImageSpacing;
+ PointType m_FixedImageOrigin;
/** Function to compute derivatives of the fixed image. */
- GradientCalculatorPointer m_FixedImageGradientCalculator;
-
+ GradientCalculatorPointer m_FixedImageGradientCalculator;
/** Function to interpolate the moving image. */
- InterpolatorPointer m_MovingImageInterpolator;
+ InterpolatorPointer m_MovingImageInterpolator;
/** The global timestep. */
- TimeStepType m_TimeStep;
+ TimeStepType m_TimeStep;
/** Threshold below which the denominator term is considered zero. */
- double m_DenominatorThreshold;
+ double m_DenominatorThreshold;
/** Threshold below which two intensity value are assumed to match. */
- double m_IntensityDifferenceThreshold;
+ double m_IntensityDifferenceThreshold;
- mutable double m_MetricTotal;
+ mutable double m_MetricTotal;
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/DisparityMap/otbNCCRegistrationFunction.txx b/Code/DisparityMap/otbNCCRegistrationFunction.txx
index 38b38e2929..ffba5015a5 100644
--- a/Code/DisparityMap/otbNCCRegistrationFunction.txx
+++ b/Code/DisparityMap/otbNCCRegistrationFunction.txx
@@ -32,44 +32,42 @@ namespace otb
* Default constructor
*/
template <class TFixedImage, class TMovingImage, class TDeformationField>
-NCCRegistrationFunction<TFixedImage,TMovingImage,TDeformationField>
+NCCRegistrationFunction<TFixedImage, TMovingImage, TDeformationField>
::NCCRegistrationFunction()
{
- RadiusType r;
+ RadiusType r;
unsigned int j;
- for ( j = 0; j < ImageDimension; ++j )
- {
+ for (j = 0; j < ImageDimension; ++j)
+ {
r[j] = 1;
- }
+ }
this->SetRadius(r);
- m_MetricTotal=0.0;
+ m_MetricTotal = 0.0;
m_TimeStep = 1.0;
m_DenominatorThreshold = 1e-9;
m_IntensityDifferenceThreshold = 0.001;
this->SetMovingImage(NULL);
this->SetFixedImage(NULL);
- m_FixedImageSpacing.Fill( 1.0 );
- m_FixedImageOrigin.Fill( 0.0 );
+ m_FixedImageSpacing.Fill(1.0);
+ m_FixedImageOrigin.Fill(0.0);
m_FixedImageGradientCalculator = GradientCalculatorType::New();
typename DefaultInterpolatorType::Pointer interp =
DefaultInterpolatorType::New();
m_MovingImageInterpolator = static_cast<InterpolatorType*>(
- interp.GetPointer() );
-
+ interp.GetPointer());
}
-
/*
* Standard "PrintSelf" method.
*/
template <class TFixedImage, class TMovingImage, class TDeformationField>
void
-NCCRegistrationFunction<TFixedImage,TMovingImage,TDeformationField>
+NCCRegistrationFunction<TFixedImage, TMovingImage, TDeformationField>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
@@ -86,47 +84,44 @@ NCCRegistrationFunction<TFixedImage,TMovingImage,TDeformationField>
*/
}
-
/*
* Set the function state values before each iteration
*/
template <class TFixedImage, class TMovingImage, class TDeformationField>
void
-NCCRegistrationFunction<TFixedImage,TMovingImage,TDeformationField>
+NCCRegistrationFunction<TFixedImage, TMovingImage, TDeformationField>
::InitializeIteration()
{
- if ( !this->m_MovingImage || !this->m_FixedImage || !m_MovingImageInterpolator )
- {
- itkExceptionMacro( << "MovingImage, FixedImage and/or Interpolator not set" );
- }
+ if (!this->m_MovingImage || !this->m_FixedImage || !m_MovingImageInterpolator)
+ {
+ itkExceptionMacro(<< "MovingImage, FixedImage and/or Interpolator not set");
+ }
// cache fixed image information
m_FixedImageSpacing = this->m_FixedImage->GetSpacing();
m_FixedImageOrigin = this->m_FixedImage->GetOrigin();
// setup gradient calculator
- m_FixedImageGradientCalculator->SetInputImage( this->m_FixedImage );
+ m_FixedImageGradientCalculator->SetInputImage(this->m_FixedImage);
// setup moving image interpolator
- m_MovingImageInterpolator->SetInputImage( this->m_MovingImage );
-
+ m_MovingImageInterpolator->SetInputImage(this->m_MovingImage);
std::cout << " total metric " << m_MetricTotal << " field size " <<
- this->GetDeformationField()->GetLargestPossibleRegion().GetSize()<< " image size " <<
- this->m_FixedImage->GetLargestPossibleRegion().GetSize() << std::endl;
- m_MetricTotal=0.0;
+ this->GetDeformationField()->GetLargestPossibleRegion().GetSize() << " image size " <<
+ this->m_FixedImage->GetLargestPossibleRegion().GetSize() << std::endl;
+ m_MetricTotal = 0.0;
}
-
/*
* Compute update at a non boundary neighbourhood
*/
template <class TFixedImage, class TMovingImage, class TDeformationField>
-typename NCCRegistrationFunction<TFixedImage,TMovingImage,TDeformationField>
+typename NCCRegistrationFunction<TFixedImage, TMovingImage, TDeformationField>
::PixelType
-NCCRegistrationFunction<TFixedImage,TMovingImage,TDeformationField>
-::ComputeUpdate(const NeighborhoodType &it, void * itkNotUsed(globalData),
+NCCRegistrationFunction<TFixedImage, TMovingImage, TDeformationField>
+::ComputeUpdate(const NeighborhoodType& it, void * itkNotUsed(globalData),
const FloatOffsetType& itkNotUsed(offset))
{
@@ -136,143 +131,139 @@ NCCRegistrationFunction<TFixedImage,TMovingImage,TDeformationField>
IndexType oindex = it.GetIndex();
- typename FixedImageType::SizeType hradius=it.GetRadius();
+ typename FixedImageType::SizeType hradius = it.GetRadius();
- FixedImageType* img =const_cast<FixedImageType *>(this->m_FixedImage.GetPointer());
-
- typename FixedImageType::SizeType imagesize=img->GetLargestPossibleRegion().GetSize();
+ FixedImageType* img = const_cast<FixedImageType *>(this->m_FixedImage.GetPointer());
+ typename FixedImageType::SizeType imagesize = img->GetLargestPossibleRegion().GetSize();
itk::NeighborhoodIterator<FixedImageType>
- hoodIt( hradius , img, img->GetRequestedRegion());
+ hoodIt(hradius, img, img->GetRequestedRegion());
hoodIt.SetLocation(oindex);
- double sff=0.0;
- double smm=0.0;
- double sfm=0.0;
+ double sff = 0.0;
+ double smm = 0.0;
+ double sfm = 0.0;
double fixedValue;
double movingValue;
double derivativeF[ImageDimension];
double derivativeM[ImageDimension];
- for (j=0; j<ImageDimension;++j)
- {
- derivativeF[j]=0;
- derivativeM[j]=0;
- }
+ for (j = 0; j < ImageDimension; ++j)
+ {
+ derivativeF[j] = 0;
+ derivativeM[j] = 0;
+ }
unsigned int indct;
- unsigned int hoodlen=hoodIt.Size();
-
- for (indct=0; indct<hoodlen-1; indct++)
- {
+ unsigned int hoodlen = hoodIt.Size();
- IndexType index=hoodIt.GetIndex(indct);
+ for (indct = 0; indct < hoodlen - 1; indct++)
+ {
+ IndexType index = hoodIt.GetIndex(indct);
- bool inimage=true;
- for (unsigned int dd=0; dd<ImageDimension; dd++)
- {
- if ( index[dd] < 0 || index[dd] > static_cast<typename IndexType::IndexValueType>(imagesize[dd]-1) ) inimage=false;
- }
+ bool inimage = true;
+ for (unsigned int dd = 0; dd < ImageDimension; dd++)
+ {
+ if (index[dd] < 0 || index[dd] >
+ static_cast<typename IndexType::IndexValueType>(imagesize[dd] - 1)) inimage = false;
+ }
if (inimage)
- {
-
+ {
// Get fixed image related information
CovariantVectorType fixedGradient;
- double fixedGradientSquaredMagnitude = 0;
+ double fixedGradientSquaredMagnitude = 0;
// Note: no need to check the index is within
// fixed image buffer. This is done by the external filter.
- fixedValue = (double) this->m_FixedImage->GetPixel( index );
+ fixedValue = (double) this->m_FixedImage->GetPixel(index);
- fixedGradient = m_FixedImageGradientCalculator->EvaluateAtIndex( index );
- for ( j = 0; j < ImageDimension; ++j )
- {
- fixedGradientSquaredMagnitude += vnl_math_sqr( fixedGradient[j] ) * m_FixedImageSpacing[j];
- }
+ fixedGradient = m_FixedImageGradientCalculator->EvaluateAtIndex(index);
+ for (j = 0; j < ImageDimension; ++j)
+ {
+ fixedGradientSquaredMagnitude += vnl_math_sqr(fixedGradient[j]) * m_FixedImageSpacing[j];
+ }
// Get moving image related information
PointType mappedPoint;
- typedef typename TDeformationField::PixelType DeformationPixelType;
+ typedef typename TDeformationField::PixelType DeformationPixelType;
// Edited by OTB developpers
DeformationPixelType vec;
vec.Fill(0);
if (this->GetDeformationField()->GetBufferedRegion().IsInside(index))
- {
+ {
vec = this->GetDeformationField()->GetPixel(index);
- }
+ }
// End Edited by OTB developpers
- for ( j = 0; j < ImageDimension; ++j )
- {
- mappedPoint[j] = double( index[j] ) * m_FixedImageSpacing[j] +
+ for (j = 0; j < ImageDimension; ++j)
+ {
+ mappedPoint[j] = double(index[j]) * m_FixedImageSpacing[j] +
m_FixedImageOrigin[j];
mappedPoint[j] += vec[j];
- }
- if ( m_MovingImageInterpolator->IsInsideBuffer( mappedPoint ) )
- {
- movingValue = m_MovingImageInterpolator->Evaluate( mappedPoint );
- }
+ }
+ if (m_MovingImageInterpolator->IsInsideBuffer(mappedPoint))
+ {
+ movingValue = m_MovingImageInterpolator->Evaluate(mappedPoint);
+ }
else
- {
+ {
movingValue = 0.0;
- }
+ }
- sff+=fixedValue*fixedValue;
- smm+=movingValue*movingValue;
- sfm+=fixedValue*movingValue;
+ sff += fixedValue * fixedValue;
+ smm += movingValue * movingValue;
+ sfm += fixedValue * movingValue;
- for (unsigned int dim=0; dim<ImageDimension; ++dim)
- {
+ for (unsigned int dim = 0; dim < ImageDimension; ++dim)
+ {
double differential = fixedGradient[dim];
- derivativeF[dim]+= fixedValue * differential;
- derivativeM[dim]+= movingValue * differential;
+ derivativeF[dim] += fixedValue * differential;
+ derivativeM[dim] += movingValue * differential;
+ }
}
- }
- }
+ }
- double updatenorm=0.0;
- if ( (sff*smm) != 0.0)
- {
- double factor = 1.0 / vcl_sqrt(sff * smm );
- for (unsigned int i=0; i<ImageDimension; ++i)
+ double updatenorm = 0.0;
+ if ((sff * smm) != 0.0)
{
- update[i] = factor * ( derivativeF[i] - (sfm/smm)*derivativeM[i]);
- updatenorm+=(update[i]*update[i]);
+ double factor = 1.0 / vcl_sqrt(sff * smm);
+ for (unsigned int i = 0; i < ImageDimension; ++i)
+ {
+ update[i] = factor * (derivativeF[i] - (sfm / smm) * derivativeM[i]);
+ updatenorm += (update[i] * update[i]);
+ }
+ updatenorm = vcl_sqrt(updatenorm);
+ m_MetricTotal += sfm * factor;
+ this->m_Energy += sfm * factor;
}
- updatenorm=vcl_sqrt(updatenorm);
- m_MetricTotal+=sfm*factor;
- this->m_Energy+=sfm*factor;
- }
else
- {
- for (unsigned int i=0; i<ImageDimension; ++i)
{
+ for (unsigned int i = 0; i < ImageDimension; ++i)
+ {
update[i] = 0.0;
+ }
+ updatenorm = 1.0;
}
- updatenorm=1.0;
- }
// if ( fixedValue > 0.40 && movingValue > 0.40) std::cout << " update norm " << updatenorm;
- if (this->GetNormalizeGradient() && updatenorm !=0.0 )
- {
- update/=(updatenorm);
- }
-
+ if (this->GetNormalizeGradient() && updatenorm != 0.0)
+ {
+ update /= (updatenorm);
+ }
- return update*this->m_GradientStep;
+ return update * this->m_GradientStep;
}
-
} // end namespace otbs
#endif
diff --git a/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.h b/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.h
index 4d8af4391c..80c567e910 100644
--- a/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.h
@@ -28,53 +28,53 @@ namespace otb
*/
template <class TPointSet, class TDeformationField>
class ITK_EXPORT NNearestPointsLinearInterpolateDeformationFieldGenerator
- : public PointSetToDeformationFieldGenerator<TPointSet, TDeformationField>
+ : public PointSetToDeformationFieldGenerator<TPointSet, TDeformationField>
{
public:
/** Standard typedefs */
- typedef NNearestPointsLinearInterpolateDeformationFieldGenerator Self;
- typedef PointSetToDeformationFieldGenerator<TPointSet,TDeformationField> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef NNearestPointsLinearInterpolateDeformationFieldGenerator Self;
+ typedef PointSetToDeformationFieldGenerator<TPointSet, TDeformationField> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(NNearestPointsLinearInterpolateDeformationFieldGenerator,PointSetToDeformationFieldGenerator);
+ itkTypeMacro(NNearestPointsLinearInterpolateDeformationFieldGenerator, PointSetToDeformationFieldGenerator);
/** Template parameters typedefs */
- typedef typename Superclass::PointSetType PointSetType;
- typedef typename Superclass::PointSetPointerType PointSetPointerType;
- typedef typename Superclass::DeformationFieldType DeformationFieldType;
+ typedef typename Superclass::PointSetType PointSetType;
+ typedef typename Superclass::PointSetPointerType PointSetPointerType;
+ typedef typename Superclass::DeformationFieldType DeformationFieldType;
typedef typename Superclass::DeformationFieldPointerType DeformationFieldPointerType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename DeformationFieldType::PixelType PixelType;
- typedef typename Superclass::ValueType ValueType;
- typedef typename Superclass::PointType PointType;
- typedef typename Superclass::IndexVectorType IndexVectorType;
- typedef typename Superclass::DistanceVectorType DistanceVectorType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename DeformationFieldType::PixelType PixelType;
+ typedef typename Superclass::ValueType ValueType;
+ typedef typename Superclass::PointType PointType;
+ typedef typename Superclass::IndexVectorType IndexVectorType;
+ typedef typename Superclass::DistanceVectorType DistanceVectorType;
- itkSetMacro(NumberOfPoints,unsigned int);
- itkGetMacro(NumberOfPoints,unsigned int);
+ itkSetMacro(NumberOfPoints, unsigned int);
+ itkGetMacro(NumberOfPoints, unsigned int);
protected:
/** Constructor */
NNearestPointsLinearInterpolateDeformationFieldGenerator() {};
/** Destructor */
- virtual ~NNearestPointsLinearInterpolateDeformationFieldGenerator() {};
+ virtual ~NNearestPointsLinearInterpolateDeformationFieldGenerator() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Main computation method */
virtual void GenerateData();
private:
- NNearestPointsLinearInterpolateDeformationFieldGenerator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ NNearestPointsLinearInterpolateDeformationFieldGenerator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
unsigned int m_NumberOfPoints;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbNNearestPointsLinearInterpolateDeformationFieldGenerator.txx"
#endif
diff --git a/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.txx b/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.txx
index 4ab5a71354..a6281c28de 100644
--- a/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.txx
@@ -27,7 +27,7 @@
namespace otb
{
/** Main computation method */
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
NNearestPointsLinearInterpolateDeformationFieldGenerator<TPointSet, TDeformationField>
::GenerateData(void)
@@ -39,49 +39,49 @@ NNearestPointsLinearInterpolateDeformationFieldGenerator<TPointSet, TDeformation
outputPtr->FillBuffer(defaultValue);
typedef itk::ImageRegionIteratorWithIndex<DeformationFieldType> IteratorType;
- IteratorType it(outputPtr,outputPtr->GetRequestedRegion());
+ IteratorType it(outputPtr, outputPtr->GetRequestedRegion());
- for (it.GoToBegin();!it.IsAtEnd();++it)
- {
- IndexType index = it.GetIndex();
- IndexVectorType indexVector = this->GenerateNearestValidPointsPointSet(it.GetIndex(),m_NumberOfPoints);
+ for (it.GoToBegin(); !it.IsAtEnd(); ++it)
+ {
+ IndexType index = it.GetIndex();
+ IndexVectorType indexVector = this->GenerateNearestValidPointsPointSet(it.GetIndex(), m_NumberOfPoints);
PixelType pixel(2);
- double xdeformation, ydeformation,normalization;
+ double xdeformation, ydeformation, normalization;
xdeformation = 0;
ydeformation = 0;
normalization = 0;
- for (typename IndexVectorType::iterator indexIt=indexVector.begin();indexIt!=indexVector.end();++indexIt)
- {
+ for (typename IndexVectorType::iterator indexIt = indexVector.begin(); indexIt != indexVector.end(); ++indexIt)
+ {
PointType point;
point[0] = static_cast<double>(this->GetPointSet()->GetPoints()->GetElement(*indexIt)[0]);
point[1] = static_cast<double>(this->GetPointSet()->GetPoints()->GetElement(*indexIt)[1]);
- double distance = this->EuclideanDistance(index,point);
- if (distance<EPSILON)
- {
+ double distance = this->EuclideanDistance(index, point);
+ if (distance < EPSILON)
+ {
distance = EPSILON;
+ }
+ xdeformation += this->GetPointSet()->GetPointData()->GetElement((*indexIt))[1] / distance;
+ ydeformation += this->GetPointSet()->GetPointData()->GetElement((*indexIt))[2] / distance;
+ normalization += 1 / distance;
}
- xdeformation += this->GetPointSet()->GetPointData()->GetElement((*indexIt))[1]/distance;
- ydeformation += this->GetPointSet()->GetPointData()->GetElement((*indexIt))[2]/distance;
- normalization+=1/distance;
- }
- if (normalization>0)
- {
- pixel[0] = static_cast<ValueType>(xdeformation/normalization);
- pixel[1] = static_cast<ValueType>(ydeformation/normalization);
- }
+ if (normalization > 0)
+ {
+ pixel[0] = static_cast<ValueType>(xdeformation / normalization);
+ pixel[1] = static_cast<ValueType>(ydeformation / normalization);
+ }
else
- {
- pixel=defaultValue;
- }
+ {
+ pixel = defaultValue;
+ }
it.Set(pixel);
- }
+ }
}
/**
* PrintSelf Method
*/
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
NNearestPointsLinearInterpolateDeformationFieldGenerator<TPointSet, TDeformationField>
::PrintSelf(std::ostream& os, itk::Indent indent) const
diff --git a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h
index 7d37b7f6bd..64ec2ad2de 100644
--- a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h
@@ -32,56 +32,56 @@ namespace otb
*/
template <class TPointSet, class TDeformationField>
class ITK_EXPORT NNearestTransformsLinearInterpolateDeformationFieldGenerator
- : public PointSetWithTransformToDeformationFieldGenerator<TPointSet, TDeformationField>
+ : public PointSetWithTransformToDeformationFieldGenerator<TPointSet, TDeformationField>
{
public:
/** Standard typedefs */
- typedef NNearestTransformsLinearInterpolateDeformationFieldGenerator Self;
- typedef PointSetWithTransformToDeformationFieldGenerator<TPointSet,TDeformationField> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef NNearestTransformsLinearInterpolateDeformationFieldGenerator Self;
+ typedef PointSetWithTransformToDeformationFieldGenerator<TPointSet, TDeformationField> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(NNearestTransformsLinearInterpolateDeformationFieldGenerator,PointSetWithTransformsToDeformationFieldGenerator);
+ itkTypeMacro(NNearestTransformsLinearInterpolateDeformationFieldGenerator,
+ PointSetWithTransformsToDeformationFieldGenerator);
/** Template parameters typedefs */
- typedef typename Superclass::PointSetType PointSetType;
- typedef typename Superclass::PointSetPointerType PointSetPointerType;
- typedef typename Superclass::DeformationFieldType DeformationFieldType;
+ typedef typename Superclass::PointSetType PointSetType;
+ typedef typename Superclass::PointSetPointerType PointSetPointerType;
+ typedef typename Superclass::DeformationFieldType DeformationFieldType;
typedef typename Superclass::DeformationFieldPointerType DeformationFieldPointerType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename DeformationFieldType::PixelType PixelType;
- typedef typename Superclass::ValueType ValueType;
- typedef typename Superclass::PointType PointType;
- typedef typename Superclass::IndexVectorType IndexVectorType;
- typedef typename Superclass::DistanceVectorType DistanceVectorType;
- typedef typename Superclass::TransformType TransformType;
- typedef typename TransformType::ParametersType ParametersType;
-
-
- itkSetMacro(NumberOfPoints,unsigned int);
- itkGetMacro(NumberOfPoints,unsigned int);
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename DeformationFieldType::PixelType PixelType;
+ typedef typename Superclass::ValueType ValueType;
+ typedef typename Superclass::PointType PointType;
+ typedef typename Superclass::IndexVectorType IndexVectorType;
+ typedef typename Superclass::DistanceVectorType DistanceVectorType;
+ typedef typename Superclass::TransformType TransformType;
+ typedef typename TransformType::ParametersType ParametersType;
+
+ itkSetMacro(NumberOfPoints, unsigned int);
+ itkGetMacro(NumberOfPoints, unsigned int);
protected:
/** Constructor */
NNearestTransformsLinearInterpolateDeformationFieldGenerator() {};
/** Destructor */
- virtual ~NNearestTransformsLinearInterpolateDeformationFieldGenerator() {};
+ virtual ~NNearestTransformsLinearInterpolateDeformationFieldGenerator() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Main computation method */
virtual void GenerateData();
private:
- NNearestTransformsLinearInterpolateDeformationFieldGenerator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ NNearestTransformsLinearInterpolateDeformationFieldGenerator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
unsigned int m_NumberOfPoints;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx"
#endif
diff --git a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx
index b5e2093c83..615ce188ab 100644
--- a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx
@@ -27,7 +27,7 @@
namespace otb
{
/** Main computation method */
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
NNearestTransformsLinearInterpolateDeformationFieldGenerator<TPointSet, TDeformationField>
::GenerateData(void)
@@ -39,60 +39,60 @@ NNearestTransformsLinearInterpolateDeformationFieldGenerator<TPointSet, TDeforma
outputPtr->FillBuffer(defaultValue);
typedef itk::ImageRegionIteratorWithIndex<DeformationFieldType> IteratorType;
- IteratorType it(outputPtr,outputPtr->GetRequestedRegion());
+ IteratorType it(outputPtr, outputPtr->GetRequestedRegion());
- for (it.GoToBegin();!it.IsAtEnd();++it)
- {
- IndexType index = it.GetIndex();
- IndexVectorType indexVector = this->GenerateNearestValidPointsPointSet(it.GetIndex(),m_NumberOfPoints);
+ for (it.GoToBegin(); !it.IsAtEnd(); ++it)
+ {
+ IndexType index = it.GetIndex();
+ IndexVectorType indexVector = this->GenerateNearestValidPointsPointSet(it.GetIndex(), m_NumberOfPoints);
PixelType pixel(2);
- double xdeformation, ydeformation,normalization;
+ double xdeformation, ydeformation, normalization;
xdeformation = 0;
ydeformation = 0;
normalization = 0;
- for (typename IndexVectorType::iterator indexIt=indexVector.begin();indexIt!=indexVector.end();++indexIt)
- {
+ for (typename IndexVectorType::iterator indexIt = indexVector.begin(); indexIt != indexVector.end(); ++indexIt)
+ {
PointType point;
point[0] = static_cast<double>(this->GetPointSet()->GetPoints()->GetElement(*indexIt)[0]);
point[1] = static_cast<double>(this->GetPointSet()->GetPoints()->GetElement(*indexIt)[1]);
- double distance = this->EuclideanDistance(index,point);
- if (distance<EPSILON)
- {
+ double distance = this->EuclideanDistance(index, point);
+ if (distance < EPSILON)
+ {
distance = EPSILON;
- }
+ }
ParametersType params(this->GetTransform()->GetNumberOfParameters());
- for (unsigned int i = 0; i<this->GetTransform()->GetNumberOfParameters();++i)
- {
- params[i] = this->GetPointSet()->GetPointData()->GetElement((*indexIt))[i+3];
- }
+ for (unsigned int i = 0; i < this->GetTransform()->GetNumberOfParameters(); ++i)
+ {
+ params[i] = this->GetPointSet()->GetPointData()->GetElement((*indexIt))[i + 3];
+ }
this->GetTransform()->SetParameters(params);
- PointType sourcePoint,targetPoint;
+ PointType sourcePoint, targetPoint;
- outputPtr->TransformIndexToPhysicalPoint(it.GetIndex(),sourcePoint);
+ outputPtr->TransformIndexToPhysicalPoint(it.GetIndex(), sourcePoint);
targetPoint = this->GetTransform()->TransformPoint(sourcePoint);
- xdeformation += (targetPoint[0]-sourcePoint[0])/distance;
- ydeformation += (targetPoint[1]-sourcePoint[1]) /distance;
- normalization+=1/distance;
- }
+ xdeformation += (targetPoint[0] - sourcePoint[0]) / distance;
+ ydeformation += (targetPoint[1] - sourcePoint[1]) / distance;
+ normalization += 1 / distance;
+ }
- if (normalization>0)
- {
- pixel[0] = static_cast<ValueType>(xdeformation/normalization);
- pixel[1] = static_cast<ValueType>(ydeformation/normalization);
- }
+ if (normalization > 0)
+ {
+ pixel[0] = static_cast<ValueType>(xdeformation / normalization);
+ pixel[1] = static_cast<ValueType>(ydeformation / normalization);
+ }
else
- {
- pixel=defaultValue;
- }
+ {
+ pixel = defaultValue;
+ }
it.Set(pixel);
- }
+ }
}
/**
* PrintSelf Method
*/
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
NNearestTransformsLinearInterpolateDeformationFieldGenerator<TPointSet, TDeformationField>
::PrintSelf(std::ostream& os, itk::Indent indent) const
diff --git a/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.h b/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.h
index 7e4874eec3..f5650022fd 100644
--- a/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.h
@@ -30,46 +30,46 @@ namespace otb
*/
template <class TPointSet, class TDeformationField>
class ITK_EXPORT NearestPointDeformationFieldGenerator
- : public PointSetToDeformationFieldGenerator<TPointSet, TDeformationField>
+ : public PointSetToDeformationFieldGenerator<TPointSet, TDeformationField>
{
public:
/** Standard typedefs */
- typedef NearestPointDeformationFieldGenerator Self;
- typedef PointSetToDeformationFieldGenerator<TPointSet,TDeformationField> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef NearestPointDeformationFieldGenerator Self;
+ typedef PointSetToDeformationFieldGenerator<TPointSet, TDeformationField> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(NearestPointDeformationFieldGenerator,PointSetToDeformationFieldGenerator);
+ itkTypeMacro(NearestPointDeformationFieldGenerator, PointSetToDeformationFieldGenerator);
/** Template parameters typedefs */
- typedef typename Superclass::PointSetType PointSetType;
- typedef typename Superclass::PointSetPointerType PointSetPointerType;
- typedef typename Superclass::DeformationFieldType DeformationFieldType;
+ typedef typename Superclass::PointSetType PointSetType;
+ typedef typename Superclass::PointSetPointerType PointSetPointerType;
+ typedef typename Superclass::DeformationFieldType DeformationFieldType;
typedef typename Superclass::DeformationFieldPointerType DeformationFieldPointerType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename DeformationFieldType::PixelType PixelType;
- typedef typename Superclass::ValueType ValueType;
- typedef typename Superclass::IndexVectorType IndexVectorType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename DeformationFieldType::PixelType PixelType;
+ typedef typename Superclass::ValueType ValueType;
+ typedef typename Superclass::IndexVectorType IndexVectorType;
protected:
/** Constructor */
NearestPointDeformationFieldGenerator() {};
/** Destructor */
- virtual ~NearestPointDeformationFieldGenerator() {};
+ virtual ~NearestPointDeformationFieldGenerator() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Main computation method */
virtual void GenerateData();
private:
- NearestPointDeformationFieldGenerator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ NearestPointDeformationFieldGenerator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbNearestPointDeformationFieldGenerator.txx"
#endif
diff --git a/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.txx b/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.txx
index e86700c828..52699d0905 100644
--- a/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.txx
@@ -25,7 +25,7 @@
namespace otb
{
/** Main computation method */
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
NearestPointDeformationFieldGenerator<TPointSet, TDeformationField>
::GenerateData(void)
@@ -37,28 +37,28 @@ NearestPointDeformationFieldGenerator<TPointSet, TDeformationField>
outputPtr->FillBuffer(defaultValue);
typedef itk::ImageRegionIteratorWithIndex<DeformationFieldType> IteratorType;
- IteratorType it(outputPtr,outputPtr->GetRequestedRegion());
+ IteratorType it(outputPtr, outputPtr->GetRequestedRegion());
- for (it.GoToBegin();!it.IsAtEnd();++it)
- {
- IndexVectorType indexVector = this->GenerateNearestValidPointsPointSet(it.GetIndex(),1);
- PixelType p(2);
- if (indexVector.size()>=1)
+ for (it.GoToBegin(); !it.IsAtEnd(); ++it)
{
+ IndexVectorType indexVector = this->GenerateNearestValidPointsPointSet(it.GetIndex(), 1);
+ PixelType p(2);
+ if (indexVector.size() >= 1)
+ {
p[0] = static_cast<ValueType>(this->GetPointSet()->GetPointData()->GetElement(indexVector[0])[1]);
p[1] = static_cast<ValueType>(this->GetPointSet()->GetPointData()->GetElement(indexVector[0])[2]);
- }
+ }
else
- {
- p=defaultValue;
- }
+ {
+ p = defaultValue;
+ }
it.Set(p);
- }
+ }
}
/**
* PrintSelf Method
*/
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
NearestPointDeformationFieldGenerator<TPointSet, TDeformationField>
::PrintSelf(std::ostream& os, itk::Indent indent) const
diff --git a/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.h b/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.h
index e3e67f7118..b5f74506f8 100644
--- a/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.h
@@ -30,49 +30,49 @@ namespace otb
*/
template <class TPointSet, class TDeformationField>
class ITK_EXPORT NearestTransformDeformationFieldGenerator
- : public PointSetWithTransformToDeformationFieldGenerator<TPointSet, TDeformationField>
+ : public PointSetWithTransformToDeformationFieldGenerator<TPointSet, TDeformationField>
{
public:
/** Standard typedefs */
- typedef NearestTransformDeformationFieldGenerator Self;
- typedef PointSetWithTransformToDeformationFieldGenerator<TPointSet,TDeformationField> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef NearestTransformDeformationFieldGenerator Self;
+ typedef PointSetWithTransformToDeformationFieldGenerator<TPointSet, TDeformationField> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(NearestTransformDeformationFieldGenerator,PointSetWithTransformToDeformationFieldGenerator);
+ itkTypeMacro(NearestTransformDeformationFieldGenerator, PointSetWithTransformToDeformationFieldGenerator);
/** Template parameters typedefs */
- typedef typename Superclass::PointSetType PointSetType;
- typedef typename Superclass::PointSetPointerType PointSetPointerType;
- typedef typename Superclass::DeformationFieldType DeformationFieldType;
+ typedef typename Superclass::PointSetType PointSetType;
+ typedef typename Superclass::PointSetPointerType PointSetPointerType;
+ typedef typename Superclass::DeformationFieldType DeformationFieldType;
typedef typename Superclass::DeformationFieldPointerType DeformationFieldPointerType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::PointType PointType;
- typedef typename DeformationFieldType::PixelType PixelType;
- typedef typename Superclass::ValueType ValueType;
- typedef typename Superclass::IndexVectorType IndexVectorType;
- typedef typename Superclass::TransformType TransformType;
- typedef typename TransformType::ParametersType ParametersType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::PointType PointType;
+ typedef typename DeformationFieldType::PixelType PixelType;
+ typedef typename Superclass::ValueType ValueType;
+ typedef typename Superclass::IndexVectorType IndexVectorType;
+ typedef typename Superclass::TransformType TransformType;
+ typedef typename TransformType::ParametersType ParametersType;
protected:
/** Constructor */
NearestTransformDeformationFieldGenerator() {};
/** Destructor */
- virtual ~NearestTransformDeformationFieldGenerator() {};
+ virtual ~NearestTransformDeformationFieldGenerator() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Main computation method */
virtual void GenerateData();
private:
- NearestTransformDeformationFieldGenerator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ NearestTransformDeformationFieldGenerator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbNearestTransformDeformationFieldGenerator.txx"
#endif
diff --git a/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.txx b/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.txx
index ed40305a89..3d5bb45516 100644
--- a/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.txx
@@ -25,7 +25,7 @@
namespace otb
{
/** Main computation method */
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
NearestTransformDeformationFieldGenerator<TPointSet, TDeformationField>
::GenerateData(void)
@@ -37,38 +37,38 @@ NearestTransformDeformationFieldGenerator<TPointSet, TDeformationField>
outputPtr->FillBuffer(defaultValue);
typedef itk::ImageRegionIteratorWithIndex<DeformationFieldType> IteratorType;
- IteratorType it(outputPtr,outputPtr->GetRequestedRegion());
+ IteratorType it(outputPtr, outputPtr->GetRequestedRegion());
- for (it.GoToBegin();!it.IsAtEnd();++it)
- {
- IndexVectorType indexVector = this->GenerateNearestValidPointsPointSet(it.GetIndex(),1);
- PixelType pixel(2);
- if (indexVector.size()>=1)
+ for (it.GoToBegin(); !it.IsAtEnd(); ++it)
{
- ParametersType params(this->GetTransform()->GetNumberOfParameters());
- for (unsigned int i = 0; i<this->GetTransform()->GetNumberOfParameters();++i)
+ IndexVectorType indexVector = this->GenerateNearestValidPointsPointSet(it.GetIndex(), 1);
+ PixelType pixel(2);
+ if (indexVector.size() >= 1)
{
- params[i] = this->GetPointSet()->GetPointData()->GetElement(indexVector[0])[i+3];
- }
+ ParametersType params(this->GetTransform()->GetNumberOfParameters());
+ for (unsigned int i = 0; i < this->GetTransform()->GetNumberOfParameters(); ++i)
+ {
+ params[i] = this->GetPointSet()->GetPointData()->GetElement(indexVector[0])[i + 3];
+ }
this->GetTransform()->SetParameters(params);
- PointType sourcePoint,targetPoint;
+ PointType sourcePoint, targetPoint;
- outputPtr->TransformIndexToPhysicalPoint(it.GetIndex(),sourcePoint);
+ outputPtr->TransformIndexToPhysicalPoint(it.GetIndex(), sourcePoint);
targetPoint = this->GetTransform()->TransformPoint(sourcePoint);
- pixel[0] = static_cast<ValueType>(targetPoint[0]-sourcePoint[0]);
- pixel[1] = static_cast<ValueType>(targetPoint[1]-sourcePoint[1]);
- }
+ pixel[0] = static_cast<ValueType>(targetPoint[0] - sourcePoint[0]);
+ pixel[1] = static_cast<ValueType>(targetPoint[1] - sourcePoint[1]);
+ }
else
- {
- pixel=defaultValue;
- }
+ {
+ pixel = defaultValue;
+ }
it.Set(pixel);
- }
+ }
}
/**
* PrintSelf Method
*/
-template <class TPointSet,class TDeformationField>
+template <class TPointSet, class TDeformationField>
void
NearestTransformDeformationFieldGenerator<TPointSet, TDeformationField>
::PrintSelf(std::ostream& os, itk::Indent indent) const
diff --git a/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.h b/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.h
index c450838cd0..712babbab2 100644
--- a/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.h
@@ -31,11 +31,11 @@ namespace Functor
class DistanceComparisonFunctor
{
public:
- DistanceComparisonFunctor() {};
- virtual ~DistanceComparisonFunctor() {};
+ DistanceComparisonFunctor() {}
+ virtual ~DistanceComparisonFunctor() {}
typedef std::vector<double> DistanceVectorType;
- void SetDistanceVector(DistanceVectorType &vec)
+ void SetDistanceVector(DistanceVectorType& vec)
{
m_DistanceVector = vec;
}
@@ -43,9 +43,9 @@ public:
{
return m_DistanceVector;
}
- inline bool operator()(const unsigned int a1, const unsigned int a2)
+ inline bool operator ()(const unsigned int a1, const unsigned int a2)
{
- return m_DistanceVector[a1]<m_DistanceVector[a2];
+ return m_DistanceVector[a1] < m_DistanceVector[a2];
}
private:
@@ -61,7 +61,7 @@ private:
*/
template <class TPointSet, class TDeformationField>
class ITK_EXPORT PointSetToDeformationFieldGenerator
- : public itk::ImageSource<TDeformationField>
+ : public itk::ImageSource<TDeformationField>
{
public:
/** Standard typedefs */
@@ -77,19 +77,19 @@ public:
itkTypeMacro(PointSetToDeformationFieldGenerator, ImageSource);
/** Template parameters typedefs */
- typedef TPointSet PointSetType;
+ typedef TPointSet PointSetType;
typedef typename PointSetType::Pointer PointSetPointerType;
- typedef TDeformationField DeformationFieldType;
- typedef typename DeformationFieldType::Pointer DeformationFieldPointerType;
- typedef typename DeformationFieldType::IndexType IndexType;
- typedef typename DeformationFieldType::SizeType SizeType;
- typedef typename DeformationFieldType::SpacingType SpacingType;
- typedef typename DeformationFieldType::PointType PointType;
+ typedef TDeformationField DeformationFieldType;
+ typedef typename DeformationFieldType::Pointer DeformationFieldPointerType;
+ typedef typename DeformationFieldType::IndexType IndexType;
+ typedef typename DeformationFieldType::SizeType SizeType;
+ typedef typename DeformationFieldType::SpacingType SpacingType;
+ typedef typename DeformationFieldType::PointType PointType;
typedef typename DeformationFieldType::InternalPixelType ValueType;
/** More typedefs */
- typedef std::vector<double> DistanceVectorType;
+ typedef std::vector<double> DistanceVectorType;
typedef std::vector<unsigned int> IndexVectorType;
/**
@@ -103,23 +103,22 @@ public:
*/
const TPointSet * GetPointSet(void);
-
- itkSetMacro(MetricThreshold,double);
- itkGetMacro(MetricThreshold,double);
- itkSetMacro(DefaultValue,ValueType);
- itkGetMacro(DefaultValue,ValueType);
- itkSetMacro(OutputSize,SizeType);
- itkGetConstReferenceMacro(OutputSize,SizeType);
- itkSetMacro(OutputSpacing,SpacingType);
- itkGetConstReferenceMacro(OutputSpacing,SpacingType);
- itkSetMacro(OutputOrigin,PointType);
- itkGetConstReferenceMacro(OutputOrigin,PointType);
+ itkSetMacro(MetricThreshold, double);
+ itkGetMacro(MetricThreshold, double);
+ itkSetMacro(DefaultValue, ValueType);
+ itkGetMacro(DefaultValue, ValueType);
+ itkSetMacro(OutputSize, SizeType);
+ itkGetConstReferenceMacro(OutputSize, SizeType);
+ itkSetMacro(OutputSpacing, SpacingType);
+ itkGetConstReferenceMacro(OutputSpacing, SpacingType);
+ itkSetMacro(OutputOrigin, PointType);
+ itkGetConstReferenceMacro(OutputOrigin, PointType);
protected:
/** Constructor */
PointSetToDeformationFieldGenerator();
/** Destructor */
- virtual ~PointSetToDeformationFieldGenerator() {};
+ virtual ~PointSetToDeformationFieldGenerator() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Generate output information */
@@ -136,8 +135,8 @@ protected:
double EuclideanDistance(IndexType index, PointType p);
private:
- PointSetToDeformationFieldGenerator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PointSetToDeformationFieldGenerator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/**
* The threshold of metric value.
@@ -152,7 +151,7 @@ private:
/** Default value */
ValueType m_DefaultValue;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbPointSetToDeformationFieldGenerator.txx"
#endif
diff --git a/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.txx b/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.txx
index 2ae41f31ce..5f3e319910 100644
--- a/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.txx
@@ -47,7 +47,7 @@ void
PointSetToDeformationFieldGenerator<TPointSet, TDeformationField>
::SetPointSet(const TPointSet * pointset)
{
- this->itk::ProcessObject::SetNthInput(0,const_cast<PointSetType *>(pointset));
+ this->itk::ProcessObject::SetNthInput(0, const_cast<PointSetType *>(pointset));
}
/**
* Get the pointset containing the disparity.
@@ -66,7 +66,7 @@ void
PointSetToDeformationFieldGenerator<TPointSet, TDeformationField>
::GenerateOutputInformation(void)
{
- DeformationFieldPointerType outputPtr = this->GetOutput();
+ DeformationFieldPointerType outputPtr = this->GetOutput();
typename DeformationFieldType::RegionType largest;
largest.SetSize(m_OutputSize);
IndexType index;
@@ -92,41 +92,41 @@ PointSetToDeformationFieldGenerator<TPointSet, TDeformationField>
{
typedef Functor::DistanceComparisonFunctor ComparisonFunctorType;
DistanceVectorType distanceVector;
- IndexVectorType indexVector;
- IndexVectorType sortVector;
- unsigned int i = 0;
- unsigned int j = 0;
+ IndexVectorType indexVector;
+ IndexVectorType sortVector;
+ unsigned int i = 0;
+ unsigned int j = 0;
typedef typename PointSetType::PointsContainer::ConstIterator PointSetIteratorType;
- typedef typename PointSetType::PointsContainer PointsContainerType;
+ typedef typename PointSetType::PointsContainer PointsContainerType;
PointSetIteratorType it = this->GetPointSet()->GetPoints()->Begin();
- for (;it!=this->GetPointSet()->GetPoints()->End();++it)
- {
- PointType p;
- p[0]=it.Value()[0];
- p[1]=it.Value()[1];
- if (vcl_abs(this->GetPointSet()->GetPointData()->GetElement(j)[0])>=m_MetricThreshold)
+ for (; it != this->GetPointSet()->GetPoints()->End(); ++it)
{
+ PointType p;
+ p[0] = it.Value()[0];
+ p[1] = it.Value()[1];
+ if (vcl_abs(this->GetPointSet()->GetPointData()->GetElement(j)[0]) >= m_MetricThreshold)
+ {
- distanceVector.push_back(EuclideanDistance(index,p));
+ distanceVector.push_back(EuclideanDistance(index, p));
sortVector.push_back(i);
indexVector.push_back(j);
++i;
- }
+ }
++j;
- }
+ }
ComparisonFunctorType comp;
comp.SetDistanceVector(distanceVector);
- sort(sortVector.begin(),sortVector.end(),comp);
+ sort(sortVector.begin(), sortVector.end(), comp);
// building output vector
- unsigned int nbElements = (n<indexVector.size() ? n : indexVector.size());
+ unsigned int nbElements = (n < indexVector.size() ? n : indexVector.size());
IndexVectorType output;
- for (i=0;i<nbElements;++i)
- {
+ for (i = 0; i < nbElements; ++i)
+ {
output.push_back(indexVector[sortVector[i]]);
- }
+ }
return output;
}
@@ -138,7 +138,7 @@ PointSetToDeformationFieldGenerator<TPointSet, TDeformationField>
PointType pprime;
// our point are expressed in index and not in physical coordinates
//this->GetOutput()->TransformIndexToPhysicalPoint(index,pprime);
- return vcl_sqrt(vcl_pow(index[0]-p[0],2)+vcl_pow(index[1]-p[1],2));
+ return vcl_sqrt(vcl_pow(index[0] - p[0], 2) + vcl_pow(index[1] - p[1], 2));
}
/**
* PrintSelf Method
diff --git a/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.h b/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.h
index 50695e8f72..ac1410c9c1 100644
--- a/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.h
@@ -35,57 +35,57 @@ namespace otb
*/
template <class TPointSet, class TDeformationField>
class ITK_EXPORT PointSetWithTransformToDeformationFieldGenerator
- : public PointSetToDeformationFieldGenerator<TPointSet,TDeformationField>
+ : public PointSetToDeformationFieldGenerator<TPointSet, TDeformationField>
{
public:
/** Standard typedefs */
- typedef PointSetWithTransformToDeformationFieldGenerator Self;
- typedef PointSetToDeformationFieldGenerator<TPointSet,TDeformationField> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PointSetWithTransformToDeformationFieldGenerator Self;
+ typedef PointSetToDeformationFieldGenerator<TPointSet, TDeformationField> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(PointSetWithTransformToDeformationFieldGenerator,PointSetToDeformationFieldGenerator);
+ itkTypeMacro(PointSetWithTransformToDeformationFieldGenerator, PointSetToDeformationFieldGenerator);
/** Template parameters typedefs */
- typedef TPointSet PointSetType;
+ typedef TPointSet PointSetType;
typedef typename PointSetType::Pointer PointSetPointerType;
- typedef TDeformationField DeformationFieldType;
- typedef typename DeformationFieldType::Pointer DeformationFieldPointerType;
- typedef typename DeformationFieldType::IndexType IndexType;
- typedef typename DeformationFieldType::SizeType SizeType;
- typedef typename DeformationFieldType::SpacingType SpacingType;
- typedef typename DeformationFieldType::PointType PointType;
+ typedef TDeformationField DeformationFieldType;
+ typedef typename DeformationFieldType::Pointer DeformationFieldPointerType;
+ typedef typename DeformationFieldType::IndexType IndexType;
+ typedef typename DeformationFieldType::SizeType SizeType;
+ typedef typename DeformationFieldType::SpacingType SpacingType;
+ typedef typename DeformationFieldType::PointType PointType;
typedef typename DeformationFieldType::InternalPixelType ValueType;
/** More typedefs */
typedef typename Superclass::DistanceVectorType DistanceVectorType;
- typedef typename Superclass::IndexVectorType IndexVectorType;
+ typedef typename Superclass::IndexVectorType IndexVectorType;
/** Transform typedefs */
- typedef itk::Transform<double,2,2> TransformType;
- typedef typename TransformType::Pointer TransformPointerType;
+ typedef itk::Transform<double, 2, 2> TransformType;
+ typedef typename TransformType::Pointer TransformPointerType;
typedef typename TransformType::ParametersType ParametersType;
/** Set/Get the Transfrom. */
- itkSetObjectMacro(Transform,TransformType);
- itkGetObjectMacro(Transform,TransformType);
+ itkSetObjectMacro(Transform, TransformType);
+ itkGetObjectMacro(Transform, TransformType);
protected:
/** Constructor */
PointSetWithTransformToDeformationFieldGenerator();
/** Destructor */
- virtual ~PointSetWithTransformToDeformationFieldGenerator() {};
+ virtual ~PointSetWithTransformToDeformationFieldGenerator() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- PointSetWithTransformToDeformationFieldGenerator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PointSetWithTransformToDeformationFieldGenerator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/**
* The transform used for local registration.
@@ -93,7 +93,7 @@ private:
TransformPointerType m_Transform;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbPointSetWithTransformToDeformationFieldGenerator.txx"
#endif
diff --git a/Code/DisparityMap/otbStreamingWarpImageFilter.h b/Code/DisparityMap/otbStreamingWarpImageFilter.h
index a8889c0ed9..8bd89ac3eb 100644
--- a/Code/DisparityMap/otbStreamingWarpImageFilter.h
+++ b/Code/DisparityMap/otbStreamingWarpImageFilter.h
@@ -45,14 +45,14 @@ namespace otb
template <class TInputImage, class TOutputImage, class TDeformationField>
class ITK_EXPORT StreamingWarpImageFilter
- : public itk::WarpImageFilter< TInputImage, TOutputImage, TDeformationField >
+ : public itk::WarpImageFilter<TInputImage, TOutputImage, TDeformationField>
{
public:
/** Standard class typedefs. */
- typedef StreamingWarpImageFilter Self;
- typedef itk::WarpImageFilter< TInputImage, TOutputImage, TDeformationField> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef StreamingWarpImageFilter Self;
+ typedef itk::WarpImageFilter<TInputImage, TOutputImage, TDeformationField> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -70,14 +70,14 @@ public:
typedef typename DeformationFieldType::Pointer DeformationFieldPointerType;
/** Accessors */
- itkSetMacro(MaximumDeformation,DeformationValueType);
- itkGetConstReferenceMacro(MaximumDeformation,DeformationValueType);
+ itkSetMacro(MaximumDeformation, DeformationValueType);
+ itkGetConstReferenceMacro(MaximumDeformation, DeformationValueType);
protected:
/** Constructor */
StreamingWarpImageFilter();
/** Destructor */
- virtual ~StreamingWarpImageFilter() {};
+ virtual ~StreamingWarpImageFilter() {}
/** PrintSelf */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/**
@@ -87,8 +87,8 @@ protected:
virtual void GenerateInputRequestedRegion();
private:
- StreamingWarpImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ StreamingWarpImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
// Assesment of the maximum deformation for streaming
DeformationValueType m_MaximumDeformation;
@@ -100,5 +100,4 @@ private:
#include "otbStreamingWarpImageFilter.txx"
#endif
-
#endif
diff --git a/Code/DisparityMap/otbStreamingWarpImageFilter.txx b/Code/DisparityMap/otbStreamingWarpImageFilter.txx
index b0811ebec1..29d4c9a13f 100644
--- a/Code/DisparityMap/otbStreamingWarpImageFilter.txx
+++ b/Code/DisparityMap/otbStreamingWarpImageFilter.txx
@@ -28,46 +28,48 @@ namespace otb
{
template<class TInputImage, class TOutputImage, class TDeformationField>
-StreamingWarpImageFilter<TInputImage,TOutputImage,TDeformationField>
+StreamingWarpImageFilter<TInputImage, TOutputImage, TDeformationField>
::StreamingWarpImageFilter()
{
// Fill the default maximum deformation
m_MaximumDeformation.Fill(1);
}
-
template<class TInputImage, class TOutputImage, class TDeformationField>
void
-StreamingWarpImageFilter<TInputImage,TOutputImage,TDeformationField>
+StreamingWarpImageFilter<TInputImage, TOutputImage, TDeformationField>
::GenerateInputRequestedRegion()
{
// First, ca the superclass implementation
Superclass::GenerateInputRequestedRegion();
// Get the input and deformation field pointers
- InputImageType * inputPtr = const_cast<InputImageType *>(this->GetInput());
+ InputImageType * inputPtr = const_cast<InputImageType *>(this->GetInput());
DeformationFieldType * deformationPtr = const_cast<DeformationFieldType*>(this->GetDeformationField());
// Check if the input and the deformation field exist
if (!inputPtr || !deformationPtr)
- {
+ {
return;
- }
+ }
// Compute the security margin radius
- typename InputImageType::SizeType radius;
+ typename InputImageType::SizeType radius;
typename InputImageType::SpacingType spacing = inputPtr->GetSpacing();
// Add the padding due to the interpolator
- unsigned int interpolatorRadius = StreamingTraits<typename Superclass::InputImageType>::CalculateNeededRadiusForInterpolator(this->GetInterpolator());
+ unsigned int interpolatorRadius =
+ StreamingTraits<typename Superclass::InputImageType>::CalculateNeededRadiusForInterpolator(this->GetInterpolator());
// Compute the margin due to the maximum deformation value and interpolator radius
- for (unsigned int i = 0; i<InputImageType::ImageDimension;++i)
- {
- radius[i]= interpolatorRadius + static_cast<unsigned int>(vcl_ceil(m_MaximumDeformation[i]/vcl_abs(spacing[i])));
- }
+ for (unsigned int i = 0; i < InputImageType::ImageDimension; ++i)
+ {
+ radius[i] = interpolatorRadius + static_cast<unsigned int>(vcl_ceil(m_MaximumDeformation[i] / vcl_abs(spacing[i])));
+ }
- otbMsgDevMacro(<<"WarpImageFilter: MaximumDeformation: "<<m_MaximumDeformation<<", interpolator radius: "<<interpolatorRadius<<", total radius: "<<radius);
+ otbMsgDevMacro(
+ << "WarpImageFilter: MaximumDeformation: " << m_MaximumDeformation << ", interpolator radius: " <<
+ interpolatorRadius << ", total radius: " << radius);
// get a copy of the input requested region (should equal the output
// requested region)
@@ -75,21 +77,21 @@ StreamingWarpImageFilter<TInputImage,TOutputImage,TDeformationField>
inputRequestedRegion = deformationPtr->GetRequestedRegion();
// pad the input requested region by the operator radius
- inputRequestedRegion.PadByRadius( radius);
+ inputRequestedRegion.PadByRadius(radius);
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
@@ -97,18 +99,17 @@ StreamingWarpImageFilter<TInputImage,TOutputImage,TDeformationField>
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
- }
+ }
}
template<class TInputImage, class TOutputImage, class TDeformationField>
void
-StreamingWarpImageFilter<TInputImage,TOutputImage,TDeformationField>
+StreamingWarpImageFilter<TInputImage, TOutputImage, TDeformationField>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os << indent << "Maximum deformation: " << m_MaximumDeformation<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Maximum deformation: " << m_MaximumDeformation << std::endl;
}
-
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbAddCarvingPathFilter.h b/Code/FeatureExtraction/otbAddCarvingPathFilter.h
index 5f83b4b986..90f697adbd 100644
--- a/Code/FeatureExtraction/otbAddCarvingPathFilter.h
+++ b/Code/FeatureExtraction/otbAddCarvingPathFilter.h
@@ -55,14 +55,13 @@ namespace otb
* \ingroup ImageFilters
*/
-
-template <class TInputImage, class TInputPath,class TOutputImage>
-class ITK_EXPORT AddCarvingPathFilter : public itk::ImageAndPathToImageFilter<TInputImage,TInputPath,TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
+class ITK_EXPORT AddCarvingPathFilter : public itk::ImageAndPathToImageFilter<TInputImage, TInputPath, TOutputImage>
{
public:
/** Standard class typedefs. */
typedef AddCarvingPathFilter Self;
- typedef itk::ImageAndPathToImageFilter<TInputImage,TInputPath,TOutputImage> Superclass;
+ typedef itk::ImageAndPathToImageFilter<TInputImage, TInputPath, TOutputImage> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -73,34 +72,34 @@ public:
itkTypeMacro(AddCarvingPathFilter, itk::ImageAndPathToImageFilter);
/** Some convenient typedefs. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointer;
- typedef typename InputImageType::ConstPointer InputImageConstPointer;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef TInputPath InputPathType;
- typedef typename InputPathType::Pointer InputPathPointer;
- typedef typename InputPathType::ConstPointer InputPathConstPointer;
- typedef typename InputPathType::InputType InputPathInputType;
- typedef typename InputPathType::OutputType InputPathOutputType;
- typedef typename InputPathType::IndexType InputPathIndexType;
- typedef typename InputPathType::OffsetType InputPathOffsetType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::ConstPointer OutputImageConstPointer;
-
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputImagePixelType;
- typedef typename OutputImageType::ValueType OutputImageValueType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointer;
+ typedef typename InputImageType::ConstPointer InputImageConstPointer;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef TInputPath InputPathType;
+ typedef typename InputPathType::Pointer InputPathPointer;
+ typedef typename InputPathType::ConstPointer InputPathConstPointer;
+ typedef typename InputPathType::InputType InputPathInputType;
+ typedef typename InputPathType::OutputType InputPathOutputType;
+ typedef typename InputPathType::IndexType InputPathIndexType;
+ typedef typename InputPathType::OffsetType InputPathOffsetType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::ConstPointer OutputImageConstPointer;
+
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputImagePixelType;
+ typedef typename OutputImageType::ValueType OutputImageValueType;
// typedef typename itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
// typedef typename itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
typedef typename itk::ImageSliceConstIteratorWithIndex<InputImageType> InputIteratorType;
- typedef typename itk::ImageSliceIteratorWithIndex<OutputImageType> OutputIteratorType;
+ typedef typename itk::ImageSliceIteratorWithIndex<OutputImageType> OutputIteratorType;
/** Set/Get the path input of this process object.
Note: these methods are adding to get the proper name */
- void SetInputPath( const TInputPath * path);
+ void SetInputPath(const TInputPath * path);
const TInputPath * GetInputPath(void);
@@ -108,25 +107,25 @@ public:
itkGetConstReferenceMacro(Value, OutputImagePixelType);
/** Set and Get direction value */
- itkSetMacro(Direction ,unsigned int);
- itkGetConstMacro(Direction ,unsigned int);
+ itkSetMacro(Direction, unsigned int);
+ itkGetConstMacro(Direction, unsigned int);
virtual void GenerateOutputInformation();
virtual void GenerateInputRequestedRegion();
protected:
AddCarvingPathFilter();
- virtual ~AddCarvingPathFilter() {};
+ virtual ~AddCarvingPathFilter() {}
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
virtual void GenerateData();
private:
- AddCarvingPathFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ AddCarvingPathFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
OutputImagePixelType m_Value;
- unsigned int m_Direction;
+ unsigned int m_Direction;
};
} // end namespace otb
diff --git a/Code/FeatureExtraction/otbAddCarvingPathFilter.txx b/Code/FeatureExtraction/otbAddCarvingPathFilter.txx
index cd14e81a18..a6e6473923 100644
--- a/Code/FeatureExtraction/otbAddCarvingPathFilter.txx
+++ b/Code/FeatureExtraction/otbAddCarvingPathFilter.txx
@@ -27,8 +27,8 @@ namespace otb
/**
* Constructor
*/
-template <class TInputImage, class TInputPath,class TOutputImage>
-AddCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
+AddCarvingPathFilter<TInputImage, TInputPath, TOutputImage>
::AddCarvingPathFilter()
{
m_Value = static_cast<OutputImagePixelType>(255.0);
@@ -37,35 +37,34 @@ AddCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
/**
* Main computation method.
*/
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
inline void
-AddCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
-::SetInputPath( const TInputPath * path)
+AddCarvingPathFilter<TInputImage, TInputPath, TOutputImage>
+::SetInputPath(const TInputPath * path)
{
this->SetPathInput(path);
}
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
const TInputPath *
-AddCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
+AddCarvingPathFilter<TInputImage, TInputPath, TOutputImage>
::GetInputPath(void)
{
return this->GetPathInput();
}
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
void
-AddCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
+AddCarvingPathFilter<TInputImage, TInputPath, TOutputImage>
::GenerateData(void)
{
const InputImageType * inputImage = this->GetImageInput();
- const InputPathType * inputPath = this->GetPathInput();
- OutputImageType * outputImage = this->GetOutput();
+ const InputPathType * inputPath = this->GetPathInput();
+ OutputImageType * outputImage = this->GetOutput();
- outputImage->SetBufferedRegion( outputImage->GetRequestedRegion() );
+ outputImage->SetBufferedRegion(outputImage->GetRequestedRegion());
outputImage->Allocate();
-
InputIteratorType inputIterator(inputImage,
inputImage->GetLargestPossibleRegion());
OutputIteratorType outputIterator(outputImage,
@@ -75,28 +74,28 @@ AddCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
unsigned int dir1;
if (m_Direction == 0)
- {
- dir0=0;
- dir1=1;
- }
+ {
+ dir0 = 0;
+ dir1 = 1;
+ }
else
- {
- dir0=1;
- dir1=0;
- }
+ {
+ dir0 = 1;
+ dir1 = 0;
+ }
- inputIterator.SetFirstDirection( dir0 );
- inputIterator.SetSecondDirection( dir1 );
+ inputIterator.SetFirstDirection(dir0);
+ inputIterator.SetSecondDirection(dir1);
inputIterator.GoToBegin();
- outputIterator.SetFirstDirection( dir0 );
- outputIterator.SetSecondDirection( dir1 );
+ outputIterator.SetFirstDirection(dir0);
+ outputIterator.SetSecondDirection(dir1);
outputIterator.GoToBegin();
- int line=-1;
- typename InputImageType::IndexType index;
- typename InputPathType::VertexListType::ConstPointer vertexList = inputPath->GetVertexList();
+ int line = -1;
+ typename InputImageType::IndexType index;
+ typename InputPathType::VertexListType::ConstPointer vertexList = inputPath->GetVertexList();
typename InputPathType::VertexListType::ConstIterator pathIterator;
- typename InputImageType::IndexType indexToAdd;
+ typename InputImageType::IndexType indexToAdd;
typedef typename InputImageType::IndexType::IndexValueType IndexValueType;
typename InputImageType::SizeType inputSize;
@@ -105,102 +104,99 @@ AddCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
//go to the end of the path
pathIterator = vertexList->Begin();
while (pathIterator != vertexList->End())
- {
+ {
++pathIterator;
- }
+ }
--pathIterator;
while (!outputIterator.IsAtEnd())
- {
- while (!outputIterator.IsAtEndOfSlice())
{
+ while (!outputIterator.IsAtEndOfSlice())
+ {
bool flag = false;
while (!outputIterator.IsAtEndOfLine())
- {
+ {
index = outputIterator.GetIndex();
if (index[dir1] != line)
- {
+ {
line = index[dir1];
typename InputImageType::PointType tmpIndex;
- inputImage->TransformContinuousIndexToPhysicalPoint(pathIterator.Value(),tmpIndex);
- inputImage->TransformPhysicalPointToIndex(tmpIndex,indexToAdd);
+ inputImage->TransformContinuousIndexToPhysicalPoint(pathIterator.Value(), tmpIndex);
+ inputImage->TransformPhysicalPointToIndex(tmpIndex, indexToAdd);
if (pathIterator != vertexList->Begin())
- {
+ {
--pathIterator;
- }
+ }
if (index[dir1] != indexToAdd[dir1])
- {
+ {
itkExceptionMacro(<< "Error : " << index[dir1] << " , " << indexToAdd[dir1]);
+ }
}
- }
- if ( (flag==true)
+ if ((flag == true)
|| ((index[dir0] != indexToAdd[dir0])
&& (index[dir0] < static_cast<IndexValueType>(inputSize[dir0]))))
- {
+ {
outputIterator.Set(inputIterator.Get());
++inputIterator;
- }
+ }
else
- {
+ {
flag = true;
OutputImagePixelType newValue = itk::NumericTraits<OutputImagePixelType>::Zero;
- int n = 0;
- InputIteratorType tmpIterator = inputIterator;
+ int n = 0;
+ InputIteratorType tmpIterator = inputIterator;
--tmpIterator;
if (!tmpIterator.IsAtReverseEndOfLine())
- {
+ {
newValue = tmpIterator.Get();
++n;
- }
+ }
tmpIterator = inputIterator;
++tmpIterator;
if (!tmpIterator.IsAtEndOfLine())
- {
+ {
newValue += tmpIterator.Get();
++n;
- }
+ }
assert(n != 0);
newValue /= n;
outputIterator.Set(newValue);
- }
+ }
++outputIterator;
- }
+ }
- if ((outputIterator.GetIndex())[dir0] != (inputIterator.GetIndex())[dir0]+1)
- {
- itkExceptionMacro(<< "Error 2: "<< (outputIterator.GetIndex())[dir0] << " , "
- << (inputIterator.GetIndex())[dir0]);
- }
+ if ((outputIterator.GetIndex())[dir0] != (inputIterator.GetIndex())[dir0] + 1)
+ {
+ itkExceptionMacro(<< "Error 2: " << (outputIterator.GetIndex())[dir0] << " , "
+ << (inputIterator.GetIndex())[dir0]);
+ }
inputIterator.NextLine();
outputIterator.NextLine();
- }
+ }
inputIterator.NextSlice();
outputIterator.NextSlice();
- }
-
+ }
}
-
/**
* Printself Method
*/
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
void
-AddCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
+AddCarvingPathFilter<TInputImage, TInputPath, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
os << indent << "Path Value: " << m_Value << std::endl;
}
-
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
void
-AddCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
+AddCarvingPathFilter<TInputImage, TInputPath, TOutputImage>
::GenerateOutputInformation()
{
// call the superclass' implementation of this method
@@ -208,70 +204,69 @@ AddCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
// get pointers to the input and output
typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
unsigned int dir0;
unsigned int dir1;
if (m_Direction == 0)
- {
- dir0=0;
- dir1=1;
- }
+ {
+ dir0 = 0;
+ dir1 = 1;
+ }
else
- {
- dir0=1;
- dir1=0;
- }
+ {
+ dir0 = 1;
+ dir1 = 0;
+ }
// we need to compute the output spacing, the output image size, and the
// output image start index
const typename TInputImage::SpacingType&
- inputSpacing = inputPtr->GetSpacing();
- const typename TInputImage::SizeType& inputSize
- = inputPtr->GetLargestPossibleRegion().GetSize();
- const typename TInputImage::IndexType& inputStartIndex
- = inputPtr->GetLargestPossibleRegion().GetIndex();
+ inputSpacing = inputPtr->GetSpacing();
+ const typename TInputImage::SizeType& inputSize
+ = inputPtr->GetLargestPossibleRegion().GetSize();
+ const typename TInputImage::IndexType& inputStartIndex
+ = inputPtr->GetLargestPossibleRegion().GetIndex();
- typename TOutputImage::SpacingType outputSpacing;
- typename TOutputImage::SizeType outputSize;
- typename TOutputImage::IndexType outputStartIndex;
+ typename TOutputImage::SpacingType outputSpacing;
+ typename TOutputImage::SizeType outputSize;
+ typename TOutputImage::IndexType outputStartIndex;
for (unsigned int i = 0; i < TOutputImage::ImageDimension; ++i)
- {
+ {
outputSpacing[i] = inputSpacing[i];
outputSize[i] = (unsigned int) (inputSize[i]);
outputStartIndex[i] = inputStartIndex[i];
- }
+ }
// we remove one column of the image
outputSize[dir0] = inputSize[dir0] + 1;
-
- outputPtr->SetSpacing( outputSpacing );
+ outputPtr->SetSpacing(outputSpacing);
typename TOutputImage::RegionType outputLargestPossibleRegion;
- outputLargestPossibleRegion.SetSize( outputSize );
- outputLargestPossibleRegion.SetIndex( outputStartIndex );
+ outputLargestPossibleRegion.SetSize(outputSize);
+ outputLargestPossibleRegion.SetIndex(outputStartIndex);
- outputPtr->SetLargestPossibleRegion( outputLargestPossibleRegion );
+ outputPtr->SetLargestPossibleRegion(outputLargestPossibleRegion);
}
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
void
-AddCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
+AddCarvingPathFilter<TInputImage, TInputPath, TOutputImage>
::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- InputImagePointer inputPtr =
- const_cast< InputImageType * >( this->GetInput() );
- if ( !inputPtr )
- {
- itkExceptionMacro( << "Input has not been set." );
- }
-
- inputPtr->SetRequestedRegion( inputPtr->GetLargestPossibleRegion() );
+ InputImagePointer inputPtr =
+ const_cast<InputImageType *>(this->GetInput());
+ if (!inputPtr)
+ {
+ itkExceptionMacro(<< "Input has not been set.");
+ }
+
+ inputPtr->SetRequestedRegion(inputPtr->GetLargestPossibleRegion());
}
diff --git a/Code/FeatureExtraction/otbAngularSecondMomentumTextureFunctor.h b/Code/FeatureExtraction/otbAngularSecondMomentumTextureFunctor.h
index b909e79884..25429c31e0 100644
--- a/Code/FeatureExtraction/otbAngularSecondMomentumTextureFunctor.h
+++ b/Code/FeatureExtraction/otbAngularSecondMomentumTextureFunctor.h
@@ -39,33 +39,32 @@ namespace Functor
*/
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT AngularSecondMomentumTextureFunctor :
-public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
+ public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
AngularSecondMomentumTextureFunctor(){};
- virtual ~AngularSecondMomentumTextureFunctor(){};
+ virtual ~AngularSecondMomentumTextureFunctor(){}
typedef TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
- typedef typename Superclass::NeighborhoodType NeighborhoodType;
+ typedef typename Superclass::NeighborhoodType NeighborhoodType;
-
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
this->ComputeJointHistogram(neigh, neighOff);
double out = 0.;
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
+ {
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
{
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- double p = static_cast<double>(this->GetHisto()[r][s]) * areaInv;
- out += vcl_pow( p, 2 );
- }
+ double p = static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ out += vcl_pow(p, 2);
}
- return out;
+ }
+ return out;
}
};
@@ -74,4 +73,3 @@ public:
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbAssociativeSymmetricalSumImageFilter.h b/Code/FeatureExtraction/otbAssociativeSymmetricalSumImageFilter.h
index 83841921ac..b82e509616 100644
--- a/Code/FeatureExtraction/otbAssociativeSymmetricalSumImageFilter.h
+++ b/Code/FeatureExtraction/otbAssociativeSymmetricalSumImageFilter.h
@@ -36,52 +36,51 @@ namespace otb
*
*/
-
namespace Functor
{
/** \class AssociativeSymmetricalSum
* \brief Functor used with the AssociativeSymmetricalSumImageFilter.
*/
-template< class TInput1, class TInput2, class TOutput>
+template<class TInput1, class TInput2, class TOutput>
class ITK_EXPORT AssociativeSymmetricalSum
{
public:
AssociativeSymmetricalSum() {};
- virtual ~AssociativeSymmetricalSum() {};
+ virtual ~AssociativeSymmetricalSum() {}
- inline TOutput operator()( const TInput1 X,
+ inline TOutput operator ()(const TInput1 X,
const TInput2 Y)
{
TOutput SumXY = 0.;
- SumXY += static_cast<TOutput>((X*Y)/(1.-X-Y+(2*X*Y)));
+ SumXY += static_cast<TOutput>((X * Y) / (1. - X - Y + (2 * X * Y)));
- return ( SumXY );
+ return (SumXY);
}
};
}
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT AssociativeSymmetricalSumImageFilter :
- public
- itk::BinaryFunctorImageFilter<TInputImage1,TInputImage2,TOutputImage,
- Functor::AssociativeSymmetricalSum<
- typename TInputImage1::PixelType,
- typename TInputImage2::PixelType,
- typename TOutputImage::PixelType> >
+ public
+ itk::BinaryFunctorImageFilter<TInputImage1, TInputImage2, TOutputImage,
+ Functor::AssociativeSymmetricalSum<
+ typename TInputImage1::PixelType,
+ typename TInputImage2::PixelType,
+ typename TOutputImage::PixelType> >
{
public:
/** Standard class typedefs. */
- typedef AssociativeSymmetricalSumImageFilter Self;
- typedef itk::BinaryFunctorImageFilter<TInputImage1,TInputImage2,TOutputImage,
- Functor::AssociativeSymmetricalSum<
- typename TInputImage1::PixelType,
- typename TInputImage1::PixelType,
- typename TOutputImage::PixelType>
- > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef AssociativeSymmetricalSumImageFilter Self;
+ typedef itk::BinaryFunctorImageFilter<TInputImage1, TInputImage2, TOutputImage,
+ Functor::AssociativeSymmetricalSum<
+ typename TInputImage1::PixelType,
+ typename TInputImage1::PixelType,
+ typename TOutputImage::PixelType>
+ > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -91,12 +90,11 @@ protected:
virtual ~AssociativeSymmetricalSumImageFilter() {}
private:
- AssociativeSymmetricalSumImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ AssociativeSymmetricalSumImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.h b/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.h
index 0863e581cf..61003b27fe 100644
--- a/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.h
+++ b/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.h
@@ -25,7 +25,6 @@
#include "otbLineCorrelationDetectorImageFilter.h"
#include "otbAssociativeSymmetricalSumImageFilter.h"
-
namespace otb
{
@@ -39,64 +38,65 @@ namespace otb
*/
template <class TInputImage,
-class TOutputImage,
-class TOutputImageDirection = TOutputImage,
-class TInterpolator = itk::LinearInterpolateImageFunction<TInputImage> >
+ class TOutputImage,
+ class TOutputImageDirection = TOutputImage,
+ class TInterpolator = itk::LinearInterpolateImageFunction<TInputImage> >
class ITK_EXPORT AssymmetricFusionOfLineDetectorImageFilter :
- public LineDetectorImageFilterBase< TInputImage, TOutputImage, TOutputImageDirection, TInterpolator >
+ public LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, TInterpolator>
{
public:
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,
- unsigned int,
- TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension,
+ unsigned int,
+ TOutputImage::ImageDimension);
- typedef AssymmetricFusionOfLineDetectorImageFilter Self;
- typedef LineDetectorImageFilterBase< TInputImage, TOutputImage, TOutputImageDirection, TInterpolator > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef AssymmetricFusionOfLineDetectorImageFilter Self;
+ typedef LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, TInterpolator> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
itkNewMacro(Self);
itkTypeMacro(AssymmetricFusionOfLineDetectorImageFilter, LineDetectorImageFilterBase);
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::OutputImageDirectionType OutputImageDirectionType;
- typedef typename Superclass::InterpolatorType InterpolatorType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::OutputImageDirectionType OutputImageDirectionType;
+ typedef typename Superclass::InterpolatorType InterpolatorType;
typedef OutputImageType InputImageType1;
typedef OutputImageType InputImageType2;
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::SizeType SizeType;
typedef typename OutputImageType::PixelType OutputPixelType;
-
protected:
AssymmetricFusionOfLineDetectorImageFilter();
- virtual ~AssymmetricFusionOfLineDetectorImageFilter() {};
+ virtual ~AssymmetricFusionOfLineDetectorImageFilter() {}
- typedef otb::LineRatioDetectorImageFilter< InputImageType, OutputImageType, OutputImageDirectionType, InterpolatorType > LineRatioType;
- typedef otb::LineCorrelationDetectorImageFilter< InputImageType, OutputImageType, OutputImageDirectionType, InterpolatorType > LineCorrelationType;
- typedef otb::AssociativeSymmetricalSumImageFilter< InputImageType1, InputImageType2, OutputImageType > AssSymSumType;
+ typedef otb::LineRatioDetectorImageFilter<InputImageType, OutputImageType, OutputImageDirectionType,
+ InterpolatorType> LineRatioType;
+ typedef otb::LineCorrelationDetectorImageFilter<InputImageType, OutputImageType, OutputImageDirectionType,
+ InterpolatorType> LineCorrelationType;
+ typedef otb::AssociativeSymmetricalSumImageFilter<InputImageType1, InputImageType2,
+ OutputImageType> AssSymSumType;
virtual void GenerateData();
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- AssymmetricFusionOfLineDetectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ AssymmetricFusionOfLineDetectorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
-
- typename LineRatioType::Pointer m_LineRatio;
- typename LineCorrelationType::Pointer m_LineCorrelation;
- typename AssSymSumType::Pointer m_AssSymSum;
+ typename LineRatioType::Pointer m_LineRatio;
+ typename LineCorrelationType::Pointer m_LineCorrelation;
+ typename AssSymSumType::Pointer m_AssSymSum;
};
} // end namespace otb
@@ -104,5 +104,4 @@ private:
#include "otbAssymmetricFusionOfLineDetectorImageFilter.txx"
#endif
-
#endif
diff --git a/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.txx b/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.txx
index c686c18ff7..2715e4204e 100644
--- a/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.txx
@@ -20,7 +20,6 @@
#include "otbAssymmetricFusionOfLineDetectorImageFilter.h"
-
namespace otb
{
@@ -45,23 +44,22 @@ void
AssymmetricFusionOfLineDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection, TInterpolator>
::GenerateData()
{
- m_LineRatio->SetInput( this->GetInput() );
- m_LineRatio->SetLengthLine( this->m_LengthLine );
- m_LineRatio->SetWidthLine( this->m_WidthLine );
+ m_LineRatio->SetInput(this->GetInput());
+ m_LineRatio->SetLengthLine(this->m_LengthLine);
+ m_LineRatio->SetWidthLine(this->m_WidthLine);
- m_LineCorrelation->SetInput( this->GetInput() );
- m_LineCorrelation->SetLengthLine( this->m_LengthLine );
- m_LineCorrelation->SetWidthLine( this->m_WidthLine );
+ m_LineCorrelation->SetInput(this->GetInput());
+ m_LineCorrelation->SetLengthLine(this->m_LengthLine);
+ m_LineCorrelation->SetWidthLine(this->m_WidthLine);
- m_AssSymSum->SetInput1( m_LineRatio->GetOutput() );
- m_AssSymSum->SetInput2( m_LineCorrelation->GetOutput() );
+ m_AssSymSum->SetInput1(m_LineRatio->GetOutput());
+ m_AssSymSum->SetInput2(m_LineCorrelation->GetOutput());
- m_AssSymSum->GraftOutput(this->GetOutput() );
+ m_AssSymSum->GraftOutput(this->GetOutput());
m_AssSymSum->Update();
- this->GraftOutput(m_AssSymSum->GetOutput() );
+ this->GraftOutput(m_AssSymSum->GetOutput());
}
-
/**
* Standard "PrintSelf" method
*/
@@ -70,11 +68,9 @@ void
AssymmetricFusionOfLineDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection, TInterpolator>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
-
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbBreakAngularPathListFilter.h b/Code/FeatureExtraction/otbBreakAngularPathListFilter.h
index ffcfdf0f2e..7af4fc2176 100644
--- a/Code/FeatureExtraction/otbBreakAngularPathListFilter.h
+++ b/Code/FeatureExtraction/otbBreakAngularPathListFilter.h
@@ -31,14 +31,14 @@ namespace otb
*/
template <class TPath>
class ITK_EXPORT BreakAngularPathListFilter
- : public PathListToPathListFilter<TPath>
+ : public PathListToPathListFilter<TPath>
{
public:
/** Standard typedefs */
- typedef BreakAngularPathListFilter Self;
- typedef PathListToPathListFilter<TPath> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef BreakAngularPathListFilter Self;
+ typedef PathListToPathListFilter<TPath> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -47,39 +47,41 @@ public:
itkTypeMacro(BreakAngularPathListFilter, PathListToPathListFilter);
/** Template parameters typedefs */
- typedef typename Superclass::PathType PathType;
- typedef typename Superclass::PathListType PathListType;
- typedef typename Superclass::PathPointerType PathPointerType;
- typedef typename PathListType::Pointer PathListPointerType;
+ typedef typename Superclass::PathType PathType;
+ typedef typename Superclass::PathListType PathListType;
+ typedef typename Superclass::PathPointerType PathPointerType;
+ typedef typename PathListType::Pointer PathListPointerType;
typedef double MaxAngleType;
/** Set/Get the max angle */
- itkSetMacro(MaxAngle,MaxAngleType);
- itkGetConstMacro(MaxAngle,MaxAngleType);
+ itkSetMacro(MaxAngle, MaxAngleType);
+ itkGetConstMacro(MaxAngle, MaxAngleType);
protected:
/** Constructor */
BreakAngularPathListFilter();
/** Destructor */
- virtual ~BreakAngularPathListFilter() {};
+ virtual ~BreakAngularPathListFilter() {}
/** GenerateData method */
virtual void GenerateData();
/** PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- BreakAngularPathListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ BreakAngularPathListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Calculate break angular for a path */
- void BreakAngularPath(const MaxAngleType maxAngle, const PathPointerType inputPath, PathListPointerType outputPathList );
+ void BreakAngularPath(const MaxAngleType maxAngle,
+ const PathPointerType inputPath,
+ PathListPointerType outputPathList);
/** Max angle value */
MaxAngleType m_MaxAngle;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbBreakAngularPathListFilter.txx"
#endif
diff --git a/Code/FeatureExtraction/otbBreakAngularPathListFilter.txx b/Code/FeatureExtraction/otbBreakAngularPathListFilter.txx
index f289cebca3..af9e2988eb 100644
--- a/Code/FeatureExtraction/otbBreakAngularPathListFilter.txx
+++ b/Code/FeatureExtraction/otbBreakAngularPathListFilter.txx
@@ -32,7 +32,6 @@ BreakAngularPathListFilter<TPath>
{
}
-
template <class TPath>
void
BreakAngularPathListFilter<TPath>
@@ -49,26 +48,26 @@ BreakAngularPathListFilter<TPath>
double alpha1(0.), alpha2(0.);
- while ( pathIt != vertexList->End() )
- {
+ while (pathIt != vertexList->End())
+ {
// Add Pixel 1
newPath->AddVertex(pathIt.Value());
- pixel1=pathIt.Value();
+ pixel1 = pathIt.Value();
++pathIt;
if (pathIt != vertexList->End())
- {
- pixel2=pathIt.Value();
+ {
+ pixel2 = pathIt.Value();
++pathIt;
if (pathIt != vertexList->End())
- {
- pixel3=pathIt.Value();
-
- alpha1 = vcl_atan2((pixel1[1]-pixel2[1]),(pixel1[0]-pixel2[0]));
- alpha2 = vcl_atan2((pixel2[1]-pixel3[1]),(pixel2[0]-pixel3[0]));
- alpha1 = (alpha1 >= 0)?alpha1:(alpha1+CONST_2PI);
- alpha2 = (alpha2 >= 0)?alpha2:(alpha2+CONST_2PI);
- if (vcl_abs(alpha1-alpha2) > static_cast<double>(maxAngle) )
{
+ pixel3 = pathIt.Value();
+
+ alpha1 = vcl_atan2((pixel1[1] - pixel2[1]), (pixel1[0] - pixel2[0]));
+ alpha2 = vcl_atan2((pixel2[1] - pixel3[1]), (pixel2[0] - pixel3[0]));
+ alpha1 = (alpha1 >= 0) ? alpha1 : (alpha1 + CONST_2PI);
+ alpha2 = (alpha2 >= 0) ? alpha2 : (alpha2 + CONST_2PI);
+ if (vcl_abs(alpha1 - alpha2) > static_cast<double>(maxAngle))
+ {
// Add Pixel 2
newPath->AddVertex(pixel2);
//Create new PathType in the out path list
@@ -76,38 +75,37 @@ BreakAngularPathListFilter<TPath>
// Reinit
newPath = PathType::New();
- }
+ }
--pathIt; // Return previous pixel
- }
+ }
else
- {
+ {
// Add last Pixel (Pixel 2)
newPath->AddVertex(pixel2);
+ }
}
}
- }
//Create new PathType in the out list
outputPathList->PushBack(newPath);
}
-
template <class TPath>
void
BreakAngularPathListFilter<TPath>
::GenerateData()
{
- const PathListType * inputPathList = this->GetInput();
- PathListType * outputPathList = this->GetOutput();
+ const PathListType * inputPathList = this->GetInput();
+ PathListType * outputPathList = this->GetOutput();
typename PathListType::ConstIterator listIt = inputPathList->Begin();
outputPathList->Clear();
PathListPointerType newTempPathList = PathListType::New();
- while ( listIt != inputPathList->End())
- {
- (void)BreakAngularPath(m_MaxAngle, listIt.Get(), outputPathList);
+ while (listIt != inputPathList->End())
+ {
+ (void) BreakAngularPath(m_MaxAngle, listIt.Get(), outputPathList);
++listIt;
- }
+ }
}
/**
@@ -119,7 +117,7 @@ BreakAngularPathListFilter<TPath>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
- os << indent << "Angular max value : "<<m_MaxAngle<<std::endl;
+ os << indent << "Angular max value : " << m_MaxAngle << std::endl;
}
} // End namespace otb
diff --git a/Code/FeatureExtraction/otbCloudDetectionFilter.h b/Code/FeatureExtraction/otbCloudDetectionFilter.h
index e346702613..e1748e8a21 100644
--- a/Code/FeatureExtraction/otbCloudDetectionFilter.h
+++ b/Code/FeatureExtraction/otbCloudDetectionFilter.h
@@ -27,35 +27,35 @@ namespace otb
* \brief Applies cloud detection functor to an image.
*/
template <class TInputImage, class TOutputImage, class TFunction = Functor::CloudDetectionFunctor<
-ITK_TYPENAME TInputImage::PixelType, ITK_TYPENAME TOutputImage::PixelType> >
-class ITK_EXPORT CloudDetectionFilter : public itk::UnaryFunctorImageFilter< TInputImage, TOutputImage, TFunction >
+ ITK_TYPENAME TInputImage::PixelType, ITK_TYPENAME TOutputImage::PixelType> >
+class ITK_EXPORT CloudDetectionFilter : public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction>
{
public:
/** Standard class typedefs. */
- typedef CloudDetectionFilter Self;
- typedef typename itk::UnaryFunctorImageFilter < TInputImage, TOutputImage, TFunction >
+ typedef CloudDetectionFilter Self;
+ typedef typename itk::UnaryFunctorImageFilter <TInputImage, TOutputImage, TFunction>
Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(CloudDetectionFilter,UnaryFunctorImageFilter);
+ itkTypeMacro(CloudDetectionFilter, UnaryFunctorImageFilter);
/** Some convenient typedefs. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointer;
- typedef typename InputImageType::PixelType InputPixelType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointer;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
/** Getters/Setters */
- void SetReferencePixel( InputPixelType ref );
- void SetVariance( double var );
+ void SetReferencePixel(InputPixelType ref);
+ void SetVariance(double var);
void SetMinThreshold(double threshold);
void SetMaxThreshold(double threshold);
InputPixelType GetReferencePixel();
@@ -66,16 +66,15 @@ public:
protected:
CloudDetectionFilter();
- virtual ~CloudDetectionFilter() {};
+ virtual ~CloudDetectionFilter() {}
virtual void BeforeThreadedGenerateData();
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- CloudDetectionFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ CloudDetectionFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -86,4 +85,3 @@ private:
#endif
#endif
-
diff --git a/Code/FeatureExtraction/otbCloudDetectionFilter.txx b/Code/FeatureExtraction/otbCloudDetectionFilter.txx
index cb73251842..a5ca3bc469 100644
--- a/Code/FeatureExtraction/otbCloudDetectionFilter.txx
+++ b/Code/FeatureExtraction/otbCloudDetectionFilter.txx
@@ -20,7 +20,6 @@
#include "otbCloudDetectionFilter.h"
-
namespace otb
{
@@ -28,7 +27,7 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage, class TFunction>
-CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
+CloudDetectionFilter<TInputImage, TOutputImage, TFunction>
::CloudDetectionFilter()
{
}
@@ -38,10 +37,10 @@ CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
void
-CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
+CloudDetectionFilter<TInputImage, TOutputImage, TFunction>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
}
/**
@@ -49,16 +48,17 @@ CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
void
-CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
+CloudDetectionFilter<TInputImage, TOutputImage, TFunction>
::BeforeThreadedGenerateData()
{
unsigned int ReferencePixelNumberOfBands = 0;
ReferencePixelNumberOfBands = this->GetReferencePixel().GetSize();
- if ( ReferencePixelNumberOfBands != this->GetInput()->GetNumberOfComponentsPerPixel() )
- {
- itkExceptionMacro("The number of bands of the reference pixel is different from the number of bands of the input image. ");
- }
+ if (ReferencePixelNumberOfBands != this->GetInput()->GetNumberOfComponentsPerPixel())
+ {
+ itkExceptionMacro(
+ "The number of bands of the reference pixel is different from the number of bands of the input image. ");
+ }
}
/**
@@ -66,10 +66,10 @@ CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
void
-CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
+CloudDetectionFilter<TInputImage, TOutputImage, TFunction>
::SetVariance(double var)
{
- this->GetFunctor().SetVariance( var );
+ this->GetFunctor().SetVariance(var);
}
/**
@@ -77,7 +77,7 @@ CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
double
-CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
+CloudDetectionFilter<TInputImage, TOutputImage, TFunction>
::GetVariance()
{
return this->GetFunctor().GetVariance();
@@ -88,18 +88,18 @@ CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
void
-CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
+CloudDetectionFilter<TInputImage, TOutputImage, TFunction>
::SetReferencePixel(InputPixelType ref)
{
- this->GetFunctor().SetReferencePixel( ref );
+ this->GetFunctor().SetReferencePixel(ref);
}
/**
* GetReferencePixel
*/
template <class TInputImage, class TOutputImage, class TFunction>
-typename CloudDetectionFilter<TInputImage,TOutputImage,TFunction>::InputPixelType
-CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
+typename CloudDetectionFilter<TInputImage, TOutputImage, TFunction>::InputPixelType
+CloudDetectionFilter<TInputImage, TOutputImage, TFunction>
::GetReferencePixel()
{
return this->GetFunctor().GetReferencePixel();
@@ -110,7 +110,7 @@ CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
void
-CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
+CloudDetectionFilter<TInputImage, TOutputImage, TFunction>
::SetMinThreshold(double threshold)
{
this->GetFunctor().SetMinThreshold(threshold);
@@ -121,7 +121,7 @@ CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
void
-CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
+CloudDetectionFilter<TInputImage, TOutputImage, TFunction>
::SetMaxThreshold(double threshold)
{
this->GetFunctor().SetMaxThreshold(threshold);
@@ -132,7 +132,7 @@ CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
double
-CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
+CloudDetectionFilter<TInputImage, TOutputImage, TFunction>
::GetMinThreshold()
{
return this->GetFunctor().GetMinThreshold();
@@ -143,7 +143,7 @@ CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
double
-CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
+CloudDetectionFilter<TInputImage, TOutputImage, TFunction>
::GetMaxThreshold()
{
return this->GetFunctor().GetMaxThreshold();
@@ -152,4 +152,3 @@ CloudDetectionFilter<TInputImage,TOutputImage,TFunction>
}
#endif
-
diff --git a/Code/FeatureExtraction/otbCloudDetectionFunctor.h b/Code/FeatureExtraction/otbCloudDetectionFunctor.h
index b2109b37fd..36a58fee2c 100644
--- a/Code/FeatureExtraction/otbCloudDetectionFunctor.h
+++ b/Code/FeatureExtraction/otbCloudDetectionFunctor.h
@@ -29,7 +29,7 @@ namespace otb
*/
namespace Functor
{
-template<class TInput,class TOutputValue>
+template<class TInput, class TOutputValue>
class CloudDetectionFunctor
{
public:
@@ -39,64 +39,62 @@ public:
{
m_MinThreshold = 0.0;
m_MaxThreshold = 1.0;
- };
+ }
- virtual ~CloudDetectionFunctor() {};
- inline TOutputValue operator()(const TInput& inPix)
+ virtual ~CloudDetectionFunctor() {}
+ inline TOutputValue operator ()(const TInput& inPix)
{
- if ( (m_CloudEstimatorFunctor(inPix)>m_MinThreshold) && (m_CloudEstimatorFunctor(inPix)<=m_MaxThreshold) )
- {
+ if ((m_CloudEstimatorFunctor(inPix) > m_MinThreshold) && (m_CloudEstimatorFunctor(inPix) <= m_MaxThreshold))
+ {
return 1;
- }
+ }
else
- {
+ {
return 0;
- }
+ }
}
- void SetReferencePixel( TInput ref )
+ void SetReferencePixel(TInput ref)
{
m_CloudEstimatorFunctor.SetReferencePixel(ref);
- };
+ }
void SetVariance(double variance)
{
m_CloudEstimatorFunctor.SetVariance(variance);
- };
+ }
void SetMinThreshold(double threshold)
{
m_MinThreshold = threshold;
- };
+ }
void SetMaxThreshold(double threshold)
{
m_MaxThreshold = threshold;
- };
+ }
double GetMinThreshold()
{
return m_MinThreshold;
- };
+ }
double GetMaxThreshold()
{
return m_MaxThreshold;
- };
+ }
double GetVariance()
{
return m_CloudEstimatorFunctor.GetVariance();
- };
+ }
TInput GetReferencePixel()
{
return m_CloudEstimatorFunctor.GetReferencePixel();
- };
-
+ }
protected:
CloudEstimatorFunctorType m_CloudEstimatorFunctor;
- double m_MinThreshold;
- double m_MaxThreshold;
+ double m_MinThreshold;
+ double m_MaxThreshold;
};
} // end namespace functor
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbCloudEstimatorFilter.h b/Code/FeatureExtraction/otbCloudEstimatorFilter.h
index a32ded658f..0c0b6507be 100644
--- a/Code/FeatureExtraction/otbCloudEstimatorFilter.h
+++ b/Code/FeatureExtraction/otbCloudEstimatorFilter.h
@@ -29,51 +29,50 @@ namespace otb
* \brief Applies a color reversal.
*/
template <class TInputImage, class TOutputImage, class TFunction = Functor::SpectralAngleFunctor<
-ITK_TYPENAME TInputImage::PixelType, ITK_TYPENAME TOutputImage::PixelType> >
-class ITK_EXPORT CloudEstimatorFilter : public itk::UnaryFunctorImageFilter< TInputImage, TOutputImage, TFunction >
+ ITK_TYPENAME TInputImage::PixelType, ITK_TYPENAME TOutputImage::PixelType> >
+class ITK_EXPORT CloudEstimatorFilter : public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction>
{
public:
/** Standard class typedefs. */
- typedef CloudEstimatorFilter Self;
- typedef typename itk::UnaryFunctorImageFilter < TInputImage, TOutputImage, TFunction >
+ typedef CloudEstimatorFilter Self;
+ typedef typename itk::UnaryFunctorImageFilter <TInputImage, TOutputImage, TFunction>
Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(CloudEstimatorFilter,UnaryFunctorImageFilter);
+ itkTypeMacro(CloudEstimatorFilter, UnaryFunctorImageFilter);
/** Some convenient typedefs. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointer;
- typedef typename InputImageType::PixelType InputPixelType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointer;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
/** Getters/Setters */
- void SetReferencePixel( InputPixelType ref );
+ void SetReferencePixel(InputPixelType ref);
InputPixelType GetReferencePixel();
- void SetVariance( double var );
+ void SetVariance(double var);
double GetVariance();
protected:
CloudEstimatorFilter();
- virtual ~CloudEstimatorFilter() {};
+ virtual ~CloudEstimatorFilter() {}
virtual void BeforeThreadedGenerateData();
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- CloudEstimatorFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ CloudEstimatorFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -84,4 +83,3 @@ private:
#endif
#endif
-
diff --git a/Code/FeatureExtraction/otbCloudEstimatorFilter.txx b/Code/FeatureExtraction/otbCloudEstimatorFilter.txx
index 6fe556602f..553f542e6b 100644
--- a/Code/FeatureExtraction/otbCloudEstimatorFilter.txx
+++ b/Code/FeatureExtraction/otbCloudEstimatorFilter.txx
@@ -20,7 +20,6 @@
#include "otbCloudEstimatorFilter.h"
-
namespace otb
{
@@ -28,7 +27,7 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage, class TFunction>
-CloudEstimatorFilter<TInputImage,TOutputImage,TFunction>
+CloudEstimatorFilter<TInputImage, TOutputImage, TFunction>
::CloudEstimatorFilter()
{
}
@@ -38,10 +37,10 @@ CloudEstimatorFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
void
-CloudEstimatorFilter<TInputImage,TOutputImage,TFunction>
+CloudEstimatorFilter<TInputImage, TOutputImage, TFunction>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
}
/**
@@ -49,16 +48,17 @@ CloudEstimatorFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
void
-CloudEstimatorFilter<TInputImage,TOutputImage,TFunction>
+CloudEstimatorFilter<TInputImage, TOutputImage, TFunction>
::BeforeThreadedGenerateData()
{
unsigned int ReferencePixelNumberOfBands = 0;
ReferencePixelNumberOfBands = this->GetReferencePixel().GetSize();
- if ( ReferencePixelNumberOfBands != this->GetInput()->GetNumberOfComponentsPerPixel() )
- {
- itkExceptionMacro("The number of bands of the reference pixel is different from the number of bands of the input image. ");
- }
+ if (ReferencePixelNumberOfBands != this->GetInput()->GetNumberOfComponentsPerPixel())
+ {
+ itkExceptionMacro(
+ "The number of bands of the reference pixel is different from the number of bands of the input image. ");
+ }
}
/**
@@ -66,10 +66,10 @@ CloudEstimatorFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
void
-CloudEstimatorFilter<TInputImage,TOutputImage,TFunction>
+CloudEstimatorFilter<TInputImage, TOutputImage, TFunction>
::SetVariance(double var)
{
- this->GetFunctor().SetVariance( var );
+ this->GetFunctor().SetVariance(var);
}
/**
@@ -77,7 +77,7 @@ CloudEstimatorFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
double
-CloudEstimatorFilter<TInputImage,TOutputImage,TFunction>
+CloudEstimatorFilter<TInputImage, TOutputImage, TFunction>
::GetVariance()
{
return this->GetFunctor().GetVariance();
@@ -88,18 +88,18 @@ CloudEstimatorFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
void
-CloudEstimatorFilter<TInputImage,TOutputImage,TFunction>
+CloudEstimatorFilter<TInputImage, TOutputImage, TFunction>
::SetReferencePixel(InputPixelType ref)
{
- this->GetFunctor().SetReferencePixel( ref );
+ this->GetFunctor().SetReferencePixel(ref);
}
/**
* GetReferencePixel
*/
template <class TInputImage, class TOutputImage, class TFunction>
-typename CloudEstimatorFilter<TInputImage,TOutputImage,TFunction>::InputPixelType
-CloudEstimatorFilter<TInputImage,TOutputImage,TFunction>
+typename CloudEstimatorFilter<TInputImage, TOutputImage, TFunction>::InputPixelType
+CloudEstimatorFilter<TInputImage, TOutputImage, TFunction>
::GetReferencePixel()
{
return this->GetFunctor().GetReferencePixel();
@@ -108,4 +108,3 @@ CloudEstimatorFilter<TInputImage,TOutputImage,TFunction>
}
#endif
-
diff --git a/Code/FeatureExtraction/otbCloudEstimatorFunctor.h b/Code/FeatureExtraction/otbCloudEstimatorFunctor.h
index ab714ed2fd..c29cbebba6 100644
--- a/Code/FeatureExtraction/otbCloudEstimatorFunctor.h
+++ b/Code/FeatureExtraction/otbCloudEstimatorFunctor.h
@@ -30,7 +30,7 @@ namespace otb
*/
namespace Functor
{
-template<class TInput,class TOutputValue>
+template<class TInput, class TOutputValue>
class CloudEstimatorFunctor
{
public:
@@ -43,45 +43,45 @@ public:
m_RefNorm = 2.0;
m_Variance = 1.0;
m_Denom = 1.0;
- };
+ }
- virtual ~CloudEstimatorFunctor() {};
- inline TOutputValue operator()(const TInput& inPix)
+ virtual ~CloudEstimatorFunctor() {}
+ inline TOutputValue operator ()(const TInput& inPix)
{
TOutputValue lOut;
- double lRes = 0.0;
- double lCurPixNorm = 0.0;
- double lGaussianCoef = 1.0;
+ double lRes = 0.0;
+ double lCurPixNorm = 0.0;
+ double lGaussianCoef = 1.0;
// Compute the Gaussian Coef
- for (unsigned int i=0; i<std::min(inPix.Size(),m_ReferencePixel.Size()); ++i)
- {
- lCurPixNorm += inPix[i]*inPix[i];
- }
+ for (unsigned int i = 0; i < std::min(inPix.Size(), m_ReferencePixel.Size()); ++i)
+ {
+ lCurPixNorm += inPix[i] * inPix[i];
+ }
lCurPixNorm = vcl_sqrt(static_cast<double>(lCurPixNorm));
- lGaussianCoef = vcl_exp(- vcl_pow((lCurPixNorm-m_RefNorm),2) / m_Denom );
+ lGaussianCoef = vcl_exp(-vcl_pow((lCurPixNorm - m_RefNorm), 2) / m_Denom);
// Reverse the SpectralAngle values and set them between [0;1]
- lRes = lGaussianCoef * ((CONST_PI-m_SpectralAngleFunctor(inPix)) / CONST_PI);
+ lRes = lGaussianCoef * ((CONST_PI - m_SpectralAngleFunctor(inPix)) / CONST_PI);
lOut = static_cast<TOutputValue>(lRes);
return lOut;
}
- void SetReferencePixel( TInput ref )
+ void SetReferencePixel(TInput ref)
{
m_ReferencePixel = ref;
m_SpectralAngleFunctor.SetReferencePixel(ref);
m_RefNorm = 0.0;
- for (unsigned int i = 0; i<ref.Size(); ++i)
- {
- m_RefNorm += ref[i]*ref[i];
- }
+ for (unsigned int i = 0; i < ref.Size(); ++i)
+ {
+ m_RefNorm += ref[i] * ref[i];
+ }
m_RefNorm = vcl_sqrt(static_cast<double>(m_RefNorm));
SetVariance(m_Variance);
- };
+ }
void SetVariance(double variance)
{
@@ -92,23 +92,22 @@ public:
TInput GetReferencePixel()
{
return m_ReferencePixel;
- };
+ }
double GetVariance()
{
return m_Variance;
- };
+ }
protected:
SpectralAngleFunctorType m_SpectralAngleFunctor;
- TInput m_ReferencePixel;
- double m_RefNorm;
- double m_Variance;
- double m_Denom;
+ TInput m_ReferencePixel;
+ double m_RefNorm;
+ double m_Variance;
+ double m_Denom;
};
} // end namespace functor
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbClusterProminenceTextureFunctor.h b/Code/FeatureExtraction/otbClusterProminenceTextureFunctor.h
index d106e9fb2a..314111e22c 100644
--- a/Code/FeatureExtraction/otbClusterProminenceTextureFunctor.h
+++ b/Code/FeatureExtraction/otbClusterProminenceTextureFunctor.h
@@ -42,32 +42,34 @@ namespace Functor
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT ClusterProminenceTextureFunctor :
-public MeanTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType>
+ public MeanTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
ClusterProminenceTextureFunctor(){};
- virtual ~ClusterProminenceTextureFunctor(){};
+ virtual ~ClusterProminenceTextureFunctor(){}
typedef MeanTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
- typedef typename Superclass::NeighborhoodType NeighborhoodType;
+ typedef typename Superclass::NeighborhoodType NeighborhoodType;
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
this->ComputeJointHistogram(neigh, neighOff);
double mean = Superclass::ComputeOverSingleChannel(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
double out = 0.;
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
{
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- double p = this->GetHisto()[r][s]*areaInv;
- double sumPixel = (static_cast<double>(s)+0.5)*this->GetNeighBinLength() + (static_cast<double>(r)+0.5)*this->GetOffsetBinLength();
- out += vcl_pow( sumPixel - 2*mean, 4) * p;
- }
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
+ {
+ double p = this->GetHisto()[r][s] * areaInv;
+ double sumPixel =
+ (static_cast<double>(s) +
+ 0.5) * this->GetNeighBinLength() + (static_cast<double>(r) + 0.5) * this->GetOffsetBinLength();
+ out += vcl_pow(sumPixel - 2 * mean, 4) * p;
+ }
}
return out;
@@ -75,9 +77,7 @@ public:
};
-
} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbClusterShadeTextureFunctor.h b/Code/FeatureExtraction/otbClusterShadeTextureFunctor.h
index 22b535e568..3029ae3fe5 100644
--- a/Code/FeatureExtraction/otbClusterShadeTextureFunctor.h
+++ b/Code/FeatureExtraction/otbClusterShadeTextureFunctor.h
@@ -42,32 +42,33 @@ namespace Functor
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT ClusterShadeTextureFunctor :
-public MeanTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType>
+ public MeanTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
ClusterShadeTextureFunctor(){};
- virtual ~ClusterShadeTextureFunctor(){};
+ virtual ~ClusterShadeTextureFunctor(){}
typedef MeanTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
typedef typename Superclass::NeighborhoodType NeighborhoodType;
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
this->ComputeJointHistogram(neigh, neighOff);
double mean = Superclass::ComputeOverSingleChannel(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
double out = 0.;
-
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
{
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- double p = this->GetHisto()[r][s]*areaInv;
- double sumPixel = (static_cast<double>(s)+0.5)*this->GetNeighBinLength() + (static_cast<double>(r)+0.5)*this->GetOffsetBinLength();
- out += vcl_pow( sumPixel - 2*mean, 3) * p;
- }
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
+ {
+ double p = this->GetHisto()[r][s] * areaInv;
+ double sumPixel =
+ (static_cast<double>(s) +
+ 0.5) * this->GetNeighBinLength() + (static_cast<double>(r) + 0.5) * this->GetOffsetBinLength();
+ out += vcl_pow(sumPixel - 2 * mean, 3) * p;
+ }
}
return out;
@@ -75,7 +76,6 @@ public:
};
-
} // namespace Functor
} // namespace otb
diff --git a/Code/FeatureExtraction/otbCompacityPathFunction.h b/Code/FeatureExtraction/otbCompacityPathFunction.h
index 620adabab6..09ebfb1351 100644
--- a/Code/FeatureExtraction/otbCompacityPathFunction.h
+++ b/Code/FeatureExtraction/otbCompacityPathFunction.h
@@ -36,17 +36,17 @@ namespace otb
* \ingroup PathFunctions
*/
-template < class TInputPath,
-class TOutput = double>
+template <class TInputPath,
+ class TOutput = double>
class ITK_EXPORT CompacityPathFunction :
- public PathFunction< TInputPath, TOutput >
+ public PathFunction<TInputPath, TOutput>
{
public:
/** Standard class typedefs. */
- typedef CompacityPathFunction Self;
- typedef PathFunction<TInputPath, TOutput> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef CompacityPathFunction Self;
+ typedef PathFunction<TInputPath, TOutput> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(CompacityPathFunction, PathFunction);
@@ -55,28 +55,27 @@ public:
itkNewMacro(Self);
/** InputPathType typedef support. */
- typedef typename Superclass::InputPathType PathType;
- typedef typename Superclass::InputPathConstPointer PathConstPointer;
- typedef typename PathType::ContinuousIndexType VertexType;
- typedef itk::VectorContainer< unsigned,VertexType > VertexListType;
- typedef typename VertexListType::ConstPointer VertexListPointer;
- typedef TOutput OutputType;
-
- typedef double RealType;
+ typedef typename Superclass::InputPathType PathType;
+ typedef typename Superclass::InputPathConstPointer PathConstPointer;
+ typedef typename PathType::ContinuousIndexType VertexType;
+ typedef itk::VectorContainer<unsigned, VertexType> VertexListType;
+ typedef typename VertexListType::ConstPointer VertexListPointer;
+ typedef TOutput OutputType;
+ typedef double RealType;
/** Evaluate the function at non-integer positions */
- virtual OutputType Evaluate( const PathType& path) const;
- virtual OutputType Evaluate( ) const;
+ virtual OutputType Evaluate(const PathType& path) const;
+ virtual OutputType Evaluate() const;
protected:
CompacityPathFunction() {};
- virtual ~CompacityPathFunction() {};
+ virtual ~CompacityPathFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- CompacityPathFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ CompacityPathFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/FeatureExtraction/otbCompacityPathFunction.txx b/Code/FeatureExtraction/otbCompacityPathFunction.txx
index f9f12f896f..75361bf53b 100644
--- a/Code/FeatureExtraction/otbCompacityPathFunction.txx
+++ b/Code/FeatureExtraction/otbCompacityPathFunction.txx
@@ -26,97 +26,95 @@
namespace otb
{
-template < class TInputPath, class TOutput>
+template <class TInputPath, class TOutput>
void
-CompacityPathFunction< TInputPath, TOutput >
+CompacityPathFunction<TInputPath, TOutput>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
}
-
-template < class TInputPath, class TOutput>
+template <class TInputPath, class TOutput>
typename CompacityPathFunction<TInputPath,
-TOutput>::OutputType
-CompacityPathFunction<TInputPath,TOutput>
+ TOutput>::OutputType
+CompacityPathFunction<TInputPath, TOutput>
::Evaluate(const PathType& path) const
{
- typedef double RealType;
+ typedef double RealType;
- VertexListPointer vertexList;
- VertexType cindex;
- VertexType IndexOut;
- int nbPath;
- RealType Surface=0.0;
- RealType Perimeter=0.0;
- RealType Compacity;
- RealType x1,x2,y1,y2;
+ VertexListPointer vertexList;
+ VertexType cindex;
+ VertexType IndexOut;
+ int nbPath;
+ RealType Surface = 0.0;
+ RealType Perimeter = 0.0;
+ RealType Compacity;
+ RealType x1, x2, y1, y2;
vertexList = path.GetVertexList();
nbPath = vertexList->Size();
- if (nbPath >2)
- {
- for (int i =0; i<nbPath;++i)
+ if (nbPath > 2)
{
+ for (int i = 0; i < nbPath; ++i)
+ {
cindex = vertexList->GetElement(i);
x1 = cindex[0];
y1 = cindex[1];
- if ( i == (nbPath-1) )
- {
+ if (i == (nbPath - 1))
+ {
cindex = vertexList->GetElement(0);
- }
+ }
else
- {
- cindex = vertexList->GetElement(i+1);
- }
+ {
+ cindex = vertexList->GetElement(i + 1);
+ }
x2 = cindex[0];
y2 = cindex[1];
RealType Norm;
- Norm = vcl_sqrt((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1) );
+ Norm = vcl_sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1));
Perimeter += Norm;
- RealType P = x2 * (y2-y1);
- RealType Q = y2 * (x2-x1);
+ RealType P = x2 * (y2 - y1);
+ RealType Q = y2 * (x2 - x1);
- Surface += ( P - Q );
- } // FOR loop
- } // IF loop
+ Surface += (P - Q);
+ } // FOR loop
+ } // IF loop
else
- {
- itkExceptionMacro(<<"CompacityPathFunction::Evaluate() FAILED -- path must contains at least 3 points");
- }
+ {
+ itkExceptionMacro(<< "CompacityPathFunction::Evaluate() FAILED -- path must contains at least 3 points");
+ }
Surface /= 2.0;
Compacity = Surface / (Perimeter * Perimeter);
- Compacity *= ( 4.* acos(-1.0) );
+ Compacity *= (4. * acos(-1.0));
- return (static_cast<OutputType>(Compacity) );
+ return (static_cast<OutputType>(Compacity));
}
-template < class TInputPath, class TOutput>
+template <class TInputPath, class TOutput>
typename CompacityPathFunction<TInputPath,
-TOutput>::OutputType
-CompacityPathFunction<TInputPath,TOutput>
+ TOutput>::OutputType
+CompacityPathFunction<TInputPath, TOutput>
::Evaluate() const
{
- if ( !this->GetInputPath() )
- {
- otbMsgDevMacro( << "Problem with GetInputPath" );
- return static_cast<OutputType>(itk::NumericTraits<OutputType>::max() );
- }
+ if (!this->GetInputPath())
+ {
+ otbMsgDevMacro(<< "Problem with GetInputPath");
+ return static_cast<OutputType>(itk::NumericTraits<OutputType>::max());
+ }
- OutputType Result = Evaluate( *(this->GetInputPath()) );
+ OutputType Result = Evaluate(*(this->GetInputPath()));
return Result;
}
-
} // namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbComplexMomentImageFunction.h b/Code/FeatureExtraction/otbComplexMomentImageFunction.h
index 769eecb730..76d3a848a7 100644
--- a/Code/FeatureExtraction/otbComplexMomentImageFunction.h
+++ b/Code/FeatureExtraction/otbComplexMomentImageFunction.h
@@ -45,19 +45,19 @@ namespace otb
*
* \ingroup ImageFunctions
*/
-template < class TInput,
-class TOutput = std::complex<double>,
-class TPrecision = double,
-class TCoordRep = float >
+template <class TInput,
+ class TOutput = std::complex<double>,
+ class TPrecision = double,
+ class TCoordRep = float>
class ITK_EXPORT ComplexMomentImageFunction :
- public GeometricMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep>
+ public GeometricMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef ComplexMomentImageFunction Self;
- typedef GeometricMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ComplexMomentImageFunction Self;
+ typedef GeometricMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(ComplexMomentImageFunction, GeometricMomentImageFunction);
@@ -66,35 +66,35 @@ public:
itkNewMacro(Self);
/** InputImageType typedef support. */
- typedef typename Superclass::InputType InputType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::PointType PointType;
+ typedef typename Superclass::InputType InputType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
+ typedef typename Superclass::PointType PointType;
- typedef typename Superclass::OutputType ComplexType;
+ typedef typename Superclass::OutputType ComplexType;
/** Type for calculation precision */
- typedef typename Superclass::PrecisionType PrecisionType;
+ typedef typename Superclass::PrecisionType PrecisionType;
/** ComplexType for calculation precision */
- typedef std::complex<PrecisionType> ComplexPrecisionType;
+ typedef std::complex<PrecisionType> ComplexPrecisionType;
/** Evalulate the function at specified index */
- virtual ComplexType EvaluateAtIndex( const IndexType& index ) const;
+ virtual ComplexType EvaluateAtIndex(const IndexType& index) const;
/** Evaluate the function at non-integer positions */
- virtual ComplexType Evaluate( const PointType& point ) const
+ virtual ComplexType Evaluate(const PointType& point) const
{
IndexType index;
- this->ConvertPointToNearestIndex( point, index );
- return this->EvaluateAtIndex( index );
+ this->ConvertPointToNearestIndex(point, index);
+ return this->EvaluateAtIndex(index);
}
virtual ComplexType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex ) const
+ const ContinuousIndexType& cindex) const
{
IndexType index;
- this->ConvertContinuousIndexToNearestIndex( cindex, index );
- return this->EvaluateAtIndex( index );
+ this->ConvertContinuousIndexToNearestIndex(cindex, index);
+ return this->EvaluateAtIndex(index);
}
itkSetMacro(P, unsigned int);
@@ -102,15 +102,14 @@ public:
itkSetMacro(Q, unsigned int);
itkGetConstReferenceMacro(Q, unsigned int);
-
protected:
ComplexMomentImageFunction();
- virtual ~ComplexMomentImageFunction() {};
+ virtual ~ComplexMomentImageFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ComplexMomentImageFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ ComplexMomentImageFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
unsigned int m_P;
unsigned int m_Q;
@@ -124,4 +123,3 @@ private:
#endif
#endif
-
diff --git a/Code/FeatureExtraction/otbComplexMomentImageFunction.txx b/Code/FeatureExtraction/otbComplexMomentImageFunction.txx
index 1faa4630d3..35dc695b3b 100644
--- a/Code/FeatureExtraction/otbComplexMomentImageFunction.txx
+++ b/Code/FeatureExtraction/otbComplexMomentImageFunction.txx
@@ -31,8 +31,8 @@ namespace otb
/**
* Constructor
*/
-template < class TInput, class TOutput, class TPrecision, class TCoordRep>
-ComplexMomentImageFunction<TInput,TOutput,TPrecision,TCoordRep>
+template <class TInput, class TOutput, class TPrecision, class TCoordRep>
+ComplexMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep>
::ComplexMomentImageFunction()
{
m_P = 0;
@@ -42,39 +42,38 @@ ComplexMomentImageFunction<TInput,TOutput,TPrecision,TCoordRep>
/**
*
*/
-template < class TInput, class TOutput, class TPrecision, class TCoordRep>
+template <class TInput, class TOutput, class TPrecision, class TCoordRep>
void
-ComplexMomentImageFunction<TInput,TOutput,TPrecision,TCoordRep>
+ComplexMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
os << indent << " p indice value : " << m_P << std::endl;
os << indent << " q indice value : " << m_Q << std::endl;
}
-
-template < class TInput, class TOutput, class TPrecision, class TCoordRep>
-typename ComplexMomentImageFunction<TInput,TOutput,TPrecision,TCoordRep>::ComplexType
-ComplexMomentImageFunction<TInput,TOutput,TPrecision,TCoordRep>
+template <class TInput, class TOutput, class TPrecision, class TCoordRep>
+typename ComplexMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep>::ComplexType
+ComplexMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep>
::EvaluateAtIndex(const IndexType& index) const
{
- typename TInput::SizeType ImageSize;
- ComplexPrecisionType Sum;
- ComplexPrecisionType ValP;
- ComplexPrecisionType ValQ;
- PrecisionType Norm;
- IndexType IndexValue;
- IndexType indexPos = index;
- typename TInput::SizeType kernelSize;
-
- if ( !this->GetInputImage() )
- {
- otbMsgDevMacro( << "Pb with GetInputImage" );
- return ( ComplexType(itk::NumericTraits<PrecisionType>::Zero, itk::NumericTraits<PrecisionType>::Zero ) );
- }
-
- if (this->GetNeighborhoodRadius()<0)
- {
+ typename TInput::SizeType ImageSize;
+ ComplexPrecisionType Sum;
+ ComplexPrecisionType ValP;
+ ComplexPrecisionType ValQ;
+ PrecisionType Norm;
+ IndexType IndexValue;
+ IndexType indexPos = index;
+ typename TInput::SizeType kernelSize;
+
+ if (!this->GetInputImage())
+ {
+ otbMsgDevMacro(<< "Pb with GetInputImage");
+ return (ComplexType(itk::NumericTraits<PrecisionType>::Zero, itk::NumericTraits<PrecisionType>::Zero));
+ }
+
+ if (this->GetNeighborhoodRadius() < 0)
+ {
ImageSize = this->GetInputImage()->GetBufferedRegion().GetSize();
indexPos[0] = ImageSize[0] / 2;
@@ -82,50 +81,48 @@ ComplexMomentImageFunction<TInput,TOutput,TPrecision,TCoordRep>
kernelSize[0] = indexPos[0];
kernelSize[1] = indexPos[1];
- }
+ }
else
- {
- kernelSize.Fill( this->GetNeighborhoodRadius() );
- }
+ {
+ kernelSize.Fill(this->GetNeighborhoodRadius());
+ }
itk::ConstNeighborhoodIterator<TInput>
it(kernelSize, this->GetInputImage(), this->GetInputImage()->GetBufferedRegion());
-
// Set the iterator at the desired location
it.SetLocation(indexPos);
- Sum = ComplexPrecisionType(0.0,0.0);
+ Sum = ComplexPrecisionType(0.0, 0.0);
Norm = 0;
const unsigned int size = it.Size();
for (unsigned int i = 0; i < size; ++i)
- {
+ {
IndexValue = it.GetIndex(i);
- ValP = ComplexPrecisionType(1.0,0.0);
- ValQ = ComplexPrecisionType(1.0,0.0);
+ ValP = ComplexPrecisionType(1.0, 0.0);
+ ValQ = ComplexPrecisionType(1.0, 0.0);
unsigned int p = m_P;
- while (p>0)
- {
- ValP *= ComplexPrecisionType(IndexValue[0]-indexPos[0], IndexValue[1]-indexPos[1]);
+ while (p > 0)
+ {
+ ValP *= ComplexPrecisionType(IndexValue[0] - indexPos[0], IndexValue[1] - indexPos[1]);
--p;
- }
+ }
unsigned int q = m_Q;
- while (q>0)
- {
- ValQ *= ComplexPrecisionType(IndexValue[0]-indexPos[0], -IndexValue[1]-indexPos[1]);
+ while (q > 0)
+ {
+ ValQ *= ComplexPrecisionType(IndexValue[0] - indexPos[0], -IndexValue[1] - indexPos[1]);
--q;
- }
+ }
- Sum += ( ValP * ValQ * ComplexPrecisionType(static_cast<PrecisionType>(it.GetPixel(i)),0.0) );
- Norm+=it.GetPixel(i);
- }
+ Sum += (ValP * ValQ * ComplexPrecisionType(static_cast<PrecisionType>(it.GetPixel(i)), 0.0));
+ Norm += it.GetPixel(i);
+ }
- Norm = vcl_pow(Norm,((PrecisionType)m_P+(PrecisionType)m_Q)/2.);
+ Norm = vcl_pow(Norm, ((PrecisionType) m_P + (PrecisionType) m_Q) / 2.);
- return (static_cast<ComplexType>(Sum/Norm));
+ return (static_cast<ComplexType>(Sum / Norm));
}
-
} // namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbComplexMomentPathFunction.h b/Code/FeatureExtraction/otbComplexMomentPathFunction.h
index 1d53a6dd3d..b55e43669e 100644
--- a/Code/FeatureExtraction/otbComplexMomentPathFunction.h
+++ b/Code/FeatureExtraction/otbComplexMomentPathFunction.h
@@ -45,20 +45,20 @@ namespace otb
*
* \ingroup ImageFunctions
*/
-template < class TInputPath,
-class TOutput = std::complex<double>,
-class TPrecision = double>
+template <class TInputPath,
+ class TOutput = std::complex<double>,
+ class TPrecision = double>
class ITK_EXPORT ComplexMomentPathFunction :
- public GeometricMomentPathFunction< TInputPath,
- TOutput,
- TPrecision >
+ public GeometricMomentPathFunction<TInputPath,
+ TOutput,
+ TPrecision>
{
public:
/** Standard class typedefs. */
- typedef ComplexMomentPathFunction Self;
- typedef GeometricMomentPathFunction<TInputPath, TOutput, TPrecision> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ComplexMomentPathFunction Self;
+ typedef GeometricMomentPathFunction<TInputPath, TOutput, TPrecision> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(ComplexMomentPathFunction, GeometricMomentPathFunction);
@@ -66,26 +66,25 @@ public:
/** Method for creation through the object factory. */
itkNewMacro(Self);
-
/** InputPathType typedef support. */
- typedef typename Superclass::PathType PathType;
- typedef typename Superclass::PathConstPointer PathConstPointer;
- typedef typename PathType::ContinuousIndexType VertexType;
- typedef itk::VectorContainer< unsigned,VertexType > VertexListType;
- typedef typename VertexListType::ConstPointer VertexListPointer;
+ typedef typename Superclass::PathType PathType;
+ typedef typename Superclass::PathConstPointer PathConstPointer;
+ typedef typename PathType::ContinuousIndexType VertexType;
+ typedef itk::VectorContainer<unsigned, VertexType> VertexListType;
+ typedef typename VertexListType::ConstPointer VertexListPointer;
/** Complex Type */
- typedef typename Superclass::OutputType ComplexType;
+ typedef typename Superclass::OutputType ComplexType;
- typedef typename Superclass::OutputType OutputType;
+ typedef typename Superclass::OutputType OutputType;
- typedef double RealType;
+ typedef double RealType;
/** Type for calculation precision */
- typedef typename Superclass::PrecisionType PrecisionType;
+ typedef typename Superclass::PrecisionType PrecisionType;
/** ComplexType for calculation precision */
- typedef std::complex<PrecisionType> ComplexPrecisionType;
+ typedef std::complex<PrecisionType> ComplexPrecisionType;
/** Evalulate the function */
virtual OutputType Evaluate(const PathType& path) const;
@@ -98,16 +97,16 @@ public:
protected:
ComplexMomentPathFunction();
- virtual ~ComplexMomentPathFunction() {};
+ virtual ~ComplexMomentPathFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ComplexMomentPathFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ ComplexMomentPathFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
ComplexPrecisionType EvaluateComplexMomentAtIndex(VertexType index) const;
- unsigned int m_P;
- unsigned int m_Q;
+ unsigned int m_P;
+ unsigned int m_Q;
};
} // namespace otb
@@ -117,4 +116,3 @@ private:
#endif
#endif
-
diff --git a/Code/FeatureExtraction/otbComplexMomentPathFunction.txx b/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
index 096a38b077..2e0b6a5b0a 100644
--- a/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
+++ b/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
@@ -31,8 +31,8 @@ namespace otb
/**
* Constructor
*/
-template < class TInputPath, class TOutput, class TPrecision>
-ComplexMomentPathFunction<TInputPath,TOutput,TPrecision>
+template <class TInputPath, class TOutput, class TPrecision>
+ComplexMomentPathFunction<TInputPath, TOutput, TPrecision>
::ComplexMomentPathFunction()
{
m_P = 0;
@@ -42,143 +42,142 @@ ComplexMomentPathFunction<TInputPath,TOutput,TPrecision>
/**
*
*/
-template < class TInputPath, class TOutput, class TPrecision>
+template <class TInputPath, class TOutput, class TPrecision>
void
-ComplexMomentPathFunction<TInputPath,TOutput,TPrecision>
+ComplexMomentPathFunction<TInputPath, TOutput, TPrecision>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
os << indent << " p indice value : " << m_P << std::endl;
os << indent << " q indice value : " << m_Q << std::endl;
}
-
-template < class TInputPath, class TOutput, class TPrecision>
-typename ComplexMomentPathFunction<TInputPath,TOutput,TPrecision>::ComplexPrecisionType
-ComplexMomentPathFunction<TInputPath,TOutput,TPrecision>
+template <class TInputPath, class TOutput, class TPrecision>
+typename ComplexMomentPathFunction<TInputPath, TOutput, TPrecision>::ComplexPrecisionType
+ComplexMomentPathFunction<TInputPath, TOutput, TPrecision>
::EvaluateComplexMomentAtIndex(VertexType index) const
{
- ComplexPrecisionType ValP;
- ComplexPrecisionType ValQ;
- ComplexPrecisionType Result;
+ ComplexPrecisionType ValP;
+ ComplexPrecisionType ValQ;
+ ComplexPrecisionType Result;
PrecisionType PixelValue(1.0);
- ValP = ComplexPrecisionType(1.0,0.0);
- ValQ = ComplexPrecisionType(1.0,0.0);
+ ValP = ComplexPrecisionType(1.0, 0.0);
+ ValQ = ComplexPrecisionType(1.0, 0.0);
unsigned int p = m_P;
- while (p>0)
- {
+ while (p > 0)
+ {
ValP *= ComplexPrecisionType(index[0], index[1]);
--p;
- }
+ }
unsigned int q = m_Q;
- while (q>0)
- {
+ while (q > 0)
+ {
ValQ *= ComplexPrecisionType(index[0], -index[1]);
--q;
- }
+ }
- Result = ValP * ValQ * ComplexPrecisionType( static_cast<PrecisionType>(PixelValue), 0.0);
+ Result = ValP * ValQ * ComplexPrecisionType(static_cast<PrecisionType>(PixelValue), 0.0);
return Result;
}
-
-template < class TInputPath, class TOutput, class TPrecision>
+template <class TInputPath, class TOutput, class TPrecision>
typename ComplexMomentPathFunction<TInputPath,
-TOutput,TPrecision>::OutputType
-ComplexMomentPathFunction<TInputPath,TOutput,TPrecision>
+ TOutput, TPrecision>::OutputType
+ComplexMomentPathFunction<TInputPath, TOutput, TPrecision>
::Evaluate(const PathType& path) const
{
// Retrieve the vertex list
VertexListPointer vertexList = path.GetVertexList();
// Get the number of vertices in the path
unsigned int pathSize = vertexList->Size();
-
+
// value will store the result
ComplexPrecisionType value = static_cast<ComplexPrecisionType>(0.0);
-
+
// Check if we there are enough vertices in the path to actually
// compute something
- if(pathSize < 2)
+ if (pathSize < 2)
{
return static_cast<OutputType>(value);
}
-
+
// First, we compute the centroid of the path so as to center the moment
typename VertexListType::ConstIterator it = vertexList->Begin();
- VertexType centroid = it.Value();
+ VertexType centroid = it.Value();
++it;
// Cumulate points
- while(it!=vertexList->End())
+ while (it != vertexList->End())
{
- centroid[0]+=it.Value()[0];
- centroid[1]+=it.Value()[1];
+ centroid[0] += it.Value()[0];
+ centroid[1] += it.Value()[1];
++it;
}
-
+
// Normalize
- centroid[0]/=static_cast<PrecisionType>(pathSize);
- centroid[1]/=static_cast<PrecisionType>(pathSize);
+ centroid[0] /= static_cast<PrecisionType>(pathSize);
+ centroid[1] /= static_cast<PrecisionType>(pathSize);
// Second, we integrate along the edge
it = vertexList->Begin();
VertexType source = it.Value();
- source[0]-= centroid[0];
- source[1]-= centroid[1];
+ source[0] -= centroid[0];
+ source[1] -= centroid[1];
++it;
PrecisionType ds;
- VertexType dest;
+ VertexType dest;
// This variable will be used to normalize the moment
PrecisionType norm = 0.;
- while(it!=vertexList->End())
+ while (it != vertexList->End())
{
dest = it.Value();
-
+
// Get source and destination coordinates
dest[0] -= centroid[0];
dest[1] -= centroid[1];
-
+
// Don't forget the ds part of the integration process
- ds = vcl_sqrt(vcl_pow(dest[0]-source[0],2.)+vcl_pow(dest[1]-source[1],2.));
- norm+=ds;
+ ds = vcl_sqrt(vcl_pow(dest[0] - source[0], 2.) + vcl_pow(dest[1] - source[1], 2.));
+ norm += ds;
value += ds * EvaluateComplexMomentAtIndex(source);
- source=dest;
+ source = dest;
++it;
}
// Close the loop
dest = vertexList->Begin().Value();
dest[0] -= centroid[0];
dest[1] -= centroid[1];
- ds = vcl_sqrt(vcl_pow(dest[0]-source[0],2.)+vcl_pow(dest[1]-source[1],2.));
- norm+=ds;
- value += EvaluateComplexMomentAtIndex(source)*ds;
- norm = vcl_pow(norm,((PrecisionType)m_P+(PrecisionType)m_Q)/2.);
+ ds = vcl_sqrt(vcl_pow(dest[0] - source[0], 2.) + vcl_pow(dest[1] - source[1], 2.));
+ norm += ds;
+ value += EvaluateComplexMomentAtIndex(source) * ds;
+ norm = vcl_pow(norm, ((PrecisionType) m_P + (PrecisionType) m_Q) / 2.);
// Normalize with edge perimeter
- value/=norm;
-
+ value /= norm;
+
return static_cast<OutputType>(value);
}
-template < class TInputPath, class TOutput, class TPrecision>
+template <class TInputPath, class TOutput, class TPrecision>
typename ComplexMomentPathFunction<TInputPath,
-TOutput,TPrecision>::OutputType
-ComplexMomentPathFunction<TInputPath,TOutput,TPrecision>
+ TOutput, TPrecision>::OutputType
+ComplexMomentPathFunction<TInputPath, TOutput, TPrecision>
::Evaluate() const
{
- if ( !this->GetInputPath() )
- {
- otbMsgDevMacro( << "Pb with GetInputPath" );
- return static_cast<OutputType>(ComplexPrecisionType( itk::NumericTraits<PrecisionType>::Zero, itk::NumericTraits<PrecisionType>::Zero ) );
- }
+ if (!this->GetInputPath())
+ {
+ otbMsgDevMacro(<< "Pb with GetInputPath");
+ return static_cast<OutputType>(ComplexPrecisionType(itk::NumericTraits<PrecisionType>::Zero,
+ itk::NumericTraits<PrecisionType>::Zero));
+ }
- OutputType Result = Evaluate( *(this->GetInputPath()) );
+ OutputType Result = Evaluate(*(this->GetInputPath()));
return Result;
}
diff --git a/Code/FeatureExtraction/otbContrastTextureFunctor.h b/Code/FeatureExtraction/otbContrastTextureFunctor.h
index ba80d7b7cc..ccdb7dce2f 100644
--- a/Code/FeatureExtraction/otbContrastTextureFunctor.h
+++ b/Code/FeatureExtraction/otbContrastTextureFunctor.h
@@ -40,39 +40,40 @@ namespace Functor
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT ContrastTextureFunctor :
-public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
+ public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
ContrastTextureFunctor(){};
- virtual ~ContrastTextureFunctor(){};
+ virtual ~ContrastTextureFunctor(){}
typedef TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
typedef typename Superclass::NeighborhoodType NeighborhoodType;
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
this->ComputeJointHistogram(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
double out = 0.;
// loop over bin neighborhood values
- for (unsigned sB = 0; sB<this->GetHisto()[0].size(); sB++)
+ for (unsigned sB = 0; sB < this->GetHisto()[0].size(); sB++)
{
- double nCeil = (static_cast<double>(sB)+0.5)*this->GetNeighBinLength();
- double nCeilSquare = vcl_pow( nCeil, 2);
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ double nCeil = (static_cast<double>(sB) + 0.5) * this->GetNeighBinLength();
+ double nCeilSquare = vcl_pow(nCeil, 2);
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
+ {
+ double rVal = (static_cast<double>(r) + 0.5) * this->GetOffsetBinLength();
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
{
- double rVal = (static_cast<double>(r)+0.5)*this->GetOffsetBinLength();
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- if( vcl_abs((static_cast<double>(s)+0.5)*this->GetNeighBinLength() - rVal - nCeil) < vcl_abs(this->GetNeighBinLength()) )
- {
- double p = static_cast<double>(this->GetHisto()[r][s])*areaInv;
- out += nCeilSquare * p;
- }
- }
+ if (vcl_abs((static_cast<double>(s) + 0.5) * this->GetNeighBinLength() - rVal - nCeil) <
+ vcl_abs(this->GetNeighBinLength()))
+ {
+ double p = static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ out += nCeilSquare * p;
+ }
}
+ }
}
return out;
@@ -80,9 +81,7 @@ public:
};
-
} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbCorrelationTextureFunctor.h b/Code/FeatureExtraction/otbCorrelationTextureFunctor.h
index 6390bbe6c8..605d6836dd 100644
--- a/Code/FeatureExtraction/otbCorrelationTextureFunctor.h
+++ b/Code/FeatureExtraction/otbCorrelationTextureFunctor.h
@@ -41,79 +41,76 @@ namespace Functor
* \ingroup Textures
*/
-
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT CorrelationTextureFunctor :
-public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
+ public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
CorrelationTextureFunctor(){};
- virtual ~CorrelationTextureFunctor(){};
+ virtual ~CorrelationTextureFunctor(){}
typedef TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
- typedef typename Superclass::NeighborhoodType NeighborhoodType;
+ typedef typename Superclass::NeighborhoodType NeighborhoodType;
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
this->ComputeJointHistogram(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
double out = 0.;
double sumProb = 0.;
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
{
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- double p = static_cast<double>(this->GetHisto()[r][s])*areaInv;
- sumProb += p;
- double pixProd = ( (static_cast<double>(r)+0.5)*this->GetOffsetBinLength() ) * ( (static_cast<double>(s)+0.5)*this->GetNeighBinLength() );
- out += pixProd * p;
- }
- }
-
- double meanPOff = sumProb/static_cast<double>(this->GetHisto().size());
- double meanPNeigh = sumProb/static_cast<double>(this->GetHisto()[0].size());
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
+ {
+ double p = static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ sumProb += p;
+ double pixProd =
+ ((static_cast<double>(r) +
+ 0.5) * this->GetOffsetBinLength()) * ((static_cast<double>(s) + 0.5) * this->GetNeighBinLength());
+ out += pixProd * p;
+ }
+ }
+
+ double meanPOff = sumProb / static_cast<double>(this->GetHisto().size());
+ double meanPNeigh = sumProb / static_cast<double>(this->GetHisto()[0].size());
// Standard deviation of p for offset region
double stdPOff = 0.;
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
{
- double sumTemp = 0.;
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- sumTemp += this->GetHisto()[r][s]*areaInv;
- }
- stdPOff += vcl_pow( (meanPOff-sumTemp), 2);
+ double sumTemp = 0.;
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
+ {
+ sumTemp += this->GetHisto()[r][s] * areaInv;
+ }
+ stdPOff += vcl_pow((meanPOff - sumTemp), 2);
}
stdPOff /= this->GetHisto().size();
stdPOff = vcl_sqrt(stdPOff);
// Standard deviation of p for neighborhood region
double stdPNeigh = 0.;
- for (unsigned r = 0; r<this->GetHisto()[0].size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto()[0].size(); ++r)
{
- double sumTemp = 0.;
- for (unsigned s = 0; s<this->GetHisto().size(); ++s)
- {
- sumTemp += this->GetHisto()[s][r]*areaInv;
- }
- stdPNeigh += vcl_pow( (meanPNeigh-sumTemp), 2);
+ double sumTemp = 0.;
+ for (unsigned s = 0; s < this->GetHisto().size(); ++s)
+ {
+ sumTemp += this->GetHisto()[s][r] * areaInv;
+ }
+ stdPNeigh += vcl_pow((meanPNeigh - sumTemp), 2);
}
stdPNeigh /= this->GetHisto()[0].size();
stdPNeigh = vcl_sqrt(stdPNeigh);
-
- if(stdPOff*stdPNeigh != 0)
- out = (out - meanPOff*meanPNeigh) / (stdPOff*stdPNeigh);
+ if (stdPOff * stdPNeigh != 0) out = (out - meanPOff * meanPNeigh) / (stdPOff * stdPNeigh);
return out;
}
};
-
} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbDifferenceEntropyTextureFunctor.h b/Code/FeatureExtraction/otbDifferenceEntropyTextureFunctor.h
index 57a5c434d2..11199adb50 100644
--- a/Code/FeatureExtraction/otbDifferenceEntropyTextureFunctor.h
+++ b/Code/FeatureExtraction/otbDifferenceEntropyTextureFunctor.h
@@ -38,56 +38,52 @@ namespace Functor
* \ingroup Textures
*/
-
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT DifferenceEntropyTextureFunctor :
-public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
+ public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
DifferenceEntropyTextureFunctor(){};
- virtual ~DifferenceEntropyTextureFunctor(){};
+ virtual ~DifferenceEntropyTextureFunctor(){}
typedef TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
typedef typename Superclass::NeighborhoodType NeighborhoodType;
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
this->ComputeJointHistogram(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
double out = 0.;
// loop over bin neighborhood values
- for (unsigned sB = 0; sB<this->GetHisto()[0].size(); sB++)
+ for (unsigned sB = 0; sB < this->GetHisto()[0].size(); sB++)
{
- double Px_y = 0.;
- double nCeil = (static_cast<double>(sB)+0.5)*this->GetNeighBinLength();
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ double Px_y = 0.;
+ double nCeil = (static_cast<double>(sB) + 0.5) * this->GetNeighBinLength();
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
+ {
+ double rVal = (static_cast<double>(r) + 0.5) * this->GetOffsetBinLength();
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
{
- double rVal = (static_cast<double>(r)+0.5)*this->GetOffsetBinLength();
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- if( vcl_abs((static_cast<double>(s)+0.5)*this->GetNeighBinLength() - rVal - nCeil) < vcl_abs(this->GetNeighBinLength()) )
- {
- Px_y += static_cast<double>(this->GetHisto()[r][s])*areaInv;
- }
- }
+ if (vcl_abs((static_cast<double>(s) + 0.5) * this->GetNeighBinLength() - rVal - nCeil) <
+ vcl_abs(this->GetNeighBinLength()))
+ {
+ Px_y += static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ }
}
- if(Px_y != 0.)
- out += Px_y * vcl_log(Px_y);
+ }
+ if (Px_y != 0.) out += Px_y * vcl_log(Px_y);
}
- if(out != 0)
- out = -out;
+ if (out != 0) out = -out;
return out;
}
};
-
} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbDifferenceVarianceTextureFunctor.h b/Code/FeatureExtraction/otbDifferenceVarianceTextureFunctor.h
index ae56f04ed7..d5bd6a3698 100644
--- a/Code/FeatureExtraction/otbDifferenceVarianceTextureFunctor.h
+++ b/Code/FeatureExtraction/otbDifferenceVarianceTextureFunctor.h
@@ -40,68 +40,68 @@ namespace Functor
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT DifferenceVarianceTextureFunctor :
-public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
+ public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
DifferenceVarianceTextureFunctor(){};
- virtual ~DifferenceVarianceTextureFunctor(){};
+ virtual ~DifferenceVarianceTextureFunctor(){}
typedef TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
typedef typename Superclass::NeighborhoodType NeighborhoodType;
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
this->ComputeJointHistogram(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
double MeanPx_y = 0.;
// Computes mean Px_y
- for (unsigned sB = 0; sB<this->GetHisto()[0].size(); sB++)
+ for (unsigned sB = 0; sB < this->GetHisto()[0].size(); sB++)
{
- double nCeil = (static_cast<double>(sB)+0.5)*this->GetNeighBinLength();
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ double nCeil = (static_cast<double>(sB) + 0.5) * this->GetNeighBinLength();
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
+ {
+ double rVal = (static_cast<double>(r) + 0.5) * this->GetOffsetBinLength();
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
{
- double rVal = (static_cast<double>(r)+0.5)*this->GetOffsetBinLength();
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- if( vcl_abs((static_cast<double>(s)+0.5)*this->GetNeighBinLength() - rVal - nCeil) < vcl_abs(this->GetNeighBinLength()) )
- {
- MeanPx_y += static_cast<double>(this->GetHisto()[r][s])*areaInv;
- }
- }
+ if (vcl_abs((static_cast<double>(s) + 0.5) * this->GetNeighBinLength() - rVal - nCeil) <
+ vcl_abs(this->GetNeighBinLength()))
+ {
+ MeanPx_y += static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ }
}
+ }
}
MeanPx_y /= static_cast<double>(this->GetHisto()[0].size());
// Computes variance
double varPx_y = 0.;
- for (unsigned sB = 0; sB<this->GetHisto()[0].size(); sB++)
+ for (unsigned sB = 0; sB < this->GetHisto()[0].size(); sB++)
{
- double Px_y = 0.;
- double nCeil = (static_cast<double>(sB)+0.5)*this->GetNeighBinLength();
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ double Px_y = 0.;
+ double nCeil = (static_cast<double>(sB) + 0.5) * this->GetNeighBinLength();
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
+ {
+ double rVal = (static_cast<double>(r) + 0.5) * this->GetOffsetBinLength();
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
{
- double rVal = (static_cast<double>(r)+0.5)*this->GetOffsetBinLength();
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- if( vcl_abs((static_cast<double>(s)+0.5)*this->GetNeighBinLength() - rVal - nCeil) < vcl_abs(this->GetNeighBinLength()) )
- {
- Px_y += static_cast<double>(this->GetHisto()[r][s])*areaInv;
- }
- }
+ if (vcl_abs((static_cast<double>(s) + 0.5) * this->GetNeighBinLength() - rVal - nCeil) <
+ vcl_abs(this->GetNeighBinLength()))
+ {
+ Px_y += static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ }
}
- varPx_y += vcl_pow((Px_y - MeanPx_y), 2);
+ }
+ varPx_y += vcl_pow((Px_y - MeanPx_y), 2);
}
- return varPx_y/this->GetHisto()[0].size();
+ return varPx_y / this->GetHisto()[0].size();
}
};
-
} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbEnergyTextureFunctor.h b/Code/FeatureExtraction/otbEnergyTextureFunctor.h
index 4eabb72370..7fb8a204b0 100644
--- a/Code/FeatureExtraction/otbEnergyTextureFunctor.h
+++ b/Code/FeatureExtraction/otbEnergyTextureFunctor.h
@@ -20,7 +20,6 @@
#include "otbTextureFunctorBase.h"
-
namespace otb
{
namespace Functor
@@ -40,49 +39,48 @@ namespace Functor
*/
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT EnergyTextureFunctor :
-public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
+ public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
EnergyTextureFunctor(){};
- virtual ~EnergyTextureFunctor(){};
+ virtual ~EnergyTextureFunctor(){}
- typedef TScalarInputPixelType InputScalarType;
- typedef TScalarOutputPixelType OutputScalarType;
+ typedef TScalarInputPixelType InputScalarType;
+ typedef TScalarOutputPixelType OutputScalarType;
typedef TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
- typedef typename Superclass::OffsetType OffsetType;
- typedef typename Superclass::RadiusType RadiusType;
- typedef typename Superclass::NeighborhoodType NeighborhoodType;
-
+ typedef typename Superclass::OffsetType OffsetType;
+ typedef typename Superclass::RadiusType RadiusType;
+ typedef typename Superclass::NeighborhoodType NeighborhoodType;
- double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
RadiusType radius = neigh.GetRadius();
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
OffsetType offset;
offset.Fill(0);
OffsetType offsetOff;
OffsetType offsetOffInit;
- offsetOffInit[0] = -radius[0]+this->GetOffset()[0]-1;
- offsetOffInit[1] = -radius[1]+this->GetOffset()[1]-1;
+ offsetOffInit[0] = -radius[0] + this->GetOffset()[0] - 1;
+ offsetOffInit[1] = -radius[1] + this->GetOffset()[1] - 1;
double temp = 0.;
double norm = 0.;
offsetOff = offsetOffInit;
- for ( int l = -static_cast<int>(radius[0]); l <= static_cast<int>(radius[0]); l++ )
+ for (int l = -static_cast<int>(radius[0]); l <= static_cast<int>(radius[0]); l++)
{
- offsetOff[0]++;
- offsetOff[1] = offsetOffInit[1];
- offset[0] = l;
- for ( int k = -static_cast<int>(radius[1]); k <= static_cast<int>(radius[1]); ++k)
- {
- offsetOff[1]++;
- offset[1] = k;
- norm = vcl_pow(static_cast<double>( ( neigh[offset] - neighOff[neighOff.GetCenterNeighborhoodIndex()] ) ), 2);
- temp += norm;
- }
+ offsetOff[0]++;
+ offsetOff[1] = offsetOffInit[1];
+ offset[0] = l;
+ for (int k = -static_cast<int>(radius[1]); k <= static_cast<int>(radius[1]); ++k)
+ {
+ offsetOff[1]++;
+ offset[1] = k;
+ norm = vcl_pow(static_cast<double>((neigh[offset] - neighOff[neighOff.GetCenterNeighborhoodIndex()])), 2);
+ temp += norm;
+ }
}
temp /= area;
return vcl_pow(temp, 2);
@@ -90,9 +88,7 @@ public:
};
-
} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbEntropyTextureFunctor.h b/Code/FeatureExtraction/otbEntropyTextureFunctor.h
index 969d3f5948..035909b4bd 100644
--- a/Code/FeatureExtraction/otbEntropyTextureFunctor.h
+++ b/Code/FeatureExtraction/otbEntropyTextureFunctor.h
@@ -40,18 +40,18 @@ namespace Functor
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT EntropyTextureFunctor :
-public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
+ public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
EntropyTextureFunctor(){};
- virtual ~EntropyTextureFunctor(){};
+ virtual ~EntropyTextureFunctor(){}
- typedef TScalarInputPixelType InputScalarType;
- typedef TScalarOutputPixelType OutputScalarType;
+ typedef TScalarInputPixelType InputScalarType;
+ typedef TScalarOutputPixelType OutputScalarType;
typedef TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
- typedef typename Superclass::OffsetType OffsetType;
- typedef typename Superclass::RadiusType RadiusType;
- typedef typename Superclass::NeighborhoodType NeighborhoodType;
+ typedef typename Superclass::OffsetType OffsetType;
+ typedef typename Superclass::RadiusType RadiusType;
+ typedef typename Superclass::NeighborhoodType NeighborhoodType;
/*
typedef TIterInput IterType;
typedef TOutput OutputType;
@@ -60,25 +60,23 @@ public:
typedef itk::Neighborhood<InternalPixelType,::itk::GetImageDimension<ImageType>::ImageDimension> NeighborhoodType;
*/
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
this->ComputeJointHistogram(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
double out = 0.;
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
+ {
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
{
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- double p = static_cast<double>(this->GetHisto()[r][s]) * areaInv;
- if (p != 0)
- out += (p * vcl_log(p));
- }
+ double p = static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ if (p != 0) out += (p * vcl_log(p));
}
- if (out != 0.)
- out = -(out);
+ }
+ if (out != 0.) out = -(out);
- return out;
+ return out;
}
};
@@ -86,4 +84,3 @@ public:
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbExtractSegmentsImageFilter.h b/Code/FeatureExtraction/otbExtractSegmentsImageFilter.h
index 7fe108a416..23a7e2e6f6 100644
--- a/Code/FeatureExtraction/otbExtractSegmentsImageFilter.h
+++ b/Code/FeatureExtraction/otbExtractSegmentsImageFilter.h
@@ -43,116 +43,110 @@ namespace otb
*/
template <class TInputImage,
-class TOutputImage>
+ class TOutputImage>
class ITK_EXPORT ExtractSegmentsImageFilter :
- public itk::ImageToImageFilter< TInputImage, TOutputImage >
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,
- unsigned int,
- TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension,
+ unsigned int,
+ TOutputImage::ImageDimension);
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
typedef TInputImage PSOutputImageType;
- typedef ExtractSegmentsImageFilter Self;
- typedef itk::ImageToImageFilter< InputImageType, OutputImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ExtractSegmentsImageFilter Self;
+ typedef itk::ImageToImageFilter<InputImageType, OutputImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
itkNewMacro(Self);
itkTypeMacro(ExtractSegmentsImageFilter, itk::ImageToImageFilter);
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::SizeType SizeType;
typedef typename OutputImageType::PixelType OutputPixelType;
-
/** Definition of the list of lines. */
- typedef LineSpatialObjectList LinesListType;
-
+ typedef LineSpatialObjectList LinesListType;
/** Set/Get the radius of the region of the pixel suppression by direction image filter. */
- void SetPixelSuppressionRadius( SizeType Radius );
- const SizeType GetPixelSuppressionRadius( void );
+ void SetPixelSuppressionRadius(SizeType Radius);
+ const SizeType GetPixelSuppressionRadius(void);
/** Set/Get Angular Accuracy on the direction of the central pixel for
the pixel suppression by direction image filter. */
- void SetPixelSuppressionAngularBeam( float AngularBeam );
- const float GetPixelSuppressionAngularBeam( void );
-
+ void SetPixelSuppressionAngularBeam(float AngularBeam);
+ const float GetPixelSuppressionAngularBeam(void);
/** Set/Get the radius used to define the region of local hough filter. */
- void SetLocalHoughRadius( SizeType Radius );
- const SizeType GetLocalHoughRadius( void );
+ void SetLocalHoughRadius(SizeType Radius);
+ const SizeType GetLocalHoughRadius(void);
/** Set/Get the number of lines we are looking for in the local hough filter. */
- void SetLocalHoughNumberOfLines( unsigned int Radius );
- const unsigned int GetLocalHoughNumberOfLines( void );
+ void SetLocalHoughNumberOfLines(unsigned int Radius);
+ const unsigned int GetLocalHoughNumberOfLines(void);
/** Set/Get the radius of the disc to remove from the accumulator
* for each line found */
- void SetLocalHoughDiscRadius( float DiscRadius );
- const float GetLocalHoughDiscRadius( void );
+ void SetLocalHoughDiscRadius(float DiscRadius);
+ const float GetLocalHoughDiscRadius(void);
/** Set/Get the variance of the gaussian bluring for the accumulator */
- void SetLocalHoughVariance( float Variance );
- const float GetLocalHoughVariance( void );
-
+ void SetLocalHoughVariance(float Variance);
+ const float GetLocalHoughVariance(void);
/** Set/Get the radius between two segments in the fill gaps filter. */
- void SetFillGapsRadius( float Radius );
- const float GetFillGapsRadius( void );
+ void SetFillGapsRadius(float Radius);
+ const float GetFillGapsRadius(void);
/** Set/Get Angular Beam between two segments in the fill gaps filter. */
- void SetFillGapsAngularBeam( float AngularBeam );
- const float GetFillGapsAngularBeam( void );
-
+ void SetFillGapsAngularBeam(float AngularBeam);
+ const float GetFillGapsAngularBeam(void);
/** Set/Get the image input of this filter. */
- void SetInputImage( const InputImageType *image);
+ void SetInputImage(const InputImageType *image);
const InputImageType * GetInputImage(void);
/** Set/Get the image direction of this filter. */
- void SetInputImageDirection( const InputImageType *image);
+ void SetInputImageDirection(const InputImageType *image);
const InputImageType * GetInputImageDirection(void);
/** Set/Get the value of the drawed line*/
- itkGetMacro(LineValue,typename OutputImageType::PixelType );
- itkSetMacro(LineValue,typename OutputImageType::PixelType );
-
+ itkGetMacro(LineValue, typename OutputImageType::PixelType);
+ itkSetMacro(LineValue, typename OutputImageType::PixelType);
protected:
ExtractSegmentsImageFilter();
- virtual ~ExtractSegmentsImageFilter() {};
+ virtual ~ExtractSegmentsImageFilter() {}
- typedef PixelSuppressionByDirectionImageFilter< InputImageType, PSOutputImageType > PixelSuppressionType;
- typedef LocalHoughFilter< InputImageType > LocalHoughType;
- typedef FillGapsFilter FillGapsType;
- typedef DrawLineSpatialObjectListFilter< InputImageType, OutputImageType > DrawLineListType;
- typedef itk::RescaleIntensityImageFilter<TInputImage , TInputImage> RescaleType;
+ typedef PixelSuppressionByDirectionImageFilter<InputImageType, PSOutputImageType> PixelSuppressionType;
+ typedef LocalHoughFilter<InputImageType> LocalHoughType;
+ typedef FillGapsFilter FillGapsType;
+ typedef DrawLineSpatialObjectListFilter<InputImageType, OutputImageType> DrawLineListType;
+ typedef itk::RescaleIntensityImageFilter<TInputImage, TInputImage> RescaleType;
virtual void GenerateData();
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ExtractSegmentsImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ExtractSegmentsImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- typename OutputImageType::PixelType m_LineValue;
+ typename OutputImageType::PixelType m_LineValue;
- typename PixelSuppressionType::Pointer m_PixelSuppression;
- typename LocalHoughType::Pointer m_LocalHough;
- typename FillGapsType::Pointer m_FillGaps;
- typename DrawLineListType::Pointer m_DrawLineList;
+ typename PixelSuppressionType::Pointer m_PixelSuppression;
+ typename LocalHoughType::Pointer m_LocalHough;
+ typename FillGapsType::Pointer m_FillGaps;
+ typename DrawLineListType::Pointer m_DrawLineList;
typename RescaleType::Pointer m_Rescaler;
};
} // end namespace otb
@@ -161,5 +155,4 @@ private:
#include "otbExtractSegmentsImageFilter.txx"
#endif
-
#endif
diff --git a/Code/FeatureExtraction/otbExtractSegmentsImageFilter.txx b/Code/FeatureExtraction/otbExtractSegmentsImageFilter.txx
index c3d072aa0c..e1218c07c8 100644
--- a/Code/FeatureExtraction/otbExtractSegmentsImageFilter.txx
+++ b/Code/FeatureExtraction/otbExtractSegmentsImageFilter.txx
@@ -20,7 +20,6 @@
#include "otbExtractSegmentsImageFilter.h"
-
namespace otb
{
@@ -38,7 +37,7 @@ ExtractSegmentsImageFilter<TInputImage, TOutputImage>
m_LocalHough = LocalHoughType::New();
m_FillGaps = FillGapsType::New();
m_DrawLineList = DrawLineListType::New();
- m_Rescaler =RescaleType::New();
+ m_Rescaler = RescaleType::New();
m_LineValue = static_cast<typename OutputImageType::PixelType>(255.);
}
@@ -48,9 +47,9 @@ ExtractSegmentsImageFilter<TInputImage, TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void ExtractSegmentsImageFilter<TInputImage, TOutputImage>
-::SetInputImage( const InputImageType *image)
+::SetInputImage(const InputImageType *image)
{
- this->SetInput(0,image);
+ this->SetInput(0, image);
}
template <class TInputImage, class TOutputImage>
@@ -58,8 +57,8 @@ const typename ExtractSegmentsImageFilter<TInputImage, TOutputImage>::InputImage
ExtractSegmentsImageFilter<TInputImage, TOutputImage>
::GetInputImage(void)
{
- return static_cast<const InputImageType * >
- (this->GetInput(0) );
+ return static_cast<const InputImageType *>
+ (this->GetInput(0));
}
/**
@@ -67,9 +66,9 @@ ExtractSegmentsImageFilter<TInputImage, TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void ExtractSegmentsImageFilter<TInputImage, TOutputImage>
-::SetInputImageDirection( const InputImageType *image)
+::SetInputImageDirection(const InputImageType *image)
{
- this->SetInput(1,image);
+ this->SetInput(1, image);
}
template <class TInputImage, class TOutputImage>
@@ -77,8 +76,8 @@ const typename ExtractSegmentsImageFilter<TInputImage, TOutputImage>::InputImage
ExtractSegmentsImageFilter<TInputImage, TOutputImage>
::GetInputImageDirection(void)
{
- return static_cast<const InputImageType * >
- (this->GetInput(1) );
+ return static_cast<const InputImageType *>
+ (this->GetInput(1));
}
/**
@@ -210,33 +209,31 @@ ExtractSegmentsImageFilter<TInputImage, TOutputImage>
return (m_FillGaps->GetAngularBeam());
}
-
template <class TInputImage, class TOutputImage>
void
ExtractSegmentsImageFilter<TInputImage, TOutputImage>
::GenerateData()
{
-
- m_PixelSuppression->SetInputImage( this->GetInputImage() );
- m_PixelSuppression->SetInputImageDirection( this->GetInputImageDirection() );
- m_Rescaler->SetInput( m_PixelSuppression->GetOutput() );
+ m_PixelSuppression->SetInputImage(this->GetInputImage());
+ m_PixelSuppression->SetInputImageDirection(this->GetInputImageDirection());
+
+ m_Rescaler->SetInput(m_PixelSuppression->GetOutput());
- m_LocalHough->SetInput( m_Rescaler->GetOutput() );
+ m_LocalHough->SetInput(m_Rescaler->GetOutput());
- m_FillGaps->SetInput ( m_LocalHough->GetOutput() );
+ m_FillGaps->SetInput (m_LocalHough->GetOutput());
- m_DrawLineList->SetInput( this->GetInputImage() );
- m_DrawLineList->SetInputLineSpatialObjectList( m_FillGaps->GetOutput() );
+ m_DrawLineList->SetInput(this->GetInputImage());
+ m_DrawLineList->SetInputLineSpatialObjectList(m_FillGaps->GetOutput());
m_DrawLineList->SetValue(m_LineValue);
- m_DrawLineList->GraftOutput( this->GetOutput() );
+ m_DrawLineList->GraftOutput(this->GetOutput());
m_DrawLineList->Update();
- this->GraftOutput(m_DrawLineList->GetOutput() );
+ this->GraftOutput(m_DrawLineList->GetOutput());
}
-
/**
* Standard "PrintSelf" method
*/
@@ -245,14 +242,12 @@ void
ExtractSegmentsImageFilter<TInputImage, TOutput>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
/* os << indent << "Length: " << m_LengthLine << std::endl;
os << indent << "Width: " << m_WidthLine << std::endl;*/
}
-
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbFillGapsFilter.cxx b/Code/FeatureExtraction/otbFillGapsFilter.cxx
index 5a6cdfba76..fcc538166e 100644
--- a/Code/FeatureExtraction/otbFillGapsFilter.cxx
+++ b/Code/FeatureExtraction/otbFillGapsFilter.cxx
@@ -32,40 +32,36 @@ FillGapsFilter::FillGapsFilter()
LineSpatialObjectListPointer output = LineSpatialObjectListType::New();
- this->ProcessObjectType::SetNthOutput(0, output );
+ this->ProcessObjectType::SetNthOutput(0, output);
m_Radius = 4.0;
m_AngularBeam = 1.0;
}
-
void
FillGapsFilter
::SetInput(const LineSpatialObjectListType * input)
{
this->ProcessObjectType::SetNthInput(0,
- const_cast< LineSpatialObjectListType * >( input ) );
+ const_cast<LineSpatialObjectListType *>(input));
}
-
const FillGapsFilter::LineSpatialObjectListType *
FillGapsFilter
::GetInput(void)
{
return static_cast<const LineSpatialObjectListType *>
- (this->ProcessObjectType::GetInput(0) );
+ (this->ProcessObjectType::GetInput(0));
}
-
FillGapsFilter::LineSpatialObjectListType *
FillGapsFilter
::GetOutput(void)
{
return static_cast<LineSpatialObjectListType *>
- (this->ProcessObjectType::GetOutput(0) );
+ (this->ProcessObjectType::GetOutput(0));
}
-
/**
*
*/
@@ -77,7 +73,7 @@ FillGapsFilter
// Get the LineSpatialObject
const LineSpatialObjectList * inputLine = this->GetInput();
- LineSpatialObjectList * outputLine = this->GetOutput();
+ LineSpatialObjectList * outputLine = this->GetOutput();
// Get the list of points which consists of two points to represent a
// straight line
@@ -87,24 +83,22 @@ FillGapsFilter
LineSpatialObjectListType::const_iterator itLineListB;
LineSpatialObjectListType::const_iterator itLineListBEnd = inputLine->end();
-
- double x1(0.),y1(0.),x2(0.),y2(0.),x3(0.),y3(0.),x4(0.),y4(0.);
- double xTemp(0.),yTemp(0.);
- double R13(0.),R14(0.),R23(0.),R24(0.);
+ double x1(0.), y1(0.), x2(0.), y2(0.), x3(0.), y3(0.), x4(0.), y4(0.);
+ double xTemp(0.), yTemp(0.);
+ double R13(0.), R14(0.), R23(0.), R24(0.);
double CosTheta(0.);
-
- PointListType::const_iterator itPoints;
+ PointListType::const_iterator itPoints;
CosTheta = vcl_cos(m_AngularBeam);
--itLineListAEnd;
- while (itLineListA != itLineListAEnd )
- {
+ while (itLineListA != itLineListAEnd)
+ {
itLineListB = itLineListA;
++itLineListB;
- PointListType & pointsList = (*itLineListA)->GetPoints();
+ PointListType& pointsList = (*itLineListA)->GetPoints();
itPoints = pointsList.begin();
x1 = (*itPoints).GetPosition()[0];
@@ -114,22 +108,22 @@ FillGapsFilter
x2 = (*itPoints).GetPosition()[0];
y2 = (*itPoints).GetPosition()[1];
- PointType point;
- PointListType pointList;
+ PointType point;
+ PointListType pointList;
- point.SetPosition(x1,y1);
+ point.SetPosition(x1, y1);
pointList.push_back(point);
- point.SetPosition(x2,y2);
+ point.SetPosition(x2, y2);
pointList.push_back(point);
LineSpatialObjectType::Pointer line = LineSpatialObjectType::New();
line->SetId(0);
- line->SetPoints( pointList );
+ line->SetPoints(pointList);
line->ComputeBoundingBox();
outputLine->push_back(line);
while (itLineListB != itLineListBEnd)
- {
+ {
pointsList = (*itLineListB)->GetPoints();
itPoints = pointsList.begin();
@@ -143,10 +137,10 @@ FillGapsFilter
// Calculate the radius for each point of each line
- R13 = vcl_sqrt( (x1-x3)*(x1-x3) + (y1-y3)*(y1-y3) );
- R14 = vcl_sqrt( (x1-x4)*(x1-x4) + (y1-y4)*(y1-y4) );
- R23 = vcl_sqrt( (x2-x3)*(x2-x3) + (y2-y3)*(y2-y3) );
- R24 = vcl_sqrt( (x2-x4)*(x2-x4) + (y2-y4)*(y2-y4) );
+ R13 = vcl_sqrt((x1 - x3) * (x1 - x3) + (y1 - y3) * (y1 - y3));
+ R14 = vcl_sqrt((x1 - x4) * (x1 - x4) + (y1 - y4) * (y1 - y4));
+ R23 = vcl_sqrt((x2 - x3) * (x2 - x3) + (y2 - y3) * (y2 - y3));
+ R24 = vcl_sqrt((x2 - x4) * (x2 - x4) + (y2 - y4) * (y2 - y4));
double Rmin = m_Radius;
@@ -156,30 +150,29 @@ FillGapsFilter
if (R23 < Rmin) Rmin = R23;
if (R24 < Rmin) Rmin = R24;
-
if (Rmin < m_Radius)
- {
- // Sort Points such as the radius of P2 and P3 is the smallest one.
- if (Rmin == R24 )
{
+ // Sort Points such as the radius of P2 and P3 is the smallest one.
+ if (Rmin == R24)
+ {
xTemp = x3;
yTemp = y3;
x3 = x4;
y3 = y4;
x4 = xTemp;
y4 = yTemp;
- }
- if (Rmin == R13 )
- {
+ }
+ if (Rmin == R13)
+ {
xTemp = x1;
yTemp = y1;
x1 = x2;
y1 = y2;
x2 = xTemp;
y2 = yTemp;
- }
- if (Rmin == R14 )
- {
+ }
+ if (Rmin == R14)
+ {
xTemp = x3;
yTemp = y3;
x3 = x4;
@@ -192,7 +185,7 @@ FillGapsFilter
y1 = y2;
x2 = xTemp;
y2 = yTemp;
- }
+ }
//Estimate the norm each line
/* double Norm12,Norm23,Norm34;
@@ -200,7 +193,7 @@ FillGapsFilter
Norm23 = vcl_sqrt( (x2-x3)*(x2-x3) + (y2-y3)*(y2-y3) );
Norm34 = vcl_sqrt( (x3-x4)*(x3-x4) + (y3-y4)*(y3-y4) );
*/
- double Angle12_23,Angle12_34,Angle23_34;
+ double Angle12_23, Angle12_34, Angle23_34;
//Estimate the angle between lines 12-23 and lines 12-34
/*Angle12_23 = (x2-x1)*(x3-x2) + (y2-y1)*(y3-y2);
Angle12_23 = Angle12_23 / Norm12 / Norm23;
@@ -208,53 +201,51 @@ FillGapsFilter
Angle12_34 = (x2-x1)*(x4-x3) + (y2-y1)*(y4-y3);
Angle12_34 = Angle12_34 / Norm12 / Norm34;*/
- Angle12_23 = vcl_cos(vcl_atan2((y2-y1), (x2-x1))-vcl_atan2((y3-y2), (x3-x2)));
- Angle12_34 = vcl_cos(vcl_atan2((y2-y1), (x2-x1))-vcl_atan2((y4-y3), (x4-x3)));
- Angle23_34 = vcl_cos(vcl_atan2((y3-y2), (x3-x2))-vcl_atan2((y4-y3), (x4-x3)));
-
-
- if ( (Angle12_23 > CosTheta) && (Angle12_34 > CosTheta) && (Angle23_34 > CosTheta) )
- {
+ Angle12_23 = vcl_cos(vcl_atan2((y2 - y1), (x2 - x1)) - vcl_atan2((y3 - y2), (x3 - x2)));
+ Angle12_34 = vcl_cos(vcl_atan2((y2 - y1), (x2 - x1)) - vcl_atan2((y4 - y3), (x4 - x3)));
+ Angle23_34 = vcl_cos(vcl_atan2((y3 - y2), (x3 - x2)) - vcl_atan2((y4 - y3), (x4 - x3)));
+ if ((Angle12_23 > CosTheta) && (Angle12_34 > CosTheta) && (Angle23_34 > CosTheta))
+ {
// Store 23-segment
- PointType point;
- PointListType pointList;
+ PointType point;
+ PointListType pointList;
- point.SetPosition(x2,y2);
+ point.SetPosition(x2, y2);
pointList.push_back(point);
- point.SetPosition(x3,y3);
+ point.SetPosition(x3, y3);
pointList.push_back(point);
LineSpatialObjectType::Pointer line = LineSpatialObjectType::New();
line->SetId(0);
- line->SetPoints( pointList );
+ line->SetPoints(pointList);
line->ComputeBoundingBox();
outputLine->push_back(line);
pointList.clear();
- }
- } // if(Rmin < m_Radius)
+ }
+ } // if(Rmin < m_Radius)
++itLineListB;
- } // while(itLineListB != itLineListBEnd)
+ } // while(itLineListB != itLineListBEnd)
++itLineListA;
- }
+ }
// Insert the last element
- PointType point;
- PointListType pointList;
+ PointType point;
+ PointListType pointList;
- point.SetPosition(x3,y3);
+ point.SetPosition(x3, y3);
pointList.push_back(point);
- point.SetPosition(x4,y4);
+ point.SetPosition(x4, y4);
pointList.push_back(point);
LineSpatialObjectType::Pointer line = LineSpatialObjectType::New();
line->SetId(0);
- line->SetPoints( pointList );
+ line->SetPoints(pointList);
line->ComputeBoundingBox();
outputLine->push_back(line);
@@ -262,7 +253,6 @@ FillGapsFilter
}
-
/**
*
*/
@@ -271,9 +261,7 @@ void
FillGapsFilter
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
} // end namespace otb
-
diff --git a/Code/FeatureExtraction/otbFillGapsFilter.h b/Code/FeatureExtraction/otbFillGapsFilter.h
index b18d58e5b5..bfa4d14900 100644
--- a/Code/FeatureExtraction/otbFillGapsFilter.h
+++ b/Code/FeatureExtraction/otbFillGapsFilter.h
@@ -34,25 +34,25 @@ class ITK_EXPORT FillGapsFilter : public itk::ProcessObject
public:
/** Standard class typedefs. */
- typedef FillGapsFilter Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef FillGapsFilter Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(FillGapsFilter,itk::ProcessObject);
+ itkTypeMacro(FillGapsFilter, itk::ProcessObject);
/** Some convenient typedefs. */
- typedef LineSpatialObjectList LineSpatialObjectListType;
- typedef LineSpatialObjectListType::Pointer LineSpatialObjectListPointer;
- typedef LineSpatialObjectListType::LineType LineSpatialObjectType;
- typedef LineSpatialObjectType::PointListType PointListType;
- typedef LineSpatialObjectType::LinePointType PointType;
+ typedef LineSpatialObjectList LineSpatialObjectListType;
+ typedef LineSpatialObjectListType::Pointer LineSpatialObjectListPointer;
+ typedef LineSpatialObjectListType::LineType LineSpatialObjectType;
+ typedef LineSpatialObjectType::PointListType PointListType;
+ typedef LineSpatialObjectType::LinePointType PointType;
- typedef itk::ProcessObject ProcessObjectType;
+ typedef itk::ProcessObject ProcessObjectType;
void SetInput(const LineSpatialObjectListType * input);
const LineSpatialObjectListType * GetInput();
@@ -64,20 +64,18 @@ public:
itkSetMacro(Radius, double);
itkGetConstReferenceMacro(Radius, double);
-
protected:
FillGapsFilter();
- virtual ~FillGapsFilter() {};
+ virtual ~FillGapsFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
virtual void GenerateData();
-
private:
- FillGapsFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ FillGapsFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
double m_AngularBeam;
double m_Radius;
@@ -87,4 +85,3 @@ private:
} // end namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbFlusserImageFunction.h b/Code/FeatureExtraction/otbFlusserImageFunction.h
index 8b778527c5..c4018af0a1 100644
--- a/Code/FeatureExtraction/otbFlusserImageFunction.h
+++ b/Code/FeatureExtraction/otbFlusserImageFunction.h
@@ -22,7 +22,6 @@
#include <complex>
-
namespace otb
{
@@ -59,19 +58,19 @@ namespace otb
* \ingroup ImageFunctions
*/
-template < class TInput,
-class TOutput = double,
-class TPrecision = double,
-class TCoordRep = float >
+template <class TInput,
+ class TOutput = double,
+ class TPrecision = double,
+ class TCoordRep = float>
class ITK_EXPORT FlusserImageFunction :
- public RealMomentImageFunction< TInput, TOutput, TPrecision, TCoordRep >
+ public RealMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef FlusserImageFunction Self;
- typedef RealMomentImageFunction< TInput, TOutput, TPrecision, TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef FlusserImageFunction Self;
+ typedef RealMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(FlusserImageFunction, RealMomentImageFunction);
@@ -80,55 +79,52 @@ public:
itkNewMacro(Self);
/** InputImageType typedef support. */
- typedef TInput InputType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::PointType PointType;
+ typedef TInput InputType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
+ typedef typename Superclass::PointType PointType;
- typedef typename Superclass::RealType RealType;
- typedef typename std::complex<RealType> ComplexType;
+ typedef typename Superclass::RealType RealType;
+ typedef typename std::complex<RealType> ComplexType;
/** Type for calculation precision */
- typedef typename Superclass::PrecisionType PrecisionType;
-
+ typedef typename Superclass::PrecisionType PrecisionType;
/** Dimension of the underlying image. */
itkStaticConstMacro(ImageDimension, unsigned int,
InputType::ImageDimension);
-
/** Evalulate the function at specified index */
- virtual RealType EvaluateAtIndex( const IndexType& index ) const;
+ virtual RealType EvaluateAtIndex(const IndexType& index) const;
/** Evaluate the function at non-integer positions */
- virtual RealType Evaluate( const PointType& point ) const
+ virtual RealType Evaluate(const PointType& point) const
{
IndexType index;
- this->ConvertPointToNearestIndex( point, index );
- return this->EvaluateAtIndex( index );
+ this->ConvertPointToNearestIndex(point, index);
+ return this->EvaluateAtIndex(index);
}
virtual RealType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex ) const
+ const ContinuousIndexType& cindex) const
{
IndexType index;
- this->ConvertContinuousIndexToNearestIndex( cindex, index );
- return this->EvaluateAtIndex( index );
+ this->ConvertContinuousIndexToNearestIndex(cindex, index);
+ return this->EvaluateAtIndex(index);
}
-
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
- itkSetClampMacro(MomentNumber,short,1,11);
- itkGetConstReferenceMacro( MomentNumber, short );
+ itkSetClampMacro(MomentNumber, short, 1, 11);
+ itkGetConstReferenceMacro(MomentNumber, short);
protected:
FlusserImageFunction();
- virtual ~FlusserImageFunction() {};
+ virtual ~FlusserImageFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- FlusserImageFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ FlusserImageFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
short m_MomentNumber;
};
diff --git a/Code/FeatureExtraction/otbFlusserImageFunction.txx b/Code/FeatureExtraction/otbFlusserImageFunction.txx
index a79f0cdef4..cde80e8601 100644
--- a/Code/FeatureExtraction/otbFlusserImageFunction.txx
+++ b/Code/FeatureExtraction/otbFlusserImageFunction.txx
@@ -30,204 +30,201 @@ namespace otb
/**
* Constructor
*/
-template < class TInput, class TOutput, class TPrecision, class TCoordRep>
-FlusserImageFunction<TInput,TOutput,TPrecision,TCoordRep>
+template <class TInput, class TOutput, class TPrecision, class TCoordRep>
+FlusserImageFunction<TInput, TOutput, TPrecision, TCoordRep>
::FlusserImageFunction()
{
- m_MomentNumber =-1;
+ m_MomentNumber = -1;
}
/**
*
*/
-template < class TInput, class TOutput, class TPrecision, class TCoordRep>
+template <class TInput, class TOutput, class TPrecision, class TCoordRep>
void
-FlusserImageFunction<TInput,TOutput,TPrecision,TCoordRep>
+FlusserImageFunction<TInput, TOutput, TPrecision, TCoordRep>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
os << indent << " m_MomentNumber : " << m_MomentNumber << std::endl;
}
-
-template < class TInput, class TOutput, class TPrecision, class TCoordRep>
-typename FlusserImageFunction<TInput,TOutput,TPrecision,TCoordRep>::RealType
-FlusserImageFunction<TInput,TOutput,TPrecision,TCoordRep>
+template <class TInput, class TOutput, class TPrecision, class TCoordRep>
+typename FlusserImageFunction<TInput, TOutput, TPrecision, TCoordRep>::RealType
+FlusserImageFunction<TInput, TOutput, TPrecision, TCoordRep>
::EvaluateAtIndex(const IndexType& index) const
{
RealType FlusserValue(itk::NumericTraits<RealType>::Zero);
ComplexType FlusserValueComplex(itk::NumericTraits<ComplexType>::Zero);
- typedef otb::ComplexMomentImageFunction<InputType,ComplexType> CMType;
- typename CMType::Pointer function =CMType::New();
+ typedef otb::ComplexMomentImageFunction<InputType, ComplexType> CMType;
+ typename CMType::Pointer function = CMType::New();
- if ( !this->GetInputImage() )
- {
- return ( itk::NumericTraits<RealType>::max() );
- }
+ if (!this->GetInputImage())
+ {
+ return (itk::NumericTraits<RealType>::max());
+ }
- if ( !this->IsInsideBuffer( index ) )
- {
- return ( itk::NumericTraits<RealType>::max() );
- }
+ if (!this->IsInsideBuffer(index))
+ {
+ return (itk::NumericTraits<RealType>::max());
+ }
assert(m_MomentNumber > 0);
assert(m_MomentNumber < 12);
- function->SetInputImage( this->GetInputImage() );
- function->SetNeighborhoodRadius(this->GetNeighborhoodRadius() );
+ function->SetInputImage(this->GetInputImage());
+ function->SetNeighborhoodRadius(this->GetNeighborhoodRadius());
switch (m_MomentNumber)
- {
- case 1 :
- {
+ {
+ case 1:
+ {
ComplexType C11;
function->SetP(1);
function->SetQ(1);
- C11 = function->EvaluateAtIndex( index );
+ C11 = function->EvaluateAtIndex(index);
FlusserValue = C11.real();
- }
- break;
+ }
+ break;
case 2:
- {
- ComplexType C21,C12;
+ {
+ ComplexType C21, C12;
function->SetP(2);
function->SetQ(1);
- C21 = function->EvaluateAtIndex( index );
+ C21 = function->EvaluateAtIndex(index);
function->SetP(1);
function->SetQ(2);
- C12 = function->EvaluateAtIndex( index );
+ C12 = function->EvaluateAtIndex(index);
- FlusserValue = vcl_abs( C21 * C12 );
- }
- break;
+ FlusserValue = vcl_abs(C21 * C12);
+ }
+ break;
case 3:
- {
- ComplexType C20,C12;
+ {
+ ComplexType C20, C12;
function->SetP(2);
function->SetQ(0);
- C20 = function->EvaluateAtIndex( index );
+ C20 = function->EvaluateAtIndex(index);
function->SetP(1);
function->SetQ(2);
- C12 = function->EvaluateAtIndex( index );
- FlusserValueComplex = C20 * vcl_pow(C12,2);
+ C12 = function->EvaluateAtIndex(index);
+ FlusserValueComplex = C20 * vcl_pow(C12, 2);
FlusserValue = FlusserValueComplex.real();
- }
- break;
+ }
+ break;
case 4:
- {
- ComplexType C20,C12;
+ {
+ ComplexType C20, C12;
function->SetP(2);
function->SetQ(0);
- C20 = function->EvaluateAtIndex( index );
+ C20 = function->EvaluateAtIndex(index);
function->SetP(1);
function->SetQ(2);
- C12 = function->EvaluateAtIndex( index );
- FlusserValueComplex = C20 * vcl_pow(C12,2);
+ C12 = function->EvaluateAtIndex(index);
+ FlusserValueComplex = C20 * vcl_pow(C12, 2);
FlusserValue = FlusserValueComplex.imag();
- }
- break;
+ }
+ break;
case 5:
- {
- ComplexType C30,C12;
+ {
+ ComplexType C30, C12;
function->SetP(3);
function->SetQ(0);
- C30 = function->EvaluateAtIndex( index );
+ C30 = function->EvaluateAtIndex(index);
function->SetP(1);
function->SetQ(2);
- C12 = function->EvaluateAtIndex( index );
+ C12 = function->EvaluateAtIndex(index);
- FlusserValueComplex = C30 * vcl_pow(C12,3);
+ FlusserValueComplex = C30 * vcl_pow(C12, 3);
FlusserValue = FlusserValueComplex.real();
- }
- break;
+ }
+ break;
case 6:
- {
- ComplexType C30,C12;
+ {
+ ComplexType C30, C12;
function->SetP(3);
function->SetQ(0);
- C30 = function->EvaluateAtIndex( index );
+ C30 = function->EvaluateAtIndex(index);
function->SetP(1);
function->SetQ(2);
- C12 = function->EvaluateAtIndex( index );
+ C12 = function->EvaluateAtIndex(index);
- FlusserValueComplex = C30 * vcl_pow(C12,3);
+ FlusserValueComplex = C30 * vcl_pow(C12, 3);
FlusserValue = FlusserValueComplex.imag();
- }
- break;
- case 7 :
- {
+ }
+ break;
+ case 7:
+ {
ComplexType C22;
function->SetP(2);
function->SetQ(2);
- C22 = function->EvaluateAtIndex( index );
+ C22 = function->EvaluateAtIndex(index);
FlusserValue = C22.real();
- }
- break;
+ }
+ break;
case 8:
- {
- ComplexType C31,C12;
+ {
+ ComplexType C31, C12;
function->SetP(3);
function->SetQ(1);
- C31 = function->EvaluateAtIndex( index );
+ C31 = function->EvaluateAtIndex(index);
function->SetP(1);
function->SetQ(2);
- C12 = function->EvaluateAtIndex( index );
- FlusserValueComplex = C31 * vcl_pow(C12,2);
+ C12 = function->EvaluateAtIndex(index);
+ FlusserValueComplex = C31 * vcl_pow(C12, 2);
FlusserValue = FlusserValueComplex.real();
- }
- break;
+ }
+ break;
case 9:
- {
- ComplexType C31,C12;
+ {
+ ComplexType C31, C12;
function->SetP(3);
function->SetQ(1);
- C31 = function->EvaluateAtIndex( index );
+ C31 = function->EvaluateAtIndex(index);
function->SetP(1);
function->SetQ(2);
- C12 = function->EvaluateAtIndex( index );
- FlusserValueComplex = C31 * vcl_pow(C12,2);
+ C12 = function->EvaluateAtIndex(index);
+ FlusserValueComplex = C31 * vcl_pow(C12, 2);
FlusserValue = FlusserValueComplex.imag();
- }
- break;
+ }
+ break;
case 10:
- {
- ComplexType C40,C12;
+ {
+ ComplexType C40, C12;
function->SetP(4);
function->SetQ(0);
- C40 = function->EvaluateAtIndex( index );
+ C40 = function->EvaluateAtIndex(index);
function->SetP(1);
function->SetQ(2);
- C12 = function->EvaluateAtIndex( index );
- FlusserValueComplex = C40 * vcl_pow(C12,4);
+ C12 = function->EvaluateAtIndex(index);
+ FlusserValueComplex = C40 * vcl_pow(C12, 4);
FlusserValue = FlusserValueComplex.real();
- }
- break;
+ }
+ break;
case 11:
- {
- ComplexType C40,C12;
+ {
+ ComplexType C40, C12;
function->SetP(4);
function->SetQ(0);
- C40 = function->EvaluateAtIndex( index );
+ C40 = function->EvaluateAtIndex(index);
function->SetP(1);
function->SetQ(2);
- C12 = function->EvaluateAtIndex( index );
- FlusserValueComplex = C40 * vcl_pow(C12,4);
+ C12 = function->EvaluateAtIndex(index);
+ FlusserValueComplex = C40 * vcl_pow(C12, 4);
FlusserValue = FlusserValueComplex.imag();
- }
- break;
+ }
+ break;
default:
itkWarningMacro("Hu's invariant parameters are between 1 and 7");
- }
-
+ }
- return (static_cast<RealType>(FlusserValue) );
+ return (static_cast<RealType>(FlusserValue));
}
-
} // namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbFlusserPathFunction.h b/Code/FeatureExtraction/otbFlusserPathFunction.h
index a97cf5830b..31f1c29b1f 100644
--- a/Code/FeatureExtraction/otbFlusserPathFunction.h
+++ b/Code/FeatureExtraction/otbFlusserPathFunction.h
@@ -56,18 +56,18 @@ namespace otb
* \ingroup PathFunctions
*/
-template < class TInputPath,
-class TOutput = double,
-class TPrecision = double>
+template <class TInputPath,
+ class TOutput = double,
+ class TPrecision = double>
class ITK_EXPORT FlusserPathFunction :
- public RealMomentPathFunction< TInputPath, TOutput, TPrecision >
+ public RealMomentPathFunction<TInputPath, TOutput, TPrecision>
{
public:
/** Standard class typedefs. */
- typedef FlusserPathFunction Self;
- typedef RealMomentPathFunction<TInputPath, TOutput, TPrecision> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef FlusserPathFunction Self;
+ typedef RealMomentPathFunction<TInputPath, TOutput, TPrecision> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(FlusserPathFunction, RealMomentPathFunction);
@@ -76,33 +76,33 @@ public:
itkNewMacro(Self);
/** InputPathType typedef support. */
- typedef typename Superclass::PathType PathType;
- typedef typename Superclass::PathConstPointer PathConstPointer;
- typedef typename PathType::ContinuousIndexType VertexType;
- typedef itk::VectorContainer< unsigned,VertexType > VertexListType;
- typedef typename VertexListType::ConstPointer VertexListPointer;
+ typedef typename Superclass::PathType PathType;
+ typedef typename Superclass::PathConstPointer PathConstPointer;
+ typedef typename PathType::ContinuousIndexType VertexType;
+ typedef itk::VectorContainer<unsigned, VertexType> VertexListType;
+ typedef typename VertexListType::ConstPointer VertexListPointer;
- typedef typename Superclass::RealType RealType;
+ typedef typename Superclass::RealType RealType;
/** Type for calculation precision */
- typedef typename Superclass::PrecisionType PrecisionType;
+ typedef typename Superclass::PrecisionType PrecisionType;
/** Evaluate the function at non-integer positions */
- virtual RealType Evaluate( const PathType& path) const;
- virtual RealType Evaluate( ) const;
+ virtual RealType Evaluate(const PathType& path) const;
+ virtual RealType Evaluate() const;
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
- itkSetMacro(MomentNumber,short);
- itkGetConstReferenceMacro( MomentNumber, short );
+ itkSetMacro(MomentNumber, short);
+ itkGetConstReferenceMacro(MomentNumber, short);
protected:
FlusserPathFunction();
- virtual ~FlusserPathFunction() {};
+ virtual ~FlusserPathFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- FlusserPathFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ FlusserPathFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
short m_MomentNumber;
};
diff --git a/Code/FeatureExtraction/otbFlusserPathFunction.txx b/Code/FeatureExtraction/otbFlusserPathFunction.txx
index 8f1b957beb..9bab392bd9 100644
--- a/Code/FeatureExtraction/otbFlusserPathFunction.txx
+++ b/Code/FeatureExtraction/otbFlusserPathFunction.txx
@@ -29,208 +29,205 @@ namespace otb
/**
* Constructor
*/
-template < class TInputPath, class TOutput, class TPrecision>
-FlusserPathFunction<TInputPath, TOutput, TPrecision >
+template <class TInputPath, class TOutput, class TPrecision>
+FlusserPathFunction<TInputPath, TOutput, TPrecision>
::FlusserPathFunction()
{
- m_MomentNumber =-1;
+ m_MomentNumber = -1;
}
/**
*
*/
-template < class TInputPath, class TOutput, class TPrecision>
+template <class TInputPath, class TOutput, class TPrecision>
void
-FlusserPathFunction< TInputPath, TOutput, TPrecision >
+FlusserPathFunction<TInputPath, TOutput, TPrecision>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
os << indent << " m_MomentNumber : " << m_MomentNumber << std::endl;
}
-
-template < class TInputPath, class TOutput, class TPrecision>
+template <class TInputPath, class TOutput, class TPrecision>
typename FlusserPathFunction<TInputPath, TOutput, TPrecision>::RealType
-FlusserPathFunction<TInputPath, TOutput, TPrecision >
-::Evaluate( const PathType& path) const
+FlusserPathFunction<TInputPath, TOutput, TPrecision>
+::Evaluate(const PathType& path) const
{
- typedef ComplexMomentPathFunction<PathType> FunctionType;
- typedef typename FunctionType::ComplexType ComplexType;
+ typedef ComplexMomentPathFunction<PathType> FunctionType;
+ typedef typename FunctionType::ComplexType ComplexType;
RealType FlusserValue(itk::NumericTraits<RealType>::Zero);
ComplexType FlusserValueComplex(itk::NumericTraits<ComplexType>::Zero);
- typename FunctionType::Pointer function =FunctionType::New();
+ typename FunctionType::Pointer function = FunctionType::New();
- function->SetInputPath( this->GetInputPath() );
+ function->SetInputPath(this->GetInputPath());
switch (m_MomentNumber)
- {
- case 1 :
- {
+ {
+ case 1:
+ {
ComplexType C11;
function->SetP(1);
function->SetQ(1);
- C11 = function->Evaluate( );
+ C11 = function->Evaluate();
FlusserValue = C11.real();
- }
- break;
+ }
+ break;
case 2:
- {
- ComplexType C21,C12;
+ {
+ ComplexType C21, C12;
function->SetP(2);
function->SetQ(1);
- C21 = function->Evaluate( );
+ C21 = function->Evaluate();
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( );
+ C12 = function->Evaluate();
- FlusserValue = vcl_abs( C21 * C12 );
- }
- break;
+ FlusserValue = vcl_abs(C21 * C12);
+ }
+ break;
case 3:
- {
- ComplexType C20,C12;
+ {
+ ComplexType C20, C12;
function->SetP(2);
function->SetQ(0);
- C20 = function->Evaluate( );
+ C20 = function->Evaluate();
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( );
- FlusserValueComplex = C20 * vcl_pow(C12,2);
+ C12 = function->Evaluate();
+ FlusserValueComplex = C20 * vcl_pow(C12, 2);
FlusserValue = FlusserValueComplex.real();
- }
- break;
+ }
+ break;
case 4:
- {
- ComplexType C20,C12;
+ {
+ ComplexType C20, C12;
function->SetP(2);
function->SetQ(0);
- C20 = function->Evaluate( );
+ C20 = function->Evaluate();
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( );
- FlusserValueComplex = C20 * vcl_pow(C12,2);
+ C12 = function->Evaluate();
+ FlusserValueComplex = C20 * vcl_pow(C12, 2);
FlusserValue = FlusserValueComplex.imag();
- }
- break;
+ }
+ break;
case 5:
- {
- ComplexType C30,C12;
+ {
+ ComplexType C30, C12;
function->SetP(3);
function->SetQ(0);
- C30 = function->Evaluate( );
+ C30 = function->Evaluate();
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( );
+ C12 = function->Evaluate();
- FlusserValueComplex = C30 * vcl_pow(C12,3);
+ FlusserValueComplex = C30 * vcl_pow(C12, 3);
FlusserValue = FlusserValueComplex.real();
- }
- break;
+ }
+ break;
case 6:
- {
- ComplexType C30,C12;
+ {
+ ComplexType C30, C12;
function->SetP(3);
function->SetQ(0);
- C30 = function->Evaluate( );
+ C30 = function->Evaluate();
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( );
+ C12 = function->Evaluate();
- FlusserValueComplex = C30 * vcl_pow(C12,3);
+ FlusserValueComplex = C30 * vcl_pow(C12, 3);
FlusserValue = FlusserValueComplex.imag();
- }
- break;
- case 7 :
- {
+ }
+ break;
+ case 7:
+ {
ComplexType C22;
function->SetP(2);
function->SetQ(2);
- C22 = function->Evaluate( );
+ C22 = function->Evaluate();
FlusserValue = C22.real();
- }
- break;
+ }
+ break;
case 8:
- {
- ComplexType C31,C12;
+ {
+ ComplexType C31, C12;
function->SetP(3);
function->SetQ(1);
- C31 = function->Evaluate( );
+ C31 = function->Evaluate();
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( );
- FlusserValueComplex = C31 * vcl_pow(C12,2);
+ C12 = function->Evaluate();
+ FlusserValueComplex = C31 * vcl_pow(C12, 2);
FlusserValue = FlusserValueComplex.real();
- }
- break;
+ }
+ break;
case 9:
- {
- ComplexType C31,C12;
+ {
+ ComplexType C31, C12;
function->SetP(3);
function->SetQ(1);
- C31 = function->Evaluate( );
+ C31 = function->Evaluate();
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( );
- FlusserValueComplex = C31 * vcl_pow(C12,2);
+ C12 = function->Evaluate();
+ FlusserValueComplex = C31 * vcl_pow(C12, 2);
FlusserValue = FlusserValueComplex.imag();
- }
- break;
+ }
+ break;
case 10:
- {
- ComplexType C40,C12;
+ {
+ ComplexType C40, C12;
function->SetP(4);
function->SetQ(0);
- C40 = function->Evaluate( );
+ C40 = function->Evaluate();
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( );
- FlusserValueComplex = C40 * vcl_pow(C12,4);
+ C12 = function->Evaluate();
+ FlusserValueComplex = C40 * vcl_pow(C12, 4);
FlusserValue = FlusserValueComplex.real();
- }
- break;
+ }
+ break;
case 11:
- {
- ComplexType C40,C12;
+ {
+ ComplexType C40, C12;
function->SetP(4);
function->SetQ(0);
- C40 = function->Evaluate( );
+ C40 = function->Evaluate();
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( );
- FlusserValueComplex = C40 * vcl_pow(C12,4);
+ C12 = function->Evaluate();
+ FlusserValueComplex = C40 * vcl_pow(C12, 4);
FlusserValue = FlusserValueComplex.imag();
- }
- break;
+ }
+ break;
default:
itkWarningMacro("Flusser's invariant parameters are between 1 and 11");
- }
-
+ }
- return (static_cast<RealType>(FlusserValue) );
+ return (static_cast<RealType>(FlusserValue));
}
-template < class TInputPath, class TOutput, class TPrecision>
+template <class TInputPath, class TOutput, class TPrecision>
typename FlusserPathFunction<TInputPath, TOutput, TPrecision>::RealType
-FlusserPathFunction<TInputPath, TOutput, TPrecision >
+FlusserPathFunction<TInputPath, TOutput, TPrecision>
::Evaluate() const
{
- if ( !this->GetInputPath() )
- {
- otbMsgDevMacro( << "Pb with GetInputPath" );
- return static_cast<RealType>( itk::NumericTraits<PrecisionType>::max());
- }
+ if (!this->GetInputPath())
+ {
+ otbMsgDevMacro(<< "Pb with GetInputPath");
+ return static_cast<RealType>(itk::NumericTraits<PrecisionType>::max());
+ }
- RealType Result = Evaluate( *(this->GetInputPath()) );
+ RealType Result = Evaluate(*(this->GetInputPath()));
return Result;
}
-
} // namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h b/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h
index c21fdb0cda..ea96f1bf42 100644
--- a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h
+++ b/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h
@@ -45,79 +45,74 @@ namespace otb
* \ingroup ImageFunctions
*/
-template < class TPixel,
-class TInterpol,
-unsigned int Dimension = 2 >
+template <class TPixel,
+ class TInterpol,
+ unsigned int Dimension = 2>
class ITK_EXPORT ForwardFourierMellinTransformImageFilter :
- public itk::ImageToImageFilter<Image< TPixel , Dimension >,
- itk::Image< std::complex<TPixel> , Dimension > >
+ public itk::ImageToImageFilter<Image<TPixel, Dimension>,
+ itk::Image<std::complex<TPixel>, Dimension> >
{
public:
//typedef TPixel PixelType;
- typedef Image< TPixel , Dimension > InputImageType;
+ typedef Image<TPixel, Dimension> InputImageType;
/* typedef otb::Image< std::complex< TPixel > , Dimension > OutputImageType; */
- typedef typename itk::VnlFFTRealToComplexConjugateImageFilter<TPixel,Dimension> FourierImageFilterType;
- typedef typename FourierImageFilterType::OutputImageType OutputImageType;
-
+ typedef typename itk::VnlFFTRealToComplexConjugateImageFilter<TPixel, Dimension> FourierImageFilterType;
+ typedef typename FourierImageFilterType::OutputImageType OutputImageType;
/** Standard class typedefs. */
- typedef ForwardFourierMellinTransformImageFilter Self;
- typedef itk::ImageToImageFilter< InputImageType, OutputImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ForwardFourierMellinTransformImageFilter Self;
+ typedef itk::ImageToImageFilter<InputImageType, OutputImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
- itkTypeMacro( ForwardFourierMellinTransformImageFilter, itk::ImageToImageFilter);
+ itkTypeMacro(ForwardFourierMellinTransformImageFilter, itk::ImageToImageFilter);
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** InputImageType typedef support. */
- typedef typename InputImageType::PixelType PixelType;
- typedef typename InputImageType::IndexType IndexType;
- typedef typename InputImageType::Pointer ImagePointer;
- typedef typename InputImageType::ConstPointer ImageConstPointer;
-
+ typedef typename InputImageType::PixelType PixelType;
+ typedef typename InputImageType::IndexType IndexType;
+ typedef typename InputImageType::Pointer ImagePointer;
+ typedef typename InputImageType::ConstPointer ImageConstPointer;
/** InputImageType typedef support. */
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::IndexType OutputIndexType;
- typedef typename OutputImageType::SizeType OutputSizeType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::ConstPointer OutputImageConstPointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::IndexType OutputIndexType;
+ typedef typename OutputImageType::SizeType OutputSizeType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::ConstPointer OutputImageConstPointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
-
- typedef typename OutputImageType::PixelType ComplexType;
+ typedef typename OutputImageType::PixelType ComplexType;
/** Typedefs to describe and access Interpolator */
- typedef TInterpol InterpolatorType;
- typedef typename InterpolatorType::Pointer InterpolatorPointerType;
- typedef typename InterpolatorType::ConstPointer InterpolatorConstPointerType;
- typedef typename InterpolatorType::CoordRepType CoordRepType;
- typedef typename InterpolatorType::PointType PointType;
-
+ typedef TInterpol InterpolatorType;
+ typedef typename InterpolatorType::Pointer InterpolatorPointerType;
+ typedef typename InterpolatorType::ConstPointer InterpolatorConstPointerType;
+ typedef typename InterpolatorType::CoordRepType CoordRepType;
+ typedef typename InterpolatorType::PointType PointType;
- typedef LogPolarTransform<CoordRepType> LogPolarTransformType;
- typedef typename LogPolarTransformType::Pointer LogPolarTransformPointerType;
- typedef itk::ResampleImageFilter<InputImageType,InputImageType,CoordRepType> ResampleFilterType;
- typedef typename ResampleFilterType::Pointer ResampleFilterPointerType;
- typedef itk::ImageRegionIteratorWithIndex<InputImageType> IteratorType;
+ typedef LogPolarTransform<CoordRepType> LogPolarTransformType;
+ typedef typename LogPolarTransformType::Pointer LogPolarTransformPointerType;
+ typedef itk::ResampleImageFilter<InputImageType, InputImageType, CoordRepType> ResampleFilterType;
+ typedef typename ResampleFilterType::Pointer ResampleFilterPointerType;
+ typedef itk::ImageRegionIteratorWithIndex<InputImageType> IteratorType;
-
- typedef typename FourierImageFilterType::Pointer FourierImageFilterPointer;
- typedef typename FourierImageFilterType::ConstPointer FourierImageFilterConstPointer;
+ typedef typename FourierImageFilterType::Pointer FourierImageFilterPointer;
+ typedef typename FourierImageFilterType::ConstPointer FourierImageFilterConstPointer;
/** Set/Get the output size of the transform (should be powers of two in both directions */
- itkSetMacro(OutputSize,OutputSizeType);
- itkGetMacro(OutputSize,OutputSizeType);
+ itkSetMacro(OutputSize, OutputSizeType);
+ itkGetMacro(OutputSize, OutputSizeType);
/** Set/Get the Sigma value for the Log-polar resampler */
- itkSetMacro(Sigma,double);
- itkGetMacro(Sigma,double);
+ itkSetMacro(Sigma, double);
+ itkGetMacro(Sigma, double);
/** Set/Get the Default pixel value for the Log-polar resampler */
itkSetMacro(DefaultPixelValue, PixelType);
@@ -126,21 +121,19 @@ public:
virtual void GenerateOutputInformation(void);
/** Set/Get the Interpolator pointer for the Log-polar resampler */
- itkSetObjectMacro(Interpolator,InterpolatorType);
- itkGetObjectMacro(Interpolator,InterpolatorType);
-
+ itkSetObjectMacro(Interpolator, InterpolatorType);
+ itkGetObjectMacro(Interpolator, InterpolatorType);
protected:
ForwardFourierMellinTransformImageFilter();
- virtual ~ForwardFourierMellinTransformImageFilter() {};
+ virtual ~ForwardFourierMellinTransformImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Main Computation Method */
void GenerateData();
-
private:
- ForwardFourierMellinTransformImageFilter( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ ForwardFourierMellinTransformImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Sigma for normalization */
double m_Sigma;
@@ -175,4 +168,3 @@ private:
#endif
#endif
-
diff --git a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.txx b/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.txx
index 738bfa6435..882ba859ed 100644
--- a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.txx
+++ b/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.txx
@@ -23,8 +23,8 @@
namespace otb
{
-template < class TPixel,class TInterpol,unsigned int Dimension >
-ForwardFourierMellinTransformImageFilter<TPixel, TInterpol, Dimension >
+template <class TPixel, class TInterpol, unsigned int Dimension>
+ForwardFourierMellinTransformImageFilter<TPixel, TInterpol, Dimension>
::ForwardFourierMellinTransformImageFilter()
{
@@ -36,12 +36,12 @@ ForwardFourierMellinTransformImageFilter<TPixel, TInterpol, Dimension >
m_ResampleFilter = ResampleFilterType::New();
m_ResampleFilter->SetInterpolator(m_Interpolator);
m_ResampleFilter->SetTransform(m_Transform);
- m_DefaultPixelValue=0;
+ m_DefaultPixelValue = 0;
}
-template < class TPixel,class TInterpol,unsigned int Dimension >
+template <class TPixel, class TInterpol, unsigned int Dimension>
void
-ForwardFourierMellinTransformImageFilter<TPixel, TInterpol, Dimension >
+ForwardFourierMellinTransformImageFilter<TPixel, TInterpol, Dimension>
::GenerateOutputInformation(void)
{
Superclass::GenerateOutputInformation();
@@ -49,29 +49,31 @@ ForwardFourierMellinTransformImageFilter<TPixel, TInterpol, Dimension >
OutputImagePointer outputPtr = this->GetOutput();
if (!outputPtr)
- {
+ {
return;
- }
+ }
typename OutputImageType::RegionType largestPossibleRegion;
- typename OutputImageType::IndexType index;
+ typename OutputImageType::IndexType index;
index.Fill(0);
largestPossibleRegion.SetIndex(index);
largestPossibleRegion.SetSize(m_OutputSize);
outputPtr->SetLargestPossibleRegion(largestPossibleRegion);
}
-template < class TPixel,class TInterpol,unsigned int Dimension >
+template <class TPixel, class TInterpol, unsigned int Dimension>
void
-ForwardFourierMellinTransformImageFilter<TPixel, TInterpol, Dimension >
+ForwardFourierMellinTransformImageFilter<TPixel, TInterpol, Dimension>
::GenerateData()
{
typename LogPolarTransformType::ParametersType params(4);
// Center the transform
- params[0]=0.5*static_cast<double>(this->GetInput()->GetLargestPossibleRegion().GetSize()[0]);
- params[1]=0.5*static_cast<double>(this->GetInput()->GetLargestPossibleRegion().GetSize()[1]);
- params[2]=360./m_OutputSize[0];
- params[3]=vcl_log(vcl_sqrt(vcl_pow(static_cast<double>(this->GetInput()->GetLargestPossibleRegion().GetSize()[0]),2)
- +vcl_pow(static_cast<double>(this->GetInput()->GetLargestPossibleRegion().GetSize()[1]),2.))/2)/m_OutputSize[1];
+ params[0] = 0.5 * static_cast<double>(this->GetInput()->GetLargestPossibleRegion().GetSize()[0]);
+ params[1] = 0.5 * static_cast<double>(this->GetInput()->GetLargestPossibleRegion().GetSize()[1]);
+ params[2] = 360. / m_OutputSize[0];
+ params[3] =
+ vcl_log(vcl_sqrt(vcl_pow(static_cast<double>(this->GetInput()->GetLargestPossibleRegion().GetSize()[0]), 2)
+ + vcl_pow(static_cast<double>(this->GetInput()->GetLargestPossibleRegion().GetSize()[1]),
+ 2.)) / 2) / m_OutputSize[1];
m_Transform->SetParameters(params);
// log polar resampling
@@ -81,53 +83,53 @@ ForwardFourierMellinTransformImageFilter<TPixel, TInterpol, Dimension >
m_ResampleFilter->Update();
typename InputImageType::Pointer tempImage = m_ResampleFilter->GetOutput();
- m_Iterator = IteratorType(tempImage,tempImage->GetRequestedRegion());
+ m_Iterator = IteratorType(tempImage, tempImage->GetRequestedRegion());
// Min/max values of the output pixel type AND these values
// represented as the output type of the interpolator
- const PixelType minOutputValue = itk::NumericTraits<PixelType >::NonpositiveMin();
- const PixelType maxOutputValue = itk::NumericTraits<PixelType >::max();
+ const PixelType minOutputValue = itk::NumericTraits<PixelType>::NonpositiveMin();
+ const PixelType maxOutputValue = itk::NumericTraits<PixelType>::max();
// Normalization is specific to FourierMellin convergence conditions, and
// thus should be implemented here instead of in the resample filter.
- for (m_Iterator.GoToBegin();!m_Iterator.IsAtEnd();++m_Iterator)
- {
- double Rho = m_Iterator.GetIndex()[1]*params[3];
+ for (m_Iterator.GoToBegin(); !m_Iterator.IsAtEnd(); ++m_Iterator)
+ {
+ double Rho = m_Iterator.GetIndex()[1] * params[3];
PixelType pixval;
- double valueTemp = static_cast<double>(m_Iterator.Get());
+ double valueTemp = static_cast<double>(m_Iterator.Get());
valueTemp *= vcl_exp(m_Sigma * Rho);
- valueTemp *=params[3];
+ valueTemp *= params[3];
PixelType value = static_cast<PixelType>(valueTemp);
- if ( value < minOutputValue )
- {
+ if (value < minOutputValue)
+ {
pixval = minOutputValue;
- }
- else if ( value > maxOutputValue )
- {
+ }
+ else if (value > maxOutputValue)
+ {
pixval = maxOutputValue;
- }
+ }
else
- {
+ {
pixval = static_cast<PixelType>(value);
- }
+ }
m_Iterator.Set(pixval);
- }
- m_FFTFilter->SetInput(tempImage );
+ }
+ m_FFTFilter->SetInput(tempImage);
- m_FFTFilter->GraftOutput( this->GetOutput() );
+ m_FFTFilter->GraftOutput(this->GetOutput());
m_FFTFilter->Update();
- this->GraftOutput( m_FFTFilter->GetOutput() );
+ this->GraftOutput(m_FFTFilter->GetOutput());
}
/**
* Standard "PrintSelf" method
*/
-template < class TPixel,class TInterpol,unsigned int Dimension >
+template <class TPixel, class TInterpol, unsigned int Dimension>
void
-ForwardFourierMellinTransformImageFilter<TPixel, TInterpol, Dimension >
+ForwardFourierMellinTransformImageFilter<TPixel, TInterpol, Dimension>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbGenericRoadExtractionFilter.h b/Code/FeatureExtraction/otbGenericRoadExtractionFilter.h
index fdb2908f40..d4b4d17760 100644
--- a/Code/FeatureExtraction/otbGenericRoadExtractionFilter.h
+++ b/Code/FeatureExtraction/otbGenericRoadExtractionFilter.h
@@ -72,123 +72,120 @@ namespace otb
*/
template <class TInputImage, class TOutputPath>
class ITK_EXPORT GenericRoadExtractionFilter
- : public ImageToPathListFilter<TInputImage,TOutputPath>
+ : public ImageToPathListFilter<TInputImage, TOutputPath>
{
-public :
+public:
/** Standard typedefs */
- typedef GenericRoadExtractionFilter Self;
- typedef ImageToPathListFilter<TInputImage,TOutputPath> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef GenericRoadExtractionFilter Self;
+ typedef ImageToPathListFilter<TInputImage, TOutputPath> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(GenericRoadExtractionFilter,ImageToPathListFilter);
+ itkTypeMacro(GenericRoadExtractionFilter, ImageToPathListFilter);
/** Template parameters typedefs */
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::OutputPathType OutputPathType;
- typedef typename Superclass::OutputPathListType OutputPathListType;
- typedef typename InputImageType::PixelType InputPixelType;
- typedef double InternalPixelType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::OutputPathType OutputPathType;
+ typedef typename Superclass::OutputPathListType OutputPathListType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef double InternalPixelType;
- typedef otb::VectorImage<InternalPixelType,InputImageType::ImageDimension> VectorImageType;
- typedef otb::Image<InternalPixelType,InputImageType::ImageDimension> ModulusType;
- typedef otb::Image<InternalPixelType,InputImageType::ImageDimension> DirectionType;
+ typedef otb::VectorImage<InternalPixelType, InputImageType::ImageDimension> VectorImageType;
+ typedef otb::Image<InternalPixelType, InputImageType::ImageDimension> ModulusType;
+ typedef otb::Image<InternalPixelType, InputImageType::ImageDimension> DirectionType;
- typedef itk::CovariantVector<InternalPixelType,InputImageType::ImageDimension>
+ typedef itk::CovariantVector<InternalPixelType, InputImageType::ImageDimension>
VectorPixelType;
- typedef otb::Image<VectorPixelType,InputImageType::ImageDimension> CovariantVectorImageType;
-
+ typedef otb::Image<VectorPixelType, InputImageType::ImageDimension> CovariantVectorImageType;
typedef itk::SqrtImageFilter<
- InputImageType,
- InputImageType> SquareRootImageFilterType;
+ InputImageType,
+ InputImageType> SquareRootImageFilterType;
typedef itk::GradientRecursiveGaussianImageFilter<
- InputImageType,
- CovariantVectorImageType> GradientFilterType;
+ InputImageType,
+ CovariantVectorImageType> GradientFilterType;
typedef NeighborhoodScalarProductFilter<
- CovariantVectorImageType,
- ModulusType,
- DirectionType> NeighborhoodScalarProductFilterType;
+ CovariantVectorImageType,
+ ModulusType,
+ DirectionType> NeighborhoodScalarProductFilterType;
typedef RemoveIsolatedByDirectionFilter<
- ModulusType,
- DirectionType,
- ModulusType > RemoveIsolatedByDirectionFilterType;
+ ModulusType,
+ DirectionType,
+ ModulusType> RemoveIsolatedByDirectionFilterType;
typedef RemoveWrongDirectionFilter<
- ModulusType,
- DirectionType,
- ModulusType> RemoveWrongDirectionFilterType;
+ ModulusType,
+ DirectionType,
+ ModulusType> RemoveWrongDirectionFilterType;
typedef NonMaxRemovalByDirectionFilter<
- ModulusType,
- DirectionType,
- ModulusType > NonMaxRemovalByDirectionFilterType;
+ ModulusType,
+ DirectionType,
+ ModulusType> NonMaxRemovalByDirectionFilterType;
typedef VectorizationPathListFilter<
- ModulusType,
- DirectionType,
- OutputPathType > VectorizationPathListFilterType;
+ ModulusType,
+ DirectionType,
+ OutputPathType> VectorizationPathListFilterType;
- typedef SimplifyPathListFilter<OutputPathType> SimplifyPathListFilterType;
- typedef BreakAngularPathListFilter<OutputPathType> BreakAngularPathListFilterType;
- typedef RemoveTortuousPathListFilter<OutputPathType> RemoveTortuousPathListFilterType;
- typedef LinkPathListFilter<OutputPathType> LinkPathListFilterType;
- typedef LikelihoodPathListFilter<OutputPathType, ModulusType> LikelihoodPathListFilterType;
+ typedef SimplifyPathListFilter<OutputPathType> SimplifyPathListFilterType;
+ typedef BreakAngularPathListFilter<OutputPathType> BreakAngularPathListFilterType;
+ typedef RemoveTortuousPathListFilter<OutputPathType> RemoveTortuousPathListFilterType;
+ typedef LinkPathListFilter<OutputPathType> LinkPathListFilterType;
+ typedef LikelihoodPathListFilter<OutputPathType, ModulusType> LikelihoodPathListFilterType;
/** Template parameters typedefs for internals filters */
- typedef typename GradientFilterType::RealType SigmaType;
+ typedef typename GradientFilterType::RealType SigmaType;
typedef typename VectorizationPathListFilterType::InputPixelType AmplitudeThresholdType;
// typedef typename SimplifyPathListFilterType::ToleranceType ToleranceType;
- typedef double ToleranceType;
+ typedef double ToleranceType;
typedef typename BreakAngularPathListFilterType::MaxAngleType MaxAngleType;
// typedef typename RemoveTortuousPathListFilterType::MeanDistanceThresholdType MeanDistanceThresholdType;
- typedef double MeanDistanceThresholdType;
+ typedef double MeanDistanceThresholdType;
typedef typename LinkPathListFilterType::RealType LinkRealType;
-
/** Get/Set the alpha value */
- itkGetConstReferenceMacro(Alpha,double);
- itkSetMacro(Alpha,double);
+ itkGetConstReferenceMacro(Alpha, double);
+ itkSetMacro(Alpha, double);
/** Get/Set the amplitude threshold to start following a path (use by the VectorizationPathListFilter)*/
- itkSetMacro(AmplitudeThreshold,AmplitudeThresholdType);
- itkGetMacro(AmplitudeThreshold,AmplitudeThresholdType);
+ itkSetMacro(AmplitudeThreshold, AmplitudeThresholdType);
+ itkGetMacro(AmplitudeThreshold, AmplitudeThresholdType);
/** Get/Set the tolerance for segment consistency (tolerance in terms of distance) (use by the SimplifyPathListFilter)*/
- itkGetMacro(Tolerance,ToleranceType);
- itkSetMacro(Tolerance,ToleranceType);
+ itkGetMacro(Tolerance, ToleranceType);
+ itkSetMacro(Tolerance, ToleranceType);
/** Get/Set the resolution */
- itkGetMacro(Resolution,double);
- itkSetMacro(Resolution,double);
+ itkGetMacro(Resolution, double);
+ itkSetMacro(Resolution, double);
/** Set/Get the max angle (use bye the BreakAngularPathListFilter)*/
- itkSetMacro(MaxAngle,MaxAngleType);
- itkGetConstMacro(MaxAngle,MaxAngleType);
+ itkSetMacro(MaxAngle, MaxAngleType);
+ itkGetConstMacro(MaxAngle, MaxAngleType);
/** Get/Set the tolerance for segment consistency (tolerance in terms of distance) (use by RemoveTortuousPathListFilter)*/
- itkGetMacro(FirstMeanDistanceThreshold,MeanDistanceThresholdType);
- itkSetMacro(FirstMeanDistanceThreshold,MeanDistanceThresholdType);
- itkGetMacro(SecondMeanDistanceThreshold,MeanDistanceThresholdType);
- itkSetMacro(SecondMeanDistanceThreshold,MeanDistanceThresholdType);
+ itkGetMacro(FirstMeanDistanceThreshold, MeanDistanceThresholdType);
+ itkSetMacro(FirstMeanDistanceThreshold, MeanDistanceThresholdType);
+ itkGetMacro(SecondMeanDistanceThreshold, MeanDistanceThresholdType);
+ itkSetMacro(SecondMeanDistanceThreshold, MeanDistanceThresholdType);
/** Get/Set the angular threshold (use by LinkPathFilter)*/
- itkSetMacro(AngularThreshold,LinkRealType);
- itkGetMacro(AngularThreshold,LinkRealType);
+ itkSetMacro(AngularThreshold, LinkRealType);
+ itkGetMacro(AngularThreshold, LinkRealType);
/** Get/Set the distance threshold (use by LinkPathFilter)*/
- itkSetMacro(DistanceThreshold,LinkRealType);
- itkGetMacro(DistanceThreshold,LinkRealType);
-
+ itkSetMacro(DistanceThreshold, LinkRealType);
+ itkGetMacro(DistanceThreshold, LinkRealType);
protected:
/** Constructor */
GenericRoadExtractionFilter();
/** Destructor */
- ~GenericRoadExtractionFilter() {};
+ ~GenericRoadExtractionFilter() {}
/** Prepare main computation method */
void BeforeGenerateData(void);
@@ -198,27 +195,25 @@ protected:
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-private :
-
- GenericRoadExtractionFilter(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
-
-
- typename SquareRootImageFilterType::Pointer m_SquareRootImageFilter;
- typename GradientFilterType::Pointer m_GradientFilter;
- typename NeighborhoodScalarProductFilterType::Pointer m_NeighborhoodScalarProductFilter;
- typename RemoveIsolatedByDirectionFilterType::Pointer m_RemoveIsolatedByDirectionFilter;
- typename RemoveWrongDirectionFilterType::Pointer m_RemoveWrongDirectionFilter;
- typename NonMaxRemovalByDirectionFilterType::Pointer m_NonMaxRemovalByDirectionFilter;
- typename VectorizationPathListFilterType::Pointer m_VectorizationPathListFilter;
- typename SimplifyPathListFilterType::Pointer m_FirstSimplifyPathListFilter;
- typename SimplifyPathListFilterType::Pointer m_SecondSimplifyPathListFilter;
- typename BreakAngularPathListFilterType::Pointer m_BreakAngularPathListFilter;
- typename RemoveTortuousPathListFilterType::Pointer m_FirstRemoveTortuousPathListFilter;
- typename RemoveTortuousPathListFilterType::Pointer m_SecondRemoveTortuousPathListFilter;
- typename LinkPathListFilterType::Pointer m_LinkPathListFilter;
- typename LikelihoodPathListFilterType::Pointer m_LikelihoodPathListFilter;
-
+private:
+
+ GenericRoadExtractionFilter(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
+
+ typename SquareRootImageFilterType::Pointer m_SquareRootImageFilter;
+ typename GradientFilterType::Pointer m_GradientFilter;
+ typename NeighborhoodScalarProductFilterType::Pointer m_NeighborhoodScalarProductFilter;
+ typename RemoveIsolatedByDirectionFilterType::Pointer m_RemoveIsolatedByDirectionFilter;
+ typename RemoveWrongDirectionFilterType::Pointer m_RemoveWrongDirectionFilter;
+ typename NonMaxRemovalByDirectionFilterType::Pointer m_NonMaxRemovalByDirectionFilter;
+ typename VectorizationPathListFilterType::Pointer m_VectorizationPathListFilter;
+ typename SimplifyPathListFilterType::Pointer m_FirstSimplifyPathListFilter;
+ typename SimplifyPathListFilterType::Pointer m_SecondSimplifyPathListFilter;
+ typename BreakAngularPathListFilterType::Pointer m_BreakAngularPathListFilter;
+ typename RemoveTortuousPathListFilterType::Pointer m_FirstRemoveTortuousPathListFilter;
+ typename RemoveTortuousPathListFilterType::Pointer m_SecondRemoveTortuousPathListFilter;
+ typename LinkPathListFilterType::Pointer m_LinkPathListFilter;
+ typename LikelihoodPathListFilterType::Pointer m_LikelihoodPathListFilter;
/** Amplitude threshold to start following a path (use by the VectorizationPathListFilter)*/
AmplitudeThresholdType m_AmplitudeThreshold;
@@ -245,7 +240,7 @@ private :
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbGenericRoadExtractionFilter.txx"
diff --git a/Code/FeatureExtraction/otbGenericRoadExtractionFilter.txx b/Code/FeatureExtraction/otbGenericRoadExtractionFilter.txx
index d64ace2691..9671526198 100644
--- a/Code/FeatureExtraction/otbGenericRoadExtractionFilter.txx
+++ b/Code/FeatureExtraction/otbGenericRoadExtractionFilter.txx
@@ -26,7 +26,7 @@ namespace otb
/**
* Constructor
*/
-template <class TInputImage,class TOutputPath>
+template <class TInputImage, class TOutputPath>
GenericRoadExtractionFilter<TInputImage, TOutputPath>
::GenericRoadExtractionFilter()
{
@@ -49,7 +49,7 @@ GenericRoadExtractionFilter<TInputImage, TOutputPath>
m_LikelihoodPathListFilter = LikelihoodPathListFilterType::New();
/** Amplitude threshold to start following a path (use by the VectorizationPathListFilter)*/
- m_AmplitudeThreshold = static_cast<AmplitudeThresholdType>(0.00005 );
+ m_AmplitudeThreshold = static_cast<AmplitudeThresholdType>(0.00005);
/** Tolerance for segment consistency (tolerance in terms of distance) (use by the SimplifyPathFilter)*/
m_Tolerance = static_cast<ToleranceType>(1.);
/** Max angle (use bye the BreakAngularPathListFilter)*/
@@ -73,7 +73,7 @@ GenericRoadExtractionFilter<TInputImage, TOutputPath>
/**
* Prepare main computation method
*/
-template <class TInputImage,class TOutputPath>
+template <class TInputImage, class TOutputPath>
void
GenericRoadExtractionFilter<TInputImage, TOutputPath>
::BeforeGenerateData()
@@ -82,25 +82,25 @@ GenericRoadExtractionFilter<TInputImage, TOutputPath>
typename InputImageType::SpacingType spacing = this->GetInput()->GetSpacing();
// Getting x Spacing for the resolution
m_Resolution = static_cast<double>(spacing[0]);
- if ( m_Resolution == 0. )
- {
+ if (m_Resolution == 0.)
+ {
itkWarningMacro(<< "The image spacing is zero. So the resolution used in the filter is forced to 1.");
m_Resolution = 1.;
- }
+ }
}
/**
* Main computation method
*/
-template <class TInputImage,class TOutputPath>
+template <class TInputImage, class TOutputPath>
void
GenericRoadExtractionFilter<TInputImage, TOutputPath>
::GenerateData()
{
// // Input images pointers
typename InputImageType::ConstPointer inputImage = this->GetInput();
- typename OutputPathListType::Pointer outputPathList = this->GetOutput();
+ typename OutputPathListType::Pointer outputPathList = this->GetOutput();
///////////////////////////////////////
//// Algorithm for road extraction ////
@@ -112,7 +112,7 @@ GenericRoadExtractionFilter<TInputImage, TOutputPath>
m_GradientFilter->SetInput(m_SquareRootImageFilter->GetOutput());
/** Sigma calculated with the alpha and image resolution parameters */
- m_GradientFilter->SetSigma(static_cast<SigmaType>(m_Alpha * (1.2/m_Resolution + 1.) ));
+ m_GradientFilter->SetSigma(static_cast<SigmaType>(m_Alpha * (1.2 / m_Resolution + 1.)));
m_NeighborhoodScalarProductFilter->SetInput(m_GradientFilter->GetOutput());
@@ -140,7 +140,7 @@ GenericRoadExtractionFilter<TInputImage, TOutputPath>
m_LinkPathListFilter->SetInput(m_FirstRemoveTortuousPathListFilter->GetOutput());
m_LinkPathListFilter->SetAngularThreshold(m_AngularThreshold);
- m_LinkPathListFilter->SetDistanceThreshold( static_cast<LinkRealType>(m_DistanceThreshold/m_Resolution) );
+ m_LinkPathListFilter->SetDistanceThreshold(static_cast<LinkRealType>(m_DistanceThreshold / m_Resolution));
m_SecondSimplifyPathListFilter->SetInput(m_LinkPathListFilter->GetOutput());
m_SecondSimplifyPathListFilter->GetFunctor().SetTolerance(m_Tolerance);
@@ -157,31 +157,31 @@ GenericRoadExtractionFilter<TInputImage, TOutputPath>
m_LikelihoodPathListFilter->Update();
// outputPathList = m_LikelihoodPathListFilter->GetOutput();
for (typename LikelihoodPathListFilterType::PathListType::ConstIterator it
- = m_LikelihoodPathListFilter->GetOutput()->Begin();
- it!=m_LikelihoodPathListFilter->GetOutput()->End();
+ = m_LikelihoodPathListFilter->GetOutput()->Begin();
+ it != m_LikelihoodPathListFilter->GetOutput()->End();
++it)
- {
+ {
outputPathList->PushBack(it.Get());
- }
+ }
}
/**
* PrintSelf method
*/
-template <class TInputImage,class TOutputPath>
+template <class TInputImage, class TOutputPath>
void
GenericRoadExtractionFilter<TInputImage, TOutputPath>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os << indent << "m_Alpha:"<< m_Alpha << std::endl;
- os << indent << "m_Resolution:"<< m_Resolution << std::endl;
- os << indent << "m_AmplitudeThreshold: "<< m_AmplitudeThreshold << std::endl;
- os << indent << "m_Tolerance: "<< m_Tolerance << std::endl;
- os << indent << "m_MaxAngle: "<< m_MaxAngle << std::endl;
- os << indent << "m_FirstMeanDistanceThreshold: "<< m_FirstMeanDistanceThreshold << std::endl;
- os << indent << "m_SecondMeanDistanceThreshold: "<< m_SecondMeanDistanceThreshold << std::endl;
- os << indent << "m_DistanceThreshold: "<<m_DistanceThreshold<< std::endl;
- os << indent << "m_AngularThreshold: "<<m_AngularThreshold<< std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "m_Alpha:" << m_Alpha << std::endl;
+ os << indent << "m_Resolution:" << m_Resolution << std::endl;
+ os << indent << "m_AmplitudeThreshold: " << m_AmplitudeThreshold << std::endl;
+ os << indent << "m_Tolerance: " << m_Tolerance << std::endl;
+ os << indent << "m_MaxAngle: " << m_MaxAngle << std::endl;
+ os << indent << "m_FirstMeanDistanceThreshold: " << m_FirstMeanDistanceThreshold << std::endl;
+ os << indent << "m_SecondMeanDistanceThreshold: " << m_SecondMeanDistanceThreshold << std::endl;
+ os << indent << "m_DistanceThreshold: " << m_DistanceThreshold << std::endl;
+ os << indent << "m_AngularThreshold: " << m_AngularThreshold << std::endl;
}
} // End namespace otb
diff --git a/Code/FeatureExtraction/otbGeometricMomentImageFunction.h b/Code/FeatureExtraction/otbGeometricMomentImageFunction.h
index 5ab94c5b37..6228b6451d 100644
--- a/Code/FeatureExtraction/otbGeometricMomentImageFunction.h
+++ b/Code/FeatureExtraction/otbGeometricMomentImageFunction.h
@@ -20,7 +20,6 @@
#include "itkImageFunction.h"
-
namespace otb
{
@@ -31,59 +30,57 @@ namespace otb
* \ingroup ImageFunctions
*/
-template < class TInput,
-class TOutput = float,
-class TPrecision = double,
-class TCoordRep = float >
+template <class TInput,
+ class TOutput = float,
+ class TPrecision = double,
+ class TCoordRep = float>
class ITK_EXPORT GeometricMomentImageFunction :
- public itk::ImageFunction<TInput, TOutput,TCoordRep >
+ public itk::ImageFunction<TInput, TOutput, TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef GeometricMomentImageFunction Self;
- typedef itk::ImageFunction< TInput, TOutput,TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef GeometricMomentImageFunction Self;
+ typedef itk::ImageFunction<TInput, TOutput, TCoordRep> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(GeometricMomentImageFunction, itk::ImageFunction);
-
/** InputImageType typedef support. */
- typedef typename Superclass::InputType InputType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::PointType PointType;
+ typedef typename Superclass::InputType InputType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
+ typedef typename Superclass::PointType PointType;
- typedef TOutput OutputType;
+ typedef TOutput OutputType;
/** Type for calculation precision */
- typedef TPrecision PrecisionType;
+ typedef TPrecision PrecisionType;
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
- itkSetMacro( NeighborhoodRadius, int );
- itkGetConstReferenceMacro( NeighborhoodRadius, int );
+ itkSetMacro(NeighborhoodRadius, int);
+ itkGetConstReferenceMacro(NeighborhoodRadius, int);
protected:
GeometricMomentImageFunction()
- {
+ {
m_NeighborhoodRadius = -1;
- };
+ };
- ~GeometricMomentImageFunction() {};
+ ~GeometricMomentImageFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << " m_NeighborhoodRadius: " << m_NeighborhoodRadius << std::endl;
}
private:
- GeometricMomentImageFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ GeometricMomentImageFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
int m_NeighborhoodRadius;
-
};
} // namespace otb
diff --git a/Code/FeatureExtraction/otbGeometricMomentPathFunction.h b/Code/FeatureExtraction/otbGeometricMomentPathFunction.h
index 67bacb5468..ca399944d8 100644
--- a/Code/FeatureExtraction/otbGeometricMomentPathFunction.h
+++ b/Code/FeatureExtraction/otbGeometricMomentPathFunction.h
@@ -20,7 +20,6 @@
#include "otbPathFunction.h"
-
namespace otb
{
@@ -31,48 +30,45 @@ namespace otb
* \ingroup PathFunctions
*/
-template < class TInputPath,
-class TOutput,
-class TPrecision = double>
+template <class TInputPath,
+ class TOutput,
+ class TPrecision = double>
class ITK_EXPORT GeometricMomentPathFunction :
- public PathFunction< TInputPath, TOutput>
+ public PathFunction<TInputPath, TOutput>
{
public:
/** Standard class typedefs. */
- typedef GeometricMomentPathFunction Self;
- typedef PathFunction< TInputPath, TOutput> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef GeometricMomentPathFunction Self;
+ typedef PathFunction<TInputPath, TOutput> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(GeometricMomentPathFunction, PathFunction);
-
/** InputPathType typedef support. */
typedef typename Superclass::InputPathType PathType;
typedef typename Superclass::InputPathConstPointer PathConstPointer;
/** OutputPathType typedef support. */
- typedef typename Superclass::OutputType OutputType;
+ typedef typename Superclass::OutputType OutputType;
/** Type for calculation precision */
- typedef TPrecision PrecisionType;
-
+ typedef TPrecision PrecisionType;
protected:
GeometricMomentPathFunction() {};
- ~GeometricMomentPathFunction() {};
+ ~GeometricMomentPathFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
private:
- GeometricMomentPathFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ GeometricMomentPathFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbHarrisImageFilter.h b/Code/FeatureExtraction/otbHarrisImageFilter.h
index 2af22448a2..d8cc8ce8f9 100644
--- a/Code/FeatureExtraction/otbHarrisImageFilter.h
+++ b/Code/FeatureExtraction/otbHarrisImageFilter.h
@@ -49,59 +49,58 @@ The interest points can then be extracted with a thresholding filter.
*/
template <class TInputImage, class TOutputImage>
-class HarrisImageFilter : public itk::ImageToImageFilter< TInputImage, TOutputImage >
+class HarrisImageFilter : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,
- unsigned int,
- TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension,
+ unsigned int,
+ TOutputImage::ImageDimension);
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
- typedef HarrisImageFilter Self;
- typedef itk::ImageToImageFilter< InputImageType, OutputImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef HarrisImageFilter Self;
+ typedef itk::ImageToImageFilter<InputImageType, OutputImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
itkNewMacro(Self);
itkTypeMacro(HarrisImageFilter, ImageToImageFilter);
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::SizeType SizeType;
typedef typename OutputImageType::PixelType OutputPixelType;
// typedef typename InputImageType::SizeType SizeType;
- typedef itk::Image< itk::SymmetricSecondRankTensor<
- typename itk::NumericTraits< InputPixelType>::RealType,
- ::itk::GetImageDimension<InputImageType>::ImageDimension >,
- ::itk::GetImageDimension<InputImageType>::ImageDimension > TensorType;
+ typedef itk::Image<itk::SymmetricSecondRankTensor<
+ typename itk::NumericTraits<InputPixelType>::RealType,
+ ::itk::GetImageDimension<InputImageType>::ImageDimension>,
+ ::itk::GetImageDimension<InputImageType>::ImageDimension> TensorType;
- typedef itk::HessianRecursiveGaussianImageFilter<InputImageType,TensorType > HessianFilterType;
+ typedef itk::HessianRecursiveGaussianImageFilter<InputImageType, TensorType> HessianFilterType;
typedef itk::RecursiveGaussianImageFilter<TensorType,
- TensorType> GaussianFilterType;
- typedef otb::HessianToScalarImageFilter<TensorType,OutputImageType > HessianToScalarFilterType;
- typedef otb::MultiplyByScalarImageFilter<OutputImageType,OutputImageType> MultiplyScalarFilterType;
+ TensorType> GaussianFilterType;
+ typedef otb::HessianToScalarImageFilter<TensorType, OutputImageType> HessianToScalarFilterType;
+ typedef otb::MultiplyByScalarImageFilter<OutputImageType, OutputImageType> MultiplyScalarFilterType;
- itkSetMacro(SigmaD,double);
+ itkSetMacro(SigmaD, double);
itkGetConstReferenceMacro(SigmaD, double);
- itkSetMacro(SigmaI,double);
+ itkSetMacro(SigmaI, double);
itkGetConstReferenceMacro(SigmaI, double);
- itkSetMacro(Alpha,double);
+ itkSetMacro(Alpha, double);
itkGetConstReferenceMacro(Alpha, double);
-
protected:
HarrisImageFilter();
- virtual ~HarrisImageFilter() {};
+ virtual ~HarrisImageFilter() {}
virtual void GenerateData();
@@ -109,16 +108,16 @@ protected:
private:
HarrisImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
double m_SigmaD;
double m_SigmaI;
double m_Alpha;
- typename HessianFilterType::Pointer m_HessianFilter;
- typename GaussianFilterType::Pointer m_GaussianFilter;
- typename HessianToScalarFilterType::Pointer m_HessianToScalarFilter;
- typename MultiplyScalarFilterType::Pointer m_MultiplyScalarFilter;
+ typename HessianFilterType::Pointer m_HessianFilter;
+ typename GaussianFilterType::Pointer m_GaussianFilter;
+ typename HessianToScalarFilterType::Pointer m_HessianToScalarFilter;
+ typename MultiplyScalarFilterType::Pointer m_MultiplyScalarFilter;
};
} // end namespace otb
@@ -126,5 +125,4 @@ private:
#include "otbHarrisImageFilter.txx"
#endif
-
#endif
diff --git a/Code/FeatureExtraction/otbHarrisImageFilter.txx b/Code/FeatureExtraction/otbHarrisImageFilter.txx
index 277b582e8b..8ee0a18f5d 100644
--- a/Code/FeatureExtraction/otbHarrisImageFilter.txx
+++ b/Code/FeatureExtraction/otbHarrisImageFilter.txx
@@ -20,7 +20,6 @@
#include "otbHarrisImageFilter.h"
-
namespace otb
{
@@ -46,27 +45,26 @@ void
HarrisImageFilter<TInputImage, TOutputImage>
::GenerateData()
{
- m_HessianFilter->SetInput( this->GetInput() );
- m_HessianFilter->SetSigma( this->m_SigmaD );
+ m_HessianFilter->SetInput(this->GetInput());
+ m_HessianFilter->SetSigma(this->m_SigmaD);
m_HessianFilter->SetNormalizeAcrossScale(false);
- m_GaussianFilter->SetInput(m_HessianFilter->GetOutput() );
- m_GaussianFilter->SetSigma( this->m_SigmaI );
- m_GaussianFilter->SetOrder( GaussianFilterType::ZeroOrder );
+ m_GaussianFilter->SetInput(m_HessianFilter->GetOutput());
+ m_GaussianFilter->SetSigma(this->m_SigmaI);
+ m_GaussianFilter->SetOrder(GaussianFilterType::ZeroOrder);
m_GaussianFilter->SetNormalizeAcrossScale(false);
- m_HessianToScalarFilter->SetInput( m_GaussianFilter->GetOutput() );
- m_HessianToScalarFilter->SetAlpha( this->m_Alpha );
+ m_HessianToScalarFilter->SetInput(m_GaussianFilter->GetOutput());
+ m_HessianToScalarFilter->SetAlpha(this->m_Alpha);
- m_MultiplyScalarFilter->SetInput( m_HessianToScalarFilter->GetOutput() );
- m_MultiplyScalarFilter->SetCoef( (m_SigmaD*m_SigmaD) );
+ m_MultiplyScalarFilter->SetInput(m_HessianToScalarFilter->GetOutput());
+ m_MultiplyScalarFilter->SetCoef((m_SigmaD * m_SigmaD));
- m_MultiplyScalarFilter->GraftOutput(this->GetOutput() );
+ m_MultiplyScalarFilter->GraftOutput(this->GetOutput());
m_MultiplyScalarFilter->Update();
- this->GraftOutput(m_MultiplyScalarFilter->GetOutput() );
+ this->GraftOutput(m_MultiplyScalarFilter->GetOutput());
}
-
/**
* Standard "PrintSelf" method
*/
@@ -75,14 +73,12 @@ void
HarrisImageFilter<TInputImage, TOutput>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "Sigma_D : " << this->m_SigmaD << std::endl;
os << indent << "Sigma_I : " << this->m_SigmaI << std::endl;
os << indent << "Alpha : " << this->m_Alpha << std::endl;
}
-
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h b/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h
index 8182d995f2..dd7c479f36 100644
--- a/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h
+++ b/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h
@@ -30,59 +30,59 @@ namespace otb
*/
template <class TInputImage,
-class TOutputPointSet = itk::PointSet<ITK_TYPENAME TInputImage::PixelType,2> >
+ class TOutputPointSet = itk::PointSet<ITK_TYPENAME TInputImage::PixelType, 2> >
class ITK_EXPORT HarrisImageToPointSetFilter :
- public ImageToPointSetFilter< TInputImage,TOutputPointSet >
+ public ImageToPointSetFilter<TInputImage, TOutputPointSet>
{
public:
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
typedef TInputImage InputImageType;
typedef TOutputPointSet OutputPointSetType;
- typedef HarrisImageToPointSetFilter Self;
- typedef ImageToPointSetFilter< InputImageType, OutputPointSetType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef HarrisImageToPointSetFilter Self;
+ typedef ImageToPointSetFilter<InputImageType, OutputPointSetType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
itkNewMacro(Self);
itkTypeMacro(HarrisImageToPointSetFilter, ImageToPointSetFilter);
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::SizeType SizeType;
- typedef typename otb::HarrisImageFilter<InputImageType,InputImageType> HarrisImageFilterType;
+ typedef typename otb::HarrisImageFilter<InputImageType, InputImageType> HarrisImageFilterType;
typedef typename otb::ThresholdImageToPointSetFilter<InputImageType,
- OutputPointSetType> ThresholdImageToPointSetType;
+ OutputPointSetType> ThresholdImageToPointSetType;
typedef typename OutputPointSetType::PixelType OutputPixelType;
- itkSetMacro(SigmaD,double);
+ itkSetMacro(SigmaD, double);
itkGetConstReferenceMacro(SigmaD, double);
- itkSetMacro(SigmaI,double);
+ itkSetMacro(SigmaI, double);
itkGetConstReferenceMacro(SigmaI, double);
- itkSetMacro(Alpha,double);
+ itkSetMacro(Alpha, double);
itkGetConstReferenceMacro(Alpha, double);
- itkSetMacro(LowerThreshold,InputPixelType);
+ itkSetMacro(LowerThreshold, InputPixelType);
itkGetConstReferenceMacro(LowerThreshold, InputPixelType);
- itkSetMacro(UpperThreshold,InputPixelType);
+ itkSetMacro(UpperThreshold, InputPixelType);
itkGetConstReferenceMacro(UpperThreshold, InputPixelType);
protected:
HarrisImageToPointSetFilter();
- virtual ~HarrisImageToPointSetFilter() {};
+ virtual ~HarrisImageToPointSetFilter() {}
virtual void GenerateData();
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- HarrisImageToPointSetFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ HarrisImageToPointSetFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
InputPixelType m_LowerThreshold;
InputPixelType m_UpperThreshold;
@@ -90,8 +90,8 @@ private:
double m_SigmaI;
double m_Alpha;
- typename HarrisImageFilterType::Pointer m_HarrisFilter;
- typename ThresholdImageToPointSetType::Pointer m_ThresholdFilter;
+ typename HarrisImageFilterType::Pointer m_HarrisFilter;
+ typename ThresholdImageToPointSetType::Pointer m_ThresholdFilter;
};
} // end namespace otb
@@ -100,5 +100,4 @@ private:
#include "otbHarrisImageToPointSetFilter.txx"
#endif
-
#endif
diff --git a/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.txx b/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.txx
index 7001a8ca44..9dff206431 100644
--- a/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.txx
+++ b/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.txx
@@ -20,7 +20,6 @@
#include "otbHarrisImageToPointSetFilter.h"
-
namespace otb
{
@@ -50,21 +49,20 @@ HarrisImageToPointSetFilter<TInputImage, TOutputPointSet>
typename OutputPointSetType::Pointer pointList = this->GetOutput();
- m_HarrisFilter->SetInput( 0, this->GetInput(0) );
- m_HarrisFilter->SetSigmaD( m_SigmaD );
- m_HarrisFilter->SetSigmaI( m_SigmaI );
- m_HarrisFilter->SetAlpha( m_Alpha );
+ m_HarrisFilter->SetInput(0, this->GetInput(0));
+ m_HarrisFilter->SetSigmaD(m_SigmaD);
+ m_HarrisFilter->SetSigmaI(m_SigmaI);
+ m_HarrisFilter->SetAlpha(m_Alpha);
- m_ThresholdFilter->SetInput(0,m_HarrisFilter->GetOutput() );
+ m_ThresholdFilter->SetInput(0, m_HarrisFilter->GetOutput());
m_ThresholdFilter->SetLowerThreshold(m_LowerThreshold);
m_ThresholdFilter->SetUpperThreshold(m_UpperThreshold);
- m_ThresholdFilter->SetOutput(pointList );
+ m_ThresholdFilter->SetOutput(pointList);
m_ThresholdFilter->Update();
}
-
/**
* Standard "PrintSelf" method
*/
@@ -73,7 +71,7 @@ void
HarrisImageToPointSetFilter<TInputImage, TOutputPointSet>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "Sigma_D : " << this->m_SigmaD << std::endl;
os << indent << "Sigma_I : " << this->m_SigmaI << std::endl;
os << indent << "Alpha : " << this->m_Alpha << std::endl;
@@ -81,8 +79,6 @@ HarrisImageToPointSetFilter<TInputImage, TOutputPointSet>
os << indent << "UpperThreshold : " << this->m_UpperThreshold << std::endl;
}
-
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbHessianToScalarImageFilter.h b/Code/FeatureExtraction/otbHessianToScalarImageFilter.h
index e1340d8576..c8379004b3 100644
--- a/Code/FeatureExtraction/otbHessianToScalarImageFilter.h
+++ b/Code/FeatureExtraction/otbHessianToScalarImageFilter.h
@@ -30,7 +30,7 @@ namespace otb
namespace Functor
{
-template< class TInput, class TOutput >
+template<class TInput, class TOutput>
class HessianToScalar
{
public:
@@ -38,18 +38,18 @@ public:
{
m_Alpha = 1.0;
}
- virtual ~HessianToScalar() {};
- inline TOutput operator()( const TInput & Hessian )
+ virtual ~HessianToScalar() {}
+ inline TOutput operator ()(const TInput& Hessian)
{
TOutput det;
TOutput trace;
TOutput result;
- det = static_cast<TOutput>( Hessian(0,0) * Hessian(1,1) - Hessian(0,1) * Hessian(1,0) );
- trace = static_cast<TOutput>( Hessian(0,0) + Hessian(1,1) );
+ det = static_cast<TOutput>(Hessian(0, 0) * Hessian(1, 1) - Hessian(0, 1) * Hessian(1, 0));
+ trace = static_cast<TOutput>(Hessian(0, 0) + Hessian(1, 1));
- result = det - ( static_cast<TOutput>(m_Alpha) * trace * trace );
+ result = det - (static_cast<TOutput>(m_Alpha) * trace * trace);
return result;
}
@@ -58,60 +58,58 @@ public:
{
m_Alpha = Alpha;
}
- double GetAlpha(void)const
+ double GetAlpha(void) const
{
- return ( m_Alpha );
+ return (m_Alpha);
}
private:
- double m_Alpha;
+ double m_Alpha;
};
}
template <class TInputImage, class TOutputImage>
class ITK_EXPORT HessianToScalarImageFilter :
- public itk::UnaryFunctorImageFilter<
- TInputImage,TOutputImage,
- Functor::HessianToScalar<
+ public itk::UnaryFunctorImageFilter<
+ TInputImage, TOutputImage,
+ Functor::HessianToScalar<
ITK_TYPENAME TInputImage::PixelType,
- ITK_TYPENAME TOutputImage::PixelType> >
+ ITK_TYPENAME TOutputImage::PixelType> >
{
public:
/** Standard class typedefs. */
- typedef HessianToScalarImageFilter Self;
+ typedef HessianToScalarImageFilter Self;
typedef typename itk::UnaryFunctorImageFilter<
- TInputImage,
- TOutputImage,
- Functor::HessianToScalar<
- ITK_TYPENAME TInputImage::PixelType,
- ITK_TYPENAME TOutputImage::PixelType> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ TInputImage,
+ TOutputImage,
+ Functor::HessianToScalar<
+ ITK_TYPENAME TInputImage::PixelType,
+ ITK_TYPENAME TOutputImage::PixelType> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
void SetAlpha(double Alpha)
{
- this->GetFunctor().SetAlpha( Alpha );
+ this->GetFunctor().SetAlpha(Alpha);
this->Modified();
}
- double GetAlpha(void)const
+ double GetAlpha(void) const
{
- return( this->GetFunctor().GetAlpha() );
+ return (this->GetFunctor().GetAlpha());
}
protected:
HessianToScalarImageFilter() {}
virtual ~HessianToScalarImageFilter() {}
private:
- HessianToScalarImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ HessianToScalarImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.h b/Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.h
index 0d7f75b337..fff445f7f7 100644
--- a/Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.h
+++ b/Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.h
@@ -61,7 +61,7 @@ namespace otb
template<typename TInputPixelType, typename TOutputPixelType>
class ITK_EXPORT HoughTransform2DLinesImageFilter :
- public itk::ImageToImageFilter< itk::Image<TInputPixelType,2>, itk::Image<TOutputPixelType,2> >
+ public itk::ImageToImageFilter<itk::Image<TInputPixelType, 2>, itk::Image<TOutputPixelType, 2> >
{
public:
@@ -69,26 +69,26 @@ public:
typedef HoughTransform2DLinesImageFilter Self;
/** Input Image typedef */
- typedef itk::Image<TInputPixelType,2> InputImageType;
- typedef typename InputImageType::Pointer InputImagePointer;
+ typedef itk::Image<TInputPixelType, 2> InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointer;
typedef typename InputImageType::ConstPointer InputImageConstPointer;
/** Output Image typedef */
- typedef itk::Image<TOutputPixelType,2> OutputImageType;
+ typedef itk::Image<TOutputPixelType, 2> OutputImageType;
typedef typename OutputImageType::Pointer OutputImagePointer;
/** Smart pointer typedef support. */
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Line typedef */
- typedef itk::LineSpatialObject<2> LineType;
- typedef typename LineType::Pointer LinePointer;
- typedef std::list<LinePointer> LinesListType;
- typedef LineType::LinePointType LinePointType;
+ typedef itk::LineSpatialObject<2> LineType;
+ typedef typename LineType::Pointer LinePointer;
+ typedef std::list<LinePointer> LinesListType;
+ typedef LineType::LinePointType LinePointType;
/** Standard "Superclass" typedef. */
- typedef itk::ImageToImageFilter<InputImageType, OutputImageType> Superclass;
+ typedef itk::ImageToImageFilter<InputImageType, OutputImageType> Superclass;
/** Image index typedef */
typedef typename InputImageType::IndexType IndexType;
@@ -100,7 +100,7 @@ public:
typedef typename InputImageType::RegionType OutputImageRegionType;
/** Run-time type information (and related methods). */
- itkTypeMacro( HoughTransform2DLinesImageFilter, ImageToImageFilter );
+ itkTypeMacro(HoughTransform2DLinesImageFilter, ImageToImageFilter);
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -110,63 +110,63 @@ public:
/** Accessors for the threshold above which the filter should consider
the point as a valid point */
- itkSetMacro(Threshold,float);
- itkGetMacro(Threshold,float);
+ itkSetMacro(Threshold, float);
+ itkGetMacro(Threshold, float);
/** Accessors for the parameters of the angle axis.
The Hough space describes (in the angle direction)
[AngleAxisMinimum,AngleAxisMaximum[ with AngleAxisSize values */
/** Accessors for the size of the angle axis */
- itkSetMacro(AngleAxisSize,unsigned int);
- itkGetMacro(AngleAxisSize,unsigned int);
+ itkSetMacro(AngleAxisSize, unsigned int);
+ itkGetMacro(AngleAxisSize, unsigned int);
/** Accessors for the minimum of the angle axis */
- itkSetMacro(AngleAxisMinimum,double);
- itkGetMacro(AngleAxisMinimum,double);
+ itkSetMacro(AngleAxisMinimum, double);
+ itkGetMacro(AngleAxisMinimum, double);
/** Accessors for the maximum of the angle axis */
- itkSetMacro(AngleAxisMaximum,double);
- itkGetMacro(AngleAxisMaximum,double);
+ itkSetMacro(AngleAxisMaximum, double);
+ itkGetMacro(AngleAxisMaximum, double);
/** Accessors for the parameters of the distance axis.
The Hough space describes (in the distance direction)
[DistanceAxisMinimum,DistanceAxisMaximum[ with DistanceAxisSize values */
/** Accessors for the actual size of the Distance axis */
- itkSetMacro(DistanceAxisSize,unsigned int);
- itkGetMacro(DistanceAxisSize,unsigned int);
+ itkSetMacro(DistanceAxisSize, unsigned int);
+ itkGetMacro(DistanceAxisSize, unsigned int);
/** Accessors for the maximum size of the Distance axis */
- itkGetMacro(DistanceAxisMaximumSize,unsigned int);
+ itkGetMacro(DistanceAxisMaximumSize, unsigned int);
/** Accessors for the minimum of the Distance axis */
- itkSetMacro(DistanceAxisMinimum,double);
- itkGetMacro(DistanceAxisMinimum,double);
+ itkSetMacro(DistanceAxisMinimum, double);
+ itkGetMacro(DistanceAxisMinimum, double);
/** Accessors for the maximum of the Distance axis */
- itkSetMacro(DistanceAxisMaximum,double);
- itkGetMacro(DistanceAxisMaximum,double);
+ itkSetMacro(DistanceAxisMaximum, double);
+ itkGetMacro(DistanceAxisMaximum, double);
/** Set/Get the number of lines to extract */
- itkSetMacro(NumberOfLines,unsigned int);
- itkGetMacro(NumberOfLines,unsigned int);
+ itkSetMacro(NumberOfLines, unsigned int);
+ itkGetMacro(NumberOfLines, unsigned int);
/** Set/Get the radius of the disc to remove from the accumulator
* for each line found */
- itkSetMacro(DiscRadius,float);
- itkGetMacro(DiscRadius,float);
+ itkSetMacro(DiscRadius, float);
+ itkGetMacro(DiscRadius, float);
/** Set/Get the variance of the gaussian bluring for the accumulator */
- itkSetMacro(Variance,float);
- itkGetMacro(Variance,float);
+ itkSetMacro(Variance, float);
+ itkGetMacro(Variance, float);
/** Simplify the accumulator */
void Simplify(void);
/** Get the Simplified accumulator */
- itkGetObjectMacro(SimplifyAccumulator,OutputImageType);
+ itkGetObjectMacro(SimplifyAccumulator, OutputImageType);
/** Get the list of lines. This recomputes the lines */
- LinesListType & GetLines(unsigned int n=0);
+ LinesListType& GetLines(unsigned int n = 0);
#ifdef ITK_USE_CONCEPT_CHECKING
/** Begin concept checking */
@@ -182,10 +182,10 @@ public:
protected:
HoughTransform2DLinesImageFilter();
- virtual ~HoughTransform2DLinesImageFilter() {};
+ virtual ~HoughTransform2DLinesImageFilter() {}
- HoughTransform2DLinesImageFilter(const Self&) {}
- void operator=(const Self&) {}
+ HoughTransform2DLinesImageFilter(const Self &) {}
+ void operator =(const Self&) {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -215,23 +215,23 @@ protected:
private:
- unsigned int m_AngleAxisSize;
- double m_AngleAxisMinimum;
- double m_AngleAxisMaximum;
- double m_AngleAxisIncrement;
- unsigned int m_DistanceAxisSize;
- unsigned int m_DistanceAxisMaximumSize;
- double m_DistanceAxisMinimum;
- double m_DistanceAxisMaximum;
- double m_DistanceAxisIncrement;
- float m_Threshold;
+ unsigned int m_AngleAxisSize;
+ double m_AngleAxisMinimum;
+ double m_AngleAxisMaximum;
+ double m_AngleAxisIncrement;
+ unsigned int m_DistanceAxisSize;
+ unsigned int m_DistanceAxisMaximumSize;
+ double m_DistanceAxisMinimum;
+ double m_DistanceAxisMaximum;
+ double m_DistanceAxisIncrement;
+ float m_Threshold;
OutputImagePointer m_SimplifyAccumulator;
- LinesListType m_LinesList;
- unsigned int m_NumberOfLines;
- float m_DiscRadius;
- float m_Variance;
- unsigned long m_OldModifiedTime;
- unsigned long m_OldNumberOfLines;
+ LinesListType m_LinesList;
+ unsigned int m_NumberOfLines;
+ float m_DiscRadius;
+ float m_Variance;
+ unsigned long m_OldModifiedTime;
+ unsigned long m_OldNumberOfLines;
};
} // end namespace otb
diff --git a/Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.txx b/Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.txx
index 72921a889b..1503a9a714 100644
--- a/Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.txx
+++ b/Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.txx
@@ -25,16 +25,15 @@
#include <itkMinimumMaximumImageCalculator.h>
#include <itkCastImageFilter.h>
-
namespace otb
{
/** Constructor */
template<typename TInputPixelType, typename TOutputPixelType>
-HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
+HoughTransform2DLinesImageFilter<TInputPixelType, TOutputPixelType>
::HoughTransform2DLinesImageFilter()
{
- const double nPI = 4.0 * vcl_atan( 1.0 );
+ const double nPI = 4.0 * vcl_atan(1.0);
m_Threshold = 0; // by default
@@ -56,7 +55,7 @@ HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
template<typename TInputPixelType, typename TOutputPixelType>
void
-HoughTransform2DLinesImageFilter<TInputPixelType,TOutputPixelType>
+HoughTransform2DLinesImageFilter<TInputPixelType, TOutputPixelType>
::EnlargeOutputRequestedRegion(itk::DataObject *output)
{
// call the superclass' implementation of this method
@@ -65,226 +64,221 @@ HoughTransform2DLinesImageFilter<TInputPixelType,TOutputPixelType>
output->SetRequestedRegionToLargestPossibleRegion();
}
-
template<typename TInputPixelType, typename TOutputPixelType>
void
-HoughTransform2DLinesImageFilter<TInputPixelType,TOutputPixelType>
+HoughTransform2DLinesImageFilter<TInputPixelType, TOutputPixelType>
::GenerateOutputInformation()
{
// call the superclass' implementation of this method
Superclass::GenerateOutputInformation();
// get pointers to the input and output
- InputImageConstPointer input = this->GetInput();
- OutputImagePointer output = this->GetOutput();
+ InputImageConstPointer input = this->GetInput();
+ OutputImagePointer output = this->GetOutput();
- if ( !input || !output )
- {
+ if (!input || !output)
+ {
return;
- }
+ }
// Compute the size of the output image
- if (m_DistanceAxisSize +1 == 0)
- {
+ if (m_DistanceAxisSize + 1 == 0)
+ {
double inputSize0 = input->GetLargestPossibleRegion().GetSize()[0];
double inputSize1 = input->GetLargestPossibleRegion().GetSize()[1];
- double inputDiagonalSize = sqrt(inputSize0*inputSize0 + inputSize1*inputSize1 );
+ double inputDiagonalSize = sqrt(inputSize0 * inputSize0 + inputSize1 * inputSize1);
m_DistanceAxisSize = (long unsigned int) inputDiagonalSize;
- }
+ }
itk::Size<2> size;
- size[0]= (long unsigned int)m_DistanceAxisSize;
- size[1]= (long unsigned int)m_AngleAxisSize;
+ size[0] = (long unsigned int) m_DistanceAxisSize;
+ size[1] = (long unsigned int) m_AngleAxisSize;
typename InputImageType::RegionType region;
region.SetSize(size);
region.SetIndex(input->GetLargestPossibleRegion().GetIndex());
- output->SetLargestPossibleRegion( region );
+ output->SetLargestPossibleRegion(region);
}
-
template<typename TInputPixelType, typename TOutputPixelType>
void
-HoughTransform2DLinesImageFilter<TInputPixelType,TOutputPixelType>
+HoughTransform2DLinesImageFilter<TInputPixelType, TOutputPixelType>
::GenerateInputRequestedRegion()
{
Superclass::GenerateInputRequestedRegion();
- if ( this->GetInput() )
- {
- InputImagePointer image = const_cast< InputImageType * >( this->GetInput() );
+ if (this->GetInput())
+ {
+ InputImagePointer image = const_cast<InputImageType *>(this->GetInput());
image->SetRequestedRegionToLargestPossibleRegion();
- }
+ }
}
-
/** Generate the accumulator image */
template<typename TInputPixelType, typename TOutputPixelType>
void
-HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
+HoughTransform2DLinesImageFilter<TInputPixelType, TOutputPixelType>
::GenerateData()
{
- itkDebugMacro(<<"HoughTransform2DLinesImageFilter called");
+ itkDebugMacro(<< "HoughTransform2DLinesImageFilter called");
- m_AngleAxisIncrement = (m_AngleAxisMaximum - m_AngleAxisMinimum)/m_AngleAxisSize;
- m_DistanceAxisIncrement = (m_DistanceAxisMaximum - m_DistanceAxisMinimum)/m_DistanceAxisSize;
+ m_AngleAxisIncrement = (m_AngleAxisMaximum - m_AngleAxisMinimum) / m_AngleAxisSize;
+ m_DistanceAxisIncrement = (m_DistanceAxisMaximum - m_DistanceAxisMinimum) / m_DistanceAxisSize;
// Get the input and output pointers
- InputImageConstPointer inputImage = this->GetInput(0);
- OutputImagePointer outputImage = this->GetOutput(0);
+ InputImageConstPointer inputImage = this->GetInput(0);
+ OutputImagePointer outputImage = this->GetOutput(0);
// Allocate the output
this->AllocateOutputs();
outputImage->FillBuffer(0);
- itk::ImageRegionConstIteratorWithIndex< InputImageType > image_it( inputImage, inputImage->GetRequestedRegion() );
+ itk::ImageRegionConstIteratorWithIndex<InputImageType> image_it(inputImage, inputImage->GetRequestedRegion());
image_it.Begin();
itk::Index<2> index;
// Pre-computation of trigonometric lines
unsigned int nbAngles = static_cast<unsigned long int>(m_AngleAxisSize);
- std::vector<double> cosAngle(nbAngles,0.);
- std::vector<double> sinAngle(nbAngles,0.);
+ std::vector<double> cosAngle(nbAngles, 0.);
+ std::vector<double> sinAngle(nbAngles, 0.);
//const double nPI = 4.0 * vcl_atan( 1.0 ); Unused in this method
- for (unsigned int indexAngle = 0; indexAngle < nbAngles; indexAngle ++ )
- {
+ for (unsigned int indexAngle = 0; indexAngle < nbAngles; indexAngle++)
+ {
double angle = this->GetAngleValue(indexAngle);
cosAngle[indexAngle] = vcl_cos(angle);
sinAngle[indexAngle] = vcl_sin(angle);
- }
+ }
- while ( !image_it.IsAtEnd() )
- {
- if (image_it.Get()>m_Threshold)
+ while (!image_it.IsAtEnd())
{
- for (unsigned int indexAngle = 0; indexAngle < nbAngles; indexAngle ++ )
+ if (image_it.Get() > m_Threshold)
{
- double r = image_it.GetIndex()[0]*cosAngle[indexAngle]+image_it.GetIndex()[1]*sinAngle[indexAngle];
- unsigned int indexR = this->GetDistanceIndex(r);
- index[0]= indexR; // m_R
- index[1]= indexAngle; // m_Theta
- if ( outputImage->GetBufferedRegion().IsInside(index) )
+ for (unsigned int indexAngle = 0; indexAngle < nbAngles; indexAngle++)
{
- outputImage->SetPixel(index, outputImage->GetPixel(index)+image_it.Get());
+ double r = image_it.GetIndex()[0] * cosAngle[indexAngle] + image_it.GetIndex()[1] * sinAngle[indexAngle];
+ unsigned int indexR = this->GetDistanceIndex(r);
+ index[0] = indexR; // m_R
+ index[1] = indexAngle; // m_Theta
+ if (outputImage->GetBufferedRegion().IsInside(index))
+ {
+ outputImage->SetPixel(index, outputImage->GetPixel(index) + image_it.Get());
+ }
}
}
- }
++image_it;
- }
+ }
}
-
/** Simplify the accumulator
* Do the same iteration process as the Update() method but find the maximum
* along the curve and then remove the curve */
template<typename TInputPixelType, typename TOutputPixelType>
void
-HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
+HoughTransform2DLinesImageFilter<TInputPixelType, TOutputPixelType>
::Simplify(void)
{
// Get the input and output pointers
- InputImageConstPointer inputImage = this->GetInput(0);
- OutputImagePointer outputImage = this->GetOutput(0);
+ InputImageConstPointer inputImage = this->GetInput(0);
+ OutputImagePointer outputImage = this->GetOutput(0);
if (!inputImage || !outputImage)
- {
+ {
itkExceptionMacro("Update() must be called before Simplify().");
- }
+ }
/** Allocate the simplify accumulator */
m_SimplifyAccumulator = OutputImageType::New();
- m_SimplifyAccumulator->SetRegions( outputImage->GetLargestPossibleRegion() );
+ m_SimplifyAccumulator->SetRegions(outputImage->GetLargestPossibleRegion());
m_SimplifyAccumulator->SetOrigin(inputImage->GetOrigin());
m_SimplifyAccumulator->SetSpacing(inputImage->GetSpacing());
m_SimplifyAccumulator->Allocate();
m_SimplifyAccumulator->FillBuffer(0);
- itk::Index<2> index;
- itk::Index<2> maxIndex;
+ itk::Index<2> index;
+ itk::Index<2> maxIndex;
typename OutputImageType::PixelType value;
typename OutputImageType::PixelType valuemax;
- itk::ImageRegionConstIteratorWithIndex< InputImageType > image_it( inputImage, inputImage->GetRequestedRegion() );
+ itk::ImageRegionConstIteratorWithIndex<InputImageType> image_it(inputImage, inputImage->GetRequestedRegion());
image_it.GoToBegin();
- while ( !image_it.IsAtEnd() )
- {
- if (image_it.Get()>m_Threshold)
+ while (!image_it.IsAtEnd())
{
+ if (image_it.Get() > m_Threshold)
+ {
// Look for maximum along the curve and remove the curve at the same time
valuemax = -1;
- maxIndex[0]=0;
- maxIndex[1]=0;
- for (double angle = m_AngleAxisMinimum; angle < m_AngleAxisMaximum; angle += m_AngleAxisIncrement )
- {
- index[0]= (long int)(image_it.GetIndex()[0]*vcl_cos(angle)+image_it.GetIndex()[1]*vcl_sin(angle)); // m_R
- index[1]= (long int)( this->GetAngleIndex(angle)); // m_Theta
-
- if ( outputImage->GetBufferedRegion().IsInside(index) )
+ maxIndex[0] = 0;
+ maxIndex[1] = 0;
+ for (double angle = m_AngleAxisMinimum; angle < m_AngleAxisMaximum; angle += m_AngleAxisIncrement)
{
- value = outputImage->GetPixel(index);
- if ( value > valuemax)
+ index[0] = (long int) (image_it.GetIndex()[0] * vcl_cos(angle) + image_it.GetIndex()[1] * vcl_sin(angle)); // m_R
+ index[1] = (long int) (this->GetAngleIndex(angle)); // m_Theta
+
+ if (outputImage->GetBufferedRegion().IsInside(index))
{
+ value = outputImage->GetPixel(index);
+ if (value > valuemax)
+ {
valuemax = value;
maxIndex = index;
+ }
}
}
+ m_SimplifyAccumulator->SetPixel(maxIndex, m_SimplifyAccumulator->GetPixel(maxIndex) + 1);
}
- m_SimplifyAccumulator->SetPixel(maxIndex,m_SimplifyAccumulator->GetPixel(maxIndex)+1);
- }
++image_it;
- }
-
- itk::ImageRegionConstIteratorWithIndex< OutputImageType > accusimple_it( m_SimplifyAccumulator, m_SimplifyAccumulator->GetRequestedRegion() );
- itk::ImageRegionIteratorWithIndex< OutputImageType > accu_it( outputImage, outputImage->GetRequestedRegion() );
+ }
+ itk::ImageRegionConstIteratorWithIndex<OutputImageType> accusimple_it(m_SimplifyAccumulator,
+ m_SimplifyAccumulator->GetRequestedRegion());
+ itk::ImageRegionIteratorWithIndex<OutputImageType> accu_it(outputImage, outputImage->GetRequestedRegion());
accusimple_it.GoToBegin();
accu_it.GoToBegin();
- while ( !accusimple_it.IsAtEnd() )
- {
+ while (!accusimple_it.IsAtEnd())
+ {
accu_it.Set(accusimple_it.Get());
++accu_it;
++accusimple_it;
- }
+ }
}
-
/** Get the list of lines. This recomputes the lines */
template<typename TInputPixelType, typename TOutputPixelType>
-typename HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>::LinesListType &
-HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
+typename HoughTransform2DLinesImageFilter<TInputPixelType, TOutputPixelType>::LinesListType&
+HoughTransform2DLinesImageFilter<TInputPixelType, TOutputPixelType>
::GetLines(unsigned int n)
{
if ((this->GetMTime() == m_OldModifiedTime) && (n == m_OldNumberOfLines)) // if the filter has not been updated
- {
+ {
return m_LinesList;
- }
+ }
m_LinesList.clear();
/** Blur the accumulator in order to find the maximum */
- typedef float InternalImagePixelType;
- typedef itk::Image< InternalImagePixelType,2 > InternalImageType;
+ typedef float InternalImagePixelType;
+ typedef itk::Image<InternalImagePixelType, 2> InternalImageType;
OutputImagePointer outputImage = this->GetOutput(0);
- if ( !outputImage )
- {
+ if (!outputImage)
+ {
itkExceptionMacro("Update() must be called before GetLines().");
- }
+ }
/** Convert the accumulator output image type to internal image type*/
- typedef itk::CastImageFilter< OutputImageType, InternalImageType> CastImageFilterType;
+ typedef itk::CastImageFilter<OutputImageType, InternalImageType> CastImageFilterType;
typename CastImageFilterType::Pointer castImageFilter = CastImageFilterType::New();
castImageFilter->SetInput(outputImage);
- typedef itk::DiscreteGaussianImageFilter<InternalImageType,InternalImageType> GaussianFilterType;
+ typedef itk::DiscreteGaussianImageFilter<InternalImageType, InternalImageType> GaussianFilterType;
typename GaussianFilterType::Pointer gaussianFilter = GaussianFilterType::New();
gaussianFilter->SetInput(castImageFilter->GetOutput()); // the output is the accumulator image
@@ -298,61 +292,60 @@ HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
typedef itk::MinimumMaximumImageCalculator<InternalImageType> MinMaxCalculatorType;
typename MinMaxCalculatorType::Pointer minMaxCalculator = MinMaxCalculatorType::New();
itk::ImageRegionIterator<InternalImageType>
- it_input(postProcessImage,postProcessImage->GetLargestPossibleRegion());
+ it_input(postProcessImage, postProcessImage->GetLargestPossibleRegion());
- const double nPI = 4.0 * vcl_atan( 1.0 );
+ const double nPI = 4.0 * vcl_atan(1.0);
itk::Index<2> index;
- unsigned int lines=0;
- bool found;
+ unsigned int lines = 0;
+ bool found;
// Find maxima
do
- {
+ {
minMaxCalculator->SetImage(postProcessImage);
minMaxCalculator->ComputeMaximum();
- InternalImageType::PixelType max = minMaxCalculator->GetMaximum();
+ InternalImageType::PixelType max = minMaxCalculator->GetMaximum();
found = false;
- for (it_input.GoToBegin();!it_input.IsAtEnd();++it_input)
- {
- if (it_input.Get() == max)
+ for (it_input.GoToBegin(); !it_input.IsAtEnd(); ++it_input)
{
+ if (it_input.Get() == max)
+ {
// Create the line
LineType::PointListType list; // insert two points per line
double radius = this->GetDistanceValue(it_input.GetIndex()[0]);
double teta = this->GetAngleValue(it_input.GetIndex()[1]);
- double Vx = radius*vcl_cos(teta );
- double Vy = radius*vcl_sin(teta );
- double norm = vcl_sqrt(Vx*Vx+Vy*Vy);
- double VxNorm = Vx/norm;
- double VyNorm = Vy/norm;
+ double Vx = radius * vcl_cos(teta);
+ double Vy = radius * vcl_sin(teta);
+ double norm = vcl_sqrt(Vx * Vx + Vy * Vy);
+ double VxNorm = Vx / norm;
+ double VyNorm = Vy / norm;
- if ((teta<=0) || (teta >= nPI / 2 ) )
- {
- if (teta >= nPI/2)
+ if ((teta <= 0) || (teta >= nPI / 2))
{
- VyNorm = - VyNorm;
- VxNorm = - VxNorm;
- }
+ if (teta >= nPI / 2)
+ {
+ VyNorm = -VyNorm;
+ VxNorm = -VxNorm;
+ }
LinePointType p;
- p.SetPosition(Vx,Vy);
+ p.SetPosition(Vx, Vy);
list.push_back(p);
- p.SetPosition(Vx-VyNorm*5,Vy+VxNorm*5);
+ p.SetPosition(Vx - VyNorm * 5, Vy + VxNorm * 5);
list.push_back(p);
- }
+ }
else // if teta>0
- {
+ {
LinePointType p;
- p.SetPosition(Vx,Vy);
+ p.SetPosition(Vx, Vy);
list.push_back(p);
- p.SetPosition(Vx-VyNorm*5,Vy+VxNorm*5);
+ p.SetPosition(Vx - VyNorm * 5, Vy + VxNorm * 5);
list.push_back(p);
- } // end if(teta>0)
-
+ } // end if(teta>0)
// Create a Line Spatial Object
LinePointer Line = LineType::New();
@@ -364,17 +357,17 @@ HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
// Remove a black disc from the hough space domain
for (double angle = m_AngleAxisMinimum; angle <= m_AngleAxisMaximum; angle += m_AngleAxisIncrement)
- {
- for (double length = 0; length < m_DiscRadius;length += 1)
{
- index[0] = (long int)(it_input.GetIndex()[0] + length * vcl_cos(angle));
- index[1] = (long int)(it_input.GetIndex()[1] + length * vcl_sin(angle));
- if ( postProcessImage->GetBufferedRegion().IsInside(index) )
+ for (double length = 0; length < m_DiscRadius; length += 1)
{
- postProcessImage->SetPixel(index,0);
+ index[0] = (long int) (it_input.GetIndex()[0] + length * vcl_cos(angle));
+ index[1] = (long int) (it_input.GetIndex()[1] + length * vcl_sin(angle));
+ if (postProcessImage->GetBufferedRegion().IsInside(index))
+ {
+ postProcessImage->SetPixel(index, 0);
+ }
}
}
- }
minMaxCalculator->SetImage(postProcessImage);
minMaxCalculator->ComputeMaximum();
max = minMaxCalculator->GetMaximum();
@@ -382,10 +375,10 @@ HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
++lines;
found = true;
if (lines == m_NumberOfLines) break;
+ }
}
}
- }
- while ((lines<m_NumberOfLines) && (found));
+ while ((lines < m_NumberOfLines) && (found));
m_OldModifiedTime = this->GetMTime();
m_OldNumberOfLines = m_LinesList.size();
@@ -395,10 +388,10 @@ HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
/** Print Self information */
template<typename TInputPixelType, typename TOutputPixelType>
void
-HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
+HoughTransform2DLinesImageFilter<TInputPixelType, TOutputPixelType>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << "Threshold: " << m_Threshold << std::endl;
os << "Angle axis size: " << m_AngleAxisSize << std::endl;
@@ -413,17 +406,17 @@ HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
/** Computes angle index from angle value */
template<typename TInputPixelType, typename TOutputPixelType>
int
-HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
+HoughTransform2DLinesImageFilter<TInputPixelType, TOutputPixelType>
::GetAngleIndex(double angle)
{
- int indexAngle = static_cast<int>((angle-m_AngleAxisMinimum)/m_AngleAxisIncrement);
+ int indexAngle = static_cast<int>((angle - m_AngleAxisMinimum) / m_AngleAxisIncrement);
return indexAngle;
}
/** Computes angle value from angle index */
template<typename TInputPixelType, typename TOutputPixelType>
double
-HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
+HoughTransform2DLinesImageFilter<TInputPixelType, TOutputPixelType>
::GetAngleValue(int indexAngle)
{
double angle = m_AngleAxisMinimum + indexAngle * m_AngleAxisIncrement;
@@ -433,24 +426,23 @@ HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
/** Computes distance index from distance value */
template<typename TInputPixelType, typename TOutputPixelType>
int
-HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
+HoughTransform2DLinesImageFilter<TInputPixelType, TOutputPixelType>
::GetDistanceIndex(double distance)
{
- int indexDistance = static_cast<int>((distance-m_DistanceAxisMinimum)/m_DistanceAxisIncrement);
+ int indexDistance = static_cast<int>((distance - m_DistanceAxisMinimum) / m_DistanceAxisIncrement);
return indexDistance;
}
/** Computes distance value from distance index */
template<typename TInputPixelType, typename TOutputPixelType>
double
-HoughTransform2DLinesImageFilter< TInputPixelType, TOutputPixelType>
+HoughTransform2DLinesImageFilter<TInputPixelType, TOutputPixelType>
::GetDistanceValue(int indexDistance)
{
double distance = m_DistanceAxisMinimum + indexDistance * m_DistanceAxisIncrement;
return distance;
}
-
} // end namespace
#endif
diff --git a/Code/FeatureExtraction/otbHuImageFunction.h b/Code/FeatureExtraction/otbHuImageFunction.h
index 71d55e5ff5..28896db70c 100644
--- a/Code/FeatureExtraction/otbHuImageFunction.h
+++ b/Code/FeatureExtraction/otbHuImageFunction.h
@@ -53,19 +53,19 @@ namespace otb
*/
// public itk::ImageFunction< TInput, TOutput,TCoordRep >
-template < class TInput,
-class TOutput = double,
-class TPrecision = double,
-class TCoordRep = float >
+template <class TInput,
+ class TOutput = double,
+ class TPrecision = double,
+ class TCoordRep = float>
class ITK_EXPORT HuImageFunction :
- public RealMomentImageFunction< TInput, TOutput, TPrecision, TCoordRep >
+ public RealMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef HuImageFunction Self;
- typedef RealMomentImageFunction< TInput, TOutput, TPrecision, TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef HuImageFunction Self;
+ typedef RealMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(HuImageFunction, RealMomentImageFunction);
@@ -74,54 +74,52 @@ public:
itkNewMacro(Self);
/** InputImageType typedef support. */
- typedef TInput InputType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::PointType PointType;
+ typedef TInput InputType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
+ typedef typename Superclass::PointType PointType;
- typedef typename Superclass::RealType RealType;
- typedef typename std::complex<RealType> ComplexType;
+ typedef typename Superclass::RealType RealType;
+ typedef typename std::complex<RealType> ComplexType;
/** Type for calculation precision */
- typedef typename Superclass::PrecisionType PrecisionType;
+ typedef typename Superclass::PrecisionType PrecisionType;
/** Dimension of the underlying image. */
itkStaticConstMacro(ImageDimension, unsigned int,
InputType::ImageDimension);
-
/** Evalulate the function at specified index */
- virtual RealType EvaluateAtIndex( const IndexType& index ) const;
+ virtual RealType EvaluateAtIndex(const IndexType& index) const;
/** Evaluate the function at non-integer positions */
- virtual RealType Evaluate( const PointType& point ) const
+ virtual RealType Evaluate(const PointType& point) const
{
IndexType index;
- this->ConvertPointToNearestIndex( point, index );
- return this->EvaluateAtIndex( index );
+ this->ConvertPointToNearestIndex(point, index);
+ return this->EvaluateAtIndex(index);
}
virtual RealType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex ) const
+ const ContinuousIndexType& cindex) const
{
IndexType index;
- this->ConvertContinuousIndexToNearestIndex( cindex, index );
- return this->EvaluateAtIndex( index );
+ this->ConvertContinuousIndexToNearestIndex(cindex, index);
+ return this->EvaluateAtIndex(index);
}
-
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
- itkSetClampMacro(MomentNumber,short,1,7);
- itkGetConstReferenceMacro( MomentNumber, short );
+ itkSetClampMacro(MomentNumber, short, 1, 7);
+ itkGetConstReferenceMacro(MomentNumber, short);
protected:
HuImageFunction();
- virtual ~HuImageFunction() {};
+ virtual ~HuImageFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- HuImageFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ HuImageFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
short m_MomentNumber;
};
@@ -133,4 +131,3 @@ private:
#endif
#endif
-
diff --git a/Code/FeatureExtraction/otbHuImageFunction.txx b/Code/FeatureExtraction/otbHuImageFunction.txx
index baa05b181a..8bb695c485 100644
--- a/Code/FeatureExtraction/otbHuImageFunction.txx
+++ b/Code/FeatureExtraction/otbHuImageFunction.txx
@@ -30,163 +30,159 @@ namespace otb
/**
* Constructor
*/
-template < class TInput, class TOutput, class TPrecision, class TCoordRep>
-HuImageFunction<TInput,TOutput,TPrecision,TCoordRep>
+template <class TInput, class TOutput, class TPrecision, class TCoordRep>
+HuImageFunction<TInput, TOutput, TPrecision, TCoordRep>
::HuImageFunction()
{
- m_MomentNumber =-1;
+ m_MomentNumber = -1;
}
/**
*
*/
-template < class TInput, class TOutput, class TPrecision, class TCoordRep>
+template <class TInput, class TOutput, class TPrecision, class TCoordRep>
void
-HuImageFunction<TInput,TOutput,TPrecision,TCoordRep>
+HuImageFunction<TInput, TOutput, TPrecision, TCoordRep>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
os << indent << " m_MomentNumber : " << m_MomentNumber << std::endl;
}
-
-template < class TInput, class TOutput, class TPrecision, class TCoordRep>
-typename HuImageFunction<TInput,TOutput,TPrecision,TCoordRep>::RealType
-HuImageFunction<TInput,TOutput,TPrecision,TCoordRep>
+template <class TInput, class TOutput, class TPrecision, class TCoordRep>
+typename HuImageFunction<TInput, TOutput, TPrecision, TCoordRep>::RealType
+HuImageFunction<TInput, TOutput, TPrecision, TCoordRep>
::EvaluateAtIndex(const IndexType& index) const
{
//typename InputType::SizeType ImageSize;
- RealType HuValue = 0.;
- ComplexType HuValueComplex;
-
- typedef otb::ComplexMomentImageFunction<InputType,ComplexType> CMType;
- typename CMType::Pointer function =CMType::New();
+ RealType HuValue = 0.;
+ ComplexType HuValueComplex;
- if ( !this->GetInputImage() )
- {
- return ( itk::NumericTraits<RealType>::max() );
- }
+ typedef otb::ComplexMomentImageFunction<InputType, ComplexType> CMType;
+ typename CMType::Pointer function = CMType::New();
+ if (!this->GetInputImage())
+ {
+ return (itk::NumericTraits<RealType>::max());
+ }
- if ( !this->IsInsideBuffer( index ) )
- {
- otbMsgDevMacro( << index );
- return ( itk::NumericTraits<RealType>::max() );
- }
+ if (!this->IsInsideBuffer(index))
+ {
+ otbMsgDevMacro(<< index);
+ return (itk::NumericTraits<RealType>::max());
+ }
assert(m_MomentNumber > 0);
assert(m_MomentNumber < 8);
- function->SetInputImage( this->GetInputImage() );
- function->SetNeighborhoodRadius(this->GetNeighborhoodRadius() );
+ function->SetInputImage(this->GetInputImage());
+ function->SetNeighborhoodRadius(this->GetNeighborhoodRadius());
switch (m_MomentNumber)
- {
- case 1 :
- {
+ {
+ case 1:
+ {
ComplexType C11;
function->SetP(1);
function->SetQ(1);
- C11 = function->EvaluateAtIndex( index );
+ C11 = function->EvaluateAtIndex(index);
HuValue = C11.real();
- }
- break;
+ }
+ break;
case 2:
- {
- ComplexType C20,C02;
+ {
+ ComplexType C20, C02;
function->SetP(2);
function->SetQ(0);
- C20 = function->EvaluateAtIndex( index );
+ C20 = function->EvaluateAtIndex(index);
function->SetP(0);
function->SetQ(2);
- C02 = function->EvaluateAtIndex( index );
+ C02 = function->EvaluateAtIndex(index);
- HuValue = vcl_abs( C20 * C02 );
+ HuValue = vcl_abs(C20 * C02);
- }
- break;
+ }
+ break;
case 3:
- {
- ComplexType C30,C03;
+ {
+ ComplexType C30, C03;
function->SetP(3);
function->SetQ(0);
- C30 = function->EvaluateAtIndex( index );
+ C30 = function->EvaluateAtIndex(index);
function->SetP(0);
function->SetQ(3);
- C03 = function->EvaluateAtIndex( index );
+ C03 = function->EvaluateAtIndex(index);
- HuValue = vcl_abs( C30 * C03 );
- }
- break;
+ HuValue = vcl_abs(C30 * C03);
+ }
+ break;
case 4:
- {
- ComplexType C21,C12;
+ {
+ ComplexType C21, C12;
function->SetP(2);
function->SetQ(1);
- C21 = function->EvaluateAtIndex( index );
+ C21 = function->EvaluateAtIndex(index);
function->SetP(1);
function->SetQ(2);
- C12 = function->EvaluateAtIndex( index );
+ C12 = function->EvaluateAtIndex(index);
- HuValue = vcl_abs( C21 * C12 );
- }
- break;
+ HuValue = vcl_abs(C21 * C12);
+ }
+ break;
case 5:
- {
- ComplexType C30,C12;
+ {
+ ComplexType C30, C12;
function->SetP(3);
function->SetQ(0);
- C30 = function->EvaluateAtIndex( index );
+ C30 = function->EvaluateAtIndex(index);
function->SetP(1);
function->SetQ(2);
- C12 = function->EvaluateAtIndex( index );
+ C12 = function->EvaluateAtIndex(index);
- HuValueComplex = C30 * vcl_pow(C12,3);
+ HuValueComplex = C30 * vcl_pow(C12, 3);
HuValue = HuValueComplex.real();
- }
- break;
+ }
+ break;
case 6:
- {
- ComplexType C20,C12;
+ {
+ ComplexType C20, C12;
function->SetP(2);
function->SetQ(0);
- C20 = function->EvaluateAtIndex( index );
+ C20 = function->EvaluateAtIndex(index);
function->SetP(1);
function->SetQ(2);
- C12 = function->EvaluateAtIndex( index );
+ C12 = function->EvaluateAtIndex(index);
- HuValueComplex = C20 * vcl_pow( C12 ,2 );
+ HuValueComplex = C20 * vcl_pow(C12, 2);
HuValue = HuValueComplex.real();
- }
- break;
+ }
+ break;
case 7:
- {
- ComplexType C30,C12;
+ {
+ ComplexType C30, C12;
function->SetP(3);
function->SetQ(0);
- C30 = function->EvaluateAtIndex( index );
+ C30 = function->EvaluateAtIndex(index);
function->SetP(1);
function->SetQ(2);
- C12 = function->EvaluateAtIndex( index );
+ C12 = function->EvaluateAtIndex(index);
- HuValueComplex = C30 * vcl_pow( C12 , 3);
+ HuValueComplex = C30 * vcl_pow(C12, 3);
HuValue = HuValueComplex.imag();
- }
- break;
+ }
+ break;
default:
itkWarningMacro("Hu's invariant parameters are between 1 and 7");
- }
+ }
-
- return (static_cast<RealType>(HuValue) );
+ return (static_cast<RealType>(HuValue));
}
-
} // namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbHuPathFunction.h b/Code/FeatureExtraction/otbHuPathFunction.h
index def3265634..980a058fc5 100644
--- a/Code/FeatureExtraction/otbHuPathFunction.h
+++ b/Code/FeatureExtraction/otbHuPathFunction.h
@@ -52,18 +52,18 @@ namespace otb
* \ingroup FunctionFunctions
*/
-template < class TInputPath,
-class TOutput = double,
-class TPrecision = double>
+template <class TInputPath,
+ class TOutput = double,
+ class TPrecision = double>
class ITK_EXPORT HuPathFunction :
- public RealMomentPathFunction< TInputPath, TOutput, TPrecision >
+ public RealMomentPathFunction<TInputPath, TOutput, TPrecision>
{
public:
/** Standard class typedefs. */
- typedef HuPathFunction Self;
- typedef RealMomentPathFunction<TInputPath, TOutput, TPrecision> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef HuPathFunction Self;
+ typedef RealMomentPathFunction<TInputPath, TOutput, TPrecision> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(HuPathFunction, RealMomentPathFunction);
@@ -72,34 +72,34 @@ public:
itkNewMacro(Self);
/** InputPathType typedef support. */
- typedef typename Superclass::PathType PathType;
- typedef typename Superclass::PathConstPointer PathConstPointer;
- typedef typename PathType::ContinuousIndexType VertexType;
- typedef itk::VectorContainer< unsigned,VertexType > VertexListType;
- typedef typename VertexListType::ConstPointer VertexListPointer;
+ typedef typename Superclass::PathType PathType;
+ typedef typename Superclass::PathConstPointer PathConstPointer;
+ typedef typename PathType::ContinuousIndexType VertexType;
+ typedef itk::VectorContainer<unsigned, VertexType> VertexListType;
+ typedef typename VertexListType::ConstPointer VertexListPointer;
/** OutputType typedef support. */
- typedef typename Superclass::RealType RealType;
+ typedef typename Superclass::RealType RealType;
/** Type for calculation precision */
- typedef typename Superclass::PrecisionType PrecisionType;
+ typedef typename Superclass::PrecisionType PrecisionType;
/** Evaluate the function at non-integer positions */
- virtual RealType Evaluate( const PathType& path) const;
- virtual RealType Evaluate( ) const;
+ virtual RealType Evaluate(const PathType& path) const;
+ virtual RealType Evaluate() const;
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
- itkSetMacro(MomentNumber,short);
- itkGetConstReferenceMacro( MomentNumber, short );
+ itkSetMacro(MomentNumber, short);
+ itkGetConstReferenceMacro(MomentNumber, short);
protected:
HuPathFunction();
- virtual ~HuPathFunction() {};
+ virtual ~HuPathFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- HuPathFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ HuPathFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
short m_MomentNumber;
};
@@ -111,4 +111,3 @@ private:
#endif
#endif
-
diff --git a/Code/FeatureExtraction/otbHuPathFunction.txx b/Code/FeatureExtraction/otbHuPathFunction.txx
index 32e939e5b5..05ba8174cb 100644
--- a/Code/FeatureExtraction/otbHuPathFunction.txx
+++ b/Code/FeatureExtraction/otbHuPathFunction.txx
@@ -30,158 +30,157 @@ namespace otb
/**
* Constructor
*/
-template < class TInputPath, class TOutput, class TPrecision>
-HuPathFunction< TInputPath, TOutput, TPrecision >
+template <class TInputPath, class TOutput, class TPrecision>
+HuPathFunction<TInputPath, TOutput, TPrecision>
::HuPathFunction()
{
- m_MomentNumber =-1;
+ m_MomentNumber = -1;
}
/**
*
*/
-template < class TInputPath, class TOutput, class TPrecision>
+template <class TInputPath, class TOutput, class TPrecision>
void
-HuPathFunction< TInputPath, TOutput, TPrecision >
+HuPathFunction<TInputPath, TOutput, TPrecision>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
os << indent << " m_MomentNumber : " << m_MomentNumber << std::endl;
}
-
-template < class TInputPath, class TOutput, class TPrecision>
-typename HuPathFunction<TInputPath, TOutput, TPrecision >::RealType
-HuPathFunction<TInputPath, TOutput, TPrecision >
-::Evaluate( const PathType& path) const
+template <class TInputPath, class TOutput, class TPrecision>
+typename HuPathFunction<TInputPath, TOutput, TPrecision>::RealType
+HuPathFunction<TInputPath, TOutput, TPrecision>
+::Evaluate(const PathType& path) const
{
- typedef ComplexMomentPathFunction<PathType> FunctionType;
- typedef typename FunctionType::ComplexType ComplexType;
+ typedef ComplexMomentPathFunction<PathType> FunctionType;
+ typedef typename FunctionType::ComplexType ComplexType;
- RealType HuValue = 0.;
- ComplexType HuValueComplex;
+ RealType HuValue = 0.;
+ ComplexType HuValueComplex;
- typename FunctionType::Pointer function =FunctionType::New();
+ typename FunctionType::Pointer function = FunctionType::New();
- function->SetInputPath( this->GetInputPath() );
+ function->SetInputPath(this->GetInputPath());
switch (m_MomentNumber)
- {
- case 1 :
- {
+ {
+ case 1:
+ {
ComplexType C11;
function->SetP(1);
function->SetQ(1);
- C11 = function->Evaluate( );
+ C11 = function->Evaluate();
HuValue = C11.real();
- }
- break;
+ }
+ break;
case 2:
- {
- ComplexType C20,C02;
+ {
+ ComplexType C20, C02;
function->SetP(2);
function->SetQ(0);
- C20 = function->Evaluate( );
+ C20 = function->Evaluate();
function->SetP(0);
function->SetQ(2);
- C02 = function->Evaluate( );
+ C02 = function->Evaluate();
- HuValue = vcl_abs( C20 * C02 );
+ HuValue = vcl_abs(C20 * C02);
- }
- break;
+ }
+ break;
case 3:
- {
- ComplexType C30,C03;
+ {
+ ComplexType C30, C03;
function->SetP(3);
function->SetQ(0);
- C30 = function->Evaluate( );
+ C30 = function->Evaluate();
function->SetP(0);
function->SetQ(3);
- C03 = function->Evaluate( );
+ C03 = function->Evaluate();
- HuValue = vcl_abs( C30 * C03 );
- }
- break;
+ HuValue = vcl_abs(C30 * C03);
+ }
+ break;
case 4:
- {
- ComplexType C21,C12;
+ {
+ ComplexType C21, C12;
function->SetP(2);
function->SetQ(1);
- C21 = function->Evaluate( );
+ C21 = function->Evaluate();
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( );
+ C12 = function->Evaluate();
- HuValue = vcl_abs( C21 * C12 );
- }
- break;
+ HuValue = vcl_abs(C21 * C12);
+ }
+ break;
case 5:
- {
- ComplexType C30,C12;
+ {
+ ComplexType C30, C12;
function->SetP(3);
function->SetQ(0);
- C30 = function->Evaluate( );
+ C30 = function->Evaluate();
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( );
+ C12 = function->Evaluate();
- HuValueComplex = C30 * vcl_pow(C12,3);
+ HuValueComplex = C30 * vcl_pow(C12, 3);
HuValue = HuValueComplex.real();
- }
- break;
+ }
+ break;
case 6:
- {
- ComplexType C20,C12;
+ {
+ ComplexType C20, C12;
function->SetP(2);
function->SetQ(0);
- C20 = function->Evaluate( );
+ C20 = function->Evaluate();
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( );
+ C12 = function->Evaluate();
- HuValueComplex = C20 * vcl_pow( C12 ,2 );
+ HuValueComplex = C20 * vcl_pow(C12, 2);
HuValue = HuValueComplex.real();
- }
- break;
+ }
+ break;
case 7:
- {
- ComplexType C30,C12;
+ {
+ ComplexType C30, C12;
function->SetP(3);
function->SetQ(0);
- C30 = function->Evaluate( );
+ C30 = function->Evaluate();
function->SetP(1);
function->SetQ(2);
- C12 = function->Evaluate( );
+ C12 = function->Evaluate();
- HuValueComplex = C30 * vcl_pow( C12 , 3);
+ HuValueComplex = C30 * vcl_pow(C12, 3);
HuValue = HuValueComplex.imag();
- }
- break;
+ }
+ break;
default:
itkWarningMacro("Hu's invariant parameters are between 1 and 7");
- }
+ }
- return (static_cast<RealType>(HuValue) );
+ return (static_cast<RealType>(HuValue));
}
-template < class TInputPath, class TOutput, class TPrecision>
-typename HuPathFunction<TInputPath, TOutput, TPrecision >::RealType
-HuPathFunction<TInputPath, TOutput, TPrecision >
-::Evaluate( ) const
+template <class TInputPath, class TOutput, class TPrecision>
+typename HuPathFunction<TInputPath, TOutput, TPrecision>::RealType
+HuPathFunction<TInputPath, TOutput, TPrecision>
+::Evaluate() const
{
- if ( !this->GetInputPath() )
- {
- otbMsgDevMacro( << "Pb with GetInputPath" );
- return static_cast<RealType>( itk::NumericTraits<PrecisionType>::max());
- }
+ if (!this->GetInputPath())
+ {
+ otbMsgDevMacro(<< "Pb with GetInputPath");
+ return static_cast<RealType>(itk::NumericTraits<PrecisionType>::max());
+ }
- RealType Result = Evaluate( *(this->GetInputPath()) );
+ RealType Result = Evaluate(*(this->GetInputPath()));
return Result;
diff --git a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.h b/Code/FeatureExtraction/otbImageFittingPolygonListFilter.h
index 8d46e09442..8765edc7be 100644
--- a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.h
+++ b/Code/FeatureExtraction/otbImageFittingPolygonListFilter.h
@@ -33,14 +33,14 @@ namespace otb
*/
template <class TPath, class TImage>
class ITK_EXPORT ImageFittingPolygonListFilter
- : public PathListToPathListFilter<TPath>
+ : public PathListToPathListFilter<TPath>
{
public:
/** Standard typedefs */
- typedef ImageFittingPolygonListFilter Self;
- typedef PathListToPathListFilter<TPath> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageFittingPolygonListFilter Self;
+ typedef PathListToPathListFilter<TPath> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -49,18 +49,18 @@ public:
itkTypeMacro(ImageFittingPolygonListFilter, PathListToPathListFilter);
/** Template parameters typedefs */
- typedef typename Superclass::PathType PathType;
- typedef typename Superclass::PathListType PathListType;
- typedef typename Superclass::PathPointerType PathPointerType;
- typedef typename PathListType::Pointer PathListPointerType;
- typedef typename PathListType::ConstIterator IteratorType;
- typedef typename PathType::VertexType VertexType;
- typedef typename PathType::VertexListType VertexListType;
+ typedef typename Superclass::PathType PathType;
+ typedef typename Superclass::PathListType PathListType;
+ typedef typename Superclass::PathPointerType PathPointerType;
+ typedef typename PathListType::Pointer PathListPointerType;
+ typedef typename PathListType::ConstIterator IteratorType;
+ typedef typename PathType::VertexType VertexType;
+ typedef typename PathType::VertexListType VertexListType;
typedef typename VertexListType::ConstIterator VertexListConstIteratorType;
- typedef double RealType;
+ typedef double RealType;
- typedef TImage ImageType;
- typedef typename ImageType::Pointer ImagePointerType;
+ typedef TImage ImageType;
+ typedef typename ImageType::Pointer ImagePointerType;
typedef typename ImageType::ConstPointer ImageConstPointerType;
typedef itk::LineConstIterator<ImageType> LineConstIteratorType;
@@ -78,35 +78,37 @@ public:
const ImageType * GetInputImage(void);
/** Set/Get the search radius. */
- itkSetMacro(Radius,unsigned int);
- itkGetMacro(Radius,unsigned int);
+ itkSetMacro(Radius, unsigned int);
+ itkGetMacro(Radius, unsigned int);
/** Set/Get the number of iteration. */
- itkSetMacro(NumberOfIterations,unsigned int);
- itkGetMacro(NumberOfIterations,unsigned int);
+ itkSetMacro(NumberOfIterations, unsigned int);
+ itkGetMacro(NumberOfIterations, unsigned int);
protected:
/** Constructor */
ImageFittingPolygonListFilter();
/** Destructor */
- virtual ~ImageFittingPolygonListFilter() {};
+ virtual ~ImageFittingPolygonListFilter() {}
/** GenerateData method */
virtual void GenerateData();
/** PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
- virtual double computeValue(ImageConstPointerType image, VertexType middlePoint, VertexType previousPoint, VertexType nextPoint) const;
+ virtual double computeValue(ImageConstPointerType image,
+ VertexType middlePoint,
+ VertexType previousPoint,
+ VertexType nextPoint) const;
unsigned int m_Radius;
unsigned int m_NumberOfIterations;
private:
- ImageFittingPolygonListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ ImageFittingPolygonListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbImageFittingPolygonListFilter.txx"
#endif
diff --git a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx b/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx
index d7558ab31c..c03ad9607f 100644
--- a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx
+++ b/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx
@@ -34,8 +34,8 @@ ImageFittingPolygonListFilter<TPath, TImage>
{
this->SetNumberOfRequiredInputs(2);
this->SetNumberOfInputs(2);
- m_Radius=1;
- m_NumberOfIterations=1;
+ m_Radius = 1;
+ m_NumberOfIterations = 1;
}
template <class TPath, class TImage>
@@ -43,7 +43,7 @@ void
ImageFittingPolygonListFilter<TPath, TImage>
::SetInputImage(const ImageType * image)
{
- this->itk::ProcessObject::SetNthInput(1,const_cast<ImageType *>(image));
+ this->itk::ProcessObject::SetNthInput(1, const_cast<ImageType *>(image));
}
template <class TPath, class TImage>
@@ -52,14 +52,13 @@ const typename ImageFittingPolygonListFilter<TPath, TImage>
ImageFittingPolygonListFilter<TPath, TImage>
::GetInputImage(void)
{
- if (this->GetNumberOfInputs()<1)
- {
+ if (this->GetNumberOfInputs() < 1)
+ {
return 0;
- }
+ }
return static_cast<const ImageType *>(this->itk::ProcessObject::GetInput(1));
}
-
//FIXME
//There is an issue here with integer and continous indexes
//maybe we should use the itk::LineConstIterator
@@ -71,31 +70,30 @@ ImageFittingPolygonListFilter<TPath, TImage>
// I/O wiring
ImageConstPointerType inputImagePtr = this->GetInputImage();
const PathListType * inputPtr = this->GetInput();
- PathListType * outputPtr = this->GetOutput();
-
+ PathListType * outputPtr = this->GetOutput();
- typename ImageType::RegionType regionLargest=inputImagePtr->GetLargestPossibleRegion();
+ typename ImageType::RegionType regionLargest = inputImagePtr->GetLargestPossibleRegion();
typedef itk::ImageRegionConstIteratorWithIndex<ImageType> NeighborhoodIteratorType;
typename ImageType::SizeType size;
- size[0]= 2*m_Radius+1;
- size[1]= 2*m_Radius+1;
+ size[0] = 2 * m_Radius + 1;
+ size[1] = 2 * m_Radius + 1;
typename ImageType::RegionType region;
region.SetSize(size);
typename ImageType::IndexType start;
//go through all the polygons in the list
IteratorType it = inputPtr->Begin();
- while ( it != inputPtr->End() )
- {
+ while (it != inputPtr->End())
+ {
PathPointerType polygon = it.Get();
- if (polygon->GetVertexList()->Size()>2)
- {
- for (unsigned int iteration=0;iteration < m_NumberOfIterations;++iteration)
+ if (polygon->GetVertexList()->Size() > 2)
{
- PathPointerType newPolygon = PathType::New();
+ for (unsigned int iteration = 0; iteration < m_NumberOfIterations; ++iteration)
+ {
+ PathPointerType newPolygon = PathType::New();
VertexListConstIteratorType vertexIt = polygon->GetVertexList()->Begin();
//We are now going to go through all the vertex, we won't start to process
// first as we need to know the last one for that.
@@ -105,165 +103,166 @@ ImageFittingPolygonListFilter<TPath, TImage>
VertexType currentPoint = vertexIt.Value();
++vertexIt;
while (vertexIt != polygon->GetVertexList()->End())
- {
- VertexType nextPoint=vertexIt.Value();
+ {
+ VertexType nextPoint = vertexIt.Value();
/** try all the possible neighbor for the current point
* to factorize
* */
- {
+ {
- start[0] = static_cast<long int>(currentPoint[0]-m_Radius);
- start[1] = static_cast<long int>(currentPoint[1]-m_Radius);
+ start[0] = static_cast<long int>(currentPoint[0] - m_Radius);
+ start[1] = static_cast<long int>(currentPoint[1] - m_Radius);
region.SetIndex(start);
- region.Crop(inputImagePtr->GetLargestPossibleRegion());
+ region.Crop(inputImagePtr->GetLargestPossibleRegion());
NeighborhoodIteratorType nIt(inputImagePtr, region);
- double maxValue=0.0;
+ double maxValue = 0.0;
VertexType maxPoint = currentPoint;
- nIt.GoToBegin();
- while( !nIt.IsAtEnd() )
- {
- if (regionLargest.IsInside(nIt.GetIndex()))
+ nIt.GoToBegin();
+ while (!nIt.IsAtEnd())
{
- VertexType middlePoint=static_cast<VertexType>(nIt.GetIndex());
- double currentValue = computeValue(inputImagePtr, middlePoint, previousPoint, nextPoint);
- if (currentValue > maxValue)
+ if (regionLargest.IsInside(nIt.GetIndex()))
{
- maxValue=currentValue;
- maxPoint=middlePoint;
+ VertexType middlePoint = static_cast<VertexType>(nIt.GetIndex());
+ double currentValue = computeValue(inputImagePtr, middlePoint, previousPoint, nextPoint);
+ if (currentValue > maxValue)
+ {
+ maxValue = currentValue;
+ maxPoint = middlePoint;
+ }
}
+ ++nIt;
}
- ++nIt;
- }
- currentPoint=maxPoint;
+ currentPoint = maxPoint;
newPolygon->AddVertex(maxPoint);
- }
+ }
/** End 'to factorize' */
++vertexIt;
- previousPoint=currentPoint;
- currentPoint=nextPoint;
+ previousPoint = currentPoint;
+ currentPoint = nextPoint;
- }
+ }
//We now need to process the last and the first point
VertexType nextPoint = firstPoint;
/** try all the possible neighbor for the current point
* to factorize
* */
- {
- start[0] = static_cast<long int>(currentPoint[0]-m_Radius);
- start[1] = static_cast<long int>(currentPoint[1]-m_Radius);
+ {
+ start[0] = static_cast<long int>(currentPoint[0] - m_Radius);
+ start[1] = static_cast<long int>(currentPoint[1] - m_Radius);
region.SetIndex(start);
NeighborhoodIteratorType nIt(inputImagePtr, region);
- double maxValue=0.0;
+ double maxValue = 0.0;
VertexType maxPoint = currentPoint;
- nIt.GoToBegin();
+ nIt.GoToBegin();
- while( !nIt.IsAtEnd() )
- {
- if (regionLargest.IsInside(nIt.GetIndex()))
+ while (!nIt.IsAtEnd())
{
- VertexType middlePoint=static_cast<VertexType>(nIt.GetIndex());
- double currentValue = computeValue(inputImagePtr, middlePoint, previousPoint, nextPoint);
- if (currentValue > maxValue)
+ if (regionLargest.IsInside(nIt.GetIndex()))
{
- maxValue=currentValue;
- maxPoint=middlePoint;
+ VertexType middlePoint = static_cast<VertexType>(nIt.GetIndex());
+ double currentValue = computeValue(inputImagePtr, middlePoint, previousPoint, nextPoint);
+ if (currentValue > maxValue)
+ {
+ maxValue = currentValue;
+ maxPoint = middlePoint;
+ }
}
+ ++nIt;
}
- ++nIt;
- }
- currentPoint=maxPoint;
+ currentPoint = maxPoint;
newPolygon->AddVertex(maxPoint);
- }
+ }
/** End 'to factorize' */
previousPoint = currentPoint;
- currentPoint= firstPoint;
+ currentPoint = firstPoint;
vertexIt = newPolygon->GetVertexList()->Begin();
- nextPoint=vertexIt.Value();
+ nextPoint = vertexIt.Value();
/** try all the possible neighbor for the current point
* to factorize
* */
- {
+ {
- start[0] = static_cast<long int>(currentPoint[0]-m_Radius);
- start[1] = static_cast<long int>(currentPoint[1]-m_Radius);
+ start[0] = static_cast<long int>(currentPoint[0] - m_Radius);
+ start[1] = static_cast<long int>(currentPoint[1] - m_Radius);
region.SetIndex(start);
NeighborhoodIteratorType nIt(inputImagePtr, region);
- double maxValue=0.0;
+ double maxValue = 0.0;
VertexType maxPoint = currentPoint;
- nIt.GoToBegin();
- while ( !nIt.IsAtEnd() )
- {
- if (regionLargest.IsInside(nIt.GetIndex()))
+ nIt.GoToBegin();
+ while (!nIt.IsAtEnd())
{
- VertexType middlePoint=static_cast<VertexType>(nIt.GetIndex());
- double currentValue = computeValue(inputImagePtr, middlePoint, previousPoint, nextPoint);
- if (currentValue > maxValue)
+ if (regionLargest.IsInside(nIt.GetIndex()))
{
- maxValue=currentValue;
- maxPoint=middlePoint;
+ VertexType middlePoint = static_cast<VertexType>(nIt.GetIndex());
+ double currentValue = computeValue(inputImagePtr, middlePoint, previousPoint, nextPoint);
+ if (currentValue > maxValue)
+ {
+ maxValue = currentValue;
+ maxPoint = middlePoint;
+ }
}
+ ++nIt;
}
- ++nIt;
- }
- currentPoint=maxPoint;
+ currentPoint = maxPoint;
newPolygon->AddVertex(maxPoint);
- }
+ }
/** End 'to factorize' */
- polygon = newPolygon;//prepare the next iteration
+ polygon = newPolygon; //prepare the next iteration
+ }
}
- }
outputPtr->PushBack(polygon);
++it;
- }//going through the polygon list
+ } //going through the polygon list
}
template <class TPath, class TImage>
double
ImageFittingPolygonListFilter<TPath, TImage>
-::computeValue(ImageConstPointerType image, VertexType middlePoint, VertexType previousPoint, VertexType nextPoint) const
+::computeValue(ImageConstPointerType image, VertexType middlePoint, VertexType previousPoint,
+ VertexType nextPoint) const
{
typedef typename ImageType::IndexType IndexType;
IndexType middleIndex;
IndexType previousIndex;
IndexType nextIndex;
- middleIndex[0]=static_cast<long int>(middlePoint[0]);
- middleIndex[1]=static_cast<long int>(middlePoint[1]);
- previousIndex[0]=static_cast<long int>(previousPoint[0]);
- previousIndex[1]=static_cast<long int>(previousPoint[1]);
- nextIndex[0]=static_cast<long int>(nextPoint[0]);
- nextIndex[1]=static_cast<long int>(nextPoint[1]);
- double currentValue = 0.0;
+ middleIndex[0] = static_cast<long int>(middlePoint[0]);
+ middleIndex[1] = static_cast<long int>(middlePoint[1]);
+ previousIndex[0] = static_cast<long int>(previousPoint[0]);
+ previousIndex[1] = static_cast<long int>(previousPoint[1]);
+ nextIndex[0] = static_cast<long int>(nextPoint[0]);
+ nextIndex[1] = static_cast<long int>(nextPoint[1]);
+ double currentValue = 0.0;
unsigned int count = 0;
- {//compute for first segment
+ { //compute for first segment
LineConstIteratorType itLine(image, previousIndex, middleIndex);
while (!itLine.IsAtEnd())
- {
+ {
currentValue += itLine.Get();
++count;
++itLine;
+ }
}
- }
- {//compute for second segment
+ { //compute for second segment
LineConstIteratorType itLine(image, nextIndex, middleIndex);
while (!itLine.IsAtEnd())
- {
+ {
currentValue += itLine.Get();
++count;
++itLine;
+ }
}
- }
- return currentValue/count;
+ return currentValue / count;
}
/**
diff --git a/Code/FeatureExtraction/otbImageToCarvingPathFilter.h b/Code/FeatureExtraction/otbImageToCarvingPathFilter.h
index 40ff5b199f..0c20cc5bed 100644
--- a/Code/FeatureExtraction/otbImageToCarvingPathFilter.h
+++ b/Code/FeatureExtraction/otbImageToCarvingPathFilter.h
@@ -51,10 +51,9 @@ namespace otb
* \ingroup ImageFilters
*/
-
template <class TInputImage, class TOutputPath>
class ITK_EXPORT ImageToCarvingPathFilter
- : public ImageToPathFilter<TInputImage, TOutputPath>
+ : public ImageToPathFilter<TInputImage, TOutputPath>
{
public:
/** standards typedefs */
@@ -66,7 +65,7 @@ public:
/// Creation through the object factory
itkNewMacro(Self);
/// Runtime information
- itkTypeMacro(ImageToCarvingPathFilter,ImageToPathFilter);
+ itkTypeMacro(ImageToCarvingPathFilter, ImageToPathFilter);
/// Template parameters typedef
typedef typename Superclass::InputImageType InputImageType;
@@ -74,30 +73,29 @@ public:
typedef typename Superclass::OutputPathType OutputPathType;
typedef typename Superclass::OutputPathPointerType OutputPathPointerType;
- typedef typename InputImageType::PixelType PixelType;
-
+ typedef typename InputImageType::PixelType PixelType;
/** Set and Get foreground value */
- itkSetMacro(ForegroundValue,PixelType);
- itkGetConstMacro(ForegroundValue,PixelType);
+ itkSetMacro(ForegroundValue, PixelType);
+ itkGetConstMacro(ForegroundValue, PixelType);
/** Set and Get direction value */
- itkSetMacro(Direction ,unsigned int);
- itkGetConstMacro(Direction ,unsigned int);
+ itkSetMacro(Direction, unsigned int);
+ itkGetConstMacro(Direction, unsigned int);
/** Get EnergyPerPix value */
- itkGetConstMacro(EnergyPerPix ,double);
+ itkGetConstMacro(EnergyPerPix, double);
protected:
ImageToCarvingPathFilter();
- virtual ~ImageToCarvingPathFilter() {};
+ virtual ~ImageToCarvingPathFilter() {}
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
- virtual void GenerateOutputInformation() {}; //does nothing
+ virtual void GenerateOutputInformation() {} //does nothing
virtual void GenerateData();
private:
- ImageToCarvingPathFilter(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ ImageToCarvingPathFilter(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
PixelType m_ForegroundValue;
unsigned int m_Direction;
diff --git a/Code/FeatureExtraction/otbImageToCarvingPathFilter.txx b/Code/FeatureExtraction/otbImageToCarvingPathFilter.txx
index 844a3b8328..3161cf9fe8 100644
--- a/Code/FeatureExtraction/otbImageToCarvingPathFilter.txx
+++ b/Code/FeatureExtraction/otbImageToCarvingPathFilter.txx
@@ -50,27 +50,27 @@ ImageToCarvingPathFilter<TInputImage, TOutputPath>
{
const InputImageType * inputImage = this->GetInput();
- OutputPathType * outputPath = this->GetOutput();
+ OutputPathType * outputPath = this->GetOutput();
typedef itk::ImageSliceConstIteratorWithIndex
<InputImageType> IteratorType;
- typedef itk::NeighborhoodIterator< InputImageType >
+ typedef itk::NeighborhoodIterator<InputImageType>
NeighborhoodIteratorType;
IteratorType it(inputImage,
inputImage->GetLargestPossibleRegion());
it.GoToBegin();
- PixelType maxValue = itk::NumericTraits< PixelType >::max();
+ PixelType maxValue = itk::NumericTraits<PixelType>::max();
typename InputImageType::Pointer energyImage = InputImageType::New();
- energyImage->SetRegions(inputImage-> GetLargestPossibleRegion());
+ energyImage->SetRegions(inputImage->GetLargestPossibleRegion());
energyImage->Allocate();
typename NeighborhoodIteratorType::RadiusType radius;
radius.Fill(1);
NeighborhoodIteratorType neighIt(radius, energyImage,
- energyImage-> GetLargestPossibleRegion() );
+ energyImage->GetLargestPossibleRegion());
neighIt.GoToBegin();
unsigned int dir0;
@@ -81,101 +81,99 @@ ImageToCarvingPathFilter<TInputImage, TOutputPath>
typename IteratorType::OffsetType UP2;
typename IteratorType::OffsetType NEXT;
-
- const typename IteratorType::OffsetType LEFT ={{-1,0}};
- const typename IteratorType::OffsetType RIGHT ={{1,0}};
- const typename IteratorType::OffsetType UP ={{0,-1}};
- const typename IteratorType::OffsetType DOWN ={{0,1}};
- const typename IteratorType::OffsetType LEFTUP ={{-1,-1}};
+ const typename IteratorType::OffsetType LEFT = {{-1, 0}};
+ const typename IteratorType::OffsetType RIGHT = {{1, 0}};
+ const typename IteratorType::OffsetType UP = {{0, -1}};
+ const typename IteratorType::OffsetType DOWN = {{0, 1}};
+ const typename IteratorType::OffsetType LEFTUP = {{-1, -1}};
// const typename IteratorType::OffsetType RIGHTDOWN ={{1,1}};
- const typename IteratorType::OffsetType RIGHTUP ={{1,-1}};
- const typename IteratorType::OffsetType LEFTDOWN ={{-1,1}};
+ const typename IteratorType::OffsetType RIGHTUP = {{1, -1}};
+ const typename IteratorType::OffsetType LEFTDOWN = {{-1, 1}};
// const typename IteratorType::OffsetType CENTER ={{0,0}};
if (m_Direction == 0)
- {
- dir0=0;
- dir1=1;
+ {
+ dir0 = 0;
+ dir1 = 1;
UP0 = LEFTUP;
UP1 = UP;
UP2 = RIGHTUP;
NEXT = DOWN;
- }
+ }
else
- {
- dir0=1;
- dir1=0;
+ {
+ dir0 = 1;
+ dir1 = 0;
UP0 = LEFTUP;
UP1 = LEFT;
UP2 = LEFTDOWN;
NEXT = RIGHT;
- }
+ }
/** Compute the energy image top-down or left-right
* with cumulative energy (dynamic programming first step) */
- it.SetFirstDirection( dir0 );
- it.SetSecondDirection( dir1 );
+ it.SetFirstDirection(dir0);
+ it.SetSecondDirection(dir1);
it.GoToBegin();
neighIt.GoToBegin();
while (!it.IsAtEnd())
- {
- while (!it.IsAtEndOfSlice())
{
- while (!it.IsAtEndOfLine())
+ while (!it.IsAtEndOfSlice())
{
- neighIt.SetLocation(it.GetIndex());//TODO bad for performances... find a better option
+ while (!it.IsAtEndOfLine())
+ {
+ neighIt.SetLocation(it.GetIndex()); //TODO bad for performances... find a better option
// this is really about 20% of total processing time !!!
PixelType min = maxValue;
- bool isInside = false;
- bool flag = false;
+ bool isInside = false;
+ bool flag = false;
if (neighIt.GetPixel(UP0, isInside) < min)
- {
- if (isInside)
{
- min=neighIt.GetPixel(UP0);
+ if (isInside)
+ {
+ min = neighIt.GetPixel(UP0);
flag = true;
+ }
}
- }
if (neighIt.GetPixel(UP1, isInside) < min)
- {
- if (isInside)
{
- min=neighIt.GetPixel(UP1);
+ if (isInside)
+ {
+ min = neighIt.GetPixel(UP1);
flag = true;
+ }
}
- }
if (neighIt.GetPixel(UP2, isInside) < min)
- {
- if (isInside)
{
- min=neighIt.GetPixel(UP2);
+ if (isInside)
+ {
+ min = neighIt.GetPixel(UP2);
flag = true;
+ }
}
- }
if (!flag) //no previous value
- {
+ {
min = 0;
- }
+ }
PixelType newValue = it.Get() + min;
neighIt.SetCenterPixel(newValue);
++it;
- }
+ }
it.NextLine();
- }
+ }
it.NextSlice();
- }
-
+ }
/** Follow the minima bottom-up or right-left
* (dynamic programming second step) */
//find the starting point to follow on the last line
- typedef itk::ImageLinearConstIteratorWithIndex< InputImageType >
+ typedef itk::ImageLinearConstIteratorWithIndex<InputImageType>
LinearIteratorType;
LinearIteratorType LinIt(energyImage,
@@ -187,64 +185,64 @@ ImageToCarvingPathFilter<TInputImage, TOutputPath>
PixelType min = maxValue;
IndexType indexToAdd;
while (!LinIt.IsAtReverseEndOfLine())
- {
- if (LinIt.Get()<min)
{
- min=LinIt.Get();
- indexToAdd=LinIt.GetIndex();
- }
+ if (LinIt.Get() < min)
+ {
+ min = LinIt.Get();
+ indexToAdd = LinIt.GetIndex();
+ }
--LinIt;
- }
+ }
outputPath->AddVertex(indexToAdd);
- m_EnergyPerPix = ((double) min)/ (inputImage->GetLargestPossibleRegion().GetSize())[dir1];
+ m_EnergyPerPix = ((double) min) / (inputImage->GetLargestPossibleRegion().GetSize())[dir1];
//follow the min
neighIt.SetLocation(indexToAdd);
- bool flag=true;
+ bool flag = true;
while (flag)
- {
- flag=false;
+ {
+ flag = false;
PixelType min = maxValue;
IndexType indexToAdd;
- bool isInside = false;
+ bool isInside = false;
if (neighIt.GetPixel(UP0, isInside) < min)
- {
- if (isInside)
{
- min=neighIt.GetPixel(UP0);
+ if (isInside)
+ {
+ min = neighIt.GetPixel(UP0);
indexToAdd = neighIt.GetIndex(UP0);
flag = true;
+ }
}
- }
if (neighIt.GetPixel(UP1, isInside) < min)
- {
- if (isInside)
{
- min=neighIt.GetPixel(UP1);
+ if (isInside)
+ {
+ min = neighIt.GetPixel(UP1);
indexToAdd = neighIt.GetIndex(UP1);
flag = true;
+ }
}
- }
if (neighIt.GetPixel(UP2, isInside) < min)
- {
- if (isInside)
{
- min=neighIt.GetPixel(UP2);
+ if (isInside)
+ {
+ min = neighIt.GetPixel(UP2);
indexToAdd = neighIt.GetIndex(UP2);
flag = true;
+ }
}
- }
if (flag)
- {
+ {
outputPath->AddVertex(indexToAdd);
neighIt.SetLocation(indexToAdd);
- }
+ }
- }
+ }
}
@@ -253,8 +251,8 @@ void
ImageToCarvingPathFilter<TInputImage, TOutputPath>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os << "Foreground value : "<<m_ForegroundValue<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << "Foreground value : " << m_ForegroundValue << std::endl;
}
} // end namespace otb
diff --git a/Code/FeatureExtraction/otbImageToEdgePathFilter.h b/Code/FeatureExtraction/otbImageToEdgePathFilter.h
index e0c830bd91..4ee8158db6 100644
--- a/Code/FeatureExtraction/otbImageToEdgePathFilter.h
+++ b/Code/FeatureExtraction/otbImageToEdgePathFilter.h
@@ -49,14 +49,13 @@ namespace otb
* \sa ImageToPathFilter
*/
-
template <class TInputImage, class TOutputPath>
class ITK_EXPORT ImageToEdgePathFilter
- : public ImageToPathFilter<TInputImage, TOutputPath>
+ : public ImageToPathFilter<TInputImage, TOutputPath>
{
public:
/** standards typedefs */
- typedef ImageToEdgePathFilter Self;
+ typedef ImageToEdgePathFilter Self;
typedef ImageToPathFilter<TInputImage, TOutputPath> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -64,31 +63,31 @@ public:
/// Creation througth the object factory
itkNewMacro(Self);
/// Runtime information
- itkTypeMacro(ImageToEdgePathFilter,ImageToPathFilter);
+ itkTypeMacro(ImageToEdgePathFilter, ImageToPathFilter);
/// Template parameters typedef
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::InputImagePointerType InputImagePointerType;
- typedef typename Superclass::OutputPathType OutputPathType;
- typedef typename Superclass::OutputPathPointerType OutputPathPointerType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::InputImagePointerType InputImagePointerType;
+ typedef typename Superclass::OutputPathType OutputPathType;
+ typedef typename Superclass::OutputPathPointerType OutputPathPointerType;
typedef typename OutputPathType::ContinuousIndexType ContinuousIndexType;
- typedef typename InputImageType::PixelType PixelType;
+ typedef typename InputImageType::PixelType PixelType;
/** Set and Get foreground value */
- itkSetMacro(ForegroundValue,PixelType);
- itkGetConstMacro(ForegroundValue,PixelType);
+ itkSetMacro(ForegroundValue, PixelType);
+ itkGetConstMacro(ForegroundValue, PixelType);
protected:
ImageToEdgePathFilter();
- virtual ~ImageToEdgePathFilter() {};
+ virtual ~ImageToEdgePathFilter() {}
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
- virtual void GenerateOutputInformation() {}; //does nothing
+ virtual void GenerateOutputInformation() {} //does nothing
virtual void GenerateData();
private:
- ImageToEdgePathFilter(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ ImageToEdgePathFilter(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
PixelType m_ForegroundValue;
};
diff --git a/Code/FeatureExtraction/otbImageToEdgePathFilter.txx b/Code/FeatureExtraction/otbImageToEdgePathFilter.txx
index 0b5a34c9b1..4490b6f3c3 100644
--- a/Code/FeatureExtraction/otbImageToEdgePathFilter.txx
+++ b/Code/FeatureExtraction/otbImageToEdgePathFilter.txx
@@ -45,59 +45,59 @@ ImageToEdgePathFilter<TInputImage, TOutputPath>
{
const InputImageType * inputImage = this->GetInput();
- OutputPathType * outputPath = this->GetOutput();
+ OutputPathType * outputPath = this->GetOutput();
- otbMsgDebugMacro(<<"Foreground value : "<<m_ForegroundValue);
+ otbMsgDebugMacro(<< "Foreground value : " << m_ForegroundValue);
PixelType initPadConstant(0);
- if ( initPadConstant == m_ForegroundValue )
- {
+ if (initPadConstant == m_ForegroundValue)
+ {
initPadConstant = 1;
- }
+ }
- typedef itk::ConstantPadImageFilter<InputImageType,InputImageType> PadFilterType;
- typedef itk::ConstShapedNeighborhoodIterator<InputImageType> IteratorType;
- typedef itk::ImageRegionConstIteratorWithIndex<InputImageType> LinearIteratorType;
+ typedef itk::ConstantPadImageFilter<InputImageType, InputImageType> PadFilterType;
+ typedef itk::ConstShapedNeighborhoodIterator<InputImageType> IteratorType;
+ typedef itk::ImageRegionConstIteratorWithIndex<InputImageType> LinearIteratorType;
// Padding to deal with near the border objects.
typename PadFilterType::Pointer pad = PadFilterType::New();
pad->SetInput(inputImage);
pad->SetConstant(initPadConstant);
- long unsigned int padSize[2] = {1,1};
+ long unsigned int padSize[2] = {1, 1};
pad->SetPadUpperBound(padSize);
pad->SetPadLowerBound(padSize);
pad->Update();
// Iterate on the image to get a starting point
- LinearIteratorType linIter(pad->GetOutput(),pad->GetOutput()->GetLargestPossibleRegion());
+ LinearIteratorType linIter(pad->GetOutput(), pad->GetOutput()->GetLargestPossibleRegion());
linIter.GoToBegin();
bool flag = true;
while (flag && !linIter.IsAtEnd())
- {
- if (linIter.Get() == m_ForegroundValue )
{
- flag=false;
- }
+ if (linIter.Get() == m_ForegroundValue)
+ {
+ flag = false;
+ }
else
- {
+ {
++linIter;
+ }
}
- }
typename InputImageType::IndexType start = linIter.GetIndex();
// outputPath->AddVertex(start);
// Neighborhood definition
typename IteratorType::RadiusType radius;
radius.Fill(1);
- IteratorType it(radius, pad->GetOutput(),pad->GetOutput()->GetLargestPossibleRegion());
- const typename IteratorType::OffsetType LEFT ={{-1,0}};
- const typename IteratorType::OffsetType RIGHT ={{1,0}};
- const typename IteratorType::OffsetType UP ={{0,-1}};
- const typename IteratorType::OffsetType DOWN ={{0,1}};
- const typename IteratorType::OffsetType LEFTUP ={{-1,-1}};
- const typename IteratorType::OffsetType RIGHTDOWN ={{1,1}};
- const typename IteratorType::OffsetType RIGHTUP ={{1,-1}};
- const typename IteratorType::OffsetType LEFTDOWN ={{-1,1}};
- const typename IteratorType::OffsetType CENTER ={{0,0}};
+ IteratorType it(radius, pad->GetOutput(), pad->GetOutput()->GetLargestPossibleRegion());
+ const typename IteratorType::OffsetType LEFT = {{-1, 0}};
+ const typename IteratorType::OffsetType RIGHT = {{1, 0}};
+ const typename IteratorType::OffsetType UP = {{0, -1}};
+ const typename IteratorType::OffsetType DOWN = {{0, 1}};
+ const typename IteratorType::OffsetType LEFTUP = {{-1, -1}};
+ const typename IteratorType::OffsetType RIGHTDOWN = {{1, 1}};
+ const typename IteratorType::OffsetType RIGHTUP = {{1, -1}};
+ const typename IteratorType::OffsetType LEFTDOWN = {{-1, 1}};
+ const typename IteratorType::OffsetType CENTER = {{0, 0}};
it.ClearActiveList();
it.ActivateOffset(LEFT);
it.ActivateOffset(RIGHT);
@@ -121,28 +121,22 @@ ImageToEdgePathFilter<TInputImage, TOutputPath>
// Set up the iterator
it.SetLocation(start);
-
ContinuousIndexType newVertex = it.GetIndex(CENTER);
- if (it.GetPixel(RIGHT)==m_ForegroundValue)
- newVertex[0]-=0.5;
- if (it.GetPixel(LEFT)==m_ForegroundValue)
- newVertex[0]+=0.5;
- if (it.GetPixel(UP)==m_ForegroundValue)
- newVertex[1]+=0.5;
- if (it.GetPixel(DOWN)==m_ForegroundValue)
- newVertex[1]-=0.5;
+ if (it.GetPixel(RIGHT) == m_ForegroundValue) newVertex[0] -= 0.5;
+ if (it.GetPixel(LEFT) == m_ForegroundValue) newVertex[0] += 0.5;
+ if (it.GetPixel(UP) == m_ForegroundValue) newVertex[1] += 0.5;
+ if (it.GetPixel(DOWN) == m_ForegroundValue) newVertex[1] -= 0.5;
outputPath->AddVertex(newVertex);
-
- otbMsgDebugMacro(<<"START: "<<start);
+ otbMsgDebugMacro(<< "START: " << start);
// stopping flag
flag = true;
- int nbMove=0;
+ int nbMove = 0;
// nexstart gives a clue of where to begin searching in next step of the search
- int nextStart=0;
+ int nextStart = 0;
// While the search has not eended
while (flag)
- {
+ {
// move is used to walk the neighnorhood clock-wise
int move = nextStart;
// edgeFound indicate that the edge has been found.
@@ -150,74 +144,70 @@ ImageToEdgePathFilter<TInputImage, TOutputPath>
// LastWasPositive indicate wether the previous pixel belong to the object or not
bool LastWasPositive(false);
// While unexplored pixels remain and no edge was found
- while ((move<nextStart+8)&&(!EdgeFound))
- {
+ while ((move < nextStart + 8) && (!EdgeFound))
+ {
//otbMsgDevMacro(<<"SEARCH: "<<move%8<<" "<<it.GetPixel(rotation[move%8])<<" LAST: "<<LastWasPositive);
// If last pixel was not in the object and the current is, we have found the edge
- if ((!LastWasPositive) && (it.GetPixel(rotation[move%8]) == m_ForegroundValue) )
- {
- EdgeFound=true;
- }
+ if ((!LastWasPositive) && (it.GetPixel(rotation[move % 8]) == m_ForegroundValue))
+ {
+ EdgeFound = true;
+ }
else
- {
+ {
// Else goes on
- LastWasPositive=(it.GetPixel(rotation[move%8]) == m_ForegroundValue);
+ LastWasPositive = (it.GetPixel(rotation[move % 8]) == m_ForegroundValue);
move++;
+ }
}
- }
// Once the search has been completed, if an edge pixel was found
if (EdgeFound)
- {
+ {
// Update the output path
- it+=rotation[move%8];
- nextStart=(move+5)%8;
+ it += rotation[move % 8];
+ nextStart = (move + 5) % 8;
newVertex = it.GetIndex(CENTER);
- if (it.GetPixel(RIGHT)==m_ForegroundValue)
- newVertex[0]-=0.5;
- if (it.GetPixel(LEFT)==m_ForegroundValue)
- newVertex[0]+=0.5;
- if (it.GetPixel(UP)==m_ForegroundValue)
- newVertex[1]+=0.5;
- if (it.GetPixel(DOWN)==m_ForegroundValue)
- newVertex[1]-=0.5;
+ if (it.GetPixel(RIGHT) == m_ForegroundValue) newVertex[0] -= 0.5;
+ if (it.GetPixel(LEFT) == m_ForegroundValue) newVertex[0] += 0.5;
+ if (it.GetPixel(UP) == m_ForegroundValue) newVertex[1] += 0.5;
+ if (it.GetPixel(DOWN) == m_ForegroundValue) newVertex[1] -= 0.5;
outputPath->AddVertex(newVertex);
- otbMsgDebugMacro(<<newVertex);
+ otbMsgDebugMacro(<< newVertex);
// If we came back to our start point after a sufficient number of moves
- if ((it.GetIndex(CENTER)==start)&&(nbMove>=2))
- {
+ if ((it.GetIndex(CENTER) == start) && (nbMove >= 2))
+ {
// search end
- flag=false;
- }
+ flag = false;
+ }
else
- {
- // else
- for (int i=0;i<8;++i)
{
- // If we came back near our starting pointer after a sufficient number of moves
- if ((it.GetIndex(rotation[i])==start)&&(nbMove>=2))
+ // else
+ for (int i = 0; i < 8; ++i)
{
+ // If we came back near our starting pointer after a sufficient number of moves
+ if ((it.GetIndex(rotation[i]) == start) && (nbMove >= 2))
+ {
// search end
- flag=false;
+ flag = false;
+ }
}
}
}
- }
// else
else
- {
+ {
// search ended, no pixel can be added to the edge path.
- flag=false;
- }
+ flag = false;
+ }
nbMove++;
- }
+ }
}
template <class TInputImage, class TOutputPath>
void
ImageToEdgePathFilter<TInputImage, TOutputPath>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os << "Foreground value : "<<m_ForegroundValue<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << "Foreground value : " << m_ForegroundValue << std::endl;
}
} // end namespace otb
diff --git a/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.h b/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.h
index d928b9cd86..3caa9b903e 100644
--- a/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.h
+++ b/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.h
@@ -28,7 +28,6 @@
#include "itkFixedArray.h"
#include "otbMath.h"
-
namespace otb
{
namespace Functor
@@ -45,26 +44,25 @@ template <class TInput, class TOutput>
class HessianDeterminant
{
public:
- HessianDeterminant() {};
- virtual ~HessianDeterminant() {};
+ HessianDeterminant() {}
+ virtual ~HessianDeterminant() {}
/*
*
* \param input : A symetric Hessian Matrix
* \return Determinant of the Hessian Matrix
*/
- inline TOutput operator()(const TInput& input)
+ inline TOutput operator ()(const TInput& input)
{
- return static_cast<TOutput>(input[0]*input[1] - input[2]*input[2]);
+ return static_cast<TOutput>(input[0] * input[1] - input[2] * input[2]);
}
-
bool operator !=(const HessianDeterminant) const
{
return false;
}
- bool operator==(const HessianDeterminant & other) const
+ bool operator ==(const HessianDeterminant& other) const
{
return !(*this != other);
}
@@ -80,7 +78,7 @@ public:
*/
template <class TInputImage, class TOutputImage, class TPrecision = double>
class ITK_EXPORT ImageToHessianDeterminantImageFilter
- : public itk::ImageToImageFilter< TInputImage, TOutputImage >
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
@@ -95,11 +93,11 @@ public:
itkNewMacro(Self);
/** Set/Get the number of iterations */
- itkSetMacro(Sigma,double);
- itkGetMacro(Sigma,double);
+ itkSetMacro(Sigma, double);
+ itkGetMacro(Sigma, double);
/** Run-time type information (and related methods). */
- itkTypeMacro(ImageToHessianDeterminantImageFilter,ImageToImageFilter);
+ itkTypeMacro(ImageToHessianDeterminantImageFilter, ImageToImageFilter);
/* Initialization of Input & Output Images*/
typedef TInputImage InputImageType;
@@ -108,19 +106,19 @@ public:
typedef typename OutputImageType::Pointer OutputImagePointerType;
typedef typename OutputImageType::PixelType OutputPixelType;
-
- typedef itk::FixedArray<TPrecision,3> VectorType;
- typedef otb::Image<VectorType,2> VectorImageType;
+ typedef itk::FixedArray<TPrecision, 3> VectorType;
+ typedef otb::Image<VectorType, 2> VectorImageType;
typedef typename VectorImageType::Pointer VectorImagePointerType;
/** Internal filters typedefs */
typedef itk::HessianRecursiveGaussianImageFilter
- <InputImageType,VectorImageType> ImageToHessianImageFilterType;
- typedef typename ImageToHessianImageFilterType::Pointer ImageToHessianImageFilterPointerType;
- typedef Functor::HessianDeterminant<VectorType,OutputPixelType> DeterminantFunctorType;
- typedef itk::UnaryFunctorImageFilter<VectorImageType,OutputImageType,DeterminantFunctorType> DeterminantFilterType;
- typedef typename DeterminantFilterType::Pointer DeterminantFilterPointerType;
-
+ <InputImageType, VectorImageType> ImageToHessianImageFilterType;
+ typedef typename ImageToHessianImageFilterType::Pointer
+ ImageToHessianImageFilterPointerType;
+ typedef Functor::HessianDeterminant<VectorType, OutputPixelType> DeterminantFunctorType;
+ typedef itk::UnaryFunctorImageFilter<VectorImageType, OutputImageType, DeterminantFunctorType> DeterminantFilterType;
+ typedef typename DeterminantFilterType::Pointer
+ DeterminantFilterPointerType;
protected:
/**
@@ -145,7 +143,7 @@ private:
/** Hessian filter */
ImageToHessianImageFilterPointerType m_HessianFilter;
/** Hessian Determinant Computation filter */
- DeterminantFilterPointerType m_DeterminantFilter;
+ DeterminantFilterPointerType m_DeterminantFilter;
/** Width of the Gaussian used in the HessianRecursiveGaussianImageFilter */
double m_Sigma;
diff --git a/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.txx b/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.txx
index 33d625bad6..52740ff58c 100644
--- a/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.txx
+++ b/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.txx
@@ -26,7 +26,7 @@
namespace otb
{
template <class TInputImage, class TOutputImage, class TPrecision>
-ImageToHessianDeterminantImageFilter<TInputImage,TOutputImage,TPrecision>
+ImageToHessianDeterminantImageFilter<TInputImage, TOutputImage, TPrecision>
::ImageToHessianDeterminantImageFilter()
{
// Filter intialization
@@ -41,14 +41,13 @@ ImageToHessianDeterminantImageFilter<TInputImage,TOutputImage,TPrecision>
}
template <class TInputImage, class TOutputImage, class TPrecision>
-ImageToHessianDeterminantImageFilter<TInputImage,TOutputImage,TPrecision>
+ImageToHessianDeterminantImageFilter<TInputImage, TOutputImage, TPrecision>
::~ImageToHessianDeterminantImageFilter()
{}
-
template <class TInputImage, class TOutputImage, class TPrecision>
void
-ImageToHessianDeterminantImageFilter<TInputImage,TOutputImage,TPrecision>
+ImageToHessianDeterminantImageFilter<TInputImage, TOutputImage, TPrecision>
::GenerateData(void)
{
// Execute minipipeline
@@ -60,13 +59,13 @@ ImageToHessianDeterminantImageFilter<TInputImage,TOutputImage,TPrecision>
}
/*PrintSelf*/
-template <class TInputImage, class TOutputImage, class TPrecision >
+template <class TInputImage, class TOutputImage, class TPrecision>
void
-ImageToHessianDeterminantImageFilter<TInputImage,TOutputImage,TPrecision>
+ImageToHessianDeterminantImageFilter<TInputImage, TOutputImage, TPrecision>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
- os << indent <<"Sigma: " << m_Sigma << std::endl;
+ os << indent << "Sigma: " << m_Sigma << std::endl;
}
}
diff --git a/Code/FeatureExtraction/otbImageToLineSegmentVectorData.h b/Code/FeatureExtraction/otbImageToLineSegmentVectorData.h
index 6904c9132f..3d41387da7 100644
--- a/Code/FeatureExtraction/otbImageToLineSegmentVectorData.h
+++ b/Code/FeatureExtraction/otbImageToLineSegmentVectorData.h
@@ -28,7 +28,6 @@
#include "otbPersistentFilterStreamingDecorator.h"
#include "otbVectorData.h"
-
namespace otb
{
@@ -42,32 +41,32 @@ namespace otb
* \sa PersistentImageFilter
*
*/
-template<class TInputImage, class TPrecision=double >
+template<class TInputImage, class TPrecision = double>
class ITK_EXPORT PersistentLineSegmentDetector :
-public PersistentImageFilter<TInputImage, TInputImage>
+ public PersistentImageFilter<TInputImage, TInputImage>
{
- public:
+public:
/** Standard Self typedef */
- typedef PersistentLineSegmentDetector Self;
- typedef PersistentImageFilter<TInputImage,TInputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef PersistentLineSegmentDetector Self;
+ typedef PersistentImageFilter<TInputImage, TInputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Runtime information support. */
itkTypeMacro(PersistentLineSegmentDetector, PersistentImageFilter);
-
+
/** Image related typedefs. */
// First Input
- typedef TInputImage ImageType;
- typedef typename TInputImage::Pointer ImagePointer;
- typedef typename TInputImage::RegionType RegionType;
- typedef typename TInputImage::SizeType SizeType;
- typedef typename TInputImage::IndexType IndexType;
- typedef typename TInputImage::PixelType PixelType;
- typedef typename TInputImage::InternalPixelType InternalPixelType;
+ typedef TInputImage ImageType;
+ typedef typename TInputImage::Pointer ImagePointer;
+ typedef typename TInputImage::RegionType RegionType;
+ typedef typename TInputImage::SizeType SizeType;
+ typedef typename TInputImage::IndexType IndexType;
+ typedef typename TInputImage::PixelType PixelType;
+ typedef typename TInputImage::InternalPixelType InternalPixelType;
// Output path type
typedef LineSegmentDetector<ImageType, TPrecision> LineDetectorType;
@@ -77,40 +76,38 @@ public PersistentImageFilter<TInputImage, TInputImage>
typedef ObjectList<LineSpatialObjectType> LineSpatialObjectListType;
typedef typename LineSpatialObjectListType::Pointer LineSpatialObjectListPointerType;
- typedef itk::ExtractImageFilter<ImageType, ImageType> ExtractorType;
- typedef typename ExtractorType::Pointer ExtractorPointerType;
+ typedef itk::ExtractImageFilter<ImageType, ImageType> ExtractorType;
+ typedef typename ExtractorType::Pointer ExtractorPointerType;
- typedef ObjectList<ExtractorType> ExtractorListType;
- typedef ObjectList<LineDetectorType> LineDetectorListType;
+ typedef ObjectList<ExtractorType> ExtractorListType;
+ typedef ObjectList<LineDetectorType> LineDetectorListType;
// Vector of region
- typedef std::vector<RegionType> RegionListType;
+ typedef std::vector<RegionType> RegionListType;
virtual void Reset(void);
virtual void Synthetize(void);
- itkGetObjectMacro(LineSpatialObjectList,LineSpatialObjectListType);
+ itkGetObjectMacro(LineSpatialObjectList, LineSpatialObjectListType);
RegionListType GetRegionList()
{
return m_RegionList;
}
- void AllocateOutputs(){};
+ void AllocateOutputs(){}
void GenerateOutputInformation();
// Override since the filter needs all the data for the algorithm
virtual void GenerateInputRequestedRegion();
-
protected:
PersistentLineSegmentDetector();
- virtual ~PersistentLineSegmentDetector() {};
+ virtual ~PersistentLineSegmentDetector() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
- virtual void ThreadedGenerateData (const RegionType& outputRegionForThread,int threadId);
-
+ virtual void ThreadedGenerateData(const RegionType& outputRegionForThread, int threadId);
private:
- PersistentLineSegmentDetector(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PersistentLineSegmentDetector(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
// line detector filter
//LineDetectorPointerType m_LineDetector;
@@ -145,41 +142,40 @@ private:
* \ingroup MathematicalStatisticsImageFilters
*/
-template<class TInputImage, class TPrecision=double>
+template<class TInputImage, class TPrecision = double>
class ITK_EXPORT ImageToLineSegmentVectorData :
- public PersistentFilterStreamingDecorator< PersistentLineSegmentDetector<TInputImage, TPrecision> >
+ public PersistentFilterStreamingDecorator<PersistentLineSegmentDetector<TInputImage, TPrecision> >
{
- public:
+public:
/** Standard Self typedef */
- typedef ImageToLineSegmentVectorData Self;
+ typedef ImageToLineSegmentVectorData Self;
typedef PersistentFilterStreamingDecorator
- < PersistentLineSegmentDetector<TInputImage, TPrecision> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ <PersistentLineSegmentDetector<TInputImage, TPrecision> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(ImageToLineSegmentVectorData,PersistentFilterStreamingDecorator);
+ itkTypeMacro(ImageToLineSegmentVectorData, PersistentFilterStreamingDecorator);
- typedef TInputImage InputImageType;
- typedef typename TInputImage::SizeType SizeType;
+ typedef TInputImage InputImageType;
+ typedef typename TInputImage::SizeType SizeType;
- typedef typename Superclass::FilterType LSDFilterType;
+ typedef typename Superclass::FilterType LSDFilterType;
/** Type of DataObjects used for scalar outputs */
typedef typename LSDFilterType::LineSpatialObjectListType LineSpatialObjectListType;
typedef typename LineSpatialObjectListType::Pointer LineSpatialObjectListPointerType;
typedef typename LSDFilterType::LineSpatialObjectType LineSpatialObjectType;
typedef typename LSDFilterType::RegionListType RegionListType;
- typedef VectorData<TPrecision> VectorDataType;
- typedef typename VectorDataType::Pointer VectorDataPointerType;
- typedef typename VectorDataType::DataNodeType DataNodeType;
- typedef typename DataNodeType::Pointer DataNodePointerType;
- typedef typename DataNodeType::LineType LineType;
- typedef typename LineType::VertexType VertexType;
+ typedef VectorData<TPrecision> VectorDataType;
+ typedef typename VectorDataType::Pointer VectorDataPointerType;
+ typedef typename VectorDataType::DataNodeType DataNodeType;
+ typedef typename DataNodeType::Pointer DataNodePointerType;
+ typedef typename DataNodeType::LineType LineType;
+ typedef typename LineType::VertexType VertexType;
void SetInput(TInputImage * input)
{
@@ -190,11 +186,10 @@ class ITK_EXPORT ImageToLineSegmentVectorData :
return this->GetFilter()->GetInput();
}
-
- LineSpatialObjectListPointerType GetLines()
+ LineSpatialObjectListPointerType GetLines()
{
return this->GetFilter()->GetLineSpatialObjectList();
- };
+ }
RegionListType GetRegionList()
{
return this->GetFilter()->GetRegionList();
@@ -210,11 +205,11 @@ protected:
/** Constructor */
ImageToLineSegmentVectorData();
/** Destructor */
- virtual ~ImageToLineSegmentVectorData() {};
+ virtual ~ImageToLineSegmentVectorData() {}
private:
- ImageToLineSegmentVectorData(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageToLineSegmentVectorData(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** tolerance to fuse 2 lines in 2 threads. */
double m_ThreadDistanceThreshold;
diff --git a/Code/FeatureExtraction/otbImageToLineSegmentVectorData.txx b/Code/FeatureExtraction/otbImageToLineSegmentVectorData.txx
index 208cf26bec..7dd5473a5d 100644
--- a/Code/FeatureExtraction/otbImageToLineSegmentVectorData.txx
+++ b/Code/FeatureExtraction/otbImageToLineSegmentVectorData.txx
@@ -26,7 +26,6 @@
#include "itkImageRegionIterator.h"
#include "itkProgressReporter.h"
-
namespace otb
{
@@ -40,7 +39,6 @@ PersistentLineSegmentDetector<TInputImage, TPrecision>
m_RegionList.clear();
}
-
template<class TInputImage, class TPrecision>
void
PersistentLineSegmentDetector<TInputImage, TPrecision>
@@ -54,14 +52,13 @@ PersistentLineSegmentDetector<TInputImage, TPrecision>
m_Extractor->Clear();
m_LineDetector->Clear();
- for(int p=0; p<nbThread; ++p)
+ for (int p = 0; p < nbThread; ++p)
{
- m_Extractor->PushBack( ExtractorType::New() );
- m_LineDetector->PushBack( LineDetectorType::New() );
- m_LineDetector->GetNthElement(p)->SetImageSize(this->GetInput()->GetLargestPossibleRegion().GetSize());
+ m_Extractor->PushBack(ExtractorType::New());
+ m_LineDetector->PushBack(LineDetectorType::New());
+ m_LineDetector->GetNthElement(p)->SetImageSize(this->GetInput()->GetLargestPossibleRegion().GetSize());
}
-
}
template<class TInputImage, class TPrecision>
@@ -70,7 +67,6 @@ PersistentLineSegmentDetector<TInputImage, TPrecision>
::Synthetize()
{}
-
template<class TInputImage, class TPrecision>
void
PersistentLineSegmentDetector<TInputImage, TPrecision>
@@ -78,45 +74,43 @@ PersistentLineSegmentDetector<TInputImage, TPrecision>
{
Superclass::GenerateInputRequestedRegion();
- if ( this->GetInput() )
- {
- ImagePointer image = const_cast< ImageType * >( this->GetInput() );
+ if (this->GetInput())
+ {
+ ImagePointer image = const_cast<ImageType *>(this->GetInput());
image->SetRequestedRegion(this->GetOutput()->GetRequestedRegion());
- }
+ }
}
-
template<class TInputImage, class TPrecision>
void
PersistentLineSegmentDetector<TInputImage, TPrecision>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
- if ( this->GetInput() )
- {
+ if (this->GetInput())
+ {
this->GetOutput()->CopyInformation(this->GetInput());
this->GetOutput()->SetLargestPossibleRegion(this->GetInput()->GetLargestPossibleRegion());
- }
+ }
- if (this->GetOutput()->GetRequestedRegion().GetNumberOfPixels()==0)
- {
+ if (this->GetOutput()->GetRequestedRegion().GetNumberOfPixels() == 0)
+ {
this->GetOutput()->SetRequestedRegion(this->GetOutput()->GetLargestPossibleRegion());
- }
+ }
}
-
template<class TInputImage, class TPrecision>
void
PersistentLineSegmentDetector<TInputImage, TPrecision>
-::ThreadedGenerateData (const RegionType& outputRegionForThread,int threadId)
+::ThreadedGenerateData(const RegionType& outputRegionForThread, int threadId)
{
- ImagePointer inputPtr = const_cast< TInputImage * >( this->GetInput() );
- ImagePointer outputPtr = const_cast< TInputImage * >( this->GetOutput() );
+ ImagePointer inputPtr = const_cast<TInputImage *>(this->GetInput());
+ ImagePointer outputPtr = const_cast<TInputImage *>(this->GetOutput());
inputPtr->SetRequestedRegion(outputRegionForThread);
inputPtr->PropagateRequestedRegion();
inputPtr->UpdateOutputData();
-
+
m_Extractor->GetNthElement(threadId)->SetInput(this->GetInput());
m_Extractor->GetNthElement(threadId)->SetExtractionRegion(outputRegionForThread);
m_Extractor->GetNthElement(threadId)->UpdateOutputInformation();
@@ -124,7 +118,6 @@ PersistentLineSegmentDetector<TInputImage, TPrecision>
m_LineDetector->GetNthElement(threadId)->SetInput(m_Extractor->GetNthElement(threadId)->GetOutput());
m_LineDetector->GetNthElement(threadId)->Update();
-
m_RegionList[threadId] = outputRegionForThread;
m_LineSpatialObjectList->SetNthElement(threadId, m_LineDetector->GetNthElement(threadId)->GetOutput());
}
@@ -134,10 +127,9 @@ void
PersistentLineSegmentDetector<TInputImage, TPrecision>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
// end of class PersistentLineSegmentDetector
/**===========================================================================*/
@@ -149,7 +141,6 @@ ImageToLineSegmentVectorData<TInputImage, TPrecision>
m_ThreadDistanceThreshold = 10.;
}
-
/**
* The aim here is to gathered each thread output into a vector data.
* For that we have to fuse different thread output, in particular for line that throw thread.
@@ -167,158 +158,159 @@ typename ImageToLineSegmentVectorData<TInputImage, TPrecision>::VectorDataPointe
ImageToLineSegmentVectorData<TInputImage, TPrecision>
::GetOutputVectorData()
{
- unsigned int listSize = this->GetLines()->Size();
- if( listSize == 0)
+ unsigned int listSize = this->GetLines()->Size();
+ if (listSize == 0)
{
- itkExceptionMacro(<<"No LineSpatialObject to vectorize");
+ itkExceptionMacro(<< "No LineSpatialObject to vectorize");
}
VectorDataPointerType vlines = VectorDataType::New();
- DataNodePointerType document = DataNodeType::New();
- DataNodePointerType folder = DataNodeType::New();
- DataNodePointerType root = vlines->GetDataTree()->GetRoot()->Get();
+ DataNodePointerType document = DataNodeType::New();
+ DataNodePointerType folder = DataNodeType::New();
+ DataNodePointerType root = vlines->GetDataTree()->GetRoot()->Get();
document->SetNodeType(otb::DOCUMENT);
folder->SetNodeType(otb::FOLDER);
- vlines->GetDataTree()->Add(document,root);
- vlines->GetDataTree()->Add(folder,document);
+ vlines->GetDataTree()->Add(document, root);
+ vlines->GetDataTree()->Add(folder, document);
vlines->SetProjectionRef(this->GetInput()->GetProjectionRef());
RegionListType regionList = this->GetRegionList();
- SizeType whereAmI;
+ SizeType whereAmI;
whereAmI.Fill(0);
typedef std::vector<VertexType> DoubleVertexType;
std::vector<DoubleVertexType> vertexList, vertexNewList;
- for(unsigned int i = 0; i<listSize; ++i )
+ for (unsigned int i = 0; i < listSize; ++i)
{
- typename LineSpatialObjectType::const_iterator it = this->GetLines()->GetNthElement(i)->begin();
- typename LineSpatialObjectType::const_iterator itEnd = this->GetLines()->GetNthElement(i)->end();
-
- while(it != itEnd)
- {
- VertexType p1,p2;
- typename LineType::Pointer l = LineType::New();
- typename LineSpatialObjectType::LineType::PointListType & pointsList = (*it)->GetPoints();
- typename LineSpatialObjectType::LineType::PointListType::const_iterator itPoints = pointsList.begin();
- p1[0] =(*itPoints).GetPosition()[0]; //First Vertex
- p1[1] =(*itPoints).GetPosition()[1];
- ++itPoints;
- p2[0] =(*itPoints).GetPosition()[0]; //Second Vertex
- p2[1] =(*itPoints).GetPosition()[1];
-
- bool go = false;
- // horizontal line
- if( vcl_abs(p1[1]-whereAmI[1])<m_ThreadDistanceThreshold && vcl_abs(p2[1]-whereAmI[1])<m_ThreadDistanceThreshold )
- {
- go = true;
- }
- // point over the border
- else if( vcl_abs(p1[1]-whereAmI[1])<m_ThreadDistanceThreshold || vcl_abs(p2[1]-whereAmI[1])<m_ThreadDistanceThreshold )
- {
- // have to fuse?
- unsigned int j=0;
- bool done = false;
- VertexType p1Old;
- VertexType p2Old;
- while(j<vertexList.size() && done==false)
- {
- p1Old = vertexList[j][0];
- p2Old = vertexList[j][1];
-
- // if p1=p1old and p2=p2Old or p1=p2old and p2=p1Old mod 1
- if( ( vcl_abs(p1[0]-p1Old[0])<m_ThreadDistanceThreshold && vcl_abs(p1[1]-p1Old[1])<m_ThreadDistanceThreshold ) ||
- ( vcl_abs(p2[0]-p2Old[0])<m_ThreadDistanceThreshold && vcl_abs(p2[1]-p2Old[1])<m_ThreadDistanceThreshold ) ||
- ( vcl_abs(p1[0]-p2Old[0])<m_ThreadDistanceThreshold && vcl_abs(p1[1]-p2Old[1])<m_ThreadDistanceThreshold ) ||
- ( vcl_abs(p2[0]-p1Old[0])<m_ThreadDistanceThreshold && vcl_abs(p2[1]-p1Old[1])<m_ThreadDistanceThreshold ) )
- {
- done = true;
- }
- ++j;
- }
- if(done==true && j!=0)
- {
- DoubleVertexType vert;
- // keep the 2 lines extramities
- // p1 is the common point -> keep p2
- if(vcl_abs(p1[1]-whereAmI[1])<m_ThreadDistanceThreshold)
- {
- vert.push_back(p2);
- // p1 is the same as p1Old -> keep p2Old
- if( vcl_abs(p1[0]-p1Old[0])<m_ThreadDistanceThreshold && vcl_abs(p1[1]-p1Old[1])<m_ThreadDistanceThreshold )
- vert.push_back(p2Old);
- else
- vert.push_back(p1Old);
- }
- // p2 is the common point -> keep p1
- else
- {
- vert.push_back(p1);
- // p2 is the same as p1Old -> keep p1Old
- if( vcl_abs(p2[0]-p2Old[0])<m_ThreadDistanceThreshold && vcl_abs(p2[1]-p2Old[1]<m_ThreadDistanceThreshold) )
- vert.push_back(p1Old);
- else
- vert.push_back(p2Old);
- }
- vertexNewList.push_back(vert);
- // j-1 because of the ++j at the end of the while
- vertexList.erase(vertexList.begin()+(j-1));
- }
- else if(j==0)
- {
- DoubleVertexType vert;
- vert.push_back(p1);
- vert.push_back(p2);
- vertexNewList.push_back(vert);
- }
- // no point to fuse
- else
- go = true;
- }// else if( vcl_abs(p1[1]-whereAmI[1])<m_ThreadDistanceThreshold || vcl_abs(p2[1]-whereAmI[1])<m_ThreadDistanceThreshold )
- else
- {
- go = true;
- }
-
-
- if( go==true)
- {
- l->AddVertex(p1);
- l->AddVertex(p2);
-
- DataNodePointerType node = DataNodeType::New();
- node->SetNodeType(otb::FEATURE_LINE);
- node->SetLine(l);
- vlines->GetDataTree()->Add(node,folder);
- }
-
- ++it;
- } // End while(it != itEnd) loop
-
- // write the false alarm in vertexList (those that don't have a continuation in the next thread)
- for(unsigned int k=0; k<vertexList.size(); ++k)
- {
- typename LineType::Pointer l = LineType::New();
- l->AddVertex(vertexList[k][0]);
- l->AddVertex(vertexList[k][1]);
-
- DataNodePointerType node = DataNodeType::New();
- node->SetNodeType(otb::FEATURE_LINE);
- node->SetLine(l);
- vlines->GetDataTree()->Add(node,folder);
- }
- vertexList.clear();
- vertexList = vertexNewList;
- vertexNewList.clear();
- whereAmI[0] += regionList[i].GetSize()[0];
- whereAmI[1] += regionList[i].GetSize()[1];
-
- }// End for loop
+ typename LineSpatialObjectType::const_iterator it = this->GetLines()->GetNthElement(i)->begin();
+ typename LineSpatialObjectType::const_iterator itEnd = this->GetLines()->GetNthElement(i)->end();
+
+ while (it != itEnd)
+ {
+ VertexType p1, p2;
+ typename LineType::Pointer l = LineType::New();
+ typename LineSpatialObjectType::LineType::PointListType& pointsList = (*it)->GetPoints();
+ typename LineSpatialObjectType::LineType::PointListType::const_iterator itPoints = pointsList.begin();
+ p1[0] = (*itPoints).GetPosition()[0]; //First Vertex
+ p1[1] = (*itPoints).GetPosition()[1];
+ ++itPoints;
+ p2[0] = (*itPoints).GetPosition()[0]; //Second Vertex
+ p2[1] = (*itPoints).GetPosition()[1];
+
+ bool go = false;
+ // horizontal line
+ if (vcl_abs(p1[1] - whereAmI[1]) < m_ThreadDistanceThreshold && vcl_abs(p2[1] - whereAmI[1]) <
+ m_ThreadDistanceThreshold)
+ {
+ go = true;
+ }
+ // point over the border
+ else if (vcl_abs(p1[1] - whereAmI[1]) < m_ThreadDistanceThreshold || vcl_abs(p2[1] - whereAmI[1]) <
+ m_ThreadDistanceThreshold)
+ {
+ // have to fuse?
+ unsigned int j = 0;
+ bool done = false;
+ VertexType p1Old;
+ VertexType p2Old;
+ while (j < vertexList.size() && done == false)
+ {
+ p1Old = vertexList[j][0];
+ p2Old = vertexList[j][1];
+
+ // if p1=p1old and p2=p2Old or p1=p2old and p2=p1Old mod 1
+ if ((vcl_abs(p1[0] - p1Old[0]) < m_ThreadDistanceThreshold && vcl_abs(p1[1] - p1Old[1]) <
+ m_ThreadDistanceThreshold) ||
+ (vcl_abs(p2[0] - p2Old[0]) < m_ThreadDistanceThreshold && vcl_abs(p2[1] - p2Old[1]) <
+ m_ThreadDistanceThreshold) ||
+ (vcl_abs(p1[0] - p2Old[0]) < m_ThreadDistanceThreshold && vcl_abs(p1[1] - p2Old[1]) <
+ m_ThreadDistanceThreshold) ||
+ (vcl_abs(p2[0] - p1Old[0]) < m_ThreadDistanceThreshold && vcl_abs(p2[1] - p1Old[1]) <
+ m_ThreadDistanceThreshold))
+ {
+ done = true;
+ }
+ ++j;
+ }
+ if (done == true && j != 0)
+ {
+ DoubleVertexType vert;
+ // keep the 2 lines extramities
+ // p1 is the common point -> keep p2
+ if (vcl_abs(p1[1] - whereAmI[1]) < m_ThreadDistanceThreshold)
+ {
+ vert.push_back(p2);
+ // p1 is the same as p1Old -> keep p2Old
+ if (vcl_abs(p1[0] - p1Old[0]) < m_ThreadDistanceThreshold && vcl_abs(p1[1] - p1Old[1]) <
+ m_ThreadDistanceThreshold) vert.push_back(p2Old);
+ else vert.push_back(p1Old);
+ }
+ // p2 is the common point -> keep p1
+ else
+ {
+ vert.push_back(p1);
+ // p2 is the same as p1Old -> keep p1Old
+ if (vcl_abs(p2[0] - p2Old[0]) < m_ThreadDistanceThreshold &&
+ vcl_abs(p2[1] - p2Old[1] < m_ThreadDistanceThreshold)) vert.push_back(p1Old);
+ else vert.push_back(p2Old);
+ }
+ vertexNewList.push_back(vert);
+ // j-1 because of the ++j at the end of the while
+ vertexList.erase(vertexList.begin() + (j - 1));
+ }
+ else if (j == 0)
+ {
+ DoubleVertexType vert;
+ vert.push_back(p1);
+ vert.push_back(p2);
+ vertexNewList.push_back(vert);
+ }
+ // no point to fuse
+ else go = true;
+ } // else if( vcl_abs(p1[1]-whereAmI[1])<m_ThreadDistanceThreshold || vcl_abs(p2[1]-whereAmI[1])<m_ThreadDistanceThreshold )
+ else
+ {
+ go = true;
+ }
+
+ if (go == true)
+ {
+ l->AddVertex(p1);
+ l->AddVertex(p2);
+
+ DataNodePointerType node = DataNodeType::New();
+ node->SetNodeType(otb::FEATURE_LINE);
+ node->SetLine(l);
+ vlines->GetDataTree()->Add(node, folder);
+ }
+
+ ++it;
+ } // End while(it != itEnd) loop
+
+ // write the false alarm in vertexList (those that don't have a continuation in the next thread)
+ for (unsigned int k = 0; k < vertexList.size(); ++k)
+ {
+ typename LineType::Pointer l = LineType::New();
+ l->AddVertex(vertexList[k][0]);
+ l->AddVertex(vertexList[k][1]);
+
+ DataNodePointerType node = DataNodeType::New();
+ node->SetNodeType(otb::FEATURE_LINE);
+ node->SetLine(l);
+ vlines->GetDataTree()->Add(node, folder);
+ }
+ vertexList.clear();
+ vertexList = vertexNewList;
+ vertexNewList.clear();
+ whereAmI[0] += regionList[i].GetSize()[0];
+ whereAmI[1] += regionList[i].GetSize()[1];
+
+ } // End for loop
return vlines;
}
-
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbImageToModulusAndDirectionImageFilter.h b/Code/FeatureExtraction/otbImageToModulusAndDirectionImageFilter.h
index 53f0a93eb9..ccd306e380 100644
--- a/Code/FeatureExtraction/otbImageToModulusAndDirectionImageFilter.h
+++ b/Code/FeatureExtraction/otbImageToModulusAndDirectionImageFilter.h
@@ -20,7 +20,6 @@
#include "itkImageToImageFilter.h"
-
namespace otb
{
@@ -35,24 +34,24 @@ namespace otb
*
*/
template <class TInputImage,
-class TOutputImage,
-class TOutputImageDirection = TOutputImage >
-class ITK_EXPORT ImageToModulusAndDirectionImageFilter : public itk::ImageToImageFilter< TInputImage, TOutputImage >
+ class TOutputImage,
+ class TOutputImageDirection = TOutputImage>
+class ITK_EXPORT ImageToModulusAndDirectionImageFilter : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Extract dimensions as well of the images of entry of exit. */
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,
- unsigned int,
- TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension,
+ unsigned int,
+ TOutputImage::ImageDimension);
/** typedef for the classes standards. */
- typedef ImageToModulusAndDirectionImageFilter Self;
- typedef itk::ImageToImageFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageToModulusAndDirectionImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for management of the object factory. */
itkNewMacro(Self);
@@ -60,17 +59,16 @@ public:
/** Return the name of the class. */
itkTypeMacro(ImageToModulusAndDirectionImageFilter, itk::ImageToImageFilter);
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef TOutputImageDirection OutputImageDirectionType;
-
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef TOutputImageDirection OutputImageDirectionType;
- typedef typename InputImageType::Pointer InputImagePointer;
- typedef typename InputImageType::ConstPointer InputImageConstPointer;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::ConstPointer OutputImageConstPointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename InputImageType::Pointer InputImagePointer;
+ typedef typename InputImageType::ConstPointer InputImageConstPointer;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::ConstPointer OutputImageConstPointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
/** Return the const output image modulus */
const OutputImageType * GetOutput() const;
@@ -87,12 +85,12 @@ public:
protected:
ImageToModulusAndDirectionImageFilter();
- virtual ~ImageToModulusAndDirectionImageFilter() {};
+ virtual ~ImageToModulusAndDirectionImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageToModulusAndDirectionImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageToModulusAndDirectionImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
@@ -101,5 +99,4 @@ private:
#include "otbImageToModulusAndDirectionImageFilter.txx"
#endif
-
#endif
diff --git a/Code/FeatureExtraction/otbImageToModulusAndDirectionImageFilter.txx b/Code/FeatureExtraction/otbImageToModulusAndDirectionImageFilter.txx
index e101f47153..d60babf17d 100644
--- a/Code/FeatureExtraction/otbImageToModulusAndDirectionImageFilter.txx
+++ b/Code/FeatureExtraction/otbImageToModulusAndDirectionImageFilter.txx
@@ -27,7 +27,7 @@ namespace otb
/**
*
*/
-template <class TInputImage, class TOutputImage, class TOutputImageDirection >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection>
ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::
ImageToModulusAndDirectionImageFilter()
{
@@ -36,70 +36,72 @@ ImageToModulusAndDirectionImageFilter()
this->SetNumberOfOutputs(2);
this->SetNumberOfRequiredOutputs(2);
- this->SetNthOutput(0,OutputImageType::New());
- this->SetNthOutput(1,OutputImageDirectionType::New());
+ this->SetNthOutput(0, OutputImageType::New());
+ this->SetNthOutput(1, OutputImageDirectionType::New());
}
-
/** Return the const output image modulus */
-template <class TInputImage, class TOutputImage, class TOutputImageDirection >
-const typename ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::OutputImageType *
+template <class TInputImage, class TOutputImage, class TOutputImageDirection>
+const typename ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage,
+ TOutputImageDirection>::OutputImageType *
ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::
GetOutput() const
{
if (this->GetNumberOfOutputs() < 1)
- {
+ {
return 0;
- }
- return static_cast<const OutputImageType * >
- (this->itk::ProcessObject::GetOutput(0) );
+ }
+ return static_cast<const OutputImageType *>
+ (this->itk::ProcessObject::GetOutput(0));
}
/** Return the output image modulus */
-template <class TInputImage, class TOutputImage, class TOutputImageDirection >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection>
typename ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::OutputImageType *
ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::
GetOutput()
{
if (this->GetNumberOfOutputs() < 1)
- {
+ {
return 0;
- }
- return static_cast<OutputImageType * >
- (this->itk::ProcessObject::GetOutput(0) );
+ }
+ return static_cast<OutputImageType *>
+ (this->itk::ProcessObject::GetOutput(0));
}
/** Return the const output image direction */
-template <class TInputImage, class TOutputImage, class TOutputImageDirection >
-const typename ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::OutputImageDirectionType *
+template <class TInputImage, class TOutputImage, class TOutputImageDirection>
+const typename ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage,
+ TOutputImageDirection>::OutputImageDirectionType *
ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::
-GetOutputDirection()const
+GetOutputDirection() const
{
if (this->GetNumberOfOutputs() < 2)
- {
+ {
return 0;
- }
- return static_cast<const OutputImageDirectionType * >
- (this->itk::ProcessObject::GetOutput(1) );
+ }
+ return static_cast<const OutputImageDirectionType *>
+ (this->itk::ProcessObject::GetOutput(1));
}
/** Return the output image direction */
-template <class TInputImage, class TOutputImage, class TOutputImageDirection >
-typename ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::OutputImageDirectionType *
+template <class TInputImage, class TOutputImage, class TOutputImageDirection>
+typename ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage,
+ TOutputImageDirection>::OutputImageDirectionType *
ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::
GetOutputDirection()
{
if (this->GetNumberOfOutputs() < 2)
- {
+ {
return 0;
- }
- return static_cast<OutputImageDirectionType * >
- (this->itk::ProcessObject::GetOutput(1) );
+ }
+ return static_cast<OutputImageDirectionType *>
+ (this->itk::ProcessObject::GetOutput(1));
}
/**
* Standard "GenerateInputRequestedRegion" method
*/
-template <class TInputImage, class TOutputImage, class TOutputImageDirection >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection>
void
ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage, TOutputImageDirection>
::GenerateInputRequestedRegion()
@@ -110,12 +112,12 @@ ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage, TOutputImageDir
/**
* Standard "PrintSelf" method
*/
-template <class TInputImage, class TOutputImage, class TOutputImageDirection >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection>
void
ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::
PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
diff --git a/Code/FeatureExtraction/otbImageToPathListAlignFilter.h b/Code/FeatureExtraction/otbImageToPathListAlignFilter.h
index 03086c0707..c64ebb121a 100644
--- a/Code/FeatureExtraction/otbImageToPathListAlignFilter.h
+++ b/Code/FeatureExtraction/otbImageToPathListAlignFilter.h
@@ -32,20 +32,20 @@ namespace otb
*
*/
template <class TInputImage, class TOutputPath>
-class ITK_EXPORT ImageToPathListAlignFilter : public ImageToPathListFilter<TInputImage,TOutputPath>
+class ITK_EXPORT ImageToPathListAlignFilter : public ImageToPathListFilter<TInputImage, TOutputPath>
{
public:
/** Standard class typedefs. */
- typedef ImageToPathListAlignFilter Self;
- typedef ImageToPathListFilter<TInputImage,TOutputPath> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageToPathListAlignFilter Self;
+ typedef ImageToPathListFilter<TInputImage, TOutputPath> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(ImageToPathListAlignFilter,ImageToPathListFilter);
+ itkTypeMacro(ImageToPathListAlignFilter, ImageToPathListFilter);
// itkTypeMacro(ImageToPathListAlignFilter,itk::ImageSource);
/** ImageDimension constants */
@@ -53,36 +53,35 @@ public:
TInputImage::ImageDimension);
/** Some convenient typedefs. */
- typedef typename Superclass::OutputPathListType OutputPathListType;
+ typedef typename Superclass::OutputPathListType OutputPathListType;
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::InputImageRegionType InputImageRegionType;
- typedef typename InputImageType::Pointer InputImagePointer;
- typedef typename InputImageType::ConstPointer InputImageConstPointer;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::InputImageRegionType InputImageRegionType;
+ typedef typename InputImageType::Pointer InputImagePointer;
+ typedef typename InputImageType::ConstPointer InputImageConstPointer;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::ValueType ValueType;
- typedef typename InputImageType::PixelType PixelType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::ValueType ValueType;
+ typedef typename InputImageType::PixelType PixelType;
- typedef typename Superclass::OutputPathType OutputPathType;
+ typedef typename Superclass::OutputPathType OutputPathType;
// typedef typename Superclass::OutputPathListType OutputPathListType;
- typedef typename Superclass::OutputPathPointerType OutputPathPointerType;
+ typedef typename Superclass::OutputPathPointerType OutputPathPointerType;
// typedef float RealType;
- //typedef typename itk::NumericTraits<PixelType>::RealType RealType;
- typedef double RealType;
+//typedef typename itk::NumericTraits<PixelType>::RealType RealType;
+ typedef double RealType;
// typedef typename itk::Image<RealType,InputImageDimension> RealImageType;
- typedef typename otb::Image<RealType,InputImageDimension> RealImageType;
- typedef typename RealImageType::Pointer RealImageTypePointer;
- typedef typename RealImageType::IndexType RealImageTypeIndexType;
-
+ typedef typename otb::Image<RealType, InputImageDimension> RealImageType;
+ typedef typename RealImageType::Pointer RealImageTypePointer;
+ typedef typename RealImageType::IndexType RealImageTypeIndexType;
/** Spacing (size of a pixel) of the output image. The
* spacing is the geometric distance between image samples.
* It is stored internally as double, but may be set from
* float. \sa GetSpacing() */
- virtual void SetSpacing( const double* spacing);
- virtual void SetSpacing( const float* spacing);
+ virtual void SetSpacing(const double* spacing);
+ virtual void SetSpacing(const float* spacing);
virtual const double* GetSpacing() const;
/** Set/Get the value for pixels on and off the path.
@@ -96,50 +95,50 @@ public:
* coordinates of the index (0,0,...,0). It is stored internally
* as double but may be set from float.
* \sa GetOrigin() */
- virtual void SetOrigin( const double* origin);
- virtual void SetOrigin( const float* origin);
+ virtual void SetOrigin(const double* origin);
+ virtual void SetOrigin(const float* origin);
virtual const double * GetOrigin() const;
/** Set/Get Size */
- itkSetMacro(Size,SizeType);
- itkGetMacro(Size,SizeType);
-
- itkSetMacro(isMeaningfulSegment,bool);
- itkSetMacro(NbGradDirection,int);
- itkSetMacro(NbLineDirection,int);
- itkSetMacro(MinGradNorm,double);
- itkSetMacro(Eps,double);
- itkGetConstReferenceMacro(isMeaningfulSegment,bool);
- itkGetConstReferenceMacro(NbGradDirection,int);
- itkGetConstReferenceMacro(NbLineDirection,int);
- itkGetConstReferenceMacro(MinGradNorm,double);
- itkGetConstReferenceMacro(Eps,double);
+ itkSetMacro(Size, SizeType);
+ itkGetMacro(Size, SizeType);
+
+ itkSetMacro(isMeaningfulSegment, bool);
+ itkSetMacro(NbGradDirection, int);
+ itkSetMacro(NbLineDirection, int);
+ itkSetMacro(MinGradNorm, double);
+ itkSetMacro(Eps, double);
+ itkGetConstReferenceMacro(isMeaningfulSegment, bool);
+ itkGetConstReferenceMacro(NbGradDirection, int);
+ itkGetConstReferenceMacro(NbLineDirection, int);
+ itkGetConstReferenceMacro(MinGradNorm, double);
+ itkGetConstReferenceMacro(Eps, double);
protected:
ImageToPathListAlignFilter();
virtual ~ImageToPathListAlignFilter();
- virtual void GenerateOutputInformation() {}; // do nothing
+ virtual void GenerateOutputInformation() {} // do nothing
virtual void GenerateData();
- virtual std::vector<double> tab(int n,double p,double m);
- virtual void AngleCalculate( const InputImageType* InputImageIn);
+ virtual std::vector<double> tab(int n, double p, double m);
+ virtual void AngleCalculate(const InputImageType* InputImageIn);
- SizeType m_Size;
- double m_Spacing[InputImageDimension];
- double m_Origin[InputImageDimension];
- ValueType m_PathValue;
- ValueType m_BackgroundValue;
+ SizeType m_Size;
+ double m_Spacing[InputImageDimension];
+ double m_Origin[InputImageDimension];
+ ValueType m_PathValue;
+ ValueType m_BackgroundValue;
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageToPathListAlignFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
- bool m_isMeaningfulSegment; /// to get all meaningful segments (maximal or not
- int m_NbGradDirection; /// Number of allowed gradient direction, default 16
- int m_NbLineDirection; /// Number of line directions to scan, default 96)
- double m_MinGradNorm; /// Minimum gradient norm to define a direction, default 2.
- double m_Eps; /// -log10(max. number of false alarms), default 0
+ ImageToPathListAlignFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
+ bool m_isMeaningfulSegment; /// to get all meaningful segments (maximal or not
+ int m_NbGradDirection; /// Number of allowed gradient direction, default 16
+ int m_NbLineDirection; /// Number of line directions to scan, default 96)
+ double m_MinGradNorm; /// Minimum gradient norm to define a direction, default 2.
+ double m_Eps; /// -log10(max. number of false alarms), default 0
std::vector<double> m_seglist;
RealImageType * m_AngleImage; //Angle image use by GenerateData and AngleCalculate methods
diff --git a/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx b/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx
index a92b07fa92..6dc37a99b8 100644
--- a/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx
+++ b/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx
@@ -41,7 +41,7 @@ struct one_segment
/** Constructor */
template <class TInputImage, class TOutputPath>
-ImageToPathListAlignFilter<TInputImage,TOutputPath>
+ImageToPathListAlignFilter<TInputImage, TOutputPath>
::ImageToPathListAlignFilter()
{
this->SetNumberOfRequiredInputs(1);
@@ -49,15 +49,15 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
m_isMeaningfulSegment = false;
m_NbGradDirection = 16;
m_NbLineDirection = 96;
- m_MinGradNorm=2.0;
- m_Eps=0.0;
+ m_MinGradNorm = 2.0;
+ m_Eps = 0.0;
for (unsigned int i = 0; i < InputImageDimension; ++i)
- {
+ {
// Set an image spacing for the user
m_Spacing[i] = 1.0;
m_Origin[i] = 0;
- }
+ }
m_PathValue = itk::NumericTraits<ValueType>::One;
m_BackgroundValue = itk::NumericTraits<ValueType>::Zero;
@@ -65,62 +65,61 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
/** Destructor */
template <class TInputImage, class TOutputPath>
-ImageToPathListAlignFilter<TInputImage,TOutputPath>
+ImageToPathListAlignFilter<TInputImage, TOutputPath>
::~ImageToPathListAlignFilter()
{
}
-
//----------------------------------------------------------------------------
template <class TInputImage, class TOutputPath>
void
-ImageToPathListAlignFilter<TInputImage,TOutputPath>
+ImageToPathListAlignFilter<TInputImage, TOutputPath>
::SetSpacing(const double* spacing)
{
unsigned int i;
- for (i=0; i<InputImageDimension; ++i)
- {
- if ( spacing[i] != m_Spacing[i] )
+ for (i = 0; i < InputImageDimension; ++i)
{
+ if (spacing[i] != m_Spacing[i])
+ {
break;
+ }
}
- }
- if ( i < InputImageDimension )
- {
- for (i=0; i<InputImageDimension; ++i)
+ if (i < InputImageDimension)
{
+ for (i = 0; i < InputImageDimension; ++i)
+ {
m_Spacing[i] = spacing[i];
- }
+ }
this->Modified();
- }
+ }
}
template <class TInputImage, class TOutputPath>
void
-ImageToPathListAlignFilter<TInputImage,TOutputPath>
+ImageToPathListAlignFilter<TInputImage, TOutputPath>
::SetSpacing(const float* spacing)
{
unsigned int i;
- for (i=0; i<InputImageDimension; ++i)
- {
- if ( (double)spacing[i] != m_Spacing[i] )
+ for (i = 0; i < InputImageDimension; ++i)
{
+ if ((double) spacing[i] != m_Spacing[i])
+ {
break;
+ }
}
- }
- if ( i < InputImageDimension )
- {
- for (i=0; i<InputImageDimension; ++i)
+ if (i < InputImageDimension)
{
+ for (i = 0; i < InputImageDimension; ++i)
+ {
m_Spacing[i] = spacing[i];
- }
+ }
this->Modified();
- }
+ }
}
template <class TInputImage, class TOutputPath>
const double *
-ImageToPathListAlignFilter<TInputImage,TOutputPath>
+ImageToPathListAlignFilter<TInputImage, TOutputPath>
::GetSpacing() const
{
return m_Spacing;
@@ -129,51 +128,51 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
//----------------------------------------------------------------------------
template <class TInputImage, class TOutputPath>
void
-ImageToPathListAlignFilter<TInputImage,TOutputPath>
+ImageToPathListAlignFilter<TInputImage, TOutputPath>
::SetOrigin(const double* origin)
{
unsigned int i;
- for (i=0; i<InputImageDimension; ++i)
- {
- if ( origin[i] != m_Origin[i] )
+ for (i = 0; i < InputImageDimension; ++i)
{
+ if (origin[i] != m_Origin[i])
+ {
break;
+ }
}
- }
- if ( i < InputImageDimension )
- {
- for (i=0; i<InputImageDimension; ++i)
+ if (i < InputImageDimension)
{
+ for (i = 0; i < InputImageDimension; ++i)
+ {
m_Origin[i] = origin[i];
+ }
}
- }
}
template <class TInputImage, class TOutputPath>
void
-ImageToPathListAlignFilter<TInputImage,TOutputPath>
+ImageToPathListAlignFilter<TInputImage, TOutputPath>
::SetOrigin(const float* origin)
{
unsigned int i;
- for (i=0; i<InputImageDimension; ++i)
- {
- if ( (double)origin[i] != m_Origin[i] )
+ for (i = 0; i < InputImageDimension; ++i)
{
+ if ((double) origin[i] != m_Origin[i])
+ {
break;
+ }
}
- }
- if ( i < InputImageDimension )
- {
- for (i=0; i<InputImageDimension; ++i)
+ if (i < InputImageDimension)
{
+ for (i = 0; i < InputImageDimension; ++i)
+ {
m_Origin[i] = origin[i];
+ }
}
- }
}
template <class TInputImage, class TOutputPath>
const double *
-ImageToPathListAlignFilter<TInputImage,TOutputPath>
+ImageToPathListAlignFilter<TInputImage, TOutputPath>
::GetOrigin() const
{
return m_Origin;
@@ -183,36 +182,36 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
/* Algorithm */
template <class TInputImage, class TOutputPath>
std::vector<double>
-ImageToPathListAlignFilter<TInputImage,TOutputPath>
-::tab(int n,double p,double m)
+ImageToPathListAlignFilter<TInputImage, TOutputPath>
+::tab(int n, double p, double m)
{
std::vector<double> out;
- int adr1,adr2,x,y;
+ int adr1, adr2, x, y;
// double lambda;
double q;
- q = 1.0-p;
- out.resize((n+1)*(n+1));
+ q = 1.0 - p;
+ out.resize((n + 1) * (n + 1));
adr1 = 0;
/*** compute proba (=x among y) ***/
out[0] = 1.0;
- for (y=1,adr2=0;y<=n;++y)
- {
+ for (y = 1, adr2 = 0; y <= n; ++y)
+ {
adr1 = adr2;
- adr2 += n+1;
- out[adr2] = q*out[adr1];
- for (x=1;x<=y;++x)
- out[adr2+x] = p*out[adr1+x-1] + q*out[adr1+x];
- }
+ adr2 += n + 1;
+ out[adr2] = q * out[adr1];
+ for (x = 1; x <= y; ++x)
+ out[adr2 + x] = p * out[adr1 + x - 1] + q * out[adr1 + x];
+ }
/*** sum to obtain proba (>=k among y) ***/
- for (y=1,adr1=n+1;y<=n;++y,adr1+=n+1)
- for (x=y-1;x>=0;x--)
- out[adr1+x] += out[adr1+x+1];
+ for (y = 1, adr1 = n + 1; y <= n; ++y, adr1 += n + 1)
+ for (x = y - 1; x >= 0; x--)
+ out[adr1 + x] += out[adr1 + x + 1];
/*** multiply by m (number of segments) to obtain expectation***/
- for (adr1=(n+1)*(n+1);--adr1>=0;)
+ for (adr1 = (n + 1) * (n + 1); --adr1 >= 0; )
out[adr1] *= m;
return out;
@@ -220,11 +219,11 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
template <class TInputImage, class TOutputPath>
void
-ImageToPathListAlignFilter<TInputImage,TOutputPath>
+ImageToPathListAlignFilter<TInputImage, TOutputPath>
::AngleCalculate(const InputImageType* InputImage)
{
double threshold;
- int n,p,x,y;
+ int n, p, x, y;
typename InputImageType::SizeType Taille;
typename RealImageType::IndexType IndexOut;
@@ -237,7 +236,7 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
IndexOut[1] = 0;
// region.SetIndex(InputImage->GetLargestPossibleRegion().GetIndex());
region.SetIndex(IndexOut);
- m_AngleImage->SetRegions( region );
+ m_AngleImage->SetRegions(region);
m_AngleImage->SetOrigin(InputImage->GetOrigin());
m_AngleImage->SetSpacing(InputImage->GetSpacing());
m_AngleImage->Allocate();
@@ -250,96 +249,94 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
typename InputImageType::IndexType idx;
- for (x=0;x<p;++x)
- {
- idx[0] = (n-1);
+ for (x = 0; x < p; ++x)
+ {
+ idx[0] = (n - 1);
idx[1] = x;
// indice = (n-1)*p +x
- m_AngleImage->SetPixel(idx,static_cast<RealType>(-1000.0));
- }
- for (y=0;y<n;++y)
- {
+ m_AngleImage->SetPixel(idx, static_cast<RealType>(-1000.0));
+ }
+ for (y = 0; y < n; ++y)
+ {
idx[0] = y;
- idx[1] = p-1;
+ idx[1] = p - 1;
// indice = p*y+p-1
- m_AngleImage->SetPixel(idx,static_cast<RealType>(-1000.0));
- }
+ m_AngleImage->SetPixel(idx, static_cast<RealType>(-1000.0));
+ }
typename InputImageType::IndexType adr;
- RealType PixelA,PixelB,PixelC,PixelD;
- RealType com1,com2,gx,gy,norm;
+ RealType PixelA, PixelB, PixelC, PixelD;
+ RealType com1, com2, gx, gy, norm;
- for (x=0;x<p-1;++x)
- for (y=0;y<n-1;++y)
- {
+ for (x = 0; x < p - 1; ++x)
+ for (y = 0; y < n - 1; ++y)
+ {
// indice = y*p+x
adr[0] = y;
adr[1] = x;
- idx[0] = adr[0] +1;
- idx[1] = adr[1] +1;
- PixelA = static_cast<RealType>(InputImage->GetPixel(idx) );
+ idx[0] = adr[0] + 1;
+ idx[1] = adr[1] + 1;
+ PixelA = static_cast<RealType>(InputImage->GetPixel(idx));
idx[0] = adr[0];
idx[1] = adr[1];
- assert( idx[0] < n );
- assert( idx[1] < p );
- assert( idx[0] >= 0 );
- assert( idx[1] >= 0 );
- PixelB = static_cast<RealType>(InputImage->GetPixel(idx) );
- idx[0] = adr[0]+1;
+ assert(idx[0] < n);
+ assert(idx[1] < p);
+ assert(idx[0] >= 0);
+ assert(idx[1] >= 0);
+ PixelB = static_cast<RealType>(InputImage->GetPixel(idx));
+ idx[0] = adr[0] + 1;
idx[1] = adr[1];
- assert( idx[0] < n );
- assert( idx[1] < p );
- assert( idx[0] >= 0 );
- assert( idx[1] >= 0 );
- PixelC = static_cast<RealType>(InputImage->GetPixel(idx) );
+ assert(idx[0] < n);
+ assert(idx[1] < p);
+ assert(idx[0] >= 0);
+ assert(idx[1] >= 0);
+ PixelC = static_cast<RealType>(InputImage->GetPixel(idx));
idx[0] = adr[0];
- idx[1] = adr[1]+1;
- assert( idx[0] < n );
- assert( idx[1] < p );
- assert( idx[0] >= 0 );
- assert( idx[1] >= 0 );
- PixelD = static_cast<RealType>(InputImage->GetPixel(idx) );
- com1 = PixelA-PixelB;
- com2 = PixelC-PixelD;
- gx = 0.5 * (com1+com2);
- gy = 0.5 * (com1-com2);
- norm = gx*gx + gy*gy;
-
- if (norm <=threshold)
- m_AngleImage->SetPixel(adr,static_cast<RealType>(-1000.0));
- else m_AngleImage->SetPixel(adr,static_cast<RealType>(vcl_atan2(gx,-gy)));
- }
+ idx[1] = adr[1] + 1;
+ assert(idx[0] < n);
+ assert(idx[1] < p);
+ assert(idx[0] >= 0);
+ assert(idx[1] >= 0);
+ PixelD = static_cast<RealType>(InputImage->GetPixel(idx));
+ com1 = PixelA - PixelB;
+ com2 = PixelC - PixelD;
+ gx = 0.5 * (com1 + com2);
+ gy = 0.5 * (com1 - com2);
+ norm = gx * gx + gy * gy;
+
+ if (norm <= threshold) m_AngleImage->SetPixel(adr, static_cast<RealType>(-1000.0));
+ else m_AngleImage->SetPixel(adr, static_cast<RealType>(vcl_atan2(gx, -gy)));
+ }
}
template <class TInputImage, class TOutputPath>
void
-ImageToPathListAlignFilter<TInputImage,TOutputPath>
+ImageToPathListAlignFilter<TInputImage, TOutputPath>
::GenerateData(void)
{
// SizeType size;
// double origin[InputImageDimension];
typename InputImageType::SizeType Taille;
- RealImageTypeIndexType indexAngle;
+ RealImageTypeIndexType indexAngle;
// Flist result;
- int iseglist,size_seglist; /* associated counter and dynamic size */
- int iseg,size_seg;
- double nfa,max_nfa;
- std::vector<double> test;
- std::vector<int> count,startbloc,endbloc;
- std::vector<double> seglist; /* list of recorded segments */
+ int iseglist, size_seglist; /* associated counter and dynamic size */
+ int iseg, size_seg;
+ double nfa, max_nfa;
+ std::vector<double> test;
+ std::vector<int> count, startbloc, endbloc;
+ std::vector<double> seglist; /* list of recorded segments */
std::vector<one_segment> seg;
- int mx,my,ox,oy,nx,ny,n;
- int xx,yy,pos,posmax,nblocs,inbloc,max_nblocs;
- int cur,i,j,side,l,lphase;
+ int mx, my, ox, oy, nx, ny, n;
+ int xx, yy, pos, posmax, nblocs, inbloc, max_nblocs;
+ int cur, i, j, side, l, lphase;
// int tmp;
- int itheta,ntheta;
- double theta,theta0,dtheta,dx,dy,prec;
- double error =0.0;
+ int itheta, ntheta;
+ double theta, theta0, dtheta, dx, dy, prec;
+ double error = 0.0;
itkDebugMacro(<< "ImageToPathListAlignFilter::GenerateData() called");
-
// Get the input and output pointers
- const InputImageType * InputImage = this->GetInput();
+ const InputImageType * InputImage = this->GetInput();
OutputPathListType * OutputPath = this->GetOutput();
// Generate the image
@@ -348,29 +345,29 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
Taille = InputImage->GetLargestPossibleRegion().GetSize();
nx = Taille[0];
ny = Taille[1];
- max_nfa = vcl_pow(10.0,-(m_Eps));
+ max_nfa = vcl_pow(10.0, -(m_Eps));
// typename InputImageType::IndexType adr;
/*** maximal length for a line */
- n = (int)vcl_ceil(hypot((double)nx,(double)ny))+1;
+ n = (int) vcl_ceil(hypot((double) nx, (double) ny)) + 1;
/*** compute angle map of u ***/
RealImageTypePointer lAngleImagePointer = RealImageType::New();
m_AngleImage = static_cast<RealImageType*>(lAngleImagePointer.GetPointer());
- this->AngleCalculate( InputImage );
+ this->AngleCalculate(InputImage);
/*** compute P(k,l) ***/
- test = tab(n,1.0/(double)(m_NbGradDirection),(double)(nx*ny)*(double)(nx*ny));
+ test = tab(n, 1.0 / (double) (m_NbGradDirection), (double) (nx * ny) * (double) (nx * ny));
/*** initialization ***/
- prec = CONST_PI/(double)(m_NbGradDirection);
- ntheta = m_NbLineDirection/2; /* i.e. # directions of NON-ORIENTED lines */
- dtheta = CONST_PI/(double)ntheta;
+ prec = CONST_PI / (double) (m_NbGradDirection);
+ ntheta = m_NbLineDirection / 2; /* i.e. # directions of NON-ORIENTED lines */
+ dtheta = CONST_PI / (double) ntheta;
/******************** memory allocation ********************/
- max_nblocs = n/2+1; /* maximal number of blocs */
+ max_nblocs = n / 2 + 1; /* maximal number of blocs */
count.resize(max_nblocs);
startbloc.resize(max_nblocs);
endbloc.resize(max_nblocs);
@@ -379,160 +376,159 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
seg.resize(size_seg);
size_seglist = 10000; /* initial allocation (may reallocate later) */
- seglist.resize(5*size_seglist);
+ seglist.resize(5 * size_seglist);
/* counter for recorded segments (seglist) */
iseglist = 0;
-
/******************** first loop : the four sides ********************/
- for (side=0;side<4;side++)
- {
- printf("side %d/4 ",side+1);
-
- theta0 = CONST_PI_2*(double)side;
- mx = ((side==0 || side==2)?1:0);
- my = ((side==1 || side==3)?1:0);
- ox = ((side==1)?nx-1:0);
- oy = ((side==2)?ny-1:0);
+ for (side = 0; side < 4; side++)
+ {
+ printf("side %d/4 ", side + 1);
- posmax = nx*mx+ny*my;
+ theta0 = CONST_PI_2 * (double) side;
+ mx = ((side == 0 || side == 2) ? 1 : 0);
+ my = ((side == 1 || side == 3) ? 1 : 0);
+ ox = ((side == 1) ? nx - 1 : 0);
+ oy = ((side == 2) ? ny - 1 : 0);
+ posmax = nx * mx + ny * my;
/*** second loop : angles ***/
- for (itheta = 0; itheta<ntheta; itheta++)
- {
+ for (itheta = 0; itheta < ntheta; itheta++)
+ {
printf(".");
fflush(stdout);
- theta = theta0 + (double)(itheta)*dtheta;
- dx = (double)vcl_cos((double)theta);
- dy = (double)vcl_sin((double)theta);
+ theta = theta0 + (double) (itheta) * dtheta;
+ dx = (double) vcl_cos((double) theta);
+ dy = (double) vcl_sin((double) theta);
/*** third loop : start positions ***/
- for (pos=0;pos<posmax;++pos)
- {
+ for (pos = 0; pos < posmax; ++pos)
+ {
/* clear segment array */
iseg = 0;
/*** fourth loop : phase for two-spaced pixels ***/
- for (lphase=0;lphase<2;lphase++)
- {
+ for (lphase = 0; lphase < 2; lphase++)
+ {
/*** detect aligned points by blocs ***/
inbloc = nblocs = cur = l = count[0] = 0;
- xx = ox+pos*mx + (int)(dx*(double)(l*2+lphase));
- yy = oy+pos*my + (int)(dy*(double)(l*2+lphase));
+ xx = ox + pos * mx + (int) (dx * (double) (l * 2 + lphase));
+ yy = oy + pos * my + (int) (dy * (double) (l * 2 + lphase));
-
- for (;xx>=0 && xx<nx && yy>=0 && yy<ny;)
- {
+ for (; xx >= 0 && xx < nx && yy >= 0 && yy < ny; )
+ {
indexAngle[0] = xx;
indexAngle[1] = yy;
// indice = yy*nx+xx
- assert( indexAngle[0] < nx );
- assert( indexAngle[1] < ny );
- assert( indexAngle[0] >= 0 );
- assert( indexAngle[1] >= 0 );
+ assert(indexAngle[0] < nx);
+ assert(indexAngle[1] < ny);
+ assert(indexAngle[0] >= 0);
+ assert(indexAngle[1] >= 0);
- error = static_cast<double>( m_AngleImage->GetPixel(indexAngle) );
- if (error>-100.0)
- {
- error -= theta;
- while (error<=-CONST_PI) error += CONST_2PI;
- while (error>CONST_PI) error -= CONST_2PI;
- if (error<0.0) error = -error;
- if (error<prec)
+ error = static_cast<double>(m_AngleImage->GetPixel(indexAngle));
+ if (error > -100.0)
{
+ error -= theta;
+ while (error <= -CONST_PI)
+ error += CONST_2PI;
+ while (error > CONST_PI)
+ error -= CONST_2PI;
+ if (error < 0.0) error = -error;
+ if (error < prec)
+ {
++cur;
if (!inbloc)
- {
- startbloc[nblocs]=l;
- inbloc=1;
+ {
+ startbloc[nblocs] = l;
+ inbloc = 1;
+ }
}
- }
else
- {
- if (inbloc)
{
- endbloc[nblocs] = l-1;
+ if (inbloc)
+ {
+ endbloc[nblocs] = l - 1;
++nblocs;
count[nblocs] = cur;
+ }
+ inbloc = 0;
}
- inbloc=0;
}
- }
/* compute next point */
l++;
- xx = ox+pos*mx + (int)(dx*(double)(l*2+lphase));
- yy = oy+pos*my + (int)(dy*(double)(l*2+lphase));
- }
+ xx = ox + pos * mx + (int) (dx * (double) (l * 2 + lphase));
+ yy = oy + pos * my + (int) (dy * (double) (l * 2 + lphase));
+ }
/*** detect meaningful segments ***/
- for (i=0;i<nblocs;++i)
- for (j=i;j<nblocs;++j)
- if ((nfa = test[count[j+1]-count[i]
- +(n+1)*(1+endbloc[j]-startbloc[i])]) < max_nfa)
- {
- seg[iseg].start = startbloc[i]*2+lphase;
- seg[iseg].end = endbloc[j]*2+lphase;
+ for (i = 0; i < nblocs; ++i)
+ for (j = i; j < nblocs; ++j)
+ if ((nfa = test[count[j + 1] - count[i]
+ + (n + 1) * (1 + endbloc[j] - startbloc[i])]) < max_nfa)
+ {
+ seg[iseg].start = startbloc[i] * 2 + lphase;
+ seg[iseg].end = endbloc[j] * 2 + lphase;
seg[iseg].nfa = nfa;
seg[iseg].ok = 1;
iseg++;
/* reallocate if necessary */
- if (iseg==size_seg)
- {
- size_seg = (size_seg*3)/2;
+ if (iseg == size_seg)
+ {
+ size_seg = (size_seg * 3) / 2;
seg.resize(size_seg);
// if (!seg)
// mwerror(FATAL,1,"Not enough memory.");
+ }
}
- }
- }
+ }
/*** end of phase loop ***/
/*** remove non-maximal segments ***/
if (!m_isMeaningfulSegment)
- for (i=0;i<iseg;++i)
- for (j=0;j<iseg;++j)
- if (i!=j)
+ for (i = 0; i < iseg; ++i)
+ for (j = 0; j < iseg; ++j)
+ if (i != j)
/* seg[i] is included in seg[j] ? */
- if (seg[i].start>=seg[j].start && seg[i].end<=seg[j].end)
- {
+ if (seg[i].start >= seg[j].start && seg[i].end <= seg[j].end)
+ {
/* remove the less meaningful of seg[i] and seg[j] */
- if (seg[i].nfa<seg[j].nfa) seg[j].ok=0;
- else seg[i].ok=0;
+ if (seg[i].nfa < seg[j].nfa) seg[j].ok = 0;
+ else seg[i].ok = 0;
- }
+ }
/*** store detected segments ***/
- for (i=0;i<iseg;++i)
+ for (i = 0; i < iseg; ++i)
if (seg[i].ok)
- {
- seglist[iseglist*5 ]=(double)(ox+pos*mx)+dx*(double)(seg[i].start);
- seglist[iseglist*5+1]=(double)(oy+pos*my)+dy*(double)(seg[i].start);
- seglist[iseglist*5+2]=(double)(ox+pos*mx)+dx*(double)(seg[i].end);
- seglist[iseglist*5+3]=(double)(oy+pos*my)+dy*(double)(seg[i].end);
- seglist[iseglist*5+4]=-(double)log10(seg[i].nfa);
+ {
+ seglist[iseglist * 5] = (double) (ox + pos * mx) + dx * (double) (seg[i].start);
+ seglist[iseglist * 5 + 1] = (double) (oy + pos * my) + dy * (double) (seg[i].start);
+ seglist[iseglist * 5 + 2] = (double) (ox + pos * mx) + dx * (double) (seg[i].end);
+ seglist[iseglist * 5 + 3] = (double) (oy + pos * my) + dy * (double) (seg[i].end);
+ seglist[iseglist * 5 + 4] = -(double) log10(seg[i].nfa);
iseglist++;
/* reallocate seglist if necessary */
- if (iseglist==size_seglist)
- {
- size_seglist = (size_seglist*3)/2;
+ if (iseglist == size_seglist)
+ {
+ size_seglist = (size_seglist * 3) / 2;
seglist.resize(size_seglist);
// if (!seglist)
// mwerror(FATAL,1,"Not enough memory.");
+ }
}
- }
+ }
}
- }
/*** end of second loop ***/
- printf(" nb de segments: %d\n",iseglist);
- }
+ printf(" nb de segments: %d\n", iseglist);
+ }
/******************** end of first loop ********************/
seg.clear();
@@ -542,7 +538,7 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
test.clear();
/* build segments list */
- seglist.resize(5*iseglist);
+ seglist.resize(5 * iseglist);
/* build segments list */
OutputPath->Clear();
@@ -552,30 +548,29 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
typename InputImageType::PointType point;
ContinuousIndexType cindex;
- for (i=0;i<iseglist;++i)
- {
+ for (i = 0; i < iseglist; ++i)
+ {
OutputPathPointerType path = OutputPathType::New();
path->Initialize();
- point[0]=seglist[i*5 ];
- point[1]=seglist[i*5+1];
- InputImage->TransformPhysicalPointToContinuousIndex( point, cindex );
+ point[0] = seglist[i * 5];
+ point[1] = seglist[i * 5 + 1];
+ InputImage->TransformPhysicalPointToContinuousIndex(point, cindex);
path->AddVertex(cindex);
- cindex[0] = seglist[i*5+2];
- cindex[1] = seglist[i*5+3];
+ cindex[0] = seglist[i * 5 + 2];
+ cindex[1] = seglist[i * 5 + 3];
path->AddVertex(cindex);
OutputPath->PushBack(path);
- }
+ }
itkDebugMacro(<< "ImageToPathListAlignFilter::GenerateData() finished");
} // end update function
-
template <class TInputImage, class TOutputPath>
void
-ImageToPathListAlignFilter<TInputImage,TOutputPath>
+ImageToPathListAlignFilter<TInputImage, TOutputPath>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
@@ -584,7 +579,6 @@ ImageToPathListAlignFilter<TInputImage,TOutputPath>
// os << indent << "Background Value : " << m_BackgroundValue << std::endl;
}
-
} // end namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h
index 987cc93cdc..af4795cfaf 100644
--- a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h
+++ b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h
@@ -44,14 +44,14 @@ namespace Functor
/** \class MagnitudeFunctor
* \brief This functor computes the magnitude of a covariant vector.
*/
-template <class TInputPixel,class TOutputPixel>
+template <class TInputPixel, class TOutputPixel>
class MagnitudeFunctor
{
public:
- inline TOutputPixel operator()(const TInputPixel& input)
+ inline TOutputPixel operator ()(const TInputPixel& input)
{
- return vcl_sqrt(input[0]*input[0]+input[1]*input[1]);
+ return vcl_sqrt(input[0] * input[0] + input[1] * input[1]);
}
};
@@ -59,23 +59,23 @@ public:
* \brief This functor computes the orientation of a cavariant vector<br>
* Orientation values lies between 0 and 2*Pi.
*/
-template <class TInputPixel,class TOutputPixel>
+template <class TInputPixel, class TOutputPixel>
class OrientationFunctor
{
public:
- inline TOutputPixel operator()(const TInputPixel& input)
+ inline TOutputPixel operator ()(const TInputPixel& input)
{
- TOutputPixel resp = vcl_atan2(input[1],input[0]);
- if (resp<0)
- {
- resp+=CONST_2PI;
- }
+ TOutputPixel resp = vcl_atan2(input[1], input[0]);
+ if (resp < 0)
+ {
+ resp += CONST_2PI;
+ }
return resp;
}
};
-}// end namespace Functor
+} // end namespace Functor
/** \class ImageToSIFTKeyPointSetFilter
* \brief This class extracts key points from an input image, trough a pyramidal decomposition.
@@ -107,33 +107,33 @@ public:
*/
template <class TInputImage, class TOutputPointSet>
class ITK_EXPORT ImageToSIFTKeyPointSetFilter
- : public ImageToPointSetFilter<TInputImage,TOutputPointSet>
+ : public ImageToPointSetFilter<TInputImage, TOutputPointSet>
{
public:
/** Standard typedefs */
- typedef ImageToSIFTKeyPointSetFilter Self;
- typedef ImageToPointSetFilter<TInputImage,TOutputPointSet> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageToSIFTKeyPointSetFilter Self;
+ typedef ImageToPointSetFilter<TInputImage, TOutputPointSet> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(ImageToSIFTKeyPointSetFilter,ImageToPointSetFilter);
+ itkTypeMacro(ImageToSIFTKeyPointSetFilter, ImageToPointSetFilter);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
- typedef typename TInputImage::Pointer InputImagePointerType;
+ typedef TInputImage InputImageType;
+ typedef typename TInputImage::Pointer InputImagePointerType;
typedef typename TInputImage::PixelType PixelType;
- typedef TOutputPointSet OutputPointSetType;
- typedef typename TOutputPointSet::Pointer OutputPointSetPointerType;
- typedef typename TOutputPointSet::PixelType OutputPixelType;
- typedef typename TOutputPointSet::PointType OutputPointType;
+ typedef TOutputPointSet OutputPointSetType;
+ typedef typename TOutputPointSet::Pointer OutputPointSetPointerType;
+ typedef typename TOutputPointSet::PixelType OutputPixelType;
+ typedef typename TOutputPointSet::PointType OutputPointType;
typedef typename TOutputPointSet::PointIdentifier OutputPointIdentifierType;
- typedef itk::Vector<PixelType,3> VectorPointType;
+ typedef itk::Vector<PixelType, 3> VectorPointType;
/** Set/Get the number of octaves */
itkSetMacro(OctavesNumber, unsigned int);
@@ -177,39 +177,43 @@ public:
/** Internal typedefs */
typedef itk::ExpandImageFilter<TInputImage, TInputImage> ExpandFilterType;
- typedef typename ExpandFilterType::Pointer ExpandFilterPointerType;
+ typedef typename ExpandFilterType::Pointer ExpandFilterPointerType;
typedef itk::ShrinkImageFilter<InputImageType, InputImageType> ShrinkFilterType;
- typedef typename ShrinkFilterType::Pointer ShrinkFilterPointerType;
+ typedef typename ShrinkFilterType::Pointer ShrinkFilterPointerType;
- typedef itk::RecursiveGaussianImageFilter<InputImageType,InputImageType> GaussianFilterType;
- typedef typename GaussianFilterType::Pointer GaussianFilterPointerType;
+ typedef itk::RecursiveGaussianImageFilter<InputImageType, InputImageType> GaussianFilterType;
+ typedef typename GaussianFilterType::Pointer GaussianFilterPointerType;
- typedef otb::ImageList<InputImageType> ImageListType;
+ typedef otb::ImageList<InputImageType> ImageListType;
typedef typename ImageListType::Pointer ImageListPointerType;
- typedef itk::SubtractImageFilter<InputImageType,InputImageType,InputImageType> SubtractFilterType;
- typedef typename SubtractFilterType::Pointer SubtractFilterPointerType;
+ typedef itk::SubtractImageFilter<InputImageType, InputImageType, InputImageType> SubtractFilterType;
+ typedef typename SubtractFilterType::Pointer SubtractFilterPointerType;
- typedef itk::ConstNeighborhoodIterator<InputImageType> NeighborhoodIteratorType;
+ typedef itk::ConstNeighborhoodIterator<InputImageType> NeighborhoodIteratorType;
typedef typename NeighborhoodIteratorType::NeighborhoodType NeighborhoodType;
- typedef typename NeighborhoodType::OffsetType OffsetType;
+ typedef typename NeighborhoodType::OffsetType OffsetType;
typedef itk::ImageRegionConstIterator<InputImageType> RegionIteratorType;
typedef itk::MinimumMaximumImageCalculator<InputImageType> MinimumMaximumCalculatorType;
- typedef typename MinimumMaximumCalculatorType::Pointer MinimumMaximumCalculatorPointerType;
+ typedef typename MinimumMaximumCalculatorType::Pointer MinimumMaximumCalculatorPointerType;
- typedef itk::GradientImageFilter<InputImageType,PixelType,PixelType> GradientFilterType;
- typedef typename GradientFilterType::Pointer GradientFilterPointerType;
- typedef typename GradientFilterType::OutputImageType GradientOutputImageType;
+ typedef itk::GradientImageFilter<InputImageType, PixelType, PixelType> GradientFilterType;
+ typedef typename GradientFilterType::Pointer GradientFilterPointerType;
+ typedef typename GradientFilterType::OutputImageType GradientOutputImageType;
- typedef itk::UnaryFunctorImageFilter<GradientOutputImageType,InputImageType,
- Functor::MagnitudeFunctor<typename GradientOutputImageType::PixelType,typename InputImageType::PixelType> > MagnitudeFilterType;
+ typedef itk::UnaryFunctorImageFilter<GradientOutputImageType, InputImageType,
+ Functor::MagnitudeFunctor<typename GradientOutputImageType::PixelType,
+ typename InputImageType::PixelType> >
+ MagnitudeFilterType;
typedef typename MagnitudeFilterType::Pointer MagnitudeFilterPointerType;
- typedef itk::UnaryFunctorImageFilter<GradientOutputImageType,InputImageType,
- Functor::OrientationFunctor<typename GradientOutputImageType::PixelType,typename InputImageType::PixelType> > OrientationFilterType;
+ typedef itk::UnaryFunctorImageFilter<GradientOutputImageType, InputImageType,
+ Functor::OrientationFunctor<typename GradientOutputImageType::PixelType,
+ typename InputImageType::PixelType> >
+ OrientationFilterType;
typedef typename OrientationFilterType::Pointer OrientationFilterPointerType;
protected:
@@ -235,7 +239,7 @@ protected:
void ComputeDifferenceOfGaussian(InputImagePointerType input);
/** Localize key point */
- void DetectKeyPoint( const unsigned int octave );
+ void DetectKeyPoint(const unsigned int octave);
/** Check local extremum for 26 neighbors (current and adjacents scales)
*
@@ -245,9 +249,9 @@ protected:
*
* \return true if the pixel is extremum
*/
- bool IsLocalExtremum( const NeighborhoodIteratorType& currentScale,
- const NeighborhoodIteratorType& previousScale,
- const NeighborhoodIteratorType& nextScale ) const;
+ bool IsLocalExtremum(const NeighborhoodIteratorType& currentScale,
+ const NeighborhoodIteratorType& previousScale,
+ const NeighborhoodIteratorType& nextScale) const;
/** Refine location key point
*
@@ -262,10 +266,10 @@ protected:
*
* \return true if key point is accepted, false otherwise
*/
- bool RefineLocationKeyPoint( const NeighborhoodIteratorType& currentScale,
- const NeighborhoodIteratorType& previousScale,
- const NeighborhoodIteratorType& nextScale,
- VectorPointType& solution);
+ bool RefineLocationKeyPoint(const NeighborhoodIteratorType& currentScale,
+ const NeighborhoodIteratorType& previousScale,
+ const NeighborhoodIteratorType& nextScale,
+ VectorPointType& solution);
/** Assign key point orientation
*
@@ -276,8 +280,8 @@ protected:
* \return orientation key point orientation
*/
std::vector<PixelType> ComputeKeyPointOrientations(const NeighborhoodIteratorType& currentScale,
- const unsigned int scale,
- const PixelType translation);
+ const unsigned int scale,
+ const PixelType translation);
/** Compute local image descriptor
*
@@ -288,12 +292,12 @@ protected:
* \return histogram descriptor
*/
std::vector<PixelType> ComputeKeyPointDescriptor(const NeighborhoodIteratorType& currentScale,
- const unsigned int scale,
- const PixelType& orientation);
+ const unsigned int scale,
+ const PixelType& orientation);
private:
- ImageToSIFTKeyPointSetFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageToSIFTKeyPointSetFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Number of octaves */
unsigned int m_OctavesNumber;
@@ -317,7 +321,7 @@ private:
double m_RatioEdgeThreshold;
/** Histogram sift keys descriptors gradient magnitude threshold */
- PixelType m_GradientMagnitudeThreshold;
+ PixelType m_GradientMagnitudeThreshold;
/** Sigma 0 */
typename GaussianFilterType::ScalarRealType m_Sigma0;
@@ -383,7 +387,7 @@ private:
/** Offsets vector, conveniance datas */
static const OffsetType m_Offsets[8];
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbImageToSIFTKeyPointSetFilter.txx"
#endif
diff --git a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx
index 35bd9011ae..95fa377aef 100644
--- a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx
+++ b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx
@@ -29,41 +29,51 @@ namespace otb
template <class TInputImage, class TOutputPointSet>
const double
-ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
+ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>
::m_HistogramGaussianWeights[73] =
-{
- 2.3771112282795414e-07, 3.8860734758633732e-07, 6.2655544995978937e-07, 9.9631120821413786e-07, 1.5624909838697011e-06, 2.4167238265599128e-06, 3.6865788528530121e-06,
- 5.5463469229192623e-06, 8.2295774080263437e-06, 1.2043009749602365e-05, 1.738119136656513e-05, 2.4740646513897326e-05, 3.4731980398846277e-05, 4.808781565748272e-05,
- 6.5664032975164266e-05, 8.8431512984476723e-05, 0.00011745555408931643, 0.00015386047198026335, 0.00019877765486783745, 0.00025327659834301937, 0.00031828015928190065,
- 0.00039446735551235698, 0.00048216931692246382, 0.00058126620279441276, 0.00069109471776775144, 0.00081037694122312908, 0.00093718121775182789, 0.0010689246133776746,
- 0.0012024238404411182, 0.0013339976954896103, 0.0014596192424447215, 0.0015751106965100009, 0.0016763688464699555, 0.0017596045720966803, 0.0018215772013714365,
- 0.0018598035923515156, 0.0018727231637146351, 0.0018598035923515156, 0.0018215772013714365, 0.0017596045720966803, 0.0016763688464699555, 0.0015751106965100009,
- 0.0014596192424447215, 0.0013339976954896103, 0.0012024238404411182, 0.0010689246133776746, 0.00093718121775182789, 0.00081037694122312908, 0.00069109471776775144,
- 0.00058126620279441276, 0.00048216931692246382, 0.00039446735551235698, 0.00031828015928190065, 0.00025327659834301937, 0.00019877765486783745, 0.00015386047198026335,
- 0.00011745555408931643, 8.8431512984476723e-05, 6.5664032975164266e-05, 4.808781565748272e-05, 3.4731980398846277e-05, 2.4740646513897326e-05, 1.738119136656513e-05,
- 1.2043009749602365e-05, 8.2295774080263437e-06, 5.5463469229192623e-06, 3.6865788528530121e-06, 2.4167238265599128e-06, 1.5624909838697011e-06, 9.9631120821413786e-07,
+ {
+ 2.3771112282795414e-07, 3.8860734758633732e-07, 6.2655544995978937e-07, 9.9631120821413786e-07,
+ 1.5624909838697011e-06, 2.4167238265599128e-06, 3.6865788528530121e-06,
+ 5.5463469229192623e-06, 8.2295774080263437e-06, 1.2043009749602365e-05, 1.738119136656513e-05,
+ 2.4740646513897326e-05, 3.4731980398846277e-05, 4.808781565748272e-05,
+ 6.5664032975164266e-05, 8.8431512984476723e-05, 0.00011745555408931643, 0.00015386047198026335,
+ 0.00019877765486783745, 0.00025327659834301937, 0.00031828015928190065,
+ 0.00039446735551235698, 0.00048216931692246382, 0.00058126620279441276, 0.00069109471776775144,
+ 0.00081037694122312908, 0.00093718121775182789, 0.0010689246133776746,
+ 0.0012024238404411182, 0.0013339976954896103, 0.0014596192424447215, 0.0015751106965100009, 0.0016763688464699555,
+ 0.0017596045720966803, 0.0018215772013714365,
+ 0.0018598035923515156, 0.0018727231637146351, 0.0018598035923515156, 0.0018215772013714365, 0.0017596045720966803,
+ 0.0016763688464699555, 0.0015751106965100009,
+ 0.0014596192424447215, 0.0013339976954896103, 0.0012024238404411182, 0.0010689246133776746,
+ 0.00093718121775182789, 0.00081037694122312908, 0.00069109471776775144,
+ 0.00058126620279441276, 0.00048216931692246382, 0.00039446735551235698, 0.00031828015928190065,
+ 0.00025327659834301937, 0.00019877765486783745, 0.00015386047198026335,
+ 0.00011745555408931643, 8.8431512984476723e-05, 6.5664032975164266e-05, 4.808781565748272e-05,
+ 3.4731980398846277e-05, 2.4740646513897326e-05, 1.738119136656513e-05,
+ 1.2043009749602365e-05, 8.2295774080263437e-06, 5.5463469229192623e-06, 3.6865788528530121e-06,
+ 2.4167238265599128e-06, 1.5624909838697011e-06, 9.9631120821413786e-07,
6.2655544995978937e-07, 3.8860734758633732e-07, 2.3771112282795414e-07
-};
+ };
template <class TInputImage, class TOutputPointSet>
-const typename ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>::OffsetType
-ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>::m_Offsets[8] =
-{
- {{-1,-1}}, //0
- {{-1, 0}}, //1
- {{-1, 1}}, //2
- {{ 0,-1}}, //3
- {{ 0, 1}}, //4
- {{ 1,-1}}, //5
- {{ 1, 0}}, //6
- {{ 1, 1}}, //7
-};
+const typename ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>::OffsetType
+ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>::m_Offsets[8] =
+ {
+ {{-1, -1}}, //0
+ {{-1, 0}}, //1
+ {{-1, 1}}, //2
+ {{ 0, -1}}, //3
+ {{ 0, 1}}, //4
+ {{ 1, -1}}, //5
+ {{ 1, 0}}, //6
+ {{ 1, 1}}, //7
+ };
/**
* Constructor
*/
template <class TInputImage, class TOutputPointSet>
-ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
+ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>
::ImageToSIFTKeyPointSetFilter()
{
m_OctavesNumber = 1;
@@ -92,15 +102,15 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
template <class TInputImage, class TOutputPointSet>
void
-ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
+ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>
::GenerateData()
{
// First, subsample the input image
InitializeInputImage();
- InputImagePointerType input = m_ExpandFilter->GetOutput();
+ InputImagePointerType input = m_ExpandFilter->GetOutput();
typename InputImageType::PointType point;
- typename InputImageType::IndexType index;
+ typename InputImageType::IndexType index;
index[0] = 0;
index[1] = 0;
@@ -108,11 +118,11 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
// for each octave, compute the difference of gaussian
unsigned int lOctave = 0;
- m_Sigmak = vcl_pow(2, static_cast<double>(1/(double)(m_ScalesNumber+1)));
- m_RatioEdgeThreshold = (m_EdgeThreshold+1)*(m_EdgeThreshold+1)/m_EdgeThreshold;
+ m_Sigmak = vcl_pow(2, static_cast<double>(1 / (double) (m_ScalesNumber + 1)));
+ m_RatioEdgeThreshold = (m_EdgeThreshold + 1) * (m_EdgeThreshold + 1) / m_EdgeThreshold;
for (lOctave = 0; lOctave != m_OctavesNumber; lOctave++)
- {
+ {
m_DifferentSamplePoints = 0;
m_DiscardedKeyPoints = 0;
@@ -130,27 +140,27 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
input = m_ShrinkFilter->GetOutput();
- typename InputImageType::PointType origin1;
+ typename InputImageType::PointType origin1;
typename InputImageType::SpacingType spacing = input->GetSpacing();
- origin1[0] = origin0[0] + spacing[0]*0.25;
- origin1[1] = origin0[1] + spacing[1]*0.25;
+ origin1[0] = origin0[0] + spacing[0] * 0.25;
+ origin1[1] = origin0[1] + spacing[1] * 0.25;
input->SetOrigin(origin1);
- otbGenericMsgDebugMacro( <<"ImageToSIFTKeyPointSetFilter:: Number total key points : " \
- << m_ValidatedKeyPoints);
- otbGenericMsgDebugMacro( <<"ImageToSIFTKeyPointSetFilter:: Number different sample key points per octave : " \
- << m_DifferentSamplePoints );
- otbGenericMsgDebugMacro( <<"ImageToSIFTKeyPointSetFilter:: Number discarded key points per octave : " \
- << m_DiscardedKeyPoints );
- otbGenericMsgDebugMacro( <<"ImageToSIFTKeyPointSetFilter:: Resample image factor : " \
- << m_ShrinkFactors);
+ otbGenericMsgDebugMacro(<< "ImageToSIFTKeyPointSetFilter:: Number total key points : " \
+ << m_ValidatedKeyPoints);
+ otbGenericMsgDebugMacro(<< "ImageToSIFTKeyPointSetFilter:: Number different sample key points per octave : " \
+ << m_DifferentSamplePoints);
+ otbGenericMsgDebugMacro(<< "ImageToSIFTKeyPointSetFilter:: Number discarded key points per octave : " \
+ << m_DiscardedKeyPoints);
+ otbGenericMsgDebugMacro(<< "ImageToSIFTKeyPointSetFilter:: Resample image factor : " \
+ << m_ShrinkFactors);
- }
+ }
- otbGenericMsgDebugMacro( <<"ImageToSIFTKeyPointSetFilter:: Total number key points : " \
- << this->GetOutput()->GetNumberOfPoints());
+ otbGenericMsgDebugMacro(<< "ImageToSIFTKeyPointSetFilter:: Total number key points : " \
+ << this->GetOutput()->GetNumberOfPoints());
}
@@ -159,19 +169,19 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
*/
template <class TInputImage, class TOutputPointSet>
void
-ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
+ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>
::InitializeInputImage()
{
- m_ExpandFilter->SetInput( this->GetInput());
+ m_ExpandFilter->SetInput(this->GetInput());
m_ExpandFilter->SetExpandFactors(m_ExpandFactors);
m_ExpandFilter->Update();
- typename InputImageType::PointType origin0 = this->GetInput()->GetOrigin();
- typename InputImageType::PointType origin1;
+ typename InputImageType::PointType origin0 = this->GetInput()->GetOrigin();
+ typename InputImageType::PointType origin1;
typename InputImageType::SpacingType spacing = m_ExpandFilter->GetOutput()->GetSpacing();
- origin1[0] = origin0[0]-spacing[0]*0.5;
- origin1[1] = origin0[1]-spacing[1]*0.5;
+ origin1[0] = origin0[0] - spacing[0] * 0.5;
+ origin1[1] = origin0[1] - spacing[1] * 0.5;
m_ExpandFilter->GetOutput()->SetOrigin(origin1);
}
@@ -181,10 +191,10 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
*/
template <class TInputImage, class TOutputPointSet>
void
-ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
+ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>
::ComputeDifferenceOfGaussian(InputImagePointerType input)
{
- unsigned int lScale = 0;
+ unsigned int lScale = 0;
InputImagePointerType previousGaussian;
m_DoGList = ImageListType::New();
@@ -200,11 +210,11 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
//
// with multiply by spacing before filtering, length sigma gaussian
// is compute in pixel
- double xsigman = vcl_abs(input->GetSpacing()[0])*m_Sigma0;
- double ysigman = vcl_abs(input->GetSpacing()[1])*m_Sigma0;
+ double xsigman = vcl_abs(input->GetSpacing()[0]) * m_Sigma0;
+ double ysigman = vcl_abs(input->GetSpacing()[1]) * m_Sigma0;
- for (lScale = 0; lScale != m_ScalesNumber+2; lScale++)
- {
+ for (lScale = 0; lScale != m_ScalesNumber + 2; lScale++)
+ {
m_XGaussianFilter = GaussianFilterType::New();
m_YGaussianFilter = GaussianFilterType::New();
@@ -232,22 +242,21 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
m_MagnitudeList->PushBack(m_MagnitudeFilter->GetOutput());
m_OrientationList->PushBack(m_OrientationFilter->GetOutput());
-
- if (lScale>0)
- {
+ if (lScale > 0)
+ {
m_SubtractFilter = SubtractFilterType::New();
m_SubtractFilter->SetInput1(m_YGaussianFilter->GetOutput());
m_SubtractFilter->SetInput2(previousGaussian);
m_SubtractFilter->Update();
m_DoGList->PushBack(m_SubtractFilter->GetOutput());
- }
+ }
previousGaussian = m_YGaussianFilter->GetOutput();
- xsigman = xsigman*m_Sigmak;
- ysigman = ysigman*m_Sigmak;
- }
+ xsigman = xsigman * m_Sigmak;
+ ysigman = ysigman * m_Sigmak;
+ }
m_LastGaussian = previousGaussian;
- otbGenericMsgDebugMacro( <<"ImageToSIFTKeyPointSetFilter:: Number of DoG "<<m_DoGList->Size() );
+ otbGenericMsgDebugMacro(<< "ImageToSIFTKeyPointSetFilter:: Number of DoG " << m_DoGList->Size());
}
/**
@@ -255,20 +264,20 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
*/
template <class TInputImage, class TOutputPointSet>
void
-ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
-::DetectKeyPoint( const unsigned int octave )
+ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>
+::DetectKeyPoint(const unsigned int octave)
{
// need at least 3 DoG, ie 2 scales
- if (m_ScalesNumber > 1 )
- {
- typename ImageListType::Iterator lIterDoG = m_DoGList->Begin()+1;
- unsigned int lScale = 1;
- OutputPointSetPointerType outputPointSet = this->GetOutput();
+ if (m_ScalesNumber > 1)
+ {
+ typename ImageListType::Iterator lIterDoG = m_DoGList->Begin() + 1;
+ unsigned int lScale = 1;
+ OutputPointSetPointerType outputPointSet = this->GetOutput();
typename InputImageType::SpacingType spacing = lIterDoG.Get()->GetSpacing();
- while ( (lIterDoG+1) != m_DoGList->End())
- {
- otbGenericMsgDebugMacro( <<"ImageToSIFTKeyPointSetFilter:: octave: " << octave << " scale: " << lScale);
+ while ((lIterDoG + 1) != m_DoGList->End())
+ {
+ otbGenericMsgDebugMacro(<< "ImageToSIFTKeyPointSetFilter:: octave: " << octave << " scale: " << lScale);
// Compute max of DoG
MinimumMaximumCalculatorPointerType lMaximumCalculator = MinimumMaximumCalculatorType::New();
lMaximumCalculator->SetImage(lIterDoG.Get());
@@ -276,30 +285,30 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
typename InputImageType::SizeType lRadius;
lRadius.Fill(1);
- typename ImageListType::Iterator lIterNext = lIterDoG+1;
- typename ImageListType::Iterator lIterPrev = lIterDoG-1;
+ typename ImageListType::Iterator lIterNext = lIterDoG + 1;
+ typename ImageListType::Iterator lIterPrev = lIterDoG - 1;
NeighborhoodIteratorType lIterCurrent(lRadius,
lIterDoG.Get(),
lIterDoG.Get()->GetLargestPossibleRegion());
NeighborhoodIteratorType lIterLowerAdjacent(lRadius,
- lIterPrev.Get(),
- lIterPrev.Get()->GetLargestPossibleRegion());
+ lIterPrev.Get(),
+ lIterPrev.Get()->GetLargestPossibleRegion());
NeighborhoodIteratorType lIterUpperAdjacent(lRadius,
- lIterNext.Get(),
- lIterNext.Get()->GetLargestPossibleRegion());
+ lIterNext.Get(),
+ lIterNext.Get()->GetLargestPossibleRegion());
- while ( !lIterCurrent.IsAtEnd() &&
- !lIterLowerAdjacent.IsAtEnd() &&
- !lIterUpperAdjacent.IsAtEnd() )
- {
+ while (!lIterCurrent.IsAtEnd() &&
+ !lIterLowerAdjacent.IsAtEnd() &&
+ !lIterUpperAdjacent.IsAtEnd())
+ {
// check local min/max
if (IsLocalExtremum(lIterCurrent,
lIterLowerAdjacent,
- lIterUpperAdjacent) )
- {
+ lIterUpperAdjacent))
+ {
VectorPointType lTranslation(PixelType(0));
- OffsetType lOffsetZero = {{0,0}};
+ OffsetType lOffsetZero = {{0, 0}};
unsigned int lChangeSamplePoints = 0;
NeighborhoodIteratorType neighborCurrentScale(lIterCurrent);
@@ -309,64 +318,66 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
bool accepted = false;
bool changed = true;
while (lChangeSamplePoints < m_ChangeSamplePointsMax &&
- changed )
- {
+ changed)
+ {
accepted = RefineLocationKeyPoint(neighborCurrentScale,
neighborPreviousScale,
neighborNextScale,
lTranslation);
- OffsetType lTranslateOffset = {{0,0}};
+ OffsetType lTranslateOffset = {{0, 0}};
- lTranslateOffset[0] += static_cast<int>(lTranslation[0]>0.5);
- lTranslateOffset[0] += -static_cast<int>(lTranslation[0]<-0.5);
+ lTranslateOffset[0] += static_cast<int>(lTranslation[0] > 0.5);
+ lTranslateOffset[0] += -static_cast<int>(lTranslation[0] < -0.5);
- lTranslateOffset[1] += static_cast<int>(lTranslation[1]>0.5);
- lTranslateOffset[1] += -static_cast<int>(lTranslation[1]<-0.5);
+ lTranslateOffset[1] += static_cast<int>(lTranslation[1] > 0.5);
+ lTranslateOffset[1] += -static_cast<int>(lTranslation[1] < -0.5);
- NeighborhoodIteratorType moveIterator = neighborCurrentScale+lTranslateOffset;
+ NeighborhoodIteratorType moveIterator = neighborCurrentScale + lTranslateOffset;
- if ( moveIterator.InBounds())
- {
+ if (moveIterator.InBounds())
+ {
changed = lTranslateOffset != lOffsetZero;
// move iterator
- neighborCurrentScale+=lTranslateOffset;
- neighborPreviousScale+=lTranslateOffset;
- neighborNextScale+=lTranslateOffset;
- }
+ neighborCurrentScale += lTranslateOffset;
+ neighborPreviousScale += lTranslateOffset;
+ neighborNextScale += lTranslateOffset;
+ }
else
- {
+ {
changed = false;
- }
+ }
++lChangeSamplePoints;
- }
+ }
if (changed)
- {
+ {
++m_DifferentSamplePoints;
- }
+ }
// add key point
if (accepted)
- {
+ {
std::vector<PixelType> lOrientations = ComputeKeyPointOrientations(neighborCurrentScale,
- lScale,
- lTranslation[2]);
+ lScale,
+ lTranslation[2]);
// for each main orientation
- for (typename std::vector<PixelType>::iterator orientationIt = lOrientations.begin(); orientationIt != lOrientations.end();++orientationIt)
- {
+ for (typename std::vector<PixelType>::iterator orientationIt = lOrientations.begin();
+ orientationIt != lOrientations.end();
+ ++orientationIt)
+ {
std::vector<PixelType> lDescriptors = ComputeKeyPointDescriptor(neighborCurrentScale,
- lScale,
- *orientationIt);
+ lScale,
+ *orientationIt);
OutputPointType keyPoint;
lIterDoG.Get()->TransformIndexToPhysicalPoint(neighborCurrentScale.GetIndex(),
- keyPoint);
- keyPoint[0] += spacing[0]*lTranslation[0];
- keyPoint[1] += spacing[1]*lTranslation[1];
+ keyPoint);
+ keyPoint[0] += spacing[0] * lTranslation[0];
+ keyPoint[1] += spacing[1] * lTranslation[1];
outputPointSet->SetPoint(m_ValidatedKeyPoints, keyPoint);
@@ -379,27 +390,27 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
unsigned int lIndDesc = 0;
while (lIterDescriptor != lDescriptors.end())
- {
+ {
data.SetElement(lIndDesc, *lIterDescriptor);
++lIndDesc;
++lIterDescriptor;
- }
+ }
outputPointSet->SetPointData(m_ValidatedKeyPoints, data);
++m_ValidatedKeyPoints;
+ }
}
}
- }
++lIterCurrent;
++lIterLowerAdjacent;
++lIterUpperAdjacent;
- }
+ }
++lIterDoG;
++lScale;
+ }
}
- }
}
/**
@@ -407,47 +418,47 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
*/
template <class TInputImage, class TOutputPointSet>
bool
-ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
-::IsLocalExtremum( const NeighborhoodIteratorType& currentScale,
- const NeighborhoodIteratorType& previousScale,
- const NeighborhoodIteratorType& nextScale) const
+ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>
+::IsLocalExtremum(const NeighborhoodIteratorType& currentScale,
+ const NeighborhoodIteratorType& previousScale,
+ const NeighborhoodIteratorType& nextScale) const
{
- bool isMin = currentScale.GetCenterPixel() < currentScale.GetPixel(m_Offsets[0]);
- bool isMax = currentScale.GetCenterPixel() > currentScale.GetPixel(m_Offsets[0]);
- bool isExtremum = isMin || isMax;
+ bool isMin = currentScale.GetCenterPixel() < currentScale.GetPixel(m_Offsets[0]);
+ bool isMax = currentScale.GetCenterPixel() > currentScale.GetPixel(m_Offsets[0]);
+ bool isExtremum = isMin || isMax;
unsigned int lIterOffset = 0;
while (isExtremum && lIterOffset != 8)
- {
+ {
OffsetType off = m_Offsets[lIterOffset];
if (isMin)
- {
+ {
isExtremum =
currentScale.GetCenterPixel() < currentScale.GetPixel(off) &&
currentScale.GetCenterPixel() < previousScale.GetPixel(off) &&
currentScale.GetCenterPixel() < nextScale.GetPixel(off);
- }
+ }
else if (isMax)
- {
+ {
isExtremum =
currentScale.GetCenterPixel() > currentScale.GetPixel(off) &&
currentScale.GetCenterPixel() > previousScale.GetPixel(off) &&
currentScale.GetCenterPixel() > nextScale.GetPixel(off);
- }
+ }
lIterOffset++;
- }
+ }
if (isExtremum && isMin)
- {
+ {
isExtremum =
currentScale.GetCenterPixel() < previousScale.GetCenterPixel() &&
currentScale.GetCenterPixel() < nextScale.GetCenterPixel();
- }
+ }
else if (isExtremum && isMax)
- {
+ {
isExtremum =
currentScale.GetCenterPixel() > previousScale.GetCenterPixel() &&
currentScale.GetCenterPixel() > nextScale.GetCenterPixel();
- }
+ }
return isExtremum;
}
@@ -456,89 +467,89 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
*/
template <class TInputImage, class TOutputPointSet>
bool
-ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
-::RefineLocationKeyPoint( const NeighborhoodIteratorType& currentScale,
- const NeighborhoodIteratorType& previousScale,
- const NeighborhoodIteratorType& nextScale,
- VectorPointType& solution)
+ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>
+::RefineLocationKeyPoint(const NeighborhoodIteratorType& currentScale,
+ const NeighborhoodIteratorType& previousScale,
+ const NeighborhoodIteratorType& nextScale,
+ VectorPointType& solution)
{
bool accepted = true;
solution = VectorPointType(PixelType(0));
- PixelType dx = 0.5*(currentScale.GetPixel(m_Offsets[6])
- -currentScale.GetPixel(m_Offsets[1]) );
+ PixelType dx = 0.5 * (currentScale.GetPixel(m_Offsets[6])
+ - currentScale.GetPixel(m_Offsets[1]));
- PixelType dy = 0.5*(currentScale.GetPixel(m_Offsets[4])
- -currentScale.GetPixel(m_Offsets[3]) );
+ PixelType dy = 0.5 * (currentScale.GetPixel(m_Offsets[4])
+ - currentScale.GetPixel(m_Offsets[3]));
- PixelType ds = 0.5*(nextScale.GetCenterPixel()-
- previousScale.GetCenterPixel());
+ PixelType ds = 0.5 * (nextScale.GetCenterPixel() -
+ previousScale.GetCenterPixel());
PixelType dxx = currentScale.GetPixel(m_Offsets[6])
- -2*currentScale.GetCenterPixel()
- +currentScale.GetPixel(m_Offsets[1]);
+ - 2 * currentScale.GetCenterPixel()
+ + currentScale.GetPixel(m_Offsets[1]);
PixelType dyy = currentScale.GetPixel(m_Offsets[3])
- -2*currentScale.GetCenterPixel()
- +currentScale.GetPixel(m_Offsets[4]);
+ - 2 * currentScale.GetCenterPixel()
+ + currentScale.GetPixel(m_Offsets[4]);
PixelType dss = previousScale.GetCenterPixel()
- -2*currentScale.GetCenterPixel()
- +nextScale.GetCenterPixel();
+ - 2 * currentScale.GetCenterPixel()
+ + nextScale.GetCenterPixel();
- PixelType dxy = 0.25*(currentScale.GetPixel(m_Offsets[7])
- +currentScale.GetPixel(m_Offsets[0])
- -currentScale.GetPixel(m_Offsets[2])
- -currentScale.GetPixel(m_Offsets[5]) );
+ PixelType dxy = 0.25 * (currentScale.GetPixel(m_Offsets[7])
+ + currentScale.GetPixel(m_Offsets[0])
+ - currentScale.GetPixel(m_Offsets[2])
+ - currentScale.GetPixel(m_Offsets[5]));
- PixelType dxs = 0.25*(nextScale.GetPixel(m_Offsets[6])
- +previousScale.GetPixel(m_Offsets[1])
- -nextScale.GetPixel(m_Offsets[1])
- -previousScale.GetPixel(m_Offsets[6]) );
+ PixelType dxs = 0.25 * (nextScale.GetPixel(m_Offsets[6])
+ + previousScale.GetPixel(m_Offsets[1])
+ - nextScale.GetPixel(m_Offsets[1])
+ - previousScale.GetPixel(m_Offsets[6]));
- PixelType dys = 0.25*(nextScale.GetPixel(m_Offsets[4])
- +previousScale.GetPixel(m_Offsets[3])
- -nextScale.GetPixel(m_Offsets[3])
- -previousScale.GetPixel(m_Offsets[4]) );
+ PixelType dys = 0.25 * (nextScale.GetPixel(m_Offsets[4])
+ + previousScale.GetPixel(m_Offsets[3])
+ - nextScale.GetPixel(m_Offsets[3])
+ - previousScale.GetPixel(m_Offsets[4]));
// Compute matrice determinant
- double det = dxx*(dyy*dss-dys*dys) -dxy*(dxy*dss-dxs*dys)+dxs*(dxy*dys-dxs*dyy);
+ double det = dxx * (dyy * dss - dys * dys) - dxy * (dxy * dss - dxs * dys) + dxs * (dxy * dys - dxs * dyy);
// Solve system, compute key point offset
- solution[0] = -dx*(dyy*dss-dys*dys)-dy*(dxs*dys-dxy*dss)-ds*(dxy*dys-dyy*dxs);
- solution[1] = -dx*(dys*dxs-dss*dxy)-dy*(dxx*dss-dxs*dxs)-ds*(dxs*dxy-dxx*dys);
- solution[2] = -dx*(dxy*dys-dxs*dyy)-dy*(dxy*dxs-dxx*dys)-ds*(dxx*dyy-dxy*dxy);
+ solution[0] = -dx * (dyy * dss - dys * dys) - dy * (dxs * dys - dxy * dss) - ds * (dxy * dys - dyy * dxs);
+ solution[1] = -dx * (dys * dxs - dss * dxy) - dy * (dxx * dss - dxs * dxs) - ds * (dxs * dxy - dxx * dys);
+ solution[2] = -dx * (dxy * dys - dxs * dyy) - dy * (dxy * dxs - dxx * dys) - ds * (dxx * dyy - dxy * dxy);
// Compute interpolated value DoG for lSolution (determinant factor)
- PixelType lDoGInterpolated = det*currentScale.GetCenterPixel() +
- 0.5*(dx*solution[0]+
- dy*solution[1]+
- ds*solution[2]);
+ PixelType lDoGInterpolated = det * currentScale.GetCenterPixel() +
+ 0.5 * (dx * solution[0] +
+ dy * solution[1] +
+ ds * solution[2]);
- PixelType lHessianTrace2 = (dxx+dyy)*(dxx+dyy);
- PixelType lHessianDet = dxx*dyy-dxy*dxy;
+ PixelType lHessianTrace2 = (dxx + dyy) * (dxx + dyy);
+ PixelType lHessianDet = dxx * dyy - dxy * dxy;
// DoG threshold
- accepted = fabs(lDoGInterpolated) >= fabs(det*m_DoGThreshold);
+ accepted = fabs(lDoGInterpolated) >= fabs(det * m_DoGThreshold);
// Eliminating edge response
accepted = accepted &&
- fabs(lHessianTrace2) < fabs(m_RatioEdgeThreshold*lHessianDet);
+ fabs(lHessianTrace2) < fabs(m_RatioEdgeThreshold * lHessianDet);
if (!accepted)
- {
+ {
++m_DiscardedKeyPoints;
- }
+ }
if (det < 1e-10f)
- {
+ {
solution.Fill(0);
- }
+ }
else
- {
+ {
// normalize offset with determinant of derivative matrix
- solution/=det;
- }
+ solution /= det;
+ }
return accepted;
}
@@ -547,139 +558,139 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
*/
template <class TInputImage, class TOutputPointSet>
std::vector<typename ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>::PixelType>
-ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
-::ComputeKeyPointOrientations( const NeighborhoodIteratorType& currentScale,
- const unsigned int scale,
- const PixelType translation)
+ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>
+::ComputeKeyPointOrientations(const NeighborhoodIteratorType& currentScale,
+ const unsigned int scale,
+ const PixelType translation)
{
// radius of the neighborhood
unsigned int radius = 4;
- double lSigma = scale*3;
+ double lSigma = scale * 3;
unsigned int nbBins = 36;
- double binWidth = 360./nbBins;
+ double binWidth = 360. / nbBins;
// initialize the histogram
- std::vector<double> lHistogram(nbBins,0.), lSmoothedHistogram(nbBins,0.);
+ std::vector<double> lHistogram(nbBins, 0.), lSmoothedHistogram(nbBins, 0.);
// Build the region to examine
- typename InputImageType::RegionType region;
- typename InputImageType::RegionType::SizeType regionSize;
+ typename InputImageType::RegionType region;
+ typename InputImageType::RegionType::SizeType regionSize;
typename InputImageType::RegionType::IndexType regionIndex;
- regionSize.Fill(2*radius+2);
+ regionSize.Fill(2 * radius + 2);
region.SetSize(regionSize);
- regionIndex[0] = currentScale.GetIndex()[0]-regionSize[0]/2;
- regionIndex[1] = currentScale.GetIndex()[1]-regionSize[1]/2;
+ regionIndex[0] = currentScale.GetIndex()[0] - regionSize[0] / 2;
+ regionIndex[1] = currentScale.GetIndex()[1] - regionSize[1] / 2;
region.SetIndex(regionIndex);
if (!region.Crop(m_OrientationList->GetNthElement(scale)->GetLargestPossibleRegion()))
- {
- itkExceptionMacro(<<"Region "<<region<<" is strictly outside the largest possible region!");
- }
+ {
+ itkExceptionMacro(<< "Region " << region << " is strictly outside the largest possible region!");
+ }
// iterators on the orientation and the magnitude
- RegionIteratorType lIterOrientation(m_OrientationList->GetNthElement(scale),region);
+ RegionIteratorType lIterOrientation(m_OrientationList->GetNthElement(scale), region);
RegionIteratorType lIterMagn(m_MagnitudeList->GetNthElement(scale), region);
lIterOrientation.GoToBegin();
lIterMagn.GoToBegin();
// For each pixel
while (!lIterOrientation.IsAtEnd() && !lIterMagn.IsAtEnd())
- {
+ {
// check if pixel is inside the circle of radius
- float dx = lIterMagn.GetIndex()[0]-currentScale.GetIndex()[0];
- float dy = lIterMagn.GetIndex()[1]-currentScale.GetIndex()[1];
- float dist = vcl_sqrt(dx*dx+dy*dy);
+ float dx = lIterMagn.GetIndex()[0] - currentScale.GetIndex()[0];
+ float dy = lIterMagn.GetIndex()[1] - currentScale.GetIndex()[1];
+ float dist = vcl_sqrt(dx * dx + dy * dy);
// If we are in the circle
- if (dist<radius)
- {
+ if (dist < radius)
+ {
//Get the values
PixelType lOrientation = lIterOrientation.Get();
PixelType lMagnitude = lIterMagn.Get();
// Compute the gaussian weight
- double lWeightMagnitude = vcl_exp(-dist*dist/(2*lSigma*lSigma));
+ double lWeightMagnitude = vcl_exp(-dist * dist / (2 * lSigma * lSigma));
// Compute the histogram bin index
- unsigned int lHistoIndex = static_cast<unsigned int>(vcl_floor(nbBins*lOrientation/(CONST_2PI)));
+ unsigned int lHistoIndex = static_cast<unsigned int>(vcl_floor(nbBins * lOrientation / (CONST_2PI)));
// Update the histogram value
- lHistogram[lHistoIndex] += lMagnitude*lWeightMagnitude;
- }
+ lHistogram[lHistoIndex] += lMagnitude * lWeightMagnitude;
+ }
++lIterOrientation;
++lIterMagn;
- }
+ }
// Computing smoothed histogram and looking for the maximum and a second maximum within 80% of the first
double max = 0;
double secondMax = 0;
double sum = 0;
- int maxIndex = 0;
- int secondMaxIndex = -1;
- int j = 0;
- int i = 0;
+ int maxIndex = 0;
+ int secondMaxIndex = -1;
+ int j = 0;
+ int i = 0;
// Smoothing histogram
- for (i=0;i<static_cast<int>(nbBins);++i)
- {
- sum = 0;
- for (j=i-nbBins;j<i;++j)
+ for (i = 0; i < static_cast<int>(nbBins); ++i)
{
- sum+=lHistogram[i-j-1]*m_HistogramGaussianWeights[j+nbBins];
+ sum = 0;
+ for (j = i - nbBins; j < i; ++j)
+ {
+ sum += lHistogram[i - j - 1] * m_HistogramGaussianWeights[j + nbBins];
+ }
+ lSmoothedHistogram[i] = sum;
}
- lSmoothedHistogram[i]=sum;
- }
// looking for maximums
- for (i=0;i<static_cast<int>(nbBins);++i)
- {
- if (lSmoothedHistogram[i]>max)
+ for (i = 0; i < static_cast<int>(nbBins); ++i)
{
+ if (lSmoothedHistogram[i] > max)
+ {
secondMax = max;
secondMaxIndex = maxIndex;
- max=lSmoothedHistogram[i];
+ max = lSmoothedHistogram[i];
maxIndex = i;
- }
+ }
else if (sum > secondMax)
- {
+ {
secondMax = lSmoothedHistogram[i];
secondMaxIndex = i;
+ }
}
- }
// This structure will hold the located maximums
std::vector<PixelType> orientations;
//interpolate orientation maximum
- double x1,x2,x3,y1,y2,y3,a,b,num,denom,orientation;
- x1 = (maxIndex-1)*binWidth+binWidth/2;
- y1 = lSmoothedHistogram[(maxIndex-1)<0 ? maxIndex-1+nbBins : maxIndex-1];
- x2 = (maxIndex)*binWidth+binWidth/2;
+ double x1, x2, x3, y1, y2, y3, a, b, num, denom, orientation;
+ x1 = (maxIndex - 1) * binWidth + binWidth / 2;
+ y1 = lSmoothedHistogram[(maxIndex - 1) < 0 ? maxIndex - 1 + nbBins : maxIndex - 1];
+ x2 = (maxIndex) * binWidth + binWidth / 2;
y2 = lSmoothedHistogram[maxIndex];
- x3 = (maxIndex+1)*binWidth+binWidth/2;
- y3 = lSmoothedHistogram[maxIndex+1>static_cast<int>(nbBins)-1 ? maxIndex+1-nbBins : maxIndex+1];
+ x3 = (maxIndex + 1) * binWidth + binWidth / 2;
+ y3 = lSmoothedHistogram[maxIndex + 1 > static_cast < int > (nbBins) - 1 ? maxIndex + 1 - nbBins : maxIndex + 1];
- denom = x1*x1*x2 + x2*x2*x3 + x3*x3*x1 - x1*x1*x3 - x2*x2*x1 - x3*x3*x2;
+ denom = x1 * x1 * x2 + x2 * x2 * x3 + x3 * x3 * x1 - x1 * x1 * x3 - x2 * x2 * x1 - x3 * x3 * x2;
num = y1 * x2 + y2 * x3 + y3 * x1 - y1 * x3 - y2 * x1 - y3 * x2;
if (denom == 0 || num == 0)
- {
+ {
// no main orientation, return an empty orientation vector
return orientations;
- }
+ }
- a = num/denom;
- b = ((y1-y2)-a*(x1*x1-x2*x2))/(x1-x2);
+ a = num / denom;
+ b = ((y1 - y2) - a * (x1 * x1 - x2 * x2)) / (x1 - x2);
- orientation = -b/(2*a);
- if (orientation<0)
- {
- orientation+=360;
- }
- else if (orientation>=360)
- {
- orientation-=360;
- }
+ orientation = -b / (2 * a);
+ if (orientation < 0)
+ {
+ orientation += 360;
+ }
+ else if (orientation >= 360)
+ {
+ orientation -= 360;
+ }
// orientations.push_back( static_cast<PixelType>(maxIndex*binWidth + binWidth/2));
orientations.push_back(static_cast<PixelType>(orientation));
@@ -727,146 +738,148 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
* Compute key point descriptor
*/
template <class TInputImage, class TOutputPointSet>
-std::vector< typename ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>::PixelType >
-ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
-::ComputeKeyPointDescriptor( const NeighborhoodIteratorType& currentScale,
- const unsigned int scale,
- const PixelType& orientation)
+std::vector<typename ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>::PixelType>
+ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>
+::ComputeKeyPointDescriptor(const NeighborhoodIteratorType& currentScale,
+ const unsigned int scale,
+ const PixelType& orientation)
{
std::vector<PixelType> lHistogram(128, 0.);
- typename InputImageType::RegionType region;
- typename InputImageType::RegionType::SizeType regionSize;
+ typename InputImageType::RegionType region;
+ typename InputImageType::RegionType::SizeType regionSize;
typename InputImageType::RegionType::IndexType regionIndex;
unsigned int nbHistograms = 4;
unsigned int nbPixelsPerHistogram = 4;
unsigned int nbBinsPerHistogram = 8;
- float radius = static_cast<float>(nbHistograms/2*nbPixelsPerHistogram);
+ float radius = static_cast<float>(nbHistograms / 2 * nbPixelsPerHistogram);
// std::cout<<"Radius: "<<radius<<std::endl;
-
// 4 region of 4 pixels plus 2 pixels of margin
- regionSize[0] = nbHistograms*nbPixelsPerHistogram+2;
- regionSize[1] = nbHistograms*nbPixelsPerHistogram+2;
+ regionSize[0] = nbHistograms * nbPixelsPerHistogram + 2;
+ regionSize[1] = nbHistograms * nbPixelsPerHistogram + 2;
// sigma set to one half the width of descriptor window
// TODO check this
double lSigma = radius;
// index - regionSize/2
- regionIndex[0]=currentScale.GetIndex()[0]-regionSize[0]/2;
- regionIndex[1]=currentScale.GetIndex()[1]-regionSize[1]/2;
+ regionIndex[0] = currentScale.GetIndex()[0] - regionSize[0] / 2;
+ regionIndex[1] = currentScale.GetIndex()[1] - regionSize[1] / 2;
region.SetIndex(regionIndex);
region.SetSize(regionSize);
// Crop with largest region
if (!region.Crop(m_OrientationList->GetNthElement(scale)->GetLargestPossibleRegion()))
- {
- itkExceptionMacro(<<"Region "<<region<<" is outside of the largest possible region!");
- }
- RegionIteratorType lIterMagnitude(m_MagnitudeList->GetNthElement(scale),region);
- RegionIteratorType lIterOrientation(m_OrientationList->GetNthElement(scale),region);
+ {
+ itkExceptionMacro(<< "Region " << region << " is outside of the largest possible region!");
+ }
+ RegionIteratorType lIterMagnitude(m_MagnitudeList->GetNthElement(scale), region);
+ RegionIteratorType lIterOrientation(m_OrientationList->GetNthElement(scale), region);
lIterMagnitude.GoToBegin();
lIterOrientation.GoToBegin();
// For each pixel in the region
while (!lIterMagnitude.IsAtEnd() && !lIterOrientation.IsAtEnd())
- {
+ {
// check if pixel is inside the circle of radius
- float dx = lIterMagnitude.GetIndex()[0]-currentScale.GetIndex()[0];
- float dy = lIterMagnitude.GetIndex()[1]-currentScale.GetIndex()[1];
- float dist = vcl_sqrt(dx*dx+dy*dy);
+ float dx = lIterMagnitude.GetIndex()[0] - currentScale.GetIndex()[0];
+ float dy = lIterMagnitude.GetIndex()[1] - currentScale.GetIndex()[1];
+ float dist = vcl_sqrt(dx * dx + dy * dy);
// If we are in the circle
- if (dist<radius)
- {
+ if (dist < radius)
+ {
// rotate the pixel location to compensate sift orientation
- float angle = orientation*CONST_PI_180;
+ float angle = orientation * CONST_PI_180;
float cosangle = vcl_cos(-angle);
float sinangle = vcl_sin(-angle);
float rdx = dx * cosangle - dy * sinangle;
float rdy = dx * sinangle + dy * cosangle;
// decide to which histogram the pixel contributes
- unsigned int xHistogramIndex = static_cast<unsigned int>(vcl_floor((rdx + radius)/static_cast<float>(nbPixelsPerHistogram)));
- unsigned int yHistogramIndex = static_cast<unsigned int>(vcl_floor((rdy + radius)/static_cast<float>(nbPixelsPerHistogram)));
+ unsigned int xHistogramIndex =
+ static_cast<unsigned int>(vcl_floor((rdx + radius) / static_cast<float>(nbPixelsPerHistogram)));
+ unsigned int yHistogramIndex =
+ static_cast<unsigned int>(vcl_floor((rdy + radius) / static_cast<float>(nbPixelsPerHistogram)));
// decide to which bin of the histogram the pixel contributes
- float compensatedOrientation = lIterOrientation.Get()-angle;
- if (compensatedOrientation<0)
- {
- compensatedOrientation+=CONST_2PI;
- }
- if (compensatedOrientation>=CONST_2PI)
- {
- compensatedOrientation-=CONST_2PI;
- }
- unsigned int histogramBin = static_cast<unsigned int>(vcl_floor(compensatedOrientation*nbBinsPerHistogram/(CONST_2PI)));
+ float compensatedOrientation = lIterOrientation.Get() - angle;
+ if (compensatedOrientation < 0)
+ {
+ compensatedOrientation += CONST_2PI;
+ }
+ if (compensatedOrientation >= CONST_2PI)
+ {
+ compensatedOrientation -= CONST_2PI;
+ }
+ unsigned int histogramBin =
+ static_cast<unsigned int>(vcl_floor(compensatedOrientation * nbBinsPerHistogram / (CONST_2PI)));
// Compute the wheight of the pixel in the histogram
- double lWeightMagnitude = vcl_exp(-(dist*dist)/(2*lSigma*lSigma));
+ double lWeightMagnitude = vcl_exp(-(dist * dist) / (2 * lSigma * lSigma));
// Compute the global descriptor index
unsigned int descriptorIndex = yHistogramIndex * nbBinsPerHistogram * nbHistograms
+ xHistogramIndex * nbBinsPerHistogram + histogramBin;
- lHistogram[descriptorIndex]+=lIterMagnitude.Get()*lWeightMagnitude;
- }
+ lHistogram[descriptorIndex] += lIterMagnitude.Get() * lWeightMagnitude;
+ }
++lIterOrientation;
++lIterMagnitude;
- }
+ }
// normalize histogram to unit lenght
typename std::vector<PixelType>::iterator lIterHisto = lHistogram.begin();
- float lNorm = 0.0;
+ float lNorm = 0.0;
while (lIterHisto != lHistogram.end())
- {
- lNorm = lNorm + (*lIterHisto)*(*lIterHisto);
+ {
+ lNorm = lNorm + (*lIterHisto) * (*lIterHisto);
++lIterHisto;
- }
+ }
lNorm = vcl_sqrt(lNorm);
lIterHisto = lHistogram.begin();
while (lIterHisto != lHistogram.end())
- {
- if (lNorm>0)
{
- *lIterHisto = (*lIterHisto)/lNorm;
- }
+ if (lNorm > 0)
+ {
+ *lIterHisto = (*lIterHisto) / lNorm;
+ }
else
- {
+ {
*lIterHisto = m_GradientMagnitudeThreshold;
- }
+ }
// threshold gradient magnitude
if (*lIterHisto > m_GradientMagnitudeThreshold)
- {
+ {
*lIterHisto = m_GradientMagnitudeThreshold;
- }
+ }
++lIterHisto;
- }
+ }
// renormalize histogram to unit length
lIterHisto = lHistogram.begin();
lNorm = 0.0;
while (lIterHisto != lHistogram.end())
- {
- lNorm = lNorm + (*lIterHisto)*(*lIterHisto);
+ {
+ lNorm = lNorm + (*lIterHisto) * (*lIterHisto);
++lIterHisto;
- }
+ }
lNorm = vcl_sqrt(lNorm);
lIterHisto = lHistogram.begin();
while (lIterHisto != lHistogram.end())
- {
- *lIterHisto = (*lIterHisto)/lNorm;
+ {
+ *lIterHisto = (*lIterHisto) / lNorm;
++lIterHisto;
- }
+ }
return lHistogram;
}
@@ -876,19 +889,19 @@ ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
*/
template <class TInputImage, class TOutputPointSet>
void
-ImageToSIFTKeyPointSetFilter<TInputImage,TOutputPointSet>
+ImageToSIFTKeyPointSetFilter<TInputImage, TOutputPointSet>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
typedef typename TOutputPointSet::PointsContainerConstIterator PointsIteratorType;
- typedef typename TOutputPointSet::PointDataContainerIterator PointsDataIteratorType;
- typedef itk::ProcessObject ProcessObjectType;
+ typedef typename TOutputPointSet::PointDataContainerIterator PointsDataIteratorType;
+ typedef itk::ProcessObject ProcessObjectType;
const OutputPointSetType* output = dynamic_cast<const OutputPointSetType*>(this->ProcessObjectType::GetOutput(0));
Superclass::PrintSelf(os, indent);
- os<<indent<<"Number of octaves: "<<m_OctavesNumber<<std::endl;
- os<<indent<<"Number of scales: "<<m_ScalesNumber<<std::endl;
+ os << indent << "Number of octaves: " << m_OctavesNumber << std::endl;
+ os << indent << "Number of scales: " << m_ScalesNumber << std::endl;
- os<<indent<<"Number of SIFT key points: " << output->GetNumberOfPoints() << std::endl;
+ os << indent << "Number of SIFT key points: " << output->GetNumberOfPoints() << std::endl;
}
} // End namespace otb
diff --git a/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.h b/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.h
index ad8f7e74a9..a144ca7eb7 100644
--- a/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.h
+++ b/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.h
@@ -56,66 +56,65 @@
namespace otb
{
-template <class TInputImage , class TOutputPointSet>
+template <class TInputImage, class TOutputPointSet>
class ITK_EXPORT ImageToSURFKeyPointSetFilter
- : public ImageToPointSetFilter<TInputImage, TOutputPointSet>
+ : public ImageToPointSetFilter<TInputImage, TOutputPointSet>
{
public:
/** Standard class typedefs. */
- typedef ImageToSURFKeyPointSetFilter Self;
- typedef ImageToPointSetFilter<TInputImage,TOutputPointSet> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageToSURFKeyPointSetFilter Self;
+ typedef ImageToPointSetFilter<TInputImage, TOutputPointSet> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(ImageToSURFKeyPointSetFilter,ImageToPointSetFilter);
-
+ itkTypeMacro(ImageToSURFKeyPointSetFilter, ImageToPointSetFilter);
/** Template parameters typedefs*/
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename InputImageType::IndexType PixelIndex;
- typedef typename InputImageType::IndexType IndexType;
- typedef typename InputImageType::PixelType PixelValue;
- typedef typename InputImageType::SpacingType SpacingType;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::PointType PointImageType;
-
- typedef TOutputPointSet OutputPointSetType;
- typedef typename TOutputPointSet::Pointer OutputPointSetPointerType;
- typedef typename TOutputPointSet::PixelType OutputPixelType;
- typedef typename TOutputPointSet::PointType OutputPointType;
- typedef typename TOutputPointSet::PointIdentifier OutputPointIdentifierType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::IndexType PixelIndex;
+ typedef typename InputImageType::IndexType IndexType;
+ typedef typename InputImageType::PixelType PixelValue;
+ typedef typename InputImageType::SpacingType SpacingType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::PointType PointImageType;
+
+ typedef TOutputPointSet OutputPointSetType;
+ typedef typename TOutputPointSet::Pointer OutputPointSetPointerType;
+ typedef typename TOutputPointSet::PixelType OutputPixelType;
+ typedef typename TOutputPointSet::PointType OutputPointType;
+ typedef typename TOutputPointSet::PointIdentifier OutputPointIdentifierType;
/** Set/Get the number of Octaves */
- itkSetMacro(OctavesNumber,int);
- itkGetMacro(OctavesNumber,int);
+ itkSetMacro(OctavesNumber, int);
+ itkGetMacro(OctavesNumber, int);
/** Set/Get the number of scales*/
- itkSetMacro(ScalesNumber,int);
- itkGetMacro(ScalesNumber,int);
+ itkSetMacro(ScalesNumber, int);
+ itkGetMacro(ScalesNumber, int);
/** Get the number of KeyPoints detected*/
- itkGetMacro(NumberOfPoints,int);
+ itkGetMacro(NumberOfPoints, int);
/** Internal filters typedefs */
- typedef itk::ConstNeighborhoodIterator<InputImageType> NeighborhoodIteratorType;
+ typedef itk::ConstNeighborhoodIterator<InputImageType> NeighborhoodIteratorType;
typedef typename NeighborhoodIteratorType::NeighborhoodType NeighborhoodType;
- typedef otb::ImageToHessianDeterminantImageFilter<InputImageType ,InputImageType > ImageToDetHessianImageType;
- typedef typename ImageToDetHessianImageType::Pointer DetHessianPointerFilter;
+ typedef otb::ImageToHessianDeterminantImageFilter<InputImageType, InputImageType> ImageToDetHessianImageType;
+ typedef typename ImageToDetHessianImageType::Pointer DetHessianPointerFilter;
/** Filter for resampling images for the multi-scale analysis */
- typedef itk::ResampleImageFilter<InputImageType,InputImageType> ResampleFilterType;
- typedef typename ResampleFilterType::Pointer ResampleFilterPointerType;
+ typedef itk::ResampleImageFilter<InputImageType, InputImageType> ResampleFilterType;
+ typedef typename ResampleFilterType::Pointer ResampleFilterPointerType;
/** ImageList to store the Hessian determinant image at each scale (sigma width)*/
- typedef otb::ImageList< InputImageType > ImageListType;
+ typedef otb::ImageList<InputImageType> ImageListType;
typedef typename ImageListType::Pointer ImageListTypePointer;
/** */
@@ -140,7 +139,6 @@ protected:
*/
virtual void GenerateData();
-
/** Check local extremum for 8 neighbors (current)
*
* \param currentScale
@@ -149,7 +147,6 @@ protected:
*/
virtual bool IsLocalExtremum(const NeighborhoodType& neigh);
-
/** Check local extremum for 8 neighbors (Previous or Scale)
*
* \param neigh
@@ -160,7 +157,6 @@ protected:
virtual bool IsLocalExtremumAround(const NeighborhoodType& neigh,
double CenterValue);
-
/** AssignOrientation
*
* \param currentScale neighborhood
@@ -185,12 +181,12 @@ protected:
/**
* Compute min a b c
*/
- virtual int GetMin( int a , int b , int c);
+ virtual int GetMin(int a, int b, int c);
private:
- ImageToSURFKeyPointSetFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageToSURFKeyPointSetFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Number of octaves */
int m_OctavesNumber;
@@ -222,5 +218,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.txx b/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.txx
index 8a8b6d1aa0..9bb755d6c3 100644
--- a/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.txx
+++ b/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.txx
@@ -28,8 +28,8 @@ namespace otb
/**---------------------------------------------------------
* Constructor
----------------------------------------------------------*/
-template < class TInputImage, class TOutputPointSet >
-ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet >
+template <class TInputImage, class TOutputPointSet>
+ImageToSURFKeyPointSetFilter<TInputImage, TOutputPointSet>
::ImageToSURFKeyPointSetFilter()
{
m_OctavesNumber = 1;
@@ -38,13 +38,12 @@ ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet >
m_DetHessianFilter = ImageToDetHessianImageType::New();
}
-
/*---------------------------------------------------------
* Destructor.c
----------------------------------------------------------*/
template <class TInputImage, class TOutputPointSet>
-ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
+ImageToSURFKeyPointSetFilter<TInputImage, TOutputPointSet>
::~ImageToSURFKeyPointSetFilter()
{}
@@ -53,30 +52,26 @@ ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
--------------------------------------------------------*/
template <class TInputImage, class TOutputPointSet>
void
-ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
+ImageToSURFKeyPointSetFilter<TInputImage, TOutputPointSet>
::GenerateData(void)
{
-
- double k;
- double sigma_in = 2.;
+ double k;
+ double sigma_in = 2.;
SizeType radius;
/*Output*/
- OutputPointSetPointerType outputPointSet = this->GetOutput();
+ OutputPointSetPointerType outputPointSet = this->GetOutput();
/** Computing the multiplicative factor for scales iteration
* scalar used for the wifth of the gaussian
*/
- if (m_ScalesNumber > 1 )
- k = (double)std::pow(2.0,(double)(1/(double)(m_ScalesNumber-1)));
- else
- k = 3;
-
+ if (m_ScalesNumber > 1) k = (double) std::pow(2.0, (double) (1 / (double) (m_ScalesNumber - 1)));
+ else k = 3;
/* Computation loop over octaves*/
- for (int i = 0; i < m_OctavesNumber; i++ )
- {
+ for (int i = 0; i < m_OctavesNumber; i++)
+ {
sigma_in = 2.;
m_ImageList = ImageListType::New();
@@ -84,41 +79,40 @@ ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
/*--------------------------------------------------------
Octave per octave
--------------------------------------------------------*/
- if (i>0)
- {
+ if (i > 0)
+ {
m_ResampleFilter = ResampleFilterType::New();
- m_ResampleFilter ->SetInput(this->GetInput());
+ m_ResampleFilter->SetInput(this->GetInput());
SizeType size = this->GetInput()->GetLargestPossibleRegion().GetSize();
for (int k = 0; k < 2; ++k)
- size[k] = (unsigned int) floor(size[k]/std::pow(2.0,i) );
- m_ResampleFilter->SetSize( size );
+ size[k] = (unsigned int) floor(size[k] / std::pow(2.0, i));
+ m_ResampleFilter->SetSize(size);
SpacingType spacing = this->GetInput()->GetSpacing();
for (int k = 0; k < 2; ++k)
- spacing[k] = (spacing[k] * std::pow(2.0,i));
- m_ResampleFilter->SetOutputSpacing( spacing );
+ spacing[k] = (spacing[k] * std::pow(2.0, i));
+ m_ResampleFilter->SetOutputSpacing(spacing);
- m_ResampleFilter->SetDefaultPixelValue( 0 );
+ m_ResampleFilter->SetDefaultPixelValue(0);
m_ResampleFilter->Update();
m_determinantImage = m_ResampleFilter->GetOutput();
- otbGenericMsgDebugMacro( <<"ImageToSURFKeyPointSetFilter:: Size of the image at the octave : " \
- << i << " is " \
- <<m_determinantImage->GetLargestPossibleRegion().GetSize() );
+ otbGenericMsgDebugMacro(<< "ImageToSURFKeyPointSetFilter:: Size of the image at the octave : " \
+ << i << " is " \
+ << m_determinantImage->GetLargestPossibleRegion().GetSize());
- }
+ }
- for (int j = 0; j < m_ScalesNumber; j++ )
- {
+ for (int j = 0; j < m_ScalesNumber; j++)
+ {
/** Incrementation of the gaussian width
* the width of the gaussian have to be doubled for
* each iteration over octaves
*/
- if ((i != 0 && j !=0 ) || (i == 0 && (i+j !=0) ) || ( m_ScalesNumber == 1 && i!=0 ))
- sigma_in *= k;
+ if ((i != 0 && j != 0) || (i == 0 && (i + j != 0)) || (m_ScalesNumber == 1 && i != 0)) sigma_in *= k;
/**
* For each octave, we serach for the key points
@@ -127,55 +121,53 @@ ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
/** Hessian Determinant Image */
m_DetHessianFilter = ImageToDetHessianImageType::New();
- if ( i == 0 )m_DetHessianFilter->SetInput(this->GetInput());
- else m_DetHessianFilter->SetInput(m_determinantImage );
+ if (i == 0) m_DetHessianFilter->SetInput(this->GetInput());
+ else m_DetHessianFilter->SetInput(m_determinantImage);
m_DetHessianFilter->SetSigma(sigma_in);
m_DetHessianFilter->Update();
m_determinantImage = m_DetHessianFilter->GetOutput();
- if (i+j==0)
- {
- otbGenericMsgDebugMacro( <<"ImageToSURFKeyPointSetFilter:: Size of the image at the octave : "
- << i << " is "
- <<m_determinantImage->GetLargestPossibleRegion().GetSize() );
- }
+ if (i + j == 0)
+ {
+ otbGenericMsgDebugMacro(<< "ImageToSURFKeyPointSetFilter:: Size of the image at the octave : "
+ << i << " is "
+ << m_determinantImage->GetLargestPossibleRegion().GetSize());
+ }
/** For each octave, we fill the imageList for the extremum search*/
m_ImageList->PushBack(m_determinantImage);
- }
+ }
/*----------------------------------------------------*/
/* extremum Search over octave's scales */
/*----------------------------------------------------*/
- for (int jj = 1; jj < (int)(m_ImageList->Size() - 1 ); jj++)
- {
+ for (int jj = 1; jj < (int) (m_ImageList->Size() - 1); jj++)
+ {
m_ImageCurrent = m_ImageList->GetNthElement(jj);
- m_ImageMovedPrev = m_ImageList->GetNthElement(jj-1);
- m_ImageMovedNext = m_ImageList->GetNthElement(jj+1);
-
+ m_ImageMovedPrev = m_ImageList->GetNthElement(jj - 1);
+ m_ImageMovedNext = m_ImageList->GetNthElement(jj + 1);
/** NeighboorhoodIterator parameters*/
radius.Fill(1);
- NeighborhoodIteratorType it(radius, m_ImageCurrent,m_ImageCurrent->GetLargestPossibleRegion());
+ NeighborhoodIteratorType it(radius, m_ImageCurrent, m_ImageCurrent->GetLargestPossibleRegion());
it.GoToBegin();
-
/* NeighboorhoodIterator Adjacents parameters*/
- NeighborhoodIteratorType itNeighPrev(radius, m_ImageMovedPrev,m_ImageMovedPrev->GetLargestPossibleRegion());
+ NeighborhoodIteratorType itNeighPrev(radius, m_ImageMovedPrev, m_ImageMovedPrev->GetLargestPossibleRegion());
itNeighPrev.GoToBegin();
- NeighborhoodIteratorType itNeighNext(radius, m_ImageMovedNext,m_ImageMovedNext->GetLargestPossibleRegion());
+ NeighborhoodIteratorType itNeighNext(radius, m_ImageMovedNext, m_ImageMovedNext->GetLargestPossibleRegion());
itNeighNext.GoToBegin();
while (!it.IsAtEnd())
- {
+ {
if (IsLocalExtremum(it.GetNeighborhood())
- && IsLocalExtremumAround(itNeighPrev.GetNeighborhood(),m_ImageCurrent->GetPixel(it.GetIndex()))
- && IsLocalExtremumAround(itNeighNext.GetNeighborhood(),m_ImageCurrent->GetPixel(it.GetIndex())) )
- {
+ && IsLocalExtremumAround(itNeighPrev.GetNeighborhood(), m_ImageCurrent->GetPixel(it.GetIndex()))
+ && IsLocalExtremumAround(itNeighNext.GetNeighborhood(), m_ImageCurrent->GetPixel(it.GetIndex())))
+ {
OutputPointType keyPoint;
itNeighPrev.SetLocation(it.GetIndex());
itNeighNext.SetLocation(it.GetIndex());
@@ -184,45 +176,42 @@ ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
keyPoint[1] = it.GetIndex()[1];
//keyPoint[2] = sigma_in/pow(k,(double)jj)*pow(2.,(double)i);
- double sigmaDetected = sigma_in/pow(k,(double)jj)*pow(2.,(double)i);
-
- radius.Fill(GetMin((int)(this->GetInput()->GetLargestPossibleRegion().GetSize()[0] - keyPoint[0]),
- (int)(this->GetInput()->GetLargestPossibleRegion().GetSize()[1] - keyPoint[1]),
- (int)(6*sigmaDetected) ) ); // changer le sigma detected par keypoint[2]
+ double sigmaDetected = sigma_in / pow(k, (double) jj) * pow(2., (double) i);
+ radius.Fill(GetMin((int) (this->GetInput()->GetLargestPossibleRegion().GetSize()[0] - keyPoint[0]),
+ (int) (this->GetInput()->GetLargestPossibleRegion().GetSize()[1] - keyPoint[1]),
+ (int) (6 * sigmaDetected))); // changer le sigma detected par keypoint[2]
/*
Computing the orientation of the key point detected
*/
- NeighborhoodIteratorType itNeighOrientation(radius,this->GetInput() ,
- this->GetInput()->GetLargestPossibleRegion());
+ NeighborhoodIteratorType itNeighOrientation(radius, this->GetInput(),
+ this->GetInput()->GetLargestPossibleRegion());
itNeighOrientation.SetLocation(it.GetIndex());
/** TO DO*/
//keyPoint[3] = AssignOrientation( itNeighOrientation.GetNeighborhood() ,keyPoint[2] );
- double orientationDetected = AssignOrientation( itNeighOrientation.GetNeighborhood() , sigmaDetected );
+ double orientationDetected = AssignOrientation(itNeighOrientation.GetNeighborhood(), sigmaDetected);
/*Filling the Point pointSet Part*/
outputPointSet->SetPoint(m_NumberOfPoints, keyPoint);
-
/*----------------------------------------*/
/* Descriptor Computation */
/*----------------------------------------*/
- radius.Fill(GetMin((int)(this->GetInput()->GetLargestPossibleRegion().GetSize()[0] - keyPoint[0]),
- (int)(this->GetInput()->GetLargestPossibleRegion().GetSize()[1] - keyPoint[1]),
- (int)(10*sigmaDetected))); // TODO a changer sigmaDetected par Keypoint[2]
+ radius.Fill(GetMin((int) (this->GetInput()->GetLargestPossibleRegion().GetSize()[0] - keyPoint[0]),
+ (int) (this->GetInput()->GetLargestPossibleRegion().GetSize()[1] - keyPoint[1]),
+ (int) (10 * sigmaDetected))); // TODO a changer sigmaDetected par Keypoint[2]
- NeighborhoodIteratorType itNeighDescriptor(radius,this->GetInput(),
- this->GetInput()->GetLargestPossibleRegion());
+ NeighborhoodIteratorType itNeighDescriptor(radius, this->GetInput(),
+ this->GetInput()->GetLargestPossibleRegion());
itNeighDescriptor.SetLocation(it.GetIndex());
VectorType descriptor;
descriptor.resize(64);
//descriptor = ComputeDescriptor(itNeighDescriptor.GetNeighborhood(),keyPoint[3],keyPoint[2]);
- descriptor = ComputeDescriptor(itNeighDescriptor.GetNeighborhood(),orientationDetected,sigmaDetected);
-
+ descriptor = ComputeDescriptor(itNeighDescriptor.GetNeighborhood(), orientationDetected, sigmaDetected);
/*Updating the pointset data with values of the descriptor*/
OutputPixelType data;
@@ -230,42 +219,42 @@ ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
unsigned int IndDescriptor = 0;
- typename std::vector<double>::const_iterator itDescriptor =
+ typename std::vector<double>::const_iterator itDescriptor =
descriptor.begin();
while (itDescriptor != descriptor.end())
- {
+ {
data.SetElement(IndDescriptor, *itDescriptor);
IndDescriptor++;
itDescriptor++;
- }
+ }
outputPointSet->SetPointData(m_NumberOfPoints, data);
m_NumberOfPoints++;
- }
+ }
++it;
++itNeighPrev;
++itNeighNext;
- }/*End while for extremum search*/
+ } /*End while for extremum search*/
- } /*End Iteration over scales */
+ } /*End Iteration over scales */
m_ImageList->Clear();
- } /* End Key Points search*/
+ } /* End Key Points search*/
- otbGenericMsgDebugMacro( <<"ImageToSURFKeyPointSetFilter:: Total Number of Key points "\
- << m_NumberOfPoints );
+ otbGenericMsgDebugMacro(<< "ImageToSURFKeyPointSetFilter:: Total Number of Key points " \
+ << m_NumberOfPoints);
-}/** End of GenerateData()*/
+} /** End of GenerateData()*/
template <class TInputImage, class TOutputPointSet>
int
-ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
-::GetMin( int a , int b , int c)
+ImageToSURFKeyPointSetFilter<TInputImage, TOutputPointSet>
+::GetMin(int a, int b, int c)
{
- return std::min(a,std::min(b,c));
+ return std::min(a, std::min(b, c));
}
/*-----------------------------------------------------------
@@ -273,34 +262,34 @@ ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
-----------------------------------------------------------*/
template <class TInputImage, class TOutputPointSet>
bool
-ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
+ImageToSURFKeyPointSetFilter<TInputImage, TOutputPointSet>
::IsLocalExtremum(const NeighborhoodType& neigh)
{
- int centerIndex = neigh.GetCenterNeighborhoodIndex(), i = 0;
+ int centerIndex = neigh.GetCenterNeighborhoodIndex(), i = 0;
double centerValue = neigh[centerIndex];
- bool max = false, min = false;
- int flag_min = 0, flag_max = 0;
+ bool max = false, min = false;
+ int flag_min = 0, flag_max = 0;
- while (i!=(int)neigh.Size())
- {
- if (i != centerIndex )
+ while (i != (int) neigh.Size())
{
- if ( centerValue> neigh[i] && flag_max == 0) max = true;
- else
+ if (i != centerIndex)
{
+ if (centerValue > neigh[i] && flag_max == 0) max = true;
+ else
+ {
max = false;
flag_max = 1;
- }
+ }
- if (centerValue < neigh[i] && flag_min == 0 && centerValue <0) min = true;
+ if (centerValue < neigh[i] && flag_min == 0 && centerValue < 0) min = true;
else
- {
+ {
min = false;
flag_min = 1;
+ }
}
- }
++i;
- }
+ }
return max || min;
}
@@ -310,33 +299,33 @@ ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
-----------------------------------------------------------*/
template <class TInputImage, class TOutputPointSet>
bool
-ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
-::IsLocalExtremumAround(const NeighborhoodType& neigh , double CenterValue)
+ImageToSURFKeyPointSetFilter<TInputImage, TOutputPointSet>
+::IsLocalExtremumAround(const NeighborhoodType& neigh, double CenterValue)
{
- int i = 0;
+ int i = 0;
bool max = false, min = false;
- int flag_min = 0, flag_max = 0;
+ int flag_min = 0, flag_max = 0;
- while (i!=(int)neigh.Size())
- {
+ while (i != (int) neigh.Size())
+ {
- if ( CenterValue> neigh[i] && flag_max == 0) max = true;
+ if (CenterValue > neigh[i] && flag_max == 0) max = true;
else
- {
+ {
max = false;
flag_max = 1;
- }
+ }
- if (CenterValue < neigh[i] && flag_min == 0) min = true;
+ if (CenterValue < neigh[i] && flag_min == 0) min = true;
else
- {
+ {
min = false;
flag_min = 1;
- }
+ }
++i;
- }
+ }
return max || min;
}
@@ -347,82 +336,81 @@ ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
template <class TInputImage, class TOutputPointSet>
double
-ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
-::AssignOrientation(const NeighborhoodType& neigh , double S)
+ImageToSURFKeyPointSetFilter<TInputImage, TOutputPointSet>
+::AssignOrientation(const NeighborhoodType& neigh, double S)
{
- int i= 0;
- int pas =( (i+S)-(int)(i+S) > 0.5 )?((int)S+1):(int)S;
- int Largeur = 2*neigh.GetRadius()[0]+1; // Width & length of a neighborhood
- int rayon = neigh.GetRadius()[0]; // radius of the neigh
- int col, raw;
+ int i = 0;
+ int pas = ((i + S) - (int) (i + S) > 0.5) ? ((int) S + 1) : (int) S;
+ int Largeur = 2 * neigh.GetRadius()[0] + 1; // Width & length of a neighborhood
+ int rayon = neigh.GetRadius()[0]; // radius of the neigh
+ int col, raw;
double dist;
- double w; // weight of the circular gaussian
+ double w; // weight of the circular gaussian
OutputPointType pt;
// Gradient orientation histogram
double angle;
- int bin = 0;
- int Pi = 180;
- int LengthBin = 60;
- int NbBins = (2*Pi/LengthBin);
- std::vector<double> tab(NbBins*2 , 0.);
-
- while (i < (int)neigh.Size())
- {
- col = i%Largeur - rayon;
- raw = i/Largeur - rayon;
- dist = vcl_sqrt(static_cast<double>(col *col + raw * raw) );
- col +=rayon;
- raw +=rayon; // Backup to the image coordinate axes
-
- if (dist < 6*S)
+ int bin = 0;
+ int Pi = 180;
+ int LengthBin = 60;
+ int NbBins = (2 * Pi / LengthBin);
+ std::vector<double> tab(NbBins*2, 0.);
+
+ while (i < (int) neigh.Size())
{
- // Haar Wavelets responses accumulated in an histogram with Pi/3 precison
- if (( col > pas && col < Largeur - pas ) && ( raw > pas && raw < Largeur - pas) )
+ col = i % Largeur - rayon;
+ raw = i / Largeur - rayon;
+ dist = vcl_sqrt(static_cast<double>(col * col + raw * raw));
+ col += rayon;
+ raw += rayon; // Backup to the image coordinate axes
+
+ if (dist < 6 * S)
{
+ // Haar Wavelets responses accumulated in an histogram with Pi/3 precison
+ if ((col > pas && col < Largeur - pas) && (raw > pas && raw < Largeur - pas))
+ {
- w = vcl_exp(-((col-rayon)*(col-rayon) + (raw-rayon)*(raw-rayon))/(2*2.5*2.5*S*S) );
- pt[0] = (neigh[(col+pas) + raw * Largeur] - neigh[(col-pas) + raw *Largeur ]) * w;
- pt[1] = (neigh[col + (raw+pas)* Largeur ] - neigh[col + (raw-pas)*Largeur]) * w;
+ w = vcl_exp(-((col - rayon) * (col - rayon) + (raw - rayon) * (raw - rayon)) / (2 * 2.5 * 2.5 * S * S));
+ pt[0] = (neigh[(col + pas) + raw * Largeur] - neigh[(col - pas) + raw * Largeur]) * w;
+ pt[1] = (neigh[col + (raw + pas) * Largeur] - neigh[col + (raw - pas) * Largeur]) * w;
if (pt[0] + pt[1] != 0)
- {
- angle = atan( pt[0]/pt[1] )*( Pi/M_PI);
- if (angle < 0 )
- angle += 2*Pi;
+ {
+ angle = atan(pt[0] / pt[1]) * (Pi / M_PI);
+ if (angle < 0) angle += 2 * Pi;
- bin = (int)(angle/LengthBin);
+ bin = (int) (angle / LengthBin);
- if ( bin <= NbBins-1 || bin >= 0 )
- {
- tab[2*bin] += pt[0];
- tab[2*bin+1] += pt[1];
+ if (bin <= NbBins - 1 || bin >= 0)
+ {
+ tab[2 * bin] += pt[0];
+ tab[2 * bin + 1] += pt[1];
+ }
}
}
}
+ i += pas;
}
- i+= pas;
- }
//Find Orientation
- double indice = 0;
- double max = 0;
- double length = 0;
+ double indice = 0;
+ double max = 0;
+ double length = 0;
//Detection de l'orientation du point courant
- for (int i = 0; i < NbBins*2; i = i+2)
- {
- length = vcl_sqrt( tab[i]*tab[i] + tab[i+1]*tab[i+1] );
- if ( length > max)
+ for (int i = 0; i < NbBins * 2; i = i + 2)
{
+ length = vcl_sqrt(tab[i] * tab[i] + tab[i + 1] * tab[i + 1]);
+ if (length > max)
+ {
max = length;
- indice = i/2;
+ indice = i / 2;
+ }
}
- }
- return (indice+0.5)*LengthBin;
+ return (indice + 0.5) * LengthBin;
}
/*-----------------------------------------------------------
@@ -430,32 +418,31 @@ ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
-----------------------------------------------------------*/
template <class TInputImage, class TOutputPointSet>
-typename ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
+typename ImageToSURFKeyPointSetFilter<TInputImage, TOutputPointSet>
::VectorType
-ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
-::ComputeDescriptor(const NeighborhoodType& neigh , double O , double S )
+ImageToSURFKeyPointSetFilter<TInputImage, TOutputPointSet>
+::ComputeDescriptor(const NeighborhoodType& neigh, double O, double S)
{
typedef itk::CenteredRigid2DTransform<double> TransformType;
TransformType::Pointer eulerTransform = TransformType::New();
TransformType::ParametersType ParamVec(5);
- PointImageType pSrc , pDst;
- double angle = O * M_PI / 180;
-
+ PointImageType pSrc, pDst;
+ double angle = O * M_PI / 180;
- int i = 0, col, raw , Nbin, pas = 1;
+ int i = 0, col, raw, Nbin, pas = 1;
double xx = 0, yy = 0;
- double dx, dy , w;
- int Largeur = 2*neigh.GetRadius()[0]+1;
- double rayon = static_cast<double>(Largeur)/4.;
+ double dx, dy, w;
+ int Largeur = 2 * neigh.GetRadius()[0] + 1;
+ double rayon = static_cast<double>(Largeur) / 4.;
double r = neigh.GetRadius()[0];
double dist = 0;
- double x0 = neigh.GetCenterNeighborhoodIndex()% Largeur;
- double y0 = neigh.GetCenterNeighborhoodIndex()/ Largeur;
+ double x0 = neigh.GetCenterNeighborhoodIndex() % Largeur;
+ double y0 = neigh.GetCenterNeighborhoodIndex() / Largeur;
//std::cout << " x0 " << x0 << " y0 " << y0 << angle << std::endl;
- VectorType descriptorVector;
+ VectorType descriptorVector;
descriptorVector.resize(64);
/** Parameters of the transformation*/
@@ -466,19 +453,19 @@ ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
ParamVec[4] = 0;
eulerTransform->SetParameters(ParamVec);
- while (i < (int)neigh.Size())
- {
+ while (i < (int) neigh.Size())
+ {
col = i % Largeur;
raw = i / Largeur;
- if (( col > pas && col < Largeur - pas ) && ( raw > pas && raw < Largeur - pas) )
- {
- double distanceX = (raw-r);
- double distanceY = (col-r);
- dist = vcl_sqrt(distanceX*distanceX + distanceY*distanceY);
-
- if (dist <= r )
+ if ((col > pas && col < Largeur - pas) && (raw > pas && raw < Largeur - pas))
{
+ double distanceX = (raw - r);
+ double distanceY = (col - r);
+ dist = vcl_sqrt(distanceX * distanceX + distanceY * distanceY);
+
+ if (dist <= r)
+ {
/* Transform point to compensate the rotation the orientation */
pDst[0] = col;
pDst[1] = raw;
@@ -488,38 +475,38 @@ ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
col = static_cast<int>(vcl_floor(pSrc[0]));
raw = static_cast<int>(vcl_floor(pSrc[1]));
- if (raw==0) raw =+1;
- if (col ==0) col +=1;
+ if (raw == 0) raw = +1;
+ if (col == 0) col += 1;
- xx = static_cast<int> (pSrc[1]/rayon);
- yy = static_cast<int> (pSrc[0]/rayon);
- Nbin = static_cast<int> (xx + 4*yy);
+ xx = static_cast<int> (pSrc[1] / rayon);
+ yy = static_cast<int> (pSrc[0] / rayon);
+ Nbin = static_cast<int> (xx + 4 * yy);
- if ( Nbin < 16) //because 64 descriptor length
- {
- double distanceXcompensee_2 = (pSrc[0] - r)*(pSrc[0] - r);
- double distanceYcompensee_2 = (pSrc[1] - r)*(pSrc[1] - r);
+ if (Nbin < 16) //because 64 descriptor length
+ {
+ double distanceXcompensee_2 = (pSrc[0] - r) * (pSrc[0] - r);
+ double distanceYcompensee_2 = (pSrc[1] - r) * (pSrc[1] - r);
- w = vcl_exp(-( distanceXcompensee_2 + distanceYcompensee_2 ) / (2*3.3*3.3*S*S) );
+ w = vcl_exp(-(distanceXcompensee_2 + distanceYcompensee_2) / (2 * 3.3 * 3.3 * S * S));
- dx = 0.5 * (neigh[(col+pas) + raw * Largeur] - neigh[(col-pas) + raw *Largeur]) * w;
- dy = 0.5 * (neigh[col + (raw+ pas)* Largeur] - neigh[col + (raw-pas)*Largeur]) * w;
+ dx = 0.5 * (neigh[(col + pas) + raw * Largeur] - neigh[(col - pas) + raw * Largeur]) * w;
+ dy = 0.5 * (neigh[col + (raw + pas) * Largeur] - neigh[col + (raw - pas) * Largeur]) * w;
- descriptorVector[4*Nbin ] += dx;
- descriptorVector[4*Nbin+1] += dy;
- descriptorVector[4*Nbin+2] += vcl_abs(dx);
- descriptorVector[4*Nbin+3] += vcl_abs(dy);
+ descriptorVector[4 * Nbin] += dx;
+ descriptorVector[4 * Nbin + 1] += dy;
+ descriptorVector[4 * Nbin + 2] += vcl_abs(dx);
+ descriptorVector[4 * Nbin + 3] += vcl_abs(dy);
+ }
}
}
- }
i++;
- }
+ }
double accu = 0;
- for (int i = 0; i < 64; i++)
- accu += descriptorVector[i]*descriptorVector[i];
+ for (int i = 0; i < 64; i++)
+ accu += descriptorVector[i] * descriptorVector[i];
- for (int j = 0; j < 64; j++)
+ for (int j = 0; j < 64; j++)
descriptorVector[j] /= vcl_sqrt(accu);
return descriptorVector;
@@ -529,9 +516,9 @@ ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
/*----------------------------------------------------------------
PrintSelf
-----------------------------------------------------------------*/
-template <class TInputImage, class TOutputPointSet >
+template <class TInputImage, class TOutputPointSet>
void
-ImageToSURFKeyPointSetFilter< TInputImage, TOutputPointSet>
+ImageToSURFKeyPointSetFilter<TInputImage, TOutputPointSet>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/FeatureExtraction/otbInformationMeasureOfCorrelation1TextureFunctor.h b/Code/FeatureExtraction/otbInformationMeasureOfCorrelation1TextureFunctor.h
index 7539b1fb8d..94e716df54 100644
--- a/Code/FeatureExtraction/otbInformationMeasureOfCorrelation1TextureFunctor.h
+++ b/Code/FeatureExtraction/otbInformationMeasureOfCorrelation1TextureFunctor.h
@@ -43,21 +43,21 @@ namespace Functor
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT InformationMeasureOfCorrelation1TextureFunctor :
-public EntropyTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType>
+ public EntropyTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
InformationMeasureOfCorrelation1TextureFunctor(){};
- virtual ~InformationMeasureOfCorrelation1TextureFunctor(){};
+ virtual ~InformationMeasureOfCorrelation1TextureFunctor(){}
typedef EntropyTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
typedef typename Superclass::NeighborhoodType NeighborhoodType;
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
double HXY = Superclass::ComputeOverSingleChannel(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
double out = 0.;
// Stores marginal proba values
std::vector<double> PxVector;
@@ -65,66 +65,56 @@ public:
// Computes HX
double HX = 0.;
- for (unsigned r = 0; r<this->GetHisto()[0].size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto()[0].size(); ++r)
{
- double sumTemp = 0.;
- for (unsigned s = 0; s<this->GetHisto().size(); ++s)
- {
- sumTemp += this->GetHisto()[s][r]*areaInv;
- }
- PxVector.push_back( sumTemp );
- if(sumTemp != 0. )
- HX += sumTemp * vcl_log( sumTemp );
+ double sumTemp = 0.;
+ for (unsigned s = 0; s < this->GetHisto().size(); ++s)
+ {
+ sumTemp += this->GetHisto()[s][r] * areaInv;
+ }
+ PxVector.push_back(sumTemp);
+ if (sumTemp != 0.) HX += sumTemp * vcl_log(sumTemp);
}
- if ( HX != 0. )
- HX = -HX;
-
+ if (HX != 0.) HX = -HX;
// Computes HY
double HY = 0.;
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
{
- double sumTemp = 0.;
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- sumTemp += this->GetHisto()[r][s]*areaInv;
- }
- PyVector.push_back( sumTemp );
- if(sumTemp != 0. )
- HY += sumTemp * vcl_log( sumTemp );
+ double sumTemp = 0.;
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
+ {
+ sumTemp += this->GetHisto()[r][s] * areaInv;
+ }
+ PyVector.push_back(sumTemp);
+ if (sumTemp != 0.) HY += sumTemp * vcl_log(sumTemp);
}
- if ( HY != 0. )
- HY = -HY;
-
+ if (HY != 0.) HY = -HY;
// Computes HXY1
double HXY1 = 0.;
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
{
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
+ {
+ if (PyVector[r] * PxVector[s] != 0.)
{
- if( PyVector[r]*PxVector[s] != 0. )
- {
- double p = this->GetHisto()[r][s]*areaInv;
- HXY1 += p * vcl_log( PyVector[r]*PxVector[s] );
- }
-
+ double p = this->GetHisto()[r][s] * areaInv;
+ HXY1 += p * vcl_log(PyVector[r] * PxVector[s]);
}
+
+ }
}
- if ( HXY1 != 0. )
- HXY1 = -HXY1;
+ if (HXY1 != 0.) HXY1 = -HXY1;
- if( std::max(HX, HY) != 0.)
- out = (HXY-HXY1) / std::max(HX, HY);
+ if (std::max(HX, HY) != 0.) out = (HXY - HXY1) / std::max(HX, HY);
return out;
}
};
-
} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbInformationMeasureOfCorrelation2TextureFunctor.h b/Code/FeatureExtraction/otbInformationMeasureOfCorrelation2TextureFunctor.h
index c6caf67279..57b4c28a9a 100644
--- a/Code/FeatureExtraction/otbInformationMeasureOfCorrelation2TextureFunctor.h
+++ b/Code/FeatureExtraction/otbInformationMeasureOfCorrelation2TextureFunctor.h
@@ -43,75 +43,72 @@ namespace Functor
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT InformationMeasureOfCorrelation2TextureFunctor :
-public EntropyTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType>
+ public EntropyTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
InformationMeasureOfCorrelation2TextureFunctor(){};
- virtual ~InformationMeasureOfCorrelation2TextureFunctor(){};
+ virtual ~InformationMeasureOfCorrelation2TextureFunctor(){}
typedef EntropyTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
typedef typename Superclass::NeighborhoodType NeighborhoodType;
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
double HXY = Superclass::ComputeOverSingleChannel(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
double out = 0.;
// Stores marginal proba values
std::vector<double> PxVector;
std::vector<double> PyVector;
// Computes HX
- for (unsigned r = 0; r<this->GetHisto()[0].size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto()[0].size(); ++r)
{
- double sumTemp = 0.;
- for (unsigned s = 0; s<this->GetHisto().size(); ++s)
- {
- sumTemp += this->GetHisto()[s][r]*areaInv;
- }
- PxVector.push_back( sumTemp );
+ double sumTemp = 0.;
+ for (unsigned s = 0; s < this->GetHisto().size(); ++s)
+ {
+ sumTemp += this->GetHisto()[s][r] * areaInv;
+ }
+ PxVector.push_back(sumTemp);
}
// Computes HY
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
{
- double sumTemp = 0.;
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- sumTemp += this->GetHisto()[r][s]*areaInv;
- }
- PyVector.push_back( sumTemp );
+ double sumTemp = 0.;
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
+ {
+ sumTemp += this->GetHisto()[r][s] * areaInv;
+ }
+ PyVector.push_back(sumTemp);
}
// Computes HXY2
double HXY2 = 0.;
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
{
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
+ {
+ double PxPy = PyVector[r] * PxVector[s];
+ if (PxPy != 0.)
{
- double PxPy = PyVector[r]*PxVector[s];
- if( PxPy != 0. )
- {
- HXY2 += PxPy * vcl_log( PxPy );
- }
-
+ HXY2 += PxPy * vcl_log(PxPy);
}
+
+ }
}
- if ( HXY2 != 0. )
- HXY2 = -HXY2;
+ if (HXY2 != 0.) HXY2 = -HXY2;
- out = vcl_sqrt( vcl_abs(1-vcl_exp( -2.*(HXY2-HXY))) );
+ out = vcl_sqrt(vcl_abs(1 - vcl_exp(-2. * (HXY2 - HXY))));
return out;
}
};
-
} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbInverseDifferenceMomentTextureFunctor.h b/Code/FeatureExtraction/otbInverseDifferenceMomentTextureFunctor.h
index 06cc344f95..f7abb14a8a 100644
--- a/Code/FeatureExtraction/otbInverseDifferenceMomentTextureFunctor.h
+++ b/Code/FeatureExtraction/otbInverseDifferenceMomentTextureFunctor.h
@@ -40,39 +40,40 @@ namespace Functor
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT InverseDifferenceMomentTextureFunctor :
-public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
+ public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
InverseDifferenceMomentTextureFunctor(){};
- virtual ~InverseDifferenceMomentTextureFunctor(){};
+ virtual ~InverseDifferenceMomentTextureFunctor(){}
typedef TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
typedef typename Superclass::NeighborhoodType NeighborhoodType;
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
this->ComputeJointHistogram(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
double out = 0.;
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
+ {
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
{
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- double p = static_cast<double>(this->GetHisto()[r][s]) * areaInv;
- double dist = vcl_pow( ( (static_cast<double>(r)+0.5)*this->GetOffsetBinLength())-((static_cast<double>(s)+0.5)*this->GetNeighBinLength()), 2);
+ double p = static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ double dist =
+ vcl_pow(((static_cast<double>(r) +
+ 0.5) * this->GetOffsetBinLength()) - ((static_cast<double>(s) + 0.5) * this->GetNeighBinLength()),
+ 2);
- out += ((1/(1+dist)) * p);
- }
+ out += ((1 / (1 + dist)) * p);
}
- return out;
+ }
+ return out;
}
};
-
- } // namespace Functor
+} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h b/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h
index df14d351e3..5dc11f928b 100644
--- a/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h
+++ b/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h
@@ -43,18 +43,18 @@ namespace otb
* \sa PointSet
* \sa EuclideanDistance
*/
-template < class TPointSet, class TDistance = itk::Statistics::EuclideanDistance< typename TPointSet::PixelType > >
+template <class TPointSet, class TDistance = itk::Statistics::EuclideanDistance<typename TPointSet::PixelType> >
class ITK_EXPORT KeyPointSetsMatchingFilter
- : public ObjectListSource< ObjectList< Landmark< typename TPointSet::PointType, typename TPointSet::PixelType,double> > >
+ : public ObjectListSource<ObjectList<Landmark<typename TPointSet::PointType, typename TPointSet::PixelType, double> > >
{
public:
/// standard class typedefs
- typedef KeyPointSetsMatchingFilter Self;
- typedef ObjectListSource< ObjectList<
- Landmark< typename TPointSet::PointType,
- typename TPointSet::PixelType,double> > > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef KeyPointSetsMatchingFilter Self;
+ typedef ObjectListSource<ObjectList<
+ Landmark<typename TPointSet::PointType,
+ typename TPointSet::PixelType, double> > > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/// template typedefs
typedef TPointSet PointSetType;
@@ -67,23 +67,23 @@ public:
typedef typename PointDataContainerType::ConstIterator PointDataIteratorType;
typedef TDistance DistanceType;
typedef typename DistanceType::Pointer DistancePointerType;
- typedef Landmark< typename TPointSet::PointType,
- typename TPointSet::PixelType,double> LandmarkType;
- typedef typename LandmarkType::Pointer LandmarkPointerType;
- typedef ObjectList<LandmarkType> LandmarkListType;
- typedef typename LandmarkListType::Pointer LandmarkListPointerType;
- typedef std::pair<unsigned int,double> NeighborSearchResultType;
+ typedef Landmark<typename TPointSet::PointType,
+ typename TPointSet::PixelType, double> LandmarkType;
+ typedef typename LandmarkType::Pointer LandmarkPointerType;
+ typedef ObjectList<LandmarkType> LandmarkListType;
+ typedef typename LandmarkListType::Pointer LandmarkListPointerType;
+ typedef std::pair<unsigned int, double> NeighborSearchResultType;
/// standard macros
itkNewMacro(Self);
- itkTypeMacro(KeyPointSetsMatchingFilter,ObjectListSource);
+ itkTypeMacro(KeyPointSetsMatchingFilter, ObjectListSource);
/// Accessors
itkBooleanMacro(UseBackMatching);
- itkSetMacro(UseBackMatching,bool);
- itkGetMacro(UseBackMatching,bool);
- itkSetMacro(DistanceThreshold,double);
- itkGetMacro(DistanceThreshold,double);
+ itkSetMacro(UseBackMatching, bool);
+ itkGetMacro(UseBackMatching, bool);
+ itkSetMacro(DistanceThreshold, double);
+ itkGetMacro(DistanceThreshold, double);
/// Set the first pointset
void SetInput1(const PointSetType * pointset);
@@ -98,7 +98,7 @@ protected:
/// Constructor
KeyPointSetsMatchingFilter();
/// Destructor
- virtual ~KeyPointSetsMatchingFilter() {};
+ virtual ~KeyPointSetsMatchingFilter() {}
/// PrintSelf method
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -111,10 +111,9 @@ protected:
*/
NeighborSearchResultType NearestNeighbor(const PointDataType& data1, const PointSetType * pointset);
-
private:
- KeyPointSetsMatchingFilter(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ KeyPointSetsMatchingFilter(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
// Find back matches from 2 to 1 to validate them
bool m_UseBackMatching;
@@ -132,4 +131,3 @@ private:
#include "otbKeyPointSetsMatchingFilter.txx"
#endif
#endif
-
diff --git a/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.txx b/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.txx
index 9bd156fcca..e4f0c3c132 100644
--- a/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.txx
+++ b/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.txx
@@ -24,7 +24,7 @@ namespace otb
{
template <class TPointSet, class TDistance>
-KeyPointSetsMatchingFilter<TPointSet,TDistance>
+KeyPointSetsMatchingFilter<TPointSet, TDistance>
::KeyPointSetsMatchingFilter()
{
this->SetNumberOfRequiredInputs(2);
@@ -35,9 +35,9 @@ KeyPointSetsMatchingFilter<TPointSet,TDistance>
}
template <class TPointSet, class TDistance>
-const typename KeyPointSetsMatchingFilter<TPointSet,TDistance>
+const typename KeyPointSetsMatchingFilter<TPointSet, TDistance>
::PointSetType *
-KeyPointSetsMatchingFilter<TPointSet,TDistance>
+KeyPointSetsMatchingFilter<TPointSet, TDistance>
::GetInput1()
{
return static_cast<const PointSetType *>(this->itk::ProcessObject::GetInput(0));
@@ -45,16 +45,16 @@ KeyPointSetsMatchingFilter<TPointSet,TDistance>
template <class TPointSet, class TDistance>
void
-KeyPointSetsMatchingFilter<TPointSet,TDistance>
+KeyPointSetsMatchingFilter<TPointSet, TDistance>
::SetInput1(const PointSetType * pointset)
{
- this->itk::ProcessObject::SetNthInput(0,const_cast<PointSetType *>(pointset));
+ this->itk::ProcessObject::SetNthInput(0, const_cast<PointSetType *>(pointset));
}
template <class TPointSet, class TDistance>
-const typename KeyPointSetsMatchingFilter<TPointSet,TDistance>
+const typename KeyPointSetsMatchingFilter<TPointSet, TDistance>
::PointSetType *
-KeyPointSetsMatchingFilter<TPointSet,TDistance>
+KeyPointSetsMatchingFilter<TPointSet, TDistance>
::GetInput2()
{
return static_cast<const PointSetType *>(this->itk::ProcessObject::GetInput(1));
@@ -62,15 +62,15 @@ KeyPointSetsMatchingFilter<TPointSet,TDistance>
template <class TPointSet, class TDistance>
void
-KeyPointSetsMatchingFilter<TPointSet,TDistance>
+KeyPointSetsMatchingFilter<TPointSet, TDistance>
::SetInput2(const PointSetType * pointset)
{
- this->itk::ProcessObject::SetNthInput(1,const_cast<PointSetType *>(pointset));
+ this->itk::ProcessObject::SetNthInput(1, const_cast<PointSetType *>(pointset));
}
template <class TPointSet, class TDistance>
void
-KeyPointSetsMatchingFilter<TPointSet,TDistance>
+KeyPointSetsMatchingFilter<TPointSet, TDistance>
::GenerateData()
{
// std::cout<<"GenerateData()"<<std::endl;
@@ -80,63 +80,63 @@ KeyPointSetsMatchingFilter<TPointSet,TDistance>
const PointSetType * ps2 = this->GetInput2();
// Check if one of the pointsets is empty
- if ( ps1->GetNumberOfPoints() == 0 || ps2->GetNumberOfPoints() == 0 )
- {
- itkExceptionMacro(<<"Empty input pointset !");
- }
+ if (ps1->GetNumberOfPoints() == 0 || ps2->GetNumberOfPoints() == 0)
+ {
+ itkExceptionMacro(<< "Empty input pointset !");
+ }
// Get the output pointer
LandmarkListPointerType landmarks = this->GetOutput();
// Define iterators on points and point data.
- PointsIteratorType pIt = ps1->GetPoints()->Begin();
+ PointsIteratorType pIt = ps1->GetPoints()->Begin();
PointDataIteratorType pdIt = ps1->GetPointData()->Begin();
// iterate on pointset 1
- while (pdIt!=ps1->GetPointData()->End()
- &&pIt!=ps1->GetPoints()->End())
- {
+ while (pdIt != ps1->GetPointData()->End()
+ && pIt != ps1->GetPoints()->End())
+ {
// Get point and point data at current location
- bool matchFound = false;
- unsigned int currentIndex = pIt.Index();
+ bool matchFound = false;
+ unsigned int currentIndex = pIt.Index();
PointDataType data = pdIt.Value();
PointType point = pIt.Value();
// These variables will hold the matched point and point data
PointDataType dataMatch;
- PointType pointMatch;
+ PointType pointMatch;
// call to the matching routine
- NeighborSearchResultType searchResult1 = NearestNeighbor(data,ps2);
+ NeighborSearchResultType searchResult1 = NearestNeighbor(data, ps2);
// Check if the neighbor distance is lower than the threshold
if (searchResult1.second < m_DistanceThreshold)
- {
+ {
// Get the matched point and point data
dataMatch = ps2->GetPointData()->GetElement(searchResult1.first);
pointMatch = ps2->GetPoints()->GetElement(searchResult1.first);
// If the back matching option is on
if (m_UseBackMatching)
- {
+ {
// Peform the back search
- NeighborSearchResultType searchResult2 = NearestNeighbor(dataMatch,ps1);
+ NeighborSearchResultType searchResult2 = NearestNeighbor(dataMatch, ps1);
// Test if back search finds the same match
if (currentIndex == searchResult2.first)
- {
+ {
matchFound = true;
+ }
}
- }
else // else back matching
- {
+ {
matchFound = true;
+ }
}
- }
// If we found a match, add the proper landmark
if (matchFound)
- {
+ {
LandmarkPointerType landmark = LandmarkType::New();
landmark->SetPoint1(point);
landmark->SetPointData1(data);
@@ -146,19 +146,19 @@ KeyPointSetsMatchingFilter<TPointSet,TDistance>
// Add the new landmark to the landmark list
landmarks->PushBack(landmark);
- }
+ }
++pdIt;
++pIt;
- }
+ }
}
template <class TPointSet, class TDistance>
-typename KeyPointSetsMatchingFilter<TPointSet,TDistance>::NeighborSearchResultType
-KeyPointSetsMatchingFilter<TPointSet,TDistance>
+typename KeyPointSetsMatchingFilter<TPointSet, TDistance>::NeighborSearchResultType
+KeyPointSetsMatchingFilter<TPointSet, TDistance>
::NearestNeighbor(const PointDataType& data1, const PointSetType * pointset)
{
// std::cout<<"Call to NearestNeighbor()"<<std::endl;
- // Declare the result
+// Declare the result
NeighborSearchResultType result;
// Define iterators on points and point data.
@@ -166,54 +166,54 @@ KeyPointSetsMatchingFilter<TPointSet,TDistance>
// local variables
unsigned int nearestIndex = 0;
- double d1 = m_DistanceCalculator->Evaluate(data1,pdIt.Value());
+ double d1 = m_DistanceCalculator->Evaluate(data1, pdIt.Value());
++pdIt;
- double d2 = m_DistanceCalculator->Evaluate(data1,pdIt.Value());
+ double d2 = m_DistanceCalculator->Evaluate(data1, pdIt.Value());
++pdIt;
- if (d1>d2)
- {
+ if (d1 > d2)
+ {
nearestIndex = 1;
- }
+ }
// Initialize distances
- double nearestDistance = std::min(d1,d2);
- double secondNearestDistance = std::max(d1,d2);
+ double nearestDistance = std::min(d1, d2);
+ double secondNearestDistance = std::max(d1, d2);
double distanceValue;
// iterate on the pointset
- while ( pdIt != pointset->GetPointData()->End() )
- {
+ while (pdIt != pointset->GetPointData()->End())
+ {
// Evaluate the distance
- distanceValue = m_DistanceCalculator->Evaluate(data1,pdIt.Value());
+ distanceValue = m_DistanceCalculator->Evaluate(data1, pdIt.Value());
// std::cout<<nearestIndex<<" "<<nearestDistance<<" "<<secondNearestDistance<<std::endl;
// Check if this point is the nearest neighbor
if (distanceValue < nearestDistance)
- {
+ {
secondNearestDistance = nearestDistance;
nearestDistance = distanceValue;
nearestIndex = pdIt.Index();
- }
+ }
// Else check if it is the second nearest neighbor
else if (distanceValue < secondNearestDistance)
- {
+ {
secondNearestDistance = distanceValue;
- }
+ }
++pdIt;
- }
+ }
// Fill results
result.first = nearestIndex;
if (secondNearestDistance == 0)
- {
+ {
result.second = 1;
- }
+ }
else
- {
- result.second = nearestDistance/secondNearestDistance;
- }
+ {
+ result.second = nearestDistance / secondNearestDistance;
+ }
// return the result
return result;
@@ -222,7 +222,7 @@ KeyPointSetsMatchingFilter<TPointSet,TDistance>
template <class TPointSet, class TDistance>
void
-KeyPointSetsMatchingFilter<TPointSet,TDistance>
+KeyPointSetsMatchingFilter<TPointSet, TDistance>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/FeatureExtraction/otbLandmark.h b/Code/FeatureExtraction/otbLandmark.h
index 3ee1cfca04..83b5dec414 100644
--- a/Code/FeatureExtraction/otbLandmark.h
+++ b/Code/FeatureExtraction/otbLandmark.h
@@ -31,9 +31,9 @@ namespace otb
*
* The class TLandmarkData can be used to store any information on the matching.
*/
-template <class TPoint, class TPointData, class TLandmarkData=TPointData>
+template <class TPoint, class TPointData, class TLandmarkData = TPointData>
class ITK_EXPORT Landmark
- : public itk::DataObject
+ : public itk::DataObject
{
public:
/// standard class typedefs
@@ -44,7 +44,7 @@ public:
/// Standard macros
itkNewMacro(Self);
- itkTypeMacro(Landmark,DataObject);
+ itkTypeMacro(Landmark, DataObject);
/// template typedefs
typedef TPoint PointType;
@@ -52,16 +52,16 @@ public:
typedef TLandmarkData LandmarkDataType;
/// Accessors
- itkSetMacro(Point1,PointType);
- itkGetConstReferenceMacro(Point1,PointType);
- itkSetMacro(PointData1,PointDataType);
- itkGetConstReferenceMacro(PointData1,PointDataType);
- itkSetMacro(Point2,PointType);
- itkGetConstReferenceMacro(Point2,PointType);
- itkSetMacro(PointData2,PointDataType);
- itkGetConstReferenceMacro(PointData2,PointDataType);
- itkSetMacro(LandmarkData,LandmarkDataType);
- itkGetConstReferenceMacro(LandmarkData,LandmarkDataType);
+ itkSetMacro(Point1, PointType);
+ itkGetConstReferenceMacro(Point1, PointType);
+ itkSetMacro(PointData1, PointDataType);
+ itkGetConstReferenceMacro(PointData1, PointDataType);
+ itkSetMacro(Point2, PointType);
+ itkGetConstReferenceMacro(Point2, PointType);
+ itkSetMacro(PointData2, PointDataType);
+ itkGetConstReferenceMacro(PointData2, PointDataType);
+ itkSetMacro(LandmarkData, LandmarkDataType);
+ itkGetConstReferenceMacro(LandmarkData, LandmarkDataType);
protected:
/// Constructor
@@ -71,22 +71,22 @@ protected:
/// PrintSelf method
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"Landmark: P1= "<<m_Point1<<" P2= "<<m_Point2<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Landmark: P1= " << m_Point1 << " P2= " << m_Point2 << std::endl;
}
private:
- Landmark(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ Landmark(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/// First landmark point
- PointType m_Point1;
+ PointType m_Point1;
/// Second landmark point
- PointType m_Point2;
+ PointType m_Point2;
/// First landmark point data
- PointDataType m_PointData1;
+ PointDataType m_PointData1;
/// Second landmark point data
- PointDataType m_PointData2;
+ PointDataType m_PointData2;
/// Landmark data
LandmarkDataType m_LandmarkData;
};
diff --git a/Code/FeatureExtraction/otbLikelihoodPathListFilter.h b/Code/FeatureExtraction/otbLikelihoodPathListFilter.h
index 0898715ad5..4b07882c5d 100644
--- a/Code/FeatureExtraction/otbLikelihoodPathListFilter.h
+++ b/Code/FeatureExtraction/otbLikelihoodPathListFilter.h
@@ -34,14 +34,14 @@ namespace otb
*/
template <class TPath, class TImage>
class ITK_EXPORT LikelihoodPathListFilter
- : public PathListToPathListFilter<TPath>
+ : public PathListToPathListFilter<TPath>
{
public:
/** Standard typedefs */
- typedef LikelihoodPathListFilter Self;
- typedef PathListToPathListFilter<TPath> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LikelihoodPathListFilter Self;
+ typedef PathListToPathListFilter<TPath> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -50,18 +50,18 @@ public:
itkTypeMacro(LikelihoodPathListFilter, PathListToPathListFilter);
/** Template parameters typedefs */
- typedef typename Superclass::PathType PathType;
- typedef typename Superclass::PathListType PathListType;
- typedef typename Superclass::PathPointerType PathPointerType;
- typedef typename PathListType::Pointer PathListPointerType;
- typedef typename PathListType::ConstIterator IteratorType;
- typedef typename PathType::VertexType VertexType;
- typedef typename PathType::VertexListType VertexListType;
+ typedef typename Superclass::PathType PathType;
+ typedef typename Superclass::PathListType PathListType;
+ typedef typename Superclass::PathPointerType PathPointerType;
+ typedef typename PathListType::Pointer PathListPointerType;
+ typedef typename PathListType::ConstIterator IteratorType;
+ typedef typename PathType::VertexType VertexType;
+ typedef typename PathType::VertexListType VertexListType;
typedef typename VertexListType::ConstIterator VertexIteratorType;
- typedef double RealType;
+ typedef double RealType;
- typedef TImage ImageType;
- typedef typename ImageType::Pointer ImagePointerType;
+ typedef TImage ImageType;
+ typedef typename ImageType::Pointer ImagePointerType;
typedef typename ImageType::ConstPointer ImageConstPointerType;
/**
@@ -80,19 +80,19 @@ protected:
/** Constructor */
LikelihoodPathListFilter();
/** Destructor */
- virtual ~LikelihoodPathListFilter() {};
+ virtual ~LikelihoodPathListFilter() {}
/** GenerateData method */
virtual void GenerateData();
/** PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- LikelihoodPathListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LikelihoodPathListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
std::string m_Key;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbLikelihoodPathListFilter.txx"
#endif
diff --git a/Code/FeatureExtraction/otbLikelihoodPathListFilter.txx b/Code/FeatureExtraction/otbLikelihoodPathListFilter.txx
index e2bc559ade..c1066b7d90 100644
--- a/Code/FeatureExtraction/otbLikelihoodPathListFilter.txx
+++ b/Code/FeatureExtraction/otbLikelihoodPathListFilter.txx
@@ -41,7 +41,7 @@ void
LikelihoodPathListFilter<TPath, TImage>
::SetInputImage(const ImageType * image)
{
- this->itk::ProcessObject::SetNthInput(1,const_cast<ImageType *>(image));
+ this->itk::ProcessObject::SetNthInput(1, const_cast<ImageType *>(image));
}
template <class TPath, class TImage>
const typename LikelihoodPathListFilter<TPath, TImage>
@@ -49,10 +49,10 @@ const typename LikelihoodPathListFilter<TPath, TImage>
LikelihoodPathListFilter<TPath, TImage>
::GetInputImage(void)
{
- if (this->GetNumberOfInputs()<1)
- {
+ if (this->GetNumberOfInputs() < 1)
+ {
return 0;
- }
+ }
return static_cast<const ImageType *>(this->itk::ProcessObject::GetInput(1));
}
@@ -64,24 +64,24 @@ LikelihoodPathListFilter<TPath, TImage>
// I/O wiring
ImageConstPointerType inputImagePtr = this->GetInputImage();
const PathListType * inputPtr = this->GetInput();
- PathListType * outputPtr = this->GetOutput();
+ PathListType * outputPtr = this->GetOutput();
- typedef otb::PolyLineImageConstIterator<ImageType,PathType> ImageIteratorType;
+ typedef otb::PolyLineImageConstIterator<ImageType, PathType> ImageIteratorType;
for (IteratorType it = inputPtr->Begin(); it != inputPtr->End(); ++it)
- {
+ {
PathPointerType path = it.Get();
- ImageIteratorType imageIt(inputImagePtr,path);
+ ImageIteratorType imageIt(inputImagePtr, path);
double cumulatedValues = 0.0;
double nbPoints = 0.0;
- for (imageIt.GoToBegin();!imageIt.IsAtEnd();++imageIt,++nbPoints)
- {
- cumulatedValues+=static_cast<double>(imageIt.Get());
- }
- itk::MetaDataDictionary & dict = path->GetMetaDataDictionary();
- itk::EncapsulateMetaData<double>(dict,m_Key,cumulatedValues/nbPoints);
+ for (imageIt.GoToBegin(); !imageIt.IsAtEnd(); ++imageIt, ++nbPoints)
+ {
+ cumulatedValues += static_cast<double>(imageIt.Get());
+ }
+ itk::MetaDataDictionary& dict = path->GetMetaDataDictionary();
+ itk::EncapsulateMetaData<double>(dict, m_Key, cumulatedValues / nbPoints);
outputPtr->PushBack(path);
- }
+ }
}
/**
* PrintSelf Method
diff --git a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h
index 96d0dbef76..18472c515f 100644
--- a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h
+++ b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h
@@ -22,7 +22,6 @@
#include "itkLinearInterpolateImageFunction.h"
#include "otbLineDetectorImageFilterBase.h"
-
namespace otb
{
/**
@@ -32,25 +31,27 @@ namespace otb
*/
template <class TInputImage,
-class TOutputImage,
-class TOutputImageDirection = TOutputImage,
-class TInterpolator = itk::LinearInterpolateImageFunction<TInputImage> >
-class ITK_EXPORT LineCorrelationDetectorImageFilter : public LineDetectorImageFilterBase< TInputImage, TOutputImage, TOutputImageDirection, TInterpolator >
+ class TOutputImage,
+ class TOutputImageDirection = TOutputImage,
+ class TInterpolator = itk::LinearInterpolateImageFunction<TInputImage> >
+class ITK_EXPORT LineCorrelationDetectorImageFilter : public LineDetectorImageFilterBase<TInputImage, TOutputImage,
+ TOutputImageDirection,
+ TInterpolator>
{
public:
/** Extract dimensions as well of the images of entry of exit. */
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,
- unsigned int,
- TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension,
+ unsigned int,
+ TOutputImage::ImageDimension);
/** typedef for the classes standards. */
- typedef LineCorrelationDetectorImageFilter Self;
- typedef LineDetectorImageFilterBase< TInputImage, TOutputImage, TOutputImageDirection, TInterpolator > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LineCorrelationDetectorImageFilter Self;
+ typedef LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, TInterpolator> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for management of the "object factory". */
itkNewMacro(Self);
@@ -58,24 +59,22 @@ public:
/** Return the name of the class. */
itkTypeMacro(LineCorrelationDetectorImageFilter, LineDetectorImageFilterBase);
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::OutputImageDirectionType OutputImageDirectionType;
- typedef typename Superclass::InterpolatorType InterpolatorType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::OutputImageDirectionType OutputImageDirectionType;
+ typedef typename Superclass::InterpolatorType InterpolatorType;
/** Typedefs to describe and access Interpolator */
- typedef typename InterpolatorType::Pointer InterpolatorPointer;
+ typedef typename InterpolatorType::Pointer InterpolatorPointer;
typedef typename InterpolatorType::CoordRepType CoordRepType;
typedef typename InputImageType::PointType TPoint;
-
/** Definition of the input and output images */
- typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::PixelType InputPixelType;
typedef typename OutputImageType::PixelType OutputPixelType;
-
- typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
typedef typename OutputImageType::RegionType OutputImageRegionType;
/** Definition of the size of the images. */
@@ -83,17 +82,15 @@ public:
protected:
LineCorrelationDetectorImageFilter();
- virtual ~LineCorrelationDetectorImageFilter() {};
+ virtual ~LineCorrelationDetectorImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
/** Compute the measure */
virtual double ComputeMeasure(std::vector<double>* m1, std::vector<double>* m2, std::vector<double>* m3);
private:
- LineCorrelationDetectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ LineCorrelationDetectorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
@@ -102,5 +99,4 @@ private:
#include "otbLineCorrelationDetectorImageFilter.txx"
#endif
-
#endif
diff --git a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
index 5e34adb709..3d7bca0767 100644
--- a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
@@ -52,7 +52,6 @@ LineCorrelationDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirect
::ComputeMeasure(std::vector<double>* m1, std::vector<double>* m2, std::vector<double>* m3)
{
-
double M1 = 0.0;
double M2 = 0.0;
double M3 = 0.0;
@@ -66,8 +65,8 @@ LineCorrelationDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirect
std::vector<double>::iterator m3It = m3->begin();
std::vector<double>::iterator m3End = m3->end();
- while ( m1It!=m1End && m2It!=m2End && m3It!=m3End )
- {
+ while (m1It != m1End && m2It != m2End && m3It != m3End)
+ {
M1 += (*m1It);
++m1It;
@@ -78,7 +77,7 @@ LineCorrelationDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirect
M3 += (*m3It);
++m3It;
- }
+ }
M1 /= m1->size();
M2 /= m2->size();
@@ -92,21 +91,19 @@ LineCorrelationDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirect
m2It = m2->begin();
m3It = m3->begin();
+ while (m1It != m1End && m2It != m2End && m3It != m3End)
+ {
- while ( m1It!=m1End && m2It!=m2End && m3It!=m3End )
- {
-
- sigma1 += vcl_pow((*m1It)-M1,2);
+ sigma1 += vcl_pow((*m1It) - M1, 2);
++m1It;
- sigma2 += vcl_pow((*m2It)-M2,2);
+ sigma2 += vcl_pow((*m2It) - M2, 2);
++m2It;
- sigma3 += vcl_pow((*m3It)-M3,2);
+ sigma3 += vcl_pow((*m3It) - M3, 2);
++m3It;
-
- }
+ }
sigma1 /= m1->size();
sigma2 /= m2->size();
@@ -118,7 +115,6 @@ LineCorrelationDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirect
sigma3 = vcl_sqrt(sigma3);
*/
-
// Calculation of the cross correlation coefficient
double d1 = 0.;
@@ -129,43 +125,37 @@ LineCorrelationDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirect
double rho13 = 0.;
// rho12
- if ( M2 != 0. )
- {
- d1 = sigma1/vcl_pow(M2,2)*m1->size();
- d2 = sigma2/vcl_pow(M2,2)*m2->size();
+ if (M2 != 0.)
+ {
+ d1 = sigma1 / vcl_pow(M2, 2) * m1->size();
+ d2 = sigma2 / vcl_pow(M2, 2) * m2->size();
- d3 = vcl_pow(((M1/M2)-1.),2)*(m1->size()*m2->size());
+ d3 = vcl_pow(((M1 / M2) - 1.), 2) * (m1->size() * m2->size());
- if ( ( d3 != 0. ) )
- rho12 = static_cast<double>( 1. / ( 1. + ( (m1->size()+m2->size())*(d1+d2)/d3 ) ) );
- else
- rho12 = 0.;
+ if ((d3 != 0.)) rho12 = static_cast<double>(1. / (1. + ((m1->size() + m2->size()) * (d1 + d2) / d3)));
+ else rho12 = 0.;
- }
- if ( M3 != 0. )
- {
- d1 = sigma1/vcl_pow(M3,2)*m1->size();
- d2 = sigma3/vcl_pow(M3,2)*m2->size();
+ }
+ if (M3 != 0.)
+ {
+ d1 = sigma1 / vcl_pow(M3, 2) * m1->size();
+ d2 = sigma3 / vcl_pow(M3, 2) * m2->size();
- d3 = vcl_pow(((M1/M3)-1.),2)*(m1->size()*m2->size());
+ d3 = vcl_pow(((M1 / M3) - 1.), 2) * (m1->size() * m2->size());
- if ( ( d3 != 0. ) )
- rho13 = static_cast<double>( 1. / ( 1. + ( (m1->size()+m2->size())*(d1+d2)/d3 ) ) );
- else
- rho13 = 0.;
+ if ((d3 != 0.)) rho13 = static_cast<double>(1. / (1. + ((m1->size() + m2->size()) * (d1 + d2) / d3)));
+ else rho13 = 0.;
- }
+ }
rho12 = vcl_sqrt(rho12);
rho13 = vcl_sqrt(rho13);
// Determination of the minimum intensity of detection between R12 et R13
- return static_cast<double>( MIN( rho12, rho13 ) );
-
+ return static_cast<double>(MIN(rho12, rho13));
}
-
/**
* Standard "PrintSelf" method
*/
@@ -174,11 +164,9 @@ void
LineCorrelationDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection, TInterpolator>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
-
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.h b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.h
index ee54af275f..4a82c7d409 100644
--- a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.h
+++ b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.h
@@ -24,12 +24,11 @@
#include "otbImage.h"
#include "itkNumericTraits.h"
-#define MINI(_A,_B) ((_A) < (_B) ? (_A) : (_B))
-#define MAXI(_A,_B) ((_A) > (_B) ? (_A) : (_B))
-#define ROTATION(_x,_y,_theta,_xout,_yout) \
- (_xout) = (_x)*vcl_cos(_theta) - (_y)*vcl_sin(_theta); \
- (_yout) = (_x)*vcl_sin(_theta) + (_y)*vcl_cos(_theta)
-
+#define MINI(_A, _B) ((_A) < (_B) ? (_A) : (_B))
+#define MAXI(_A, _B) ((_A) > (_B) ? (_A) : (_B))
+#define ROTATION(_x, _y, _theta, _xout, _yout) \
+ (_xout) = (_x) * vcl_cos(_theta) - (_y) * vcl_sin(_theta); \
+ (_yout) = (_x) * vcl_sin(_theta) + (_y) * vcl_cos(_theta)
namespace otb
{
@@ -54,25 +53,26 @@ namespace otb
*/
template <class TInputImage,
-class TOutputImage,
-class TOutputImageDirection = TOutputImage,
-class TInterpolator = itk::LinearInterpolateImageFunction<TInputImage> >
-class ITK_EXPORT LineDetectorImageFilterBase : public ImageToModulusAndDirectionImageFilter< TInputImage, TOutputImage, TOutputImageDirection >
+ class TOutputImage,
+ class TOutputImageDirection = TOutputImage,
+ class TInterpolator = itk::LinearInterpolateImageFunction<TInputImage> >
+class ITK_EXPORT LineDetectorImageFilterBase : public ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage,
+ TOutputImageDirection>
{
public:
/** Extract dimensions as well of the images of entry of exit. */
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,
- unsigned int,
- TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension,
+ unsigned int,
+ TOutputImage::ImageDimension);
/** typedef for the classes standards. */
- typedef LineDetectorImageFilterBase Self;
- typedef ImageToModulusAndDirectionImageFilter< TInputImage, TOutputImage, TOutputImageDirection > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LineDetectorImageFilterBase Self;
+ typedef ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage, TOutputImageDirection> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for management of the object factory. */
itkNewMacro(Self);
@@ -80,25 +80,23 @@ public:
/** Return the name of the class. */
itkTypeMacro(LineDetectorImageFilterBase, ImageToModulusAndDirectionImageFilter);
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::OutputImageDirectionType OutputImageDirectionType;
- typedef TInterpolator InterpolatorType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::OutputImageDirectionType OutputImageDirectionType;
+ typedef TInterpolator InterpolatorType;
/** Typedefs to describe and access Interpolator */
- typedef typename InterpolatorType::Pointer InterpolatorPointer;
+ typedef typename InterpolatorType::Pointer InterpolatorPointer;
typedef typename InterpolatorType::CoordRepType CoordRepType;
typedef typename InputImageType::PointType TPoint;
-
/** Definition of the input and output images */
- typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::PixelType InputPixelType;
typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
-
- typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
typedef typename OutputImageType::RegionType OutputImageRegionType;
/** Definition of the size of the images. */
@@ -122,7 +120,6 @@ public:
/** Get the radius of one zone. */
itkGetConstReferenceMacro(Radius, SizeType);
-
/** Set the radius of one zone. */
itkSetMacro(Threshold, OutputPixelType);
@@ -135,12 +132,12 @@ public:
/** Get the numbero of drections for line detection. */
itkGetConstReferenceMacro(NumberOfDirections, unsigned int);
-
- virtual void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError);
+ virtual void GenerateInputRequestedRegion()
+ throw(itk::InvalidRequestedRegionError);
protected:
LineDetectorImageFilterBase();
- virtual ~LineDetectorImageFilterBase() {};
+ virtual ~LineDetectorImageFilterBase() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
void BeforeThreadedGenerateData();
@@ -155,7 +152,7 @@ protected:
* \sa ImageToImageFilter::GenerateData()
*/
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
virtual double ComputeMeasure(std::vector<double>* m1, std::vector<double>* m2, std::vector<double>* m3);
@@ -175,9 +172,8 @@ protected:
unsigned int m_NumberOfDirections;
private:
- LineDetectorImageFilterBase(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ LineDetectorImageFilterBase(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
@@ -186,5 +182,4 @@ private:
#include "otbLineDetectorImageFilterBase.txx"
#endif
-
#endif
diff --git a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
index 796705cc7b..85585e5497 100644
--- a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
+++ b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
@@ -39,7 +39,7 @@ namespace otb
/**
*
*/
-template <class TInputImage, class TOutputImage, class TOutputImageDirection, class InterpolatorType >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection, class InterpolatorType>
LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, InterpolatorType>
::LineDetectorImageFilterBase()
{
@@ -56,22 +56,22 @@ LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, In
// this->SetNthOutput(1,OutputImageType::New());
}
-template <class TInputImage, class TOutputImage, class TOutputImageDirection, class InterpolatorType >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection, class InterpolatorType>
void
LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, InterpolatorType>
::GenerateInputRequestedRegion() throw (itk::InvalidRequestedRegionError)
-{
+ {
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- typename Superclass::InputImagePointer inputPtr = const_cast< TInputImage * >( this->GetInput() );
+ typename Superclass::InputImagePointer inputPtr = const_cast<TInputImage *>(this->GetInput());
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
@@ -79,92 +79,92 @@ LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, In
inputRequestedRegion = inputPtr->GetRequestedRegion();
// Define the size of the region by the radius
- m_Radius[1] = static_cast<unsigned int>(3*(2*m_WidthLine+1) + 2);
- m_Radius[0] = 2*m_LengthLine+1;
+ m_Radius[1] = static_cast<unsigned int>(3 * (2 * m_WidthLine + 1) + 2);
+ m_Radius[0] = 2 * m_LengthLine + 1;
// Define the size of the facelist by taking into account the rotation of the region
- m_FaceList[0] = static_cast<unsigned int>( vcl_sqrt( static_cast<double>((m_Radius[0]*m_Radius[0]) + (m_Radius[1]*m_Radius[1]) ) ) + 1 );
+ m_FaceList[0] =
+ static_cast<unsigned int>(vcl_sqrt(static_cast<double>(
+ (m_Radius[0] * m_Radius[0]) + (m_Radius[1] * m_Radius[1]))) + 1);
m_FaceList[1] = m_FaceList[0];
- otbMsgDevMacro( << "Radius : "<<m_Radius[0]<<" "<<m_Radius[1]);
- otbMsgDevMacro( << "-> FaceList : "<<m_FaceList[0]<<" "<<m_FaceList[1]);
+ otbMsgDevMacro(<< "Radius : " << m_Radius[0] << " " << m_Radius[1]);
+ otbMsgDevMacro(<< "-> FaceList : " << m_FaceList[0] << " " << m_FaceList[1]);
// pad the input requested region by the operator radius
- inputRequestedRegion.PadByRadius( m_FaceList );
+ inputRequestedRegion.PadByRadius(m_FaceList);
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << static_cast<const char *>(this->GetNameOfClass())
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
+ }
}
-}
/*
* Set up state of filter before multi-threading.
* InterpolatorType::SetInputImage is not thread-safe and hence
* has to be set up before ThreadedGenerateData
*/
-template <class TInputImage, class TOutputImage, class TOutputImageDirection, class InterpolatorType >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection, class InterpolatorType>
void
LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, InterpolatorType>
::BeforeThreadedGenerateData()
{
- typename OutputImageType::Pointer output = this->GetOutput();
+ typename OutputImageType::Pointer output = this->GetOutput();
output->FillBuffer(0);
- typename OutputImageType::Pointer outputDirection = this->GetOutputDirection();
+ typename OutputImageType::Pointer outputDirection = this->GetOutputDirection();
outputDirection->FillBuffer(0);
}
-template <class TInputImage, class TOutputImage, class TOutputImageDirection, class InterpolatorType >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection, class InterpolatorType>
void
LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, InterpolatorType>
::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread,
- int threadId
-)
+ const OutputImageRegionType& outputRegionForThread,
+ int threadId
+ )
{
typename InputImageType::ConstPointer input = this->GetInput();
-
InterpolatorPointer interpolator2 = InterpolatorType::New();
interpolator2->SetInputImage(input);
-
- itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
- itk::ConstNeighborhoodIterator<InputImageType> bit,cit;
- typename itk::ConstNeighborhoodIterator<InputImageType>::OffsetType off;
- itk::ImageRegionIterator<OutputImageType> it;
- itk::ImageRegionIterator<OutputImageType> itdir;
- typedef itk::ImageRegionIterator<InputImageType> InputIteratorType;
+ itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
+ itk::ConstNeighborhoodIterator<InputImageType> bit, cit;
+ typename itk::ConstNeighborhoodIterator<InputImageType>::OffsetType off;
+ itk::ImageRegionIterator<OutputImageType> it;
+ itk::ImageRegionIterator<OutputImageType> itdir;
+ typedef itk::ImageRegionIterator<InputImageType> InputIteratorType;
typedef itk::ImageRegionConstIterator<InputImageType> ConstInputIteratorType;
// Allocate output
- typename OutputImageType::Pointer output = this->GetOutput();
- typename OutputImageType::Pointer outputDir = this->GetOutputDirection();
+ typename OutputImageType::Pointer output = this->GetOutput();
+ typename OutputImageType::Pointer outputDir = this->GetOutputDirection();
// Find the data-set boundary "faces"
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType faceList;
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType::iterator fit;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType faceList;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType::iterator fit;
itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> bC;
faceList = bC(input, outputRegionForThread, m_FaceList);
@@ -172,7 +172,7 @@ LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, In
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
- typename TInputImage::IndexType bitIndex;
+ typename TInputImage::IndexType bitIndex;
typename InterpolatorType::ContinuousIndexType Index;
// --------------------------------------------------------------------------
@@ -187,19 +187,18 @@ LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, In
double* Theta = new double[NB_DIR];
// La rotation nulle correspond a un contour horizontal -> 0 !!
- for (unsigned int i=0; i<NB_DIR; ++i)
- {
- Theta[i] = (CONST_PI*(i/double(NB_DIR)));
+ for (unsigned int i = 0; i < NB_DIR; ++i)
+ {
+ Theta[i] = (CONST_PI * (i / double(NB_DIR)));
/* if(Theta[i]>CONST_PI)
Theta[i] = Theta[i]-CONST_PI;
if((i/double(NB_DIR))==0.5)
Theta[i]=0.;*/
- }
+ }
// Number of the zone
unsigned int zone;
-
// Intensity of the linear feature
double R;
@@ -219,18 +218,17 @@ LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, In
int Yc12, Yc13;
//---------------------------------------------------------------------------
- otbMsgDevMacro( << "Theta : "<<Theta[0]<<" "<<Theta[1]<<" "<<Theta[2]<<" "<<Theta[3]);
-
+ otbMsgDevMacro(<< "Theta : " << Theta[0] << " " << Theta[1] << " " << Theta[2] << " " << Theta[3]);
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
bool interiorFace = true;
- for (fit=faceList.begin(); fit != faceList.end(); ++fit)
- {
+ for (fit = faceList.begin(); fit != faceList.end(); ++fit)
+ {
bit = itk::ConstNeighborhoodIterator<InputImageType>(m_Radius, input, *fit);
- cit = itk::ConstNeighborhoodIterator<InputImageType>(m_FaceList, input,*fit);
+ cit = itk::ConstNeighborhoodIterator<InputImageType>(m_FaceList, input, *fit);
it = itk::ImageRegionIterator<OutputImageType>(output, *fit);
itdir = itk::ImageRegionIterator<OutputImageType>(outputDir, *fit);
@@ -240,11 +238,10 @@ LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, In
cit.OverrideBoundaryCondition(&nbc);
cit.GoToBegin();
- otbMsgDevMacro( << " ------------------- FaceList --------------------------");
-
+ otbMsgDevMacro(<< " ------------------- FaceList --------------------------");
- while ( (!bit.IsAtEnd())&&(!cit.IsAtEnd()) )
- {
+ while ((!bit.IsAtEnd()) && (!cit.IsAtEnd()))
+ {
InterpolatorPointer interpolator = InterpolatorType::New();
// Location of the central pixel of the region
off.Fill(0);
@@ -255,39 +252,38 @@ LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, In
// JULIEN : If the processed region is the center face
// the input image can be used for the interpolation
if (interiorFace)
- {
+ {
interpolator->SetInputImage(input);
- }
+ }
// else we must feed the interpolator with a partial image corresponding
// to the boundary conditions
else
- {
+ {
typename InputImageType::RegionType tempRegion;
- typename InputImageType::SizeType tempSize;
- tempSize[0] = 2*m_FaceList[0]+1;
- tempSize[1] = 2*m_FaceList[1]+1;
+ typename InputImageType::SizeType tempSize;
+ tempSize[0] = 2 * m_FaceList[0] + 1;
+ tempSize[1] = 2 * m_FaceList[1] + 1;
tempRegion.SetSize(tempSize);
typename itk::ConstNeighborhoodIterator<InputImageType>::OffsetType tempIndex;
- tempIndex[0]=off[0]-m_FaceList[0];
- tempIndex[1]=off[1]-m_FaceList[1];
+ tempIndex[0] = off[0] - m_FaceList[0];
+ tempIndex[1] = off[1] - m_FaceList[1];
tempRegion.SetIndex(cit.GetIndex(tempIndex));
typename InputImageType::Pointer tempImage = InputImageType::New();
tempImage->SetRegions(tempRegion);
tempImage->Allocate();
- for (unsigned int p = 0; p<=2*m_FaceList[0];++p)
- {
- for (unsigned int q = 0; q<=2*m_FaceList[1];q++)
+ for (unsigned int p = 0; p <= 2 * m_FaceList[0]; ++p)
{
- typename itk::ConstNeighborhoodIterator<InputImageType>::OffsetType index;
- index[0]=p-m_FaceList[0];
- index[1]=q-m_FaceList[1];
- tempImage->SetPixel(cit.GetIndex(index),cit.GetPixel(index));
+ for (unsigned int q = 0; q <= 2 * m_FaceList[1]; q++)
+ {
+ typename itk::ConstNeighborhoodIterator<InputImageType>::OffsetType index;
+ index[0] = p - m_FaceList[0];
+ index[1] = q - m_FaceList[1];
+ tempImage->SetPixel(cit.GetIndex(index), cit.GetPixel(index));
+ }
}
- }
interpolator->SetInputImage(tempImage);
- }
-
+ }
// Location of the central pixel between zone 1 and zone 2
Yc12 = Yc - m_WidthLine - 1;
@@ -295,114 +291,107 @@ LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, In
// Location of the central pixel between zone 1 and zone 3
Yc13 = Yc + m_WidthLine + 1;
-
// Contains for the 4 directions the the pixels belonging to each zone
//std::vector<double> PixelValues[NB_DIR][NB_ZONE];
// ROMAIN
std::vector<double>** PixelValues = NULL;
PixelValues = new std::vector<double>*[NB_DIR];
- for (unsigned int i=0; i<NB_DIR; ++i)
- {
+ for (unsigned int i = 0; i < NB_DIR; ++i)
+ {
PixelValues[i] = NULL;
PixelValues[i] = new std::vector<double>[NB_ZONE];
- }
+ }
//otbMsgDevMacro( << "\tCentre Xc/Yc="<<Xc<<" "<<Yc<<" Yc12/Yc13="<<Yc12<<" "<<Yc13);
// Loop on the region
for (unsigned int i = 0; i < m_Radius[0]; ++i)
for (unsigned int j = 0; j < m_Radius[1]; ++j)
- {
+ {
- off[0]=i-m_Radius[0]/2;
- off[1]=j-m_Radius[1]/2;
+ off[0] = i - m_Radius[0] / 2;
+ off[1] = j - m_Radius[1] / 2;
bitIndex = bit.GetIndex(off);
X = bitIndex[0];
Y = bitIndex[1];
// We determine in the horizontal direction with which zone the pixel belongs.
- if ( Y < Yc12 )
- zone = 1;
- else if ( ( Yc12 < Y ) && ( Y < Yc13 ) )
- zone = 0;
- else if ( Y > Yc13 )
- zone = 2;
- else
- continue;
+ if (Y < Yc12) zone = 1;
+ else if ((Yc12 < Y) && (Y < Yc13)) zone = 0;
+ else if (Y > Yc13) zone = 2;
+ else continue;
//otbMsgDevMacro( << "\t\tPoint traite (i,j)=("<<i<<","<<j<<") -> X,Y="<<X<<","<<Y<<" zone="<<zone);
// Loop on the directions
- for (unsigned int dir=0; dir<NB_DIR; ++dir )
- {
+ for (unsigned int dir = 0; dir < NB_DIR; ++dir)
+ {
//ROTATION( (X-Xc), (Y-Yc), Theta[dir], xout, yout);
- xout = (X-Xc)*vcl_cos(Theta[dir]) - (Y-Yc)*vcl_sin(Theta[dir]);
- yout = (X-Xc)*vcl_sin(Theta[dir]) + (Y-Yc)*vcl_cos(Theta[dir]);
+ xout = (X - Xc) * vcl_cos(Theta[dir]) - (Y - Yc) * vcl_sin(Theta[dir]);
+ yout = (X - Xc) * vcl_sin(Theta[dir]) + (Y - Yc) * vcl_cos(Theta[dir]);
Index[0] = static_cast<CoordRepType>(xout + Xc);
Index[1] = static_cast<CoordRepType>(yout + Yc);
- PixelValues[dir][zone].push_back(static_cast<double>(interpolator->EvaluateAtContinuousIndex( Index )));
- }
- } // end of the loop on the pixels of the region
+ PixelValues[dir][zone].push_back(static_cast<double>(interpolator->EvaluateAtContinuousIndex(Index)));
+ }
+ } // end of the loop on the pixels of the region
R = 0.;
Direction = 0.;
// Loop on the 4 directions
-
- for (unsigned int dir=0; dir<NB_DIR; ++dir )
- {
-
+ for (unsigned int dir = 0; dir < NB_DIR; ++dir)
+ {
double Rtemp = this->ComputeMeasure(&PixelValues[dir][0], &PixelValues[dir][1], &PixelValues[dir][2]);
- if ( Rtemp > R)
- {
+ if (Rtemp > R)
+ {
R = Rtemp;
Direction = Theta[dir];
- }
+ }
- } // end of the loop on the directions
+ } // end of the loop on the directions
//otbMsgDevMacro( << "\t\tR,Direction : "<<R<<","<<Direction);
- if ( R >= this->GetThreshold() )
- {
+ if (R >= this->GetThreshold())
+ {
// Assignment of this value to the output pixel
- it.Set( static_cast<OutputPixelType>(R) );
+ it.Set(static_cast<OutputPixelType>(R));
// Assignment of this value to the "outputdir" pixel
- itdir.Set( static_cast<OutputPixelType>(Direction) );
- }
+ itdir.Set(static_cast<OutputPixelType>(Direction));
+ }
else
- {
+ {
- it.Set( itk::NumericTraits<OutputPixelType>::Zero );
+ it.Set(itk::NumericTraits<OutputPixelType>::Zero);
- itdir.Set( static_cast<OutputPixelType>(0) );
- }
+ itdir.Set(static_cast<OutputPixelType>(0));
+ }
++bit;
++cit;
++it;
++itdir;
- interiorFace=false;
+ interiorFace = false;
progress.CompletedPixel();
// ROMAIN
- for (unsigned int i=0; i<NB_DIR; ++i)
- {
+ for (unsigned int i = 0; i < NB_DIR; ++i)
+ {
delete[] PixelValues[i];
PixelValues[i] = NULL;
- }
+ }
delete[] PixelValues;
PixelValues = NULL;
- }
+ }
- }
+ }
delete[] Theta;
}
-template <class TInputImage, class TOutputImage, class TOutputImageDirection, class InterpolatorType >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection, class InterpolatorType>
double
LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, InterpolatorType>
::ComputeMeasure(std::vector<double>* m1, std::vector<double>* m2, std::vector<double>* m3)
@@ -413,12 +402,12 @@ LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, In
/**
* Standard "PrintSelf" method
*/
-template <class TInputImage, class TOutputImage, class TOutputImageDirection, class InterpolatorType >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection, class InterpolatorType>
void
LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, InterpolatorType>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "Length: " << m_LengthLine << std::endl;
os << indent << "Width: " << m_WidthLine << std::endl;
diff --git a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h
index 34556774aa..d720d50d26 100644
--- a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h
+++ b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h
@@ -22,11 +22,9 @@
#include "itkLinearInterpolateImageFunction.h"
#include "otbLineDetectorImageFilterBase.h"
-
namespace otb
{
-
/** \class LineRatioDetectorImageFilter
* \brief Application of detection of linear features based on the
* ratio of local means.
@@ -62,25 +60,27 @@ namespace otb
*
*/
template <class TInputImage,
-class TOutputImage,
-class TOutputImageDirection = TOutputImage,
-class TInterpolator = itk::LinearInterpolateImageFunction<TInputImage> >
-class ITK_EXPORT LineRatioDetectorImageFilter : public LineDetectorImageFilterBase< TInputImage, TOutputImage, TOutputImageDirection, TInterpolator >
+ class TOutputImage,
+ class TOutputImageDirection = TOutputImage,
+ class TInterpolator = itk::LinearInterpolateImageFunction<TInputImage> >
+class ITK_EXPORT LineRatioDetectorImageFilter : public LineDetectorImageFilterBase<TInputImage, TOutputImage,
+ TOutputImageDirection,
+ TInterpolator>
{
public:
/** Extract dimensions as well of the images of entry of exit. */
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,
- unsigned int,
- TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension,
+ unsigned int,
+ TOutputImage::ImageDimension);
/** typedef for the classes standards. */
- typedef LineRatioDetectorImageFilter Self;
- typedef LineDetectorImageFilterBase< TInputImage, TOutputImage, TOutputImageDirection, TInterpolator> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LineRatioDetectorImageFilter Self;
+ typedef LineDetectorImageFilterBase<TInputImage, TOutputImage, TOutputImageDirection, TInterpolator> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for management of the "object factory". */
itkNewMacro(Self);
@@ -88,24 +88,22 @@ public:
/** Return the name of the class. */
itkTypeMacro(LineRatioDetectorImageFilter, LineDetectorImageFilterBase);
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::OutputImageDirectionType OutputImageDirectionType;
- typedef typename Superclass::InterpolatorType InterpolatorType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::OutputImageDirectionType OutputImageDirectionType;
+ typedef typename Superclass::InterpolatorType InterpolatorType;
/** Typedefs to describe and access Interpolator */
- typedef typename InterpolatorType::Pointer InterpolatorPointer;
+ typedef typename InterpolatorType::Pointer InterpolatorPointer;
typedef typename InterpolatorType::CoordRepType CoordRepType;
typedef typename InputImageType::PointType TPoint;
-
/** Definition of the input and output images */
- typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::PixelType InputPixelType;
typedef typename OutputImageType::PixelType OutputPixelType;
-
- typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
typedef typename OutputImageType::RegionType OutputImageRegionType;
/** Definition of the size of the images. */
@@ -113,15 +111,14 @@ public:
protected:
LineRatioDetectorImageFilter();
- virtual ~LineRatioDetectorImageFilter() {};
+ virtual ~LineRatioDetectorImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
virtual double ComputeMeasure(std::vector<double>* m1, std::vector<double>* m2, std::vector<double>* m3);
private:
- LineRatioDetectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ LineRatioDetectorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
@@ -130,5 +127,4 @@ private:
#include "otbLineRatioDetectorImageFilter.txx"
#endif
-
#endif
diff --git a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
index 029efe3a4e..f0145c3a79 100644
--- a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
@@ -37,8 +37,8 @@ namespace otb
/**
*
*/
-template <class TInputImage, class TOutputImage, class TOutputImageDirection, class TInterpolator >
-LineRatioDetectorImageFilter< TInputImage, TOutputImage, TOutputImageDirection, TInterpolator >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection, class TInterpolator>
+LineRatioDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection, TInterpolator>
::LineRatioDetectorImageFilter()
{
this->m_Radius.Fill(1);
@@ -47,9 +47,9 @@ LineRatioDetectorImageFilter< TInputImage, TOutputImage, TOutputImageDirection,
this->m_FaceList.Fill(0);
}
-template <class TInputImage, class TOutputImage, class TOutputImageDirection, class TInterpolator >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection, class TInterpolator>
double
-LineRatioDetectorImageFilter< TInputImage, TOutputImage, TOutputImageDirection, TInterpolator >
+LineRatioDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection, TInterpolator>
::ComputeMeasure(std::vector<double>* m1, std::vector<double>* m2, std::vector<double>* m3)
{
@@ -66,8 +66,8 @@ LineRatioDetectorImageFilter< TInputImage, TOutputImage, TOutputImageDirection,
std::vector<double>::iterator m3It = m3->begin();
std::vector<double>::iterator m3End = m3->end();
- while ( m1It!=m1End && m2It!=m2End && m3It!=m3End )
- {
+ while (m1It != m1End && m2It != m2End && m3It != m3End)
+ {
M1 += (*m1It);
++m1It;
@@ -78,7 +78,7 @@ LineRatioDetectorImageFilter< TInputImage, TOutputImage, TOutputImageDirection,
M3 += (*m3It);
++m3It;
- }
+ }
M1 /= m1->size();
M2 /= m2->size();
@@ -86,42 +86,33 @@ LineRatioDetectorImageFilter< TInputImage, TOutputImage, TOutputImageDirection,
double R12 = 0.0;
double R13 = 0.0;
-
+
double epsilon = 0.0000000001;
- if (( vcl_abs(M1) > epsilon ) && (vcl_abs(M2) > epsilon ))
- R12 = static_cast<double>( 1 - MIN( (M1/M2), (M2/M1) ) );
- else if (( vcl_abs(M1) > epsilon ) || (vcl_abs(M2) > epsilon ))
- R12 = 1.0;
+ if ((vcl_abs(M1) > epsilon) && (vcl_abs(M2) > epsilon)) R12 = static_cast<double>(1 - MIN((M1 / M2), (M2 / M1)));
+ else if ((vcl_abs(M1) > epsilon) || (vcl_abs(M2) > epsilon)) R12 = 1.0;
else R12 = 0.;
-
- if (( vcl_abs(M1) > epsilon ) && (vcl_abs(M3) > epsilon ))
- R13 = static_cast<double>( 1 - MIN( (M1/M3), (M3/M1) ) );
- else if (( vcl_abs(M1) > epsilon ) || (vcl_abs(M3) > epsilon ))
- R13 = 1.0;
+ if ((vcl_abs(M1) > epsilon) && (vcl_abs(M3) > epsilon)) R13 = static_cast<double>(1 - MIN((M1 / M3), (M3 / M1)));
+ else if ((vcl_abs(M1) > epsilon) || (vcl_abs(M3) > epsilon)) R13 = 1.0;
else R13 = 0.;
-
// Determination of the minimum intensity of detection between R12 et R13
- return static_cast<double>( MIN( R12, R13 ) );
+ return static_cast<double>(MIN(R12, R13));
}
-
/**
* Standard "PrintSelf" method
*/
-template <class TInputImage, class TOutputImage, class TOutputImageDirection, class TInterpolator >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection, class TInterpolator>
void
-LineRatioDetectorImageFilter< TInputImage, TOutputImage, TOutputImageDirection, TInterpolator >
+LineRatioDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection, TInterpolator>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
-
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbLineSegmentDetector.h b/Code/FeatureExtraction/otbLineSegmentDetector.h
index 3129b919b8..922d2471fc 100644
--- a/Code/FeatureExtraction/otbLineSegmentDetector.h
+++ b/Code/FeatureExtraction/otbLineSegmentDetector.h
@@ -18,7 +18,6 @@
#ifndef __otbLineSegmentDetector_h
#define __otbLineSegmentDetector_h
-
#include "otbImageToLineSpatialObjectListFilter.h"
#include "otbLineSpatialObjectList.h"
#include "otbImage.h"
@@ -28,48 +27,47 @@
#include "itkGradientRecursiveGaussianImageFilter.h"
#include "itkGradientImageFilter.h"
-
namespace otb
{
namespace Functor
+{
+/** \class MagnitudeFunctor
+ * \brief This functor computes the magnitude of a covariant vector.
+ */
+template <class TInputPixel, class TOutputPixel>
+class MagnitudeFunctor
+{
+public:
+
+ inline TOutputPixel operator ()(const TInputPixel& input)
{
- /** \class MagnitudeFunctor
- * \brief This functor computes the magnitude of a covariant vector.
- */
- template <class TInputPixel,class TOutputPixel>
- class MagnitudeFunctor
- {
- public:
-
- inline TOutputPixel operator()(const TInputPixel& input)
- {
- return static_cast<TOutputPixel>(2*vcl_sqrt(input[0]*input[0] + input[1]*input[1] ));
- }
- };
-
- /** \class OrientationFunctor
- * \brief This functor computes the orientation of a cavariant vector<br>
- * Orientation values lies between 0 and 2*Pi.
- */
- template <class TInputPixel,class TOutputPixel>
- class OrientationFunctor
- {
- public:
+ return static_cast<TOutputPixel>(2 * vcl_sqrt(input[0] * input[0] + input[1] * input[1]));
+ }
+};
+
+/** \class OrientationFunctor
+ * \brief This functor computes the orientation of a cavariant vector<br>
+ * Orientation values lies between 0 and 2*Pi.
+ */
+template <class TInputPixel, class TOutputPixel>
+class OrientationFunctor
+{
+public:
- inline TOutputPixel operator()(const TInputPixel& input)
- {
- TOutputPixel resp = static_cast<TOutputPixel>(vcl_atan2(input[0],-input[1]));
+ inline TOutputPixel operator ()(const TInputPixel& input)
+ {
+ TOutputPixel resp = static_cast<TOutputPixel>(vcl_atan2(input[0], -input[1]));
- if (resp< itk::NumericTraits<TOutputPixel>::Zero)
- {
- resp = -resp;
- }
+ if (resp < itk::NumericTraits<TOutputPixel>::Zero)
+ {
+ resp = -resp;
+ }
- return resp;
- }
- };
- }// end namespace Functor
+ return resp;
+ }
+};
+} // end namespace Functor
/** \class LineSegmentDetector
* \brief this class implement a fast line detector with false detection control using
@@ -81,94 +79,92 @@ namespace Functor
*
*/
-template <class TInputImage,class TPrecision = double>
+template <class TInputImage, class TPrecision = double>
class ITK_EXPORT LineSegmentDetector :
- public otb::ImageToLineSpatialObjectListFilter< TInputImage >
+ public otb::ImageToLineSpatialObjectListFilter<TInputImage>
{
- public:
+public:
/** typedef for the classes standards. */
- typedef LineSegmentDetector Self;
- typedef ImageToLineSpatialObjectListFilter< TInputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LineSegmentDetector Self;
+ typedef ImageToLineSpatialObjectListFilter<TInputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for management of the object factory. */
itkNewMacro(Self);
/** Return the name of the class. */
- itkTypeMacro(LineSegmentDetector,ImageToLineSpatialObjectListFilter );
+ itkTypeMacro(LineSegmentDetector, ImageToLineSpatialObjectListFilter);
/** Definition of the input image and the output ObjectList*/
- typedef TInputImage InputImageType;
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::IndexType InputIndexType;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::RegionType RegionType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::IndexType InputIndexType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::RegionType RegionType;
/** Definition of the list of lines. */
- typedef LineSpatialObjectList LineSpatialObjectListType;
- typedef LineSpatialObjectListType::Pointer LineSpatialObjectListPointer;
- typedef LineSpatialObjectListType::LineType LineSpatialObjectType;
- typedef LineSpatialObjectType::PointListType PointListType;
- typedef LineSpatialObjectType::LinePointType PointType;
-
+ typedef LineSpatialObjectList LineSpatialObjectListType;
+ typedef LineSpatialObjectListType::Pointer LineSpatialObjectListPointer;
+ typedef LineSpatialObjectListType::LineType LineSpatialObjectType;
+ typedef LineSpatialObjectType::PointListType PointListType;
+ typedef LineSpatialObjectType::LinePointType PointType;
/** Definition of temporary image ised to store LABELS*/
- typedef Image<TPrecision ,2> OutputImageType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::IndexType OutputIndexType;
- typedef typename OutputImageType::SizeType OutputSizeType;
+ typedef Image<TPrecision, 2> OutputImageType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::IndexType OutputIndexType;
+ typedef typename OutputImageType::SizeType OutputSizeType;
/** Histogram to store the coordinate of ordered pixels*/
- typedef std::vector<OutputIndexType> IndexVectorType;
- typedef typename IndexVectorType::iterator IndexVectorIteratorType;
- typedef std::vector<IndexVectorType > CoordinateHistogramType;
- typedef typename CoordinateHistogramType::iterator CoordinateHistogramIteratorType;
-
+ typedef std::vector<OutputIndexType> IndexVectorType;
+ typedef typename IndexVectorType::iterator IndexVectorIteratorType;
+ typedef std::vector<IndexVectorType> CoordinateHistogramType;
+ typedef typename CoordinateHistogramType::iterator CoordinateHistogramIteratorType;
/** typedef structure to store REGION*/
- typedef std::vector<IndexVectorType> VectorOfIndexVectorType;
- typedef std::vector<float> DirectionVectorType;
- typedef typename DirectionVectorType::iterator DirectionVectorIteratorType;
+ typedef std::vector<IndexVectorType> VectorOfIndexVectorType;
+ typedef std::vector<float> DirectionVectorType;
+ typedef typename DirectionVectorType::iterator DirectionVectorIteratorType;
/** */
- typedef itk::GradientRecursiveGaussianImageFilter<OutputImageType > GradientFilterType;
+ typedef itk::GradientRecursiveGaussianImageFilter<OutputImageType> GradientFilterType;
//typedef itk::GradientImageFilter<InputImageType > GradientFilterType;
- typedef typename GradientFilterType::Pointer GradientFilterPointerType;
+ typedef typename GradientFilterType::Pointer GradientFilterPointerType;
typedef typename GradientFilterType::OutputImageType GradientOutputImageType;
-
- typedef itk::UnaryFunctorImageFilter<GradientOutputImageType,OutputImageType,
- Functor::MagnitudeFunctor<typename GradientOutputImageType::PixelType,TPrecision> > MagnitudeFilterType;
- typedef typename MagnitudeFilterType::Pointer MagnitudeFilterPointerType;
- typedef typename MagnitudeFilterType::OutputImageType::PixelType MagnitudePixelType;
- typedef typename MagnitudeFilterType::OutputImageType MagnitudeImageType;
- typedef typename MagnitudeImageType::Pointer MagnitudeImagePointerType;
-
- typedef itk::UnaryFunctorImageFilter<GradientOutputImageType,OutputImageType,
- Functor::OrientationFunctor<typename GradientOutputImageType::PixelType,TPrecision> > OrientationFilterType;
- typedef typename OrientationFilterType::Pointer OrientationFilterPointerType;
- typedef typename OrientationFilterType::OutputImageType OutputImageDirType;
- typedef typename OutputImageDirType::RegionType OutputImageDirRegionType;
+ typedef itk::UnaryFunctorImageFilter<GradientOutputImageType, OutputImageType,
+ Functor::MagnitudeFunctor<typename GradientOutputImageType::PixelType,
+ TPrecision> > MagnitudeFilterType;
+ typedef typename MagnitudeFilterType::Pointer MagnitudeFilterPointerType;
+ typedef typename MagnitudeFilterType::OutputImageType::PixelType MagnitudePixelType;
+ typedef typename MagnitudeFilterType::OutputImageType MagnitudeImageType;
+ typedef typename MagnitudeImageType::Pointer MagnitudeImagePointerType;
+
+ typedef itk::UnaryFunctorImageFilter<GradientOutputImageType, OutputImageType,
+ Functor::OrientationFunctor<typename GradientOutputImageType::PixelType,
+ TPrecision> > OrientationFilterType;
+ typedef typename OrientationFilterType::Pointer OrientationFilterPointerType;
+ typedef typename OrientationFilterType::OutputImageType OutputImageDirType;
+ typedef typename OutputImageDirType::RegionType OutputImageDirRegionType;
/** Create an image to store the label USED(1) or notUsed (0)*/
- typedef otb::Image<unsigned char, 2> LabelImageType;
- typedef typename LabelImageType::Pointer LabelImagePointerType;
+ typedef otb::Image<unsigned char, 2> LabelImageType;
+ typedef typename LabelImageType::Pointer LabelImagePointerType;
/** Vector to store the rectangle characteization center, width, orientation ,( begin ,end ) of the central line*/
- typedef std::vector<double> RectangleType;
- typedef typename RectangleType::iterator RectangleIteratorType;
- typedef std::vector< RectangleType> RectangleListType;
- typedef typename RectangleListType::iterator RectangleListTypeIterator;
-
+ typedef std::vector<double> RectangleType;
+ typedef typename RectangleType::iterator RectangleIteratorType;
+ typedef std::vector<RectangleType> RectangleListType;
+ typedef typename RectangleListType::iterator RectangleListTypeIterator;
itkSetMacro(ImageSize, SizeType);
itkGetMacro(ImageSize, SizeType);
protected:
LineSegmentDetector();
- virtual ~LineSegmentDetector() {};
+ virtual ~LineSegmentDetector() {}
/** Before Generate Data method*/
virtual void BeforeGenerateData();
@@ -179,20 +175,19 @@ protected:
* this method is used to determine the seeds where to begin the search segments
* Points with large gradient modulus are more able to belong to a segment
*/
- virtual CoordinateHistogramType SortImageByModulusValue(MagnitudeImagePointerType modulusImage);
+ virtual CoordinateHistogramType SortImageByModulusValue(MagnitudeImagePointerType modulusImage);
/** */
- virtual void LineSegmentDetection(CoordinateHistogramType & CoordinateHistogram);
+ virtual void LineSegmentDetection(CoordinateHistogramType& CoordinateHistogram);
/** */
- virtual bool IsUsed(InputIndexType & index) const;
-
- /** Set Pixel flag to USED*/
- virtual void SetPixelToUsed(InputIndexType index);
+ virtual bool IsUsed(InputIndexType& index) const;
+ /** Set Pixel flag to USED*/
+ virtual void SetPixelToUsed(InputIndexType index);
/** search for a segment which begins from a seed "index "*/
- virtual void GrowRegion(InputIndexType index);
+ virtual void GrowRegion(InputIndexType index);
/** Define if two are aligned */
virtual bool IsAligned(double Angle, double regionAngle, double prec) const;
@@ -201,26 +196,25 @@ protected:
virtual int ComputeRectangles();
/** */
- virtual void Region2Rect(IndexVectorType region , double angleRegion);
+ virtual void Region2Rect(IndexVectorType region, double angleRegion);
/** */
- virtual double ComputeRegionOrientation(IndexVectorType region , double x, double y , double angleRegion) const;
+ virtual double ComputeRegionOrientation(IndexVectorType region, double x, double y, double angleRegion) const;
/** */
virtual double angle_diff(double a, double b) const;
/** Compute the Number Of False Alarm for a rectangle*/
- virtual double ComputeRectNFA(const RectangleType & rec) const;
+ virtual double ComputeRectNFA(const RectangleType& rec) const;
/** */
- virtual double ImproveRectangle(RectangleType & rec) const;
+ virtual double ImproveRectangle(RectangleType& rec) const;
/** NFA For a rectangle*/
virtual double NFA(int n, int k, double p, double logNT) const;
/** Create a copy of a rectangle*/
- virtual void CopyRectangle(RectangleType & rDst , RectangleType & rSrc ) const;
-
+ virtual void CopyRectangle(RectangleType& rDst, RectangleType& rSrc) const;
/** Rutines from numerical recipes*/
virtual double betacf(double a, double b, double x) const;
@@ -231,26 +225,25 @@ protected:
/** Printself method*/
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
private:
- LineSegmentDetector(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LineSegmentDetector(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- VectorOfIndexVectorType m_RegionList;
- DirectionVectorType m_DirectionVector;
- LabelImagePointerType m_UsedPointImage;
- RectangleListType m_RectangleList;
+ VectorOfIndexVectorType m_RegionList;
+ DirectionVectorType m_DirectionVector;
+ LabelImagePointerType m_UsedPointImage;
+ RectangleListType m_RectangleList;
- double m_Threshold;
- double m_Prec;
- double m_DirectionsAllowed;
- unsigned int m_MinimumRegionSize;
- unsigned int m_NumberOfImagePixels;
+ double m_Threshold;
+ double m_Prec;
+ double m_DirectionsAllowed;
+ unsigned int m_MinimumRegionSize;
+ unsigned int m_NumberOfImagePixels;
/** The image size has to be the LargestPosssibleRegion in the case
* (streaming uses (streaming decorator).
*/
- SizeType m_ImageSize;
+ SizeType m_ImageSize;
/** Gradient filter */
GradientFilterPointerType m_GradientFilter;
@@ -262,8 +255,7 @@ private:
OrientationFilterPointerType m_OrientationFilter;
/** Output*/
- LineSpatialObjectListPointer m_LineList;
-
+ LineSpatialObjectListPointer m_LineList;
};
} // end namespace otb
@@ -272,6 +264,4 @@ private:
#include "otbLineSegmentDetector.txx"
#endif
-
#endif
-
diff --git a/Code/FeatureExtraction/otbLineSegmentDetector.txx b/Code/FeatureExtraction/otbLineSegmentDetector.txx
index f2c794c684..689c5af317 100644
--- a/Code/FeatureExtraction/otbLineSegmentDetector.txx
+++ b/Code/FeatureExtraction/otbLineSegmentDetector.txx
@@ -36,7 +36,6 @@
#include "itkMatrix.h"
#include "itkSymmetricEigenAnalysis.h"
-
#define MAXIT 100
#define EPS 3.0e-7
#define FPMIN 1.0e-30
@@ -48,11 +47,11 @@ namespace otb
*
*/
template <class TInputImage, class TPrecision>
-LineSegmentDetector<TInputImage,TPrecision >
+LineSegmentDetector<TInputImage, TPrecision>
::LineSegmentDetector()
{
- m_DirectionsAllowed = 1./8.;
+ m_DirectionsAllowed = 1. / 8.;
m_Prec = CONST_PI * m_DirectionsAllowed;
m_Threshold = 2.;
@@ -70,15 +69,14 @@ LineSegmentDetector<TInputImage,TPrecision >
m_ImageSize.Fill(0);
}
-
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
void
-LineSegmentDetector<TInputImage,TPrecision >
+LineSegmentDetector<TInputImage, TPrecision>
::BeforeGenerateData()
{
- if( this->GetInput()->GetRequestedRegion() != this->GetInput()->GetLargestPossibleRegion() )
+ if (this->GetInput()->GetRequestedRegion() != this->GetInput()->GetLargestPossibleRegion())
{
- itkExceptionMacro(<<"No streamed filter. ERROR : requested region is not the largest possible region.");
+ itkExceptionMacro(<< "No streamed filter. ERROR : requested region is not the largest possible region.");
}
/** Allocate memory for the temporary label Image*/
@@ -87,14 +85,13 @@ LineSegmentDetector<TInputImage,TPrecision >
m_UsedPointImage->FillBuffer(0);
}
-
/**
*
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
void
-LineSegmentDetector<TInputImage,TPrecision >
+LineSegmentDetector<TInputImage, TPrecision>
::GenerateData()
{
this->BeforeGenerateData();
@@ -103,8 +100,8 @@ LineSegmentDetector<TInputImage,TPrecision >
m_LineList = this->GetOutput();
/** Cast the MagnitudeOutput Image in */
- typedef itk::CastImageFilter<InputImageType, OutputImageType> castFilerType;
- typename castFilerType::Pointer castFilter = castFilerType::New();
+ typedef itk::CastImageFilter<InputImageType, OutputImageType> castFilerType;
+ typename castFilerType::Pointer castFilter = castFilerType::New();
castFilter->SetInput(this->GetInput());
/** Compute the modulus and the orientation gradient image*/
@@ -117,7 +114,7 @@ LineSegmentDetector<TInputImage,TPrecision >
m_OrientationFilter->Update();
/** Compute the seed histogram to begin the search*/
- CoordinateHistogramType CoordinateHistogram;
+ CoordinateHistogramType CoordinateHistogram;
CoordinateHistogram = this->SortImageByModulusValue(m_MagnitudeFilter->GetOutput());
/** Serach the segments on the image by growing a region from a seed */
@@ -136,32 +133,31 @@ LineSegmentDetector<TInputImage,TPrecision >
*
*/
-template <class TInputImage, class TPrecision >
-typename LineSegmentDetector<TInputImage,TPrecision >
+template <class TInputImage, class TPrecision>
+typename LineSegmentDetector<TInputImage, TPrecision>
::CoordinateHistogramType
-LineSegmentDetector<TInputImage,TPrecision >
+LineSegmentDetector<TInputImage, TPrecision>
::SortImageByModulusValue(MagnitudeImagePointerType modulusImage)
{
- if(m_ImageSize[0]==0 && m_ImageSize[1]==0)
- m_ImageSize = this->GetInput()->GetLargestPossibleRegion().GetSize();
+ if (m_ImageSize[0] == 0 && m_ImageSize[1] == 0) m_ImageSize = this->GetInput()->GetLargestPossibleRegion().GetSize();
m_NumberOfImagePixels = static_cast<unsigned int>(m_ImageSize[1] * m_ImageSize[0]);
/**
* Compute the minimum region size
*/
- double logNT = 5.*(vcl_log10(static_cast<double>(m_ImageSize[0])) + vcl_log10(static_cast<double>(m_ImageSize[1])))/2.;
+ double logNT = 5. *
+ (vcl_log10(static_cast<double>(m_ImageSize[0])) + vcl_log10(static_cast<double>(m_ImageSize[1]))) / 2.;
double log1_p = vcl_log10(m_DirectionsAllowed);
- double rapport = logNT/log1_p;
- m_MinimumRegionSize = -1*static_cast<unsigned int>(rapport);
-
+ double rapport = logNT / log1_p;
+ m_MinimumRegionSize = -1 * static_cast<unsigned int>(rapport);
/** Definition of the min & the max of an image*/
- OutputPixelType min = itk::NumericTraits<TPrecision>::Zero;
- OutputPixelType max = itk::NumericTraits<TPrecision>::Zero;
+ OutputPixelType min = itk::NumericTraits<TPrecision>::Zero;
+ OutputPixelType max = itk::NumericTraits<TPrecision>::Zero;
/** Computing the min & max of the image*/
- typedef itk::MinimumMaximumImageCalculator<OutputImageType> MinMaxCalculatorFilter;
+ typedef itk::MinimumMaximumImageCalculator<OutputImageType> MinMaxCalculatorFilter;
typename MinMaxCalculatorFilter::Pointer minmaxCalculator = MinMaxCalculatorFilter::New();
minmaxCalculator->SetImage(modulusImage);
@@ -171,60 +167,59 @@ LineSegmentDetector<TInputImage,TPrecision >
max = minmaxCalculator->GetMaximum();
/** Compute the threshold on the gradient*/
- m_Threshold = 4*m_Threshold /vcl_sin(m_Prec)*((max-min)/255.); // threshold normalized with min & max of the values
+ m_Threshold = 4 * m_Threshold / vcl_sin(m_Prec) * ((max - min) / 255.); // threshold normalized with min & max of the values
/** Computing the length of the bins*/
unsigned int NbBin = 10;
- double lengthBin = static_cast<double>((max - min))/static_cast<double>(NbBin-1);
+ double lengthBin = static_cast<double>((max - min)) / static_cast<double>(NbBin - 1);
CoordinateHistogramType tempHisto(NbBin); /** Initializing the histogram */
// New region : without boundaries
- RegionType region;
- SizeType size = modulusImage->GetRequestedRegion().GetSize();
+ RegionType region;
+ SizeType size = modulusImage->GetRequestedRegion().GetSize();
InputIndexType id = modulusImage->GetRequestedRegion().GetIndex();
-
// Don't take in carre the boudary of the image.
// Special cases for streamed call
- if( modulusImage->GetRequestedRegion().GetIndex()[0] == 0)
+ if (modulusImage->GetRequestedRegion().GetIndex()[0] == 0)
{
- id[0]++;
- size[0]--;
- if( modulusImage->GetRequestedRegion().GetSize()[0]+modulusImage->GetRequestedRegion().GetIndex()[0] == m_ImageSize[0])
- size[0]--;
+ id[0]++;
+ size[0]--;
+ if (modulusImage->GetRequestedRegion().GetSize()[0] + modulusImage->GetRequestedRegion().GetIndex()[0] ==
+ m_ImageSize[0]) size[0]--;
}
- else if( modulusImage->GetRequestedRegion().GetSize()[0]+modulusImage->GetRequestedRegion().GetIndex()[0] == m_ImageSize[0])
+ else if (modulusImage->GetRequestedRegion().GetSize()[0] + modulusImage->GetRequestedRegion().GetIndex()[0] ==
+ m_ImageSize[0])
{
- size[0]--;
+ size[0]--;
}
-
- if( modulusImage->GetRequestedRegion().GetIndex()[1] == 0)
+
+ if (modulusImage->GetRequestedRegion().GetIndex()[1] == 0)
{
- id[1]++;
- size[1]--;
- if( modulusImage->GetRequestedRegion().GetSize()[1]+modulusImage->GetRequestedRegion().GetIndex()[1] == m_ImageSize[1])
- size[1]--;
+ id[1]++;
+ size[1]--;
+ if (modulusImage->GetRequestedRegion().GetSize()[1] + modulusImage->GetRequestedRegion().GetIndex()[1] ==
+ m_ImageSize[1]) size[1]--;
}
- else if( modulusImage->GetRequestedRegion().GetSize()[1]+modulusImage->GetRequestedRegion().GetIndex()[1] == m_ImageSize[1])
+ else if (modulusImage->GetRequestedRegion().GetSize()[1] + modulusImage->GetRequestedRegion().GetIndex()[1] ==
+ m_ImageSize[1])
{
- size[1]--;
+ size[1]--;
}
-
+
region.SetIndex(id);
region.SetSize(size);
itk::ImageRegionIterator<OutputImageType> it(modulusImage, region);
-
it.GoToBegin();
- while(!it.IsAtEnd())
+ while (!it.IsAtEnd())
{
- OutputIndexType index = it.GetIndex();
- unsigned int bin = static_cast<unsigned int> (static_cast<double>(it.Value())/lengthBin);
- if( it.Value()- m_Threshold >1e-10 )
- tempHisto[NbBin-bin-1].push_back(it.GetIndex());
-
- ++it;
+ OutputIndexType index = it.GetIndex();
+ unsigned int bin = static_cast<unsigned int> (static_cast<double>(it.Value()) / lengthBin);
+ if (it.Value() - m_Threshold > 1e-10) tempHisto[NbBin - bin - 1].push_back(it.GetIndex());
+
+ ++it;
}
return tempHisto;
@@ -235,30 +230,30 @@ LineSegmentDetector<TInputImage,TPrecision >
* Method used to search the segments
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
void
LineSegmentDetector<TInputImage, TPrecision>
-::LineSegmentDetection(CoordinateHistogramType & CoordinateHistogram)
+::LineSegmentDetection(CoordinateHistogramType& CoordinateHistogram)
{
/** Begin the search of the segments*/
- CoordinateHistogramIteratorType ItCoordinateList = CoordinateHistogram.begin();
+ CoordinateHistogramIteratorType ItCoordinateList = CoordinateHistogram.begin();
- while(ItCoordinateList != CoordinateHistogram.end())
+ while (ItCoordinateList != CoordinateHistogram.end())
{
- typename IndexVectorType::iterator ItIndexVector = (*ItCoordinateList).begin();
- while(ItIndexVector != (*ItCoordinateList).end())
+ typename IndexVectorType::iterator ItIndexVector = (*ItCoordinateList).begin();
+ while (ItIndexVector != (*ItCoordinateList).end())
+ {
+ InputIndexType index = *(ItIndexVector);
+
+ /** If the point is not yet computed */
+ if (!this->IsUsed(index))
{
- InputIndexType index = *(ItIndexVector);
-
- /** If the point is not yet computed */
- if(!this->IsUsed(index))
- {
- this->GrowRegion(index);
- }
- ++ItIndexVector;
+ this->GrowRegion(index);
}
- ++ItCoordinateList;
+ ++ItIndexVector;
+ }
+ ++ItCoordinateList;
}
}
@@ -267,58 +262,56 @@ LineSegmentDetector<TInputImage, TPrecision>
* Method used to compute rectangles from region
* Here you can access the NFA for each region
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
int
LineSegmentDetector<TInputImage, TPrecision>
::ComputeRectangles()
{
/** Check the size of the region list */
unsigned int sizeRegion = m_RegionList.size();
- if(sizeRegion ==0)
- return EXIT_FAILURE;
+ if (sizeRegion == 0) return EXIT_FAILURE;
/** Compute the rectangle*/
- CoordinateHistogramIteratorType ItRegion = m_RegionList.begin();
- DirectionVectorIteratorType ItDir = m_DirectionVector.begin();
+ CoordinateHistogramIteratorType ItRegion = m_RegionList.begin();
+ DirectionVectorIteratorType ItDir = m_DirectionVector.begin();
- while(ItRegion != m_RegionList.end() && ItDir !=m_DirectionVector.end() )
+ while (ItRegion != m_RegionList.end() && ItDir != m_DirectionVector.end())
{
- this->Region2Rect(*ItRegion, *ItDir );
- ++ItRegion;
- ++ItDir;
+ this->Region2Rect(*ItRegion, *ItDir);
+ ++ItRegion;
+ ++ItDir;
}
/** Improve the rectangles & store the lines*/
- RectangleListTypeIterator itRec = m_RectangleList.begin();
- while(itRec != m_RectangleList.end())
+ RectangleListTypeIterator itRec = m_RectangleList.begin();
+ while (itRec != m_RectangleList.end())
{
- double NFA = this->ComputeRectNFA((*itRec));
- /**
- * Here we start building the OUTPUT :a LineSpatialObjectList.
- */
- if(NFA > 0.)
- {
- PointListType pointList;
- PointType point;
-
- point.SetPosition(static_cast<TPrecision>((*itRec)[0]),static_cast<TPrecision>((*itRec)[1]));
- pointList.push_back(point);
- point.SetPosition(static_cast<TPrecision>((*itRec)[2]),static_cast<TPrecision>((*itRec)[3]));
- pointList.push_back(point);
-
- typename LineSpatialObjectType::Pointer line = LineSpatialObjectType::New();
- line->SetId(0);
- line->SetPoints( pointList );
- line->ComputeBoundingBox();
- m_LineList->push_back(line);
- pointList.clear();
- }
-
- ++itRec;
+ double NFA = this->ComputeRectNFA((*itRec));
+ /**
+ * Here we start building the OUTPUT :a LineSpatialObjectList.
+ */
+ if (NFA > 0.)
+ {
+ PointListType pointList;
+ PointType point;
+
+ point.SetPosition(static_cast<TPrecision>((*itRec)[0]), static_cast<TPrecision>((*itRec)[1]));
+ pointList.push_back(point);
+ point.SetPosition(static_cast<TPrecision>((*itRec)[2]), static_cast<TPrecision>((*itRec)[3]));
+ pointList.push_back(point);
+
+ typename LineSpatialObjectType::Pointer line = LineSpatialObjectType::New();
+ line->SetId(0);
+ line->SetPoints(pointList);
+ line->ComputeBoundingBox();
+ m_LineList->push_back(line);
+ pointList.clear();
+ }
+
+ ++itRec;
}
-
return EXIT_SUCCESS;
}
@@ -326,17 +319,17 @@ LineSegmentDetector<TInputImage, TPrecision>
/**
* Copy a rectangle rSrc in a rectangle rDst
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
void
LineSegmentDetector<TInputImage, TPrecision>
-::CopyRectangle(RectangleType & rDst , RectangleType & rSrc ) const
+::CopyRectangle(RectangleType& rDst, RectangleType& rSrc) const
{
- RectangleIteratorType itSrc = rSrc.begin();
+ RectangleIteratorType itSrc = rSrc.begin();
- while(itSrc != rSrc.end())
+ while (itSrc != rSrc.end())
{
- rDst.push_back(*(itSrc));
- ++itSrc;
+ rDst.push_back(*(itSrc));
+ ++itSrc;
}
}
@@ -345,110 +338,108 @@ LineSegmentDetector<TInputImage, TPrecision>
* Method used to compute improve the NFA of The rectangle by changing
* the components of the rectangle
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
double
LineSegmentDetector<TInputImage, TPrecision>
-:: ImproveRectangle(RectangleType & rec) const
+::ImproveRectangle(RectangleType& rec) const
{
- int n = 0;
- double nfa_new;
- double delta = 0.5;
- double delta_2 = delta / 2.0;
+ int n = 0;
+ double nfa_new;
+ double delta = 0.5;
+ double delta_2 = delta / 2.0;
RectangleType r;
double NFA = this->ComputeRectNFA(rec);
- if( NFA > 0. ) return NFA;
+ if (NFA > 0.) return NFA;
/*Try to improve the precison of the oriented */
- CopyRectangle(r ,rec );
- for(n=0; n<5; ++n)
+ CopyRectangle(r, rec);
+ for (n = 0; n < 5; ++n)
{
- r[7] /= 2.0;
- r[6] = CONST_PI * r[7]; // prec = rec[6]
- nfa_new = this->ComputeRectNFA(r);
- if( nfa_new > NFA )
- {
- NFA = nfa_new;
- CopyRectangle(rec ,r );
- }
+ r[7] /= 2.0;
+ r[6] = CONST_PI * r[7]; // prec = rec[6]
+ nfa_new = this->ComputeRectNFA(r);
+ if (nfa_new > NFA)
+ {
+ NFA = nfa_new;
+ CopyRectangle(rec, r);
+ }
}
-
- if( NFA > 0. ) return NFA;
-
+ if (NFA > 0.) return NFA;
/*Try to improve the width of the rectangle*/
- CopyRectangle(r ,rec );
- for(n=0; n<5; ++n)
+ CopyRectangle(r, rec);
+ for (n = 0; n < 5; ++n)
{
- r[4] -= delta; //r[4] is stored as the width
- nfa_new = this->ComputeRectNFA(r);
- if( nfa_new > NFA )
- {
- NFA = nfa_new;
- CopyRectangle(rec ,r );
- }
+ r[4] -= delta; //r[4] is stored as the width
+ nfa_new = this->ComputeRectNFA(r);
+ if (nfa_new > NFA)
+ {
+ NFA = nfa_new;
+ CopyRectangle(rec, r);
+ }
}
- if( NFA > 0. ) return NFA;
+ if (NFA > 0.) return NFA;
/*Try to improve the extremity of the segments*/
- CopyRectangle(r ,rec );
- for(n=0; n<5; ++n)
+ CopyRectangle(r, rec);
+ for (n = 0; n < 5; ++n)
{
- if( (r[4] - delta) >= 0.5 )
+ if ((r[4] - delta) >= 0.5)
+ {
+ r[0] += -vcl_sin(r[5]) * delta_2;
+ r[1] += vcl_cos(r[5]) * delta_2;
+ r[2] += -vcl_sin(r[5]) * delta_2;
+ r[3] += vcl_cos(r[5]) * delta_2;
+ r[4] -= delta;
+
+ nfa_new = this->ComputeRectNFA(r);
+ if (nfa_new > NFA)
{
- r[0] += -vcl_sin(r[5]) * delta_2;
- r[1] += vcl_cos(r[5])* delta_2;
- r[2] += -vcl_sin(r[5])* delta_2;
- r[3] += vcl_cos(r[5])* delta_2;
- r[4] -= delta;
-
- nfa_new = this->ComputeRectNFA(r);
- if( nfa_new > NFA )
- {
- NFA = nfa_new;
- CopyRectangle(rec ,r );
- }
+ NFA = nfa_new;
+ CopyRectangle(rec, r);
}
+ }
}
- if( NFA > 0. ) return NFA;
+ if (NFA > 0.) return NFA;
- CopyRectangle(r, rec );
- for(n=0; n<5; ++n)
+ CopyRectangle(r, rec);
+ for (n = 0; n < 5; ++n)
{
- if( (r[4] - delta) >= 0.5 )
+ if ((r[4] - delta) >= 0.5)
+ {
+ r[0] -= -vcl_sin(r[5]) * delta_2;
+ r[1] -= vcl_cos(r[5]) * delta_2;
+ r[2] -= -vcl_sin(r[5]) * delta_2;
+ r[3] -= vcl_cos(r[5]) * delta_2;
+ r[4] -= delta;
+
+ nfa_new = this->ComputeRectNFA(r);
+ if (nfa_new > NFA)
{
- r[0] -= -vcl_sin(r[5]) * delta_2;
- r[1] -= vcl_cos(r[5])* delta_2;
- r[2] -= -vcl_sin(r[5])* delta_2;
- r[3] -= vcl_cos(r[5])* delta_2;
- r[4] -= delta;
-
- nfa_new = this->ComputeRectNFA(r);
- if( nfa_new > NFA )
- {
- NFA = nfa_new;
- CopyRectangle(rec ,r );
- }
+ NFA = nfa_new;
+ CopyRectangle(rec, r);
}
+ }
}
- if( NFA > 0. ) return NFA;
+ if (NFA > 0.) return NFA;
/*Try to improve the precision again */
- CopyRectangle(r ,rec );
- for(n=0; n<5; ++n)
+ CopyRectangle(r, rec);
+ for (n = 0; n < 5; ++n)
{
- r[7] /= 2.0;
- r[6] = CONST_PI * r[7]; // prec = rec[]
- nfa_new = this->ComputeRectNFA(r);
- if( nfa_new > NFA )
- {
- NFA = nfa_new;
- CopyRectangle(rec ,r );
- }
+ r[7] /= 2.0;
+ r[6] = CONST_PI * r[7]; // prec = rec[]
+ nfa_new = this->ComputeRectNFA(r);
+ if (nfa_new > NFA)
+ {
+ NFA = nfa_new;
+ CopyRectangle(rec, r);
+ }
}
- if( NFA > 0. ) return NFA;
+ if (NFA > 0.) return NFA;
return NFA;
@@ -458,28 +449,28 @@ LineSegmentDetector<TInputImage, TPrecision>
/**
* Method IsUsed : Determine if a point was used or not. search in the m_LabelImage
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
bool
LineSegmentDetector<TInputImage, TPrecision>
-::IsUsed(InputIndexType & index) const
+::IsUsed(InputIndexType& index) const
{
bool isUsed = false;
- typedef itk::ImageConstIterator<LabelImageType> ImageIteratorType;
- RegionType region = m_UsedPointImage->GetLargestPossibleRegion();
+ typedef itk::ImageConstIterator<LabelImageType> ImageIteratorType;
+ RegionType region = m_UsedPointImage->GetLargestPossibleRegion();
InputIndexType indexRef = region.GetIndex();
- ImageIteratorType itLabel(m_UsedPointImage,region);
+ ImageIteratorType itLabel(m_UsedPointImage, region);
itLabel.GoToBegin();
- if( m_UsedPointImage->GetLargestPossibleRegion().IsInside(index) )
+ if (m_UsedPointImage->GetLargestPossibleRegion().IsInside(index))
{
- itLabel.SetIndex(index);
- if( itLabel.Get() == 1 )
- isUsed = true;
+ itLabel.SetIndex(index);
+ if (itLabel.Get() == 1) isUsed = true;
}
else
{
- itkExceptionMacro(<<"Can't access to index "<<index<<", outside the image largest region ("<<region.GetIndex()<<", "<<region.GetSize()<<")");
+ itkExceptionMacro(<< "Can't access to index " << index << ", outside the image largest region (" << region.GetIndex(
+ ) << ", " << region.GetSize() << ")");
}
// typedef itk::NeighborhoodIterator<LabelImageType> NeighborhoodLabelIteratorType;
// typename NeighborhoodLabelIteratorType::SizeType radiusLabel;
@@ -498,15 +489,15 @@ LineSegmentDetector<TInputImage, TPrecision>
/**
* Method SetPixelToUsed : Seta pixel to used
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
void
LineSegmentDetector<TInputImage, TPrecision>
-::SetPixelToUsed(InputIndexType index)
+::SetPixelToUsed(InputIndexType index)
{
- typedef itk::NeighborhoodIterator<LabelImageType> NeighborhoodLabelIteratorType;
- typename NeighborhoodLabelIteratorType::SizeType radiusLabel;
+ typedef itk::NeighborhoodIterator<LabelImageType> NeighborhoodLabelIteratorType;
+ typename NeighborhoodLabelIteratorType::SizeType radiusLabel;
radiusLabel.Fill(0);
- NeighborhoodLabelIteratorType itLabel(radiusLabel,m_UsedPointImage,
+ NeighborhoodLabelIteratorType itLabel(radiusLabel, m_UsedPointImage,
m_UsedPointImage->GetRequestedRegion());
itLabel.SetLocation(index);
itLabel.SetCenterPixel(1); // 1 : Set the point status to : Used Point
@@ -517,26 +508,27 @@ LineSegmentDetector<TInputImage, TPrecision>
* Method GrowRegion : From a seed grow the region to find a connected region with the same orientation
* within a precision (m_Prec)
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
void
LineSegmentDetector<TInputImage, TPrecision>
-::GrowRegion(InputIndexType index )
+::GrowRegion(InputIndexType index)
{
/** Add the point to the used list point*/
this->SetPixelToUsed(index);
/** Neighborhooding */
- typedef itk::ConstNeighborhoodIterator<OutputImageType> NeighborhoodIteratorType;
- typename NeighborhoodIteratorType::SizeType radius;
+ typedef itk::ConstNeighborhoodIterator<OutputImageType> NeighborhoodIteratorType;
+ typename NeighborhoodIteratorType::SizeType radius;
radius.Fill(1);
- NeighborhoodIteratorType itNeigh(radius,m_MagnitudeFilter->GetOutput(),
+ NeighborhoodIteratorType itNeigh(radius, m_MagnitudeFilter->GetOutput(),
m_MagnitudeFilter->GetOutput()->GetRequestedRegion());
- NeighborhoodIteratorType itNeighDir(radius,m_OrientationFilter->GetOutput() ,
- m_OrientationFilter->GetOutput()->GetRequestedRegion());
+ NeighborhoodIteratorType itNeighDir(radius, m_OrientationFilter->GetOutput(),
+ m_OrientationFilter->GetOutput()->
+ GetRequestedRegion());
/** Vector where to store the point belonging to the current region*/
- unsigned int neighSize = itNeigh.GetSize()[0]*itNeigh.GetSize()[1];
- IndexVectorType reg;
+ unsigned int neighSize = itNeigh.GetSize()[0] * itNeigh.GetSize()[1];
+ IndexVectorType reg;
/** Angle of the region*/
double regionAngle = 0;
@@ -546,61 +538,60 @@ LineSegmentDetector<TInputImage, TPrecision>
double sumX = 0.;
double sumY = 0.;
-
/**
* Loop for searching regions
*/
- for (unsigned int cpt = 0; cpt < reg.size(); cpt++ )
+ for (unsigned int cpt = 0; cpt < reg.size(); cpt++)
{
- itNeigh.SetLocation(reg[cpt]);
- itNeighDir.SetLocation(reg[cpt]);
- sumX += vcl_cos(*(itNeighDir.GetCenterValue()));
- sumY += vcl_sin(*(itNeighDir.GetCenterValue()));
- regionAngle = vcl_atan2(sumY,sumX);
-
- unsigned int s = 0;
- while(s < neighSize )
+ itNeigh.SetLocation(reg[cpt]);
+ itNeighDir.SetLocation(reg[cpt]);
+ sumX += vcl_cos(*(itNeighDir.GetCenterValue()));
+ sumY += vcl_sin(*(itNeighDir.GetCenterValue()));
+ regionAngle = vcl_atan2(sumY, sumX);
+
+ unsigned int s = 0;
+ while (s < neighSize)
+ {
+ InputIndexType NeighIndex = itNeigh.GetIndex(s);
+ double angleComp = itNeighDir.GetPixel(s);
+
+ if (this->GetInput()->GetLargestPossibleRegion().IsInside(NeighIndex)) /** Check if the index is inside the image*/
{
- InputIndexType NeighIndex = itNeigh.GetIndex(s);
- double angleComp = itNeighDir.GetPixel(s);
-
- if(this->GetInput()->GetLargestPossibleRegion().IsInside(NeighIndex)) /** Check if the index is inside the image*/
- {
- if( !this->IsUsed(NeighIndex) && this->IsAligned(angleComp, regionAngle, m_Prec) )
- {
-
- this->SetPixelToUsed(NeighIndex);
- reg.push_back(NeighIndex);
- }
- }
- ++s;
+ if (!this->IsUsed(NeighIndex) && this->IsAligned(angleComp, regionAngle, m_Prec))
+ {
+
+ this->SetPixelToUsed(NeighIndex);
+ reg.push_back(NeighIndex);
+ }
}
- }/** End Searching loop*/
+ ++s;
+ }
+ } /** End Searching loop*/
/** Store the region*/
- if(reg.size()> m_MinimumRegionSize && reg.size() < static_cast<unsigned int>(m_NumberOfImagePixels/4))
- {
- m_RegionList.push_back(reg);
- m_DirectionVector.push_back(regionAngle);
- }
+ if (reg.size() > m_MinimumRegionSize && reg.size() < static_cast<unsigned int>(m_NumberOfImagePixels / 4))
+ {
+ m_RegionList.push_back(reg);
+ m_DirectionVector.push_back(regionAngle);
+ }
}
/**************************************************************************************************************/
/**
* The method atan2 gives values of angles modulo PI, put the angle in a rang [0,Pi]
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
bool
LineSegmentDetector<TInputImage, TPrecision>
::IsAligned(double Angle, double regionAngle, double prec) const
{
double diff = Angle - regionAngle;
- if( diff < 0.0 ) diff = -diff;
- if( diff > 1.5*CONST_PI )
+ if (diff < 0.0) diff = -diff;
+ if (diff > 1.5 * CONST_PI)
{
- diff -= CONST_2PI;
- if( diff < 0.0 ) diff = -diff;
+ diff -= CONST_2PI;
+ if (diff < 0.0) diff = -diff;
}
return diff < prec;
@@ -610,100 +601,101 @@ LineSegmentDetector<TInputImage, TPrecision>
/**
* compute the best rectangle possible that
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
void
LineSegmentDetector<TInputImage, TPrecision>
-::Region2Rect(IndexVectorType region , double angleRegion)
+::Region2Rect(IndexVectorType region, double angleRegion)
{
/** Local Variables*/
- double weight = 0.,sumWeight = 0.;
- double x = 0., y = 0.;
- double l_min = 0., l_max = 0.,l =0., w=0. , w_min = 0. , w_max =0.;
+ double weight = 0., sumWeight = 0.;
+ double x = 0., y = 0.;
+ double l_min = 0., l_max = 0., l = 0., w = 0., w_min = 0., w_max = 0.;
/** Neighborhooding again*/
- typedef itk::ConstNeighborhoodIterator<OutputImageType> NeighborhoodIteratorType;
- typename NeighborhoodIteratorType::SizeType radius;
+ typedef itk::ConstNeighborhoodIterator<OutputImageType> NeighborhoodIteratorType;
+ typename NeighborhoodIteratorType::SizeType radius;
radius.Fill(0);
- NeighborhoodIteratorType itNeigh(radius,m_MagnitudeFilter->GetOutput(),
+ NeighborhoodIteratorType itNeigh(radius, m_MagnitudeFilter->GetOutput(),
m_MagnitudeFilter->GetOutput()->GetRequestedRegion());
/** Computing the center of the rectangle*/
- IndexVectorIteratorType it = region.begin();
- while(it != region.end())
+ IndexVectorIteratorType it = region.begin();
+ while (it != region.end())
{
- itNeigh.SetLocation(*it);
- weight = *itNeigh.GetCenterValue();
- x += static_cast<double>((*it)[0])* weight;
- y += static_cast<double>((*it)[1])* weight;
- sumWeight += weight;
- ++it;
+ itNeigh.SetLocation(*it);
+ weight = *itNeigh.GetCenterValue();
+ x += static_cast<double>((*it)[0]) * weight;
+ y += static_cast<double>((*it)[1]) * weight;
+ sumWeight += weight;
+ ++it;
}
- if(sumWeight < 1e-10)
+ if (sumWeight < 1e-10)
{
- x = 0.; y = 0.;
+ x = 0.; y = 0.;
}
else
{
- x/= sumWeight;
- y/= sumWeight;
+ x /= sumWeight;
+ y /= sumWeight;
}
/** Compute the orientation of the region*/
- double theta = this->ComputeRegionOrientation(region , x , y , angleRegion);
+ double theta = this->ComputeRegionOrientation(region, x, y, angleRegion);
/* Lenght & Width of the rectangle **/
- typedef std::vector<MagnitudePixelType> MagnitudeVector;
+ typedef std::vector<MagnitudePixelType> MagnitudeVector;
- unsigned int Diagonal = static_cast< unsigned int>(vnl_math_hypot(static_cast<double>(m_ImageSize[1]) ,static_cast<double>(m_ImageSize[0])) + 2);
- MagnitudeVector sum_l( 2*Diagonal, itk::NumericTraits<MagnitudePixelType>::Zero);
- MagnitudeVector sum_w( 2*Diagonal, itk::NumericTraits<MagnitudePixelType>::Zero);
+ unsigned int Diagonal =
+ static_cast<unsigned int>(vnl_math_hypot(static_cast<double>(m_ImageSize[1]), static_cast<double>(
+ m_ImageSize[0])) + 2);
+ MagnitudeVector sum_l(2*Diagonal, itk::NumericTraits<MagnitudePixelType>::Zero);
+ MagnitudeVector sum_w(2*Diagonal, itk::NumericTraits<MagnitudePixelType>::Zero);
double dx = vcl_cos(theta);
double dy = vcl_sin(theta);
it = region.begin();
- while(it != region.end())
+ while (it != region.end())
{
- itNeigh.SetLocation(*it);
- weight = *itNeigh.GetCenterValue();
- l = ( static_cast<double>((*it)[0]) - x )*dx + ( static_cast<double>((*it)[1]) - y )*dy;
- w = -( static_cast<double>((*it)[0]) - x )*dy + ( static_cast<double>((*it)[1]) - y )*dx;
+ itNeigh.SetLocation(*it);
+ weight = *itNeigh.GetCenterValue();
+ l = (static_cast<double>((*it)[0]) - x) * dx + (static_cast<double>((*it)[1]) - y) * dy;
+ w = -(static_cast<double>((*it)[0]) - x) * dy + (static_cast<double>((*it)[1]) - y) * dx;
- if(l<l_min) l_min = l; if(l>l_max) l_max = l;
- if(w<w_min) w_min = w; if(w>w_max) w_max = w;
+ if (l < l_min) l_min = l; if (l > l_max) l_max = l;
+ if (w < w_min) w_min = w; if (w > w_max) w_max = w;
- sum_l[static_cast< int>(vcl_floor(l)+0.5)+ Diagonal ] += static_cast<MagnitudePixelType>(weight);
- sum_w[static_cast< int>(vcl_floor(w)+0.5)+ Diagonal ] += static_cast<MagnitudePixelType>(weight);
+ sum_l[static_cast < int > (vcl_floor(l) + 0.5) + Diagonal] += static_cast<MagnitudePixelType>(weight);
+ sum_w[static_cast < int > (vcl_floor(w) + 0.5) + Diagonal] += static_cast<MagnitudePixelType>(weight);
- ++it;
+ ++it;
}
/** Thresholdinq the width and the length*/
double sum_th = 0.01 * sumWeight; /* weight threshold for selecting region */
double s = 0.;
- int i = 0;
+ int i = 0;
- for( s=0.0,i = static_cast<int>(l_min); s<sum_th && i<=static_cast<int>(l_max); ++i)
- s += sum_l[ Diagonal + i];
+ for (s = 0.0, i = static_cast<int>(l_min); s < sum_th && i <= static_cast<int>(l_max); ++i)
+ s += sum_l[Diagonal + i];
- double lb = (static_cast<double>(i-1) - 0.5 );
+ double lb = (static_cast<double>(i - 1) - 0.5);
- for(s=0.0,i=static_cast<int>(l_max); s<sum_th && i>=static_cast<int>(l_min); i--)
- s += sum_l[ Diagonal + i];
- double lf = (static_cast<double>(i+1) + 0.5 );
+ for (s = 0.0, i = static_cast<int>(l_max); s < sum_th && i >= static_cast<int>(l_min); i--)
+ s += sum_l[Diagonal + i];
+ double lf = (static_cast<double>(i + 1) + 0.5);
- for(s=0.0,i=static_cast<int>(w_min); s<sum_th && i<=static_cast<int>(w_max); ++i)
- s += sum_w[ Diagonal + i];
+ for (s = 0.0, i = static_cast<int>(w_min); s < sum_th && i <= static_cast<int>(w_max); ++i)
+ s += sum_w[Diagonal + i];
- double wr = (static_cast<double>(i-1) - 0.5);
+ double wr = (static_cast<double>(i - 1) - 0.5);
- for(s=0.0,i=static_cast<int>(w_max); s<sum_th && i>=static_cast<int>(w_min); i--)
+ for (s = 0.0, i = static_cast<int>(w_max); s < sum_th && i >= static_cast<int>(w_min); i--)
s += sum_w[Diagonal + i];
- double wl = (static_cast<double>(i+1) + 0.5 );
-
+ double wl = (static_cast<double>(i + 1) + 0.5);
/** Finally store the rectangle in vector this way :
* vec[0] = x1
@@ -716,21 +708,22 @@ LineSegmentDetector<TInputImage, TPrecision>
* vec[7] = p = 1/8
*/
-
- if(vcl_abs(wl - wr) - vcl_sqrt(static_cast<double>(m_ImageSize[1]*m_ImageSize[1] + m_ImageSize[0]*m_ImageSize[0])) < 1e-10)
+ if (vcl_abs(wl -
+ wr) - vcl_sqrt(static_cast<double>(m_ImageSize[1] * m_ImageSize[1] + m_ImageSize[0] * m_ImageSize[0])) <
+ 1e-10)
{
- RectangleType rec(8 ,0.); // Definition of a rectangle : 8 components
- rec[0] = (x + lb*dx >0)?x + lb*dx:0.;
- rec[1] = (y + lb*dy >0)?y + lb*dy:0.;
- rec[2] = (x + lf*dx >0)?x + lf*dx:0.;
- rec[3] = (y + lf*dy >0)?y + lf*dy:0;
- rec[4] = wl - wr;
- rec[5] = theta;
- rec[6] = m_Prec;
- rec[7] = m_DirectionsAllowed;
-
- if(rec[4] - 1. <1e-10) rec[4] = 1.;
- m_RectangleList.push_back(rec);
+ RectangleType rec(8, 0.); // Definition of a rectangle : 8 components
+ rec[0] = (x + lb * dx > 0) ? x + lb * dx : 0.;
+ rec[1] = (y + lb * dy > 0) ? y + lb * dy : 0.;
+ rec[2] = (x + lf * dx > 0) ? x + lf * dx : 0.;
+ rec[3] = (y + lf * dy > 0) ? y + lf * dy : 0;
+ rec[4] = wl - wr;
+ rec[5] = theta;
+ rec[6] = m_Prec;
+ rec[7] = m_DirectionsAllowed;
+
+ if (rec[4] - 1. < 1e-10) rec[4] = 1.;
+ m_RectangleList.push_back(rec);
}
}
@@ -739,61 +732,61 @@ LineSegmentDetector<TInputImage, TPrecision>
* Compute the orientation of a region , using an eigen Value analysis.
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
double
LineSegmentDetector<TInputImage, TPrecision>
-::ComputeRegionOrientation(IndexVectorType region , double x,double y , double angleRegion) const
+::ComputeRegionOrientation(IndexVectorType region, double x, double y, double angleRegion) const
{
double Ixx = 0.0;
double Iyy = 0.0;
double Ixy = 0.0;
double theta = 0.;
- double weight = 0.,sum = 0.;
+ double weight = 0., sum = 0.;
/** Neighborhooding again*/
- typedef itk::ConstNeighborhoodIterator<OutputImageType> NeighborhoodIteratorType;
- typename NeighborhoodIteratorType::SizeType radius;
+ typedef itk::ConstNeighborhoodIterator<OutputImageType> NeighborhoodIteratorType;
+ typename NeighborhoodIteratorType::SizeType radius;
radius.Fill(0);
- NeighborhoodIteratorType itNeigh(radius,m_MagnitudeFilter->GetOutput(),
+ NeighborhoodIteratorType itNeigh(radius, m_MagnitudeFilter->GetOutput(),
m_MagnitudeFilter->GetOutput()->GetRequestedRegion());
/** Computing the center iof the rectangle*/
- IndexVectorIteratorType it = region.begin();
- while(it != region.end())
+ IndexVectorIteratorType it = region.begin();
+ while (it != region.end())
{
- itNeigh.SetLocation(*it);
- weight = *itNeigh.GetCenterValue();
- double Iyy2 = static_cast<double>((*it)[0]) - x;
- double Ixx2 = static_cast<double>((*it)[1]) - y;
-
- Ixx += Ixx2*Ixx2*weight;
- Iyy += Iyy2*Iyy2*weight;
- Ixy -= Ixx2*Iyy2*weight;
- sum += weight;
- ++it;
+ itNeigh.SetLocation(*it);
+ weight = *itNeigh.GetCenterValue();
+ double Iyy2 = static_cast<double>((*it)[0]) - x;
+ double Ixx2 = static_cast<double>((*it)[1]) - y;
+
+ Ixx += Ixx2 * Ixx2 * weight;
+ Iyy += Iyy2 * Iyy2 * weight;
+ Ixy -= Ixx2 * Iyy2 * weight;
+ sum += weight;
+ ++it;
}
/** using te itk Eigen analysis*/
- typedef itk::Matrix<double , 2, 2> MatrixType;
- typedef std::vector<double > MatrixEigenType;
+ typedef itk::Matrix<double, 2, 2> MatrixType;
+ typedef std::vector<double> MatrixEigenType;
MatrixType Inertie, eigenVector;
- MatrixEigenType eigenMatrix(2,0.);
- Inertie[1][1] =Ixx;
- Inertie[0][0] =Iyy;
- Inertie[0][1] =Ixy;
- Inertie[1][0] =Ixy;
+ MatrixEigenType eigenMatrix(2, 0.);
+ Inertie[1][1] = Ixx;
+ Inertie[0][0] = Iyy;
+ Inertie[0][1] = Ixy;
+ Inertie[1][0] = Ixy;
- typedef itk::SymmetricEigenAnalysis<MatrixType,MatrixEigenType> EigenAnalysisType;
+ typedef itk::SymmetricEigenAnalysis<MatrixType, MatrixEigenType> EigenAnalysisType;
EigenAnalysisType eigenFilter(2);
- eigenFilter.ComputeEigenValuesAndVectors(Inertie,eigenMatrix,eigenVector );
+ eigenFilter.ComputeEigenValuesAndVectors(Inertie, eigenMatrix, eigenVector);
theta = vcl_atan2(eigenVector[1][1], -eigenVector[1][0]);
/* the previous procedure don't cares orientations,
so it could be wrong by 180 degrees.
here is corrected if necessary */
- if( this->angle_diff(theta,angleRegion) > m_Prec ) theta += CONST_PI;
+ if (this->angle_diff(theta, angleRegion) > m_Prec) theta += CONST_PI;
return theta;
}
@@ -802,15 +795,17 @@ LineSegmentDetector<TInputImage, TPrecision>
/**
* Compute the difference betwenn 2 angles modulo 2_PI
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
double
LineSegmentDetector<TInputImage, TPrecision>
::angle_diff(double a, double b) const
{
a -= b;
- while( a <= -CONST_PI ) a += CONST_2PI;
- while( a > CONST_PI ) a -= CONST_2PI;
- if( a < 0.0 ) a = -a;
+ while (a <= -CONST_PI)
+ a += CONST_2PI;
+ while (a > CONST_PI)
+ a -= CONST_2PI;
+ if (a < 0.0) a = -a;
return a;
}
@@ -818,12 +813,12 @@ LineSegmentDetector<TInputImage, TPrecision>
/**
* compute the number of false alarm of the rectangle
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
double
LineSegmentDetector<TInputImage, TPrecision>
-::ComputeRectNFA(const RectangleType & rec) const
+::ComputeRectNFA(const RectangleType& rec) const
{
- int NbAligned = 0;
+ int NbAligned = 0;
double nfa_val = 0.;
/** Compute the NFA of the rectangle
@@ -832,45 +827,45 @@ LineSegmentDetector<TInputImage, TPrecision>
*/
/** Compute the number of points aligned */
- typedef otb::Rectangle<double> RectangleType;
- RectangleType::Pointer rectangle = RectangleType::New();
+ typedef otb::Rectangle<double> RectangleType;
+ RectangleType::Pointer rectangle = RectangleType::New();
/** Fill the rectangle with the points*/
- for (int i = 0; i<2; ++i)
+ for (int i = 0; i < 2; ++i)
{
- typename RectangleType::VertexType vertex;
- vertex[0] = rec[2*i];
- vertex[1] = rec[2*i+1];
- rectangle->AddVertex(vertex);
+ typename RectangleType::VertexType vertex;
+ vertex[0] = rec[2 * i];
+ vertex[1] = rec[2 * i + 1];
+ rectangle->AddVertex(vertex);
}
rectangle->SetWidth(rec[4]);
rectangle->SetOrientation(rec[5]);
-
/** Get The Bounding Region*/
- OutputImageDirRegionType region = rectangle->GetBoundingRegion();
- region.Crop( m_OrientationFilter->GetOutput()->GetLargestPossibleRegion() );
- itk::ImageRegionIterator<OutputImageDirType> it(m_OrientationFilter->GetOutput(), region/*m_OrientationFilter->GetOutput()->GetRequestedRegion()*/);
+ OutputImageDirRegionType region = rectangle->GetBoundingRegion();
+ region.Crop(m_OrientationFilter->GetOutput()->GetLargestPossibleRegion());
+ itk::ImageRegionIterator<OutputImageDirType> it(m_OrientationFilter->GetOutput(), region /*m_OrientationFilter->GetOutput()->GetRequestedRegion()*/);
it.GoToBegin();
int pts = 0;
- while(!it.IsAtEnd())
+ while (!it.IsAtEnd())
{
- if( rectangle->IsInside( it.GetIndex()) && m_OrientationFilter->GetOutput()->GetRequestedRegion().IsInside( it.GetIndex()) )
- {
- ++pts;
-
- if(this->IsAligned(it.Get(), rec[5] /*theta*/ ,rec[6] /*Prec*/))
- NbAligned++;
- }
- ++it;
+ if (rectangle->IsInside(it.GetIndex()) &&
+ m_OrientationFilter->GetOutput()->GetRequestedRegion().IsInside(it.GetIndex()))
+ {
+ ++pts;
+
+ if (this->IsAligned(it.Get(), rec[5] /*theta*/, rec[6] /*Prec*/)) NbAligned++;
+ }
+ ++it;
}
/** Compute the NFA from the rectangle computed below*/
- double logNT = 5.*(vcl_log10(static_cast<double>(m_ImageSize[1])) + vcl_log10(static_cast<double>(m_ImageSize[0])))/2.;
+ double logNT = 5. *
+ (vcl_log10(static_cast<double>(m_ImageSize[1])) + vcl_log10(static_cast<double>(m_ImageSize[0]))) / 2.;
- nfa_val = NFA(pts,NbAligned ,m_DirectionsAllowed,logNT);
+ nfa_val = NFA(pts, NbAligned, m_DirectionsAllowed, logNT);
return nfa_val;
}
@@ -884,38 +879,36 @@ LineSegmentDetector<TInputImage, TPrecision>
n,k,p - binomial parameters.
logNT - logarithm of Number of Tests
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
double
LineSegmentDetector<TInputImage, TPrecision>
::NFA(int n, int k, double p, double logNT) const
{
double val;
- if(k==0) return -logNT;
+ if (k == 0) return -logNT;
- val = -logNT - log10(betai((double)k,(double)(n-k+1),p));
+ val = -logNT - log10(betai((double) k, (double) (n - k + 1), p));
- if(vnl_math_isinf(val)) /* approximate by the first term of the tail */
- val = -logNT - ( factln(n) - factln(k) - factln(n-k) ) / CONST_LN10
- - (double)k * log10(p) - (double)(n-k) * log10(1.0-p);
+ if (vnl_math_isinf(val)) /* approximate by the first term of the tail */
+ val = -logNT - (factln(n) - factln(k) - factln(n - k)) / CONST_LN10
+ - (double) k * log10(p) - (double) (n - k) * log10(1.0 - p);
return val;
}
-
/**
* Standard "PrintSelf" method
*/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
void
LineSegmentDetector<TInputImage, TPrecision>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
-
/**************************************************************************************************************/
/**************************************************************************************************************/
/*
@@ -924,65 +917,67 @@ LineSegmentDetector<TInputImage, TPrecision>
*/
/**************************************************************************************************************/
/**************************************************************************************************************/
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
double
LineSegmentDetector<TInputImage, TPrecision>
::betacf(double a, double b, double x) const
{
- int m,m2;
- double aa,c,d,del,h,qab,qam,qap;
-
- qab=a+b;
- qap=a+1.0;
- qam=a-1.0;
- c=1.0;
- d=1.0-qab*x/qap;
- if (fabs(d) < FPMIN) d=FPMIN;
- d=1.0/d;
- h=d;
- for (m=1;m<=MAXIT;m++) {
- m2=2*m;
- aa=m*(b-m)*x/((qam+m2)*(a+m2));
- d=1.0+aa*d;
- if (fabs(d) < FPMIN) d=FPMIN;
- c=1.0+aa/c;
- if (fabs(c) < FPMIN) c=FPMIN;
- d=1.0/d;
- h *= d*c;
- aa = -(a+m)*(qab+m)*x/((a+m2)*(qap+m2));
- d=1.0+aa*d;
- if (fabs(d) < FPMIN) d=FPMIN;
- c=1.0+aa/c;
- if (fabs(c) < FPMIN) c=FPMIN;
- d=1.0/d;
- del=d*c;
+ int m, m2;
+ double aa, c, d, del, h, qab, qam, qap;
+
+ qab = a + b;
+ qap = a + 1.0;
+ qam = a - 1.0;
+ c = 1.0;
+ d = 1.0 - qab * x / qap;
+ if (fabs(d) < FPMIN) d = FPMIN;
+ d = 1.0 / d;
+ h = d;
+ for (m = 1; m <= MAXIT; m++)
+ {
+ m2 = 2 * m;
+ aa = m * (b - m) * x / ((qam + m2) * (a + m2));
+ d = 1.0 + aa * d;
+ if (fabs(d) < FPMIN) d = FPMIN;
+ c = 1.0 + aa / c;
+ if (fabs(c) < FPMIN) c = FPMIN;
+ d = 1.0 / d;
+ h *= d * c;
+ aa = -(a + m) * (qab + m) * x / ((a + m2) * (qap + m2));
+ d = 1.0 + aa * d;
+ if (fabs(d) < FPMIN) d = FPMIN;
+ c = 1.0 + aa / c;
+ if (fabs(c) < FPMIN) c = FPMIN;
+ d = 1.0 / d;
+ del = d * c;
h *= del;
- if (fabs(del-1.0) < EPS) break;
- }
+ if (fabs(del - 1.0) < EPS) break;
+ }
return h;
}
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
double
LineSegmentDetector<TInputImage, TPrecision>
::gammln(double xx) const
{
- double x,y,tmp,ser;
- static double cof[6]={76.18009172947146,-86.50532032941677,
- 24.01409824083091,-1.231739572450155,
- 0.1208650973866179e-2,-0.5395239384953e-5};
- int j;
-
- y=x=xx;
- tmp=x+5.5;
- tmp -= (x+0.5)*log(tmp);
- ser=1.000000000190015;
- for (j=0;j<=5;++j) ser += cof[j]/++y;
- return -tmp+log(2.5066282746310005*ser/x);
+ double x, y, tmp, ser;
+ static double cof[6] = {76.18009172947146, -86.50532032941677,
+ 24.01409824083091, -1.231739572450155,
+ 0.1208650973866179e-2, -0.5395239384953e-5};
+ int j;
+
+ y = x = xx;
+ tmp = x + 5.5;
+ tmp -= (x + 0.5) * log(tmp);
+ ser = 1.000000000190015;
+ for (j = 0; j <= 5; ++j)
+ ser += cof[j] / ++y;
+ return -tmp + log(2.5066282746310005 * ser / x);
}
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
double
LineSegmentDetector<TInputImage, TPrecision>
::betai(double a, double b, double x) const
@@ -991,17 +986,13 @@ LineSegmentDetector<TInputImage, TPrecision>
double gammln(double xx);
double bt;
- if (x == 0.0 || x == 1.0) bt=0.0;
- else
- bt=exp(this->gammln(a+b)-this->gammln(a)-this->gammln(b)+a*log(x)+b*log(1.0-x));
- if (x < (a+1.0)/(a+b+2.0))
- return bt*this->betacf(a,b,x)/a;
- else
- return 1.0-bt*this->betacf(b,a,1.0-x)/b;
+ if (x == 0.0 || x == 1.0) bt = 0.0;
+ else bt = exp(this->gammln(a + b) - this->gammln(a) - this->gammln(b) + a * log(x) + b * log(1.0 - x));
+ if (x < (a + 1.0) / (a + b + 2.0)) return bt * this->betacf(a, b, x) / a;
+ else return 1.0 - bt*this->betacf(b, a, 1.0 - x) / b;
}
-
-template <class TInputImage, class TPrecision >
+template <class TInputImage, class TPrecision>
double
LineSegmentDetector<TInputImage, TPrecision>
::factln(int n) const
@@ -1010,8 +1001,8 @@ LineSegmentDetector<TInputImage, TPrecision>
static double a[101];
if (n <= 1) return 0.0;
- if (n <= 100) return a[n] ? a[n] : (a[n]=this->gammln(n+1.0));
- else return this->gammln(n+1.0);
+ if (n <= 100) return a[n] ? a[n] : (a[n] = this->gammln(n + 1.0));
+ else return this->gammln(n + 1.0);
}
/********************* end Numerical Recipes functions **************************************************************************/
diff --git a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h b/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h
index 17fec79160..dc6e1c7b45 100644
--- a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h
+++ b/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h
@@ -32,48 +32,48 @@
namespace otb
{
-template <class TImage, class TLinesList , class TPointSet>
+template <class TImage, class TLinesList, class TPointSet>
class ITK_EXPORT LineSpatialObjectListToRightAnglePointSetFilter
- : public otb::LineSpatialObjectListToPointSetFilter <TLinesList, TPointSet>
+ : public otb::LineSpatialObjectListToPointSetFilter <TLinesList, TPointSet>
{
public:
/** Standard class typedefs. */
- typedef LineSpatialObjectListToRightAnglePointSetFilter Self;
- typedef LineSpatialObjectListToPointSetFilter <TLinesList, TPointSet> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LineSpatialObjectListToRightAnglePointSetFilter Self;
+ typedef LineSpatialObjectListToPointSetFilter <TLinesList, TPointSet> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(LineSpatialObjectListToRightAnglePointSetFilter,LineSpatialObjectListToPointSetFilter);
-
+ itkTypeMacro(LineSpatialObjectListToRightAnglePointSetFilter, LineSpatialObjectListToPointSetFilter);
+
/** Typedef support for ProcessObject*/
- typedef itk::ProcessObject ProcessObjectType;
+ typedef itk::ProcessObject ProcessObjectType;
/** Template parameters typedefs*/
- typedef TLinesList InputLinesListType;
- typedef typename InputLinesListType::LineType LineType;
- typedef std::vector<LineType*> VectorLineType;
+ typedef TLinesList InputLinesListType;
+ typedef typename InputLinesListType::LineType LineType;
+ typedef std::vector<LineType*> VectorLineType;
//typedef typename LineType::PointListType InputPointListType;
- typedef typename InputLinesListType::const_iterator InputLinesListTypeIterator;
+ typedef typename InputLinesListType::const_iterator InputLinesListTypeIterator;
/** Typdedef for The input image :
* (ONLY USED FOR THE LINE ITERATOR -> To check if the index is inside the region)
*/
- typedef TImage InputImageType;
- typedef typename InputImageType::IndexType InputIndexType;
-
+ typedef TImage InputImageType;
+ typedef typename InputImageType::IndexType InputIndexType;
+
/** Typedef support for output PointSet*/
- typedef TPointSet OutputPointSetType;
- typedef typename OutputPointSetType::PointType PointType;
- typedef typename OutputPointSetType::Pointer OutputPointSetPointerType;
+ typedef TPointSet OutputPointSetType;
+ typedef typename OutputPointSetType::PointType PointType;
+ typedef typename OutputPointSetType::Pointer OutputPointSetPointerType;
/** Typedef Support for Checking couple of segments used*/
- typedef itk::VariableSizeMatrix<unsigned int> checkMatrixType;
+ typedef itk::VariableSizeMatrix<unsigned int> checkMatrixType;
/**
* Public Methods :
@@ -83,11 +83,10 @@ public:
virtual void SetInputImage(InputImageType *);
-
/** Set/Get the thresholds*/
itkGetMacro(ThresholdDistance, double);
itkSetMacro(ThresholdDistance, double);
-
+
itkGetMacro(ThresholdAngle, double);
itkSetMacro(ThresholdAngle, double);
@@ -101,8 +100,8 @@ protected:
* the aim of the GenerateOutputInformation below is to avoid the guilty static_cast
*
*/
-
- virtual void GenerateOutputInformation(){};
+
+ virtual void GenerateOutputInformation(){}
/**
* Constructor.
@@ -111,7 +110,7 @@ protected:
/**
* Destructor.
*/
- virtual ~LineSpatialObjectListToRightAnglePointSetFilter(){};
+ virtual ~LineSpatialObjectListToRightAnglePointSetFilter(){}
/**
* Standard PrintSelf method.
*/
@@ -123,15 +122,15 @@ protected:
/**
* Angle computation
*/
- virtual double ComputeAngleFormedBySegments(LineType * lineDst , LineType * lineSrc);
+ virtual double ComputeAngleFormedBySegments(LineType * lineDst, LineType * lineSrc);
/**
* When we find a right angle, one compute the coordinate of the segments intersection
*/
- virtual PointType ComputeAngleRightCoordinate(LineType * lineDst , LineType * lineSrc);
+ virtual PointType ComputeAngleRightCoordinate(LineType * lineDst, LineType * lineSrc);
/**
* AddRightAngleToPointSet
*/
- virtual void AddRightAngleToPointSet(PointType rAngle , LineType * LineDst , LineType* LineCur );
+ virtual void AddRightAngleToPointSet(PointType rAngle, LineType * LineDst, LineType* LineCur);
/**
* Compute the orienation of a segment
*/
@@ -139,19 +138,19 @@ protected:
/**
* Distance From a point rAngle to a segment line
*/
- virtual double ComputeDistanceFromPointToSegment(PointType rAngle ,LineType * line);
+ virtual double ComputeDistanceFromPointToSegment(PointType rAngle, LineType * line);
private:
- LineSpatialObjectListToRightAnglePointSetFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LineSpatialObjectListToRightAnglePointSetFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Smart pointer on the output PointSet*/
- OutputPointSetPointerType m_OutputPointSet;
+ OutputPointSetPointerType m_OutputPointSet;
double m_ThresholdDistance;
double m_ThresholdAngle;
-
+
};
}
#ifndef OTB_MANUAL_INSTANTIATION
@@ -159,5 +158,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.txx b/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
index e70a884115..103c0214df 100644
--- a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
+++ b/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
@@ -30,52 +30,52 @@ namespace otb
/**
*
*/
-template <class TImage, class TLinesList , class TPointSet>
-LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
+template <class TImage, class TLinesList, class TPointSet>
+LineSpatialObjectListToRightAnglePointSetFilter<TImage, TLinesList, TPointSet>
::LineSpatialObjectListToRightAnglePointSetFilter()
{
this->SetNumberOfRequiredInputs(2);
this->SetNumberOfRequiredOutputs(1);
m_ThresholdDistance = 20.;
- m_ThresholdAngle = CONST_PI/30.; //36 cause we want 6 degrees threshold
+ m_ThresholdAngle = CONST_PI / 30.; //36 cause we want 6 degrees threshold
}
/**
* Method : Set The Input Image
*/
-template <class TImage, class TLinesList , class TPointSet>
+template <class TImage, class TLinesList, class TPointSet>
void
-LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
+LineSpatialObjectListToRightAnglePointSetFilter<TImage, TLinesList, TPointSet>
::SetInputImage(InputImageType * inputImage)
{
this->itk::ProcessObject::SetNthInput(1,
- const_cast< InputImageType * >( inputImage ) );
+ const_cast<InputImageType *>(inputImage));
}
- /**
- * Method : Get The Input Image
- */
-template <class TImage, class TLinesList , class TPointSet>
-typename LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
+/**
+* Method : Get The Input Image
+*/
+template <class TImage, class TLinesList, class TPointSet>
+typename LineSpatialObjectListToRightAnglePointSetFilter<TImage, TLinesList, TPointSet>
::InputImageType *
-LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
+LineSpatialObjectListToRightAnglePointSetFilter<TImage, TLinesList, TPointSet>
::GetInputImage()
{
return static_cast<InputImageType *>
- (this->ProcessObjectType::GetInput(1) );
+ (this->ProcessObjectType::GetInput(1));
}
/**
* Method : GenerateData()
*/
-template <class TImage, class TLinesList , class TPointSet>
+template <class TImage, class TLinesList, class TPointSet>
void
-LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
+LineSpatialObjectListToRightAnglePointSetFilter<TImage, TLinesList, TPointSet>
::GenerateData()
{
unsigned int counterTest = 0, counterCur = 0;
-
+
/** Output*/
m_OutputPointSet = this->GetOutput();
@@ -84,58 +84,58 @@ LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
/** Instancition of Cheking availability Matrix*/
unsigned int numberOfLines = inputLinesList->size();
- checkMatrixType segmentsUsedMatrix(numberOfLines,numberOfLines);
+ checkMatrixType segmentsUsedMatrix(numberOfLines, numberOfLines);
segmentsUsedMatrix.Fill(0);
-
+
/** Loop to get all the lines in the listLine */
- InputLinesListTypeIterator itLinesListTest = inputLinesList->begin(); /** Current tested Line */
-
- while(itLinesListTest != inputLinesList->end() )
+ InputLinesListTypeIterator itLinesListTest = inputLinesList->begin(); /** Current tested Line */
+
+ while (itLinesListTest != inputLinesList->end())
{
- counterCur = 0;
- InputLinesListTypeIterator itLinesListCur = inputLinesList->begin(); /** Line tested with with current Line*/
- InputLinesListTypeIterator itLinesListCurEnd = inputLinesList->end();
-
- while(itLinesListCur != itLinesListCurEnd )
+ counterCur = 0;
+ InputLinesListTypeIterator itLinesListCur = inputLinesList->begin(); /** Line tested with with current Line*/
+ InputLinesListTypeIterator itLinesListCurEnd = inputLinesList->end();
+
+ while (itLinesListCur != itLinesListCurEnd)
+ {
+ /** Check If segments are already computed */
+ if (segmentsUsedMatrix[counterTest][counterCur] == 0 && segmentsUsedMatrix[counterCur][counterTest] == 0)
{
- /** Check If segments are already computed */
- if( segmentsUsedMatrix[counterTest][counterCur]== 0 && segmentsUsedMatrix[counterCur][counterTest] == 0 )
- {
- /** Set the segments to USED (== 1)*/
- segmentsUsedMatrix[counterTest][counterCur] = 1;
- segmentsUsedMatrix[counterCur][counterTest] = 1;
-
- /** Compute the angle formed by the two segments */
- double Angle = this->ComputeAngleFormedBySegments(*itLinesListTest, *itLinesListCur);
-
- /** Check if the angle is a right one */
- if(vcl_abs(Angle - CONST_PI_2) <= m_ThresholdAngle )
- {
- /** Right angle coordinate*/
- PointType RightAngleCoordinate;
- RightAngleCoordinate = this->ComputeAngleRightCoordinate(*itLinesListTest, *itLinesListCur);
-
- /** Compute the distance between the two segments and the right angle formed by this segments*/
- double dist1 = this->ComputeDistanceFromPointToSegment(RightAngleCoordinate,*itLinesListTest);
- double dist2 = this->ComputeDistanceFromPointToSegment(RightAngleCoordinate,*itLinesListCur);
-
- /** Use Pythagore to compute the distance between the two segments*/
- double SegmentDistance = vcl_sqrt(dist1*dist1 + dist2*dist2);
-
+ /** Set the segments to USED (== 1)*/
+ segmentsUsedMatrix[counterTest][counterCur] = 1;
+ segmentsUsedMatrix[counterCur][counterTest] = 1;
+
+ /** Compute the angle formed by the two segments */
+ double Angle = this->ComputeAngleFormedBySegments(*itLinesListTest, *itLinesListCur);
+
+ /** Check if the angle is a right one */
+ if (vcl_abs(Angle - CONST_PI_2) <= m_ThresholdAngle)
+ {
+ /** Right angle coordinate*/
+ PointType RightAngleCoordinate;
+ RightAngleCoordinate = this->ComputeAngleRightCoordinate(*itLinesListTest, *itLinesListCur);
+
+ /** Compute the distance between the two segments and the right angle formed by this segments*/
+ double dist1 = this->ComputeDistanceFromPointToSegment(RightAngleCoordinate, *itLinesListTest);
+ double dist2 = this->ComputeDistanceFromPointToSegment(RightAngleCoordinate, *itLinesListCur);
+
+ /** Use Pythagore to compute the distance between the two segments*/
+ double SegmentDistance = vcl_sqrt(dist1 * dist1 + dist2 * dist2);
+
// if(this->ComputeDistanceFromPointToSegment(RightAngleCoordinate,*itLinesListTest) <m_ThresholdDistance &&
// this->ComputeDistanceFromPointToSegment(RightAngleCoordinate,*itLinesListCur) <m_ThresholdDistance)
- if(SegmentDistance < m_ThresholdDistance)
- {
- /** If Right Angle & not so far from segments: Add it to the pointSet*/
- this->AddRightAngleToPointSet(RightAngleCoordinate , *itLinesListTest , *itLinesListCur );
- }
- }
+ if (SegmentDistance < m_ThresholdDistance)
+ {
+ /** If Right Angle & not so far from segments: Add it to the pointSet*/
+ this->AddRightAngleToPointSet(RightAngleCoordinate, *itLinesListTest, *itLinesListCur);
}
- ++counterCur;
- ++itLinesListCur;
+ }
}
- ++counterTest;
- ++itLinesListTest;
+ ++counterCur;
+ ++itLinesListCur;
+ }
+ ++counterTest;
+ ++itLinesListTest;
}
}
@@ -143,54 +143,54 @@ LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
* Method : Compute Distance between a point and a segment
*
*/
-template <class TImage, class TLinesList , class TPointSet>
+template <class TImage, class TLinesList, class TPointSet>
double
-LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
-::ComputeDistanceFromPointToSegment(PointType rAngle ,LineType * line)
+LineSpatialObjectListToRightAnglePointSetFilter<TImage, TLinesList, TPointSet>
+::ComputeDistanceFromPointToSegment(PointType rAngle, LineType * line)
{
/** Extract Indexes from the Dst line to instantiate the line iterator*/
- typename LineType::PointListType &pointsListDst = line->GetPoints();
+ typename LineType::PointListType& pointsListDst = line->GetPoints();
typename LineType::PointListType::const_iterator itPointsDst = pointsListDst.begin();
- double X1 = (*itPointsDst).GetPosition()[0]; //xq1
- double Y1 = (*itPointsDst).GetPosition()[1]; //yq1
+ double X1 = (*itPointsDst).GetPosition()[0]; //xq1
+ double Y1 = (*itPointsDst).GetPosition()[1]; //yq1
++itPointsDst;
double X2 = (*itPointsDst).GetPosition()[0]; //xq2
double Y2 = (*itPointsDst).GetPosition()[1]; //yq2
-
- double dist1 = vcl_sqrt((X1-rAngle[0])*(X1-rAngle[0]) + (Y1-rAngle[1])*(Y1-rAngle[1]));
- double dist2 = vcl_sqrt((X2-rAngle[0])*(X2-rAngle[0]) + (Y2-rAngle[1])*(Y2-rAngle[1]));
- return std::min(dist1,dist2);
+ double dist1 = vcl_sqrt((X1 - rAngle[0]) * (X1 - rAngle[0]) + (Y1 - rAngle[1]) * (Y1 - rAngle[1]));
+ double dist2 = vcl_sqrt((X2 - rAngle[0]) * (X2 - rAngle[0]) + (Y2 - rAngle[1]) * (Y2 - rAngle[1]));
+
+ return std::min(dist1, dist2);
}
/**
* Method : Compute Angle formed by the two segments
*
*/
-template <class TImage, class TLinesList , class TPointSet>
+template <class TImage, class TLinesList, class TPointSet>
double
-LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
-::ComputeAngleFormedBySegments(LineType * lineDst , LineType * lineSrc)
+LineSpatialObjectListToRightAnglePointSetFilter<TImage, TLinesList, TPointSet>
+::ComputeAngleFormedBySegments(LineType * lineDst, LineType * lineSrc)
{
double oriDst = this->ComputeOrientation(lineDst);
double oriSrc = this->ComputeOrientation(lineSrc);
-
+
return vcl_abs(oriDst - oriSrc);
}
/**
* Method : ComputeDistanceBetweenSegments
*/
-template <class TImage, class TLinesList , class TPointSet>
+template <class TImage, class TLinesList, class TPointSet>
double
-LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
+LineSpatialObjectListToRightAnglePointSetFilter<TImage, TLinesList, TPointSet>
::ComputeOrientation(LineType * line)
{
- typename LineType::PointListType & pointsList = line->GetPoints();
+ typename LineType::PointListType& pointsList = line->GetPoints();
typename LineType::PointListType::const_iterator itPoints = pointsList.begin();
- double Xp1 = (*itPoints).GetPosition()[0];
- double Yp1 = (*itPoints).GetPosition()[1];
-
+ double Xp1 = (*itPoints).GetPosition()[0];
+ double Yp1 = (*itPoints).GetPosition()[1];
+
++itPoints;
double Xp2 = (*itPoints).GetPosition()[0];
double Yp2 = (*itPoints).GetPosition()[1];
@@ -198,121 +198,107 @@ LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
//Compute the orientation
double dx = Xp1 - Xp2;
double dy = Yp1 - Yp2;
- double orientation = vcl_atan2(dy,dx);
- if(orientation < 0)
- orientation += CONST_PI;
+ double orientation = vcl_atan2(dy, dx);
+ if (orientation < 0) orientation += CONST_PI;
return orientation;
}
-
/**
* Method : ComputeDistanceBetweenSegments
*/
-template <class TImage, class TLinesList , class TPointSet>
-typename LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
+template <class TImage, class TLinesList, class TPointSet>
+typename LineSpatialObjectListToRightAnglePointSetFilter<TImage, TLinesList, TPointSet>
::PointType
-LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
-::ComputeAngleRightCoordinate(LineType * lineDst , LineType * lineSrc)
+LineSpatialObjectListToRightAnglePointSetFilter<TImage, TLinesList, TPointSet>
+::ComputeAngleRightCoordinate(LineType * lineDst, LineType * lineSrc)
{
PointType P;
-
+
/** ----- */
- typename LineType::PointListType & pointsList = lineSrc->GetPoints();
+ typename LineType::PointListType& pointsList = lineSrc->GetPoints();
typename LineType::PointListType::const_iterator itPoints = pointsList.begin();
-
+
double Xp1 = (*itPoints).GetPosition()[0];
double Yp1 = (*itPoints).GetPosition()[1];
++itPoints;
double Xp2 = (*itPoints).GetPosition()[0];
double Yp2 = (*itPoints).GetPosition()[1];
-
+
/** Extract Indexes from the Dst line to instantiate the line iterator*/
- typename LineType::PointListType &pointsListDst = lineDst->GetPoints();
+ typename LineType::PointListType& pointsListDst = lineDst->GetPoints();
typename LineType::PointListType::const_iterator itPointsDst = pointsListDst.begin();
-
+
double Xq1 = (*itPointsDst).GetPosition()[0]; //xq1
double Yq1 = (*itPointsDst).GetPosition()[1]; //yq1
++itPointsDst;
double Xq2 = (*itPointsDst).GetPosition()[0]; //xq2
double Yq2 = (*itPointsDst).GetPosition()[1]; //yq2
-
/** Compute the equation of the lines A and B which are support of the segments Src & Dst*/
// - Line 1 : slope and origin
- double originA = 0. , slopeA = 0.;
- double originB = 0. , slopeB = 0.;
+ double originA = 0., slopeA = 0.;
+ double originB = 0., slopeB = 0.;
double LengthSegmentAy = 0., lengthSegmentBy = 0.;
/** Equation of the first Line*/
- if(vcl_abs(Xp2 - Xp1) <1e-10)
- Xp2 = 0.0001;
-
- if(Xp1 < Xp2 )
- LengthSegmentAy = Yp2 - Yp1;
- else
- LengthSegmentAy = Yp1 - Yp2;
-
- slopeA = LengthSegmentAy/(Xp2-Xp1);
+ if (vcl_abs(Xp2 - Xp1) < 1e-10) Xp2 = 0.0001;
+
+ if (Xp1 < Xp2) LengthSegmentAy = Yp2 - Yp1;
+ else LengthSegmentAy = Yp1 - Yp2;
+
+ slopeA = LengthSegmentAy / (Xp2 - Xp1);
originA = Yp1 - (slopeA * Xp1);
/** Equation of the second Line*/
- if(vcl_abs(Xq2 - Xq1) <1e-10)
- Xq2 = 0.0001;
-
- if(Xq1 < Xq2 )
- lengthSegmentBy = Yq2 - Yq1;
- else
- lengthSegmentBy = Yq1 - Yq2;
-
- slopeB = lengthSegmentBy/(Xq2-Xq1);
+ if (vcl_abs(Xq2 - Xq1) < 1e-10) Xq2 = 0.0001;
+
+ if (Xq1 < Xq2) lengthSegmentBy = Yq2 - Yq1;
+ else lengthSegmentBy = Yq1 - Yq2;
+
+ slopeB = lengthSegmentBy / (Xq2 - Xq1);
originB = Yq1 - (slopeB * Xq1);
/** Avoid the case of parallel lines*/
double denum = 0.;
- if(vcl_abs(slopeA - slopeB ) < 1e-5)
- denum = 0.001;
- else
- denum = slopeA - slopeB;
-
+ if (vcl_abs(slopeA - slopeB) < 1e-5) denum = 0.001;
+ else denum = slopeA - slopeB;
+
/** Compute the coordinate of the intersection point Y =AX+B*/
- P[0] = (originB - originA)/denum;
+ P[0] = (originB - originA) / denum;
P[1] = slopeA * static_cast<double>(P[0]) + originA;
return P;
}
-
/**
* AddRightAngleToPointSet
*/
-template <class TImage, class TLinesList , class TPointSet>
+template <class TImage, class TLinesList, class TPointSet>
void
-LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
-::AddRightAngleToPointSet(PointType rAngle , LineType * LineDst , LineType* LineCur )
+LineSpatialObjectListToRightAnglePointSetFilter<TImage, TLinesList, TPointSet>
+::AddRightAngleToPointSet(PointType rAngle, LineType * LineDst, LineType* LineCur)
{
unsigned int CurrentPos = m_OutputPointSet->GetNumberOfPoints();
- m_OutputPointSet->SetPoint(CurrentPos ,rAngle);
- VectorLineType vectorLine;
+ m_OutputPointSet->SetPoint(CurrentPos, rAngle);
+ VectorLineType vectorLine;
vectorLine.push_back(LineDst);
vectorLine.push_back(LineCur);
- m_OutputPointSet->SetPointData(CurrentPos , vectorLine);
+ m_OutputPointSet->SetPointData(CurrentPos, vectorLine);
}
/**
* Standard "PrintSelf" method
*/
-template <class TImage, class TLinesList , class TPointSet>
+template <class TImage, class TLinesList, class TPointSet>
void
-LineSpatialObjectListToRightAnglePointSetFilter<TImage,TLinesList ,TPointSet>
+LineSpatialObjectListToRightAnglePointSetFilter<TImage, TLinesList, TPointSet>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
-
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbLinkPathListFilter.h b/Code/FeatureExtraction/otbLinkPathListFilter.h
index 9fe47439e8..ca5d5836cc 100644
--- a/Code/FeatureExtraction/otbLinkPathListFilter.h
+++ b/Code/FeatureExtraction/otbLinkPathListFilter.h
@@ -42,14 +42,14 @@ namespace otb
*/
template <class TPath>
class ITK_EXPORT LinkPathListFilter
- : public PathListToPathListFilter<TPath>
+ : public PathListToPathListFilter<TPath>
{
public:
/** Standard typedefs */
- typedef LinkPathListFilter Self;
- typedef PathListToPathListFilter<TPath> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LinkPathListFilter Self;
+ typedef PathListToPathListFilter<TPath> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -58,20 +58,20 @@ public:
itkTypeMacro(LinkPathListFilter, PathListToPathListFilter);
/** Template parameters typedefs */
- typedef typename Superclass::PathType PathType;
- typedef typename Superclass::PathListType PathListType;
- typedef typename Superclass::PathPointerType PathPointerType;
- typedef typename PathListType::Pointer PathListPointerType;
- typedef typename PathListType::ConstIterator IteratorType;
- typedef typename PathType::VertexType VertexType;
- typedef typename PathType::VertexListType VertexListType;
+ typedef typename Superclass::PathType PathType;
+ typedef typename Superclass::PathListType PathListType;
+ typedef typename Superclass::PathPointerType PathPointerType;
+ typedef typename PathListType::Pointer PathListPointerType;
+ typedef typename PathListType::ConstIterator IteratorType;
+ typedef typename PathType::VertexType VertexType;
+ typedef typename PathType::VertexListType VertexListType;
typedef typename VertexListType::ConstIterator VertexIteratorType;
- typedef double RealType;
+ typedef double RealType;
- itkSetMacro(AngularThreshold,RealType);
- itkGetMacro(AngularThreshold,RealType);
- itkSetMacro(DistanceThreshold,RealType);
- itkGetMacro(DistanceThreshold,RealType);
+ itkSetMacro(AngularThreshold, RealType);
+ itkGetMacro(AngularThreshold, RealType);
+ itkSetMacro(DistanceThreshold, RealType);
+ itkGetMacro(DistanceThreshold, RealType);
itkSetMacro(ModuloPI, bool);
itkGetMacro(ModuloPI, bool);
@@ -79,7 +79,7 @@ protected:
/** Constructor */
LinkPathListFilter();
/** Destructor */
- virtual ~LinkPathListFilter() {};
+ virtual ~LinkPathListFilter() {}
/** GenerateData method */
virtual void GenerateData();
/** PrintSelf method */
@@ -103,11 +103,11 @@ protected:
* \param revert2 wether p2 need to be reverted or not,
* \return the linked path.
*/
- PathPointerType LinkPath(PathPointerType p1,bool revert1, PathPointerType p2, bool revert2);
+ PathPointerType LinkPath(PathPointerType p1, bool revert1, PathPointerType p2, bool revert2);
private:
- LinkPathListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LinkPathListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
RealType m_AngularThreshold;
RealType m_DistanceThreshold;
@@ -116,7 +116,7 @@ private:
bool m_ModuloPI;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbLinkPathListFilter.txx"
#endif
diff --git a/Code/FeatureExtraction/otbLinkPathListFilter.txx b/Code/FeatureExtraction/otbLinkPathListFilter.txx
index f655386fa1..bfb025c31f 100644
--- a/Code/FeatureExtraction/otbLinkPathListFilter.txx
+++ b/Code/FeatureExtraction/otbLinkPathListFilter.txx
@@ -41,8 +41,8 @@ LinkPathListFilter<TPath>
::GenerateData()
{
// IO
- const PathListType * inputPtr = this->GetInput();
- PathListType * outputPtr = this->GetOutput();
+ const PathListType * inputPtr = this->GetInput();
+ PathListType * outputPtr = this->GetOutput();
// Input iterator
IteratorType inputIt = inputPtr->Begin();
@@ -50,35 +50,35 @@ LinkPathListFilter<TPath>
std::vector<bool> eraseFlagVector;
// First we copy all input path to output
- while ( inputIt != inputPtr->End())
- {
+ while (inputIt != inputPtr->End())
+ {
outputPtr->PushBack(inputIt.Get());
eraseFlagVector.push_back(false);
++inputIt;
- }
+ }
IteratorType outputIt1 = outputPtr->Begin();
unsigned int index1 = 0;
- while (outputIt1!=outputPtr->End())
- {
- if (!eraseFlagVector[index1])
+ while (outputIt1 != outputPtr->End())
{
+ if (!eraseFlagVector[index1])
+ {
IteratorType outputIt2 = outputIt1;
++outputIt2;
// indicate if a path was found and wath is its index
unsigned int pathToLinkIndex = 0;
- double distance = -1.0;
- unsigned int index2 = index1+1;
- bool found = false;
- bool revert1 = false;
- bool revert2 = false;
+ double distance = -1.0;
+ unsigned int index2 = index1 + 1;
+ bool found = false;
+ bool revert1 = false;
+ bool revert2 = false;
if (!eraseFlagVector[index1])
- {
- while (outputIt2!=outputPtr->End())
{
- if (!eraseFlagVector[index2])
+ while (outputIt2 != outputPtr->End())
{
+ if (!eraseFlagVector[index2])
+ {
//otbMsgDevMacro(<<"Examining links between path "<<index1<<" and path "<<index2);
// Examining end of path1 with beginning of path2
VertexIteratorType vSourceIt = outputIt1.Get()->GetVertexList()->End();
@@ -90,11 +90,11 @@ LinkPathListFilter<TPath>
VertexType v3 = vTargetIt.Value();
++vTargetIt;
VertexType v4 = vTargetIt.Value();
- double tmpDistance = vcl_sqrt(vcl_pow(v2[0]-v3[0],2)+vcl_pow(v2[1]-v3[1],2));
- if ((tmpDistance<static_cast<double>(m_DistanceThreshold)) && ((!found)||(tmpDistance<distance)))
- {
- if (VerifyAngularCondition(v1,v2,v3,v4))
+ double tmpDistance = vcl_sqrt(vcl_pow(v2[0] - v3[0], 2) + vcl_pow(v2[1] - v3[1], 2));
+ if ((tmpDistance < static_cast<double>(m_DistanceThreshold)) && ((!found) || (tmpDistance < distance)))
{
+ if (VerifyAngularCondition(v1, v2, v3, v4))
+ {
// we found a better candidate
//otbMsgDevMacro(<<"Link between end of path "<<index1<<" and beginning of path "<<index2<<" is currently the best choice");
distance = tmpDistance;
@@ -102,23 +102,23 @@ LinkPathListFilter<TPath>
revert1 = false;
revert2 = false;
if (!found)
- {
+ {
found = true;
+ }
}
}
- }
// Examining end of path1 with end of path2
vTargetIt = outputIt2.Get()->GetVertexList()->End();
--vTargetIt;
v3 = vTargetIt.Value();
--vTargetIt;
v4 = vTargetIt.Value();
- tmpDistance = vcl_sqrt(vcl_pow(v2[0]-v3[0],2)+vcl_pow(v2[1]-v3[1],2));
+ tmpDistance = vcl_sqrt(vcl_pow(v2[0] - v3[0], 2) + vcl_pow(v2[1] - v3[1], 2));
- if ((tmpDistance<static_cast<double>(m_DistanceThreshold)) && ((!found)||(tmpDistance<distance)))
- {
- if (VerifyAngularCondition(v1,v2,v3,v4))
+ if ((tmpDistance < static_cast<double>(m_DistanceThreshold)) && ((!found) || (tmpDistance < distance)))
{
+ if (VerifyAngularCondition(v1, v2, v3, v4))
+ {
// we found a better candidate
//otbMsgDevMacro(<<"Link between end of path "<<index1<<" and end of path "<<index2<<" is currently the best choice");
distance = tmpDistance;
@@ -126,22 +126,22 @@ LinkPathListFilter<TPath>
revert1 = false;
revert2 = true;
if (!found)
- {
+ {
found = true;
+ }
}
}
- }
// Examining beginning of path1 with end of path2
vSourceIt = outputIt1.Get()->GetVertexList()->Begin();
v2 = vSourceIt.Value();
++vSourceIt;
v1 = vSourceIt.Value();
- tmpDistance = vcl_sqrt(vcl_pow(v2[0]-v3[0],2)+vcl_pow(v2[1]-v3[1],2));
+ tmpDistance = vcl_sqrt(vcl_pow(v2[0] - v3[0], 2) + vcl_pow(v2[1] - v3[1], 2));
- if ((tmpDistance<static_cast<double>(m_DistanceThreshold)) && ((!found)||(tmpDistance<distance)))
- {
- if (VerifyAngularCondition(v1,v2,v3,v4))
+ if ((tmpDistance < static_cast<double>(m_DistanceThreshold)) && ((!found) || (tmpDistance < distance)))
{
+ if (VerifyAngularCondition(v1, v2, v3, v4))
+ {
// we found a better candidate
//otbMsgDevMacro(<<"Link between beginning of path "<<index1<<" and end of path "<<index2<<" is currently the best choice");
distance = tmpDistance;
@@ -149,21 +149,21 @@ LinkPathListFilter<TPath>
revert1 = true;
revert2 = true;
if (!found)
- {
+ {
found = true;
+ }
}
}
- }
// Examining beginning of path1 with beginning of path2
vTargetIt = outputIt2.Get()->GetVertexList()->Begin();
v3 = vTargetIt.Value();
++vTargetIt;
v4 = vTargetIt.Value();
- tmpDistance = vcl_sqrt(vcl_pow(v2[0]-v3[0],2)+vcl_pow(v2[1]-v3[1],2));
- if ((tmpDistance<static_cast<double>(m_DistanceThreshold)) && ((!found)||(tmpDistance<distance)))
- {
- if (VerifyAngularCondition(v1,v2,v3,v4))
+ tmpDistance = vcl_sqrt(vcl_pow(v2[0] - v3[0], 2) + vcl_pow(v2[1] - v3[1], 2));
+ if ((tmpDistance < static_cast<double>(m_DistanceThreshold)) && ((!found) || (tmpDistance < distance)))
{
+ if (VerifyAngularCondition(v1, v2, v3, v4))
+ {
// we found a better candidate
//otbMsgDevMacro(<<"Link between beginning of path "<<index1<<" and beginning of path "<<index2<<" is currently the best choice");
distance = tmpDistance;
@@ -171,47 +171,47 @@ LinkPathListFilter<TPath>
revert1 = true;
revert2 = false;
if (!found)
- {
+ {
found = true;
+ }
}
}
}
- }
++index2;
++outputIt2;
- }
+ }
if (found)
- {
+ {
//otbMsgDevMacro(<<"Search ended, merging path "<<index1<<" and path "<<pathToLinkIndex);
// an appropriate path was found
outputIt2 = outputPtr->Begin() + pathToLinkIndex;
- PathPointerType newPath = this->LinkPath(outputIt1.Get(),revert1,outputIt2.Get(),revert2);
+ PathPointerType newPath = this->LinkPath(outputIt1.Get(), revert1, outputIt2.Get(), revert2);
outputPtr->PushBack(newPath);
// add a non erased flag for the new path
eraseFlagVector.push_back(false);
// mark the old path as erased
- eraseFlagVector[index1]=true;
- eraseFlagVector[pathToLinkIndex]=true;
+ eraseFlagVector[index1] = true;
+ eraseFlagVector[pathToLinkIndex] = true;
+ }
}
}
- }
++index1;
// This replaces ++outputIt1 because the iterators is somehow invalidated by a pushback.
outputIt1 = outputPtr->Begin() + index1;
- }
+ }
// search ended, now removing the erased path
typename std::vector<bool>::reverse_iterator it = eraseFlagVector.rbegin();
- index1 = eraseFlagVector.size()-1;
- while (it!=eraseFlagVector.rend())
- {
- if (eraseFlagVector[index1])
+ index1 = eraseFlagVector.size() - 1;
+ while (it != eraseFlagVector.rend())
{
+ if (eraseFlagVector[index1])
+ {
outputPtr->Erase(index1);
- }
+ }
--index1;
++it;
- }
+ }
}
/**
* Verify the angular condition to link a path.
@@ -226,26 +226,26 @@ bool
LinkPathListFilter<TPath>
::VerifyAngularCondition(VertexType v1, VertexType v2, VertexType v3, VertexType v4)
{
- double alpha1 = vcl_atan2((v2[1]-v1[1]),(v2[0]-v1[0]));
- double alpha2 = vcl_atan2((v4[1]-v3[1]),(v4[0]-v3[0]));
- double alpha3 = vcl_atan2((v3[1]-v2[1]),(v3[0]-v2[0]));
+ double alpha1 = vcl_atan2((v2[1] - v1[1]), (v2[0] - v1[0]));
+ double alpha2 = vcl_atan2((v4[1] - v3[1]), (v4[0] - v3[0]));
+ double alpha3 = vcl_atan2((v3[1] - v2[1]), (v3[0] - v2[0]));
if (m_ModuloPI)
- {
- alpha1 = (alpha1 >= 0)?alpha1:(alpha1+CONST_PI);
- alpha2 = (alpha2 >= 0)?alpha2:(alpha2+CONST_PI);
- alpha3 = (alpha3 >= 0)?alpha3:(alpha3+CONST_PI);
- }
+ {
+ alpha1 = (alpha1 >= 0) ? alpha1 : (alpha1 + CONST_PI);
+ alpha2 = (alpha2 >= 0) ? alpha2 : (alpha2 + CONST_PI);
+ alpha3 = (alpha3 >= 0) ? alpha3 : (alpha3 + CONST_PI);
+ }
else
- {
- alpha1 = (alpha1 >= 0)?alpha1:(alpha1+CONST_2PI);
- alpha2 = (alpha2 >= 0)?alpha2:(alpha2+CONST_2PI);
- alpha3 = (alpha3 >= 0)?alpha3:(alpha3+CONST_2PI);
- }
+ {
+ alpha1 = (alpha1 >= 0) ? alpha1 : (alpha1 + CONST_2PI);
+ alpha2 = (alpha2 >= 0) ? alpha2 : (alpha2 + CONST_2PI);
+ alpha3 = (alpha3 >= 0) ? alpha3 : (alpha3 + CONST_2PI);
+ }
- bool resp = (vcl_abs(alpha1-alpha2) < static_cast<double>(m_AngularThreshold))
- && (vcl_abs(alpha1-alpha3) < static_cast<double>(m_AngularThreshold))
- &&(vcl_abs(alpha2-alpha3) <static_cast<double>(m_AngularThreshold ));
+ bool resp = (vcl_abs(alpha1 - alpha2) < static_cast<double>(m_AngularThreshold))
+ && (vcl_abs(alpha1 - alpha3) < static_cast<double>(m_AngularThreshold))
+ && (vcl_abs(alpha2 - alpha3) < static_cast<double>(m_AngularThreshold));
return resp;
}
/**
@@ -260,44 +260,43 @@ template <class TPath>
typename LinkPathListFilter<TPath>
::PathPointerType
LinkPathListFilter<TPath>
-::LinkPath(PathPointerType p1, bool revert1 , PathPointerType p2, bool revert2)
+::LinkPath(PathPointerType p1, bool revert1, PathPointerType p2, bool revert2)
{
PathPointerType resp = PathType::New();
VertexIteratorType it;
-
if (revert1)
- {
- for (it=(p1->GetVertexList()->End());it!=p1->GetVertexList()->Begin();)
{
+ for (it = (p1->GetVertexList()->End()); it != p1->GetVertexList()->Begin(); )
+ {
--it;
resp->AddVertex((it).Value());
+ }
}
- }
else
- {
- for (it=p1->GetVertexList()->Begin();it!=p1->GetVertexList()->End();++it)
{
+ for (it = p1->GetVertexList()->Begin(); it != p1->GetVertexList()->End(); ++it)
+ {
resp->AddVertex((it).Value());
+ }
}
- }
if (revert2)
- {
- for (it=(p2->GetVertexList()->End());it!=p2->GetVertexList()->Begin();)
{
+ for (it = (p2->GetVertexList()->End()); it != p2->GetVertexList()->Begin(); )
+ {
--it;
resp->AddVertex((it).Value());
+ }
}
- }
else
- {
- for (it=p2->GetVertexList()->Begin();it!=p2->GetVertexList()->End();++it)
{
+ for (it = p2->GetVertexList()->Begin(); it != p2->GetVertexList()->End(); ++it)
+ {
resp->AddVertex(it.Value());
+ }
}
- }
return resp;
}
/**
diff --git a/Code/FeatureExtraction/otbLocalHoughFilter.h b/Code/FeatureExtraction/otbLocalHoughFilter.h
index 35d211f3fb..f473242679 100644
--- a/Code/FeatureExtraction/otbLocalHoughFilter.h
+++ b/Code/FeatureExtraction/otbLocalHoughFilter.h
@@ -30,7 +30,6 @@
#include "otbExtractROI.h"
#include "otbImage.h"
-
namespace otb
{
/** \class LocalHoughFilter
@@ -52,10 +51,9 @@ class ITK_EXPORT LocalHoughFilter : public ImageToLineSpatialObjectListFilter<TI
{
public:
-
/** Standard class typedefs. */
typedef LocalHoughFilter Self;
- typedef ImageToLineSpatialObjectListFilter<TInputImage> Superclass;
+ typedef ImageToLineSpatialObjectListFilter<TInputImage> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -65,44 +63,41 @@ public:
/** Return the name of the class. */
itkTypeMacro(LocalHoughFilter, ImageToLineSpatialObjectListFilter);
-
/** Definition of the list of lines. */
- typedef typename Superclass::LinesListType LinesListType;
+ typedef typename Superclass::LinesListType LinesListType;
typedef typename LinesListType::const_iterator LineIterator;
- typedef typename LinesListType::LineType LineType;
- typedef typename LineType::Pointer LinePointer;
+ typedef typename LinesListType::LineType LineType;
+ typedef typename LineType::Pointer LinePointer;
- typedef typename LineType::PointListType PointListType;
- typedef typename LineType::LinePointType LinePointType;
+ typedef typename LineType::PointListType PointListType;
+ typedef typename LineType::LinePointType LinePointType;
/** Extract dimensions as well of the images of entry of exit. */
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
-
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
typedef TInputImage InputImageType;
//------------------------------------------------------------
- typedef unsigned char OutputPixelType;
- typedef otb::Image< OutputPixelType, 2 > OutputImageType;
+ typedef unsigned char OutputPixelType;
+ typedef otb::Image<OutputPixelType, 2> OutputImageType;
//-----------------------------------------------
/** Definition of the pixel type of the input and output images */
- typedef typename InputImageType::PixelType InputPixelType;
- typedef float AccumulatorPixelType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef float AccumulatorPixelType;
- typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
/** Definition of the size of the images. */
typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::RegionType::IndexType IndexType;
+ typedef typename InputImageType::RegionType::IndexType IndexType;
/** Typedefs to define the extract ROI filter. */
- typedef ExtractROI< InputPixelType, InputPixelType> ROIFilterType;
-
+ typedef ExtractROI<InputPixelType, InputPixelType> ROIFilterType;
/** Set the radius of the local region where to apply the Hough filter. */
itkSetMacro(Radius, SizeType);
@@ -110,7 +105,6 @@ public:
/** Get the radius of the local region. */
itkGetConstReferenceMacro(Radius, SizeType);
-
/** Set the radius of the overlap of the local region where to apply the Hough filter. */
itkSetMacro(Overlap, SizeType);
@@ -125,17 +119,15 @@ public:
/** Set/Get the radius of the disc to remove from the accumulator
* for each line found */
- itkSetMacro(DiscRadius,float);
- itkGetMacro(DiscRadius,float);
-
+ itkSetMacro(DiscRadius, float);
+ itkGetMacro(DiscRadius, float);
/** Set/Get the variance of the gaussian bluring for the accumulator */
- itkSetMacro(Variance,float);
- itkGetMacro(Variance,float);
-
- itkSetMacro(Threshold,float);
- itkGetMacro(Threshold,float);
+ itkSetMacro(Variance, float);
+ itkGetMacro(Variance, float);
+ itkSetMacro(Threshold, float);
+ itkGetMacro(Threshold, float);
protected:
LocalHoughFilter();
@@ -143,15 +135,13 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Definition of the Hough Filter. */
- typedef itk::HoughTransform2DLinesImageFilter<InputPixelType, AccumulatorPixelType> HoughFilterType;
-
+ typedef itk::HoughTransform2DLinesImageFilter<InputPixelType, AccumulatorPixelType> HoughFilterType;
virtual void GenerateData();
-
private:
- LocalHoughFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LocalHoughFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Radius used to define the local region. */
SizeType m_Radius;
@@ -160,7 +150,7 @@ private:
SizeType m_Overlap;
/** Parameter of the Hough filter : number of lines we are looking for. */
- unsigned int m_NumberOfLines;
+ unsigned int m_NumberOfLines;
/** Variance of the accumulator blurring (default = 5). */
float m_Variance;
@@ -173,10 +163,8 @@ private:
LinePointer LinePointResearch(LineIterator itLines, InputImageType *localImage, IndexType origin);
-
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/FeatureExtraction/otbLocalHoughFilter.txx b/Code/FeatureExtraction/otbLocalHoughFilter.txx
index 7360406c54..c416668997 100644
--- a/Code/FeatureExtraction/otbLocalHoughFilter.txx
+++ b/Code/FeatureExtraction/otbLocalHoughFilter.txx
@@ -31,10 +31,10 @@ namespace otb
*/
template <class TInputImage>
LocalHoughFilter<TInputImage>::LocalHoughFilter() : ImageToLineSpatialObjectListFilter<TInputImage>(),
- m_NumberOfLines(1),
- m_Variance(5),
- m_DiscRadius(10),
- m_Threshold(0)
+ m_NumberOfLines(1),
+ m_Variance(5),
+ m_DiscRadius(10),
+ m_Threshold(0)
{
m_Radius.Fill(20);
m_Overlap.Fill(0);
@@ -48,23 +48,21 @@ LinePointResearch(LineIterator itLines, InputImageType *image, IndexType origin)
// Get the list of points which consists of two points to represent a
// straight line
- PointListType & pointsList = (*itLines)->GetPoints();
- typename PointListType::const_iterator itPoints = pointsList.begin();
-
+ PointListType& pointsList = (*itLines)->GetPoints();
+ typename PointListType::const_iterator itPoints = pointsList.begin();
double u[2];
u[0] = (*itPoints).GetPosition()[0];
u[1] = (*itPoints).GetPosition()[1];
++itPoints;
double v[2];
- v[0] = u[0]-(*itPoints).GetPosition()[0];
- v[1] = u[1]-(*itPoints).GetPosition()[1];
+ v[0] = u[0] - (*itPoints).GetPosition()[0];
+ v[1] = u[1] - (*itPoints).GetPosition()[1];
- double norm = vcl_sqrt(v[0]*v[0]+v[1]*v[1]);
+ double norm = vcl_sqrt(v[0] * v[0] + v[1] * v[1]);
v[0] /= norm;
v[1] /= norm;
-
typename InputImageType::RegionType region = image->GetLargestPossibleRegion();
PointListType ptList;
@@ -74,79 +72,71 @@ LinePointResearch(LineIterator itLines, InputImageType *image, IndexType origin)
typename InputImageType::IndexType previousIndex;
typename InputImageType::IndexType nextIndex;
-
// The diagonal is the largest distance between two edges of image
itk::Size<2> size = region.GetSize();
- float diag = vcl_sqrt((float)( size[0]*size[0] + size[1]*size[1] ));
+ float diag = vcl_sqrt((float) (size[0] * size[0] + size[1] * size[1]));
// Loop on the largest distance to be sure to cover all the image
// whatever the position of the origin u
- for (int i=static_cast<int>(-diag); i<static_cast<int>(diag); ++i)
- {
-
- previousIndex[0] = static_cast<long>(u[0]+(i-1)*v[0]);
- previousIndex[1] = static_cast<long>(u[1]+(i-1)*v[1]);
+ for (int i = static_cast<int>(-diag); i < static_cast<int>(diag); ++i)
+ {
- localIndex[0] = static_cast<long>(u[0]+i*v[0]);
- localIndex[1] = static_cast<long>(u[1]+i*v[1]);
+ previousIndex[0] = static_cast<long>(u[0] + (i - 1) * v[0]);
+ previousIndex[1] = static_cast<long>(u[1] + (i - 1) * v[1]);
- nextIndex[0] = static_cast<long>(u[0]+(i+1)*v[0]);
- nextIndex[1] = static_cast<long>(u[1]+(i+1)*v[1]);
+ localIndex[0] = static_cast<long>(u[0] + i * v[0]);
+ localIndex[1] = static_cast<long>(u[1] + i * v[1]);
+ nextIndex[0] = static_cast<long>(u[0] + (i + 1) * v[0]);
+ nextIndex[1] = static_cast<long>(u[1] + (i + 1) * v[1]);
// Check if the local index is inside the image and the previous
// index is outside or if the local index is inside the image and
// the next index is outside
+ if (((region.IsInside(localIndex)) && (!region.IsInside(previousIndex))) ||
+ ((region.IsInside(localIndex)) && (!region.IsInside(nextIndex))))
+ {
- if ( ((region.IsInside( localIndex )) && (!region.IsInside( previousIndex ))) ||
- ((region.IsInside( localIndex )) && (!region.IsInside( nextIndex ))) )
- {
-
- point.SetPosition(localIndex[0]+origin[0],localIndex[1]+origin[1]);
+ point.SetPosition(localIndex[0] + origin[0], localIndex[1] + origin[1]);
ptList.push_back(point);
- }
+ }
- }
+ }
// Check if the line is well defined by two points
LinePointer line = LineType::New();
-
- if ( ptList.size() == 2 )
- {
+ if (ptList.size() == 2)
+ {
line->SetId(0);
line->SetPoints(ptList);
line->ComputeBoundingBox();
- }
+ }
ptList.clear();
-
- return( line);
-
+ return (line);
}
-
template <class TInputImage>
void
LocalHoughFilter<TInputImage>
::GenerateData()
{
- typename InputImageType::ConstPointer input = this->GetInput();
+ typename InputImageType::ConstPointer input = this->GetInput();
- typename LinesListType::Pointer list;
+ typename LinesListType::Pointer list;
list = this->GetOutput();
- typename ROIFilterType::Pointer ROIfilter = ROIFilterType::New();
-
- typename HoughFilterType::LinesListType lines;
+ typename ROIFilterType::Pointer ROIfilter = ROIFilterType::New();
- typename HoughFilterType::Pointer houghFilter = HoughFilterType::New();
+ typename HoughFilterType::LinesListType lines;
+ typename HoughFilterType::Pointer houghFilter = HoughFilterType::New();
// Get image size
itk::Size<2> size = input->GetLargestPossibleRegion().GetSize();
@@ -155,42 +145,35 @@ LocalHoughFilter<TInputImage>
// Direction X
// x and y must be < size in order to avoid 0-sized regions
- for ( unsigned long x=0; x < size[0]-1; x += (m_Radius[0]-m_Overlap[0]) )
- {
+ for (unsigned long x = 0; x < size[0] - 1; x += (m_Radius[0] - m_Overlap[0]))
+ {
// Initialize the extract ROI filter in the direction X
ROIfilter->SetStartX(x);
// Number of pixels of the local region
- if ( (x+m_Radius[0]) < size[0] )
- ROIfilter->SetSizeX(m_Radius[0]);
- else
- ROIfilter->SetSizeX(size[0]-x-1);
-
+ if ((x + m_Radius[0]) < size[0]) ROIfilter->SetSizeX(m_Radius[0]);
+ else ROIfilter->SetSizeX(size[0] - x - 1);
// Direction Y
- for ( unsigned long y=0; y < size[1]-1; y += (m_Radius[1]-m_Overlap[1]) )
- {
+ for (unsigned long y = 0; y < size[1] - 1; y += (m_Radius[1] - m_Overlap[1]))
+ {
// Initialize the extract ROI filter in the direction Y
ROIfilter->SetStartY(y);
- if ( (y+m_Radius[1]) < size[1] )
- ROIfilter->SetSizeY(m_Radius[1]);
- else
- ROIfilter->SetSizeY(size[1]-y-1);
-
+ if ((y + m_Radius[1]) < size[1]) ROIfilter->SetSizeY(m_Radius[1]);
+ else ROIfilter->SetSizeY(size[1] - y - 1);
// Extract the local region of the input image
- ROIfilter->SetInput( this->GetInput() );
+ ROIfilter->SetInput(this->GetInput());
// ----------------------------------------------------
// Create a copy of the extract ROI filter output image
// ----------------------------------------------------
- typename InputImageType::Pointer localImage = InputImageType::New();
- typename InputImageType::Pointer filterImage = InputImageType::New();
-
+ typename InputImageType::Pointer localImage = InputImageType::New();
+ typename InputImageType::Pointer filterImage = InputImageType::New();
ROIfilter->UpdateLargestPossibleRegion();
ROIfilter->Update();
@@ -202,64 +185,60 @@ LocalHoughFilter<TInputImage>
typename InputImageType::RegionType region;
- IndexType index;
+ IndexType index;
index[0] = 0;
index[1] = 0;
region.SetSize(filterImage->GetLargestPossibleRegion().GetSize());
region.SetIndex(index);
- localImage->SetRegions( region );
+ localImage->SetRegions(region);
localImage->SetOrigin(filterImage->GetOrigin());
localImage->SetSpacing(filterImage->GetSpacing());
localImage->Allocate();
- typedef itk::ImageRegionIteratorWithIndex< InputImageType > LocalIteratorType;
- typedef itk::ImageRegionConstIteratorWithIndex< InputImageType > FilterIteratorType;
+ typedef itk::ImageRegionIteratorWithIndex<InputImageType> LocalIteratorType;
+ typedef itk::ImageRegionConstIteratorWithIndex<InputImageType> FilterIteratorType;
- LocalIteratorType localIt( localImage, localImage->GetRequestedRegion() );
- FilterIteratorType filterIt( filterImage, filterImage->GetRequestedRegion() );
+ LocalIteratorType localIt(localImage, localImage->GetRequestedRegion());
+ FilterIteratorType filterIt(filterImage, filterImage->GetRequestedRegion());
localIt.GoToBegin();
filterIt.GoToBegin();
-
// Copy the filter image in the new local image
- for ( localIt.GoToBegin(); !localIt.IsAtEnd(); ++localIt,++filterIt)
- localIt.Set( static_cast<InputPixelType>(filterIt.Get()) );
-
+ for (localIt.GoToBegin(); !localIt.IsAtEnd(); ++localIt, ++filterIt)
+ localIt.Set(static_cast<InputPixelType>(filterIt.Get()));
// -------------------------------
// Application of Hough filter
// -------------------------------
- houghFilter->SetInput( localImage );
- houghFilter->SetNumberOfLines( m_NumberOfLines );
- houghFilter->SetVariance( m_Variance );
- houghFilter->SetDiscRadius( m_DiscRadius );
- houghFilter->SetThreshold( m_Threshold );
+ houghFilter->SetInput(localImage);
+ houghFilter->SetNumberOfLines(m_NumberOfLines);
+ houghFilter->SetVariance(m_Variance);
+ houghFilter->SetDiscRadius(m_DiscRadius);
+ houghFilter->SetThreshold(m_Threshold);
houghFilter->Modified();
houghFilter->Update();
-
// ---------------------------------------
// Get the list of LineSpatialObject lines
// ---------------------------------------
lines = houghFilter->GetLines(m_NumberOfLines);
-
LineIterator itLines = lines.begin();
// Loop on the lines of hough filter list
- while ( itLines != lines.end() )
- {
+ while (itLines != lines.end())
+ {
LinePointer line = LineType::New();
- IndexType origin;
+ IndexType origin;
origin[0] = x;
origin[1] = y;
@@ -268,29 +247,26 @@ LocalHoughFilter<TInputImage>
// used to define a line
line = LinePointResearch(itLines, localImage, origin);
- if (line->GetNumberOfPoints() != 0)
- list->push_back(line);
+ if (line->GetNumberOfPoints() != 0) list->push_back(line);
++itLines;
- }
+ }
lines.clear();
- } // end of loop in y direction
-
- } // end of loop in x direction
+ } // end of loop in y direction
+ } // end of loop in x direction
}
-
template <class TInputImage>
void
LocalHoughFilter<TInputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/FeatureExtraction/otbMeanTextureFunctor.h b/Code/FeatureExtraction/otbMeanTextureFunctor.h
index c267196fb7..c5fcc86282 100644
--- a/Code/FeatureExtraction/otbMeanTextureFunctor.h
+++ b/Code/FeatureExtraction/otbMeanTextureFunctor.h
@@ -40,31 +40,31 @@ namespace Functor
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT MeanTextureFunctor :
-public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
+ public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
MeanTextureFunctor(){};
- virtual ~MeanTextureFunctor(){};
+ virtual ~MeanTextureFunctor(){}
typedef TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
typedef typename Superclass::NeighborhoodType NeighborhoodType;
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
this->ComputeJointHistogram(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
double out = 0.;
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
+ {
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
{
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- double p = static_cast<double>(this->GetHisto()[r][s]) * areaInv;
- out += (static_cast<double>(s)+0.5)*this->GetNeighBinLength() * p;
- }
+ double p = static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ out += (static_cast<double>(s) + 0.5) * this->GetNeighBinLength() * p;
}
+ }
- return out;
+ return out;
}
};
@@ -72,4 +72,3 @@ public:
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbModulusAndDirectionImageToImageFilter.h b/Code/FeatureExtraction/otbModulusAndDirectionImageToImageFilter.h
index 9cd5401c9e..f9283032c1 100644
--- a/Code/FeatureExtraction/otbModulusAndDirectionImageToImageFilter.h
+++ b/Code/FeatureExtraction/otbModulusAndDirectionImageToImageFilter.h
@@ -20,7 +20,6 @@
#include "itkImageToImageFilter.h"
-
namespace otb
{
@@ -35,24 +34,24 @@ namespace otb
*
*/
template <class TInputImage,
-class TInputImageDirection,
-class TOutputImage >
-class ITK_EXPORT ModulusAndDirectionImageToImageFilter : public itk::ImageToImageFilter< TInputImage, TOutputImage >
+ class TInputImageDirection,
+ class TOutputImage>
+class ITK_EXPORT ModulusAndDirectionImageToImageFilter : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Extract dimensions as well of the images of entry of exit. */
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,
- unsigned int,
- TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension,
+ unsigned int,
+ TOutputImage::ImageDimension);
/** typedef for the classes standards. */
- typedef ModulusAndDirectionImageToImageFilter Self;
- typedef itk::ImageToImageFilter< TInputImage, TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ModulusAndDirectionImageToImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for management of the object factory. */
itkNewMacro(Self);
@@ -60,24 +59,24 @@ public:
/** Return the name of the class. */
itkTypeMacro(ModulusAndDirectionImageToImageFilter, itk::ImageToImageFilter);
- typedef typename Superclass::InputImageType InputImageType;
- typedef TInputImageDirection InputImageDirectionType;
- typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef TInputImageDirection InputImageDirectionType;
+ typedef typename Superclass::OutputImageType OutputImageType;
/** Set/Get the image input of this process object. */
- virtual void SetInput( const InputImageType *input);
- virtual void SetInputDirection( const InputImageDirectionType *direction);
+ virtual void SetInput(const InputImageType *input);
+ virtual void SetInputDirection(const InputImageDirectionType *direction);
const InputImageType * GetInput(void);
const InputImageDirectionType * GetInputDirection(void);
protected:
ModulusAndDirectionImageToImageFilter();
- virtual ~ModulusAndDirectionImageToImageFilter() {};
+ virtual ~ModulusAndDirectionImageToImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ModulusAndDirectionImageToImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ModulusAndDirectionImageToImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
@@ -86,5 +85,4 @@ private:
#include "otbModulusAndDirectionImageToImageFilter.txx"
#endif
-
#endif
diff --git a/Code/FeatureExtraction/otbModulusAndDirectionImageToImageFilter.txx b/Code/FeatureExtraction/otbModulusAndDirectionImageToImageFilter.txx
index 25213cb913..55a06c5e65 100644
--- a/Code/FeatureExtraction/otbModulusAndDirectionImageToImageFilter.txx
+++ b/Code/FeatureExtraction/otbModulusAndDirectionImageToImageFilter.txx
@@ -27,7 +27,7 @@ namespace otb
/**
*
*/
-template <class TInputImage, class TOutputImage, class TOutputImageDirection >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection>
ModulusAndDirectionImageToImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::
ModulusAndDirectionImageToImageFilter()
{
@@ -36,70 +36,70 @@ ModulusAndDirectionImageToImageFilter()
this->SetNumberOfOutputs(1);
this->SetNumberOfRequiredOutputs(1);
- this->SetNthOutput(0,OutputImageType::New());
+ this->SetNthOutput(0, OutputImageType::New());
}
-
-template <class TInputImage, class TInputImageDirection, class TOutputImage >
+template <class TInputImage, class TInputImageDirection, class TOutputImage>
void
ModulusAndDirectionImageToImageFilter<TInputImage, TInputImageDirection, TOutputImage>::
-SetInput( const InputImageType *input)
+SetInput(const InputImageType *input)
{
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(0,
- const_cast< InputImageType * >( input ) );
+ const_cast<InputImageType *>(input));
}
-template <class TInputImage, class TInputImageDirection, class TOutputImage >
+template <class TInputImage, class TInputImageDirection, class TOutputImage>
void
ModulusAndDirectionImageToImageFilter<TInputImage, TInputImageDirection, TOutputImage>::
-SetInputDirection( const InputImageDirectionType *direction)
+SetInputDirection(const InputImageDirectionType *direction)
{
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(1,
- const_cast< InputImageDirectionType * >( direction ) );
+ const_cast<InputImageDirectionType *>(direction));
}
/** Return the input image modulus */
-template <class TInputImage, class TInputImageDirection, class TOutputImage >
+template <class TInputImage, class TInputImageDirection, class TOutputImage>
const typename ModulusAndDirectionImageToImageFilter<TInputImage, TInputImageDirection, TOutputImage>::InputImageType *
ModulusAndDirectionImageToImageFilter<TInputImage, TInputImageDirection, TOutputImage>::
GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TInputImage * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<const TInputImage *>
+ (this->itk::ProcessObject::GetInput(0));
}
/** Return the intput image direction */
-template <class TInputImage, class TInputImageDirection, class TOutputImage >
-const typename ModulusAndDirectionImageToImageFilter<TInputImage, TInputImageDirection, TOutputImage>::InputImageDirectionType *
+template <class TInputImage, class TInputImageDirection, class TOutputImage>
+const typename ModulusAndDirectionImageToImageFilter<TInputImage, TInputImageDirection,
+ TOutputImage>::InputImageDirectionType *
ModulusAndDirectionImageToImageFilter<TInputImage, TInputImageDirection, TOutputImage>::
GetInputDirection(void)
{
if (this->GetNumberOfInputs() < 2)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TInputImageDirection * >
- (this->itk::ProcessObject::GetInput(1) );
+ return static_cast<const TInputImageDirection *>
+ (this->itk::ProcessObject::GetInput(1));
}
/**
* Standard "PrintSelf" method
*/
-template <class TInputImage, class TInputImageDirection, class TOutputImage >
+template <class TInputImage, class TInputImageDirection, class TOutputImage>
void
ModulusAndDirectionImageToImageFilter<TInputImage, TInputImageDirection, TOutputImage>::
PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
diff --git a/Code/FeatureExtraction/otbMultiplyByScalarImageFilter.h b/Code/FeatureExtraction/otbMultiplyByScalarImageFilter.h
index c4fdac4d60..6ad2fce665 100644
--- a/Code/FeatureExtraction/otbMultiplyByScalarImageFilter.h
+++ b/Code/FeatureExtraction/otbMultiplyByScalarImageFilter.h
@@ -30,7 +30,7 @@ namespace otb
namespace Functor
{
-template< class TInput, class TOutput >
+template<class TInput, class TOutput>
class MultiplyByScalar
{
public:
@@ -38,12 +38,12 @@ public:
{
m_Coef = 1.0;
}
- virtual ~MultiplyByScalar() {};
- inline TOutput operator()( const TInput & value )
+ virtual ~MultiplyByScalar() {}
+ inline TOutput operator ()(const TInput& value)
{
TOutput result;
- result = static_cast<TOutput>( m_Coef * value );
+ result = static_cast<TOutput>(m_Coef * value);
return result;
}
@@ -52,60 +52,58 @@ public:
{
m_Coef = Coef;
}
- double GetCoef(void)const
+ double GetCoef(void) const
{
- return ( m_Coef );
+ return (m_Coef);
}
private:
- double m_Coef;
+ double m_Coef;
};
}
template <class TInputImage, class TOutputImage>
class ITK_EXPORT MultiplyByScalarImageFilter :
- public itk::UnaryFunctorImageFilter<
- TInputImage,TOutputImage,
- Functor::MultiplyByScalar<
+ public itk::UnaryFunctorImageFilter<
+ TInputImage, TOutputImage,
+ Functor::MultiplyByScalar<
ITK_TYPENAME TInputImage::PixelType,
- ITK_TYPENAME TOutputImage::PixelType> >
+ ITK_TYPENAME TOutputImage::PixelType> >
{
public:
/** Standard class typedefs. */
- typedef MultiplyByScalarImageFilter Self;
+ typedef MultiplyByScalarImageFilter Self;
typedef typename itk::UnaryFunctorImageFilter<
- TInputImage,
- TOutputImage,
- Functor::MultiplyByScalar<
- ITK_TYPENAME TInputImage::PixelType,
- ITK_TYPENAME TOutputImage::PixelType> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ TInputImage,
+ TOutputImage,
+ Functor::MultiplyByScalar<
+ ITK_TYPENAME TInputImage::PixelType,
+ ITK_TYPENAME TOutputImage::PixelType> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
void SetCoef(double Coef)
{
- this->GetFunctor().SetCoef( Coef );
+ this->GetFunctor().SetCoef(Coef);
this->Modified();
}
- double GetCoef(void)const
+ double GetCoef(void) const
{
- return( this->GetFunctor().GetCoef() );
+ return (this->GetFunctor().GetCoef());
}
protected:
MultiplyByScalarImageFilter() {}
virtual ~MultiplyByScalarImageFilter() {}
private:
- MultiplyByScalarImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ MultiplyByScalarImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h b/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h
index 2c8f8dfcb9..c057ea47a8 100644
--- a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h
+++ b/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h
@@ -47,39 +47,39 @@ namespace otb
*/
template <class TInputImage, class TOutputModulus, class TOutputDirection>
class ITK_EXPORT NeighborhoodScalarProductFilter
- : public ImageToModulusAndDirectionImageFilter<TInputImage,TOutputModulus,TOutputDirection>
+ : public ImageToModulusAndDirectionImageFilter<TInputImage, TOutputModulus, TOutputDirection>
{
public:
/** Standard typedefs */
- typedef NeighborhoodScalarProductFilter Self;
- typedef ImageToModulusAndDirectionImageFilter<TInputImage,TOutputModulus,TOutputDirection> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef NeighborhoodScalarProductFilter Self;
+ typedef ImageToModulusAndDirectionImageFilter<TInputImage, TOutputModulus, TOutputDirection> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(NeighborhoodScalarProductFilter,ImageToModulusAndDirectionImageFilter);
+ itkTypeMacro(NeighborhoodScalarProductFilter, ImageToModulusAndDirectionImageFilter);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::ConstPointer InputImageConstPointerType;
- typedef typename InputImageType::PixelType InputPixelType;
- typedef TOutputModulus OutputModulusType;
- typedef typename OutputModulusType::Pointer OutputModulusPointerType;
- typedef typename OutputModulusType::RegionType RegionType;
- typedef typename OutputModulusType::SizeType SizeType;
- typedef typename OutputModulusType::IndexType IndexType;
- typedef TOutputDirection OutputDirectionType;
- typedef typename OutputDirectionType::Pointer OutputDirectionPointerType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::ConstPointer InputImageConstPointerType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef TOutputModulus OutputModulusType;
+ typedef typename OutputModulusType::Pointer OutputModulusPointerType;
+ typedef typename OutputModulusType::RegionType RegionType;
+ typedef typename OutputModulusType::SizeType SizeType;
+ typedef typename OutputModulusType::IndexType IndexType;
+ typedef TOutputDirection OutputDirectionType;
+ typedef typename OutputDirectionType::Pointer OutputDirectionPointerType;
typedef typename OutputDirectionType::RegionType OutputImageRegionType;
protected:
/** Constructor */
NeighborhoodScalarProductFilter();
/** Destructor */
- virtual ~NeighborhoodScalarProductFilter() {};
+ virtual ~NeighborhoodScalarProductFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** NeighborhoodScalarProductImageFilter can be implemented as a multithreaded filter.
@@ -93,12 +93,12 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
private:
- NeighborhoodScalarProductFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ NeighborhoodScalarProductFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbNeighborhoodScalarProductFilter.txx"
#endif
diff --git a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx b/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx
index e63ea2faa8..d919c49d02 100644
--- a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx
+++ b/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx
@@ -32,29 +32,29 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputModulus, class TOutputDirection>
-NeighborhoodScalarProductFilter<TInputImage,TOutputModulus,TOutputDirection>
+NeighborhoodScalarProductFilter<TInputImage, TOutputModulus, TOutputDirection>
::NeighborhoodScalarProductFilter()
{}
template <class TInputImage, class TOutputModulus, class TOutputDirection>
void
-NeighborhoodScalarProductFilter<TInputImage,TOutputModulus,TOutputDirection>
-::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId )
+NeighborhoodScalarProductFilter<TInputImage, TOutputModulus, TOutputDirection>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
// some typedefs
- typedef itk::ConstNeighborhoodIterator<InputImageType> NeighborhoodIteratorType;
- typedef typename NeighborhoodIteratorType::RadiusType RadiusType;
- typedef typename NeighborhoodIteratorType::OffsetType OffsetType;
- typedef itk::ZeroFluxNeumannBoundaryCondition<InputImageType> BoundaryConditionType;
- typedef itk::ImageRegionIterator<OutputModulusType> OutputIteratorType;
- typedef itk::ImageRegionIterator<OutputDirectionType> OutputDirectionIteratorType;
+ typedef itk::ConstNeighborhoodIterator<InputImageType> NeighborhoodIteratorType;
+ typedef typename NeighborhoodIteratorType::RadiusType RadiusType;
+ typedef typename NeighborhoodIteratorType::OffsetType OffsetType;
+ typedef itk::ZeroFluxNeumannBoundaryCondition<InputImageType> BoundaryConditionType;
+ typedef itk::ImageRegionIterator<OutputModulusType> OutputIteratorType;
+ typedef itk::ImageRegionIterator<OutputDirectionType> OutputDirectionIteratorType;
typedef itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> BoundaryFacesCalculatorType;
- typedef typename BoundaryFacesCalculatorType::FaceListType FaceListType;
- typedef typename FaceListType::iterator FaceListIteratorType;
+ typedef typename BoundaryFacesCalculatorType::FaceListType FaceListType;
+ typedef typename FaceListType::iterator FaceListIteratorType;
// Pointers on inputs/outputs
- InputImageType * inputPtr = const_cast<InputImageType *>(this->GetInput());
- OutputModulusPointerType outputPtr = this->GetOutput();
+ InputImageType * inputPtr = const_cast<InputImageType *>(this->GetInput());
+ OutputModulusPointerType outputPtr = this->GetOutput();
OutputDirectionPointerType outputDirPtr = this->GetOutputDirection();
// Neighborhood radius
@@ -63,97 +63,97 @@ NeighborhoodScalarProductFilter<TInputImage,TOutputModulus,TOutputDirection>
// Find the data-set boundary "faces"
BoundaryFacesCalculatorType bC;
- FaceListType faceList = bC(inputPtr, outputRegionForThread, r);
- FaceListIteratorType fit;
+ FaceListType faceList = bC(inputPtr, outputRegionForThread, r);
+ FaceListIteratorType fit;
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
- for (fit=faceList.begin(); fit != faceList.end(); ++fit)
- {
+ for (fit = faceList.begin(); fit != faceList.end(); ++fit)
+ {
NeighborhoodIteratorType neighInputIt(r, inputPtr, *fit);
- OutputIteratorType outputIt(outputPtr,*fit);
- OutputDirectionIteratorType outputDirIt(outputDirPtr,*fit);
+ OutputIteratorType outputIt(outputPtr, *fit);
+ OutputDirectionIteratorType outputDirIt(outputDirPtr, *fit);
neighInputIt.GoToBegin();
outputIt.GoToBegin();
outputDirIt.GoToBegin();
- while ((!neighInputIt.IsAtEnd()) && (!outputIt.IsAtEnd()) && (!outputDirIt.IsAtEnd()) )
- {
+ while ((!neighInputIt.IsAtEnd()) && (!outputIt.IsAtEnd()) && (!outputDirIt.IsAtEnd()))
+ {
// local variable intialization
- int neighborhoodNumberMax = 0;
+ int neighborhoodNumberMax = 0;
double scalarMaxValue = 0;
//TODO for a more general algorithm this might be replaced by:
//double scalarMaxValue = itk::NumericTraits<double>::NonpositiveMin();
int flagPosNegDirection = 0;
// walk through each case
- for (int neighborhoodNumber = 0; neighborhoodNumber<4; ++neighborhoodNumber)
- {
- double scalarCurrentValue = 0.0;
+ for (int neighborhoodNumber = 0; neighborhoodNumber < 4; ++neighborhoodNumber)
+ {
+ double scalarCurrentValue = 0.0;
OffsetType offset1;
OffsetType offset2;
switch (neighborhoodNumber)
- {
+ {
case 0:
- offset1[0]=1;
- offset1[1]=-1;
- offset2[0]=-1;
- offset2[1]=1;
+ offset1[0] = 1;
+ offset1[1] = -1;
+ offset2[0] = -1;
+ offset2[1] = 1;
break;
case 1:
- offset1[0]=1;
- offset1[1]=0;
- offset2[0]=-1;
- offset2[1]=0;
+ offset1[0] = 1;
+ offset1[1] = 0;
+ offset2[0] = -1;
+ offset2[1] = 0;
break;
case 2:
- offset1[0]=1;
- offset1[1]=1;
- offset2[0]=-1;
- offset2[1]=-1;
+ offset1[0] = 1;
+ offset1[1] = 1;
+ offset2[0] = -1;
+ offset2[1] = -1;
break;
case 3:
- offset1[0]=0;
- offset1[1]=1;
- offset2[0]=0;
- offset2[1]=-1;
+ offset1[0] = 0;
+ offset1[1] = 1;
+ offset2[0] = 0;
+ offset2[1] = -1;
break;
- }
+ }
// Get the gradient values
InputPixelType pixel1 = neighInputIt.GetPixel(offset1);
InputPixelType pixel2 = neighInputIt.GetPixel(offset2);
// Compute the scalar product
- scalarCurrentValue = -(pixel1[0]*pixel2[0]+pixel1[1]*pixel2[1]);
+ scalarCurrentValue = -(pixel1[0] * pixel2[0] + pixel1[1] * pixel2[1]);
// If the value is higher than the current max value
if (scalarCurrentValue > scalarMaxValue)
- {
+ {
// keep this configuration
scalarMaxValue = scalarCurrentValue;
neighborhoodNumberMax = neighborhoodNumber;
// Also keep the direction
- if (pixel1[0] <0)
- {
+ if (pixel1[0] < 0)
+ {
flagPosNegDirection = 1;
- }
+ }
else
- {
+ {
flagPosNegDirection = 0;
- }
+ }
+ }
}
- }
// Compute the direction
- double angle = static_cast<double>((1+neighborhoodNumberMax)) * static_cast<double>(CONST_PI_4);
+ double angle = static_cast<double>((1 + neighborhoodNumberMax)) * static_cast<double>(CONST_PI_4);
if (flagPosNegDirection)
- {
+ {
angle -= CONST_PI;
- }
+ }
// Set the ouptut values
outputIt.Set(scalarMaxValue);
@@ -162,15 +162,15 @@ NeighborhoodScalarProductFilter<TInputImage,TOutputModulus,TOutputDirection>
++outputIt;
++outputDirIt;
progress.CompletedPixel();
+ }
}
- }
}
/**
* PrintSelf Method
*/
template <class TInputImage, class TOutputModulus, class TOutputDirection>
void
-NeighborhoodScalarProductFilter<TInputImage,TOutputModulus,TOutputDirection>
+NeighborhoodScalarProductFilter<TInputImage, TOutputModulus, TOutputDirection>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h b/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h
index b89c15d01a..6228b8dede 100644
--- a/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h
+++ b/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h
@@ -36,25 +36,25 @@ template <class TInput1, class TInput2, class TOutput>
class NonMaxRemovalByDirectionFunctor
{
public:
- NonMaxRemovalByDirectionFunctor() {};
- virtual ~NonMaxRemovalByDirectionFunctor() {};
- inline TOutput operator()(const TInput1 & itA, const TInput2 &itB)
+ NonMaxRemovalByDirectionFunctor() {}
+ virtual ~NonMaxRemovalByDirectionFunctor() {}
+ inline TOutput operator ()(const TInput1& itA, const TInput2& itB)
{
TOutput resp = 0;
if (itA.GetCenterPixel() != 0)
- {
- typename TInput1::OffsetType offset1,offset2;
+ {
+ typename TInput1::OffsetType offset1, offset2;
int neighborhoodNumber;
if (itB.GetCenterPixel() > 0)
- {
- neighborhoodNumber = static_cast<int>(itB.GetCenterPixel()/(CONST_PI_4)-1);
- }
+ {
+ neighborhoodNumber = static_cast<int>(itB.GetCenterPixel() / (CONST_PI_4) -1);
+ }
else
- {
- neighborhoodNumber = static_cast<int>((itB.GetCenterPixel()+CONST_PI)/(CONST_PI_4)-1);
- }
- switch ( neighborhoodNumber )
- {
+ {
+ neighborhoodNumber = static_cast<int>((itB.GetCenterPixel() + CONST_PI) / (CONST_PI_4) -1);
+ }
+ switch (neighborhoodNumber)
+ {
case 0:
offset1[0] = 1;
offset1[1] = -1;
@@ -79,13 +79,13 @@ public:
offset2[0] = 0;
offset2[1] = -1;
break;
- }
+ }
if ((itA.GetCenterPixel() > itA.GetPixel(offset1))
&& (itA.GetCenterPixel() > itA.GetPixel(offset2)))
- {
+ {
resp = itA.GetCenterPixel();
+ }
}
- }
return resp;
}
};
@@ -99,11 +99,11 @@ public:
*/
template <class TInputModulus, class TInputDirection, class TOutputImage>
class ITK_EXPORT NonMaxRemovalByDirectionFilter
- : public ModulusAndDirectionImageToImageFilter<TInputModulus, TInputDirection, TOutputImage>
+ : public ModulusAndDirectionImageToImageFilter<TInputModulus, TInputDirection, TOutputImage>
{
public:
/** Standard typedefs */
- typedef NonMaxRemovalByDirectionFilter Self;
+ typedef NonMaxRemovalByDirectionFilter Self;
typedef ModulusAndDirectionImageToImageFilter<TInputModulus, TInputDirection, TOutputImage> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -112,26 +112,27 @@ public:
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(NonMaxRemovalByDirectionFilter,ModulusAndDirectionImageToImageFilter);
+ itkTypeMacro(NonMaxRemovalByDirectionFilter, ModulusAndDirectionImageToImageFilter);
/** typedef of the computing filter (this allows us to derive from ModulusAndDirectionToImageFilter as well as
using the BinaryFunctorNeighBorhoodImageFilter, which is appropriate here */
typedef Functor::NonMaxRemovalByDirectionFunctor<
- typename itk::ConstNeighborhoodIterator<TInputModulus>,
- typename itk::ConstNeighborhoodIterator<TInputDirection>,
- typename TOutputImage::PixelType> FunctorType;
- typedef otb::BinaryFunctorNeighborhoodImageFilter<TInputModulus, TInputDirection,TOutputImage,FunctorType> ComputingFilterType;
+ typename itk::ConstNeighborhoodIterator<TInputModulus>,
+ typename itk::ConstNeighborhoodIterator<TInputDirection>,
+ typename TOutputImage::PixelType> FunctorType;
+ typedef otb::BinaryFunctorNeighborhoodImageFilter<TInputModulus, TInputDirection, TOutputImage,
+ FunctorType> ComputingFilterType;
protected:
/** Constructor */
NonMaxRemovalByDirectionFilter() {};
/** Destructor */
- virtual ~NonMaxRemovalByDirectionFilter() {};
+ virtual ~NonMaxRemovalByDirectionFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- };
+ Superclass::PrintSelf(os, indent);
+ }
/** Main computation method */
virtual void GenerateData(void)
{
@@ -144,8 +145,8 @@ protected:
}
private:
- NonMaxRemovalByDirectionFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ NonMaxRemovalByDirectionFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbOrientationPathFunction.h b/Code/FeatureExtraction/otbOrientationPathFunction.h
index 31a0316465..c82e93a25f 100644
--- a/Code/FeatureExtraction/otbOrientationPathFunction.h
+++ b/Code/FeatureExtraction/otbOrientationPathFunction.h
@@ -32,17 +32,17 @@ namespace otb
* \ingroup PathFunctions
*/
-template < class TInputPath,
-class TOutput = double>
+template <class TInputPath,
+ class TOutput = double>
class ITK_EXPORT OrientationPathFunction :
- public PathFunction< TInputPath, TOutput >
+ public PathFunction<TInputPath, TOutput>
{
public:
/** Standard class typedefs. */
- typedef OrientationPathFunction Self;
- typedef PathFunction<TInputPath, TOutput> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef OrientationPathFunction Self;
+ typedef PathFunction<TInputPath, TOutput> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(OrientationPathFunction, PathFunction);
@@ -51,28 +51,27 @@ public:
itkNewMacro(Self);
/** InputPathType typedef support. */
- typedef typename Superclass::InputPathType PathType;
- typedef typename Superclass::InputPathConstPointer PathConstPointer;
- typedef typename PathType::ContinuousIndexType VertexType;
- typedef itk::VectorContainer< unsigned,VertexType > VertexListType;
- typedef typename VertexListType::ConstPointer VertexListPointer;
- typedef TOutput OutputType;
-
- typedef double RealType;
+ typedef typename Superclass::InputPathType PathType;
+ typedef typename Superclass::InputPathConstPointer PathConstPointer;
+ typedef typename PathType::ContinuousIndexType VertexType;
+ typedef itk::VectorContainer<unsigned, VertexType> VertexListType;
+ typedef typename VertexListType::ConstPointer VertexListPointer;
+ typedef TOutput OutputType;
+ typedef double RealType;
/** Evaluate the function at non-integer positions */
- virtual OutputType Evaluate( const PathType& path) const;
- virtual OutputType Evaluate( ) const;
+ virtual OutputType Evaluate(const PathType& path) const;
+ virtual OutputType Evaluate() const;
protected:
OrientationPathFunction() {};
- virtual ~OrientationPathFunction() {};
+ virtual ~OrientationPathFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- OrientationPathFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ OrientationPathFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/FeatureExtraction/otbOrientationPathFunction.txx b/Code/FeatureExtraction/otbOrientationPathFunction.txx
index 1979373ddb..ec6dd801e3 100644
--- a/Code/FeatureExtraction/otbOrientationPathFunction.txx
+++ b/Code/FeatureExtraction/otbOrientationPathFunction.txx
@@ -26,34 +26,33 @@
namespace otb
{
-template < class TInputPath, class TOutput>
+template <class TInputPath, class TOutput>
void
-OrientationPathFunction< TInputPath, TOutput >
+OrientationPathFunction<TInputPath, TOutput>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
}
-
-template < class TInputPath, class TOutput>
+template <class TInputPath, class TOutput>
typename OrientationPathFunction<TInputPath,
-TOutput>::OutputType
-OrientationPathFunction<TInputPath,TOutput>
+ TOutput>::OutputType
+OrientationPathFunction<TInputPath, TOutput>
::Evaluate(const PathType& path) const
{
- typedef double RealType;
+ typedef double RealType;
- VertexListPointer vertexList;
- VertexType cindex;
- VertexType IndexOut;
- int nbPath;
- RealType Theta;
+ VertexListPointer vertexList;
+ VertexType cindex;
+ VertexType IndexOut;
+ int nbPath;
+ RealType Theta;
vertexList = path.GetVertexList();
nbPath = vertexList->Size();
- if (nbPath ==2)
- {
+ if (nbPath == 2)
+ {
cindex = vertexList->GetElement(0);
RealType x1 = cindex[0];
RealType y1 = cindex[1];
@@ -61,34 +60,33 @@ OrientationPathFunction<TInputPath,TOutput>
RealType x2 = cindex[0];
RealType y2 = cindex[1];
- Theta = vcl_atan2(y2-y1,x2-x1);
- } // IF loop
+ Theta = vcl_atan2(y2 - y1, x2 - x1);
+ } // IF loop
else
- {
- itkExceptionMacro(<<"OrientationPathFunction::Evaluate() FAILED -- path must have 2 points");
- }
- return (static_cast<OutputType>(Theta) );
+ {
+ itkExceptionMacro(<< "OrientationPathFunction::Evaluate() FAILED -- path must have 2 points");
+ }
+ return (static_cast<OutputType>(Theta));
}
-template < class TInputPath, class TOutput>
+template <class TInputPath, class TOutput>
typename OrientationPathFunction<TInputPath,
-TOutput>::OutputType
-OrientationPathFunction<TInputPath,TOutput>
+ TOutput>::OutputType
+OrientationPathFunction<TInputPath, TOutput>
::Evaluate() const
{
- if ( !this->GetInputPath() )
- {
- otbMsgDevMacro( << "Problem with GetInputPath" );
- return static_cast<OutputType>(itk::NumericTraits<OutputType>::max() );
- }
+ if (!this->GetInputPath())
+ {
+ otbMsgDevMacro(<< "Problem with GetInputPath");
+ return static_cast<OutputType>(itk::NumericTraits<OutputType>::max());
+ }
- OutputType Result = Evaluate( *(this->GetInputPath()) );
+ OutputType Result = Evaluate(*(this->GetInputPath()));
return Result;
}
-
} // namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbPanTexTextureFunctor.h b/Code/FeatureExtraction/otbPanTexTextureFunctor.h
index 737d12c7f0..3ae6128c77 100644
--- a/Code/FeatureExtraction/otbPanTexTextureFunctor.h
+++ b/Code/FeatureExtraction/otbPanTexTextureFunctor.h
@@ -40,38 +40,38 @@ namespace Functor
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT PanTexTextureFunctor :
-public ContrastTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType>
+ public ContrastTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
PanTexTextureFunctor()
{
- OffsetType off;
- off[0] = 0;
- off[1] = 1;
- m_OffsetList.push_back(off); //(0,1)
- off[1] = 2;
- m_OffsetList.push_back(off); //(0,2)
- off[0] = 1;
- off[1] = -2;
- m_OffsetList.push_back(off); //(1,-2)
- off[1] = -1;
- m_OffsetList.push_back(off); //(1,-1)
- off[1] = 0;
- m_OffsetList.push_back(off); //(1,0)
- off[1] = 1;
- m_OffsetList.push_back(off); //(1,1)
- off[1] = 2;
- m_OffsetList.push_back(off); //(1,2)
- off[0] = 2;
- off[1] = -1;
- m_OffsetList.push_back(off); //(2,-1)
- off[1] = 0;
- m_OffsetList.push_back(off); //(2,0)
- off[1] = 1;
- m_OffsetList.push_back(off); //(2,1)
+ OffsetType off;
+ off[0] = 0;
+ off[1] = 1;
+ m_OffsetList.push_back(off); //(0,1)
+ off[1] = 2;
+ m_OffsetList.push_back(off); //(0,2)
+ off[0] = 1;
+ off[1] = -2;
+ m_OffsetList.push_back(off); //(1,-2)
+ off[1] = -1;
+ m_OffsetList.push_back(off); //(1,-1)
+ off[1] = 0;
+ m_OffsetList.push_back(off); //(1,0)
+ off[1] = 1;
+ m_OffsetList.push_back(off); //(1,1)
+ off[1] = 2;
+ m_OffsetList.push_back(off); //(1,2)
+ off[0] = 2;
+ off[1] = -1;
+ m_OffsetList.push_back(off); //(2,-1)
+ off[1] = 0;
+ m_OffsetList.push_back(off); //(2,0)
+ off[1] = 1;
+ m_OffsetList.push_back(off); //(2,1)
};
- virtual ~PanTexTextureFunctor(){};
+ virtual ~PanTexTextureFunctor(){}
/*
typedef TIterInput IterType;
@@ -82,37 +82,33 @@ public:
typedef itk::Neighborhood<InternalPixelType,::itk::GetImageDimension<ImageType>::ImageDimension> NeighborhoodType;
typedef ContrastTextureFunctor<IterType, OutputType> Superclass;
*/
- typedef TScalarInputPixelType InputScalarType;
- typedef TScalarOutputPixelType OutputScalarType;
+ typedef TScalarInputPixelType InputScalarType;
+ typedef TScalarOutputPixelType OutputScalarType;
typedef ContrastTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
- typedef typename Superclass::OffsetType OffsetType;
- typedef typename Superclass::RadiusType RadiusType;
- typedef typename Superclass::NeighborhoodType NeighborhoodType;
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
- {
- // Loop over each offset
- double out = itk::NumericTraits<double>::max();
- Superclass contrast;
- for(unsigned int k=0; k<m_OffsetList.size(); ++k)
- {
- contrast.SetOffset( m_OffsetList[k] );
- double res = contrast.ComputeOverSingleChannel(neigh, neighOff);
- if(res<out)
- out=res;
- }
-
+ typedef typename Superclass::OffsetType OffsetType;
+ typedef typename Superclass::RadiusType RadiusType;
+ typedef typename Superclass::NeighborhoodType NeighborhoodType;
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
+ {
+ // Loop over each offset
+ double out = itk::NumericTraits<double>::max();
+ Superclass contrast;
+ for (unsigned int k = 0; k < m_OffsetList.size(); ++k)
+ {
+ contrast.SetOffset(m_OffsetList[k]);
+ double res = contrast.ComputeOverSingleChannel(neigh, neighOff);
+ if (res < out) out = res;
+ }
return out;
}
- private:
+private:
std::vector<OffsetType> m_OffsetList;
};
-
} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbPanTexTextureImageFilter.h b/Code/FeatureExtraction/otbPanTexTextureImageFilter.h
index da76021fd7..3a0fd25b6e 100644
--- a/Code/FeatureExtraction/otbPanTexTextureImageFilter.h
+++ b/Code/FeatureExtraction/otbPanTexTextureImageFilter.h
@@ -37,24 +37,32 @@ namespace otb
template <class TInputImage, class TOutputImage>
class ITK_EXPORT PanTexTextureImageFilter :
-public UnaryFunctorNeighborhoodWithOffsetImageFilter< TInputImage, TOutputImage, ITK_TYPENAME Functor::PanTexTextureFunctor< ITK_TYPENAME TInputImage::InternalPixelType, ITK_TYPENAME TOutputImage::InternalPixelType> >
+ public UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage, TOutputImage,
+ ITK_TYPENAME Functor::PanTexTextureFunctor<ITK_TYPENAME
+ TInputImage::
+ InternalPixelType,
+ ITK_TYPENAME
+ TOutputImage::
+ InternalPixelType> >
{
public:
/** Standard class typedefs. */
- typedef PanTexTextureImageFilter Self;
+ typedef PanTexTextureImageFilter Self;
typedef UnaryFunctorNeighborhoodWithOffsetImageFilter<TInputImage,
TOutputImage,
- typename Functor::PanTexTextureFunctor<typename TInputImage::InternalPixelType,
- typename TOutputImage::InternalPixelType> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typename Functor::PanTexTextureFunctor<typename TInputImage::
+ InternalPixelType,
+ typename TOutputImage::
+ InternalPixelType> >
+ Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(PanTexTextureImageFilter,UnaryFunctorNeighborhoodWithOffsetImageFilter);
-
+ itkTypeMacro(PanTexTextureImageFilter, UnaryFunctorNeighborhoodWithOffsetImageFilter);
/** Some convenient typedefs. */
typedef TInputImage InputImageType;
@@ -62,23 +70,22 @@ public:
typedef typename itk::ConstNeighborhoodIterator<InputImageType> NeighborhoodIteratorType;
typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef typename InputImageType::SizeType InputImageSizeType;
- typedef typename InputImageType::OffsetType InputImageOffsetType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputImagePixelType;
- typedef typename Superclass::RadiusType RadiusType;
- typedef typename Superclass::InputImageOffsetType OffsetType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::SizeType InputImageSizeType;
+ typedef typename InputImageType::OffsetType InputImageOffsetType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputImagePixelType;
+ typedef typename Superclass::RadiusType RadiusType;
+ typedef typename Superclass::InputImageOffsetType OffsetType;
typedef itk::ProcessObject ProcessObjectType;
-
protected:
PanTexTextureImageFilter();
- virtual ~PanTexTextureImageFilter() {};
+ virtual ~PanTexTextureImageFilter() {}
/** UnaryFunctorNeighborhoodWithOffsetImageFilter can be implemented as a multithreaded filter.
* Therefore, this implementation provides a ThreadedGenerateData() routine
@@ -90,19 +97,18 @@ protected:
*
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
- virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
-
+ virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
private:
- PanTexTextureImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PanTexTextureImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
//Offset is setted to [2,2] in the publication
virtual void SetOffset(OffsetType off)
- {
- Superclass::SetOffset(off);
- };
+ {
+ Superclass::SetOffset(off);
+ }
};
} // namespace otb
@@ -111,5 +117,4 @@ private:
#include "otbPanTexTextureImageFilter.txx"
#endif
-
#endif
diff --git a/Code/FeatureExtraction/otbPanTexTextureImageFilter.txx b/Code/FeatureExtraction/otbPanTexTextureImageFilter.txx
index 1bb5340221..068c61bcc1 100644
--- a/Code/FeatureExtraction/otbPanTexTextureImageFilter.txx
+++ b/Code/FeatureExtraction/otbPanTexTextureImageFilter.txx
@@ -20,29 +20,27 @@
#include "otbPanTexTextureImageFilter.h"
-
namespace otb
{
/**
* Constructor
*/
template <class TInputImage, class TOutputImage>
-PanTexTextureImageFilter<TInputImage,TOutputImage>
+PanTexTextureImageFilter<TInputImage, TOutputImage>
::PanTexTextureImageFilter()
{
- this->SetRadius( 4 );
+ this->SetRadius(4);
OffsetType off; off.Fill(2);
- this->SetOffset( off );
+ this->SetOffset(off);
}
-
/**
* ThreadedGenerateData Performs the neighborhood-wise operation
*/
template <class TInputImage, class TOutputImage>
void
PanTexTextureImageFilter<TInputImage, TOutputImage>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread, int threadId)
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
itk::ZeroFluxNeumannBoundaryCondition<TInputImage> nbc;
itk::ZeroFluxNeumannBoundaryCondition<TInputImage> nbcOff;
@@ -50,10 +48,10 @@ PanTexTextureImageFilter<TInputImage, TOutputImage>
// ImageToImageFilter::GetInput(int) always returns a pointer to a
// TInputImage so it cannot be used for the second input.
typename InputImageType::ConstPointer inputPtr = dynamic_cast<const TInputImage*>(ProcessObjectType::GetInput(0));
- OutputImagePointer outputPtr = this->GetOutput(0);
+ OutputImagePointer outputPtr = this->GetOutput(0);
itk::ImageRegionIterator<TOutputImage> outputIt;
-
+
// Neighborhood+offset iterator
RadiusType rOff;
rOff[0] = this->GetRadius()[0] + vcl_abs(this->GetOffset()[0]);
@@ -61,7 +59,7 @@ PanTexTextureImageFilter<TInputImage, TOutputImage>
NeighborhoodIteratorType neighInputOffIt;
// Find the data-set boundary "faces"
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage>::FaceListType faceListOff;
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage> bCOff;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage> bCOff;
faceListOff = bCOff(inputPtr, outputRegionForThread, rOff);
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage>::FaceListType::iterator fitOff;
@@ -70,10 +68,10 @@ PanTexTextureImageFilter<TInputImage, TOutputImage>
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
- fitOff=faceListOff.begin();
+ fitOff = faceListOff.begin();
- while ( fitOff!=faceListOff.end() )
- {
+ while (fitOff != faceListOff.end())
+ {
// Neighborhood+offset iterator
neighInputOffIt = itk::ConstNeighborhoodIterator<TInputImage>(rOff, inputPtr, *fitOff);
neighInputOffIt.OverrideBoundaryCondition(&nbcOff);
@@ -81,17 +79,17 @@ PanTexTextureImageFilter<TInputImage, TOutputImage>
outputIt = itk::ImageRegionIterator<TOutputImage>(outputPtr, *fitOff);
- while ( ! outputIt.IsAtEnd() )
- {
+ while (!outputIt.IsAtEnd())
+ {
- outputIt.Set( this->m_FunctorList[threadId]( neighInputOffIt.GetNeighborhood() ) );
+ outputIt.Set(this->m_FunctorList[threadId](neighInputOffIt.GetNeighborhood()));
++neighInputOffIt;
++outputIt;
progress.CompletedPixel();
- }
+ }
++fitOff;
- }
+ }
}
} // end namespace otb
diff --git a/Code/FeatureExtraction/otbPanTexTextureImageFunctionFilter.h b/Code/FeatureExtraction/otbPanTexTextureImageFunctionFilter.h
index 6fbf9dfe75..7b532da62c 100644
--- a/Code/FeatureExtraction/otbPanTexTextureImageFunctionFilter.h
+++ b/Code/FeatureExtraction/otbPanTexTextureImageFunctionFilter.h
@@ -39,19 +39,29 @@ namespace otb
* \ingroup Textures
*/
-template <class TInputImage, class TOutputImage, class TCoordRep = float >
+template <class TInputImage, class TOutputImage, class TCoordRep = float>
class ITK_EXPORT PanTexTextureImageFunctionFilter :
-public FunctionWithNeighborhoodToImageFilter< TInputImage, TOutputImage,
- TextureImageFunction<TInputImage, ITK_TYPENAME Functor::PanTexTextureFunctor< ITK_TYPENAME TInputImage::PixelType, ITK_TYPENAME TOutputImage::PixelType>, TCoordRep > >
+ public FunctionWithNeighborhoodToImageFilter<TInputImage, TOutputImage,
+ TextureImageFunction<TInputImage,
+ ITK_TYPENAME Functor::PanTexTextureFunctor<
+ ITK_TYPENAME TInputImage::PixelType,
+ ITK_TYPENAME
+ TOutputImage::PixelType>, TCoordRep> >
{
- public:
+public:
/** Standard class typedefs. */
typedef PanTexTextureImageFunctionFilter Self;
- typedef FunctionWithNeighborhoodToImageFilter< TInputImage, TOutputImage,
- TextureImageFunction<TInputImage, typename Functor::PanTexTextureFunctor< typename TInputImage::PixelType, typename TOutputImage::PixelType >, TCoordRep > > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef FunctionWithNeighborhoodToImageFilter<TInputImage, TOutputImage,
+ TextureImageFunction<TInputImage,
+ typename Functor::PanTexTextureFunctor<typename
+ TInputImage
+ ::PixelType,
+ typename
+ TOutputImage
+ ::PixelType>, TCoordRep> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(PanTexTextureImageFunctionFilter, TextureImageFunction);
@@ -60,18 +70,17 @@ public FunctionWithNeighborhoodToImageFilter< TInputImage, TOutputImage,
itkNewMacro(Self);
/** typedef support. */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
- typedef typename InputImageType::OffsetType OffsetType;
- typedef typename InputImageType::SizeType SizeType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
+ typedef typename InputImageType::OffsetType OffsetType;
+ typedef typename InputImageType::SizeType SizeType;
/** Dimension of the underlying image. */
- itkStaticConstMacro(ImageDimension, unsigned int,InputImageType::ImageDimension);
-
+ itkStaticConstMacro(ImageDimension, unsigned int, InputImageType::ImageDimension);
protected:
PanTexTextureImageFunctionFilter()
- {
+ {
OffsetType off;
off.Fill(2);
this->SetOffset(off);
@@ -79,15 +88,15 @@ protected:
radius.Fill(4);
this->SetRadius(radius);
- };
- virtual ~PanTexTextureImageFunctionFilter() {};
+ };
+ virtual ~PanTexTextureImageFunctionFilter() {}
//void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- PanTexTextureImageFunctionFilter( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ PanTexTextureImageFunctionFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- virtual void SetOffset( OffsetType off )
+ virtual void SetOffset(OffsetType off)
{
Superclass::SetOffset(off);
}
@@ -95,6 +104,4 @@ private:
} // end namespace otb
-
#endif
-
diff --git a/Code/FeatureExtraction/otbParallelLinePathListFilter.h b/Code/FeatureExtraction/otbParallelLinePathListFilter.h
index b7971cc48b..adf67a7f94 100644
--- a/Code/FeatureExtraction/otbParallelLinePathListFilter.h
+++ b/Code/FeatureExtraction/otbParallelLinePathListFilter.h
@@ -47,14 +47,14 @@ namespace otb
*/
template <class TPath>
class ITK_EXPORT ParallelLinePathListFilter
- : public PathListToPathListFilter<TPath>
+ : public PathListToPathListFilter<TPath>
{
public:
/** Standard typedefs */
- typedef ParallelLinePathListFilter Self;
- typedef PathListToPathListFilter<TPath> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ParallelLinePathListFilter Self;
+ typedef PathListToPathListFilter<TPath> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -63,29 +63,28 @@ public:
itkTypeMacro(ParallelLinePathListFilter, PathListToPathListFilter);
/** Template parameters typedefs */
- typedef typename Superclass::PathType PathType;
- typedef typename Superclass::PathListType PathListType;
- typedef typename Superclass::PathPointerType PathPointerType;
- typedef typename PathListType::Pointer PathListPointerType;
- typedef typename PathListType::ConstIterator IteratorType;
- typedef typename PathType::VertexType VertexType;
- typedef typename PathType::VertexListType VertexListType;
+ typedef typename Superclass::PathType PathType;
+ typedef typename Superclass::PathListType PathListType;
+ typedef typename Superclass::PathPointerType PathPointerType;
+ typedef typename PathListType::Pointer PathListPointerType;
+ typedef typename PathListType::ConstIterator IteratorType;
+ typedef typename PathType::VertexType VertexType;
+ typedef typename PathType::VertexListType VertexListType;
typedef typename VertexListType::ConstIterator VertexIteratorType;
- typedef double RealType;
-
- itkSetMacro(AngularThreshold,RealType);
- itkGetMacro(AngularThreshold,RealType);
- itkSetMacro(DistanceThreshold,RealType);
- itkGetMacro(DistanceThreshold,RealType);
- itkSetMacro(CommonDistanceThreshold,RealType);
- itkGetMacro(CommonDistanceThreshold,RealType);
+ typedef double RealType;
+ itkSetMacro(AngularThreshold, RealType);
+ itkGetMacro(AngularThreshold, RealType);
+ itkSetMacro(DistanceThreshold, RealType);
+ itkGetMacro(DistanceThreshold, RealType);
+ itkSetMacro(CommonDistanceThreshold, RealType);
+ itkGetMacro(CommonDistanceThreshold, RealType);
protected:
/** Constructor */
ParallelLinePathListFilter();
/** Destructor */
- virtual ~ParallelLinePathListFilter() {};
+ virtual ~ParallelLinePathListFilter() {}
/** GenerateData method */
virtual void GenerateData();
/** PrintSelf method */
@@ -140,15 +139,15 @@ protected:
PathPointerType WriteParallelPath(PathPointerType p1);
private:
- ParallelLinePathListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ParallelLinePathListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
RealType m_AngularThreshold;
RealType m_DistanceThreshold;
RealType m_CommonDistanceThreshold;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbParallelLinePathListFilter.txx"
#endif
diff --git a/Code/FeatureExtraction/otbParallelLinePathListFilter.txx b/Code/FeatureExtraction/otbParallelLinePathListFilter.txx
index aa8d5c0105..9531db1d78 100644
--- a/Code/FeatureExtraction/otbParallelLinePathListFilter.txx
+++ b/Code/FeatureExtraction/otbParallelLinePathListFilter.txx
@@ -41,18 +41,18 @@ ParallelLinePathListFilter<TPath>
::GenerateData()
{
// IO
- const PathListType * inputPtr = this->GetInput();
- PathListType * outputPtr = this->GetOutput();
+ const PathListType * inputPtr = this->GetInput();
+ PathListType * outputPtr = this->GetOutput();
// Input iterator
IteratorType inputIt = inputPtr->Begin();
- std::vector<bool> eraseFlagVector1;
+ std::vector<bool> eraseFlagVector1;
std::vector<unsigned int> parallelLineIndex;
// First we copy all input path to output
- while ( inputIt != inputPtr->End())
- {
+ while (inputIt != inputPtr->End())
+ {
// Write the next input path always to the
// last element of the list. This last element is
// newly created.
@@ -64,7 +64,7 @@ ParallelLinePathListFilter<TPath>
eraseFlagVector1.push_back(false);
++inputIt;
- }
+ }
unsigned int VectorSize = static_cast<unsigned int>(eraseFlagVector1.size());
//std::cout<<" Number of Lines: "<< VectorSize <<std::endl;
@@ -76,72 +76,72 @@ ParallelLinePathListFilter<TPath>
// Iterate through all lines of the pathlist
while (firstLineCounter < VectorSize)
- {
- if (!eraseFlagVector1[index1])
{
+ if (!eraseFlagVector1[index1])
+ {
IteratorType outputIt2 = outputIt1;
++outputIt2;
- unsigned int index2 = index1+1;
+ unsigned int index2 = index1 + 1;
// Check if any of the following lines are parallel
- while (outputIt2!=outputPtr->End())
- {
+ while (outputIt2 != outputPtr->End())
+ {
if (!eraseFlagVector1[index2])
- { // Read the first and the last vertex of each line pair that is checked
+ { // Read the first and the last vertex of each line pair that is checked
VertexIteratorType vSourceIt = outputIt1.Get()->GetVertexList()->Begin();
- VertexType v1 = vSourceIt.Value();
+ VertexType v1 = vSourceIt.Value();
vSourceIt = outputIt1.Get()->GetVertexList()->End();
--vSourceIt;
VertexType v2 = vSourceIt.Value();
VertexIteratorType vTargetIt = outputIt2.Get()->GetVertexList()->Begin();
- VertexType v3 = vTargetIt.Value();
+ VertexType v3 = vTargetIt.Value();
vTargetIt = outputIt2.Get()->GetVertexList()->End();
--vTargetIt;
VertexType v4 = vTargetIt.Value();
// Check for parallel lines
- if (VerifyAngularCondition(v1,v2,v3,v4))
- {
- ++parallelLineCounter;
- if (VerifyMaxDistanceCondition(v1,v2,v3,v4))
+ if (VerifyAngularCondition(v1, v2, v3, v4))
{
- ++maxDistCounter;
- if (VerifyCommonDistanceCondition(v1,v2,v3,v4))
+ ++parallelLineCounter;
+ if (VerifyMaxDistanceCondition(v1, v2, v3, v4))
{
+ ++maxDistCounter;
+ if (VerifyCommonDistanceCondition(v1, v2, v3, v4))
+ {
++commonDistCounter;
// Write index of first parallel path
parallelLineIndex.push_back(index1);
// Write index of second parallel path
parallelLineIndex.push_back(index2);
+ }
}
}
}
- }
++index2;
++outputIt2;
+ }
}
- }
// mark the old path as erased
- eraseFlagVector1[index1]=true;
+ eraseFlagVector1[index1] = true;
++firstLineCounter;
++index1;
++outputIt1;
- }// end of for loop
+ } // end of for loop
- std::cout<< "Number of line pairs that pass the angular condition: " << parallelLineCounter <<std::endl;
- std::cout<< "Number of line pairs that pass the maximum distance condition: " << maxDistCounter <<std::endl;
- std::cout<< "Number of line pairs that pass the common distance condition: " << commonDistCounter <<std::endl;
+ std::cout << "Number of line pairs that pass the angular condition: " << parallelLineCounter << std::endl;
+ std::cout << "Number of line pairs that pass the maximum distance condition: " << maxDistCounter << std::endl;
+ std::cout << "Number of line pairs that pass the common distance condition: " << commonDistCounter << std::endl;
// Write all parallel lines and set the non-erase flagg.
typename std::vector<unsigned int>::iterator lineIt1 = parallelLineIndex.begin();
- unsigned int sortLineIndex = 0;
- while (lineIt1!=parallelLineIndex.end())
- {
+ unsigned int sortLineIndex = 0;
+ while (lineIt1 != parallelLineIndex.end())
+ {
IteratorType outputIt3 = outputPtr->Begin() + parallelLineIndex[sortLineIndex];
PathPointerType newPath1 = this->WriteParallelPath(outputIt3.Get());
@@ -149,24 +149,23 @@ ParallelLinePathListFilter<TPath>
// add a non-erase flag for the new path
eraseFlagVector1.push_back(false);
++sortLineIndex;
- std::cout<<"Number of lines written in the path list: "<< sortLineIndex<<std::endl;
+ std::cout << "Number of lines written in the path list: " << sortLineIndex << std::endl;
++lineIt1;
- }
-
+ }
// Search ended, now removing the erased path from the first line pointer
typename std::vector<bool>::reverse_iterator it1 = eraseFlagVector1.rbegin();
- index1 = eraseFlagVector1.size()-1;
- while (it1!=eraseFlagVector1.rend())
- {
- if (eraseFlagVector1[index1])
+ index1 = eraseFlagVector1.size() - 1;
+ while (it1 != eraseFlagVector1.rend())
{
+ if (eraseFlagVector1[index1])
+ {
outputPtr->Erase(index1);
- }
+ }
--index1;
++it1;
- }
+ }
}
/**
@@ -186,15 +185,15 @@ bool
ParallelLinePathListFilter<TPath>
::VerifyAngularCondition(VertexType v1, VertexType v2, VertexType v3, VertexType v4)
{
- double alpha1 = vcl_atan2((v2[1]-v1[1]),(v2[0]-v1[0]));
- double alpha2 = vcl_atan2((v4[1]-v3[1]),(v4[0]-v3[0]));
+ double alpha1 = vcl_atan2((v2[1] - v1[1]), (v2[0] - v1[0]));
+ double alpha2 = vcl_atan2((v4[1] - v3[1]), (v4[0] - v3[0]));
- alpha1 = (alpha1 >= 0)?alpha1:(alpha1+CONST_PI);
- alpha2 = (alpha2 >= 0)?alpha2:(alpha2+CONST_PI);
+ alpha1 = (alpha1 >= 0) ? alpha1 : (alpha1 + CONST_PI);
+ alpha2 = (alpha2 >= 0) ? alpha2 : (alpha2 + CONST_PI);
// Return true if the angle between the two lines is smaller than
// the specified threshold.
- bool angle = (vcl_abs(alpha1-alpha2) < static_cast<double>(m_AngularThreshold));
+ bool angle = (vcl_abs(alpha1 - alpha2) < static_cast<double>(m_AngularThreshold));
return angle;
}
@@ -218,15 +217,15 @@ ParallelLinePathListFilter<TPath>
// Compute the direction vector of the first line
VertexType vectorDir12;
- vectorDir12[0] = v2[0]-v1[0];
- vectorDir12[1] = v2[1]-v1[1];
+ vectorDir12[0] = v2[0] - v1[0];
+ vectorDir12[1] = v2[1] - v1[1];
// Compute the orthogonal distance between the two parallel lines
// with equation d = |(v3 - v1)X(v2 - v1)|/|v2 - v1|
- double distance = 0., denominator =0., nominator = 0.;
- denominator = vcl_abs( (v3[0]-v1[0])*vectorDir12[1] - (v3[1]-v1[1])*vectorDir12[0] );
- nominator = sqrt(pow(vectorDir12[0],2) + pow(vectorDir12[1],2));
- distance = denominator/nominator;
+ double distance = 0., denominator = 0., nominator = 0.;
+ denominator = vcl_abs((v3[0] - v1[0]) * vectorDir12[1] - (v3[1] - v1[1]) * vectorDir12[0]);
+ nominator = sqrt(pow(vectorDir12[0], 2) + pow(vectorDir12[1], 2));
+ distance = denominator / nominator;
//std::cout<< "Distance between two parallel lines: " << distance <<std::endl;
// Check if the orthogonal distance between the lines
@@ -256,14 +255,14 @@ ParallelLinePathListFilter<TPath>
{
// Compute the length of each line
double length12 = 0., length34 = 0.;
- length12 = sqrt( pow((v2[0]-v1[0]),2) + pow((v2[1]-v1[1]),2) );
- length34 = sqrt( pow((v4[0]-v3[0]),2) + pow((v4[1]-v3[1]),2) );
+ length12 = sqrt(pow((v2[0] - v1[0]), 2) + pow((v2[1] - v1[1]), 2));
+ length34 = sqrt(pow((v4[0] - v3[0]), 2) + pow((v4[1] - v3[1]), 2));
// Set v1[0] to zero and align the y-axis of
// the new coordinate system with line one (v1 and v2).
// Compute the coordinates of the first and of the
// second line in the new coordinate system.
- VertexType tempv1, tempv2 , tempv3, tempv4;
+ VertexType tempv1, tempv2, tempv3, tempv4;
//Initialization
tempv1.Fill(0.);
@@ -272,22 +271,22 @@ ParallelLinePathListFilter<TPath>
tempv4.Fill(0.);
if (v1[1] == v2[1])
- {
- if (v1[0] < v2[0])
{
+ if (v1[0] < v2[0])
+ {
tempv1[0] = 0., tempv1[1] = 0.;
tempv2[0] = 0., tempv2[1] = length12;
- tempv3[0] = v3[0]-v1[0], tempv3[1] = v3[1]-v1[1];
- tempv4[0] = v4[0]-v1[0], tempv4[1] = v4[1]-v1[1];
- }
+ tempv3[0] = v3[0] - v1[0], tempv3[1] = v3[1] - v1[1];
+ tempv4[0] = v4[0] - v1[0], tempv4[1] = v4[1] - v1[1];
+ }
else
- {
+ {
tempv2[0] = 0., tempv2[1] = 0.;
tempv1[0] = 0., tempv1[1] = length12;
- tempv3[0] = v3[0]-v2[0], tempv3[1] = v3[1]-v2[1];
- tempv4[0] = v4[0]-v2[0], tempv4[1] = v4[1]-v2[1];
+ tempv3[0] = v3[0] - v2[0], tempv3[1] = v3[1] - v2[1];
+ tempv4[0] = v4[0] - v2[0], tempv4[1] = v4[1] - v2[1];
+ }
}
- }
// Check the direction of the line (vector).
// The origin of the new coordinate system is
// set to the smaller of the two vertices.
@@ -298,17 +297,17 @@ ParallelLinePathListFilter<TPath>
VertexType temptransv3, temptransv4;
if (v1[1] < v2[1])
- {
- if (v1[0] == v2[0])
{
+ if (v1[0] == v2[0])
+ {
tempv1[0] = 0., tempv1[1] = 0.;
tempv2[0] = 0., tempv2[1] = length12;
- tempv3[0] = v3[0]-v1[0], tempv3[1] = v3[1]-v1[1];
- tempv4[0] = v4[0]-v1[0], tempv4[1] = v4[1]-v1[1];
- }
+ tempv3[0] = v3[0] - v1[0], tempv3[1] = v3[1] - v1[1];
+ tempv4[0] = v4[0] - v1[0], tempv4[1] = v4[1] - v1[1];
+ }
else
- {
+ {
// Coordinates of the first line in the new coordinate system
tempv1[0] = 0.;
tempv1[1] = 0.;
@@ -318,13 +317,13 @@ ParallelLinePathListFilter<TPath>
// Rotate the system clockwise
double sinealpha;
if (v2[0] > v1[0])
- {
- sinealpha = (v2[0]-v1[0])/length12;
- }
+ {
+ sinealpha = (v2[0] - v1[0]) / length12;
+ }
else
- {
- sinealpha = (v1[0]-v2[0])/length12;
- }
+ {
+ sinealpha = (v1[0] - v2[0]) / length12;
+ }
double alpha1 = vcl_asin(sinealpha);
// Translation
@@ -334,33 +333,34 @@ ParallelLinePathListFilter<TPath>
temptransv4[1] = v4[1] - v1[1];
// Rotation
- tempv3[0] = temptransv3[0]*cos(alpha1)+temptransv3[1]*sin(alpha1);
- tempv3[1] = temptransv3[1]*cos(alpha1)-temptransv3[0]*sin(alpha1);
- tempv4[0] = temptransv4[0]*cos(alpha1)+temptransv4[1]*sin(alpha1);
- tempv4[1] = temptransv4[1]*cos(alpha1)-temptransv4[0]*sin(alpha1);
-
- std::cout<< "tempv1[0], tempv1[1], tempv2[0], tempv2[1]: ";
- std::cout<< tempv1[0] <<", " << tempv1[1] <<", " << tempv2[0] <<", " <<tempv2[1] << std::endl;
- std::cout<< "Alpha: "<< alpha1 << std::endl;
- std::cout<< "tempv3[0], tempv3[1], tempv4[0], tempv4[1]: ";
- std::cout<< tempv3[0] <<", " << tempv3[1] <<", " << tempv4[0] <<", " <<tempv4[1] << std::endl;
- std::cout<< "Calculated length of the second line: " << sqrt( pow((tempv4[0]-tempv3[0]),2) + pow((tempv4[1]-tempv3[1]),2) ) <<std::endl;
- std::cout<< "Original length of line 1: " << length12 <<std::endl;
+ tempv3[0] = temptransv3[0] * cos(alpha1) + temptransv3[1] * sin(alpha1);
+ tempv3[1] = temptransv3[1] * cos(alpha1) - temptransv3[0] * sin(alpha1);
+ tempv4[0] = temptransv4[0] * cos(alpha1) + temptransv4[1] * sin(alpha1);
+ tempv4[1] = temptransv4[1] * cos(alpha1) - temptransv4[0] * sin(alpha1);
+
+ std::cout << "tempv1[0], tempv1[1], tempv2[0], tempv2[1]: ";
+ std::cout << tempv1[0] << ", " << tempv1[1] << ", " << tempv2[0] << ", " << tempv2[1] << std::endl;
+ std::cout << "Alpha: " << alpha1 << std::endl;
+ std::cout << "tempv3[0], tempv3[1], tempv4[0], tempv4[1]: ";
+ std::cout << tempv3[0] << ", " << tempv3[1] << ", " << tempv4[0] << ", " << tempv4[1] << std::endl;
+ std::cout << "Calculated length of the second line: " <<
+ sqrt(pow((tempv4[0] - tempv3[0]), 2) + pow((tempv4[1] - tempv3[1]), 2)) << std::endl;
+ std::cout << "Original length of line 1: " << length12 << std::endl;
+ }
}
- }
if (v2[1] < v1[1])
- {
+ {
if (v1[0] == v2[0])
- {
+ {
tempv2[0] = 0., tempv2[1] = 0.;
tempv1[0] = 0., tempv1[1] = length12;
- tempv3[0] = v3[0]-v2[0], tempv3[1] = v3[1]-v2[1];
- tempv4[0] = v4[0]-v2[0], tempv4[1] = v4[1]-v2[1];
- }
+ tempv3[0] = v3[0] - v2[0], tempv3[1] = v3[1] - v2[1];
+ tempv4[0] = v4[0] - v2[0], tempv4[1] = v4[1] - v2[1];
+ }
else
- {
+ {
tempv1[0] = 0.;
tempv1[1] = 0.;
tempv2[0] = 0.;
@@ -369,13 +369,13 @@ ParallelLinePathListFilter<TPath>
// Rotate the system clockwise
double sinealpha;
if (v2[0] > v1[0])
- {
- sinealpha = (v2[0]-v1[0])/length12;
- }
+ {
+ sinealpha = (v2[0] - v1[0]) / length12;
+ }
else
- {
- sinealpha = (v1[0]-v2[0])/length12;
- }
+ {
+ sinealpha = (v1[0] - v2[0]) / length12;
+ }
double alpha1 = vcl_asin(sinealpha);
@@ -386,20 +386,21 @@ ParallelLinePathListFilter<TPath>
temptransv4[1] = v4[1] - v2[1];
// Rotation
- tempv3[0] = temptransv3[0]*cos(alpha1)+temptransv3[1]*sin(alpha1);
- tempv3[1] = temptransv3[1]*cos(alpha1)-temptransv3[0]*sin(alpha1);
- tempv4[0] = temptransv4[0]*cos(alpha1)+temptransv4[1]*sin(alpha1);
- tempv4[1] = temptransv4[1]*cos(alpha1)-temptransv4[0]*sin(alpha1);
-
- std::cout<< "tempv1[0], tempv1[1], tempv2[0], tempv2[1]: ";
- std::cout<< tempv1[0] <<", " << tempv1[1] <<", " << tempv2[0] <<", " <<tempv2[1] << std::endl;
- std::cout<< "Alpha: "<< alpha1 << std::endl;
- std::cout<< "tempv3[0], tempv3[1], tempv4[0], tempv4[1]: ";
- std::cout<< tempv3[0] <<", " << tempv3[1] <<", " << tempv4[0] <<", " <<tempv4[1] << std::endl;
- std::cout<< "Calculated length of the second line: " << sqrt( pow((tempv4[0]-tempv3[0]),2) + pow((tempv4[1]-tempv3[1]),2) ) <<std::endl;
- std::cout<< "Original length of line 1: " << length12 <<std::endl;
+ tempv3[0] = temptransv3[0] * cos(alpha1) + temptransv3[1] * sin(alpha1);
+ tempv3[1] = temptransv3[1] * cos(alpha1) - temptransv3[0] * sin(alpha1);
+ tempv4[0] = temptransv4[0] * cos(alpha1) + temptransv4[1] * sin(alpha1);
+ tempv4[1] = temptransv4[1] * cos(alpha1) - temptransv4[0] * sin(alpha1);
+
+ std::cout << "tempv1[0], tempv1[1], tempv2[0], tempv2[1]: ";
+ std::cout << tempv1[0] << ", " << tempv1[1] << ", " << tempv2[0] << ", " << tempv2[1] << std::endl;
+ std::cout << "Alpha: " << alpha1 << std::endl;
+ std::cout << "tempv3[0], tempv3[1], tempv4[0], tempv4[1]: ";
+ std::cout << tempv3[0] << ", " << tempv3[1] << ", " << tempv4[0] << ", " << tempv4[1] << std::endl;
+ std::cout << "Calculated length of the second line: " <<
+ sqrt(pow((tempv4[0] - tempv3[0]), 2) + pow((tempv4[1] - tempv3[1]), 2)) << std::endl;
+ std::cout << "Original length of line 1: " << length12 << std::endl;
+ }
}
- }
// Compute the length of the overlapping part
// of the two lines. This is done by simply
@@ -409,85 +410,85 @@ ParallelLinePathListFilter<TPath>
double commonDist = 0.;
if (tempv3[1] >= tempv4[1])
- {
- if (tempv3[1] >=0 && tempv3[1] <= tempv2[1])
{
- if (tempv4[1] >=0)
+ if (tempv3[1] >= 0 && tempv3[1] <= tempv2[1])
{
- commonDist = vcl_abs(tempv4[1]-tempv3[1]);
- }
+ if (tempv4[1] >= 0)
+ {
+ commonDist = vcl_abs(tempv4[1] - tempv3[1]);
+ }
else if (tempv4[1] < 0)
- {
+ {
commonDist = tempv3[1];
+ }
}
- }
else if (tempv3[1] >= 0 && tempv3[1] >= tempv2[1])
- {
- if (tempv4[1] >=0)
{
- commonDist = tempv2[1]-tempv4[1];
- }
+ if (tempv4[1] >= 0)
+ {
+ commonDist = tempv2[1] - tempv4[1];
+ }
else if (tempv4[1] < 0)
- {
+ {
commonDist = tempv2[1];
- }
+ }
- }
+ }
else if (tempv4[1] >= tempv2[1])
- { // No overlapping parts exist. The (negative) distance
- // between the two closest endpoints is calculated.
- commonDist = -vcl_abs(tempv4[1]-tempv2[1]);
- }
+ { // No overlapping parts exist. The (negative) distance
+ // between the two closest endpoints is calculated.
+ commonDist = -vcl_abs(tempv4[1] - tempv2[1]);
+ }
else if (tempv3[1] < 0)
- { // No overlapping parts exist. The (negative) distance
- // between the two closest endpoints is calculated.
+ { // No overlapping parts exist. The (negative) distance
+ // between the two closest endpoints is calculated.
commonDist = tempv3[1];
+ }
}
- }
else
- {
- if (tempv4[1] >=0 && tempv4[1] <= tempv2[1])
{
- if (tempv3[1] >=0)
+ if (tempv4[1] >= 0 && tempv4[1] <= tempv2[1])
{
- commonDist = vcl_abs(tempv3[1]-tempv4[1]);
- }
+ if (tempv3[1] >= 0)
+ {
+ commonDist = vcl_abs(tempv3[1] - tempv4[1]);
+ }
else if (tempv3[1] < 0)
- {
+ {
commonDist = tempv4[1];
+ }
}
- }
else if (tempv4[1] >= 0 && tempv4[1] >= tempv2[1])
- {
- if (tempv3[1] >=0)
{
- commonDist = tempv2[1]-tempv3[1];
- }
+ if (tempv3[1] >= 0)
+ {
+ commonDist = tempv2[1] - tempv3[1];
+ }
else if (tempv3[1] < 0)
- {
+ {
commonDist = tempv2[1];
- }
+ }
- }
+ }
else if (tempv3[1] >= tempv2[1])
- { // No overlapping parts exist. The (negative) distance
- // between the two closest endpoints is calculated.
- commonDist = -vcl_abs(tempv3[1]-tempv2[1]);
- }
+ { // No overlapping parts exist. The (negative) distance
+ // between the two closest endpoints is calculated.
+ commonDist = -vcl_abs(tempv3[1] - tempv2[1]);
+ }
else if (tempv4[1] < 0)
- { // No overlapping parts exist. The (negative) distance
- // between the two closest endpoints is calculated.
+ { // No overlapping parts exist. The (negative) distance
+ // between the two closest endpoints is calculated.
commonDist = tempv4[1];
+ }
}
- }
// The common parallel parts of the two lines have to be greater than
// the provided threshold.
- std::cout<< "Calculated common distance of the parallel lines: " << commonDist <<std::endl;
+ std::cout << "Calculated common distance of the parallel lines: " << commonDist << std::endl;
bool common = (commonDist >= static_cast<double>(m_CommonDistanceThreshold));
return common;
@@ -507,10 +508,10 @@ ParallelLinePathListFilter<TPath>
VertexIteratorType it;
- for (it=p1->GetVertexList()->Begin();it!=p1->GetVertexList()->End();++it)
- {
+ for (it = p1->GetVertexList()->Begin(); it != p1->GetVertexList()->End(); ++it)
+ {
resp->AddVertex((it).Value());
- }
+ }
return resp;
}
@@ -526,6 +527,5 @@ ParallelLinePathListFilter<TPath>
Superclass::PrintSelf(os, indent);
}
-
} // End namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.h b/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.h
index 85eac513e2..820796cbb8 100644
--- a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.h
+++ b/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.h
@@ -22,10 +22,9 @@
#include "itkImage.h"
#include "itkNumericTraits.h"
-#define TRANSITION_MATRIX(_x,_y,_theta,_xout,_yout) \
- (_xout) = (_x)*vcl_cos(_theta) + (_y)*vcl_sin(_theta); \
- (_yout) = - (_x)*vcl_sin(_theta) + (_y)*vcl_cos(_theta)
-
+#define TRANSITION_MATRIX(_x, _y, _theta, _xout, _yout) \
+ (_xout) = (_x) * vcl_cos(_theta) + (_y) * vcl_sin(_theta); \
+ (_yout) = -(_x) * vcl_sin(_theta) + (_y) * vcl_cos(_theta)
namespace otb
{
@@ -48,26 +47,25 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
-class ITK_EXPORT PixelSuppressionByDirectionImageFilter : public itk::ImageToImageFilter< TInputImage, TOutputImage >
+class ITK_EXPORT PixelSuppressionByDirectionImageFilter : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Extract input and output image dimensions */
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,
- unsigned int,
- TOutputImage::ImageDimension);
-
-
- typedef TInputImage InputImageType;
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension,
+ unsigned int,
+ TOutputImage::ImageDimension);
+
+ typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
/** typedef for the classes standards. */
- typedef PixelSuppressionByDirectionImageFilter Self;
- typedef itk::ImageToImageFilter< InputImageType, OutputImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PixelSuppressionByDirectionImageFilter Self;
+ typedef itk::ImageToImageFilter<InputImageType, OutputImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for management of the "object factory". */
itkNewMacro(Self);
@@ -76,12 +74,12 @@ public:
itkTypeMacro(PixelSuppressionByDirectionImageFilter, ImageToImageFilter);
/** Definition of the input and output images */
- typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::PixelType InputPixelType;
typedef typename OutputImageType::PixelType OutputPixelType;
typedef typename itk::NumericTraits<InputPixelType>::RealType InputRealType;
- typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
typedef typename OutputImageType::RegionType OutputImageRegionType;
typedef typename InputImageType::SizeType SizeType;
@@ -97,26 +95,26 @@ public:
itkGetConstReferenceMacro(AngularBeam, InputRealType);
/** Set/Get the image input of this process object. */
- void SetInputImage( const InputImageType *image);
+ void SetInputImage(const InputImageType *image);
const InputImageType * GetInputImage(void);
- void SetInputImageDirection( const InputImageType *image);
+ void SetInputImageDirection(const InputImageType *image);
const InputImageType * GetInputImageDirection(void);
-
- virtual void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError);
+ virtual void GenerateInputRequestedRegion()
+ throw(itk::InvalidRequestedRegionError);
protected:
PixelSuppressionByDirectionImageFilter();
- virtual ~PixelSuppressionByDirectionImageFilter() {};
+ virtual ~PixelSuppressionByDirectionImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
private:
- PixelSuppressionByDirectionImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PixelSuppressionByDirectionImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
// Radius of the region
SizeType m_Radius;
@@ -130,5 +128,4 @@ private:
#include "otbPixelSuppressionByDirectionImageFilter.txx"
#endif
-
#endif
diff --git a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx b/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
index eca3120a25..5dacce1c13 100644
--- a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
+++ b/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
@@ -51,7 +51,7 @@ void
PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>
::SetInputImage(const InputImageType *input)
{
- this->SetInput(0,input);
+ this->SetInput(0, input);
}
template <class TInputImage, class TOutputImage>
@@ -59,7 +59,7 @@ void
PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>
::SetInputImageDirection(const InputImageType *input)
{
- this->SetInput(1,input);
+ this->SetInput(1, input);
}
template <class TInputImage, class TOutputImage>
@@ -69,12 +69,12 @@ PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>
::GetInputImage(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TInputImage * >
- (this->GetInput(0) );
+ return static_cast<const TInputImage *>
+ (this->GetInput(0));
}
template <class TInputImage, class TOutputImage>
@@ -84,28 +84,29 @@ PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>
::GetInputImageDirection(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TInputImage * >
- (this->GetInput(1) );
+ return static_cast<const TInputImage *>
+ (this->GetInput(1));
}
template <class TInputImage, class TOutputImage>
-void PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() throw (itk::InvalidRequestedRegionError)
-{
+void PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>::GenerateInputRequestedRegion() throw (
+ itk::InvalidRequestedRegionError)
+ {
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- typename Superclass::InputImagePointer inputPtr = const_cast< TInputImage * >( this->GetInputImageDirection() );
+ typename Superclass::InputImagePointer inputPtr = const_cast<TInputImage *>(this->GetInputImageDirection());
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
@@ -113,50 +114,48 @@ void PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>::Generate
inputRequestedRegion = inputPtr->GetRequestedRegion();
// pad the input requested region by the operator radius
- inputRequestedRegion.PadByRadius( m_Radius );
+ inputRequestedRegion.PadByRadius(m_Radius);
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << static_cast<const char *>(this->GetNameOfClass())
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
+ }
}
-}
-
-template< class TInputImage, class TOutputImage>
-void PixelSuppressionByDirectionImageFilter< TInputImage, TOutputImage>::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread,
- int threadId
-)
+template<class TInputImage, class TOutputImage>
+void PixelSuppressionByDirectionImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(
+ const OutputImageRegionType& outputRegionForThread,
+ int threadId
+ )
{
- itk::ConstantBoundaryCondition<InputImageType> cbc;
- const InputPixelType cvalue = 255;
+ itk::ConstantBoundaryCondition<InputImageType> cbc;
+ const InputPixelType cvalue = 255;
cbc.SetConstant(cvalue);
- itk::ConstNeighborhoodIterator<InputImageType> bit;
- itk::ImageRegionConstIterator<InputImageType> itin;
- itk::ImageRegionIterator<OutputImageType> itout;
-
+ itk::ConstNeighborhoodIterator<InputImageType> bit;
+ itk::ImageRegionConstIterator<InputImageType> itin;
+ itk::ImageRegionIterator<OutputImageType> itout;
// Allocate output
typename OutputImageType::Pointer output = this->GetOutput();
@@ -164,14 +163,12 @@ void PixelSuppressionByDirectionImageFilter< TInputImage, TOutputImage>::Threade
typename InputImageType::ConstPointer inputDirection = this->GetInputImageDirection();
// Find the data-set boundary "faces"
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType faceList;
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType::iterator fit;
-
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType faceList;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType::iterator fit;
itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> bC;
faceList = bC(inputDirection, outputRegionForThread, m_Radius);
-
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
@@ -190,17 +187,15 @@ void PixelSuppressionByDirectionImageFilter< TInputImage, TOutputImage>::Threade
// Pixel location in the system axis of the region after rotation of theta
// where theta is the direction of the cantral pixel
-
// Pixel Direction
double ThetaXcYc, Thetaxtyt;
-
//---------------------------------------------------------------------------
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
- for (fit=faceList.begin(); fit != faceList.end(); ++fit)
- {
+ for (fit = faceList.begin(); fit != faceList.end(); ++fit)
+ {
bit = itk::ConstNeighborhoodIterator<InputImageType>(m_Radius, inputDirection, *fit);
itin = itk::ImageRegionConstIterator<InputImageType>(input, *fit);
@@ -209,9 +204,8 @@ void PixelSuppressionByDirectionImageFilter< TInputImage, TOutputImage>::Threade
bit.OverrideBoundaryCondition(&cbc);
bit.GoToBegin();
-
- while ( ! bit.IsAtEnd() )
- {
+ while (!bit.IsAtEnd())
+ {
/*// Location of the central pixel of the region in the input image
bitIndex = bit.GetIndex();
@@ -220,81 +214,75 @@ void PixelSuppressionByDirectionImageFilter< TInputImage, TOutputImage>::Threade
Yc = bitIndex[1];
*/
// Get Pixel Direction from the image of directions
- ThetaXcYc = static_cast<double>( bit.GetCenterPixel() );
+ ThetaXcYc = static_cast<double>(bit.GetCenterPixel());
// Pixel intensity in the input image
PixelValue = itin.Get();
bool IsLine = false;
- typename itk::ConstNeighborhoodIterator<InputImageType>::OffsetType off;
+ typename itk::ConstNeighborhoodIterator<InputImageType>::OffsetType off;
// Loop on the region
- for (unsigned int i = 0; i < 2*m_Radius[0]+1; ++i)
- for (unsigned int j = 0; j < 2*m_Radius[1]+1; ++j)
- {
+ for (unsigned int i = 0; i < 2 * m_Radius[0] + 1; ++i)
+ for (unsigned int j = 0; j < 2 * m_Radius[1] + 1; ++j)
+ {
- off[0]=i-m_Radius[0];
- off[1]=j-m_Radius[1];
+ off[0] = i - m_Radius[0];
+ off[1] = j - m_Radius[1];
x = off[0];
y = off[1];
-
// No calculation on the central pixel
- if (( x == 0 ) && ( y == 0 ))
- continue;
+ if ((x == 0) && (y == 0)) continue;
- Thetaxtyt = vcl_atan2( static_cast<double>(y), static_cast<double>(x) ); //result is [-PI,PI]
+ Thetaxtyt = vcl_atan2(static_cast<double>(y), static_cast<double>(x)); //result is [-PI,PI]
while (Thetaxtyt < 0)
- Thetaxtyt = CONST_PI + Thetaxtyt; // Theta is now [0,PI] as is
+ Thetaxtyt = CONST_PI + Thetaxtyt; // Theta is now [0,PI] as is
// the result of detectors
while (Thetaxtyt > CONST_PI_2)
- Thetaxtyt = Thetaxtyt-CONST_PI; // Theta is now [-PI/2,PI/2]
-
-
- if ( (vcl_abs(vcl_cos(Thetaxtyt-ThetaXcYc)) >= vcl_cos(m_AngularBeam)) // this
- // pixel
- // is
- // in
- // the
- // angular beam
- && (vcl_abs(vcl_cos(bit.GetPixel(off)-ThetaXcYc)) >= vcl_cos(m_AngularBeam)) ) //and
- //its
- //direction
- //is
- //also
- //in
- //the beam
- {
+ Thetaxtyt = Thetaxtyt - CONST_PI; // Theta is now [-PI/2,PI/2]
+
+ if ((vcl_abs(vcl_cos(Thetaxtyt - ThetaXcYc)) >= vcl_cos(m_AngularBeam)) // this
+ // pixel
+ // is
+ // in
+ // the
+ // angular beam
+ && (vcl_abs(vcl_cos(bit.GetPixel(off) - ThetaXcYc)) >= vcl_cos(m_AngularBeam))) //and
+ //its
+ //direction
+ //is
+ //also
+ //in
+ //the beam
+ {
IsLine = true;
continue;
- }
+ }
-
- }
+ }
// end of the loop on the pixels of the region
-
// Assignment of this value to the output pixel
if (IsLine == true)
- {
- itout.Set( static_cast<OutputPixelType>(PixelValue) );
- }
+ {
+ itout.Set(static_cast<OutputPixelType>(PixelValue));
+ }
else
- {
- itout.Set( static_cast<OutputPixelType>(0.) );
- }
-
+ {
+ itout.Set(static_cast<OutputPixelType>(0.));
+ }
++bit;
++itin;
++itout;
progress.CompletedPixel();
- }
+ }
- }
+ }
}
/**
@@ -304,12 +292,10 @@ template <class TInputImage, class TOutput>
void
PixelSuppressionByDirectionImageFilter<TInputImage, TOutput>::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "Radius: " << m_Radius << std::endl;
}
-
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbRealMomentImageFunction.h b/Code/FeatureExtraction/otbRealMomentImageFunction.h
index 13b0318315..416bfb3889 100644
--- a/Code/FeatureExtraction/otbRealMomentImageFunction.h
+++ b/Code/FeatureExtraction/otbRealMomentImageFunction.h
@@ -20,7 +20,6 @@
#include "otbGeometricMomentImageFunction.h"
-
namespace otb
{
@@ -31,52 +30,49 @@ namespace otb
* \ingroup ImageFunctions
*/
-template < class TInput,
-class TOutput = float,
-class TPrecision = double,
-class TCoordRep = float >
+template <class TInput,
+ class TOutput = float,
+ class TPrecision = double,
+ class TCoordRep = float>
class ITK_EXPORT RealMomentImageFunction :
- public GeometricMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep >
+ public GeometricMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep>
{
public:
/** Standard class typedefs. */
- typedef RealMomentImageFunction Self;
- typedef GeometricMomentImageFunction< TInput, TOutput, TPrecision, TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef RealMomentImageFunction Self;
+ typedef GeometricMomentImageFunction<TInput, TOutput, TPrecision, TCoordRep> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(RealMomentImageFunction, GeometricMomentImageFunction);
-
/** InputImageType typedef support. */
- typedef typename Superclass::InputType InputType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::PointType PointType;
+ typedef typename Superclass::InputType InputType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
+ typedef typename Superclass::PointType PointType;
/** Type for calculation precision */
- typedef typename Superclass::PrecisionType PrecisionType;
-
- typedef typename Superclass::OutputType OutputType;
- typedef OutputType RealType;
+ typedef typename Superclass::PrecisionType PrecisionType;
+ typedef typename Superclass::OutputType OutputType;
+ typedef OutputType RealType;
protected:
RealMomentImageFunction() {};
- ~RealMomentImageFunction() {};
+ ~RealMomentImageFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
private:
- RealMomentImageFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ RealMomentImageFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbRealMomentPathFunction.h b/Code/FeatureExtraction/otbRealMomentPathFunction.h
index 62e4114726..db157b8d7a 100644
--- a/Code/FeatureExtraction/otbRealMomentPathFunction.h
+++ b/Code/FeatureExtraction/otbRealMomentPathFunction.h
@@ -21,7 +21,6 @@
#include "otbGeometricMomentPathFunction.h"
#include "itkVectorContainer.h"
-
namespace otb
{
@@ -32,50 +31,49 @@ namespace otb
* \ingroup PathFunctions
*/
-template < class TInputPath,
-class TOutput = double,
-class TPrecision = double>
+template <class TInputPath,
+ class TOutput = double,
+ class TPrecision = double>
class ITK_EXPORT RealMomentPathFunction :
- public GeometricMomentPathFunction< TInputPath, TOutput, TPrecision>
+ public GeometricMomentPathFunction<TInputPath, TOutput, TPrecision>
{
public:
/** Standard class typedefs. */
- typedef RealMomentPathFunction Self;
- typedef GeometricMomentPathFunction< TInputPath, TOutput, TPrecision> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef RealMomentPathFunction Self;
+ typedef GeometricMomentPathFunction<TInputPath, TOutput, TPrecision> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(RealMomentPathFunction, GeometricMomentPathFunction);
/** InputPathType typedef support. */
- typedef typename Superclass::PathType PathType;
- typedef typename Superclass::PathConstPointer PathConstPointer;
- typedef typename PathType::ContinuousIndexType VertexType;
- typedef itk::VectorContainer< unsigned,VertexType > VertexListType;
- typedef typename VertexListType::ConstPointer VertexListPointer;
+ typedef typename Superclass::PathType PathType;
+ typedef typename Superclass::PathConstPointer PathConstPointer;
+ typedef typename PathType::ContinuousIndexType VertexType;
+ typedef itk::VectorContainer<unsigned, VertexType> VertexListType;
+ typedef typename VertexListType::ConstPointer VertexListPointer;
/** Type for calculation precision */
- typedef typename Superclass::PrecisionType PrecisionType;
+ typedef typename Superclass::PrecisionType PrecisionType;
/** OutputType typedef support. */
- typedef typename Superclass::OutputType RealType;
+ typedef typename Superclass::OutputType RealType;
protected:
RealMomentPathFunction()
- {}
- ~RealMomentPathFunction() {};
+ {}
+ ~RealMomentPathFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
private:
- RealMomentPathFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ RealMomentPathFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.h b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.h
index 9ec94f9d6a..144681db3d 100644
--- a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.h
+++ b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.h
@@ -30,67 +30,64 @@
namespace otb
{
-
+
/** \class RegionImageToRectangularPathListFilter
* \class ImageToPathListAlignFilter
* \brief Base class used to implement filter to model regions by rectangles.
*
*/
template <class TInputImage, class TOutputPath>
-class ITK_EXPORT RegionImageToRectangularPathListFilter : public ImageToPathListFilter<TInputImage,TOutputPath>
+class ITK_EXPORT RegionImageToRectangularPathListFilter : public ImageToPathListFilter<TInputImage, TOutputPath>
{
public:
/** Standard class typedefs. */
- typedef RegionImageToRectangularPathListFilter Self;
- typedef ImageToPathListFilter<TInputImage,TOutputPath> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef RegionImageToRectangularPathListFilter Self;
+ typedef ImageToPathListFilter<TInputImage, TOutputPath> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
/** Method for creation through the object factory. */
itkNewMacro(Self);
-
+
/** Run-time type information (and related methods). */
- itkTypeMacro(RegionImageToRectangularPathListFilter,ImageToPathListFilter);
+ itkTypeMacro(RegionImageToRectangularPathListFilter, ImageToPathListFilter);
// itkTypeMacro(ImageToPathListAlignFilter,itk::ImageSource);
-
+
/** ImageDimension constants */
itkStaticConstMacro(InputImageDimension, unsigned int,
TInputImage::ImageDimension);
-
+
/** Some convenient typedefs. */
- typedef typename Superclass::OutputPathListType OutputPathListType;
-
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::InputImageRegionType InputImageRegionType;
- typedef typename InputImageType::Pointer InputImagePointer;
- typedef typename InputImageType::ConstPointer InputImageConstPointer;
-
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::ValueType ValueType;
- typedef typename InputImageType::PixelType PixelType;
-
- typedef typename Superclass::OutputPathType OutputPathType;
+ typedef typename Superclass::OutputPathListType OutputPathListType;
+
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::InputImageRegionType InputImageRegionType;
+ typedef typename InputImageType::Pointer InputImagePointer;
+ typedef typename InputImageType::ConstPointer InputImageConstPointer;
+
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::ValueType ValueType;
+ typedef typename InputImageType::PixelType PixelType;
+
+ typedef typename Superclass::OutputPathType OutputPathType;
// typedef typename Superclass::OutputPathListType OutputPathListType;
- typedef typename Superclass::OutputPathPointerType OutputPathPointerType;
+ typedef typename Superclass::OutputPathPointerType OutputPathPointerType;
// typedef float RealType;
- //typedef typename itk::NumericTraits<PixelType>::RealType RealType;
- typedef double RealType;
+//typedef typename itk::NumericTraits<PixelType>::RealType RealType;
+ typedef double RealType;
// typedef typename itk::Image<RealType,InputImageDimension> RealImageType;
- typedef typename otb::Image<RealType,InputImageDimension> RealImageType;
- typedef typename RealImageType::Pointer RealImageTypePointer;
- typedef typename RealImageType::IndexType RealImageTypeIndexType;
-
-
-
-
+ typedef typename otb::Image<RealType, InputImageDimension> RealImageType;
+ typedef typename RealImageType::Pointer RealImageTypePointer;
+ typedef typename RealImageType::IndexType RealImageTypeIndexType;
+
/** The minimum rectangular fit of returned rectangles. */
- itkSetMacro(MinimumFit,double);
- itkGetConstReferenceMacro(MinimumFit,double);
+ itkSetMacro(MinimumFit, double);
+ itkGetConstReferenceMacro(MinimumFit, double);
/** The minimum size of returned rectangles. */
- itkSetMacro(MinimumSize,double);
- itkGetConstReferenceMacro(MinimumSize,double);
+ itkSetMacro(MinimumSize, double);
+ itkGetConstReferenceMacro(MinimumSize, double);
//jgc
/** Dimension of the image the iterator walks. This constant is needed so
@@ -99,17 +96,16 @@ public:
* access to the dimension of the image that the iterator walks. */
itkStaticConstMacro(NDimensions, unsigned int, TInputImage::ImageDimension);
-
protected:
RegionImageToRectangularPathListFilter();
virtual ~RegionImageToRectangularPathListFilter();
- virtual void GenerateOutputInformation(){}; // do nothing
+ virtual void GenerateOutputInformation(){} // do nothing
virtual void GenerateData();
-
- double m_MinimumFit;
- double m_MinimumSize;
- int m_CrossTermFormula;
+
+ double m_MinimumFit;
+ double m_MinimumSize;
+ int m_CrossTermFormula;
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -118,8 +114,8 @@ protected:
typename MarkerImageType::Pointer markerImage;
private:
- RegionImageToRectangularPathListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ RegionImageToRectangularPathListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
diff --git a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
index 61e56aa9e9..305edd5496 100644
--- a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
+++ b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
@@ -44,7 +44,7 @@ namespace otb
/** Constructor */
template <class TInputImage, class TOutputPath>
-RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
+RegionImageToRectangularPathListFilter<TInputImage, TOutputPath>
::RegionImageToRectangularPathListFilter()
{
this->SetNumberOfRequiredInputs(1);
@@ -54,36 +54,33 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
/** Destructor */
template <class TInputImage, class TOutputPath>
-RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
+RegionImageToRectangularPathListFilter<TInputImage, TOutputPath>
::~RegionImageToRectangularPathListFilter()
{
}
-
/* Algorithm */
-
template <class TInputImage, class TOutputPath>
void
-RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
+RegionImageToRectangularPathListFilter<TInputImage, TOutputPath>
::GenerateData(void)
{
typename InputImageType::SizeType Taille;
//this->DebugOn();
//itkDebugMacro(<< "RegionImageToRectangularPathListFilter::GenerateData() called");
-
// Get the input and output pointers
- const InputImageType * InputImage = this->GetInput();
+ const InputImageType * InputImage = this->GetInput();
OutputPathListType * OutputPath = this->GetOutput();
// Generate the image
/* Filter algorithm */
-
+
Taille = InputImage->GetLargestPossibleRegion().GetSize();
itkDebugMacro(<< "Input image size : " << Taille);
- typename InputImageType::PointType origin;
+ typename InputImageType::PointType origin;
typename InputImageType::SpacingType spacing;
origin = InputImage->GetOrigin();
spacing = InputImage->GetSpacing();
@@ -115,15 +112,15 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
markerImage = MarkerImageType::New();
typename MarkerImageType::RegionType markerRegion = InputImage->GetLargestPossibleRegion();
- markerImage->SetLargestPossibleRegion( markerRegion );
- markerImage->SetBufferedRegion( markerRegion );
- markerImage->SetRequestedRegion( markerRegion );
+ markerImage->SetLargestPossibleRegion(markerRegion);
+ markerImage->SetBufferedRegion(markerRegion);
+ markerImage->SetRequestedRegion(markerRegion);
markerImage->Allocate();
unsigned char maxValue = itk::NumericTraits<ITK_TYPENAME MarkerImageType::PixelType>::max();
markerImage->FillBuffer(maxValue);
unsigned char zeroValue = itk::NumericTraits<ITK_TYPENAME MarkerImageType::PixelType>::Zero;
unsigned char regionValue;
- int neighbor;
+ int neighbor;
//markerImage->FillBuffer(itk::NumericTraits<ITK_TYPENAME MarkerImageType::PixelType>::max());
//typedef itk::ImageRegionIterator<MarkerImageType> MarkerIteratorType;
@@ -131,257 +128,283 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
MarkerIteratorType mit(markerImage, markerRegion);
typedef typename TInputImage::IndexType IndexType;
- std::vector<IndexType> regionContainer; // Pb for growing from within loop
+ std::vector<IndexType> regionContainer; // Pb for growing from within loop
typename std::vector<IndexType>::iterator regionIterator;
typename std::vector<IndexType>::iterator regionIterator2;
regionContainer.reserve(Taille[0] * Taille[1]); // to avoid growth problems
IndexType explorerIndex; // position whose neighbors are to be checked for inclusion in current region
try {
- OutputPath->Clear();
-
- for (nit.GoToBegin(), pixelCount = 0; ! nit.IsAtEnd(); ++nit) {
- pixelCount++;
- if (pixelCount <= pixelDebugNumber) {
- std::cout << "Pixel #" << pixelCount << " : " << nit.GetCenterPixel() << std::endl;
- for (neighbor = 1; neighbor <= 7; neighbor += 2) // 4 neighbors : above, left, right, below
- std::cout << "Neighbor #" << neighbor << " : " << nit.GetPixel(neighbor) << std::endl;
- }
- mit.SetIndex(nit.GetIndex());
- if (mit.Get() == maxValue) { // pixel not yet processed
- mit.Set(zeroValue);
- regionContainer.clear();
- regionContainer.push_back(nit.GetIndex());
- regionValue = nit.GetCenterPixel();
- regionCount++;
- if (pixelCount <= pixelDebugNumber) {
- std::cout << "Starting new region at " << nit.GetIndex() << " with value " << (unsigned short) regionValue << std::endl;
- }
- // Collect all pixels in same region (same value), reachable in 4-connectivity
- for (regionIterator = regionContainer.begin(); regionIterator != /*<*/ regionContainer.end(); ++regionIterator /* regionContainer grows within loop */) {
- // add neighbors not yet processed, until whole region has been collected (no "new" neighbor)
- explorerIndex = *regionIterator;
- nit2.SetLocation(explorerIndex);
+ OutputPath->Clear();
+
+ for (nit.GoToBegin(), pixelCount = 0; !nit.IsAtEnd(); ++nit)
+ {
+ pixelCount++;
+ if (pixelCount <= pixelDebugNumber)
+ {
+ std::cout << "Pixel #" << pixelCount << " : " << nit.GetCenterPixel() << std::endl;
+ for (neighbor = 1; neighbor <= 7; neighbor += 2) // 4 neighbors : above, left, right, below
+ std::cout << "Neighbor #" << neighbor << " : " << nit.GetPixel(neighbor) << std::endl;
+ }
+ mit.SetIndex(nit.GetIndex());
+ if (mit.Get() == maxValue) // pixel not yet processed
+ {
+ mit.Set(zeroValue);
+ regionContainer.clear();
+ regionContainer.push_back(nit.GetIndex());
+ regionValue = nit.GetCenterPixel();
+ regionCount++;
if (pixelCount <= pixelDebugNumber)
- std::cout << "Exploring neighbors of " << explorerIndex << std::endl;
-
- for (neighbor = 1; neighbor <= 7; neighbor += 2)
- if (nit2.GetPixel(neighbor) == regionValue) { // ZZ and not yet processed...
- mit.SetIndex(nit2.GetIndex(neighbor));
- if (mit.Get() == maxValue) { // pixel not yet processed
- mit.Set(zeroValue);
- regionContainer.push_back(nit2.GetIndex(neighbor));
- if (pixelCount <= pixelDebugNumber) {
- std::cout << "Adding " << nit2.GetIndex(neighbor) << std::endl;
- std::cout << "Added " << regionContainer.back() << std::endl;
+ {
+ std::cout << "Starting new region at " << nit.GetIndex() << " with value " << (unsigned short) regionValue <<
+ std::endl;
+ }
+ // Collect all pixels in same region (same value), reachable in 4-connectivity
+ for (regionIterator = regionContainer.begin(); regionIterator != /*<*/ regionContainer.end(); ++regionIterator /* regionContainer grows within loop */)
+ {
+ // add neighbors not yet processed, until whole region has been collected (no "new" neighbor)
+ explorerIndex = *regionIterator;
+ nit2.SetLocation(explorerIndex);
+ if (pixelCount <= pixelDebugNumber) std::cout << "Exploring neighbors of " << explorerIndex << std::endl;
+
+ for (neighbor = 1; neighbor <= 7; neighbor += 2)
+ if (nit2.GetPixel(neighbor) == regionValue) // ZZ and not yet processed...
+ {
+ mit.SetIndex(nit2.GetIndex(neighbor));
+ if (mit.Get() == maxValue) // pixel not yet processed
+ {
+ mit.Set(zeroValue);
+ regionContainer.push_back(nit2.GetIndex(neighbor));
+ if (pixelCount <= pixelDebugNumber)
+ {
+ std::cout << "Adding " << nit2.GetIndex(neighbor) << std::endl;
+ std::cout << "Added " << regionContainer.back() << std::endl;
+ }
+ }
}
- }
}
- }
- if (pixelCount <= pixelDebugNumber) {
- std::cout << "Region queue (" << regionContainer.size() << " elements) : " << std::endl;
- for (regionIterator = regionContainer.begin(); regionIterator != regionContainer.end(); ++regionIterator)
- std::cout << *regionIterator;
- std::cout << std::endl;
- }
+ if (pixelCount <= pixelDebugNumber)
+ {
+ std::cout << "Region queue (" << regionContainer.size() << " elements) : " << std::endl;
+ for (regionIterator = regionContainer.begin(); regionIterator != regionContainer.end(); ++regionIterator)
+ std::cout << *regionIterator;
+ std::cout << std::endl;
+ }
- // Compute variance-covariance matrix of x-y coordinates of region pixels
- double sumX = 0, sumY = 0, sumX2 = 0, sumY2 = 0, sumXY = 0;
- double avgX, avgY, varX, varY, covarXY;
- int n = regionContainer.size();
- for (regionIterator = regionContainer.begin(); regionIterator != regionContainer.end(); ++regionIterator) {
- explorerIndex = *regionIterator;
- sumX += explorerIndex[0];
- sumY += explorerIndex[1];
- sumX2 += explorerIndex[0] * explorerIndex[0];
- sumY2 += explorerIndex[1] * explorerIndex[1];
- sumXY += explorerIndex[0] * explorerIndex[1];
- }
- avgX = (double) sumX / n;
- avgY = (double) sumY / n;
- varX = (double) sumX2 / n - avgX * avgX;
- varY = (double) sumY2 / n - avgY * avgY;
- covarXY = (double) sumXY / n - avgX * avgY;
-
- // Compute average deviation (or mean absolute deviation) matrix instead, because rectangles resulting from above statistics are too elongated
- double sumAX = 0, sumAY = 0, crossTermAXY = 0;
- double adevX, adevY, adevXY;
- double ax, ay;
- for (regionIterator = regionContainer.begin(); regionIterator != regionContainer.end(); ++regionIterator) {
- explorerIndex = *regionIterator;
- ax = vcl_abs(explorerIndex[0] - avgX);
- ay = vcl_abs(explorerIndex[1] - avgY);
- sumAX += ax;
- sumAY += ay;
- crossTermAXY += ax * ay;
- }
- adevX = sumAX / n;
- adevY = sumAY / n;
- adevXY = vcl_sqrt(crossTermAXY) / n;
-
- // Compute eigenvalues and eigenvectors of variance-covariance matrix (for DIRECTION)
- double delta,
- l1, l2, /* eigenvalues */
- y1, y2, /* eigenvectors y coordinate, for x = 1*/
- x1 = 1, /* first eigenvector x coordinate */
- x2 = 1, /* second eigenvector x coordinate, 1 except in special case when covarXY == 0 */
- alpha /* main direction */;
- delta = (varX - varY) * (varX - varY) + 4 * covarXY * covarXY;
- l1 = (varX + varY + vcl_sqrt(delta)) / 2;
- l2 = (varX + varY - vcl_sqrt(delta)) / 2;
- if (covarXY != 0.0) { // ZZ or larger than a small epsilon ? (eg 10^(-15)...)
- y1 = (l1 - varX) / covarXY; // for x1 = 1
- y2 = (l2 - varX) / covarXY; // for x2 = 1
- } else { // matrix was already diagonal
- y1 = 0;
- x2 = 0;
- y2 = 1;
- }
+ // Compute variance-covariance matrix of x-y coordinates of region pixels
+ double sumX = 0, sumY = 0, sumX2 = 0, sumY2 = 0, sumXY = 0;
+ double avgX, avgY, varX, varY, covarXY;
+ int n = regionContainer.size();
+ for (regionIterator = regionContainer.begin(); regionIterator != regionContainer.end(); ++regionIterator)
+ {
+ explorerIndex = *regionIterator;
+ sumX += explorerIndex[0];
+ sumY += explorerIndex[1];
+ sumX2 += explorerIndex[0] * explorerIndex[0];
+ sumY2 += explorerIndex[1] * explorerIndex[1];
+ sumXY += explorerIndex[0] * explorerIndex[1];
+ }
+ avgX = (double) sumX / n;
+ avgY = (double) sumY / n;
+ varX = (double) sumX2 / n - avgX * avgX;
+ varY = (double) sumY2 / n - avgY * avgY;
+ covarXY = (double) sumXY / n - avgX * avgY;
+
+ // Compute average deviation (or mean absolute deviation) matrix instead, because rectangles resulting from above statistics are too elongated
+ double sumAX = 0, sumAY = 0, crossTermAXY = 0;
+ double adevX, adevY, adevXY;
+ double ax, ay;
+ for (regionIterator = regionContainer.begin(); regionIterator != regionContainer.end(); ++regionIterator)
+ {
+ explorerIndex = *regionIterator;
+ ax = vcl_abs(explorerIndex[0] - avgX);
+ ay = vcl_abs(explorerIndex[1] - avgY);
+ sumAX += ax;
+ sumAY += ay;
+ crossTermAXY += ax * ay;
+ }
+ adevX = sumAX / n;
+ adevY = sumAY / n;
+ adevXY = vcl_sqrt(crossTermAXY) / n;
+
+ // Compute eigenvalues and eigenvectors of variance-covariance matrix (for DIRECTION)
+ double delta,
+ l1, l2, /* eigenvalues */
+ y1, y2, /* eigenvectors y coordinate, for x = 1*/
+ x1 = 1, /* first eigenvector x coordinate */
+ x2 = 1, /* second eigenvector x coordinate, 1 except in special case when covarXY == 0 */
+ alpha /* main direction */;
+ delta = (varX - varY) * (varX - varY) + 4 * covarXY * covarXY;
+ l1 = (varX + varY + vcl_sqrt(delta)) / 2;
+ l2 = (varX + varY - vcl_sqrt(delta)) / 2;
+ if (covarXY != 0.0) // ZZ or larger than a small epsilon ? (eg 10^(-15)...)
+ {
+ y1 = (l1 - varX) / covarXY; // for x1 = 1
+ y2 = (l2 - varX) / covarXY; // for x2 = 1
+ }
+ else // matrix was already diagonal
+ {
+ y1 = 0;
+ x2 = 0;
+ y2 = 1;
+ }
- // Compute eigenvalues and eigenvectors of absolute mean deviation matrix (for PROPORTIONS)
- double adelta,
- al1, al2, /* eigenvalues */
- ay1, ay2, /* eigenvectors y coordinate, for x = 1*/
- ax1 = 1, /* first eigenvector x coordinate */
- ax2 = 1; /* second eigenvector x coordinate, 1 except in special case when covarXY == 0 */
- adelta = (adevX - adevY) * (adevX - adevY) + 4 * adevXY * adevXY;
- al1 = (adevX + adevY + vcl_sqrt(adelta)) / 2;
- al2 = (adevX + adevY - vcl_sqrt(adelta)) / 2;
- if (adevXY != 0.0) { // ZZ or larger than a small epsilon ? (eg 10^(-15)...)
- ay1 = (al1 - adevX) / adevXY; // for x1 = 1
- ay2 = (al2 - adevX) / adevXY; // for x2 = 1
- } else { // matrix was already diagonal
- ay1 = 0;
- ax2 = 0;
- ay2 = 1;
- }
+ // Compute eigenvalues and eigenvectors of absolute mean deviation matrix (for PROPORTIONS)
+ double adelta,
+ al1, al2, /* eigenvalues */
+ ay1, ay2, /* eigenvectors y coordinate, for x = 1*/
+ ax1 = 1, /* first eigenvector x coordinate */
+ ax2 = 1; /* second eigenvector x coordinate, 1 except in special case when covarXY == 0 */
+ adelta = (adevX - adevY) * (adevX - adevY) + 4 * adevXY * adevXY;
+ al1 = (adevX + adevY + vcl_sqrt(adelta)) / 2;
+ al2 = (adevX + adevY - vcl_sqrt(adelta)) / 2;
+ if (adevXY != 0.0) // ZZ or larger than a small epsilon ? (eg 10^(-15)...)
+ {
+ ay1 = (al1 - adevX) / adevXY; // for x1 = 1
+ ay2 = (al2 - adevX) / adevXY; // for x2 = 1
+ }
+ else // matrix was already diagonal
+ {
+ ay1 = 0;
+ ax2 = 0;
+ ay2 = 1;
+ }
- if (y1 != 0)
- alpha = vcl_atan(1 / y1) * 180 / vnl_math::pi;
- else
- alpha = 90;
- if (alpha < 0)
- alpha += 180; // Conventionnaly given as a value between 0 and 180°
-
- // Compute equivalent length and width (based on equal area criterion)
- double length, width;
- if (al2 != 0) {
- length = vcl_sqrt(vcl_abs(al1 / al2) * n);
- //length = vcl_sqrt(l1 / l2 * n);
- if (al1 != 0)
- width = vcl_abs(al2 / al1) * length;
- else { // l1 == 0 and l2 == 0
- length = width = vcl_sqrt(static_cast<double>(n)); // should happen only when n == 1 anyway
- }
- } else {
- length = n; // Arbitrary representation for degenerate case
- width = 1;
- }
+ if (y1 != 0) alpha = vcl_atan(1 / y1) * 180 / vnl_math::pi;
+ else alpha = 90;
+ if (alpha < 0) alpha += 180; // Conventionnaly given as a value between 0 and 180°
+
+ // Compute equivalent length and width (based on equal area criterion)
+ double length, width;
+ if (al2 != 0)
+ {
+ length = vcl_sqrt(vcl_abs(al1 / al2) * n);
+ //length = vcl_sqrt(l1 / l2 * n);
+ if (al1 != 0) width = vcl_abs(al2 / al1) * length;
+ else // l1 == 0 and l2 == 0
+ {
+ length = width = vcl_sqrt(static_cast<double>(n)); // should happen only when n == 1 anyway
+ }
+ }
+ else
+ {
+ length = n; // Arbitrary representation for degenerate case
+ width = 1;
+ }
- // Normalize eigenvectors (for following tests)
- double norm;
- norm = vcl_sqrt(x1 * x1 + y1 * y1);
- assert (norm != 0); //(by construction of eigenvectors)
- if (norm != 0) {
- x1 /= norm;
- y1 /= norm;
- }
- norm = vcl_sqrt(x2 * x2 + y2 * y2);
- assert (norm != 0); //(by construction of eigenvectors)
- if (norm != 0) {
- x2 /= norm;
- y2 /= norm;
- }
+ // Normalize eigenvectors (for following tests)
+ double norm;
+ norm = vcl_sqrt(x1 * x1 + y1 * y1);
+ assert (norm != 0); //(by construction of eigenvectors)
+ if (norm != 0)
+ {
+ x1 /= norm;
+ y1 /= norm;
+ }
+ norm = vcl_sqrt(x2 * x2 + y2 * y2);
+ assert (norm != 0); //(by construction of eigenvectors)
+ if (norm != 0)
+ {
+ x2 /= norm;
+ y2 /= norm;
+ }
- // Normalize eigenvectors (for following tests) (No : used only for printing values for debugging)
- norm = vcl_sqrt(ax1 * ax1 + ay1 * ay1);
- assert (norm != 0); //(by construction of eigenvectors)
- if (norm != 0) {
- ax1 /= norm;
- ay1 /= norm;
- }
- norm = vcl_sqrt(ax2 * ax2 + ay2 * ay2);
- assert (norm != 0); //(by construction of eigenvectors)
- if (norm != 0) {
- ax2 /= norm;
- ay2 /= norm;
- }
+ // Normalize eigenvectors (for following tests) (No : used only for printing values for debugging)
+ norm = vcl_sqrt(ax1 * ax1 + ay1 * ay1);
+ assert (norm != 0); //(by construction of eigenvectors)
+ if (norm != 0)
+ {
+ ax1 /= norm;
+ ay1 /= norm;
+ }
+ norm = vcl_sqrt(ax2 * ax2 + ay2 * ay2);
+ assert (norm != 0); //(by construction of eigenvectors)
+ if (norm != 0)
+ {
+ ax2 /= norm;
+ ay2 /= norm;
+ }
- // Count the proportion of region pixels contained within rectangle model, to evaluate rectangular fit, or "rectangularity"
- // Rectangle model uses [x1,y1] and [x2,y2] for direction (angle), and size derived from adev matrix
- double vx, vy; // x-y coordinates relative to rectangle center
- double halfLength = length / 2, halfWidth = width / 2; // to write formulas more easily
- int countWithin = 0; // number of pixels contained within rectangle
- for (regionIterator = regionContainer.begin(); regionIterator != regionContainer.end(); ++regionIterator) {
- explorerIndex = *regionIterator;
- vx = explorerIndex[0] - avgX;
- vy = explorerIndex[1] - avgY;
- if (vcl_abs(vx * x1 + vy * y1) <= halfLength
- && vcl_abs(vx * x2 + vy * y2) <= halfWidth)
- countWithin ++;
- }
+ // Count the proportion of region pixels contained within rectangle model, to evaluate rectangular fit, or "rectangularity"
+ // Rectangle model uses [x1,y1] and [x2,y2] for direction (angle), and size derived from adev matrix
+ double vx, vy; // x-y coordinates relative to rectangle center
+ double halfLength = length / 2, halfWidth = width / 2; // to write formulas more easily
+ int countWithin = 0; // number of pixels contained within rectangle
+ for (regionIterator = regionContainer.begin(); regionIterator != regionContainer.end(); ++regionIterator)
+ {
+ explorerIndex = *regionIterator;
+ vx = explorerIndex[0] - avgX;
+ vy = explorerIndex[1] - avgY;
+ if (vcl_abs(vx * x1 + vy * y1) <= halfLength
+ && vcl_abs(vx * x2 + vy * y2) <= halfWidth) countWithin++;
+ }
- if (regionCount <= regionDebugNumber) {
- std::cout << std::endl << "Region " << regionCount << " (area = " << n << " pixels)" << std::endl;
- std::cout << "sumX = " << sumX << "; sumY = " << sumY << "; sumX2 = " << sumX2 << "; sumY2 = " << sumY2 << "; sumXY = " << sumXY << std::endl;
- std::cout << "avgX = " << avgX << "; avgY = " << avgY << std::endl;
- std::cout << "varX = " << varX << "; varY = " << varY << "; covarXY = " << covarXY << std::endl;
- std::cout << "adevX = " << adevX << "; adevY = " << adevY << "; adevXY = " << adevXY << std::endl;
- std::cout << "crossTermAXY = " << crossTermAXY << std::endl;
- std::cout << "eigenvalue 1 = " << l1 << "; eigenvalue 2 = " << l2 << std::endl;
- std::cout << "eigenvector 1 = [" << x1 << ", " << y1 << "]; eigenvector 2 = [" << x2 << ", " << y2 << "]" << std::endl;
- std::cout << "A-eigenvalue 1 = " << al1 << "; A-eigenvalue 2 = " << al2 << std::endl;
- std::cout << "A-eigenvector 1 = [" << ax1 << ", " << ay1 << "]; A-eigenvector 2 = [" << ax2 << ", " << ay2 << "]" << std::endl;
- std::cout << "length = " << length << "; width = " << width << std::endl;
- std::cout << "main direction = " << alpha << "°" << std::endl;
- std::cout << "rectangular fit = " << (float) countWithin / n << std::endl;
- }
+ if (regionCount <= regionDebugNumber)
+ {
+ std::cout << std::endl << "Region " << regionCount << " (area = " << n << " pixels)" << std::endl;
+ std::cout << "sumX = " << sumX << "; sumY = " << sumY << "; sumX2 = " << sumX2 << "; sumY2 = " << sumY2 <<
+ "; sumXY = " << sumXY << std::endl;
+ std::cout << "avgX = " << avgX << "; avgY = " << avgY << std::endl;
+ std::cout << "varX = " << varX << "; varY = " << varY << "; covarXY = " << covarXY << std::endl;
+ std::cout << "adevX = " << adevX << "; adevY = " << adevY << "; adevXY = " << adevXY << std::endl;
+ std::cout << "crossTermAXY = " << crossTermAXY << std::endl;
+ std::cout << "eigenvalue 1 = " << l1 << "; eigenvalue 2 = " << l2 << std::endl;
+ std::cout << "eigenvector 1 = [" << x1 << ", " << y1 << "]; eigenvector 2 = [" << x2 << ", " << y2 << "]" <<
+ std::endl;
+ std::cout << "A-eigenvalue 1 = " << al1 << "; A-eigenvalue 2 = " << al2 << std::endl;
+ std::cout << "A-eigenvector 1 = [" << ax1 << ", " << ay1 << "]; A-eigenvector 2 = [" << ax2 << ", " << ay2 <<
+ "]" << std::endl;
+ std::cout << "length = " << length << "; width = " << width << std::endl;
+ std::cout << "main direction = " << alpha << "°" << std::endl;
+ std::cout << "rectangular fit = " << (float) countWithin / n << std::endl;
+ }
-
- // Build rectangle list, converting image coordinates into physical coordinates
- typedef typename OutputPathType::ContinuousIndexType ContinuousIndexType;
-
- ContinuousIndexType point;
-
- OutputPathPointerType path = OutputPathType::New();
-
- path->Initialize();
- point[0] = (avgX + x1 * halfLength + x2 * halfWidth) * spacing[0] + origin[0];
- point[1] = (avgY + y1 * halfLength + y2 * halfWidth) * spacing[1] + origin[1];
- path->AddVertex(point);
- if (regionCount <= regionDebugNumber)
- std::cout << "corner 1 : [" << point[0] << ", " << point[1] << "]" << std::endl;
- point[0] = (avgX - x1 * halfLength + x2 * halfWidth) * spacing[0] + origin[0];
- point[1] = (avgY - y1 * halfLength + y2 * halfWidth) * spacing[1] + origin[1];
- path->AddVertex(point);
- if (regionCount <= regionDebugNumber)
- std::cout << "corner 2 : [" << point[0] << ", " << point[1] << "]" << std::endl;
- point[0] = (avgX - x1 * halfLength - x2 * halfWidth) * spacing[0] + origin[0];
- point[1] = (avgY - y1 * halfLength - y2 * halfWidth) * spacing[1] + origin[1];
- path->AddVertex(point);
- if (regionCount <= regionDebugNumber)
- std::cout << "corner 3 : [" << point[0] << ", " << point[1] << "]" << std::endl;
- point[0] = (avgX + x1 * halfLength - x2 * halfWidth) * spacing[0] + origin[0];
- point[1] = (avgY + y1 * halfLength - y2 * halfWidth) * spacing[1] + origin[1];
- path->AddVertex(point);
- if (regionCount <= regionDebugNumber)
- std::cout << "corner 4 : [" << point[0] << ", " << point[1] << "]" << std::endl;
- point[0] = (avgX + x1 * halfLength + x2 * halfWidth) * spacing[0] + origin[0];
- point[1] = (avgY + y1 * halfLength + y2 * halfWidth) * spacing[1] + origin[1];
- path->AddVertex(point);
-
- path->SetValue((double) countWithin / n);
-
- if ((float) countWithin / n >= m_MinimumFit // keep only rectangles with fit larger than minimumFit
- && n >= m_MinimumSize) { // and size larger than minimumSize
- OutputPath->PushBack(path);
- selectedRegionCount ++;
+ // Build rectangle list, converting image coordinates into physical coordinates
+ typedef typename OutputPathType::ContinuousIndexType ContinuousIndexType;
+
+ ContinuousIndexType point;
+
+ OutputPathPointerType path = OutputPathType::New();
+
+ path->Initialize();
+ point[0] = (avgX + x1 * halfLength + x2 * halfWidth) * spacing[0] + origin[0];
+ point[1] = (avgY + y1 * halfLength + y2 * halfWidth) * spacing[1] + origin[1];
+ path->AddVertex(point);
+ if (regionCount <= regionDebugNumber) std::cout << "corner 1 : [" << point[0] << ", " << point[1] << "]" <<
+ std::endl;
+ point[0] = (avgX - x1 * halfLength + x2 * halfWidth) * spacing[0] + origin[0];
+ point[1] = (avgY - y1 * halfLength + y2 * halfWidth) * spacing[1] + origin[1];
+ path->AddVertex(point);
+ if (regionCount <= regionDebugNumber) std::cout << "corner 2 : [" << point[0] << ", " << point[1] << "]" <<
+ std::endl;
+ point[0] = (avgX - x1 * halfLength - x2 * halfWidth) * spacing[0] + origin[0];
+ point[1] = (avgY - y1 * halfLength - y2 * halfWidth) * spacing[1] + origin[1];
+ path->AddVertex(point);
+ if (regionCount <= regionDebugNumber) std::cout << "corner 3 : [" << point[0] << ", " << point[1] << "]" <<
+ std::endl;
+ point[0] = (avgX + x1 * halfLength - x2 * halfWidth) * spacing[0] + origin[0];
+ point[1] = (avgY + y1 * halfLength - y2 * halfWidth) * spacing[1] + origin[1];
+ path->AddVertex(point);
+ if (regionCount <= regionDebugNumber) std::cout << "corner 4 : [" << point[0] << ", " << point[1] << "]" <<
+ std::endl;
+ point[0] = (avgX + x1 * halfLength + x2 * halfWidth) * spacing[0] + origin[0];
+ point[1] = (avgY + y1 * halfLength + y2 * halfWidth) * spacing[1] + origin[1];
+ path->AddVertex(point);
+
+ path->SetValue((double) countWithin / n);
+
+ if ((float) countWithin / n >= m_MinimumFit // keep only rectangles with fit larger than minimumFit
+ && n >= m_MinimumSize) // and size larger than minimumSize
+ {
+ OutputPath->PushBack(path);
+ selectedRegionCount++;
+ }
+ }
}
- }
- }
- } catch (std::exception &e) {
+ } catch (std::exception & e)
+ {
std::cerr << "Caught exception " << e.what() << std::endl;
- }
+ }
std::cout << pixelCount << " pixels seen." << std::endl;
std::cout << regionCount << " regions processed, " << selectedRegionCount << " regions selected." << std::endl;
@@ -389,16 +412,14 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
} // end update function
-
template <class TInputImage, class TOutputPath>
void
-RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
+RegionImageToRectangularPathListFilter<TInputImage, TOutputPath>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
}
-
} // end namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbRemoveCarvingPathFilter.h b/Code/FeatureExtraction/otbRemoveCarvingPathFilter.h
index 9a3e733ecc..92ac565388 100644
--- a/Code/FeatureExtraction/otbRemoveCarvingPathFilter.h
+++ b/Code/FeatureExtraction/otbRemoveCarvingPathFilter.h
@@ -56,14 +56,13 @@ namespace otb
* \ingroup ImageFilters
*/
-
-template <class TInputImage, class TInputPath,class TOutputImage>
-class ITK_EXPORT RemoveCarvingPathFilter : public itk::ImageAndPathToImageFilter<TInputImage,TInputPath,TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
+class ITK_EXPORT RemoveCarvingPathFilter : public itk::ImageAndPathToImageFilter<TInputImage, TInputPath, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef RemoveCarvingPathFilter Self;
- typedef itk::ImageAndPathToImageFilter<TInputImage,TInputPath,TOutputImage> Superclass;
+ typedef RemoveCarvingPathFilter Self;
+ typedef itk::ImageAndPathToImageFilter<TInputImage, TInputPath, TOutputImage> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -74,57 +73,56 @@ public:
itkTypeMacro(RemoveCarvingPathFilter, itk::ImageAndPathToImageFilter);
/** Some convenient typedefs. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointer;
- typedef typename InputImageType::ConstPointer InputImageConstPointer;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef TInputPath InputPathType;
- typedef typename InputPathType::Pointer InputPathPointer;
- typedef typename InputPathType::ConstPointer InputPathConstPointer;
- typedef typename InputPathType::InputType InputPathInputType;
- typedef typename InputPathType::OutputType InputPathOutputType;
- typedef typename InputPathType::IndexType InputPathIndexType;
- typedef typename InputPathType::OffsetType InputPathOffsetType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::ConstPointer OutputImageConstPointer;
-
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputImagePixelType;
- typedef typename OutputImageType::ValueType OutputImageValueType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointer;
+ typedef typename InputImageType::ConstPointer InputImageConstPointer;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef TInputPath InputPathType;
+ typedef typename InputPathType::Pointer InputPathPointer;
+ typedef typename InputPathType::ConstPointer InputPathConstPointer;
+ typedef typename InputPathType::InputType InputPathInputType;
+ typedef typename InputPathType::OutputType InputPathOutputType;
+ typedef typename InputPathType::IndexType InputPathIndexType;
+ typedef typename InputPathType::OffsetType InputPathOffsetType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::ConstPointer OutputImageConstPointer;
+
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputImagePixelType;
+ typedef typename OutputImageType::ValueType OutputImageValueType;
// typedef typename itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
// typedef typename itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
typedef typename itk::ImageSliceConstIteratorWithIndex<InputImageType> InputIteratorType;
- typedef typename itk::ImageSliceIteratorWithIndex<OutputImageType> OutputIteratorType;
+ typedef typename itk::ImageSliceIteratorWithIndex<OutputImageType> OutputIteratorType;
/** Set/Get the path input of this process object.
Note: these methods are adding to get the proper name */
- void SetInputPath( const TInputPath * path);
+ void SetInputPath(const TInputPath * path);
const TInputPath * GetInputPath(void);
-
itkSetMacro(Value, OutputImagePixelType);
itkGetConstReferenceMacro(Value, OutputImagePixelType);
/** Set and Get direction value */
- itkSetMacro(Direction ,unsigned int);
- itkGetConstMacro(Direction ,unsigned int);
+ itkSetMacro(Direction, unsigned int);
+ itkGetConstMacro(Direction, unsigned int);
virtual void GenerateOutputInformation();
protected:
RemoveCarvingPathFilter();
- virtual ~RemoveCarvingPathFilter() {};
+ virtual ~RemoveCarvingPathFilter() {}
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
virtual void GenerateData();
private:
- RemoveCarvingPathFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ RemoveCarvingPathFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
OutputImagePixelType m_Value;
unsigned int m_Direction;
diff --git a/Code/FeatureExtraction/otbRemoveCarvingPathFilter.txx b/Code/FeatureExtraction/otbRemoveCarvingPathFilter.txx
index 32e34f175f..3a9676fb01 100644
--- a/Code/FeatureExtraction/otbRemoveCarvingPathFilter.txx
+++ b/Code/FeatureExtraction/otbRemoveCarvingPathFilter.txx
@@ -27,25 +27,25 @@ namespace otb
/**
* Constructor
*/
-template <class TInputImage, class TInputPath,class TOutputImage>
-RemoveCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
+RemoveCarvingPathFilter<TInputImage, TInputPath, TOutputImage>
::RemoveCarvingPathFilter()
{
m_Value = static_cast<OutputImagePixelType>(255.0);
m_Direction = 0;
}
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
inline void
-RemoveCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
-::SetInputPath( const TInputPath * path)
+RemoveCarvingPathFilter<TInputImage, TInputPath, TOutputImage>
+::SetInputPath(const TInputPath * path)
{
this->SetPathInput(path);
}
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
const TInputPath *
-RemoveCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
+RemoveCarvingPathFilter<TInputImage, TInputPath, TOutputImage>
::GetInputPath(void)
{
return this->GetPathInput();
@@ -54,20 +54,19 @@ RemoveCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
/**
* Main computation method.
*/
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
void
-RemoveCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
+RemoveCarvingPathFilter<TInputImage, TInputPath, TOutputImage>
::GenerateData(void)
{
const InputImageType * inputImage = this->GetImageInput();
- const InputPathType * inputPath = this->GetPathInput();
- OutputImageType * outputImage = this->GetOutput();
+ const InputPathType * inputPath = this->GetPathInput();
+ OutputImageType * outputImage = this->GetOutput();
- outputImage->SetBufferedRegion( outputImage->GetRequestedRegion() );
+ outputImage->SetBufferedRegion(outputImage->GetRequestedRegion());
outputImage->Allocate();
-
InputIteratorType inputIterator(inputImage,
inputImage->GetLargestPossibleRegion());
OutputIteratorType outputIterator(outputImage,
@@ -77,94 +76,92 @@ RemoveCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
unsigned int dir1;
if (m_Direction == 0)
- {
- dir0=0;
- dir1=1;
- }
+ {
+ dir0 = 0;
+ dir1 = 1;
+ }
else
- {
- dir0=1;
- dir1=0;
- }
+ {
+ dir0 = 1;
+ dir1 = 0;
+ }
- inputIterator.SetFirstDirection( dir0 );
- inputIterator.SetSecondDirection( dir1 );
+ inputIterator.SetFirstDirection(dir0);
+ inputIterator.SetSecondDirection(dir1);
inputIterator.GoToBegin();
- outputIterator.SetFirstDirection( dir0 );
- outputIterator.SetSecondDirection( dir1 );
+ outputIterator.SetFirstDirection(dir0);
+ outputIterator.SetSecondDirection(dir1);
outputIterator.GoToBegin();
- int line=-1;
- typename InputImageType::IndexType index;
- typename InputPathType::VertexListType::ConstPointer vertexList = inputPath->GetVertexList();
+ int line = -1;
+ typename InputImageType::IndexType index;
+ typename InputPathType::VertexListType::ConstPointer vertexList = inputPath->GetVertexList();
typename InputPathType::VertexListType::ConstIterator pathIterator;
- typename InputImageType::IndexType indexToRemove;
+ typename InputImageType::IndexType indexToRemove;
//go to the end of the path
pathIterator = vertexList->Begin();
while (pathIterator != vertexList->End())
- {
+ {
++pathIterator;
- }
+ }
--pathIterator;
while (!inputIterator.IsAtEnd())
- {
- while (!inputIterator.IsAtEndOfSlice())
{
- while (!inputIterator.IsAtEndOfLine())
+ while (!inputIterator.IsAtEndOfSlice())
{
+ while (!inputIterator.IsAtEndOfLine())
+ {
index = inputIterator.GetIndex();
if (index[dir1] != line)
- {
+ {
line = index[dir1];
typename InputImageType::PointType tmpIndex;
- inputImage->TransformContinuousIndexToPhysicalPoint(pathIterator.Value(),tmpIndex);
- inputImage->TransformPhysicalPointToIndex(tmpIndex,indexToRemove);
+ inputImage->TransformContinuousIndexToPhysicalPoint(pathIterator.Value(), tmpIndex);
+ inputImage->TransformPhysicalPointToIndex(tmpIndex, indexToRemove);
- if (pathIterator!=vertexList->Begin())
- {
+ if (pathIterator != vertexList->Begin())
+ {
--pathIterator;
- }
+ }
if (index[dir1] != indexToRemove[dir1])
- {
+ {
itkExceptionMacro(<< "Error!!!");
+ }
}
- }
if (index[dir0] != indexToRemove[dir0])
- {
+ {
outputIterator.Set(inputIterator.Get());
++outputIterator;
- }
+ }
++inputIterator;
- }
+ }
inputIterator.NextLine();
outputIterator.NextLine();
- }
+ }
inputIterator.NextSlice();
outputIterator.NextSlice();
- }
-
+ }
}
-
/**
* Printself Method
*/
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
void
-RemoveCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
+RemoveCarvingPathFilter<TInputImage, TInputPath, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
os << indent << "Path Value: " << m_Value << std::endl;
}
-template <class TInputImage, class TInputPath,class TOutputImage>
+template <class TInputImage, class TInputPath, class TOutputImage>
void
-RemoveCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
+RemoveCarvingPathFilter<TInputImage, TInputPath, TOutputImage>
::GenerateOutputInformation()
{
// call the superclass' implementation of this method
@@ -172,52 +169,51 @@ RemoveCarvingPathFilter<TInputImage,TInputPath,TOutputImage>
// get pointers to the input and output
typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
unsigned int dir0;
unsigned int dir1;
if (m_Direction == 0)
- {
- dir0=0;
- dir1=1;
- }
+ {
+ dir0 = 0;
+ dir1 = 1;
+ }
else
- {
- dir0=1;
- dir1=0;
- }
+ {
+ dir0 = 1;
+ dir1 = 0;
+ }
// we need to compute the output spacing, the output image size, and the
// output image start index
const typename TInputImage::SpacingType&
- inputSpacing = inputPtr->GetSpacing();
- const typename TInputImage::SizeType& inputSize
- = inputPtr->GetLargestPossibleRegion().GetSize();
- const typename TInputImage::IndexType& inputStartIndex
- = inputPtr->GetLargestPossibleRegion().GetIndex();
+ inputSpacing = inputPtr->GetSpacing();
+ const typename TInputImage::SizeType& inputSize
+ = inputPtr->GetLargestPossibleRegion().GetSize();
+ const typename TInputImage::IndexType& inputStartIndex
+ = inputPtr->GetLargestPossibleRegion().GetIndex();
- typename TOutputImage::SpacingType outputSpacing;
- typename TOutputImage::SizeType outputSize;
- typename TOutputImage::IndexType outputStartIndex;
+ typename TOutputImage::SpacingType outputSpacing;
+ typename TOutputImage::SizeType outputSize;
+ typename TOutputImage::IndexType outputStartIndex;
for (unsigned int i = 0; i < TOutputImage::ImageDimension; ++i)
- {
+ {
outputSpacing[i] = inputSpacing[i];
outputSize[i] = (unsigned int) (inputSize[i]);
outputStartIndex[i] = inputStartIndex[i];
- }
+ }
// we remove one column of the image
outputSize[dir0] = inputSize[dir0] - 1;
-
- outputPtr->SetSpacing( outputSpacing );
+ outputPtr->SetSpacing(outputSpacing);
typename TOutputImage::RegionType outputLargestPossibleRegion;
- outputLargestPossibleRegion.SetSize( outputSize );
- outputLargestPossibleRegion.SetIndex( outputStartIndex );
+ outputLargestPossibleRegion.SetSize(outputSize);
+ outputLargestPossibleRegion.SetIndex(outputStartIndex);
- outputPtr->SetLargestPossibleRegion( outputLargestPossibleRegion );
+ outputPtr->SetLargestPossibleRegion(outputLargestPossibleRegion);
}
} // end namespace otb
diff --git a/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h b/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h
index 659974e1fe..49a9f70b6e 100644
--- a/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h
+++ b/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h
@@ -35,28 +35,28 @@ template <class TInput1, class TInput2, class TOutput>
class RemoveIsolatedByDirectionFunctor
{
public:
- RemoveIsolatedByDirectionFunctor() {};
- virtual ~RemoveIsolatedByDirectionFunctor() {};
- inline TOutput operator()(const TInput1 & itA, const TInput2 &itB)
+ RemoveIsolatedByDirectionFunctor() {}
+ virtual ~RemoveIsolatedByDirectionFunctor() {}
+ inline TOutput operator ()(const TInput1& itA, const TInput2& itB)
{
double currentDirection = itB.GetCenterPixel();
- int nEqualNeighbors = 0;
- for (int neighborhoodIndex=0; neighborhoodIndex < 9; ++neighborhoodIndex)
- {
- if (itB.GetPixel(neighborhoodIndex) == currentDirection)
+ int nEqualNeighbors = 0;
+ for (int neighborhoodIndex = 0; neighborhoodIndex < 9; ++neighborhoodIndex)
{
+ if (itB.GetPixel(neighborhoodIndex) == currentDirection)
+ {
++nEqualNeighbors;
+ }
}
- }
if (nEqualNeighbors <= 1)
- {
+ {
//should never be 0 as it is at least equal to itself
return 0;
- }
+ }
else
- {
+ {
return static_cast<TOutput>(itA.GetCenterPixel());
- }
+ }
}
};
}
@@ -74,7 +74,7 @@ public:
*/
template <class TInputModulus, class TInputDirection, class TOutputImage>
class ITK_EXPORT RemoveIsolatedByDirectionFilter
- : public ModulusAndDirectionImageToImageFilter<TInputModulus, TInputDirection, TOutputImage>
+ : public ModulusAndDirectionImageToImageFilter<TInputModulus, TInputDirection, TOutputImage>
{
public:
/** Standard typedefs */
@@ -87,26 +87,27 @@ public:
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(RemoveIsolatedByDirectionFilter,ModulusAndDirectionImageToImageFilter);
+ itkTypeMacro(RemoveIsolatedByDirectionFilter, ModulusAndDirectionImageToImageFilter);
/** typedef of the computing filter (this allows us to derive from ModulusAndDirectionToImageFilter as well as
using the BinaryFunctorNeighBorhoodImageFilter, which is appropriate here */
typedef Functor::RemoveIsolatedByDirectionFunctor<
- typename itk::ConstNeighborhoodIterator<TInputModulus>,
- typename itk::ConstNeighborhoodIterator<TInputDirection>,
- typename TOutputImage::PixelType> FunctorType;
- typedef otb::BinaryFunctorNeighborhoodImageFilter<TInputModulus, TInputDirection,TOutputImage,FunctorType> ComputingFilterType;
+ typename itk::ConstNeighborhoodIterator<TInputModulus>,
+ typename itk::ConstNeighborhoodIterator<TInputDirection>,
+ typename TOutputImage::PixelType> FunctorType;
+ typedef otb::BinaryFunctorNeighborhoodImageFilter<TInputModulus, TInputDirection, TOutputImage,
+ FunctorType> ComputingFilterType;
protected:
/** Constructor */
RemoveIsolatedByDirectionFilter() {};
/** Destructor */
- virtual ~RemoveIsolatedByDirectionFilter() {};
+ virtual ~RemoveIsolatedByDirectionFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- };
+ Superclass::PrintSelf(os, indent);
+ }
/** Main computation method */
virtual void GenerateData(void)
{
@@ -119,8 +120,8 @@ protected:
}
private:
- RemoveIsolatedByDirectionFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ RemoveIsolatedByDirectionFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h b/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h
index 3eb6680e84..6b0106ae33 100644
--- a/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h
+++ b/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h
@@ -51,13 +51,12 @@ namespace otb
// template <class TPath>
template <class TPath>
class ITK_EXPORT RemoveTortuousPathListFilter :
- public UnaryFunctorObjectListBooleanFilter<
- ObjectList<TPath>,
- ObjectList<TPath>,
- PathMeanDistanceFunctor<typename TPath::Pointer> >
- {};
-
-}// End namespace otb
+ public UnaryFunctorObjectListBooleanFilter<
+ ObjectList<TPath>,
+ ObjectList<TPath>,
+ PathMeanDistanceFunctor<typename TPath::Pointer> >
+{};
+} // End namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h b/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h
index af178aca06..15628be399 100644
--- a/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h
+++ b/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h
@@ -39,18 +39,18 @@ template <class TInput1, class TInput2, class TOutput>
class RemoveWrongDirectionFunctor
{
public:
- RemoveWrongDirectionFunctor() {};
- virtual ~RemoveWrongDirectionFunctor() {};
- inline TOutput operator()(const TInput1 &A, const TInput2 &B)
+ RemoveWrongDirectionFunctor() {}
+ virtual ~RemoveWrongDirectionFunctor() {}
+ inline TOutput operator ()(const TInput1& A, const TInput2& B)
{
if (B < CONST_PI_8)
- {
+ {
return 0;
- }
+ }
else
- {
+ {
return A;
- }
+ }
}
};
}
@@ -70,11 +70,11 @@ public:
*/
template <class TInputModulus, class TInputDirection, class TOutputImage>
class ITK_EXPORT RemoveWrongDirectionFilter
- : public ModulusAndDirectionImageToImageFilter<TInputModulus, TInputDirection, TOutputImage>
+ : public ModulusAndDirectionImageToImageFilter<TInputModulus, TInputDirection, TOutputImage>
{
public:
/** Standard typedefs */
- typedef RemoveWrongDirectionFilter Self;
+ typedef RemoveWrongDirectionFilter Self;
typedef ModulusAndDirectionImageToImageFilter<TInputModulus, TInputDirection, TOutputImage> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -83,26 +83,26 @@ public:
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(RemoveWrongDirectionFilter,ModulusAndDirectionImageToImageFilter);
+ itkTypeMacro(RemoveWrongDirectionFilter, ModulusAndDirectionImageToImageFilter);
/** typedef of the computing filter (this allows us to derive from ModulusAndDirectionToImageFilter as well as
using the BinaryFunctorImageFilter, which is appropriate here */
typedef Functor::RemoveWrongDirectionFunctor<
- typename TInputModulus::PixelType,
- typename TInputDirection::PixelType,
- typename TOutputImage::PixelType> FunctorType;
- typedef itk::BinaryFunctorImageFilter<TInputModulus, TInputDirection,TOutputImage,FunctorType> ComputingFilterType;
+ typename TInputModulus::PixelType,
+ typename TInputDirection::PixelType,
+ typename TOutputImage::PixelType> FunctorType;
+ typedef itk::BinaryFunctorImageFilter<TInputModulus, TInputDirection, TOutputImage, FunctorType> ComputingFilterType;
protected:
/** Constructor */
RemoveWrongDirectionFilter() {};
/** Destructor */
- virtual ~RemoveWrongDirectionFilter() {};
+ virtual ~RemoveWrongDirectionFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- };
+ Superclass::PrintSelf(os, indent);
+ }
/** Main computation method */
virtual void GenerateData(void)
{
@@ -115,8 +115,8 @@ protected:
}
private:
- RemoveWrongDirectionFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ RemoveWrongDirectionFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbRoadExtractionFilter.h b/Code/FeatureExtraction/otbRoadExtractionFilter.h
index 91a83f311b..7857896904 100644
--- a/Code/FeatureExtraction/otbRoadExtractionFilter.h
+++ b/Code/FeatureExtraction/otbRoadExtractionFilter.h
@@ -60,89 +60,88 @@ namespace otb
*/
template <class TInputImage, class TOutputPath>
class ITK_EXPORT RoadExtractionFilter
- : public ImageToPathListFilter<TInputImage,TOutputPath>
+ : public ImageToPathListFilter<TInputImage, TOutputPath>
{
-public :
+public:
/** Standard typedefs */
- typedef RoadExtractionFilter Self;
- typedef ImageToPathListFilter<TInputImage,TOutputPath> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef RoadExtractionFilter Self;
+ typedef ImageToPathListFilter<TInputImage, TOutputPath> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(RoadExtractionFilter,ImageToPathListFilter);
+ itkTypeMacro(RoadExtractionFilter, ImageToPathListFilter);
/** Template parameters typedefs */
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::OutputPathType OutputPathType;
- typedef typename Superclass::OutputPathListType OutputPathListType;
- typedef typename InputImageType::PixelType InputPixelType;
- typedef double InternalPixelType;
-
- typedef otb::VectorImage<InternalPixelType,InputImageType::ImageDimension> VectorImageType;
- typedef otb::Image<InternalPixelType,InputImageType::ImageDimension> SpectralAngleType;
- typedef otb::Image<InternalPixelType,InputImageType::ImageDimension> ModulusType;
- typedef otb::Image<InternalPixelType,InputImageType::ImageDimension> DirectionType;
-
- typedef itk::CovariantVector<InternalPixelType,InputImageType::ImageDimension>
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::OutputPathType OutputPathType;
+ typedef typename Superclass::OutputPathListType OutputPathListType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef double InternalPixelType;
+
+ typedef otb::VectorImage<InternalPixelType, InputImageType::ImageDimension> VectorImageType;
+ typedef otb::Image<InternalPixelType, InputImageType::ImageDimension> SpectralAngleType;
+ typedef otb::Image<InternalPixelType, InputImageType::ImageDimension> ModulusType;
+ typedef otb::Image<InternalPixelType, InputImageType::ImageDimension> DirectionType;
+
+ typedef itk::CovariantVector<InternalPixelType, InputImageType::ImageDimension>
VectorPixelType;
- typedef otb::Image<VectorPixelType,InputImageType::ImageDimension> CovariantVectorImageType;
+ typedef otb::Image<VectorPixelType, InputImageType::ImageDimension> CovariantVectorImageType;
/* Template parameters typedefs for composites filters */
typedef SpectralAngleDistanceImageFilter<
- InputImageType,
- SpectralAngleType> SpectralAngleDistanceImageFilterType;
+ InputImageType,
+ SpectralAngleType> SpectralAngleDistanceImageFilterType;
typedef GenericRoadExtractionFilter<SpectralAngleType, OutputPathType>
GenericRoadExtractionFilterType;
-
/** Template parameters typedefs for internals filters */
- typedef typename GenericRoadExtractionFilterType::SigmaType SigmaType;
- typedef typename GenericRoadExtractionFilterType::AmplitudeThresholdType AmplitudeThresholdType;
- typedef typename GenericRoadExtractionFilterType::ToleranceType ToleranceType;
- typedef typename GenericRoadExtractionFilterType::MaxAngleType MaxAngleType;
+ typedef typename GenericRoadExtractionFilterType::SigmaType SigmaType;
+ typedef typename GenericRoadExtractionFilterType::AmplitudeThresholdType AmplitudeThresholdType;
+ typedef typename GenericRoadExtractionFilterType::ToleranceType ToleranceType;
+ typedef typename GenericRoadExtractionFilterType::MaxAngleType MaxAngleType;
typedef typename GenericRoadExtractionFilterType::MeanDistanceThresholdType MeanDistanceThresholdType;
- typedef typename GenericRoadExtractionFilterType::LinkRealType LinkRealType;
+ typedef typename GenericRoadExtractionFilterType::LinkRealType LinkRealType;
/** Get/Set the reference pixel (use by the SpectralAngleDistanceImageFilter)*/
- otbGetObjectMemberConstReferenceMacro(SpectralAngleDistanceImageFilter,ReferencePixel,InputPixelType);
- otbSetObjectMemberMacro(SpectralAngleDistanceImageFilter,ReferencePixel,InputPixelType);
+ otbGetObjectMemberConstReferenceMacro(SpectralAngleDistanceImageFilter, ReferencePixel, InputPixelType);
+ otbSetObjectMemberMacro(SpectralAngleDistanceImageFilter, ReferencePixel, InputPixelType);
/** Get/Set the alpha value */
- otbGetObjectMemberConstReferenceMacro(GenericRoadExtractionFilter,Alpha,double);
- otbSetObjectMemberMacro(GenericRoadExtractionFilter,Alpha,double);
+ otbGetObjectMemberConstReferenceMacro(GenericRoadExtractionFilter, Alpha, double);
+ otbSetObjectMemberMacro(GenericRoadExtractionFilter, Alpha, double);
/** Get/Set the amplitude threshold to start following a path (use by the VectorizationPathListFilter)*/
- otbSetObjectMemberMacro(GenericRoadExtractionFilter,AmplitudeThreshold,AmplitudeThresholdType);
- otbGetObjectMemberMacro(GenericRoadExtractionFilter,AmplitudeThreshold,AmplitudeThresholdType);
+ otbSetObjectMemberMacro(GenericRoadExtractionFilter, AmplitudeThreshold, AmplitudeThresholdType);
+ otbGetObjectMemberMacro(GenericRoadExtractionFilter, AmplitudeThreshold, AmplitudeThresholdType);
/** Get/Set the tolerance for segment consistency (tolerance in terms of distance) (use by the SimplifyPathListFilter)*/
- otbGetObjectMemberMacro(GenericRoadExtractionFilter,Tolerance,ToleranceType);
- otbSetObjectMemberMacro(GenericRoadExtractionFilter,Tolerance,ToleranceType);
+ otbGetObjectMemberMacro(GenericRoadExtractionFilter, Tolerance, ToleranceType);
+ otbSetObjectMemberMacro(GenericRoadExtractionFilter, Tolerance, ToleranceType);
/** Set/Get the max angle (use bye the BreakAngularPathListFilter)*/
- otbSetObjectMemberMacro(GenericRoadExtractionFilter,MaxAngle,MaxAngleType);
- otbGetObjectMemberConstMacro(GenericRoadExtractionFilter,MaxAngle,MaxAngleType);
+ otbSetObjectMemberMacro(GenericRoadExtractionFilter, MaxAngle, MaxAngleType);
+ otbGetObjectMemberConstMacro(GenericRoadExtractionFilter, MaxAngle, MaxAngleType);
/** Get/Set the tolerance for segment consistency (tolerance in terms of distance) (use by RemoveTortuousPathListFilter)*/
- otbGetObjectMemberMacro(GenericRoadExtractionFilter,FirstMeanDistanceThreshold,MeanDistanceThresholdType);
- otbSetObjectMemberMacro(GenericRoadExtractionFilter,FirstMeanDistanceThreshold,MeanDistanceThresholdType);
- otbGetObjectMemberMacro(GenericRoadExtractionFilter,SecondMeanDistanceThreshold,MeanDistanceThresholdType);
- otbSetObjectMemberMacro(GenericRoadExtractionFilter,SecondMeanDistanceThreshold,MeanDistanceThresholdType);
+ otbGetObjectMemberMacro(GenericRoadExtractionFilter, FirstMeanDistanceThreshold, MeanDistanceThresholdType);
+ otbSetObjectMemberMacro(GenericRoadExtractionFilter, FirstMeanDistanceThreshold, MeanDistanceThresholdType);
+ otbGetObjectMemberMacro(GenericRoadExtractionFilter, SecondMeanDistanceThreshold, MeanDistanceThresholdType);
+ otbSetObjectMemberMacro(GenericRoadExtractionFilter, SecondMeanDistanceThreshold, MeanDistanceThresholdType);
/** Get/Set the angular threshold (use by LinkPathFilter)*/
- otbSetObjectMemberMacro(GenericRoadExtractionFilter,AngularThreshold,LinkRealType);
- otbGetObjectMemberMacro(GenericRoadExtractionFilter,AngularThreshold,LinkRealType);
+ otbSetObjectMemberMacro(GenericRoadExtractionFilter, AngularThreshold, LinkRealType);
+ otbGetObjectMemberMacro(GenericRoadExtractionFilter, AngularThreshold, LinkRealType);
/** Get/Set the distance threshold (use by LinkPathFilter)*/
- otbSetObjectMemberMacro(GenericRoadExtractionFilter,DistanceThreshold,LinkRealType);
- otbGetObjectMemberMacro(GenericRoadExtractionFilter,DistanceThreshold,LinkRealType);
+ otbSetObjectMemberMacro(GenericRoadExtractionFilter, DistanceThreshold, LinkRealType);
+ otbGetObjectMemberMacro(GenericRoadExtractionFilter, DistanceThreshold, LinkRealType);
protected:
/** Constructor */
RoadExtractionFilter();
/** Destructor */
- ~RoadExtractionFilter() {};
+ ~RoadExtractionFilter() {}
/** Prepare main computation method */
void BeforeGenerateData(void);
@@ -152,19 +151,18 @@ protected:
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-private :
+private:
- RoadExtractionFilter(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ RoadExtractionFilter(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** SpectralAngleDistanceImageFilter use by the composite filter */
- typename SpectralAngleDistanceImageFilterType::Pointer m_SpectralAngleDistanceImageFilter;
+ typename SpectralAngleDistanceImageFilterType::Pointer m_SpectralAngleDistanceImageFilter;
typename GenericRoadExtractionFilterType::Pointer m_GenericRoadExtractionFilter;
-
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbRoadExtractionFilter.txx"
diff --git a/Code/FeatureExtraction/otbRoadExtractionFilter.txx b/Code/FeatureExtraction/otbRoadExtractionFilter.txx
index ab31b8243c..3b5ddde2e8 100644
--- a/Code/FeatureExtraction/otbRoadExtractionFilter.txx
+++ b/Code/FeatureExtraction/otbRoadExtractionFilter.txx
@@ -26,7 +26,7 @@ namespace otb
/**
* Constructor
*/
-template <class TInputImage,class TOutputPath>
+template <class TInputImage, class TOutputPath>
RoadExtractionFilter<TInputImage, TOutputPath>
::RoadExtractionFilter()
{
@@ -38,18 +38,17 @@ RoadExtractionFilter<TInputImage, TOutputPath>
}
-
/**
* Main computation method
*/
-template <class TInputImage,class TOutputPath>
+template <class TInputImage, class TOutputPath>
void
RoadExtractionFilter<TInputImage, TOutputPath>
::GenerateData()
{
// Input images pointers
typename InputImageType::ConstPointer inputImage = this->GetInput();
- typename OutputPathListType::Pointer outputPathList = this->GetOutput();
+ typename OutputPathListType::Pointer outputPathList = this->GetOutput();
m_SpectralAngleDistanceImageFilter->SetInput(inputImage);
@@ -57,23 +56,23 @@ RoadExtractionFilter<TInputImage, TOutputPath>
m_GenericRoadExtractionFilter->Update();
for (typename GenericRoadExtractionFilterType::OutputPathListType::ConstIterator it
- = m_GenericRoadExtractionFilter->GetOutput()->Begin();
- it!=m_GenericRoadExtractionFilter->GetOutput()->End();
+ = m_GenericRoadExtractionFilter->GetOutput()->Begin();
+ it != m_GenericRoadExtractionFilter->GetOutput()->End();
++it)
- {
+ {
outputPathList->PushBack(it.Get());
- }
+ }
}
/**
* PrintSelf method
*/
-template <class TInputImage,class TOutputPath>
+template <class TInputImage, class TOutputPath>
void
RoadExtractionFilter<TInputImage, TOutputPath>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os << indent << "m_ReferencePixel: "<< m_SpectralAngleDistanceImageFilter->GetReferencePixel() << std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "m_ReferencePixel: " << m_SpectralAngleDistanceImageFilter->GetReferencePixel() << std::endl;
}
} // End namespace otb
diff --git a/Code/FeatureExtraction/otbSFSTexturesFunctor.h b/Code/FeatureExtraction/otbSFSTexturesFunctor.h
index f7d2579a23..2966a04fa0 100644
--- a/Code/FeatureExtraction/otbSFSTexturesFunctor.h
+++ b/Code/FeatureExtraction/otbSFSTexturesFunctor.h
@@ -49,10 +49,9 @@ namespace otb
* \ingroup Textures
*/
-
namespace Functor
{
-template<class TIter,class TOutputValue>
+template<class TIter, class TOutputValue>
class SFSTexturesFunctor
{
public:
@@ -65,7 +64,7 @@ public:
this->SetNumberOfDirections(20); // set the step too
m_SelectedTextures = std::vector<bool>(6, 1);
}
- virtual ~SFSTexturesFunctor() {};
+ virtual ~SFSTexturesFunctor() {}
typedef typename TIter::InternalPixelType InternalPixelType;
typedef typename TIter::SizeType SizeType;
@@ -74,41 +73,41 @@ public:
typedef TOutputValue OutputValueType;
typedef std::vector<OutputValueType> OutputType;
- void SetSpatialThreshold( unsigned int thresh ){ m_SpatialThreshold=thresh; };
- void SetSpectralThreshold( InternalPixelType thresh ){ m_SpectralThreshold=thresh; };
- void SetRatioMaxConsiderationNumber( unsigned int value ){ m_RatioMaxConsiderationNumber=value; };
- void SetAlpha( double alpha ){ m_Alpha=alpha; };
- void SetNumberOfDirections( unsigned int D )
- {
- m_NumberOfDirections = D;
- m_DirectionStep = CONST_2PI/static_cast<double>(D);
- };
- void SetDirectionStep( double step ){ m_DirectionStep = step; };
- void SetSelectedTextures( std::vector<bool> vect )
- {
- m_SelectedTextures.clear();
- m_SelectedTextures = vect;
- };
- void SetTextureStatus( unsigned int id, bool isSelected ){ m_SelectedTextures[id] = isSelected; };
-
- unsigned int GetSpatialThreshold(){ return m_SpatialThreshold; };
- InternalPixelType GetSpectralThreshold(){ return m_SpectralThreshold; };
- unsigned int GetRatioMaxConsiderationNumber(){ return m_RatioMaxConsiderationNumber; };
- double GetAlpha(){ return m_Alpha; };
- unsigned int GetNumberOfDirections(){ return m_NumberOfDirections(); };
- std::vector<bool> GetTexturesStatus(){ return m_SelectedTextures; };
-
- inline OutputType operator()(const TIter& it)
+ void SetSpatialThreshold(unsigned int thresh){ m_SpatialThreshold = thresh; }
+ void SetSpectralThreshold(InternalPixelType thresh){ m_SpectralThreshold = thresh; }
+ void SetRatioMaxConsiderationNumber(unsigned int value){ m_RatioMaxConsiderationNumber = value; }
+ void SetAlpha(double alpha){ m_Alpha = alpha; }
+ void SetNumberOfDirections(unsigned int D)
+ {
+ m_NumberOfDirections = D;
+ m_DirectionStep = CONST_2PI / static_cast<double>(D);
+ }
+ void SetDirectionStep(double step){ m_DirectionStep = step; }
+ void SetSelectedTextures(std::vector<bool> vect)
+ {
+ m_SelectedTextures.clear();
+ m_SelectedTextures = vect;
+ }
+ void SetTextureStatus(unsigned int id, bool isSelected){ m_SelectedTextures[id] = isSelected; }
+
+ unsigned int GetSpatialThreshold(){ return m_SpatialThreshold; }
+ InternalPixelType GetSpectralThreshold(){ return m_SpectralThreshold; }
+ unsigned int GetRatioMaxConsiderationNumber(){ return m_RatioMaxConsiderationNumber; }
+ double GetAlpha(){ return m_Alpha; }
+ unsigned int GetNumberOfDirections(){ return m_NumberOfDirections(); }
+ std::vector<bool> GetTexturesStatus(){ return m_SelectedTextures; }
+
+ inline OutputType operator ()(const TIter& it)
{
- double length = itk::NumericTraits<double>::NonpositiveMin();
- double width = itk::NumericTraits<double>::max();
- double SpatialThresholdDouble = static_cast<double>(m_SpatialThreshold);
- double NumberOfDirectionsDouble = static_cast<double>(m_NumberOfDirections);
- double dist = 0.;
- double angle = 0.;
- double sdiVal = 0.;
- double sumWMean = 0.;
- double sum = 0.;
+ double length = itk::NumericTraits<double>::NonpositiveMin();
+ double width = itk::NumericTraits<double>::max();
+ double SpatialThresholdDouble = static_cast<double>(m_SpatialThreshold);
+ double NumberOfDirectionsDouble = static_cast<double>(m_NumberOfDirections);
+ double dist = 0.;
+ double angle = 0.;
+ double sdiVal = 0.;
+ double sumWMean = 0.;
+ double sum = 0.;
std::vector<double> di(m_NumberOfDirections, 0.);
std::vector<double> minSorted(m_RatioMaxConsiderationNumber, width);
std::vector<double> maxSorted(m_RatioMaxConsiderationNumber, length);
@@ -116,262 +115,232 @@ public:
std::vector<unsigned int> lengthLine(m_NumberOfDirections, 0);
std::vector<double>::iterator itVector;
- OutputType out(6, 0);
+ OutputType out(6, 0);
OffsetType off;
off.Fill(0);
- for( unsigned int d = 0; d<m_NumberOfDirections; d++ )
+ for (unsigned int d = 0; d < m_NumberOfDirections; d++)
{
- // Current angle direction
- angle = m_Alpha*static_cast<double>(d);
-
- // last offset in the diraction respecting spatial threshold
- off[0] = static_cast<int>(vcl_floor(SpatialThresholdDouble*vcl_cos( angle ) + 0.5));
- off[1] = static_cast<int>(vcl_floor(SpatialThresholdDouble*vcl_sin( angle ) + 0.5));
- // last indices in the diration respecting spectral threshold
- OffsetType offEnd = this->FindLastOffset( it, off );
- // computes distance = dist between the 2 segment point. One of them is the center pixel -> (0,0)
- dist = vcl_sqrt( vcl_pow(static_cast<double>(offEnd[0]), 2 ) + vcl_pow(static_cast<double>(offEnd[1]), 2 ) );
-
- // for length computation
- if( m_SelectedTextures[0] == true )
- if( dist>length )
- length = dist;
-
- // for width computation
- if( m_SelectedTextures[1] == true )
- if( dist<width)
- width = dist;
-
- // for PSI computation
- if( m_SelectedTextures[2] == true || m_SelectedTextures[5] == true )
- sum += dist;
-
- // for w-mean computation
- if( m_SelectedTextures[3] == true )
- sdiVal = this->ComputeSDi(it, offEnd);
-
- // for Ratio computation
- if( m_SelectedTextures[4] == true )
+ // Current angle direction
+ angle = m_Alpha * static_cast<double>(d);
+
+ // last offset in the diraction respecting spatial threshold
+ off[0] = static_cast<int>(vcl_floor(SpatialThresholdDouble * vcl_cos(angle) + 0.5));
+ off[1] = static_cast<int>(vcl_floor(SpatialThresholdDouble * vcl_sin(angle) + 0.5));
+ // last indices in the diration respecting spectral threshold
+ OffsetType offEnd = this->FindLastOffset(it, off);
+ // computes distance = dist between the 2 segment point. One of them is the center pixel -> (0,0)
+ dist = vcl_sqrt(vcl_pow(static_cast<double>(offEnd[0]), 2) + vcl_pow(static_cast<double>(offEnd[1]), 2));
+
+ // for length computation
+ if (m_SelectedTextures[0] == true)
+ if (dist > length) length = dist;
+
+ // for width computation
+ if (m_SelectedTextures[1] == true)
+ if (dist < width) width = dist;
+
+ // for PSI computation
+ if (m_SelectedTextures[2] == true || m_SelectedTextures[5] == true) sum += dist;
+
+ // for w-mean computation
+ if (m_SelectedTextures[3] == true) sdiVal = this->ComputeSDi(it, offEnd);
+
+ // for Ratio computation
+ if (m_SelectedTextures[4] == true)
+ {
+ bool doo = false;
+ itVector = maxSorted.begin();
+ while (itVector != maxSorted.end() && doo == false)
{
- bool doo = false;
- itVector = maxSorted.begin();
- while( itVector != maxSorted.end() && doo==false )
- {
- if( dist>(*itVector) )
- {
- maxSorted.insert(itVector, dist);
- maxSorted.pop_back();
- doo=true;
- }
- // Some visual plateform segfault at the ++ when the previous condition is checked
- // even if a -- is done.
- // Seems to be due to std::vector::insert that change the pointer.
- if( !doo )
- ++itVector;
- }
- doo = false;
- itVector = minSorted.begin();
- while( itVector != minSorted.end() && doo==false )
- {
- if( dist<(*itVector) )
- {
- minSorted.insert(itVector, dist);
- minSorted.pop_back();
- doo=true;
- }
- // Some visual plateform segfault at the ++ when the previous condition is checked
- // even if a -- is done.
- // Seems to be due to std::vector::insert that change the pointer.
- if( !doo )
- ++itVector;
- }
+ if (dist > (*itVector))
+ {
+ maxSorted.insert(itVector, dist);
+ maxSorted.pop_back();
+ doo = true;
+ }
+ // Some visual plateform segfault at the ++ when the previous condition is checked
+ // even if a -- is done.
+ // Seems to be due to std::vector::insert that change the pointer.
+ if (!doo) ++itVector;
}
-
- di[d] = dist;
- if( m_SelectedTextures[3] == true )
+ doo = false;
+ itVector = minSorted.begin();
+ while (itVector != minSorted.end() && doo == false)
{
- lengthLine[d] = static_cast<unsigned int>(dist);//static_cast<unsigned int>( vcl_sqrt(vcl_pow(static_cast<double>(offEnd[0]), 2) + vcl_pow(static_cast<double>(offEnd[1]), 2)) );
- sti[d] = sdiVal;
- if(sdiVal!=0.)
- sumWMean += (m_Alpha*(dist-1)*dist/*lengthLine[n]*di[n]*/)/sdiVal;
+ if (dist < (*itVector))
+ {
+ minSorted.insert(itVector, dist);
+ minSorted.pop_back();
+ doo = true;
+ }
+ // Some visual plateform segfault at the ++ when the previous condition is checked
+ // even if a -- is done.
+ // Seems to be due to std::vector::insert that change the pointer.
+ if (!doo) ++itVector;
}
+ }
+
+ di[d] = dist;
+ if (m_SelectedTextures[3] == true)
+ {
+ lengthLine[d] = static_cast<unsigned int>(dist); //static_cast<unsigned int>( vcl_sqrt(vcl_pow(static_cast<double>(offEnd[0]), 2) + vcl_pow(static_cast<double>(offEnd[1]), 2)) );
+ sti[d] = sdiVal;
+ if (sdiVal != 0.) sumWMean += (m_Alpha * (dist - 1) * dist /*lengthLine[n]*di[n]*/) / sdiVal;
+ }
}
/////// FILL OUTPUT
// length
- if( m_SelectedTextures[0] == true )
- out[0] = static_cast<OutputValueType>(length);
+ if (m_SelectedTextures[0] == true) out[0] = static_cast<OutputValueType>(length);
// width
- if( m_SelectedTextures[1] == true )
- out[1] = static_cast<OutputValueType>(width);
+ if (m_SelectedTextures[1] == true) out[1] = static_cast<OutputValueType>(width);
// PSI
- if( m_SelectedTextures[2] == true )
- out[2] = static_cast<OutputValueType>(sum/NumberOfDirectionsDouble);
+ if (m_SelectedTextures[2] == true) out[2] = static_cast<OutputValueType>(sum / NumberOfDirectionsDouble);
// w-mean
- if( m_SelectedTextures[3] == true )
- out[3] = static_cast<OutputValueType>(sumWMean/NumberOfDirectionsDouble);
+ if (m_SelectedTextures[3] == true) out[3] = static_cast<OutputValueType>(sumWMean / NumberOfDirectionsDouble);
// ratio
- if( m_SelectedTextures[4] == true )
+ if (m_SelectedTextures[4] == true)
{
- double sumMin = 0;
- double sumMax = 0;
- for(unsigned int t=0; t<m_RatioMaxConsiderationNumber; t++)
- {
- sumMin += minSorted[t];
- sumMax += maxSorted[t];
- }
- if (sumMax != 0.)
- out[4] = static_cast<OutputValueType>(vcl_atan(sumMin/sumMax));
- else if (sumMax == 0. && sumMin == 0.)
- out[4] = static_cast<OutputValueType>(1.);
+ double sumMin = 0;
+ double sumMax = 0;
+ for (unsigned int t = 0; t < m_RatioMaxConsiderationNumber; t++)
+ {
+ sumMin += minSorted[t];
+ sumMax += maxSorted[t];
+ }
+ if (sumMax != 0.) out[4] = static_cast<OutputValueType>(vcl_atan(sumMin / sumMax));
+ else if (sumMax == 0. && sumMin == 0.) out[4] = static_cast<OutputValueType>(1.);
}
// SD
- if( m_SelectedTextures[5] == true )
+ if (m_SelectedTextures[5] == true)
{
- double sumPSI = 0;
- for(unsigned int n=0; n<di.size(); ++n)
- sumPSI += vcl_pow(di[n] - sumWMean/NumberOfDirectionsDouble , 2);
- out[5] = static_cast<OutputValueType>(vcl_sqrt(sumPSI)/(NumberOfDirectionsDouble-1.));
+ double sumPSI = 0;
+ for (unsigned int n = 0; n < di.size(); ++n)
+ sumPSI += vcl_pow(di[n] - sumWMean / NumberOfDirectionsDouble, 2);
+ out[5] = static_cast<OutputValueType>(vcl_sqrt(sumPSI) / (NumberOfDirectionsDouble - 1.));
}
return out;
}
-
/** Checks spectral threshold condition
* the last point in the directiuon is the first that doesn't
* respect the spectral condition.
*/
- OffsetType FindLastOffset( const TIter & it, const OffsetType & stopOffset )
- {
- bool res = true;
- int signX = this->ComputeStep( stopOffset[0] );
- int signY = this->ComputeStep( stopOffset[1] );
-
- OffsetType currentOff;
- currentOff.Fill(0);
- currentOff[0]=signX;
-
- double slop = 0.;
- if(stopOffset[0]!=0)
- slop = static_cast<double>(stopOffset[1] / static_cast<double>(stopOffset[0]) );
-
- bool isInside = true;
- while( isInside == true && res == true)
- {
- this->ComputePointLine( currentOff, slop, signY, stopOffset[0] );
+ OffsetType FindLastOffset(const TIter& it, const OffsetType& stopOffset)
+ {
+ bool res = true;
+ int signX = this->ComputeStep(stopOffset[0]);
+ int signY = this->ComputeStep(stopOffset[1]);
- if( vcl_abs(it.GetPixel(currentOff)-it.GetCenterPixel()) > m_SpectralThreshold )
- {
- res = false;
- }
- else
- currentOff[0]+=signX;
+ OffsetType currentOff;
+ currentOff.Fill(0);
+ currentOff[0] = signX;
+
+ double slop = 0.;
+ if (stopOffset[0] != 0) slop = static_cast<double>(stopOffset[1] / static_cast<double>(stopOffset[0]));
- isInside = this->CheckIsInside(signX, signY, currentOff, stopOffset);
+ bool isInside = true;
+ while (isInside == true && res == true)
+ {
+ this->ComputePointLine(currentOff, slop, signY, stopOffset[0]);
+
+ if (vcl_abs(it.GetPixel(currentOff) - it.GetCenterPixel()) > m_SpectralThreshold)
+ {
+ res = false;
}
+ else currentOff[0] += signX;
- return currentOff;
- }
+ isInside = this->CheckIsInside(signX, signY, currentOff, stopOffset);
+ }
+ return currentOff;
+ }
/** Computes SD in the ith direction */
- double ComputeSDi( const TIter & it, const OffsetType & stopOffset)
- {
- bool canGo = true;
- unsigned int nbElt = 0;
- double SDi = 0.;
- double mean = 0.;
- double slop = 0.;
- if(stopOffset[0] != 0)
- slop = static_cast<double>(stopOffset[1] / static_cast<double>(stopOffset[0]) );
-
- int signX = this->ComputeStep( stopOffset[0] );
- int signY = this->ComputeStep( stopOffset[1] );
-
- OffsetType currentOff;
- currentOff.Fill(0);
- currentOff[0]=signX;
-
- bool isInside = true;
- // First compute mean
- while( isInside == true && canGo == true )
- {
- this->ComputePointLine( currentOff, slop, signY, stopOffset[0] );
+ double ComputeSDi(const TIter& it, const OffsetType& stopOffset)
+ {
+ bool canGo = true;
+ unsigned int nbElt = 0;
+ double SDi = 0.;
+ double mean = 0.;
+ double slop = 0.;
+ if (stopOffset[0] != 0) slop = static_cast<double>(stopOffset[1] / static_cast<double>(stopOffset[0]));
+
+ int signX = this->ComputeStep(stopOffset[0]);
+ int signY = this->ComputeStep(stopOffset[1]);
+
+ OffsetType currentOff;
+ currentOff.Fill(0);
+ currentOff[0] = signX;
+
+ bool isInside = true;
+ // First compute mean
+ while (isInside == true && canGo == true)
+ {
+ this->ComputePointLine(currentOff, slop, signY, stopOffset[0]);
- mean += static_cast<double>(it.GetPixel(currentOff));
- nbElt++;
+ mean += static_cast<double>(it.GetPixel(currentOff));
+ nbElt++;
- if( vcl_abs(it.GetPixel(currentOff)-it.GetCenterPixel()) >= m_SpectralThreshold )
- canGo = false;
- else
- currentOff[0]+=signX;
+ if (vcl_abs(it.GetPixel(currentOff) - it.GetCenterPixel()) >= m_SpectralThreshold) canGo = false;
+ else currentOff[0] += signX;
- isInside = this->CheckIsInside(signX, signY, currentOff, stopOffset);
- }
+ isInside = this->CheckIsInside(signX, signY, currentOff, stopOffset);
+ }
- mean /= static_cast<double>(nbElt);
- currentOff[0] = signX;
- currentOff[1] = 0;
- isInside = true;
+ mean /= static_cast<double>(nbElt);
+ currentOff[0] = signX;
+ currentOff[1] = 0;
+ isInside = true;
- while( isInside == true && canGo == true )
- {
- this->ComputePointLine( currentOff, slop, signY, stopOffset[0] );
-
- SDi += vcl_pow((static_cast<double>(it.GetPixel(currentOff)) - mean), 2);
- if( vcl_abs(it.GetPixel(currentOff)-it.GetCenterPixel()) >= m_SpectralThreshold )
- canGo = false;
- else
- currentOff[0]+=signX;
+ while (isInside == true && canGo == true)
+ {
+ this->ComputePointLine(currentOff, slop, signY, stopOffset[0]);
- isInside = this->CheckIsInside(signX, signY, currentOff, stopOffset);
+ SDi += vcl_pow((static_cast<double>(it.GetPixel(currentOff)) - mean), 2);
+ if (vcl_abs(it.GetPixel(currentOff) - it.GetCenterPixel()) >= m_SpectralThreshold) canGo = false;
+ else currentOff[0] += signX;
- }
- return vcl_sqrt(SDi);
- }
+ isInside = this->CheckIsInside(signX, signY, currentOff, stopOffset);
+ }
+ return vcl_sqrt(SDi);
+ }
/** Check if the current offset is inside the stop one. */
- bool CheckIsInside(const int & signX, const int & signY, const OffsetType & currentOff, const OffsetType & stopOffset)
- {
- bool isInside = true;
- if( signX*currentOff[0]>=signX*stopOffset[0] && stopOffset[0]!=0)
- isInside = false;
- else if( signY*currentOff[1]>=signY*stopOffset[1] && stopOffset[1] != 0 )
- isInside = false;
+ bool CheckIsInside(const int& signX, const int& signY, const OffsetType& currentOff, const OffsetType& stopOffset)
+ {
+ bool isInside = true;
+ if (signX * currentOff[0] >= signX * stopOffset[0] && stopOffset[0] != 0) isInside = false;
+ else if (signY * currentOff[1] >= signY * stopOffset[1] && stopOffset[1] != 0) isInside = false;
- return isInside;
- }
+ return isInside;
+ }
/** Compute the y coordinate according to a given x coordinate.
* Use the Bresenham algo if the line is not horizontal (stopOffsetX==0).
* Otherwise, it increments of 1 Y.
*/
- void ComputePointLine( OffsetType & currentOff, const double & slop, const int & signY, const int & stopOffsetX )
- {
- if(stopOffsetX!=0)
- currentOff[1] = static_cast<int>( vcl_floor( slop*static_cast<double>(currentOff[0]) + 0.5 ));
- else
- currentOff[1]+=signY;
- }
-
+ void ComputePointLine(OffsetType& currentOff, const double& slop, const int& signY, const int& stopOffsetX)
+ {
+ if (stopOffsetX != 0) currentOff[1] = static_cast<int>(vcl_floor(slop * static_cast<double>(currentOff[0]) + 0.5));
+ else currentOff[1] += signY;
+ }
/** Compute the to give at x for line computation.
* according to the signof stopOffset.
*/
- int ComputeStep( const int & stopOffset )
- {
- int sign = 1;
- if(stopOffset<0)
- sign = -1;
-
- return sign;
- }
+ int ComputeStep(const int& stopOffset)
+ {
+ int sign = 1;
+ if (stopOffset < 0) sign = -1;
+ return sign;
+ }
protected:
/** spectral threshold conditon*/
@@ -401,5 +370,4 @@ protected:
} // end namespace functor
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbSFSTexturesImageFilter.h b/Code/FeatureExtraction/otbSFSTexturesImageFilter.h
index 4424c4b365..f6540b7209 100644
--- a/Code/FeatureExtraction/otbSFSTexturesImageFilter.h
+++ b/Code/FeatureExtraction/otbSFSTexturesImageFilter.h
@@ -23,7 +23,6 @@
#include "itkImageRegionIteratorWithIndex.h"
#include "itkConstNeighborhoodIterator.h"
-
namespace otb
{
@@ -52,39 +51,39 @@ namespace otb
template <class TInputImage, class TOutputImage>
class ITK_EXPORT SFSTexturesImageFilter :
-public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef SFSTexturesImageFilter Self;
+ typedef SFSTexturesImageFilter Self;
typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(UnaryFunctorNeighborhoodImageFilter,ImageToImageFilter);
+ itkTypeMacro(UnaryFunctorNeighborhoodImageFilter, ImageToImageFilter);
/** Some convenient typedefs. */
- typedef typename InputImageType::ConstPointer InputImagePointerType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef typename InputImageType::SizeType InputImageSizeType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputImagePixelType;
- typedef itk::ConstNeighborhoodIterator<TInputImage> NeighborhoodIteratorType;
- typedef typename NeighborhoodIteratorType::RadiusType RadiusType;
- typedef Functor::SFSTexturesFunctor< NeighborhoodIteratorType,OutputImagePixelType > FunctorType;
- typedef typename FunctorType::OutputType FunctorOutputType;
- typedef itk::ProcessObject ProcessObjectType;
+ typedef typename InputImageType::ConstPointer InputImagePointerType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::SizeType InputImageSizeType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputImagePixelType;
+ typedef itk::ConstNeighborhoodIterator<TInputImage> NeighborhoodIteratorType;
+ typedef typename NeighborhoodIteratorType::RadiusType RadiusType;
+ typedef Functor::SFSTexturesFunctor<NeighborhoodIteratorType, OutputImagePixelType> FunctorType;
+ typedef typename FunctorType::OutputType FunctorOutputType;
+ typedef itk::ProcessObject ProcessObjectType;
/**Set/Get the radius of neighborhood.*/
- itkGetMacro(Radius,unsigned int);
+ itkGetMacro(Radius, unsigned int);
/** Functor accessors */
FunctorType& GetFunctor()
@@ -95,7 +94,7 @@ public:
const FunctorType& GetFunctor() const
{
return m_Functor;
- };
+ }
void SetFunctor(const FunctorType& functor)
{
m_Functor = functor;
@@ -103,56 +102,56 @@ public:
}
/** Spatial Threshold accessor */
- void SetSpatialThreshold( unsigned int thresh )
- {
- this->GetFunctor().SetSpatialThreshold( thresh );
- m_Radius = thresh;
- this->Modified();
- };
+ void SetSpatialThreshold(unsigned int thresh)
+ {
+ this->GetFunctor().SetSpatialThreshold(thresh);
+ m_Radius = thresh;
+ this->Modified();
+ }
unsigned int GetSpatialThreshold()
- {
- return this->GetFunctor().GetSpatialThreshold();
- };
+ {
+ return this->GetFunctor().GetSpatialThreshold();
+ }
/** Spectral Threshold accessor */
- void SetSpectralThreshold( InputImagePixelType thresh )
- {
- this->GetFunctor().SetSpectralThreshold( thresh );
- };
+ void SetSpectralThreshold(InputImagePixelType thresh)
+ {
+ this->GetFunctor().SetSpectralThreshold(thresh);
+ }
InputImagePixelType GetSpectralThreshold()
- {
- return this->GetFunctor().GetSpectralThreshold();
- };
+ {
+ return this->GetFunctor().GetSpectralThreshold();
+ }
/** RatioMaxConsiderationNumber accessor */
- void SetRatioMaxConsiderationNumber( unsigned int value )
- {
- this->GetFunctor().SetRatioMaxConsiderationNumber(value);
- };
+ void SetRatioMaxConsiderationNumber(unsigned int value)
+ {
+ this->GetFunctor().SetRatioMaxConsiderationNumber(value);
+ }
unsigned int GetRatioMaxConsiderationNumber()
- {
- return this->GetFunctor().GetRatioMaxConsiderationNumber();
- };
+ {
+ return this->GetFunctor().GetRatioMaxConsiderationNumber();
+ }
/** Alpha accessor */
- void SetAlpha( double alpha )
- {
- this->GetFunctor().SetAlpha(alpha);
- };
+ void SetAlpha(double alpha)
+ {
+ this->GetFunctor().SetAlpha(alpha);
+ }
double GetAlpha()
- {
- return this->GetFunctor().GetAlpha();
- };
+ {
+ return this->GetFunctor().GetAlpha();
+ }
/** Number Of Directions */
- void SetNumberOfDirections( unsigned int D )
- {
- this->GetFunctor().SetNumberOfDirections( D );
- double step = CONST_2PI/static_cast<double>(D);
- this->GetFunctor().SetDirectionStep( step );
- };
+ void SetNumberOfDirections(unsigned int D)
+ {
+ this->GetFunctor().SetNumberOfDirections(D);
+ double step = CONST_2PI / static_cast<double>(D);
+ this->GetFunctor().SetDirectionStep(step);
+ }
unsigned int GetNumberOfDirections()
- {
- return this->GetFunctor().GetNumberOfDirections();
- };
+ {
+ return this->GetFunctor().GetNumberOfDirections();
+ }
/** Texture selection accessors
* 1: LENGTH
@@ -163,24 +162,25 @@ public:
* 6: SD
* Set to 1 means the texture will be computed.
**/
- typedef enum {LENGTH=1, WIDTH, PSI, WMEAN, RATIO, SD} FeatureType;
-
- void SetFeatureStatus(FeatureType id, bool isSelected )
- {
- if ( static_cast<unsigned int>(id) > this->GetTexturesStatus().size() || id == 0 )
- {
- itkExceptionMacro(<<"Invalid texture index "<<id<<", must be in [1;"<<this->GetTexturesStatus().size()<<"]");
- }
- else
- {
- this->GetFunctor().SetTextureStatus( id-1, isSelected );
+ typedef enum {LENGTH = 1, WIDTH, PSI, WMEAN, RATIO, SD} FeatureType;
+
+ void SetFeatureStatus(FeatureType id, bool isSelected)
+ {
+ if (static_cast<unsigned int>(id) > this->GetTexturesStatus().size() || id == 0)
+ {
+ itkExceptionMacro(
+ << "Invalid texture index " << id << ", must be in [1;" << this->GetTexturesStatus().size() << "]");
}
- }
+ else
+ {
+ this->GetFunctor().SetTextureStatus(id - 1, isSelected);
+ }
+ }
std::vector<bool> GetTexturesStatus()
- {
- return this->GetFunctor().GetTexturesStatus();
- }
+ {
+ return this->GetFunctor().GetTexturesStatus();
+ }
void InitFeatureStatus(bool status);
@@ -188,7 +188,7 @@ public:
const OutputImageType * GetLengthOutput() const;
OutputImageType * GetLengthOutput();
- /** Return output width image */
+ /** Return output width image */
const OutputImageType * GetWidthOutput() const;
OutputImageType * GetWidthOutput();
@@ -208,26 +208,25 @@ public:
const OutputImageType * GetSDOutput() const;
OutputImageType * GetSDOutput();
-
virtual void GenerateOutputInformation();
std::vector<FunctorType> m_FunctorList;
protected:
SFSTexturesImageFilter();
- virtual ~SFSTexturesImageFilter(){};
+ virtual ~SFSTexturesImageFilter(){}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
virtual void BeforeThreadedGenerateData();
- virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId );
+ virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
/** Pad the input requested region by radius */
virtual void GenerateInputRequestedRegion(void);
private:
- SFSTexturesImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SFSTexturesImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
unsigned int m_Radius;
- FunctorType m_Functor;
+ FunctorType m_Functor;
};
diff --git a/Code/FeatureExtraction/otbSFSTexturesImageFilter.txx b/Code/FeatureExtraction/otbSFSTexturesImageFilter.txx
index fce34a97f8..4bb2cb0a1a 100644
--- a/Code/FeatureExtraction/otbSFSTexturesImageFilter.txx
+++ b/Code/FeatureExtraction/otbSFSTexturesImageFilter.txx
@@ -29,20 +29,20 @@ namespace otb
{
template <class TInputImage, class TOutputImage>
-SFSTexturesImageFilter<TInputImage,TOutputImage>
+SFSTexturesImageFilter<TInputImage, TOutputImage>
::SFSTexturesImageFilter()
{
this->SetNumberOfInputs(1);
- this->SetNumberOfRequiredInputs( 1 );
+ this->SetNumberOfRequiredInputs(1);
this->SetNumberOfOutputs(6);
this->SetNumberOfRequiredOutputs(1);
-
- this->SetNthOutput(0,OutputImageType::New());
- this->SetNthOutput(1,OutputImageType::New());
- this->SetNthOutput(2,OutputImageType::New());
- this->SetNthOutput(3,OutputImageType::New());
- this->SetNthOutput(4,OutputImageType::New());
- this->SetNthOutput(5,OutputImageType::New());
+
+ this->SetNthOutput(0, OutputImageType::New());
+ this->SetNthOutput(1, OutputImageType::New());
+ this->SetNthOutput(2, OutputImageType::New());
+ this->SetNthOutput(3, OutputImageType::New());
+ this->SetNthOutput(4, OutputImageType::New());
+ this->SetNthOutput(5, OutputImageType::New());
m_Radius = this->GetSpatialThreshold();
m_FunctorList.clear();
@@ -60,14 +60,14 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
::GetLengthOutput() const
{
if (this->GetNumberOfOutputs() < 1)
- {
+ {
return 0;
- }
+ }
if (this->GetTexturesStatus()[0] == false)
- {
- itkExceptionMacro(<<"Impossible to create length image : texture not selected");
- }
- return static_cast<const OutputImageType * > (this->itk::ProcessObject::GetOutput(0) );
+ {
+ itkExceptionMacro(<< "Impossible to create length image : texture not selected");
+ }
+ return static_cast<const OutputImageType *> (this->itk::ProcessObject::GetOutput(0));
}
template <class TInputImage, class TOutputImage>
typename SFSTexturesImageFilter<TInputImage, TOutputImage>::OutputImageType *
@@ -75,14 +75,14 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
::GetLengthOutput()
{
if (this->GetNumberOfOutputs() < 1)
- {
+ {
return 0;
- }
+ }
if (this->GetTexturesStatus()[0] == false)
- {
- itkExceptionMacro(<<"Impossible to create length image : texture not selected");
- }
- return static_cast<OutputImageType * >(this->itk::ProcessObject::GetOutput(0) );
+ {
+ itkExceptionMacro(<< "Impossible to create length image : texture not selected");
+ }
+ return static_cast<OutputImageType *>(this->itk::ProcessObject::GetOutput(0));
}
// Return output width image
@@ -92,14 +92,14 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
::GetWidthOutput() const
{
if (this->GetNumberOfOutputs() < 2)
- {
+ {
return 0;
- }
- if (this->GetTexturesStatus()[1] == false)
- {
- itkExceptionMacro(<<"Impossible to create width image : texture not selected");
- }
- return static_cast<const OutputImageType * > (this->itk::ProcessObject::GetOutput(1) );
+ }
+ if (this->GetTexturesStatus()[1] == false)
+ {
+ itkExceptionMacro(<< "Impossible to create width image : texture not selected");
+ }
+ return static_cast<const OutputImageType *> (this->itk::ProcessObject::GetOutput(1));
}
template <class TInputImage, class TOutputImage>
typename SFSTexturesImageFilter<TInputImage, TOutputImage>::OutputImageType *
@@ -107,14 +107,14 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
::GetWidthOutput()
{
if (this->GetNumberOfOutputs() < 2)
- {
+ {
return 0;
- }
- if (this->GetTexturesStatus()[1] == false)
- {
- itkExceptionMacro(<<"Impossible to create width image : texture not selected");
- }
- return static_cast<OutputImageType * >(this->itk::ProcessObject::GetOutput(1) );
+ }
+ if (this->GetTexturesStatus()[1] == false)
+ {
+ itkExceptionMacro(<< "Impossible to create width image : texture not selected");
+ }
+ return static_cast<OutputImageType *>(this->itk::ProcessObject::GetOutput(1));
}
//Return output PSI image
@@ -124,14 +124,14 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
::GetPSIOutput() const
{
if (this->GetNumberOfOutputs() < 3)
- {
+ {
return 0;
- }
- if (this->GetTexturesStatus()[2] == false)
- {
- itkExceptionMacro(<<"Impossible to create PSI image : texture not selected");
- }
- return static_cast<const OutputImageType * > (this->itk::ProcessObject::GetOutput(2) );
+ }
+ if (this->GetTexturesStatus()[2] == false)
+ {
+ itkExceptionMacro(<< "Impossible to create PSI image : texture not selected");
+ }
+ return static_cast<const OutputImageType *> (this->itk::ProcessObject::GetOutput(2));
}
template <class TInputImage, class TOutputImage>
typename SFSTexturesImageFilter<TInputImage, TOutputImage>::OutputImageType *
@@ -139,15 +139,15 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
::GetPSIOutput()
{
if (this->GetNumberOfOutputs() < 3)
- {
+ {
return 0;
- }
+ }
if (this->GetTexturesStatus()[2] == false)
- {
- itkExceptionMacro(<<"Impossible to create PSI image : texture not selected");
- }
+ {
+ itkExceptionMacro(<< "Impossible to create PSI image : texture not selected");
+ }
- return static_cast<OutputImageType * >(this->itk::ProcessObject::GetOutput(2) );
+ return static_cast<OutputImageType *>(this->itk::ProcessObject::GetOutput(2));
}
// Return output WMean image
@@ -157,14 +157,14 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
::GetWMeanOutput() const
{
if (this->GetNumberOfOutputs() < 4)
- {
+ {
return 0;
- }
+ }
if (this->GetTexturesStatus()[3] == false)
- {
- itkExceptionMacro(<<"Impossible to create W-Mean image : texture not selected");
- }
- return static_cast<const OutputImageType * > (this->itk::ProcessObject::GetOutput(3) );
+ {
+ itkExceptionMacro(<< "Impossible to create W-Mean image : texture not selected");
+ }
+ return static_cast<const OutputImageType *> (this->itk::ProcessObject::GetOutput(3));
}
template <class TInputImage, class TOutputImage>
typename SFSTexturesImageFilter<TInputImage, TOutputImage>::OutputImageType *
@@ -172,14 +172,14 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
::GetWMeanOutput()
{
if (this->GetNumberOfOutputs() < 4)
- {
+ {
return 0;
- }
- if (this->GetTexturesStatus()[3] == false)
- {
- itkExceptionMacro(<<"Impossible to create W-Mean image : texture not selected");
- }
- return static_cast<OutputImageType * >(this->itk::ProcessObject::GetOutput(3) );
+ }
+ if (this->GetTexturesStatus()[3] == false)
+ {
+ itkExceptionMacro(<< "Impossible to create W-Mean image : texture not selected");
+ }
+ return static_cast<OutputImageType *>(this->itk::ProcessObject::GetOutput(3));
}
// Return output ratio image
@@ -189,14 +189,14 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
::GetRatioOutput() const
{
if (this->GetNumberOfOutputs() < 5)
- {
+ {
return 0;
- }
- if (this->GetTexturesStatus()[4] == false)
- {
- itkExceptionMacro(<<"Impossible to create Ratio image : texture not selected");
- }
- return static_cast<const OutputImageType * > (this->itk::ProcessObject::GetOutput(4) );
+ }
+ if (this->GetTexturesStatus()[4] == false)
+ {
+ itkExceptionMacro(<< "Impossible to create Ratio image : texture not selected");
+ }
+ return static_cast<const OutputImageType *> (this->itk::ProcessObject::GetOutput(4));
}
template <class TInputImage, class TOutputImage>
typename SFSTexturesImageFilter<TInputImage, TOutputImage>::OutputImageType *
@@ -204,14 +204,14 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
::GetRatioOutput()
{
if (this->GetNumberOfOutputs() < 5)
- {
+ {
return 0;
- }
+ }
if (this->GetTexturesStatus()[4] == false)
- {
- itkExceptionMacro(<<"Impossible to create Ratio image : texture not selected");
- }
- return static_cast<OutputImageType * >(this->itk::ProcessObject::GetOutput(4) );
+ {
+ itkExceptionMacro(<< "Impossible to create Ratio image : texture not selected");
+ }
+ return static_cast<OutputImageType *>(this->itk::ProcessObject::GetOutput(4));
}
// Return output SD image
@@ -221,14 +221,14 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
::GetSDOutput() const
{
if (this->GetNumberOfOutputs() < 6)
- {
+ {
return 0;
- }
- if (this->GetTexturesStatus()[5] == false)
- {
- itkExceptionMacro(<<"Impossible to create SD image : texture not selected");
- }
- return static_cast<const OutputImageType * > (this->itk::ProcessObject::GetOutput(5) );
+ }
+ if (this->GetTexturesStatus()[5] == false)
+ {
+ itkExceptionMacro(<< "Impossible to create SD image : texture not selected");
+ }
+ return static_cast<const OutputImageType *> (this->itk::ProcessObject::GetOutput(5));
}
template <class TInputImage, class TOutputImage>
typename SFSTexturesImageFilter<TInputImage, TOutputImage>::OutputImageType *
@@ -236,58 +236,57 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
::GetSDOutput()
{
if (this->GetNumberOfOutputs() < 6)
- {
+ {
return 0;
- }
+ }
if (this->GetTexturesStatus()[5] == false)
- {
- itkExceptionMacro(<<"Impossible to create SD image : texture not selected");
- }
+ {
+ itkExceptionMacro(<< "Impossible to create SD image : texture not selected");
+ }
- return static_cast<OutputImageType * >(this->itk::ProcessObject::GetOutput(5) );
+ return static_cast<OutputImageType *>(this->itk::ProcessObject::GetOutput(5));
}
-
template <class TInputImage, class TOutputImage>
void
SFSTexturesImageFilter<TInputImage, TOutputImage>
::BeforeThreadedGenerateData()
{
Superclass::BeforeThreadedGenerateData();
- if(this->GetSpatialThreshold() < this->GetRatioMaxConsiderationNumber())
+ if (this->GetSpatialThreshold() < this->GetRatioMaxConsiderationNumber())
{
- itkExceptionMacro(<<"Spatial Threshold ("<<this->GetSpatialThreshold()
- <<") is lower than Ration Max Consideration Number ("
- <<this->GetRatioMaxConsiderationNumber()<<") what is not allowed.");
+ itkExceptionMacro(<< "Spatial Threshold (" << this->GetSpatialThreshold()
+ << ") is lower than Ration Max Consideration Number ("
+ << this->GetRatioMaxConsiderationNumber() << ") what is not allowed.");
}
- for (int i =0; i<this->GetNumberOfThreads(); ++i)
+ for (int i = 0; i < this->GetNumberOfThreads(); ++i)
{
- m_FunctorList.push_back(m_Functor);
+ m_FunctorList.push_back(m_Functor);
}
this->InitFeatureStatus(true);
}
template <class TInputImage, class TOutputImage>
void
-SFSTexturesImageFilter<TInputImage,TOutputImage>
+SFSTexturesImageFilter<TInputImage, TOutputImage>
::GenerateInputRequestedRegion()
{
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- typename Superclass::InputImagePointer inputPtr = const_cast< TInputImage * >( this->GetInput());
- typename Superclass::OutputImagePointer outputPtr1 = this->GetOutput(0);//this->GetLengthOutput();
- typename Superclass::OutputImagePointer outputPtr2 = this->GetOutput(1);//this->GetWidthOutput();
- typename Superclass::OutputImagePointer outputPtr3 = this->GetOutput(2);//this->GetPSIOutput();
- typename Superclass::OutputImagePointer outputPtr4 = this->GetOutput(3);//this->GetWMeanOutput();
- typename Superclass::OutputImagePointer outputPtr5 = this->GetOutput(4);//this->GetRatioOutput();
- typename Superclass::OutputImagePointer outputPtr6 = this->GetOutput(5);//this->GetSDOutput();
-
- if ( !inputPtr || !outputPtr1 || !outputPtr2 || !outputPtr3 || !outputPtr4 || !outputPtr5 || !outputPtr6 )
- {
+ typename Superclass::InputImagePointer inputPtr = const_cast<TInputImage *>(this->GetInput());
+ typename Superclass::OutputImagePointer outputPtr1 = this->GetOutput(0); //this->GetLengthOutput();
+ typename Superclass::OutputImagePointer outputPtr2 = this->GetOutput(1); //this->GetWidthOutput();
+ typename Superclass::OutputImagePointer outputPtr3 = this->GetOutput(2); //this->GetPSIOutput();
+ typename Superclass::OutputImagePointer outputPtr4 = this->GetOutput(3); //this->GetWMeanOutput();
+ typename Superclass::OutputImagePointer outputPtr5 = this->GetOutput(4); //this->GetRatioOutput();
+ typename Superclass::OutputImagePointer outputPtr6 = this->GetOutput(5); //this->GetSDOutput();
+
+ if (!inputPtr || !outputPtr1 || !outputPtr2 || !outputPtr3 || !outputPtr4 || !outputPtr5 || !outputPtr6)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
typename TInputImage::RegionType inputRequestedRegion;
@@ -297,35 +296,34 @@ SFSTexturesImageFilter<TInputImage,TOutputImage>
InputImageSizeType rad;
rad[0] = m_Radius;
rad[1] = m_Radius;
- inputRequestedRegion.PadByRadius( rad );
+ inputRequestedRegion.PadByRadius(rad);
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << this->GetNameOfClass()
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
- }
+ }
}
-
template <class TInputImage, class TOutputImage>
void
SFSTexturesImageFilter<TInputImage, TOutputImage>
@@ -335,18 +333,17 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
//this->GetOutput()->SetNumberOfComponentsPerPixel(6);
}
-
template <class TInputImage, class TOutputImage>
void
SFSTexturesImageFilter<TInputImage, TOutputImage>
-::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId )
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
itk::ZeroFluxNeumannBoundaryCondition<TInputImage> nbc;
// We use dynamic_cast since inputs are stored as DataObjects. The
- // ImageToImageFilter::GetInput(int) always returns a pointer to a
- // TInputImage so it cannot be used for the second input.
- InputImagePointerType inputPtr = dynamic_cast<const TInputImage*>(ProcessObjectType::GetInput(0));
+// ImageToImageFilter::GetInput(int) always returns a pointer to a
+// TInputImage so it cannot be used for the second input.
+ InputImagePointerType inputPtr = dynamic_cast<const TInputImage*>(ProcessObjectType::GetInput(0));
OutputImagePointerType outputPtr1 = this->GetOutput(0);
OutputImagePointerType outputPtr2 = this->GetOutput(1);
OutputImagePointerType outputPtr3 = this->GetOutput(2);
@@ -359,14 +356,13 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
NeighborhoodIteratorType neighInputIt;
itk::ImageRegionIterator<TOutputImage> outputIt1, outputIt2, outputIt3, outputIt4, outputIt5, outputIt6;
- FunctorOutputType outputFunctor;
+ FunctorOutputType outputFunctor;
// Find the data-set boundary "faces"
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage>::FaceListType faceList;
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage> bC;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage> bC;
faceList = bC(inputPtr, outputRegionForThread, r);
-
typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage>::FaceListType::iterator fit;
// support progress methods/callbacks
@@ -376,66 +372,64 @@ SFSTexturesImageFilter<TInputImage, TOutputImage>
// the edge of the buffer.
std::vector<bool> textStatus = this->GetTexturesStatus();
- for (fit=faceList.begin(); fit != faceList.end(); ++fit)
- {
+ for (fit = faceList.begin(); fit != faceList.end(); ++fit)
+ {
neighInputIt = itk::ConstNeighborhoodIterator<TInputImage>(r, inputPtr, *fit);
-
+
outputIt1 = itk::ImageRegionIterator<TOutputImage>(outputPtr1, *fit);
outputIt2 = itk::ImageRegionIterator<TOutputImage>(outputPtr2, *fit);
outputIt3 = itk::ImageRegionIterator<TOutputImage>(outputPtr3, *fit);
outputIt4 = itk::ImageRegionIterator<TOutputImage>(outputPtr4, *fit);
outputIt5 = itk::ImageRegionIterator<TOutputImage>(outputPtr5, *fit);
outputIt6 = itk::ImageRegionIterator<TOutputImage>(outputPtr6, *fit);
-
- std::vector< itk::ImageRegionIterator<TOutputImage> *> outItList;
+
+ std::vector<itk::ImageRegionIterator<TOutputImage> *> outItList;
outItList.push_back(&outputIt1);
outItList.push_back(&outputIt2);
outItList.push_back(&outputIt3);
outItList.push_back(&outputIt4);
outItList.push_back(&outputIt5);
outItList.push_back(&outputIt6);
-
+
neighInputIt.OverrideBoundaryCondition(&nbc);
neighInputIt.GoToBegin();
-
- for(unsigned int i = 0; i<outItList.size(); ++i)
+
+ for (unsigned int i = 0; i < outItList.size(); ++i)
{
- (*outItList[i]).GoToBegin();
+ (*outItList[i]).GoToBegin();
}
-
- while ( !outputIt1.IsAtEnd() )
- {
- outputFunctor = m_FunctorList[threadId]( neighInputIt);
- for(unsigned int i = 0; i<outItList.size(); ++i)
+ while (!outputIt1.IsAtEnd())
+ {
+
+ outputFunctor = m_FunctorList[threadId](neighInputIt);
+ for (unsigned int i = 0; i < outItList.size(); ++i)
{
- if( textStatus[i]==true )
- (*outItList[i]).Set( outputFunctor[i] );
+ if (textStatus[i] == true) (*outItList[i]).Set(outputFunctor[i]);
}
-
+
++neighInputIt;
- for(unsigned int i = 0; i<outItList.size(); ++i)
+ for (unsigned int i = 0; i < outItList.size(); ++i)
{
- ++(*outItList[i]);
+ ++(*outItList[i]);
}
-
+
progress.CompletedPixel();
+ }
}
- }
}
template <class TInputImage, class TOutputImage>
void
SFSTexturesImageFilter<TInputImage, TOutputImage>
::InitFeatureStatus(bool status)
+{
+ for (FeatureType id = LENGTH; id <= SD;
+ id = static_cast<FeatureType>(id + 1))
{
- for (FeatureType id=LENGTH;id<=SD;
- id=static_cast<FeatureType>(id+1))
- {
- this->SetFeatureStatus(static_cast<FeatureType>(id),status);
- }
+ this->SetFeatureStatus(static_cast<FeatureType>(id), status);
}
-
+}
/**
* Standard "PrintSelf" method
@@ -445,19 +439,16 @@ void
SFSTexturesImageFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
-
//os << indent << "Spatial Threshold : " << this->GetSpatialThreshold() << std::endl;
//os << indent << "Spectral Threshold : " << this->GetSpectralThreshold() << std::endl;
//os << indent << "Ratio Max Consideration Number: " << this->GetRatioMaxConsiderationNumber() << std::endl;
//os << indent << "Alpha : " << this->GetAlpha() << std::endl;
//os << indent << "Number Of Directions : " << this->GetNumberOfDirections() << std::endl;
-
-}
+}
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbShape.h b/Code/FeatureExtraction/otbShape.h
index caa3649a60..759cf66836 100644
--- a/Code/FeatureExtraction/otbShape.h
+++ b/Code/FeatureExtraction/otbShape.h
@@ -49,7 +49,7 @@ public:
x = -1;
y = -1;
}
- ~Point_plane() {};
+ ~Point_plane() {}
protected:
@@ -64,15 +64,15 @@ private:
class Shape
{
public:
- char inferior_type; /* Indicates if it is extracted from a superior or inferior level set */
- float value; /* Limiting gray-level of the level set */
- char open; /* Indicates if the shape meets the border of the image */
- int area; /* Area of the shape = area of the cc of level set + areas of the holes */
- char removed; /* Indicates whether the shape exists or not */
+ char inferior_type; /* Indicates if it is extracted from a superior or inferior level set */
+ float value; /* Limiting gray-level of the level set */
+ char open; /* Indicates if the shape meets the border of the image */
+ int area; /* Area of the shape = area of the cc of level set + areas of the holes */
+ char removed; /* Indicates whether the shape exists or not */
Point_plane *pixels; /* The array of pixels contained in the shape */
- Shape *parent;
- Shape *next_sibling;
- Shape *child;
+ Shape * parent;
+ Shape * next_sibling;
+ Shape * child;
/* Data to include it in a tree. It has a parent (the smallest containing
shape), children (the largest contained shapes, whose first is pChild
and the others are its siblings), and siblings (the other children of
@@ -97,12 +97,11 @@ public:
~Shape()
{
- if (pixels != NULL) delete[] pixels;
+ if (pixels != NULL) delete[] pixels;
pixels = NULL;
area = 0;
}
-
protected:
private:
@@ -117,26 +116,24 @@ private:
class Shapes
{
public:
- typedef itk::PolyLineParametricPath<2> PathType;
- typedef PathType::Pointer PathPointer;
- typedef PathType::VertexType VertexType;
+ typedef itk::PolyLineParametricPath<2> PathType;
+ typedef PathType::Pointer PathPointer;
+ typedef PathType::VertexType VertexType;
int nrow; /* Number of rows (dy) of the image */
int ncol; /* Number of columns (dx) of the image */
int interpolation; /* Interpolation used for the level lines:
0=nearest neighbor, 1=bilinear */
Shape *the_shapes; /* Array of the shapes. The root of the tree is at index 0 */
- int nb_shapes; /* The number of shapes (the size of the array the_shapes) */
+ int nb_shapes; /* The number of shapes (the size of the array the_shapes) */
/* Link between pixels and shapes */
Shape **smallest_shape; /* An image giving for each pixel the smallest shape containing it */
-
// Shapes* mw_new_shapes();
- void mw_alloc_shapes( int inrow, int incol, float value);
+ void mw_alloc_shapes(int inrow, int incol, float value);
void mw_change_shapes(int inrow, int incol, float value);
- Shape* mw_get_smallest_shape(int iX,int iY);
-
+ Shape* mw_get_smallest_shape(int iX, int iY);
/* For each shape, find its number of proper pixels */
void compute_proper_pixels(int *tabNbOfProperPixels);
@@ -152,7 +149,6 @@ public:
another module, when this field is needed */
void flst_pixels();
-
static const int EAST;
static const int NORTH;
static const int WEST;
@@ -161,16 +157,16 @@ public:
void TURN_LEFT(int *dir);
void TURN_RIGHT(int *dir);
/* Is the point in the shape? */
- char point_in_shape(int x,int y,Shape *pShape);
+ char point_in_shape(int x, int y, Shape *pShape);
void find_next_dual_point(Point_plane *pDualPoint,
int *cDirection,
Shape *pShape);
- int find_closed_boundary(Shape *pShape,PathPointer pBoundary);
+ int find_closed_boundary(Shape *pShape, PathPointer pBoundary);
/* Find an initial point (to follow the boundary) at the border of the image */
void initial_point_border(Point_plane *pDualPoint,
- int *cDirection,Shape *pShape);
+ int *cDirection, Shape *pShape);
/* Find an open boundary */
- void find_open_boundary(Shape *pShape,PathPointer pBoundary);
+ void find_open_boundary(Shape *pShape, PathPointer pBoundary);
PathPointer flst_shape_boundary(Shape *pShape);
Shapes()
{
@@ -184,8 +180,7 @@ public:
~Shapes()
{
- if ((the_shapes != NULL) && (nb_shapes > 0))
- delete[] (the_shapes[0].pixels);
+ if ((the_shapes != NULL) && (nb_shapes > 0)) delete[] (the_shapes[0].pixels);
if (the_shapes != NULL) delete[] the_shapes;
if (smallest_shape != NULL) delete[] smallest_shape;
}
@@ -194,15 +189,12 @@ protected:
private:
-
};
} // end namespace otb
-
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbShape.txx"
#endif
-
#endif
diff --git a/Code/FeatureExtraction/otbShape.txx b/Code/FeatureExtraction/otbShape.txx
index 6651b65599..8571f24822 100644
--- a/Code/FeatureExtraction/otbShape.txx
+++ b/Code/FeatureExtraction/otbShape.txx
@@ -29,11 +29,9 @@ CMLA, Ecole Normale Superieure de Cachan, 61 av. du President Wilson,
#include "otbShape.h"
-
namespace otb
{
-
/*--- Shape ---*/
/* Get in the subtree of root sh a shape that is not removed, NULL if all shapes are removed */
@@ -42,12 +40,10 @@ Shape*
Shape::mw_get_not_removed_shape(Shape *sh)
{
Shape *NotSup = NULL;
- if ((sh == NULL) || (!sh->removed))
- return(sh);
+ if ((sh == NULL) || (!sh->removed)) return (sh);
for (sh = sh->child; sh != NULL; sh = sh->next_sibling)
- if ((NotSup = mw_get_not_removed_shape(sh)) != NULL)
- break;
- return(NotSup);
+ if ((NotSup = mw_get_not_removed_shape(sh)) != NULL) break;
+ return (NotSup);
}
/* Get the true parent, that is the greatest non removed ancestor */
@@ -56,21 +52,21 @@ Shape*
Shape::mw_get_parent_shape(Shape *sh)
{
if (sh == NULL)
- {
- std::cerr <<"[mw_get_parent_shape] input shape structure is NULL" << std::endl;
- return(NULL);
- }
+ {
+ std::cerr << "[mw_get_parent_shape] input shape structure is NULL" << std::endl;
+ return (NULL);
+ }
if (sh->parent == NULL) /* It is the root of the shape */
- return(NULL);
+ return (NULL);
do
if ((sh = sh->parent) == NULL)
- {
+ {
std::cerr << "[mw_get_parent_shape] the root of the shapes is removed" << std::endl;
- return(NULL);
- }
+ return (NULL);
+ }
while (sh->removed);
- return(sh);
+ return (sh);
}
/* Get the first child, taking into account that some shapes are removed */
@@ -80,17 +76,15 @@ Shape::mw_get_first_child_shape(Shape *sh)
{
Shape *NotSup = NULL;
if (sh == NULL)
- {
+ {
std::cerr << "[mw_get_first_child_shape] input shape is NULL" << std::endl;
- return(NULL);
- }
+ return (NULL);
+ }
for (sh = sh->child; sh != NULL; sh = sh->next_sibling)
- if ((NotSup = mw_get_not_removed_shape(sh)) != NULL)
- break;
- return(NotSup);
+ if ((NotSup = mw_get_not_removed_shape(sh)) != NULL) break;
+ return (NotSup);
}
-
/* Get the next sibling, taking into account that some shapes are removed */
Shape*
@@ -99,56 +93,51 @@ Shape::mw_get_next_sibling_shape(Shape *sh)
Shape *sh1 = NULL;
Shape *sh2 = NULL;
if (sh == NULL)
- {
- std::cerr <<"[mw_get_next_sibling_shape] input shape is NULL";
- return(NULL);
- }
+ {
+ std::cerr << "[mw_get_next_sibling_shape] input shape is NULL";
+ return (NULL);
+ }
/* First look at the siblings in the original tree */
for (sh1 = sh->next_sibling; sh1 != NULL; sh1 = sh1->next_sibling)
- if ((sh2 = mw_get_not_removed_shape(sh1)) != NULL)
- return(sh2);
- if (sh->parent == NULL || ! sh->parent->removed)
- return(NULL); /* The parent in the original tree is also the parent in the true tree, nothing more to do */
+ if ((sh2 = mw_get_not_removed_shape(sh1)) != NULL) return (sh2);
+ if (sh->parent == NULL || !sh->parent->removed) return (NULL); /* The parent in the original tree is also the parent in the true tree, nothing more to do */
/* If not found, find the node in the original tree just before the true parent */
do
- {
+ {
sh = sh->parent;
/* Look at the siblings of this node */
for (sh1 = sh->next_sibling; sh1 != NULL; sh1 = sh1->next_sibling)
- if ((sh2 = mw_get_not_removed_shape(sh1)) != NULL)
- return(sh2);
- }
+ if ((sh2 = mw_get_not_removed_shape(sh1)) != NULL) return (sh2);
+ }
while (sh->parent->removed);
- return(NULL);
+ return (NULL);
}
-
/*-- Shapes --*/
-
/* Allocate the root of the shapes */
void
-Shapes::mw_alloc_shapes( int inrow, int incol, float value)
+Shapes::mw_alloc_shapes(int inrow, int incol, float value)
{
- int size,i;
+ int size, i;
Shape *root;
- size = inrow*incol;
+ size = inrow * incol;
if (size <= 0)
- {
+ {
std::cerr << "[mw_alloc_shapes] Attempts to alloc shapes with null size" << std::endl;
- }
- if ((the_shapes!=NULL)||(smallest_shape!=NULL))
- {
+ }
+ if ((the_shapes != NULL) || (smallest_shape != NULL))
+ {
std::cerr << "[mw_alloc_shapes] Attempts to alloc root which is already allocated" << std::endl;
- }
+ }
- root = the_shapes = new Shape[size+1];
- if (root==NULL)
- {
- std::cerr <<"[mw_alloc_shapes] Not enough memory" <<std::endl;
- }
+ root = the_shapes = new Shape[size + 1];
+ if (root == NULL)
+ {
+ std::cerr << "[mw_alloc_shapes] Not enough memory" << std::endl;
+ }
root->inferior_type = 1;
root->value = value;
root->open = 1;
@@ -163,71 +152,67 @@ Shapes::mw_alloc_shapes( int inrow, int incol, float value)
nrow = inrow;
ncol = incol;
-
typedef Shape* ShapePtr;
smallest_shape = new ShapePtr[size];
- if (smallest_shape==NULL)
- {
- std::cerr <<"[mw_alloc_shapes] Not enough memory" << std::endl;
+ if (smallest_shape == NULL)
+ {
+ std::cerr << "[mw_alloc_shapes] Not enough memory" << std::endl;
delete root;
- }
- for (i=size-1; i>=0; i--) smallest_shape[i] = root;
+ }
+ for (i = size - 1; i >= 0; i--)
+ smallest_shape[i] = root;
}
-
/* Allocate the struct and the root if they are not defined */
void
-Shapes::mw_change_shapes(int inrow,int incol,float value)
+Shapes::mw_change_shapes(int inrow, int incol, float value)
{
- int size,i;
+ int size, i;
/* Deallocate the shapes but the structure itself */
- otbMsgDevMacro( << "mw_change_shapes () " );
- otbMsgDevMacro( << " nb shapes : " <<this->nb_shapes);
- otbMsgDevMacro( << " the shapes : " <<the_shapes );
- if ((the_shapes != NULL) && (nb_shapes > 0))
- delete[] the_shapes[0].pixels;
+ otbMsgDevMacro(<< "mw_change_shapes () ");
+ otbMsgDevMacro(<< " nb shapes : " << this->nb_shapes);
+ otbMsgDevMacro(<< " the shapes : " << the_shapes);
+ if ((the_shapes != NULL) && (nb_shapes > 0)) delete[] the_shapes[0].pixels;
if (the_shapes != NULL) delete[] the_shapes;
if (smallest_shape != NULL) delete[] smallest_shape;
mw_alloc_shapes(inrow, incol, value);
}
-
/* Return the smallest shape containing the given pixel */
Shape*
-Shapes::mw_get_smallest_shape(int iX,int iY)
+Shapes::mw_get_smallest_shape(int iX, int iY)
{
Shape *sh;
- sh = smallest_shape[iY*ncol+iX];
+ sh = smallest_shape[iY * ncol + iX];
if (sh == NULL)
- {
+ {
std::cerr << "[mw_get_smallest_shape] smallest shape is NULL" << std::endl;
- return(NULL);
- }
- if (sh->removed)
- sh = sh->mw_get_parent_shape(sh);
- return(sh);
+ return (NULL);
+ }
+ if (sh->removed) sh = sh->mw_get_parent_shape(sh);
+ return (sh);
}
void
Shapes::compute_proper_pixels(int *tabNbOfProperPixels)
{
Shape *pShape;
- int *pNbOfProperPixels;
- int i;
+ int * pNbOfProperPixels;
+ int i;
/* 1) Initialize by the area */
- pShape = the_shapes + nb_shapes-1;
- pNbOfProperPixels = tabNbOfProperPixels + nb_shapes-1;
- for (i = nb_shapes-1; i >= 0; i--)
+ pShape = the_shapes + nb_shapes - 1;
+ pNbOfProperPixels = tabNbOfProperPixels + nb_shapes - 1;
+ for (i = nb_shapes - 1; i >= 0; i--)
*pNbOfProperPixels-- = (pShape--)->area;
/* 2) For each shape, substract its area to its parent */
- pShape = the_shapes + nb_shapes-1;
- for (i = nb_shapes-1; i > 0; i--, pShape--)
+ pShape = the_shapes + nb_shapes - 1;
+ for (i = nb_shapes - 1; i > 0; i--, pShape--)
tabNbOfProperPixels[pShape->parent - the_shapes] -= pShape->area;
}
@@ -235,20 +220,18 @@ Shapes::compute_proper_pixels(int *tabNbOfProperPixels)
void
Shapes::allocate_pixels(int* tabNbOfProperPixels)
{
- Point_plane *tabPixelsOfRoot;
- Shape *pShape;
- Shape **tabpShapesOfStack;
+ Point_plane *tabPixelsOfRoot;
+ Shape * pShape;
+ Shape ** tabpShapesOfStack;
int i;
int iIndex;
int iSizeOfStack;
/* 1) Memory allocation */
- tabPixelsOfRoot = the_shapes[0].pixels = new Point_plane[nrow*ncol];
- if (tabPixelsOfRoot == NULL)
- std::cerr << "allocate_pixels --> Allocation of pixels"<<std::endl;
- tabpShapesOfStack = new Shape*[nb_shapes];
- if (tabpShapesOfStack == NULL)
- std::cerr << "allocate_pixels --> Allocation of stack"<< std::endl;
+ tabPixelsOfRoot = the_shapes[0].pixels = new Point_plane[nrow * ncol];
+ if (tabPixelsOfRoot == NULL) std::cerr << "allocate_pixels --> Allocation of pixels" << std::endl;
+ tabpShapesOfStack = new Shape *[nb_shapes];
+ if (tabpShapesOfStack == NULL) std::cerr << "allocate_pixels --> Allocation of stack" << std::endl;
/* 2) Enumeration of the tree in preorder, using the stack */
pShape = &the_shapes[0];
@@ -256,211 +239,201 @@ Shapes::allocate_pixels(int* tabNbOfProperPixels)
i = 0;
while (1)
if (pShape != NULL)
- {
+ {
/* Write pixels of pShape */
pShape->pixels = &tabPixelsOfRoot[i];
iIndex = pShape - the_shapes;
i += tabNbOfProperPixels[iIndex];
tabpShapesOfStack[iSizeOfStack++] = pShape; /* Push */
pShape = pShape->child;
- }
+ }
else
- {
- if (iSizeOfStack == 0)
- break;
+ {
+ if (iSizeOfStack == 0) break;
pShape = tabpShapesOfStack[--iSizeOfStack]->next_sibling; /* Pop */
- }
+ }
delete[] tabpShapesOfStack;
}
-
void
Shapes::flst_pixels()
{
- Shape **ppShape;
- int *tabNbOfProperPixels; /* For each shape, its number of proper pixels */
- Point_plane *pCurrentPoint;
+ Shape ** ppShape;
+ int * tabNbOfProperPixels; /* For each shape, its number of proper pixels */
+ Point_plane *pCurrentPoint;
int i;
int j;
int iIndex;
/* 1) Compute nb of proper pixels in each shape */
tabNbOfProperPixels = new int[nb_shapes];
- if (tabNbOfProperPixels ==NULL)
- std::cerr << "Allocation of array error" << std::endl;
+ if (tabNbOfProperPixels == NULL) std::cerr << "Allocation of array error" << std::endl;
compute_proper_pixels(tabNbOfProperPixels);
-
/* 2) Allocate array for the root and make others sub-arrays */
allocate_pixels(tabNbOfProperPixels);
/* 3) Fill the array */
- ppShape = smallest_shape + ncol*nrow-1;
- for (i = nrow-1; i >= 0; i--)
- for (j = ncol-1; j >= 0; j--, ppShape--)
- {
+ ppShape = smallest_shape + ncol * nrow - 1;
+ for (i = nrow - 1; i >= 0; i--)
+ for (j = ncol - 1; j >= 0; j--, ppShape--)
+ {
iIndex = (*ppShape) - the_shapes;
pCurrentPoint = &(*ppShape)->pixels[--tabNbOfProperPixels[iIndex]];
pCurrentPoint->x = j;
pCurrentPoint->y = i;
- }
+ }
delete[] tabNbOfProperPixels;
}
-
const int Shapes::EAST = 0;
const int Shapes::NORTH = 1;
const int Shapes::WEST = 2;
const int Shapes::SOUTH = 3;
-
void
Shapes::TURN_LEFT(int *dir)
{
- *dir = (*dir==NORTH ? WEST :(*dir==WEST ? SOUTH :(*dir==SOUTH ? EAST : NORTH)));
+ *dir = (*dir == NORTH ? WEST : (*dir == WEST ? SOUTH : (*dir == SOUTH ? EAST : NORTH)));
}
void
Shapes::TURN_RIGHT(int *dir)
{
- *dir = (*dir==NORTH ? EAST :(*dir==EAST ? SOUTH :(*dir==SOUTH ? WEST : NORTH)));
+ *dir = (*dir == NORTH ? EAST : (*dir == EAST ? SOUTH : (*dir == SOUTH ? WEST : NORTH)));
}
-
/* Is the point in the shape? */
char
-Shapes::point_in_shape(int x,int y,Shape *pShape)
+Shapes::point_in_shape(int x, int y, Shape *pShape)
{
char result;
- Shape *pShapePoint = smallest_shape[y*ncol+x];
+ Shape *pShapePoint = smallest_shape[y * ncol + x];
result = (pShape->pixels <= pShapePoint->pixels &&
- pShapePoint->pixels < pShape->pixels+pShape->area);
+ pShapePoint->pixels < pShape->pixels + pShape->area);
- otbMsgDevMacro( << "PointInShape() -->"<<x<<" "<<y<<" " << pShape->value << " Result : "<< int(result));
+ otbMsgDevMacro(<< "PointInShape() -->" << x << " " << y << " " << pShape->value << " Result : " << int(result));
return (pShape->pixels <= pShapePoint->pixels &&
- pShapePoint->pixels < pShape->pixels+pShape->area);
+ pShapePoint->pixels < pShape->pixels + pShape->area);
}
/* Find the dual point following pDualPoint as we follow the shape boundary */
void
-Shapes::find_next_dual_point(Point_plane *pDualPoint,int *cDirection,Shape *pShape)
+Shapes::find_next_dual_point(Point_plane *pDualPoint, int *cDirection, Shape *pShape)
{
char bLeftIn, bRightIn;
- otbMsgDevMacro( << "Shapes::find_next_dual_point()" );
- otbMsgDevMacro( << " pDualPoint : ( "<<pDualPoint->x << " , " << pDualPoint->y << " Direction :" << cDirection );
+ otbMsgDevMacro(<< "Shapes::find_next_dual_point()");
+ otbMsgDevMacro(<< " pDualPoint : ( " << pDualPoint->x << " , " << pDualPoint->y << " Direction :" << cDirection);
switch (*cDirection)
- {
- case NORTH:
- bLeftIn = point_in_shape(pDualPoint->x-1, pDualPoint->y-1, pShape);
- bRightIn = point_in_shape(pDualPoint->x, pDualPoint->y-1, pShape);
- if (bLeftIn && ! bRightIn)
- -- pDualPoint->y;
- else if (! bLeftIn && (! bRightIn || pShape->inferior_type))
{
- -- pDualPoint->x;
+ case NORTH:
+ bLeftIn = point_in_shape(pDualPoint->x - 1, pDualPoint->y - 1, pShape);
+ bRightIn = point_in_shape(pDualPoint->x, pDualPoint->y - 1, pShape);
+ if (bLeftIn && !bRightIn) --pDualPoint->y;
+ else if (!bLeftIn && (!bRightIn || pShape->inferior_type))
+ {
+ --pDualPoint->x;
TURN_LEFT(cDirection);
- }
+ }
else
- {
- ++ pDualPoint->x;
+ {
+ ++pDualPoint->x;
TURN_RIGHT(cDirection);
- }
+ }
break;
case WEST:
- bLeftIn = point_in_shape(pDualPoint->x-1, pDualPoint->y, pShape);
- bRightIn = point_in_shape(pDualPoint->x-1, pDualPoint->y-1, pShape);
- if (bLeftIn && ! bRightIn)
- -- pDualPoint->x;
- else if (! bLeftIn && (! bRightIn || pShape->inferior_type))
- {
- ++ pDualPoint->y;
+ bLeftIn = point_in_shape(pDualPoint->x - 1, pDualPoint->y, pShape);
+ bRightIn = point_in_shape(pDualPoint->x - 1, pDualPoint->y - 1, pShape);
+ if (bLeftIn && !bRightIn) --pDualPoint->x;
+ else if (!bLeftIn && (!bRightIn || pShape->inferior_type))
+ {
+ ++pDualPoint->y;
TURN_LEFT(cDirection);
- }
+ }
else
- {
- -- pDualPoint->y;
+ {
+ --pDualPoint->y;
TURN_RIGHT(cDirection);
- }
+ }
break;
case SOUTH:
bLeftIn = point_in_shape(pDualPoint->x, pDualPoint->y, pShape);
- bRightIn = point_in_shape(pDualPoint->x-1, pDualPoint->y, pShape);
- if (bLeftIn && ! bRightIn)
- ++ pDualPoint->y;
- else if (! bLeftIn && (! bRightIn || pShape->inferior_type))
- {
- ++ pDualPoint->x;
+ bRightIn = point_in_shape(pDualPoint->x - 1, pDualPoint->y, pShape);
+ if (bLeftIn && !bRightIn) ++pDualPoint->y;
+ else if (!bLeftIn && (!bRightIn || pShape->inferior_type))
+ {
+ ++pDualPoint->x;
TURN_LEFT(cDirection);
- }
+ }
else
- {
- -- pDualPoint->x;
+ {
+ --pDualPoint->x;
TURN_RIGHT(cDirection);
- }
+ }
break;
case EAST:
- bLeftIn = point_in_shape(pDualPoint->x, pDualPoint->y-1, pShape);
+ bLeftIn = point_in_shape(pDualPoint->x, pDualPoint->y - 1, pShape);
bRightIn = point_in_shape(pDualPoint->x, pDualPoint->y, pShape);
- if (bLeftIn && ! bRightIn)
- ++ pDualPoint->x;
- else if (! bLeftIn && (! bRightIn || pShape->inferior_type))
- {
- -- pDualPoint->y;
+ if (bLeftIn && !bRightIn) ++pDualPoint->x;
+ else if (!bLeftIn && (!bRightIn || pShape->inferior_type))
+ {
+ --pDualPoint->y;
TURN_LEFT(cDirection);
- }
+ }
else
- {
- ++ pDualPoint->y;
+ {
+ ++pDualPoint->y;
TURN_RIGHT(cDirection);
- }
+ }
break;
- }
+ }
}
int
-Shapes::find_closed_boundary(Shape *pShape,PathPointer pBoundary)
+Shapes::find_closed_boundary(Shape *pShape, PathPointer pBoundary)
{
- short int x0;
- short int y0;
- Point_plane dualPoint;
- int cDirection;
- short int iWidth = (short int)ncol;
- short int iHeight = (short int)nrow;
- PathType::ContinuousIndexType cindex;
-
- otbMsgDevMacro( << " find_closed_boundary 0" );
+ short int x0;
+ short int y0;
+ Point_plane dualPoint;
+ int cDirection;
+ short int iWidth = (short int) ncol;
+ short int iHeight = (short int) nrow;
+ PathType::ContinuousIndexType cindex;
+
+ otbMsgDevMacro(<< " find_closed_boundary 0");
/* 1) Find initial point, with NORTH direction */
- otbMsgDevMacro( << "pixel : " << pShape->pixels );
+ otbMsgDevMacro(<< "pixel : " << pShape->pixels);
dualPoint.x = pShape->pixels[0].x;
dualPoint.y = pShape->pixels[0].y;
cDirection = NORTH;
- otbMsgDevMacro( << " find_closed_boundary 1" );
+ otbMsgDevMacro(<< " find_closed_boundary 1");
- do ++ dualPoint.x;
+ do
+ ++dualPoint.x;
while (point_in_shape(dualPoint.x, dualPoint.y, pShape));
- otbMsgDevMacro( << " find_closed_boundary 2" );
+ otbMsgDevMacro(<< " find_closed_boundary 2");
/* 2) Follow the boundary */
x0 = dualPoint.x;
y0 = dualPoint.y;
do
- {
- otbMsgDevMacro( << " find_closed_boundary 3" );
+ {
+ otbMsgDevMacro(<< " find_closed_boundary 3");
cindex[0] = dualPoint.x;
cindex[1] = dualPoint.y;
pBoundary->AddVertex(cindex);
- find_next_dual_point(&dualPoint,&cDirection, pShape);
- }
+ find_next_dual_point(&dualPoint, &cDirection, pShape);
+ }
while (dualPoint.x != x0 || dualPoint.y != y0 || cDirection != NORTH);
/* Close the boundary */
@@ -469,105 +442,105 @@ Shapes::find_closed_boundary(Shape *pShape,PathPointer pBoundary)
pBoundary->AddVertex(cindex);
- otbMsgDevMacro( << " find_closed_boundary 4" );
+ otbMsgDevMacro(<< " find_closed_boundary 4");
}
-
/* Find an initial point (to follow the boundary) at the border of the image */
void
-Shapes::initial_point_border(Point_plane *pDualPoint,int *cDirection,Shape *pShape)
+Shapes::initial_point_border(Point_plane *pDualPoint, int *cDirection, Shape *pShape)
{
- short int iWidth = (short int)ncol;
- short int iHeight = (short int)nrow;
+ short int iWidth = (short int) ncol;
+ short int iHeight = (short int) nrow;
short int x, y;
- otbMsgDevMacro( << "initial_point_border() --> " );
- otbMsgDevMacro( << " pDualPoint x: " <<pDualPoint->x << " pDualPoint y: " <<pDualPoint->y << " Direction :" << int(*cDirection) );
+ otbMsgDevMacro(<< "initial_point_border() --> ");
+ otbMsgDevMacro(<< " pDualPoint x: " << pDualPoint->x << " pDualPoint y: " << pDualPoint->y << " Direction :" <<
+ int(*cDirection));
/* Right border */
*cDirection = WEST;
- otbMsgDevMacro( << " Direction (WEST) :" << int(*cDirection) );
- x = iWidth-1;
+ otbMsgDevMacro(<< " Direction (WEST) :" << int(*cDirection));
+ x = iWidth - 1;
y = 0;
- if (point_in_shape(x, y++, pShape))
- while (y < iHeight && point_in_shape(x, y++, pShape));
- while (y < iHeight && ! point_in_shape(x, y, pShape))
+ if (point_in_shape(x, y++, pShape)) while (y < iHeight && point_in_shape(x, y++, pShape))
+ ;
+ while (y < iHeight && !point_in_shape(x, y, pShape))
++y;
if (y < iHeight)
- {
+ {
pDualPoint->x = iWidth;
pDualPoint->y = y;
return;
- }
+ }
/* Top border */
*cDirection = SOUTH;
x = 0;
y = 0;
- if (point_in_shape(x++, y, pShape))
- while (x < iWidth && point_in_shape(x++, y, pShape));
- while (x < iWidth && ! point_in_shape(x, y, pShape))
- ++ x;
+ if (point_in_shape(x++, y, pShape)) while (x < iWidth && point_in_shape(x++, y, pShape))
+ ;
+ while (x < iWidth && !point_in_shape(x, y, pShape))
+ ++x;
if (x < iWidth)
- {
+ {
pDualPoint->x = x;
pDualPoint->y = 0;
return;
- }
+ }
/* Left border */
*cDirection = EAST;
x = 0;
- y = iHeight-1;
- if (point_in_shape(x, y--, pShape))
- while (y >= 0 && point_in_shape(x, y--, pShape));
- while (y >= 0 && ! point_in_shape(x, y, pShape))
- -- y;
+ y = iHeight - 1;
+ if (point_in_shape(x, y--, pShape)) while (y >= 0 && point_in_shape(x, y--, pShape))
+ ;
+ while (y >= 0 && !point_in_shape(x, y, pShape))
+ --y;
if (y >= 0)
- {
+ {
pDualPoint->x = 0;
- pDualPoint->y = y+1;
+ pDualPoint->y = y + 1;
return;
- }
+ }
/* Bottom border */
*cDirection = NORTH;
- x = iWidth-1;
- y = iHeight-1;
- if (point_in_shape(x--, y, pShape))
- while (x >= 0 && point_in_shape(x--, y, pShape));
- while (x >= 0 && ! point_in_shape(x, y, pShape))
- -- x;
+ x = iWidth - 1;
+ y = iHeight - 1;
+ if (point_in_shape(x--, y, pShape)) while (x >= 0 && point_in_shape(x--, y, pShape))
+ ;
+ while (x >= 0 && !point_in_shape(x, y, pShape))
+ --x;
if (x >= 0)
- {
- pDualPoint->x = x+1;
+ {
+ pDualPoint->x = x + 1;
pDualPoint->y = iHeight;
return;
- }
- std::cerr << "initial_point_border --> Coherency?"<<std::endl;
+ }
+ std::cerr << "initial_point_border --> Coherency?" << std::endl;
}
/* Find an open boundary */
void
-Shapes::find_open_boundary(Shape *pShape,PathPointer pBoundary)
+Shapes::find_open_boundary(Shape *pShape, PathPointer pBoundary)
{
- Point_plane dualPoint;
- int cDirection;
- Point_plane *pPoint;
- short int iWidth = (short int)ncol;
- short int iHeight = (short int)nrow;
- PathType::ContinuousIndexType cindex;
-
- otbMsgDevMacro( << "Shapes::find_open_boundary()" );
- initial_point_border(&dualPoint,&cDirection, pShape);
+ Point_plane dualPoint;
+ int cDirection;
+ Point_plane * pPoint;
+ short int iWidth = (short int) ncol;
+ short int iHeight = (short int) nrow;
+ PathType::ContinuousIndexType cindex;
+
+ otbMsgDevMacro(<< "Shapes::find_open_boundary()");
+ initial_point_border(&dualPoint, &cDirection, pShape);
do
- {
+ {
cindex[0] = dualPoint.x;
cindex[1] = dualPoint.y;
pBoundary->AddVertex(cindex);
- otbMsgDevMacro( << "Shapes::find_open_boundary() DO WHILE" );
- find_next_dual_point(&dualPoint, &cDirection,pShape);
- }
+ otbMsgDevMacro(<< "Shapes::find_open_boundary() DO WHILE");
+ find_next_dual_point(&dualPoint, &cDirection, pShape);
+ }
while (0 < dualPoint.x && dualPoint.x < iWidth &&
0 < dualPoint.y && dualPoint.y < iHeight);
@@ -578,40 +551,35 @@ Shapes::find_open_boundary(Shape *pShape,PathPointer pBoundary)
pBoundary->AddVertex(cindex);
- otbMsgDevMacro( << "Shapes::find_open_boundary() END" );
+ otbMsgDevMacro(<< "Shapes::find_open_boundary() END");
}
-
/* Find boundary of the shape */
Shapes::PathPointer
Shapes::flst_shape_boundary(Shape *pShape)
{
- otbMsgDevMacro( << " FLST Shape Boundary " );
- otbMsgDevMacro( << "Nb ncol : " << ncol );
+ otbMsgDevMacro(<< " FLST Shape Boundary ");
+ otbMsgDevMacro(<< "Nb ncol : " << ncol);
- PathPointer pBoundary = PathType::New();
+ PathPointer pBoundary = PathType::New();
- otbMsgDevMacro( << " FLST Shape Boundary ....New" );
+ otbMsgDevMacro(<< " FLST Shape Boundary ....New");
- if (the_shapes[0].pixels == NULL)
- flst_pixels();
- otbMsgDevMacro( << " FLST Shape Boundary ....Pixel" );
+ if (the_shapes[0].pixels == NULL) flst_pixels();
+ otbMsgDevMacro(<< " FLST Shape Boundary ....Pixel");
- otbMsgDevMacro( << " FLST Shape Boundary ....pShape->open " <<int(pShape->open) );
+ otbMsgDevMacro(<< " FLST Shape Boundary ....pShape->open " << int(pShape->open));
pBoundary->Initialize();
- if (pShape->open)
- find_open_boundary( pShape, pBoundary);
- else
- find_closed_boundary(pShape, pBoundary);
+ if (pShape->open) find_open_boundary(pShape, pBoundary);
+ else find_closed_boundary(pShape, pBoundary);
- otbMsgDevMacro( << " FLST Shpae Boundary ....Find OK" );
+ otbMsgDevMacro(<< " FLST Shpae Boundary ....Find OK");
- return(pBoundary);
+ return (pBoundary);
}
-
} // namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbSiftFastImageFilter.h b/Code/FeatureExtraction/otbSiftFastImageFilter.h
index 0c28231169..f5c07e13fa 100644
--- a/Code/FeatureExtraction/otbSiftFastImageFilter.h
+++ b/Code/FeatureExtraction/otbSiftFastImageFilter.h
@@ -25,7 +25,6 @@
namespace otb
{
-
/** \class SiftFastImageFilter
* \brief This class extracts key points from an input image through a pyramidal decomposition
*
@@ -36,20 +35,20 @@ namespace otb
*/
template <class TInputImage, class TOutputPointSet>
class ITK_EXPORT SiftFastImageFilter
- : public ImageToPointSetFilter<TInputImage,TOutputPointSet>
+ : public ImageToPointSetFilter<TInputImage, TOutputPointSet>
{
public:
/** Standard typedefs */
- typedef SiftFastImageFilter Self;
- typedef ImageToPointSetFilter<TInputImage,TOutputPointSet> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SiftFastImageFilter Self;
+ typedef ImageToPointSetFilter<TInputImage, TOutputPointSet> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(SiftFastImageFilter,ImageToPointSetFilter);
+ itkTypeMacro(SiftFastImageFilter, ImageToPointSetFilter);
/** Template parameters typedefs */
@@ -57,26 +56,26 @@ public:
typedef typename TInputImage::Pointer InputImagePointerType;
typedef typename TInputImage::PixelType PixelType;
- typedef TOutputPointSet OutputPointSetType;
- typedef typename TOutputPointSet::Pointer OutputPointSetPointerType;
- typedef typename TOutputPointSet::PixelType OutputPixelType;
- typedef typename TOutputPointSet::PointType OutputPointType;
+ typedef TOutputPointSet OutputPointSetType;
+ typedef typename TOutputPointSet::Pointer OutputPointSetPointerType;
+ typedef typename TOutputPointSet::PixelType OutputPixelType;
+ typedef typename TOutputPointSet::PointType OutputPointType;
typedef typename TOutputPointSet::PointIdentifier OutputPointIdentifierType;
- typedef otb::Image<float,2> FloatImageType;
- typedef std::vector< std::pair<OutputPointType,double> > OrientationVectorType;
+ typedef otb::Image<float, 2> FloatImageType;
+ typedef std::vector<std::pair<OutputPointType, double> > OrientationVectorType;
// Used to rescale data in the [0,1] range
- typedef itk::RescaleIntensityImageFilter<InputImageType,FloatImageType> RescalerType;
+ typedef itk::RescaleIntensityImageFilter<InputImageType, FloatImageType> RescalerType;
- itkSetMacro(ScalesNumber,unsigned int);
- itkGetMacro(ScalesNumber,unsigned int);
+ itkSetMacro(ScalesNumber, unsigned int);
+ itkGetMacro(ScalesNumber, unsigned int);
//Set/Get the Orientation of all KeyPoints
OrientationVectorType GetOrientationVector()
- {
- return m_OrientationVector;
- }
+ {
+ return m_OrientationVector;
+ }
protected:
/** Actually process the input */
@@ -93,12 +92,11 @@ protected:
private:
/** The number of scales */
- unsigned int m_ScalesNumber;
- OrientationVectorType m_OrientationVector;
-
+ unsigned int m_ScalesNumber;
+ OrientationVectorType m_OrientationVector;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbSiftFastImageFilter.txx"
#endif
diff --git a/Code/FeatureExtraction/otbSiftFastImageFilter.txx b/Code/FeatureExtraction/otbSiftFastImageFilter.txx
index 44a3319933..3d055c92c4 100644
--- a/Code/FeatureExtraction/otbSiftFastImageFilter.txx
+++ b/Code/FeatureExtraction/otbSiftFastImageFilter.txx
@@ -31,20 +31,19 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputPointSet>
-SiftFastImageFilter<TInputImage,TOutputPointSet>
+SiftFastImageFilter<TInputImage, TOutputPointSet>
::SiftFastImageFilter()
-{ }
-
+{}
template <class TInputImage, class TOutputPointSet>
void
-SiftFastImageFilter<TInputImage,TOutputPointSet>
+SiftFastImageFilter<TInputImage, TOutputPointSet>
::GenerateData()
{
// Get the input image pointer
- const InputImageType * inputPtr = this->GetInput();
- OutputPointSetPointerType outputPointSet = this->GetOutput();
+ const InputImageType * inputPtr = this->GetInput();
+ OutputPointSetPointerType outputPointSet = this->GetOutput();
typename InputImageType::SizeType size = inputPtr->GetLargestPossibleRegion().GetSize();
@@ -55,46 +54,46 @@ SiftFastImageFilter<TInputImage,TOutputPointSet>
rescaler->SetOutputMaximum(1);
rescaler->Update();
- SiftFastImage siftInputImage = CreateImage(size[1],size[0]);
- itk::ImageRegionIterator<FloatImageType> inIt(rescaler->GetOutput(),rescaler->GetOutput()->GetLargestPossibleRegion());
+ SiftFastImage siftInputImage = CreateImage(size[1], size[0]);
+ itk::ImageRegionIterator<FloatImageType> inIt(rescaler->GetOutput(), rescaler->GetOutput()->GetLargestPossibleRegion());
- unsigned int index =0;
+ unsigned int index = 0;
- for (inIt.GoToBegin();!inIt.IsAtEnd();++inIt)
- {
- siftInputImage->pixels[index]=inIt.Get();
+ for (inIt.GoToBegin(); !inIt.IsAtEnd(); ++inIt)
+ {
+ siftInputImage->pixels[index] = inIt.Get();
++index;
- }
+ }
- Keypoint keypts = GetKeypoints(siftInputImage,m_ScalesNumber);
+ Keypoint keypts = GetKeypoints(siftInputImage, m_ScalesNumber);
Keypoint key = keypts;
unsigned int numkeys = 0;
while (key)
- {
+ {
// Get the key location
- itk::ContinuousIndex<float,2> keyContIndex;
- keyContIndex[0]=key->col;
- keyContIndex[1]=key->row;
+ itk::ContinuousIndex<float, 2> keyContIndex;
+ keyContIndex[0] = key->col;
+ keyContIndex[1] = key->row;
OutputPointType point;
- inputPtr->TransformContinuousIndexToPhysicalPoint(keyContIndex,point);
+ inputPtr->TransformContinuousIndexToPhysicalPoint(keyContIndex, point);
// Get the key descriptor
OutputPixelType data;
data.SetSize(128);
for (int i = 0; i < 128; ++i)
- {
- data[i]=key->descrip[i];
+ {
+ data[i] = key->descrip[i];
- }
- outputPointSet->SetPoint(numkeys,point);
- outputPointSet->SetPointData(numkeys,data);
+ }
+ outputPointSet->SetPoint(numkeys, point);
+ outputPointSet->SetPointData(numkeys, data);
//Fill the current point and its orientation
- std::pair< OutputPointType,double> pair;
+ std::pair<OutputPointType, double> pair;
pair.first = point;
pair.second = key->ori;
m_OrientationVector.push_back(pair);
@@ -104,7 +103,7 @@ SiftFastImageFilter<TInputImage,TOutputPointSet>
// go to next key
++numkeys;
key = key->next;
- }
+ }
FreeKeypoints(keypts);
DestroyAllResources();
}
@@ -113,7 +112,7 @@ SiftFastImageFilter<TInputImage,TOutputPointSet>
*/
template <class TInputImage, class TOutputPointSet>
void
-SiftFastImageFilter<TInputImage,TOutputPointSet>
+SiftFastImageFilter<TInputImage, TOutputPointSet>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/FeatureExtraction/otbSimplePointCountStrategy.h b/Code/FeatureExtraction/otbSimplePointCountStrategy.h
index ff77223c22..c767bdd76e 100644
--- a/Code/FeatureExtraction/otbSimplePointCountStrategy.h
+++ b/Code/FeatureExtraction/otbSimplePointCountStrategy.h
@@ -20,7 +20,6 @@
#include "otbMath.h"
-
namespace otb
{
@@ -35,46 +34,41 @@ namespace otb
*/
-
-template< class TPointSet, class TRadiusType , class TIndexType>
+template<class TPointSet, class TRadiusType, class TIndexType>
class Count
{
public:
- Count() {};
- ~Count() {};
+ Count() {}
+ ~Count() {}
- inline float operator()( const TPointSet * pointSet , const TRadiusType & size , const TIndexType & index )
+ inline float operator ()(const TPointSet * pointSet, const TRadiusType& size, const TIndexType& index)
{
- int accu = 0;
- double surface = CONST_PI*size*size;
+ int accu = 0;
+ double surface = CONST_PI * size * size;
if (pointSet->GetNumberOfPoints() != 0)
- {
- typedef typename TPointSet::PointsContainer::ConstIterator iteratorType;
+ {
+ typedef typename TPointSet::PointsContainer::ConstIterator iteratorType;
iteratorType it = pointSet->GetPoints()->Begin();
- while ( it != pointSet->GetPoints()->End())
- {
- float distX2 =( index[0]-it.Value()[0])*( index[0]-it.Value()[0]);
- float distY2 =( index[1]-it.Value()[1])*( index[1]-it.Value()[1]);
+ while (it != pointSet->GetPoints()->End())
+ {
+ float distX2 = (index[0] - it.Value()[0]) * (index[0] - it.Value()[0]);
+ float distY2 = (index[1] - it.Value()[1]) * (index[1] - it.Value()[1]);
float dist = vcl_sqrt(distX2 + distY2);
- if (dist <= size)
- accu++;
+ if (dist <= size) accu++;
++it;
+ }
}
- }
- else
- return 0.;
+ else return 0.;
- return static_cast<float>(accu/surface);
+ return static_cast<float>(accu / surface);
}
};
-
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbSimplifyPathListFilter.h b/Code/FeatureExtraction/otbSimplifyPathListFilter.h
index f907691885..58597aa578 100644
--- a/Code/FeatureExtraction/otbSimplifyPathListFilter.h
+++ b/Code/FeatureExtraction/otbSimplifyPathListFilter.h
@@ -60,13 +60,13 @@ namespace otb
*/
template <class TPath>
-class ITK_EXPORT SimplifyPathListFilter:
- public UnaryFunctorObjectListFilter<
- ObjectList<TPath>,
- ObjectList<TPath>,
- SimplifyPathFunctor<TPath,TPath> >
- {};
+class ITK_EXPORT SimplifyPathListFilter :
+ public UnaryFunctorObjectListFilter<
+ ObjectList<TPath>,
+ ObjectList<TPath>,
+ SimplifyPathFunctor<TPath, TPath> >
+{};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/FeatureExtraction/otbSpectralAngleFunctor.h b/Code/FeatureExtraction/otbSpectralAngleFunctor.h
index c1bf6a95b8..54ec748cc8 100644
--- a/Code/FeatureExtraction/otbSpectralAngleFunctor.h
+++ b/Code/FeatureExtraction/otbSpectralAngleFunctor.h
@@ -28,7 +28,7 @@ namespace otb
*/
namespace Functor
{
-template<class TInput,class TOutputValue>
+template<class TInput, class TOutputValue>
class SpectralAngleFunctor
{
public:
@@ -36,29 +36,29 @@ public:
{
m_ReferencePixel.SetSize(4);
m_ReferencePixel.Fill(1);
- };
+ }
- virtual ~SpectralAngleFunctor() {};
+ virtual ~SpectralAngleFunctor() {}
// Binary operator
- inline TOutputValue operator()(const TInput& inPix)
+ inline TOutputValue operator ()(const TInput& inPix)
{
return this->Evaluate(inPix);
}
- void SetReferencePixel( TInput ref )
+ void SetReferencePixel(TInput ref)
{
m_ReferencePixel = ref;
m_RefNorm = 0.0;
- for (unsigned int i = 0; i<ref.Size(); ++i)
- {
- m_RefNorm += ref[i]*ref[i];
- }
+ for (unsigned int i = 0; i < ref.Size(); ++i)
+ {
+ m_RefNorm += ref[i] * ref[i];
+ }
m_RefNorm = vcl_sqrt(static_cast<double>(m_RefNorm));
- };
+ }
TInput GetReferencePixel()
{
return m_ReferencePixel;
- };
+ }
protected:
// This method can be reimplemented in subclasses to actually
@@ -67,26 +67,26 @@ protected:
{
TOutputValue out;
- double dist=0.0;
- double scalarProd=0.0;
- double normProd=0.0;
- double normProd1=0.0;
+ double dist = 0.0;
+ double scalarProd = 0.0;
+ double normProd = 0.0;
+ double normProd1 = 0.0;
double sqrtNormProd = 0.0;
- for (unsigned int i=0; i<std::min(inPix.Size(),m_ReferencePixel.Size()); ++i)
- {
- scalarProd += inPix[i]*m_ReferencePixel[i];
- normProd1 += inPix[i]*inPix[i];
- }
- normProd = normProd1 * m_RefNorm*m_RefNorm;
+ for (unsigned int i = 0; i < std::min(inPix.Size(), m_ReferencePixel.Size()); ++i)
+ {
+ scalarProd += inPix[i] * m_ReferencePixel[i];
+ normProd1 += inPix[i] * inPix[i];
+ }
+ normProd = normProd1 * m_RefNorm * m_RefNorm;
sqrtNormProd = vcl_sqrt(normProd);
- if ( (sqrtNormProd == 0.0) || ( scalarProd / sqrtNormProd > 1) )
- {
+ if ((sqrtNormProd == 0.0) || (scalarProd / sqrtNormProd > 1))
+ {
dist = 0.0;
- }
+ }
else
- {
- dist = vcl_acos(scalarProd/sqrtNormProd);
- }
+ {
+ dist = vcl_acos(scalarProd / sqrtNormProd);
+ }
out = static_cast<TOutputValue>(dist);
return out;
@@ -99,6 +99,4 @@ protected:
} // end namespace functor
} // end namespace otb
-
#endif
-
diff --git a/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h b/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h
index 74b59b5127..4610dda6ef 100644
--- a/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h
+++ b/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h
@@ -21,7 +21,6 @@
#include "otbMath.h"
#include "otbSpectralAngleFunctor.h"
-
namespace otb
{
@@ -31,15 +30,15 @@ namespace Functor
/** \class SqrtSpectralAngleFunctor
* \brief This functor computes the square root of a spectral angle according to a reference pixel.
*/
-template <class TInputVectorPixel,class TOutputPixel>
+template <class TInputVectorPixel, class TOutputPixel>
class SqrtSpectralAngleFunctor : public SpectralAngleFunctor<TInputVectorPixel, TOutputPixel>
{
public:
- typedef SqrtSpectralAngleFunctor Self;
- typedef SpectralAngleFunctor<TInputVectorPixel,TOutputPixel> Superclass;
+ typedef SqrtSpectralAngleFunctor Self;
+ typedef SpectralAngleFunctor<TInputVectorPixel, TOutputPixel> Superclass;
- SqrtSpectralAngleFunctor() {};
- virtual ~SqrtSpectralAngleFunctor() {};
+ SqrtSpectralAngleFunctor() {}
+ virtual ~SqrtSpectralAngleFunctor() {}
protected:
virtual TOutputPixel Evaluate(const TInputVectorPixel& inPix) const
@@ -55,4 +54,3 @@ protected:
#endif
#endif
-
diff --git a/Code/FeatureExtraction/otbSumAverageTextureFunctor.h b/Code/FeatureExtraction/otbSumAverageTextureFunctor.h
index 5ee4e43242..a064c2fb86 100644
--- a/Code/FeatureExtraction/otbSumAverageTextureFunctor.h
+++ b/Code/FeatureExtraction/otbSumAverageTextureFunctor.h
@@ -39,55 +39,53 @@ namespace Functor
*/
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT SumAverageTextureFunctor :
-public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
+ public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
SumAverageTextureFunctor(){};
- virtual ~SumAverageTextureFunctor(){};
+ virtual ~SumAverageTextureFunctor(){}
typedef TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
typedef typename Superclass::NeighborhoodType NeighborhoodType;
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
- {
- this->ComputeJointHistogram(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
- double out = 0.;
- // loop over bin neighborhood values
- for (unsigned sB = 0; sB<this->GetHisto()[0].size(); sB++)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
+ {
+ this->ComputeJointHistogram(neigh, neighOff);
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
+ double out = 0.;
+ // loop over bin neighborhood values
+ for (unsigned sB = 0; sB < this->GetHisto()[0].size(); sB++)
+ {
+ double nCeil = (static_cast<double>(sB) + 0.5) * this->GetNeighBinLength();
+ double nCeil2 = (static_cast<double>(sB) + this->GetHisto()[0].size() + 0.5) * this->GetNeighBinLength();
+ double Px_y = 0.;
+ double Px_y2 = 0.;
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
{
- double nCeil = (static_cast<double>(sB)+0.5)*this->GetNeighBinLength();
- double nCeil2 = (static_cast<double>(sB)+this->GetHisto()[0].size()+0.5)*this->GetNeighBinLength();
- double Px_y = 0.;
- double Px_y2 = 0.;
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ double rVal = (static_cast<double>(r) + 0.5) * this->GetOffsetBinLength();
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
+ {
+ double sVal = (static_cast<double>(s) + 0.5) * this->GetNeighBinLength();
+ if (vcl_abs(rVal + sVal - nCeil) < vcl_abs(this->GetNeighBinLength()))
{
- double rVal = (static_cast<double>(r)+0.5)*this->GetOffsetBinLength();
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- double sVal = (static_cast<double>(s)+0.5)*this->GetNeighBinLength();
- if( vcl_abs(rVal + sVal - nCeil) < vcl_abs(this->GetNeighBinLength()) )
- {
- Px_y += static_cast<double>(this->GetHisto()[r][s])*areaInv;
- }
- if( vcl_abs(rVal + sVal - nCeil2) < vcl_abs(this->GetNeighBinLength()) )
- {
- Px_y2 += static_cast<double>(this->GetHisto()[r][s])*areaInv;
- }
- }
+ Px_y += static_cast<double>(this->GetHisto()[r][s]) * areaInv;
}
- out += nCeil * Px_y + nCeil2 * Px_y2;
+ if (vcl_abs(rVal + sVal - nCeil2) < vcl_abs(this->GetNeighBinLength()))
+ {
+ Px_y2 += static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ }
+ }
}
+ out += nCeil * Px_y + nCeil2 * Px_y2;
+ }
- return out;
- }
+ return out;
+ }
};
-
} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbSumEntropyTextureFunctor.h b/Code/FeatureExtraction/otbSumEntropyTextureFunctor.h
index 9f20602495..bc4aaaae17 100644
--- a/Code/FeatureExtraction/otbSumEntropyTextureFunctor.h
+++ b/Code/FeatureExtraction/otbSumEntropyTextureFunctor.h
@@ -39,63 +39,56 @@ namespace Functor
*/
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT SumEntropyTextureFunctor :
-public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
+ public TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
SumEntropyTextureFunctor(){};
- virtual ~SumEntropyTextureFunctor(){};
+ virtual ~SumEntropyTextureFunctor(){}
typedef TextureFunctorBase<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
typedef typename Superclass::NeighborhoodType NeighborhoodType;
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
this->ComputeJointHistogram(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
double out = 0.;
// loop over bin neighborhood values
- for (unsigned sB = 0; sB<this->GetHisto()[0].size(); sB++)
+ for (unsigned sB = 0; sB < this->GetHisto()[0].size(); sB++)
{
- double nCeil = (static_cast<double>(sB)+0.5)*this->GetNeighBinLength();
- double nCeil2 = (static_cast<double>(sB)+this->GetHisto()[0].size()+0.5)*this->GetNeighBinLength();
- double Px_y = 0.;
- double Px_y2 = 0.;
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ double nCeil = (static_cast<double>(sB) + 0.5) * this->GetNeighBinLength();
+ double nCeil2 = (static_cast<double>(sB) + this->GetHisto()[0].size() + 0.5) * this->GetNeighBinLength();
+ double Px_y = 0.;
+ double Px_y2 = 0.;
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
+ {
+ double rVal = (static_cast<double>(r) + 0.5) * this->GetOffsetBinLength();
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
{
- double rVal = (static_cast<double>(r)+0.5)*this->GetOffsetBinLength();
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- double sVal = (static_cast<double>(s)+0.5)*this->GetNeighBinLength();
- if( vcl_abs(rVal + sVal - nCeil) < vcl_abs(this->GetNeighBinLength()) )
- {
- Px_y += static_cast<double>(this->GetHisto()[r][s])*areaInv;
- }
- if( vcl_abs(rVal + sVal - nCeil2) < vcl_abs(this->GetNeighBinLength()) )
- {
- Px_y2 += static_cast<double>(this->GetHisto()[r][s])*areaInv;
- }
- }
+ double sVal = (static_cast<double>(s) + 0.5) * this->GetNeighBinLength();
+ if (vcl_abs(rVal + sVal - nCeil) < vcl_abs(this->GetNeighBinLength()))
+ {
+ Px_y += static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ }
+ if (vcl_abs(rVal + sVal - nCeil2) < vcl_abs(this->GetNeighBinLength()))
+ {
+ Px_y2 += static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ }
}
- if(Px_y != 0.)
- out += Px_y * vcl_log(Px_y);
- if(Px_y2 != 0.)
- out += Px_y2 * vcl_log(Px_y2);
+ }
+ if (Px_y != 0.) out += Px_y * vcl_log(Px_y);
+ if (Px_y2 != 0.) out += Px_y2 * vcl_log(Px_y2);
}
-
- if(out != 0)
- out = -out;
-
+ if (out != 0) out = -out;
return out;
}
};
-
} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbSumVarianceTextureFunctor.h b/Code/FeatureExtraction/otbSumVarianceTextureFunctor.h
index bcbd3588db..c1144ac692 100644
--- a/Code/FeatureExtraction/otbSumVarianceTextureFunctor.h
+++ b/Code/FeatureExtraction/otbSumVarianceTextureFunctor.h
@@ -41,45 +41,45 @@ namespace Functor
*/
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT SumVarianceTextureFunctor :
-public SumAverageTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType>
+ public SumAverageTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
SumVarianceTextureFunctor(){};
- virtual ~SumVarianceTextureFunctor(){};
+ virtual ~SumVarianceTextureFunctor(){}
typedef SumAverageTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
typedef typename Superclass::NeighborhoodType NeighborhoodType;
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
double f6 = Superclass::ComputeOverSingleChannel(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
double out = 0.;
- for (unsigned sB = 0; sB<this->GetHisto()[0].size(); sB++)
+ for (unsigned sB = 0; sB < this->GetHisto()[0].size(); sB++)
{
- double nCeil = (static_cast<double>(sB)+0.5)*this->GetNeighBinLength();
- double nCeil2 = (static_cast<double>(sB)+this->GetHisto()[0].size()+0.5)*this->GetNeighBinLength();
- double Px_y = 0.;
- double Px_y2 = 0.;
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ double nCeil = (static_cast<double>(sB) + 0.5) * this->GetNeighBinLength();
+ double nCeil2 = (static_cast<double>(sB) + this->GetHisto()[0].size() + 0.5) * this->GetNeighBinLength();
+ double Px_y = 0.;
+ double Px_y2 = 0.;
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
+ {
+ double rVal = (static_cast<double>(r) + 0.5) * this->GetOffsetBinLength();
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
{
- double rVal = (static_cast<double>(r)+0.5)*this->GetOffsetBinLength();
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- double sVal = (static_cast<double>(s)+0.5)*this->GetNeighBinLength();
- if( vcl_abs(rVal + sVal - nCeil) < vcl_abs(this->GetNeighBinLength()) )
- {
- Px_y += static_cast<double>(this->GetHisto()[r][s])*areaInv;
- }
- if( vcl_abs(rVal + sVal - nCeil2) < vcl_abs(this->GetNeighBinLength()) )
- {
- Px_y2 += static_cast<double>(this->GetHisto()[r][s])*areaInv;
- }
- }
+ double sVal = (static_cast<double>(s) + 0.5) * this->GetNeighBinLength();
+ if (vcl_abs(rVal + sVal - nCeil) < vcl_abs(this->GetNeighBinLength()))
+ {
+ Px_y += static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ }
+ if (vcl_abs(rVal + sVal - nCeil2) < vcl_abs(this->GetNeighBinLength()))
+ {
+ Px_y2 += static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ }
}
- out += vcl_pow((nCeil-f6), 2)*Px_y + vcl_pow((nCeil2-f6), 2)*Px_y2;
+ }
+ out += vcl_pow((nCeil - f6), 2) * Px_y + vcl_pow((nCeil2 - f6), 2) * Px_y2;
}
return out;
diff --git a/Code/FeatureExtraction/otbTextureFunctorBase.h b/Code/FeatureExtraction/otbTextureFunctorBase.h
index 7d80c7d7aa..9a5441438b 100644
--- a/Code/FeatureExtraction/otbTextureFunctorBase.h
+++ b/Code/FeatureExtraction/otbTextureFunctorBase.h
@@ -26,7 +26,6 @@
#include "itkSize.h"
#include "itkVariableLengthVector.h"
-
namespace otb
{
namespace Functor
@@ -63,8 +62,8 @@ public:
m_NeighBinLength = 0;
m_OffsetBinLength = 0;
m_Histo.clear();
- };
- virtual ~TextureFunctorBase() {};
+ }
+ virtual ~TextureFunctorBase() {}
typedef TScalarInputPixelType InputScalarType;
typedef TScalarOutputPixelType OutputScalarType;
@@ -78,97 +77,96 @@ public:
typedef std::vector<int> IntVectorType;
typedef std::vector<IntVectorType> IntVectorVectorType;
+ void SetOffset(OffsetType off){ m_Offset = off; }
+ OffsetType GetOffset(){ return m_Offset; }
+ double GetMaxi(){ return m_Maxi; }
+ double GetMini(){ return m_Mini; }
+ double GetMaxiOff(){ return m_MaxiOff; }
+ double GetMiniOff(){ return m_MiniOff; }
+ double GetMean(){ return m_Mean; }
+ double GetMeanOff(){ return m_MeanOff; }
+ double GetStd(){ return m_Std; }
+ double GetStdOff(){ return m_StdOff; }
+ double GetNeighBinLength(){ return m_NeighBinLength; }
+ double GetOffsetBinLength(){ return m_OffsetBinLength; }
+ IntVectorVectorType GetHisto(){ return m_Histo; }
+
+ /** Computes the histogram bins using Scott formula, plus min/max, means, stds */
+ void StatComputation(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
+ {
+ double binLength = 0;
+ double binLengthOff = 0;
+ m_Mean = 0.;
+ m_MeanOff = 0.;
+ m_Std = 0.;
+ m_StdOff = 0.;
+ RadiusType radius = neigh.GetRadius();
+ m_Mini = itk::NumericTraits<double>::max();
+ m_MiniOff = itk::NumericTraits<double>::max();
+ m_Maxi = itk::NumericTraits<double>::NonpositiveMin();
+ m_MaxiOff = itk::NumericTraits<double>::NonpositiveMin();
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
+ double scottCoef = 3.5 / (vcl_pow(area, 1 / 3));
- void SetOffset(OffsetType off){ m_Offset=off; };
- OffsetType GetOffset(){ return m_Offset; };
- double GetMaxi(){ return m_Maxi; };
- double GetMini(){ return m_Mini; };
- double GetMaxiOff(){ return m_MaxiOff; };
- double GetMiniOff(){ return m_MiniOff; };
- double GetMean(){ return m_Mean; };
- double GetMeanOff(){ return m_MeanOff; };
- double GetStd(){ return m_Std; };
- double GetStdOff(){ return m_StdOff;};
- double GetNeighBinLength(){ return m_NeighBinLength; };
- double GetOffsetBinLength(){ return m_OffsetBinLength; };
- IntVectorVectorType GetHisto(){ return m_Histo; };
-
- /** Computes the histogram bins using Scott formula, plus min/max, means, stds */
- void StatComputation(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
- {
- double binLength = 0;
- double binLengthOff =0;
- m_Mean = 0.;
- m_MeanOff = 0.;
- m_Std = 0.;
- m_StdOff = 0.;
- RadiusType radius = neigh.GetRadius();
- m_Mini = itk::NumericTraits<double>::max();
- m_MiniOff = itk::NumericTraits<double>::max();
- m_Maxi = itk::NumericTraits<double>::NonpositiveMin();
- m_MaxiOff = itk::NumericTraits<double>::NonpositiveMin();
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
- double scottCoef = 3.5 /(vcl_pow(area, 1/3) );
-
- OffsetType offset;
- offset.Fill(0);
- OffsetType offsetOff;
- OffsetType offsetOffInit;
+ OffsetType offset;
+ offset.Fill(0);
+ OffsetType offsetOff;
+ OffsetType offsetOffInit;
- offsetOffInit[0] = -radius[0]+this->GetOffset()[0]-1;
- offsetOffInit[1] = -radius[1]+this->GetOffset()[1]-1;
+ offsetOffInit[0] = -radius[0] + this->GetOffset()[0] - 1;
+ offsetOffInit[1] = -radius[1] + this->GetOffset()[1] - 1;
- offsetOff = offsetOffInit;
- for ( int l = -static_cast<int>(radius[0]); l <= static_cast<int>(radius[0]); l++ )
+ offsetOff = offsetOffInit;
+ for (int l = -static_cast<int>(radius[0]); l <= static_cast<int>(radius[0]); l++)
+ {
+ offsetOff[0]++;
+ offsetOff[1] = offsetOffInit[1];
+ offset[0] = l;
+ for (int k = -static_cast<int>(radius[1]); k <= static_cast<int>(radius[1]); ++k)
{
- offsetOff[0]++;
- offsetOff[1] = offsetOffInit[1];
- offset[0] = l;
- for ( int k = -static_cast<int>(radius[1]); k <= static_cast<int>(radius[1]); ++k)
- {
- offsetOff[1]++;
- offset[1] = k;
- m_Mean += static_cast<double>(neigh[offset]);
- m_MeanOff += static_cast<double>(neighOff[offsetOff]);
-
- m_Mini = std::min(static_cast<double>(neigh[offset]), m_Mini);
- m_Maxi = std::max(static_cast<double>(neigh[offset]), m_Maxi);
- m_MiniOff = std::min(static_cast<double>(neighOff[offsetOff]),m_MiniOff);
- m_MaxiOff = std::max(static_cast<double>(neighOff[offsetOff]),m_MaxiOff);
- }
+ offsetOff[1]++;
+ offset[1] = k;
+ m_Mean += static_cast<double>(neigh[offset]);
+ m_MeanOff += static_cast<double>(neighOff[offsetOff]);
+
+ m_Mini = std::min(static_cast<double>(neigh[offset]), m_Mini);
+ m_Maxi = std::max(static_cast<double>(neigh[offset]), m_Maxi);
+ m_MiniOff = std::min(static_cast<double>(neighOff[offsetOff]), m_MiniOff);
+ m_MaxiOff = std::max(static_cast<double>(neighOff[offsetOff]), m_MaxiOff);
}
- m_Mean *= areaInv;
- m_MeanOff *= areaInv;
+ }
+ m_Mean *= areaInv;
+ m_MeanOff *= areaInv;
- offsetOff = offsetOffInit;
+ offsetOff = offsetOffInit;
- for( int l = -static_cast<int>(radius[0]); l <= static_cast<int>(radius[0]); l++ )
+ for (int l = -static_cast<int>(radius[0]); l <= static_cast<int>(radius[0]); l++)
+ {
+ offsetOff[0]++;
+ offsetOff[1] = offsetOffInit[1];
+ offset[0] = l;
+ for (int k = -static_cast<int>(radius[1]); k <= static_cast<int>(radius[1]); ++k)
{
- offsetOff[0]++;
- offsetOff[1] = offsetOffInit[1];
- offset[0] = l;
- for( int k = -static_cast<int>(radius[1]); k <= static_cast<int>(radius[1]); ++k)
- {
- offsetOff[1]++;
- offset[1] = k;
- binLength += vcl_pow( (m_Mean-static_cast<double>(neigh[offset])), 2);
- binLengthOff += vcl_pow( (m_MeanOff-static_cast<double>(neighOff[offsetOff])), 2);
- }
+ offsetOff[1]++;
+ offset[1] = k;
+ binLength += vcl_pow((m_Mean - static_cast<double>(neigh[offset])), 2);
+ binLengthOff += vcl_pow((m_MeanOff - static_cast<double>(neighOff[offsetOff])), 2);
}
+ }
- binLength *= areaInv;
- binLength = vcl_sqrt( binLength );
- binLengthOff *= areaInv;
- binLengthOff = vcl_sqrt( binLengthOff );
- m_Std = binLength;
- m_StdOff = binLengthOff;
+ binLength *= areaInv;
+ binLength = vcl_sqrt(binLength);
+ binLengthOff *= areaInv;
+ binLengthOff = vcl_sqrt(binLengthOff);
+ m_Std = binLength;
+ m_StdOff = binLengthOff;
- m_NeighBinLength = scottCoef*binLength;
- m_OffsetBinLength = scottCoef*binLengthOff;
- }
+ m_NeighBinLength = scottCoef * binLength;
+ m_OffsetBinLength = scottCoef * binLengthOff;
+ }
-inline OutputScalarType operator()(const NeighborhoodType &neigh)
+ inline OutputScalarType operator ()(const NeighborhoodType& neigh)
{
RadiusType radiusOff = neigh.GetRadius();
//OutputScalarType outPix;
@@ -178,138 +176,150 @@ inline OutputScalarType operator()(const NeighborhoodType &neigh)
offset.Fill(0);
// Compute the neighborhood radius from the neigh+offset iterator to extract the neighborhood area from the iterator
RadiusType radius;
- radius[0] = static_cast<unsigned int>( 0.5*( static_cast<double>(neigh.GetSize()[0] - 1) ) - static_cast<double>( vcl_abs(m_Offset[0])) );
- radius[1] = static_cast<unsigned int>( 0.5*( static_cast<double>(neigh.GetSize()[1] - 1) ) - static_cast<double>( vcl_abs(m_Offset[1])) );
+ radius[0] =
+ static_cast<unsigned int>(0.5 *
+ (static_cast<double>(neigh.GetSize()[0] - 1)) - static_cast<double>(vcl_abs(m_Offset[0])));
+ radius[1] =
+ static_cast<unsigned int>(0.5 *
+ (static_cast<double>(neigh.GetSize()[1] - 1)) - static_cast<double>(vcl_abs(m_Offset[1])));
NeighborhoodType inNeigh;
inNeigh.SetRadius(radius);
NeighborhoodType offNeigh;
offNeigh.SetRadius(radiusOff);
// Extract the neighborhood area
- for ( int l = -static_cast<int>(radius[0]); l <= static_cast<int>(radius[0]); l++ )
+ for (int l = -static_cast<int>(radius[0]); l <= static_cast<int>(radius[0]); l++)
{
- offset[0] = l;
- for ( int k = -static_cast<int>(radius[1]); k <= static_cast<int>(radius[1]); ++k)
- {
- offset[1] = k;
- inNeigh[offset] = neigh[offset];//neigh.GetPixel(offset);
- }
+ offset[0] = l;
+ for (int k = -static_cast<int>(radius[1]); k <= static_cast<int>(radius[1]); ++k)
+ {
+ offset[1] = k;
+ inNeigh[offset] = neigh[offset]; //neigh.GetPixel(offset);
+ }
}
// Extract the offset area
offset.Fill(0);
- for ( int l = -static_cast<int>(radiusOff[0]); l <= static_cast<int>(radiusOff[0]); l++ )
+ for (int l = -static_cast<int>(radiusOff[0]); l <= static_cast<int>(radiusOff[0]); l++)
{
- offset[0] = l;
- for ( int k = -static_cast<int>(radiusOff[1]); k <= static_cast<int>(radiusOff[1]); ++k)
- {
- offset[1] = k;
- offNeigh[offset] = neigh[offset];//neigh.GetPixel(offset);
- }
+ offset[0] = l;
+ for (int k = -static_cast<int>(radiusOff[1]); k <= static_cast<int>(radiusOff[1]); ++k)
+ {
+ offset[1] = k;
+ offNeigh[offset] = neigh[offset]; //neigh.GetPixel(offset);
+ }
}
- OutputScalarType outPix = static_cast<OutputScalarType>( this->ComputeOverSingleChannel(inNeigh, offNeigh) );
+ OutputScalarType outPix = static_cast<OutputScalarType>(this->ComputeOverSingleChannel(inNeigh, offNeigh));
return outPix;
}
- inline OutputVectorType operator()(const NeighborhoodVectorType &neigh)
- {
- RadiusType radiusOff = neigh.GetRadius();
- OutputVectorType outPix;
- outPix.SetSize( neigh.GetCenterValue/*Pixel*/().GetSize() );
- outPix.Fill(0);
- OffsetType offset;
- offset.Fill(0);
- // Compute the neighborhood radius from the neigh+offset iterator to extract the neighborhood area from the iterator
- RadiusType radius;
- radius[0] = static_cast<unsigned int>( 0.5*( static_cast<double>(neigh.GetSize()[0] - 1) ) - static_cast<double>( vcl_abs(m_Offset[0])) );
- radius[1] = static_cast<unsigned int>( 0.5*( static_cast<double>(neigh.GetSize()[1] - 1) ) - static_cast<double>( vcl_abs(m_Offset[1])) );
-
- // For each channel
- for ( unsigned int i=0; i<neigh.GetCenterValue/*Pixel*/().GetSize(); ++i )
+ inline OutputVectorType operator ()(const NeighborhoodVectorType& neigh)
+ {
+ RadiusType radiusOff = neigh.GetRadius();
+ OutputVectorType outPix;
+ outPix.SetSize(neigh.GetCenterValue/*Pixel*/ ().GetSize());
+ outPix.Fill(0);
+ OffsetType offset;
+ offset.Fill(0);
+ // Compute the neighborhood radius from the neigh+offset iterator to extract the neighborhood area from the iterator
+ RadiusType radius;
+ radius[0] =
+ static_cast<unsigned int>(0.5 *
+ (static_cast<double>(neigh.GetSize()[0] - 1)) - static_cast<double>(vcl_abs(m_Offset[0])));
+ radius[1] =
+ static_cast<unsigned int>(0.5 *
+ (static_cast<double>(neigh.GetSize()[1] - 1)) - static_cast<double>(vcl_abs(m_Offset[1])));
+
+ // For each channel
+ for (unsigned int i = 0; i < neigh.GetCenterValue/*Pixel*/ ().GetSize(); ++i)
+ {
+ NeighborhoodType inNeigh;
+ inNeigh.SetRadius(radius);
+ NeighborhoodType offNeigh;
+ offNeigh.SetRadius(radiusOff);
+ // Extract the neighborhood area
+ for (int l = -static_cast<int>(radius[0]); l <= static_cast<int>(radius[0]); l++)
{
- NeighborhoodType inNeigh;
- inNeigh.SetRadius(radius);
- NeighborhoodType offNeigh;
- offNeigh.SetRadius(radiusOff);
- // Extract the neighborhood area
- for ( int l = -static_cast<int>(radius[0]); l <= static_cast<int>(radius[0]); l++ )
- {
- offset[0] = l;
- for ( int k = -static_cast<int>(radius[1]); k <= static_cast<int>(radius[1]); ++k)
- {
- offset[1] = k;
- inNeigh[offset] = neigh[offset][i];//neigh.GetPixel(offset)[i];
- }
- }
- // Extract the offset area
- offset.Fill(0);
- for ( int l = -static_cast<int>(radiusOff[0]); l <= static_cast<int>(radiusOff[0]); l++ )
- {
- offset[0] = l;
- for ( int k = -static_cast<int>(radiusOff[1]); k <= static_cast<int>(radiusOff[1]); ++k)
- {
- offset[1] = k;
- offNeigh[offset] = neigh[offset][i];
- }
- }
- outPix[i] = static_cast<OutputScalarType>( this->ComputeOverSingleChannel(inNeigh, offNeigh) );
+ offset[0] = l;
+ for (int k = -static_cast<int>(radius[1]); k <= static_cast<int>(radius[1]); ++k)
+ {
+ offset[1] = k;
+ inNeigh[offset] = neigh[offset][i]; //neigh.GetPixel(offset)[i];
+ }
}
- return outPix;
- }
-
- void ComputeJointHistogram(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
- {
- this->StatComputation(neigh, neighOff);
-
- RadiusType radius = neigh.GetRadius();
- OffsetType offset;
+ // Extract the offset area
offset.Fill(0);
- OffsetType offsetOff;
- OffsetType offsetOffInit;
-
- offsetOffInit[0] = -radius[0]+this->GetOffset()[0]-1;
- offsetOffInit[1] = -radius[1]+this->GetOffset()[1]-1;
-
- int histoIdX = 0;
- int histoIdY = 0;
-
- IntVectorType histoTemp;
- if (m_NeighBinLength != 0)
- histoTemp = IntVectorType( static_cast<unsigned int>(vcl_floor( static_cast<double>(this->GetMaxi()-this->GetMini())/m_NeighBinLength)+1.), 0);
- else
- histoTemp = IntVectorType( 1, 0 );
+ for (int l = -static_cast<int>(radiusOff[0]); l <= static_cast<int>(radiusOff[0]); l++)
+ {
+ offset[0] = l;
+ for (int k = -static_cast<int>(radiusOff[1]); k <= static_cast<int>(radiusOff[1]); ++k)
+ {
+ offset[1] = k;
+ offNeigh[offset] = neigh[offset][i];
+ }
+ }
+ outPix[i] = static_cast<OutputScalarType>(this->ComputeOverSingleChannel(inNeigh, offNeigh));
+ }
+ return outPix;
+ }
- if (m_OffsetBinLength != 0)
- m_Histo = IntVectorVectorType( static_cast<unsigned int>(vcl_floor(static_cast<double>(this->GetMaxiOff()-this->GetMiniOff())/m_OffsetBinLength)+1.), histoTemp );
- else
- m_Histo = IntVectorVectorType( 1, histoTemp );
+ void ComputeJointHistogram(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
+ {
+ this->StatComputation(neigh, neighOff);
- offsetOff = offsetOffInit;
- for ( int l = -static_cast<int>(radius[0]); l <= static_cast<int>(radius[0]); l++ )
+ RadiusType radius = neigh.GetRadius();
+ OffsetType offset;
+ offset.Fill(0);
+ OffsetType offsetOff;
+ OffsetType offsetOffInit;
+
+ offsetOffInit[0] = -radius[0] + this->GetOffset()[0] - 1;
+ offsetOffInit[1] = -radius[1] + this->GetOffset()[1] - 1;
+
+ int histoIdX = 0;
+ int histoIdY = 0;
+
+ IntVectorType histoTemp;
+ if (m_NeighBinLength != 0) histoTemp =
+ IntVectorType(static_cast<unsigned int>(vcl_floor(static_cast<double>(this->GetMaxi() -
+ this->GetMini()) / m_NeighBinLength) + 1.),
+ 0);
+ else histoTemp = IntVectorType(1, 0);
+
+ if (m_OffsetBinLength != 0) m_Histo =
+ IntVectorVectorType(static_cast<unsigned int>(vcl_floor(static_cast<double>(this->GetMaxiOff() -
+ this->GetMiniOff()) /
+ m_OffsetBinLength) + 1.), histoTemp);
+ else m_Histo = IntVectorVectorType(1, histoTemp);
+
+ offsetOff = offsetOffInit;
+ for (int l = -static_cast<int>(radius[0]); l <= static_cast<int>(radius[0]); l++)
+ {
+ offsetOff[0]++;
+ offsetOff[1] = offsetOffInit[1];
+ offset[0] = l;
+ for (int k = -static_cast<int>(radius[1]); k <= static_cast<int>(radius[1]); ++k)
{
- offsetOff[0]++;
- offsetOff[1] = offsetOffInit[1];
- offset[0] = l;
- for ( int k = -static_cast<int>(radius[1]); k <= static_cast<int>(radius[1]); ++k)
- {
- offsetOff[1]++;
- offset[1] = k;
- histoIdX = 0;
- histoIdY = 0;
- if ( m_OffsetBinLength != 0)
- histoIdX = static_cast<int>(vcl_floor( (static_cast<double>(neighOff[offsetOff])-this->GetMiniOff()) / static_cast<double>(m_OffsetBinLength) ));
- if ( m_NeighBinLength !=0 )
- histoIdY = static_cast<int>(vcl_floor( (static_cast<double>(neigh[offset])-this->GetMini()) /static_cast<double>( m_NeighBinLength) ));
-
- m_Histo[histoIdX][histoIdY]++;
-
- }
+ offsetOff[1]++;
+ offset[1] = k;
+ histoIdX = 0;
+ histoIdY = 0;
+ if (m_OffsetBinLength != 0) histoIdX =
+ static_cast<int>(vcl_floor((static_cast<double>(neighOff[offsetOff]) -
+ this->GetMiniOff()) / static_cast<double>(m_OffsetBinLength)));
+ if (m_NeighBinLength != 0) histoIdY =
+ static_cast<int>(vcl_floor((static_cast<double>(neigh[offset]) -
+ this->GetMini()) / static_cast<double>(m_NeighBinLength)));
+
+ m_Histo[histoIdX][histoIdY]++;
+
}
- }
+ }
+ }
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff) = 0;
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff) = 0;
- private:
+private:
OffsetType m_Offset;
/** Stores min/max neighborhood area values */
double m_Mini;
@@ -330,9 +340,7 @@ inline OutputScalarType operator()(const NeighborhoodType &neigh)
IntVectorVectorType m_Histo;
};
-
} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbTextureFunctors.h b/Code/FeatureExtraction/otbTextureFunctors.h
index 885d60bbe3..750ddb8742 100644
--- a/Code/FeatureExtraction/otbTextureFunctors.h
+++ b/Code/FeatureExtraction/otbTextureFunctors.h
@@ -36,6 +36,4 @@
#include "otbClusterProminenceTextureFunctor.h"
#include "otbMeanTextureFunctor.h"
-
#endif
-
diff --git a/Code/FeatureExtraction/otbTextureImageFunction.h b/Code/FeatureExtraction/otbTextureImageFunction.h
index 2c899ac662..c8c3cefba7 100644
--- a/Code/FeatureExtraction/otbTextureImageFunction.h
+++ b/Code/FeatureExtraction/otbTextureImageFunction.h
@@ -23,7 +23,6 @@
#include "itkConstNeighborhoodIterator.h"
#include "itkVariableLengthVector.h"
-
namespace otb
{
@@ -37,17 +36,18 @@ namespace otb
* \ingroup ImageFunctions
* \ingroup Textures
*/
-template <class TInputImage, class TFunctor, class TCoordRep = float >
+template <class TInputImage, class TFunctor, class TCoordRep = float>
class ITK_EXPORT TextureImageFunction :
- public itk::ImageFunction< TInputImage, ITK_TYPENAME itk::NumericTraits<typename TInputImage::PixelType>::RealType, TCoordRep >
+ public itk::ImageFunction<TInputImage, ITK_TYPENAME itk::NumericTraits<typename TInputImage::PixelType>::RealType,
+ TCoordRep>
{
- public:
+public:
/** Standard class typedefs. */
typedef TextureImageFunction Self;
typedef itk::ImageFunction<TInputImage, ITK_TYPENAME itk::NumericTraits<typename TInputImage::PixelType>::RealType,
- TCoordRep > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ TCoordRep> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(TextureImageFunction, itk::ImageFunction);
@@ -56,79 +56,75 @@ class ITK_EXPORT TextureImageFunction :
itkNewMacro(Self);
/** typedef support. */
- typedef TInputImage InputImageType;
- typedef TFunctor FunctorType;
- typedef typename InputImageType::OffsetType OffsetType;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::PixelType PixelType;
- typedef typename Superclass::OutputType OutputType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
- typedef typename Superclass::PointType PointType;
- typedef itk::ConstNeighborhoodIterator<InputImageType> IteratorType;
- typedef typename IteratorType::NeighborhoodType NeighborhoodType;
- typedef typename itk::NumericTraits<typename InputImageType::PixelType>::RealType RealType;
-
+ typedef TInputImage InputImageType;
+ typedef TFunctor FunctorType;
+ typedef typename InputImageType::OffsetType OffsetType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::PixelType PixelType;
+ typedef typename Superclass::OutputType OutputType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::ContinuousIndexType ContinuousIndexType;
+ typedef typename Superclass::PointType PointType;
+ typedef itk::ConstNeighborhoodIterator<InputImageType> IteratorType;
+ typedef typename IteratorType::NeighborhoodType NeighborhoodType;
+ typedef typename itk::NumericTraits<typename InputImageType::PixelType>::RealType RealType;
/** Dimension of the underlying image. */
- itkStaticConstMacro(ImageDimension, unsigned int,InputImageType::ImageDimension);
-
+ itkStaticConstMacro(ImageDimension, unsigned int, InputImageType::ImageDimension);
/** Evalulate the function at specified index */
- virtual RealType EvaluateAtIndex( const IndexType& index ) const;
+ virtual RealType EvaluateAtIndex(const IndexType& index) const;
/** Evaluate the function at non-integer positions */
- virtual RealType Evaluate( const PointType& point ) const
+ virtual RealType Evaluate(const PointType& point) const
{
IndexType index;
- this->ConvertPointToNearestIndex( point, index );
- return this->EvaluateAtIndex( index );
- };
+ this->ConvertPointToNearestIndex(point, index);
+ return this->EvaluateAtIndex(index);
+ }
virtual RealType EvaluateAtContinuousIndex(
- const ContinuousIndexType& cindex ) const
+ const ContinuousIndexType& cindex) const
{
IndexType index;
- this->ConvertContinuousIndexToNearestIndex( cindex, index );
- return this->EvaluateAtIndex( index );
- };
+ this->ConvertContinuousIndexToNearestIndex(cindex, index);
+ return this->EvaluateAtIndex(index);
+ }
/** Get/Set the radius of the neighborhood over which the
statistics are evaluated */
- void SetRadius(SizeType & rad)
+ void SetRadius(SizeType& rad)
{
m_Radius = rad;
this->Modified();
- };
+ }
- void SetOffset(OffsetType & off)
+ void SetOffset(OffsetType& off)
{
m_Offset = off;
this->Modified();
- };
+ }
- itkGetMacro( Radius, SizeType);
- itkGetMacro( Offset, OffsetType);
+ itkGetMacro(Radius, SizeType);
+ itkGetMacro(Offset, OffsetType);
protected:
TextureImageFunction();
- virtual ~TextureImageFunction() {};
+ virtual ~TextureImageFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- TextureImageFunction( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ TextureImageFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- SizeType m_Radius;
+ SizeType m_Radius;
OffsetType m_Offset;
};
} // end namespace otb
-
#ifndef OTB_MANUAL_INSTANTIATION
# include "otbTextureImageFunction.txx"
#endif
#endif
-
diff --git a/Code/FeatureExtraction/otbTextureImageFunction.txx b/Code/FeatureExtraction/otbTextureImageFunction.txx
index e80d82e3c1..0a90a831e4 100644
--- a/Code/FeatureExtraction/otbTextureImageFunction.txx
+++ b/Code/FeatureExtraction/otbTextureImageFunction.txx
@@ -20,7 +20,6 @@
#include "otbTextureImageFunction.h"
-
namespace otb
{
@@ -35,7 +34,6 @@ TextureImageFunction<TInputImage, TFunctor, TCoordRep>
m_Offset.Fill(0);
}
-
/**
*
*/
@@ -44,12 +42,11 @@ void
TextureImageFunction<TInputImage, TFunctor, TCoordRep>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
os << indent << "Radius: " << m_Radius << std::endl;
os << indent << "Offset: " << m_Offset << std::endl;
}
-
/**
*
*/
@@ -59,15 +56,15 @@ typename TextureImageFunction<TInputImage, TFunctor, TCoordRep>
TextureImageFunction<TInputImage, TFunctor, TCoordRep>
::EvaluateAtIndex(const IndexType& index) const
{
- if ( !this->GetInputImage() )
- {
- return ( itk::NumericTraits<RealType>::max() );
- }
+ if (!this->GetInputImage())
+ {
+ return (itk::NumericTraits<RealType>::max());
+ }
- if ( !this->IsInsideBuffer( index ) )
- {
- return ( itk::NumericTraits<RealType>::max() );
- }
+ if (!this->IsInsideBuffer(index))
+ {
+ return (itk::NumericTraits<RealType>::max());
+ }
SizeType radiusOff;
radiusOff[0] = (m_Radius[0]) + vcl_abs(m_Offset[0]);
@@ -77,10 +74,9 @@ TextureImageFunction<TInputImage, TFunctor, TCoordRep>
FunctorType funct;
funct.SetOffset(m_Offset);
-
- return static_cast<RealType>(funct( itOff.GetNeighborhood() ));
-}
+ return static_cast<RealType>(funct(itOff.GetNeighborhood()));
+}
} // end namespace otb
diff --git a/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h b/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h
index a14c1981f2..076b61be8e 100644
--- a/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h
+++ b/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h
@@ -30,55 +30,55 @@ namespace otb
*/
template <class TInputImage,
-class TOutputPointSet = itk::PointSet<ITK_TYPENAME TInputImage::PixelType,2> >
+ class TOutputPointSet = itk::PointSet<ITK_TYPENAME TInputImage::PixelType, 2> >
class ITK_EXPORT ThresholdImageToPointSetFilter :
- public ImageToPointSetFilter< TInputImage,TOutputPointSet >
+ public ImageToPointSetFilter<TInputImage, TOutputPointSet>
{
public:
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
- typedef ThresholdImageToPointSetFilter Self;
- typedef ImageToPointSetFilter< InputImageType, TOutputPointSet> Superclass;
- typedef typename Superclass::OutputPointSetType OutputPointSetType;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ThresholdImageToPointSetFilter Self;
+ typedef ImageToPointSetFilter<InputImageType, TOutputPointSet> Superclass;
+ typedef typename Superclass::OutputPointSetType OutputPointSetType;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
itkNewMacro(Self);
itkTypeMacro(ThresholdImageToPointSetFilter, ImageToPointSetFilter);
- typedef typename Superclass::InputImagePixelType InputPixelType;
- typedef typename Superclass::InputImagePointer InputImagePointer;
- typedef typename Superclass::InputImageRegionType InputImageRegionType;
- typedef typename Superclass::InputImageConstPointer InputImageConstPointer;
- typedef typename Superclass::InputImageType::SizeType SizeType;
- typedef typename Superclass::InputImageType::IndexType IndexType;
+ typedef typename Superclass::InputImagePixelType InputPixelType;
+ typedef typename Superclass::InputImagePointer InputImagePointer;
+ typedef typename Superclass::InputImageRegionType InputImageRegionType;
+ typedef typename Superclass::InputImageConstPointer InputImageConstPointer;
+ typedef typename Superclass::InputImageType::SizeType SizeType;
+ typedef typename Superclass::InputImageType::IndexType IndexType;
- typedef typename Superclass::OutputPointSetPointer OutputPointSetPointer;
- typedef typename Superclass::OutputPointSetType::PixelType OutputPointSetPixelType;
- typedef typename Superclass::PointsContainerType PointsContainerType;
+ typedef typename Superclass::OutputPointSetPointer OutputPointSetPointer;
+ typedef typename Superclass::OutputPointSetType::PixelType OutputPointSetPixelType;
+ typedef typename Superclass::PointsContainerType PointsContainerType;
- itkSetMacro(LowerThreshold,InputPixelType);
+ itkSetMacro(LowerThreshold, InputPixelType);
itkGetConstReferenceMacro(LowerThreshold, InputPixelType);
- itkSetMacro(UpperThreshold,InputPixelType);
+ itkSetMacro(UpperThreshold, InputPixelType);
itkGetConstReferenceMacro(UpperThreshold, InputPixelType);
protected:
ThresholdImageToPointSetFilter();
- virtual ~ThresholdImageToPointSetFilter() {};
+ virtual ~ThresholdImageToPointSetFilter() {}
- virtual void ThreadedGenerateData(const InputImageRegionType &inputRegionForThread, int threadId);
+ virtual void ThreadedGenerateData(const InputImageRegionType& inputRegionForThread, int threadId);
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ThresholdImageToPointSetFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ThresholdImageToPointSetFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
InputPixelType m_LowerThreshold;
InputPixelType m_UpperThreshold;
@@ -89,5 +89,4 @@ private:
#include "otbThresholdImageToPointSetFilter.txx"
#endif
-
#endif
diff --git a/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.txx b/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.txx
index fe24a97145..2f8bb63b63 100644
--- a/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.txx
+++ b/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.txx
@@ -38,35 +38,35 @@ ThresholdImageToPointSetFilter<TInputImage, TOutputPointSet>
template <class TInputImage, class TOutputPointSet>
void
ThresholdImageToPointSetFilter<TInputImage, TOutputPointSet>
-::ThreadedGenerateData(const InputImageRegionType &inputRegionForThread, int threadId)
+::ThreadedGenerateData(const InputImageRegionType& inputRegionForThread, int threadId)
{
this->m_PointsContainerPerThread[threadId] = PointsContainerType::New();
- InputImageConstPointer inputPtr = this->GetInput();
+ InputImageConstPointer inputPtr = this->GetInput();
// Define the iterators
itk::ImageRegionConstIterator<TInputImage> inputIt(inputPtr, inputRegionForThread);
itk::ProgressReporter progress(this, threadId, inputRegionForThread.GetNumberOfPixels());
- typename OutputPointSetType::PointType position;
+ typename OutputPointSetType::PointType position;
inputIt.GoToBegin();
- while( !inputIt.IsAtEnd() )
- {
+ while (!inputIt.IsAtEnd())
+ {
const InputPixelType value = inputIt.Get();
if ((value >= m_LowerThreshold) && (value <= m_UpperThreshold))
- {
+ {
//FIXME: non valid for image with dim > 2
const IndexType index = inputIt.GetIndex();
position[0] = index[0];
position[1] = index[1];
this->m_PointsContainerPerThread[threadId]->push_back(position);
- }
+ }
++inputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
}
/**
@@ -77,13 +77,11 @@ void
ThresholdImageToPointSetFilter<TInputImage, TOutputPointSet>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "LowerThreshold : " << m_LowerThreshold << std::endl;
os << indent << "UpperThreshold : " << m_UpperThreshold << std::endl;
}
-
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.h b/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.h
index 12d5ad2396..2d1398b3e3 100644
--- a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.h
+++ b/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.h
@@ -22,9 +22,8 @@
#include "otbImage.h"
#include "itkNumericTraits.h"
-#define MINI(_A,_B) ((_A) < (_B) ? (_A) : (_B))
-#define MAXI(_A,_B) ((_A) > (_B) ? (_A) : (_B))
-
+#define MINI(_A, _B) ((_A) < (_B) ? (_A) : (_B))
+#define MAXI(_A, _B) ((_A) > (_B) ? (_A) : (_B))
namespace otb
{
@@ -56,23 +55,24 @@ namespace otb
*
*/
-template <class TInputImage, class TOutputImage, class TOutputImageDirection = TOutputImage >
-class ITK_EXPORT TouziEdgeDetectorImageFilter : public ImageToModulusAndDirectionImageFilter< TInputImage, TOutputImage, TOutputImageDirection >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection = TOutputImage>
+class ITK_EXPORT TouziEdgeDetectorImageFilter : public ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage,
+ TOutputImageDirection>
{
public:
/** Extract input and output images sizes. */
- itkStaticConstMacro( InputImageDimension,
- unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,
- unsigned int,
- TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension,
+ unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension,
+ unsigned int,
+ TOutputImage::ImageDimension);
/** typedef for the classes standards. */
- typedef TouziEdgeDetectorImageFilter Self;
- typedef ImageToModulusAndDirectionImageFilter< TInputImage, TOutputImage, TOutputImageDirection> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef TouziEdgeDetectorImageFilter Self;
+ typedef ImageToModulusAndDirectionImageFilter<TInputImage, TOutputImage, TOutputImageDirection> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for management of the object factory. */
itkNewMacro(Self);
@@ -81,30 +81,29 @@ public:
itkTypeMacro(TouziEdgeDetectorImageFilter, ImageToModulusAndDirectionImageFilter);
/** typedef to simplify variables definition and declaration. */
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::OutputImageType OutputImageType;
typedef typename Superclass::OutputImageDirectionType OutputImageDirectionType;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
typedef typename OutputImageDirectionType::PixelType OutputPixelDirectionType;
-
/** Set/Get radius methods */
itkSetMacro(Radius, SizeType);
itkGetConstReferenceMacro(Radius, SizeType);
-
/** To be allowed to use the pipeline method TouziEdgeDetectorImageFilter needs
* a treatment input area larger than the output one.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
- virtual void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError);
+ virtual void GenerateInputRequestedRegion()
+ throw(itk::InvalidRequestedRegionError);
protected:
TouziEdgeDetectorImageFilter();
- virtual ~TouziEdgeDetectorImageFilter() {};
+ virtual ~TouziEdgeDetectorImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
void BeforeThreadedGenerateData();
@@ -118,11 +117,11 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
private:
- TouziEdgeDetectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ TouziEdgeDetectorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Radius declaration */
SizeType m_Radius;
@@ -135,5 +134,4 @@ private:
#include "otbTouziEdgeDetectorImageFilter.txx"
#endif
-
#endif
diff --git a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx b/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
index ef9746007b..baba885600 100644
--- a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
@@ -37,26 +37,28 @@ namespace otb
/**
*
*/
-template <class TInputImage, class TOutputImage, class TOutputImageDirection >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection>
TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::TouziEdgeDetectorImageFilter()
{
m_Radius.Fill(1);
}
-template <class TInputImage, class TOutputImage, class TOutputImageDirection >
-void TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>::GenerateInputRequestedRegion() throw (itk::InvalidRequestedRegionError)
-{
+template <class TInputImage, class TOutputImage, class TOutputImageDirection>
+void TouziEdgeDetectorImageFilter<TInputImage, TOutputImage,
+ TOutputImageDirection>::GenerateInputRequestedRegion() throw (
+ itk::InvalidRequestedRegionError)
+ {
// call the superclass' implementation of this method
Superclass::GenerateInputRequestedRegion();
// get pointers to the input and output
- typename Superclass::InputImagePointer inputPtr = const_cast< TInputImage * >( this->GetInput() );
+ typename Superclass::InputImagePointer inputPtr = const_cast<TInputImage *>(this->GetInput());
typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
return;
- }
+ }
// get a copy of the input requested region (should equal the output
// requested region)
@@ -64,90 +66,88 @@ void TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirecti
inputRequestedRegion = inputPtr->GetRequestedRegion();
// pad the input requested region by the operator radius
- inputRequestedRegion.PadByRadius( m_Radius );
+ inputRequestedRegion.PadByRadius(m_Radius);
// crop the input requested region at the input's largest possible region
- if ( inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()) )
- {
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion()))
+ {
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
return;
- }
+ }
else
- {
+ {
// Couldn't crop the region (requested region is outside the largest
// possible region). Throw an exception.
// store what we tried to request (prior to trying to crop)
- inputPtr->SetRequestedRegion( inputRequestedRegion );
+ inputPtr->SetRequestedRegion(inputRequestedRegion);
// build an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << static_cast<const char *>(this->GetNameOfClass())
- << "::GenerateInputRequestedRegion()";
+ << "::GenerateInputRequestedRegion()";
e.SetLocation(msg.str().c_str());
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
e.SetDataObject(inputPtr);
throw e;
+ }
}
-}
/**
* Set up state of filter before multi-threading.
* InterpolatorType::SetInputImage is not thread-safe and hence
* has to be set up before ThreadedGenerateData
*/
-template <class TInputImage, class TOutputImage, class TOutputImageDirection >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection>
void
TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>
::BeforeThreadedGenerateData()
{
typename OutputImageDirectionType::RegionType region;
- typename OutputImageType::Pointer output = this->GetOutput();
+ typename OutputImageType::Pointer output = this->GetOutput();
OutputImageDirectionType * direction = this->GetOutputDirection();
region.SetSize(output->GetRequestedRegion().GetSize());
region.SetIndex(output->GetRequestedRegion().GetIndex());
- direction->SetRegions( region );
+ direction->SetRegions(region);
direction->SetOrigin(output->GetOrigin());
direction->SetSpacing(output->GetSpacing());
direction->Allocate();
}
-template <class TInputImage, class TOutputImage, class TOutputImageDirection >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection>
void
TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>
::ThreadedGenerateData(
- const OutputImageRegionType& outputRegionForThread,
- int threadId
-)
+ const OutputImageRegionType& outputRegionForThread,
+ int threadId
+ )
{
- unsigned int i;
- itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
- itk::ConstNeighborhoodIterator<InputImageType> bit;
- itk::ImageRegionIterator<OutputImageType> it;
- itk::ImageRegionIterator<OutputImageType> it_dir;
-
+ unsigned int i;
+ itk::ZeroFluxNeumannBoundaryCondition<InputImageType> nbc;
+ itk::ConstNeighborhoodIterator<InputImageType> bit;
+ itk::ImageRegionIterator<OutputImageType> it;
+ itk::ImageRegionIterator<OutputImageType> it_dir;
// Allocate output
- typename OutputImageType::Pointer output = this->GetOutput();
- typename InputImageType::ConstPointer input = this->GetInput();
- typename OutputImageDirectionType::Pointer outputDir = this->GetOutputDirection();
+ typename OutputImageType::Pointer output = this->GetOutput();
+ typename InputImageType::ConstPointer input = this->GetInput();
+ typename OutputImageDirectionType::Pointer outputDir = this->GetOutputDirection();
// Find the data-set boundary "faces"
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType faceList;
- typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType::iterator fit;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType faceList;
+ typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType>::FaceListType::iterator fit;
itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> bC;
faceList = bC(input, outputRegionForThread, m_Radius);
-
// support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
- typename TInputImage::IndexType bitIndex;
+ typename TInputImage::IndexType bitIndex;
// Initializations
// ---------------
@@ -161,8 +161,7 @@ TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>
Theta[0] = 0.;
Theta[1] = CONST_PI_4;
Theta[2] = CONST_PI_2;
- Theta[3] = 3*CONST_PI / 4.;
-
+ Theta[3] = 3 * CONST_PI / 4.;
// contains for the 4 directions the sum of the pixels belonging to each region
double Sum[NB_DIR][NB_REGION];
@@ -187,12 +186,12 @@ TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>
int xc;
int yc;
- int cpt=0;
+ int cpt = 0;
// Process each of the boundary faces. These are N-d regions which border
// the edge of the buffer.
- for (fit=faceList.begin(); fit != faceList.end(); ++fit)
- {
+ for (fit = faceList.begin(); fit != faceList.end(); ++fit)
+ {
cpt += 1;
@@ -205,9 +204,8 @@ TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>
bit.OverrideBoundaryCondition(&nbc);
bit.GoToBegin();
-
- while ( ! bit.IsAtEnd() )
- {
+ while (!bit.IsAtEnd())
+ {
// Location of the pixel central
bitIndex = bit.GetIndex();
@@ -216,20 +214,19 @@ TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>
yc = bitIndex[1];
// Initializations
- for (int dir=0; dir<NB_DIR; ++dir)
- {
- for (int m=0; m<NB_REGION; m++)
+ for (int dir = 0; dir < NB_DIR; ++dir)
+ {
+ for (int m = 0; m < NB_REGION; m++)
Sum[dir][m] = 0.;
- }
+ }
R_contour = -1;
Dir_contour = 0.;
Sum_R_theta = 0.;
-
// Loop on pixels of the filter
for (i = 0; i < neighborhoodSize; ++i)
- {
+ {
bitIndex = bit.GetIndex(i);
x = bitIndex[0];
@@ -238,97 +235,77 @@ TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>
// We determine for each direction with which region the pixel belongs.
// Horizontal direction
- if ( y < yc )
- Sum[0][0] += static_cast<double>(bit.GetPixel(i));
- else if ( y > yc )
- Sum[0][1] += static_cast<double>(bit.GetPixel(i));
+ if (y < yc) Sum[0][0] += static_cast<double>(bit.GetPixel(i));
+ else if (y > yc) Sum[0][1] += static_cast<double>(bit.GetPixel(i));
// Diagonal direction 1
- if ( (y-yc) < (x-xc) )
- Sum[1][0] += static_cast<double>(bit.GetPixel(i));
- else if ( (y-yc) > (x-xc) )
- Sum[1][1] += static_cast<double>(bit.GetPixel(i));
+ if ((y - yc) < (x - xc)) Sum[1][0] += static_cast<double>(bit.GetPixel(i));
+ else if ((y - yc) > (x - xc)) Sum[1][1] += static_cast<double>(bit.GetPixel(i));
// Vertical direction
- if ( x > xc )
- Sum[2][0] += static_cast<double>(bit.GetPixel(i));
- else if ( x < xc )
- Sum[2][1] += static_cast<double>(bit.GetPixel(i));
+ if (x > xc) Sum[2][0] += static_cast<double>(bit.GetPixel(i));
+ else if (x < xc) Sum[2][1] += static_cast<double>(bit.GetPixel(i));
// Diagonal direction 2
- if ( (y-yc) > -(x-xc) )
- Sum[3][0] += static_cast<double>(bit.GetPixel(i));
- else if ( (y-yc) < -(x-xc) )
- Sum[3][1] += static_cast<double>(bit.GetPixel(i));
-
-
- } // end of the loop on pixels of the filter
+ if ((y - yc) > -(x - xc)) Sum[3][0] += static_cast<double>(bit.GetPixel(i));
+ else if ((y - yc) < -(x - xc)) Sum[3][1] += static_cast<double>(bit.GetPixel(i));
+ } // end of the loop on pixels of the filter
// Loop on the 4 directions
- for ( int dir=0; dir<NB_DIR; ++dir )
- {
+ for (int dir = 0; dir < NB_DIR; ++dir)
+ {
// Calculation of the mean of the 2 regions
- M1 = Sum[dir][0] / static_cast<double>(m_Radius[0]*(2*m_Radius[0]+1));
- M2 = Sum[dir][1] / static_cast<double>(m_Radius[0]*(2*m_Radius[0]+1));
+ M1 = Sum[dir][0] / static_cast<double>(m_Radius[0] * (2 * m_Radius[0] + 1));
+ M2 = Sum[dir][1] / static_cast<double>(m_Radius[0] * (2 * m_Radius[0] + 1));
// Calculation of the intensity of the contour
- if (( M1 != 0 ) && (M2 != 0))
- R_theta[dir] = static_cast<double>( 1 - MINI( (M1/M2), (M2/M1) ) );
- else
- R_theta[dir] = 0.;
+ if ((M1 != 0) && (M2 != 0)) R_theta[dir] = static_cast<double>(1 - MINI((M1 / M2), (M2 / M1)));
+ else R_theta[dir] = 0.;
// Determination of the maximum intensity of the contour
- R_contour = static_cast<double>( MAXI( R_contour, R_theta[dir] ) );
+ R_contour = static_cast<double>(MAXI(R_contour, R_theta[dir]));
// Determination of the sign of contour
- if ( M2 > M1 )
- sign = +1;
- else
- sign = -1;
+ if (M2 > M1) sign = +1;
+ else sign = -1;
Dir_contour += sign * Theta[dir] * R_theta[dir];
Sum_R_theta += R_theta[dir];
-
- } // end of the loop on the directions
-
+ } // end of the loop on the directions
// Assignment of this value to the output pixel
- it.Set( static_cast<OutputPixelType>(R_contour) );
+ it.Set(static_cast<OutputPixelType>(R_contour));
// Determination of the direction of the contour
- if ( Sum_R_theta != 0. )
- Dir_contour = Dir_contour / Sum_R_theta;
-
+ if (Sum_R_theta != 0.) Dir_contour = Dir_contour / Sum_R_theta;
// Assignment of this value to the "outputdir" pixel
- it_dir.Set( static_cast<OutputPixelDirectionType>(Dir_contour) );
+ it_dir.Set(static_cast<OutputPixelDirectionType>(Dir_contour));
++bit;
++it;
++it_dir;
progress.CompletedPixel();
- }
+ }
- }
+ }
}
/**
* Standard "PrintSelf" method
*/
-template <class TInputImage, class TOutputImage, class TOutputImageDirection >
+template <class TInputImage, class TOutputImage, class TOutputImageDirection>
void
TouziEdgeDetectorImageFilter<TInputImage, TOutputImage, TOutputImageDirection>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "Radius: " << m_Radius << std::endl;
}
-
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbTreeNeighborhood.h b/Code/FeatureExtraction/otbTreeNeighborhood.h
index eeae0d9b73..3412d73b9d 100644
--- a/Code/FeatureExtraction/otbTreeNeighborhood.h
+++ b/Code/FeatureExtraction/otbTreeNeighborhood.h
@@ -42,7 +42,7 @@ public:
Point_plane point; /* Neighbor pixel */
float value; /* Its gray level */
Neighbor() {};
- ~Neighbor() {};
+ ~Neighbor() {}
protected:
@@ -55,59 +55,58 @@ class ITK_EXPORT Neighborhood
public:
typedef enum {AMBIGUOUS, MIN, MAX, INVALID} TypeOfTree;
- Neighbor *tabPoints; /* The array of neighbors, organized as a binary tree */
+ Neighbor * tabPoints; /* The array of neighbors, organized as a binary tree */
int iNbPoints; /* The size of the previous arrays */
TypeOfTree type; /* max- or min- oriented heap? */
float otherBound; /* Min gray level if max-oriented, max if min-oriented */
void reinit_neighborhood(TypeOfTree type);
- void init_neighborhood(int iMaxArea,int iWidth,int iHeight);
+ void init_neighborhood(int iMaxArea, int iWidth, int iHeight);
void free_neighborhood();
void print_neighborhood();
- int ORDER_MAX(int k,int l)
+ int ORDER_MAX(int k, int l)
{
return (tabPoints[k].value > tabPoints[l].value);
- };
- int ORDER_MIN(int k,int l)
+ }
+ int ORDER_MIN(int k, int l)
{
return (tabPoints[k].value < tabPoints[l].value);
- };
- int ORDER_MAX2(int k,int l)
+ }
+ int ORDER_MAX2(int k, int l)
{
return (tabPoints[k].value >= tabPoints[l].value);
- };
- int ORDER_MIN2(int k,int l)
+ }
+ int ORDER_MIN2(int k, int l)
{
return (tabPoints[k].value <= tabPoints[l].value);
- };
- void SWAP(int k,int l)
+ }
+ void SWAP(int k, int l)
{
tabPoints[0] = tabPoints[k];
tabPoints[k] = tabPoints[l];
tabPoints[l] = tabPoints[0];
- };
+ }
void fix_up();
void fix_down();
Neighborhood() {};
- ~Neighborhood() {};
+ ~Neighborhood() {}
protected:
private:
};
-
class ITK_EXPORT Connection
{
public:
Shape *shape; /* Largest shape of the monotone section */
- float level; /* Connection level */
+ float level; /* Connection level */
Connection() {};
- ~Connection() {};
+ ~Connection() {}
protected:
@@ -115,7 +114,6 @@ private:
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
@@ -123,4 +121,3 @@ private:
#endif
#endif
-
diff --git a/Code/FeatureExtraction/otbTreeNeighborhood.txx b/Code/FeatureExtraction/otbTreeNeighborhood.txx
index aca4cc9467..b898a1ca56 100644
--- a/Code/FeatureExtraction/otbTreeNeighborhood.txx
+++ b/Code/FeatureExtraction/otbTreeNeighborhood.txx
@@ -16,7 +16,6 @@
=========================================================================*/
-
#ifndef __otbTreeNeighborhood_txx
#define __otbTreeNeighborhood_txx
@@ -40,16 +39,14 @@ Neighborhood::reinit_neighborhood(TypeOfTree type)
/* To allocate the structure representing the neighborhood of a region */
void
Neighborhood::init_neighborhood(int iMaxArea,
- int iWidth,int iHeight)
+ int iWidth, int iHeight)
{
- iMaxArea = 4*(iMaxArea+1);
- if (iMaxArea > iWidth*iHeight)
- iMaxArea = iWidth*iHeight;
-
- tabPoints = new Neighbor[iMaxArea+1];
- if (tabPoints == NULL)
- std::cerr << "init_neighborhood --> neighbors allocation error" << std::endl;
- reinit_neighborhood( AMBIGUOUS);
+ iMaxArea = 4 * (iMaxArea + 1);
+ if (iMaxArea > iWidth * iHeight) iMaxArea = iWidth * iHeight;
+
+ tabPoints = new Neighbor[iMaxArea + 1];
+ if (tabPoints == NULL) std::cerr << "init_neighborhood --> neighbors allocation error" << std::endl;
+ reinit_neighborhood(AMBIGUOUS);
}
/* Free the structure representing the neighborhood of a region */
@@ -59,27 +56,26 @@ Neighborhood::free_neighborhood()
delete[] tabPoints;
}
-
/* Put the last neighbor at a position so that we fix the heap */
void
Neighborhood::fix_up()
{
Neighbor *tabPoints = tabPoints;
- int k = iNbPoints;
- int l;
+ int k = iNbPoints;
+ int l;
if (type == MAX)
- while (k > 1 && ORDER_MAX(k, l=k>>1))
- {
+ while (k > 1 && ORDER_MAX(k, l = k >> 1))
+ {
SWAP(k, l);
k = l;
- }
+ }
else
- while (k > 1 && ORDER_MIN(k, l=k>>1))
- {
+ while (k > 1 && ORDER_MIN(k, l = k >> 1))
+ {
SWAP(k, l);
k = l;
- }
+ }
}
/* Put the first neighbor at a position so that we fix the heap */
@@ -87,43 +83,41 @@ void
Neighborhood::fix_down()
{
Neighbor *tabPoints = tabPoints;
- int N = iNbPoints;
- int k = 1;
- int l;
+ int N = iNbPoints;
+ int k = 1;
+ int l;
if (type == MAX)
while ((l = k << 1) <= N)
- {
- if (l < N && ORDER_MAX(l+1,l)) ++l;
- if (ORDER_MAX2(k,l))
- break;
+ {
+ if (l < N && ORDER_MAX(l + 1, l)) ++l;
+ if (ORDER_MAX2(k, l)) break;
SWAP(k, l);
k = l;
- }
+ }
else
while ((l = k << 1) <= N)
- {
- if (l < N && ORDER_MIN(l+1,l)) ++l;
- if (ORDER_MIN2(k,l))
- break;
+ {
+ if (l < N && ORDER_MIN(l + 1, l)) ++l;
+ if (ORDER_MIN2(k, l)) break;
SWAP(k, l);
k = l;
- }
+ }
}
-
void
Neighborhood::print_neighborhood()
{
- otbMsgDevMacro( << "pNeighborhood : " );
- otbMsgDevMacro( << " iNbPoints : " << iNbPoints );
- for (int i= 0; i<=iNbPoints; ++i)
- {
- otbMsgDevMacro( << "tabPoints["<<i <<"] =" << tabPoints[i].value << " Position: (" << tabPoints[i].point.x << " , " << tabPoints[i].point.y << ")" );
- }
+ otbMsgDevMacro(<< "pNeighborhood : ");
+ otbMsgDevMacro(<< " iNbPoints : " << iNbPoints);
+ for (int i = 0; i <= iNbPoints; ++i)
+ {
+ otbMsgDevMacro(
+ << "tabPoints[" << i << "] =" << tabPoints[i].value << " Position: (" << tabPoints[i].point.x << " , " <<
+ tabPoints[i].point.y << ")");
+ }
}
-
}
#endif
diff --git a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h b/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
index cd7421acdb..c7706a0512 100644
--- a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
+++ b/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
@@ -1,4 +1,3 @@
-
/*=========================================================================
Program: ORFEO Toolbox
@@ -42,68 +41,67 @@
#include "otbStreamingImageFileWriter.h"
#include "itkMultiplyImageFilter.h"
-
namespace otb
{
namespace Functor
{
-
- /** \class RadiometricNonWaterNonVegetationIndexFunctor
- * \brief This functor computes ndwi and ndvi of an image
- * \brief in order to find urban areas and generate a grayscale image
- */
-template<class TInput,class TOutput=double>
+/** \class RadiometricNonWaterNonVegetationIndexFunctor
+ * \brief This functor computes ndwi and ndvi of an image
+ * \brief in order to find urban areas and generate a grayscale image
+ */
+template<class TInput, class TOutput = double>
class RadiometricNonWaterNonVegetationIndexFunctor
{
- public:
- typedef Functor::NDVI< double, double, double> VegetationFunctorType;
- typedef Functor::NDWI2< double, double, double> WaterFunctorType;
- typedef TOutput ValueType;
+public:
+ typedef Functor::NDVI<double, double, double> VegetationFunctorType;
+ typedef Functor::NDWI2<double, double, double> WaterFunctorType;
+ typedef TOutput ValueType;
- VegetationFunctorType GetVegetationFunctor(){ return m_VegetationFunctor; };
- WaterFunctorType GetWaterFunctor(){ return m_WaterFunctor; };
+ VegetationFunctorType GetVegetationFunctor(){ return m_VegetationFunctor; }
+ WaterFunctorType GetWaterFunctor(){ return m_WaterFunctor; }
- void SetRedIndex(int id){ m_VegetationFunctor.SetRedIndex(id); };
- void SetGreenIndex(int id){ m_WaterFunctor.SetGIndex(id); };
- void SetNIRIndex(int id){ m_VegetationFunctor.SetNIRIndex(id);
- m_WaterFunctor.SetNIRIndex(id); };
+ void SetRedIndex(int id){ m_VegetationFunctor.SetRedIndex(id); }
+ void SetGreenIndex(int id){ m_WaterFunctor.SetGIndex(id); }
+ void SetNIRIndex(int id)
+ {
+ m_VegetationFunctor.SetNIRIndex(id);
+ m_WaterFunctor.SetNIRIndex(id);
+ }
RadiometricNonWaterNonVegetationIndexFunctor(){}
- virtual ~RadiometricNonWaterNonVegetationIndexFunctor(){};
-
- inline TOutput operator()(const TInput& pInPix)
- {
- TOutput lVIval,lWIval,lOutPix;
-
- TInput zero = pInPix;
- zero.Fill(0);
- if(pInPix!=zero)
+ virtual ~RadiometricNonWaterNonVegetationIndexFunctor(){}
+
+ inline TOutput operator ()(const TInput& pInPix)
+ {
+ TOutput lVIval, lWIval, lOutPix;
+
+ TInput zero = pInPix;
+ zero.Fill(0);
+ if (pInPix != zero)
{
- lVIval = static_cast<ValueType>(std::max(0.,m_VegetationFunctor(pInPix)));
- lWIval = static_cast<ValueType>(std::max(0.,m_WaterFunctor(pInPix)));
+ lVIval = static_cast<ValueType>(std::max(0., m_VegetationFunctor(pInPix)));
+ lWIval = static_cast<ValueType>(std::max(0., m_WaterFunctor(pInPix)));
- lOutPix = vcl_sqrt(vcl_abs((1-lVIval)*(1-lWIval)));
+ lOutPix = vcl_sqrt(vcl_abs((1 - lVIval) * (1 - lWIval)));
}
- else
- lOutPix = 0;
+ else lOutPix = 0;
- return lOutPix;
- }
+ return lOutPix;
+ }
- protected :
+protected:
VegetationFunctorType m_VegetationFunctor;
WaterFunctorType m_WaterFunctor;
};
-
- /** \class RadiometricNonWaterNonVegetationDetectionFunctor
- * \brief This functor uses computes RadiometricNonWaterNonVegetationIndexFunctor
- * \brief and appli a threshold to produce a binary image
- */
-template<class TInput,class TOutput>
+/** \class RadiometricNonWaterNonVegetationDetectionFunctor
+ * \brief This functor uses computes RadiometricNonWaterNonVegetationIndexFunctor
+ * \brief and appli a threshold to produce a binary image
+ */
+template<class TInput, class TOutput>
class RadiometricNonWaterNonVegetationDetectionFunctor
{
public:
@@ -113,113 +111,120 @@ public:
{
m_LowerThreshold = 0.0;
m_UpperThreshold = 1.0;
- };
+ }
- virtual ~RadiometricNonWaterNonVegetationDetectionFunctor() {};
- inline TOutput operator()(const TInput& inPix)
+ virtual ~RadiometricNonWaterNonVegetationDetectionFunctor() {}
+ inline TOutput operator ()(const TInput& inPix)
{
// The vegetation and water areas are put to 0.
double indexesVal = static_cast<double>(m_RadiometricNonWaterNonVegetationIndexFunctor(inPix));
- if ( (indexesVal > m_LowerThreshold) && (indexesVal <= m_UpperThreshold) )
- {
+ if ((indexesVal > m_LowerThreshold) && (indexesVal <= m_UpperThreshold))
+ {
return static_cast<TOutput>(1);
- }
+ }
else
- {
+ {
return static_cast<TOutput>(0);
- }
+ }
}
- void SetLowerThreshold(double threshold){ m_LowerThreshold = threshold; };
- void SetUpperThreshold(double threshold){ m_UpperThreshold = threshold; };
- double GetLowerThreshold(){ return m_LowerThreshold; };
- double GetUpperThreshold(){ return m_UpperThreshold; };
-
- void SetRedIndex(int id){ m_RadiometricNonWaterNonVegetationIndexFunctor.SetRedIndex(id); };
- void SetGreenIndex(int id){ m_RadiometricNonWaterNonVegetationIndexFunctor.SetGreenIndex(id); };
- void SetNIRIndex(int id){ m_RadiometricNonWaterNonVegetationIndexFunctor.SetNIRIndex(id); };
+ void SetLowerThreshold(double threshold){ m_LowerThreshold = threshold; }
+ void SetUpperThreshold(double threshold){ m_UpperThreshold = threshold; }
+ double GetLowerThreshold(){ return m_LowerThreshold; }
+ double GetUpperThreshold(){ return m_UpperThreshold; }
+ void SetRedIndex(int id){ m_RadiometricNonWaterNonVegetationIndexFunctor.SetRedIndex(id); }
+ void SetGreenIndex(int id){ m_RadiometricNonWaterNonVegetationIndexFunctor.SetGreenIndex(id); }
+ void SetNIRIndex(int id){ m_RadiometricNonWaterNonVegetationIndexFunctor.SetNIRIndex(id); }
protected:
RadiometricNonWaterNonVegetationIndexFunctorType m_RadiometricNonWaterNonVegetationIndexFunctor;
- double m_LowerThreshold;
- double m_UpperThreshold;
+ double m_LowerThreshold;
+ double m_UpperThreshold;
};
} //end namespace functor
-
- /** \class UrbanAreaDetectionImageFilter
- * \brief This filter uses associated functors to produce a binary or grayscale image
- * \brief where the white areas represents the urban areas.
- */
+/** \class UrbanAreaDetectionImageFilter
+ * \brief This filter uses associated functors to produce a binary or grayscale image
+ * \brief where the white areas represents the urban areas.
+ */
template <class TInputImage, class TOutputImage,
class TFunction = Functor::RadiometricNonWaterNonVegetationIndexFunctor<
- typename TInputImage::PixelType,
- typename TOutputImage::PixelType> >
+ typename TInputImage::PixelType,
+ typename TOutputImage::PixelType> >
class ITK_EXPORT UrbanAreaDetectionImageFilter :
- public itk::ImageToImageFilter<TInputImage, TOutputImage>
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef UrbanAreaDetectionImageFilter Self;
- typedef itk::ImageToImageFilter< TInputImage,TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef UrbanAreaDetectionImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( UrbanAreaDetectionImageFilter, itk::ImageToImageFilter);
+ itkTypeMacro(UrbanAreaDetectionImageFilter, itk::ImageToImageFilter);
/** Images typedefs */
- typedef TInputImage VectorImageType;
- typedef TOutputImage OutputImageType;
- typedef double SingleImagePixelType;
- typedef Image<SingleImagePixelType, 2> SingleImageType;
- typedef SingleImageType::SizeType SizeType;
- typedef typename OutputImageType::PixelType OutputImagePixelType;
- typedef typename VectorImageType::PixelType VectorImagePixelType;
-
+ typedef TInputImage VectorImageType;
+ typedef TOutputImage OutputImageType;
+ typedef double SingleImagePixelType;
+ typedef Image<SingleImagePixelType, 2> SingleImageType;
+ typedef SingleImageType::SizeType SizeType;
+ typedef typename OutputImageType::PixelType OutputImagePixelType;
+ typedef typename VectorImageType::PixelType VectorImagePixelType;
/** Filters typedefs */
// NonVegetationNonWaterIndexFilter
- typedef Functor::RadiometricNonWaterNonVegetationDetectionFunctor< VectorImagePixelType, OutputImagePixelType > FunctorType;
- typedef MultiChannelRAndGAndNIRIndexImageFilter < VectorImageType,OutputImageType, FunctorType > UrbanAreaExtractionFilterType;
- typedef typename UrbanAreaExtractionFilterType::Pointer UrbanAreaExtrationFilterPointerType;
+ typedef Functor::RadiometricNonWaterNonVegetationDetectionFunctor<VectorImagePixelType,
+ OutputImagePixelType> FunctorType;
+ typedef MultiChannelRAndGAndNIRIndexImageFilter <VectorImageType, OutputImageType,
+ FunctorType> UrbanAreaExtractionFilterType;
+ typedef typename UrbanAreaExtractionFilterType::Pointer
+ UrbanAreaExtrationFilterPointerType;
// Erode/Dilate Filters
- typedef typename itk::BinaryBallStructuringElement< OutputImagePixelType, 2 > StructuringElementType;
- typedef typename itk::BinaryErodeImageFilter<OutputImageType,OutputImageType,StructuringElementType> ErodeFilterType;
- typedef typename itk::BinaryDilateImageFilter<OutputImageType,OutputImageType,StructuringElementType> DilateFilterType;
+ typedef typename itk::BinaryBallStructuringElement<OutputImagePixelType,
+ 2> StructuringElementType;
+ typedef typename itk::BinaryErodeImageFilter<OutputImageType, OutputImageType,
+ StructuringElementType> ErodeFilterType;
+ typedef typename itk::BinaryDilateImageFilter<OutputImageType, OutputImageType,
+ StructuringElementType> DilateFilterType;
// MaskImageFilter
- typedef typename itk::MaskImageFilter<VectorImageType,OutputImageType> MaskImageFilterType;
- typedef typename MaskImageFilterType::Pointer MaskImageFilterPointerType;
+ typedef typename itk::MaskImageFilter<VectorImageType, OutputImageType> MaskImageFilterType;
+ typedef typename MaskImageFilterType::Pointer MaskImageFilterPointerType;
// Intensity
- typedef VectorImageToIntensityImageFilter<VectorImageType, SingleImageType> IntensityFilterType;
- typedef typename IntensityFilterType::Pointer IntensityFilterPointerType;
+ typedef VectorImageToIntensityImageFilter<VectorImageType, SingleImageType> IntensityFilterType;
+ typedef typename IntensityFilterType::Pointer IntensityFilterPointerType;
// EdgeDensityFilter
- typedef BinaryImageDensityFunction<SingleImageType> CountFunctionType;
- typedef itk::SobelEdgeDetectionImageFilter<SingleImageType , SingleImageType> SobelType;
- typedef EdgeDetectorImageFilter<SingleImageType, SingleImageType, SobelType> SobelDetectorType;
- typedef EdgeDensityImageFilter<SingleImageType, SingleImageType, SobelDetectorType, CountFunctionType> EdgeDensityFilterType;
- typedef typename EdgeDensityFilterType::Pointer EdgeDensityFilterPointerType;
+ typedef BinaryImageDensityFunction<SingleImageType>
+ CountFunctionType;
+ typedef itk::SobelEdgeDetectionImageFilter<SingleImageType, SingleImageType> SobelType;
+ typedef EdgeDetectorImageFilter<SingleImageType, SingleImageType,
+ SobelType> SobelDetectorType;
+ typedef EdgeDensityImageFilter<SingleImageType, SingleImageType, SobelDetectorType,
+ CountFunctionType> EdgeDensityFilterType;
+ typedef typename EdgeDensityFilterType::Pointer
+ EdgeDensityFilterPointerType;
// Threshold
- typedef itk::BinaryThresholdImageFilter<SingleImageType,OutputImageType> ThresholdFilterType;
- typedef typename ThresholdFilterType::Pointer ThresholdFilterPointerType;
+ typedef itk::BinaryThresholdImageFilter<SingleImageType, OutputImageType> ThresholdFilterType;
+ typedef typename ThresholdFilterType::Pointer ThresholdFilterPointerType;
// Multiply
- typedef itk::MultiplyImageFilter<VectorImageType,OutputImageType,VectorImageType> MultiplyImageFilterType;
- typedef typename MultiplyImageFilterType::Pointer MultiplyImageFilterPointerType;
+ typedef itk::MultiplyImageFilter<VectorImageType, OutputImageType, VectorImageType> MultiplyImageFilterType;
+ typedef typename MultiplyImageFilterType::Pointer MultiplyImageFilterPointerType;
/** Get/Set indices */
- void SetRedIndex(int id){ m_UrbanAreaExtractionFilter->SetRedIndex( id ); };
- void SetGreenIndex(int id){ m_UrbanAreaExtractionFilter->SetGreenIndex( id ); };
- void SetNIRIndex(int id){ m_UrbanAreaExtractionFilter->SetNIRIndex( id ); };
- unsigned int GetRedIndex(){ return m_UrbanAreaExtractionFilter->GetRedIndex(); };
- unsigned int GetGreenIndex(){ return m_UrbanAreaExtractionFilter->GetGreenIndex(); };
- unsigned int GetNIRIndex(){ return m_UrbanAreaExtractionFilter->GetNIRIndex(); };
+ void SetRedIndex(int id){ m_UrbanAreaExtractionFilter->SetRedIndex(id); }
+ void SetGreenIndex(int id){ m_UrbanAreaExtractionFilter->SetGreenIndex(id); }
+ void SetNIRIndex(int id){ m_UrbanAreaExtractionFilter->SetNIRIndex(id); }
+ unsigned int GetRedIndex(){ return m_UrbanAreaExtractionFilter->GetRedIndex(); }
+ unsigned int GetGreenIndex(){ return m_UrbanAreaExtractionFilter->GetGreenIndex(); }
+ unsigned int GetNIRIndex(){ return m_UrbanAreaExtractionFilter->GetNIRIndex(); }
/** Get/Set threshold values */
itkGetMacro(ThresholdValue, double);
itkSetMacro(ThresholdValue, double);
@@ -235,11 +240,11 @@ public:
protected:
UrbanAreaDetectionImageFilter();
- virtual ~UrbanAreaDetectionImageFilter(){};
+ virtual ~UrbanAreaDetectionImageFilter(){}
private:
- UrbanAreaDetectionImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ UrbanAreaDetectionImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Filters */
IntensityFilterPointerType m_IntensityFilter;
@@ -250,7 +255,6 @@ private:
MaskImageFilterPointerType m_MaskImageFilter;
MultiplyImageFilterPointerType m_MultiplyFilter;
-
/** Thresholds */
double m_ThresholdValue;
double m_ThresholdDensity;
@@ -267,4 +271,3 @@ private:
#endif
#endif
-
diff --git a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.txx b/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.txx
index 16a26508c0..8b37c9ceef 100644
--- a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.txx
+++ b/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.txx
@@ -81,14 +81,14 @@ UrbanAreaDetectionImageFilter<TInputImage, TOutputImage, TFunction>
// Threshold
m_Thresholder->SetInsideValue(0);
m_Thresholder->SetOutsideValue(1);
- m_Thresholder->SetLowerThreshold( -10. );
- m_Thresholder->SetUpperThreshold( m_ThresholdDensity );
+ m_Thresholder->SetLowerThreshold(-10.);
+ m_Thresholder->SetUpperThreshold(m_ThresholdDensity);
// Apply the mask on the input image
m_MultiplyFilter->SetInput1(this->GetInput());
// Give a threshold to urbanAreaFilter
- m_UrbanAreaExtractionFilter->GetFunctor().SetLowerThreshold( m_ThresholdValue );
+ m_UrbanAreaExtractionFilter->GetFunctor().SetLowerThreshold(m_ThresholdValue);
// Progress accumulator
itk::ProgressAccumulator::Pointer progress = itk::ProgressAccumulator::New();
@@ -104,5 +104,4 @@ UrbanAreaDetectionImageFilter<TInputImage, TOutputImage, TFunction>
} // end namespace otb
-
#endif
diff --git a/Code/FeatureExtraction/otbVarianceTextureFunctor.h b/Code/FeatureExtraction/otbVarianceTextureFunctor.h
index e3380ca790..d2398f2e85 100644
--- a/Code/FeatureExtraction/otbVarianceTextureFunctor.h
+++ b/Code/FeatureExtraction/otbVarianceTextureFunctor.h
@@ -42,40 +42,37 @@ namespace Functor
template <class TScalarInputPixelType, class TScalarOutputPixelType>
class ITK_EXPORT VarianceTextureFunctor :
-public MeanTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType>
+ public MeanTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType>
{
public:
VarianceTextureFunctor(){};
- virtual ~VarianceTextureFunctor(){};
+ virtual ~VarianceTextureFunctor(){}
typedef MeanTextureFunctor<TScalarInputPixelType, TScalarOutputPixelType> Superclass;
typedef typename Superclass::NeighborhoodType NeighborhoodType;
-
- virtual double ComputeOverSingleChannel(const NeighborhoodType &neigh, const NeighborhoodType &neighOff)
+ virtual double ComputeOverSingleChannel(const NeighborhoodType& neigh, const NeighborhoodType& neighOff)
{
this->ComputeJointHistogram(neigh, neighOff);
double mean = Superclass::ComputeOverSingleChannel(neigh, neighOff);
- double area = static_cast<double>(neigh.GetSize()[0]*neigh.GetSize()[1]);
- double areaInv = 1/area;
+ double area = static_cast<double>(neigh.GetSize()[0] * neigh.GetSize()[1]);
+ double areaInv = 1 / area;
double out = 0.;
- for (unsigned r = 0; r<this->GetHisto().size(); ++r)
+ for (unsigned r = 0; r < this->GetHisto().size(); ++r)
{
- for (unsigned s = 0; s<this->GetHisto()[r].size(); ++s)
- {
- double p = static_cast<double>(this->GetHisto()[r][s]) * areaInv;
- double square = vcl_pow( ( ( (static_cast<double>(s)+0.5)*this->GetNeighBinLength() ) - mean), 2);
- out += square*p;
- }
+ for (unsigned s = 0; s < this->GetHisto()[r].size(); ++s)
+ {
+ double p = static_cast<double>(this->GetHisto()[r][s]) * areaInv;
+ double square = vcl_pow((((static_cast<double>(s) + 0.5) * this->GetNeighBinLength()) - mean), 2);
+ out += square * p;
+ }
}
return out;
}
};
-
} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/FeatureExtraction/otbVectorizationPathListFilter.h b/Code/FeatureExtraction/otbVectorizationPathListFilter.h
index ebe8fa4e7f..91f2f71e9e 100644
--- a/Code/FeatureExtraction/otbVectorizationPathListFilter.h
+++ b/Code/FeatureExtraction/otbVectorizationPathListFilter.h
@@ -41,14 +41,14 @@ namespace otb
*/
template <class TInputModulus, class TInputDirection, class TOutputPath>
class ITK_EXPORT VectorizationPathListFilter
- : public PathListSource<TOutputPath>
+ : public PathListSource<TOutputPath>
{
public:
/** Standard typedefs */
- typedef VectorizationPathListFilter Self;
- typedef PathListSource<TOutputPath> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef VectorizationPathListFilter Self;
+ typedef PathListSource<TOutputPath> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -57,7 +57,7 @@ public:
itkTypeMacro(VectorizationPathListFilter, PathListSource);
/** Template parameters typedefs */
- typedef TInputModulus InputModulusType;
+ typedef TInputModulus InputModulusType;
typedef typename InputModulusType::ConstPointer InputModulusConstPointerType;
typedef typename InputModulusType::PixelType InputPixelType;
typedef typename InputModulusType::PointType PointType;
@@ -81,14 +81,14 @@ public:
void SetInputDirection(InputDirectionType * inputDirection);
const InputDirectionType * GetInputDirection(void);
- itkSetMacro(AmplitudeThreshold,InputPixelType);
- itkGetMacro(AmplitudeThreshold,InputPixelType);
+ itkSetMacro(AmplitudeThreshold, InputPixelType);
+ itkGetMacro(AmplitudeThreshold, InputPixelType);
protected:
/** Other internal useful typedefs */
- typedef otb::Image<bool,InputModulusType::ImageDimension> FlagImageType;
- typedef typename FlagImageType::Pointer FlagImagePointerType;
+ typedef otb::Image<bool, InputModulusType::ImageDimension> FlagImageType;
+ typedef typename FlagImageType::Pointer FlagImagePointerType;
typedef itk::ImageRegionConstIterator<InputModulusType> ModRegionIteratorType;
typedef itk::ImageRegionConstIterator<InputDirectionType> DirRegionIteratorType;
@@ -98,9 +98,9 @@ protected:
typedef itk::ConstantBoundaryCondition<InputDirectionType> DirBCType;
typedef itk::ConstantBoundaryCondition<FlagImageType> FlagBCType;
- typedef itk::ConstNeighborhoodIterator<InputModulusType,ModBCType> ModNeighborhoodIteratorType;
- typedef itk::ConstNeighborhoodIterator<InputDirectionType,ModBCType> DirNeighborhoodIteratorType;
- typedef itk::NeighborhoodIterator<FlagImageType,FlagBCType> FlagNeighborhoodIteratorType;
+ typedef itk::ConstNeighborhoodIterator<InputModulusType, ModBCType> ModNeighborhoodIteratorType;
+ typedef itk::ConstNeighborhoodIterator<InputDirectionType, ModBCType> DirNeighborhoodIteratorType;
+ typedef itk::NeighborhoodIterator<FlagImageType, FlagBCType> FlagNeighborhoodIteratorType;
typedef typename ModNeighborhoodIteratorType::RadiusType RadiusType;
typedef typename ModNeighborhoodIteratorType::OffsetType OffsetType;
@@ -113,7 +113,7 @@ protected:
/** Constructor */
VectorizationPathListFilter();
/** Destructor */
- virtual ~VectorizationPathListFilter() {};
+ virtual ~VectorizationPathListFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Main computation method */
@@ -133,12 +133,12 @@ protected:
*/
OffsetVectorType GetThreeNeighborOffsetFromDirection(double direction, unsigned int flagReverse);
private:
- VectorizationPathListFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorizationPathListFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Amplitude threshold to start following a path */
InputPixelType m_AmplitudeThreshold;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbVectorizationPathListFilter.txx"
#endif
diff --git a/Code/FeatureExtraction/otbVectorizationPathListFilter.txx b/Code/FeatureExtraction/otbVectorizationPathListFilter.txx
index 04fddc4795..50221ed286 100644
--- a/Code/FeatureExtraction/otbVectorizationPathListFilter.txx
+++ b/Code/FeatureExtraction/otbVectorizationPathListFilter.txx
@@ -41,7 +41,7 @@ void
VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
::SetInput(InputModulusType * inputModulus)
{
- this->itk::ProcessObject::SetNthInput(0,const_cast<InputModulusType *>(inputModulus));
+ this->itk::ProcessObject::SetNthInput(0, const_cast<InputModulusType *>(inputModulus));
}
template <class TInputModulus, class TInputDirection, class TOutputPath>
@@ -51,9 +51,9 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
return static_cast<const TInputModulus*>(this->itk::ProcessObject::GetInput(0));
}
@@ -62,7 +62,7 @@ void
VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
::SetInputDirection(InputDirectionType * inputDirection)
{
- this->itk::ProcessObject::SetNthInput(1,const_cast<InputDirectionType *>(inputDirection));
+ this->itk::ProcessObject::SetNthInput(1, const_cast<InputDirectionType *>(inputDirection));
}
template <class TInputModulus, class TInputDirection, class TOutputPath>
@@ -72,9 +72,9 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
::GetInputDirection(void)
{
if (this->GetNumberOfInputs() < 2)
- {
+ {
return 0;
- }
+ }
return static_cast<const TInputDirection *>(this->itk::ProcessObject::GetInput(1));
}
@@ -86,9 +86,9 @@ void
VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
::GenerateData(void)
{
- InputModulusConstPointerType modPtr = this->GetInput();
+ InputModulusConstPointerType modPtr = this->GetInput();
InputDirectionConstPointerType dirPtr = this->GetInputDirection();
- OutputPathListPointerType outPtr = this->GetOutput();
+ OutputPathListPointerType outPtr = this->GetOutput();
typedef typename OffsetVectorType::iterator OffsetIteratorType;
@@ -103,122 +103,122 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
flagImage->FillBuffer(false);
// Iterators instantiation
- ModRegionIteratorType modIt(modPtr,modPtr->GetLargestPossibleRegion());
- DirRegionIteratorType dirIt(dirPtr,dirPtr->GetLargestPossibleRegion());
- FlagRegionIteratorType flagIt(flagImage,flagImage->GetLargestPossibleRegion());
+ ModRegionIteratorType modIt(modPtr, modPtr->GetLargestPossibleRegion());
+ DirRegionIteratorType dirIt(dirPtr, dirPtr->GetLargestPossibleRegion());
+ FlagRegionIteratorType flagIt(flagImage, flagImage->GetLargestPossibleRegion());
for (modIt.GoToBegin(), dirIt.GoToBegin(), flagIt.GoToBegin();
(!modIt.IsAtEnd()) && (!dirIt.IsAtEnd()) && (!flagIt.IsAtEnd());
++modIt, ++dirIt, ++flagIt)
- {
- if ((modIt.Get() > m_AmplitudeThreshold) && (!flagIt.Get()))
{
+ if ((modIt.Get() > m_AmplitudeThreshold) && (!flagIt.Get()))
+ {
//this is a beginning, to follow in two directions
OutputPathPointerType pathTempDirect = OutputPathType::New();
OutputPathPointerType pathTempReverse = OutputPathType::New();
OutputPathPointerType path = OutputPathType::New();
- bool flagFinish;
- int flagReverse = 0;
+ bool flagFinish;
+ int flagReverse = 0;
double totalAmplitude = 0;
ModNeighborhoodIteratorType nModIt(radius, modPtr, modPtr->GetLargestPossibleRegion());
DirNeighborhoodIteratorType nDirIt(radius, dirPtr, dirPtr->GetLargestPossibleRegion());
FlagNeighborhoodIteratorType nFlagIt(radius, flagImage, flagImage->GetLargestPossibleRegion());
- for (flagReverse=0; flagReverse < 2; ++flagReverse)
- {
+ for (flagReverse = 0; flagReverse < 2; ++flagReverse)
+ {
nModIt.SetLocation(modIt.GetIndex());
nDirIt.SetLocation(dirIt.GetIndex());
nFlagIt.SetLocation(flagIt.GetIndex());
// temporary point
- PointType point;
+ PointType point;
VertexType vertex;
- modPtr->TransformIndexToPhysicalPoint(nModIt.GetIndex(),point);
- modPtr->TransformPhysicalPointToContinuousIndex(point,vertex);
- if (flagReverse==0)
- {
+ modPtr->TransformIndexToPhysicalPoint(nModIt.GetIndex(), point);
+ modPtr->TransformPhysicalPointToContinuousIndex(point, vertex);
+ if (flagReverse == 0)
+ {
flagIt.Set(true);
// otbMsgDebugMacro(<<"Adding new vertex: "<<vertex);
pathTempDirect->AddVertex(vertex);
- }
+ }
flagFinish = false;
while (!flagFinish)
- {
- offsetVector = GetThreeNeighborOffsetFromDirection(nDirIt.GetCenterPixel(),flagReverse);
+ {
+ offsetVector = GetThreeNeighborOffsetFromDirection(nDirIt.GetCenterPixel(), flagReverse);
OffsetIteratorType vecIt = offsetVector.begin();
- bool flagFound=false;
+ bool flagFound = false;
while (vecIt != offsetVector.end() && !flagFound)
- {
+ {
flagFound = nModIt.GetPixel(*vecIt) > 0
&& !nFlagIt.GetPixel(*vecIt);
++vecIt;
- }
+ }
if (flagFound)
- {
+ {
point.Fill(0);
PointType tmpPoint;
totalAmplitude = 0;
for (vecIt = offsetVector.begin(); vecIt != offsetVector.end(); ++vecIt)
- {
+ {
double currentAmplitude = nModIt.GetPixel(*vecIt);
- modPtr->TransformIndexToPhysicalPoint(nModIt.GetIndex(*vecIt),tmpPoint);
+ modPtr->TransformIndexToPhysicalPoint(nModIt.GetIndex(*vecIt), tmpPoint);
point[0] += currentAmplitude * tmpPoint[0];
point[1] += currentAmplitude * tmpPoint[1];
totalAmplitude += currentAmplitude;
- }
+ }
point[0] = point[0] / totalAmplitude;
point[1] = point[1] / totalAmplitude;
- modPtr->TransformPhysicalPointToContinuousIndex(point,vertex);
+ modPtr->TransformPhysicalPointToContinuousIndex(point, vertex);
if (flagReverse == 0)
- {
+ {
// otbMsgDevMacro(<<"Adding new vertex (direct): "<<vertex);
pathTempDirect->AddVertex(vertex);
- }
+ }
else
- {
+ {
// otbMsgDevMacro(<<"Adding new vertex (reverse): "<<vertex);
pathTempReverse->AddVertex(vertex);
- }
+ }
// flag the pixel use
nFlagIt.SetCenterPixel(true);
//update the neighbor iterators so they are centered on the nearest pixel to the barycenter
IndexType newIndex;
- if (modPtr->TransformPhysicalPointToIndex(point,newIndex))
- {
+ if (modPtr->TransformPhysicalPointToIndex(point, newIndex))
+ {
// otbMsgDevMacro(<<"Moving to new center: " << newIndex);
nModIt.SetLocation(newIndex);
nDirIt.SetLocation(newIndex);
nFlagIt.SetLocation(newIndex);
if (nModIt.GetCenterPixel() == 0)
- {
+ {
//we need to check that in case the barycenter is out...
- flagFinish=true;
- }
+ flagFinish = true;
+ }
if (nFlagIt.GetCenterPixel())
- {
+ {
//we don't want to go back to the same pixels
- flagFinish=true;
+ flagFinish = true;
+ }
}
- }
else
- {
+ {
//new point outside image
- flagFinish=true;
+ flagFinish = true;
+ }
}
- }
else
- {
- flagFinish=true;
+ {
+ flagFinish = true;
+ }
}
}
- }
VertexListPointerType vertexDirect = pathTempDirect->GetVertexList();
VertexListPointerType vertexReverse = pathTempReverse->GetVertexList();
@@ -226,34 +226,33 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
VertexIteratorType vertexReverseIt = vertexReverse->End();
if (vertexReverseIt != vertexReverse->Begin())
- {
- --vertexReverseIt;
- while ( vertexReverseIt != vertexReverse->Begin())
{
+ --vertexReverseIt;
+ while (vertexReverseIt != vertexReverse->Begin())
+ {
path->AddVertex(vertexReverseIt.Value());
++numberVertex;
--vertexReverseIt;
- }
+ }
path->AddVertex(vertexReverseIt.Value());
- }
-
+ }
VertexIteratorType vertexDirectIt = vertexDirect->Begin();
- while ( vertexDirectIt != vertexDirect->End())
- {
+ while (vertexDirectIt != vertexDirect->End())
+ {
path->AddVertex(vertexDirectIt.Value());
++vertexDirectIt;
++numberVertex;
- }
+ }
// otbMsgDebugMacro(<<"Path number of vertices: "<<numberVertex);
if (numberVertex > 3)
- {
+ {
outPtr->PushBack(path);
+ }
}
}
- }
}
/**
@@ -268,28 +267,28 @@ typename VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath
VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
::GetEightNeighborOffsetFromDirection(double direction, unsigned int flagReverse)
{
- int neighborhoodNumber=0;
+ int neighborhoodNumber = 0;
OffsetVectorType offset;
offset.reserve(8);
if (direction > 0)
- {
+ {
//find the direction in terms of 0,1,2,3
- neighborhoodNumber = (int) (direction/(CONST_PI_4)-1);
- }
+ neighborhoodNumber = (int) (direction / (CONST_PI_4) -1);
+ }
else
- {
- neighborhoodNumber = (int) ((direction+CONST_PI)/(CONST_PI_4)-1);
+ {
+ neighborhoodNumber = (int) ((direction + CONST_PI) / (CONST_PI_4) -1);
neighborhoodNumber = (neighborhoodNumber + 4);
//if the direction was <0 need to convert to 4,5,6,7
- }
+ }
if (flagReverse)
- {
+ {
//if the reverse flag is activated we need to look on the other side
neighborhoodNumber = (neighborhoodNumber + 4) % 8;
- }
+ }
OffsetType tmpOffset;
- switch ( neighborhoodNumber )
- {
+ switch (neighborhoodNumber)
+ {
case 0:
tmpOffset[0] = 1;
tmpOffset[1] = 0;
@@ -514,7 +513,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
tmpOffset[1] = 2;
offset.push_back(tmpOffset);
break;
- }
+ }
return offset;
}
@@ -530,29 +529,29 @@ typename VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath
VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
::GetThreeNeighborOffsetFromDirection(double direction, unsigned int flagReverse)
{
- int neighborhoodNumber=0;
+ int neighborhoodNumber = 0;
OffsetVectorType offset;
offset.reserve(3);
if (direction > 0)
- {
+ {
//find the direction in terms of 0,1,2,3
- neighborhoodNumber = (int) (direction/(CONST_PI_4)-1);
- }
+ neighborhoodNumber = (int) (direction / (CONST_PI_4) -1);
+ }
else
- {
- neighborhoodNumber = (int) ((direction+CONST_PI)/(CONST_PI_4)-1);
+ {
+ neighborhoodNumber = (int) ((direction + CONST_PI) / (CONST_PI_4) -1);
neighborhoodNumber = (neighborhoodNumber + 4);
//if the direction was <0 need to convert to 4,5,6,7
- }
+ }
if (flagReverse)
- {
+ {
//if the reverse flag is activated we need to look on the other side
neighborhoodNumber = (neighborhoodNumber + 4) % 8;
- }
+ }
OffsetType tmpOffset;
// otbMsgDevMacro(<<"Direction: " << neighborhoodNumber)
- switch ( neighborhoodNumber )
- {
+ switch (neighborhoodNumber)
+ {
case 0:
tmpOffset[0] = 1;
tmpOffset[1] = 0;
@@ -656,7 +655,7 @@ VectorizationPathListFilter<TInputModulus, TInputDirection, TOutputPath>
offset.push_back(tmpOffset);
break;
- }
+ }
return offset;
}
diff --git a/Code/Fusion/otbBayesianFusionFilter.h b/Code/Fusion/otbBayesianFusionFilter.h
index 6e513e8f8f..d23b623b7e 100644
--- a/Code/Fusion/otbBayesianFusionFilter.h
+++ b/Code/Fusion/otbBayesianFusionFilter.h
@@ -32,7 +32,6 @@
#include "otbImageToVectorImageCastFilter.h"
#include "itkVariableSizeMatrix.h"
-
namespace otb
{
@@ -43,117 +42,118 @@ namespace Functor
*
*/
template <class TInputMultiSpectral,
-class TInputMultiSpectralInterp,
-class TInputPanchro,
-class TOutput>
+ class TInputMultiSpectralInterp,
+ class TInputPanchro,
+ class TOutput>
class BayesianFunctor
{
public:
- BayesianFunctor() {};
- virtual ~BayesianFunctor() {};
- typedef typename TInputMultiSpectral::RealValueType RealType;
- typedef typename itk::VariableSizeMatrix<RealType> MatrixType;
+ BayesianFunctor() {}
+ virtual ~BayesianFunctor() {}
+ typedef typename TInputMultiSpectral::RealValueType RealType;
+ typedef typename itk::VariableSizeMatrix<RealType> MatrixType;
void SetLambda(float lambda)
{
m_Lambda = lambda;
- };
+ }
void SetS(float S)
{
m_S = S;
- };
+ }
void SetAlpha(float alpha)
{
m_Alpha = alpha;
- };
+ }
void SetBeta(MatrixType matrix)
{
m_Beta = matrix;
- };
+ }
void SetCovarianceInvMatrix(MatrixType matrix)
{
m_CovarianceInvMatrix = matrix;
- };
+ }
void SetVcondopt(MatrixType matrix)
{
m_Vcondopt = matrix;
- };
+ }
float GetLambda()
{
return m_Lambda;
- };
+ }
float GetAlpha()
{
return m_Alpha;
- };
+ }
float GetS()
{
return m_S;
- };
+ }
MatrixType GetBeta()
{
return m_Beta;
- };
+ }
MatrixType GetCovarianceInvMatrix()
{
return m_CovarianceInvMatrix;
- };
+ }
MatrixType GetVcondopt()
{
return m_Vcondopt;
- };
-
+ }
- inline TOutput operator() (const TInputMultiSpectral & ms, const TInputMultiSpectralInterp & msi, const TInputPanchro & p)
+ inline TOutput operator ()(const TInputMultiSpectral& ms,
+ const TInputMultiSpectralInterp& msi,
+ const TInputPanchro& p)
{
TOutput obs;
obs.SetSize(msi.GetSize());
MatrixType obsMat, msiVect;
obsMat.SetSize(1, obs.GetSize());
msiVect.SetSize(1, msi.GetSize());
- for (unsigned int i=0; i<msi.GetSize();++i)
- {
+ for (unsigned int i = 0; i < msi.GetSize(); ++i)
+ {
msiVect(0, i) = msi[i];
- }
- obsMat = msiVect*m_CovarianceInvMatrix;
- obsMat *= 2*(1-m_Lambda);
+ }
+ obsMat = msiVect * m_CovarianceInvMatrix;
+ obsMat *= 2 * (1 - m_Lambda);
MatrixType PanVect;
PanVect = m_Beta.GetTranspose();
- PanVect *= (p-m_Alpha);
+ PanVect *= (p - m_Alpha);
PanVect /= m_S;
- PanVect *= 2*m_Lambda;
+ PanVect *= 2 * m_Lambda;
/** TODO
* To modify using + method operator. If we use it now -> exceptionmacro (no GetClassName...)
* obsMat += PanVect;
**/
- if ( (obsMat.Cols() != PanVect.Cols()) || (obsMat.Rows() != PanVect.Rows()) )
- {
- itkGenericExceptionMacro( << "Matrix with size (" << obsMat.Rows() << "," <<
- obsMat.Cols() << ") cannot be subtracted from matrix with size (" <<
- PanVect.Rows() << "," << PanVect.Cols() << " )" );
- }
-
- for ( unsigned int r=0; r<obsMat.Rows(); ++r)
- {
- for ( unsigned int c=0; c<obsMat.Cols(); ++c )
+ if ((obsMat.Cols() != PanVect.Cols()) || (obsMat.Rows() != PanVect.Rows()))
+ {
+ itkGenericExceptionMacro(<< "Matrix with size (" << obsMat.Rows() << "," <<
+ obsMat.Cols() << ") cannot be subtracted from matrix with size (" <<
+ PanVect.Rows() << "," << PanVect.Cols() << " )");
+ }
+
+ for (unsigned int r = 0; r < obsMat.Rows(); ++r)
{
- obsMat(r,c) += PanVect(r,c);
+ for (unsigned int c = 0; c < obsMat.Cols(); ++c)
+ {
+ obsMat(r, c) += PanVect(r, c);
+ }
}
- }
//**** END TODO ****/
obsMat *= m_Vcondopt;
- for (unsigned int i=0; i<obs.GetSize();++i)
- {
- obs[i] = static_cast<typename TOutput::ValueType>(obsMat(0U,i));
- }
+ for (unsigned int i = 0; i < obs.GetSize(); ++i)
+ {
+ obs[i] = static_cast<typename TOutput::ValueType>(obsMat(0U, i));
+ }
return obs;
}
private:
- float m_Lambda;
- float m_S;
- float m_Alpha;
+ float m_Lambda;
+ float m_S;
+ float m_Alpha;
MatrixType m_CovarianceInvMatrix;
MatrixType m_Beta;
MatrixType m_Vcondopt;
@@ -165,7 +165,6 @@ private:
*/
/***** END TODO ***/
-
/** \class BayesianFusionFilter
* \brief Bayesian fusion filter. Contribution of Julien Radoux
*
@@ -190,23 +189,23 @@ private:
*/
template <class TInputMultiSpectralImage,
-class TInputMultiSpectralInterpImage,
-class TInputPanchroImage,
-class TOutputImage>
+ class TInputMultiSpectralInterpImage,
+ class TInputPanchroImage,
+ class TOutputImage>
class ITK_EXPORT BayesianFusionFilter
- : public FusionImageBase<TInputMultiSpectralImage,
- TInputMultiSpectralInterpImage,
- TInputPanchroImage,
- TOutputImage,
- Functor::BayesianFunctor<ITK_TYPENAME TInputMultiSpectralImage::PixelType,
- ITK_TYPENAME TInputMultiSpectralInterpImage::PixelType,
- ITK_TYPENAME TInputPanchroImage::PixelType,
- ITK_TYPENAME TOutputImage::PixelType> >
+ : public FusionImageBase<TInputMultiSpectralImage,
+ TInputMultiSpectralInterpImage,
+ TInputPanchroImage,
+ TOutputImage,
+ Functor::BayesianFunctor<ITK_TYPENAME TInputMultiSpectralImage::PixelType,
+ ITK_TYPENAME TInputMultiSpectralInterpImage::PixelType,
+ ITK_TYPENAME TInputPanchroImage::PixelType,
+ ITK_TYPENAME TOutputImage::PixelType> >
{
public:
/** Extract input and output images dimensions.*/
- itkStaticConstMacro( InputImageDimension, unsigned int, TInputMultiSpectralImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputMultiSpectralImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
/** "typedef" to simplify the variables definition and the declaration. */
typedef TInputMultiSpectralImage InputMultiSpectralImageType;
@@ -214,19 +213,18 @@ public:
typedef TInputPanchroImage InputPanchroImageType;
typedef TOutputImage OutputImageType;
-
/** "typedef" for standard classes. */
typedef BayesianFusionFilter Self;
- typedef FusionImageBase< InputMultiSpectralImageType,
- InputMultiSpectralInterpImageType,
- InputPanchroImageType,
- OutputImageType,
- Functor::BayesianFunctor<ITK_TYPENAME InputMultiSpectralImageType::PixelType,
- ITK_TYPENAME InputMultiSpectralInterpImageType::PixelType,
- ITK_TYPENAME InputPanchroImageType::PixelType,
- ITK_TYPENAME OutputImageType::PixelType> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef FusionImageBase<InputMultiSpectralImageType,
+ InputMultiSpectralInterpImageType,
+ InputPanchroImageType,
+ OutputImageType,
+ Functor::BayesianFunctor<ITK_TYPENAME InputMultiSpectralImageType::PixelType,
+ ITK_TYPENAME InputMultiSpectralInterpImageType::PixelType,
+ ITK_TYPENAME InputPanchroImageType::PixelType,
+ ITK_TYPENAME OutputImageType::PixelType> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** object factory method. */
itkNewMacro(Self);
@@ -235,34 +233,38 @@ public:
itkTypeMacro(BayesianFusionFilter, FusionImageBase);
/** Supported images definition. */
- typedef typename InputMultiSpectralImageType::PixelType InputMultiSpectralPixelType;
- typedef typename InputMultiSpectralImageType::InternalPixelType InputMultiSpectralInternalPixelType;
- typedef typename InputMultiSpectralInterpImageType::PixelType InputMultiSpectralInterpPixelType;
- typedef typename InputMultiSpectralInterpImageType::InternalPixelType InputMultiSpectralInterpInternalPixelType;
- typedef typename InputPanchroImageType::PixelType InputPanchroPixelType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
+ typedef typename InputMultiSpectralImageType::PixelType InputMultiSpectralPixelType;
+ typedef typename InputMultiSpectralImageType::InternalPixelType InputMultiSpectralInternalPixelType;
+ typedef typename InputMultiSpectralInterpImageType::PixelType InputMultiSpectralInterpPixelType;
+ typedef typename InputMultiSpectralInterpImageType::InternalPixelType InputMultiSpectralInterpInternalPixelType;
+ typedef typename InputPanchroImageType::PixelType InputPanchroPixelType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
/** Real class typedef definition. */
- typedef typename itk::NumericTraits<InputPanchroPixelType>::RealType InputPanchroRealType;
- typedef typename itk::NumericTraits<InputMultiSpectralInternalPixelType>::RealType InputMultiSpectralRealType;
- typedef typename InputMultiSpectralImageType::RegionType InputMultiSpectralImageRegionType;
- typedef typename itk::NumericTraits<InputMultiSpectralInterpInternalPixelType>::RealType InputMultiSpectralInterpRealType;
- typedef typename InputMultiSpectralInterpImageType::RegionType InputMultiSpectralInterpImageRegionType;
- typedef typename InputPanchroImageType::RegionType InputPanchroImageRegionType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
-
+ typedef typename itk::NumericTraits<InputPanchroPixelType>::RealType InputPanchroRealType;
+ typedef typename itk::NumericTraits<InputMultiSpectralInternalPixelType>::RealType InputMultiSpectralRealType;
+ typedef typename InputMultiSpectralImageType::RegionType
+ InputMultiSpectralImageRegionType;
+ typedef typename itk::NumericTraits<InputMultiSpectralInterpInternalPixelType>::RealType
+ InputMultiSpectralInterpRealType;
+ typedef typename InputMultiSpectralInterpImageType::RegionType
+ InputMultiSpectralInterpImageRegionType;
+ typedef typename InputPanchroImageType::RegionType InputPanchroImageRegionType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
/** Image size "typedef" definition. */
typedef typename InputMultiSpectralImageType::SizeType SizeType;
-
/** Typedef for statistic computing. */
- typedef StreamingStatisticsVectorImageFilter<InputMultiSpectralInterpImageType> StreamingStatisticsVectorImageFilterType;
- typedef typename StreamingStatisticsVectorImageFilterType::MatrixType MatrixType;
- typedef StreamingMatrixTransposeMatrixImageFilter<InputMultiSpectralImageType, InputMultiSpectralImageType> MSTransposeMSType;
- typedef ImageToVectorImageCastFilter<InputPanchroImageType, InputMultiSpectralImageType> CasterType;
-
+ typedef StreamingStatisticsVectorImageFilter<InputMultiSpectralInterpImageType>
+ StreamingStatisticsVectorImageFilterType;
+ typedef typename StreamingStatisticsVectorImageFilterType::MatrixType
+ MatrixType;
+ typedef StreamingMatrixTransposeMatrixImageFilter<InputMultiSpectralImageType,
+ InputMultiSpectralImageType> MSTransposeMSType;
+ typedef ImageToVectorImageCastFilter<InputPanchroImageType,
+ InputMultiSpectralImageType> CasterType;
/** Set the ponderation value. */
itkSetMacro(Lambda, float);
@@ -298,7 +300,7 @@ protected:
BayesianFusionFilter();
virtual ~BayesianFusionFilter();
/** Check if internal statistics need to be computed, and do so */
- void BeforeThreadedGenerateData ();
+ void BeforeThreadedGenerateData();
/** Compute internal statistics required for fusion */
void ComputeInternalStatistics(void);
/** Call the superclass implementation and set the StatisticsHaveBeenGenerated
@@ -308,7 +310,7 @@ protected:
private:
/** Ponderation declaration*/
float m_Lambda;
- float m_S;
+ float m_S;
/** Multispectral covariance matrix */
MatrixType m_CovarianceMatrix;
/** Multispectral inverse covariance matrix */
diff --git a/Code/Fusion/otbBayesianFusionFilter.txx b/Code/Fusion/otbBayesianFusionFilter.txx
index b74ea5256d..85d5d63757 100644
--- a/Code/Fusion/otbBayesianFusionFilter.txx
+++ b/Code/Fusion/otbBayesianFusionFilter.txx
@@ -23,18 +23,17 @@
#include "otbBayesianFusionFilter.h"
-
namespace otb
{
template <class TInputMultiSpectralImage,
-class TInputMultiSpectralInterpImage,
-class TInputPanchroImage,
-class TOutputImage>
+ class TInputMultiSpectralInterpImage,
+ class TInputPanchroImage,
+ class TOutputImage>
BayesianFusionFilter<TInputMultiSpectralImage,
-TInputMultiSpectralInterpImage,
-TInputPanchroImage,
-TOutputImage>
+ TInputMultiSpectralInterpImage,
+ TInputPanchroImage,
+ TOutputImage>
::BayesianFusionFilter()
{
m_Lambda = 0.9999;
@@ -42,28 +41,27 @@ TOutputImage>
m_StatisticsHaveBeenGenerated = false;
}
-
template <class TInputMultiSpectralImage,
-class TInputMultiSpectralInterpImage,
-class TInputPanchroImage,
-class TOutputImage>
+ class TInputMultiSpectralInterpImage,
+ class TInputPanchroImage,
+ class TOutputImage>
BayesianFusionFilter<TInputMultiSpectralImage,
-TInputMultiSpectralInterpImage,
-TInputPanchroImage,
-TOutputImage>
+ TInputMultiSpectralInterpImage,
+ TInputPanchroImage,
+ TOutputImage>
::~BayesianFusionFilter()
{
}
template <class TInputMultiSpectralImage,
-class TInputMultiSpectralInterpImage,
-class TInputPanchroImage,
-class TOutputImage>
+ class TInputMultiSpectralInterpImage,
+ class TInputPanchroImage,
+ class TOutputImage>
void
BayesianFusionFilter<TInputMultiSpectralImage,
-TInputMultiSpectralInterpImage,
-TInputPanchroImage,
-TOutputImage>
+ TInputMultiSpectralInterpImage,
+ TInputPanchroImage,
+ TOutputImage>
::Modified()
{
Superclass::Modified();
@@ -71,32 +69,32 @@ TOutputImage>
}
template <class TInputMultiSpectralImage,
-class TInputMultiSpectralInterpImage,
-class TInputPanchroImage,
-class TOutputImage>
+ class TInputMultiSpectralInterpImage,
+ class TInputPanchroImage,
+ class TOutputImage>
void
BayesianFusionFilter<TInputMultiSpectralImage,
-TInputMultiSpectralInterpImage,
-TInputPanchroImage,
-TOutputImage>
-::BeforeThreadedGenerateData ()
+ TInputMultiSpectralInterpImage,
+ TInputPanchroImage,
+ TOutputImage>
+::BeforeThreadedGenerateData()
{
if (!m_StatisticsHaveBeenGenerated)
- {
+ {
this->ComputeInternalStatistics();
m_StatisticsHaveBeenGenerated = true;
- }
+ }
}
template <class TInputMultiSpectralImage,
-class TInputMultiSpectralInterpImage,
-class TInputPanchroImage,
-class TOutputImage>
+ class TInputMultiSpectralInterpImage,
+ class TInputPanchroImage,
+ class TOutputImage>
void
BayesianFusionFilter<TInputMultiSpectralImage,
-TInputMultiSpectralInterpImage,
-TInputPanchroImage,
-TOutputImage>
+ TInputMultiSpectralInterpImage,
+ TInputPanchroImage,
+ TOutputImage>
::ComputeInternalStatistics()
{
OutputImageRegionType msiRequestedRegion = this->GetMultiSpectInterp()->GetRequestedRegion();
@@ -104,43 +102,48 @@ TOutputImage>
OutputImageRegionType panchroRequestedRegion = this->GetPanchro()->GetRequestedRegion();
// Allocate output
- typename OutputImageType::Pointer output = this->GetOutput();
- typename InputMultiSpectralImageType::Pointer multiSpec = const_cast<InputMultiSpectralImageType *>(this->GetMultiSpect());
- typename InputMultiSpectralInterpImageType::Pointer multiSpecInterp = const_cast<InputMultiSpectralInterpImageType *>(this->GetMultiSpectInterp());
- typename InputPanchroImageType::Pointer panchro = const_cast<InputPanchroImageType *>(this->GetPanchro());
+ typename OutputImageType::Pointer output = this->GetOutput();
+ typename InputMultiSpectralImageType::Pointer multiSpec = const_cast<InputMultiSpectralImageType *>(
+ this->GetMultiSpect());
+ typename InputMultiSpectralInterpImageType::Pointer multiSpecInterp = const_cast<InputMultiSpectralInterpImageType *>(
+ this->GetMultiSpectInterp());
+ typename InputPanchroImageType::Pointer panchro = const_cast<InputPanchroImageType *>(
+ this->GetPanchro());
/** Variable Initialisaton */
- m_Beta.SetSize(multiSpecInterp->GetNumberOfComponentsPerPixel()+1, 1);
+ m_Beta.SetSize(multiSpecInterp->GetNumberOfComponentsPerPixel() + 1, 1);
m_Beta.Fill(itk::NumericTraits<InputMultiSpectralInterpRealType>::Zero);
- m_CovarianceMatrix.SetSize( multiSpecInterp->GetNumberOfComponentsPerPixel(), multiSpecInterp->GetNumberOfComponentsPerPixel() );
+ m_CovarianceMatrix.SetSize(
+ multiSpecInterp->GetNumberOfComponentsPerPixel(), multiSpecInterp->GetNumberOfComponentsPerPixel());
m_CovarianceMatrix.Fill(itk::NumericTraits<InputMultiSpectralInterpRealType>::Zero);
- m_CovarianceInvMatrix.SetSize( multiSpecInterp->GetNumberOfComponentsPerPixel(), multiSpecInterp->GetNumberOfComponentsPerPixel() );
+ m_CovarianceInvMatrix.SetSize(
+ multiSpecInterp->GetNumberOfComponentsPerPixel(), multiSpecInterp->GetNumberOfComponentsPerPixel());
m_CovarianceInvMatrix.Fill(itk::NumericTraits<InputMultiSpectralInterpRealType>::Zero);
- m_Vcondopt.SetSize( multiSpecInterp->GetNumberOfComponentsPerPixel(), multiSpecInterp->GetNumberOfComponentsPerPixel() );
+ m_Vcondopt.SetSize(multiSpecInterp->GetNumberOfComponentsPerPixel(), multiSpecInterp->GetNumberOfComponentsPerPixel());
m_Vcondopt.Fill(itk::NumericTraits<InputMultiSpectralInterpRealType>::Zero);
/** Compute the inverse of the multispectral interpolated image covariance matrix */
- typename StreamingStatisticsVectorImageFilterType::Pointer covComputefilter = StreamingStatisticsVectorImageFilterType::New();
+ typename StreamingStatisticsVectorImageFilterType::Pointer covComputefilter =
+ StreamingStatisticsVectorImageFilterType::New();
covComputefilter->SetInput(multiSpecInterp);
covComputefilter->Update();
-
MatrixType m_CovarianceMatrix = covComputefilter->GetCovariance();
- otbMsgDebugMacro(<<"Covariance: "<<m_CovarianceMatrix);
+ otbMsgDebugMacro(<< "Covariance: " << m_CovarianceMatrix);
m_CovarianceInvMatrix = m_CovarianceMatrix.GetInverse();
/** Beta computation : Regression model coefficient */
// MatrixTransform only support vectorimage input
- typename CasterType::Pointer caster = CasterType::New();
+ typename CasterType::Pointer caster = CasterType::New();
caster->SetInput(panchro);
// caster->Update();
// Compute the transpose multispectral image multiplied by itself
- typename MSTransposeMSType::Pointer msTransposeMs = MSTransposeMSType::New();
+ typename MSTransposeMSType::Pointer msTransposeMs = MSTransposeMSType::New();
// Compute the transpose multispectral image multiplied by the panchromatic one
- typename MSTransposeMSType::Pointer msTransposePan = MSTransposeMSType::New();
+ typename MSTransposeMSType::Pointer msTransposePan = MSTransposeMSType::New();
// Add a dimension filled with ones to the images
msTransposeMs->SetUsePadFirstInput(true);
msTransposeMs->SetUsePadSecondInput(true);
@@ -150,101 +153,101 @@ TOutputImage>
msTransposeMs->SetSecondInput(multiSpec);
msTransposePan->SetFirstInput(multiSpec);
- msTransposePan->SetSecondInput( caster->GetOutput() );
+ msTransposePan->SetSecondInput(caster->GetOutput());
msTransposeMs->Update();
- otbMsgDebugMacro(<<"MsTMs: "<<msTransposeMs->GetResultOutput()->Get());
+ otbMsgDebugMacro(<< "MsTMs: " << msTransposeMs->GetResultOutput()->Get());
msTransposePan->Update();
- otbMsgDebugMacro(<<"MsTPan: "<<msTransposePan->GetResultOutput()->Get());
+ otbMsgDebugMacro(<< "MsTPan: " << msTransposePan->GetResultOutput()->Get());
MatrixType temp;
temp = msTransposeMs->GetResultOutput()->Get().GetInverse();
- m_Beta = temp*msTransposePan->GetResultOutput()->Get();
+ m_Beta = temp * msTransposePan->GetResultOutput()->Get();
// S computation : quadratique mean of the regression residue
// Compute the transpose panchromatic image multiplied by itself
- typename MSTransposeMSType::Pointer panTransposePan = MSTransposeMSType::New();
+ typename MSTransposeMSType::Pointer panTransposePan = MSTransposeMSType::New();
panTransposePan->SetFirstInput(caster->GetOutput());
panTransposePan->SetSecondInput(caster->GetOutput());
panTransposePan->Update();
- otbMsgDebugMacro(<<"PanTPan: "<<msTransposePan->GetResultOutput()->Get());
+ otbMsgDebugMacro(<< "PanTPan: " << msTransposePan->GetResultOutput()->Get());
MatrixType S, tempS, tempS2;
S = panTransposePan->GetResultOutput()->Get();
tempS = msTransposePan->GetResultOutput()->Get().GetTranspose();
- tempS = tempS*m_Beta;
+ tempS = tempS * m_Beta;
/** TODO
* To modify using - method operator. If we use it now -> exceptionmacro (no GetClassName...)
* S = S-tempS;
**/
- if ( (S.Rows() != tempS.Rows()) || (S.Cols() != tempS.Cols()))
- {
- itkExceptionMacro( << "Matrix with size (" << S.Rows() << "," <<
- S.Cols() << ") cannot be subtracted from matrix with size (" <<
- tempS.Rows() << "," << tempS.Cols() <<" )" );
- }
- for ( unsigned int r=0; r<S.Rows(); ++r)
- {
- for ( unsigned int c=0; c<S.Cols(); ++c )
+ if ((S.Rows() != tempS.Rows()) || (S.Cols() != tempS.Cols()))
{
- S(r,c) -= tempS(r,c);
+ itkExceptionMacro(<< "Matrix with size (" << S.Rows() << "," <<
+ S.Cols() << ") cannot be subtracted from matrix with size (" <<
+ tempS.Rows() << "," << tempS.Cols() << " )");
+ }
+ for (unsigned int r = 0; r < S.Rows(); ++r)
+ {
+ for (unsigned int c = 0; c < S.Cols(); ++c)
+ {
+ S(r, c) -= tempS(r, c);
+ }
}
- }
//**** END TODO ****/
tempS = m_Beta.GetTranspose();
tempS2 = msTransposePan->GetResultOutput()->Get();
- tempS = tempS*tempS2;
+ tempS = tempS * tempS2;
/** TODO
* To modify using - method operator. If we use it now -> exceptionmacro (no GetClassName...)
* S = S-tempS;
**/
- if ( (S.Rows() != tempS.Rows()) || (S.Cols() != tempS.Cols()) )
- {
- itkExceptionMacro( << "Matrix with size (" << S.Rows() << "," <<
- S.Cols() << ") cannot be subtracted from matrix with size (" <<
- tempS.Rows() << "," << tempS.Cols() << " )" );
-
- }
- for ( unsigned int r=0; r<S.Rows(); ++r)
- {
- for ( unsigned int c=0; c<S.Cols(); ++c )
+ if ((S.Rows() != tempS.Rows()) || (S.Cols() != tempS.Cols()))
{
- S(r,c) -= tempS(r,c);
+ itkExceptionMacro(<< "Matrix with size (" << S.Rows() << "," <<
+ S.Cols() << ") cannot be subtracted from matrix with size (" <<
+ tempS.Rows() << "," << tempS.Cols() << " )");
+
+ }
+ for (unsigned int r = 0; r < S.Rows(); ++r)
+ {
+ for (unsigned int c = 0; c < S.Cols(); ++c)
+ {
+ S(r, c) -= tempS(r, c);
+ }
}
- }
//**** END TODO ****/
-
MatrixType xxT, xxTb, xxTbT, xxTbTb;
xxT = msTransposeMs->GetResultOutput()->Get().GetTranspose();
- xxTb = xxT*m_Beta;
+ xxTb = xxT * m_Beta;
xxTbT = xxTb.GetTranspose();
- xxTbTb = xxTbT*m_Beta;
+ xxTbTb = xxTbT * m_Beta;
/** TODO
* To modify using - method operator. If we use it now -> exceptionmacro (no GetClassName...)
* S = S-xxTbTb;
**/
- if ( (S.Cols() != xxTbTb.Cols()) || (S.Cols() != xxTbTb.Cols()) )
- {
- itkExceptionMacro( << "Matrix with size (" << S.Rows() << "," <<
- S.Cols() << ") cannot be subtracted from matrix with size (" <<
- xxTbTb.Rows() << "," << xxTbTb.Cols() << " )" );
- }
-
- for ( unsigned int r=0; r<S.Rows(); ++r)
- {
- for ( unsigned int c=0; c<S.Cols(); ++c )
+ if ((S.Cols() != xxTbTb.Cols()) || (S.Cols() != xxTbTb.Cols()))
{
- S(r,c) += xxTbTb(r,c);
+ itkExceptionMacro(<< "Matrix with size (" << S.Rows() << "," <<
+ S.Cols() << ") cannot be subtracted from matrix with size (" <<
+ xxTbTb.Rows() << "," << xxTbTb.Cols() << " )");
+ }
+
+ for (unsigned int r = 0; r < S.Rows(); ++r)
+ {
+ for (unsigned int c = 0; c < S.Cols(); ++c)
+ {
+ S(r, c) += xxTbTb(r, c);
+ }
}
- }
//**** END TODO ****/
- unsigned int size1 = multiSpec->GetLargestPossibleRegion().GetSize()[0]*multiSpec->GetLargestPossibleRegion().GetSize()[1];
- unsigned int size2 = multiSpec->GetNumberOfComponentsPerPixel()+1;
- m_S = S(0,0);
- m_S /= static_cast<float>(size1-size2);
+ unsigned int size1 = multiSpec->GetLargestPossibleRegion().GetSize()[0] *
+ multiSpec->GetLargestPossibleRegion().GetSize()[1];
+ unsigned int size2 = multiSpec->GetNumberOfComponentsPerPixel() + 1;
+ m_S = S(0, 0);
+ m_S /= static_cast<float>(size1 - size2);
// cutBeta is the N-1 last m_Beta element matrix.
// varPan contains transpose(cutBeta)*cutBeta/S
@@ -254,10 +257,10 @@ TOutputImage>
cutBeta.SetSize(multiSpecInterp->GetNumberOfComponentsPerPixel(), 1);
cutBeta.Fill(itk::NumericTraits<InputMultiSpectralInterpRealType>::Zero);
// Take the N-1 m_Beta last elements
- for ( unsigned int r=1; r<m_Beta.Rows(); ++r )
- {
- cutBeta(r-1,0) = m_Beta(r,0);
- }
+ for (unsigned int r = 1; r < m_Beta.Rows(); ++r)
+ {
+ cutBeta(r - 1, 0) = m_Beta(r, 0);
+ }
varPan = cutBeta;
MatrixType tempvarPan;
@@ -269,43 +272,42 @@ TOutputImage>
MatrixType eye;
eye.SetSize(multiSpecInterp->GetNumberOfComponentsPerPixel(), multiSpecInterp->GetNumberOfComponentsPerPixel());
eye.Fill(itk::NumericTraits<InputMultiSpectralInterpRealType>::Zero);
- for ( unsigned int r=1; r<eye.Rows(); ++r)
- {
- eye(r,r) = vcl_pow(10., -12.);
- }
+ for (unsigned int r = 1; r < eye.Rows(); ++r)
+ {
+ eye(r, r) = vcl_pow(10., -12.);
+ }
/** TODO
* To modify using + method operator. If we use it now -> exceptionmacro (no GetClassName...)
* m_Vcondopt = 2 *m_Lambda*varPan+2*m_CovarianceInvMatrix*(1-m_Lambda)+eye;
**/
- if ( (m_Vcondopt.Cols() != varPan.Cols()) || (m_Vcondopt.Cols() != varPan.Cols())
- || (m_Vcondopt.Cols() != m_CovarianceInvMatrix.Cols()) || (m_Vcondopt.Cols() != m_CovarianceInvMatrix.Cols()))
- {
- itkExceptionMacro( << "Matrix with size (" << m_Vcondopt.Rows() << "," <<
- m_Vcondopt.Cols() << ") cannot be subtracted from matrix with size (" <<
- varPan.Rows() << "," << varPan.Cols() << " ) or ( " <<
- m_CovarianceInvMatrix.Rows() << "," << m_CovarianceInvMatrix.Cols()<<")" );
- }
- for ( unsigned int r=0; r<m_Vcondopt.Rows(); ++r)
- {
- for ( unsigned int c=0; c<m_Vcondopt.Cols(); ++c )
+ if ((m_Vcondopt.Cols() != varPan.Cols()) || (m_Vcondopt.Cols() != varPan.Cols())
+ || (m_Vcondopt.Cols() != m_CovarianceInvMatrix.Cols()) || (m_Vcondopt.Cols() != m_CovarianceInvMatrix.Cols()))
{
- m_Vcondopt(r,c) = 2 *m_Lambda*varPan(r,c)
- +2*m_CovarianceInvMatrix(r,c)*(1-m_Lambda)
- +eye(r,c);
+ itkExceptionMacro(<< "Matrix with size (" << m_Vcondopt.Rows() << "," <<
+ m_Vcondopt.Cols() << ") cannot be subtracted from matrix with size (" <<
+ varPan.Rows() << "," << varPan.Cols() << " ) or ( " <<
+ m_CovarianceInvMatrix.Rows() << "," << m_CovarianceInvMatrix.Cols() << ")");
+ }
+ for (unsigned int r = 0; r < m_Vcondopt.Rows(); ++r)
+ {
+ for (unsigned int c = 0; c < m_Vcondopt.Cols(); ++c)
+ {
+ m_Vcondopt(r, c) = 2 *m_Lambda*varPan(r, c)
+ + 2 * m_CovarianceInvMatrix(r, c) * (1 - m_Lambda)
+ + eye(r, c);
+ }
}
- }
//**** END TODO ****/
m_Vcondopt = m_Vcondopt.GetInverse();
// Functor initialization
this->GetFunctor().SetVcondopt(m_Vcondopt);
this->GetFunctor().SetBeta(cutBeta);
- this->GetFunctor().SetAlpha(m_Beta(0,0));
+ this->GetFunctor().SetAlpha(m_Beta(0, 0));
this->GetFunctor().SetCovarianceInvMatrix(m_CovarianceInvMatrix);
this->GetFunctor().SetLambda(m_Lambda);
this->GetFunctor().SetS(m_S);
-
// Restore the previous buffered data
multiSpecInterp->SetRequestedRegion(msiRequestedRegion);
multiSpecInterp->PropagateRequestedRegion();
diff --git a/Code/Fusion/otbFusionImageBase.h b/Code/Fusion/otbFusionImageBase.h
index c5a3493934..404c9346af 100644
--- a/Code/Fusion/otbFusionImageBase.h
+++ b/Code/Fusion/otbFusionImageBase.h
@@ -21,20 +21,22 @@
#include "itkTernaryFunctorImageFilter.h"
#include "itkNumericTraits.h"
-
namespace otb
{
/** \class FusionImageBase
* Basic class for every Fusion classes.
* \sa TernaryFunctorImageFilter
*/
-template <class TInputMultiSpectralImage, class TInputMultiSpectralInterpImage, class TInputPanchroImage, class TOutputImage, class TFunctor>
-class ITK_EXPORT FusionImageBase : public itk::TernaryFunctorImageFilter<TInputMultiSpectralImage, TInputMultiSpectralInterpImage, TInputPanchroImage, TOutputImage, TFunctor>
+template <class TInputMultiSpectralImage, class TInputMultiSpectralInterpImage, class TInputPanchroImage,
+ class TOutputImage, class TFunctor>
+class ITK_EXPORT FusionImageBase : public itk::TernaryFunctorImageFilter<TInputMultiSpectralImage,
+ TInputMultiSpectralInterpImage,
+ TInputPanchroImage, TOutputImage, TFunctor>
{
public:
/** Extract input and output images dimensions.*/
- itkStaticConstMacro( InputImageDimension,unsigned int, TInputMultiSpectralImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension,unsigned int, TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputMultiSpectralImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
/** "typedef" to simplify the variables definition and the declaration. */
typedef TInputMultiSpectralImage InputMultiSpectralImageType;
@@ -45,13 +47,13 @@ public:
/** "typedef" for standard classes. */
typedef FusionImageBase Self;
- typedef itk::TernaryFunctorImageFilter< InputMultiSpectralImageType,
- InputMultiSpectralInterpImageType,
- InputPanchroImageType,
- OutputImageType,
- FunctorType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::TernaryFunctorImageFilter<InputMultiSpectralImageType,
+ InputMultiSpectralInterpImageType,
+ InputPanchroImageType,
+ OutputImageType,
+ FunctorType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** object factory method. */
itkNewMacro(Self);
@@ -65,65 +67,60 @@ public:
typedef typename InputPanchroImageType::PixelType InputPanchroPixelType;
typedef typename OutputImageType::PixelType OutputPixelType;
/** Real class typedef definition. */
- typedef typename itk::NumericTraits<InputMultiSpectralPixelType>::RealType InputMultiSpectralRealType;
- typedef typename itk::NumericTraits<InputMultiSpectralInterpPixelType>::RealType InputMultiSpectralInterpRealType;
- typedef typename itk::NumericTraits<InputPanchroPixelType>::RealType InputPanchroRealType;
- typedef typename InputMultiSpectralImageType::RegionType InputMultiSpectralImageRegionType;
- typedef typename InputMultiSpectralInterpImageType::RegionType InputMultiSpectralInterpImageRegionType;
- typedef typename InputPanchroImageType::RegionType InputPanchroImageRegionType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename itk::NumericTraits<InputMultiSpectralPixelType>::RealType InputMultiSpectralRealType;
+ typedef typename itk::NumericTraits<InputMultiSpectralInterpPixelType>::RealType InputMultiSpectralInterpRealType;
+ typedef typename itk::NumericTraits<InputPanchroPixelType>::RealType InputPanchroRealType;
+ typedef typename InputMultiSpectralImageType::RegionType InputMultiSpectralImageRegionType;
+ typedef typename InputMultiSpectralInterpImageType::RegionType
+ InputMultiSpectralInterpImageRegionType;
+ typedef typename InputPanchroImageType::RegionType InputPanchroImageRegionType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
/** Image size "typedef" definition. */
typedef typename InputMultiSpectralImageType::SizeType SizeType;
-
void SetMultiSpect(const InputMultiSpectralImageType *multiSpect)
{
- this->SetInput1( multiSpect );
- };
+ this->SetInput1(multiSpect);
+ }
void SetMultiSpectInterp(const InputMultiSpectralInterpImageType *multiSpectInterp)
{
- this->SetInput2( multiSpectInterp );
- };
+ this->SetInput2(multiSpectInterp);
+ }
void SetPanchro(const InputPanchroImageType *panchro)
{
- this->SetInput3( panchro );
- };
+ this->SetInput3(panchro);
+ }
const InputMultiSpectralImageType* GetMultiSpect()
{
- if ( this->GetNumberOfInputs() < 1 )
- {
+ if (this->GetNumberOfInputs() < 1)
+ {
return 0;
- }
- else
- return( static_cast<const InputMultiSpectralImageType *>(this->itk::ProcessObject::GetInput(0)) );
+ }
+ else return (static_cast<const InputMultiSpectralImageType *>(this->itk::ProcessObject::GetInput(0)));
}
const InputMultiSpectralInterpImageType* GetMultiSpectInterp()
{
- if ( this->GetNumberOfInputs() < 2 )
- {
+ if (this->GetNumberOfInputs() < 2)
+ {
return 0;
- }
- else
- return( static_cast<const InputMultiSpectralInterpImageType *>(this->itk::ProcessObject::GetInput(1)) );
+ }
+ else return (static_cast<const InputMultiSpectralInterpImageType *>(this->itk::ProcessObject::GetInput(1)));
}
const InputPanchroImageType* GetPanchro()
{
- if ( this->GetNumberOfInputs() < 3 )
- {
+ if (this->GetNumberOfInputs() < 3)
+ {
return 0;
- }
- else
- return( static_cast<const InputPanchroImageType *>(this->itk::ProcessObject::GetInput(2)) );
+ }
+ else return (static_cast<const InputPanchroImageType *>(this->itk::ProcessObject::GetInput(2)));
}
-
};
} // end namespace otb
-
#endif
diff --git a/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h b/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h
index 9eecf13cbc..0e96c03bfa 100644
--- a/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h
+++ b/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h
@@ -47,25 +47,25 @@ namespace otb
*
**/
-template <class TPanImageType,class TXsImageType,class TOutputImageType>
+template <class TPanImageType, class TXsImageType, class TOutputImageType>
class ITK_EXPORT SimpleRcsPanSharpeningFusionImageFilter :
- public itk::ImageToImageFilter<TXsImageType, TOutputImageType>
+ public itk::ImageToImageFilter<TXsImageType, TOutputImageType>
{
public:
- typedef SimpleRcsPanSharpeningFusionImageFilter Self;
+ typedef SimpleRcsPanSharpeningFusionImageFilter Self;
typedef itk::ImageToImageFilter
<TXsImageType, TOutputImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
//typedef otb::Image<double,2> InternalImageType;
//typedef otb::VectorImage<double> InternalVectorImageType;
- typedef otb::Image<double,TPanImageType::ImageDimension> InternalImageType;
- typedef otb::VectorImage<double,TPanImageType::ImageDimension> InternalVectorImageType;
+ typedef otb::Image<double, TPanImageType::ImageDimension> InternalImageType;
+ typedef otb::VectorImage<double, TPanImageType::ImageDimension> InternalVectorImageType;
- typedef typename InternalImageType::PixelType InternalPixelType;
+ typedef typename InternalImageType::PixelType InternalPixelType;
typedef typename itk::NumericTraits<InternalPixelType>::RealType InternalRealType;
- typedef typename itk::Array<InternalRealType> ArrayType;
+ typedef typename itk::Array<InternalRealType> ArrayType;
/** Method for creation through object factory */
itkNewMacro(Self);
@@ -75,22 +75,22 @@ public:
itk::ImageToImageFilter);
/** Display */
- void PrintSelf( std::ostream& os, itk::Indent indent ) const;
+ void PrintSelf(std::ostream& os, itk::Indent indent) const;
typedef typename InternalImageType::SizeType RadiusType;
/** Set the filter radius */
- itkGetMacro( Radius, RadiusType);
- itkSetMacro( Radius, RadiusType);
+ itkGetMacro(Radius, RadiusType);
+ itkSetMacro(Radius, RadiusType);
/** Set the input filter */
itkSetMacro(Filter, ArrayType);
itkGetConstReferenceMacro(Filter, ArrayType);
- virtual void SetPanInput( const TPanImageType * image);
+ virtual void SetPanInput(const TPanImageType * image);
const TPanImageType * GetPanInput(void) const;
- virtual void SetXsInput( const TXsImageType * path);
+ virtual void SetXsInput(const TXsImageType * path);
const TXsImageType * GetXsInput(void) const;
protected:
@@ -100,11 +100,10 @@ protected:
typedef otb::ConvolutionImageFilter
<TPanImageType, InternalImageType> ConvolutionFilterType;
typedef itk::DivideImageFilter
- <TXsImageType,InternalImageType,
- InternalVectorImageType> DivideFilterType;
+ <TXsImageType, InternalImageType,
+ InternalVectorImageType> DivideFilterType;
typedef itk::MultiplyImageFilter
- <InternalVectorImageType,TPanImageType,TOutputImageType> MultiplyFilterType;
-
+ <InternalVectorImageType, TPanImageType, TOutputImageType> MultiplyFilterType;
// Software Guide : EndCodeSnippet
@@ -112,15 +111,15 @@ protected:
private:
- SimpleRcsPanSharpeningFusionImageFilter(Self&); // intentionally not implemented
- void operator=(const Self&); // intentionally not implemented
+ SimpleRcsPanSharpeningFusionImageFilter(Self &); // intentionally not implemented
+ void operator =(const Self&); // intentionally not implemented
- typename ConvolutionFilterType::Pointer m_ConvolutionFilter;
- typename DivideFilterType::Pointer m_DivideFilter;
- typename MultiplyFilterType::Pointer m_MultiplyFilter;
+ typename ConvolutionFilterType::Pointer m_ConvolutionFilter;
+ typename DivideFilterType::Pointer m_DivideFilter;
+ typename MultiplyFilterType::Pointer m_MultiplyFilter;
RadiusType m_Radius;
- ArrayType m_Filter;
+ ArrayType m_Filter;
};
@@ -131,4 +130,3 @@ private:
#endif
#endif
-
diff --git a/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.txx b/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.txx
index 826b9b6662..c1e7c2b376 100644
--- a/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.txx
+++ b/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.txx
@@ -23,7 +23,6 @@
#include "otbSimpleRcsPanSharpeningFusionImageFilter.h"
-
namespace otb
{
template <class TPanImageType, class TXsImageType, class TOutputImageType>
@@ -37,9 +36,8 @@ SimpleRcsPanSharpeningFusionImageFilter
m_DivideFilter = DivideFilterType::New();
m_MultiplyFilter = MultiplyFilterType::New();
-
m_Radius.Fill(3);
- m_Filter.SetSize(7*7);
+ m_Filter.SetSize(7 * 7);
m_Filter.Fill(1);
m_DivideFilter->SetInput2(m_ConvolutionFilter->GetOutput());
@@ -57,7 +55,7 @@ SimpleRcsPanSharpeningFusionImageFilter
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(1,
- const_cast< TPanImageType* >( image ) );
+ const_cast<TPanImageType*>(image));
this->Modified();
}
@@ -68,12 +66,12 @@ SimpleRcsPanSharpeningFusionImageFilter
::GetPanInput(void) const
{
if (this->GetNumberOfInputs() < 2)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TPanImageType * >
- (this->itk::ProcessObject::GetInput(1) );
+ return static_cast<const TPanImageType *>
+ (this->itk::ProcessObject::GetInput(1));
}
template <class TPanImageType, class TXsImageType, class TOutputImageType>
@@ -86,7 +84,7 @@ SimpleRcsPanSharpeningFusionImageFilter
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(0,
- const_cast< TXsImageType* >( image ) );
+ const_cast<TXsImageType*>(image));
this->Modified();
}
@@ -97,16 +95,15 @@ SimpleRcsPanSharpeningFusionImageFilter
::GetXsInput(void) const
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TXsImageType * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<const TXsImageType *>
+ (this->itk::ProcessObject::GetInput(0));
}
-
-template <class TPanImageType,class TXsImageType,class TOutputImageType>
+template <class TPanImageType, class TXsImageType, class TOutputImageType>
void
SimpleRcsPanSharpeningFusionImageFilter
<TPanImageType, TXsImageType, TOutputImageType>
@@ -114,36 +111,36 @@ SimpleRcsPanSharpeningFusionImageFilter
{
//Check if size is correct
- typename InternalImageType::SizeType sizePan;
+ typename InternalImageType::SizeType sizePan;
typename InternalVectorImageType::SizeType sizeXs;
sizePan = this->GetPanInput()->GetLargestPossibleRegion().GetSize();
sizeXs = this->GetXsInput()->GetLargestPossibleRegion().GetSize();
if ((sizePan[0] != sizeXs[0]) || (sizePan[1] != sizeXs[1]))
- {
- itkExceptionMacro(<<"SimpleRcsPanSharpeningFusionImageFilter: Wrong Pan/Xs size");
- }
+ {
+ itkExceptionMacro(<< "SimpleRcsPanSharpeningFusionImageFilter: Wrong Pan/Xs size");
+ }
//Process the fusion
- m_ConvolutionFilter->SetInput( this->GetPanInput() );
- m_ConvolutionFilter->SetRadius( this->m_Radius);
- m_ConvolutionFilter->SetFilter( this->m_Filter);
+ m_ConvolutionFilter->SetInput(this->GetPanInput());
+ m_ConvolutionFilter->SetRadius(this->m_Radius);
+ m_ConvolutionFilter->SetFilter(this->m_Filter);
m_DivideFilter->SetInput1(this->GetXsInput());
m_MultiplyFilter->SetInput2(this->GetPanInput());
- m_MultiplyFilter->GraftOutput( this->GetOutput() );
+ m_MultiplyFilter->GraftOutput(this->GetOutput());
m_MultiplyFilter->Update();
- this->GraftOutput( m_MultiplyFilter->GetOutput() );
+ this->GraftOutput(m_MultiplyFilter->GetOutput());
}
-template <class TPanImageType,class TXsImageType,class TOutputImageType>
+template <class TPanImageType, class TXsImageType, class TOutputImageType>
void
SimpleRcsPanSharpeningFusionImageFilter
<TPanImageType, TXsImageType, TOutputImageType>
-::PrintSelf( std::ostream& os, itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os
<< indent << "Radius:" << this->m_Radius
diff --git a/Code/GeospatialAnalysis/otbGISTableFunction.h b/Code/GeospatialAnalysis/otbGISTableFunction.h
index 554355c2ac..b29a6be591 100644
--- a/Code/GeospatialAnalysis/otbGISTableFunction.h
+++ b/Code/GeospatialAnalysis/otbGISTableFunction.h
@@ -24,7 +24,6 @@
namespace otb
{
-
/** \class GISTableFunction
* \brief Evaluates a const transaction on a GISTable
*
@@ -40,12 +39,12 @@ namespace otb
* \ingroup GISTableFunctions
*/
template <
-class TInputTable,
-class TOutput
->
+ class TInputTable,
+ class TOutput
+ >
class ITK_EXPORT GISTableFunction :
- public FunctionBase< TInputTable,
- TOutput >
+ public FunctionBase<TInputTable,
+ TOutput>
{
public:
/** Dimension underlying input table. */
@@ -53,12 +52,12 @@ public:
TInputTable::SpatialDimension);
/** Standard class typedefs. */
- typedef GISTableFunction Self;
+ typedef GISTableFunction Self;
typedef FunctionBase<
TInputTable,
- TOutput > Superclass;
- typedef SmartPointer<Self> Pointer;
- typedef SmartPointer<const Self> ConstPointer;
+ TOutput> Superclass;
+ typedef SmartPointer<Self> Pointer;
+ typedef SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(GISTableFunction, FunctionBase);
@@ -76,16 +75,15 @@ public:
typedef TOutput OutputType;
/** Set the input table. */
- virtual void SetInputTable( const InputTableType* ptr );
+ virtual void SetInputTable(const InputTableType* ptr);
/** Get the input Table. */
const InputTableType * GetInputTable() const
- { return m_Table.GetPointer(); }
+ { return m_Table.GetPointer(); }
/** Evaluate the function.
* Subclasses must provide this method. */
- virtual TOutput Evaluate( ) const = 0;
-
+ virtual TOutput Evaluate() const = 0;
protected:
GISTableFunction();
@@ -93,17 +91,16 @@ protected:
void PrintSelf(std::ostream& os, Indent indent) const;
/** Const pointer to the input table. */
- InputTableConstPointer m_Table;
+ InputTableConstPointer m_Table;
private:
- GISTableFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ GISTableFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#if OTB_MANUAL_INSTANTIATION
# include "itkGISTableFunction.txx"
#endif
diff --git a/Code/GeospatialAnalysis/otbGISTableFunction.txx b/Code/GeospatialAnalysis/otbGISTableFunction.txx
index 1570cb7ee2..d0e9764bfd 100644
--- a/Code/GeospatialAnalysis/otbGISTableFunction.txx
+++ b/Code/GeospatialAnalysis/otbGISTableFunction.txx
@@ -33,7 +33,6 @@ GISTableFunction<TInputTable, TOutput>
m_Table = NULL;
}
-
/**
* Standard "PrintSelf" method
*/
@@ -44,12 +43,11 @@ GISTableFunction<TInputTable, TOutput>
std::ostream& os,
Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "InputTable: " << m_Table.GetPointer() << std::endl;
}
-
/**
* Initialize by setting the input table
*/
@@ -57,14 +55,13 @@ template <class TInputTable, class TOutput>
void
GISTableFunction<TInputTable, TOutput>
::SetInputTable(
- const InputTableType* ptr )
+ const InputTableType* ptr)
{
// set the input table
m_Table = ptr;
}
-
} // end namespace itk
#endif
diff --git a/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.cxx b/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.cxx
index 4e271627d8..926273c548 100644
--- a/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.cxx
+++ b/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.cxx
@@ -24,9 +24,10 @@
namespace otb
{
-PostGISCreateTableTransactor::PostGISCreateTableTransactor() : PostGISCreateTableTransactor::Superclass("CreateTable") {
+PostGISCreateTableTransactor::PostGISCreateTableTransactor() : PostGISCreateTableTransactor::Superclass("CreateTable")
+{
m_RemoveExistingTable = false;
-};
+}
PostGISCreateTableTransactor::PostGISCreateTableTransactor(const PostGISCreateTableTransactor& pgt)
: PostGISCreateTableTransactor::Superclass("CreateTable")
@@ -37,54 +38,54 @@ PostGISCreateTableTransactor::PostGISCreateTableTransactor(const PostGISCreateTa
m_RemoveExistingTable = pgt.GetRemoveExistingTable();
}
-PostGISCreateTableTransactor& PostGISCreateTableTransactor::operator=(const PostGISCreateTableTransactor& pgt) throw() {
- m_TableName = pgt.GetTableName();
- m_SRID = pgt.GetSRID();
- m_Dimension = pgt.GetDimension();
- m_RemoveExistingTable = pgt.GetRemoveExistingTable();
+PostGISCreateTableTransactor & PostGISCreateTableTransactor::operator =(const PostGISCreateTableTransactor& pgt)
+throw()
+{
+ m_TableName = pgt.GetTableName();
+ m_SRID = pgt.GetSRID();
+ m_Dimension = pgt.GetDimension();
+ m_RemoveExistingTable = pgt.GetRemoveExistingTable();
return *this;
}
-void PostGISCreateTableTransactor::operator()(pqxx::nontransaction &T)
+void PostGISCreateTableTransactor::operator ()(pqxx::nontransaction& T)
{
- if(m_RemoveExistingTable)
+ if (m_RemoveExistingTable)
{
std::stringstream dropCommand;
//dropCommand << "DROP TABLE " << m_TableName;
dropCommand << "DROP TABLE IF EXISTS " << m_TableName;
-
- otbGenericMsgDebugMacro(<<"Drop Command " << dropCommand.str());
+
+ otbGenericMsgDebugMacro(<< "Drop Command " << dropCommand.str());
m_Result = T.exec(dropCommand.str());
}
std::stringstream createCommand;
- createCommand << "CREATE TABLE "<< m_TableName
- <<" (id serial PRIMARY KEY, genre TEXT);";
+ createCommand << "CREATE TABLE " << m_TableName
+ << " (id serial PRIMARY KEY, genre TEXT);";
- otbGenericMsgDebugMacro(<<"Create Command " << createCommand.str());
+ otbGenericMsgDebugMacro(<< "Create Command " << createCommand.str());
m_Result = T.exec(createCommand.str());
std::stringstream addGeometryCommand;
- addGeometryCommand << "SELECT AddGeometryColumn( '"<< m_TableName <<
- "', 'the_geom', "<< m_SRID <<", 'GEOMETRY',"<< m_Dimension <<" );";
+ addGeometryCommand << "SELECT AddGeometryColumn( '" << m_TableName <<
+ "', 'the_geom', " << m_SRID << ", 'GEOMETRY'," << m_Dimension << " );";
-
-
-
m_Result = T.exec(addGeometryCommand.str());
/** creation index GIST */
std::stringstream addGISTIndexCommand;
-
- addGISTIndexCommand << "CREATE INDEX idx_" << m_TableName << "_the_geom ON " << m_TableName << " USING gist( the_geom );";
- otbGenericMsgDebugMacro(<<"Create Command " << addGISTIndexCommand.str());
-
+ addGISTIndexCommand << "CREATE INDEX idx_" << m_TableName << "_the_geom ON " << m_TableName <<
+ " USING gist( the_geom );";
+
+ otbGenericMsgDebugMacro(<< "Create Command " << addGISTIndexCommand.str());
+
m_Result = T.exec(addGISTIndexCommand.str());
}
@@ -139,12 +140,11 @@ PostGISCreateTableTransactor::ResultType PostGISCreateTableTransactor::GetResult
return m_Result;
}
-
-void PostGISCreateTableTransactor::CreateGISTIndex (pqxx::nontransaction &T)
+void PostGISCreateTableTransactor::CreateGISTIndex(pqxx::nontransaction& T)
{
/*
std::stringstream addGISTIndexCmd;
-
+
addGISTIndexCmd << "CREATE INDEX idx_" << m_TableName << "_the_geom ON " << m_TableName << " USING gist( the_geom );";
otbGenericMsgDebugMacro(<<"Create Command " << addGISTIndexCmd.str());
@@ -154,5 +154,3 @@ void PostGISCreateTableTransactor::CreateGISTIndex (pqxx::nontransaction &T)
}
} // end namespace otb
-
-
diff --git a/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.h b/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.h
index 284847a80e..2010f383d6 100644
--- a/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.h
+++ b/Code/GeospatialAnalysis/otbPostGISCreateTableTransactor.h
@@ -21,11 +21,9 @@
#include <pqxx/pqxx>
#include <string>
-
namespace otb
{
-
/** \class PostGISCreateTableTransactor
* \brief PQXX-based transactor for creating PostGIS tables
*
@@ -39,9 +37,9 @@ namespace otb
*/
class PostGISCreateTableTransactor :
- public pqxx::transactor<pqxx::nontransaction>
+ public pqxx::transactor<pqxx::nontransaction>
{
-
+
public:
typedef pqxx::result ResultType;
@@ -52,10 +50,11 @@ public:
PostGISCreateTableTransactor(const PostGISCreateTableTransactor& pgt);
- PostGISCreateTableTransactor& operator=(const PostGISCreateTableTransactor& pgt) throw();
-
- void operator()(pqxx::nontransaction &T);
-
+ PostGISCreateTableTransactor& operator =(const PostGISCreateTableTransactor& pgt)
+ throw();
+
+ void operator ()(pqxx::nontransaction& T);
+
void on_commit();
std::string GetTableName() const;
@@ -75,19 +74,18 @@ public:
bool GetRemoveExistingTable() const;
ResultType GetResult() const;
-
- void CreateGISTIndex (pqxx::nontransaction &T);
-
+
+ void CreateGISTIndex(pqxx::nontransaction& T);
+
protected:
-
- ResultType m_Result;
- std::string m_TableName;
- int m_SRID;
+
+ ResultType m_Result;
+ std::string m_TableName;
+ int m_SRID;
unsigned short m_Dimension;
- bool m_RemoveExistingTable;
+ bool m_RemoveExistingTable;
};
} // end namespace otb
-
#endif
diff --git a/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.cxx b/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.cxx
index d349caa204..ebcbebf2b0 100644
--- a/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.cxx
+++ b/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.cxx
@@ -19,13 +19,14 @@
#include <sstream>
#include "otbMacro.h"
-
namespace otb
{
-PostGISFromStringTransactor::PostGISFromStringTransactor() : PostGISFromStringTransactor::Superclass("FromStringTransactor") {
+PostGISFromStringTransactor::PostGISFromStringTransactor() : PostGISFromStringTransactor::Superclass(
+ "FromStringTransactor")
+{
m_TransactionString = "";
- };
+}
PostGISFromStringTransactor::PostGISFromStringTransactor(const PostGISFromStringTransactor& pgt)
: PostGISFromStringTransactor::Superclass("FromStringTransactor")
@@ -33,29 +34,31 @@ PostGISFromStringTransactor::PostGISFromStringTransactor(const PostGISFromString
m_TransactionString = pgt.GetTransactionString();
}
-PostGISFromStringTransactor& PostGISFromStringTransactor::operator=(const PostGISFromStringTransactor& pgt) throw() {
- m_TransactionString = pgt.GetTransactionString();
- return *this;
+PostGISFromStringTransactor & PostGISFromStringTransactor::operator =(const PostGISFromStringTransactor& pgt)
+throw()
+{
+ m_TransactionString = pgt.GetTransactionString();
+ return *this;
}
-
-void PostGISFromStringTransactor::operator()(pqxx::nontransaction &T)
+
+void PostGISFromStringTransactor::operator ()(pqxx::nontransaction& T)
{
- if(m_TransactionString!="")
+ if (m_TransactionString != "")
{
-
- otbGenericMsgDebugMacro(<<"Transaction Command " << m_TransactionString);
-
+
+ otbGenericMsgDebugMacro(<< "Transaction Command " << m_TransactionString);
+
m_Result = T.exec(m_TransactionString);
}
-
+
}
void PostGISFromStringTransactor::on_commit()
{
std::cout << "\t Transaction \t" << std::endl;
- std::cout << "\t "<< m_TransactionString << std::endl;
-
+ std::cout << "\t " << m_TransactionString << std::endl;
+
}
std::string PostGISFromStringTransactor::GetTransactionString() const
@@ -73,7 +76,4 @@ PostGISFromStringTransactor::ResultType PostGISFromStringTransactor::GetResult()
return m_Result;
}
-
} // end namespace otb
-
-
diff --git a/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.h b/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.h
index 0b9836e0e6..06480e6c5a 100644
--- a/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.h
+++ b/Code/GeospatialAnalysis/otbPostGISFromStringTransactor.h
@@ -21,11 +21,9 @@
#include <pqxx/pqxx>
#include <string>
-
namespace otb
{
-
/** \class PostGISFromStringTransactor
* \brief PQXX-based transactor for executing PostGIS queries.
*
@@ -39,9 +37,9 @@ namespace otb
*/
class PostGISFromStringTransactor :
- public pqxx::transactor<pqxx::nontransaction>
+ public pqxx::transactor<pqxx::nontransaction>
{
-
+
public:
typedef pqxx::result ResultType;
@@ -52,26 +50,25 @@ public:
PostGISFromStringTransactor(const PostGISFromStringTransactor& pgt);
- PostGISFromStringTransactor& operator=(const PostGISFromStringTransactor& pgt) throw();
-
- void operator()(pqxx::nontransaction &T);
-
+ PostGISFromStringTransactor& operator =(const PostGISFromStringTransactor& pgt)
+ throw();
+
+ void operator ()(pqxx::nontransaction& T);
+
void on_commit();
std::string GetTransactionString() const;
void SetTransactionString(const std::string& trans);
-
ResultType GetResult() const;
-
+
protected:
-
- ResultType m_Result;
+
+ ResultType m_Result;
std::string m_TransactionString;
};
} // end namespace otb
-
#endif
diff --git a/Code/GeospatialAnalysis/otbPostGISQueryTransactor.cxx b/Code/GeospatialAnalysis/otbPostGISQueryTransactor.cxx
index dd65a4169b..c6f964dedd 100644
--- a/Code/GeospatialAnalysis/otbPostGISQueryTransactor.cxx
+++ b/Code/GeospatialAnalysis/otbPostGISQueryTransactor.cxx
@@ -19,7 +19,6 @@
#include <sstream>
#include "otbMacro.h"
-
namespace otb
{
@@ -35,37 +34,37 @@ PostGISQueryTransactor::PostGISQueryTransactor(const PostGISQueryTransactor& pgt
m_ViewName = pgt.GetViewName();
}
-PostGISQueryTransactor& PostGISQueryTransactor::operator=(const PostGISQueryTransactor& pgt) throw() {
- m_TransactionString = pgt.GetTransactionString();
- m_ViewName = pgt.GetViewName();
- return *this;
+PostGISQueryTransactor & PostGISQueryTransactor::operator =(const PostGISQueryTransactor& pgt)
+throw()
+{
+ m_TransactionString = pgt.GetTransactionString();
+ m_ViewName = pgt.GetViewName();
+ return *this;
}
-void PostGISQueryTransactor::operator()(pqxx::nontransaction &T)
+void PostGISQueryTransactor::operator ()(pqxx::nontransaction& T)
{
- if(m_RemoveExistingView)
- {
+ if (m_RemoveExistingView)
+ {
std::stringstream dropCommand;
//dropCommand << "DROP TABLE " << m_ViewName;
dropCommand << "DROP VIEW IF EXISTS " << m_ViewName;
-
- otbGenericMsgDebugMacro(<<"Drop Command " << dropCommand.str());
+
+ otbGenericMsgDebugMacro(<< "Drop Command " << dropCommand.str());
m_Result = T.exec(dropCommand.str());
- }
+ }
std::stringstream createCommand;
- createCommand << "CREATE VIEW "<< m_ViewName
- <<" AS " << m_TransactionString;
+ createCommand << "CREATE VIEW " << m_ViewName
+ << " AS " << m_TransactionString;
- otbGenericMsgDebugMacro(<<"Create Command " << createCommand.str());
+ otbGenericMsgDebugMacro(<< "Create Command " << createCommand.str());
m_Result = T.exec(createCommand.str());
-
-
}
/*
@@ -73,7 +72,7 @@ void PostGISQueryTransactor::on_commit()
{
std::cout << "\t Transaction \t" << std::endl;
std::cout << "\t "<< m_TransactionString << std::endl;
-
+
}
std::string PostGISQueryTransactor::GetTransactionString() const
@@ -114,7 +113,7 @@ void PostGISQueryTransactor::CreateView(pqxx::nontransaction &T)
//dropCommand << "DROP TABLE " << m_ViewName;
dropCommand << "DROP VIEW IF EXISTS " << m_ViewName;
-
+
otbGenericMsgDebugMacro(<<"Drop Command " << dropCommand.str());
m_Result = T.exec(dropCommand.str());
@@ -131,5 +130,3 @@ void PostGISQueryTransactor::CreateView(pqxx::nontransaction &T)
}
*/
} // end namespace otb
-
-
diff --git a/Code/GeospatialAnalysis/otbPostGISQueryTransactor.h b/Code/GeospatialAnalysis/otbPostGISQueryTransactor.h
index fa9cba1949..4912104acd 100644
--- a/Code/GeospatialAnalysis/otbPostGISQueryTransactor.h
+++ b/Code/GeospatialAnalysis/otbPostGISQueryTransactor.h
@@ -26,7 +26,6 @@
namespace otb
{
-
/** \class PostGISQueryTransactor
* \brief PQXX-based transactor for executing PostGIS queries.
*
@@ -40,11 +39,11 @@ namespace otb
*/
class PostGISQueryTransactor :
- public otb::PostGISFromStringTransactor
+ public otb::PostGISFromStringTransactor
{
-
+
public:
-
+
typedef PostGISFromStringTransactor Superclass;
//typedef pqxx::transactor<pqxx::nontransaction> Superclass;
//typedef pqxx::result ResultType;
@@ -52,28 +51,26 @@ public:
PostGISQueryTransactor(const PostGISQueryTransactor& pgt);
- PostGISQueryTransactor& operator=(const PostGISQueryTransactor& pgt) throw();
-
- void operator()(pqxx::nontransaction &T);
-
+ PostGISQueryTransactor& operator =(const PostGISQueryTransactor& pgt)
+ throw();
+
+ void operator ()(pqxx::nontransaction& T);
+
void SetRemoveExistingView(bool val);
bool GetRemoveExistingView() const;
-
+
void SetViewName(const std::string& aName);
-
+
std::string GetViewName() const;
-
+
//void CreateView(pqxx::nontransaction &T);
-
-
-
+
protected:
std::string m_ViewName;
- bool m_RemoveExistingView;
+ bool m_RemoveExistingView;
};
} // end namespace otb
-
#endif
diff --git a/Code/GeospatialAnalysis/otbTransactorGISTableFunction.h b/Code/GeospatialAnalysis/otbTransactorGISTableFunction.h
index 3eda76e06f..4f3e7e5ebf 100644
--- a/Code/GeospatialAnalysis/otbTransactorGISTableFunction.h
+++ b/Code/GeospatialAnalysis/otbTransactorGISTableFunction.h
@@ -23,7 +23,6 @@
namespace otb
{
-
/** \class TransactorGISTableFunction
* \brief Evaluates a const transaction on a GISTable using a transactor
*
@@ -36,12 +35,12 @@ namespace otb
* \ingroup TransactorGISTableFunctions
*/
template <
-class TInputTable,
+ class TInputTable,
class TOutput, class TTransactor
->
+ >
class ITK_EXPORT TransactorGISTableFunction :
- public GISTableFunction< TInputTable,
- TOutput >
+ public GISTableFunction<TInputTable,
+ TOutput>
{
public:
/** Dimension underlying input table. */
@@ -49,10 +48,10 @@ public:
TInputTable::SpatialDimension);
/** Standard class typedefs. */
- typedef TransactorGISTableFunction Self;
- typedef GISTableFunction< TInputTable, TOutput > Superclass;
- typedef SmartPointer<Self> Pointer;
- typedef SmartPointer<const Self> ConstPointer;
+ typedef TransactorGISTableFunction Self;
+ typedef GISTableFunction<TInputTable, TOutput> Superclass;
+ typedef SmartPointer<Self> Pointer;
+ typedef SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(TransactorGISTableFunction, GISTableFunction);
@@ -71,10 +70,10 @@ public:
typedef TOutput OutputType;
/** Evaluate the function using the transactor. */
- virtual TOutput Evaluate( ){
- m_Table->GetConnection()->PerformTransaction( TransactorType() );
- };
-
+ virtual TOutput Evaluate()
+ {
+ m_Table->GetConnection()->PerformTransaction(TransactorType());
+ }
protected:
TransactorGISTableFunction();
@@ -82,15 +81,14 @@ protected:
void PrintSelf(std::ostream& os, Indent indent) const;
/** Const pointer to the input Table. */
- InputTableConstPointer m_Table;
+ InputTableConstPointer m_Table;
private:
- TransactorGISTableFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ TransactorGISTableFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
-
#endif
diff --git a/Code/Gui/otbFltkFilterWatcher.cxx b/Code/Gui/otbFltkFilterWatcher.cxx
index 61b5997e47..65ef6e5452 100644
--- a/Code/Gui/otbFltkFilterWatcher.cxx
+++ b/Code/Gui/otbFltkFilterWatcher.cxx
@@ -27,12 +27,12 @@ FltkFilterWatcher
::FltkFilterWatcher(itk::ProcessObject* process,
int x, int y, int w, int h,
const char *comment)
- : FilterWatcherBase(process, comment)
+ : FilterWatcherBase(process, comment)
{
- m_Window = new Fl_Window(x,y,w+10,h+10);
+ m_Window = new Fl_Window(x, y, w + 10, h + 10);
m_Window->label(m_Comment.c_str());
m_Window->begin();
- m_Progress = new Fl_Progress(5,5,w,h);
+ m_Progress = new Fl_Progress(5, 5, w, h);
m_Progress->selection_color(FL_DARK_BLUE);
m_Progress->minimum(0);
m_Progress->maximum(1);
diff --git a/Code/Gui/otbFltkFilterWatcher.h b/Code/Gui/otbFltkFilterWatcher.h
index 6e769c53ab..f15a47bcf4 100644
--- a/Code/Gui/otbFltkFilterWatcher.h
+++ b/Code/Gui/otbFltkFilterWatcher.h
@@ -43,14 +43,13 @@ public:
/** Constructor. Takes a ProcessObject to monitor and an optional
* comment string that is prepended to each event message. */
- FltkFilterWatcher(itk::ProcessObject* process,
- int x, int y, int w,int h,
- const char *comment="");
+ FltkFilterWatcher(itk::ProcessObject * process,
+ int x, int y, int w, int h,
+ const char *comment = "");
/** Destructor. */
virtual ~FltkFilterWatcher();
-
/** Callback method to show the EndEvent */
virtual void EndFilter()
{
@@ -63,10 +62,10 @@ protected:
virtual void ShowProgress()
{
if (m_Process)
- {
+ {
m_Progress->value(m_Process->GetProgress());
Fl::check();
- }
+ }
}
/** Callback method to show the StartEvent */
@@ -76,10 +75,9 @@ protected:
m_Progress->show();
}
-
private:
- Fl_Window * m_Window;
+ Fl_Window * m_Window;
Fl_Progress * m_Progress;
};
diff --git a/Code/Gui/otbFltkWriterWatcher.cxx b/Code/Gui/otbFltkWriterWatcher.cxx
index 3d4cb14c40..a3779c4ba2 100644
--- a/Code/Gui/otbFltkWriterWatcher.cxx
+++ b/Code/Gui/otbFltkWriterWatcher.cxx
@@ -27,37 +27,35 @@ FltkWriterWatcher
::FltkWriterWatcher(itk::ProcessObject* process,
int x, int y, int w, int h,
const char *comment)
- : WriterWatcherBase(process, comment)
+ : WriterWatcherBase(process, comment)
{
- this->BuildGUI(x,y,w,h,comment);
+ this->BuildGUI(x, y, w, h, comment);
}
-
FltkWriterWatcher
::FltkWriterWatcher(itk::ProcessObject* process,
itk::ProcessObject* source,
int x, int y, int w, int h,
const char *comment)
- : WriterWatcherBase(process,source,comment)
+ : WriterWatcherBase(process, source, comment)
{
- this->BuildGUI(x,y,w,h,comment);
+ this->BuildGUI(x, y, w, h, comment);
}
-
void FltkWriterWatcher
-::BuildGUI(int x, int y, int w, int h,const char * /*comment*/)
+::BuildGUI(int x, int y, int w, int h, const char * /*comment*/)
{
- m_Window = new Fl_Window(x,y,w+10,h+15);
+ m_Window = new Fl_Window(x, y, w + 10, h + 15);
m_Window->label(m_Comment.c_str());
m_Window->begin();
- m_FilterProgress = new Fl_Progress(5,5,w,h/2);
+ m_FilterProgress = new Fl_Progress(5, 5, w, h / 2);
m_FilterProgress->selection_color(FL_DARK_BLUE);
m_FilterProgress->minimum(0);
m_FilterProgress->maximum(1);
m_FilterProgress->label("current tile");
m_FilterProgress->align(FL_ALIGN_INSIDE);
- m_WriterProgress = new Fl_Progress(5,h/2+10,w,h/2);
+ m_WriterProgress = new Fl_Progress(5, h / 2 + 10, w, h / 2);
m_WriterProgress->selection_color(FL_RED);
m_WriterProgress->minimum(0);
m_WriterProgress->maximum(1);
diff --git a/Code/Gui/otbFltkWriterWatcher.h b/Code/Gui/otbFltkWriterWatcher.h
index 7765f1645b..e03ecd03f0 100644
--- a/Code/Gui/otbFltkWriterWatcher.h
+++ b/Code/Gui/otbFltkWriterWatcher.h
@@ -43,20 +43,18 @@ public:
/** Constructor. Takes a ProcessObject to monitor and an optional
* comment string that is prepended to each event message. */
- FltkWriterWatcher(itk::ProcessObject* process,
- int x, int y, int w,int h,
- const char *comment="");
+ FltkWriterWatcher(itk::ProcessObject * process,
+ int x, int y, int w, int h,
+ const char *comment = "");
- FltkWriterWatcher(itk::ProcessObject* process,
+ FltkWriterWatcher(itk::ProcessObject * process,
itk::ProcessObject * source,
- int x, int y, int w,int h,
- const char *comment="");
-
+ int x, int y, int w, int h,
+ const char *comment = "");
/** Destructor. */
virtual ~FltkWriterWatcher();
-
/** Callback method to show the EndEvent */
virtual void EndWriter()
{
@@ -72,20 +70,20 @@ protected:
virtual void ShowFilterProgress()
{
if (m_SourceProcess)
- {
+ {
m_FilterProgress->value(m_SourceProcess->GetProgress());
Fl::check();
- }
+ }
}
/** Callback method to show the ProgressEvent */
virtual void ShowWriterProgress()
{
if (m_Process)
- {
+ {
m_WriterProgress->value(m_Process->GetProgress());
Fl::check();
- }
+ }
}
/** Callback method to show the StartEvent */
@@ -97,7 +95,6 @@ protected:
Fl::check();
}
-
/** Callback method to show the StartEvent */
virtual void StartFilter()
{
@@ -107,11 +104,11 @@ protected:
Fl::check();
}
- void BuildGUI(int x, int y, int w, int h,const char * comment);
+ void BuildGUI(int x, int y, int w, int h, const char * comment);
private:
- Fl_Window * m_Window;
+ Fl_Window * m_Window;
Fl_Progress * m_WriterProgress;
Fl_Progress * m_FilterProgress;
};
diff --git a/Code/IO/otbBSQImageIO.cxx b/Code/IO/otbBSQImageIO.cxx
index feeb402de7..11e527fa93 100644
--- a/Code/IO/otbBSQImageIO.cxx
+++ b/Code/IO/otbBSQImageIO.cxx
@@ -29,7 +29,6 @@
#include <fstream>
#include <iostream>
-
namespace otb
{
@@ -39,17 +38,17 @@ BSQImageIO::BSQImageIO()
this->SetNumberOfDimensions(2);
m_PixelType = SCALAR;
m_ComponentType = UCHAR;
- if ( itk::ByteSwapper<char>::SystemIsLittleEndian() == true)
- {
+ if (itk::ByteSwapper<char>::SystemIsLittleEndian() == true)
+ {
m_ByteOrder = LittleEndian;
- }
+ }
else
- {
+ {
m_ByteOrder = BigEndian;
- }
+ }
m_FileByteOrder = m_ByteOrder;
- m_TypeBsq="";
+ m_TypeBsq = "";
// Set default spacing to one
m_Spacing[0] = 1.0;
m_Spacing[1] = 1.0;
@@ -69,54 +68,53 @@ BSQImageIO::BSQImageIO()
BSQImageIO::~BSQImageIO()
{
- if ( m_HeaderFile.is_open() )
- {
+ if (m_HeaderFile.is_open())
+ {
m_HeaderFile.close();
- }
- if ( m_ChannelsFile != NULL)
- {
- for (unsigned int numComponent = 0; numComponent<this->GetNumberOfComponents(); numComponent++)
+ }
+ if (m_ChannelsFile != NULL)
{
- if ( m_ChannelsFile[numComponent].is_open() )
+ for (unsigned int numComponent = 0; numComponent < this->GetNumberOfComponents(); numComponent++)
{
+ if (m_ChannelsFile[numComponent].is_open())
+ {
m_ChannelsFile[numComponent].close();
+ }
}
+ delete[] m_ChannelsFile;
}
- delete [] m_ChannelsFile;
- }
}
-bool BSQImageIO::CanReadFile( const char* filename )
+bool BSQImageIO::CanReadFile(const char* filename)
{
std::fstream header_file;
- std::string lFileName(filename);
- std::string extension = System::GetExtension(filename);
- if ((extension!="HD")&&(extension!="hd"))
- {
+ std::string lFileName(filename);
+ std::string extension = System::GetExtension(filename);
+ if ((extension != "HD") && (extension != "hd"))
+ {
return false;
- }
- if ( System::IsADirName(lFileName) == true )
- {
+ }
+ if (System::IsADirName(lFileName) == true)
+ {
return false;
- }
- if ( System::SetToLower(System::GetExtension(lFileName)) != "hd" )
- {
+ }
+ if (System::SetToLower(System::GetExtension(lFileName)) != "hd")
+ {
return false;
- }
+ }
- header_file.open( lFileName.c_str(), std::ios::in );
- if ( header_file.fail() )
- {
- otbMsgDevMacro(<<"BSQImageIO::CanReadFile() failed header open ! " );
+ header_file.open(lFileName.c_str(), std::ios::in);
+ if (header_file.fail())
+ {
+ otbMsgDevMacro(<< "BSQImageIO::CanReadFile() failed header open ! ");
return false;
- }
+ }
//Read header informations
- bool lResult = InternalReadHeaderInformation(lFileName, header_file,false);
+ bool lResult = InternalReadHeaderInformation(lFileName, header_file, false);
header_file.close();
return (lResult);
}
-
// Used to print information about this object
void BSQImageIO::PrintSelf(std::ostream& os, itk::Indent indent) const
{
@@ -132,123 +130,122 @@ void BSQImageIO::ReadVolume(void*)
void BSQImageIO::Read(void* buffer)
{
unsigned long step = this->GetNumberOfComponents();
- char * p = static_cast<char *>(buffer);
+ char * p = static_cast<char *>(buffer);
int lNbLines = this->GetIORegion().GetSize()[1];
int lNbColumns = this->GetIORegion().GetSize()[0];
int lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
- otbMsgDevMacro( <<" BSQImageIO::Read() ");
- otbMsgDevMacro( <<" Image size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDevMacro( <<" Region read (IORegion) : "<<this->GetIORegion());
- otbMsgDevMacro( <<" Nb Of Components : "<<this->GetNumberOfComponents());
+ otbMsgDevMacro(<< " BSQImageIO::Read() ");
+ otbMsgDevMacro(<< " Image size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDevMacro(<< " Region read (IORegion) : " << this->GetIORegion());
+ otbMsgDevMacro(<< " Nb Of Components : " << this->GetNumberOfComponents());
std::streamoff headerLength(0);
std::streamoff numberOfBytesPerLines = static_cast<std::streamoff>(this->GetComponentSize() * m_Dimensions[0]);
std::streamoff offset;
std::streamsize numberOfBytesToBeRead = this->GetComponentSize() * lNbColumns;
std::streamsize numberOfBytesRead;
- unsigned long cpt = 0;
+ unsigned long cpt = 0;
// Update the step variable
- step = step * (unsigned long)(this->GetComponentSize());
+ step = step * (unsigned long) (this->GetComponentSize());
char * value = new char[numberOfBytesToBeRead];
- if (value==NULL)
- {
- itkExceptionMacro(<<"BSQImageIO::Read(): Bad alloc");
+ if (value == NULL)
+ {
+ itkExceptionMacro(<< "BSQImageIO::Read(): Bad alloc");
return;
- }
-
- otbMsgDevMacro( <<" sizeof(streamsize) : "<<sizeof(std::streamsize));
- otbMsgDevMacro( <<" sizeof(streampos) : "<<sizeof(std::streampos));
- otbMsgDevMacro( <<" sizeof(streamoff) : "<<sizeof(std::streamoff));
- otbMsgDevMacro( <<" sizeof(std::ios::beg) : "<<sizeof(std::ios::beg));
- otbMsgDevMacro( <<" sizeof(size_t) : "<<sizeof(size_t));
- otbMsgDevMacro( <<" sizeof(unsigned long) : "<<sizeof(unsigned long));
+ }
+ otbMsgDevMacro(<< " sizeof(streamsize) : " << sizeof(std::streamsize));
+ otbMsgDevMacro(<< " sizeof(streampos) : " << sizeof(std::streampos));
+ otbMsgDevMacro(<< " sizeof(streamoff) : " << sizeof(std::streamoff));
+ otbMsgDevMacro(<< " sizeof(std::ios::beg) : " << sizeof(std::ios::beg));
+ otbMsgDevMacro(<< " sizeof(size_t) : " << sizeof(size_t));
+ otbMsgDevMacro(<< " sizeof(unsigned long) : " << sizeof(unsigned long));
for (unsigned int nbComponents = 0; nbComponents < this->GetNumberOfComponents(); ++nbComponents)
- {
- cpt = (unsigned long )(nbComponents)* (unsigned long)(this->GetComponentSize());
- //Read region of the channel
- for (int LineNo = lFirstLine;LineNo <lFirstLine + lNbLines; LineNo++ )
{
+ cpt = (unsigned long) (nbComponents) * (unsigned long) (this->GetComponentSize());
+ //Read region of the channel
+ for (int LineNo = lFirstLine; LineNo < lFirstLine + lNbLines; LineNo++)
+ {
offset = headerLength + numberOfBytesPerLines * static_cast<std::streamoff>(LineNo);
offset += static_cast<std::streamoff>(this->GetComponentSize() * lFirstColumn);
m_ChannelsFile[nbComponents].seekg(offset, std::ios::beg);
//Read a line
- m_ChannelsFile[nbComponents].read( static_cast<char *>( value ), numberOfBytesToBeRead );
+ m_ChannelsFile[nbComponents].read(static_cast<char *>(value), numberOfBytesToBeRead);
numberOfBytesRead = m_ChannelsFile[nbComponents].gcount();
#ifdef __APPLE_CC__
// fail() is broken in the Mac. It returns true when reaches eof().
- if ( numberOfBytesRead != numberOfBytesToBeRead )
+ if (numberOfBytesRead != numberOfBytesToBeRead)
#else
- if ( ( numberOfBytesRead != numberOfBytesToBeRead ) || m_ChannelsFile[nbComponents].fail() )
+ if ((numberOfBytesRead != numberOfBytesToBeRead) || m_ChannelsFile[nbComponents].fail())
#endif
- {
- itkExceptionMacro(<<"BSQImageIO::Read() Can Read the specified Region"); // read failed
- }
+ {
+ itkExceptionMacro(<< "BSQImageIO::Read() Can Read the specified Region"); // read failed
+ }
// cpt = (unsigned long )(nbComponents)* (unsigned long)(this->GetComponentSize()) + numberOfBytesToBeRead * this->GetNumberOfComponents() * LineNo;
// cpt = (unsigned long )(nbComponents)* (unsigned long)(this->GetComponentSize()) + numberOfBytesToBeRead * this->GetNumberOfComponents();
- for ( std::streamsize i=0; i < numberOfBytesToBeRead; i = i+static_cast<std::streamsize>(this->GetComponentSize()) )
- {
- memcpy((void*)(&(p[cpt])),(const void*)(&(value[i])),(size_t)(this->GetComponentSize()));
+ for (std::streamsize i = 0;
+ i < numberOfBytesToBeRead;
+ i = i + static_cast<std::streamsize>(this->GetComponentSize()))
+ {
+ memcpy((void*) (&(p[cpt])), (const void*) (&(value[i])), (size_t) (this->GetComponentSize()));
cpt += step;
+ }
}
}
- }
unsigned long numberOfPixelsOfRegion = lNbLines * lNbColumns * this->GetNumberOfComponents();
- delete [] value;
+ delete[] value;
// Swap bytes if necessary
- if ( 0 ) {}
- otbSwappFileToSystemMacro( unsigned short, USHORT, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( short, SHORT, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( char, CHAR, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( unsigned char, UCHAR, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( unsigned int, UINT, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( int, INT, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( long, LONG, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( unsigned long, ULONG, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( float, FLOAT, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( double, DOUBLE, buffer, numberOfPixelsOfRegion )
+ if (0) {}
+ otbSwappFileToSystemMacro(unsigned short, USHORT, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(short, SHORT, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(char, CHAR, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(unsigned char, UCHAR, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(unsigned int, UINT, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(int, INT, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(long, LONG, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(unsigned long, ULONG, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(float, FLOAT, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(double, DOUBLE, buffer, numberOfPixelsOfRegion)
else
- {
- itkExceptionMacro(<<"BSQImageIO::Read() undefined component type! " );
- }
+ {
+ itkExceptionMacro(<< "BSQImageIO::Read() undefined component type! ");
+ }
}
-
void BSQImageIO::ReadImageInformation()
{
- if ( m_HeaderFile.is_open() )
- {
+ if (m_HeaderFile.is_open())
+ {
m_HeaderFile.close();
- }
- m_HeaderFile.open( m_FileName.c_str(), std::ios::in );
- if ( m_HeaderFile.fail() )
- {
- itkExceptionMacro(<<"BSQImageIO::ReadImageInformation() failed header open ! " );
- }
+ }
+ m_HeaderFile.open(m_FileName.c_str(), std::ios::in);
+ if (m_HeaderFile.fail())
+ {
+ itkExceptionMacro(<< "BSQImageIO::ReadImageInformation() failed header open ! ");
+ }
//Read header informations
- InternalReadHeaderInformation(m_FileName, m_HeaderFile,true);
+ InternalReadHeaderInformation(m_FileName, m_HeaderFile, true);
- otbMsgDebugMacro( <<"Driver to read: BSQ");
- otbMsgDebugMacro( <<" Read file : "<< m_FileName);
- otbMsgDebugMacro( <<" Size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDebugMacro( <<" ComponentType : "<<this->GetComponentType() );
- otbMsgDebugMacro( <<" NumberOfComponents : "<<this->GetNumberOfComponents());
- otbMsgDebugMacro( <<" ComponentSize : "<<this->GetComponentSize());
- otbMsgDebugMacro( <<" GetPixelSize : "<<this->GetPixelSize());
+ otbMsgDebugMacro(<< "Driver to read: BSQ");
+ otbMsgDebugMacro(<< " Read file : " << m_FileName);
+ otbMsgDebugMacro(<< " Size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDebugMacro(<< " ComponentType : " << this->GetComponentType());
+ otbMsgDebugMacro(<< " NumberOfComponents : " << this->GetNumberOfComponents());
+ otbMsgDebugMacro(<< " ComponentSize : " << this->GetComponentSize());
+ otbMsgDebugMacro(<< " GetPixelSize : " << this->GetPixelSize());
}
-
-bool BSQImageIO::InternalReadHeaderInformation(const std::string & file_name, std::fstream & file, const bool reportError)
+bool BSQImageIO::InternalReadHeaderInformation(const std::string& file_name, std::fstream& file, const bool reportError)
{
std::string lString;
@@ -256,125 +253,127 @@ bool BSQImageIO::InternalReadHeaderInformation(const std::string & file_name, st
//Read TYPE information
file >> lString;
lString = System::SetToUpper(lString);
- if ( lString != "TYPE" )
- {
- if ( reportError == true )
+ if (lString != "TYPE")
{
+ if (reportError == true)
+ {
itkExceptionMacro(<< "BSQ : the first line of the header file must be contains 'TYPE' caracters.");
- }
+ }
else
- {
+ {
return false;
+ }
}
- }
file >> lStrCodePix;
lStrCodePix = System::SetToUpper(lStrCodePix);
if (lStrCodePix == "OCT")
- {
+ {
SetComponentType(CHAR);
- }
+ }
else if (lStrCodePix == "UOCT")
- {
+ {
SetComponentType(UCHAR);
- }
+ }
else if (lStrCodePix == "I2")
- {
+ {
SetComponentType(SHORT);
- }
+ }
else if (lStrCodePix == "UI2")
- {
+ {
SetComponentType(USHORT);
- }
+ }
else if (lStrCodePix == "I4")
- {
+ {
SetComponentType(INT);
- }
+ }
else if (lStrCodePix == "UI4")
- {
+ {
SetComponentType(UINT);
- }
+ }
else if (lStrCodePix == "R4")
- {
+ {
SetComponentType(FLOAT);
- }
+ }
else if (lStrCodePix == "R8")
- {
+ {
SetComponentType(DOUBLE);
- }
+ }
else
- {
- if ( reportError == true )
{
- itkExceptionMacro(<< "BSQ : the value type '"<<lStrCodePix<<"' (second line) set in the header file is not reconized as correct value.");
- }
+ if (reportError == true)
+ {
+ itkExceptionMacro(
+ << "BSQ : the value type '" << lStrCodePix <<
+ "' (second line) set in the header file is not reconized as correct value.");
+ }
else
- {
+ {
return false;
+ }
}
- }
//Read LABEL information
file >> lString;
lString = System::SetToUpper(lString);
- if ( lString != "LABEL" )
- {
- if ( reportError == true )
+ if (lString != "LABEL")
{
+ if (reportError == true)
+ {
itkExceptionMacro(<< "BSQ : the third line of the header file must be contains 'LABEL' caracters.");
- }
+ }
else
- {
+ {
return false;
+ }
}
- }
- while ( (lString != "CHANNELS") || (file.eof()))
- {
+ while ((lString != "CHANNELS") || (file.eof()))
+ {
file >> lString;
lString = System::SetToUpper(lString);
- }
- if ( lString != "CHANNELS" )
- {
- if ( reportError == true )
+ }
+ if (lString != "CHANNELS")
{
+ if (reportError == true)
+ {
itkExceptionMacro(<< "BSQ : 'CHANNELS' keyword is not find in the header file.");
- }
+ }
else
- {
+ {
return false;
+ }
}
- }
unsigned int lNbChannels;
file >> lNbChannels;
- this->SetNumberOfComponents( lNbChannels );
+ this->SetNumberOfComponents(lNbChannels);
//Read LINES information
file >> lString;
lString = System::SetToUpper(lString);
- if ( lString != "LINES" )
- {
- if ( reportError == true )
+ if (lString != "LINES")
{
+ if (reportError == true)
+ {
itkExceptionMacro(<< "BSQ : 'LINES' keyword is not find in the header file.");
- }
+ }
else
- {
+ {
return false;
+ }
}
- }
file >> m_Dimensions[1];
//Read COLUMNS information
file >> lString;
lString = System::SetToUpper(lString);
- if ( lString != "COLUMNS" )
- {
- if ( reportError == true )
+ if (lString != "COLUMNS")
{
+ if (reportError == true)
+ {
itkExceptionMacro(<< "BSQ : 'COLUMNS' keyword is not find in the header file.");
- }
+ }
else
- {
+ {
return false;
+ }
}
- }
file >> m_Dimensions[0];
//Read "BITS PER PIXEL" informations
@@ -385,216 +384,218 @@ bool BSQImageIO::InternalReadHeaderInformation(const std::string & file_name, st
file >> lString;
lStrBitsPerPixels = lStrBitsPerPixels + " " + lString;
lStrBitsPerPixels = System::SetToUpper(lStrBitsPerPixels);
- if ( lStrBitsPerPixels != "BITS PER PIXEL" )
- {
- if ( reportError == true )
+ if (lStrBitsPerPixels != "BITS PER PIXEL")
{
+ if (reportError == true)
+ {
itkExceptionMacro(<< "BSQ : 'BITS PER PIXEL' keyword is not find in the header file.");
- }
+ }
else
- {
+ {
return false;
+ }
}
- }
int lNbBitsPerPixels;
file >> lNbBitsPerPixels;
//Read "SENSCODAGE" informations (optionnal)
file >> lString;
- if ( lString.empty() == false)
- {
- lString = System::SetToUpper(lString);
- if ( lString == "SENSCODAGE" )
+ if (lString.empty() == false)
{
+ lString = System::SetToUpper(lString);
+ if (lString == "SENSCODAGE")
+ {
file >> lString;
lString = System::SetToUpper(lString);
- if ( lString == "INTEL" )
- {
+ if (lString == "INTEL")
+ {
m_FileByteOrder = LittleEndian;
- }
- else if ( lString == "IEEE" )
- {
+ }
+ else if (lString == "IEEE")
+ {
m_FileByteOrder = BigEndian;
- }
+ }
else
- {
- if ( reportError == true )
{
- itkExceptionMacro(<< "BSQ : the value SENSCODAGE '"<<lString<<"' set in the header file is not reconized as correct value. Possible values are INTEL or IEEE");
- }
+ if (reportError == true)
+ {
+ itkExceptionMacro(
+ << "BSQ : the value SENSCODAGE '" << lString <<
+ "' set in the header file is not reconized as correct value. Possible values are INTEL or IEEE");
+ }
else
- {
+ {
return false;
+ }
}
}
}
- }
file.close();
//Define channels file name
- std::string lRootName = System::GetRootName( file_name );
+ std::string lRootName = System::GetRootName(file_name);
m_ChannelsFileName.clear();
- for (unsigned int i=0; i<this->GetNumberOfComponents(); ++i)
- {
+ for (unsigned int i = 0; i < this->GetNumberOfComponents(); ++i)
+ {
::itk::OStringStream lStream;
- lStream << lRootName << ".c" << i+1;
+ lStream << lRootName << ".c" << i + 1;
m_ChannelsFileName.push_back(lStream.str());
- }
+ }
- m_ChannelsFile = new std::fstream[this->GetNumberOfComponents() ];
+ m_ChannelsFile = new std::fstream[this->GetNumberOfComponents()];
//Try to open channels file
- for (unsigned int channels = 0; channels<m_ChannelsFileName.size(); ++channels)
- {
- m_ChannelsFile[channels].open( m_ChannelsFileName[channels].c_str(), std::ios::in | std::ios::binary );
- if ( m_ChannelsFile[channels].fail() )
+ for (unsigned int channels = 0; channels < m_ChannelsFileName.size(); ++channels)
{
- if ( reportError == true )
+ m_ChannelsFile[channels].open(m_ChannelsFileName[channels].c_str(), std::ios::in | std::ios::binary);
+ if (m_ChannelsFile[channels].fail())
{
- itkExceptionMacro(<< "BSQ : impossible to find the file <"<<m_ChannelsFileName[channels]<<">.");
- }
+ if (reportError == true)
+ {
+ itkExceptionMacro(<< "BSQ : impossible to find the file <" << m_ChannelsFileName[channels] << ">.");
+ }
else
- {
+ {
return false;
+ }
}
}
- }
this->SetFileTypeToBinary();
this->SetNumberOfDimensions(2);
- return(true);
+ return (true);
}
-
-bool BSQImageIO::CanWriteFile( const char* filename )
+bool BSQImageIO::CanWriteFile(const char* filename)
{
std::string lFileName(filename);
std::string extension = System::GetExtension(filename);
- if ((extension!="HD")&&(extension!="hd"))
- {
+ if ((extension != "HD") && (extension != "hd"))
+ {
return false;
- }
- if ( System::IsADirName(lFileName) == true )
- {
+ }
+ if (System::IsADirName(lFileName) == true)
+ {
return false;
- }
+ }
const std::string Extension = System::GetExtension(filename);
- if ( (Extension == "hd") || (Extension == "HD") )
- {
+ if ((Extension == "hd") || (Extension == "HD"))
+ {
return true;
- }
+ }
else
- {
+ {
return false;
- }
+ }
}
void BSQImageIO::Write(const void* buffer)
{
- if ( m_FlagWriteImageInformation == true )
- {
+ if (m_FlagWriteImageInformation == true)
+ {
this->WriteImageInformation();
m_FlagWriteImageInformation = false;
- }
+ }
unsigned long step = this->GetNumberOfComponents();
- unsigned int lNbLines = this->GetIORegion().GetSize()[1];
- unsigned int lNbColumns = this->GetIORegion().GetSize()[0];
- int lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
- int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
+ unsigned int lNbLines = this->GetIORegion().GetSize()[1];
+ unsigned int lNbColumns = this->GetIORegion().GetSize()[0];
+ int lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
+ int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
// Cas particuliers : on controle que si la r�gion � �crire est de la m�me dimension que l'image enti�re,
// on commence l'offset � 0 (lorsque que l'on est pas en "Streaming")
- if ( (lNbLines == m_Dimensions[1]) && (lNbColumns == m_Dimensions[0]))
- {
- otbMsgDevMacro(<<"Force l'offset de l'IORegion � 0");
+ if ((lNbLines == m_Dimensions[1]) && (lNbColumns == m_Dimensions[0]))
+ {
+ otbMsgDevMacro(<< "Force l'offset de l'IORegion � 0");
lFirstLine = 0;
lFirstColumn = 0;
- }
+ }
- otbMsgDevMacro( <<" BSQImageIO::Write() ");
- otbMsgDevMacro( <<" Image size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDevMacro( <<" Region read (IORegion) : "<<this->GetIORegion());
- otbMsgDevMacro( <<" Nb Of Components : "<<this->GetNumberOfComponents());
- otbMsgDevMacro( <<" GetComponentSize : "<<this->GetComponentSize());
+ otbMsgDevMacro(<< " BSQImageIO::Write() ");
+ otbMsgDevMacro(<< " Image size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDevMacro(<< " Region read (IORegion) : " << this->GetIORegion());
+ otbMsgDevMacro(<< " Nb Of Components : " << this->GetNumberOfComponents());
+ otbMsgDevMacro(<< " GetComponentSize : " << this->GetComponentSize());
- std::streamoff headerLength(0);
+ std::streamoff headerLength(0);
std::streamoff numberOfBytesPerLines = static_cast<std::streamoff>(this->GetComponentSize() * m_Dimensions[0]);
std::streamsize numberOfBytesToBeWrite = static_cast<std::streamsize>(this->GetComponentSize() * lNbColumns);
- std::streamoff offset = 0;
- unsigned long cpt = 0;
+ std::streamoff offset = 0;
+ unsigned long cpt = 0;
// Update the step variable
- step = step * (unsigned long)(this->GetComponentSize());
+ step = step * (unsigned long) (this->GetComponentSize());
const char * p = static_cast<const char *>(buffer);
char* value = new char[numberOfBytesToBeWrite];
- if (value==NULL)
- {
- itkExceptionMacro(<<"Erreur allocation meoire");
+ if (value == NULL)
+ {
+ itkExceptionMacro(<< "Erreur allocation meoire");
return;
- }
+ }
for (unsigned int nbComponents = 0; nbComponents < this->GetNumberOfComponents(); ++nbComponents)
- {
- cpt = (unsigned long )(nbComponents)* (unsigned long)(this->GetComponentSize());
- //Read region of the channel
- for (unsigned int LineNo = lFirstLine;LineNo <lFirstLine + lNbLines; LineNo++ )
{
- for ( std::streamsize i=0; i < numberOfBytesToBeWrite; i = i+static_cast<std::streamsize>(this->GetComponentSize()) )
+ cpt = (unsigned long) (nbComponents) * (unsigned long) (this->GetComponentSize());
+ //Read region of the channel
+ for (unsigned int LineNo = lFirstLine; LineNo < lFirstLine + lNbLines; LineNo++)
{
- memcpy((void*)(&(value[i])),(const void*)(&(p[cpt])),(size_t)(this->GetComponentSize()));
+ for (std::streamsize i = 0;
+ i < numberOfBytesToBeWrite;
+ i = i + static_cast<std::streamsize>(this->GetComponentSize()))
+ {
+ memcpy((void*) (&(value[i])), (const void*) (&(p[cpt])), (size_t) (this->GetComponentSize()));
cpt += step;
- }
+ }
offset = headerLength + numberOfBytesPerLines * static_cast<std::streamoff>(LineNo);
offset += static_cast<std::streamoff>(this->GetComponentSize() * lFirstColumn);
m_ChannelsFile[nbComponents].seekp(offset, std::ios::beg);
//Write a line
- m_ChannelsFile[nbComponents].write( static_cast<char *>( value ), numberOfBytesToBeWrite );
+ m_ChannelsFile[nbComponents].write(static_cast<char *>(value), numberOfBytesToBeWrite);
+ }
}
- }
- delete [] value;
+ delete[] value;
}
-
void BSQImageIO::WriteImageInformation()
{
- if ( m_FileName == "" )
- {
- itkExceptionMacro(<<"A FileName must be specified.");
- }
- if ( CanWriteFile(m_FileName.c_str()) == false)
- {
- itkExceptionMacro(<< "The file "<<m_FileName.c_str()<<" is not defined as a BSQ file");
- }
+ if (m_FileName == "")
+ {
+ itkExceptionMacro(<< "A FileName must be specified.");
+ }
+ if (CanWriteFile(m_FileName.c_str()) == false)
+ {
+ itkExceptionMacro(<< "The file " << m_FileName.c_str() << " is not defined as a BSQ file");
+ }
// Close file from any previous image
- if ( m_HeaderFile.is_open() )
- {
+ if (m_HeaderFile.is_open())
+ {
m_HeaderFile.close();
- }
+ }
// Open the new file for writing
// Actually open the file
- m_HeaderFile.open( m_FileName.c_str(), std::ios::out | std::ios::trunc );
- if ( m_HeaderFile.fail() )
- {
- itkExceptionMacro(<< "Cannot write requested file "<<m_FileName.c_str()<<".");
- }
-
- if ( 0 ) {}
- otbSetTypeBsqMacro( CHAR, "OCT")
- otbSetTypeBsqMacro( UCHAR, "UOCT")
- otbSetTypeBsqMacro( SHORT, "I2")
- otbSetTypeBsqMacro( USHORT, "UI2")
- otbSetTypeBsqMacro( INT, "I4")
- otbSetTypeBsqMacro( UINT, "UI4")
- otbSetTypeBsqMacro( FLOAT, "R4")
- otbSetTypeBsqMacro( DOUBLE, "R8")
+ m_HeaderFile.open(m_FileName.c_str(), std::ios::out | std::ios::trunc);
+ if (m_HeaderFile.fail())
+ {
+ itkExceptionMacro(<< "Cannot write requested file " << m_FileName.c_str() << ".");
+ }
+
+ if (0) {}
+ otbSetTypeBsqMacro(CHAR, "OCT")
+ otbSetTypeBsqMacro(UCHAR, "UOCT")
+ otbSetTypeBsqMacro(SHORT, "I2")
+ otbSetTypeBsqMacro(USHORT, "UI2")
+ otbSetTypeBsqMacro(INT, "I4")
+ otbSetTypeBsqMacro(UINT, "UI4")
+ otbSetTypeBsqMacro(FLOAT, "R4")
+ otbSetTypeBsqMacro(DOUBLE, "R8")
else
- {
+ {
itkExceptionMacro(<< "BSQ format doesn't reconized (TYPE).");
- }
+ }
std::string lString;
//Write TYPE information
@@ -605,10 +606,9 @@ void BSQImageIO::WriteImageInformation()
m_HeaderFile << "LABEL" << std::endl;
m_HeaderFile << m_TypeBsq << " - This BSQ image file was producted by OTB software." << std::endl;
-
//Write CHANNELS information
m_HeaderFile << "CHANNELS" << std::endl;
- m_HeaderFile <<this->GetNumberOfComponents() << std::endl;
+ m_HeaderFile << this->GetNumberOfComponents() << std::endl;
//Write LINES information
m_HeaderFile << "LINES" << std::endl;
@@ -619,74 +619,73 @@ void BSQImageIO::WriteImageInformation()
//Write "BITS PER PIXEL" informations
m_HeaderFile << "BITS PER PIXEL" << std::endl;
- m_HeaderFile << this->GetComponentSize()*8 << std::endl;
+ m_HeaderFile << this->GetComponentSize() * 8 << std::endl;
//Write "SENSCODAGE" informations
m_HeaderFile << "SENSCODAGE" << std::endl;
- if ( m_ByteOrder == LittleEndian )
- {
+ if (m_ByteOrder == LittleEndian)
+ {
m_HeaderFile << "INTEL" << std::endl;
- }
+ }
else
- {
+ {
m_HeaderFile << "IEEE" << std::endl;
- }
+ }
m_HeaderFile.close();
//Create channels files
//Define channels file name
- std::string lRootName = System::GetRootName( m_FileName );
+ std::string lRootName = System::GetRootName(m_FileName);
m_ChannelsFileName.clear();
- for (unsigned int i=0; i<this->GetNumberOfComponents(); ++i)
- {
+ for (unsigned int i = 0; i < this->GetNumberOfComponents(); ++i)
+ {
::itk::OStringStream lStream;
- lStream << lRootName << ".c" << i+1;
+ lStream << lRootName << ".c" << i + 1;
m_ChannelsFileName.push_back(lStream.str());
- }
+ }
//Allocate buffer of stream file
- m_ChannelsFile = new std::fstream[this->GetNumberOfComponents() ];
+ m_ChannelsFile = new std::fstream[this->GetNumberOfComponents()];
//Try to open channels file
- for (unsigned int channels = 0; channels<m_ChannelsFileName.size(); ++channels)
- {
- m_ChannelsFile[channels].open( m_ChannelsFileName[channels].c_str(), std::ios::out | std::ios::trunc | std::ios::binary );
- if ( m_ChannelsFile[channels].fail() )
+ for (unsigned int channels = 0; channels < m_ChannelsFileName.size(); ++channels)
{
- itkExceptionMacro(<< "BSQ : impossible to find the file <"<<m_ChannelsFileName[channels]<<">.");
+ m_ChannelsFile[channels].open(
+ m_ChannelsFileName[channels].c_str(), std::ios::out | std::ios::trunc | std::ios::binary);
+ if (m_ChannelsFile[channels].fail())
+ {
+ itkExceptionMacro(<< "BSQ : impossible to find the file <" << m_ChannelsFileName[channels] << ">.");
+ }
}
- }
this->SetFileTypeToBinary();
this->SetNumberOfDimensions(2);
unsigned long headerLength = this->GetComponentSize() * m_Dimensions[0];
- char* value = new char[headerLength];
+ char* value = new char[headerLength];
- for (unsigned int channels = 0; channels<m_ChannelsFileName.size(); ++channels)
- {
- m_ChannelsFile[channels].seekp(0, std::ios::beg );
- //Write Header line and all file (whitout information)
- for (unsigned int numLigne=0; numLigne<(m_Dimensions[1]); numLigne++)
+ for (unsigned int channels = 0; channels < m_ChannelsFileName.size(); ++channels)
{
- m_ChannelsFile[channels].write(value,headerLength);
+ m_ChannelsFile[channels].seekp(0, std::ios::beg);
+ //Write Header line and all file (whitout information)
+ for (unsigned int numLigne = 0; numLigne < (m_Dimensions[1]); numLigne++)
+ {
+ m_ChannelsFile[channels].write(value, headerLength);
+ }
}
- }
- delete [] value;
+ delete[] value;
- otbMsgDebugMacro( <<"Driver to write: BSQ");
- otbMsgDebugMacro( <<" Write file : "<< m_FileName);
- otbMsgDebugMacro( <<" Size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDebugMacro( <<" Type Bsq : "<<m_TypeBsq);
- otbMsgDebugMacro( <<" ComponentType : "<<this->GetComponentType() );
- otbMsgDebugMacro( <<" NumberOfComponents : "<<this->GetNumberOfComponents());
- otbMsgDebugMacro( <<" ComponentSize : "<<this->GetComponentSize());
- otbMsgDebugMacro( <<" GetPixelSize : "<<this->GetPixelSize());
+ otbMsgDebugMacro(<< "Driver to write: BSQ");
+ otbMsgDebugMacro(<< " Write file : " << m_FileName);
+ otbMsgDebugMacro(<< " Size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDebugMacro(<< " Type Bsq : " << m_TypeBsq);
+ otbMsgDebugMacro(<< " ComponentType : " << this->GetComponentType());
+ otbMsgDebugMacro(<< " NumberOfComponents : " << this->GetNumberOfComponents());
+ otbMsgDebugMacro(<< " ComponentSize : " << this->GetComponentSize());
+ otbMsgDebugMacro(<< " GetPixelSize : " << this->GetPixelSize());
}
-
} // end namespace otb
-
diff --git a/Code/IO/otbBSQImageIO.h b/Code/IO/otbBSQImageIO.h
index eb181c81eb..9bc5d14307 100644
--- a/Code/IO/otbBSQImageIO.h
+++ b/Code/IO/otbBSQImageIO.h
@@ -23,7 +23,6 @@
#include <string>
#include <vector>
-
namespace otb
{
@@ -41,12 +40,12 @@ class ITK_EXPORT BSQImageIO : public itk::ImageIOBase
public:
/** Standard class typedefs. */
- typedef BSQImageIO Self;
- typedef itk::ImageIOBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef BSQImageIO Self;
+ typedef itk::ImageIOBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
/** Byte order typedef */
- typedef Superclass::ByteOrder ByteOrder;
+ typedef Superclass::ByteOrder ByteOrder;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -64,7 +63,7 @@ public:
virtual bool CanStreamRead()
{
return true;
- };
+ }
/** Set the spacing and dimention information for the set filename. */
virtual void ReadImageInformation();
@@ -85,7 +84,7 @@ public:
virtual bool CanStreamWrite()
{
return true;
- };
+ }
/** Writes the spacing and dimentions of the image.
* Assumes SetFileName has been called with a valid file name. */
@@ -114,49 +113,47 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- BSQImageIO(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ BSQImageIO(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Internal method to read header informations */
- bool InternalReadHeaderInformation(const std::string & file_name, std::fstream & file, const bool reportError);
-
+ bool InternalReadHeaderInformation(const std::string& file_name, std::fstream& file, const bool reportError);
#define otbSwappFileOrderToSystemOrderMacro(StrongType, buffer, buffer_size) \
{ \
- typedef itk::ByteSwapper< StrongType > InternalByteSwapperType; \
- if ( m_ByteOrder != m_FileByteOrder ) \
+ typedef itk::ByteSwapper<StrongType> InternalByteSwapperType; \
+ if (m_ByteOrder != m_FileByteOrder) \
+ { \
+ if (m_ByteOrder == LittleEndian) \
{ \
- if ( m_ByteOrder == LittleEndian ) \
- { \
- InternalByteSwapperType::SwapRangeFromSystemToBigEndian( (StrongType *)buffer, buffer_size ); \
- } \
- else if ( m_ByteOrder == BigEndian ) \
- { \
- InternalByteSwapperType::SwapRangeFromSystemToLittleEndian((StrongType *)buffer, buffer_size ); \
- } \
+ InternalByteSwapperType::SwapRangeFromSystemToBigEndian((StrongType *) buffer, buffer_size); \
} \
+ else if (m_ByteOrder == BigEndian) \
+ { \
+ InternalByteSwapperType::SwapRangeFromSystemToLittleEndian((StrongType *) buffer, buffer_size); \
+ } \
+ } \
}
#define otbSwappFileToSystemMacro(StrongType, WeakType, buffer, buffer_size) \
- else if ( this->GetComponentType() == WeakType ) \
+ else if (this->GetComponentType() == WeakType) \
{ \
- otbSwappFileOrderToSystemOrderMacro( StrongType, buffer, buffer_size )\
+ otbSwappFileOrderToSystemOrderMacro(StrongType, buffer, buffer_size) \
}
#define otbSetTypeBsqMacro(WeakType, CAI_VALUE) \
- else if ( this->GetComponentType() == WeakType ) \
+ else if (this->GetComponentType() == WeakType) \
{ \
- m_TypeBsq = CAI_VALUE; \
+ m_TypeBsq = CAI_VALUE; \
}
-
- bool m_FlagWriteImageInformation;
+ bool m_FlagWriteImageInformation;
itk::ImageIOBase::ByteOrder m_FileByteOrder;
- std::fstream m_HeaderFile;
- std::string m_TypeBsq;
- std::vector< std::string > m_ChannelsFileName;
+ std::fstream m_HeaderFile;
+ std::string m_TypeBsq;
+ std::vector<std::string> m_ChannelsFileName;
// std::vector< std::fstream > m_ChannelsFile;
- std::fstream * m_ChannelsFile;
+ std::fstream * m_ChannelsFile;
//std::fstream file;
// char* value;
diff --git a/Code/IO/otbBSQImageIOFactory.cxx b/Code/IO/otbBSQImageIOFactory.cxx
index e002517253..6b42f1b473 100644
--- a/Code/IO/otbBSQImageIOFactory.cxx
+++ b/Code/IO/otbBSQImageIOFactory.cxx
@@ -21,7 +21,6 @@
#include "otbBSQImageIO.h"
#include "itkVersion.h"
-
namespace otb
{
@@ -51,4 +50,3 @@ BSQImageIOFactory::GetDescription() const
}
} // end namespace otb
-
diff --git a/Code/IO/otbBSQImageIOFactory.h b/Code/IO/otbBSQImageIOFactory.h
index bfc1c0a426..7c60dd801b 100644
--- a/Code/IO/otbBSQImageIOFactory.h
+++ b/Code/IO/otbBSQImageIOFactory.h
@@ -30,10 +30,10 @@ class ITK_EXPORT BSQImageIOFactory : public itk::ObjectFactoryBase
{
public:
/** Standard class typedefs. */
- typedef BSQImageIOFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef BSQImageIOFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -57,12 +57,11 @@ protected:
virtual ~BSQImageIOFactory();
private:
- BSQImageIOFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ BSQImageIOFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbCoordinateToName.cxx b/Code/IO/otbCoordinateToName.cxx
index ff65271974..2f4203ec6d 100644
--- a/Code/IO/otbCoordinateToName.cxx
+++ b/Code/IO/otbCoordinateToName.cxx
@@ -34,8 +34,8 @@ namespace otb
* Constructor
*/
-CoordinateToName::CoordinateToName():
- m_Lon(-1000.0), m_Lat(-1000.0), m_Multithread(false), m_IsValid(false)
+CoordinateToName::CoordinateToName() :
+ m_Lon(-1000.0), m_Lat(-1000.0), m_Multithread(false), m_IsValid(false)
{
m_PlaceName = "";
m_CountryName = "";
@@ -43,7 +43,7 @@ CoordinateToName::CoordinateToName():
//Avoid collision between different instance of the class
typedef itk::Statistics::MersenneTwisterRandomVariateGenerator RandomGenType;
RandomGenType::Pointer randomGen = RandomGenType::GetInstance();
- randomGen->SetSeed(reinterpret_cast<long int>(this));//make sure the seed is unique for this class
+ randomGen->SetSeed(reinterpret_cast<long int>(this)); //make sure the seed is unique for this class
int randomNum = randomGen->GetIntegerVariate();
std::stringstream filename;
@@ -54,7 +54,7 @@ CoordinateToName::CoordinateToName():
m_Threader = itk::MultiThreader::New();
- m_UpdateDistance = 0.01;//about 1km at equator
+ m_UpdateDistance = 0.01; //about 1km at equator
}
@@ -65,36 +65,34 @@ void
CoordinateToName
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
os << indent << " m_Lon " << m_Lon << std::endl;
os << indent << " m_Lat " << m_Lat << std::endl;
os << indent << " m_PlaceName " << m_PlaceName << std::endl;
}
-
bool CoordinateToName::Evaluate()
{
if (m_Multithread)
- {
+ {
m_Threader->SpawnThread(ThreadFunction, this);
- }
+ }
else
- {
+ {
DoEvaluate();
- }
+ }
return true;
}
ITK_THREAD_RETURN_TYPE
-CoordinateToName::ThreadFunction( void *arg )
+CoordinateToName::ThreadFunction(void *arg)
{
- struct itk::MultiThreader::ThreadInfoStruct * pInfo = (itk::MultiThreader::ThreadInfoStruct *)(arg);
- CoordinateToName::Pointer lThis = (CoordinateToName*)(pInfo->UserData);
+ struct itk::MultiThreader::ThreadInfoStruct * pInfo = (itk::MultiThreader::ThreadInfoStruct *) (arg);
+ CoordinateToName::Pointer lThis = (CoordinateToName*) (pInfo->UserData);
lThis->DoEvaluate();
return 0;
}
-
void CoordinateToName::DoEvaluate()
{
std::ostringstream urlStream;
@@ -112,25 +110,24 @@ void CoordinateToName::DoEvaluate()
m_IsValid = true;
}
-
void CoordinateToName::RetrieveXML(std::ostringstream& urlStream) const
{
#ifdef OTB_USE_CURL
- CURL *curl;
+ CURL * curl;
CURLcode res;
- FILE* output_file = fopen(m_TempFileName.c_str(),"w");
+ FILE* output_file = fopen(m_TempFileName.c_str(), "w");
curl = curl_easy_init();
char url[256];
- strcpy(url,urlStream.str().data());
+ strcpy(url, urlStream.str().data());
// std::cout << url << std::endl;
if (curl)
- {
+ {
std::vector<char> chunk;
curl_easy_setopt(curl, CURLOPT_URL, url);
-
+
// Set 5s timeout
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 5);
@@ -140,31 +137,30 @@ void CoordinateToName::RetrieveXML(std::ostringstream& urlStream) const
fclose(output_file);
/* always cleanup */
curl_easy_cleanup(curl);
- }
+ }
#endif
}
-
void CoordinateToName::ParseXMLGeonames(std::string& placeName, std::string& countryName) const
{
#ifdef OTB_USE_CURL
- TiXmlDocument doc( m_TempFileName.c_str() );
+ TiXmlDocument doc(m_TempFileName.c_str());
doc.LoadFile();
- TiXmlHandle docHandle( &doc );
-
- TiXmlElement* childName = docHandle.FirstChild( "geonames" ).FirstChild( "geoname" ).
- FirstChild( "name" ).Element();
- if ( childName )
- {
- placeName=childName->GetText();
- }
- TiXmlElement* childCountryName = docHandle.FirstChild( "geonames" ).FirstChild( "geoname" ).
- FirstChild( "countryName" ).Element();
- if ( childCountryName )
- {
- countryName=childCountryName->GetText();
- }
- otbMsgDevMacro(<<"Near " << placeName << " in " << countryName);
+ TiXmlHandle docHandle(&doc);
+
+ TiXmlElement* childName = docHandle.FirstChild("geonames").FirstChild("geoname").
+ FirstChild("name").Element();
+ if (childName)
+ {
+ placeName = childName->GetText();
+ }
+ TiXmlElement* childCountryName = docHandle.FirstChild("geonames").FirstChild("geoname").
+ FirstChild("countryName").Element();
+ if (childCountryName)
+ {
+ countryName = childCountryName->GetText();
+ }
+ otbMsgDevMacro(<< "Near " << placeName << " in " << countryName);
remove(m_TempFileName.c_str());
#endif
}
diff --git a/Code/IO/otbCoordinateToName.h b/Code/IO/otbCoordinateToName.h
index 428867e60b..e371f1b718 100644
--- a/Code/IO/otbCoordinateToName.h
+++ b/Code/IO/otbCoordinateToName.h
@@ -39,10 +39,9 @@ class ITK_EXPORT CoordinateToName : public itk::Object
{
public:
/** Standard class typedefs. */
- typedef CoordinateToName Self;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef CoordinateToName Self;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
typedef itk::Object Superclass;
@@ -50,13 +49,13 @@ public:
/** Method for creation through the object factory. */
itkNewMacro(Self);
- typedef itk::Point<double,2> PointType;
+ typedef itk::Point<double, 2> PointType;
- itkGetMacro( Lon, double );
- itkGetMacro( Lat, double );
+ itkGetMacro(Lon, double);
+ itkGetMacro(Lat, double);
- itkSetMacro( Lon, double );
- itkSetMacro( Lat, double );
+ itkSetMacro(Lon, double);
+ itkSetMacro(Lat, double);
/**
* Set the lon/lat only if they are far enough from the current point to
@@ -65,43 +64,43 @@ public:
bool SetLonLat(PointType point)
{
if ((vcl_abs(point[0] - m_Lon) > m_UpdateDistance) || (vcl_abs(point[1] - m_Lat) > m_UpdateDistance))
- {
+ {
// std::cout << "Update lon/lat " << m_Lon << ", " << m_Lat << " -> " << point << std::endl;
m_Lon = point[0];
m_Lat = point[1];
//TODO Check whether it is better to have something imprecise or nothing at all
m_IsValid = false;
return true;
- }
+ }
else
- {
+ {
// std::cout << "Keeping lon/lat" << std::endl;
return false;
- }
+ }
}
std::string GetPlaceName() const
{
if (m_IsValid)
- {
+ {
return m_PlaceName;
- }
+ }
else
- {
+ {
return "";
- }
+ }
}
std::string GetCountryName() const
{
if (m_IsValid)
- {
+ {
return m_CountryName;
- }
+ }
else
- {
+ {
return "";
- }
+ }
}
itkGetMacro(Multithread, bool);
@@ -112,7 +111,7 @@ public:
protected:
CoordinateToName();
- virtual ~CoordinateToName() {};
+ virtual ~CoordinateToName() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
void RetrieveXML(std::ostringstream& urlStream) const;
void ParseXMLGeonames(std::string& placeName, std::string& countryName) const;
@@ -122,8 +121,8 @@ protected:
static ITK_THREAD_RETURN_TYPE ThreadFunction(void*);
private:
- CoordinateToName( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ CoordinateToName(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
double m_Lon;
double m_Lat;
diff --git a/Code/IO/otbDEMHandler.cxx b/Code/IO/otbDEMHandler.cxx
index 7d8a5ce905..1461342e4e 100644
--- a/Code/IO/otbDEMHandler.cxx
+++ b/Code/IO/otbDEMHandler.cxx
@@ -23,13 +23,13 @@
#include "base/ossimFilename.h"
#include "base/ossimDirectory.h"
#include "base/ossimGeoidEgm96.h"
-#include "base/ossimRefPtr.h"
+#include "base/ossimRefPtr.h"
namespace otb
{
DEMHandler
-::DEMHandler():
+::DEMHandler() :
m_ElevManager(ossimElevManager::instance())
{
}
@@ -39,12 +39,12 @@ DEMHandler
::OpenDEMDirectory(const char* DEMDirectory)
{
ossimFilename ossimDEMDir;
- ossimDEMDir=ossimFilename(DEMDirectory);
+ ossimDEMDir = ossimFilename(DEMDirectory);
if (!m_ElevManager->loadElevationPath(ossimDEMDir))
- {
- itkExceptionMacro("Failed to open DEM Directory: "<<ossimDEMDir);
- }
+ {
+ itkExceptionMacro("Failed to open DEM Directory: " << ossimDEMDir);
+ }
}
void
@@ -52,34 +52,33 @@ DEMHandler
::OpenGeoidFile(const char* geoidFile)
{
if ((ossimGeoidManager::instance()->findGeoidByShortName("geoid1996")) == 0)
- {
- otbMsgDevMacro( << "Opening geoid: " << geoidFile);
- ossimFilename geoid(geoidFile);
+ {
+ otbMsgDevMacro(<< "Opening geoid: " << geoidFile);
+ ossimFilename geoid(geoidFile);
ossimRefPtr<ossimGeoid> geoidPtr = new ossimGeoidEgm96(geoid);
if (geoidPtr->getErrorStatus() == ossimErrorCodes::OSSIM_OK)
- {
- otbMsgDevMacro( << "Geoid successfully opened");
- ossimGeoidManager::instance()->addGeoid(geoidPtr);
- geoidPtr.release();
- }
+ {
+ otbMsgDevMacro(<< "Geoid successfully opened");
+ ossimGeoidManager::instance()->addGeoid(geoidPtr);
+ geoidPtr.release();
+ }
else
- {
- otbMsgDevMacro( << "Failure opening geoid");
+ {
+ otbMsgDevMacro(<< "Failure opening geoid");
geoidPtr.release();
+ }
}
- }
}
-
double
DEMHandler
::GetHeightAboveMSL(const PointType& geoPoint) const
{
- double height;
+ double height;
ossimGpt ossimWorldPoint;
- ossimWorldPoint.lon=geoPoint[0];
- ossimWorldPoint.lat=geoPoint[1];
- height=m_ElevManager->getHeightAboveMSL(ossimWorldPoint);
+ ossimWorldPoint.lon = geoPoint[0];
+ ossimWorldPoint.lat = geoPoint[1];
+ height = m_ElevManager->getHeightAboveMSL(ossimWorldPoint);
return height;
}
@@ -87,12 +86,12 @@ double
DEMHandler
::GetHeightAboveEllipsoid(const PointType& geoPoint) const
{
- double height;
+ double height;
ossimGpt ossimWorldPoint;
- ossimWorldPoint.lon=geoPoint[0];
- ossimWorldPoint.lat=geoPoint[1];
- otbMsgDevMacro( << "Geoid offset: " << ossimGeoidManager::instance()->offsetFromEllipsoid(ossimWorldPoint));
- height=m_ElevManager->getHeightAboveEllipsoid(ossimWorldPoint);
+ ossimWorldPoint.lon = geoPoint[0];
+ ossimWorldPoint.lat = geoPoint[1];
+ otbMsgDevMacro(<< "Geoid offset: " << ossimGeoidManager::instance()->offsetFromEllipsoid(ossimWorldPoint));
+ height = m_ElevManager->getHeightAboveEllipsoid(ossimWorldPoint);
return height;
}
@@ -100,7 +99,7 @@ void
DEMHandler
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "DEMHandler" << std::endl;
}
diff --git a/Code/IO/otbDEMHandler.h b/Code/IO/otbDEMHandler.h
index 1784c8cf0e..23f73d4160 100644
--- a/Code/IO/otbDEMHandler.h
+++ b/Code/IO/otbDEMHandler.h
@@ -42,22 +42,22 @@ namespace otb
*
*/
-class ITK_EXPORT DEMHandler: public itk::Object
+class ITK_EXPORT DEMHandler : public itk::Object
{
-public :
+public:
/** Standard class typedefs. */
- typedef DEMHandler Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef DEMHandler Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef itk::Point<double, 2> PointType;
+ typedef itk::Point<double, 2> PointType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(DEMHandler,Object);
+ itkTypeMacro(DEMHandler, Object);
/** Try to open the DEM directory. */
virtual void OpenDEMDirectory(const char* DEMDirectory);
@@ -73,7 +73,7 @@ public :
protected:
DEMHandler();
- virtual ~DEMHandler() {};
+ virtual ~DEMHandler() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -83,5 +83,4 @@ protected:
} // namespace otb
-
#endif
diff --git a/Code/IO/otbDEMToImageGenerator.h b/Code/IO/otbDEMToImageGenerator.h
index bf726520a7..e00b399721 100644
--- a/Code/IO/otbDEMToImageGenerator.h
+++ b/Code/IO/otbDEMToImageGenerator.h
@@ -27,7 +27,6 @@
#include "otbDEMHandler.h"
#include "itkImageRegionIteratorWithIndex.h"
-
namespace otb
{
/** \class DEMToImageGenerator
@@ -44,64 +43,63 @@ namespace otb
*
*/
template <class TDEMImage>
-class ITK_EXPORT DEMToImageGenerator:
- public itk::ImageSource<TDEMImage>
+class ITK_EXPORT DEMToImageGenerator :
+ public itk::ImageSource<TDEMImage>
{
-public :
+public:
/** Standard class typedefs. */
- typedef TDEMImage DEMImageType;
- typedef typename DEMImageType::Pointer DEMImagePointerType;
- typedef typename DEMImageType::PixelType PixelType;
-
- typedef DEMToImageGenerator Self;
- typedef itk::ImageSource<DEMImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef DEMImageType OutputImageType;
-
- typedef typename Superclass::Pointer OutputImagePointer;
- typedef typename OutputImageType::SpacingType SpacingType;
- typedef typename OutputImageType::SizeType SizeType;
- typedef typename OutputImageType::PointType PointType;
- typedef typename OutputImageType::IndexType IndexType;
- typedef typename Superclass::OutputImageRegionType OutputImageRegionType;
- typedef itk::ImageRegionIteratorWithIndex< DEMImageType > ImageIteratorType;
-
- typedef otb::DEMHandler DEMHandlerType;
+ typedef TDEMImage DEMImageType;
+ typedef typename DEMImageType::Pointer DEMImagePointerType;
+ typedef typename DEMImageType::PixelType PixelType;
+
+ typedef DEMToImageGenerator Self;
+ typedef itk::ImageSource<DEMImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef DEMImageType OutputImageType;
+
+ typedef typename Superclass::Pointer OutputImagePointer;
+ typedef typename OutputImageType::SpacingType SpacingType;
+ typedef typename OutputImageType::SizeType SizeType;
+ typedef typename OutputImageType::PointType PointType;
+ typedef typename OutputImageType::IndexType IndexType;
+ typedef typename Superclass::OutputImageRegionType OutputImageRegionType;
+ typedef itk::ImageRegionIteratorWithIndex<DEMImageType> ImageIteratorType;
+
+ typedef otb::DEMHandler DEMHandlerType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(DEMToImageGenerator,ImageSource);
+ itkTypeMacro(DEMToImageGenerator, ImageSource);
/** Set/Get the Output Origin coordinates. */
- itkSetMacro(OutputOrigin,PointType);
- itkGetConstReferenceMacro(OutputOrigin,PointType);
+ itkSetMacro(OutputOrigin, PointType);
+ itkGetConstReferenceMacro(OutputOrigin, PointType);
/** Set/Get the Output Size. */
- itkSetMacro(OutputSize,SizeType);
- itkGetConstReferenceMacro(OutputSize,SizeType);
+ itkSetMacro(OutputSize, SizeType);
+ itkGetConstReferenceMacro(OutputSize, SizeType);
/** Set/Get the Output Spacing. */
- itkSetMacro(OutputSpacing,SpacingType);
- itkGetConstReferenceMacro(OutputSpacing,SpacingType);
+ itkSetMacro(OutputSpacing, SpacingType);
+ itkGetConstReferenceMacro(OutputSpacing, SpacingType);
/** Set/Get the Default Unknown Value. */
- itkSetMacro(DefaultUnknownValue,PixelType);
- itkGetConstReferenceMacro(DefaultUnknownValue,PixelType);
+ itkSetMacro(DefaultUnknownValue, PixelType);
+ itkGetConstReferenceMacro(DefaultUnknownValue, PixelType);
/** Set the DEM directory. */
virtual void SetDEMDirectoryPath(const char* DEMDirectory);
-
protected:
DEMToImageGenerator();
- virtual ~DEMToImageGenerator(){};
+ virtual ~DEMToImageGenerator(){}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId);
+ int threadId);
virtual void GenerateOutputInformation();
DEMHandlerType::Pointer m_DEMHandler;
@@ -111,8 +109,8 @@ protected:
PixelType m_DefaultUnknownValue;
private:
- DEMToImageGenerator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ DEMToImageGenerator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // namespace otb
diff --git a/Code/IO/otbDEMToImageGenerator.txx b/Code/IO/otbDEMToImageGenerator.txx
index 80c7b9aa63..04a05be855 100644
--- a/Code/IO/otbDEMToImageGenerator.txx
+++ b/Code/IO/otbDEMToImageGenerator.txx
@@ -65,10 +65,10 @@ void DEMToImageGenerator<TDEMImage>
// Specify region parameters
OutputImageRegionType largestPossibleRegion;
- largestPossibleRegion.SetSize( m_OutputSize );
- largestPossibleRegion.SetIndex( start );
+ largestPossibleRegion.SetSize(m_OutputSize);
+ largestPossibleRegion.SetIndex(start);
- output->SetLargestPossibleRegion( largestPossibleRegion );
+ output->SetLargestPossibleRegion(largestPossibleRegion);
output->SetSpacing(m_OutputSpacing);
output->SetOrigin(m_OutputOrigin);
}
@@ -79,7 +79,7 @@ DEMToImageGenerator<TDEMImage>
::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
int threadId)
{
- DEMImagePointerType DEMImage = this->GetOutput();
+ DEMImagePointerType DEMImage = this->GetOutput();
// Create an iterator that will walk the output region
ImageIteratorType outIt = ImageIteratorType(DEMImage, outputRegionForThread);
@@ -88,13 +88,13 @@ DEMToImageGenerator<TDEMImage>
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
// Walk the output image, evaluating the height at each pixel
- IndexType currentindex;
- PointType phyPoint;
- double height;
+ IndexType currentindex;
+ PointType phyPoint;
+ double height;
for (outIt.GoToBegin(); !outIt.IsAtEnd(); ++outIt)
- {
- currentindex=outIt.GetIndex();
+ {
+ currentindex = outIt.GetIndex();
DEMImage->TransformIndexToPhysicalPoint(currentindex, phyPoint);
// otbMsgDevMacro(<< "PhyPoint : (" << phyPoint[0] << "," << phyPoint[1] << ")");
@@ -104,30 +104,29 @@ DEMToImageGenerator<TDEMImage>
// MNT sets a default value (-32768) at point where it doesn't have altitude information.
// OSSIM has chosen to change this default value in OSSIM_DBL_NAN (-4.5036e15).
if (!ossim::isnan(height))
- {
+ {
// Fill the image
- DEMImage->SetPixel(currentindex, static_cast<PixelType>(height) );
- }
+ DEMImage->SetPixel(currentindex, static_cast<PixelType>(height));
+ }
else
- {
+ {
// Back to the MNT default value
DEMImage->SetPixel(currentindex, m_DefaultUnknownValue);
- }
+ }
progress.CompletedPixel();
- }
+ }
}
-
template <class TDEMImage>
void
DEMToImageGenerator<TDEMImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
- os << indent << "Output Spacing:"<< m_OutputSpacing[0] << ","<< m_OutputSpacing[1] << std::endl;
- os << indent << "Output Origin:"<< m_OutputOrigin[0] << ","<< m_OutputOrigin[1] << std::endl;
- os << indent << "Output Size:"<< m_OutputSize[0] << ","<< m_OutputSize[1] << std::endl;
+ os << indent << "Output Spacing:" << m_OutputSpacing[0] << "," << m_OutputSpacing[1] << std::endl;
+ os << indent << "Output Origin:" << m_OutputOrigin[0] << "," << m_OutputOrigin[1] << std::endl;
+ os << indent << "Output Size:" << m_OutputSize[0] << "," << m_OutputSize[1] << std::endl;
}
} // namespace otb
diff --git a/Code/IO/otbDEMToOrthoImageGenerator.h b/Code/IO/otbDEMToOrthoImageGenerator.h
index 8f02ec0ed2..d731181452 100644
--- a/Code/IO/otbDEMToOrthoImageGenerator.h
+++ b/Code/IO/otbDEMToOrthoImageGenerator.h
@@ -27,7 +27,6 @@
#include "otbDEMHandler.h"
#include "itkImageRegionIteratorWithIndex.h"
-
namespace otb
{
/** \class DEMToOrthoImageGenerator
@@ -44,41 +43,41 @@ namespace otb
*
*/
template <class TDEMImage, class TMapProjection>
-class ITK_EXPORT DEMToOrthoImageGenerator:
- public otb::DEMToImageGenerator<TDEMImage>
+class ITK_EXPORT DEMToOrthoImageGenerator :
+ public otb::DEMToImageGenerator<TDEMImage>
{
-public :
+public:
/** Standard class typedefs. */
- typedef itk::Indent Indent;
- typedef TDEMImage DEMImageType;
- typedef typename DEMImageType::Pointer DEMImagePointerType;
- typedef typename DEMImageType::PixelType PixelType;
-
- typedef TMapProjection MapProjectionType;
- typedef typename MapProjectionType::Pointer MapProjectionPointerType;
-
- typedef DEMToOrthoImageGenerator Self;
- typedef otb::DEMToImageGenerator<DEMImageType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef Image<PixelType,2> OutputImageType;
-
- typedef typename Superclass::Pointer OutputImagePointer;
- typedef typename OutputImageType::SpacingType SpacingType;
- typedef typename OutputImageType::SizeType SizeType;
- typedef typename OutputImageType::PointType PointType;
- typedef typename OutputImageType::IndexType IndexType;
- typedef typename Superclass::OutputImageRegionType OutputImageRegionType;
- typedef itk::ImageRegionIteratorWithIndex< DEMImageType > ImageIteratorType;
-
- typedef otb::DEMHandler DEMHandlerType;
- typedef typename DEMHandlerType::Pointer DEMHandlerPointerType;
+ typedef itk::Indent Indent;
+ typedef TDEMImage DEMImageType;
+ typedef typename DEMImageType::Pointer DEMImagePointerType;
+ typedef typename DEMImageType::PixelType PixelType;
+
+ typedef TMapProjection MapProjectionType;
+ typedef typename MapProjectionType::Pointer MapProjectionPointerType;
+
+ typedef DEMToOrthoImageGenerator Self;
+ typedef otb::DEMToImageGenerator<DEMImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef Image<PixelType, 2> OutputImageType;
+
+ typedef typename Superclass::Pointer OutputImagePointer;
+ typedef typename OutputImageType::SpacingType SpacingType;
+ typedef typename OutputImageType::SizeType SizeType;
+ typedef typename OutputImageType::PointType PointType;
+ typedef typename OutputImageType::IndexType IndexType;
+ typedef typename Superclass::OutputImageRegionType OutputImageRegionType;
+ typedef itk::ImageRegionIteratorWithIndex<DEMImageType> ImageIteratorType;
+
+ typedef otb::DEMHandler DEMHandlerType;
+ typedef typename DEMHandlerType::Pointer DEMHandlerPointerType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(DEMToOrthoImageGenerator,ImageSource);
+ itkTypeMacro(DEMToOrthoImageGenerator, ImageSource);
/** Set/Get the projection*/
itkSetMacro(MapProjection, MapProjectionPointerType);
@@ -86,20 +85,20 @@ public :
protected:
DEMToOrthoImageGenerator();
- virtual ~DEMToOrthoImageGenerator(){};
+ virtual ~DEMToOrthoImageGenerator(){}
void PrintSelf(std::ostream& os, Indent indent) const;
// virtual void GenerateOutputInformation();
// void AllocateOutputs();
void BeforeThreadedGenerateData();
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId);
+ int threadId);
MapProjectionPointerType m_MapProjection;
private:
- DEMToOrthoImageGenerator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ DEMToOrthoImageGenerator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // namespace otb
diff --git a/Code/IO/otbDEMToOrthoImageGenerator.txx b/Code/IO/otbDEMToOrthoImageGenerator.txx
index eec97daa82..28ab56d1be 100644
--- a/Code/IO/otbDEMToOrthoImageGenerator.txx
+++ b/Code/IO/otbDEMToOrthoImageGenerator.txx
@@ -25,7 +25,6 @@
namespace otb
{
-
template<class TDEMImage, class TMapProjection>
DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
::DEMToOrthoImageGenerator()
@@ -39,14 +38,14 @@ DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
::BeforeThreadedGenerateData()
{
if (!m_MapProjection)
- {
- itkExceptionMacro( <<
- "Please set map projection!" );
- }
- DEMImagePointerType DEMImage = this->GetOutput();
+ {
+ itkExceptionMacro(<<
+ "Please set map projection!");
+ }
+ DEMImagePointerType DEMImage = this->GetOutput();
// allocate the output buffer
- DEMImage->SetBufferedRegion( DEMImage->GetRequestedRegion() );
+ DEMImage->SetBufferedRegion(DEMImage->GetRequestedRegion());
DEMImage->Allocate();
DEMImage->FillBuffer(0);
}
@@ -59,8 +58,7 @@ DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
int threadId)
{
-
- DEMImagePointerType DEMImage = this->GetOutput();
+ DEMImagePointerType DEMImage = this->GetOutput();
// Create an iterator that will walk the output region
ImageIteratorType outIt = ImageIteratorType(DEMImage, outputRegionForThread);
@@ -71,11 +69,11 @@ DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
// Walk the output image, evaluating the height at each pixel
IndexType currentindex;
PointType cartoPoint;
- double height;
+ double height;
PointType geoPoint;
for (outIt.GoToBegin(); !outIt.IsAtEnd(); ++outIt)
- {
- currentindex=outIt.GetIndex();
+ {
+ currentindex = outIt.GetIndex();
DEMImage->TransformIndexToPhysicalPoint(currentindex, cartoPoint);
@@ -85,22 +83,22 @@ DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
// otbMsgDevMacro(<< "GeoPoint: (" << geoPoint[0] << "," << geoPoint[1] << ")");
- height = this-> m_DEMHandler->GetHeightAboveMSL(geoPoint); // Altitude calculation
+ height = this->m_DEMHandler->GetHeightAboveMSL(geoPoint); // Altitude calculation
// otbMsgDevMacro(<< "height: " << height);
// MNT sets a default value (-32768) at point where it doesn't have altitude information.
// OSSIM has chosen to change this default value in OSSIM_DBL_NAN (-4.5036e15).
if (!ossim::isnan(height))
- {
+ {
// Fill the image
- DEMImage->SetPixel(currentindex, static_cast<PixelType>(height) );
- }
+ DEMImage->SetPixel(currentindex, static_cast<PixelType>(height));
+ }
else
- {
+ {
// Back to the MNT default value
DEMImage->SetPixel(currentindex, this->m_DefaultUnknownValue);
- }
+ }
progress.CompletedPixel();
- }
+ }
}
template <class TDEMImage, class TMapProjection>
@@ -108,8 +106,8 @@ void
DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
::PrintSelf(std::ostream& os, Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os << indent << "Map projection:" << m_MapProjection-> GetWkt() << std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Map projection:" << m_MapProjection->GetWkt() << std::endl;
}
} // namespace otb
diff --git a/Code/IO/otbDXFToSpatialObjectGroupFilter.h b/Code/IO/otbDXFToSpatialObjectGroupFilter.h
index 2e004c8406..f21ea3441b 100644
--- a/Code/IO/otbDXFToSpatialObjectGroupFilter.h
+++ b/Code/IO/otbDXFToSpatialObjectGroupFilter.h
@@ -30,7 +30,6 @@
#include "itkLineSpatialObjectPoint.h"
#include "otbArcSpatialObject.h"
-
namespace otb
{
/** \class DXFToSpatialObjectGroupFilter
@@ -39,38 +38,37 @@ namespace otb
*/
template <class TSpatialObject>
class ITK_EXPORT DXFToSpatialObjectGroupFilter
- : public DL_CreationAdapter, public SpatialObjectSource<TSpatialObject>
+ : public DL_CreationAdapter, public SpatialObjectSource<TSpatialObject>
{
public:
/** Standard typedefs */
- typedef DXFToSpatialObjectGroupFilter Self;
- typedef SpatialObjectSource< TSpatialObject > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef DXFToSpatialObjectGroupFilter Self;
+ typedef SpatialObjectSource<TSpatialObject> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(SpatialObjectReader,SpatialObjectSource);
+ itkTypeMacro(SpatialObjectReader, SpatialObjectSource);
/** Spatial objects typedefs */
- typedef TSpatialObject GroupSpatialObjectType;
- typedef typename GroupSpatialObjectType::Pointer GroupPointer;
- typedef itk::SpatialObjectPoint<TSpatialObject::ObjectDimension> PointType;
- typedef itk::LandmarkSpatialObject<TSpatialObject::ObjectDimension> LandmarkType;
- typedef typename LandmarkType::Pointer LandmarkPointer;
- typedef typename LandmarkType::PointListType LandmarkListType;
- typedef LineSpatialObject<TSpatialObject::ObjectDimension> LineType;
- typedef typename LineType::Pointer LinePointer;
- typedef itk::LineSpatialObjectPoint<TSpatialObject::ObjectDimension> LinePointType;
- typedef typename LineType::PointListType LineListType;
- typedef otb::ArcSpatialObject<TSpatialObject::ObjectDimension> ArcType;
- typedef typename ArcType::Pointer ArcPointer;
- typedef itk::EllipseSpatialObject<TSpatialObject::ObjectDimension> EllipseType;
- typedef typename EllipseType::Pointer EllipsePointer;
- typedef std::vector< LinePointType > PointListType;
-
+ typedef TSpatialObject GroupSpatialObjectType;
+ typedef typename GroupSpatialObjectType::Pointer GroupPointer;
+ typedef itk::SpatialObjectPoint<TSpatialObject::ObjectDimension> PointType;
+ typedef itk::LandmarkSpatialObject<TSpatialObject::ObjectDimension> LandmarkType;
+ typedef typename LandmarkType::Pointer LandmarkPointer;
+ typedef typename LandmarkType::PointListType LandmarkListType;
+ typedef LineSpatialObject<TSpatialObject::ObjectDimension> LineType;
+ typedef typename LineType::Pointer LinePointer;
+ typedef itk::LineSpatialObjectPoint<TSpatialObject::ObjectDimension> LinePointType;
+ typedef typename LineType::PointListType LineListType;
+ typedef otb::ArcSpatialObject<TSpatialObject::ObjectDimension> ArcType;
+ typedef typename ArcType::Pointer ArcPointer;
+ typedef itk::EllipseSpatialObject<TSpatialObject::ObjectDimension> EllipseType;
+ typedef typename EllipseType::Pointer EllipsePointer;
+ typedef std::vector<LinePointType> PointListType;
virtual void addLayer(const DL_LayerData& data);
virtual void addPoint(const DL_PointData& data);
@@ -98,14 +96,14 @@ protected:
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- DXFToSpatialObjectGroupFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
- int m_CurrentObjectType;
- LineListType m_PointList;
+ DXFToSpatialObjectGroupFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
+ int m_CurrentObjectType;
+ LineListType m_PointList;
LinePointType m_PremierPoint;
- int m_PolylineClosed; //(=1 if the polyline is closed,else =0 );
- const char* m_layer;
- bool layerspecified;
+ int m_PolylineClosed; //(=1 if the polyline is closed,else =0 );
+ const char* m_layer;
+ bool layerspecified;
};
}
#ifndef OTB_MANUAL_INSTANTIATION
@@ -113,4 +111,3 @@ private:
#endif
#endif
-
diff --git a/Code/IO/otbDXFToSpatialObjectGroupFilter.txx b/Code/IO/otbDXFToSpatialObjectGroupFilter.txx
index 205a39ff2b..694a6d01a2 100644
--- a/Code/IO/otbDXFToSpatialObjectGroupFilter.txx
+++ b/Code/IO/otbDXFToSpatialObjectGroupFilter.txx
@@ -29,10 +29,10 @@ template <class TSpatialObject>
DXFToSpatialObjectGroupFilter<TSpatialObject>
::DXFToSpatialObjectGroupFilter()
{
- m_CurrentObjectType=0;
+ m_CurrentObjectType = 0;
m_PointList.clear();
- m_layer="";
- layerspecified=false;
+ m_layer = "";
+ layerspecified = false;
this->SetNumberOfRequiredOutputs(0);
}
/**
@@ -43,8 +43,8 @@ void
DXFToSpatialObjectGroupFilter<TSpatialObject>
::SetLayer(const char* layer)
{
- m_layer=layer;
- layerspecified=true;
+ m_layer = layer;
+ layerspecified = true;
}
/**
* Sample implementation of the method which handles layers.
@@ -56,27 +56,26 @@ DXFToSpatialObjectGroupFilter<TSpatialObject>
{
GroupPointer grpPtr = this->GetOutput();
//If the previous object is a vertex we create the polyline:
- if (m_CurrentObjectType==6)
- {
- //If the polyline is closed then we add the first point at the end of the list:
- if (m_PolylineClosed==1)
+ if (m_CurrentObjectType == 6)
{
+ //If the polyline is closed then we add the first point at the end of the list:
+ if (m_PolylineClosed == 1)
+ {
m_PointList.push_back(m_PremierPoint);
- }
- LinePointer m_CurrentPolyLine=LineType::New();
+ }
+ LinePointer m_CurrentPolyLine = LineType::New();
m_CurrentPolyLine->SetPoints(m_PointList);
if (layerspecified)
- {
- if (!strcmp(attributes.getLayer().c_str(),m_layer))
{
+ if (!strcmp(attributes.getLayer().c_str(), m_layer))
+ {
grpPtr->AddSpatialObject(m_CurrentPolyLine);
+ }
}
+ else grpPtr->AddSpatialObject(m_CurrentPolyLine);
}
- else
- grpPtr->AddSpatialObject(m_CurrentPolyLine);
- }
- m_CurrentObjectType=0;
- otbMsgDebugMacro(<<"LAYER: "<< data.name <<" flags: "<<data.flags);
+ m_CurrentObjectType = 0;
+ otbMsgDebugMacro(<< "LAYER: " << data.name << " flags: " << data.flags);
}
/**
@@ -89,42 +88,42 @@ DXFToSpatialObjectGroupFilter<TSpatialObject>
{
GroupPointer grpPtr = this->GetOutput();
//If the previous object is a vertex we create the polyline:
- if (m_CurrentObjectType==6)
- {
- //If the polyline is closed then we add the first point at the end of the list:
- if (m_PolylineClosed==1)
+ if (m_CurrentObjectType == 6)
{
+ //If the polyline is closed then we add the first point at the end of the list:
+ if (m_PolylineClosed == 1)
+ {
m_PointList.push_back(m_PremierPoint);
- }
- LinePointer m_CurrentPolyLine=LineType::New();
+ }
+ LinePointer m_CurrentPolyLine = LineType::New();
m_CurrentPolyLine->SetPoints(m_PointList);
if (layerspecified)
- {
- if (!strcmp( attributes.getLayer().c_str(),m_layer))
{
+ if (!strcmp(attributes.getLayer().c_str(), m_layer))
+ {
grpPtr->AddSpatialObject(m_CurrentPolyLine);
+ }
}
+ else grpPtr->AddSpatialObject(m_CurrentPolyLine);
}
- else
- grpPtr->AddSpatialObject(m_CurrentPolyLine);
- }
- m_CurrentObjectType=1;
- LandmarkPointer landmark=LandmarkType::New();
- PointType point;
+ m_CurrentObjectType = 1;
+ LandmarkPointer landmark = LandmarkType::New();
+ PointType point;
LandmarkListType list;
- point.SetPosition(data.x, data.y, data.z );
+ point.SetPosition(data.x, data.y, data.z);
list.push_back(point);
landmark->SetPoints(list);
if (layerspecified)
- {
- if (!strcmp(attributes.getLayer().c_str(),m_layer))
{
+ if (!strcmp(attributes.getLayer().c_str(), m_layer))
+ {
grpPtr->AddSpatialObject(landmark);
+ }
}
- }
- else
- grpPtr->AddSpatialObject(landmark);
- otbMsgDebugMacro(<<"POINT ("<<data.x<<", "<<data.y<<", "<<data.z<<") ( nb objects "<<grpPtr->GetNumberOfChildren()<<")");
+ else grpPtr->AddSpatialObject(landmark);
+ otbMsgDebugMacro(
+ << "POINT (" << data.x << ", " << data.y << ", " << data.z << ") ( nb objects " << grpPtr->GetNumberOfChildren() <<
+ ")");
}
/**
@@ -137,29 +136,28 @@ DXFToSpatialObjectGroupFilter<TSpatialObject>
{
GroupPointer grpPtr = this->GetOutput();
//If the previous object is a vertex we create the polyline:
- if (m_CurrentObjectType==6)
- {
- //If the polyline is closed then we add the first point at the end of the list:
- if (m_PolylineClosed==1)
+ if (m_CurrentObjectType == 6)
{
+ //If the polyline is closed then we add the first point at the end of the list:
+ if (m_PolylineClosed == 1)
+ {
m_PointList.push_back(m_PremierPoint);
- }
- LinePointer m_CurrentPolyLine=LineType::New();
+ }
+ LinePointer m_CurrentPolyLine = LineType::New();
m_CurrentPolyLine->SetPoints(m_PointList);
if (layerspecified)
- {
- if (!strcmp( attributes.getLayer().c_str(),m_layer))
{
+ if (!strcmp(attributes.getLayer().c_str(), m_layer))
+ {
grpPtr->AddSpatialObject(m_CurrentPolyLine);
+ }
}
+ else grpPtr->AddSpatialObject(m_CurrentPolyLine);
}
- else
- grpPtr->AddSpatialObject(m_CurrentPolyLine);
- }
- m_CurrentObjectType=2;
- LinePointer line=LineType::New();
- LinePointType point1,point2;
- LineListType list,pointlist;
+ m_CurrentObjectType = 2;
+ LinePointer line = LineType::New();
+ LinePointType point1, point2;
+ LineListType list, pointlist;
pointlist.clear();
point1.SetPosition(data.x1, data.y1, data.z1);
list.push_back(point1);
@@ -167,16 +165,15 @@ DXFToSpatialObjectGroupFilter<TSpatialObject>
list.push_back(point2);
line->SetPoints(list);
if (layerspecified)
- {
- if (!strcmp(attributes.getLayer().c_str(),m_layer))
{
+ if (!strcmp(attributes.getLayer().c_str(), m_layer))
+ {
grpPtr->AddSpatialObject(line);
+ }
}
- }
- else
- grpPtr->AddSpatialObject(line);
- otbMsgDebugMacro(<<"LINE "<<"("<<data.x1<<", "<<data.y1<<", "<<data.z1<<") ("
- <<data.x2<<", "<<data.y2<<", "<<data.z2 <<grpPtr->GetNumberOfChildren()<<")");
+ else grpPtr->AddSpatialObject(line);
+ otbMsgDebugMacro(<< "LINE " << "(" << data.x1 << ", " << data.y1 << ", " << data.z1 << ") ("
+ << data.x2 << ", " << data.y2 << ", " << data.z2 << grpPtr->GetNumberOfChildren() << ")");
}
/**
@@ -189,29 +186,28 @@ DXFToSpatialObjectGroupFilter<TSpatialObject>
{
GroupPointer grpPtr = this->GetOutput();
//If the previous object is a vertex we create the polyline:
- if (m_CurrentObjectType==6)
- {
- //If the polyline is closed then we add the first point at the end of the list:
- if (m_PolylineClosed==1)
+ if (m_CurrentObjectType == 6)
{
+ //If the polyline is closed then we add the first point at the end of the list:
+ if (m_PolylineClosed == 1)
+ {
m_PointList.push_back(m_PremierPoint);
- }
- LinePointer m_CurrentPolyLine=LineType::New();
+ }
+ LinePointer m_CurrentPolyLine = LineType::New();
m_CurrentPolyLine->SetPoints(m_PointList);
if (layerspecified)
- {
- if (!strcmp(attributes.getLayer().c_str(),m_layer))
{
+ if (!strcmp(attributes.getLayer().c_str(), m_layer))
+ {
grpPtr->AddSpatialObject(m_CurrentPolyLine);
+ }
}
+ else grpPtr->AddSpatialObject(m_CurrentPolyLine);
}
- else
- grpPtr->AddSpatialObject(m_CurrentPolyLine);
- }
- m_CurrentObjectType=7;
- LinePointer line=LineType::New();
- LinePointType point1,point2,point3,point4;
- LineListType list,pointlist;
+ m_CurrentObjectType = 7;
+ LinePointer line = LineType::New();
+ LinePointType point1, point2, point3, point4;
+ LineListType list, pointlist;
pointlist.clear();
point1.SetPosition(data.x1, data.y1, data.z1);
list.push_back(point1);
@@ -224,19 +220,18 @@ DXFToSpatialObjectGroupFilter<TSpatialObject>
list.push_back(point1);
line->SetPoints(list);
if (layerspecified)
- {
- if (!strcmp(attributes.getLayer().c_str(),m_layer))
{
+ if (!strcmp(attributes.getLayer().c_str(), m_layer))
+ {
grpPtr->AddSpatialObject(line);
+ }
}
- }
- else
- grpPtr->AddSpatialObject(line);
- otbMsgDebugMacro(<<"3D Face "<<"("<<data.x1<<", "<<data.y1<<", "<<data.z1<<") ("
- <<data.x2<<", "<<data.y2<<", "<<data.z2<<") ("
- <<data.x3<<", "<<data.y3<<", "<<data.z3<<") ("
- <<data.x4<<", "<<data.y4<<", "<<data.z4<<") ("
- <<grpPtr->GetNumberOfChildren()<<")");
+ else grpPtr->AddSpatialObject(line);
+ otbMsgDebugMacro(<< "3D Face " << "(" << data.x1 << ", " << data.y1 << ", " << data.z1 << ") ("
+ << data.x2 << ", " << data.y2 << ", " << data.z2 << ") ("
+ << data.x3 << ", " << data.y3 << ", " << data.z3 << ") ("
+ << data.x4 << ", " << data.y4 << ", " << data.z4 << ") ("
+ << grpPtr->GetNumberOfChildren() << ")");
}
/**
@@ -249,28 +244,27 @@ DXFToSpatialObjectGroupFilter<TSpatialObject>
{
GroupPointer grpPtr = this->GetOutput();
//If the previous object is a vertex we create the polyline:
- if (m_CurrentObjectType==6)
- {
- //If the polyline is closed then we add the first point at the end of the list:
- if (m_PolylineClosed==1)
+ if (m_CurrentObjectType == 6)
{
+ //If the polyline is closed then we add the first point at the end of the list:
+ if (m_PolylineClosed == 1)
+ {
m_PointList.push_back(m_PremierPoint);
- }
- LinePointer m_CurrentPolyLine=LineType::New();
+ }
+ LinePointer m_CurrentPolyLine = LineType::New();
m_CurrentPolyLine->SetPoints(m_PointList);
if (layerspecified)
- {
- if (!strcmp(attributes.getLayer().c_str(),m_layer))
{
+ if (!strcmp(attributes.getLayer().c_str(), m_layer))
+ {
grpPtr->AddSpatialObject(m_CurrentPolyLine);
+ }
}
+ else grpPtr->AddSpatialObject(m_CurrentPolyLine);
}
- else
- grpPtr->AddSpatialObject(m_CurrentPolyLine);
- }
- otbMsgDebugMacro(<<"ARC ("<<data.cx<<", "<<data.cy<<", "<<data.cz<<") "
- <<data.radius<<", "<<data.angle1<<", "<<data.angle2
- <<" (nb objects "<<grpPtr->GetNumberOfChildren()<<")");
+ otbMsgDebugMacro(<< "ARC (" << data.cx << ", " << data.cy << ", " << data.cz << ") "
+ << data.radius << ", " << data.angle1 << ", " << data.angle2
+ << " (nb objects " << grpPtr->GetNumberOfChildren() << ")");
}
@@ -284,50 +278,48 @@ DXFToSpatialObjectGroupFilter<TSpatialObject>
{
GroupPointer grpPtr = this->GetOutput();
//If the previous object is a vertex we create the polyline:
- if (m_CurrentObjectType==6)
- {
- //If the polyline is closed then we add the first point at the end of the list:
- if (m_PolylineClosed==1)
+ if (m_CurrentObjectType == 6)
{
+ //If the polyline is closed then we add the first point at the end of the list:
+ if (m_PolylineClosed == 1)
+ {
m_PointList.push_back(m_PremierPoint);
- }
- LinePointer m_CurrentPolyLine=LineType::New();
+ }
+ LinePointer m_CurrentPolyLine = LineType::New();
m_CurrentPolyLine->SetPoints(m_PointList);
if (layerspecified)
- {
- if (!strcmp(attributes.getLayer().c_str(),m_layer))
{
+ if (!strcmp(attributes.getLayer().c_str(), m_layer))
+ {
grpPtr->AddSpatialObject(m_CurrentPolyLine);
+ }
}
+ else grpPtr->AddSpatialObject(m_CurrentPolyLine);
}
- else
- grpPtr->AddSpatialObject(m_CurrentPolyLine);
- }
- m_CurrentObjectType=4;
- EllipsePointer ellipse=EllipseType::New();
+ m_CurrentObjectType = 4;
+ EllipsePointer ellipse = EllipseType::New();
ellipse->SetRadius(data.radius);
double offset[TSpatialObject::ObjectDimension];
- offset[ 0 ] = data.cx;
- offset[ 1 ] = data.cy;
- if (TSpatialObject::ObjectDimension==3)
- {
- offset[ 2 ] = data.cz;
- }
+ offset[0] = data.cx;
+ offset[1] = data.cy;
+ if (TSpatialObject::ObjectDimension == 3)
+ {
+ offset[2] = data.cz;
+ }
ellipse->GetObjectToParentTransform()->SetOffset(offset);
ellipse->ComputeObjectToWorldTransform();
if (layerspecified)
- {
- if (!strcmp(attributes.getLayer().c_str(),m_layer))
{
+ if (!strcmp(attributes.getLayer().c_str(), m_layer))
+ {
grpPtr->AddSpatialObject(ellipse);
+ }
}
- }
- else
- grpPtr->AddSpatialObject(ellipse);
+ else grpPtr->AddSpatialObject(ellipse);
- otbMsgDebugMacro(<<"CIRCLE ("<<data.cx<<", "<<data.cy<<", "<<data.cz<<") "
- <<data.radius
- <<" (nb objects "<<grpPtr->GetNumberOfChildren()<<")");
+ otbMsgDebugMacro(<< "CIRCLE (" << data.cx << ", " << data.cy << ", " << data.cz << ") "
+ << data.radius
+ << " (nb objects " << grpPtr->GetNumberOfChildren() << ")");
}
/**
@@ -340,41 +332,38 @@ DXFToSpatialObjectGroupFilter<TSpatialObject>
{
GroupPointer grpPtr = this->GetOutput();
//If the previous object is a vertex we create the polyline:
- if (m_CurrentObjectType==6)
- {
- //If the polyline is closed then we add the first point at the end of the list:
- if (m_PolylineClosed==1)
+ if (m_CurrentObjectType == 6)
{
+ //If the polyline is closed then we add the first point at the end of the list:
+ if (m_PolylineClosed == 1)
+ {
m_PointList.push_back(m_PremierPoint);
- }
- LinePointer m_CurrentPolyLine=LineType::New();
+ }
+ LinePointer m_CurrentPolyLine = LineType::New();
m_CurrentPolyLine->SetPoints(m_PointList);
if (layerspecified)
- {
- if (!strcmp( attributes.getLayer().c_str(),m_layer))
{
+ if (!strcmp(attributes.getLayer().c_str(), m_layer))
+ {
grpPtr->AddSpatialObject(m_CurrentPolyLine);
+ }
}
+ else grpPtr->AddSpatialObject(m_CurrentPolyLine);
}
- else
- grpPtr->AddSpatialObject(m_CurrentPolyLine);
- }
- m_CurrentObjectType=5;
+ m_CurrentObjectType = 5;
- m_PointList.clear();//reset list
+ m_PointList.clear(); //reset list
- if ((int)data.flags==1)
- {
- m_PolylineClosed=1;
- }
- else
- m_PolylineClosed=0;
- otbMsgDebugMacro(<<"POLYLINE ");
- otbMsgDebugMacro(<<"flags: "<< data.flags <<",nombre de sommets: "<< data.number);
+ if ((int) data.flags == 1)
+ {
+ m_PolylineClosed = 1;
+ }
+ else m_PolylineClosed = 0;
+ otbMsgDebugMacro(<< "POLYLINE ");
+ otbMsgDebugMacro(<< "flags: " << data.flags << ",nombre de sommets: " << data.number);
}
-
/**
* Sample implementation of the method which handles vertices.
*/
@@ -384,14 +373,14 @@ DXFToSpatialObjectGroupFilter<TSpatialObject>
::addVertex(const DL_VertexData& data)
{
GroupPointer grpPtr = this->GetOutput();
- m_CurrentObjectType=6;
+ m_CurrentObjectType = 6;
LinePointType point;
point.SetPosition(data.x, data.y, data.z);
m_PointList.push_back(point);
- m_PremierPoint=m_PointList[0];
- otbMsgDebugMacro(<<"VERTEX ("<<data.x<<", "<<data.y<<", "<<data.z<<") "
- <<data.bulge
- <<" (nb objects "<<grpPtr->GetNumberOfChildren()<<")");
+ m_PremierPoint = m_PointList[0];
+ otbMsgDebugMacro(<< "VERTEX (" << data.x << ", " << data.y << ", " << data.z << ") "
+ << data.bulge
+ << " (nb objects " << grpPtr->GetNumberOfChildren() << ")");
}
@@ -402,25 +391,24 @@ DXFToSpatialObjectGroupFilter<TSpatialObject>
{
GroupPointer grpPtr = this->GetOutput();
//If the previous object is a vertex we create the polyline:
- if (m_CurrentObjectType==6)
- {
- //If the polyline is closed then we add the first point at the end of the list:
- if (m_PolylineClosed==1)
+ if (m_CurrentObjectType == 6)
{
+ //If the polyline is closed then we add the first point at the end of the list:
+ if (m_PolylineClosed == 1)
+ {
m_PointList.push_back(m_PremierPoint);
- }
- LinePointer m_CurrentPolyLine=LineType::New();
+ }
+ LinePointer m_CurrentPolyLine = LineType::New();
m_CurrentPolyLine->SetPoints(m_PointList);
if (layerspecified)
- {
- if (!strcmp( attributes.getLayer().c_str(),m_layer))
{
+ if (!strcmp(attributes.getLayer().c_str(), m_layer))
+ {
grpPtr->AddSpatialObject(m_CurrentPolyLine);
+ }
}
+ else grpPtr->AddSpatialObject(m_CurrentPolyLine);
}
- else
- grpPtr->AddSpatialObject(m_CurrentPolyLine);
- }
}
template <class TSpatialObject>
diff --git a/Code/IO/otbDefaultImageMetadataInterface.h b/Code/IO/otbDefaultImageMetadataInterface.h
index 24767e1ce8..b54551455a 100644
--- a/Code/IO/otbDefaultImageMetadataInterface.h
+++ b/Code/IO/otbDefaultImageMetadataInterface.h
@@ -36,9 +36,9 @@ class ITK_EXPORT DefaultImageMetadataInterface : public ImageMetadataInterfaceBa
public:
typedef DefaultImageMetadataInterface Self;
- typedef ImageMetadataInterfaceBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageMetadataInterfaceBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -52,113 +52,110 @@ public:
typedef Superclass::VariableLengthVectorType VariableLengthVectorType;
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
-
- /** Get the radiometric bias from the ossim metadata */
- VariableLengthVectorType GetPhysicalBias( const MetaDataDictionaryType & ) const
+ /** Get the radiometric bias from the ossim metadata */
+ VariableLengthVectorType GetPhysicalBias(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetPhysicalBias not implemented in DefaultImageMetadataInterface, no captor type found");
- };
-
+ itkExceptionMacro("GetPhysicalBias not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
+
/** Get the radiometric gain from the ossim metadata */
- VariableLengthVectorType GetPhysicalGain( const MetaDataDictionaryType & ) const
+ VariableLengthVectorType GetPhysicalGain(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetPhysicalGain not implemented in DefaultImageMetadataInterface, no captor type found");
- };
-
+ itkExceptionMacro("GetPhysicalGain not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
+
/** Get the solar irradiance from the ossim metadata */
- VariableLengthVectorType GetSolarIrradiance( const MetaDataDictionaryType & ) const
+ VariableLengthVectorType GetSolarIrradiance(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetSolarIrradiance not implemented in DefaultImageMetadataInterface, no captor type found");
- };
-
- /** Get the imaging acquisition day from the ossim metadata */
- int GetDay( const MetaDataDictionaryType & ) const
+ itkExceptionMacro("GetSolarIrradiance not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
+
+ /** Get the imaging acquisition day from the ossim metadata */
+ int GetDay(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetDay not implemented in DefaultImageMetadataInterface, no captor type found");
- };
-
+ itkExceptionMacro("GetDay not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
+
/** Get the imaging acquisition month from the ossim metadata */
- int GetMonth( const MetaDataDictionaryType & ) const
+ int GetMonth(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetMonth not implemented in DefaultImageMetadataInterface, no captor type found");
- };
-
+ itkExceptionMacro("GetMonth not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
+
/** Get the imaging acquisition year from the ossim metadata */
- int GetYear( const MetaDataDictionaryType & ) const
+ int GetYear(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetYear not implemented in DefaultImageMetadataInterface, no captor type found");
- };
-
+ itkExceptionMacro("GetYear not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
+
/** Get the imaging acquisition hour from the ossim metadata */
- int GetHour( const MetaDataDictionaryType & ) const
+ int GetHour(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetHour not implemented in DefaultImageMetadataInterface, no captor type found");
- };
-
+ itkExceptionMacro("GetHour not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
+
/** Get the imaging acquisition minute from the ossim metadata */
- int GetMinute( const MetaDataDictionaryType & ) const
+ int GetMinute(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetMinute not implemented in DefaultImageMetadataInterface, no captor type found");
- };
+ itkExceptionMacro("GetMinute not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
/** Get the imaging production day from the ossim metadata */
- int GetProductionDay( const MetaDataDictionaryType & ) const
+ int GetProductionDay(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetProductionDay not implemented in DefaultImageMetadataInterface, no captor type found");
- };
-
+ itkExceptionMacro("GetProductionDay not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
+
/** Get the imaging production month from the ossim metadata */
- int GetProductionMonth( const MetaDataDictionaryType & ) const
+ int GetProductionMonth(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetProductionMonth not implemented in DefaultImageMetadataInterface, no captor type found");
- };
-
+ itkExceptionMacro("GetProductionMonth not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
+
/** Get the imaging production year from the ossim metadata */
- int GetProductionYear( const MetaDataDictionaryType & ) const
+ int GetProductionYear(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetProductionYear not implemented in DefaultImageMetadataInterface, no captor type found");
- };
-
+ itkExceptionMacro("GetProductionYear not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
+
/** Get the sat elevation from the ossim metadata */
- double GetSatElevation( const MetaDataDictionaryType & ) const
+ double GetSatElevation(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetSatElevation not implemented in DefaultImageMetadataInterface, no captor type found");
- };
-
+ itkExceptionMacro("GetSatElevation not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
+
/** Get the sat azimuth from the ossim metadata */
- double GetSatAzimuth( const MetaDataDictionaryType & ) const
+ double GetSatAzimuth(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetSatElevation not implemented in DefaultImageMetadataInterface, no captor type found");
- };
-
+ itkExceptionMacro("GetSatElevation not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
/** Get the first wavelength for the spectral band definition */
- VariableLengthVectorType GetFirstWavelengths( const MetaDataDictionaryType & ) const
+ VariableLengthVectorType GetFirstWavelengths(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetFirstWavelengths not implemented in DefaultImageMetadataInterface, no captor type found");
- };
+ itkExceptionMacro("GetFirstWavelengths not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
/** Get the last wavelength for the spectral band definition */
- VariableLengthVectorType GetLastWavelengths( const MetaDataDictionaryType & ) const
+ VariableLengthVectorType GetLastWavelengths(const MetaDataDictionaryType&) const
{
- itkExceptionMacro("GetLastWavelengths not implemented in DefaultImageMetadataInterface, no captor type found");
- };
-
- bool CanRead( const MetaDataDictionaryType & ) const
+ itkExceptionMacro("GetLastWavelengths not implemented in DefaultImageMetadataInterface, no captor type found");
+ }
+
+ bool CanRead(const MetaDataDictionaryType&) const
{
- // This clas is the default one, it has to be able to call every metadata
- return true;
- };
+ // This clas is the default one, it has to be able to call every metadata
+ return true;
+ }
protected:
DefaultImageMetadataInterface(){};
- virtual ~DefaultImageMetadataInterface() {};
+ virtual ~DefaultImageMetadataInterface() {}
-
private:
- DefaultImageMetadataInterface(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ DefaultImageMetadataInterface(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/IO/otbDefaultImageMetadataInterfaceFactory.cxx b/Code/IO/otbDefaultImageMetadataInterfaceFactory.cxx
index a627d44baa..138ab41311 100644
--- a/Code/IO/otbDefaultImageMetadataInterfaceFactory.cxx
+++ b/Code/IO/otbDefaultImageMetadataInterfaceFactory.cxx
@@ -16,7 +16,6 @@
=========================================================================*/
-
#ifdef _MSC_VER
#pragma warning ( disable : 4786 )
#endif
@@ -32,7 +31,6 @@
#include "itkCreateObjectFunction.h"
#include "itkVersion.h"
-
namespace otb
{
@@ -43,7 +41,7 @@ DefaultImageMetadataInterfaceFactory
"otbDefaultImageMetadataInterface",
"Default Meteada Interface",
1,
- itk::CreateObjectFunction<DefaultImageMetadataInterface >::New());
+ itk::CreateObjectFunction<DefaultImageMetadataInterface>::New());
}
DefaultImageMetadataInterfaceFactory
diff --git a/Code/IO/otbDefaultImageMetadataInterfaceFactory.h b/Code/IO/otbDefaultImageMetadataInterfaceFactory.h
index 8b71186766..3b13961d21 100644
--- a/Code/IO/otbDefaultImageMetadataInterfaceFactory.h
+++ b/Code/IO/otbDefaultImageMetadataInterfaceFactory.h
@@ -34,10 +34,10 @@ class ITK_EXPORT DefaultImageMetadataInterfaceFactory : public itk::ObjectFactor
{
public:
/** Standard class typedefs. */
- typedef DefaultImageMetadataInterfaceFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef DefaultImageMetadataInterfaceFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -61,12 +61,11 @@ protected:
virtual ~DefaultImageMetadataInterfaceFactory();
private:
- DefaultImageMetadataInterfaceFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ DefaultImageMetadataInterfaceFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbFileName.cxx b/Code/IO/otbFileName.cxx
index b39243ea23..5f977c6043 100644
--- a/Code/IO/otbFileName.cxx
+++ b/Code/IO/otbFileName.cxx
@@ -25,22 +25,21 @@ FileName::FileName() : ossimFilename()
{}
FileName::FileName(const FileName& src)
- : ossimFilename(src)
+ : ossimFilename(src)
{}
FileName::FileName(const ossimFilename& src)
- : ossimFilename(src)
+ : ossimFilename(src)
{}
FileName::FileName(const ossimString& src)
- : ossimFilename(src)
+ : ossimFilename(src)
{}
FileName::FileName(const char* src)
- : ossimFilename(src)
+ : ossimFilename(src)
{}
-
FileName FileName::ObtainFileNameWithNoExtension() const
{
return this->fileNoExtension();
diff --git a/Code/IO/otbFileName.h b/Code/IO/otbFileName.h
index 2692128f05..c78e21eda6 100644
--- a/Code/IO/otbFileName.h
+++ b/Code/IO/otbFileName.h
@@ -38,9 +38,9 @@ class ITK_EXPORT FileName : public ossimFilename
public:
FileName();
- FileName(const FileName& src);
- FileName(const ossimFilename& src);
- FileName(const ossimString& src);
+ FileName(const FileName &src);
+ FileName(const ossimFilename &src);
+ FileName(const ossimString &src);
FileName(const char* src);
/**
@@ -53,4 +53,3 @@ public:
}
#endif
-
diff --git a/Code/IO/otbGDALImageIO.cxx b/Code/IO/otbGDALImageIO.cxx
index 83bf253ca7..dc20d2b13c 100644
--- a/Code/IO/otbGDALImageIO.cxx
+++ b/Code/IO/otbGDALImageIO.cxx
@@ -35,7 +35,6 @@
#include "itkRGBPixel.h"
#include "itkRGBAPixel.h"
-
namespace otb
{
@@ -68,7 +67,6 @@ GDALImageIO::GDALImageIO()
m_NbBands = 0;
m_FlagWriteImageInformation = true;
-
// GDALAllRegister();
}
@@ -80,28 +78,27 @@ GDALImageIO::~GDALImageIO()
// if( m_poDataset != NULL ) delete m_poDataset;
if (m_poDataset != NULL)
- {
+ {
GDALClose(m_poDataset);
m_poDataset = NULL;
- }
+ }
if (m_poBands != NULL)
- {
- delete [] m_poBands;
- }
+ {
+ delete[] m_poBands;
+ }
GDALDestroyDriverManager();
}
-
// Tell only if the file can be read with GDAL.
bool GDALImageIO::CanReadFile(const char* file)
{
// First check the extension
- if ( file == NULL )
- {
- itkDebugMacro(<<"No filename specified.");
+ if (file == NULL)
+ {
+ itkDebugMacro(<< "No filename specified.");
return false;
- }
+ }
std::string lFileNameGdal;
lFileNameGdal = std::string(file);
@@ -110,30 +107,30 @@ bool GDALImageIO::CanReadFile(const char* file)
GDALAllRegister();
// Open file with GDAL
- m_poDataset = static_cast<GDALDataset *>(GDALOpen(lFileNameGdal.c_str(), GA_ReadOnly ));
+ m_poDataset = static_cast<GDALDataset *>(GDALOpen(lFileNameGdal.c_str(), GA_ReadOnly));
- if (m_poDataset==NULL)
- {
- fprintf( stderr,
- "GDALOpen failed - %d\n%s\n",
- CPLGetLastErrorNo(), CPLGetLastErrorMsg() );
+ if (m_poDataset == NULL)
+ {
+ fprintf(stderr,
+ "GDALOpen failed - %d\n%s\n",
+ CPLGetLastErrorNo(), CPLGetLastErrorMsg());
GDALDestroyDriverManager();
- CPLDumpSharedList( NULL );
- itkDebugMacro(<<"No dataset ");
- otbMsgDevMacro(<<"Not CanReadFile GDAL");
+ CPLDumpSharedList(NULL);
+ itkDebugMacro(<< "No dataset ");
+ otbMsgDevMacro(<< "Not CanReadFile GDAL");
return false;
- }
+ }
else
- {
+ {
GDALClose(m_poDataset);
m_poDataset = NULL;
GDALDestroyDriverManager();
- CPLDumpSharedList( NULL );
+ CPLDumpSharedList(NULL);
- otbMsgDevMacro(<<"CanReadFile GDAL");
+ otbMsgDevMacro(<< "CanReadFile GDAL");
return true;
- }
+ }
}
// Used to print information about this object
@@ -148,100 +145,126 @@ void GDALImageIO::ReadVolume(void*)
{
}
-
// Read image with GDAL
void GDALImageIO::Read(void* buffer)
{
- std::streamoff step = static_cast<std::streamoff>(this->GetNumberOfComponents());
+ std::streamoff step = static_cast<std::streamoff>(this->GetNumberOfComponents());
unsigned char * p = static_cast<unsigned char *>(buffer);
- if (p==NULL)
- {
- itkExceptionMacro(<<"Memory allocation error");
+ if (p == NULL)
+ {
+ itkExceptionMacro(<< "Memory allocation error");
return;
- }
+ }
int lNbLines = this->GetIORegion().GetSize()[1];
int lNbColumns = this->GetIORegion().GetSize()[0];
int lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
-
- std::streamoff lNbPixels = (static_cast<std::streamoff>(lNbColumns))*(static_cast<std::streamoff>(lNbLines));
- std::streamoff lBufferSize = static_cast<std::streamoff>(m_NbOctetPixel)*lNbPixels;
+ std::streamoff lNbPixels = (static_cast<std::streamoff>(lNbColumns)) * (static_cast<std::streamoff>(lNbLines));
+ std::streamoff lBufferSize = static_cast<std::streamoff>(m_NbOctetPixel) * lNbPixels;
unsigned char* value = new unsigned char[lBufferSize];
- if (value==NULL)
- {
- itkExceptionMacro(<<"Memory allocation error");
+ if (value == NULL)
+ {
+ itkExceptionMacro(<< "Memory allocation error");
return;
- }
-
+ }
- CPLErr lCrGdal;
+ CPLErr lCrGdal;
std::streamoff cpt(0);
- if ( GDALDataTypeIsComplex(m_PxType) )
- {
- lCrGdal = m_poBands[0]->RasterIO( GF_Read,lFirstColumn,lFirstLine,lNbColumns, lNbLines, value , lNbColumns, lNbLines, m_PxType,0, 0 );
+ if (GDALDataTypeIsComplex(m_PxType))
+ {
+ lCrGdal = m_poBands[0]->RasterIO(GF_Read,
+ lFirstColumn,
+ lFirstLine,
+ lNbColumns,
+ lNbLines,
+ value,
+ lNbColumns,
+ lNbLines,
+ m_PxType,
+ 0,
+ 0);
if (lCrGdal == CE_Failure)
- {
- itkExceptionMacro(<< "Error while reading image (GDAL format) " << m_FileName.c_str()<<".");
- }
+ {
+ itkExceptionMacro(<< "Error while reading image (GDAL format) " << m_FileName.c_str() << ".");
+ }
cpt = 0;
- for ( std::streamoff i=0; i < lBufferSize; i = i+static_cast<std::streamoff>(m_NbOctetPixel) )
- {
- memcpy((void*)(&(p[cpt])),(const void*)(&(value[i])),(size_t)(m_NbOctetPixel));
+ for (std::streamoff i = 0; i < lBufferSize; i = i + static_cast<std::streamoff>(m_NbOctetPixel))
+ {
+ memcpy((void*) (&(p[cpt])), (const void*) (&(value[i])), (size_t) (m_NbOctetPixel));
cpt += static_cast<std::streamoff>(m_NbOctetPixel);
+ }
}
- }
else if (m_IsIndexed)
- {
+ {
step = step * static_cast<std::streamoff>(m_NbOctetPixel);
-
- lCrGdal = m_poBands[0]->RasterIO( GF_Read,lFirstColumn,lFirstLine,lNbColumns, lNbLines, value , lNbColumns, lNbLines, m_PxType,0, 0 );
+ lCrGdal = m_poBands[0]->RasterIO(GF_Read,
+ lFirstColumn,
+ lFirstLine,
+ lNbColumns,
+ lNbLines,
+ value,
+ lNbColumns,
+ lNbLines,
+ m_PxType,
+ 0,
+ 0);
if (lCrGdal == CE_Failure)
- {
- itkExceptionMacro(<< "Error while reading image (GDAL format) " << m_FileName.c_str()<<".");
- }
+ {
+ itkExceptionMacro(<< "Error while reading image (GDAL format) " << m_FileName.c_str() << ".");
+ }
// Recopie dans le buffer
cpt = 0;
- for ( std::streamoff i=0; i < lBufferSize; i = i+static_cast<std::streamoff>(m_NbOctetPixel) )
- {
+ for (std::streamoff i = 0; i < lBufferSize; i = i + static_cast<std::streamoff>(m_NbOctetPixel))
+ {
GDALColorEntry color;
m_poBands[0]->GetColorTable()->GetColorEntryAsRGB(value[i], &color);
p[cpt] = color.c1;
- p[cpt+1] = color.c2;
- p[cpt+2] = color.c3;
- p[cpt+3] = color.c4;
+ p[cpt + 1] = color.c2;
+ p[cpt + 2] = color.c3;
+ p[cpt + 3] = color.c4;
cpt += step;
- }
+ }
- }
+ }
else
- {
+ {
// Mise a jour du step
step = step * static_cast<std::streamoff>(m_NbOctetPixel);
for (unsigned int nbComponents = 0; nbComponents < this->GetNumberOfComponents(); ++nbComponents)
- {
- lCrGdal = m_poBands[nbComponents]->RasterIO( GF_Read,lFirstColumn,lFirstLine,lNbColumns, lNbLines, value , lNbColumns, lNbLines, m_PxType,0, 0 );
- if (lCrGdal == CE_Failure)
{
- itkExceptionMacro(<< "Error while reading image (GDAL format) " << m_FileName.c_str()<<".");
- }
+ lCrGdal = m_poBands[nbComponents]->RasterIO(GF_Read,
+ lFirstColumn,
+ lFirstLine,
+ lNbColumns,
+ lNbLines,
+ value,
+ lNbColumns,
+ lNbLines,
+ m_PxType,
+ 0,
+ 0);
+ if (lCrGdal == CE_Failure)
+ {
+ itkExceptionMacro(<< "Error while reading image (GDAL format) " << m_FileName.c_str() << ".");
+ }
// Recopie dans le buffer
- cpt = static_cast<std::streamoff>(nbComponents)*static_cast<std::streamoff>(m_NbOctetPixel);
- for ( std::streamoff i=0; i < lBufferSize; i = i+static_cast<std::streamoff>(m_NbOctetPixel) )
- {
- memcpy((void*)(&(p[cpt])),(const void*)(&(value[i])),(size_t)(m_NbOctetPixel));
+ cpt = static_cast<std::streamoff>(nbComponents) * static_cast<std::streamoff>(m_NbOctetPixel);
+ for (std::streamoff i = 0; i < lBufferSize; i = i + static_cast<std::streamoff>(m_NbOctetPixel))
+ {
+ memcpy((void*) (&(p[cpt])), (const void*) (&(value[i])), (size_t) (m_NbOctetPixel));
cpt += step;
+ }
}
}
- }
- delete [] value;
+ delete[] value;
value = NULL;
}
@@ -255,10 +278,10 @@ void GDALImageIO::InternalReadImageInformation()
{
int i;
- if ( m_FileName.empty() == true )
- {
- itkExceptionMacro(<<"GDAl read : empty image file name file.");
- }
+ if (m_FileName.empty() == true)
+ {
+ itkExceptionMacro(<< "GDAl read : empty image file name file.");
+ }
std::string lFileNameGdal = m_FileName;
@@ -267,40 +290,40 @@ void GDALImageIO::InternalReadImageInformation()
// Get Dataset
if (m_poDataset != NULL)
- {
+ {
// delete m_poDataset;
GDALClose(m_poDataset);
m_poDataset = NULL;
- }
- m_poDataset = static_cast<GDALDataset *>( GDALOpen(lFileNameGdal.c_str(), GA_ReadOnly ));
- otbMsgDevMacro( <<" GCPCount (original): " << m_poDataset->GetGCPCount());
+ }
+ m_poDataset = static_cast<GDALDataset *>(GDALOpen(lFileNameGdal.c_str(), GA_ReadOnly));
+ otbMsgDevMacro(<< " GCPCount (original): " << m_poDataset->GetGCPCount());
- if (m_poDataset==NULL)
- {
- itkExceptionMacro(<<"Gdal dataset is null.");
+ if (m_poDataset == NULL)
+ {
+ itkExceptionMacro(<< "Gdal dataset is null.");
return;
- }
+ }
// else
// {
- // Get image dimensions
- m_width = m_poDataset->GetRasterXSize();
- m_height = m_poDataset->GetRasterYSize();
+ // Get image dimensions
+ m_width = m_poDataset->GetRasterXSize();
+ m_height = m_poDataset->GetRasterYSize();
- if ( (m_width==0) || (m_height==0))
+ if ((m_width == 0) || (m_height == 0))
{
- itkExceptionMacro(<<"Dimension is undefined.");
+ itkExceptionMacro(<< "Dimension is undefined.");
}
- else
+ else
{
- // Set image dimensions into IO
- m_Dimensions[0] = m_width;
- m_Dimensions[1] = m_height;
+ // Set image dimensions into IO
+ m_Dimensions[0] = m_width;
+ m_Dimensions[1] = m_height;
}
- // Get Number of Bands
- m_NbBands = m_poDataset->GetRasterCount();
- if (m_NbBands==0)
+ // Get Number of Bands
+ m_NbBands = m_poDataset->GetRasterCount();
+ if (m_NbBands == 0)
{
//FIXME this happen in the case of a hdf file with SUBDATASETS
// in this situation, at least the first dataset should be open (ideally all in an imagelist)
@@ -324,207 +347,201 @@ void GDALImageIO::InternalReadImageInformation()
// std::cout << key << std::endl;
// }
- itkExceptionMacro(<<"Zero band found in the dataset");
- return;
+ itkExceptionMacro(<< "Zero band found in the dataset");
+ return;
}
- this->SetNumberOfComponents(m_NbBands);
+ this->SetNumberOfComponents(m_NbBands);
- // Set the number of dimensions (verify for the dim )
- this->SetNumberOfDimensions(2);
+ // Set the number of dimensions (verify for the dim )
+ this->SetNumberOfDimensions(2);
- otbMsgDevMacro(<<"Nb of Dimensions : "<<m_NumberOfDimensions);
+ otbMsgDevMacro(<< "Nb of Dimensions : " << m_NumberOfDimensions);
- // Automatically set the Type to Binary for GDAL data
- this->SetFileTypeToBinary();
+ // Automatically set the Type to Binary for GDAL data
+ this->SetFileTypeToBinary();
- // Get all the Bands
- m_poBands = new GDALRasterBand * [m_NbBands];
- if (m_poBands==NULL)
+ // Get all the Bands
+ m_poBands = new GDALRasterBand *[m_NbBands];
+ if (m_poBands == NULL)
{
- itkExceptionMacro(<<"Memory allocation error for the 'rasterBands'");
- return;
+ itkExceptionMacro(<< "Memory allocation error for the 'rasterBands'");
+ return;
}
- for (i=0; i<m_NbBands; ++i)
- m_poBands[i] = m_poDataset->GetRasterBand(i+1);
-
- // Get Data Type
- // Consider only the data type given by the first band!!!!!
- // Maybe be could changed (to check)
- m_PxType = m_poBands[0]->GetRasterDataType();
-
- // Following the data type given by GDAL we set it for ImageIO
- // BE CAREFUL !!!! At this time the complex data type are regarded
- // as integer data type in hope that ITK uses that kind of system
- // (take time to check !!)
- if (m_PxType == GDT_Byte)
+ for (i = 0; i < m_NbBands; ++i)
+ m_poBands[i] = m_poDataset->GetRasterBand(i + 1);
+
+ // Get Data Type
+ // Consider only the data type given by the first band!!!!!
+ // Maybe be could changed (to check)
+ m_PxType = m_poBands[0]->GetRasterDataType();
+
+ // Following the data type given by GDAL we set it for ImageIO
+ // BE CAREFUL !!!! At this time the complex data type are regarded
+ // as integer data type in hope that ITK uses that kind of system
+ // (take time to check !!)
+ if (m_PxType == GDT_Byte)
{
- SetComponentType(UCHAR);
+ SetComponentType(UCHAR);
}
- else if (m_PxType == GDT_UInt16)
+ else if (m_PxType == GDT_UInt16)
{
- SetComponentType(USHORT);
+ SetComponentType(USHORT);
}
- else if ((m_PxType == GDT_Int16) || (m_PxType == GDT_CInt16) )
+ else if ((m_PxType == GDT_Int16) || (m_PxType == GDT_CInt16))
{
- SetComponentType(SHORT);
+ SetComponentType(SHORT);
}
- else if (m_PxType == GDT_UInt32)
+ else if (m_PxType == GDT_UInt32)
{
- SetComponentType(UINT);
+ SetComponentType(UINT);
}
- else if ((m_PxType == GDT_Int32) || (m_PxType == GDT_CInt32) )
+ else if ((m_PxType == GDT_Int32) || (m_PxType == GDT_CInt32))
{
- SetComponentType(INT);
+ SetComponentType(INT);
}
- else if ((m_PxType == GDT_Float32) || (m_PxType == GDT_CFloat32) )
+ else if ((m_PxType == GDT_Float32) || (m_PxType == GDT_CFloat32))
{
- SetComponentType(FLOAT);
+ SetComponentType(FLOAT);
}
- else if ((m_PxType == GDT_Float64) || (m_PxType == GDT_CFloat64) )
+ else if ((m_PxType == GDT_Float64) || (m_PxType == GDT_CFloat64))
{
- SetComponentType(DOUBLE);
+ SetComponentType(DOUBLE);
}
- else
+ else
{
- itkExceptionMacro(<<"Pixel type unknown");
+ itkExceptionMacro(<< "Pixel type unknown");
}
-
- if ( this->GetComponentType() == CHAR )
+ if (this->GetComponentType() == CHAR)
{
- m_NbOctetPixel = 1;
+ m_NbOctetPixel = 1;
}
- else if ( this->GetComponentType() == UCHAR )
+ else if (this->GetComponentType() == UCHAR)
{
- m_NbOctetPixel = 1;
+ m_NbOctetPixel = 1;
}
- else if ( this->GetComponentType() == USHORT )
+ else if (this->GetComponentType() == USHORT)
{
- m_NbOctetPixel = 2;
+ m_NbOctetPixel = 2;
}
- else if ( this->GetComponentType() == SHORT )
+ else if (this->GetComponentType() == SHORT)
{
- m_NbOctetPixel = 2;
+ m_NbOctetPixel = 2;
}
- else if ( this->GetComponentType() == INT )
+ else if (this->GetComponentType() == INT)
{
- m_NbOctetPixel = 4;
+ m_NbOctetPixel = 4;
}
- else if ( this->GetComponentType() == UINT )
+ else if (this->GetComponentType() == UINT)
{
- m_NbOctetPixel = 4;
+ m_NbOctetPixel = 4;
}
- else if ( this->GetComponentType() == FLOAT )
+ else if (this->GetComponentType() == FLOAT)
{
- m_NbOctetPixel = 4;
+ m_NbOctetPixel = 4;
}
- else if ( this->GetComponentType() == DOUBLE )
+ else if (this->GetComponentType() == DOUBLE)
{
- m_NbOctetPixel = 8;
+ m_NbOctetPixel = 8;
}
- else
+ else
{
- itkExceptionMacro(<<"Component type unknown");
+ itkExceptionMacro(<< "Component type unknown");
}
+ /******************************************************************/
+ // Pixel Type always set to Scalar for GDAL ? maybe also to vector ?
- /******************************************************************/
- // Pixel Type always set to Scalar for GDAL ? maybe also to vector ?
-
- // Modif Patrick: LIRE LES IMAGES COMPLEXES
- if ( GDALDataTypeIsComplex(m_PxType) )
+ // Modif Patrick: LIRE LES IMAGES COMPLEXES
+ if (GDALDataTypeIsComplex(m_PxType))
{
- m_NbOctetPixel = m_NbOctetPixel * 2;
- this->SetNumberOfComponents( 2 );
- this->SetPixelType(COMPLEX);
- // Is this necessary ?
- //if(m_NbBands !=1) itkExceptionMacro(<<"GDALImageIO::InternalReadImageInformation() Can read only one band image ");
+ m_NbOctetPixel = m_NbOctetPixel * 2;
+ this->SetNumberOfComponents(2);
+ this->SetPixelType(COMPLEX);
+ // Is this necessary ?
+ //if(m_NbBands !=1) itkExceptionMacro(<<"GDALImageIO::InternalReadImageInformation() Can read only one band image ");
}
- else
+ else
{
- this-> SetNumberOfComponents(m_NbBands);
- if ( this->GetNumberOfComponents() == 1 )
+ this->SetNumberOfComponents(m_NbBands);
+ if (this->GetNumberOfComponents() == 1)
{
- this->SetPixelType(SCALAR);
+ this->SetPixelType(SCALAR);
}
- else
+ else
{
- this->SetPixelType(VECTOR);
+ this->SetPixelType(VECTOR);
}
}
- // }
+ // }
/*----------------------------------------------------------------------*/
/*-------------------------- METADATA ----------------------------------*/
/*----------------------------------------------------------------------*/
// Now initialize the itk dictionary
- itk::MetaDataDictionary & dict = this->GetMetaDataDictionary();
-
+ itk::MetaDataDictionary& dict = this->GetMetaDataDictionary();
/* -------------------------------------------------------------------- */
/* Get Spacing */
/* -------------------------------------------------------------------- */
// Default Spacing
- m_Spacing[0]=1;
- m_Spacing[1]=1;
- if (m_NumberOfDimensions==3)
- m_Spacing[2]=1;
+ m_Spacing[0] = 1;
+ m_Spacing[1] = 1;
+ if (m_NumberOfDimensions == 3) m_Spacing[2] = 1;
char** papszMetadata;
- papszMetadata = m_poDataset->GetMetadata( NULL );
-
+ papszMetadata = m_poDataset->GetMetadata(NULL);
/* -------------------------------------------------------------------- */
/* Report general info. */
/* -------------------------------------------------------------------- */
- GDALDriverH hDriver;
+ GDALDriverH hDriver;
hDriver = m_poDataset->GetDriver();
- std::string driverShortName = static_cast<std::string>( GDALGetDriverShortName( hDriver ));
- std::string driverLongName = static_cast<std::string>( GDALGetDriverLongName( hDriver ));
-
- itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::DriverShortNameKey, driverShortName );
- itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::DriverLongNameKey, driverLongName );
+ std::string driverShortName = static_cast<std::string>(GDALGetDriverShortName(hDriver));
+ std::string driverLongName = static_cast<std::string>(GDALGetDriverLongName(hDriver));
+ itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::DriverShortNameKey, driverShortName);
+ itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::DriverLongNameKey, driverLongName);
/* -------------------------------------------------------------------- */
/* Get the projection coordinate system of the image : ProjectionRef */
/* -------------------------------------------------------------------- */
- if ( m_poDataset->GetProjectionRef() != NULL )
- {
- OGRSpatialReference* pSR;
- const char * pszProjection = NULL;
+ if (m_poDataset->GetProjectionRef() != NULL)
+ {
+ OGRSpatialReference* pSR;
+ const char * pszProjection = NULL;
- pSR = new OGRSpatialReference( pszProjection );
+ pSR = new OGRSpatialReference(pszProjection);
pszProjection = m_poDataset->GetProjectionRef();
- if ( pSR->importFromWkt( (char **)(&pszProjection) ) == CE_None )
- {
- char * pszPrettyWkt = NULL;
+ if (pSR->importFromWkt((char **) (&pszProjection)) == CE_None)
+ {
+ char * pszPrettyWkt = NULL;
- pSR->exportToPrettyWkt( &pszPrettyWkt, FALSE );
- itk::EncapsulateMetaData<std::string> ( dict, MetaDataKey::ProjectionRefKey,
- static_cast<std::string>( pszPrettyWkt ) );
+ pSR->exportToPrettyWkt(&pszPrettyWkt, FALSE);
+ itk::EncapsulateMetaData<std::string> (dict, MetaDataKey::ProjectionRefKey,
+ static_cast<std::string>(pszPrettyWkt));
- CPLFree( pszPrettyWkt );
- }
+ CPLFree(pszPrettyWkt);
+ }
else
itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey,
- static_cast<std::string>( m_poDataset->GetProjectionRef() ) );
+ static_cast<std::string>(m_poDataset->GetProjectionRef()));
if (pSR != NULL)
- {
+ {
delete pSR;
pSR = NULL;
- }
+ }
- }
+ }
/* -------------------------------------------------------------------- */
/* Get the GCP projection coordinates of the image : GCPProjection */
@@ -532,31 +549,28 @@ void GDALImageIO::InternalReadImageInformation()
unsigned int gcpCount = 0;
gcpCount = m_poDataset->GetGCPCount();
- if ( gcpCount > 0 )
- {
- std::string gcpProjectionKey = static_cast<std::string>( m_poDataset->GetGCPProjection() );
+ if (gcpCount > 0)
+ {
+ std::string gcpProjectionKey = static_cast<std::string>(m_poDataset->GetGCPProjection());
itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::GCPProjectionKey, gcpProjectionKey);
-
if (gcpProjectionKey.empty())
- {
+ {
gcpCount = 0; //fix for uninitialized gcpCount in gdal (when
//reading Palsar image)
- }
+ }
-
std::string key;
- itk::EncapsulateMetaData<unsigned int>(dict, MetaDataKey::GCPCountKey,gcpCount);
+ itk::EncapsulateMetaData<unsigned int>(dict, MetaDataKey::GCPCountKey, gcpCount);
+ for (unsigned int cpt = 0; cpt < gcpCount; cpt++)
+ {
- for ( unsigned int cpt = 0; cpt < gcpCount; cpt++ )
- {
-
- const GDAL_GCP *psGCP;
+ const GDAL_GCP *psGCP;
psGCP = m_poDataset->GetGCPs() + cpt;
-
- OTB_GCP pOtbGCP(psGCP);
+
+ OTB_GCP pOtbGCP(psGCP);
// Complete the key with the GCP number : GCP_i
::itk::OStringStream lStream;
@@ -565,79 +579,79 @@ void GDALImageIO::InternalReadImageInformation()
itk::EncapsulateMetaData<OTB_GCP>(dict, key, pOtbGCP);
- }
+ }
- }
+ }
/* -------------------------------------------------------------------- */
/* Get the six coefficients of affine geoTtransform */
/* -------------------------------------------------------------------- */
- double adfGeoTransform[6];
+ double adfGeoTransform[6];
VectorType VadfGeoTransform;
- if ( m_poDataset->GetGeoTransform( adfGeoTransform ) == CE_None )
- {
- for (int cpt = 0; cpt < 6; cpt++ ) VadfGeoTransform.push_back(adfGeoTransform[cpt]);
+ if (m_poDataset->GetGeoTransform(adfGeoTransform) == CE_None)
+ {
+ for (int cpt = 0; cpt < 6; cpt++)
+ VadfGeoTransform.push_back(adfGeoTransform[cpt]);
itk::EncapsulateMetaData<VectorType>(dict, MetaDataKey::GeoTransformKey, VadfGeoTransform);
/// retrieve orgin and spacing from the geo transform
- m_Origin[0]=VadfGeoTransform[0];
- m_Origin[1]=VadfGeoTransform[3];
- m_Spacing[0]=VadfGeoTransform[1];
- m_Spacing[1]=VadfGeoTransform[5];
- }
+ m_Origin[0] = VadfGeoTransform[0];
+ m_Origin[1] = VadfGeoTransform[3];
+ m_Spacing[0] = VadfGeoTransform[1];
+ m_Spacing[1] = VadfGeoTransform[5];
+ }
/* -------------------------------------------------------------------- */
/* Report metadata. */
/* -------------------------------------------------------------------- */
papszMetadata = m_poDataset->GetMetadata(NULL);
- if ( CSLCount(papszMetadata) > 0 )
- {
+ if (CSLCount(papszMetadata) > 0)
+ {
std::string key;
- for ( int cpt = 0; papszMetadata[cpt] != NULL; cpt++ )
- {
+ for (int cpt = 0; papszMetadata[cpt] != NULL; cpt++)
+ {
::itk::OStringStream lStream;
lStream << MetaDataKey::MetadataKey << cpt;
key = lStream.str();
itk::EncapsulateMetaData<std::string>(dict, key,
- static_cast<std::string>( papszMetadata[cpt] ) );
+ static_cast<std::string>(papszMetadata[cpt]));
+ }
}
- }
/* -------------------------------------------------------------------- */
/* Report subdatasets. */
/* -------------------------------------------------------------------- */
papszMetadata = m_poDataset->GetMetadata("SUBDATASETS");
- if ( CSLCount(papszMetadata) > 0 )
- {
+ if (CSLCount(papszMetadata) > 0)
+ {
std::string key;
- for ( int cpt = 0; papszMetadata[cpt] != NULL; cpt++ )
- {
+ for (int cpt = 0; papszMetadata[cpt] != NULL; cpt++)
+ {
::itk::OStringStream lStream;
lStream << MetaDataKey::SubMetadataKey << cpt;
key = lStream.str();
itk::EncapsulateMetaData<std::string>(dict, key,
- static_cast<std::string>( papszMetadata[cpt] ) );
+ static_cast<std::string>(papszMetadata[cpt]));
+ }
}
- }
-
/* -------------------------------------------------------------------- */
/* Report corners */
/* -------------------------------------------------------------------- */
- double GeoX(0), GeoY(0);
+ double GeoX(0), GeoY(0);
VectorType VGeo;
- GDALInfoReportCorner( "Upper Left", 0.0, 0.0, GeoX, GeoY );
+ GDALInfoReportCorner("Upper Left", 0.0, 0.0, GeoX, GeoY);
VGeo.push_back(GeoX);
VGeo.push_back(GeoY);
@@ -645,7 +659,7 @@ void GDALImageIO::InternalReadImageInformation()
VGeo.clear();
- GDALInfoReportCorner( "Upper Right", m_width, 0.0, GeoX, GeoY );
+ GDALInfoReportCorner("Upper Right", m_width, 0.0, GeoX, GeoY);
VGeo.push_back(GeoX);
VGeo.push_back(GeoY);
@@ -653,7 +667,7 @@ void GDALImageIO::InternalReadImageInformation()
VGeo.clear();
- GDALInfoReportCorner( "Lower Left", 0.0, m_height, GeoX, GeoY);
+ GDALInfoReportCorner("Lower Left", 0.0, m_height, GeoX, GeoY);
VGeo.push_back(GeoX);
VGeo.push_back(GeoY);
@@ -661,7 +675,7 @@ void GDALImageIO::InternalReadImageInformation()
VGeo.clear();
- GDALInfoReportCorner( "Lower Right", m_width, m_height, GeoX, GeoY );
+ GDALInfoReportCorner("Lower Right", m_width, m_height, GeoX, GeoY);
VGeo.push_back(GeoX);
VGeo.push_back(GeoY);
@@ -673,30 +687,30 @@ void GDALImageIO::InternalReadImageInformation()
/* Color Table */
/* -------------------------------------------------------------------- */
- for (int iBand = 0; iBand <m_poDataset->GetRasterCount(); iBand++ )
- {
- GDALColorTableH hTable;
- GDALRasterBandH hBand;
- hBand=GDALGetRasterBand(m_poDataset,iBand+1);
+ for (int iBand = 0; iBand < m_poDataset->GetRasterCount(); iBand++)
+ {
+ GDALColorTableH hTable;
+ GDALRasterBandH hBand;
+ hBand = GDALGetRasterBand(m_poDataset, iBand + 1);
if ((GDALGetRasterColorInterpretation(hBand) == GCI_PaletteIndex)
&& (hTable = GDALGetRasterColorTable(hBand)) != NULL)
- {
+ {
m_IsIndexed = true;
- unsigned int ColorEntryCount=GDALGetColorEntryCount(hTable);
+ unsigned int ColorEntryCount = GDALGetColorEntryCount(hTable);
itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::ColorTableNameKey,
- static_cast<std::string>( GDALGetPaletteInterpretationName(
- GDALGetPaletteInterpretation( hTable ) ) ) );
+ static_cast<std::string>(GDALGetPaletteInterpretationName(
+ GDALGetPaletteInterpretation(hTable))));
itk::EncapsulateMetaData<unsigned int>(dict, MetaDataKey::ColorEntryCountKey, ColorEntryCount);
- for (int i = 0; i < GDALGetColorEntryCount( hTable ); ++i )
- {
- GDALColorEntry sEntry;
- VectorType VColorEntry;
+ for (int i = 0; i < GDALGetColorEntryCount(hTable); ++i)
+ {
+ GDALColorEntry sEntry;
+ VectorType VColorEntry;
- GDALGetColorEntryAsRGB( hTable, i, &sEntry );
+ GDALGetColorEntryAsRGB(hTable, i, &sEntry);
VColorEntry.push_back(sEntry.c1);
VColorEntry.push_back(sEntry.c2);
@@ -705,32 +719,32 @@ void GDALImageIO::InternalReadImageInformation()
itk::EncapsulateMetaData<VectorType>(dict, MetaDataKey::ColorEntryAsRGBKey, VColorEntry);
+ }
}
}
- }
if (m_IsIndexed)
- {
+ {
m_NbBands *= 4;
this->SetNumberOfComponents(m_NbBands);
this->SetPixelType(VECTOR);
- }
+ }
}
-bool GDALImageIO::CanWriteFile( const char* name )
+bool GDALImageIO::CanWriteFile(const char* name)
{
// First check the extension
- if ( name == NULL )
- {
- itkDebugMacro(<<"No filename specified.");
+ if (name == NULL)
+ {
+ itkDebugMacro(<< "No filename specified.");
return false;
- }
+ }
// Recuperation du type a partir du nom de fichier
std::string extGDAL = TypeConversion(name);
- if (extGDAL=="NOT-FOUND")
- {
+ if (extGDAL == "NOT-FOUND")
+ {
return false;
- }
+ }
return true;
@@ -739,43 +753,43 @@ bool GDALImageIO::CanWriteFile( const char* name )
/** TODO : Methode Write non implementee */
void GDALImageIO::Write(const void* buffer)
{
- if ( m_FlagWriteImageInformation == true )
- {
+ if (m_FlagWriteImageInformation == true)
+ {
this->InternalWriteImageInformation();
m_FlagWriteImageInformation = false;
- }
+ }
const unsigned char *p = static_cast<const unsigned char *>(buffer);
- if (p==NULL)
- {
- itkExceptionMacro(<<"GDAL : Bad alloc");
+ if (p == NULL)
+ {
+ itkExceptionMacro(<< "GDAL : Bad alloc");
return;
- }
+ }
unsigned int lNbLines = this->GetIORegion().GetSize()[1];
unsigned int lNbColumns = this->GetIORegion().GetSize()[0];
- int lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
- int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
+ int lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
+ int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
// Particular case: checking that the writen region is the same size
// of the entire image
// starting at offset 0 (when no streaming)
- if ( (lNbLines == m_Dimensions[1]) && (lNbColumns == m_Dimensions[0]))
- {
+ if ((lNbLines == m_Dimensions[1]) && (lNbColumns == m_Dimensions[0]))
+ {
lFirstLine = 0;
lFirstColumn = 0;
- }
+ }
- std::streamoff lNbPixels = static_cast<std::streamoff>(lNbColumns)*static_cast<std::streamoff>(lNbLines);
- std::streamoff lBufferSize = static_cast<std::streamoff>(m_NbOctetPixel)*lNbPixels;
- otbMsgDevMacro( <<" BufferSize allocated : "<< lBufferSize);
+ std::streamoff lNbPixels = static_cast<std::streamoff>(lNbColumns) * static_cast<std::streamoff>(lNbLines);
+ std::streamoff lBufferSize = static_cast<std::streamoff>(m_NbOctetPixel) * lNbPixels;
+ otbMsgDevMacro(<< " BufferSize allocated : " << lBufferSize);
unsigned char* value = new unsigned char[lBufferSize];
- if (value==NULL)
- {
- itkExceptionMacro(<<"Memory allocation error");
+ if (value == NULL)
+ {
+ itkExceptionMacro(<< "Memory allocation error");
return;
- }
+ }
// Mise a jour du step
std::streamoff step = static_cast<std::streamoff>(m_NbBands);
@@ -785,26 +799,36 @@ void GDALImageIO::Write(const void* buffer)
std::streamoff cpt(0);
for (int nbComponents = 0; nbComponents < m_NbBands; ++nbComponents)
- {
- cpt = static_cast<std::streamoff>(nbComponents)* static_cast<std::streamoff>(m_NbOctetPixel);
-
- for ( std::streamoff i=0; i < lBufferSize; i = i+static_cast<std::streamoff>(m_NbOctetPixel) )
{
- memcpy((void*)(&(value[i])),(const void*)(&(p[cpt])),(size_t)(m_NbOctetPixel));
+ cpt = static_cast<std::streamoff>(nbComponents) * static_cast<std::streamoff>(m_NbOctetPixel);
+
+ for (std::streamoff i = 0; i < lBufferSize; i = i + static_cast<std::streamoff>(m_NbOctetPixel))
+ {
+ memcpy((void*) (&(value[i])), (const void*) (&(p[cpt])), (size_t) (m_NbOctetPixel));
cpt += step;
- }
+ }
GDALRasterBand *poBand;
poBand = m_poBands[nbComponents]; //m_poDataset->GetRasterBand(nbComponents+1);
// lCrGdal = poBand->RasterIO(GF_Write,lFirstColumn,lFirstLine,lNbColumns, lNbLines, value , lNbColumns, lNbLines, m_PxType,0, 0 );
- lCrGdal = m_poBands[nbComponents]->RasterIO(GF_Write,lFirstColumn,lFirstLine,lNbColumns, lNbLines, value , lNbColumns, lNbLines, m_PxType,0, 0 );
+ lCrGdal = m_poBands[nbComponents]->RasterIO(GF_Write,
+ lFirstColumn,
+ lFirstLine,
+ lNbColumns,
+ lNbLines,
+ value,
+ lNbColumns,
+ lNbLines,
+ m_PxType,
+ 0,
+ 0);
if (lCrGdal == CE_Failure)
- {
- itkExceptionMacro(<< "Error while writing image (GDAL format) " << m_FileName.c_str()<<".");
- }
+ {
+ itkExceptionMacro(<< "Error while writing image (GDAL format) " << m_FileName.c_str() << ".");
+ }
m_poBands[nbComponents]->FlushCache();
- }
+ }
- delete [] value;
+ delete[] value;
value = NULL;
m_poDataset->FlushCache();
@@ -819,151 +843,151 @@ void GDALImageIO::WriteImageInformation()
void GDALImageIO::InternalWriteImageInformation()
{
- char **papszOptions = NULL;
+ char ** papszOptions = NULL;
std::string extGDAL;
m_NbBands = this->GetNumberOfComponents();
- if ( (m_Dimensions[0]==0) && (m_Dimensions[1]==0))
- {
- itkExceptionMacro(<<"Dimensions are not defined.");
- }
+ if ((m_Dimensions[0] == 0) && (m_Dimensions[1] == 0))
+ {
+ itkExceptionMacro(<< "Dimensions are not defined.");
+ }
- if((this->GetPixelType() == COMPLEX) && (m_NbBands/2 > 0))
- {
+ if ((this->GetPixelType() == COMPLEX) && (m_NbBands / 2 > 0))
+ {
m_NbBands /= 2;
- if ( this->GetComponentType() == SHORT )
- {
+ if (this->GetComponentType() == SHORT)
+ {
m_NbOctetPixel = 4;
m_PxType = GDT_CInt16;
- }
- else if ( this->GetComponentType() == INT )
- {
+ }
+ else if (this->GetComponentType() == INT)
+ {
m_NbOctetPixel = 8;
m_PxType = GDT_CInt32;
- }
- else if ( this->GetComponentType() == DOUBLE )
- {
+ }
+ else if (this->GetComponentType() == DOUBLE)
+ {
m_NbOctetPixel = 16;
m_PxType = GDT_CFloat64;
- }
- else if ( this->GetComponentType() == FLOAT )
- {
+ }
+ else if (this->GetComponentType() == FLOAT)
+ {
m_NbOctetPixel = 8;
m_PxType = GDT_CFloat32;
- }
+ }
else
- {
+ {
this->SetComponentType(FLOAT);
m_NbOctetPixel = 8;
m_PxType = GDT_CFloat32;
+ }
}
- }
else
- {
- if ( this->GetComponentType() == CHAR )
{
+ if (this->GetComponentType() == CHAR)
+ {
m_NbOctetPixel = 1;
m_PxType = GDT_Byte;
- }
- else if ( this->GetComponentType() == UCHAR )
- {
+ }
+ else if (this->GetComponentType() == UCHAR)
+ {
m_NbOctetPixel = 1;
m_PxType = GDT_Byte;
- }
- else if ( this->GetComponentType() == USHORT )
- {
+ }
+ else if (this->GetComponentType() == USHORT)
+ {
m_NbOctetPixel = 2;
m_PxType = GDT_UInt16;
- }
- else if ( this->GetComponentType() == SHORT )
- {
+ }
+ else if (this->GetComponentType() == SHORT)
+ {
m_NbOctetPixel = 2;
m_PxType = GDT_Int16;
- }
- else if ( this->GetComponentType() == INT )
- {
+ }
+ else if (this->GetComponentType() == INT)
+ {
m_NbOctetPixel = 4;
m_PxType = GDT_Int32;
- }
- else if ( this->GetComponentType() == UINT )
- {
+ }
+ else if (this->GetComponentType() == UINT)
+ {
m_NbOctetPixel = 4;
m_PxType = GDT_UInt32;
- }
- else if ( this->GetComponentType() == FLOAT )
- {
+ }
+ else if (this->GetComponentType() == FLOAT)
+ {
m_NbOctetPixel = 4;
m_PxType = GDT_Float32;
- }
- else if ( this->GetComponentType() == DOUBLE )
- {
+ }
+ else if (this->GetComponentType() == DOUBLE)
+ {
m_NbOctetPixel = 8;
m_PxType = GDT_Float64;
- }
+ }
else
- {
+ {
m_NbOctetPixel = 1;
m_PxType = GDT_Byte;
+ }
}
- }
// Automatically set the Type to Binary for GDAL data
this->SetFileTypeToBinary();
- GDALAllRegister();
-
+ GDALAllRegister();
extGDAL = TypeConversion(m_FileName);
- if (extGDAL=="NOT-FOUND")
- {
- itkExceptionMacro(<< "GDAL Writing failed : the image file name '"<<m_FileName.c_str()<<"' is not reconized by GDAL.");
- }
+ if (extGDAL == "NOT-FOUND")
+ {
+ itkExceptionMacro(
+ << "GDAL Writing failed : the image file name '" << m_FileName.c_str() << "' is not reconized by GDAL.");
+ }
m_hDriver = GetGDALDriverManager()->GetDriverByName(extGDAL.c_str());
if (m_hDriver == NULL)
- {
+ {
itkExceptionMacro(<< "GDAL Writing failed : Driver not reconized");
- }
+ }
std::string realFileName = GetGdalWriteImageFileName(extGDAL, m_FileName);
if (m_poDataset != NULL)
- {
+ {
GDALClose(m_poDataset);
m_poDataset = NULL;
- }
- m_poDataset = m_hDriver->Create( realFileName.c_str(), m_Dimensions[0],m_Dimensions[1],m_NbBands,m_PxType, papszOptions );
+ }
+ m_poDataset = m_hDriver->Create(
+ realFileName.c_str(), m_Dimensions[0], m_Dimensions[1], m_NbBands, m_PxType, papszOptions);
if (m_poDataset == NULL)
- {
- itkExceptionMacro(<< "GDAL Writing failed : Impossible to create the image file name '"<<realFileName.c_str()<<"'.");
- }
+ {
+ itkExceptionMacro(
+ << "GDAL Writing failed : Impossible to create the image file name '" << realFileName.c_str() << "'.");
+ }
// Get all the Bands
- m_poBands = new GDALRasterBand* [m_NbBands];
+ m_poBands = new GDALRasterBand *[m_NbBands];
- if (m_poBands==NULL)
- {
- itkExceptionMacro(<<"Memory allocation error for 'rasterBands'");
- }
- for (int i=0; i<m_NbBands; ++i)
- {
- m_poBands[i] = m_poDataset->GetRasterBand(i+1);
- }
+ if (m_poBands == NULL)
+ {
+ itkExceptionMacro(<< "Memory allocation error for 'rasterBands'");
+ }
+ for (int i = 0; i < m_NbBands; ++i)
+ {
+ m_poBands[i] = m_poDataset->GetRasterBand(i + 1);
+ }
// JULIEN: ADDING SUPPORT FOR METADATA WRITING.
-
/*----------------------------------------------------------------------*/
/*-------------------------- METADATA ----------------------------------*/
/*----------------------------------------------------------------------*/
// Now initialize the itk dictionary
- itk::MetaDataDictionary & dict = this->GetMetaDataDictionary();
- char** papszMetadata;
- papszMetadata = m_poDataset->GetMetadata( NULL );
+ itk::MetaDataDictionary& dict = this->GetMetaDataDictionary();
+ char** papszMetadata;
+ papszMetadata = m_poDataset->GetMetadata(NULL);
itk::OStringStream oss;
-
/* -------------------------------------------------------------------- */
/* Set the GCPs */
/* -------------------------------------------------------------------- */
@@ -971,15 +995,13 @@ void GDALImageIO::InternalWriteImageInformation()
unsigned int gcpCount = 0;
itk::ExposeMetaData<unsigned int>(dict, MetaDataKey::GCPCountKey, gcpCount);
-
- if (gcpCount>0)
- {
+ if (gcpCount > 0)
+ {
GDAL_GCP * gdalGcps = new GDAL_GCP[gcpCount];
-
- for (unsigned int gcpIndex = 0; gcpIndex < gcpCount;++gcpIndex)
- {
+ for (unsigned int gcpIndex = 0; gcpIndex < gcpCount; ++gcpIndex)
+ {
//Build the GCP string in the form of GCP_n
itk::OStringStream lStream;
lStream << MetaDataKey::GCPParametersKey << gcpIndex;
@@ -996,65 +1018,63 @@ void GDALImageIO::InternalWriteImageInformation()
gdalGcps[gcpIndex].dfGCPY = gcp.m_GCPY;
gdalGcps[gcpIndex].dfGCPZ = gcp.m_GCPZ;
- }
+ }
std::string gcpProjectionRef;
- itk::ExposeMetaData<std::string>(dict, MetaDataKey::GCPProjectionKey, gcpProjectionRef );
- m_poDataset->SetGCPs(gcpCount,gdalGcps,gcpProjectionRef.c_str());
+ itk::ExposeMetaData<std::string>(dict, MetaDataKey::GCPProjectionKey, gcpProjectionRef);
+ m_poDataset->SetGCPs(gcpCount, gdalGcps, gcpProjectionRef.c_str());
- delete [] gdalGcps;
- }
+ delete[] gdalGcps;
+ }
/* -------------------------------------------------------------------- */
/* Set the projection coordinate system of the image : ProjectionRef */
/* -------------------------------------------------------------------- */
std::string projectionRef;
- itk::ExposeMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef );
- if (! projectionRef.empty())
- {
+ itk::ExposeMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef);
+ if (!projectionRef.empty())
+ {
m_poDataset->SetProjection(projectionRef.c_str());
- }
+ }
/* -------------------------------------------------------------------- */
/* Set the six coefficients of affine geoTtransform */
/* -------------------------------------------------------------------- */
-
double * geoTransform = new double[6];
/// Reporting origin and spacing
- geoTransform[0]=m_Origin[0];
- geoTransform[3]=m_Origin[1];
- geoTransform[1]=m_Spacing[0];
- geoTransform[5]=m_Spacing[1];
+ geoTransform[0] = m_Origin[0];
+ geoTransform[3] = m_Origin[1];
+ geoTransform[1] = m_Spacing[0];
+ geoTransform[5] = m_Spacing[1];
// FIXME: Here component 1 and 4 should be replaced by the orientation parameters
- geoTransform[2]=0.;
- geoTransform[4]=0.;
+ geoTransform[2] = 0.;
+ geoTransform[4] = 0.;
m_poDataset->SetGeoTransform(geoTransform);
- delete [] geoTransform;
-
+ delete[] geoTransform;
/* -------------------------------------------------------------------- */
/* Report metadata. */
/* -------------------------------------------------------------------- */
- std::string svalue="";
+ std::string svalue = "";
std::vector<std::string> keys = dict.GetKeys();
- MetaDataKey key;
+ MetaDataKey key;
- for (unsigned int itkey=0; itkey<keys.size(); ++itkey)
- {
- if (keys[itkey].compare(0, key.MetadataKey.length(), key.MetadataKey) == 0)
+ for (unsigned int itkey = 0; itkey < keys.size(); ++itkey)
{
- itk::ExposeMetaData<std::string>(dict,keys[itkey],svalue);
+ if (keys[itkey].compare(0, key.MetadataKey.length(), key.MetadataKey) == 0)
+ {
+ itk::ExposeMetaData<std::string>(dict, keys[itkey], svalue);
unsigned int equalityPos = svalue.find_first_of('=');
- std::string tag = svalue.substr(0,equalityPos);
- std::string value = svalue.substr(equalityPos+1);
- otbMsgDevMacro(<<"Metadata: "<<tag<<"="<<value);
- m_poDataset->SetMetadataItem(tag.c_str(),value.c_str(),NULL);
+ std::string tag = svalue.substr(0, equalityPos);
+ std::string value = svalue.substr(equalityPos + 1);
+ otbMsgDevMacro(<< "Metadata: " << tag << "=" << value);
+ m_poDataset->SetMetadataItem(tag.c_str(), value.c_str(), NULL);
+ }
}
- }
// END
}
@@ -1067,50 +1087,45 @@ std::string GDALImageIO::TypeConversion(std::string name)
//Recuperer extension du fichier image
extension = System::GetExtension(name);
- if ((extension=="tif")||(extension=="tiff")||(extension=="TIF")||(extension=="TIFF"))
- extGDAL="GTiff";
- else if ((extension=="hdr")||(extension=="HDR"))
- extGDAL="ENVI";
- else if ((extension=="img")||(extension=="IMG"))
- extGDAL="HFA";
- else if(extension=="ntf")
- extGDAL="NITF";
+ if ((extension == "tif") || (extension == "tiff") || (extension == "TIF") || (extension == "TIFF")) extGDAL = "GTiff";
+ else if ((extension == "hdr") || (extension == "HDR")) extGDAL = "ENVI";
+ else if ((extension == "img") || (extension == "IMG")) extGDAL = "HFA";
+ else if (extension == "ntf") extGDAL = "NITF";
//Pas PNG car BUG !!
// else if ((extension=="png")||(extension=="PNG"))
// extGDAL="PNG";
//Pas JPEG car BUG !!
// else if ((extension=="jpg")||(extension=="JPG")||(extension=="jpeg")||(extension=="JPEG"))
// extGDAL="JPEG";
- else
- extGDAL="NOT-FOUND";
+ else extGDAL = "NOT-FOUND";
return extGDAL;
}
-std::string GDALImageIO::GetGdalWriteImageFileName(std::string & extGDAL, std::string filename)
+std::string GDALImageIO::GetGdalWriteImageFileName(std::string& extGDAL, std::string filename)
{
std::string gdalFileName;
gdalFileName = filename;
//Suppression de l'extension HDR
- if ( extGDAL=="ENVI")
- {
+ if (extGDAL == "ENVI")
+ {
gdalFileName = System::GetRootName(filename);
- }
+ }
return gdalFileName;
}
-bool GDALImageIO::GDALInfoReportCorner( const char * /*corner_name*/, double x, double y, double &GeoX, double &GeoY)
+bool GDALImageIO::GDALInfoReportCorner(const char * /*corner_name*/, double x, double y, double& GeoX, double& GeoY)
{
- const char *pszProjection;
- double adfGeoTransform[6];
+ const char *pszProjection;
+ double adfGeoTransform[6];
bool IsTrue;
/* -------------------------------------------------------------------- */
/* Transform the point into georeferenced coordinates. */
/* -------------------------------------------------------------------- */
- if ( m_poDataset->GetGeoTransform( adfGeoTransform ) == CE_None )
- {
+ if (m_poDataset->GetGeoTransform(adfGeoTransform) == CE_None)
+ {
pszProjection = m_poDataset->GetProjectionRef();
GeoX = adfGeoTransform[0] + adfGeoTransform[1] * x
@@ -1118,14 +1133,14 @@ bool GDALImageIO::GDALInfoReportCorner( const char * /*corner_name*/, double x,
GeoY = adfGeoTransform[3] + adfGeoTransform[4] * x
+ adfGeoTransform[5] * y;
IsTrue = true;
- }
+ }
else
- {
+ {
GeoX = x;
GeoY = y;
IsTrue = false;
- }
+ }
return IsTrue;
}
diff --git a/Code/IO/otbGDALImageIO.h b/Code/IO/otbGDALImageIO.h
index 09f5e917c2..21ffca4ac8 100644
--- a/Code/IO/otbGDALImageIO.h
+++ b/Code/IO/otbGDALImageIO.h
@@ -31,7 +31,6 @@
#include "otbMetaDataKey.h"
-
/* GDAL Libraries */
#include "gdal.h"
#include "gdal_priv.h"
@@ -40,7 +39,6 @@
#include "ogr_spatialref.h"
#include "ogr_srs_api.h"
-
namespace otb
{
@@ -54,16 +52,16 @@ namespace otb
*
*/
class ITK_EXPORT GDALImageIO : public itk::ImageIOBase,
- public MetaDataKey
+ public MetaDataKey
{
public:
typedef unsigned char InputPixelType;
/** Standard class typedefs. */
- typedef GDALImageIO Self;
- typedef itk::ImageIOBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef GDALImageIO Self;
+ typedef itk::ImageIOBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -86,7 +84,7 @@ public:
virtual bool CanStreamRead()
{
return true;
- };
+ }
/** Set the spacing and dimention information for the set filename. */
virtual void ReadImageInformation();
@@ -108,7 +106,7 @@ public:
virtual bool CanStreamWrite()
{
return true;
- };
+ }
/** Writes the spacing and dimentions of the image.
* Assumes SetFileName has been called with a valid file name. */
@@ -143,30 +141,29 @@ protected:
/** Determines the level of compression for written files.
* Range 0-9; 0 = none, 9 = maximum , default = 4 */
- int m_CompressionLevel;
+ int m_CompressionLevel;
const char* m_currentfile;
- bool m_IsIndexed;
+ bool m_IsIndexed;
private:
- GDALImageIO(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ GDALImageIO(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Determine real file name to write the image */
- std::string GetGdalWriteImageFileName(std::string & extGDAL, std::string filename );
+ std::string GetGdalWriteImageFileName(std::string& extGDAL, std::string filename);
std::string TypeConversion(std::string name);
/** GDAL parameters. */
- GDALDriver* m_hDriver;
- GDALDataset* m_poDataset;
+ GDALDriver* m_hDriver;
+ GDALDataset* m_poDataset;
GDALRasterBand** m_poBands;
- GDALDataType m_PxType;
+ GDALDataType m_PxType;
/** Nombre d'octets par pixel */
- int m_NbOctetPixel;
+ int m_NbOctetPixel;
- bool GDALInfoReportCorner( const char * corner_name, double x, double y,
- double &dfGeoX, double &dfGeoY);
+ bool GDALInfoReportCorner(const char * corner_name, double x, double y,
+ double& dfGeoX, double& dfGeoY);
bool m_FlagWriteImageInformation;
diff --git a/Code/IO/otbGDALImageIOFactory.cxx b/Code/IO/otbGDALImageIOFactory.cxx
index 97e7a1de02..bb16850eb9 100644
--- a/Code/IO/otbGDALImageIOFactory.cxx
+++ b/Code/IO/otbGDALImageIOFactory.cxx
@@ -21,7 +21,6 @@
#include "otbGDALImageIO.h"
#include "itkVersion.h"
-
namespace otb
{
@@ -51,4 +50,3 @@ GDALImageIOFactory::GetDescription() const
}
} // end namespace otb
-
diff --git a/Code/IO/otbGDALImageIOFactory.h b/Code/IO/otbGDALImageIOFactory.h
index b908406cb4..d148f4e6a8 100644
--- a/Code/IO/otbGDALImageIOFactory.h
+++ b/Code/IO/otbGDALImageIOFactory.h
@@ -31,10 +31,10 @@ class ITK_EXPORT GDALImageIOFactory : public itk::ObjectFactoryBase
{
public:
/** Standard class typedefs. */
- typedef GDALImageIOFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef GDALImageIOFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -58,12 +58,11 @@ protected:
virtual ~GDALImageIOFactory();
private:
- GDALImageIOFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ GDALImageIOFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbIkonosImageMetadataInterface.cxx b/Code/IO/otbIkonosImageMetadataInterface.cxx
index cca9789dca..8790fc2e1d 100644
--- a/Code/IO/otbIkonosImageMetadataInterface.cxx
+++ b/Code/IO/otbIkonosImageMetadataInterface.cxx
@@ -16,7 +16,6 @@
=========================================================================*/
-
#ifdef _MSC_VER
#pragma warning ( disable : 4786 )
#endif
@@ -32,121 +31,115 @@
namespace otb
{
-
IkonosImageMetadataInterface
::IkonosImageMetadataInterface()
{
}
bool
-IkonosImageMetadataInterface::CanRead( const MetaDataDictionaryType & dict ) const
+IkonosImageMetadataInterface::CanRead(const MetaDataDictionaryType& dict) const
{
std::string sensorID = GetSensorID(dict);
- if (sensorID.find("IKONOS-2") != std::string::npos)
- return true;
- else
- return false;
+ if (sensorID.find("IKONOS-2") != std::string::npos) return true;
+ else return false;
}
IkonosImageMetadataInterface::VariableLengthVectorType
-IkonosImageMetadataInterface::GetSolarIrradiance( const MetaDataDictionaryType & dict ) const
+IkonosImageMetadataInterface::GetSolarIrradiance(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
-
- VariableLengthVectorType outputValuesVariableLengthVector;
- ossimKeywordlist kwl;
- imageKeywordlist.convertToOSSIMKeywordlist(kwl);
-
- outputValuesVariableLengthVector.SetSize(1);
- // values from geoeye
- std::string key= "support_data.band_name";
- ossimString keywordString = kwl.find(key.c_str());
- if(keywordString=="Pan")
- {
- outputValuesVariableLengthVector[0] = 1375.8;
- }
- else if(keywordString=="Blue")
- {
- outputValuesVariableLengthVector[0] = 1930.9;
- }
- else if(keywordString=="Green")
- {
- outputValuesVariableLengthVector[0] = 1854.8;
- }
- else if(keywordString=="Red")
- {
- outputValuesVariableLengthVector[0] = 1556.5;
- }
- else if(keywordString=="NIR")
- {
- outputValuesVariableLengthVector[0] = 1156.9;
- }
-
+ }
+
+ VariableLengthVectorType outputValuesVariableLengthVector;
+ ossimKeywordlist kwl;
+ imageKeywordlist.convertToOSSIMKeywordlist(kwl);
+
+ outputValuesVariableLengthVector.SetSize(1);
+ // values from geoeye
+ std::string key = "support_data.band_name";
+ ossimString keywordString = kwl.find(key.c_str());
+ if (keywordString == "Pan")
+ {
+ outputValuesVariableLengthVector[0] = 1375.8;
+ }
+ else if (keywordString == "Blue")
+ {
+ outputValuesVariableLengthVector[0] = 1930.9;
+ }
+ else if (keywordString == "Green")
+ {
+ outputValuesVariableLengthVector[0] = 1854.8;
+ }
+ else if (keywordString == "Red")
+ {
+ outputValuesVariableLengthVector[0] = 1556.5;
+ }
+ else if (keywordString == "NIR")
+ {
+ outputValuesVariableLengthVector[0] = 1156.9;
+ }
+
return outputValuesVariableLengthVector;
}
-
int
-IkonosImageMetadataInterface::GetDay( const MetaDataDictionaryType & dict ) const
+IkonosImageMetadataInterface::GetDay(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
std::string key;
ossimString separatorList;
-
+
key = "support_data.acquisition_date";
separatorList = "-";
-
- ossimString keywordString = kwl.find(key.c_str());
+
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
-
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Day");
- // YYYY/MM/DD
- ossimString day = keywordStrings[2];
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Day");
- return day.toInt();
-}
+ // YYYY/MM/DD
+ ossimString day = keywordStrings[2];
+ return day.toInt();
+}
int
-IkonosImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict ) const
+IkonosImageMetadataInterface::GetMonth(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -156,11 +149,10 @@ IkonosImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict ) co
key = "support_data.acquisition_date";
separatorList = "-";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Month");
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Month");
// YYYY/MM/DD
ossimString month = keywordStrings[1];
@@ -169,19 +161,19 @@ IkonosImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict ) co
}
int
-IkonosImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) const
+IkonosImageMetadataInterface::GetHour(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -191,11 +183,10 @@ IkonosImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) con
key = "support_data.acquisition_time";
separatorList = ":";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 1)
- itkExceptionMacro(<<"Invalid Hour");
+ if (keywordStrings.size() <= 1) itkExceptionMacro(<< "Invalid Hour");
// HH:MM
ossimString hour = keywordStrings[0];
@@ -203,21 +194,20 @@ IkonosImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) con
return hour.toInt();
}
-
int
-IkonosImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict ) const
+IkonosImageMetadataInterface::GetMinute(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -227,11 +217,10 @@ IkonosImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict ) c
key = "support_data.acquisition_time";
separatorList = ":";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 1)
- itkExceptionMacro(<<"Invalid Minute");
+ if (keywordStrings.size() <= 1) itkExceptionMacro(<< "Invalid Minute");
// HH:MM
ossimString minute = keywordStrings[1];
@@ -239,21 +228,20 @@ IkonosImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict ) c
return minute.toInt();
}
-
int
-IkonosImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) const
+IkonosImageMetadataInterface::GetYear(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -264,11 +252,10 @@ IkonosImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) con
key = "support_data.acquisition_date";
separatorList = "-";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 2 )
- itkExceptionMacro("Invalid Year");
+ if (keywordStrings.size() <= 2) itkExceptionMacro("Invalid Year");
// YYYY/MM/DD
ossimString year = keywordStrings[0];
@@ -277,56 +264,54 @@ IkonosImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) con
}
int
-IkonosImageMetadataInterface::GetProductionDay( const MetaDataDictionaryType & dict ) const
+IkonosImageMetadataInterface::GetProductionDay(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
std::string key;
ossimString separatorList;
-
+
key = "support_data.production_date";
separatorList = "/";
-
- ossimString keywordString = kwl.find(key.c_str());
+
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
-
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Day");
- // MM/DD/YY
- ossimString day = keywordStrings[1];
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Day");
- return day.toInt();
-}
+ // MM/DD/YY
+ ossimString day = keywordStrings[1];
+ return day.toInt();
+}
int
-IkonosImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryType & dict ) const
+IkonosImageMetadataInterface::GetProductionMonth(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -336,11 +321,10 @@ IkonosImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryType &
key = "support_data.production_date";
separatorList = "/";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Month");
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Month");
// MM/DD/YY
ossimString month = keywordStrings[0];
@@ -349,19 +333,19 @@ IkonosImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryType &
}
int
-IkonosImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType & dict ) const
+IkonosImageMetadataInterface::GetProductionYear(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -372,32 +356,29 @@ IkonosImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType &
key = "support_data.production_date";
separatorList = "/";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 2 )
- itkExceptionMacro("Invalid Year");
+ if (keywordStrings.size() <= 2) itkExceptionMacro("Invalid Year");
// MM/DD/YY
int year = keywordStrings[2].toInt();
- if(year==99)
- year += 1900;
- else
- year += 2000;
+ if (year == 99) year += 1900;
+ else year += 2000;
return year;
}
IkonosImageMetadataInterface::VariableLengthVectorType
IkonosImageMetadataInterface
-::GetPhysicalBias( const MetaDataDictionaryType & dict ) const
+::GetPhysicalBias(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
VariableLengthVectorType outputValuesVariableLengthVector;
outputValuesVariableLengthVector.SetSize(GetNumberOfBands(dict));
outputValuesVariableLengthVector.Fill(0.0);
@@ -405,30 +386,29 @@ IkonosImageMetadataInterface
return outputValuesVariableLengthVector;
}
-
IkonosImageMetadataInterface::VariableLengthVectorType
IkonosImageMetadataInterface
-::GetPhysicalGain( const MetaDataDictionaryType & dict ) const
+::GetPhysicalGain(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
- int productionYear = this->GetProductionYear(dict);
- int productionMonth = this->GetProductionMonth(dict);
- int productionDay = this->GetProductionDay(dict);
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
+ int productionYear = this->GetProductionYear(dict);
+ int productionMonth = this->GetProductionMonth(dict);
+ int productionDay = this->GetProductionDay(dict);
bool isPost20010122 = false;
if ((productionYear > 2) || (productionYear < 99)) isPost20010122 = true;
else
- {
- if (productionYear == 2)
{
+ if (productionYear == 2)
+ {
if (productionMonth > 1) isPost20010122 = true;
else
- if (productionDay >= 22) isPost20010122 = true;
+ if (productionDay >= 22) isPost20010122 = true;
+ }
}
- }
//Value computed from
// http://www.geoeye.com/CorpSite/assets/docs/technical-papers/2009/IKONOS_Esun_Calculations.pdf
@@ -436,184 +416,174 @@ IkonosImageMetadataInterface
VariableLengthVectorType gain;
gain.SetSize(5);
if (isPost20010122)
- {
- gain[0] = 6.48830;//Pan
- gain[1] = 5.19064;//Blue
- gain[2] = 6.44122;//Green
- gain[3] = 6.24442;//Red
- gain[4] = 8.04222;//NIR
- }
+ {
+ gain[0] = 6.48830; //Pan
+ gain[1] = 5.19064; //Blue
+ gain[2] = 6.44122; //Green
+ gain[3] = 6.24442; //Red
+ gain[4] = 8.04222; //NIR
+ }
else
- {
- gain[0] = 6.48830;//Pan
- gain[1] = 4.51329;//Blue
- gain[2] = 5.75014;//Green
- gain[3] = 5.52720;//Red
- gain[4] = 7.11684;//NIR
- }
-
+ {
+ gain[0] = 6.48830; //Pan
+ gain[1] = 4.51329; //Blue
+ gain[2] = 5.75014; //Green
+ gain[3] = 5.52720; //Red
+ gain[4] = 7.11684; //NIR
+ }
std::vector<std::string> bandName = GetBandName(dict);
VariableLengthVectorType outputValuesVariableLengthVector;
- unsigned int numBands = GetNumberOfBands(dict);
-
+ unsigned int numBands = GetNumberOfBands(dict);
+
/** Tests if the number of bands in metadata are the same as bandName size*/
- if (numBands != bandName.size() )
- {
- itkExceptionMacro(<<"Invalid number of bands...");
- }
-
+ if (numBands != bandName.size())
+ {
+ itkExceptionMacro(<< "Invalid number of bands...");
+ }
+
outputValuesVariableLengthVector.SetSize(numBands);
- for(unsigned int i=0; i<numBands; ++i)
- {
- if (bandName[i].find("Pan") != std::string::npos)
- outputValuesVariableLengthVector[i]=gain[0];
- if (bandName[i].find("Blue") != std::string::npos)
- outputValuesVariableLengthVector[i]=gain[1];
- if (bandName[i].find("Green") != std::string::npos)
- outputValuesVariableLengthVector[i]=gain[2];
- if (bandName[i].find("Red") != std::string::npos)
- outputValuesVariableLengthVector[i]=gain[3];
- if (bandName[i].find("NIR") != std::string::npos)
- outputValuesVariableLengthVector[i]=gain[4];
- }
+ for (unsigned int i = 0; i < numBands; ++i)
+ {
+ if (bandName[i].find("Pan") != std::string::npos) outputValuesVariableLengthVector[i] = gain[0];
+ if (bandName[i].find("Blue") != std::string::npos) outputValuesVariableLengthVector[i] = gain[1];
+ if (bandName[i].find("Green") != std::string::npos) outputValuesVariableLengthVector[i] = gain[2];
+ if (bandName[i].find("Red") != std::string::npos) outputValuesVariableLengthVector[i] = gain[3];
+ if (bandName[i].find("NIR") != std::string::npos) outputValuesVariableLengthVector[i] = gain[4];
+ }
return outputValuesVariableLengthVector;
}
double
-IkonosImageMetadataInterface::GetSatElevation( const MetaDataDictionaryType & dict ) const
+IkonosImageMetadataInterface::GetSatElevation(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.nominal_collection_elevation_angle";
+ std::string key = "support_data.nominal_collection_elevation_angle";
ossimString keywordString = kwl.find(key.c_str());
return keywordString.toDouble();
}
double
-IkonosImageMetadataInterface::GetSatAzimuth( const MetaDataDictionaryType & dict ) const
+IkonosImageMetadataInterface::GetSatAzimuth(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.nominal_collection_azimuth_angle";
+ std::string key = "support_data.nominal_collection_azimuth_angle";
ossimString keywordString = kwl.find(key.c_str());
return keywordString.toDouble();
}
-
IkonosImageMetadataInterface::VariableLengthVectorType
IkonosImageMetadataInterface
-::GetFirstWavelengths( const MetaDataDictionaryType & dict ) const
+::GetFirstWavelengths(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
-
+ }
+
VariableLengthVectorType wavel(1);
wavel.Fill(0.);
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.number_bands";
- int nbBands = ossimString(kwl.find(key.c_str())).toInt();
+ std::string key = "support_data.number_bands";
+ int nbBands = ossimString(kwl.find(key.c_str())).toInt();
// Panchromatic case
- if(nbBands==1)
- {
+ if (nbBands == 1)
+ {
wavel.SetSize(1);
wavel.Fill(0.526);
- }
- else if(nbBands==4)
- {
- wavel.SetSize(4);
- wavel[0] = 0.445;
- wavel[1] = 0.506;
- wavel[2] = 0.632;
- wavel[3] = 0.757;
- }
- else
- itkExceptionMacro(<<"Invalid number of bands...");
+ }
+ else if (nbBands == 4)
+ {
+ wavel.SetSize(4);
+ wavel[0] = 0.445;
+ wavel[1] = 0.506;
+ wavel[2] = 0.632;
+ wavel[3] = 0.757;
+ }
+ else itkExceptionMacro(<< "Invalid number of bands...");
return wavel;
}
-
IkonosImageMetadataInterface::VariableLengthVectorType
IkonosImageMetadataInterface
-::GetLastWavelengths( const MetaDataDictionaryType & dict ) const
+::GetLastWavelengths(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
-
+ }
+
VariableLengthVectorType wavel(1);
wavel.Fill(0.);
-
+
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.number_bands";
- int nbBands = ossimString(kwl.find(key.c_str())).toInt();
+ std::string key = "support_data.number_bands";
+ int nbBands = ossimString(kwl.find(key.c_str())).toInt();
// Panchromatic case
- if(nbBands==1)
- {
+ if (nbBands == 1)
+ {
wavel.SetSize(1);
wavel.Fill(0.929);
- }
- else if(nbBands==4)
- {
- wavel.SetSize(4);
- wavel[0] = 0.516;
- wavel[1] = 0.595;
- wavel[2] = 0.698;
- wavel[3] = 0.853;
- }
- else
- itkExceptionMacro(<<"Invalid number of bands...");
+ }
+ else if (nbBands == 4)
+ {
+ wavel.SetSize(4);
+ wavel[0] = 0.516;
+ wavel[1] = 0.595;
+ wavel[2] = 0.698;
+ wavel[3] = 0.853;
+ }
+ else itkExceptionMacro(<< "Invalid number of bands...");
return wavel;
}
diff --git a/Code/IO/otbIkonosImageMetadataInterface.h b/Code/IO/otbIkonosImageMetadataInterface.h
index a8d091570d..ac914de709 100644
--- a/Code/IO/otbIkonosImageMetadataInterface.h
+++ b/Code/IO/otbIkonosImageMetadataInterface.h
@@ -24,7 +24,6 @@
#include "otbImageMetadataInterfaceBase.h"
-
namespace otb
{
/** \class IkonosImageMetadataInterface
@@ -36,10 +35,10 @@ class ITK_EXPORT IkonosImageMetadataInterface : public ImageMetadataInterfaceBas
{
public:
- typedef IkonosImageMetadataInterface Self;
- typedef ImageMetadataInterfaceBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef IkonosImageMetadataInterface Self;
+ typedef ImageMetadataInterfaceBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -53,64 +52,61 @@ public:
typedef Superclass::VariableLengthVectorType VariableLengthVectorType;
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
-
/** Get the radiometric bias from the ossim metadata */
- VariableLengthVectorType GetPhysicalBias( const MetaDataDictionaryType & dict ) const;
-
+ VariableLengthVectorType GetPhysicalBias(const MetaDataDictionaryType& dict) const;
+
/** Get the radiometric gain from the ossim metadata */
- VariableLengthVectorType GetPhysicalGain( const MetaDataDictionaryType & dict ) const;
-
+ VariableLengthVectorType GetPhysicalGain(const MetaDataDictionaryType& dict) const;
+
/** Get the solar irradiance from the ossim metadata */
- VariableLengthVectorType GetSolarIrradiance( const MetaDataDictionaryType & dict ) const;
-
+ VariableLengthVectorType GetSolarIrradiance(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging acquisition day from the ossim metadata : "Acquisition Date/Time" metadata variable */
- int GetDay( const MetaDataDictionaryType & dict ) const;
-
+ int GetDay(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging acquisition month from the ossim metadata : "Acquisition Date/Time" metadata variable */
- int GetMonth( const MetaDataDictionaryType & dict ) const;
-
+ int GetMonth(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging acquisition year from the ossim metadata : "Acquisition Date/Time" metadata variable */
- int GetYear( const MetaDataDictionaryType & dict ) const;
-
+ int GetYear(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging acquisition hour from the ossim metadata : "Acquisition Date/Time" metadata variable */
- int GetHour( const MetaDataDictionaryType & dict ) const;
-
+ int GetHour(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging acquisition year from the ossim metadata : "Acquisition Date/Time" metadata variable */
- int GetMinute( const MetaDataDictionaryType & dict ) const;
+ int GetMinute(const MetaDataDictionaryType& dict) const;
/** Get the imaging production day from the ossim metadata : "Creation Date" metadata variable */
- int GetProductionDay( const MetaDataDictionaryType & dict ) const;
-
+ int GetProductionDay(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging production month from the ossim metadata : "Creation Date" metadata variable */
- int GetProductionMonth( const MetaDataDictionaryType & dict ) const;
-
+ int GetProductionMonth(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging production year from the ossim metadata : "Creation Date" metadata variable */
- int GetProductionYear( const MetaDataDictionaryType & dict ) const;
+ int GetProductionYear(const MetaDataDictionaryType& dict) const;
/** Get the sat elevation from the ossim metadata */
- double GetSatElevation( const MetaDataDictionaryType & dict ) const;
-
+ double GetSatElevation(const MetaDataDictionaryType& dict) const;
+
/** Get the sat azimuth from the ossim metadata */
- double GetSatAzimuth( const MetaDataDictionaryType & dict ) const;
-
+ double GetSatAzimuth(const MetaDataDictionaryType& dict) const;
+
/** Get the first wavelength for the spectral band definition */
- VariableLengthVectorType GetFirstWavelengths( const MetaDataDictionaryType & dict ) const;
-
+ VariableLengthVectorType GetFirstWavelengths(const MetaDataDictionaryType& dict) const;
+
/** Get the last wavelength for the spectral band definition */
- VariableLengthVectorType GetLastWavelengths( const MetaDataDictionaryType & dict ) const;
-
- bool CanRead( const MetaDataDictionaryType & dict) const;
-
-
+ VariableLengthVectorType GetLastWavelengths(const MetaDataDictionaryType& dict) const;
+
+ bool CanRead(const MetaDataDictionaryType& dict) const;
+
protected:
IkonosImageMetadataInterface();
- virtual ~IkonosImageMetadataInterface() {};
+ virtual ~IkonosImageMetadataInterface() {}
-
private:
- IkonosImageMetadataInterface(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ IkonosImageMetadataInterface(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/IO/otbIkonosImageMetadataInterfaceFactory.cxx b/Code/IO/otbIkonosImageMetadataInterfaceFactory.cxx
index 93b69f439b..5b2f19d26c 100644
--- a/Code/IO/otbIkonosImageMetadataInterfaceFactory.cxx
+++ b/Code/IO/otbIkonosImageMetadataInterfaceFactory.cxx
@@ -16,7 +16,6 @@
=========================================================================*/
-
#ifdef _MSC_VER
#pragma warning ( disable : 4786 )
#endif
@@ -29,11 +28,9 @@
#include "otbIkonosImageMetadataInterfaceFactory.h"
#include "otbIkonosImageMetadataInterface.h"
-
#include "itkCreateObjectFunction.h"
#include "itkVersion.h"
-
namespace otb
{
/*************************************************
@@ -46,7 +43,7 @@ IkonosImageMetadataInterfaceFactory
"otbIkonosImageMetadataInterface",
"Ikonos Meteada Interface",
1,
- itk::CreateObjectFunction<IkonosImageMetadataInterface >::New());
+ itk::CreateObjectFunction<IkonosImageMetadataInterface>::New());
}
IkonosImageMetadataInterfaceFactory
diff --git a/Code/IO/otbIkonosImageMetadataInterfaceFactory.h b/Code/IO/otbIkonosImageMetadataInterfaceFactory.h
index 9e63445e4d..a672234455 100644
--- a/Code/IO/otbIkonosImageMetadataInterfaceFactory.h
+++ b/Code/IO/otbIkonosImageMetadataInterfaceFactory.h
@@ -17,7 +17,7 @@
=========================================================================*/
#ifndef __otbIkonosImageMetadataInterfaceFactory_h
#define __otbIkonosImageMetadataInterfaceFactory_h
-
+
#if defined(_MSC_VER)
#pragma warning ( disable : 4786 )
#endif
@@ -33,10 +33,10 @@ class ITK_EXPORT IkonosImageMetadataInterfaceFactory : public itk::ObjectFactory
{
public:
/** Standard class typedefs. */
- typedef IkonosImageMetadataInterfaceFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef IkonosImageMetadataInterfaceFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -60,12 +60,11 @@ protected:
virtual ~IkonosImageMetadataInterfaceFactory();
private:
- IkonosImageMetadataInterfaceFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ IkonosImageMetadataInterfaceFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbImage.h b/Code/IO/otbImage.h
index 0e3de884fd..46acb89f1c 100644
--- a/Code/IO/otbImage.h
+++ b/Code/IO/otbImage.h
@@ -34,19 +34,19 @@ namespace otb
*
*/
-template <class TPixel,unsigned int VImageDimension=2>
-class ITK_EXPORT Image : public itk::Image<TPixel,VImageDimension>
+template <class TPixel, unsigned int VImageDimension = 2>
+class ITK_EXPORT Image : public itk::Image<TPixel, VImageDimension>
{
public:
/** Standard class typedefs. */
- typedef Image Self;
- typedef itk::Image<TPixel, VImageDimension> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef itk::WeakPointer<const Self> ConstWeakPointer;
+ typedef Image Self;
+ typedef itk::Image<TPixel, VImageDimension> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::WeakPointer<const Self> ConstWeakPointer;
- typedef DefaultImageMetadataInterface::VectorType VectorType;
- typedef DefaultImageMetadataInterface::ImageKeywordlistType ImageKeywordlistType;
+ typedef DefaultImageMetadataInterface::VectorType VectorType;
+ typedef DefaultImageMetadataInterface::ImageKeywordlistType ImageKeywordlistType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -54,7 +54,6 @@ public:
/** Run-time type information (and related methods). */
itkTypeMacro(Image, itk::Image);
-
/** Pixel typedef support. Used to declare pixel type in filters
* or other operations. */
typedef typename Superclass::PixelType PixelType;
@@ -76,10 +75,9 @@ public:
//typedef itk::DefaultPixelAccessorFunctor< Self > AccessorFunctorType;
/** Tyepdef for the functor used to access a neighborhood of pixel pointers.*/
- typedef itk::NeighborhoodAccessorFunctor< Self >
+ typedef itk::NeighborhoodAccessorFunctor<Self>
NeighborhoodAccessorFunctorType;
-
/** Dimension of the image. This constant is used by functions that are
* templated over image type (as opposed to being templated over pixel type
* and dimension) when they need compile time access to the dimension of
@@ -90,19 +88,19 @@ public:
typedef typename Superclass::PixelContainer PixelContainer;
/** Index typedef support. An index is used to access pixel values. */
- typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::IndexType IndexType;
/** Offset typedef support. An offset is used to access pixel values. */
typedef typename Superclass::OffsetType OffsetType;
/** Size typedef support. A size is used to define region bounds. */
- typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::SizeType SizeType;
/** Direction typedef support. A matrix of direction cosines. */
- typedef typename Superclass::DirectionType DirectionType;
+ typedef typename Superclass::DirectionType DirectionType;
/** Region typedef support. A region is used to specify a subset of an image. */
- typedef typename Superclass::RegionType RegionType;
+ typedef typename Superclass::RegionType RegionType;
/** Spacing typedef support. Spacing holds the size of a pixel. The
* spacing is the geometric distance between image samples. */
@@ -113,7 +111,7 @@ public:
typedef typename Superclass::PointType PointType;
/** A pointer to the pixel container. */
- typedef typename PixelContainer::Pointer PixelContainerPointer;
+ typedef typename PixelContainer::Pointer PixelContainerPointer;
typedef typename PixelContainer::ConstPointer PixelContainerConstPointer;
/** Offset typedef (relative position between indices) */
@@ -143,33 +141,32 @@ public:
return NeighborhoodAccessorFunctorType();
}
-
/** Get the projection coordinate system of the image. */
- virtual std::string GetProjectionRef( void ) const;
+ virtual std::string GetProjectionRef(void) const;
/** Get the GCP projection coordinates of the image. */
- virtual std::string GetGCPProjection( void ) const;
+ virtual std::string GetGCPProjection(void) const;
- virtual unsigned int GetGCPCount( void ) const;
+ virtual unsigned int GetGCPCount(void) const;
- virtual OTB_GCP & GetGCPs ( unsigned int GCPnum );
+ virtual OTB_GCP& GetGCPs(unsigned int GCPnum);
- virtual std::string GetGCPId( unsigned int GCPnum ) const;
- virtual std::string GetGCPInfo( unsigned int GCPnum ) const;
- virtual double GetGCPRow( unsigned int GCPnum ) const;
- virtual double GetGCPCol( unsigned int GCPnum ) const;
- virtual double GetGCPX( unsigned int GCPnum ) const;
- virtual double GetGCPY( unsigned int GCPnum ) const;
- virtual double GetGCPZ( unsigned int GCPnum ) const;
+ virtual std::string GetGCPId(unsigned int GCPnum) const;
+ virtual std::string GetGCPInfo(unsigned int GCPnum) const;
+ virtual double GetGCPRow(unsigned int GCPnum) const;
+ virtual double GetGCPCol(unsigned int GCPnum) const;
+ virtual double GetGCPX(unsigned int GCPnum) const;
+ virtual double GetGCPY(unsigned int GCPnum) const;
+ virtual double GetGCPZ(unsigned int GCPnum) const;
/** Get the six coefficients of affine geoTtransform. */
- virtual VectorType GetGeoTransform( void ) const;
+ virtual VectorType GetGeoTransform(void) const;
/** Get image corners. */
- virtual VectorType GetUpperLeftCorner( void ) const;
- virtual VectorType GetUpperRightCorner( void ) const;
- virtual VectorType GetLowerLeftCorner( void ) const;
- virtual VectorType GetLowerRightCorner( void ) const;
+ virtual VectorType GetUpperLeftCorner(void) const;
+ virtual VectorType GetUpperRightCorner(void) const;
+ virtual VectorType GetLowerLeftCorner(void) const;
+ virtual VectorType GetLowerRightCorner(void) const;
/** Get image keyword list */
virtual ImageKeywordlistType GetImageKeywordlist(void);
@@ -182,13 +179,12 @@ public:
protected:
Image();
- virtual ~Image() {};
-
+ virtual ~Image() {}
private:
- Image(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ Image(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
+
/** Only here to have access to projection and coordinates datas.
Those method will disappear.
Use Default because don't need to know the sensor type*/
@@ -196,7 +192,6 @@ private:
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/IO/otbImage.txx b/Code/IO/otbImage.txx
index fab09bacca..850d179daf 100644
--- a/Code/IO/otbImage.txx
+++ b/Code/IO/otbImage.txx
@@ -28,124 +28,124 @@ namespace otb
{
template <class TPixel, unsigned int VImageDimension>
-Image<TPixel,VImageDimension>::Image()
+Image<TPixel, VImageDimension>::Image()
{
m_ImageMetadataInterface = DefaultImageMetadataInterface::New();
}
template <class TPixel, unsigned int VImageDimension>
-std::string Image<TPixel, VImageDimension>::GetProjectionRef( void ) const
+std::string Image<TPixel, VImageDimension>::GetProjectionRef(void) const
{
- return ( m_ImageMetadataInterface->GetProjectionRef( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetProjectionRef(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
-std::string Image<TPixel, VImageDimension>::GetGCPProjection( void ) const
+std::string Image<TPixel, VImageDimension>::GetGCPProjection(void) const
{
- return ( m_ImageMetadataInterface->GetGCPProjection( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetGCPProjection(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
-unsigned int Image<TPixel, VImageDimension>::GetGCPCount( void ) const
+unsigned int Image<TPixel, VImageDimension>::GetGCPCount(void) const
{
- return ( m_ImageMetadataInterface->GetGCPCount( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetGCPCount(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
-OTB_GCP & Image<TPixel, VImageDimension>::GetGCPs ( unsigned int GCPnum )
+OTB_GCP& Image<TPixel, VImageDimension>::GetGCPs(unsigned int GCPnum)
{
- return (m_ImageMetadataInterface->GetGCPs( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPs(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
-std::string Image<TPixel, VImageDimension>::GetGCPId( unsigned int GCPnum ) const
+std::string Image<TPixel, VImageDimension>::GetGCPId(unsigned int GCPnum) const
{
- return ( m_ImageMetadataInterface->GetGCPId( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPId(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
-std::string Image<TPixel, VImageDimension>::GetGCPInfo( unsigned int GCPnum ) const
+std::string Image<TPixel, VImageDimension>::GetGCPInfo(unsigned int GCPnum) const
{
- return ( m_ImageMetadataInterface->GetGCPInfo( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPInfo(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
-double Image<TPixel, VImageDimension>::GetGCPRow( unsigned int GCPnum ) const
+double Image<TPixel, VImageDimension>::GetGCPRow(unsigned int GCPnum) const
{
- return ( m_ImageMetadataInterface->GetGCPRow( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPRow(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
-double Image<TPixel, VImageDimension>::GetGCPCol( unsigned int GCPnum ) const
+double Image<TPixel, VImageDimension>::GetGCPCol(unsigned int GCPnum) const
{
- return ( m_ImageMetadataInterface->GetGCPCol( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPCol(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
-double Image<TPixel, VImageDimension>::GetGCPX( unsigned int GCPnum ) const
+double Image<TPixel, VImageDimension>::GetGCPX(unsigned int GCPnum) const
{
- return ( m_ImageMetadataInterface->GetGCPX( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPX(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
-double Image<TPixel, VImageDimension>::GetGCPY( unsigned int GCPnum ) const
+double Image<TPixel, VImageDimension>::GetGCPY(unsigned int GCPnum) const
{
- return ( m_ImageMetadataInterface->GetGCPY( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPY(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
-double Image<TPixel, VImageDimension>::GetGCPZ( unsigned int GCPnum ) const
+double Image<TPixel, VImageDimension>::GetGCPZ(unsigned int GCPnum) const
{
- return ( m_ImageMetadataInterface->GetGCPZ( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPZ(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
typename Image<TPixel, VImageDimension>::VectorType
-Image<TPixel, VImageDimension>::GetGeoTransform( void ) const
+Image<TPixel, VImageDimension>::GetGeoTransform(void) const
{
- return ( m_ImageMetadataInterface->GetGeoTransform( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetGeoTransform(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
typename Image<TPixel, VImageDimension>::VectorType
-Image<TPixel, VImageDimension>::GetUpperLeftCorner( void ) const
+Image<TPixel, VImageDimension>::GetUpperLeftCorner(void) const
{
- return ( m_ImageMetadataInterface->GetUpperLeftCorner( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetUpperLeftCorner(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
typename Image<TPixel, VImageDimension>::VectorType
-Image<TPixel, VImageDimension>::GetUpperRightCorner( void ) const
+Image<TPixel, VImageDimension>::GetUpperRightCorner(void) const
{
- return ( m_ImageMetadataInterface->GetUpperRightCorner( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetUpperRightCorner(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
typename Image<TPixel, VImageDimension>::VectorType
-Image<TPixel, VImageDimension>::GetLowerLeftCorner( void ) const
+Image<TPixel, VImageDimension>::GetLowerLeftCorner(void) const
{
- return ( m_ImageMetadataInterface->GetLowerLeftCorner( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetLowerLeftCorner(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
typename Image<TPixel, VImageDimension>::VectorType
-Image<TPixel, VImageDimension>::GetLowerRightCorner( void ) const
+Image<TPixel, VImageDimension>::GetLowerRightCorner(void) const
{
- return ( m_ImageMetadataInterface->GetLowerRightCorner( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetLowerRightCorner(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
typename Image<TPixel, VImageDimension>::ImageKeywordlistType
-Image<TPixel, VImageDimension>::GetImageKeywordlist( void )
+Image<TPixel, VImageDimension>::GetImageKeywordlist(void)
{
- return ( m_ImageMetadataInterface->GetImageKeywordlist( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetImageKeywordlist(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
const typename Image<TPixel, VImageDimension>::ImageKeywordlistType
-Image<TPixel, VImageDimension>::GetImageKeywordlist( void ) const
+Image<TPixel, VImageDimension>::GetImageKeywordlist(void) const
{
- return ( m_ImageMetadataInterface->GetImageKeywordlist( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetImageKeywordlist(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
@@ -163,12 +163,11 @@ template <class TPixel, unsigned int VImageDimension>
void
Image<TPixel, VImageDimension>::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
- m_ImageMetadataInterface->PrintSelf( os, indent, this->GetMetaDataDictionary() );
+ m_ImageMetadataInterface->PrintSelf(os, indent, this->GetMetaDataDictionary());
}
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbImageFileReader.h b/Code/IO/otbImageFileReader.h
index 21972e21cd..322aef38fb 100644
--- a/Code/IO/otbImageFileReader.h
+++ b/Code/IO/otbImageFileReader.h
@@ -37,9 +37,9 @@ class ITK_EXPORT ImageFileReader : public itk::ImageFileReader<TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef ImageFileReader Self;
- typedef itk::ImageFileReader<TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef ImageFileReader Self;
+ typedef itk::ImageFileReader<TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -51,10 +51,10 @@ public:
typedef typename TOutputImage::InternalPixelType OutputImagePixelType;
/** The size of the output image. */
- typedef typename TOutputImage::SizeType SizeType;
+ typedef typename TOutputImage::SizeType SizeType;
/** The region of the output image. */
- typedef typename TOutputImage::RegionType ImageRegionType;
+ typedef typename TOutputImage::RegionType ImageRegionType;
/** The pixel type of the output image. */
//typedef typename TOutputImage::InternalPixelType OutputImagePixelType;
@@ -72,7 +72,6 @@ public:
* enlarge the RequestedRegion to the size of the image on disk. */
virtual void EnlargeOutputRequestedRegion(itk::DataObject *output);
-
protected:
ImageFileReader();
virtual ~ImageFileReader();
@@ -89,19 +88,17 @@ private:
/** Generate the filename (for GDALImageI for example). If filename is a directory, look if is a
* CEOS product (file "DAT...") In this case, the GdalFileName contain the open image file.
*/
- bool GetGdalReadImageFileName( const std::string & filename, std::string & GdalFileName );
+ bool GetGdalReadImageFileName(const std::string& filename, std::string& GdalFileName);
// This is a dummy function to prevent curl from writing data to disk
// when testing http adresses
- static size_t curlDummyWriteFunction(void*,size_t,size_t nmemb,void*);
-
+ static size_t curlDummyWriteFunction(void*, size_t, size_t nmemb, void*);
- ImageFileReader(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageFileReader(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} //namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/IO/otbImageFileReader.txx b/Code/IO/otbImageFileReader.txx
index b5979fe090..b8328f95aa 100644
--- a/Code/IO/otbImageFileReader.txx
+++ b/Code/IO/otbImageFileReader.txx
@@ -59,7 +59,6 @@ ImageFileReader<TOutputImage>
{
}
-
template <class TOutputImage>
ImageFileReader<TOutputImage>
::~ImageFileReader()
@@ -73,14 +72,14 @@ void ImageFileReader<TOutputImage>
Superclass::PrintSelf(os, indent);
if (this->m_ImageIO)
- {
+ {
os << indent << "ImageIO: \n";
this->m_ImageIO->Print(os, indent.GetNextIndent());
- }
+ }
else
- {
+ {
os << indent << "ImageIO: (null)" << "\n";
- }
+ }
os << indent << "UserSpecifiedImageIO flag: " << this->m_UserSpecifiedImageIO << "\n";
os << indent << "m_FileName: " << this->m_FileName << "\n";
@@ -95,7 +94,7 @@ ImageFileReader<TOutputImage>
typename TOutputImage::Pointer output = this->GetOutput();
// allocate the output buffer
- output->SetBufferedRegion( output->GetRequestedRegion() );
+ output->SetBufferedRegion(output->GetRequestedRegion());
output->Allocate();
//otbMsgDebugMacro( <<"ImageFileReader<TOutputImage>::GenerateData : ");
@@ -116,71 +115,68 @@ ImageFileReader<TOutputImage>
// itk::ImageIORegion ioRegionStreaming = output->GetRequestedRegion();
- itk::ImageIORegion::SizeType ioSize = ioRegion.GetSize();
+ itk::ImageIORegion::SizeType ioSize = ioRegion.GetSize();
itk::ImageIORegion::IndexType ioStart = ioRegion.GetIndex();
/* Init IORegion with size or streaming size */
SizeType dimSize;
- for (unsigned int i=0; i<TOutputImage::ImageDimension; ++i)
- {
- if (i < this->m_ImageIO->GetNumberOfDimensions())
+ for (unsigned int i = 0; i < TOutputImage::ImageDimension; ++i)
{
- if ( !this->m_ImageIO->CanStreamRead() )
- dimSize[i] = this->m_ImageIO->GetDimensions(i);
- else
- dimSize[i] = output->GetRequestedRegion().GetSize()[i];
- }
+ if (i < this->m_ImageIO->GetNumberOfDimensions())
+ {
+ if (!this->m_ImageIO->CanStreamRead()) dimSize[i] = this->m_ImageIO->GetDimensions(i);
+ else dimSize[i] = output->GetRequestedRegion().GetSize()[i];
+ }
else
- {
+ {
// Number of dimensions in the output is more than number of dimensions
// in the ImageIO object (the file). Use default values for the size,
// spacing, and origin for the final (degenerate) dimensions.
dimSize[i] = 1;
+ }
}
- }
for (unsigned int i = 0; i < dimSize.GetSizeDimension(); ++i)
- {
+ {
ioSize[i] = dimSize[i];
- }
+ }
- typedef typename TOutputImage::IndexType IndexType;
+ typedef typename TOutputImage::IndexType IndexType;
IndexType start;
- if ( !this->m_ImageIO->CanStreamRead() ) start.Fill(0);
+ if (!this->m_ImageIO->CanStreamRead()) start.Fill(0);
else start = output->GetRequestedRegion().GetIndex();
for (unsigned int i = 0; i < start.GetIndexDimension(); ++i)
- {
+ {
ioStart[i] = start[i];
- }
+ }
ioRegion.SetSize(ioSize);
ioRegion.SetIndex(ioStart);
//otbMsgDebugMacro( <<" Apres ioRegion : "<<ioRegion);
-
this->m_ImageIO->SetIORegion(ioRegion);
- typedef itk::DefaultConvertPixelTraits< ITK_TYPENAME TOutputImage::IOPixelType > ConvertPixelTraits;
+ typedef itk::DefaultConvertPixelTraits<ITK_TYPENAME TOutputImage::IOPixelType> ConvertPixelTraits;
- if ( this->m_ImageIO->GetComponentTypeInfo()
- == typeid(ITK_TYPENAME ConvertPixelTraits::ComponentType)
- && (this->m_ImageIO->GetNumberOfComponents()
- == ConvertPixelTraits::GetNumberOfComponents()))
- {
+ if (this->m_ImageIO->GetComponentTypeInfo()
+ == typeid(ITK_TYPENAME ConvertPixelTraits::ComponentType)
+ && (this->m_ImageIO->GetNumberOfComponents()
+ == ConvertPixelTraits::GetNumberOfComponents()))
+ {
// allocate a buffer and have the ImageIO read directly into it
this->m_ImageIO->Read(buffer);
return;
- }
+ }
else // a type conversion is necessary
- {
+ {
// note: char is used here because the buffer is read in bytes
// regardles of the actual type of the pixels.
ImageRegionType region = output->GetBufferedRegion();
// Adapte the image size with the region
std::streamoff nbBytes = (this->m_ImageIO->GetComponentSize() * this->m_ImageIO->GetNumberOfComponents())
- * static_cast<std::streamoff>(region.GetNumberOfPixels());
+ * static_cast<std::streamoff>(region.GetNumberOfPixels());
char * loadBuffer = new char[nbBytes];
@@ -188,11 +184,10 @@ ImageFileReader<TOutputImage>
this->DoConvertBuffer(loadBuffer, region.GetNumberOfPixels());
- delete [] loadBuffer;
- }
+ delete[] loadBuffer;
+ }
}
-
template <class TOutputImage>
void
ImageFileReader<TOutputImage>
@@ -203,20 +198,19 @@ ImageFileReader<TOutputImage>
// the ImageIO object cannot stream, then set the RequestedRegion to the
// LargestPossibleRegion
if (!this->m_ImageIO->CanStreamRead())
- {
- if (out)
{
- out->SetRequestedRegion( out->GetLargestPossibleRegion() );
- }
+ if (out)
+ {
+ out->SetRequestedRegion(out->GetLargestPossibleRegion());
+ }
else
- {
+ {
throw itk::ImageFileReaderException(__FILE__, __LINE__,
"Invalid output object type");
+ }
}
- }
}
-
template <class TOutputImage>
void
ImageFileReader<TOutputImage>
@@ -225,61 +219,60 @@ ImageFileReader<TOutputImage>
typename TOutputImage::Pointer output = this->GetOutput();
- itkDebugMacro(<<"Reading file for GenerateOutputInformation()" << this->m_FileName);
+ itkDebugMacro(<< "Reading file for GenerateOutputInformation()" << this->m_FileName);
// Check to see if we can read the file given the name or prefix
//
- if ( this->m_FileName == "" )
- {
+ if (this->m_FileName == "")
+ {
throw itk::ImageFileReaderException(__FILE__, __LINE__, "FileName must be specified");
- }
+ }
// Find real image file name
// !!!! Update FileName
std::string lFileName;
- bool found = GetGdalReadImageFileName(this->m_FileName,lFileName);
- if ( found == false )
- {
- otbMsgDebugMacro( <<"Filename was NOT unknowed. May be reconize by a Image factory ! ");
- }
+ bool found = GetGdalReadImageFileName(this->m_FileName, lFileName);
+ if (found == false)
+ {
+ otbMsgDebugMacro(<< "Filename was NOT unknowed. May be reconize by a Image factory ! ");
+ }
// Update FileName
this->m_FileName = lFileName;
std::string lFileNameOssimKeywordlist = this->m_FileName;
-
// Test if the file exist and if it can be open.
// and exception will be thrown otherwise.
//
this->TestFileExistanceAndReadability();
- if ( this->m_UserSpecifiedImageIO == false ) //try creating via factory
- {
- this->m_ImageIO = ImageIOFactory::CreateImageIO( this->m_FileName.c_str(), itk::ImageIOFactory::ReadMode );
- }
+ if (this->m_UserSpecifiedImageIO == false) //try creating via factory
+ {
+ this->m_ImageIO = ImageIOFactory::CreateImageIO(this->m_FileName.c_str(), itk::ImageIOFactory::ReadMode);
+ }
- if ( this->m_ImageIO.IsNull() )
- {
- this->Print( std::cerr );
+ if (this->m_ImageIO.IsNull())
+ {
+ this->Print(std::cerr);
itk::ImageFileReaderException e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << " Could not create IO object for file "
- << this->m_FileName.c_str() << std::endl;
+ << this->m_FileName.c_str() << std::endl;
msg << " Tried to create one of the following:" << std::endl;
std::list<itk::LightObject::Pointer> allobjects =
itk::ObjectFactoryBase::CreateAllInstance("itkImageIOBase");
for (std::list<itk::LightObject::Pointer>::iterator i = allobjects.begin();
i != allobjects.end(); ++i)
- {
+ {
itk::ImageIOBase* io = dynamic_cast<itk::ImageIOBase*>(i->GetPointer());
msg << " " << io->GetNameOfClass() << std::endl;
- }
+ }
msg << " You probably failed to set a file suffix, or" << std::endl;
msg << " set the suffix to an unsupported type." << std::endl;
e.SetDescription(msg.str().c_str());
throw e;
return;
- }
+ }
// Got to allocate space for the image. Determine the characteristics of
// the image.
@@ -290,36 +283,36 @@ ImageFileReader<TOutputImage>
// THOMAS ceci n'est pas dans ITK !!
// output->SetNumberOfComponentsPerPixel(this->m_ImageIO->GetNumberOfComponents());
- SizeType dimSize;
- double spacing[ TOutputImage::ImageDimension ];
- double origin[ TOutputImage::ImageDimension ];
+ SizeType dimSize;
+ double spacing[TOutputImage::ImageDimension];
+ double origin[TOutputImage::ImageDimension];
typename TOutputImage::DirectionType direction;
- std::vector<double> axis;
+ std::vector<double> axis;
- for (unsigned int i=0; i<TOutputImage::ImageDimension; ++i)
- {
- if ( i < this->m_ImageIO->GetNumberOfDimensions() )
+ for (unsigned int i = 0; i < TOutputImage::ImageDimension; ++i)
{
+ if (i < this->m_ImageIO->GetNumberOfDimensions())
+ {
dimSize[i] = this->m_ImageIO->GetDimensions(i);
spacing[i] = this->m_ImageIO->GetSpacing(i);
origin[i] = this->m_ImageIO->GetOrigin(i);
// Please note: direction cosines are stored as columns of the
// direction matrix
axis = this->m_ImageIO->GetDirection(i);
- for (unsigned j=0; j<TOutputImage::ImageDimension; ++j)
- {
- if (j < this->m_ImageIO->GetNumberOfDimensions())
+ for (unsigned j = 0; j < TOutputImage::ImageDimension; ++j)
{
+ if (j < this->m_ImageIO->GetNumberOfDimensions())
+ {
direction[j][i] = axis[j];
- }
+ }
else
- {
+ {
direction[j][i] = 0.0;
+ }
}
}
- }
else
- {
+ {
// Number of dimensions in the output is more than number of dimensions
// in the ImageIO object (the file). Use default values for the size,
// spacing, origin and direction for the final (degenerate) dimensions.
@@ -327,115 +320,113 @@ ImageFileReader<TOutputImage>
spacing[i] = 1.0;
origin[i] = 0.0;
for (unsigned j = 0; j < TOutputImage::ImageDimension; ++j)
- {
- if (i == j)
{
+ if (i == j)
+ {
direction[j][i] = 1.0;
- }
+ }
else
- {
+ {
direction[j][i] = 0.0;
+ }
}
}
}
- }
- output->SetSpacing( spacing ); // Set the image spacing
- output->SetOrigin( origin ); // Set the image origin
- output->SetDirection( direction ); // Set the image direction cosines
+ output->SetSpacing(spacing); // Set the image spacing
+ output->SetOrigin(origin); // Set the image origin
+ output->SetDirection(direction); // Set the image direction cosines
// Trying to read ossim MetaData
- bool hasMetaData = false;
- ossimKeywordlist geom_kwl, tmp_kwl, tmp_kwl2;// = new ossimKeywordlist();
+ bool hasMetaData = false;
+ ossimKeywordlist geom_kwl, tmp_kwl, tmp_kwl2; // = new ossimKeywordlist();
// Test the plugins factory
/** Before, the pluginfactory was tested if the ossim one returned false.
- But in the case TSX, the images tif were considered as ossimQuickbirdTiffTileSource
- thus a TSX tif image wasn't read with TSX Model. We don't use the ossimRegisteryFactory
+ But in the case TSX, the images tif were considered as ossimQuickbirdTiffTileSource
+ thus a TSX tif image wasn't read with TSX Model. We don't use the ossimRegisteryFactory
because the default include factory contains ossimQuickbirdTiffTileSource. */
ossimProjection * projection = ossimplugins::ossimPluginProjectionFactory::instance()
- ->createProjection(ossimFilename(lFileNameOssimKeywordlist.c_str()), 0);
+ ->createProjection(ossimFilename(lFileNameOssimKeywordlist.c_str()), 0);
if (!projection)
{
- otbMsgDevMacro( <<"OSSIM Instantiate projection FAILED ! ");
+ otbMsgDevMacro(<< "OSSIM Instantiate projection FAILED ! ");
}
else
{
- otbMsgDevMacro( <<"OSSIM Instantiate projection SUCCESS ! ");
- hasMetaData = projection->saveState(geom_kwl);
-
- // Free memory
- delete projection;
+ otbMsgDevMacro(<< "OSSIM Instantiate projection SUCCESS ! ");
+ hasMetaData = projection->saveState(geom_kwl);
+
+ // Free memory
+ delete projection;
}
-
+
if (!hasMetaData)
{
- // Add the radar factory
- // ossimImageHandlerRegistry::instance()->addFactory(ossimImageHandlerSarFactory::instance());
-
-
- ossimImageHandler* handler = ossimImageHandlerRegistry::instance()
- ->open(ossimFilename(lFileNameOssimKeywordlist.c_str()));
- if (!handler)
- {
- otbMsgDevMacro( <<"OSSIM Open Image FAILED ! ");
- }
-
- else
- {
- otbMsgDevMacro( <<"OSSIM Open Image SUCCESS ! ");
- // hasMetaData = handler->getImageGeometry(geom_kwl);
- ossimProjection* projection = handler->getImageGeometry()->getProjection();
-
- if (projection)
- {
+ // Add the radar factory
+ // ossimImageHandlerRegistry::instance()->addFactory(ossimImageHandlerSarFactory::instance());
+
+ ossimImageHandler* handler = ossimImageHandlerRegistry::instance()
+ ->open(ossimFilename(lFileNameOssimKeywordlist.c_str()));
+ if (!handler)
+ {
+ otbMsgDevMacro(<< "OSSIM Open Image FAILED ! ");
+ }
+
+ else
+ {
+ otbMsgDevMacro(<< "OSSIM Open Image SUCCESS ! ");
+ // hasMetaData = handler->getImageGeometry(geom_kwl);
+ ossimProjection* projection = handler->getImageGeometry()->getProjection();
+
+ if (projection)
+ {
#ifdef OTB_USE_CURL
- if (projection->getClassName() == "ossimTileMapModel")
- {
- //FIXME find a better way to do that
- //we need to pass the depth information which in on the IO to the projection
- //to be handle throught the kwl
- typename TileMapImageIO::Pointer imageIO = dynamic_cast<TileMapImageIO*>(this->GetImageIO());
- dynamic_cast<ossimTileMapModel*>(projection)->setDepth(imageIO->GetDepth());
- }
+ if (projection->getClassName() == "ossimTileMapModel")
+ {
+ //FIXME find a better way to do that
+ //we need to pass the depth information which in on the IO to the projection
+ //to be handle throught the kwl
+ typename TileMapImageIO::Pointer imageIO = dynamic_cast<TileMapImageIO*>(this->GetImageIO());
+ dynamic_cast<ossimTileMapModel*>(projection)->setDepth(imageIO->GetDepth());
+ }
#endif
- hasMetaData = projection->saveState(geom_kwl);
+ hasMetaData = projection->saveState(geom_kwl);
// delete projection; //FIXME find out where this should occur
- }
- }
- // Free memory
- delete handler;
+ }
+ }
+ // Free memory
+ delete handler;
}
-
+
if (!hasMetaData)
{
- otbMsgDevMacro( <<"OSSIM MetaData not present ! ");
+ otbMsgDevMacro(<< "OSSIM MetaData not present ! ");
}
else
{
- otbMsgDevMacro( <<"OSSIM MetaData present ! ");
- otbMsgDevMacro( << geom_kwl);
-
+ otbMsgDevMacro(<< "OSSIM MetaData present ! ");
+ otbMsgDevMacro(<< geom_kwl);
// Update otb Keywordlist
ImageKeywordlist otb_kwl;
- otb_kwl.SetKeywordlist( geom_kwl );
-
+ otb_kwl.SetKeywordlist(geom_kwl);
+
// Update itk MetaData Dictionary
itk::MetaDataDictionary& dict = this->m_ImageIO->GetMetaDataDictionary();
-
- itk::EncapsulateMetaData< ImageKeywordlist >(dict,
- MetaDataKey::OSSIMKeywordlistKey, otb_kwl);
-
+
+ itk::EncapsulateMetaData<ImageKeywordlist>(dict,
+ MetaDataKey::OSSIMKeywordlistKey, otb_kwl);
+
}
-
+
//Copy MetaDataDictionary from instantiated reader to output image.
output->SetMetaDataDictionary(this->m_ImageIO->GetMetaDataDictionary());
this->SetMetaDataDictionary(this->m_ImageIO->GetMetaDataDictionary());
-
- typedef typename TOutputImage::IndexType IndexType;
+
+ typedef typename TOutputImage::IndexType IndexType;
IndexType start;
start.Fill(0);
@@ -445,13 +436,13 @@ ImageFileReader<TOutputImage>
region.SetIndex(start);
// THOMAS : ajout
- // If a VectorImage, this requires us to set the
- // VectorLength before allocate
- if ( strcmp( output->GetNameOfClass(), "VectorImage" ) == 0 )
- {
+// If a VectorImage, this requires us to set the
+// VectorLength before allocate
+ if (strcmp(output->GetNameOfClass(), "VectorImage") == 0)
+ {
typedef typename TOutputImage::AccessorFunctorType AccessorFunctorType;
- AccessorFunctorType::SetVectorLength( output, this->m_ImageIO->GetNumberOfComponents() );
- }
+ AccessorFunctorType::SetVectorLength(output, this->m_ImageIO->GetNumberOfComponents());
+ }
output->SetLargestPossibleRegion(region);
@@ -465,95 +456,96 @@ ImageFileReader<TOutputImage>
// Handle the curl case
#ifdef OTB_USE_CURL
// Test if the file a server name
- if (this->m_FileName[0]=='h'
- && this->m_FileName[1]=='t'
- && this->m_FileName[2]=='t'
- && this->m_FileName[3]=='p')
- {
- // Set up a curl request
- CURL *curl;
- CURLcode res;
- curl = curl_easy_init();
-
- // Set up the browser
- std::string browser = "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-GB; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11";
-
- if (curl)
- {
- curl_easy_setopt(curl, CURLOPT_USERAGENT, browser.data());
- curl_easy_setopt(curl, CURLOPT_URL,this->m_FileName.data());
- // Set the dummy write function
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,&Self::curlDummyWriteFunction);
- curl_easy_setopt(curl, CURLOPT_MAXFILESIZE,1);
-
- // Perform requet
- res = curl_easy_perform(curl);
-
- if(res != 0 && res != 63) // 63 stands for filesize exceed
+ if (this->m_FileName[0] == 'h'
+ && this->m_FileName[1] == 't'
+ && this->m_FileName[2] == 't'
+ && this->m_FileName[3] == 'p')
{
- itk::ImageFileReaderException e(__FILE__, __LINE__);
- itk::OStringStream msg;
- msg <<"File name is an http address, but curl fails to connect to it "
- << std::endl << "Filename = " << this->m_FileName
- << std::endl << "Curl error code = "<<res
- << std::endl;
- e.SetDescription(msg.str().c_str());
- throw e;
- }
- return;
- }
+ // Set up a curl request
+ CURL * curl;
+ CURLcode res;
+ curl = curl_easy_init();
+
+ // Set up the browser
+ std::string browser =
+ "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-GB; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11";
+
+ if (curl)
+ {
+ curl_easy_setopt(curl, CURLOPT_USERAGENT, browser.data());
+ curl_easy_setopt(curl, CURLOPT_URL, this->m_FileName.data());
+ // Set the dummy write function
+ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &Self::curlDummyWriteFunction);
+ curl_easy_setopt(curl, CURLOPT_MAXFILESIZE, 1);
+
+ // Perform requet
+ res = curl_easy_perform(curl);
+
+ if (res != 0 && res != 63) // 63 stands for filesize exceed
+ {
+ itk::ImageFileReaderException e(__FILE__, __LINE__);
+ itk::OStringStream msg;
+ msg << "File name is an http address, but curl fails to connect to it "
+ << std::endl << "Filename = " << this->m_FileName
+ << std::endl << "Curl error code = " << res
+ << std::endl;
+ e.SetDescription(msg.str().c_str());
+ throw e;
+ }
+ return;
}
+ }
#endif
-
+
// Test if the file exists.
- if ( ! itksys::SystemTools::FileExists( this->m_FileName.c_str() ) )
- {
+ if (!itksys::SystemTools::FileExists(this->m_FileName.c_str()))
+ {
itk::ImageFileReaderException e(__FILE__, __LINE__);
itk::OStringStream msg;
- msg <<"The file doesn't exist. "
- << std::endl << "Filename = " << this->m_FileName
- << std::endl;
+ msg << "The file doesn't exist. "
+ << std::endl << "Filename = " << this->m_FileName
+ << std::endl;
e.SetDescription(msg.str().c_str());
throw e;
return;
- }
+ }
// Test if the file can be open for reading access.
//Only if m_FileName specify a filename (not a dirname)
- if ( System::IsAFileName( this->m_FileName ) == true )
- {
- std::ifstream readTester;
- readTester.open( this->m_FileName.c_str() );
- if ( readTester.fail() )
+ if (System::IsAFileName(this->m_FileName) == true)
{
+ std::ifstream readTester;
+ readTester.open(this->m_FileName.c_str());
+ if (readTester.fail())
+ {
readTester.close();
itk::OStringStream msg;
- msg <<"The file couldn't be opened for reading. "
- << std::endl << "Filename: " << this->m_FileName
- << std::endl;
- itk::ImageFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ msg << "The file couldn't be opened for reading. "
+ << std::endl << "Filename: " << this->m_FileName
+ << std::endl;
+ itk::ImageFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
return;
- }
+ }
readTester.close();
- }
+ }
}
template <class TOutputImage>
bool
ImageFileReader<TOutputImage>
-::GetGdalReadImageFileName( const std::string & filename, std::string & GdalFileName )
+::GetGdalReadImageFileName(const std::string& filename, std::string& GdalFileName)
{
std::vector<std::string> listFileSearch;
listFileSearch.push_back("DAT_01.001");
- listFileSearch.push_back("dat_01.001");// RADARSAT or SAR_ERS2
+ listFileSearch.push_back("dat_01.001"); // RADARSAT or SAR_ERS2
listFileSearch.push_back("IMAGERY.TIF");
- listFileSearch.push_back("imagery.tif");//For format SPOT5TIF
+ listFileSearch.push_back("imagery.tif"); //For format SPOT5TIF
// Not recognised as a supported file format by GDAL.
// listFileSearch.push_back("IMAGERY.BIL");listFileSearch.push_back("imagery.bil");//For format SPOT5BIL
listFileSearch.push_back("IMAG_01.DAT");
- listFileSearch.push_back("imag_01.dat");//For format SPOT4
+ listFileSearch.push_back("imag_01.dat"); //For format SPOT4
std::string str_FileName;
bool fic_trouve(false);
@@ -561,54 +553,53 @@ ImageFileReader<TOutputImage>
// Si c'est un repertoire, on regarde le contenu pour voir si c'est pas du RADARSAT, ERS
std::vector<std::string> listFileFind;
listFileFind = System::Readdir(filename);
- if ( listFileFind.empty() == false )
- {
- unsigned int cpt(0);
- while ( (cpt < listFileFind.size()) && (fic_trouve==false) )
+ if (listFileFind.empty() == false)
{
+ unsigned int cpt(0);
+ while ((cpt < listFileFind.size()) && (fic_trouve == false))
+ {
str_FileName = std::string(listFileFind[cpt]);
for (unsigned int i = 0; i < listFileSearch.size(); ++i)
- {
- if (str_FileName.compare(listFileSearch[i]) == 0)
{
- GdalFileName = std::string(filename)+str_FileName;//listFileSearch[i];
- fic_trouve=true;
+ if (str_FileName.compare(listFileSearch[i]) == 0)
+ {
+ GdalFileName = std::string(filename) + str_FileName; //listFileSearch[i];
+ fic_trouve = true;
+ }
}
- }
cpt++;
+ }
}
- }
else
- {
+ {
std::string strFileName(filename);
std::string extension = System::GetExtension(strFileName);
- if ( (extension=="HDR") || (extension=="hdr") )
- {
+ if ((extension == "HDR") || (extension == "hdr"))
+ {
//Supprime l'extension
GdalFileName = System::GetRootName(strFileName);
- }
+ }
else
- {
+ {
// Sinon le filename est le nom du fichier a ouvrir
GdalFileName = std::string(filename);
+ }
+ fic_trouve = true;
}
- fic_trouve=true;
- }
- otbMsgDevMacro(<<"lFileNameGdal : "<<GdalFileName.c_str());
- otbMsgDevMacro(<<"fic_trouve : "<<fic_trouve);
- return( fic_trouve );
+ otbMsgDevMacro(<< "lFileNameGdal : " << GdalFileName.c_str());
+ otbMsgDevMacro(<< "fic_trouve : " << fic_trouve);
+ return (fic_trouve);
}
template <class TOutputImage>
size_t
ImageFileReader<TOutputImage>
-::curlDummyWriteFunction(void*,size_t,size_t nmemb,void*)
+::curlDummyWriteFunction(void*, size_t, size_t nmemb, void*)
{
return nmemb;
}
-
} //namespace otb
#endif
diff --git a/Code/IO/otbImageFileWriter.h b/Code/IO/otbImageFileWriter.h
index ac469a683e..5671595761 100644
--- a/Code/IO/otbImageFileWriter.h
+++ b/Code/IO/otbImageFileWriter.h
@@ -35,28 +35,27 @@ namespace otb
*
*/
-
template <class TInputImage>
class ITK_EXPORT ImageFileWriter : public itk::ImageFileWriter<TInputImage>
{
public:
/** Standard class typedefs. */
- typedef ImageFileWriter Self;
- typedef itk::ImageFileWriter<TInputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageFileWriter Self;
+ typedef itk::ImageFileWriter<TInputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(ImageFileWriter,itk::ImageFileWriter);
+ itkTypeMacro(ImageFileWriter, itk::ImageFileWriter);
/** Some convenient typedefs. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointer;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointer;
typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
/** Dimension of input image. */
itkStaticConstMacro(InputImageDimension, unsigned int,
@@ -66,8 +65,8 @@ public:
typedef StreamingTraits<InputImageType> StreamingTraitsType;
/** SmartPointer to a region splitting object */
- typedef itk::ImageRegionSplitter<itkGetStaticConstMacro(InputImageDimension)> SplitterType;
- typedef typename SplitterType::Pointer RegionSplitterPointer;
+ typedef itk::ImageRegionSplitter<itkGetStaticConstMacro(InputImageDimension)> SplitterType;
+ typedef typename SplitterType::Pointer RegionSplitterPointer;
/** Type use to define number of divisions */
typedef StreamingMode CalculationDivisionEnumType;
@@ -78,7 +77,7 @@ public:
virtual void Write(void);
/** Set buffer memory size (in bytes) use to calculate the number of stream divisions */
- void SetBufferMemorySize(unsigned long );
+ void SetBufferMemorySize(unsigned long);
/** Set the buffer number of lines use to calculate the number of stream divisions */
void SetBufferNumberOfLinesDivisions(unsigned long);
@@ -97,7 +96,7 @@ public:
/** Set the tiling automatic mode for streaming division */
// void SetTilingStreamDivisions(void);
- /** Choose number of divisions in tiling streaming division */
+/** Choose number of divisions in tiling streaming division */
// void SetTilingStreamDivisions(unsigned long);
/** Return the string to indicate the method use to calculate number of stream divisions. */
@@ -109,8 +108,8 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageFileWriter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageFileWriter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** This method calculate the number of stream divisions, by using the CalculationDivision type */
unsigned long CalculateNumberOfStreamDivisions(void);
@@ -128,11 +127,8 @@ private:
} // end namespace otb
-
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbImageFileWriter.txx"
#endif
-
#endif // __otbImageFileWriter_h
-
diff --git a/Code/IO/otbImageFileWriter.txx b/Code/IO/otbImageFileWriter.txx
index b5e868c174..e9f79c28e8 100644
--- a/Code/IO/otbImageFileWriter.txx
+++ b/Code/IO/otbImageFileWriter.txx
@@ -56,7 +56,6 @@ ImageFileWriter<TInputImage>
this->Superclass::SetNumberOfStreamDivisions(10);
}
-
//---------------------------------------------------------
template <class TInputImage>
ImageFileWriter<TInputImage>
@@ -64,7 +63,6 @@ ImageFileWriter<TInputImage>
{
}
-
//---------------------------------------------------------
template <class TInputImage>
void
@@ -77,7 +75,7 @@ ImageFileWriter<TInputImage>
// Update the meta data
nonConstInput->UpdateOutputInformation();
- if(this->GetImageIO() == NULL)
+ if (this->GetImageIO() == NULL)
{
this->SetImageIO(ImageIOFactory::CreateImageIO(this->GetFileName(), itk::ImageIOFactory::WriteMode));
this->SetNumberOfStreamDivisions(static_cast<unsigned int> (CalculateNumberOfStreamDivisions()));
@@ -123,7 +121,7 @@ void
ImageFileWriter<TInputImage>
::SetNumberOfStreamDivisions(unsigned long nb_divisions)
{
- this->Superclass::SetNumberOfStreamDivisions( nb_divisions );
+ this->Superclass::SetNumberOfStreamDivisions(nb_divisions);
m_CalculationDivision = SET_NUMBER_OF_STREAM_DIVISIONS;
this->Modified();
}
@@ -175,7 +173,7 @@ unsigned long
ImageFileWriter<TInputImage>
::GetNumberOfStreamDivisions(void)
{
- return(CalculateNumberOfStreamDivisions());
+ return (CalculateNumberOfStreamDivisions());
}
/**
@@ -208,14 +206,13 @@ ImageFileWriter<TInputImage>
m_BufferNumberOfLinesDivisions);
}
-
//---------------------------------------------------------
template <class TInputImage>
void
ImageFileWriter<TInputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/IO/otbImageIOFactory.cxx b/Code/IO/otbImageIOFactory.cxx
index 958a7c3bab..881da08ecc 100644
--- a/Code/IO/otbImageIOFactory.cxx
+++ b/Code/IO/otbImageIOFactory.cxx
@@ -47,7 +47,7 @@ ImageIOFactory::CreateImageIO(const char* path, FileModeType mode)
{
RegisterBuiltInFactories();
- return (Superclass::CreateImageIO(path,mode) );
+ return (Superclass::CreateImageIO(path, mode));
}
@@ -57,44 +57,44 @@ ImageIOFactory::RegisterBuiltInFactories()
static bool firstTime = true;
static itk::SimpleMutexLock mutex;
- {
+ {
// This helper class makes sure the Mutex is unlocked
// in the event an exception is thrown.
- itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder( mutex );
- if ( firstTime )
- {
+ itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder(mutex);
+ if (firstTime)
+ {
// RAD Format for OTB
- itk::ObjectFactoryBase::RegisterFactory( RADImageIOFactory::New() );
+ itk::ObjectFactoryBase::RegisterFactory(RADImageIOFactory::New());
// BSQ format for OTB
- itk::ObjectFactoryBase::RegisterFactory( BSQImageIOFactory::New() );
+ itk::ObjectFactoryBase::RegisterFactory(BSQImageIOFactory::New());
// LUM format for OTB
- itk::ObjectFactoryBase::RegisterFactory( LUMImageIOFactory::New() );
+ itk::ObjectFactoryBase::RegisterFactory(LUMImageIOFactory::New());
#ifdef OTB_COMPILE_JPEG2000
// JPEG2000 : New format for OTB
- itk::ObjectFactoryBase::RegisterFactory( JPEG2000ImageIOFactory::New() );
+ itk::ObjectFactoryBase::RegisterFactory(JPEG2000ImageIOFactory::New());
#endif
// GDAL : New format for OTB
- itk::ObjectFactoryBase::RegisterFactory( GDALImageIOFactory::New() );
+ itk::ObjectFactoryBase::RegisterFactory(GDALImageIOFactory::New());
// MegaWave format for OTB
- itk::ObjectFactoryBase::RegisterFactory( MWImageIOFactory::New() );
+ itk::ObjectFactoryBase::RegisterFactory(MWImageIOFactory::New());
// ONERA format for OTB
- itk::ObjectFactoryBase::RegisterFactory( ONERAImageIOFactory::New() );
+ itk::ObjectFactoryBase::RegisterFactory(ONERAImageIOFactory::New());
// MSTAR Format for OTB
- itk::ObjectFactoryBase::RegisterFactory( MSTARImageIOFactory::New() );
+ itk::ObjectFactoryBase::RegisterFactory(MSTARImageIOFactory::New());
#ifdef OTB_USE_CURL
// TileMap : New format for OTB
- itk::ObjectFactoryBase::RegisterFactory( TileMapImageIOFactory::New() );
+ itk::ObjectFactoryBase::RegisterFactory(TileMapImageIOFactory::New());
#endif
firstTime = false;
+ }
}
- }
}
diff --git a/Code/IO/otbImageIOFactory.h b/Code/IO/otbImageIOFactory.h
index 0bf6177f24..785e29c879 100644
--- a/Code/IO/otbImageIOFactory.h
+++ b/Code/IO/otbImageIOFactory.h
@@ -31,10 +31,10 @@ class ITK_EXPORT ImageIOFactory : public itk::ImageIOFactory
{
public:
/** Standard class typedefs. */
- typedef ImageIOFactory Self;
- typedef itk::ImageIOFactory Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageIOFactory Self;
+ typedef itk::ImageIOFactory Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class Methods used to interface with the registered factories */
@@ -42,7 +42,7 @@ public:
itkTypeMacro(ImageIOFactory, itk::ImageIOFactory);
/** Convenient typedefs. */
- typedef ::itk::ImageIOBase::Pointer ImageIOBasePointer;
+ typedef::itk::ImageIOBase::Pointer ImageIOBasePointer;
/** Mode in which the files is intended to be used */
// typedef enum { ReadMode, WriteMode } FileModeType;
@@ -58,12 +58,11 @@ protected:
~ImageIOFactory();
private:
- ImageIOFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageIOFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbImageKeywordlist.cxx b/Code/IO/otbImageKeywordlist.cxx
index eb20d98cb6..cb84c74ed4 100644
--- a/Code/IO/otbImageKeywordlist.cxx
+++ b/Code/IO/otbImageKeywordlist.cxx
@@ -17,22 +17,19 @@
=========================================================================*/
#include "otbImageKeywordlist.h"
-
namespace otb
{
-
ImageKeywordlist
::ImageKeywordlist()
{
}
ImageKeywordlist
-::ImageKeywordlist(const Self& p): m_Keywordlist(p.m_Keywordlist) //m_Keywordlist(Self.m_Keywordlist), m_Delimiter(Self.m_Delimiter)
+::ImageKeywordlist(const Self& p) : m_Keywordlist(p.m_Keywordlist) //m_Keywordlist(Self.m_Keywordlist), m_Delimiter(Self.m_Delimiter)
{
}
-
ImageKeywordlist
::~ImageKeywordlist()
{
@@ -40,22 +37,22 @@ ImageKeywordlist
void
ImageKeywordlist::
-operator=(const Self& p)
+operator =(const Self& p)
{
m_Keywordlist = p.m_Keywordlist;
}
-const ossimString &
+const ossimString&
ImageKeywordlist::
-GetMetadataByKey(const ossimString & key) const
+GetMetadataByKey(const ossimString& key) const
{
// Search for the key in the output map
KeywordlistMap::const_iterator it = m_Keywordlist.find(key);
// If the key can not be found, throw an exception
- if(it == m_Keywordlist.end())
+ if (it == m_Keywordlist.end())
{
- itkExceptionMacro(<<"Keywordlist has no output with key "<<key);
+ itkExceptionMacro(<< "Keywordlist has no output with key " << key);
}
// Then if everything is ok, return the ossinString
@@ -81,16 +78,15 @@ PrintSelf(std::ostream& os, itk::Indent indent) const
{
ossimKeywordlist kwl;
convertToOSSIMKeywordlist(kwl);
- os << indent << " Ossim Keyword list:"<<std::endl;
+ os << indent << " Ossim Keyword list:" << std::endl;
os << indent << kwl;
}
std::ostream &
-operator<<(std::ostream &os, const ImageKeywordlist &kwl)
+operator <<(std::ostream& os, const ImageKeywordlist& kwl)
{
kwl.Print(os);
return os;
}
-
} //namespace otb
diff --git a/Code/IO/otbImageKeywordlist.h b/Code/IO/otbImageKeywordlist.h
index d1c9d71de1..9322a92265 100644
--- a/Code/IO/otbImageKeywordlist.h
+++ b/Code/IO/otbImageKeywordlist.h
@@ -42,7 +42,7 @@ class ITK_EXPORT ImageKeywordlist
{
public:
/** Standard class typedefs. */
- typedef ImageKeywordlist Self;
+ typedef ImageKeywordlist Self;
//virtual const char *GetNameOfClass() const
//{return "ImageKeywordlist";}
@@ -51,13 +51,13 @@ public:
/** Run-time type information (and related methods). */
itkTypeMacro(ImageKeywordlist, ImageKeywordlist);
-
+
/** Get the internal map container */
- const KeywordlistMap & GetKeywordlist() const
+ const KeywordlistMap& GetKeywordlist() const
{
return m_Keywordlist;
}
-
+
void SetKeywordlist(const ossimKeywordlist& kwl)
{
m_Keywordlist = kwl.getMap();
@@ -72,19 +72,19 @@ public:
{
return m_Keywordlist.size();
}
-
+
/** Get the Data object descriptor corresponding to the given key */
- const ossimString & GetMetadataByKey(const ossimString & key) const;
-
+ const ossimString& GetMetadataByKey(const ossimString& key) const;
+
virtual void convertToOSSIMKeywordlist(ossimKeywordlist& kwl) const;
- virtual void Print(std::ostream& os, itk::Indent indent=0) const;
+ virtual void Print(std::ostream& os, itk::Indent indent = 0) const;
ImageKeywordlist();
virtual ~ImageKeywordlist();
- ImageKeywordlist(const Self&);
- void operator=(const Self&);
+ ImageKeywordlist(const Self &);
+ void operator =(const Self&);
protected:
/** Methods invoked by Print() to print information about the object
@@ -104,7 +104,7 @@ private:
};
-extern std::ostream & operator<<(std::ostream &os, const ImageKeywordlist &kwl);
+extern std::ostream & operator <<(std::ostream& os, const ImageKeywordlist& kwl);
} //namespace otb
diff --git a/Code/IO/otbImageMetadataInterfaceBase.cxx b/Code/IO/otbImageMetadataInterfaceBase.cxx
index 2c2c304578..a699d2002b 100644
--- a/Code/IO/otbImageMetadataInterfaceBase.cxx
+++ b/Code/IO/otbImageMetadataInterfaceBase.cxx
@@ -16,7 +16,6 @@
=========================================================================*/
-
#ifdef _MSC_VER
#pragma warning ( disable : 4786 )
#endif
@@ -31,60 +30,55 @@
#include "itkMetaDataObject.h"
#include "otbVectorDataKeywordlist.h"
-
namespace otb
{
-
ImageMetadataInterfaceBase
::ImageMetadataInterfaceBase()
{
}
std::string
-ImageMetadataInterfaceBase::GetProjectionRef( const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetProjectionRef(const MetaDataDictionaryType& dict) const
{
std::string metadata;
if (dict.HasKey(MetaDataKey::ProjectionRefKey))
- {
+ {
itk::ExposeMetaData<std::string>(dict, static_cast<std::string>(MetaDataKey::ProjectionRefKey), metadata);
- return ( metadata );
- }
- else
- return ("");
+ return (metadata);
+ }
+ else return ("");
}
std::string
-ImageMetadataInterfaceBase::GetGCPProjection( const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetGCPProjection(const MetaDataDictionaryType& dict) const
{
std::string metadata;
if (dict.HasKey(MetaDataKey::GCPProjectionKey))
- {
+ {
itk::ExposeMetaData<std::string>(dict, static_cast<std::string>(MetaDataKey::GCPProjectionKey), metadata);
- return ( metadata );
- }
- else
- return ("");
+ return (metadata);
+ }
+ else return ("");
}
unsigned int
-ImageMetadataInterfaceBase::GetGCPCount( const MetaDataDictionaryType & dict) const
+ImageMetadataInterfaceBase::GetGCPCount(const MetaDataDictionaryType& dict) const
{
unsigned int GCPCount = 0;
if (dict.HasKey(MetaDataKey::GCPCountKey))
- {
+ {
itk::ExposeMetaData<unsigned int>(dict, MetaDataKey::GCPCountKey, GCPCount);
- }
+ }
return (GCPCount);
}
-
-OTB_GCP &
-ImageMetadataInterfaceBase::GetGCPs( MetaDataDictionaryType & dict, unsigned int GCPnum )
+OTB_GCP&
+ImageMetadataInterfaceBase::GetGCPs(MetaDataDictionaryType& dict, unsigned int GCPnum)
{
std::string key;
@@ -93,16 +87,15 @@ ImageMetadataInterfaceBase::GetGCPs( MetaDataDictionaryType & dict, unsigned int
key = lStream.str();
if (dict.HasKey(key))
- {
+ {
itk::ExposeMetaData<OTB_GCP>(dict, key, m_GCP);
- }
- return ( m_GCP );
+ }
+ return (m_GCP);
}
-
std::string
-ImageMetadataInterfaceBase::GetGCPId( const MetaDataDictionaryType & dict, unsigned int GCPnum ) const
+ImageMetadataInterfaceBase::GetGCPId(const MetaDataDictionaryType& dict, unsigned int GCPnum) const
{
std::string key;
@@ -111,17 +104,16 @@ ImageMetadataInterfaceBase::GetGCPId( const MetaDataDictionaryType & dict, unsig
key = lStream.str();
if (dict.HasKey(key))
- {
+ {
OTB_GCP gcp;
itk::ExposeMetaData<OTB_GCP>(dict, key, gcp);
- return ( gcp.m_Id );
- }
- else
- return ("");
+ return (gcp.m_Id);
+ }
+ else return ("");
}
std::string
-ImageMetadataInterfaceBase::GetGCPInfo( const MetaDataDictionaryType & dict, unsigned int GCPnum ) const
+ImageMetadataInterfaceBase::GetGCPInfo(const MetaDataDictionaryType& dict, unsigned int GCPnum) const
{
std::string key;
@@ -130,17 +122,16 @@ ImageMetadataInterfaceBase::GetGCPInfo( const MetaDataDictionaryType & dict, uns
key = lStream.str();
if (dict.HasKey(key))
- {
+ {
OTB_GCP gcp;
itk::ExposeMetaData<OTB_GCP>(dict, key, gcp);
- return ( gcp.m_Info );
- }
- else
- return ("");
+ return (gcp.m_Info);
+ }
+ else return ("");
}
double
-ImageMetadataInterfaceBase::GetGCPRow( const MetaDataDictionaryType & dict, unsigned int GCPnum ) const
+ImageMetadataInterfaceBase::GetGCPRow(const MetaDataDictionaryType& dict, unsigned int GCPnum) const
{
std::string key;
@@ -148,19 +139,17 @@ ImageMetadataInterfaceBase::GetGCPRow( const MetaDataDictionaryType & dict, unsi
lStream << MetaDataKey::GCPParametersKey << GCPnum;
key = lStream.str();
-
if (dict.HasKey(key))
- {
+ {
OTB_GCP gcp;
itk::ExposeMetaData<OTB_GCP>(dict, key, gcp);
- return ( gcp.m_GCPRow );
- }
- else
- return (0);
+ return (gcp.m_GCPRow);
+ }
+ else return (0);
}
double
-ImageMetadataInterfaceBase::GetGCPCol( const MetaDataDictionaryType & dict, unsigned int GCPnum ) const
+ImageMetadataInterfaceBase::GetGCPCol(const MetaDataDictionaryType& dict, unsigned int GCPnum) const
{
std::string key;
@@ -168,19 +157,17 @@ ImageMetadataInterfaceBase::GetGCPCol( const MetaDataDictionaryType & dict, unsi
lStream << MetaDataKey::GCPParametersKey << GCPnum;
key = lStream.str();
-
if (dict.HasKey(key))
- {
+ {
OTB_GCP gcp;
itk::ExposeMetaData<OTB_GCP>(dict, key, gcp);
- return ( gcp.m_GCPCol );
- }
- else
- return (0);
+ return (gcp.m_GCPCol);
+ }
+ else return (0);
}
double
-ImageMetadataInterfaceBase::GetGCPX( const MetaDataDictionaryType & dict, unsigned int GCPnum ) const
+ImageMetadataInterfaceBase::GetGCPX(const MetaDataDictionaryType& dict, unsigned int GCPnum) const
{
std::string key;
@@ -189,17 +176,16 @@ ImageMetadataInterfaceBase::GetGCPX( const MetaDataDictionaryType & dict, unsign
key = lStream.str();
if (dict.HasKey(key))
- {
+ {
OTB_GCP gcp;
itk::ExposeMetaData<OTB_GCP>(dict, key, gcp);
- return ( gcp.m_GCPX );
- }
- else
- return (0);
+ return (gcp.m_GCPX);
+ }
+ else return (0);
}
double
-ImageMetadataInterfaceBase::GetGCPY( const MetaDataDictionaryType & dict, unsigned int GCPnum ) const
+ImageMetadataInterfaceBase::GetGCPY(const MetaDataDictionaryType& dict, unsigned int GCPnum) const
{
std::string key;
@@ -208,17 +194,16 @@ ImageMetadataInterfaceBase::GetGCPY( const MetaDataDictionaryType & dict, unsign
key = lStream.str();
if (dict.HasKey(key))
- {
+ {
OTB_GCP gcp;
itk::ExposeMetaData<OTB_GCP>(dict, key, gcp);
- return ( gcp.m_GCPY );
- }
- else
- return (0);
+ return (gcp.m_GCPY);
+ }
+ else return (0);
}
double
-ImageMetadataInterfaceBase::GetGCPZ( const MetaDataDictionaryType & dict, unsigned int GCPnum ) const
+ImageMetadataInterfaceBase::GetGCPZ(const MetaDataDictionaryType& dict, unsigned int GCPnum) const
{
std::string key;
@@ -227,149 +212,146 @@ ImageMetadataInterfaceBase::GetGCPZ( const MetaDataDictionaryType & dict, unsign
key = lStream.str();
if (dict.HasKey(key))
- {
+ {
OTB_GCP gcp;
itk::ExposeMetaData<OTB_GCP>(dict, key, gcp);
- return ( gcp.m_GCPZ );
- }
- else
- return (0);
+ return (gcp.m_GCPZ);
+ }
+ else return (0);
}
-
ImageMetadataInterfaceBase::VectorType
-ImageMetadataInterfaceBase::GetGeoTransform( const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetGeoTransform(const MetaDataDictionaryType& dict) const
{
VectorType adfGeoTransform;
if (dict.HasKey(MetaDataKey::GeoTransformKey))
- {
+ {
itk::ExposeMetaData<VectorType>(dict, MetaDataKey::GeoTransformKey, adfGeoTransform);
- }
- return ( adfGeoTransform );
+ }
+ return (adfGeoTransform);
}
ImageMetadataInterfaceBase::VectorType
-ImageMetadataInterfaceBase::GetUpperLeftCorner( const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetUpperLeftCorner(const MetaDataDictionaryType& dict) const
{
VectorType UpperLeftCorner;
if (dict.HasKey(MetaDataKey::UpperLeftCornerKey))
- {
+ {
itk::ExposeMetaData<VectorType>(dict, MetaDataKey::UpperLeftCornerKey, UpperLeftCorner);
- }
- return ( UpperLeftCorner );
+ }
+ return (UpperLeftCorner);
}
ImageMetadataInterfaceBase::VectorType
-ImageMetadataInterfaceBase::GetUpperRightCorner( const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetUpperRightCorner(const MetaDataDictionaryType& dict) const
{
VectorType UpperRightCorner;
if (dict.HasKey(MetaDataKey::UpperRightCornerKey))
- {
+ {
itk::ExposeMetaData<VectorType>(dict, MetaDataKey::UpperRightCornerKey, UpperRightCorner);
- }
- return ( UpperRightCorner );
+ }
+ return (UpperRightCorner);
}
ImageMetadataInterfaceBase::VectorType
-ImageMetadataInterfaceBase::GetLowerLeftCorner( const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetLowerLeftCorner(const MetaDataDictionaryType& dict) const
{
VectorType LowerLeftCorner;
if (dict.HasKey(MetaDataKey::LowerLeftCornerKey))
- {
+ {
itk::ExposeMetaData<VectorType>(dict, MetaDataKey::LowerLeftCornerKey, LowerLeftCorner);
- }
- return ( LowerLeftCorner );
+ }
+ return (LowerLeftCorner);
}
ImageMetadataInterfaceBase::VectorType
-ImageMetadataInterfaceBase::GetLowerRightCorner( const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetLowerRightCorner(const MetaDataDictionaryType& dict) const
{
VectorType LowerRightCorner;
if (dict.HasKey(MetaDataKey::LowerRightCornerKey))
- {
+ {
itk::ExposeMetaData<VectorType>(dict, MetaDataKey::LowerRightCornerKey, LowerRightCorner);
- }
- return ( LowerRightCorner );
+ }
+ return (LowerRightCorner);
}
ImageMetadataInterfaceBase::ImageKeywordlistType
-ImageMetadataInterfaceBase::GetImageKeywordlist( MetaDataDictionaryType & dict )
+ImageMetadataInterfaceBase::GetImageKeywordlist(MetaDataDictionaryType& dict)
{
ImageKeywordlistType ImageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, ImageKeywordlist);
- }
- return ( ImageKeywordlist );
+ }
+ return (ImageKeywordlist);
}
const ImageMetadataInterfaceBase::ImageKeywordlistType
-ImageMetadataInterfaceBase::GetImageKeywordlist(const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetImageKeywordlist(const MetaDataDictionaryType& dict) const
{
ImageKeywordlistType ImageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, ImageKeywordlist);
- }
- return ( ImageKeywordlist );
+ }
+ return (ImageKeywordlist);
}
double
-ImageMetadataInterfaceBase::GetSunElevation( const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetSunElevation(const MetaDataDictionaryType& dict) const
{
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.elevation_angle";
+ std::string key = "support_data.elevation_angle";
ossimString keywordString = kwl.find(key.c_str());
return keywordString.toDouble();
}
double
-ImageMetadataInterfaceBase::GetSunAzimuth( const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetSunAzimuth(const MetaDataDictionaryType& dict) const
{
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.azimuth_angle";
+ std::string key = "support_data.azimuth_angle";
ossimString keywordString = kwl.find(key.c_str());
return keywordString.toDouble();
}
-
std::string
-ImageMetadataInterfaceBase::GetSensorID( const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetSensorID(const MetaDataDictionaryType& dict) const
{
ImageKeywordlistType ImageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, ImageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
ImageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "sensor";
+ std::string key = "sensor";
ossimString keywordString = kwl.find(key.c_str());
std::string output(keywordString.chars());
@@ -377,110 +359,109 @@ ImageMetadataInterfaceBase::GetSensorID( const MetaDataDictionaryType & dict ) c
}
unsigned int
-ImageMetadataInterfaceBase::GetNumberOfBands( const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetNumberOfBands(const MetaDataDictionaryType& dict) const
{
ImageKeywordlistType ImageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, ImageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
ImageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.number_bands";
+ std::string key = "support_data.number_bands";
ossimString keywordString = kwl.find(key.c_str());
return keywordString.toUInt32();
}
std::vector<std::string>
-ImageMetadataInterfaceBase::GetBandName( const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetBandName(const MetaDataDictionaryType& dict) const
{
ImageKeywordlistType ImageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, ImageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
ImageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.band_name";
- ossimString keywordString = kwl.find(key.c_str());
- ossimString separatorList = " /";
+ std::string key = "support_data.band_name";
+ ossimString keywordString = kwl.find(key.c_str());
+ ossimString separatorList = " /";
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
std::vector<std::string> outputValues;
- for (unsigned int i=0; i < keywordStrings.size(); ++i)
- {
- if (!keywordStrings[i].empty())
+ for (unsigned int i = 0; i < keywordStrings.size(); ++i)
{
+ if (!keywordStrings[i].empty())
+ {
outputValues.push_back(keywordStrings[i].chars());
+ }
}
- }
return outputValues;
}
double
-ImageMetadataInterfaceBase::GetXPixelSpacing( const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetXPixelSpacing(const MetaDataDictionaryType& dict) const
{
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "pixel_spacing";
+ std::string key = "pixel_spacing";
ossimString keywordString = kwl.find(key.c_str());
return keywordString.toDouble();
}
double
-ImageMetadataInterfaceBase::GetYPixelSpacing( const MetaDataDictionaryType & dict ) const
+ImageMetadataInterfaceBase::GetYPixelSpacing(const MetaDataDictionaryType& dict) const
{
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "pixel_spacing";
+ std::string key = "pixel_spacing";
ossimString keywordString = kwl.find(key.c_str());
return keywordString.toDouble();
}
void
-ImageMetadataInterfaceBase::PrintSelf(std::ostream& os, itk::Indent indent, const MetaDataDictionaryType & dict) const
+ImageMetadataInterfaceBase::PrintSelf(std::ostream& os, itk::Indent indent, const MetaDataDictionaryType& dict) const
{
std::vector<std::string> keys = dict.GetKeys();
- std::string svalue;
- unsigned int ivalue(0);
- VectorType vvalue;
- double dvalue = 0.;
- OTB_GCP gcpvalue;
- ImageKeywordlist ossimvalue;
- VectorDataKeywordlist vectorDataKeywordlistValue;
- unsigned int i(0);
+ std::string svalue;
+ unsigned int ivalue(0);
+ VectorType vvalue;
+ double dvalue = 0.;
+ OTB_GCP gcpvalue;
+ ImageKeywordlist ossimvalue;
+ VectorDataKeywordlist vectorDataKeywordlistValue;
+ unsigned int i(0);
// Copy of the const metadata dictionary in a metadata dictionary to be used
// by the ExposeMetaData method
MetaDataDictionaryType dict2 = dict;
- MetaDataKey key;
+ MetaDataKey key;
- for (unsigned int itkey=0; itkey<keys.size(); ++itkey)
- {
-
-
- switch ( key.GetKeyType(keys[itkey]) )
+ for (unsigned int itkey = 0; itkey < keys.size(); ++itkey)
{
+
+ switch (key.GetKeyType(keys[itkey]))
+ {
case MetaDataKey::TSTRING:
itk::ExposeMetaData<std::string>(dict2, keys[itkey], svalue);
os << indent << "---> " << keys[itkey] << " = " << svalue << std::endl;
@@ -494,10 +475,10 @@ ImageMetadataInterfaceBase::PrintSelf(std::ostream& os, itk::Indent indent, cons
case MetaDataKey::TVECTOR:
itk::ExposeMetaData<VectorType>(dict2, keys[itkey], vvalue);
- for (i = 0; i < vvalue.size(); ++i )
- {
- os << indent << "---> " << keys[itkey] << "[" << i <<"] = "<< vvalue[i]<< std::endl;
- }
+ for (i = 0; i < vvalue.size(); ++i)
+ {
+ os << indent << "---> " << keys[itkey] << "[" << i << "] = " << vvalue[i] << std::endl;
+ }
vvalue.clear();
break;
@@ -527,9 +508,9 @@ ImageMetadataInterfaceBase::PrintSelf(std::ostream& os, itk::Indent indent, cons
break;
default:
break;
- }
+ }
- }
+ }
}
diff --git a/Code/IO/otbImageMetadataInterfaceBase.h b/Code/IO/otbImageMetadataInterfaceBase.h
index 0fb14dcf8c..7ed6b8c403 100644
--- a/Code/IO/otbImageMetadataInterfaceBase.h
+++ b/Code/IO/otbImageMetadataInterfaceBase.h
@@ -30,17 +30,16 @@
#include <string>
-
/** */
-#define otbMetadataGetMacro(name,type) \
- type Get##name () const \
- { \
- if (m_Image.IsNull()) \
+#define otbMetadataGetMacro(name, type) \
+ type Get ## name () const \
{ \
- itkExceptionMacro(<<"Invalid Image, can't get the dictionary"); \
- } \
- return Get##name(m_Image->GetMetaDataDictionary()); \
- }
+ if (m_Image.IsNull()) \
+ { \
+ itkExceptionMacro(<< "Invalid Image, can't get the dictionary"); \
+ } \
+ return Get ## name(m_Image->GetMetaDataDictionary()); \
+ }
namespace otb
{
@@ -53,180 +52,177 @@ class ITK_EXPORT ImageMetadataInterfaceBase : public itk::Object
{
public:
- typedef ImageMetadataInterfaceBase Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageMetadataInterfaceBase Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Run-time type information (and related methods). */
itkTypeMacro(ImageMetadataInterfaceBase, itk::Object);
- typedef itk::ImageBase< 2 > ImageType;
+ typedef itk::ImageBase<2> ImageType;
typedef itk::MetaDataDictionary MetaDataDictionaryType;
typedef MetaDataKey::VectorType VectorType;
typedef MetaDataKey::VariableLengthVectorType VariableLengthVectorType;
typedef ImageKeywordlist ImageKeywordlistType;
/** Set the image used to get the metadata */
- itkSetObjectMacro(Image,ImageType);
-
+ itkSetObjectMacro(Image, ImageType);
/** Get the projection coordinate system of the image. */
- std::string GetProjectionRef( const MetaDataDictionaryType & dict ) const;
+ std::string GetProjectionRef(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(ProjectionRef, std::string);
/** Get the GCP projection coordinates of the image. */
- std::string GetGCPProjection( const MetaDataDictionaryType & dict ) const;
+ std::string GetGCPProjection(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(GCPProjection, std::string);
-
- unsigned int GetGCPCount( const MetaDataDictionaryType & dict ) const;
+ unsigned int GetGCPCount(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(GCPCount, unsigned int);
- OTB_GCP & GetGCPs( MetaDataDictionaryType & dict, unsigned int GCPnum );
+ OTB_GCP& GetGCPs(MetaDataDictionaryType& dict, unsigned int GCPnum);
- std::string GetGCPId( const MetaDataDictionaryType & dict, unsigned int GCPnum ) const;
+ std::string GetGCPId(const MetaDataDictionaryType& dict, unsigned int GCPnum) const;
- std::string GetGCPInfo( const MetaDataDictionaryType & dict, unsigned int GCPnum ) const;
+ std::string GetGCPInfo(const MetaDataDictionaryType& dict, unsigned int GCPnum) const;
- double GetGCPRow( const MetaDataDictionaryType & dict, unsigned int GCPnum ) const;
+ double GetGCPRow(const MetaDataDictionaryType& dict, unsigned int GCPnum) const;
- double GetGCPCol( const MetaDataDictionaryType & dict, unsigned int GCPnum ) const;
+ double GetGCPCol(const MetaDataDictionaryType& dict, unsigned int GCPnum) const;
- double GetGCPX( const MetaDataDictionaryType & dict, unsigned int GCPnum ) const;
+ double GetGCPX(const MetaDataDictionaryType& dict, unsigned int GCPnum) const;
- double GetGCPY( const MetaDataDictionaryType & dict, unsigned int GCPnum ) const;
+ double GetGCPY(const MetaDataDictionaryType& dict, unsigned int GCPnum) const;
- double GetGCPZ( const MetaDataDictionaryType & dict, unsigned int GCPnum ) const;
+ double GetGCPZ(const MetaDataDictionaryType& dict, unsigned int GCPnum) const;
/** Get the six coefficients of affine geoTtransform. */
- VectorType GetGeoTransform( const MetaDataDictionaryType & dict ) const;
+ VectorType GetGeoTransform(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(GeoTransform, VectorType);
/** Get image corners. */
- VectorType GetUpperLeftCorner( const MetaDataDictionaryType & dict ) const;
+ VectorType GetUpperLeftCorner(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(UpperLeftCorner, VectorType);
- VectorType GetUpperRightCorner( const MetaDataDictionaryType & dict ) const;
+ VectorType GetUpperRightCorner(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(UpperRightCorner, VectorType);
- VectorType GetLowerLeftCorner( const MetaDataDictionaryType & dict ) const;
+ VectorType GetLowerLeftCorner(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(LowerLeftCorner, VectorType);
- VectorType GetLowerRightCorner( const MetaDataDictionaryType & dict ) const;
+ VectorType GetLowerRightCorner(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(LowerRightCorner, VectorType);
/** Get the ImageKeywordlist */
- ImageKeywordlistType GetImageKeywordlist( MetaDataDictionaryType & dict );
- const ImageKeywordlistType GetImageKeywordlist(const MetaDataDictionaryType & dict ) const;
+ ImageKeywordlistType GetImageKeywordlist(MetaDataDictionaryType& dict);
+ const ImageKeywordlistType GetImageKeywordlist(const MetaDataDictionaryType& dict) const;
/** Get the sun elevation from the ossim metadata */
- double GetSunElevation( const MetaDataDictionaryType & dict ) const;
+ double GetSunElevation(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(SunElevation, double);
/** Get the sun azimuth from the ossim metadata */
- double GetSunAzimuth( const MetaDataDictionaryType & dict ) const;
+ double GetSunAzimuth(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(SunAzimuth, double);
/** Get the sensor ID from the ossim metadata */
- std::string GetSensorID(const MetaDataDictionaryType & dict ) const;
+ std::string GetSensorID(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(SensorID, std::string);
/** Get the number of bands from the ossim metadata */
- unsigned int GetNumberOfBands(const MetaDataDictionaryType & dict ) const;
+ unsigned int GetNumberOfBands(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(NumberOfBands, unsigned int);
/** Get the band name from the ossim metadata */
- std::vector<std::string> GetBandName(const MetaDataDictionaryType & dict ) const;
+ std::vector<std::string> GetBandName(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(BandName, std::vector<std::string>);
/** Get the x pixel spacing*/
- double GetXPixelSpacing( const MetaDataDictionaryType & dict ) const;
+ double GetXPixelSpacing(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(XPixelSpacing, double);
-
+
/** Get the y pixel spacing*/
- double GetYPixelSpacing( const MetaDataDictionaryType & dict ) const;
+ double GetYPixelSpacing(const MetaDataDictionaryType& dict) const;
otbMetadataGetMacro(YPixelSpacing, double);
-
+
/** Get the radiometric bias from the ossim metadata */
- virtual VariableLengthVectorType GetPhysicalBias( const MetaDataDictionaryType & dict ) const =0;
+ virtual VariableLengthVectorType GetPhysicalBias(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(PhysicalBias, VariableLengthVectorType);
/** Get the radiometric gain from the ossim metadata */
- virtual VariableLengthVectorType GetPhysicalGain( const MetaDataDictionaryType & dict ) const =0;
+ virtual VariableLengthVectorType GetPhysicalGain(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(PhysicalGain, VariableLengthVectorType);
/** Get the solar irradiance from the ossim metadata */
- virtual VariableLengthVectorType GetSolarIrradiance( const MetaDataDictionaryType & dict ) const =0;
+ virtual VariableLengthVectorType GetSolarIrradiance(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(SolarIrradiance, VariableLengthVectorType);
/** Get the imaging acquisition day from the ossim metadata */
- virtual int GetDay( const MetaDataDictionaryType & dict ) const =0;
+ virtual int GetDay(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(Day, int);
/** Get the imaging acquisition month from the ossim metadata */
- virtual int GetMonth( const MetaDataDictionaryType & dict ) const =0;
+ virtual int GetMonth(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(Month, int);
/** Get the imaging acquisition year from the ossim metadata */
- virtual int GetYear( const MetaDataDictionaryType & dict ) const =0;
+ virtual int GetYear(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(Year, int);
/** Get the imaging acquisition hour from the ossim metadata */
- virtual int GetHour( const MetaDataDictionaryType & dict ) const =0;
+ virtual int GetHour(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(Hour, int);
/** Get the imaging acquisition minute from the ossim metadata */
- virtual int GetMinute( const MetaDataDictionaryType & dict ) const =0;
+ virtual int GetMinute(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(Minute, int);
- /** Get the imaging production day from the ossim metadata */
- virtual int GetProductionDay( const MetaDataDictionaryType & dict ) const =0;
+ /** Get the imaging production day from the ossim metadata */
+ virtual int GetProductionDay(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(ProductionDay, int);
/** Get the imaging production month from the ossim metadata */
- virtual int GetProductionMonth( const MetaDataDictionaryType & dict ) const =0;
+ virtual int GetProductionMonth(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(ProductionMonth, int);
/** Get the imaging production year from the ossim metadata */
- virtual int GetProductionYear( const MetaDataDictionaryType & dict ) const =0;
+ virtual int GetProductionYear(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(ProductionYear, int);
/** Get the sat elevation from the ossim metadata */
- virtual double GetSatElevation( const MetaDataDictionaryType & dict ) const =0;
+ virtual double GetSatElevation(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(SatElevation, double);
/** Get the sat azimuth from the ossim metadata */
- virtual double GetSatAzimuth( const MetaDataDictionaryType & dict ) const =0;
+ virtual double GetSatAzimuth(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(SatAzimuth, double);
/** Get the first wavelength for the spectral band definition */
- virtual VariableLengthVectorType GetFirstWavelengths( const MetaDataDictionaryType & dict ) const =0;
+ virtual VariableLengthVectorType GetFirstWavelengths(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(FirstWavelengths, VariableLengthVectorType);
/** Get the last wavelength for the spectral band definition */
- virtual VariableLengthVectorType GetLastWavelengths( const MetaDataDictionaryType & dict ) const =0;
+ virtual VariableLengthVectorType GetLastWavelengths(const MetaDataDictionaryType& dict) const = 0;
otbMetadataGetMacro(LastWavelengths, VariableLengthVectorType);
-
- virtual bool CanRead( const MetaDataDictionaryType & dict ) const =0;
- virtual void PrintSelf(std::ostream& os, itk::Indent indent, const MetaDataDictionaryType & dict) const;
+ virtual bool CanRead(const MetaDataDictionaryType& dict) const = 0;
+
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent, const MetaDataDictionaryType& dict) const;
protected:
ImageMetadataInterfaceBase();
- virtual ~ImageMetadataInterfaceBase() {};
+ virtual ~ImageMetadataInterfaceBase() {}
private:
- ImageMetadataInterfaceBase(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageMetadataInterfaceBase(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- OTB_GCP m_GCP;
+ OTB_GCP m_GCP;
ImageType::Pointer m_Image;
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbImageMetadataInterfaceFactory.cxx b/Code/IO/otbImageMetadataInterfaceFactory.cxx
index 1291cca6d1..43c29e7ad7 100644
--- a/Code/IO/otbImageMetadataInterfaceFactory.cxx
+++ b/Code/IO/otbImageMetadataInterfaceFactory.cxx
@@ -38,41 +38,40 @@ namespace otb
{
ImageMetadataInterfaceFactory::ImageMetadataInterfaceBasePointerType
ImageMetadataInterfaceFactory
-::CreateIMI( const MetaDataDictionaryType & dict )
+::CreateIMI(const MetaDataDictionaryType& dict)
{
RegisterBuiltInFactories();
std::list<ImageMetadataInterfaceBasePointerType> possibleIMI;
- std::list<itk::LightObject::Pointer> allobjects =
+ std::list<itk::LightObject::Pointer> allobjects =
itk::ObjectFactoryBase::CreateAllInstance("ImageMetadataInterfaceBase");
for (std::list<itk::LightObject::Pointer>::iterator i = allobjects.begin();
i != allobjects.end(); ++i)
- {
+ {
ImageMetadataInterfaceBase * io = dynamic_cast<ImageMetadataInterfaceBase*>(i->GetPointer());
if (io)
- {
+ {
possibleIMI.push_back(io);
- }
+ }
else
- {
+ {
itkGenericExceptionMacro(<< "Error ImageMetadataInterface factory did not return an ImageMetadataInterfaceBase: "
<< (*i)->GetNameOfClass());
+ }
}
- }
for (std::list<ImageMetadataInterfaceBasePointerType>::iterator k = possibleIMI.begin();
k != possibleIMI.end(); ++k)
- {
- if ((*k)->CanRead(dict))
{
+ if ((*k)->CanRead(dict))
+ {
return *k;
+ }
}
- }
DefaultImageMetadataInterface::Pointer defaultIMI = DefaultImageMetadataInterface::New();
return dynamic_cast<ImageMetadataInterfaceBase*>(static_cast<DefaultImageMetadataInterface*>(defaultIMI));
}
-
void
ImageMetadataInterfaceFactory
::RegisterBuiltInFactories()
@@ -80,20 +79,19 @@ ImageMetadataInterfaceFactory
static bool firstTime = true;
static itk::SimpleMutexLock mutex;
- {
+ {
// This helper class makes sure the Mutex is unlocked
// in the event an exception is thrown.
- itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder( mutex );
- if ( firstTime )
- {
- itk::ObjectFactoryBase::RegisterFactory( IkonosImageMetadataInterfaceFactory::New() );
- itk::ObjectFactoryBase::RegisterFactory( SpotImageMetadataInterfaceFactory::New() );
- itk::ObjectFactoryBase::RegisterFactory( QuickBirdImageMetadataInterfaceFactory::New() );
+ itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder(mutex);
+ if (firstTime)
+ {
+ itk::ObjectFactoryBase::RegisterFactory(IkonosImageMetadataInterfaceFactory::New());
+ itk::ObjectFactoryBase::RegisterFactory(SpotImageMetadataInterfaceFactory::New());
+ itk::ObjectFactoryBase::RegisterFactory(QuickBirdImageMetadataInterfaceFactory::New());
//itk::ObjectFactoryBase::RegisterFactory( TerraSarImageMetadataInterfaceFactory::New() );
firstTime = false;
+ }
}
- }
}
} // end namespace otb
-
diff --git a/Code/IO/otbImageMetadataInterfaceFactory.h b/Code/IO/otbImageMetadataInterfaceFactory.h
index 0dde69e917..ed17cf40fe 100644
--- a/Code/IO/otbImageMetadataInterfaceFactory.h
+++ b/Code/IO/otbImageMetadataInterfaceFactory.h
@@ -21,7 +21,6 @@
#include "itkObject.h"
#include "otbImageMetadataInterfaceBase.h"
-
namespace otb
{
/** \class ImageMetadataInterfaceFactory
@@ -31,7 +30,7 @@ class ITK_EXPORT ImageMetadataInterfaceFactory : public itk::Object
{
public:
/** Standard class typedefs. */
- typedef ImageMetadataInterfaceFactory Self;
+ typedef ImageMetadataInterfaceFactory Self;
typedef itk::Object Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -47,10 +46,10 @@ public:
typedef ImageMetadataInterfaceBase::VectorType VectorType;
typedef ImageMetadataInterfaceBase::VariableLengthVectorType VariableLengthVectorType;
typedef ImageMetadataInterfaceBase::ImageKeywordlistType ImageKeywordlistType;
- typedef ImageMetadataInterfaceBase::Pointer ImageMetadataInterfaceBasePointerType;
-
+ typedef ImageMetadataInterfaceBase::Pointer ImageMetadataInterfaceBasePointerType;
+
/** Create the appropriate ImageMetadataInterfaceFactory depending on the particulars of the file. */
- static ImageMetadataInterfaceBasePointerType CreateIMI( const MetaDataDictionaryType & dict );
+ static ImageMetadataInterfaceBasePointerType CreateIMI(const MetaDataDictionaryType& dict);
/** Register Built-in factories */
static void RegisterBuiltInFactories();
@@ -60,13 +59,11 @@ protected:
~ImageMetadataInterfaceFactory();
private:
- ImageMetadataInterfaceFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageMetadataInterfaceFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
-
#endif
diff --git a/Code/IO/otbImageSeriesFileReader.h b/Code/IO/otbImageSeriesFileReader.h
index abb7d21aac..0a60a60455 100644
--- a/Code/IO/otbImageSeriesFileReader.h
+++ b/Code/IO/otbImageSeriesFileReader.h
@@ -44,21 +44,21 @@ namespace otb {
*
* \see ImageFileReader
*/
-template < class TImage, class TInternalImage = TImage >
+template <class TImage, class TInternalImage = TImage>
class ITK_EXPORT ImageSeriesFileReader
- : public ImageSeriesFileReaderBase< TImage, TInternalImage >
+ : public ImageSeriesFileReaderBase<TImage, TInternalImage>
{
public:
/** Standart typedefs */
- typedef ImageSeriesFileReader Self;
- typedef ImageSeriesFileReaderBase< TImage, TInternalImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageSeriesFileReader Self;
+ typedef ImageSeriesFileReaderBase<TImage, TInternalImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Runtime informations macro */
- itkTypeMacro(ImageSeriesFileReader,ImageSeriesFileReaderBase);
+ itkTypeMacro(ImageSeriesFileReader, ImageSeriesFileReaderBase);
typedef typename Superclass::OutputImageType OutputImageType;
typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
@@ -72,13 +72,13 @@ public:
typedef typename Superclass::OutputImageListPointerType OutputImageListPointerType;
typedef typename Superclass::OutputImageListConstPointerType OutputImageListConstPointerType;
- typedef typename Superclass::InternalImageType InternalImageType;
- typedef typename Superclass::InternalImagePointerType InternalImagePointerType;
- typedef typename Superclass::InternalPixelType InternalPixelType;
- typedef typename Superclass::InternalValueType InternalValueType;
- typedef typename Superclass::InternalIndexType InternalIndexType;
- typedef typename Superclass::InternalSizeType InternalSizeType;
- typedef typename Superclass::InternalRegionType InternalRegionType;
+ typedef typename Superclass::InternalImageType InternalImageType;
+ typedef typename Superclass::InternalImagePointerType InternalImagePointerType;
+ typedef typename Superclass::InternalPixelType InternalPixelType;
+ typedef typename Superclass::InternalValueType InternalValueType;
+ typedef typename Superclass::InternalIndexType InternalIndexType;
+ typedef typename Superclass::InternalSizeType InternalSizeType;
+ typedef typename Superclass::InternalRegionType InternalRegionType;
typedef typename Superclass::ReaderType ReaderType;
typedef typename Superclass::ReaderType ReaderPointerType;
@@ -95,20 +95,20 @@ public:
// typedef MultiChannelExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
// typedef MultiToMonoChannelExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
// typedef ExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
- typedef itk::ImageToImageFilter< InternalImageType, OutputImageType > ExtractSelectionType;
- typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
+ typedef itk::ImageToImageFilter<InternalImageType, OutputImageType> ExtractSelectionType;
+ typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
- typedef ObjectList< ExtractSelectionType > ExtractSelectionListType;
+ typedef ObjectList<ExtractSelectionType> ExtractSelectionListType;
typedef typename ExtractSelectionListType::Pointer ExtractSelectionListPointerType;
protected:
ImageSeriesFileReader();
- virtual ~ImageSeriesFileReader () { }
+ virtual ~ImageSeriesFileReader () {}
/** TestBandSelection
* Tests the coherency of the Meta File (especifically band selection) with the image types
*/
- virtual void TestBandSelection( std::vector<unsigned int> & bands ) { }
+ virtual void TestBandSelection(std::vector<unsigned int>& bands) {}
/** GenerateData
* This method will be specialised if template definitions follow:
@@ -116,19 +116,19 @@ protected:
* - TImage is an Image and TInteranalImage is a VectorImage
* - TImage and TInternalImage are of Image type.
*/
- virtual void GenerateData ( unsigned int idx );
+ virtual void GenerateData(unsigned int idx);
/** AllocateListOfComponents
* Once MetaFile is read, allocation of lists are performed in SetFileName.
* This allows specific (or global) initialization in the GenerateData methods,
* that the user may invoke throught GenerateOutput() or GenerateOutput( idx ).
*/
- virtual void AllocateListOfComponents ( void );
+ virtual void AllocateListOfComponents(void);
/** PrintSelf method */
- void PrintSelf ( std::ostream& os, itk::Indent indent ) const
+ void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- return Superclass::PrintSelf( os, indent );
+ return Superclass::PrintSelf(os, indent);
}
/**
@@ -137,8 +137,8 @@ protected:
ExtractSelectionListPointerType m_ExtractorList;
private:
- ImageSeriesFileReader ( const Self & );
- void operator= ( const Self & );
+ ImageSeriesFileReader (const Self &);
+ void operator =(const Self&);
}; // end of class
/**
@@ -152,21 +152,21 @@ private:
*
* \see ImagerSeriesFileReader
*/
-template < class TPixel, class TInternalPixel >
-class ITK_EXPORT ImageSeriesFileReader< Image< TPixel, 2 >, Image< TInternalPixel, 2 > >
- : public ImageSeriesFileReaderBase< Image< TPixel, 2 >, Image< TInternalPixel, 2 > >
+template <class TPixel, class TInternalPixel>
+class ITK_EXPORT ImageSeriesFileReader<Image<TPixel, 2>, Image<TInternalPixel, 2> >
+ : public ImageSeriesFileReaderBase<Image<TPixel, 2>, Image<TInternalPixel, 2> >
{
public:
/** Standart typedefs */
- typedef ImageSeriesFileReader Self;
- typedef ImageSeriesFileReaderBase< Image< TPixel, 2 >, Image< TInternalPixel, 2 > > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageSeriesFileReader Self;
+ typedef ImageSeriesFileReaderBase<Image<TPixel, 2>, Image<TInternalPixel, 2> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Runtime informations macro */
- itkTypeMacro(ImageSeriesFileReader,ImageSeriesFileReaderBase);
+ itkTypeMacro(ImageSeriesFileReader, ImageSeriesFileReaderBase);
typedef typename Superclass::OutputImageType OutputImageType;
typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
@@ -197,20 +197,20 @@ public:
/** This is a specialised template definition of the ROI extraction procedure.
* Here TExtractSelection is a ExtractROI class since TImage and TInternalImage are of Image type.
*/
- typedef ExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
- typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
+ typedef ExtractROI<InternalPixelType, PixelType> ExtractSelectionType;
+ typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
- typedef ObjectList< ExtractSelectionType > ExtractSelectionListType;
+ typedef ObjectList<ExtractSelectionType> ExtractSelectionListType;
typedef typename ExtractSelectionListType::Pointer ExtractSelectionListPointerType;
protected:
ImageSeriesFileReader();
- virtual ~ImageSeriesFileReader () { }
+ virtual ~ImageSeriesFileReader () {}
/** TestBandSelection
* Tests the coherency of the Meta File (especifically band selection) with the image types
*/
- virtual void TestBandSelection( std::vector<unsigned int> & bands );
+ virtual void TestBandSelection(std::vector<unsigned int>& bands);
/** GenerateData
* This method will be specialised if template definitions follow:
@@ -218,19 +218,19 @@ protected:
* - TImage is an Image and TInteranalImage is a VectorImage
* - TImage and TInternalImage are of Image type.
*/
- virtual void GenerateData ( unsigned int idx );
+ virtual void GenerateData(unsigned int idx);
/**
* Once MetaFile is read, allocation of lists are performed in SetFileName.
* This allows specific (or global) initialization in the GenerateData methods,
* that the user may invoke throught GenerateOutput() or GenerateOutput( idx ).
*/
- virtual void AllocateListOfComponents ( void );
+ virtual void AllocateListOfComponents(void);
/** PrintSelf method */
- void PrintSelf ( std::ostream& os, itk::Indent indent ) const
+ void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- return Superclass::PrintSelf( os, indent );
+ return Superclass::PrintSelf(os, indent);
}
/**
@@ -239,8 +239,8 @@ protected:
ExtractSelectionListPointerType m_ExtractorList;
private:
- ImageSeriesFileReader ( const Self & );
- void operator= ( const Self & );
+ ImageSeriesFileReader (const Self &);
+ void operator =(const Self&);
}; // end of class specialized for image
/** ImagerSeriesFileReader
@@ -253,21 +253,21 @@ private:
*
* \see ImagerSeriesFileReader
*/
-template < class TPixel, class TInternalPixel >
-class ITK_EXPORT ImageSeriesFileReader< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
- : public ImageSeriesFileReaderBase< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
+template <class TPixel, class TInternalPixel>
+class ITK_EXPORT ImageSeriesFileReader<Image<TPixel, 2>, VectorImage<TInternalPixel, 2> >
+ : public ImageSeriesFileReaderBase<Image<TPixel, 2>, VectorImage<TInternalPixel, 2> >
{
public:
/** Standart typedefs */
- typedef ImageSeriesFileReader Self;
- typedef ImageSeriesFileReaderBase< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageSeriesFileReader Self;
+ typedef ImageSeriesFileReaderBase<Image<TPixel, 2>, VectorImage<TInternalPixel, 2> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Runtime informations macro */
- itkTypeMacro(ImageSeriesFileReader,ImageSeriesFileReaderBase);
+ itkTypeMacro(ImageSeriesFileReader, ImageSeriesFileReaderBase);
typedef typename Superclass::OutputImageType OutputImageType;
typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
@@ -298,20 +298,20 @@ public:
/** This is a specific template definition of the ROI extraction procedure.
* MultiToMonoChannelExtractROI since TImage is an Image and TInteranalImage is a VectorImage
*/
- typedef MultiToMonoChannelExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
- typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
+ typedef MultiToMonoChannelExtractROI<InternalPixelType, PixelType> ExtractSelectionType;
+ typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
- typedef ObjectList< ExtractSelectionType > ExtractSelectionListType;
+ typedef ObjectList<ExtractSelectionType> ExtractSelectionListType;
typedef typename ExtractSelectionListType::Pointer ExtractSelectionListPointerType;
protected:
ImageSeriesFileReader();
- virtual ~ImageSeriesFileReader () { }
+ virtual ~ImageSeriesFileReader () {}
/**
* Tests the coherency of the Meta File (especifically band selection) with the image types
*/
- virtual void TestBandSelection( std::vector<unsigned int> & bands );
+ virtual void TestBandSelection(std::vector<unsigned int>& bands);
/** GenerateData
* This method will be specialised if template definitions follow:
@@ -319,19 +319,19 @@ protected:
* - TImage is an Image and TInteranalImage is a VectorImage
* - TImage and TInternalImage are of Image type.
*/
- virtual void GenerateData ( unsigned int idx );
+ virtual void GenerateData(unsigned int idx);
/**
* Once MetaFile is read, allocation of lists are performed in SetFileName.
* This allows specific (or global) initialization in the GenerateData methods,
* that the user may invoke throught GenerateOutput() or GenerateOutput( idx ).
*/
- virtual void AllocateListOfComponents ( void );
+ virtual void AllocateListOfComponents(void);
/** PrintSelf method */
- void PrintSelf ( std::ostream& os, itk::Indent indent ) const
+ void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- return Superclass::PrintSelf( os, indent );
+ return Superclass::PrintSelf(os, indent);
}
/**
@@ -340,9 +340,8 @@ protected:
ExtractSelectionListPointerType m_ExtractorList;
private:
- ImageSeriesFileReader ( const Self & );
- void operator= ( const Self & );
-
+ ImageSeriesFileReader (const Self &);
+ void operator =(const Self&);
}; // end of class specialized for Image and VectorImage
@@ -356,21 +355,21 @@ private:
*
* \see ImagerSeriesFileReader
*/
-template < class TPixel, class TInternalPixel >
-class ITK_EXPORT ImageSeriesFileReader< VectorImage< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
- : public ImageSeriesFileReaderBase< VectorImage< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
+template <class TPixel, class TInternalPixel>
+class ITK_EXPORT ImageSeriesFileReader<VectorImage<TPixel, 2>, VectorImage<TInternalPixel, 2> >
+ : public ImageSeriesFileReaderBase<VectorImage<TPixel, 2>, VectorImage<TInternalPixel, 2> >
{
public:
/** Standart typedefs */
- typedef ImageSeriesFileReader Self;
- typedef ImageSeriesFileReaderBase< VectorImage< TPixel, 2 >, VectorImage< TInternalPixel, 2 > > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageSeriesFileReader Self;
+ typedef ImageSeriesFileReaderBase<VectorImage<TPixel, 2>, VectorImage<TInternalPixel, 2> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Runtime informations macro */
- itkTypeMacro(ImageSeriesFileReader,ImageSeriesFileReaderBase);
+ itkTypeMacro(ImageSeriesFileReader, ImageSeriesFileReaderBase);
typedef typename Superclass::OutputImageType OutputImageType;
typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
@@ -402,21 +401,20 @@ public:
* Here, it will be specialised with:
* MultiChannelExtractROI if TImage is a VectorImage
*/
- typedef MultiChannelExtractROI< InternalPixelType, PixelType > ExtractSelectionType;
- typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
+ typedef MultiChannelExtractROI<InternalPixelType, PixelType> ExtractSelectionType;
+ typedef typename ExtractSelectionType::Pointer ExtractSelectionPointerType;
- typedef ObjectList< ExtractSelectionType > ExtractSelectionListType;
+ typedef ObjectList<ExtractSelectionType> ExtractSelectionListType;
typedef typename ExtractSelectionListType::Pointer ExtractSelectionListPointerType;
-
protected:
ImageSeriesFileReader();
- virtual ~ImageSeriesFileReader () { }
+ virtual ~ImageSeriesFileReader () {}
/**
* Tests the coherency of the Meta File (especifically band selection) with the image types
*/
- virtual void TestBandSelection( std::vector<unsigned int> & bands ){ }
+ virtual void TestBandSelection(std::vector<unsigned int>& bands){}
/** GenerateData
* This method will be specialised if template definitions follow:
@@ -424,19 +422,19 @@ protected:
* - TImage is an Image and TInteranalImage is a VectorImage
* - TImage and TInternalImage are of Image type.
*/
- virtual void GenerateData ( unsigned int idx );
+ virtual void GenerateData(unsigned int idx);
/**
* Once MetaFile is read, allocation of lists are performed in SetFileName.
* This allows specific (or global) initialization in the GenerateData methods,
* that the user may invoke throught GenerateOutput() or GenerateOutput( idx ).
*/
- virtual void AllocateListOfComponents ( void );
+ virtual void AllocateListOfComponents(void);
/** PrintSelf method */
- void PrintSelf ( std::ostream& os, itk::Indent indent ) const
+ void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- return Superclass::PrintSelf( os, indent );
+ return Superclass::PrintSelf(os, indent);
}
/**
@@ -445,8 +443,8 @@ protected:
ExtractSelectionListPointerType m_ExtractorList;
private:
- ImageSeriesFileReader ( const Self & );
- void operator= ( const Self & );
+ ImageSeriesFileReader (const Self &);
+ void operator =(const Self&);
}; // end of class specialized for VectorImage
} // end of namespace otb
@@ -456,5 +454,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/IO/otbImageSeriesFileReader.txx b/Code/IO/otbImageSeriesFileReader.txx
index bb0ba78a0f..2ee311ba65 100644
--- a/Code/IO/otbImageSeriesFileReader.txx
+++ b/Code/IO/otbImageSeriesFileReader.txx
@@ -24,35 +24,35 @@
namespace otb {
-template < class TImage, class TInternalImage >
-ImageSeriesFileReader< TImage, TInternalImage >
+template <class TImage, class TInternalImage>
+ImageSeriesFileReader<TImage, TInternalImage>
::ImageSeriesFileReader ()
{
m_ExtractorList = ExtractSelectionListType::New();
}
-template < class TImage, class TInternalImage >
+template <class TImage, class TInternalImage>
void
-ImageSeriesFileReader< TImage, TInternalImage >
-::AllocateListOfComponents ()
+ImageSeriesFileReader<TImage, TInternalImage>
+::AllocateListOfComponents()
{
- for ( unsigned int i = 0; i < this->GetNumberOfOutputs(); ++i )
- {
- this->m_ImageFileReaderList->PushBack( ReaderType::New() );
- this->m_OutputList->PushBack( OutputImageType::New() );
- m_ExtractorList->PushBack( ExtractSelectionListType::New() );
- }
+ for (unsigned int i = 0; i < this->GetNumberOfOutputs(); ++i)
+ {
+ this->m_ImageFileReaderList->PushBack(ReaderType::New());
+ this->m_OutputList->PushBack(OutputImageType::New());
+ m_ExtractorList->PushBack(ExtractSelectionListType::New());
+ }
}
-template < class TImage, class TInternalImage >
+template <class TImage, class TInternalImage>
void
-ImageSeriesFileReader< TImage, TInternalImage >
-::GenerateData( unsigned int idx )
+ImageSeriesFileReader<TImage, TInternalImage>
+::GenerateData(unsigned int idx)
{
itk::OStringStream msg;
msg << "Something wrong... Check the template definition of this class in the program...\n";
msg << "\"ENVI META FILE\" FileName: " << this->m_FileName << "\n";
- ImageSeriesFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ ImageSeriesFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
}
@@ -61,8 +61,8 @@ ImageSeriesFileReader< TImage, TInternalImage >
* **********************************************************
*/
-template < class TPixel, class TInternalPixel >
-ImageSeriesFileReader< Image< TPixel, 2 >, Image< TInternalPixel, 2 > >
+template <class TPixel, class TInternalPixel>
+ImageSeriesFileReader<Image<TPixel, 2>, Image<TInternalPixel, 2> >
::ImageSeriesFileReader ()
{
m_ExtractorList = ExtractSelectionListType::New();
@@ -71,73 +71,73 @@ ImageSeriesFileReader< Image< TPixel, 2 >, Image< TInternalPixel, 2 > >
/**
* Allocation of the component... Here, based on ExtractROI
*/
-template < class TPixel, class TInternalPixel >
+template <class TPixel, class TInternalPixel>
void
-ImageSeriesFileReader< Image< TPixel, 2 >, Image< TInternalPixel, 2 > >
-::AllocateListOfComponents ()
+ImageSeriesFileReader<Image<TPixel, 2>, Image<TInternalPixel, 2> >
+::AllocateListOfComponents()
{
- for ( unsigned int i = 0; i < this->GetNumberOfOutputs(); ++i )
- {
- this->m_ImageFileReaderList->PushBack( ReaderType::New() );
- this->m_OutputList->PushBack( OutputImageType::New() );
- m_ExtractorList->PushBack( ExtractSelectionType::New() );
- }
+ for (unsigned int i = 0; i < this->GetNumberOfOutputs(); ++i)
+ {
+ this->m_ImageFileReaderList->PushBack(ReaderType::New());
+ this->m_OutputList->PushBack(OutputImageType::New());
+ m_ExtractorList->PushBack(ExtractSelectionType::New());
+ }
}
/**
* TestBandSelection tests if the templated Image type is compatible
* with the bande selection provided in the Meta File
*/
-template < class TPixel, class TInternalPixel >
+template <class TPixel, class TInternalPixel>
void
-ImageSeriesFileReader< Image< TPixel, 2 >, Image< TInternalPixel, 2 > >
-::TestBandSelection ( std::vector<unsigned int> & bands )
+ImageSeriesFileReader<Image<TPixel, 2>, Image<TInternalPixel, 2> >
+::TestBandSelection(std::vector<unsigned int>& bands)
{
- if ( bands.size() != 1 )
- {
+ if (bands.size() != 1)
+ {
itk::OStringStream msg;
msg << "Unable to handle multicomponent file from Image<> class\n";
msg << "\"ENVI META FILE\" FileName: " << this->m_FileName << "\n";
- ImageSeriesFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ ImageSeriesFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
- }
+ }
- if ( bands[0] != 1 )
- {
+ if (bands[0] != 1)
+ {
itk::OStringStream msg;
msg << "Unable to handle given band reading from multicomponent file with Image<> class\n";
msg << "\"ENVI META FILE\" FileName: " << this->m_FileName << "\n";
- ImageSeriesFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ ImageSeriesFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
- }
+ }
return;
}
/**
* GenerateData for Image type
*/
-template < class TPixel, class TInternalPixel >
+template <class TPixel, class TInternalPixel>
void
-ImageSeriesFileReader< Image< TPixel, 2 >, Image< TInternalPixel, 2 > >
-::GenerateData( unsigned int idx )
+ImageSeriesFileReader<Image<TPixel, 2>, Image<TInternalPixel, 2> >
+::GenerateData(unsigned int idx)
{
- otbMsgDebugMacro( << "Reading " << idx << "th image: " << this->m_ListOfFileNames[ idx ] );
+ otbMsgDebugMacro(<< "Reading " << idx << "th image: " << this->m_ListOfFileNames[idx]);
ReaderType * reader
- = static_cast<ReaderType*>( this->m_ImageFileReaderList->GetNthElement( idx ) );
+ = static_cast<ReaderType*>(this->m_ImageFileReaderList->GetNthElement(idx));
- reader->SetFileName( this->m_ListOfFileNames[ idx ] );
+ reader->SetFileName(this->m_ListOfFileNames[idx]);
ExtractSelectionType * selection
- = static_cast<ExtractSelectionType*>( m_ExtractorList->GetNthElement( idx ) );
+ = static_cast<ExtractSelectionType*>(m_ExtractorList->GetNthElement(idx));
- selection->SetExtractionRegion( this->m_ListOfRegionSelection[ idx ] );
+ selection->SetExtractionRegion(this->m_ListOfRegionSelection[idx]);
- selection->SetInput( reader->GetOutput() );
- selection->GraftOutput( this->m_OutputList->GetNthElement( idx ) );
+ selection->SetInput(reader->GetOutput());
+ selection->GraftOutput(this->m_OutputList->GetNthElement(idx));
selection->Update();
- this->m_OutputList->GetNthElement( idx )->Graft( selection->GetOutput() );
+ this->m_OutputList->GetNthElement(idx)->Graft(selection->GetOutput());
}
/* *********************************************************************
@@ -149,8 +149,8 @@ ImageSeriesFileReader< Image< TPixel, 2 >, Image< TInternalPixel, 2 > >
/**
* Constructor
*/
-template < class TPixel, class TInternalPixel >
-ImageSeriesFileReader< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
+template <class TPixel, class TInternalPixel>
+ImageSeriesFileReader<Image<TPixel, 2>, VectorImage<TInternalPixel, 2> >
::ImageSeriesFileReader ()
{
//this->m_OutputList = OutputImageListType::New();
@@ -161,65 +161,65 @@ ImageSeriesFileReader< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
/**
* Allocation of the component... Here, based on MultiToMonoChannelExtractROI
*/
-template < class TPixel, class TInternalPixel >
+template <class TPixel, class TInternalPixel>
void
-ImageSeriesFileReader< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
-::AllocateListOfComponents ()
+ImageSeriesFileReader<Image<TPixel, 2>, VectorImage<TInternalPixel, 2> >
+::AllocateListOfComponents()
{
- for ( unsigned int i = 0; i < this->GetNumberOfOutputs(); ++i )
- {
- this->m_ImageFileReaderList->PushBack( ReaderType::New() );
- this->m_OutputList->PushBack( OutputImageType::New() );
- m_ExtractorList->PushBack( ExtractSelectionType::New() );
- }
+ for (unsigned int i = 0; i < this->GetNumberOfOutputs(); ++i)
+ {
+ this->m_ImageFileReaderList->PushBack(ReaderType::New());
+ this->m_OutputList->PushBack(OutputImageType::New());
+ m_ExtractorList->PushBack(ExtractSelectionType::New());
+ }
}
/**
* TestBandSelection tests if the templated Image type is compatible
* with the bande selection provided in the Meta File
*/
-template < class TPixel, class TInternalPixel >
+template <class TPixel, class TInternalPixel>
void
-ImageSeriesFileReader< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
-::TestBandSelection ( std::vector<unsigned int> & bands )
+ImageSeriesFileReader<Image<TPixel, 2>, VectorImage<TInternalPixel, 2> >
+::TestBandSelection(std::vector<unsigned int>& bands)
{
- if ( bands.size() != 1 )
- {
+ if (bands.size() != 1)
+ {
itk::OStringStream msg;
msg << "Unable to handle multicomponent file from Image<> class as output\n";
msg << "\"ENVI META FILE\" FileName: " << this->m_FileName << "\n";
- ImageSeriesFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ ImageSeriesFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
- }
+ }
return;
}
/**
* GenerateData for Image type as output and VectorImage type for reading
*/
-template < class TPixel, class TInternalPixel >
+template <class TPixel, class TInternalPixel>
void
-ImageSeriesFileReader< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
-::GenerateData( unsigned int idx )
+ImageSeriesFileReader<Image<TPixel, 2>, VectorImage<TInternalPixel, 2> >
+::GenerateData(unsigned int idx)
{
- otbMsgDebugMacro( << "Reading " << idx << "th image: " << this->m_ListOfFileNames[ idx ] );
+ otbMsgDebugMacro(<< "Reading " << idx << "th image: " << this->m_ListOfFileNames[idx]);
ReaderType * reader
- = static_cast<ReaderType*>( this->m_ImageFileReaderList->GetNthElement( idx ) );
+ = static_cast<ReaderType*>(this->m_ImageFileReaderList->GetNthElement(idx));
- reader->SetFileName( this->m_ListOfFileNames[ idx ] );
+ reader->SetFileName(this->m_ListOfFileNames[idx]);
ExtractSelectionType * selection
- = static_cast<ExtractSelectionType*>( this->m_ExtractorList->GetNthElement( idx ) );
+ = static_cast<ExtractSelectionType*>(this->m_ExtractorList->GetNthElement(idx));
- selection->SetExtractionRegion( this->m_ListOfRegionSelection[ idx ] );
- selection->SetChannel( this->m_ListOfBandSelection[ idx ][0] );
+ selection->SetExtractionRegion(this->m_ListOfRegionSelection[idx]);
+ selection->SetChannel(this->m_ListOfBandSelection[idx][0]);
- selection->SetInput( reader->GetOutput() );
- selection->GraftOutput( this->m_OutputList->GetNthElement( idx ) );
+ selection->SetInput(reader->GetOutput());
+ selection->GraftOutput(this->m_OutputList->GetNthElement(idx));
selection->Update();
- this->m_OutputList->GetNthElement( idx )->Graft( selection->GetOutput() );
+ this->m_OutputList->GetNthElement(idx)->Graft(selection->GetOutput());
}
/* ******************************************************************
@@ -230,8 +230,8 @@ ImageSeriesFileReader< Image< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
/**
* Constructor
*/
-template < class TPixel, class TInternalPixel >
-ImageSeriesFileReader< VectorImage< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
+template <class TPixel, class TInternalPixel>
+ImageSeriesFileReader<VectorImage<TPixel, 2>, VectorImage<TInternalPixel, 2> >
::ImageSeriesFileReader ()
{
//this->m_OutputList = OutputImageListType::New();
@@ -242,56 +242,53 @@ ImageSeriesFileReader< VectorImage< TPixel, 2 >, VectorImage< TInternalPixel, 2
/**
* Allocation of the component... Here, based on MultiChannelExtractROI
*/
-template < class TPixel, class TInternalPixel >
+template <class TPixel, class TInternalPixel>
void
-ImageSeriesFileReader< VectorImage< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
-::AllocateListOfComponents ()
+ImageSeriesFileReader<VectorImage<TPixel, 2>, VectorImage<TInternalPixel, 2> >
+::AllocateListOfComponents()
{
- for ( unsigned int i = 0; i < this->GetNumberOfOutputs(); ++i )
- {
- this->m_ImageFileReaderList->PushBack( ReaderType::New() );
- this->m_OutputList->PushBack( OutputImageType::New() );
- m_ExtractorList->PushBack( ExtractSelectionType::New() );
- }
+ for (unsigned int i = 0; i < this->GetNumberOfOutputs(); ++i)
+ {
+ this->m_ImageFileReaderList->PushBack(ReaderType::New());
+ this->m_OutputList->PushBack(OutputImageType::New());
+ m_ExtractorList->PushBack(ExtractSelectionType::New());
+ }
}
/**
* GenerateData specialised for VectorImages
*/
-template < class TPixel, class TInternalPixel >
+template <class TPixel, class TInternalPixel>
void
-ImageSeriesFileReader< VectorImage< TPixel, 2 >, VectorImage< TInternalPixel, 2 > >
-::GenerateData( unsigned int idx )
+ImageSeriesFileReader<VectorImage<TPixel, 2>, VectorImage<TInternalPixel, 2> >
+::GenerateData(unsigned int idx)
{
- otbMsgDebugMacro( << "Reading " << idx << "th image: " << this->m_ListOfFileNames[ idx ] );
+ otbMsgDebugMacro(<< "Reading " << idx << "th image: " << this->m_ListOfFileNames[idx]);
ReaderType * reader
- = static_cast<ReaderType*>( this->m_ImageFileReaderList->GetNthElement( idx ) );
+ = static_cast<ReaderType*>(this->m_ImageFileReaderList->GetNthElement(idx));
- reader->SetFileName( this->m_ListOfFileNames[ idx ] );
+ reader->SetFileName(this->m_ListOfFileNames[idx]);
ExtractSelectionType * selection
- = static_cast<ExtractSelectionType*>( this->m_ExtractorList->GetNthElement( idx ) );
+ = static_cast<ExtractSelectionType*>(this->m_ExtractorList->GetNthElement(idx));
- selection->SetExtractionRegion( this->m_ListOfRegionSelection[ idx ] );
+ selection->SetExtractionRegion(this->m_ListOfRegionSelection[idx]);
- for ( std::vector<unsigned int>::iterator band = this->m_ListOfBandSelection[ idx ].begin();
- band != this->m_ListOfBandSelection[ idx ].end();
- ++band )
- {
- selection->SetChannel( *band );
- }
+ for (std::vector<unsigned int>::iterator band = this->m_ListOfBandSelection[idx].begin();
+ band != this->m_ListOfBandSelection[idx].end();
+ ++band)
+ {
+ selection->SetChannel(*band);
+ }
- selection->SetInput( reader->GetOutput() );
- selection->GraftOutput( this->m_OutputList->GetNthElement( idx ) );
+ selection->SetInput(reader->GetOutput());
+ selection->GraftOutput(this->m_OutputList->GetNthElement(idx));
selection->Update();
- this->m_OutputList->GetNthElement( idx )->Graft( selection->GetOutput() );
+ this->m_OutputList->GetNthElement(idx)->Graft(selection->GetOutput());
}
-
} // end of namespace otb
#endif
-
-
diff --git a/Code/IO/otbImageSeriesFileReaderBase.h b/Code/IO/otbImageSeriesFileReaderBase.h
index 0317691e05..a60c958edf 100644
--- a/Code/IO/otbImageSeriesFileReaderBase.h
+++ b/Code/IO/otbImageSeriesFileReaderBase.h
@@ -38,42 +38,42 @@
namespace otb {
- class ImageSeriesFileReaderException : public itk::ExceptionObject
- {
- public:
- itkTypeMacro( ImageSeriesFileReaderException, ExceptionObject );
+class ImageSeriesFileReaderException : public itk::ExceptionObject
+{
+public:
+ itkTypeMacro(ImageSeriesFileReaderException, ExceptionObject);
- ImageSeriesFileReaderException(const char *file, unsigned int line,
+ ImageSeriesFileReaderException(const char *file, unsigned int line,
const char* message = "Error in IO",
const char* loc = "Unknown") :
- itk::ExceptionObject(file, line, message, loc) { }
+ itk::ExceptionObject(file, line, message, loc) {}
- ImageSeriesFileReaderException(const std::string &file, unsigned int line,
+ ImageSeriesFileReaderException(const std::string& file, unsigned int line,
const char* message = "Error in IO",
const char* loc = "Unknown") :
- itk::ExceptionObject(file, line, message, loc) { }
- };
+ itk::ExceptionObject(file, line, message, loc) {}
+};
/** \class ImageSeriesFileReaderBase
* \brief
* \sa ImageSeriesFileReader
*/
-
-template < class TImage, class TInternalImage = TImage >
+
+template <class TImage, class TInternalImage = TImage>
class ITK_EXPORT ImageSeriesFileReaderBase
- : public ImageListSource< TImage >
+ : public ImageListSource<TImage>
{
public:
/** Standart typedefs */
- typedef ImageSeriesFileReaderBase Self;
- typedef ImageListSource< TImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef ImageSeriesFileReaderBase Self;
+ typedef ImageListSource<TImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Runtime informations macro */
- itkTypeMacro(ImageSeriesFileReaderBase,ImageListSource);
+ itkTypeMacro(ImageSeriesFileReaderBase, ImageListSource);
typedef TImage OutputImageType;
typedef typename OutputImageType::Pointer OutputImagePointerType;
@@ -95,10 +95,10 @@ public:
typedef typename InternalImageType::SizeType InternalSizeType;
typedef typename InternalImageType::RegionType InternalRegionType;
- typedef ImageFileReader< InternalImageType > ReaderType;
- typedef typename ReaderType::Pointer ReaderPointerType;
+ typedef ImageFileReader<InternalImageType> ReaderType;
+ typedef typename ReaderType::Pointer ReaderPointerType;
- typedef ObjectList< ReaderType > ReaderListType;
+ typedef ObjectList<ReaderType> ReaderListType;
typedef typename ReaderListType::Pointer ReaderListPointerType;
/** Get the file to be read */
@@ -109,43 +109,43 @@ public:
* the number of image files to be read, the images file names, the band and region
* selection
*/
- virtual void SetFileName ( const std::string & file );
- virtual void SetFileName ( const char * file );
+ virtual void SetFileName(const std::string& file);
+ virtual void SetFileName(const char * file);
/** get the Filenames */
- std::string GetFileName ( unsigned int i ) const
+ std::string GetFileName(unsigned int i) const
{
- return this->m_ListOfFileNames.at(i);
+ return this->m_ListOfFileNames.at(i);
}
/** Get the readers */
- itkGetObjectMacro(ImageFileReaderList,ReaderListType);
- ReaderType * GetImageFileReader ( unsigned int i ) const
+ itkGetObjectMacro(ImageFileReaderList, ReaderListType);
+ ReaderType * GetImageFileReader(unsigned int i) const
{
return this->m_ImageFileReaderList->GetNthElement(i);
}
/** Get the output list */
- virtual unsigned int GetNumberOfOutputs () const
+ virtual unsigned int GetNumberOfOutputs() const
{
return m_ListOfFileNames.size();
}
virtual OutputImageListType * GetOutput(void);
- virtual OutputImageType * GetOutput( unsigned int idx );
+ virtual OutputImageType * GetOutput(unsigned int idx);
/** Performs selective file extraction */
- virtual OutputImageListType * GenerateOutput (void);
- virtual OutputImageType * GenerateOutput ( unsigned int idx );
+ virtual OutputImageListType * GenerateOutput(void);
+ virtual OutputImageType * GenerateOutput(unsigned int idx);
/** Synchronization */
- void Update ()
+ void Update()
{
this->GenerateData();
}
protected:
ImageSeriesFileReaderBase();
- virtual ~ImageSeriesFileReaderBase () { }
+ virtual ~ImageSeriesFileReaderBase () {}
enum FileType { kFileName = 0, kImageFileName, kAnyFileName };
/**
@@ -153,10 +153,10 @@ protected:
* If the filename to test is an imageFileName, the file name may be modified in
* order to add the appropriated path
*/
- virtual void TestFileExistanceAndReadability( std::string & file, FileType fileType );
- virtual void TestBandSelection( std::vector<unsigned int> & bands ) { }
+ virtual void TestFileExistanceAndReadability(std::string& file, FileType fileType);
+ virtual void TestBandSelection(std::vector<unsigned int>& bands) {}
- virtual void GenerateData ( void );
+ virtual void GenerateData(void);
/** GenerateData
* This method will be specialised if template definitions follow:
@@ -164,34 +164,34 @@ protected:
* - TImage is an Image and TInteranalImage is a VectorImage
* - TImage and TInternalImage are of Image type.
*/
- virtual void GenerateData ( unsigned int idx );
+ virtual void GenerateData(unsigned int idx);
/**
* Read the MetaFile and test its effectiveness once inputFileName is set.
*/
- virtual void ReadMetaFile ();
+ virtual void ReadMetaFile();
/**
* Once MetaFile is read, allocation of lists are performed in SetFileName.
* This allows specific (or global) initialization in the GenerateData methods,
* that the user may invoke throught GenerateOutput() or GenerateOutput( idx ).
*/
- virtual void AllocateListOfComponents ( void );
+ virtual void AllocateListOfComponents(void);
/** PrintSelf method */
- virtual void PrintSelf ( std::ostream& os, itk::Indent indent ) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
- std::string m_FileName;
+ std::string m_FileName;
OutputImageListPointerType m_OutputList;
- std::vector< std::string > m_ListOfFileNames;
- std::vector< std::vector<unsigned int> > m_ListOfBandSelection;
- std::vector< InternalRegionType > m_ListOfRegionSelection;
+ std::vector<std::string> m_ListOfFileNames;
+ std::vector<std::vector<unsigned int> > m_ListOfBandSelection;
+ std::vector<InternalRegionType> m_ListOfRegionSelection;
ReaderListPointerType m_ImageFileReaderList;
private:
- ImageSeriesFileReaderBase ( const Self & );
- void operator= ( const Self & );
+ ImageSeriesFileReaderBase (const Self &);
+ void operator =(const Self&);
}; // end of class
} // end of namespace otb
@@ -201,5 +201,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/IO/otbImageSeriesFileReaderBase.txx b/Code/IO/otbImageSeriesFileReaderBase.txx
index 9f1b6e4a95..127969375b 100644
--- a/Code/IO/otbImageSeriesFileReaderBase.txx
+++ b/Code/IO/otbImageSeriesFileReaderBase.txx
@@ -24,8 +24,8 @@
namespace otb {
-template < class TImage, class TInternalImage >
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+template <class TImage, class TInternalImage>
+ImageSeriesFileReaderBase<TImage, TInternalImage>
::ImageSeriesFileReaderBase ()
{
m_OutputList = OutputImageListType::New();
@@ -36,137 +36,144 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
m_ListOfRegionSelection.clear();
}
-template < class TImage, class TInternalImage >
+template <class TImage, class TInternalImage>
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
-::SetFileName ( const std::string & file )
+ImageSeriesFileReaderBase<TImage, TInternalImage>
+::SetFileName(const std::string& file)
{
- return SetFileName( file.c_str() );
+ return SetFileName(file.c_str());
}
-template < class TImage, class TInternalImage >
+template <class TImage, class TInternalImage>
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
-::SetFileName ( const char * file )
+ImageSeriesFileReaderBase<TImage, TInternalImage>
+::SetFileName(const char * file)
{
- if ( file && ( file == m_FileName ) )
- return;
+ if (file && (file == m_FileName)) return;
- if ( file )
- {
+ if (file)
+ {
this->m_FileName = file;
ReadMetaFile();
AllocateListOfComponents();
- }
- else
- this->m_FileName = "";
+ }
+ else this->m_FileName = "";
this->Modified();
}
-template < class TImage, class TInternalImage >
-typename ImageSeriesFileReaderBase< TImage, TInternalImage >::OutputImageListType *
-ImageSeriesFileReaderBase< TImage, TInternalImage >
-::GetOutput ()
+template <class TImage, class TInternalImage>
+typename ImageSeriesFileReaderBase<TImage, TInternalImage>::OutputImageListType *
+ImageSeriesFileReaderBase<TImage, TInternalImage>
+::GetOutput()
{
- if ( this->GetNumberOfOutputs() < 1 )
- throw ImageSeriesFileReaderException (__FILE__, __LINE__,"No data to output",ITK_LOCATION);
+ if (this->GetNumberOfOutputs() < 1) throw ImageSeriesFileReaderException(__FILE__,
+ __LINE__,
+ "No data to output",
+ ITK_LOCATION);
- return static_cast<OutputImageListType*>( this->m_OutputList );
+ return static_cast<OutputImageListType*>(this->m_OutputList);
}
-template < class TImage, class TInternalImage >
-typename ImageSeriesFileReaderBase< TImage, TInternalImage >::OutputImageType *
-ImageSeriesFileReaderBase< TImage, TInternalImage >
-::GetOutput ( unsigned int idx )
+template <class TImage, class TInternalImage>
+typename ImageSeriesFileReaderBase<TImage, TInternalImage>::OutputImageType *
+ImageSeriesFileReaderBase<TImage, TInternalImage>
+::GetOutput(unsigned int idx)
{
- if ( this->GetNumberOfOutputs() < 1 )
- throw ImageSeriesFileReaderException (__FILE__, __LINE__,"No data to output",ITK_LOCATION);
+ if (this->GetNumberOfOutputs() < 1) throw ImageSeriesFileReaderException(__FILE__,
+ __LINE__,
+ "No data to output",
+ ITK_LOCATION);
- if ( idx >= m_OutputList->Size() )
- throw ImageSeriesFileReaderException (__FILE__, __LINE__,"Index out of bounds",ITK_LOCATION);
+ if (idx >= m_OutputList->Size()) throw ImageSeriesFileReaderException(__FILE__,
+ __LINE__,
+ "Index out of bounds",
+ ITK_LOCATION);
- return static_cast<OutputImageType*>( this->m_OutputList->GetNthElement( idx ) );
+ return static_cast<OutputImageType*>(this->m_OutputList->GetNthElement(idx));
}
-template < class TImage, class TInternalImage >
+template <class TImage, class TInternalImage>
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
-::ReadMetaFile ()
+ImageSeriesFileReaderBase<TImage, TInternalImage>
+::ReadMetaFile()
{
m_ListOfFileNames.clear();
m_ListOfBandSelection.clear();
m_ListOfRegionSelection.clear();
- this->TestFileExistanceAndReadability( m_FileName, kFileName );
+ this->TestFileExistanceAndReadability(m_FileName, kFileName);
std::string aLine;
- std::ifstream inputFile ( m_FileName.c_str(), std::ios_base::in );
+ std::ifstream inputFile(m_FileName.c_str(), std::ios_base::in);
inputFile >> aLine;
- if ( aLine != "ENVI" )
- {
+ if (aLine != "ENVI")
+ {
inputFile.close();
itk::OStringStream msg;
msg << "The file " << m_FileName << " is not a \"ENVI META FILE\" format\n";
- ImageSeriesFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ ImageSeriesFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
return;
- }
+ }
inputFile >> aLine;
- if ( aLine != "META" )
- {
+ if (aLine != "META")
+ {
inputFile.close();
itk::OStringStream msg;
msg << "The file " << m_FileName << " is not a \"ENVI META FILE\" format\n";
- ImageSeriesFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ ImageSeriesFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
return;
- }
-
+ }
+
inputFile >> aLine;
- if ( aLine != "FILE" )
- {
+ if (aLine != "FILE")
+ {
inputFile.close();
itk::OStringStream msg;
msg << "The file " << m_FileName << " is not a \"ENVI META FILE\" format\n";
- ImageSeriesFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ ImageSeriesFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
return;
- }
+ }
- while ( 1 )
- {
+ while (1)
+ {
/*
* Reading the filenames
*/
- do {
+ do
+ {
inputFile >> aLine;
//std::cerr << "-> '" << aLine << "'\n";
- } while ( aLine != "File" && inputFile.good() );
+ }
+ while (aLine != "File" && inputFile.good());
- if ( inputFile.good() )
- {
- do {
+ if (inputFile.good())
+ {
+ do
+ {
inputFile >> aLine;
//std::cerr << "--> '" << aLine << "'\n";
- } while ( aLine != ":" && inputFile.good() );
+ }
+ while (aLine != ":" && inputFile.good());
- if ( !inputFile.good() )
- {
+ if (!inputFile.good())
+ {
inputFile.close();
itk::OStringStream msg;
msg << "Unable to read image files in the \"ENVI META FILE\" file \n";
msg << "FileName: " << m_FileName << "\n";
- ImageSeriesFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ ImageSeriesFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
return;
+ }
}
- }
- else
- return; // normal exit
-
+ else return; // normal exit
+
inputFile >> aLine;
std::cerr << "-> " << aLine << "\n";
@@ -174,114 +181,119 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
// Get the Image fileName
// The test may modify image file name to add the path
// Or throw an exception when not found nor readable
- TestFileExistanceAndReadability( aLine, kImageFileName );
- m_ListOfFileNames.push_back( aLine );
+ TestFileExistanceAndReadability(aLine, kImageFileName);
+ m_ListOfFileNames.push_back(aLine);
std::string imageFileName = aLine;
/*
* Reading the Band number
*/
- do {
+ do
+ {
inputFile >> aLine;
//std::cerr << "-> '" << aLine << "'\n";
- } while ( aLine != "Bands:" && inputFile.good() );
+ }
+ while (aLine != "Bands:" && inputFile.good());
- if ( !inputFile.good() )
- {
+ if (!inputFile.good())
+ {
inputFile.close();
itk::OStringStream msg;
msg << "Unable to read the number of bands in the images in the \"ENVI META FILE\" file \n";
msg << "FileName: " << m_FileName << "\n";
- ImageSeriesFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ ImageSeriesFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
return;
- }
+ }
std::vector<unsigned int> bands;
- int aBand,oldBand=-1;
- char sep;
- while ( 1 )
- {
- inputFile >> aBand;
- if ( oldBand != -1 )
+ int aBand, oldBand = -1;
+ char sep;
+ while (1)
{
- for ( int i = oldBand; i <= aBand; ++i )
- bands.push_back( i );
+ inputFile >> aBand;
+ if (oldBand != -1)
+ {
+ for (int i = oldBand; i <= aBand; ++i)
+ bands.push_back(i);
oldBand = -1;
- }
- else
- bands.push_back( aBand );
+ }
+ else bands.push_back(aBand);
int posRef = inputFile.tellg();
inputFile >> sep;
- if ( sep == '-' )
- {
- oldBand = aBand+1;
- }
- else if ( sep != ',' )
- {
- inputFile.seekg( posRef, std::ios_base::beg );
+ if (sep == '-')
+ {
+ oldBand = aBand + 1;
+ }
+ else if (sep != ',')
+ {
+ inputFile.seekg(posRef, std::ios_base::beg);
break;
+ }
}
- }
// Storing band selection
try {
- TestBandSelection( bands );
- }
- catch ( ImageSeriesFileReaderException & e )
- {
+ TestBandSelection(bands);
+ }
+ catch (ImageSeriesFileReaderException & e)
+ {
itk::OStringStream msg;
msg << e.GetDescription();
msg << "Image FileName : " << imageFileName << "\n";
- e.SetDescription( msg.str().c_str() );
+ e.SetDescription(msg.str().c_str());
throw e;
- }
- m_ListOfBandSelection.push_back( bands );
+ }
+ m_ListOfBandSelection.push_back(bands);
/*
* Reading the Region selection
*/
- do {
+ do
+ {
inputFile >> aLine;
//std::cerr << "-> '" << aLine << "'\n";
- } while ( aLine != "Dims" && inputFile.good() );
+ }
+ while (aLine != "Dims" && inputFile.good());
- if ( inputFile.good() )
- {
- do {
+ if (inputFile.good())
+ {
+ do
+ {
inputFile >> aLine;
//std::cerr << "--> '" << aLine << "'\n";
- } while ( aLine != ":" && inputFile.good() );
+ }
+ while (aLine != ":" && inputFile.good());
- if ( !inputFile.good() )
- {
+ if (!inputFile.good())
+ {
inputFile.close();
itk::OStringStream msg;
msg << "Unable to read image region in the \"ENVI META FILE\" file \n";
msg << "FileName : " << m_FileName << "\n";
msg << "ImageName: " << imageFileName << "\n";
- ImageSeriesFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ ImageSeriesFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
return;
+ }
}
- }
- int beg_line,end_line,beg_col,end_col;
- char sep1,sep2,sep3;
+ int beg_line, end_line, beg_col, end_col;
+ char sep1, sep2, sep3;
inputFile >> beg_col >> sep1 >> end_col >> sep2 >> beg_line >> sep3 >> end_line;
- if ( !inputFile.good() )
- {
+ if (!inputFile.good())
+ {
inputFile.close();
itk::OStringStream msg;
msg << "Unable to read image region selection in the \"ENVI META FILE\" file \n";
msg << "FileName : " << m_FileName << "\n";
msg << "ImageName: " << imageFileName << "\n";
- ImageSeriesFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ ImageSeriesFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
return;
- }
+ }
IndexType index;
index[0] = beg_col - 1;
@@ -292,174 +304,169 @@ ImageSeriesFileReaderBase< TImage, TInternalImage >
size[1] = end_line - beg_line + 1;
RegionType region;
- region.SetSize( size );
- region.SetIndex( index );
+ region.SetSize(size);
+ region.SetIndex(index);
- m_ListOfRegionSelection.push_back( region );
- }
+ m_ListOfRegionSelection.push_back(region);
+ }
}
-template < class TImage, class TInternalImage >
+template <class TImage, class TInternalImage>
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
-::AllocateListOfComponents ()
+ImageSeriesFileReaderBase<TImage, TInternalImage>
+::AllocateListOfComponents()
{
- for ( unsigned int i = 0; i < GetNumberOfOutputs(); ++i )
- {
- m_ImageFileReaderList->PushBack( ReaderType::New() );
- m_OutputList->PushBack( OutputImageType::New() );
- }
+ for (unsigned int i = 0; i < GetNumberOfOutputs(); ++i)
+ {
+ m_ImageFileReaderList->PushBack(ReaderType::New());
+ m_OutputList->PushBack(OutputImageType::New());
+ }
}
/**
* GenerateData
*/
-template < class TImage, class TInternalImage >
+template <class TImage, class TInternalImage>
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
-::GenerateData( unsigned int idx )
+ImageSeriesFileReaderBase<TImage, TInternalImage>
+::GenerateData(unsigned int idx)
{
itk::OStringStream msg;
msg << "Something wrong... Check the template definition of this class in the program...\n";
msg << "\"ENVI META FILE\" FileName: " << m_FileName << "\n";
- ImageSeriesFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ ImageSeriesFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
}
-template < class TImage, class TInternalImage >
+template <class TImage, class TInternalImage>
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
-::GenerateData( )
+ImageSeriesFileReaderBase<TImage, TInternalImage>
+::GenerateData()
{
- for ( unsigned int i = 0; i < GetNumberOfOutputs(); ++i )
- GenerateData( i );
+ for (unsigned int i = 0; i < GetNumberOfOutputs(); ++i)
+ GenerateData(i);
}
/**
* GenerateOutput
*/
-template < class TImage, class TInternalImage >
-typename ImageSeriesFileReaderBase< TImage, TInternalImage >::OutputImageListType *
-ImageSeriesFileReaderBase< TImage, TInternalImage >
+template <class TImage, class TInternalImage>
+typename ImageSeriesFileReaderBase<TImage, TInternalImage>::OutputImageListType *
+ImageSeriesFileReaderBase<TImage, TInternalImage>
::GenerateOutput()
{
this->Update();
return this->GetOutput();
}
-template < class TImage, class TInternalImage >
-typename ImageSeriesFileReaderBase< TImage, TInternalImage >::OutputImageType *
-ImageSeriesFileReaderBase< TImage, TInternalImage >
-::GenerateOutput( unsigned int idx )
+template <class TImage, class TInternalImage>
+typename ImageSeriesFileReaderBase<TImage, TInternalImage>::OutputImageType *
+ImageSeriesFileReaderBase<TImage, TInternalImage>
+::GenerateOutput(unsigned int idx)
{
- this->GenerateData( idx );
- return this->GetOutput( idx );
+ this->GenerateData(idx);
+ return this->GetOutput(idx);
}
-
-template < class TImage, class TInternalImage >
+template <class TImage, class TInternalImage>
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
-::PrintSelf ( std::ostream& os, itk::Indent indent ) const
+ImageSeriesFileReaderBase<TImage, TInternalImage>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
os << indent << "File to be read : " << m_FileName << "\n";
- if ( m_ListOfFileNames.size() > 0 )
- {
- std::vector< std::vector< unsigned int > >::const_iterator bandSelection = m_ListOfBandSelection.begin();
- os << indent << "Image File(s) to be read\n";
- for ( unsigned int i = 0; i < GetNumberOfOutputs(); ++i )
+ if (m_ListOfFileNames.size() > 0)
{
+ std::vector<std::vector<unsigned int> >::const_iterator bandSelection = m_ListOfBandSelection.begin();
+ os << indent << "Image File(s) to be read\n";
+ for (unsigned int i = 0; i < GetNumberOfOutputs(); ++i)
+ {
os << indent << " " << "Filename : " << m_ListOfFileNames[i] << "\n";
os << indent << " " << "RegionSelection: Index( "
- << m_ListOfRegionSelection[i].GetIndex()[0] << ", "
- << m_ListOfRegionSelection[i].GetIndex()[1] << ") Size( "
- << m_ListOfRegionSelection[i].GetSize()[0] << ", "
- << m_ListOfRegionSelection[i].GetSize()[1] << ")\n";
+ << m_ListOfRegionSelection[i].GetIndex()[0] << ", "
+ << m_ListOfRegionSelection[i].GetIndex()[1] << ") Size( "
+ << m_ListOfRegionSelection[i].GetSize()[0] << ", "
+ << m_ListOfRegionSelection[i].GetSize()[1] << ")\n";
os << indent << " " << "BandSelection : ";
- for ( std::vector<unsigned int>::const_iterator bd = (*bandSelection).begin();
- bd != (*bandSelection).end();
- ++bd )
- {
+ for (std::vector<unsigned int>::const_iterator bd = (*bandSelection).begin();
+ bd != (*bandSelection).end();
+ ++bd)
+ {
os << *bd << " ";
- }
+ }
os << "\n";
++bandSelection;
+ }
}
- }
}
-template < class TImage, class TInternalImage >
+template <class TImage, class TInternalImage>
void
-ImageSeriesFileReaderBase< TImage, TInternalImage >
-::TestFileExistanceAndReadability ( std::string & file, FileType fileType )
+ImageSeriesFileReaderBase<TImage, TInternalImage>
+::TestFileExistanceAndReadability(std::string& file, FileType fileType)
{
// Test if the file exists.
- if( !itksys::SystemTools::FileExists( file.c_str() ) )
- {
- if ( fileType != kImageFileName )
+ if (!itksys::SystemTools::FileExists(file.c_str()))
{
+ if (fileType != kImageFileName)
+ {
ImageSeriesFileReaderException e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << "The file doesn't exist. \n";
- if ( fileType == kFileName )
- msg << "Filename = " << file << "\n";
- else
- msg << "File = " << file << "\n";
- e.SetDescription( msg.str().c_str() );
+ if (fileType == kFileName) msg << "Filename = " << file << "\n";
+ else msg << "File = " << file << "\n";
+ e.SetDescription(msg.str().c_str());
throw e;
return;
- }
+ }
else
- {
- std::vector< std::string > fullPath;
- fullPath.push_back( itksys::SystemTools::GetFilenamePath( m_FileName ) );
- fullPath.push_back( "/" );
- fullPath.push_back( file );
-
- std::string fullFileName = itksys::SystemTools::JoinPath( fullPath );
-
- if ( !itksys::SystemTools::FileExists( fullFileName.c_str() ) )
{
+ std::vector<std::string> fullPath;
+ fullPath.push_back(itksys::SystemTools::GetFilenamePath(m_FileName));
+ fullPath.push_back("/");
+ fullPath.push_back(file);
+
+ std::string fullFileName = itksys::SystemTools::JoinPath(fullPath);
+
+ if (!itksys::SystemTools::FileExists(fullFileName.c_str()))
+ {
ImageSeriesFileReaderException e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << "The image file doesn't exist. \n";
msg << "ImageFileName = " << file << "\n";
- msg << "tested path = " << itksys::SystemTools::GetFilenamePath( m_FileName ) << "\n";
- msg << "Other Tested File = " << fullFileName << "\n";
- e.SetDescription( msg.str().c_str() );
+ msg << "tested path = " << itksys::SystemTools::GetFilenamePath(m_FileName) << "\n";
+ msg << "Other Tested File = " << fullFileName << "\n";
+ e.SetDescription(msg.str().c_str());
throw e;
return;
- }
+ }
else
- {
+ {
// At this step, image file name is modified to add its path
file = fullFileName;
+ }
}
}
- }
// Test if the file can be open for reading access.
std::ifstream readTester;
- readTester.open( file.c_str() );
- if( readTester.fail() )
- {
+ readTester.open(file.c_str());
+ if (readTester.fail())
+ {
readTester.close();
itk::OStringStream msg;
msg << "The file couldn't be opened for reading. "
<< std::endl << "Filename: " << file << std::endl;
- ImageSeriesFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ ImageSeriesFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
return;
- }
+ }
readTester.close();
}
} // end of namespace otb
#endif
-
-
diff --git a/Code/IO/otbJPEG2000ImageIO.cxx b/Code/IO/otbJPEG2000ImageIO.cxx
index a4a2ed6638..d87f9a4e39 100644
--- a/Code/IO/otbJPEG2000ImageIO.cxx
+++ b/Code/IO/otbJPEG2000ImageIO.cxx
@@ -27,27 +27,26 @@
*/
void error_callback(const char *msg, void *client_data)
{
- (void)client_data;
- itkGenericExceptionMacro(<<"OpenJpeg error: "<<msg);
+ (void) client_data;
+ itkGenericExceptionMacro(<< "OpenJpeg error: " << msg);
}
/**
sample warning debug callback expecting no client object
*/
void warning_callback(const char *msg, void *client_data)
{
- (void)client_data;
- otbGenericMsgDebugMacro(<<"OpenJpeg warning: "<<msg);
+ (void) client_data;
+ otbGenericMsgDebugMacro(<< "OpenJpeg warning: " << msg);
}
/**
sample debug callback expecting no client object
*/
void info_callback(const char *msg, void *client_data)
{
- (void)client_data;
- otbMsgDevMacro(<<"OpenJpeg info: "<<msg);
+ (void) client_data;
+ otbMsgDevMacro(<< "OpenJpeg info: " << msg);
}
-
namespace otb
{
@@ -71,12 +70,12 @@ JPEG2000ImageIO::JPEG2000ImageIO()
JPEG2000ImageIO::~JPEG2000ImageIO()
{}
-bool JPEG2000ImageIO::CanReadFile( const char* filename )
+bool JPEG2000ImageIO::CanReadFile(const char* filename)
{
if (filename == NULL)
- {
+ {
return false;
- }
+ }
std::string lFileName(filename);
@@ -84,74 +83,73 @@ bool JPEG2000ImageIO::CanReadFile( const char* filename )
opj_codec_t * codec = NULL;
if (System::SetToLower(System::GetExtension(lFileName)) == "j2k")
- {
- otbMsgDebugMacro(<<"Jpeg2000ImageIO: Creating J2K codec.");
+ {
+ otbMsgDebugMacro(<< "Jpeg2000ImageIO: Creating J2K codec.");
codec = otb_openjpeg_opj_create_decompress(CODEC_J2K);
- }
+ }
else if (System::SetToLower(System::GetExtension(lFileName)) == "jp2"
|| System::SetToLower(System::GetExtension(lFileName)) == "jpx")
- {
- otbMsgDebugMacro(<<"Jpeg2000ImageIO: Creating JP2 codec.");
+ {
+ otbMsgDebugMacro(<< "Jpeg2000ImageIO: Creating JP2 codec.");
codec = otb_openjpeg_opj_create_decompress(CODEC_JP2);
- }
+ }
else
- {
- otbMsgDebugMacro(<<"Jpeg2000ImageIO: Extension not recognized.");
+ {
+ otbMsgDebugMacro(<< "Jpeg2000ImageIO: Extension not recognized.");
return false;
- }
+ }
if (!codec)
- {
- otbMsgDebugMacro(<<"Impossible to create codec.");
+ {
+ otbMsgDebugMacro(<< "Impossible to create codec.");
return false;
- }
- otb_openjpeg_opj_set_info_handler(codec, info_callback,00);
- otb_openjpeg_opj_set_warning_handler(codec, warning_callback,00);
- otb_openjpeg_opj_set_error_handler(codec, error_callback,00);
+ }
+ otb_openjpeg_opj_set_info_handler(codec, info_callback, 00);
+ otb_openjpeg_opj_set_warning_handler(codec, warning_callback, 00);
+ otb_openjpeg_opj_set_error_handler(codec, error_callback, 00);
// Setting default parameters
opj_dparameters_t parameters;
otb_openjpeg_opj_set_default_decoder_parameters(¶meters);
- if (! otb_openjpeg_opj_setup_decoder(codec,¶meters))
- {
- otbMsgDebugMacro(<<"Impossible to set parameter.");
+ if (!otb_openjpeg_opj_setup_decoder(codec, ¶meters))
+ {
+ otbMsgDebugMacro(<< "Impossible to set parameter.");
otb_openjpeg_opj_destroy_codec(codec);
return false;
- }
+ }
// Creating a file
- FILE * file = fopen(filename,"rb");
+ FILE * file = fopen(filename, "rb");
if (!file)
- {
- otbMsgDebugMacro(<<"Impossible to open file.");
+ {
+ otbMsgDebugMacro(<< "Impossible to open file.");
otb_openjpeg_opj_destroy_codec(codec);
return false;
- }
+ }
// Creating a file stream
- opj_stream_t * stream = otb_openjpeg_opj_stream_create_default_file_stream(file,true);
+ opj_stream_t * stream = otb_openjpeg_opj_stream_create_default_file_stream(file, true);
if (!stream)
- {
- otbMsgDebugMacro(<<"Impossible to create stream.");
+ {
+ otbMsgDebugMacro(<< "Impossible to create stream.");
otb_openjpeg_opj_destroy_codec(codec);
fclose(file);
return false;
- }
-
+ }
// trying to read image header
opj_image_t * image;
- OPJ_INT32 tile_x0,tile_y0;
- OPJ_UINT32 tile_width,tile_height,nb_tiles_x,nb_tiles_y;
- bool resp = otb_openjpeg_opj_read_header(codec,
- &image,
- &tile_x0,
- &tile_y0,
- &tile_width,
- &tile_height,
- &nb_tiles_x,
- &nb_tiles_y,
- stream);
+ OPJ_INT32 tile_x0, tile_y0;
+ OPJ_UINT32 tile_width, tile_height, nb_tiles_x, nb_tiles_y;
+ bool resp = otb_openjpeg_opj_read_header(codec,
+ &image,
+ &tile_x0,
+ &tile_y0,
+ &tile_width,
+ &tile_height,
+ &nb_tiles_x,
+ &nb_tiles_y,
+ stream);
// Destroy the codec
otb_openjpeg_opj_stream_destroy(stream);
fclose(file);
@@ -160,7 +158,6 @@ bool JPEG2000ImageIO::CanReadFile( const char* filename )
return resp;
}
-
// Used to print information about this object
void JPEG2000ImageIO::PrintSelf(std::ostream& os, itk::Indent indent) const
{
@@ -183,61 +180,67 @@ void JPEG2000ImageIO::Read(void* buffer)
int buffer_y0 = this->GetIORegion().GetIndex()[1];
int buffer_x0 = this->GetIORegion().GetIndex()[0];
- otbMsgDevMacro( <<" JPEG2000ImageIO::Read() ");
- otbMsgDevMacro( <<" ImageDimension : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDevMacro( <<" IORegion : "<<this->GetIORegion());
- otbMsgDevMacro( <<" Nb Of Components : "<<this->GetNumberOfComponents());
+ otbMsgDevMacro(<< " JPEG2000ImageIO::Read() ");
+ otbMsgDevMacro(<< " ImageDimension : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDevMacro(<< " IORegion : " << this->GetIORegion());
+ otbMsgDevMacro(<< " Nb Of Components : " << this->GetNumberOfComponents());
- otbMsgDevMacro(<<"IORegion: "<<this->GetIORegion());
- otbMsgDevMacro(<<"Area to read: "<<buffer_x0<<" "<<buffer_y0 <<" "<< buffer_x0+buffer_size_x-1 <<" "<<buffer_y0+buffer_size_y-1 );
- otbMsgDevMacro(<<"Component type: "<<this->GetComponentTypeAsString(this->GetComponentType()));
+ otbMsgDevMacro(<< "IORegion: " << this->GetIORegion());
+ otbMsgDevMacro(
+ << "Area to read: " << buffer_x0 << " " << buffer_y0 << " " << buffer_x0 + buffer_size_x - 1 << " " << buffer_y0 +
+ buffer_size_y - 1);
+ otbMsgDevMacro(<< "Component type: " << this->GetComponentTypeAsString(this->GetComponentType()));
// Creating openjpeg objects
if (System::SetToLower(System::GetExtension(m_FileName)) == "j2k")
- {
+ {
m_Codec = otb_openjpeg_opj_create_decompress(CODEC_J2K);
- }
+ }
else if (System::SetToLower(System::GetExtension(m_FileName)) == "jp2"
|| System::SetToLower(System::GetExtension(m_FileName)) == "jpx")
- {
+ {
m_Codec = otb_openjpeg_opj_create_decompress(CODEC_JP2);
- }
+ }
- otb_openjpeg_opj_set_info_handler(m_Codec, info_callback,00);
- otb_openjpeg_opj_set_warning_handler(m_Codec, warning_callback,00);
- otb_openjpeg_opj_set_error_handler(m_Codec, error_callback,00);
+ otb_openjpeg_opj_set_info_handler(m_Codec, info_callback, 00);
+ otb_openjpeg_opj_set_warning_handler(m_Codec, warning_callback, 00);
+ otb_openjpeg_opj_set_error_handler(m_Codec, error_callback, 00);
if (!m_Codec)
- {
- itkExceptionMacro(<<"Failed to create openjpeg codec.");
- }
+ {
+ itkExceptionMacro(<< "Failed to create openjpeg codec.");
+ }
// Create default parameters
otb_openjpeg_opj_set_default_decoder_parameters(&m_Parameters);
// Set the requested region
- otb_openjpeg_opj_restrict_decoding(&m_Parameters,buffer_x0,buffer_y0,buffer_x0+buffer_size_x-1,buffer_y0+buffer_size_y-1);
+ otb_openjpeg_opj_restrict_decoding(&m_Parameters,
+ buffer_x0,
+ buffer_y0,
+ buffer_x0 + buffer_size_x - 1,
+ buffer_y0 + buffer_size_y - 1);
- if (!otb_openjpeg_opj_setup_decoder(m_Codec,&m_Parameters))
- {
- itkExceptionMacro(<<"Failed to set up decoder parameters.");
- }
+ if (!otb_openjpeg_opj_setup_decoder(m_Codec, &m_Parameters))
+ {
+ itkExceptionMacro(<< "Failed to set up decoder parameters.");
+ }
- m_File = fopen(m_FileName.c_str(),"rb");
+ m_File = fopen(m_FileName.c_str(), "rb");
if (!m_File)
- {
- itkExceptionMacro(<<"Failed to open file: "<<m_FileName);
- }
+ {
+ itkExceptionMacro(<< "Failed to open file: " << m_FileName);
+ }
- m_OpenJpegStream = otb_openjpeg_opj_stream_create_default_file_stream(m_File,true);
+ m_OpenJpegStream = otb_openjpeg_opj_stream_create_default_file_stream(m_File, true);
if (!m_OpenJpegStream)
- {
- itkExceptionMacro(<<"Failed to create file stream.");
- }
+ {
+ itkExceptionMacro(<< "Failed to create file stream.");
+ }
- OPJ_INT32 tile_x0,tile_y0;
- OPJ_UINT32 tile_width,tile_height,nb_tiles_x,nb_tiles_y;
+ OPJ_INT32 tile_x0, tile_y0;
+ OPJ_UINT32 tile_width, tile_height, nb_tiles_x, nb_tiles_y;
if (!otb_openjpeg_opj_read_header(m_Codec,
&m_OpenJpegImage,
@@ -248,95 +251,96 @@ void JPEG2000ImageIO::Read(void* buffer)
&nb_tiles_x,
&nb_tiles_y,
m_OpenJpegStream))
- {
- itkExceptionMacro(<<"Failed to read image header.");
- }
+ {
+ itkExceptionMacro(<< "Failed to read image header.");
+ }
OPJ_BYTE * tile_data;
- OPJ_INT32 tile_x1,tile_y1;
- OPJ_UINT32 data_size,nb_comps;
+ OPJ_INT32 tile_x1, tile_y1;
+ OPJ_UINT32 data_size, nb_comps;
OPJ_UINT32 tile_index;
OPJ_BOOL goesOn = true;
while (goesOn)
- {
- if (! otb_openjpeg_opj_read_tile_header(m_Codec,
- &tile_index,
- &data_size,
- &tile_x0,
- &tile_y0,
- &tile_x1,
- &tile_y1,
- &nb_comps,
- &goesOn,
- m_OpenJpegStream))
- {
- itkExceptionMacro(<<"Error while reading tile header.");
- }
- if (goesOn)
{
- otbMsgDebugMacro(<<"==========================");
- otbMsgDebugMacro(<<"Tile index: "<<tile_index);
- otbMsgDebugMacro(<<"Data size: "<<data_size);
- otbMsgDebugMacro(<<"Tile (x0,y0): "<<tile_x0<<" "<<tile_y0);
- otbMsgDebugMacro(<<"Tile (x1,y1): "<<tile_x1<<" "<<tile_y1);
- otbMsgDebugMacro(<<"Tile number of component: "<<nb_comps);
- otbMsgDebugMacro(<<"Goes on: "<<goesOn);
- otbMsgDevMacro(<<"--------------------------");
-
-
- tile_data = new OPJ_BYTE[data_size];
-
- if (! otb_openjpeg_opj_decode_tile_data(m_Codec,tile_index,tile_data,data_size,m_OpenJpegStream))
+ if (!otb_openjpeg_opj_read_tile_header(m_Codec,
+ &tile_index,
+ &data_size,
+ &tile_x0,
+ &tile_y0,
+ &tile_x1,
+ &tile_y1,
+ &nb_comps,
+ &goesOn,
+ m_OpenJpegStream))
{
- itkExceptionMacro(<<"Error while reading tile data.");
+ itkExceptionMacro(<< "Error while reading tile header.");
}
-
- std::streamsize tile_component_size = data_size/nb_comps;
- std::streamoff buffer_skip = std::max(0,tile_y0-buffer_y0)*buffer_size_x*nb_comps*m_NbOctetPixel;
- std::streamoff tile_skip = std::max(0,buffer_y0-tile_y0)*(tile_x1-tile_x0)*m_NbOctetPixel;
- std::streamoff tile_offset_begin = std::max(0,buffer_x0-tile_x0)*m_NbOctetPixel;
- std::streamoff buffer_offset_begin = std::max(0,tile_x0-buffer_x0)*nb_comps*m_NbOctetPixel;
- std::streamsize line_size = (std::min(tile_x1,buffer_x0+buffer_size_x-1)-std::max(tile_x0,buffer_x0)+1);
- std::streamsize nb_lines = std::min(tile_y1,buffer_y0+buffer_size_y-1)- std::max(tile_y0,buffer_y0)+1;
- std::streamsize buffer_line_size = buffer_size_x*nb_comps*m_NbOctetPixel;
- std::streamsize tile_line_size = (tile_x1-tile_x0)*m_NbOctetPixel;
- std::streampos buffer_step = nb_comps * m_NbOctetPixel;
-
- otbMsgDevMacro(<<"buffer_skip: "<<buffer_skip);
- otbMsgDevMacro(<<"tile_skip: "<<tile_skip);
- otbMsgDevMacro(<<"buffer_offset_begin: "<<buffer_offset_begin);
- otbMsgDevMacro(<<"tile_offset_begin: "<<tile_offset_begin);
- otbMsgDevMacro(<<"buffer_line_size: "<<buffer_line_size);
- otbMsgDevMacro(<<"tile_line_size: "<<tile_line_size);
- otbMsgDevMacro(<<"line_size: "<<line_size);
- otbMsgDevMacro(<<"nb_lines: "<<nb_lines);
- otbMsgDevMacro(<<"buffer_step: "<<buffer_step);
-
-
- std::streamoff buffer_pos,tile_pos;
-
- for (unsigned int comp = 0;comp<nb_comps;++comp)
+ if (goesOn)
{
- for (int line = 0; line<nb_lines;++line)
+ otbMsgDebugMacro(<< "==========================");
+ otbMsgDebugMacro(<< "Tile index: " << tile_index);
+ otbMsgDebugMacro(<< "Data size: " << data_size);
+ otbMsgDebugMacro(<< "Tile (x0,y0): " << tile_x0 << " " << tile_y0);
+ otbMsgDebugMacro(<< "Tile (x1,y1): " << tile_x1 << " " << tile_y1);
+ otbMsgDebugMacro(<< "Tile number of component: " << nb_comps);
+ otbMsgDebugMacro(<< "Goes on: " << goesOn);
+ otbMsgDevMacro(<< "--------------------------");
+
+ tile_data = new OPJ_BYTE[data_size];
+
+ if (!otb_openjpeg_opj_decode_tile_data(m_Codec, tile_index, tile_data, data_size, m_OpenJpegStream))
{
- buffer_pos = buffer_skip + comp*m_NbOctetPixel + line*buffer_line_size + buffer_offset_begin;
- tile_pos = comp *tile_component_size + tile_skip + line*tile_line_size + tile_offset_begin;
+ itkExceptionMacro(<< "Error while reading tile data.");
+ }
- for (int cols = 0;cols<line_size;++cols)
+ std::streamsize tile_component_size = data_size / nb_comps;
+ std::streamoff buffer_skip =
+ std::max(0, tile_y0 - buffer_y0) * buffer_size_x * nb_comps * m_NbOctetPixel;
+ std::streamoff tile_skip = std::max(0, buffer_y0 - tile_y0) * (tile_x1 - tile_x0) * m_NbOctetPixel;
+ std::streamoff tile_offset_begin = std::max(0, buffer_x0 - tile_x0) * m_NbOctetPixel;
+ std::streamoff buffer_offset_begin = std::max(0, tile_x0 - buffer_x0) * nb_comps * m_NbOctetPixel;
+ std::streamsize line_size =
+ (std::min(tile_x1, buffer_x0 + buffer_size_x - 1) - std::max(tile_x0, buffer_x0) + 1);
+ std::streamsize nb_lines = std::min(tile_y1, buffer_y0 + buffer_size_y - 1) - std::max(tile_y0,
+ buffer_y0) + 1;
+ std::streamsize buffer_line_size = buffer_size_x * nb_comps * m_NbOctetPixel;
+ std::streamsize tile_line_size = (tile_x1 - tile_x0) * m_NbOctetPixel;
+ std::streampos buffer_step = nb_comps * m_NbOctetPixel;
+
+ otbMsgDevMacro(<< "buffer_skip: " << buffer_skip);
+ otbMsgDevMacro(<< "tile_skip: " << tile_skip);
+ otbMsgDevMacro(<< "buffer_offset_begin: " << buffer_offset_begin);
+ otbMsgDevMacro(<< "tile_offset_begin: " << tile_offset_begin);
+ otbMsgDevMacro(<< "buffer_line_size: " << buffer_line_size);
+ otbMsgDevMacro(<< "tile_line_size: " << tile_line_size);
+ otbMsgDevMacro(<< "line_size: " << line_size);
+ otbMsgDevMacro(<< "nb_lines: " << nb_lines);
+ otbMsgDevMacro(<< "buffer_step: " << buffer_step);
+
+ std::streamoff buffer_pos, tile_pos;
+
+ for (unsigned int comp = 0; comp < nb_comps; ++comp)
+ {
+ for (int line = 0; line < nb_lines; ++line)
{
- for (unsigned int octet = 0;octet<m_NbOctetPixel;++octet)
+ buffer_pos = buffer_skip + comp * m_NbOctetPixel + line * buffer_line_size + buffer_offset_begin;
+ tile_pos = comp * tile_component_size + tile_skip + line * tile_line_size + tile_offset_begin;
+
+ for (int cols = 0; cols < line_size; ++cols)
{
- charstarbuffer[buffer_pos + cols*buffer_step + octet]= tile_data[tile_pos + cols*m_NbOctetPixel + octet];
+ for (unsigned int octet = 0; octet < m_NbOctetPixel; ++octet)
+ {
+ charstarbuffer[buffer_pos + cols * buffer_step +
+ octet] = tile_data[tile_pos + cols * m_NbOctetPixel + octet];
+ }
}
}
}
- }
delete[] tile_data;
+ }
}
- }
- otbMsgDebugMacro(<<"==========================");
-
+ otbMsgDebugMacro(<< "==========================");
otb_openjpeg_opj_stream_destroy(m_OpenJpegStream);
fclose(m_File);
@@ -344,58 +348,57 @@ void JPEG2000ImageIO::Read(void* buffer)
otb_openjpeg_opj_image_destroy(m_OpenJpegImage);
}
-
void JPEG2000ImageIO::ReadImageInformation()
{
- if ( m_FileName.empty() == true )
- {
- itkExceptionMacro(<<"JPEG2000ImageIO: empty image filename.");
- }
+ if (m_FileName.empty() == true)
+ {
+ itkExceptionMacro(<< "JPEG2000ImageIO: empty image filename.");
+ }
// Creating openjpeg objects
if (System::SetToLower(System::GetExtension(m_FileName)) == "j2k")
- {
+ {
m_Codec = otb_openjpeg_opj_create_decompress(CODEC_J2K);
- }
+ }
else if (System::SetToLower(System::GetExtension(m_FileName)) == "jp2"
|| System::SetToLower(System::GetExtension(m_FileName)) == "jpx")
- {
+ {
m_Codec = otb_openjpeg_opj_create_decompress(CODEC_JP2);
- }
+ }
- otb_openjpeg_opj_set_info_handler(m_Codec, info_callback,00);
- otb_openjpeg_opj_set_warning_handler(m_Codec, warning_callback,00);
- otb_openjpeg_opj_set_error_handler(m_Codec, error_callback,00);
+ otb_openjpeg_opj_set_info_handler(m_Codec, info_callback, 00);
+ otb_openjpeg_opj_set_warning_handler(m_Codec, warning_callback, 00);
+ otb_openjpeg_opj_set_error_handler(m_Codec, error_callback, 00);
if (!m_Codec)
- {
- itkExceptionMacro(<<"Failed to create openjpeg codec.");
- }
+ {
+ itkExceptionMacro(<< "Failed to create openjpeg codec.");
+ }
// Create default parameters
otb_openjpeg_opj_set_default_decoder_parameters(&m_Parameters);
- if (!otb_openjpeg_opj_setup_decoder(m_Codec,&m_Parameters))
- {
- itkExceptionMacro(<<"Failed to set up decoder parameters.");
- }
+ if (!otb_openjpeg_opj_setup_decoder(m_Codec, &m_Parameters))
+ {
+ itkExceptionMacro(<< "Failed to set up decoder parameters.");
+ }
- m_File = fopen(m_FileName.c_str(),"rb");
+ m_File = fopen(m_FileName.c_str(), "rb");
if (!m_File)
- {
- itkExceptionMacro(<<"Failed to open file: "<<m_FileName);
- }
+ {
+ itkExceptionMacro(<< "Failed to open file: " << m_FileName);
+ }
- m_OpenJpegStream = otb_openjpeg_opj_stream_create_default_file_stream(m_File,true);
+ m_OpenJpegStream = otb_openjpeg_opj_stream_create_default_file_stream(m_File, true);
if (!m_OpenJpegStream)
- {
- itkExceptionMacro(<<"Failed to create file stream.");
- }
+ {
+ itkExceptionMacro(<< "Failed to create file stream.");
+ }
- OPJ_INT32 tile_x0,tile_y0;
- OPJ_UINT32 tile_width,tile_height,nb_tiles_x,nb_tiles_y;
+ OPJ_INT32 tile_x0, tile_y0;
+ OPJ_UINT32 tile_width, tile_height, nb_tiles_x, nb_tiles_y;
if (!otb_openjpeg_opj_read_header(m_Codec,
&m_OpenJpegImage,
@@ -406,91 +409,90 @@ void JPEG2000ImageIO::ReadImageInformation()
&nb_tiles_x,
&nb_tiles_y,
m_OpenJpegStream))
- {
- itkExceptionMacro(<<"Failed to read image header.");
- }
+ {
+ itkExceptionMacro(<< "Failed to read image header.");
+ }
- m_Dimensions[0]=m_OpenJpegImage->x1 - m_OpenJpegImage->x0;
- m_Dimensions[1]=m_OpenJpegImage->y1 - m_OpenJpegImage->y0;
+ m_Dimensions[0] = m_OpenJpegImage->x1 - m_OpenJpegImage->x0;
+ m_Dimensions[1] = m_OpenJpegImage->y1 - m_OpenJpegImage->y0;
this->SetNumberOfDimensions(2);
if (m_Dimensions[0] == 0 || m_Dimensions[1] == 0)
- {
- itkExceptionMacro(<<"Image size is null.");
- }
+ {
+ itkExceptionMacro(<< "Image size is null.");
+ }
this->SetNumberOfComponents(m_OpenJpegImage->numcomps);
this->SetFileTypeToBinary();
unsigned int precision = m_OpenJpegImage->comps->prec;
- int isSigned = m_OpenJpegImage->comps->sgnd;
+ int isSigned = m_OpenJpegImage->comps->sgnd;
- if (precision<=8)
- {
+ if (precision <= 8)
+ {
m_NbOctetPixel = 1;
if (isSigned)
- {
+ {
SetComponentType(CHAR);
- }
+ }
else
- {
+ {
SetComponentType(UCHAR);
+ }
}
- }
- else if (precision<=16)
- {
+ else if (precision <= 16)
+ {
m_NbOctetPixel = 2;
if (isSigned)
- {
+ {
SetComponentType(SHORT);
- }
+ }
else
- {
+ {
SetComponentType(USHORT);
+ }
}
- }
else
- {
+ {
m_NbOctetPixel = 4;
if (isSigned)
- {
+ {
SetComponentType(INT);
- }
+ }
else
- {
+ {
SetComponentType(UINT);
+ }
}
- }
- if ( this->GetNumberOfComponents() == 1 )
- {
+ if (this->GetNumberOfComponents() == 1)
+ {
this->SetPixelType(SCALAR);
- }
+ }
else
- {
+ {
this->SetPixelType(VECTOR);
- }
-
- otbMsgDebugMacro(<<"==========================");
- otbMsgDebugMacro(<<"ReadImageInformation: ");
- otbMsgDebugMacro(<<"Tile (x0,y0): "<<tile_x0<<" "<<tile_y0);
- otbMsgDebugMacro(<<"Tile size: "<<tile_width<<" x "<<tile_height);
- otbMsgDebugMacro(<<"Number of tiles: "<<nb_tiles_x<<" "<<nb_tiles_y);
- otbMsgDebugMacro(<<"Precision: "<<precision);
- otbMsgDebugMacro(<<"Signed: "<<isSigned);
- otbMsgDebugMacro(<<"Number of octet per value: "<<m_NbOctetPixel);
- otbMsgDebugMacro(<<"==========================");
-
-
- otbMsgDebugMacro( <<"Driver to read: JPEG2000");
- otbMsgDebugMacro( <<" Read file : "<< m_FileName);
- otbMsgDebugMacro( <<" Size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDebugMacro( <<" ComponentType : "<<this->GetComponentType());
- otbMsgDebugMacro( <<" NumberOfComponents : "<<this->GetNumberOfComponents());
- otbMsgDebugMacro( <<" ComponentSize : "<<this->GetComponentSize());
- otbMsgDebugMacro( <<" GetPixelSize : "<<this->GetPixelSize());
+ }
+
+ otbMsgDebugMacro(<< "==========================");
+ otbMsgDebugMacro(<< "ReadImageInformation: ");
+ otbMsgDebugMacro(<< "Tile (x0,y0): " << tile_x0 << " " << tile_y0);
+ otbMsgDebugMacro(<< "Tile size: " << tile_width << " x " << tile_height);
+ otbMsgDebugMacro(<< "Number of tiles: " << nb_tiles_x << " " << nb_tiles_y);
+ otbMsgDebugMacro(<< "Precision: " << precision);
+ otbMsgDebugMacro(<< "Signed: " << isSigned);
+ otbMsgDebugMacro(<< "Number of octet per value: " << m_NbOctetPixel);
+ otbMsgDebugMacro(<< "==========================");
+
+ otbMsgDebugMacro(<< "Driver to read: JPEG2000");
+ otbMsgDebugMacro(<< " Read file : " << m_FileName);
+ otbMsgDebugMacro(<< " Size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDebugMacro(<< " ComponentType : " << this->GetComponentType());
+ otbMsgDebugMacro(<< " NumberOfComponents : " << this->GetNumberOfComponents());
+ otbMsgDebugMacro(<< " ComponentSize : " << this->GetComponentSize());
+ otbMsgDebugMacro(<< " GetPixelSize : " << this->GetPixelSize());
otb_openjpeg_opj_stream_destroy(m_OpenJpegStream);
fclose(m_File);
@@ -498,8 +500,7 @@ void JPEG2000ImageIO::ReadImageInformation()
otb_openjpeg_opj_image_destroy(m_OpenJpegImage);
}
-
-bool JPEG2000ImageIO::CanWriteFile( const char* /*filename*/ )
+bool JPEG2000ImageIO::CanWriteFile(const char* /*filename*/)
{
return false;
// std::string lFileName(filename);
@@ -588,7 +589,6 @@ void JPEG2000ImageIO::Write(const void* /*buffer*/)
// /* m_Parameters.cp_disto_alloc = 1 or m_Parameters.cp_fixed_alloc = 1 */
// /* m_Parameters.tcp_rates[0] = ... */
-
// /* tile definitions parameters */
// /* position of the tile grid aligned with the image */
// m_Parameters.cp_tx0 = 0;
@@ -614,7 +614,6 @@ void JPEG2000ImageIO::Write(const void* /*buffer*/)
// /* m_Parameters.prch_init[i] = .. */
// /* m_Parameters.prcw_init[i] = .. */
-
// /* do not use progression order changes */
// /*m_Parameters.numpocs = 0;*/
// /* m_Parameters.POC[i].... */
@@ -644,7 +643,6 @@ void JPEG2000ImageIO::Write(const void* /*buffer*/)
// /* if we are using mct */
// /* opj_set_MCT(&m_Parameters,l_mct,l_offsets,NUM_COMPS); */
-
// /* image definition */
// l_current_param_ptr = m_Parameters;
// for
@@ -663,7 +661,6 @@ void JPEG2000ImageIO::Write(const void* /*buffer*/)
// ++l_current_param_ptr;
// }
-
// m_Codec = opj_create_compress(CODEC_JP2);
// opj_set_info_handler(m_Codec, info_callback,00);
// opj_set_warning_handler(m_Codec, warning_callback,00);
@@ -723,7 +720,6 @@ void JPEG2000ImageIO::Write(const void* /*buffer*/)
// unsigned int tile_index = nb_tile_x*buffer_y0/m_Parameters.cp_tdy+buffer_x0/m_Parameters.cp_tdx;
-
// OPJ_BYTE * desinterleaved_data = new OPJ_BYTE[buffer_size];
// std::streamoff step = m_NbBands*m_NbOctetPixel;
@@ -733,39 +729,33 @@ void JPEG2000ImageIO::Write(const void* /*buffer*/)
// for(comp = 0;comp<m_NbBands;++comp)
// {
-
// }
-
// if(! opj_write_tile(m_Codec,tile_index,charstarbuffer,buffer_size,m_OpenJpegStream))
// {
-
// }
}
-
void JPEG2000ImageIO::WriteImageInformation()
{
- if ( m_FileName == "" )
- {
- itkExceptionMacro(<<"A FileName must be specified.");
- }
- if ( CanWriteFile(m_FileName.c_str()) == false)
- {
- itkExceptionMacro(<< "The file "<<m_FileName.c_str()<<" is not defined as a JPEG2000 file");
- }
-
- otbMsgDebugMacro( <<"Driver to write: JPEG2000");
- otbMsgDebugMacro( <<" Write file : "<< m_FileName);
- otbMsgDebugMacro( <<" Size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDebugMacro( <<" ComponentType : "<<this->GetComponentType());
- otbMsgDebugMacro( <<" NumberOfComponents : "<<this->GetNumberOfComponents());
- otbMsgDebugMacro( <<" ComponentSize : "<<this->GetComponentSize());
- otbMsgDebugMacro( <<" GetPixelSize : "<<this->GetPixelSize());
+ if (m_FileName == "")
+ {
+ itkExceptionMacro(<< "A FileName must be specified.");
+ }
+ if (CanWriteFile(m_FileName.c_str()) == false)
+ {
+ itkExceptionMacro(<< "The file " << m_FileName.c_str() << " is not defined as a JPEG2000 file");
+ }
-}
+ otbMsgDebugMacro(<< "Driver to write: JPEG2000");
+ otbMsgDebugMacro(<< " Write file : " << m_FileName);
+ otbMsgDebugMacro(<< " Size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDebugMacro(<< " ComponentType : " << this->GetComponentType());
+ otbMsgDebugMacro(<< " NumberOfComponents : " << this->GetNumberOfComponents());
+ otbMsgDebugMacro(<< " ComponentSize : " << this->GetComponentSize());
+ otbMsgDebugMacro(<< " GetPixelSize : " << this->GetPixelSize());
+}
} // end namespace otb
-
diff --git a/Code/IO/otbJPEG2000ImageIO.h b/Code/IO/otbJPEG2000ImageIO.h
index 1929f9c733..01920f4015 100644
--- a/Code/IO/otbJPEG2000ImageIO.h
+++ b/Code/IO/otbJPEG2000ImageIO.h
@@ -46,9 +46,9 @@ class ITK_EXPORT JPEG2000ImageIO : public itk::ImageIOBase
public:
/** Standard class typedefs. */
- typedef JPEG2000ImageIO Self;
- typedef itk::ImageIOBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef JPEG2000ImageIO Self;
+ typedef itk::ImageIOBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -66,7 +66,7 @@ public:
virtual bool CanStreamRead()
{
return true;
- };
+ }
/** Set the spacing and dimention information for the set filename. */
virtual void ReadImageInformation();
@@ -87,7 +87,7 @@ public:
virtual bool CanStreamWrite()
{
return true;
- };
+ }
/** Writes the spacing and dimentions of the image.
* Assumes SetFileName has been called with a valid file name. */
@@ -106,8 +106,8 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- JPEG2000ImageIO(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ JPEG2000ImageIO(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Openjpeg decoder parameters */
opj_dparameters_t m_Parameters;
diff --git a/Code/IO/otbJPEG2000ImageIOFactory.cxx b/Code/IO/otbJPEG2000ImageIOFactory.cxx
index 3d89a60b47..0b557fefde 100644
--- a/Code/IO/otbJPEG2000ImageIOFactory.cxx
+++ b/Code/IO/otbJPEG2000ImageIOFactory.cxx
@@ -21,7 +21,6 @@
#include "otbJPEG2000ImageIO.h"
#include "itkVersion.h"
-
namespace otb
{
@@ -51,4 +50,3 @@ JPEG2000ImageIOFactory::GetDescription() const
}
} // end namespace otb
-
diff --git a/Code/IO/otbJPEG2000ImageIOFactory.h b/Code/IO/otbJPEG2000ImageIOFactory.h
index c9c8a2ff3c..2b88f25261 100644
--- a/Code/IO/otbJPEG2000ImageIOFactory.h
+++ b/Code/IO/otbJPEG2000ImageIOFactory.h
@@ -30,10 +30,10 @@ class ITK_EXPORT JPEG2000ImageIOFactory : public itk::ObjectFactoryBase
{
public:
/** Standard class typedefs. */
- typedef JPEG2000ImageIOFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef JPEG2000ImageIOFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -57,12 +57,11 @@ protected:
virtual ~JPEG2000ImageIOFactory();
private:
- JPEG2000ImageIOFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ JPEG2000ImageIOFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbKMLVectorDataIO.h b/Code/IO/otbKMLVectorDataIO.h
index d15e002e44..c349e1e32c 100644
--- a/Code/IO/otbKMLVectorDataIO.h
+++ b/Code/IO/otbKMLVectorDataIO.h
@@ -23,7 +23,6 @@
#include <string>
#include <vector>
-
#include "kml/dom.h"
#include "kml/base/file.h"
@@ -37,14 +36,14 @@ namespace otb
*/
template <class TData>
class ITK_EXPORT KMLVectorDataIO
- : public VectorDataIOBase<TData>
+ : public VectorDataIOBase<TData>
{
public:
/** Standard class typedefs. */
- typedef KMLVectorDataIO Self;
- typedef VectorDataIOBase<TData> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef KMLVectorDataIO Self;
+ typedef VectorDataIOBase<TData> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
@@ -54,30 +53,29 @@ public:
itkTypeMacro(KMLVectorDataIO, VectorDataIOBase);
/** Byte order typedef */
- typedef typename Superclass::ByteOrder ByteOrder;
+ typedef typename Superclass::ByteOrder ByteOrder;
/** Data typedef */
- typedef TData VectorDataType;
- typedef typename VectorDataType::DataTreeType DataTreeType;
- typedef typename DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
- typedef typename DataTreeType::Pointer DataTreePointerType;
- typedef typename DataTreeType::ConstPointer DataTreeConstPointerType;
- typedef typename VectorDataType::DataNodeType DataNodeType;
- typedef typename DataNodeType::Pointer DataNodePointerType;
- typedef typename DataNodeType::PointType PointType;
- typedef typename DataNodeType::LineType LineType;
- typedef typename LineType::VertexListType VertexListType;
- typedef typename VertexListType::ConstPointer VertexListConstPointerType;
- typedef typename LineType::Pointer LinePointerType;
- typedef typename LineType::VertexType VertexType;
- typedef typename DataNodeType::PolygonType PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
- typedef typename DataNodeType::PolygonListType PolygonListType;
- typedef typename PolygonListType::Pointer PolygonListPointerType;
- typedef typename VectorDataType::Pointer VectorDataPointerType;
- typedef typename VectorDataType::ConstPointer VectorDataConstPointerType;
-
+ typedef TData VectorDataType;
+ typedef typename VectorDataType::DataTreeType DataTreeType;
+ typedef typename DataTreeType::TreeNodeType InternalTreeNodeType;
+ typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
+ typedef typename DataTreeType::Pointer DataTreePointerType;
+ typedef typename DataTreeType::ConstPointer DataTreeConstPointerType;
+ typedef typename VectorDataType::DataNodeType DataNodeType;
+ typedef typename DataNodeType::Pointer DataNodePointerType;
+ typedef typename DataNodeType::PointType PointType;
+ typedef typename DataNodeType::LineType LineType;
+ typedef typename LineType::VertexListType VertexListType;
+ typedef typename VertexListType::ConstPointer VertexListConstPointerType;
+ typedef typename LineType::Pointer LinePointerType;
+ typedef typename LineType::VertexType VertexType;
+ typedef typename DataNodeType::PolygonType PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef typename DataNodeType::PolygonListType PolygonListType;
+ typedef typename PolygonListType::Pointer PolygonListPointerType;
+ typedef typename VectorDataType::Pointer VectorDataPointerType;
+ typedef typename VectorDataType::ConstPointer VectorDataConstPointerType;
/*-------- This part of the interface deals with reading data. ------ */
@@ -117,7 +115,6 @@ protected:
void WalkContainer(const kmldom::ContainerPtr& container, DataNodePointerType father);
-
/** Conversion tools */
DataNodePointerType ConvertGeometryToPointNode(const kmldom::GeometryPtr& geometry);
DataNodePointerType ConvertGeometryToLineStringNode(const kmldom::GeometryPtr& geometry);
@@ -125,14 +122,13 @@ protected:
DataNodePointerType ConvertGeometryToPolygonNode(const kmldom::GeometryPtr& geometry);
/** end conversion tools */
-
void ProcessNodeWrite(InternalTreeNodeType * source, kmldom::KmlFactory* factory,
kmldom::KmlPtr kml, kmldom::DocumentPtr currentDocument, kmldom::FolderPtr currentFolder,
kmldom::MultiGeometryPtr currentMultiGeometry);
private:
- KMLVectorDataIO(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ KMLVectorDataIO(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
DataTreePointerType m_Tree;
diff --git a/Code/IO/otbKMLVectorDataIO.txx b/Code/IO/otbKMLVectorDataIO.txx
index c146d56e1b..a8da150163 100644
--- a/Code/IO/otbKMLVectorDataIO.txx
+++ b/Code/IO/otbKMLVectorDataIO.txx
@@ -55,24 +55,24 @@ KMLVectorDataIO<TData>::~KMLVectorDataIO()
template<class TData>
bool
-KMLVectorDataIO<TData>::CanReadFile( const char* filename ) const
+KMLVectorDataIO<TData>::CanReadFile(const char* filename) const
{
std::string lFileName(filename);
- if ( System::IsADirName(lFileName) == true )
- {
+ if (System::IsADirName(lFileName) == true)
+ {
return false;
- }
- if ( System::SetToLower(System::GetExtension(lFileName)) != "kml" )
- {
+ }
+ if (System::SetToLower(System::GetExtension(lFileName)) != "kml")
+ {
return false;
- }
- if ( kmlbase::File::Exists(lFileName) == false )
- {
+ }
+ if (kmlbase::File::Exists(lFileName) == false)
+ {
return false;
- }
+ }
std::string kml;
- return (kmlbase::File::ReadFileToString(lFileName, &kml) );
+ return (kmlbase::File::ReadFileToString(lFileName, &kml));
}
// Get the features of the kml file, read into the root
@@ -82,9 +82,9 @@ KMLVectorDataIO<TData>::GetRootFeature(const kmldom::ElementPtr& root)
{
const kmldom::KmlPtr kml = kmldom::AsKml(root);
if (kml && kml->has_feature())
- {
+ {
return kml->get_feature();
- }
+ }
return kmldom::AsFeature(root);
}
@@ -94,10 +94,10 @@ void
KMLVectorDataIO<TData>::PrintIndented(std::string item, int depth)
{
while (depth--)
- {
+ {
std::cout << " ";
- }
- std::cout << item <<std::endl;
+ }
+ std::cout << item << std::endl;
}
template<class TData>
@@ -108,20 +108,20 @@ KMLVectorDataIO<TData>::WalkFeature(const kmldom::FeaturePtr& feature, DataNodeP
DataNodePointerType node = NULL;
if (feature)
- {
- if (const kmldom::ContainerPtr container = kmldom::AsContainer(feature))
{
- WalkContainer(container,father);
- }
+ if (const kmldom::ContainerPtr container = kmldom::AsContainer(feature))
+ {
+ WalkContainer(container, father);
+ }
else if (const kmldom::PlacemarkPtr placemark = kmldom::AsPlacemark(feature))
- {
- WalkGeometry(placemark->get_geometry(),father);
- }
+ {
+ WalkGeometry(placemark->get_geometry(), father);
+ }
// The Read() method is not exhaustive it is possible to add the read of the "link",
// the style (iconStyle, LineStyle...). Then into the containers we also can find the fields :
// <visibility> <description> <LookAt>... cf. code.google.com/apis/kml/documentation/kmlelementssinmaps.html
- }
+ }
return;
}
@@ -133,67 +133,67 @@ KMLVectorDataIO<TData>::WalkContainer(const kmldom::ContainerPtr& container, Dat
DataNodePointerType node = NULL;
for (size_t i = 0; i < container->get_feature_array_size(); ++i)
- {
+ {
kmldom::FeaturePtr feature = container->get_feature_array_at(i);
switch (feature->Type())
- {
+ {
case kmldom::Type_Document:
- {
+ {
DataNodePointerType document = DataNodeType::New();
document->SetNodeType(DOCUMENT);
document->SetNodeId(feature->get_id());
if (feature->has_name())
- {
- document->SetFieldAsString("name",feature->get_name());
- }
- m_Tree->Add(document,father);
- WalkFeature(feature,document);
+ {
+ document->SetFieldAsString("name", feature->get_name());
+ }
+ m_Tree->Add(document, father);
+ WalkFeature(feature, document);
break;
- }
+ }
case kmldom::Type_Folder:
- {
+ {
DataNodePointerType folder = DataNodeType::New();
folder->SetNodeType(FOLDER);
folder->SetNodeId(feature->get_id());
if (feature->has_name())
- {
- folder->SetFieldAsString("name",feature->get_name());
- }
- m_Tree->Add(folder,father);
- WalkFeature(feature,folder);
+ {
+ folder->SetFieldAsString("name", feature->get_name());
+ }
+ m_Tree->Add(folder, father);
+ WalkFeature(feature, folder);
break;
- }
+ }
case kmldom::Type_GroundOverlay:
- {
- WalkFeature(feature,father);
+ {
+ WalkFeature(feature, father);
break;
- }
+ }
case kmldom::Type_NetworkLink:
- {
- WalkFeature(feature,father);
+ {
+ WalkFeature(feature, father);
break;
- }
+ }
case kmldom::Type_PhotoOverlay:
- {
- WalkFeature(feature,father);
+ {
+ WalkFeature(feature, father);
break;
- }
+ }
case kmldom::Type_Placemark:
- {
+ {
// We just ignore placemarks
- WalkFeature(feature,father);
+ WalkFeature(feature, father);
break;
- }
+ }
case kmldom::Type_ScreenOverlay:
- {
- WalkFeature(feature,father);
+ {
+ WalkFeature(feature, father);
break;
- }
+ }
default:
break;
- }
+ }
- }
+ }
return;
}
@@ -207,60 +207,60 @@ KMLVectorDataIO<TData>::WalkGeometry(const kmldom::GeometryPtr& geometry, DataNo
DataNodePointerType node = NULL;
if (!geometry)
- {
+ {
return;
- }
+ }
// Create a Node with the Geometry type.
switch (geometry->Type())
- {
+ {
case kmldom::Type_Point:
- {
+ {
node = ConvertGeometryToPointNode(geometry);
- m_Tree->Add(node,father);
+ m_Tree->Add(node, father);
break;
- }
+ }
case kmldom::Type_LineString:
- {
+ {
node = ConvertGeometryToLineStringNode(geometry);
- m_Tree->Add(node,father);
+ m_Tree->Add(node, father);
break;
- }
+ }
case kmldom::Type_LinearRing:
- {
+ {
node = ConvertGeometryToLinearRingNode(geometry);
- m_Tree->Add(node,father);
+ m_Tree->Add(node, father);
break;
- }
+ }
case kmldom::Type_Polygon:
- {
+ {
node = ConvertGeometryToPolygonNode(geometry);
- m_Tree->Add(node,father);
+ m_Tree->Add(node, father);
break;
- }
+ }
case kmldom::Type_MultiGeometry:
- {
+ {
// this case is treated downer
break;
- }
+ }
case kmldom::Type_Model:
- {
+ {
break;
- }
+ }
default: // KML has 6 types of Geometry.
break;
- }
+ }
// Recurse into <MultiGeometry>.
if (const kmldom::MultiGeometryPtr multigeometry = kmldom::AsMultiGeometry(geometry))
- {
+ {
DataNodePointerType multi = DataNodeType::New();
multi->SetNodeType(FEATURE_COLLECTION);
- m_Tree->Add(multi,father);
+ m_Tree->Add(multi, father);
for (size_t i = 0; i < multigeometry->get_geometry_array_size(); ++i)
- {
- WalkGeometry(multigeometry->get_geometry_array_at(i),multi);
+ {
+ WalkGeometry(multigeometry->get_geometry_array_at(i), multi);
+ }
}
- }
return;
}
@@ -272,21 +272,24 @@ KMLVectorDataIO<TData>
{
if (geometry == NULL)
- {
- itkGenericExceptionMacro(<<"Failed to convert kmldom::GeometryPtr to PointNode");
- }
+ {
+ itkGenericExceptionMacro(<< "Failed to convert kmldom::GeometryPtr to PointNode");
+ }
const kmldom::PointPtr pt = kmldom::AsPoint(geometry);
PointType otbPoint;
otbPoint.Fill(0);
- otbPoint[0] = static_cast<typename DataNodeType::PrecisionType>(pt->get_coordinates()->get_coordinates_array_at(0).get_longitude());
- otbPoint[1] = static_cast<typename DataNodeType::PrecisionType>(pt->get_coordinates()->get_coordinates_array_at(0).get_latitude());
+ otbPoint[0] = static_cast<typename DataNodeType::PrecisionType>(pt->get_coordinates()->get_coordinates_array_at(
+ 0).get_longitude());
+ otbPoint[1] = static_cast<typename DataNodeType::PrecisionType>(pt->get_coordinates()->get_coordinates_array_at(
+ 0).get_latitude());
if (DataNodeType::Dimension > 2)
- {
- otbPoint[2]=static_cast<typename DataNodeType::PrecisionType>(pt->get_coordinates()->get_coordinates_array_at(0).get_altitude());
- }
+ {
+ otbPoint[2] = static_cast<typename DataNodeType::PrecisionType>(pt->get_coordinates()->get_coordinates_array_at(
+ 0).get_altitude());
+ }
DataNodePointerType node = DataNodeType::New();
node->SetPoint(otbPoint);
@@ -301,27 +304,27 @@ KMLVectorDataIO<TData>
{
if (geometry == NULL)
- {
- itkGenericExceptionMacro(<<"Failed to convert kmldom::GeometryPtr to LineNode");
- }
+ {
+ itkGenericExceptionMacro(<< "Failed to convert kmldom::GeometryPtr to LineNode");
+ }
- const kmldom::LineStringPtr ls = kmldom::AsLineString(geometry);
+ const kmldom::LineStringPtr ls = kmldom::AsLineString(geometry);
const kmldom::CoordinatesPtr coords = ls->get_coordinates();
- int array_size = coords->get_coordinates_array_size();
+ int array_size = coords->get_coordinates_array_size();
LinePointerType line = LineType::New();
- for (int i=0;i<array_size;++i)
- {
+ for (int i = 0; i < array_size; ++i)
+ {
typename LineType::VertexType vertex;
vertex[0] = coords->get_coordinates_array_at(i).get_longitude();
vertex[1] = coords->get_coordinates_array_at(i).get_latitude();
if (DataNodeType::Dimension > 2)
- {
- vertex[2]= coords->get_coordinates_array_at(i).get_altitude();
- }
+ {
+ vertex[2] = coords->get_coordinates_array_at(i).get_altitude();
+ }
line->AddVertex(vertex);
- }
+ }
DataNodePointerType node = DataNodeType::New();
node->SetLine(line);
@@ -337,27 +340,27 @@ KMLVectorDataIO<TData>
{
if (geometry == NULL)
- {
- itkGenericExceptionMacro(<<"Failed to convert kmldom::GeometryPtr to LineNode");
- }
+ {
+ itkGenericExceptionMacro(<< "Failed to convert kmldom::GeometryPtr to LineNode");
+ }
- const kmldom::LinearRingPtr lr = kmldom::AsLinearRing(geometry);
+ const kmldom::LinearRingPtr lr = kmldom::AsLinearRing(geometry);
const kmldom::CoordinatesPtr coords = lr->get_coordinates();
- int array_size = coords->get_coordinates_array_size();
+ int array_size = coords->get_coordinates_array_size();
LinePointerType line = LineType::New();
- for (int i=0;i<array_size;++i)
- {
+ for (int i = 0; i < array_size; ++i)
+ {
typename LineType::VertexType vertex;
vertex[0] = coords->get_coordinates_array_at(i).get_longitude();
vertex[1] = coords->get_coordinates_array_at(i).get_latitude();
if (DataNodeType::Dimension > 2)
- {
- vertex[2]= coords->get_coordinates_array_at(i).get_altitude();
- }
+ {
+ vertex[2] = coords->get_coordinates_array_at(i).get_altitude();
+ }
line->AddVertex(vertex);
- }
+ }
DataNodePointerType node = DataNodeType::New();
node->SetLine(line);
@@ -373,67 +376,66 @@ KMLVectorDataIO<TData>
{
if (geometry == NULL)
- {
- itkGenericExceptionMacro(<<"Failed to convert kmldom::GeometryPtr to LineNode");
- }
+ {
+ itkGenericExceptionMacro(<< "Failed to convert kmldom::GeometryPtr to LineNode");
+ }
// Get the polygon
const kmldom::PolygonPtr polygonKml = kmldom::AsPolygon(geometry);
- PolygonPointerType extRing = PolygonType::New();
- PolygonListPointerType intRings = PolygonListType::New();
+ PolygonPointerType extRing = PolygonType::New();
+ PolygonListPointerType intRings = PolygonListType::New();
// Read the outerboundaryis of the polygon
- if ( polygonKml->has_outerboundaryis())
- {
+ if (polygonKml->has_outerboundaryis())
+ {
const kmldom::OuterBoundaryIsPtr outerboundaryis = polygonKml->get_outerboundaryis();
if (outerboundaryis->has_linearring())
- {
- const kmldom::LinearRingPtr lr = outerboundaryis->get_linearring();
+ {
+ const kmldom::LinearRingPtr lr = outerboundaryis->get_linearring();
const kmldom::CoordinatesPtr coords = lr->get_coordinates();
- int array_size = coords->get_coordinates_array_size();
+ int array_size = coords->get_coordinates_array_size();
-
- for (int i=0;i<array_size;++i)
- {
+ for (int i = 0; i < array_size; ++i)
+ {
typename PolygonType::VertexType vertex;
vertex[0] = coords->get_coordinates_array_at(i).get_longitude();
vertex[1] = coords->get_coordinates_array_at(i).get_latitude();
if (DataNodeType::Dimension > 2)
- {
- vertex[2]= coords->get_coordinates_array_at(i).get_altitude();
- }
+ {
+ vertex[2] = coords->get_coordinates_array_at(i).get_altitude();
+ }
extRing->AddVertex(vertex);
+ }
}
}
- }
// Read the innerboundaryis of the polygon
- for (unsigned int intRingIndex=0;intRingIndex<polygonKml->get_innerboundaryis_array_size();++intRingIndex)
- {
+ for (unsigned int intRingIndex = 0; intRingIndex < polygonKml->get_innerboundaryis_array_size(); ++intRingIndex)
+ {
const kmldom::InnerBoundaryIsPtr innerboundaryis = polygonKml->get_innerboundaryis_array_at(intRingIndex);
if (innerboundaryis->has_linearring())
- {
- const kmldom::LinearRingPtr lr = innerboundaryis->get_linearring();
+ {
+ const kmldom::LinearRingPtr lr = innerboundaryis->get_linearring();
const kmldom::CoordinatesPtr coords = lr->get_coordinates();
- int array_size = coords->get_coordinates_array_size();
- PolygonPointerType ring = PolygonType::New();
+ int array_size = coords->get_coordinates_array_size();
+ PolygonPointerType ring = PolygonType::New();
- for (int pIndex=0;pIndex<array_size;++pIndex)
- {
+ for (int pIndex = 0; pIndex < array_size; ++pIndex)
+ {
typename PolygonType::VertexType vertex;
vertex[0] = coords->get_coordinates_array_at(pIndex).get_longitude();
vertex[1] = coords->get_coordinates_array_at(pIndex).get_latitude();
if (DataNodeType::Dimension > 2)
- {
- vertex[2]= coords->get_coordinates_array_at(pIndex).get_altitude();
- }
+ {
+ vertex[2] = coords->get_coordinates_array_at(pIndex).get_altitude();
+ }
ring->AddVertex(vertex);
- }
+ }
intRings->PushBack(ring);
+ }
}
- }
DataNodePointerType node = DataNodeType::New();
node->SetPolygonExteriorRing(extRing);
@@ -458,37 +460,37 @@ KMLVectorDataIO<TData>
{
std::string kml;
- bool status = kmlbase::File::ReadFileToString(this->m_FileName, &kml);
- if ( status == false )
- {
- itkExceptionMacro(<<"Failed to open KML data file "<<this->m_FileName);
- }
-
- std::cout<<this->m_FileName<<std::endl;
+ bool status = kmlbase::File::ReadFileToString(this->m_FileName, &kml);
+ if (status == false)
+ {
+ itkExceptionMacro(<< "Failed to open KML data file " << this->m_FileName);
+ }
- otbMsgDebugMacro( <<"Driver to read: KML");
- otbMsgDebugMacro( <<"Reading file: "<< this->m_FileName);
+ std::cout << this->m_FileName << std::endl;
+ otbMsgDebugMacro(<< "Driver to read: KML");
+ otbMsgDebugMacro(<< "Reading file: " << this->m_FileName);
// Parse the file.
- std::string errors;
+ std::string errors;
kmldom::ElementPtr root = kmldom::Parse(kml, &errors);
if (!root)
- {
- itkExceptionMacro(<<"Failed to open KML data file "<<errors);
- }
+ {
+ itkExceptionMacro(<< "Failed to open KML data file " << errors);
+ }
//Fill up projection information
//for KML files, this is geographic coordinates
- std::string projectionRef = "GEOGCS[\"GCS_WGS_1984\", DATUM[\"WGS_1984\", SPHEROID[\"WGS_1984\",6378137,298.257223563]], PRIMEM[\"Greenwich\",0], UNIT[\"Degree\",0.017453292519943295]]";
- itk::MetaDataDictionary & dict = data->GetMetaDataDictionary();
- itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef );
+ std::string projectionRef =
+ "GEOGCS[\"GCS_WGS_1984\", DATUM[\"WGS_1984\", SPHEROID[\"WGS_1984\",6378137,298.257223563]], PRIMEM[\"Greenwich\",0], UNIT[\"Degree\",0.017453292519943295]]";
+ itk::MetaDataDictionary& dict = data->GetMetaDataDictionary();
+ itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef);
const kmldom::FeaturePtr feature = GetRootFeature(root);
if (feature)
- {
+ {
// Retrieving root node
m_Tree = data->GetDataTree();
@@ -496,52 +498,51 @@ KMLVectorDataIO<TData>
DataNodePointerType document = DataNodeType::New();
document->SetNodeType(DOCUMENT);
- m_Tree->Add(document,rootNode);
+ m_Tree->Add(document, rootNode);
// Walk Feature (get the Placemarks... and walk into them) //ENGLISH ??
- WalkFeature(feature,document);
+ WalkFeature(feature, document);
- }
+ }
else
- {
- itkExceptionMacro(<<"No root feature");
- }
+ {
+ itkExceptionMacro(<< "No root feature");
+ }
// std::cout<< m_Tree <<std::endl;
}
-
template<class TData>
-bool KMLVectorDataIO<TData>::CanWriteFile( const char* filename ) const
+bool KMLVectorDataIO<TData>::CanWriteFile(const char* filename) const
{
std::string lFileName(filename);
- if ( System::IsADirName(lFileName) == true )
- {
+ if (System::IsADirName(lFileName) == true)
+ {
return false;
- }
- if ( System::SetToLower(System::GetExtension(lFileName)) != "kml" )
- {
+ }
+ if (System::SetToLower(System::GetExtension(lFileName)) != "kml")
+ {
return false;
- }
+ }
return true;
}
template<class TData>
- void KMLVectorDataIO<TData>::Write(const VectorDataConstPointerType data, char ** papszOptions)
+void KMLVectorDataIO<TData>::Write(const VectorDataConstPointerType data, char ** papszOptions)
{
itk::TimeProbe chrono;
chrono.Start();
// Retrieve data required for georeferencing
- std::string projectionRefWkt = data->GetProjectionRef();
+ std::string projectionRefWkt = data->GetProjectionRef();
OGRSpatialReference * oSRS = new OGRSpatialReference(projectionRefWkt.c_str());
- if ( !oSRS->IsGeographic() )
- {
- itkWarningMacro(<<"Vector data should be reprojected in geographic coordinates"
+ if (!oSRS->IsGeographic())
+ {
+ itkWarningMacro(<< "Vector data should be reprojected in geographic coordinates"
<< " before saving to KML. Please use otbVectorDataProjectionFilter. "
<< " The projection information is currently: " << projectionRefWkt
<< "\n We assume that you know what you're doing and proceed to save the KML file.");
- }
+ }
delete oSRS;
m_Kept = 0;
@@ -549,26 +550,25 @@ template<class TData>
//Create the factory
kmldom::KmlFactory* factory = kmldom::KmlFactory::GetFactory();
if (factory == NULL)
- {
- itkExceptionMacro(<<"Impossible to create the KML Factory to write file "<<this->m_FileName);
- }
+ {
+ itkExceptionMacro(<< "Impossible to create the KML Factory to write file " << this->m_FileName);
+ }
kmldom::KmlPtr kml = factory->CreateKml();
// Retrieving root node
DataTreeConstPointerType tree = data->GetDataTree();
- DataNodePointerType root = tree->GetRoot()->Get();
+ DataNodePointerType root = tree->GetRoot()->Get();
typedef itk::PreOrderTreeIterator<DataTreeType> TreeIteratorType;
TreeIteratorType it(tree);
it.GoToBegin();
- kmldom::DocumentPtr currentDocument = NULL;
- kmldom::FolderPtr currentFolder = NULL;
+ kmldom::DocumentPtr currentDocument = NULL;
+ kmldom::FolderPtr currentFolder = NULL;
kmldom::MultiGeometryPtr currentMultiGeometry = NULL;
-
InternalTreeNodeType * inputRoot = const_cast<InternalTreeNodeType *>(tree->GetRoot());
ProcessNodeWrite(inputRoot, factory, kml, currentDocument, currentFolder, currentMultiGeometry);
@@ -592,292 +592,293 @@ template<class TData>
//std::cout << xml;
chrono.Stop();
- std::cout<<"KMLVectorDataIO: file saved in "<<chrono.GetMeanTime()<<" seconds. (" << m_Kept << " elements)"<<std::endl;
+ std::cout << "KMLVectorDataIO: file saved in " << chrono.GetMeanTime() << " seconds. (" << m_Kept << " elements)" <<
+ std::endl;
- otbMsgDevMacro( <<" KMLVectorDataIO::Write() ");
+ otbMsgDevMacro(<< " KMLVectorDataIO::Write() ");
}
template<class TData>
- void KMLVectorDataIO<TData>::ProcessNodeWrite(InternalTreeNodeType * source, kmldom::KmlFactory* factory, kmldom::KmlPtr kml, kmldom::DocumentPtr currentDocument, kmldom::FolderPtr currentFolder, kmldom::MultiGeometryPtr currentMultiGeometry)
+void KMLVectorDataIO<TData>::ProcessNodeWrite(InternalTreeNodeType * source,
+ kmldom::KmlFactory* factory,
+ kmldom::KmlPtr kml,
+ kmldom::DocumentPtr currentDocument,
+ kmldom::FolderPtr currentFolder,
+ kmldom::MultiGeometryPtr currentMultiGeometry)
{
- // Note that we force a precise structure when we write a kml file.
+ // Note that we force a precise structure when we write a kml file.
// We will necessary have a <document> that will contain a <folder>.
// And in a folder there automatically will be one or several <placemark>.
- // Get the children list from the input node
+ // Get the children list from the input node
ChildrenListType children = source->GetChildrenList();
// std::cout << "Found " << children.size() << " children" << std::endl;
// For each child
- for(typename ChildrenListType::iterator it = children.begin(); it!=children.end(); ++it)
- {
+ for (typename ChildrenListType::iterator it = children.begin(); it != children.end(); ++it)
+ {
DataNodePointerType dataNode = (*it)->Get();
// std::cout << "Processing " << dataNode->GetNodeType() << " with Id: " << dataNode->GetNodeId() << std::endl;
++m_Kept;
switch (dataNode->GetNodeType())
- {
- case ROOT:
{
- break;
+ case ROOT:
+ {
+ break;
}
- case DOCUMENT:
+ case DOCUMENT:
{
- kmldom::DocumentPtr document = factory->CreateDocument();
- if (dataNode->HasField("name"))
+ kmldom::DocumentPtr document = factory->CreateDocument();
+ if (dataNode->HasField("name"))
{
- std::string fieldname = dataNode->GetFieldAsString("name");
- document->set_name(fieldname);
+ std::string fieldname = dataNode->GetFieldAsString("name");
+ document->set_name(fieldname);
}
- kml->set_feature(document);
- currentDocument = document;
- ProcessNodeWrite(*it, factory, kml, currentDocument, currentFolder, currentMultiGeometry);
- break;
+ kml->set_feature(document);
+ currentDocument = document;
+ ProcessNodeWrite(*it, factory, kml, currentDocument, currentFolder, currentMultiGeometry);
+ break;
}
- case FOLDER:
+ case FOLDER:
{
- kmldom::FolderPtr folder = factory->CreateFolder();
- std::string fieldname = dataNode->GetFieldAsString("name");
- folder->set_name(fieldname);
- currentDocument->add_feature(folder);
- currentFolder = folder;
- ProcessNodeWrite(*it, factory, kml, currentDocument, currentFolder, currentMultiGeometry);
- break;
+ kmldom::FolderPtr folder = factory->CreateFolder();
+ std::string fieldname = dataNode->GetFieldAsString("name");
+ folder->set_name(fieldname);
+ currentDocument->add_feature(folder);
+ currentFolder = folder;
+ ProcessNodeWrite(*it, factory, kml, currentDocument, currentFolder, currentMultiGeometry);
+ break;
}
- case FEATURE_POINT:
+ case FEATURE_POINT:
{
// Create <coordinates>
- kmldom::CoordinatesPtr coordinates = factory->CreateCoordinates();
- PointType pointCoord = dataNode->GetPoint();
- if (DataNodeType::Dimension>2)
+ kmldom::CoordinatesPtr coordinates = factory->CreateCoordinates();
+ PointType pointCoord = dataNode->GetPoint();
+ if (DataNodeType::Dimension > 2)
{
- coordinates->add_latlngalt(pointCoord[1],pointCoord[0],pointCoord[2]);
+ coordinates->add_latlngalt(pointCoord[1], pointCoord[0], pointCoord[2]);
}
- else
+ else
{
- coordinates->add_latlng(pointCoord[1],pointCoord[0]);
+ coordinates->add_latlng(pointCoord[1], pointCoord[0]);
}
// Create <Point> and give it <coordinates>.
- kmldom::PointPtr point = factory->CreatePoint();
- point->set_coordinates(coordinates);
+ kmldom::PointPtr point = factory->CreatePoint();
+ point->set_coordinates(coordinates);
- if (currentMultiGeometry != NULL)
+ if (currentMultiGeometry != NULL)
{
- currentMultiGeometry->add_geometry(point);
+ currentMultiGeometry->add_geometry(point);
}
- else
+ else
{
- kmldom::PlacemarkPtr placemark = factory->CreatePlacemark();
- placemark->set_geometry(point);
- if (currentFolder!= NULL)
+ kmldom::PlacemarkPtr placemark = factory->CreatePlacemark();
+ placemark->set_geometry(point);
+ if (currentFolder != NULL)
{
- currentFolder->add_feature(placemark);
+ currentFolder->add_feature(placemark);
}
- else
+ else
{
- currentDocument->add_feature(placemark);
+ currentDocument->add_feature(placemark);
}
}
- break;
+ break;
}
- case FEATURE_LINE:
+ case FEATURE_LINE:
{
- VertexListConstPointerType vertexList = dataNode->GetLine()->GetVertexList();
+ VertexListConstPointerType vertexList = dataNode->GetLine()->GetVertexList();
// Create <coordinates>
- kmldom::CoordinatesPtr coordinates = factory->CreateCoordinates();
- kmldom::LineStringPtr line = factory->CreateLineString();
+ kmldom::CoordinatesPtr coordinates = factory->CreateCoordinates();
+ kmldom::LineStringPtr line = factory->CreateLineString();
- typename VertexListType::ConstIterator vIt = vertexList->Begin();
+ typename VertexListType::ConstIterator vIt = vertexList->Begin();
- while (vIt != vertexList->End())
+ while (vIt != vertexList->End())
{
- VertexType pointCoord = vIt.Value();
- if (DataNodeType::Dimension>2)
+ VertexType pointCoord = vIt.Value();
+ if (DataNodeType::Dimension > 2)
{
- coordinates->add_latlngalt(pointCoord[1],pointCoord[0],pointCoord[2]);
+ coordinates->add_latlngalt(pointCoord[1], pointCoord[0], pointCoord[2]);
}
- else
+ else
{
- coordinates->add_latlng(pointCoord[1],pointCoord[0]);
+ coordinates->add_latlng(pointCoord[1], pointCoord[0]);
}
- line->set_coordinates(coordinates);
- ++vIt;
+ line->set_coordinates(coordinates);
+ ++vIt;
}
- if (currentMultiGeometry != NULL)
+ if (currentMultiGeometry != NULL)
{
- currentMultiGeometry->add_geometry(line);
+ currentMultiGeometry->add_geometry(line);
}
- else
+ else
{
- kmldom::PlacemarkPtr placemark = factory->CreatePlacemark();
- placemark->set_geometry(line);
- if (currentFolder!= NULL)
+ kmldom::PlacemarkPtr placemark = factory->CreatePlacemark();
+ placemark->set_geometry(line);
+ if (currentFolder != NULL)
{
- currentFolder->add_feature(placemark);
+ currentFolder->add_feature(placemark);
}
- else
+ else
{
- currentDocument->add_feature(placemark);
+ currentDocument->add_feature(placemark);
}
}
- break;
+ break;
}
- case FEATURE_POLYGON:
- {//TODO refine the solution of drawing the polygon 1m above the ground
- // In a polygon we just can find any LinearRings
+ case FEATURE_POLYGON:
+ { //TODO refine the solution of drawing the polygon 1m above the ground
+ // In a polygon we just can find any LinearRings
- kmldom::LinearRingPtr line = factory->CreateLinearRing();
- kmldom::PolygonPtr polygon = factory->CreatePolygon();
+ kmldom::LinearRingPtr line = factory->CreateLinearRing();
+ kmldom::PolygonPtr polygon = factory->CreatePolygon();
- polygon->set_extrude(true);
- polygon->set_altitudemode(1);//ALTITUDEMODE_RELATIVETOGROUND
+ polygon->set_extrude(true);
+ polygon->set_altitudemode(1); //ALTITUDEMODE_RELATIVETOGROUND
- kmldom::CoordinatesPtr coordinates = factory->CreateCoordinates();
- kmldom::OuterBoundaryIsPtr outerboundaryis = factory->CreateOuterBoundaryIs();
- kmldom::InnerBoundaryIsPtr innerboundaryis = factory->CreateInnerBoundaryIs();
+ kmldom::CoordinatesPtr coordinates = factory->CreateCoordinates();
+ kmldom::OuterBoundaryIsPtr outerboundaryis = factory->CreateOuterBoundaryIs();
+ kmldom::InnerBoundaryIsPtr innerboundaryis = factory->CreateInnerBoundaryIs();
- VertexListConstPointerType vertexList = dataNode->GetPolygonExteriorRing()->GetVertexList();
+ VertexListConstPointerType vertexList = dataNode->GetPolygonExteriorRing()->GetVertexList();
- typename VertexListType::ConstIterator vIt = vertexList->Begin();
+ typename VertexListType::ConstIterator vIt = vertexList->Begin();
- if (vIt == vertexList->End())
+ if (vIt == vertexList->End())
{
- itkExceptionMacro(<<"Polygon is empty");
+ itkExceptionMacro(<< "Polygon is empty");
}
- while (vIt != vertexList->End())
+ while (vIt != vertexList->End())
{
- VertexType pointCoord = vIt.Value();
- if (DataNodeType::Dimension>2)
+ VertexType pointCoord = vIt.Value();
+ if (DataNodeType::Dimension > 2)
{
- coordinates->add_latlngalt(pointCoord[1],pointCoord[0],pointCoord[2]+1);//Drawing polygon 1m above ground to avoid z-buffer issues
+ coordinates->add_latlngalt(pointCoord[1], pointCoord[0], pointCoord[2] + 1); //Drawing polygon 1m above ground to avoid z-buffer issues
}
- else
+ else
{
- coordinates->add_latlngalt(pointCoord[1],pointCoord[0],1);//Drawing polygon 1m above ground to avoid z-buffer issues
+ coordinates->add_latlngalt(pointCoord[1], pointCoord[0], 1); //Drawing polygon 1m above ground to avoid z-buffer issues
}
- line->set_coordinates(coordinates);
- ++vIt;
+ line->set_coordinates(coordinates);
+ ++vIt;
}
//Adding the first point again to close the polygon
- vIt = vertexList->Begin();
- VertexType pointCoord = vIt.Value();
- if (DataNodeType::Dimension>2)
+ vIt = vertexList->Begin();
+ VertexType pointCoord = vIt.Value();
+ if (DataNodeType::Dimension > 2)
{
- coordinates->add_latlngalt(pointCoord[1],pointCoord[0],pointCoord[2]+1);//Drawing polygon 1m above ground to avoid z-buffer issues
+ coordinates->add_latlngalt(pointCoord[1], pointCoord[0], pointCoord[2] + 1); //Drawing polygon 1m above ground to avoid z-buffer issues
}
- else
+ else
{
- coordinates->add_latlngalt(pointCoord[1],pointCoord[0],1);//Drawing polygon 1m above ground to avoid z-buffer issues
+ coordinates->add_latlngalt(pointCoord[1], pointCoord[0], 1); //Drawing polygon 1m above ground to avoid z-buffer issues
}
- line->set_coordinates(coordinates);
+ line->set_coordinates(coordinates);
- outerboundaryis->set_linearring(line);
- polygon->set_outerboundaryis(outerboundaryis);
+ outerboundaryis->set_linearring(line);
+ polygon->set_outerboundaryis(outerboundaryis);
// Retrieving internal rings as well
- for (typename PolygonListType::Iterator pIt = dataNode->GetPolygonInteriorRings()->Begin();
- pIt!=dataNode->GetPolygonInteriorRings()->End();++pIt)
+ for (typename PolygonListType::Iterator pIt = dataNode->GetPolygonInteriorRings()->Begin();
+ pIt != dataNode->GetPolygonInteriorRings()->End(); ++pIt)
{
- vertexList = pIt.Get()->GetVertexList();
- vIt = vertexList->Begin();
+ vertexList = pIt.Get()->GetVertexList();
+ vIt = vertexList->Begin();
- while (vIt != vertexList->End())
+ while (vIt != vertexList->End())
{
- vIt = vertexList->Begin();
- VertexType pointCoord = vIt.Value();
- if (DataNodeType::Dimension>2)
+ vIt = vertexList->Begin();
+ VertexType pointCoord = vIt.Value();
+ if (DataNodeType::Dimension > 2)
{
- coordinates->add_latlngalt(pointCoord[1],pointCoord[0],pointCoord[2]+1);//Drawing polygon 1m above ground to avoid z-buffer issues
+ coordinates->add_latlngalt(pointCoord[1], pointCoord[0], pointCoord[2] + 1); //Drawing polygon 1m above ground to avoid z-buffer issues
}
- else
+ else
{
- coordinates->add_latlngalt(pointCoord[1],pointCoord[0],1);//Drawing polygon 1m above ground to avoid z-buffer issues
+ coordinates->add_latlngalt(pointCoord[1], pointCoord[0], 1); //Drawing polygon 1m above ground to avoid z-buffer issues
}
- line->set_coordinates(coordinates);
- ++vIt;
+ line->set_coordinates(coordinates);
+ ++vIt;
}
//Adding the first point again to close the polygon
- vIt = vertexList->Begin();
- VertexType pointCoord = vIt.Value();
- if (DataNodeType::Dimension>2)
+ vIt = vertexList->Begin();
+ VertexType pointCoord = vIt.Value();
+ if (DataNodeType::Dimension > 2)
{
- coordinates->add_latlngalt(pointCoord[1],pointCoord[0],pointCoord[2]+1);//Drawing polygon 1m above ground to avoid z-buffer issues
+ coordinates->add_latlngalt(pointCoord[1], pointCoord[0], pointCoord[2] + 1); //Drawing polygon 1m above ground to avoid z-buffer issues
}
- else
+ else
{
- coordinates->add_latlngalt(pointCoord[1],pointCoord[0],1);//Drawing polygon 1m above ground to avoid z-buffer issues
+ coordinates->add_latlngalt(pointCoord[1], pointCoord[0], 1); //Drawing polygon 1m above ground to avoid z-buffer issues
}
- line->set_coordinates(coordinates);
- ++vIt;
-
+ line->set_coordinates(coordinates);
+ ++vIt;
- innerboundaryis->set_linearring(line);
- polygon->add_innerboundaryis(innerboundaryis);
- innerboundaryis->clear_linearring();
+ innerboundaryis->set_linearring(line);
+ polygon->add_innerboundaryis(innerboundaryis);
+ innerboundaryis->clear_linearring();
}
-
- if (currentMultiGeometry != NULL)
+ if (currentMultiGeometry != NULL)
{
- currentMultiGeometry->add_geometry(polygon);
+ currentMultiGeometry->add_geometry(polygon);
}
- else
+ else
{
- kmldom::PlacemarkPtr placemark = factory->CreatePlacemark();
- placemark->set_geometry(polygon);
- if (currentFolder!= NULL)
+ kmldom::PlacemarkPtr placemark = factory->CreatePlacemark();
+ placemark->set_geometry(polygon);
+ if (currentFolder != NULL)
{
- currentFolder->add_feature(placemark);
+ currentFolder->add_feature(placemark);
}
- else
+ else
{
- currentDocument->add_feature(placemark);
+ currentDocument->add_feature(placemark);
}
}
- break;
+ break;
}
// MultiGeometry
- case FEATURE_COLLECTION:
+ case FEATURE_COLLECTION:
{
- kmldom::MultiGeometryPtr multi = factory->CreateMultiGeometry();
- currentMultiGeometry = multi;
- kmldom::PlacemarkPtr placemark = factory->CreatePlacemark();
- placemark->set_geometry(multi);
- if (currentFolder!= NULL)
+ kmldom::MultiGeometryPtr multi = factory->CreateMultiGeometry();
+ currentMultiGeometry = multi;
+ kmldom::PlacemarkPtr placemark = factory->CreatePlacemark();
+ placemark->set_geometry(multi);
+ if (currentFolder != NULL)
{
- currentFolder->add_feature(placemark);
+ currentFolder->add_feature(placemark);
}
- else
+ else
{
- currentDocument->add_feature(placemark);
+ currentDocument->add_feature(placemark);
}
- ProcessNodeWrite(*it, factory, kml, currentDocument, currentFolder, currentMultiGeometry);
- break;
+ ProcessNodeWrite(*it, factory, kml, currentDocument, currentFolder, currentMultiGeometry);
+ break;
}
- default :
- break;
+ default:
+ break;
- } // end switch
- } // end for
+ } // end switch
+ } // end for
}
-
} // end namespace otb
#endif
-
-
diff --git a/Code/IO/otbKMLVectorDataIOFactory.h b/Code/IO/otbKMLVectorDataIOFactory.h
index 6056a7c2ad..5761fbde1c 100644
--- a/Code/IO/otbKMLVectorDataIOFactory.h
+++ b/Code/IO/otbKMLVectorDataIOFactory.h
@@ -29,10 +29,10 @@ template <class TData> class ITK_EXPORT KMLVectorDataIOFactory : public itk::Obj
{
public:
/** Standard class typedefs. */
- typedef KMLVectorDataIOFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef KMLVectorDataIOFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -56,15 +56,13 @@ protected:
virtual ~KMLVectorDataIOFactory();
private:
- KMLVectorDataIOFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ KMLVectorDataIOFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
-
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbKMLVectorDataIOFactory.txx"
#endif
diff --git a/Code/IO/otbLUMImageIO.cxx b/Code/IO/otbLUMImageIO.cxx
index 7def0f9f35..e3dee44743 100644
--- a/Code/IO/otbLUMImageIO.cxx
+++ b/Code/IO/otbLUMImageIO.cxx
@@ -35,14 +35,14 @@ LUMImageIO::LUMImageIO()
this->SetNumberOfDimensions(2);
m_PixelType = SCALAR;
m_ComponentType = UCHAR;
- if ( itk::ByteSwapper<char>::SystemIsLittleEndian() == true)
- {
+ if (itk::ByteSwapper<char>::SystemIsLittleEndian() == true)
+ {
m_ByteOrder = LittleEndian;
- }
+ }
else
- {
+ {
m_ByteOrder = BigEndian;
- }
+ }
m_FileByteOrder = BigEndian;
@@ -72,50 +72,48 @@ LUMImageIO::LUMImageIO()
this->AddSupportedReadExtension(".lum");
this->AddSupportedReadExtension(".LUM");
-
}
LUMImageIO::~LUMImageIO()
{
- if ( m_File.is_open() )
- {
+ if (m_File.is_open())
+ {
m_File.close();
- }
+ }
}
-bool LUMImageIO::CanReadFile( const char* filename )
+bool LUMImageIO::CanReadFile(const char* filename)
{
std::string lFileName(filename);
// Test the extension
std::string extension = System::GetExtension(filename);
- if ((extension!="LUM")&&(extension!="lum"))
- {
+ if ((extension != "LUM") && (extension != "lum"))
+ {
return false;
- }
- if ( System::IsADirName(lFileName) == true )
- {
+ }
+ if (System::IsADirName(lFileName) == true)
+ {
return false;
- }
- if ( m_File.is_open() )
- {
+ }
+ if (m_File.is_open())
+ {
m_File.close();
- }
+ }
std::fstream header_file;
- header_file.open( filename, std::ios::in | std::ios::binary );
- if ( header_file.fail() )
- {
- otbMsgDevMacro(<<"LUMImageIO::CanReadFile() failed header open ! " );
+ header_file.open(filename, std::ios::in | std::ios::binary);
+ if (header_file.fail())
+ {
+ otbMsgDevMacro(<< "LUMImageIO::CanReadFile() failed header open ! ");
return false;
- }
+ }
//Read header informations
- bool lResult = InternalReadHeaderInformation(header_file,false);
+ bool lResult = InternalReadHeaderInformation(header_file, false);
header_file.close();
return (lResult);
}
-
// Used to print information about this object
void LUMImageIO::PrintSelf(std::ostream& os, itk::Indent indent) const
{
@@ -137,173 +135,171 @@ void LUMImageIO::Read(void* buffer)
int lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
- otbMsgDevMacro( <<" LUMImageIO::Read() ");
- otbMsgDevMacro( <<" Image size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDevMacro( <<" Region read (IORegion) : "<<this->GetIORegion());
- otbMsgDevMacro( <<" Nb Of Components : "<<this->GetNumberOfComponents());
+ otbMsgDevMacro(<< " LUMImageIO::Read() ");
+ otbMsgDevMacro(<< " Image size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDevMacro(<< " Region read (IORegion) : " << this->GetIORegion());
+ otbMsgDevMacro(<< " Nb Of Components : " << this->GetNumberOfComponents());
- std::streamoff headerLength = static_cast<std::streamoff>(this->GetComponentSize() * m_Dimensions[0]);
- std::streamoff numberOfBytesPerLines = headerLength;
- std::streamoff offset;
+ std::streamoff headerLength = static_cast<std::streamoff>(this->GetComponentSize() * m_Dimensions[0]);
+ std::streamoff numberOfBytesPerLines = headerLength;
+ std::streamoff offset;
std::streamsize numberOfBytesToBeRead = static_cast<std::streamsize>(this->GetComponentSize() * lNbColumns);
std::streamsize numberOfBytesRead;
std::streamsize cpt = 0;
- for (int LineNo = lFirstLine;LineNo <lFirstLine + lNbLines; LineNo++ )
- {
+ for (int LineNo = lFirstLine; LineNo < lFirstLine + lNbLines; LineNo++)
+ {
offset = headerLength + numberOfBytesPerLines * static_cast<std::streamoff>(LineNo);
offset += static_cast<std::streamoff>(this->GetComponentSize() * lFirstColumn);
m_File.seekg(offset, std::ios::beg);
- m_File.read( static_cast<char *>( p + cpt ), numberOfBytesToBeRead );
+ m_File.read(static_cast<char *>(p + cpt), numberOfBytesToBeRead);
numberOfBytesRead = m_File.gcount();
#ifdef __APPLE_CC__
// fail() is broken in the Mac. It returns true when reaches eof().
- if ( numberOfBytesRead != numberOfBytesToBeRead )
+ if (numberOfBytesRead != numberOfBytesToBeRead)
#else
- if ( ( numberOfBytesRead != numberOfBytesToBeRead ) || m_File.fail() )
+ if ((numberOfBytesRead != numberOfBytesToBeRead) || m_File.fail())
#endif
- {
- itkExceptionMacro(<<"LUMImageIO::Read() Can Read the specified Region"); // read failed
- }
+ {
+ itkExceptionMacro(<< "LUMImageIO::Read() Can Read the specified Region"); // read failed
+ }
cpt += numberOfBytesToBeRead;
- }
+ }
unsigned long numberOfPixelsPerLines = lNbLines * lNbColumns;
// Swap bytes if necessary
- if ( 0 ) {}
- otbSwappFileToSystemMacro( unsigned short, USHORT, buffer, numberOfPixelsPerLines )
- otbSwappFileToSystemMacro( short, SHORT, buffer, numberOfPixelsPerLines )
- otbSwappFileToSystemMacro( char, CHAR, buffer, numberOfPixelsPerLines )
- otbSwappFileToSystemMacro( unsigned char, UCHAR, buffer, numberOfPixelsPerLines )
- otbSwappFileToSystemMacro( unsigned int, UINT, buffer, numberOfPixelsPerLines )
- otbSwappFileToSystemMacro( int, INT, buffer, numberOfPixelsPerLines )
- otbSwappFileToSystemMacro( long, LONG, buffer, numberOfPixelsPerLines )
- otbSwappFileToSystemMacro( unsigned long, ULONG, buffer, numberOfPixelsPerLines )
- otbSwappFileToSystemMacro( float, FLOAT, buffer, numberOfPixelsPerLines )
- otbSwappFileToSystemMacro( double, DOUBLE, buffer, numberOfPixelsPerLines )
+ if (0) {}
+ otbSwappFileToSystemMacro(unsigned short, USHORT, buffer, numberOfPixelsPerLines)
+ otbSwappFileToSystemMacro(short, SHORT, buffer, numberOfPixelsPerLines)
+ otbSwappFileToSystemMacro(char, CHAR, buffer, numberOfPixelsPerLines)
+ otbSwappFileToSystemMacro(unsigned char, UCHAR, buffer, numberOfPixelsPerLines)
+ otbSwappFileToSystemMacro(unsigned int, UINT, buffer, numberOfPixelsPerLines)
+ otbSwappFileToSystemMacro(int, INT, buffer, numberOfPixelsPerLines)
+ otbSwappFileToSystemMacro(long, LONG, buffer, numberOfPixelsPerLines)
+ otbSwappFileToSystemMacro(unsigned long, ULONG, buffer, numberOfPixelsPerLines)
+ otbSwappFileToSystemMacro(float, FLOAT, buffer, numberOfPixelsPerLines)
+ otbSwappFileToSystemMacro(double, DOUBLE, buffer, numberOfPixelsPerLines)
else
- {
- itkExceptionMacro(<<"LUMImageIO::Read() undefined component type! " );
- }
+ {
+ itkExceptionMacro(<< "LUMImageIO::Read() undefined component type! ");
+ }
}
-
void LUMImageIO::ReadImageInformation()
{
- if ( m_File.is_open() )
- {
+ if (m_File.is_open())
+ {
m_File.close();
- }
+ }
- m_File.open( m_FileName.c_str(), std::ios::in | std::ios::binary );
- if ( m_File.fail() )
- {
- itkExceptionMacro(<<"LUMImageIO::ReadImageInformation() failed header open ! " );
- }
+ m_File.open(m_FileName.c_str(), std::ios::in | std::ios::binary);
+ if (m_File.fail())
+ {
+ itkExceptionMacro(<< "LUMImageIO::ReadImageInformation() failed header open ! ");
+ }
//Read header informations
- InternalReadHeaderInformation(m_File,true);
+ InternalReadHeaderInformation(m_File, true);
- otbMsgDebugMacro( <<"Driver to read: LUM");
- otbMsgDebugMacro( <<" Read file : "<< m_FileName);
- otbMsgDebugMacro( <<" Size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDebugMacro( <<" ComponentType : "<<this->GetComponentType() );
- otbMsgDebugMacro( <<" NumberOfComponents : "<<this->GetNumberOfComponents());
- otbMsgDebugMacro( <<" ComponentSize : "<<this->GetComponentSize());
- otbMsgDebugMacro( <<" GetPixelSize : "<<this->GetPixelSize());
+ otbMsgDebugMacro(<< "Driver to read: LUM");
+ otbMsgDebugMacro(<< " Read file : " << m_FileName);
+ otbMsgDebugMacro(<< " Size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDebugMacro(<< " ComponentType : " << this->GetComponentType());
+ otbMsgDebugMacro(<< " NumberOfComponents : " << this->GetNumberOfComponents());
+ otbMsgDebugMacro(<< " ComponentSize : " << this->GetComponentSize());
+ otbMsgDebugMacro(<< " GetPixelSize : " << this->GetPixelSize());
}
-
-bool LUMImageIO::InternalReadHeaderInformation(std::fstream & file, const bool reportError)
+bool LUMImageIO::InternalReadHeaderInformation(std::fstream& file, const bool reportError)
{
std::string lStrTypeImage;
std::string lStrCodePix;
std::string lStrTypeMachine;
- int lNbBits(-1);
- char TypeCode[5];
- file.seekg(8, std::ios::beg );
- file.read((char*)(TypeCode),4);
- int lTaille = CaiGetTypeLum( TypeCode,
- lStrTypeImage,
- lNbBits,
- lStrCodePix);
+ int lNbBits(-1);
+ char TypeCode[5];
+ file.seekg(8, std::ios::beg);
+ file.read((char*) (TypeCode), 4);
+ int lTaille = CaiGetTypeLum(TypeCode,
+ lStrTypeImage,
+ lNbBits,
+ lStrCodePix);
if (lTaille == -1)
- {
- if ( reportError == true )
{
+ if (reportError == true)
+ {
itkExceptionMacro(<< "LUM : bad read of header informations");
- }
+ }
else
- {
+ {
return false;
+ }
}
- }
//Set file byte order
- if ( lStrTypeImage == "BE" )
- {
+ if (lStrTypeImage == "BE")
+ {
m_FileByteOrder = BigEndian;
- }
+ }
else
- {
+ {
m_FileByteOrder = LittleEndian;
- }
+ }
if (lStrCodePix == "OCT")
- {
+ {
SetComponentType(CHAR);
- }
+ }
else if (lStrCodePix == "UOCT")
- {
+ {
SetComponentType(UCHAR);
- }
+ }
else if (lStrCodePix == "I2")
- {
+ {
SetComponentType(SHORT);
- }
+ }
else if (lStrCodePix == "UI2")
- {
+ {
SetComponentType(USHORT);
- }
+ }
else if (lStrCodePix == "I4")
- {
+ {
SetComponentType(INT);
- }
+ }
else if (lStrCodePix == "UI4")
- {
+ {
SetComponentType(UINT);
- }
+ }
else if (lStrCodePix == "R4")
- {
+ {
SetComponentType(FLOAT);
- }
+ }
else if (lStrCodePix == "R8")
- {
+ {
SetComponentType(DOUBLE);
- }
+ }
else
- {
- if ( reportError == true )
{
+ if (reportError == true)
+ {
itkExceptionMacro(<< "LUM : impossible to determine CodePix information of the image");
- }
+ }
else
- {
+ {
return false;
+ }
}
- }
int NbCol(-1);
int NbLig(-1);
//Read image dimensions
- file.seekg(0, std::ios::beg );
- file.read((char*)(&NbCol),4);
- file.read((char*)(&NbLig),4);
+ file.seekg(0, std::ios::beg);
+ file.read((char*) (&NbCol), 4);
+ file.read((char*) (&NbLig), 4);
//Swapp if necessary
- otbSwappFileOrderToSystemOrderMacro(int,&NbCol,1);
- otbSwappFileOrderToSystemOrderMacro(int,&NbLig,1);
+ otbSwappFileOrderToSystemOrderMacro(int, &NbCol, 1);
+ otbSwappFileOrderToSystemOrderMacro(int, &NbLig, 1);
//Initialization of image informations
m_Dimensions[0] = NbCol;
@@ -311,244 +307,239 @@ bool LUMImageIO::InternalReadHeaderInformation(std::fstream & file, const bool r
this->SetNumberOfComponents(1);
this->SetFileTypeToBinary();
this->SetNumberOfDimensions(2);
- return(true);
+ return (true);
}
-
-bool LUMImageIO::CanWriteFile( const char* filename )
+bool LUMImageIO::CanWriteFile(const char* filename)
{
std::string lFileName(filename);
std::string extension = System::GetExtension(filename);
- if ((extension!="LUM")&&(extension!="lum"))
- {
+ if ((extension != "LUM") && (extension != "lum"))
+ {
return false;
- }
- if ( System::IsADirName(lFileName) == true )
- {
+ }
+ if (System::IsADirName(lFileName) == true)
+ {
return false;
- }
+ }
const std::string Extension = System::GetExtension(filename);
- if ( (Extension == "lum") || (Extension == "LUM") )
- {
+ if ((Extension == "lum") || (Extension == "LUM"))
+ {
return true;
- }
+ }
else
- {
+ {
return false;
- }
+ }
}
void LUMImageIO::Write(const void* buffer)
{
- if ( m_FlagWriteImageInformation == true )
- {
+ if (m_FlagWriteImageInformation == true)
+ {
this->WriteImageInformation();
m_FlagWriteImageInformation = false;
- }
+ }
unsigned long lNbLines = this->GetIORegion().GetSize()[1];
unsigned long lNbColumns = this->GetIORegion().GetSize()[0];
unsigned long lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
- int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
+ int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
// Cas particuliers : on controle que si la r�gion � �crire est de la m�me dimension que l'image enti�re,
// on commence l'offset � 0 (lorsque que l'on est pas en "Streaming")
- if ( (lNbLines == m_Dimensions[1]) && (lNbColumns == m_Dimensions[0]))
- {
- otbMsgDevMacro(<<"Force l'offset de l'IORegion � 0");
+ if ((lNbLines == m_Dimensions[1]) && (lNbColumns == m_Dimensions[0]))
+ {
+ otbMsgDevMacro(<< "Force l'offset de l'IORegion � 0");
lFirstLine = 0;
lFirstColumn = 0;
- }
+ }
- otbMsgDevMacro( <<" LUMImageIO::Write() ");
- otbMsgDevMacro( <<" Image size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDevMacro( <<" Region read (IORegion) : "<<this->GetIORegion());
- otbMsgDevMacro( <<" Nb Of Components : "<<this->GetNumberOfComponents());
- otbMsgDevMacro( <<" GetComponentSize : "<<this->GetComponentSize());
+ otbMsgDevMacro(<< " LUMImageIO::Write() ");
+ otbMsgDevMacro(<< " Image size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDevMacro(<< " Region read (IORegion) : " << this->GetIORegion());
+ otbMsgDevMacro(<< " Nb Of Components : " << this->GetNumberOfComponents());
+ otbMsgDevMacro(<< " GetComponentSize : " << this->GetComponentSize());
- std::streamoff numberOfBytesPerLines = this->GetComponentSize() * m_Dimensions[0];
- std::streamoff headerLength = numberOfBytesPerLines;
- std::streamoff offset;
+ std::streamoff numberOfBytesPerLines = this->GetComponentSize() * m_Dimensions[0];
+ std::streamoff headerLength = numberOfBytesPerLines;
+ std::streamoff offset;
std::streamsize numberOfBytesToBeWrite = this->GetComponentSize() * lNbColumns;
std::streamsize cpt = 0;
const char * p = static_cast<const char *>(buffer);
- for (unsigned long LineNo = lFirstLine;LineNo <lFirstLine + lNbLines; LineNo++ )
- {
+ for (unsigned long LineNo = lFirstLine; LineNo < lFirstLine + lNbLines; LineNo++)
+ {
offset = headerLength + numberOfBytesPerLines * static_cast<std::streamoff>(LineNo);
offset += static_cast<std::streamoff>(this->GetComponentSize() * lFirstColumn);
m_File.seekp(offset, std::ios::beg);
- m_File.write( static_cast<const char *>( p + cpt ), numberOfBytesToBeWrite );
+ m_File.write(static_cast<const char *>(p + cpt), numberOfBytesToBeWrite);
cpt += numberOfBytesToBeWrite;
- }
+ }
}
-
void LUMImageIO::WriteImageInformation()
{
- if ( m_FileName == "" )
- {
- itkExceptionMacro(<<"A FileName must be specified.");
- }
- if ( CanWriteFile(m_FileName.c_str()) == false)
- {
- itkExceptionMacro(<< "The file "<<m_FileName.c_str()<<" is not defined as a LUM file");
- }
+ if (m_FileName == "")
+ {
+ itkExceptionMacro(<< "A FileName must be specified.");
+ }
+ if (CanWriteFile(m_FileName.c_str()) == false)
+ {
+ itkExceptionMacro(<< "The file " << m_FileName.c_str() << " is not defined as a LUM file");
+ }
// Close file from any previous image
- if ( m_File.is_open() )
- {
+ if (m_File.is_open())
+ {
m_File.close();
- }
+ }
// Open the new file for writing
// Actually open the file
- m_File.open( m_FileName.c_str(), std::ios::out | std::ios::trunc | std::ios::binary );
- if ( m_File.fail() )
- {
- itkExceptionMacro(<< "Cannot write requested file "<<m_FileName.c_str()<<".");
- }
+ m_File.open(m_FileName.c_str(), std::ios::out | std::ios::trunc | std::ios::binary);
+ if (m_File.fail())
+ {
+ itkExceptionMacro(<< "Cannot write requested file " << m_FileName.c_str() << ".");
+ }
//Writing header information
std::streamsize headerLength = static_cast<std::streamsize>(this->GetComponentSize() * m_Dimensions[0]);
- m_File.seekp(0, std::ios::beg );
+ m_File.seekp(0, std::ios::beg);
char* value = new char[headerLength];
//Write Header line and all file (whitout information)
- for (unsigned int numLigne=0; numLigne<(m_Dimensions[1]+1); numLigne++)
- {
- m_File.write(value,headerLength);
- }
- delete [] value;
+ for (unsigned int numLigne = 0; numLigne < (m_Dimensions[1] + 1); numLigne++)
+ {
+ m_File.write(value, headerLength);
+ }
+ delete[] value;
value = NULL;
//Set m_TypeLum
- if ( 0 ) {}
- otbSetTypeLumMacro( CHAR, "08BI", "08LI")
- otbSetTypeLumMacro( UCHAR, "08BU", "08LU")
- otbSetTypeLumMacro( SHORT, "16BI", "16LI")
- otbSetTypeLumMacro( USHORT, "16BU", "16LU")
- otbSetTypeLumMacro( INT, "32BI", "32LI" )
- otbSetTypeLumMacro( UINT, "32BU", "32LU" )
- otbSetTypeLumMacro( FLOAT, "FLOA", "FLOL" )
- otbSetTypeLumMacro( DOUBLE, "R8B ", "R8L ")
- if ( (this->GetComponentType() == LONG) || (this->GetComponentType() == ULONG) )
- {
+ if (0) {}
+ otbSetTypeLumMacro(CHAR, "08BI", "08LI")
+ otbSetTypeLumMacro(UCHAR, "08BU", "08LU")
+ otbSetTypeLumMacro(SHORT, "16BI", "16LI")
+ otbSetTypeLumMacro(USHORT, "16BU", "16LU")
+ otbSetTypeLumMacro(INT, "32BI", "32LI")
+ otbSetTypeLumMacro(UINT, "32BU", "32LU")
+ otbSetTypeLumMacro(FLOAT, "FLOA", "FLOL")
+ otbSetTypeLumMacro(DOUBLE, "R8B ", "R8L ")
+ if ((this->GetComponentType() == LONG) || (this->GetComponentType() == ULONG))
+ {
itkExceptionMacro(<< "LUM format doesn't accept LONG or ULONG data type");
- }
+ }
- m_File.seekp(0, std::ios::beg );
+ m_File.seekp(0, std::ios::beg);
//Write image size
- m_File.write((char*)(&(m_Dimensions[0])),4);
- m_File.write((char*)(&(m_Dimensions[1])),4);
- m_File.write((char*)(m_TypeLum.data()),4);
-
- otbMsgDebugMacro( <<"Driver to write: LUM");
- otbMsgDebugMacro( <<" Write file : "<< m_FileName);
- otbMsgDebugMacro( <<" Size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDebugMacro( <<" Type Lum : "<<m_TypeLum);
- otbMsgDebugMacro( <<" ComponentType : "<<this->GetComponentType() );
- otbMsgDebugMacro( <<" NumberOfComponents : "<<this->GetNumberOfComponents());
- otbMsgDebugMacro( <<" ComponentSize : "<<this->GetComponentSize());
- otbMsgDebugMacro( <<" GetPixelSize : "<<this->GetPixelSize());
+ m_File.write((char*) (&(m_Dimensions[0])), 4);
+ m_File.write((char*) (&(m_Dimensions[1])), 4);
+ m_File.write((char*) (m_TypeLum.data()), 4);
+
+ otbMsgDebugMacro(<< "Driver to write: LUM");
+ otbMsgDebugMacro(<< " Write file : " << m_FileName);
+ otbMsgDebugMacro(<< " Size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDebugMacro(<< " Type Lum : " << m_TypeLum);
+ otbMsgDebugMacro(<< " ComponentType : " << this->GetComponentType());
+ otbMsgDebugMacro(<< " NumberOfComponents : " << this->GetNumberOfComponents());
+ otbMsgDebugMacro(<< " ComponentSize : " << this->GetComponentSize());
+ otbMsgDebugMacro(<< " GetPixelSize : " << this->GetPixelSize());
}
-
-int LUMImageIO::CaiGetTypeLum( const char * type_code,
- std::string & str_sens_code,
- int & inbbits,
- std::string & str_cod_pix)
+int LUMImageIO::CaiGetTypeLum(const char * type_code,
+ std::string& str_sens_code,
+ int& inbbits,
+ std::string& str_cod_pix)
{
unsigned int ind; /* indice de boucle sur les types reconnus */
- int trouve,icr,taille; /* indice pour la recherche */
- int mod2; /* modulo2 */
- char* pch0;
- char sens_code[3]; /* type code+ordre rangement octets dans entete*/
- char cod_pix[5];
- sens_code[0]='\0';
- cod_pix[0]='\0';
+ int trouve, icr, taille; /* indice pour la recherche */
+ int mod2; /* modulo2 */
+ char* pch0;
+ char sens_code[3]; /* type code+ordre rangement octets dans entete*/
+ char cod_pix[5];
+ sens_code[0] = '\0';
+ cod_pix[0] = '\0';
/* Initializations diverses */
trouve = -1;
taille = -1;
- int nbbits=-1;
+ int nbbits = -1;
ind = 0;
- pch0=NULL;
+ pch0 = NULL;
std::string str_type_code(type_code);
- while ((trouve==-1)&&(ind< m_CaiLumTyp.size()))
- {
- if ( (str_type_code.find(m_CaiLumTyp[ind]) >= 0 ) &&
- (str_type_code.find(m_CaiLumTyp[ind]) <= str_type_code.size() ) )
-
+ while ((trouve == -1) && (ind < m_CaiLumTyp.size()))
{
- trouve=ind;
- }
+ if ((str_type_code.find(m_CaiLumTyp[ind]) >= 0) &&
+ (str_type_code.find(m_CaiLumTyp[ind]) <= str_type_code.size()))
+
+ {
+ trouve = ind;
+ }
else
- {
- ind=ind+1;
+ {
+ ind = ind + 1;
+ }
}
- }
//CAI source code
- if (trouve !=-1)
- {
- mod2=ind%2;
- if (mod2==0) sprintf(sens_code,"BE");
- else sprintf(sens_code,"LE");
+ if (trouve != -1)
+ {
+ mod2 = ind % 2;
+ if (mod2 == 0) sprintf(sens_code, "BE");
+ else sprintf(sens_code, "LE");
if (ind < 4)
- {
- icr=sscanf(type_code,"%d",&nbbits);
- if (icr ==0) nbbits=-1;
- else
{
- trouve =(int)(nbbits/8);
- if ((nbbits%8)!=0) taille =trouve+1;
+ icr = sscanf(type_code, "%d", &nbbits);
+ if (icr == 0) nbbits = -1;
+ else
+ {
+ trouve = (int) (nbbits / 8);
+ if ((nbbits % 8) != 0) taille = trouve + 1;
else taille = trouve;
- }
- pch0 = const_cast<char *>(strstr(type_code,"U"));
+ }
+ pch0 = const_cast<char *>(strstr(type_code, "U"));
if (taille == 1)
- {
- if (pch0==NULL) sprintf(cod_pix,"OCT");
- else sprintf(cod_pix,"UOCT");
- }
+ {
+ if (pch0 == NULL) sprintf(cod_pix, "OCT");
+ else sprintf(cod_pix, "UOCT");
+ }
else if (taille == 2)
- {
- if (pch0==NULL) sprintf(cod_pix,"I2");
- else sprintf(cod_pix,"UI2");
- }
+ {
+ if (pch0 == NULL) sprintf(cod_pix, "I2");
+ else sprintf(cod_pix, "UI2");
+ }
else if (taille == 4)
- {
- if (pch0==NULL) sprintf(cod_pix,"I4");
- else sprintf(cod_pix,"UI4");
+ {
+ if (pch0 == NULL) sprintf(cod_pix, "I4");
+ else sprintf(cod_pix, "UI4");
+ }
+ else taille = -1;
}
- else taille=-1;
- }
- else if ((ind ==4)||(ind==5) )
- {
- taille=4;
+ else if ((ind == 4) || (ind == 5))
+ {
+ taille = 4;
nbbits = 32;
- sprintf(cod_pix,"R4");
+ sprintf(cod_pix, "R4");
- }
- else if ((ind ==6)||(ind==7) )
- {
- taille=8;
+ }
+ else if ((ind == 6) || (ind == 7))
+ {
+ taille = 8;
nbbits = 64;
- sprintf(cod_pix,"R8");
+ sprintf(cod_pix, "R8");
+ }
}
- }
str_cod_pix = std::string(cod_pix);
str_sens_code = std::string(sens_code);
inbbits = nbbits;
- return(taille);
+ return (taille);
}
-
} // end namespace otb
-
diff --git a/Code/IO/otbLUMImageIO.h b/Code/IO/otbLUMImageIO.h
index 17ce46fb6d..003767b879 100644
--- a/Code/IO/otbLUMImageIO.h
+++ b/Code/IO/otbLUMImageIO.h
@@ -23,7 +23,6 @@
#include <string>
#include <vector>
-
namespace otb
{
@@ -41,12 +40,12 @@ class ITK_EXPORT LUMImageIO : public itk::ImageIOBase
public:
/** Standard class typedefs. */
- typedef LUMImageIO Self;
- typedef itk::ImageIOBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef LUMImageIO Self;
+ typedef itk::ImageIOBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
/** Byte order typedef */
- typedef Superclass::ByteOrder ByteOrder;
+ typedef Superclass::ByteOrder ByteOrder;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -64,7 +63,7 @@ public:
virtual bool CanStreamRead()
{
return true;
- };
+ }
/** Set the spacing and dimention information for the set filename. */
virtual void ReadImageInformation();
@@ -85,7 +84,7 @@ public:
virtual bool CanStreamWrite()
{
return true;
- };
+ }
/** Writes the spacing and dimentions of the image.
* Assumes SetFileName has been called with a valid file name. */
@@ -113,59 +112,57 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- LUMImageIO(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LUMImageIO(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Internal method to read header informations */
- bool InternalReadHeaderInformation(std::fstream & file, const bool reportError);
+ bool InternalReadHeaderInformation(std::fstream& file, const bool reportError);
/** This method get the LUM type */
- int CaiGetTypeLum( const char * type_code,
- std::string & str_sens_code,
- int & inbbits,
- std::string & str_cod_pix);
-
+ int CaiGetTypeLum(const char * type_code,
+ std::string& str_sens_code,
+ int& inbbits,
+ std::string& str_cod_pix);
#define otbSwappFileOrderToSystemOrderMacro(StrongType, buffer, buffer_size) \
{ \
- typedef itk::ByteSwapper< StrongType > InternalByteSwapperType; \
- if ( m_ByteOrder != m_FileByteOrder ) \
+ typedef itk::ByteSwapper<StrongType> InternalByteSwapperType; \
+ if (m_ByteOrder != m_FileByteOrder) \
+ { \
+ if (m_ByteOrder == LittleEndian) \
+ { \
+ InternalByteSwapperType::SwapRangeFromSystemToBigEndian((StrongType *) buffer, buffer_size); \
+ } \
+ else if (m_ByteOrder == BigEndian) \
{ \
- if ( m_ByteOrder == LittleEndian ) \
- { \
- InternalByteSwapperType::SwapRangeFromSystemToBigEndian( (StrongType *)buffer, buffer_size ); \
- } \
- else if ( m_ByteOrder == BigEndian ) \
- { \
- InternalByteSwapperType::SwapRangeFromSystemToLittleEndian((StrongType *)buffer, buffer_size ); \
- } \
+ InternalByteSwapperType::SwapRangeFromSystemToLittleEndian((StrongType *) buffer, buffer_size); \
} \
+ } \
}
#define otbSwappFileToSystemMacro(StrongType, WeakType, buffer, buffer_size) \
- else if ( this->GetComponentType() == WeakType ) \
+ else if (this->GetComponentType() == WeakType) \
{ \
- otbSwappFileOrderToSystemOrderMacro( StrongType, buffer, buffer_size )\
+ otbSwappFileOrderToSystemOrderMacro(StrongType, buffer, buffer_size) \
}
#define otbSetTypeLumMacro(WeakType, CAI_VALUE_BE, CAI_VALUE_LE) \
- else if ( this->GetComponentType() == WeakType ) \
+ else if (this->GetComponentType() == WeakType) \
{ \
- if ( m_ByteOrder == LittleEndian ) \
- { \
- m_TypeLum = CAI_VALUE_LE; \
- } \
- else \
- { \
- m_TypeLum = CAI_VALUE_BE; \
- }\
+ if (m_ByteOrder == LittleEndian) \
+ { \
+ m_TypeLum = CAI_VALUE_LE; \
+ } \
+ else \
+ { \
+ m_TypeLum = CAI_VALUE_BE; \
+ } \
}
-
- bool m_FlagWriteImageInformation;
- std::vector< std::string > m_CaiLumTyp; //used for read
- std::string m_TypeLum; //used for write
+ bool m_FlagWriteImageInformation;
+ std::vector<std::string> m_CaiLumTyp; //used for read
+ std::string m_TypeLum; //used for write
itk::ImageIOBase::ByteOrder m_FileByteOrder;
- std::fstream m_File;
+ std::fstream m_File;
};
diff --git a/Code/IO/otbLUMImageIOFactory.cxx b/Code/IO/otbLUMImageIOFactory.cxx
index b741beb35e..91fa8c599e 100644
--- a/Code/IO/otbLUMImageIOFactory.cxx
+++ b/Code/IO/otbLUMImageIOFactory.cxx
@@ -21,7 +21,6 @@
#include "otbLUMImageIO.h"
#include "itkVersion.h"
-
namespace otb
{
@@ -51,4 +50,3 @@ LUMImageIOFactory::GetDescription() const
}
} // end namespace otb
-
diff --git a/Code/IO/otbLUMImageIOFactory.h b/Code/IO/otbLUMImageIOFactory.h
index d160c4713e..ef7a417234 100644
--- a/Code/IO/otbLUMImageIOFactory.h
+++ b/Code/IO/otbLUMImageIOFactory.h
@@ -30,10 +30,10 @@ class ITK_EXPORT LUMImageIOFactory : public itk::ObjectFactoryBase
{
public:
/** Standard class typedefs. */
- typedef LUMImageIOFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LUMImageIOFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -57,12 +57,11 @@ protected:
virtual ~LUMImageIOFactory();
private:
- LUMImageIOFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ LUMImageIOFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbMSTARImageIO.cxx b/Code/IO/otbMSTARImageIO.cxx
index e501d8e239..da43cf26b2 100644
--- a/Code/IO/otbMSTARImageIO.cxx
+++ b/Code/IO/otbMSTARImageIO.cxx
@@ -33,7 +33,6 @@
#define LSB_FIRST 0 /* Implies little-endian CPU... */
#define MSB_FIRST 1 /* Implies big-endian CPU... */
-
#include "itkExceptionObject.h"
#include "itkJPEGImageIO.h"
@@ -44,7 +43,6 @@
#include "otbMacro.h"
-
namespace otb
{
@@ -63,51 +61,49 @@ MSTARImageIO::MSTARImageIO()
m_NbOctetPixel = 0;
- MSTARfp=NULL; /* Input FILE ptr to MSTAR image file */
- HDRfp=NULL; /* Output FILE ptr to MSTAR header file */
+ MSTARfp = NULL; /* Input FILE ptr to MSTAR image file */
+ HDRfp = NULL; /* Output FILE ptr to MSTAR header file */
- MSTARname=NULL; /* Input MSTAR filename */
+ MSTARname = NULL; /* Input MSTAR filename */
- tptr=NULL; /* Temp buffer ptr */
- phdr=NULL; /* Ptr to buffer to hold Phoenix header */
+ tptr = NULL; /* Temp buffer ptr */
+ phdr = NULL; /* Ptr to buffer to hold Phoenix header */
- FSCENEdata=NULL; /* Ptr to Fullscene data buffer */
- CHIPdata=NULL; /* Ptr to CHIp data buffer */
+ FSCENEdata = NULL; /* Ptr to Fullscene data buffer */
+ CHIPdata = NULL; /* Ptr to CHIp data buffer */
}
-
/** Destructor */
MSTARImageIO::~MSTARImageIO()
{
- if ( phdr != NULL)
- {
+ if (phdr != NULL)
+ {
free(phdr);
phdr = NULL;
- }
+ }
}
-
-bool MSTARImageIO::CanReadFile( const char* filename )
+bool MSTARImageIO::CanReadFile(const char* filename)
{
// First check the filename extension
std::string fname = filename;
- if ( fname == "" )
- {
+ if (fname == "")
+ {
itkDebugMacro(<< "Fichier image non specifie.");
- }
+ }
int NbLignes; /* Nombre de lignes de l'image */
int NbColonnes; /* Nombre de colonnes de l'image */
MSTARname = filename;
- MSTARfp = fopen(MSTARname,"rb");
+ MSTARfp = fopen(MSTARname, "rb");
if (MSTARfp == NULL)
- {
- otbMsgDevMacro(<<"\nError: Unable to open ["<<MSTARname<<"] for reading!\n");
+ {
+ otbMsgDevMacro(<< "\nError: Unable to open [" << MSTARname << "] for reading!\n");
return false;
- }
+ }
/****************************************************
* Read first 512 bytes to figure out some header *
@@ -118,68 +114,68 @@ bool MSTARImageIO::CanReadFile( const char* filename )
rewind(MSTARfp);
/* Extract Phoenix Summary header length */
- tptr = (char *) strstr(tbuff,"PhoenixHeaderLength= ");
+ tptr = (char *) strstr(tbuff, "PhoenixHeaderLength= ");
if (tptr == (char *) NULL)
- {
+ {
// fprintf(stderr,"Can not determine Phoenix header length!\n");
fclose(MSTARfp);
return false;
- }
+ }
else
- {
- sscanf((tptr+20), "%d", &phlen);
- }
+ {
+ sscanf((tptr + 20), "%d", &phlen);
+ }
/* Check for and extract native header length */
- tptr = (char *) strstr(tbuff,"native_header_length= ");
+ tptr = (char *) strstr(tbuff, "native_header_length= ");
if (tptr == (char *) NULL)
- {
+ {
// fprintf(stderr,"Can not determine native header length!\n");
fclose(MSTARfp);
return false;
- }
+ }
else
- {
- sscanf((tptr+21), "%d", &nhlen);
- }
+ {
+ sscanf((tptr + 21), "%d", &nhlen);
+ }
/* Extract MSTAR column width */
- tptr = (char *) strstr(tbuff,"NumberOfColumns= ");
+ tptr = (char *) strstr(tbuff, "NumberOfColumns= ");
if (tptr == (char *) NULL)
- {
- otbMsgDevMacro(<<"Error: Can not determine MSTAR image width");
+ {
+ otbMsgDevMacro(<< "Error: Can not determine MSTAR image width");
fclose(MSTARfp);
return false;
- }
+ }
else
- {
- sscanf((tptr+16), "%d", &numcols);
+ {
+ sscanf((tptr + 16), "%d", &numcols);
NbColonnes = static_cast<int>(numcols);
- }
+ }
/* Extract MSTAR row height */
- tptr = (char *) strstr(tbuff,"NumberOfRows= ");
+ tptr = (char *) strstr(tbuff, "NumberOfRows= ");
if (tptr == (char *) NULL)
- {
- otbMsgDevMacro(<<"Error: Can not determine MSTAR image height!");
+ {
+ otbMsgDevMacro(<< "Error: Can not determine MSTAR image height!");
fclose(MSTARfp);
return false;
- }
+ }
else
- {
- sscanf((tptr+13), "%d",&numrows);
+ {
+ sscanf((tptr + 13), "%d", &numrows);
NbLignes = static_cast<int>(numrows);
- }
+ }
/* Set MSTAR image type */
if (nhlen == 0)
- {/* Implies FLOAT MSTAR chip image */
+ { /* Implies FLOAT MSTAR chip image */
mstartype = CHIP_IMAGE;
- }
+ }
else
- {
+ {
mstartype = FSCENE_IMAGE; /* UnShort Fullscene */
- }
+ }
/*******************************************************
* Allocate memory to header buffer, read Phoenix hdr, *
@@ -212,43 +208,40 @@ bool MSTARImageIO::CanReadFile( const char* filename )
// free(phdr);
-
fclose(MSTARfp);
otbMsgDevMacro(<< "Can read MSTAR");
return bool(true);
}
-
-bool MSTARImageIO::CanWriteFile( const char * filename )
+bool MSTARImageIO::CanWriteFile(const char * filename)
{
- bool formatFound = false;
+ bool formatFound = false;
std::string fname = filename;
- if ( fname == "" )
- {
+ if (fname == "")
+ {
itkDebugMacro(<< "Fichier image non specifie.");
- }
+ }
- if ( formatFound == false )
- {
+ if (formatFound == false)
+ {
std::string identificationErreur;
identificationErreur = "Format MSTAR non detecte dans l'extension du fichier.";
- itkDebugMacro(<<identificationErreur.c_str());
- }
+ itkDebugMacro(<< identificationErreur.c_str());
+ }
return formatFound;
}
-
void MSTARImageIO::Read(void* buffer)
{
- MSTARfp = fopen(MSTARname,"rb");
+ MSTARfp = fopen(MSTARname, "rb");
if (MSTARfp == NULL)
- {
- itkExceptionMacro(<< "Error: Unable to open file for reading!\n\n " << m_FileName.c_str() <<").");
- }
+ {
+ itkExceptionMacro(<< "Error: Unable to open file for reading!\n\n " << m_FileName.c_str() << ").");
+ }
/****************************************************
* Read first 512 bytes to figure out some header *
@@ -259,87 +252,89 @@ void MSTARImageIO::Read(void* buffer)
rewind(MSTARfp);
/* Extract Phoenix Summary header length */
- tptr = (char *) strstr(tbuff,"PhoenixHeaderLength= ");
+ tptr = (char *) strstr(tbuff, "PhoenixHeaderLength= ");
if (tptr == (char *) NULL)
- {
- itkExceptionMacro(<< "Error: Can not determine Phoenix header length!" );
+ {
+ itkExceptionMacro(<< "Error: Can not determine Phoenix header length!");
fclose(MSTARfp);
- }
+ }
else
- {
- sscanf((tptr+20), "%d", &phlen);
- }
+ {
+ sscanf((tptr + 20), "%d", &phlen);
+ }
/* Check for and extract native header length */
- tptr = (char *) strstr(tbuff,"native_header_length= ");
+ tptr = (char *) strstr(tbuff, "native_header_length= ");
if (tptr == (char *) NULL)
- {
- itkExceptionMacro(<<"Can not determine native header length!\n");
+ {
+ itkExceptionMacro(<< "Can not determine native header length!\n");
fclose(MSTARfp);
- }
+ }
else
- {
- sscanf((tptr+21), "%d", &nhlen);
- }
+ {
+ sscanf((tptr + 21), "%d", &nhlen);
+ }
/* Extract MSTAR column width */
- tptr = (char *) strstr(tbuff,"NumberOfColumns= ");
+ tptr = (char *) strstr(tbuff, "NumberOfColumns= ");
if (tptr == (char *) NULL)
- {
- itkExceptionMacro(<<"Error: Can not determine MSTAR image width");
+ {
+ itkExceptionMacro(<< "Error: Can not determine MSTAR image width");
fclose(MSTARfp);
- }
+ }
else
- {
- sscanf((tptr+16), "%d", &numcols);
+ {
+ sscanf((tptr + 16), "%d", &numcols);
m_Dimensions[0] = static_cast<int>(numcols);
- }
+ }
/* Extract MSTAR row height */
- tptr = (char *) strstr(tbuff,"NumberOfRows= ");
+ tptr = (char *) strstr(tbuff, "NumberOfRows= ");
if (tptr == (char *) NULL)
- {
- itkExceptionMacro(<<"Error: Can not determine MSTAR image height!");
+ {
+ itkExceptionMacro(<< "Error: Can not determine MSTAR image height!");
fclose(MSTARfp);
- }
+ }
else
- {
- sscanf((tptr+13), "%d",&numrows);
+ {
+ sscanf((tptr + 13), "%d", &numrows);
m_Dimensions[1] = static_cast<int>(numrows);
- }
+ }
/* Set MSTAR image type */
if (nhlen == 0)
- {/* Implies FLOAT MSTAR chip image */
+ { /* Implies FLOAT MSTAR chip image */
mstartype = CHIP_IMAGE;
otbMsgDevMacro(<< " Chip type ");
- }
+ }
else
- {
+ {
mstartype = FSCENE_IMAGE; /* UnShort Fullscene */
- otbMsgDevMacro( << " Scene type " );
- }
-
+ otbMsgDevMacro(<< " Scene type ");
+ }
- unsigned long step = this->GetNumberOfComponents() * (unsigned long)(m_NbOctetPixel);;
- float * p = static_cast<float *>(buffer);
+ unsigned long step = this->GetNumberOfComponents() * (unsigned long) (m_NbOctetPixel);
+ float * p = static_cast<float *>(buffer);
int lNbLines = this->GetIORegion().GetSize()[1];
int lNbColumns = this->GetIORegion().GetSize()[0];
- unsigned long lNbPixels = (unsigned long)(lNbColumns*lNbLines);
- unsigned long lTailleBuffer = (unsigned long)(m_NbOctetPixel)*lNbPixels;
+ unsigned long lNbPixels = (unsigned long) (lNbColumns * lNbLines);
+ unsigned long lTailleBuffer = (unsigned long) (m_NbOctetPixel) * lNbPixels;
unsigned char* value = new unsigned char[lTailleBuffer];
- otbMsgDevMacro( << "MSTARImageIO::Read() IORegion Start["<<this->GetIORegion().GetIndex()[0]<<","<<this->GetIORegion().GetIndex()[1]<<"] Size ["<<this->GetIORegion().GetSize()[0]<<","<<this->GetIORegion().GetSize()[1]<<"] on Image size ["<<m_Dimensions[0]<<","<<m_Dimensions[1]<<"]");
+ otbMsgDevMacro(
+ << "MSTARImageIO::Read() IORegion Start[" << this->GetIORegion().GetIndex()[0] << "," <<
+ this->GetIORegion().GetIndex()[1] << "] Size [" << this->GetIORegion().GetSize()[0] << "," <<
+ this->GetIORegion().GetSize()[1] << "] on Image size [" << m_Dimensions[0] << "," << m_Dimensions[1] << "]");
/******************************************************
* Set up location to point to MSTAR magnitude data.. *
******************************************************/
switch (mstartype)
- {
+ {
case CHIP_IMAGE:
magloc = phlen;
fseek(MSTARfp, magloc, 0);
@@ -350,7 +345,7 @@ void MSTARImageIO::Read(void* buffer)
fseek(MSTARfp, magloc, 0);
nchunks = numrows * numcols;
break;
- }
+ }
/******************************************************
* Check byte-order, swap bytes if necessary... *
@@ -361,14 +356,14 @@ void MSTARImageIO::Read(void* buffer)
/* Check byteorder */
byteorder = (int) CheckByteOrder();
switch (byteorder)
- {
+ {
case LSB_FIRST:
printf("==> Little-Endian CPU detected: Will byteswap before scaling data!\n");
break;
case MSB_FIRST:
printf("==> Big-Endian CPU detected: No byteswap needed!\n");
break;
- }
+ }
/******************************************************
* Allocate memory, read data, & write out based on *
@@ -390,53 +385,49 @@ void MSTARImageIO::Read(void* buffer)
/* Open output file for writing... */
switch (mstartype)
- {
+ {
case CHIP_IMAGE:
otbMsgDevMacro(<< " Chip and all ");
totchunks = nchunks * 2;
bytesPerImage = totchunks * sizeof(float);
CHIPdata = (float *) malloc(bytesPerImage);
-
if (CHIPdata == (float *) NULL)
- {
+ {
fclose(MSTARfp);
itkExceptionMacro("Error: Unable to malloc CHIP memory!\n");
- }
-
+ }
switch (byteorder)
- {
+ {
case LSB_FIRST: /* Little-endian..do byteswap */
- otbMsgDevMacro(<<"Performing auto-byteswap...\n");
+ otbMsgDevMacro(<< "Performing auto-byteswap...\n");
for (i = 0; i < totchunks; ++i)
- {
+ {
fread(bigfloatbuf, sizeof(char), 4, MSTARfp);
littlefloatval = byteswap_SR_IR(bigfloatbuf);
CHIPdata[i] = littlefloatval;
- }
+ }
break;
case MSB_FIRST: /* Big-endian..no swap */
numgot = fread(CHIPdata, sizeof(float), totchunks, MSTARfp);
break;
- }
+ }
/* Writes ALL data or MAG only data based on totchunks */
//n = fwrite(CHIPdata, sizeof(float), totchunks, RAWfp);
-
// Recopie dans le buffer
- for (int ci=0; ci<nchunks; ++ci)
- {
- p[ci*2]=CHIPdata[ci]; //magnitude
- p[ci*2+1]=CHIPdata[nchunks+ci]; //phase
- }
-
+ for (int ci = 0; ci < nchunks; ++ci)
+ {
+ p[ci * 2] = CHIPdata[ci]; //magnitude
+ p[ci * 2 + 1] = CHIPdata[nchunks + ci]; //phase
+ }
/* Cleanup: Close file..free memory */
free(CHIPdata);
@@ -444,111 +435,106 @@ void MSTARImageIO::Read(void* buffer)
case FSCENE_IMAGE:
bytesPerImage = nchunks * sizeof(short);
- FSCENEdata = (unsigned short *) malloc( bytesPerImage );
+ FSCENEdata = (unsigned short *) malloc(bytesPerImage);
if (FSCENEdata == (unsigned short *) NULL)
- {
+ {
fclose(MSTARfp);
- itkExceptionMacro(<<"Error: Unable to malloc fullscene memory!\n");
- }
+ itkExceptionMacro(<< "Error: Unable to malloc fullscene memory!\n");
+ }
- otbMsgDevMacro(<<"Reading MSTAR fullscene magnitude data from ["<<MSTARname<<"].");
+ otbMsgDevMacro(<< "Reading MSTAR fullscene magnitude data from [" << MSTARname << "].");
switch (byteorder)
- {
+ {
case LSB_FIRST: /* Little-endian..do byteswap */
- otbMsgDevMacro(<<"Performing auto-byteswap...");
+ otbMsgDevMacro(<< "Performing auto-byteswap...");
for (i = 0; i < nchunks; ++i)
- {
+ {
fread(bigushortbuf, sizeof(char), 2, MSTARfp);
littleushortval = byteswap_SUS_IUS(bigushortbuf);
FSCENEdata[i] = littleushortval;
- }
+ }
break;
case MSB_FIRST: /* Big-endian..no swap */
numgot = fread(FSCENEdata, sizeof(short), nchunks, MSTARfp);
break;
- }
+ }
- otbMsgDevMacro(<<"Writing MSTAR fullscene magnitude data to ["<<RAWname<<"].");
+ otbMsgDevMacro(<< "Writing MSTAR fullscene magnitude data to [" << RAWname << "].");
//n = fwrite(FSCENEdata, sizeof(short), nchunks, RAWfp);
- for ( int nbComponents = 0; nbComponents < 1; ++nbComponents)
- {
+ for (int nbComponents = 0; nbComponents < 1; ++nbComponents)
+ {
// Recopie dans le buffer
unsigned long cpt(0);
- cpt = (unsigned long )(nbComponents)* (unsigned long)(m_NbOctetPixel);
- for ( unsigned long i=0; i < lTailleBuffer; i = i+m_NbOctetPixel )
- {
- memcpy((void*)(&(p[cpt])),(const void*)(&(FSCENEdata[i])),(size_t)(m_NbOctetPixel));
+ cpt = (unsigned long) (nbComponents) * (unsigned long) (m_NbOctetPixel);
+ for (unsigned long i = 0; i < lTailleBuffer; i = i + m_NbOctetPixel)
+ {
+ memcpy((void*) (&(p[cpt])), (const void*) (&(FSCENEdata[i])), (size_t) (m_NbOctetPixel));
cpt += step;
- }
-
+ }
- }
+ }
if (n != nchunks)
- {
+ {
fclose(MSTARfp);
itkExceptionMacro(<< "Error: in writing MSTAR Fullscene data!");
- }
+ }
- otbMsgDevMacro(<<"Reading MSTAR fullscene phase data from ["<<MSTARname<<"].");
+ otbMsgDevMacro(<< "Reading MSTAR fullscene phase data from [" << MSTARname << "].");
switch (byteorder)
- {
+ {
case LSB_FIRST: /* Little-endian..do byteswap */
- otbMsgDevMacro(<<"Performing auto-byteswap...");
+ otbMsgDevMacro(<< "Performing auto-byteswap...");
for (i = 0; i < nchunks; ++i)
- {
+ {
fread(bigushortbuf, sizeof(char), 2, MSTARfp);
littleushortval = byteswap_SUS_IUS(bigushortbuf);
FSCENEdata[i] = littleushortval;
- }
+ }
break;
case MSB_FIRST: /* Big-endian..no swap */
numgot = fread(FSCENEdata, sizeof(short), nchunks, MSTARfp);
break;
- }
+ }
- otbMsgDevMacro(<<"Writing MSTAR fullscene phase data to ["<<RAWname<<"].");
+ otbMsgDevMacro(<< "Writing MSTAR fullscene phase data to [" << RAWname << "].");
// n = fwrite(FSCENEdata, sizeof(short), nchunks, RAWfp);
- for ( unsigned int nbComponents = 1; nbComponents < this->GetNumberOfComponents(); ++nbComponents)
- {
+ for (unsigned int nbComponents = 1; nbComponents < this->GetNumberOfComponents(); ++nbComponents)
+ {
// Recopie dans le buffer
unsigned long cpt(0);
- cpt = (unsigned long )(nbComponents)* (unsigned long)(m_NbOctetPixel);
- for ( unsigned long i=0; i < lTailleBuffer; i = i+m_NbOctetPixel )
- {
- memcpy((void*)(&(p[cpt])),(const void*)(&(CHIPdata[i])),(size_t)(m_NbOctetPixel));
+ cpt = (unsigned long) (nbComponents) * (unsigned long) (m_NbOctetPixel);
+ for (unsigned long i = 0; i < lTailleBuffer; i = i + m_NbOctetPixel)
+ {
+ memcpy((void*) (&(p[cpt])), (const void*) (&(CHIPdata[i])), (size_t) (m_NbOctetPixel));
cpt += step;
- }
-
+ }
- }
+ }
if (n != nchunks)
- {
+ {
fclose(MSTARfp);
- itkExceptionMacro(<<"Error: in writing MSTAR Fullscene Phase data!");
- }
+ itkExceptionMacro(<< "Error: in writing MSTAR Fullscene Phase data!");
+ }
/* Cleanup: free memory */
free(FSCENEdata);
-
break; /* End of FSCENE_IMAGE case */
- } /* End of 'mstartype' switch */
-
+ } /* End of 'mstartype' switch */
/* Cleanup: close files */
fclose(MSTARfp);
-
- delete [] value;
+ delete[] value;
}
void MSTARImageIO::ReadImageInformation()
@@ -558,12 +544,11 @@ void MSTARImageIO::ReadImageInformation()
int NbOctetPixel = sizeof(float); /* Nombre octets/pixel l'image */
MSTARname = m_FileName.c_str();
- MSTARfp = fopen(MSTARname,"rb");
+ MSTARfp = fopen(MSTARname, "rb");
if (MSTARfp == NULL)
- {
- itkExceptionMacro(<< "Error: Unable to open file for reading!\n\n " << m_FileName.c_str() );
- }
-
+ {
+ itkExceptionMacro(<< "Error: Unable to open file for reading!\n\n " << m_FileName.c_str());
+ }
/****************************************************
* Read first 512 bytes to figure out some header *
@@ -574,112 +559,111 @@ void MSTARImageIO::ReadImageInformation()
rewind(MSTARfp);
/* Extract Phoenix Summary header length */
- tptr = (char *) strstr(tbuff,"PhoenixHeaderLength= ");
+ tptr = (char *) strstr(tbuff, "PhoenixHeaderLength= ");
if (tptr == (char *) NULL)
- {
- itkExceptionMacro(<< "Error: Can not determine Phoenix header length!" );
+ {
+ itkExceptionMacro(<< "Error: Can not determine Phoenix header length!");
fclose(MSTARfp);
- }
+ }
else
- {
- sscanf((tptr+20), "%d", &phlen);
- }
+ {
+ sscanf((tptr + 20), "%d", &phlen);
+ }
/* Check for and extract native header length */
- tptr = (char *) strstr(tbuff,"native_header_length= ");
+ tptr = (char *) strstr(tbuff, "native_header_length= ");
if (tptr == (char *) NULL)
- {
- itkExceptionMacro(<<"Can not determine native header length!\n");
+ {
+ itkExceptionMacro(<< "Can not determine native header length!\n");
fclose(MSTARfp);
- }
+ }
else
- {
- sscanf((tptr+21), "%d", &nhlen);
- }
+ {
+ sscanf((tptr + 21), "%d", &nhlen);
+ }
/* Extract MSTAR column width */
- tptr = (char *) strstr(tbuff,"NumberOfColumns= ");
+ tptr = (char *) strstr(tbuff, "NumberOfColumns= ");
if (tptr == (char *) NULL)
- {
- itkExceptionMacro(<<"Error: Can not determine MSTAR image width");
+ {
+ itkExceptionMacro(<< "Error: Can not determine MSTAR image width");
fclose(MSTARfp);
- }
+ }
else
- {
- sscanf((tptr+16), "%d", &numcols);
+ {
+ sscanf((tptr + 16), "%d", &numcols);
NbColonnes = static_cast<int>(numcols);
- }
+ }
/* Extract MSTAR row height */
- tptr = (char *) strstr(tbuff,"NumberOfRows= ");
+ tptr = (char *) strstr(tbuff, "NumberOfRows= ");
if (tptr == (char *) NULL)
- {
- itkExceptionMacro(<<"Error: Can not determine MSTAR image height!");
+ {
+ itkExceptionMacro(<< "Error: Can not determine MSTAR image height!");
fclose(MSTARfp);
- }
+ }
else
- {
- sscanf((tptr+13), "%d",&numrows);
+ {
+ sscanf((tptr + 13), "%d", &numrows);
NbLignes = static_cast<int>(numrows);
- }
+ }
/* Set MSTAR image type */
if (nhlen == 0)
- {/* Implies FLOAT MSTAR chip image */
+ { /* Implies FLOAT MSTAR chip image */
mstartype = CHIP_IMAGE;
- }
+ }
else
- {
+ {
mstartype = FSCENE_IMAGE; /* UnShort Fullscene */
- }
+ }
- otbMsgDebugMacro( << "Driver: MSTAR - ");
+ otbMsgDebugMacro(<< "Driver: MSTAR - ");
this->SetNumberOfComponents(2);
this->SetNumberOfDimensions(2);
m_Dimensions[0] = NbColonnes;
m_Dimensions[1] = NbLignes;
m_NbOctetPixel = NbOctetPixel;
- otbMsgDebugMacro( <<"Image size cree : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
+ otbMsgDebugMacro(<< "Image size cree : " << m_Dimensions[0] << "," << m_Dimensions[1]);
m_PixelType = VECTOR;
-
/* Cleanup: close files */
fclose(MSTARfp);
- this->SetComponentType( FLOAT );
+ this->SetComponentType(FLOAT);
}
/** The write function is not implemented */
void MSTARImageIO::WriteImageInformation(void)
{
- itkExceptionMacro(<< "Error: The MSTARImageIO::WriteImageInformation is not implemented!");
+ itkExceptionMacro(<< "Error: The MSTARImageIO::WriteImageInformation is not implemented!");
}
/** The write function is not implemented */
-void MSTARImageIO::Write( const void* /* *buffer*/)
+void MSTARImageIO::Write(const void* /* *buffer*/)
{
- itkExceptionMacro(<< "Error: The MSTARImageIO::Write is not implemented!");
+ itkExceptionMacro(<< "Error: The MSTARImageIO::Write is not implemented!");
}
/** Print Self Method */
void MSTARImageIO::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-float MSTARImageIO::byteswap_SR_IR(unsigned char *pointer)
+float MSTARImageIO::byteswap_SR_IR(unsigned char *pointer)
{
- float *temp;
+ float * temp;
unsigned char iarray[4], *charptr;
iarray[0] = *(pointer + 3);
iarray[1] = *(pointer + 2);
iarray[2] = *(pointer + 1);
- iarray[3] = *(pointer );
+ iarray[3] = *(pointer);
charptr = iarray;
temp = (float *) charptr;
return *(temp);
@@ -688,23 +672,21 @@ float MSTARImageIO::byteswap_SR_IR(unsigned char *pointer)
unsigned short MSTARImageIO::byteswap_SUS_IUS(unsigned char *pointer)
{
unsigned short *temp;
- unsigned char iarray[2], *charptr;
+ unsigned char iarray[2], *charptr;
iarray[0] = *(pointer + 1);
- iarray[1] = *(pointer );
+ iarray[1] = *(pointer);
charptr = iarray;
temp = (unsigned short *) charptr;
return *(temp);
}
-
int MSTARImageIO::CheckByteOrder(void)
{
- short w = 0x0001;
- char *b = (char *) &w;
+ short w = 0x0001;
+ char *b = (char *) &w;
- return(b[0] ? LSB_FIRST : MSB_FIRST);
+ return (b[0] ? LSB_FIRST : MSB_FIRST);
}
-
} // end namespace otb
diff --git a/Code/IO/otbMSTARImageIO.h b/Code/IO/otbMSTARImageIO.h
index f3867a2527..a1a69bc444 100644
--- a/Code/IO/otbMSTARImageIO.h
+++ b/Code/IO/otbMSTARImageIO.h
@@ -45,8 +45,8 @@ class ITK_EXPORT MSTARImageIO : public itk::ImageIOBase
public:
/** Standard class typedefs. */
typedef MSTARImageIO Self;
- typedef itk::ImageIOBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::ImageIOBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -64,7 +64,7 @@ public:
virtual bool CanStreamRead()
{
return true;
- };
+ }
/** Set the spacing and dimension information for the set filename. */
virtual void ReadImageInformation();
@@ -82,7 +82,7 @@ public:
virtual bool CanStreamWrite()
{
return true;
- };
+ }
/** Set the spacing and dimension information for the set filename. */
virtual void WriteImageInformation();
@@ -91,14 +91,13 @@ public:
* that the IORegions has been set properly. */
virtual void Write(const void* buffer);
-
MSTARImageIO();
virtual ~MSTARImageIO();
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- MSTARImageIO(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MSTARImageIO(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Methode permettant de recuperer le format et le nom de l'image a partir du
nom d'un fichier image. */
@@ -106,27 +105,26 @@ private:
unsigned short byteswap_SUS_IUS(unsigned char *pointer);
int CheckByteOrder(void);
-
FILE *MSTARfp; /* Input FILE ptr to MSTAR image file */
FILE *RAWfp; /* Output FILE ptr to MSTAR RAW data file */
FILE *HDRfp; /* Output FILE ptr to MSTAR header file */
- int i, j, rv, n, numrows, numcols, numgot;
+ int i, j, rv, n, numrows, numcols, numgot;
const char *MSTARname; /* Input MSTAR filename */
- char RAWname[80]; /* Output MSTAR RAW filename */
- char HDRname[80]; /* Phoenix header filename buffer */
+ char RAWname[80]; /* Output MSTAR RAW filename */
+ char HDRname[80]; /* Phoenix header filename buffer */
- int outOpt; /* ALL data, or MAG ONLY... */
- int phlen, nhlen, mstartype;
- long magloc, bytesPerImage, nchunks, totchunks;
+ int outOpt; /* ALL data, or MAG ONLY... */
+ int phlen, nhlen, mstartype;
+ long magloc, bytesPerImage, nchunks, totchunks;
- char *tptr; /* Temp buffer ptr */
- char *phdr; /* Ptr to buffer to hold Phoenix header */
+ char *tptr; /* Temp buffer ptr */
+ char *phdr; /* Ptr to buffer to hold Phoenix header */
char tbuff[1024];
unsigned short *FSCENEdata; /* Ptr to Fullscene data buffer */
- float *CHIPdata; /* Ptr to CHIp data buffer */
+ float * CHIPdata; /* Ptr to CHIp data buffer */
/* Byte Order Variables */
int byteorder;
@@ -135,8 +133,7 @@ private:
unsigned char bigushortbuf[2]; /* BigEndian ushort buffer...*/
unsigned short littleushortval; /* LittleEndian ushort value.*/
-
- int m_NbOctetPixel;
+ int m_NbOctetPixel;
};
} // end namespace otb
diff --git a/Code/IO/otbMSTARImageIOFactory.cxx b/Code/IO/otbMSTARImageIOFactory.cxx
index 77143ddc74..5a2043bbe8 100644
--- a/Code/IO/otbMSTARImageIOFactory.cxx
+++ b/Code/IO/otbMSTARImageIOFactory.cxx
@@ -20,7 +20,6 @@
#include "otbMSTARImageIO.h"
#include "itkVersion.h"
-
namespace otb
{
@@ -50,4 +49,3 @@ MSTARImageIOFactory::GetDescription() const
}
} // end namespace otb
-
diff --git a/Code/IO/otbMSTARImageIOFactory.h b/Code/IO/otbMSTARImageIOFactory.h
index cc9e6f9d46..e7c9bb9f6c 100644
--- a/Code/IO/otbMSTARImageIOFactory.h
+++ b/Code/IO/otbMSTARImageIOFactory.h
@@ -30,10 +30,10 @@ class ITK_EXPORT MSTARImageIOFactory : public itk::ObjectFactoryBase
{
public:
/** Standard class typedefs. */
- typedef MSTARImageIOFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MSTARImageIOFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -57,12 +57,11 @@ protected:
virtual ~MSTARImageIOFactory();
private:
- MSTARImageIOFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MSTARImageIOFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbMWImageIO.cxx b/Code/IO/otbMWImageIO.cxx
index 19fd7055c1..1058f1c483 100644
--- a/Code/IO/otbMWImageIO.cxx
+++ b/Code/IO/otbMWImageIO.cxx
@@ -35,14 +35,14 @@ MWImageIO::MWImageIO()
this->SetNumberOfDimensions(2);
m_PixelType = SCALAR;
m_ComponentType = UCHAR;
- if ( itk::ByteSwapper<char>::SystemIsLittleEndian() == true)
- {
+ if (itk::ByteSwapper<char>::SystemIsLittleEndian() == true)
+ {
m_ByteOrder = LittleEndian;
- }
+ }
else
- {
+ {
m_ByteOrder = BigEndian;
- }
+ }
m_FileByteOrder = BigEndian;
@@ -70,39 +70,35 @@ MWImageIO::MWImageIO()
MWImageIO::~MWImageIO()
{
- if ( m_File.is_open() )
- {
+ if (m_File.is_open())
+ {
m_File.close();
- }
+ }
}
-bool MWImageIO::CanReadFile( const char* filename )
+bool MWImageIO::CanReadFile(const char* filename)
{
std::string lFileName(filename);
// Test the extension
std::string extension = GetExtension(filename);
- if ((extension!="img")&&(extension!="")&&(extension!="mw"))
- return false;
- if ( System::IsADirName(lFileName) == true )
- return false;
- if ( m_File.is_open() )
- m_File.close();
+ if ((extension != "img") && (extension != "") && (extension != "mw")) return false;
+ if (System::IsADirName(lFileName) == true) return false;
+ if (m_File.is_open()) m_File.close();
std::fstream header_file;
- header_file.open( filename, std::ios::in | std::ios::binary );
- if ( header_file.fail() )
- {
- otbMsgDevMacro(<<"MWImageIO::CanReadFile() failed header open ! " );
+ header_file.open(filename, std::ios::in | std::ios::binary);
+ if (header_file.fail())
+ {
+ otbMsgDevMacro(<< "MWImageIO::CanReadFile() failed header open ! ");
return false;
- }
+ }
//Read header informations
- bool lResult = InternalReadHeaderInformation(header_file,false);
+ bool lResult = InternalReadHeaderInformation(header_file, false);
header_file.close();
return (lResult);
}
-
// Used to print information about this object
void MWImageIO::PrintSelf(std::ostream& os, itk::Indent indent) const
{
@@ -124,115 +120,113 @@ void MWImageIO::Read(void* buffer)
int lPremiereLigne = this->GetIORegion().GetIndex()[1]; // [1... ]
int lPremiereColonne = this->GetIORegion().GetIndex()[0]; // [1... ]
- otbMsgDevMacro( <<" MWImageIO::Read() ");
- otbMsgDevMacro( <<" Dimensions de l'image : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDevMacro( <<" Region lue (IORegion) : "<<this->GetIORegion());
- otbMsgDevMacro( <<" Nb Of Components : "<<this->GetNumberOfComponents());
+ otbMsgDevMacro(<< " MWImageIO::Read() ");
+ otbMsgDevMacro(<< " Dimensions de l'image : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDevMacro(<< " Region lue (IORegion) : " << this->GetIORegion());
+ otbMsgDevMacro(<< " Nb Of Components : " << this->GetNumberOfComponents());
- std::streamoff headerLength = static_cast<std::streamoff> (64*sizeof(char)) + static_cast<std::streamoff> (m_Ncom*sizeof(char));
- std::streamoff numberOfBytesPerLines = static_cast<std::streamoff>(this->GetComponentSize() * m_Dimensions[0]);
- std::streamoff offset;
+ std::streamoff headerLength =
+ static_cast<std::streamoff> (64 * sizeof(char)) + static_cast<std::streamoff> (m_Ncom * sizeof(char));
+ std::streamoff numberOfBytesPerLines = static_cast<std::streamoff>(this->GetComponentSize() * m_Dimensions[0]);
+ std::streamoff offset;
std::streamsize numberOfBytesToBeRead = static_cast<std::streamsize>(this->GetComponentSize() * lNbColonnes);
std::streamsize numberOfBytesRead;
std::streamsize cpt = 0;
- for (int LineNo = lPremiereLigne;LineNo <lPremiereLigne + lNbLignes; LineNo++ )
- {
+ for (int LineNo = lPremiereLigne; LineNo < lPremiereLigne + lNbLignes; LineNo++)
+ {
offset = headerLength + numberOfBytesPerLines * static_cast<std::streamoff>(LineNo);
- offset += static_cast<std::streamoff>( this->GetComponentSize() * lPremiereColonne );
+ offset += static_cast<std::streamoff>(this->GetComponentSize() * lPremiereColonne);
m_File.seekg(offset, std::ios::beg);
- m_File.read( static_cast<char *>( p + cpt ), numberOfBytesToBeRead );
+ m_File.read(static_cast<char *>(p + cpt), numberOfBytesToBeRead);
numberOfBytesRead = m_File.gcount();
#ifdef __APPLE_CC__
// fail() is broken in the Mac. It returns true when reaches eof().
- if ( numberOfBytesRead != numberOfBytesToBeRead )
+ if (numberOfBytesRead != numberOfBytesToBeRead)
#else
- if ( ( numberOfBytesRead != numberOfBytesToBeRead ) || m_File.fail() )
+ if ((numberOfBytesRead != numberOfBytesToBeRead) || m_File.fail())
#endif
- {
- itkExceptionMacro(<<"MWImageIO::Read() Can Read the specified Region"); // read failed
- }
+ {
+ itkExceptionMacro(<< "MWImageIO::Read() Can Read the specified Region"); // read failed
+ }
cpt += numberOfBytesToBeRead;
- }
+ }
unsigned long numberOfPixelsPerLines = lNbLignes * lNbColonnes;
// Swap bytes if necessary
- if ( 0 ) {}
- otbSwappFileToSystemMacro( float, FLOAT, buffer, numberOfPixelsPerLines )
+ if (0) {}
+ otbSwappFileToSystemMacro(float, FLOAT, buffer, numberOfPixelsPerLines)
else
- {
- itkExceptionMacro(<<"MWImageIO::Read() undefined component type! " );
- }
+ {
+ itkExceptionMacro(<< "MWImageIO::Read() undefined component type! ");
+ }
}
-
void MWImageIO::ReadImageInformation()
{
- if ( m_File.is_open() )
- {
+ if (m_File.is_open())
+ {
m_File.close();
- }
+ }
- m_File.open( m_FileName.c_str(), std::ios::in | std::ios::binary );
- if ( m_File.fail() )
- {
- itkExceptionMacro(<<"MWImageIO::ReadImageInformation() failed header open ! " );
- }
+ m_File.open(m_FileName.c_str(), std::ios::in | std::ios::binary);
+ if (m_File.fail())
+ {
+ itkExceptionMacro(<< "MWImageIO::ReadImageInformation() failed header open ! ");
+ }
//Read header informations
- InternalReadHeaderInformation(m_File,true);
+ InternalReadHeaderInformation(m_File, true);
- otbMsgDebugMacro( <<"Driver to read: MW");
- otbMsgDebugMacro( <<" Read file : "<< m_FileName);
- otbMsgDebugMacro( <<" Size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDebugMacro( <<" ComponentType : "<<this->GetComponentType() );
- otbMsgDebugMacro( <<" NumberOfComponents : "<<this->GetNumberOfComponents());
- otbMsgDebugMacro( <<" ComponentSize : "<<this->GetComponentSize());
- otbMsgDebugMacro( <<" GetPixelSize : "<<this->GetPixelSize());
+ otbMsgDebugMacro(<< "Driver to read: MW");
+ otbMsgDebugMacro(<< " Read file : " << m_FileName);
+ otbMsgDebugMacro(<< " Size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDebugMacro(<< " ComponentType : " << this->GetComponentType());
+ otbMsgDebugMacro(<< " NumberOfComponents : " << this->GetNumberOfComponents());
+ otbMsgDebugMacro(<< " ComponentSize : " << this->GetComponentSize());
+ otbMsgDebugMacro(<< " GetPixelSize : " << this->GetPixelSize());
}
-
-bool MWImageIO::InternalReadHeaderInformation(std::fstream & file, const bool reportError)
+bool MWImageIO::InternalReadHeaderInformation(std::fstream& file, const bool reportError)
{
char * headerInformation = new char[64];
- file.seekg(0, std::ios::beg );
- file.read(headerInformation,64);
+ file.seekg(0, std::ios::beg);
+ file.read(headerInformation, 64);
unsigned short NbCol(0);
unsigned short NbLig(0);
unsigned short Nbcom(0);
//Set file byte order
- if ( headerInformation[0] == *("R") || headerInformation[1] == *("I") )
- {
+ if (headerInformation[0] == *("R") || headerInformation[1] == *("I"))
+ {
m_FileByteOrder = BigEndian;
//Read image dimensions
- Nbcom = (static_cast<unsigned int>(headerInformation[3])<<8) + static_cast<unsigned char> (headerInformation[2]);
+ Nbcom = (static_cast<unsigned int>(headerInformation[3]) << 8) + static_cast<unsigned char> (headerInformation[2]);
m_Ncom = Nbcom;
- NbCol = (static_cast<unsigned int>(headerInformation[5])<<8) + static_cast<unsigned char> (headerInformation[4]);
- NbLig = (static_cast<unsigned int>(headerInformation[7])<<8) + static_cast<unsigned char> (headerInformation[6]);
- }
- else if ( headerInformation[0] == *("I") || headerInformation[1] == *("R") )
- {
+ NbCol = (static_cast<unsigned int>(headerInformation[5]) << 8) + static_cast<unsigned char> (headerInformation[4]);
+ NbLig = (static_cast<unsigned int>(headerInformation[7]) << 8) + static_cast<unsigned char> (headerInformation[6]);
+ }
+ else if (headerInformation[0] == *("I") || headerInformation[1] == *("R"))
+ {
m_FileByteOrder = LittleEndian;
//Read image dimensions
- Nbcom = ((static_cast<unsigned int>(headerInformation[2]))<<8) + static_cast<unsigned char> (headerInformation[3]);
+ Nbcom = ((static_cast<unsigned int>(headerInformation[2])) << 8) + static_cast<unsigned char> (headerInformation[3]);
m_Ncom = Nbcom;
- NbCol = ((static_cast<unsigned int>(headerInformation[4]))<<8) + static_cast<unsigned char> (headerInformation[5]);
- NbLig = ((static_cast<unsigned int>(headerInformation[6]))<<8) + static_cast<unsigned char> (headerInformation[7]);
- }
+ NbCol = ((static_cast<unsigned int>(headerInformation[4])) << 8) + static_cast<unsigned char> (headerInformation[5]);
+ NbLig = ((static_cast<unsigned int>(headerInformation[6])) << 8) + static_cast<unsigned char> (headerInformation[7]);
+ }
else
- {
- if ( reportError == true )
{
+ if (reportError == true)
+ {
itkExceptionMacro(<< "MW : impossible to determine CodePix information of the image");
- }
+ }
return false;
- }
+ }
SetComponentType(FLOAT);
-
//Initialization of image informations
m_Dimensions[0] = NbCol;
m_Dimensions[1] = NbLig;
@@ -240,62 +234,60 @@ bool MWImageIO::InternalReadHeaderInformation(std::fstream & file, const bool re
this->SetFileTypeToBinary();
this->SetNumberOfDimensions(2);
delete[] headerInformation;
- return(true);
+ return (true);
}
-
-bool MWImageIO::CanWriteFile( const char* filename )
+bool MWImageIO::CanWriteFile(const char* filename)
{
std::string lFileName(filename);
std::string extension = GetExtension(filename);
- if (extension!="mw")
- return false;
- if ( System::IsADirName(lFileName) == true )
- return false;
+ if (extension != "mw") return false;
+ if (System::IsADirName(lFileName) == true) return false;
return true;
}
void MWImageIO::Write(const void* buffer)
{
- if ( m_FlagWriteImageInformation == true )
- {
+ if (m_FlagWriteImageInformation == true)
+ {
this->WriteImageInformation();
m_FlagWriteImageInformation = false;
- }
+ }
unsigned long lNbLignes = this->GetIORegion().GetSize()[1];
unsigned long lNbColonnes = this->GetIORegion().GetSize()[0];
unsigned long lPremiereLigne = this->GetIORegion().GetIndex()[1]; // [1... ]
- int lPremiereColonne = this->GetIORegion().GetIndex()[0]; // [1... ]
+ int lPremiereColonne = this->GetIORegion().GetIndex()[0]; // [1... ]
// Cas particuliers : on controle que si la r�gion � �crire est de la m�me dimension que l'image enti�re,
// on commence l'offset � 0 (lorsque que l'on est pas en "Streaming")
- if ( (lNbLignes == m_Dimensions[1]) && (lNbColonnes == m_Dimensions[0]))
- {
- otbMsgDevMacro(<<"Force l'offset de l'IORegion � 0");
+ if ((lNbLignes == m_Dimensions[1]) && (lNbColonnes == m_Dimensions[0]))
+ {
+ otbMsgDevMacro(<< "Force l'offset de l'IORegion � 0");
lPremiereLigne = 0;
lPremiereColonne = 0;
- }
+ }
- otbMsgDevMacro( <<" MWImageIO::Write() ");
- otbMsgDevMacro( <<" Dimensions de l'image : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDevMacro( <<" Region lue (IORegion) : "<<this->GetIORegion());
- otbMsgDevMacro( <<" Nb Of Components : "<<this->GetNumberOfComponents());
- otbMsgDevMacro( <<" GetComponentSize : "<<this->GetComponentSize());
+ otbMsgDevMacro(<< " MWImageIO::Write() ");
+ otbMsgDevMacro(<< " Dimensions de l'image : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDevMacro(<< " Region lue (IORegion) : " << this->GetIORegion());
+ otbMsgDevMacro(<< " Nb Of Components : " << this->GetNumberOfComponents());
+ otbMsgDevMacro(<< " GetComponentSize : " << this->GetComponentSize());
std::streamoff numberOfBytesPerLines = this->GetComponentSize() * m_Dimensions[0];
- std::streamoff headerLength = static_cast<std::streamoff> (64*sizeof(char)) + static_cast<std::streamoff> (m_Ncom*sizeof(char));
- std::streamoff offset;
+ std::streamoff headerLength =
+ static_cast<std::streamoff> (64 * sizeof(char)) + static_cast<std::streamoff> (m_Ncom * sizeof(char));
+ std::streamoff offset;
std::streamsize numberOfBytesToBeWrite = this->GetComponentSize() * lNbColonnes;
// std::streamsize numberOfBytesToBeWriteFloat = sizeof(float) * lNbColonnes;
std::streamsize cpt = 0;
const char * p = static_cast<const char *>(buffer);
// const float * p = dynamic_cast<const float *>(buffer);
-
+
// float floatImage[m_Dimensions[0]*m_Dimensions[1]];
-
+
// std::streamsize counter = 0;
// std::cout << "begin conversion" << std::endl;
// for (unsigned int i=0;i<m_Dimensions[0]*m_Dimensions[1];++i)
@@ -304,46 +296,45 @@ void MWImageIO::Write(const void* buffer)
// std::cout << "float " << floatImage[i] << std::endl;
// counter+=sizeof(char);
// }
-
- for (unsigned long LineNo = lPremiereLigne;LineNo <lPremiereLigne + lNbLignes; LineNo++ )
- {
+
+ for (unsigned long LineNo = lPremiereLigne; LineNo < lPremiereLigne + lNbLignes; LineNo++)
+ {
offset = headerLength + numberOfBytesPerLines * static_cast<std::streamoff>(LineNo);
- offset += static_cast<std::streamoff>( this->GetComponentSize() * lPremiereColonne );
+ offset += static_cast<std::streamoff>(this->GetComponentSize() * lPremiereColonne);
m_File.seekp(offset, std::ios::beg);
- m_File.write( static_cast<const char *>( p + cpt ), numberOfBytesToBeWrite );
+ m_File.write(static_cast<const char *>(p + cpt), numberOfBytesToBeWrite);
// m_File.write( (char *)( floatImage + cpt ), numberOfBytesToBeWriteFloat );
cpt += numberOfBytesToBeWrite;
- }
+ }
}
-
void MWImageIO::WriteImageInformation()
{
- if ( m_FileName == "" )
- {
- itkExceptionMacro(<<"A FileName must be specified.");
- }
- if ( CanWriteFile(m_FileName.c_str()) == false)
- {
- itkExceptionMacro(<< "The file "<<m_FileName.c_str()<<" is not defined as a MW file");
- }
+ if (m_FileName == "")
+ {
+ itkExceptionMacro(<< "A FileName must be specified.");
+ }
+ if (CanWriteFile(m_FileName.c_str()) == false)
+ {
+ itkExceptionMacro(<< "The file " << m_FileName.c_str() << " is not defined as a MW file");
+ }
// Close file from any previous image
- if ( m_File.is_open() )
- {
+ if (m_File.is_open())
+ {
m_File.close();
- }
+ }
// Open the new file for writing
// Actually open the file
- m_File.open( m_FileName.c_str(), std::ios::out | std::ios::trunc | std::ios::binary );
- if ( m_File.fail() )
- {
- itkExceptionMacro(<< "Cannot write requested file "<<m_FileName.c_str()<<".");
- }
-
+ m_File.open(m_FileName.c_str(), std::ios::out | std::ios::trunc | std::ios::binary);
+ if (m_File.fail())
+ {
+ itkExceptionMacro(<< "Cannot write requested file " << m_FileName.c_str() << ".");
+ }
+
//Comment by MG to review write process
-
+
//Writing header information
// if ( 0 ) {}
// if ( (this->GetComponentType() != FLOAT) )
@@ -351,97 +342,95 @@ void MWImageIO::WriteImageInformation()
// itkExceptionMacro(<< "MegaWave fimage format only accepts FLOAT32 data type");
// }
m_ComponentType = FLOAT;
-
- m_File.seekp(0, std::ios::beg );
- char header[64];
+ m_File.seekp(0, std::ios::beg);
+
+ char header[64];
std::string comments("Image written with otb mw_IO_factory");
m_Ncom = comments.length();
//Initialization to 0
- for (unsigned int i =0; i<64; ++i)
+ for (unsigned int i = 0; i < 64; ++i)
header[i] = static_cast<unsigned char>(0);
//Write image size and other information
unsigned short lNbComments = m_Ncom;
unsigned short lNbLignes = static_cast<unsigned short>(this->GetIORegion().GetSize()[1]);
- unsigned short lNbColonnes =static_cast<unsigned short>( this->GetIORegion().GetSize()[0]);
+ unsigned short lNbColonnes = static_cast<unsigned short>(this->GetIORegion().GetSize()[0]);
- unsigned short low,high;
+ unsigned short low, high;
if (m_ByteOrder == BigEndian)
- {
+ {
header[0] = *("R");
header[1] = *("I");
- ByteSplitting(lNbComments,low,high);
+ ByteSplitting(lNbComments, low, high);
header[2] = static_cast<unsigned char>(low);
header[3] = static_cast<unsigned char>(high);
- ByteSplitting(lNbColonnes,low,high);
+ ByteSplitting(lNbColonnes, low, high);
header[4] = static_cast<unsigned char>(low);
header[5] = static_cast<unsigned char>(high);
- ByteSplitting(lNbLignes,low,high);
+ ByteSplitting(lNbLignes, low, high);
header[6] = static_cast<unsigned char>(low);
header[7] = static_cast<unsigned char>(high);
- }
+ }
else if (m_ByteOrder == LittleEndian)
- {
+ {
header[0] = *("I");
header[1] = *("R");
- ByteSplitting(lNbComments,low,high);
+ ByteSplitting(lNbComments, low, high);
header[3] = static_cast<unsigned char>(low);
header[2] = static_cast<unsigned char>(high);
- ByteSplitting(lNbColonnes,low,high);
+ ByteSplitting(lNbColonnes, low, high);
header[5] = static_cast<unsigned char>(low);
header[4] = static_cast<unsigned char>(high);
- ByteSplitting(lNbLignes,low,high);
+ ByteSplitting(lNbLignes, low, high);
header[7] = static_cast<unsigned char>(low);
header[6] = static_cast<unsigned char>(high);
- }
+ }
else
- {
+ {
itkExceptionMacro(<< "Unknown Byte order");
- }
-
- m_File.write(header,64);
- m_File.write(comments.data(),36);
+ }
+ m_File.write(header, 64);
+ m_File.write(comments.data(), 36);
- otbMsgDebugMacro( <<"Driver to write: MW");
- otbMsgDebugMacro( <<" Write file : "<< m_FileName);
- otbMsgDebugMacro( <<" Size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDebugMacro( <<" Type Mw : "<<m_TypeMW);
- otbMsgDebugMacro( <<" ComponentType : "<<this->GetComponentType() );
- otbMsgDebugMacro( <<" NumberOfComponents : "<<this->GetNumberOfComponents());
- otbMsgDebugMacro( <<" ComponentSize : "<<this->GetComponentSize());
- otbMsgDebugMacro( <<" GetPixelSize : "<<this->GetPixelSize());
+ otbMsgDebugMacro(<< "Driver to write: MW");
+ otbMsgDebugMacro(<< " Write file : " << m_FileName);
+ otbMsgDebugMacro(<< " Size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDebugMacro(<< " Type Mw : " << m_TypeMW);
+ otbMsgDebugMacro(<< " ComponentType : " << this->GetComponentType());
+ otbMsgDebugMacro(<< " NumberOfComponents : " << this->GetNumberOfComponents());
+ otbMsgDebugMacro(<< " ComponentSize : " << this->GetComponentSize());
+ otbMsgDebugMacro(<< " GetPixelSize : " << this->GetPixelSize());
}
-std::string MWImageIO::GetExtension( const std::string& filename )
+std::string MWImageIO::GetExtension(const std::string& filename)
{
// This assumes that the final '.' in a file name is the delimiter
// for the file's extension type
- const std::string::size_type it = filename.find_last_of( "." );
+ const std::string::size_type it = filename.find_last_of(".");
// This determines the file's type by creating a new string
// who's value is the extension of the input filename
// eg. "myimage.gif" has an extension of "gif"
- std::string fileExt( filename, it+1, filename.length() );
+ std::string fileExt(filename, it + 1, filename.length());
//If the extension has a "/" in it then this is not an extension and there are no extension.
std::string::size_type it2 = fileExt.find_last_of("/");
- if ( it2!=std::string::npos )
- {
+ if (it2 != std::string::npos)
+ {
std::string fileExt3("");
- return( fileExt3 );
- }
+ return (fileExt3);
+ }
- return( fileExt );
+ return (fileExt);
}
-
} // end namespace otb
diff --git a/Code/IO/otbMWImageIO.h b/Code/IO/otbMWImageIO.h
index d2e0bc8e61..42cdb438ba 100644
--- a/Code/IO/otbMWImageIO.h
+++ b/Code/IO/otbMWImageIO.h
@@ -23,7 +23,6 @@
#include <string>
#include <vector>
-
namespace otb
{
@@ -41,12 +40,12 @@ class ITK_EXPORT MWImageIO : public itk::ImageIOBase
public:
/** Standard class typedefs. */
- typedef MWImageIO Self;
- typedef itk::ImageIOBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef MWImageIO Self;
+ typedef itk::ImageIOBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
/** Byte order typedef */
- typedef Superclass::ByteOrder ByteOrder;
+ typedef Superclass::ByteOrder ByteOrder;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -64,7 +63,7 @@ public:
virtual bool CanStreamRead()
{
return true;
- };
+ }
/** Set the spacing and dimention information for the set filename. */
virtual void ReadImageInformation();
@@ -85,7 +84,7 @@ public:
virtual bool CanStreamWrite()
{
return true;
- };
+ }
/** Writes the spacing and dimentions of the image.
* Assumes SetFileName has been called with a valid file name. */
@@ -113,52 +112,49 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- MWImageIO(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MWImageIO(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Internal method to read filename extension */
- std::string GetExtension( const std::string& filename );
+ std::string GetExtension(const std::string& filename);
/** Internal method to read header informations */
- bool InternalReadHeaderInformation(std::fstream & file, const bool reportError);
- inline void ByteSplitting(unsigned short a, unsigned short &low, unsigned short &high)
+ bool InternalReadHeaderInformation(std::fstream& file, const bool reportError);
+ inline void ByteSplitting(unsigned short a, unsigned short& low, unsigned short& high)
{
unsigned short b = 255;
low = a & b;
- high = (a>>8) & b;
+ high = (a >> 8) & b;
}
-
#define otbSwappFileOrderToSystemOrderMacro(StrongType, buffer, buffer_size) \
{ \
- typedef itk::ByteSwapper< StrongType > InternalByteSwapperType; \
- if ( m_ByteOrder != m_FileByteOrder ) \
+ typedef itk::ByteSwapper<StrongType> InternalByteSwapperType; \
+ if (m_ByteOrder != m_FileByteOrder) \
+ { \
+ if (m_ByteOrder == LittleEndian) \
{ \
- if ( m_ByteOrder == LittleEndian ) \
- { \
- InternalByteSwapperType::SwapRangeFromSystemToBigEndian( (StrongType *)buffer, buffer_size ); \
- } \
- else if ( m_ByteOrder == BigEndian ) \
- { \
- InternalByteSwapperType::SwapRangeFromSystemToLittleEndian((StrongType *)buffer, buffer_size ); \
- } \
+ InternalByteSwapperType::SwapRangeFromSystemToBigEndian((StrongType *) buffer, buffer_size); \
} \
+ else if (m_ByteOrder == BigEndian) \
+ { \
+ InternalByteSwapperType::SwapRangeFromSystemToLittleEndian((StrongType *) buffer, buffer_size); \
+ } \
+ } \
}
#define otbSwappFileToSystemMacro(StrongType, WeakType, buffer, buffer_size) \
- else if ( this->GetComponentType() == WeakType ) \
+ else if (this->GetComponentType() == WeakType) \
{ \
- otbSwappFileOrderToSystemOrderMacro( StrongType, buffer, buffer_size )\
+ otbSwappFileOrderToSystemOrderMacro(StrongType, buffer, buffer_size) \
}
-
- bool m_FlagWriteImageInformation;
- std::string m_TypeMW; //used for write
+ bool m_FlagWriteImageInformation;
+ std::string m_TypeMW; //used for write
itk::ImageIOBase::ByteOrder m_FileByteOrder;
- std::fstream m_File;
- unsigned int m_Ncom;
-
+ std::fstream m_File;
+ unsigned int m_Ncom;
};
diff --git a/Code/IO/otbMWImageIOFactory.cxx b/Code/IO/otbMWImageIOFactory.cxx
index 2758533101..f2ab88ebdf 100644
--- a/Code/IO/otbMWImageIOFactory.cxx
+++ b/Code/IO/otbMWImageIOFactory.cxx
@@ -21,7 +21,6 @@
#include "otbMWImageIO.h"
#include "itkVersion.h"
-
namespace otb
{
@@ -51,4 +50,3 @@ MWImageIOFactory::GetDescription() const
}
} // end namespace otb
-
diff --git a/Code/IO/otbMWImageIOFactory.h b/Code/IO/otbMWImageIOFactory.h
index ba10b67778..57aa943743 100644
--- a/Code/IO/otbMWImageIOFactory.h
+++ b/Code/IO/otbMWImageIOFactory.h
@@ -30,10 +30,10 @@ class ITK_EXPORT MWImageIOFactory : public itk::ObjectFactoryBase
{
public:
/** Standard class typedefs. */
- typedef MWImageIOFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MWImageIOFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -57,12 +57,11 @@ protected:
virtual ~MWImageIOFactory();
private:
- MWImageIOFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MWImageIOFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbMetaDataKey.cxx b/Code/IO/otbMetaDataKey.cxx
index c04b13011f..3ac3e90634 100644
--- a/Code/IO/otbMetaDataKey.cxx
+++ b/Code/IO/otbMetaDataKey.cxx
@@ -16,7 +16,6 @@
=========================================================================*/
-
#ifdef _MSC_VER
#pragma warning ( disable : 4786 )
#endif
@@ -78,12 +77,12 @@ const std::string MetaDataKey::VectorDataKeywordlistDelimiterKey = "VectorDataKe
}; */
const MetaDataKey::KeyTypeDef Types[] =
-{
+ {
MetaDataKey::KeyTypeDef(MetaDataKey::DriverShortNameKey, MetaDataKey::TSTRING),
MetaDataKey::KeyTypeDef(MetaDataKey::DriverLongNameKey, MetaDataKey::TSTRING),
MetaDataKey::KeyTypeDef(MetaDataKey::ProjectionRefKey, MetaDataKey::TSTRING),
MetaDataKey::KeyTypeDef(MetaDataKey::GCPProjectionKey, MetaDataKey::TSTRING),
- MetaDataKey::KeyTypeDef(MetaDataKey::GCPParametersKey , MetaDataKey::TOTB_GCP),
+ MetaDataKey::KeyTypeDef(MetaDataKey::GCPParametersKey, MetaDataKey::TOTB_GCP),
MetaDataKey::KeyTypeDef(MetaDataKey::GCPCountKey, MetaDataKey::TENTIER),
MetaDataKey::KeyTypeDef(MetaDataKey::GeoTransformKey, MetaDataKey::TSTRING),
MetaDataKey::KeyTypeDef(MetaDataKey::MetadataKey, MetaDataKey::TSTRING),
@@ -95,31 +94,28 @@ const MetaDataKey::KeyTypeDef Types[] =
MetaDataKey::KeyTypeDef(MetaDataKey::ColorEntryCountKey, MetaDataKey::TENTIER),
MetaDataKey::KeyTypeDef(MetaDataKey::ColorEntryAsRGBKey, MetaDataKey::TVECTOR),
MetaDataKey::KeyTypeDef(MetaDataKey::OSSIMKeywordlistKey, MetaDataKey::TOSSIMKEYWORDLIST),
- MetaDataKey::KeyTypeDef(MetaDataKey::OSSIMKeywordlistDelimiterKey,MetaDataKey::TSTRING),
+ MetaDataKey::KeyTypeDef(MetaDataKey::OSSIMKeywordlistDelimiterKey, MetaDataKey::TSTRING),
MetaDataKey::KeyTypeDef(MetaDataKey::VectorDataKeywordlistKey, MetaDataKey::TVECTORDATAKEYWORDLIST),
- MetaDataKey::KeyTypeDef(MetaDataKey::VectorDataKeywordlistDelimiterKey,MetaDataKey::TSTRING)
-};
-
+ MetaDataKey::KeyTypeDef(MetaDataKey::VectorDataKeywordlistDelimiterKey, MetaDataKey::TSTRING)
+ };
MetaDataKey::KeyType MetaDataKey::GetKeyType(std::string name)
{
MetaDataKey::KeyType ktype(MetaDataKey::TSTRING);
- for ( unsigned int i=0; i<NBKEYS; ++i)
- {
+ for (unsigned int i = 0; i < NBKEYS; ++i)
+ {
// if ( strcmp(name.c_str(),Types[i].keyname.c_str()) == 0 )
-
- if ( (name.find(Types[i].keyname) >= 0 ) &&
- (name.find(Types[i].keyname) <= name.size() ) )
- {
+ if ((name.find(Types[i].keyname) >= 0) &&
+ (name.find(Types[i].keyname) <= name.size()))
+ {
ktype = Types[i].type;
break;
- }
+ }
- }
- return(ktype);
+ }
+ return (ktype);
}
-
} // end namespace otb
diff --git a/Code/IO/otbMetaDataKey.h b/Code/IO/otbMetaDataKey.h
index e8c4c88b0d..774b778a81 100644
--- a/Code/IO/otbMetaDataKey.h
+++ b/Code/IO/otbMetaDataKey.h
@@ -30,7 +30,6 @@
#include "gdal.h"
-
namespace otb
{
/** \class MetaDataKey
@@ -46,7 +45,7 @@ public:
typedef MetaDataKey Self;
MetaDataKey() {};
- virtual ~MetaDataKey() {};
+ virtual ~MetaDataKey() {}
static const std::string DriverShortNameKey;
static const std::string DriverLongNameKey;
@@ -78,7 +77,7 @@ public:
static const std::string VectorDataKeywordlistDelimiterKey;
enum KeyType
- {
+ {
TSTRING,
TENTIER,
TDOUBLE,
@@ -86,7 +85,7 @@ public:
TVECTOR,
TOSSIMKEYWORDLIST,
TVECTORDATAKEYWORDLIST,
- };
+ };
/*
typedef struct
{
@@ -108,16 +107,14 @@ public:
};
-
KeyType GetKeyType(std::string name);
- typedef std::vector<double> VectorType;
+ typedef std::vector<double> VectorType;
typedef itk::VariableLengthVector<double> VariableLengthVectorType;
private:
- MetaDataKey(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ MetaDataKey(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -131,7 +128,6 @@ class ITK_EXPORT OTB_GCP
{
public:
-
/** Unique identifier, often numeric */
std::string m_Id;
@@ -139,24 +135,23 @@ public:
std::string m_Info;
/** Pixel (x) location of GCP on raster */
- double m_GCPCol;
+ double m_GCPCol;
/** Line (y) location of GCP on raster */
- double m_GCPRow;
+ double m_GCPRow;
/** X position of GCP in georeferenced space */
- double m_GCPX;
+ double m_GCPX;
/** Y position of GCP in georeferenced space */
- double m_GCPY;
+ double m_GCPY;
/** Elevation of GCP, or zero if not known */
- double m_GCPZ;
-
+ double m_GCPZ;
OTB_GCP() {};
- OTB_GCP( const GDAL_GCP * psGCP )
- {
+ OTB_GCP(const GDAL_GCP * psGCP)
+ {
m_Id = std::string(psGCP->pszId);
m_Info = std::string(psGCP->pszInfo);
m_GCPRow = psGCP->dfGCPLine;
@@ -164,11 +159,11 @@ public:
m_GCPX = psGCP->dfGCPX;
m_GCPY = psGCP->dfGCPY;
m_GCPZ = psGCP->dfGCPZ;
- }
- virtual ~OTB_GCP() {};
+ }
+ virtual ~OTB_GCP() {}
- OTB_GCP(const OTB_GCP& pGcp)
- {
+ OTB_GCP(const OTB_GCP &pGcp)
+ {
m_Id = pGcp.m_Id;
m_Info = pGcp.m_Info;
m_GCPCol = pGcp.m_GCPCol;
@@ -176,9 +171,9 @@ public:
m_GCPX = pGcp.m_GCPX;
m_GCPY = pGcp.m_GCPY;
m_GCPZ = pGcp.m_GCPZ;
- }
+ }
- void operator=(const OTB_GCP& pGcp)
+ void operator =(const OTB_GCP& pGcp)
{
m_Id = pGcp.m_Id;
m_Info = pGcp.m_Info;
@@ -189,7 +184,7 @@ public:
m_GCPZ = pGcp.m_GCPZ;
}
- void Print(std::ostream& os)const
+ void Print(std::ostream& os) const
{
os << " GCP Id = " << this->m_Id << std::endl;
os << " GCP Info = " << this->m_Info << std::endl;
@@ -201,5 +196,4 @@ public:
} // end namespace otb
-
#endif
diff --git a/Code/IO/otbOGRIOHelper.h b/Code/IO/otbOGRIOHelper.h
index 9c164891e9..ce53ccad9e 100644
--- a/Code/IO/otbOGRIOHelper.h
+++ b/Code/IO/otbOGRIOHelper.h
@@ -28,42 +28,41 @@
namespace otb
{
-
/** \class OGRIOHelper
* \brief This class IO OGR
*
*/
-template <class TVectorData >
+template <class TVectorData>
class OGRIOHelper
{
public:
/** Template parameters typedefs */
/** Data typedef */
- typedef TVectorData VectorDataType;
- typedef typename VectorDataType::DataTreeType DataTreeType;
- typedef typename DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
- typedef typename DataTreeType::Pointer DataTreePointerType;
- typedef typename DataTreeType::ConstPointer DataTreeConstPointerType;
- typedef typename VectorDataType::DataNodeType DataNodeType;
- typedef typename DataNodeType::Pointer DataNodePointerType;
- typedef typename DataNodeType::PointType PointType;
- typedef typename DataNodeType::LineType LineType;
- typedef typename LineType::VertexListType VertexListType;
- typedef typename VertexListType::ConstPointer VertexListConstPointerType;
- typedef typename LineType::Pointer LinePointerType;
- typedef typename DataNodeType::PolygonType PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
- typedef typename DataNodeType::PolygonListType PolygonListType;
- typedef typename PolygonListType::Pointer PolygonListPointerType;
- typedef typename VectorDataType::Pointer VectorDataPointerType;
- typedef typename VectorDataType::ConstPointer VectorDataConstPointerType;
+ typedef TVectorData VectorDataType;
+ typedef typename VectorDataType::DataTreeType DataTreeType;
+ typedef typename DataTreeType::TreeNodeType InternalTreeNodeType;
+ typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
+ typedef typename DataTreeType::Pointer DataTreePointerType;
+ typedef typename DataTreeType::ConstPointer DataTreeConstPointerType;
+ typedef typename VectorDataType::DataNodeType DataNodeType;
+ typedef typename DataNodeType::Pointer DataNodePointerType;
+ typedef typename DataNodeType::PointType PointType;
+ typedef typename DataNodeType::LineType LineType;
+ typedef typename LineType::VertexListType VertexListType;
+ typedef typename VertexListType::ConstPointer VertexListConstPointerType;
+ typedef typename LineType::Pointer LinePointerType;
+ typedef typename DataNodeType::PolygonType PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef typename DataNodeType::PolygonListType PolygonListType;
+ typedef typename PolygonListType::Pointer PolygonListPointerType;
+ typedef typename VectorDataType::Pointer VectorDataPointerType;
+ typedef typename VectorDataType::ConstPointer VectorDataConstPointerType;
//typedef typename Superclass::SpacingType SpacingType;
//typedef typename Superclass::PointType OriginType;
-
+
/** Run-time type information (and related methods). */
itkTypeMacro(OGRIOHelper, 0);
-
+
/**
* \param labelObject the label object to vectorize
* \return The vectorized label object as a polygon.
@@ -77,21 +76,24 @@ public:
inline DataNodePointerType ConvertGeometryToPolygonNode(const OGRGeometry * ogrGeometry) const;
- inline void ConvertOGRLayerToDataTreeNode (OGRLayer * layer, InternalTreeNodeType * documentPtr) const;
+ inline void ConvertOGRLayerToDataTreeNode(OGRLayer * layer, InternalTreeNodeType * documentPtr) const;
/** end conversion tools */
-
- unsigned int ProcessNodeWrite(InternalTreeNodeType * source, OGRDataSource * m_DataSource, OGRGeometryCollection * ogrCollection, OGRLayer * ogrCurrentLayer, OGRSpatialReference * oSRS);
-
- OGRIOHelper():m_Kept(-1)
- {};
- virtual ~OGRIOHelper() {};
-
- private:
+
+ unsigned int ProcessNodeWrite(InternalTreeNodeType * source,
+ OGRDataSource * m_DataSource,
+ OGRGeometryCollection * ogrCollection,
+ OGRLayer * ogrCurrentLayer,
+ OGRSpatialReference * oSRS);
+
+ OGRIOHelper() : m_Kept(-1)
+ {}
+ virtual ~OGRIOHelper() {}
+
+private:
/** Number of layer in the Tree*/
unsigned int m_Kept;
}; // end class OGRIOHelper
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
@@ -99,5 +101,3 @@ public:
#endif
#endif
-
-
diff --git a/Code/IO/otbOGRIOHelper.txx b/Code/IO/otbOGRIOHelper.txx
index 31065ea989..e38d85c5d0 100644
--- a/Code/IO/otbOGRIOHelper.txx
+++ b/Code/IO/otbOGRIOHelper.txx
@@ -22,11 +22,9 @@
#include "otbOGRIOHelper.h"
-
namespace otb
{
-
template<class TVectorData>
inline typename OGRIOHelper<TVectorData>
::DataNodePointerType
@@ -36,9 +34,9 @@ OGRIOHelper<TVectorData>
OGRPoint * ogrPoint = (OGRPoint *) ogrGeometry;
if (ogrPoint == NULL)
- {
- itkGenericExceptionMacro(<<"Failed to convert OGRGeometry to OGRPoint");
- }
+ {
+ itkGenericExceptionMacro(<< "Failed to convert OGRGeometry to OGRPoint");
+ }
PointType otbPoint;
otbPoint.Fill(0);
@@ -46,13 +44,13 @@ OGRIOHelper<TVectorData>
otbPoint[1] = static_cast<typename DataNodeType::PrecisionType>(ogrPoint->getY());
if (DataNodeType::Dimension > 2)
- {
- if (PointType::PointDimension != 3)
{
- itkGenericExceptionMacro(<<"OTB vector data can't contain the OGR information (2D instead of 2.5D)");
+ if (PointType::PointDimension != 3)
+ {
+ itkGenericExceptionMacro(<< "OTB vector data can't contain the OGR information (2D instead of 2.5D)");
+ }
+ otbPoint[2] = static_cast<typename DataNodeType::PrecisionType>(ogrPoint->getZ());
}
- otbPoint[2]=static_cast<typename DataNodeType::PrecisionType>(ogrPoint->getZ());
- }
DataNodePointerType node = DataNodeType::New();
node->SetPoint(otbPoint);
@@ -65,21 +63,21 @@ inline typename OGRIOHelper<TVectorData>
OGRIOHelper<TVectorData>
::ConvertGeometryToLineNode(const OGRGeometry * ogrGeometry) const
{
- OGRLineString * ogrLine = (OGRLineString *)ogrGeometry;
+ OGRLineString * ogrLine = (OGRLineString *) ogrGeometry;
if (ogrLine == NULL)
- {
- itkGenericExceptionMacro(<<"Failed to convert OGRGeometry to OGRLine");
- }
+ {
+ itkGenericExceptionMacro(<< "Failed to convert OGRGeometry to OGRLine");
+ }
LinePointerType line = LineType::New();
OGRPoint * ogrTmpPoint = new OGRPoint();
- for (int pIndex = 0;pIndex<ogrLine->getNumPoints();++pIndex)
- {
+ for (int pIndex = 0; pIndex < ogrLine->getNumPoints(); ++pIndex)
+ {
- ogrLine->getPoint(pIndex,ogrTmpPoint);
+ ogrLine->getPoint(pIndex, ogrTmpPoint);
typename LineType::VertexType vertex;
@@ -87,16 +85,16 @@ OGRIOHelper<TVectorData>
vertex[1] = ogrTmpPoint->getY();
if (DataNodeType::Dimension > 2)
- {
- if (LineType::VertexType::PointDimension != 3)
{
- itkGenericExceptionMacro(<<"OTB vector data can't contain the OGR information (2D instead of 2.5D)");
+ if (LineType::VertexType::PointDimension != 3)
+ {
+ itkGenericExceptionMacro(<< "OTB vector data can't contain the OGR information (2D instead of 2.5D)");
+ }
+ vertex[2] = ogrTmpPoint->getZ();
}
- vertex[2]= ogrTmpPoint->getZ();
- }
line->AddVertex(vertex);
- }
+ }
delete ogrTmpPoint;
DataNodePointerType node = DataNodeType::New();
@@ -111,63 +109,63 @@ inline typename OGRIOHelper<TVectorData>
OGRIOHelper<TVectorData>
::ConvertGeometryToPolygonNode(const OGRGeometry * ogrGeometry) const
{
- OGRPolygon * ogrPolygon = (OGRPolygon *)ogrGeometry;
+ OGRPolygon * ogrPolygon = (OGRPolygon *) ogrGeometry;
if (ogrPolygon == NULL)
- {
- itkGenericExceptionMacro(<<"Failed to convert OGRGeometry to OGRPolygon");
- }
+ {
+ itkGenericExceptionMacro(<< "Failed to convert OGRGeometry to OGRPolygon");
+ }
OGRPoint * ogrTmpPoint = new OGRPoint();
- OGRLinearRing * ogrRing = ogrPolygon->getExteriorRing();
+ OGRLinearRing * ogrRing = ogrPolygon->getExteriorRing();
PolygonPointerType extRing = PolygonType::New();
- for (int pIndex = 0;pIndex<ogrRing->getNumPoints();++pIndex)
- {
- ogrRing->getPoint(pIndex,ogrTmpPoint);
+ for (int pIndex = 0; pIndex < ogrRing->getNumPoints(); ++pIndex)
+ {
+ ogrRing->getPoint(pIndex, ogrTmpPoint);
typename PolygonType::VertexType vertex;
vertex[0] = ogrTmpPoint->getX();
vertex[1] = ogrTmpPoint->getY();
if (DataNodeType::Dimension > 2)
- {
- if (PolygonType::VertexType::PointDimension != 3)
{
- itkGenericExceptionMacro(<<"OTB vector data can't contain the OGR information (2D instead of 2.5D)");
+ if (PolygonType::VertexType::PointDimension != 3)
+ {
+ itkGenericExceptionMacro(<< "OTB vector data can't contain the OGR information (2D instead of 2.5D)");
+ }
+ vertex[2] = ogrTmpPoint->getZ();
}
- vertex[2]= ogrTmpPoint->getZ();
- }
extRing->AddVertex(vertex);
- }
+ }
PolygonListPointerType intRings = PolygonListType::New();
- for (int intRingIndex = 0;intRingIndex<ogrPolygon->getNumInteriorRings();++intRingIndex)
- {
+ for (int intRingIndex = 0; intRingIndex < ogrPolygon->getNumInteriorRings(); ++intRingIndex)
+ {
PolygonPointerType ring = PolygonType::New();
ogrRing = ogrPolygon->getInteriorRing(intRingIndex);
- for (int pIndex = 0;pIndex<ogrRing->getNumPoints();++pIndex)
- {
- ogrRing->getPoint(pIndex,ogrTmpPoint);
+ for (int pIndex = 0; pIndex < ogrRing->getNumPoints(); ++pIndex)
+ {
+ ogrRing->getPoint(pIndex, ogrTmpPoint);
typename PolygonType::VertexType vertex;
vertex[0] = ogrTmpPoint->getX();
vertex[1] = ogrTmpPoint->getY();
if (DataNodeType::Dimension > 2)
- {
- if (PolygonType::VertexType::PointDimension != 3)
{
- itkGenericExceptionMacro(<<"OTB vector data can't contain the OGR information (2D instead of 2.5D)");
+ if (PolygonType::VertexType::PointDimension != 3)
+ {
+ itkGenericExceptionMacro(<< "OTB vector data can't contain the OGR information (2D instead of 2.5D)");
+ }
+ vertex[2] = ogrTmpPoint->getZ();
}
- vertex[2]= ogrTmpPoint->getZ();
- }
ring->AddVertex(vertex);
- }
+ }
intRings->PushBack(ring);
- }
+ }
delete ogrTmpPoint;
@@ -177,387 +175,387 @@ OGRIOHelper<TVectorData>
return node;
}
-
+
template<class TVectorData>
inline void OGRIOHelper<TVectorData>
-::ConvertOGRLayerToDataTreeNode (OGRLayer * layer, InternalTreeNodeType * documentPtr) const
+::ConvertOGRLayerToDataTreeNode(OGRLayer * layer, InternalTreeNodeType * documentPtr) const
{
/** Temporary pointer to store the feature */
OGRFeature * feature;
layer->ResetReading();
- unsigned int counter = 0;
+ unsigned int counter = 0;
itk::TimeProbe chrono;
- while ((feature = layer->GetNextFeature())!=NULL)
- {
+ while ((feature = layer->GetNextFeature()) != NULL)
+ {
chrono.Start();
-
- typename InternalTreeNodeType::Pointer folderPtr = documentPtr;//TODO: clean references to folder and replace by documentPtr
+ typename InternalTreeNodeType::Pointer folderPtr = documentPtr; //TODO: clean references to folder and replace by documentPtr
- // A pointer to the current multi-geometry
+ // A pointer to the current multi-geometry
typename InternalTreeNodeType::Pointer multiPtr;
/** Temporary geometry container */
OGRGeometry * geometry = feature->GetGeometryRef();
if (geometry != NULL)
- {
- otb::VectorDataKeywordlist kwl;
- for (int fieldNum=0; fieldNum< feature->GetFieldCount(); ++fieldNum)
{
- if (feature->IsFieldSet(fieldNum))
+ otb::VectorDataKeywordlist kwl;
+ for (int fieldNum = 0; fieldNum < feature->GetFieldCount(); ++fieldNum)
{
+ if (feature->IsFieldSet(fieldNum))
+ {
kwl.AddField(feature->GetFieldDefnRef(fieldNum), feature->GetRawFieldRef(fieldNum));
+ }
}
- }
// Functor::OGRIOHelper<VectorDataType> IOFunctuor;
-
+
switch (geometry->getGeometryType())
- {
- case wkbPoint:
{
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
-
- newNode->Set(ConvertGeometryToPointNode(geometry));
- //Reach the DataNode inside the tree node
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
- itk::EncapsulateMetaData< VectorDataKeywordlist >(dict,
- MetaDataKey::VectorDataKeywordlistKey,
- kwl);
- folderPtr->AddChild(newNode);
- break;
- }
- case wkbPoint25D:
+ case wkbPoint:
{
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPointNode(geometry));
- //Reach the DataNode inside the tree node
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
- itk::EncapsulateMetaData< VectorDataKeywordlist >(dict,
- MetaDataKey::VectorDataKeywordlistKey,
- kwl);
- folderPtr->AddChild(newNode);
- break;
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+
+ newNode->Set(ConvertGeometryToPointNode(geometry));
+ //Reach the DataNode inside the tree node
+ itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::EncapsulateMetaData<VectorDataKeywordlist>(dict,
+ MetaDataKey::VectorDataKeywordlistKey,
+ kwl);
+ folderPtr->AddChild(newNode);
+ break;
}
- case wkbLineString:
+ case wkbPoint25D:
{
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToLineNode(geometry));
- //Reach the DataNode inside the tree node
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
- itk::EncapsulateMetaData< VectorDataKeywordlist >(dict,
- MetaDataKey::VectorDataKeywordlistKey,
- kwl);
- folderPtr->AddChild(newNode);
- break;
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPointNode(geometry));
+ //Reach the DataNode inside the tree node
+ itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::EncapsulateMetaData<VectorDataKeywordlist>(dict,
+ MetaDataKey::VectorDataKeywordlistKey,
+ kwl);
+ folderPtr->AddChild(newNode);
+ break;
}
- case wkbLineString25D:
+ case wkbLineString:
{
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToLineNode(geometry));
- //Reach the DataNode inside the tree node
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
- itk::EncapsulateMetaData< VectorDataKeywordlist >(dict,
- MetaDataKey::VectorDataKeywordlistKey,
- kwl);
- folderPtr->AddChild(newNode);
- break;
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToLineNode(geometry));
+ //Reach the DataNode inside the tree node
+ itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::EncapsulateMetaData<VectorDataKeywordlist>(dict,
+ MetaDataKey::VectorDataKeywordlistKey,
+ kwl);
+ folderPtr->AddChild(newNode);
+ break;
}
- case wkbPolygon:
+ case wkbLineString25D:
{
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPolygonNode(geometry));
- //Reach the DataNode inside the tree node
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
- itk::EncapsulateMetaData< VectorDataKeywordlist >(dict,
- MetaDataKey::VectorDataKeywordlistKey,
- kwl);
- folderPtr->AddChild(newNode);
- break;
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToLineNode(geometry));
+ //Reach the DataNode inside the tree node
+ itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::EncapsulateMetaData<VectorDataKeywordlist>(dict,
+ MetaDataKey::VectorDataKeywordlistKey,
+ kwl);
+ folderPtr->AddChild(newNode);
+ break;
}
- case wkbPolygon25D:
+ case wkbPolygon:
{
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPolygonNode(geometry));
- //Reach the DataNode inside the tree node
- itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
- itk::EncapsulateMetaData< VectorDataKeywordlist >(dict,
- MetaDataKey::VectorDataKeywordlistKey,
- kwl);
- folderPtr->AddChild(newNode);
- break;
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPolygonNode(geometry));
+ //Reach the DataNode inside the tree node
+ itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::EncapsulateMetaData<VectorDataKeywordlist>(dict,
+ MetaDataKey::VectorDataKeywordlistKey,
+ kwl);
+ folderPtr->AddChild(newNode);
+ break;
}
- case wkbMultiPoint:
+ case wkbPolygon25D:
+ {
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPolygonNode(geometry));
+ //Reach the DataNode inside the tree node
+ itk::MetaDataDictionary& dict = newNode->Get()->GetMetaDataDictionary();
+ itk::EncapsulateMetaData<VectorDataKeywordlist>(dict,
+ MetaDataKey::VectorDataKeywordlistKey,
+ kwl);
+ folderPtr->AddChild(newNode);
+ break;
+ }
+ case wkbMultiPoint:
{
- DataNodePointerType multi = DataNodeType::New();
- multi->SetNodeType(FEATURE_MULTIPOINT);
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- folderPtr->AddChild(multiPtr);
+ DataNodePointerType multi = DataNodeType::New();
+ multi->SetNodeType(FEATURE_MULTIPOINT);
+ multiPtr = InternalTreeNodeType::New();
+ multiPtr->Set(multi);
+ folderPtr->AddChild(multiPtr);
- OGRMultiPoint * ogrMulti = (OGRMultiPoint *) geometry;
+ OGRMultiPoint * ogrMulti = (OGRMultiPoint *) geometry;
- for (int geoIndex = 0;geoIndex<ogrMulti->getNumGeometries();++geoIndex)
+ for (int geoIndex = 0; geoIndex < ogrMulti->getNumGeometries(); ++geoIndex)
{
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
}
- break;
+ break;
}
- case wkbMultiPoint25D:
+ case wkbMultiPoint25D:
{
- DataNodePointerType multi = DataNodeType::New();
- multi->SetNodeType(FEATURE_MULTIPOINT);
+ DataNodePointerType multi = DataNodeType::New();
+ multi->SetNodeType(FEATURE_MULTIPOINT);
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- folderPtr->AddChild(multiPtr);
+ multiPtr = InternalTreeNodeType::New();
+ multiPtr->Set(multi);
+ folderPtr->AddChild(multiPtr);
- OGRMultiPoint * ogrMulti = (OGRMultiPoint *) geometry;
+ OGRMultiPoint * ogrMulti = (OGRMultiPoint *) geometry;
- for (int geoIndex = 0;geoIndex<ogrMulti->getNumGeometries();++geoIndex)
+ for (int geoIndex = 0; geoIndex < ogrMulti->getNumGeometries(); ++geoIndex)
{
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
}
- break;
+ break;
}
- case wkbMultiLineString:
+ case wkbMultiLineString:
{
- DataNodePointerType multi = DataNodeType::New();
- multi->SetNodeType(FEATURE_MULTILINE);
+ DataNodePointerType multi = DataNodeType::New();
+ multi->SetNodeType(FEATURE_MULTILINE);
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- folderPtr->AddChild(multiPtr);
+ multiPtr = InternalTreeNodeType::New();
+ multiPtr->Set(multi);
+ folderPtr->AddChild(multiPtr);
- OGRMultiLineString * ogrMulti = (OGRMultiLineString *) geometry;
+ OGRMultiLineString * ogrMulti = (OGRMultiLineString *) geometry;
- for (int geoIndex = 0;geoIndex<ogrMulti->getNumGeometries();++geoIndex)
+ for (int geoIndex = 0; geoIndex < ogrMulti->getNumGeometries(); ++geoIndex)
{
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
}
- break;
+ break;
}
- case wkbMultiLineString25D:
+ case wkbMultiLineString25D:
{
- DataNodePointerType multi = DataNodeType::New();
- multi->SetNodeType(FEATURE_MULTILINE);
-
+ DataNodePointerType multi = DataNodeType::New();
+ multi->SetNodeType(FEATURE_MULTILINE);
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- folderPtr->AddChild(multiPtr);
+ multiPtr = InternalTreeNodeType::New();
+ multiPtr->Set(multi);
+ folderPtr->AddChild(multiPtr);
- OGRMultiLineString * ogrMulti = (OGRMultiLineString *) geometry;
+ OGRMultiLineString * ogrMulti = (OGRMultiLineString *) geometry;
- for (int geoIndex = 0;geoIndex<ogrMulti->getNumGeometries();++geoIndex)
+ for (int geoIndex = 0; geoIndex < ogrMulti->getNumGeometries(); ++geoIndex)
{
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
}
- break;
+ break;
}
- case wkbMultiPolygon:
+ case wkbMultiPolygon:
{
- DataNodePointerType multi = DataNodeType::New();
- multi->SetNodeType(FEATURE_MULTIPOLYGON);
+ DataNodePointerType multi = DataNodeType::New();
+ multi->SetNodeType(FEATURE_MULTIPOLYGON);
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- folderPtr->AddChild(multiPtr);
+ multiPtr = InternalTreeNodeType::New();
+ multiPtr->Set(multi);
+ folderPtr->AddChild(multiPtr);
- OGRMultiPolygon * ogrMulti = (OGRMultiPolygon *) geometry;
+ OGRMultiPolygon * ogrMulti = (OGRMultiPolygon *) geometry;
- for (int geoIndex = 0;geoIndex<ogrMulti->getNumGeometries();++geoIndex)
+ for (int geoIndex = 0; geoIndex < ogrMulti->getNumGeometries(); ++geoIndex)
{
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
}
- break;
+ break;
}
- case wkbMultiPolygon25D:
+ case wkbMultiPolygon25D:
{
- DataNodePointerType multi = DataNodeType::New();
- multi->SetNodeType(FEATURE_MULTIPOLYGON);
+ DataNodePointerType multi = DataNodeType::New();
+ multi->SetNodeType(FEATURE_MULTIPOLYGON);
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- folderPtr->AddChild(multiPtr);
+ multiPtr = InternalTreeNodeType::New();
+ multiPtr->Set(multi);
+ folderPtr->AddChild(multiPtr);
- OGRMultiPolygon * ogrMulti = (OGRMultiPolygon *) geometry;
+ OGRMultiPolygon * ogrMulti = (OGRMultiPolygon *) geometry;
- for (int geoIndex = 0;geoIndex<ogrMulti->getNumGeometries();++geoIndex)
+ for (int geoIndex = 0; geoIndex < ogrMulti->getNumGeometries(); ++geoIndex)
{
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
}
- break;
+ break;
}
- case wkbGeometryCollection:
+ case wkbGeometryCollection:
{
- DataNodePointerType multi = DataNodeType::New();
- multi->SetNodeType(FEATURE_COLLECTION);
+ DataNodePointerType multi = DataNodeType::New();
+ multi->SetNodeType(FEATURE_COLLECTION);
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- folderPtr->AddChild(multiPtr);
+ multiPtr = InternalTreeNodeType::New();
+ multiPtr->Set(multi);
+ folderPtr->AddChild(multiPtr);
- OGRGeometryCollection * ogrMulti = (OGRGeometryCollection *) geometry;
+ OGRGeometryCollection * ogrMulti = (OGRGeometryCollection *) geometry;
- for (int geoIndex = 0;geoIndex<ogrMulti->getNumGeometries();++geoIndex)
+ for (int geoIndex = 0; geoIndex < ogrMulti->getNumGeometries(); ++geoIndex)
{
- switch (ogrMulti->getGeometryRef(geoIndex)->getGeometryType())
+ switch (ogrMulti->getGeometryRef(geoIndex)->getGeometryType())
+ {
+ case wkbPoint:
+ {
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
+ break;
+ }
+ case wkbPoint25D:
+ {
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
+ break;
+ }
+ case wkbLineString:
+ {
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
+ break;
+ }
+ case wkbLineString25D:
+ {
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
+ break;
+ }
+ case wkbPolygon:
{
- case wkbPoint:
- {
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
- break;
- }
- case wkbPoint25D:
- {
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
- break;
- }
- case wkbLineString:
- {
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
- break;
- }
- case wkbLineString25D:
- {
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
- break;
- }
- case wkbPolygon:
- {
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
- break;
- }
- case wkbPolygon25D:
- {
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
- break;
- }
- default:
- {
- std::cout<<"Geometry type not found: "<<ogrMulti->getGeometryRef(geoIndex)->getGeometryType()<<std::endl;
- break;
- }
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
+ break;
+ }
+ case wkbPolygon25D:
+ {
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
+ break;
+ }
+ default:
+ {
+ std::cout << "Geometry type not found: " << ogrMulti->getGeometryRef(geoIndex)->getGeometryType() <<
+ std::endl;
+ break;
+ }
}
}
- break;
+ break;
}
- case wkbGeometryCollection25D:
+ case wkbGeometryCollection25D:
{
- DataNodePointerType multi = DataNodeType::New();
- multi->SetNodeType(FEATURE_COLLECTION);
+ DataNodePointerType multi = DataNodeType::New();
+ multi->SetNodeType(FEATURE_COLLECTION);
- multiPtr = InternalTreeNodeType::New();
- multiPtr->Set(multi);
- folderPtr->AddChild(multiPtr);
+ multiPtr = InternalTreeNodeType::New();
+ multiPtr->Set(multi);
+ folderPtr->AddChild(multiPtr);
- OGRGeometryCollection * ogrMulti = (OGRGeometryCollection *) geometry;
+ OGRGeometryCollection * ogrMulti = (OGRGeometryCollection *) geometry;
- for (int geoIndex = 0;geoIndex<ogrMulti->getNumGeometries();++geoIndex)
+ for (int geoIndex = 0; geoIndex < ogrMulti->getNumGeometries(); ++geoIndex)
{
- switch (ogrMulti->getGeometryRef(geoIndex)->getGeometryType())
+ switch (ogrMulti->getGeometryRef(geoIndex)->getGeometryType())
+ {
+ case wkbPoint:
+ {
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
+ break;
+ }
+ case wkbPoint25D:
+ {
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
+ break;
+ }
+ case wkbLineString:
+ {
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
+ break;
+ }
+ case wkbLineString25D:
+ {
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
+ break;
+ }
+ case wkbPolygon:
+ {
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
+ break;
+ }
+ case wkbPolygon25D:
+ {
+ typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
+ newNode->Set(ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex)));
+ multiPtr->AddChild(newNode);
+ break;
+ }
+ default:
{
- case wkbPoint:
- {
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
- break;
- }
- case wkbPoint25D:
- {
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPointNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
- break;
- }
- case wkbLineString:
- {
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
- break;
- }
- case wkbLineString25D:
- {
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToLineNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
- break;
- }
- case wkbPolygon:
- {
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
- break;
- }
- case wkbPolygon25D:
- {
- typename InternalTreeNodeType::Pointer newNode = InternalTreeNodeType::New();
- newNode->Set(ConvertGeometryToPolygonNode(ogrMulti->getGeometryRef(geoIndex)));
- multiPtr->AddChild(newNode);
- break;
- }
- default:
- {
- std::cout<<"Geometry type not found: "<<ogrMulti->getGeometryRef(geoIndex)->getGeometryType()<<std::endl;
- break;
- }
+ std::cout << "Geometry type not found: " << ogrMulti->getGeometryRef(geoIndex)->getGeometryType() <<
+ std::endl;
+ break;
+ }
}
}
- break;
+ break;
}
- default:
+ default:
{
- std::cout<<"Geometry not handled: "<<geometry->getGeometryName()<<std::endl;
- break;
+ std::cout << "Geometry not handled: " << geometry->getGeometryName() << std::endl;
+ break;
+ }
}
- }
- }
- OGRFeature::DestroyFeature( feature );
+ }
+ OGRFeature::DestroyFeature(feature);
chrono.Stop();
++counter;
- }//end While feature
- otbMsgDevMacro(<<layer->GetFeatureCount()<<" features read, average insertion time "<<chrono.GetMeanTime()<<" s");
+ } //end While feature
+ otbMsgDevMacro(
+ << layer->GetFeatureCount() << " features read, average insertion time " << chrono.GetMeanTime() << " s");
}
-
-
+
template<class TVectorData>
unsigned int OGRIOHelper<TVectorData>
::ProcessNodeWrite(InternalTreeNodeType * source, OGRDataSource * m_DataSource, OGRGeometryCollection * ogrCollection,
-OGRLayer * ogrCurrentLayer, OGRSpatialReference * oSRS)
+ OGRLayer * ogrCurrentLayer, OGRSpatialReference * oSRS)
{
//unsigned int m_Kept = 0;
// Get the children list from the input node
@@ -565,286 +563,285 @@ OGRLayer * ogrCurrentLayer, OGRSpatialReference * oSRS)
// std::cout << "Found " << children.size() << " children" << std::endl;
// For each child
- for(typename ChildrenListType::iterator it = children.begin(); it!=children.end(); ++it)
- {
+ for (typename ChildrenListType::iterator it = children.begin(); it != children.end(); ++it)
+ {
DataNodePointerType dataNode = (*it)->Get();
// std::cout << "Processing " << dataNode->GetNodeType() << " with Id: " << dataNode->GetNodeId() << std::endl;
- otbGenericMsgDebugMacro(<<"Type of node " << dataNode->GetNodeType() << " id" << dataNode->GetNodeId());
+ otbGenericMsgDebugMacro(<< "Type of node " << dataNode->GetNodeType() << " id" << dataNode->GetNodeId());
++m_Kept;
switch (dataNode->GetNodeType())
- {
- case ROOT:
{
- break;
+ case ROOT:
+ {
+ break;
}
- case DOCUMENT:
+ case DOCUMENT:
{
- ogrCurrentLayer = m_DataSource->CreateLayer(dataNode->GetNodeId(),oSRS,wkbUnknown,NULL);
- if (ogrCurrentLayer == NULL)
+ ogrCurrentLayer = m_DataSource->CreateLayer(dataNode->GetNodeId(), oSRS, wkbUnknown, NULL);
+ if (ogrCurrentLayer == NULL)
{
- //itkExceptionMacro(<<"Failed to create layer "<<dataNode->GetNodeId());
- std::cout << "Failed to create layer "<<dataNode->GetNodeId() << std::endl;
+ //itkExceptionMacro(<<"Failed to create layer "<<dataNode->GetNodeId());
+ std::cout << "Failed to create layer " << dataNode->GetNodeId() << std::endl;
}
- ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
- break;
+ ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
+ break;
}
- case FOLDER:
+ case FOLDER:
{
- ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
- break;
+ ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
+ break;
}
- case FEATURE_POINT:
+ case FEATURE_POINT:
{
- //Build the ogrObject
- OGRPoint ogrPoint;
- ogrPoint.setX(dataNode->GetPoint()[0]);
- ogrPoint.setY(dataNode->GetPoint()[1]);
-
+ //Build the ogrObject
+ OGRPoint ogrPoint;
+ ogrPoint.setX(dataNode->GetPoint()[0]);
+ ogrPoint.setY(dataNode->GetPoint()[1]);
- if (DataNodeType::Dimension>2)
+ if (DataNodeType::Dimension > 2)
{
- ogrPoint.setZ(dataNode->GetPoint()[2]);
+ ogrPoint.setZ(dataNode->GetPoint()[2]);
}
- //Save it in the structure
- if (ogrCollection == NULL)
+ //Save it in the structure
+ if (ogrCollection == NULL)
{
- OGRFeature *ogrFeature;
+ OGRFeature *ogrFeature;
- ogrFeature = OGRFeature::CreateFeature( ogrCurrentLayer->GetLayerDefn() );
- ogrFeature->SetField("Name",dataNode->GetNodeId());
- ogrFeature->SetGeometry( &ogrPoint );
+ ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
+ ogrFeature->SetField("Name", dataNode->GetNodeId());
+ ogrFeature->SetGeometry(&ogrPoint);
- if( ogrCurrentLayer->CreateFeature( ogrFeature ) != OGRERR_NONE )
+ if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
{
- itkExceptionMacro(<<"Failed to create feature in shapefile.");
+ itkExceptionMacro(<< "Failed to create feature in shapefile.");
// std::cout << "Failed to create feature in shapefile."
}
- OGRFeature::DestroyFeature( ogrFeature );
+ OGRFeature::DestroyFeature(ogrFeature);
}
- else
+ else
{
- ogrCollection->addGeometry(&ogrPoint);
+ ogrCollection->addGeometry(&ogrPoint);
}
- break;
+ break;
}
- case FEATURE_LINE:
+ case FEATURE_LINE:
{
- //Build the ogrObject
- OGRLineString ogrLine;
- VertexListConstPointerType vertexList = dataNode->GetLine()->GetVertexList();
+ //Build the ogrObject
+ OGRLineString ogrLine;
+ VertexListConstPointerType vertexList = dataNode->GetLine()->GetVertexList();
- typename VertexListType::ConstIterator vIt = vertexList->Begin();
+ typename VertexListType::ConstIterator vIt = vertexList->Begin();
- while (vIt != vertexList->End())
+ while (vIt != vertexList->End())
{
- OGRPoint ogrPoint;
- ogrPoint.setX(vIt.Value()[0]);
- ogrPoint.setY(vIt.Value()[1]);
- if (DataNodeType::Dimension>2)
+ OGRPoint ogrPoint;
+ ogrPoint.setX(vIt.Value()[0]);
+ ogrPoint.setY(vIt.Value()[1]);
+ if (DataNodeType::Dimension > 2)
{
- ogrPoint.setZ(vIt.Value()[2]);
+ ogrPoint.setZ(vIt.Value()[2]);
}
- ogrLine.addPoint(&ogrPoint);
- ++vIt;
+ ogrLine.addPoint(&ogrPoint);
+ ++vIt;
}
- //Save it in the structure
- if (ogrCollection == NULL)
+ //Save it in the structure
+ if (ogrCollection == NULL)
{
- OGRFeature *ogrFeature;
+ OGRFeature *ogrFeature;
- ogrFeature = OGRFeature::CreateFeature( ogrCurrentLayer->GetLayerDefn() );
- ogrFeature->SetField("Name",dataNode->GetNodeId());
- ogrFeature->SetGeometry( &ogrLine );
+ ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
+ ogrFeature->SetField("Name", dataNode->GetNodeId());
+ ogrFeature->SetGeometry(&ogrLine);
- if( ogrCurrentLayer->CreateFeature( ogrFeature ) != OGRERR_NONE )
+ if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
{
- itkExceptionMacro(<<"Failed to create feature in shapefile.");
+ itkExceptionMacro(<< "Failed to create feature in shapefile.");
}
- OGRFeature::DestroyFeature( ogrFeature );
+ OGRFeature::DestroyFeature(ogrFeature);
}
- else
+ else
{
- ogrCollection->addGeometry(&ogrLine);
+ ogrCollection->addGeometry(&ogrLine);
}
- break;
+ break;
}
- case FEATURE_POLYGON:
+ case FEATURE_POLYGON:
{
- //Build the ogrObject
- OGRPolygon * ogrPolygon = new OGRPolygon();
- OGRLinearRing * ogrExternalRing = new OGRLinearRing();
- VertexListConstPointerType vertexList = dataNode->GetPolygonExteriorRing()->GetVertexList();
+ //Build the ogrObject
+ OGRPolygon * ogrPolygon = new OGRPolygon();
+ OGRLinearRing * ogrExternalRing = new OGRLinearRing();
+ VertexListConstPointerType vertexList = dataNode->GetPolygonExteriorRing()->GetVertexList();
- typename VertexListType::ConstIterator vIt = vertexList->Begin();
+ typename VertexListType::ConstIterator vIt = vertexList->Begin();
- while (vIt != vertexList->End())
+ while (vIt != vertexList->End())
{
- OGRPoint ogrPoint;
- ogrPoint.setX(vIt.Value()[0]);
- ogrPoint.setY(vIt.Value()[1]);
- if (DataNodeType::Dimension>2)
+ OGRPoint ogrPoint;
+ ogrPoint.setX(vIt.Value()[0]);
+ ogrPoint.setY(vIt.Value()[1]);
+ if (DataNodeType::Dimension > 2)
{
- ogrPoint.setZ(vIt.Value()[2]);
+ ogrPoint.setZ(vIt.Value()[2]);
}
- ogrExternalRing->addPoint(&ogrPoint);
- ++vIt;
+ ogrExternalRing->addPoint(&ogrPoint);
+ ++vIt;
}
- ogrPolygon->addRing(ogrExternalRing);
- delete ogrExternalRing;
+ ogrPolygon->addRing(ogrExternalRing);
+ delete ogrExternalRing;
// Retrieving internal rings as well
- for (typename PolygonListType::Iterator pIt = dataNode->GetPolygonInteriorRings()->Begin();
- pIt!=dataNode->GetPolygonInteriorRings()->End();++pIt)
+ for (typename PolygonListType::Iterator pIt = dataNode->GetPolygonInteriorRings()->Begin();
+ pIt != dataNode->GetPolygonInteriorRings()->End(); ++pIt)
{
- OGRLinearRing * ogrInternalRing = new OGRLinearRing();
- vertexList = pIt.Get()->GetVertexList();
- vIt = vertexList->Begin();
+ OGRLinearRing * ogrInternalRing = new OGRLinearRing();
+ vertexList = pIt.Get()->GetVertexList();
+ vIt = vertexList->Begin();
- while (vIt != vertexList->End())
+ while (vIt != vertexList->End())
{
- OGRPoint ogrPoint;
- ogrPoint.setX(vIt.Value()[0]);
- ogrPoint.setY(vIt.Value()[1]);
- if (DataNodeType::Dimension>2)
+ OGRPoint ogrPoint;
+ ogrPoint.setX(vIt.Value()[0]);
+ ogrPoint.setY(vIt.Value()[1]);
+ if (DataNodeType::Dimension > 2)
{
- ogrPoint.setZ(vIt.Value()[2]);
+ ogrPoint.setZ(vIt.Value()[2]);
}
- ogrInternalRing->addPoint(&ogrPoint);
- ++vIt;
+ ogrInternalRing->addPoint(&ogrPoint);
+ ++vIt;
}
- ogrPolygon->addRing(ogrInternalRing);
- delete ogrInternalRing;
+ ogrPolygon->addRing(ogrInternalRing);
+ delete ogrInternalRing;
}
- //Save it in the structure
- if (ogrCollection == NULL)
+ //Save it in the structure
+ if (ogrCollection == NULL)
{
- OGRFeature *ogrFeature;
+ OGRFeature *ogrFeature;
- ogrFeature = OGRFeature::CreateFeature( ogrCurrentLayer->GetLayerDefn() );
- ogrFeature->SetField("Name",dataNode->GetNodeId());
- ogrFeature->SetGeometry( ogrPolygon );
+ ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
+ ogrFeature->SetField("Name", dataNode->GetNodeId());
+ ogrFeature->SetGeometry(ogrPolygon);
- if( ogrCurrentLayer->CreateFeature( ogrFeature ) != OGRERR_NONE )
+ if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
{
- itkExceptionMacro(<<"Failed to create feature in shapefile.");
+ itkExceptionMacro(<< "Failed to create feature in shapefile.");
}
- OGRFeature::DestroyFeature( ogrFeature );
+ OGRFeature::DestroyFeature(ogrFeature);
}
- else
+ else
{
- ogrCollection->addGeometry(ogrPolygon);
+ ogrCollection->addGeometry(ogrPolygon);
}
- delete ogrPolygon;
- break;
+ delete ogrPolygon;
+ break;
}
- case FEATURE_MULTIPOINT:
+ case FEATURE_MULTIPOINT:
{
- if (ogrCollection != NULL)
+ if (ogrCollection != NULL)
{
- itkExceptionMacro(<<"Problem while creating multipoint.");
+ itkExceptionMacro(<< "Problem while creating multipoint.");
}
- ogrCollection = new OGRMultiPoint();
+ ogrCollection = new OGRMultiPoint();
- OGRFeature *ogrFeature;
+ OGRFeature *ogrFeature;
- ogrFeature = OGRFeature::CreateFeature( ogrCurrentLayer->GetLayerDefn() );
- ogrFeature->SetField("Name",dataNode->GetNodeId());
- ogrFeature->GetDefnRef()->SetGeomType(wkbMultiPoint);
- ogrFeature->SetGeometry(ogrCollection );
+ ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
+ ogrFeature->SetField("Name", dataNode->GetNodeId());
+ ogrFeature->GetDefnRef()->SetGeomType(wkbMultiPoint);
+ ogrFeature->SetGeometry(ogrCollection);
- if( ogrCurrentLayer->CreateFeature( ogrFeature ) != OGRERR_NONE )
+ if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
{
- itkExceptionMacro(<<"Failed to create feature in shapefile.");
+ itkExceptionMacro(<< "Failed to create feature in shapefile.");
}
- ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
- break;
+ ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
+ break;
}
- case FEATURE_MULTILINE:
+ case FEATURE_MULTILINE:
{
- if (ogrCollection != NULL)
+ if (ogrCollection != NULL)
{
- itkExceptionMacro(<<"Problem while creating multiline.");
+ itkExceptionMacro(<< "Problem while creating multiline.");
}
- ogrCollection = new OGRMultiLineString();
+ ogrCollection = new OGRMultiLineString();
- OGRFeature *ogrFeature;
+ OGRFeature *ogrFeature;
- ogrFeature = OGRFeature::CreateFeature( ogrCurrentLayer->GetLayerDefn() );
- ogrFeature->SetField("Name",dataNode->GetNodeId());
- ogrFeature->GetDefnRef()->SetGeomType(wkbMultiLineString);
- ogrFeature->SetGeometry(ogrCollection );
+ ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
+ ogrFeature->SetField("Name", dataNode->GetNodeId());
+ ogrFeature->GetDefnRef()->SetGeomType(wkbMultiLineString);
+ ogrFeature->SetGeometry(ogrCollection);
- if( ogrCurrentLayer->CreateFeature( ogrFeature ) != OGRERR_NONE )
+ if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
{
- itkExceptionMacro(<<"Failed to create feature in shapefile.");
+ itkExceptionMacro(<< "Failed to create feature in shapefile.");
}
- ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
- break;
+ ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
+ break;
}
- case FEATURE_MULTIPOLYGON:
+ case FEATURE_MULTIPOLYGON:
{
- if (ogrCollection != NULL)
+ if (ogrCollection != NULL)
{
- itkExceptionMacro(<<"Problem while creating multipolygon.");
+ itkExceptionMacro(<< "Problem while creating multipolygon.");
}
- ogrCollection = new OGRMultiPolygon();
+ ogrCollection = new OGRMultiPolygon();
- OGRFeature *ogrFeature;
+ OGRFeature *ogrFeature;
- ogrFeature = OGRFeature::CreateFeature( ogrCurrentLayer->GetLayerDefn() );
- ogrFeature->SetField("Name",dataNode->GetNodeId());
- ogrFeature->GetDefnRef()->SetGeomType(wkbMultiPolygon);
- ogrFeature->SetGeometry(ogrCollection );
+ ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
+ ogrFeature->SetField("Name", dataNode->GetNodeId());
+ ogrFeature->GetDefnRef()->SetGeomType(wkbMultiPolygon);
+ ogrFeature->SetGeometry(ogrCollection);
- if( ogrCurrentLayer->CreateFeature( ogrFeature ) != OGRERR_NONE )
+ if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
{
- itkExceptionMacro(<<"Failed to create feature in shapefile.");
+ itkExceptionMacro(<< "Failed to create feature in shapefile.");
}
- ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
- break;
+ ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
+ break;
}
- case FEATURE_COLLECTION:
+ case FEATURE_COLLECTION:
{
- if (ogrCollection != NULL)
+ if (ogrCollection != NULL)
{
- itkExceptionMacro(<<"Problem while creating collection.");
+ itkExceptionMacro(<< "Problem while creating collection.");
}
- ogrCollection = new OGRMultiPoint();//Why is is a multipoint?
+ ogrCollection = new OGRMultiPoint(); //Why is is a multipoint?
- OGRFeature *ogrFeature;
+ OGRFeature *ogrFeature;
- ogrFeature = OGRFeature::CreateFeature( ogrCurrentLayer->GetLayerDefn() );
- ogrFeature->SetField("Name",dataNode->GetNodeId());
- ogrFeature->GetDefnRef()->SetGeomType(wkbGeometryCollection);
- ogrFeature->SetGeometry(ogrCollection );
+ ogrFeature = OGRFeature::CreateFeature(ogrCurrentLayer->GetLayerDefn());
+ ogrFeature->SetField("Name", dataNode->GetNodeId());
+ ogrFeature->GetDefnRef()->SetGeomType(wkbGeometryCollection);
+ ogrFeature->SetGeometry(ogrCollection);
- if( ogrCurrentLayer->CreateFeature( ogrFeature ) != OGRERR_NONE )
+ if (ogrCurrentLayer->CreateFeature(ogrFeature) != OGRERR_NONE)
{
- itkExceptionMacro(<<"Failed to create feature in shapefile.");
+ itkExceptionMacro(<< "Failed to create feature in shapefile.");
}
- ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
- break;
+ ProcessNodeWrite(*it, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
+ break;
+ }
}
}
- }
-
+
return m_Kept;
}
/*
@@ -854,7 +851,7 @@ inline typename OGRIOHelper<TLabelObject,TPolygon>
OGRIOHelper<TLabelObject,TPolygon>
::operator()(const LabelObjectType * labelObject)
{
-
+
}
*/
diff --git a/Code/IO/otbOGRVectorDataIO.h b/Code/IO/otbOGRVectorDataIO.h
index 616ee1fa61..c6dc6c3cd0 100644
--- a/Code/IO/otbOGRVectorDataIO.h
+++ b/Code/IO/otbOGRVectorDataIO.h
@@ -40,14 +40,14 @@ namespace otb
*
*/
template <class TData> class ITK_EXPORT OGRVectorDataIO
- : public VectorDataIOBase<TData>
+ : public VectorDataIOBase<TData>
{
public:
/** Standard class typedefs. */
- typedef OGRVectorDataIO Self;
- typedef VectorDataIOBase<TData> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef OGRVectorDataIO Self;
+ typedef VectorDataIOBase<TData> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
@@ -57,31 +57,30 @@ public:
itkTypeMacro(OGRVectorDataIO, VectorDataIOBase);
/** Byte order typedef */
- typedef typename Superclass::ByteOrder ByteOrder;
+ typedef typename Superclass::ByteOrder ByteOrder;
/** Data typedef */
- typedef TData VectorDataType;
- typedef typename VectorDataType::DataTreeType DataTreeType;
- typedef typename DataTreeType::TreeNodeType InternalTreeNodeType;
- typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
- typedef typename DataTreeType::Pointer DataTreePointerType;
- typedef typename DataTreeType::ConstPointer DataTreeConstPointerType;
- typedef typename VectorDataType::DataNodeType DataNodeType;
- typedef typename DataNodeType::Pointer DataNodePointerType;
- typedef typename DataNodeType::PointType PointType;
- typedef typename DataNodeType::LineType LineType;
- typedef typename LineType::VertexListType VertexListType;
- typedef typename VertexListType::ConstPointer VertexListConstPointerType;
- typedef typename LineType::Pointer LinePointerType;
- typedef typename DataNodeType::PolygonType PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
- typedef typename DataNodeType::PolygonListType PolygonListType;
- typedef typename PolygonListType::Pointer PolygonListPointerType;
- typedef typename VectorDataType::Pointer VectorDataPointerType;
- typedef typename VectorDataType::ConstPointer VectorDataConstPointerType;
- typedef typename Superclass::SpacingType SpacingType;
- typedef typename Superclass::PointType OriginType;
-
+ typedef TData VectorDataType;
+ typedef typename VectorDataType::DataTreeType DataTreeType;
+ typedef typename DataTreeType::TreeNodeType InternalTreeNodeType;
+ typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
+ typedef typename DataTreeType::Pointer DataTreePointerType;
+ typedef typename DataTreeType::ConstPointer DataTreeConstPointerType;
+ typedef typename VectorDataType::DataNodeType DataNodeType;
+ typedef typename DataNodeType::Pointer DataNodePointerType;
+ typedef typename DataNodeType::PointType PointType;
+ typedef typename DataNodeType::LineType LineType;
+ typedef typename LineType::VertexListType VertexListType;
+ typedef typename VertexListType::ConstPointer VertexListConstPointerType;
+ typedef typename LineType::Pointer LinePointerType;
+ typedef typename DataNodeType::PolygonType PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef typename DataNodeType::PolygonListType PolygonListType;
+ typedef typename PolygonListType::Pointer PolygonListPointerType;
+ typedef typename VectorDataType::Pointer VectorDataPointerType;
+ typedef typename VectorDataType::ConstPointer VectorDataConstPointerType;
+ typedef typename Superclass::SpacingType SpacingType;
+ typedef typename Superclass::PointType OriginType;
/*-------- This part of the interface deals with reading data. ------ */
@@ -112,8 +111,8 @@ protected:
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- OGRVectorDataIO(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ OGRVectorDataIO(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
std::string GetOGRDriverName(std::string name) const;
diff --git a/Code/IO/otbOGRVectorDataIO.txx b/Code/IO/otbOGRVectorDataIO.txx
index cd063259ae..42c2fbf4ec 100644
--- a/Code/IO/otbOGRVectorDataIO.txx
+++ b/Code/IO/otbOGRVectorDataIO.txx
@@ -35,7 +35,7 @@ namespace otb
{
template<class TData>
OGRVectorDataIO<TData>
-::OGRVectorDataIO():
+::OGRVectorDataIO() :
m_DataSource(NULL)
{
// OGR factory registration
@@ -53,7 +53,7 @@ OGRVectorDataIO<TData>::~OGRVectorDataIO()
template<class TData>
bool
-OGRVectorDataIO<TData>::CanReadFile( const char* filename ) const
+OGRVectorDataIO<TData>::CanReadFile(const char* filename) const
{
OGRDataSource * poDS = OGRSFDriverRegistrar::Open(filename, FALSE);
if (poDS == NULL)
@@ -65,7 +65,6 @@ OGRVectorDataIO<TData>::CanReadFile( const char* filename ) const
return true;
}
-
// Used to print information about this object
template<class TData>
void
@@ -82,22 +81,22 @@ OGRVectorDataIO<TData>
{
// Destroy previous opened data source
if (m_DataSource != NULL)
- {
+ {
OGRDataSource::DestroyDataSource(m_DataSource);
- }
+ }
m_DataSource = OGRSFDriverRegistrar::Open(this->m_FileName.c_str(), FALSE);
if (m_DataSource == NULL)
- {
- itkExceptionMacro(<<"Failed to open data file "<<this->m_FileName);
- }
+ {
+ itkExceptionMacro(<< "Failed to open data file " << this->m_FileName);
+ }
- otbMsgDebugMacro( <<"Driver to read: OGR");
- otbMsgDebugMacro( <<"Reading file: "<< this->m_FileName);
+ otbMsgDebugMacro(<< "Driver to read: OGR");
+ otbMsgDebugMacro(<< "Reading file: " << this->m_FileName);
// Reading layers
- otbMsgDevMacro(<<"Number of layers: "<<m_DataSource->GetLayerCount());
+ otbMsgDevMacro(<< "Number of layers: " << m_DataSource->GetLayerCount());
// Retrieving root node
DataTreePointerType tree = data->GetDataTree();
@@ -108,40 +107,38 @@ OGRVectorDataIO<TData>
oSRS = m_DataSource->GetLayer(0)->GetSpatialRef();
if (oSRS != NULL)
- {
+ {
char * projectionRefChar;
oSRS->exportToWkt(&projectionRefChar);
std::string projectionRef = projectionRefChar;
OGRFree(projectionRefChar);
- itk::MetaDataDictionary & dict = data->GetMetaDataDictionary();
- itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef );
- }
+ itk::MetaDataDictionary& dict = data->GetMetaDataDictionary();
+ itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef);
+ }
else
- {
+ {
otbMsgDevMacro(<< "Can't retrieve the OGRSpatialReference from the shapefile");
- }
-
+ }
std::string projectionRefWkt = data->GetProjectionRef();
-
bool projectionInformationAvailable = !projectionRefWkt.empty();
if (projectionInformationAvailable)
- {
+ {
otbMsgDevMacro(<< "Projection information : " << projectionRefWkt);
- }
+ }
else
- {
+ {
otbMsgDevMacro(<< "Projection information unavailable: assuming WGS84");
- }
+ }
// For each layer
for (int layerIndex = 0; layerIndex < m_DataSource->GetLayerCount(); ++layerIndex)
- {
+ {
/** retrieving layer and property */
OGRLayer * layer = m_DataSource->GetLayer(layerIndex);
- otbMsgDevMacro(<<"Number of features: " << layer->GetFeatureCount());
+ otbMsgDevMacro(<< "Number of features: " << layer->GetFeatureCount());
OGRFeatureDefn * dfn = layer->GetLayerDefn();
@@ -160,47 +157,48 @@ OGRVectorDataIO<TData>
// }
/** Adding the layer to the data tree */
- tree->Add(document,root);
+ tree->Add(document, root);
/// This is not good but we do not have the choice if we want to
/// get a hook on the internal structure
InternalTreeNodeType * documentPtr = const_cast<InternalTreeNodeType *>(tree->GetNode(document));
-
+
/** IO class helper to convert ogr layer*/
OGRIOHelper<VectorDataType> OGRConversion;
OGRConversion.ConvertOGRLayerToDataTreeNode(layer, documentPtr);
-
- }// end For each layer
+
+ } // end For each layer
OGRDataSource::DestroyDataSource(m_DataSource);
m_DataSource = NULL;
}
template<class TData>
-bool OGRVectorDataIO<TData>::CanWriteFile( const char* filename ) const
+bool OGRVectorDataIO<TData>::CanWriteFile(const char* filename) const
{
-
+
std::string lFileName(filename);
- if ( System::IsADirName(lFileName) == true )
- {
+ if (System::IsADirName(lFileName) == true)
+ {
return false;
- }
-
- return ( this->GetOGRDriverName(filename) != "NOT-FOUND" );
+ }
+
+ return (this->GetOGRDriverName(filename) != "NOT-FOUND");
}
template<class TData>
- void OGRVectorDataIO<TData>::Write(const VectorDataConstPointerType data, char ** papszOptions)
+void OGRVectorDataIO<TData>::Write(const VectorDataConstPointerType data, char ** papszOptions)
{
itk::TimeProbe chrono;
chrono.Start();
-
+
//Find first the OGR driver
- OGRSFDriver * ogrDriver = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(this->GetOGRDriverName( this->m_FileName).data());
+ OGRSFDriver * ogrDriver =
+ OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(this->GetOGRDriverName(this->m_FileName).data());
if (ogrDriver == NULL)
{
- itkExceptionMacro(<<"No OGR driver found to write file "<<this->m_FileName);
+ itkExceptionMacro(<< "No OGR driver found to write file " << this->m_FileName);
}
// free an existing previous data source, if any
@@ -226,17 +224,18 @@ template<class TData>
// m_DataSource = OGRSFDriverRegistrar::Open(this->m_FileName.c_str(), TRUE);
m_DataSource = ogrDriver->CreateDataSource(this->m_FileName.c_str(), papszOptions);
-
// check the created data source
if (m_DataSource == NULL)
{
- itkExceptionMacro(<<"Failed to create OGR data source for file "<<this->m_FileName<<". Since OGR can not overwrite existing file, be sure that this file does not already exist");
+ itkExceptionMacro(
+ << "Failed to create OGR data source for file " << this->m_FileName <<
+ ". Since OGR can not overwrite existing file, be sure that this file does not already exist");
}
// Retrieve data required for georeferencing
std::string projectionRefWkt = data->GetProjectionRef();
- bool projectionInformationAvailable = !projectionRefWkt.empty();
+ bool projectionInformationAvailable = !projectionRefWkt.empty();
if (projectionInformationAvailable)
{
@@ -248,81 +247,75 @@ template<class TData>
}
//TODO georeference here from OGRSpatialReference http://www.gdal.org/ogr/classOGRDataSource.html
- OGRSpatialReference * oSRS =NULL;
+ OGRSpatialReference * oSRS = NULL;
if (projectionInformationAvailable)
{
- oSRS = new OGRSpatialReference(projectionRefWkt.c_str());
+ oSRS = new OGRSpatialReference(projectionRefWkt.c_str());
}
// Retrieving root node
DataTreeConstPointerType tree = data->GetDataTree();
if (tree->GetRoot() == NULL)
{
- itkExceptionMacro(<<"Data tree is empty: Root == NULL");
+ itkExceptionMacro(<< "Data tree is empty: Root == NULL");
}
DataNodePointerType root = tree->GetRoot()->Get();
unsigned int layerKept = 0;
- OGRLayer * ogrCurrentLayer = NULL;
+ OGRLayer * ogrCurrentLayer = NULL;
// OGRFeatureVectorType ogrFeatures;
OGRGeometryCollection * ogrCollection = NULL;
// OGRGeometry * ogrCurrentGeometry = NULL;
// Get the input tree root
InternalTreeNodeType * inputRoot = const_cast<InternalTreeNodeType *>(tree->GetRoot());
-
-
+
//Refactoring SHPIO Manuel
OGRIOHelper<VectorDataType> IOConversion;
layerKept = IOConversion.ProcessNodeWrite(inputRoot, m_DataSource, ogrCollection, ogrCurrentLayer, oSRS);
- OGRDataSource::DestroyDataSource( m_DataSource );
+ OGRDataSource::DestroyDataSource(m_DataSource);
m_DataSource = NULL;
if (oSRS != NULL)
- {
+ {
delete oSRS;
- }
+ }
chrono.Stop();
- std::cout<<"OGRVectorDataIO: file saved in "<<chrono.GetMeanTime()<<" seconds. (" << layerKept << " elements)"<<std::endl;
+ std::cout << "OGRVectorDataIO: file saved in " << chrono.GetMeanTime() << " seconds. (" << layerKept <<
+ " elements)" << std::endl;
- otbMsgDevMacro( <<" OGRVectorDataIO::Write() ");
+ otbMsgDevMacro(<< " OGRVectorDataIO::Write() ");
}
-
template<class TData>
std::string
OGRVectorDataIO<TData>::GetOGRDriverName(std::string name) const
{
std::string extension;
std::string driverOGR;
-
+
std::string upperName;
- upperName=name;
- std::transform(name.begin(),name.end(),upperName.begin(),(int(*)(int)) toupper);
-
+ upperName = name;
+ std::transform(name.begin(), name.end(), upperName.begin(), (int (*)(int))toupper);
+
//Test of PostGIS connection string
- if (upperName.substr(0,3) == "PG:")
- {
- driverOGR="PostgreSQL";
- }
+ if (upperName.substr(0, 3) == "PG:")
+ {
+ driverOGR = "PostgreSQL";
+ }
else
- {
+ {
extension = System::GetExtension(upperName);
- if (extension=="SHP")
- driverOGR="ESRI Shapefile";
- else if ( (extension=="TAB") )
- driverOGR="MapInfo File";
- else if (extension=="GML")
- driverOGR="GML";
- else if (extension=="GPX")
- driverOGR="GPX";
+ if (extension == "SHP") driverOGR = "ESRI Shapefile";
+ else if ((extension == "TAB")) driverOGR = "MapInfo File";
+ else if (extension == "GML") driverOGR = "GML";
+ else if (extension == "GPX") driverOGR = "GPX";
// else if (extension=="KML")
// driverOGR="KML";
- else
- driverOGR="NOT-FOUND";
- }
+ else driverOGR = "NOT-FOUND";
+ }
//std::cout << name << " " << driverOGR <<" "<<upperName<< " "<< upperName.substr(0,3) << std::endl;
return driverOGR;
}
diff --git a/Code/IO/otbOGRVectorDataIOFactory.h b/Code/IO/otbOGRVectorDataIOFactory.h
index 5e04d816b6..7beac0766f 100644
--- a/Code/IO/otbOGRVectorDataIOFactory.h
+++ b/Code/IO/otbOGRVectorDataIOFactory.h
@@ -29,10 +29,10 @@ template <class TData> class ITK_EXPORT OGRVectorDataIOFactory : public itk::Obj
{
public:
/** Standard class typedefs. */
- typedef OGRVectorDataIOFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef OGRVectorDataIOFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -56,15 +56,13 @@ protected:
virtual ~OGRVectorDataIOFactory();
private:
- OGRVectorDataIOFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ OGRVectorDataIOFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
-
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbOGRVectorDataIOFactory.txx"
#endif
diff --git a/Code/IO/otbONERAImageIO.cxx b/Code/IO/otbONERAImageIO.cxx
index a5ddf1e986..7d3131b7f0 100644
--- a/Code/IO/otbONERAImageIO.cxx
+++ b/Code/IO/otbONERAImageIO.cxx
@@ -51,14 +51,14 @@ ONERAImageIO::ONERAImageIO()
m_FlagWriteImageInformation = true;
- if ( itk::ByteSwapper<char>::SystemIsLittleEndian() == true)
- {
+ if (itk::ByteSwapper<char>::SystemIsLittleEndian() == true)
+ {
m_ByteOrder = LittleEndian;
- }
+ }
else
- {
+ {
m_ByteOrder = BigEndian;
- }
+ }
m_FileByteOrder = BigEndian;
@@ -66,89 +66,88 @@ ONERAImageIO::ONERAImageIO()
ONERAImageIO::~ONERAImageIO()
{
- if ( m_Datafile.is_open() )
- {
+ if (m_Datafile.is_open())
+ {
m_Datafile.close();
- }
- if ( m_Headerfile.is_open() )
- {
+ }
+ if (m_Headerfile.is_open())
+ {
m_Headerfile.close();
- }
+ }
}
-bool ONERAImageIO::CanReadFile( const char* FileNameToRead )
+bool ONERAImageIO::CanReadFile(const char* FileNameToRead)
{
std::string filename(FileNameToRead);
std::string ext;
- if ( m_Datafile.is_open() )
- {
+ if (m_Datafile.is_open())
+ {
m_Datafile.close();
- }
- if ( m_Headerfile.is_open() )
- {
+ }
+ if (m_Headerfile.is_open())
+ {
m_Headerfile.close();
- }
+ }
- if ( System::IsADirName(filename) == true )
- {
+ if (System::IsADirName(filename) == true)
+ {
return false;
- }
+ }
- const std::string HeaderFileName = System::GetRootName(filename)+".ent";
- const std::string DataFileName = System::GetRootName(filename)+".dat";
+ const std::string HeaderFileName = System::GetRootName(filename) + ".ent";
+ const std::string DataFileName = System::GetRootName(filename) + ".dat";
- m_Headerfile.open( HeaderFileName.c_str(), std::ios::in );
- if ( m_Headerfile.fail() )
- {
- otbMsgDevMacro(<<"ONERAImageIO::CanReadFile() failed header open ! " );
+ m_Headerfile.open(HeaderFileName.c_str(), std::ios::in);
+ if (m_Headerfile.fail())
+ {
+ otbMsgDevMacro(<< "ONERAImageIO::CanReadFile() failed header open ! ");
return false;
- }
- m_Datafile.open( DataFileName.c_str(), std::ios::in );
- if ( m_Datafile.fail() )
- {
- otbMsgDevMacro(<<"ONERAImageIO::CanReadFile() failed data open ! " );
+ }
+ m_Datafile.open(DataFileName.c_str(), std::ios::in);
+ if (m_Datafile.fail())
+ {
+ otbMsgDevMacro(<< "ONERAImageIO::CanReadFile() failed data open ! ");
return false;
- }
+ }
// Check magic_number
int magicNumber;
- m_Datafile.seekg(0, std::ios::beg );
- m_Datafile.read((char*)(&magicNumber),4);
+ m_Datafile.seekg(0, std::ios::beg);
+ m_Datafile.read((char*) (&magicNumber), 4);
- if ( magicNumber == ONERA_MAGIC_NUMBER )
- {
+ if (magicNumber == ONERA_MAGIC_NUMBER)
+ {
m_FileByteOrder = m_ByteOrder;
- }
+ }
else
- {
- if ( m_ByteOrder == LittleEndian )
{
+ if (m_ByteOrder == LittleEndian)
+ {
m_FileByteOrder = BigEndian;
- }
- else if ( m_ByteOrder == BigEndian )
- {
+ }
+ else if (m_ByteOrder == BigEndian)
+ {
m_FileByteOrder = LittleEndian;
+ }
}
- }
// Swap if necessary
otbSwappFileOrderToSystemOrderMacro(int, &magicNumber, 1);
m_Headerfile.close();
m_Datafile.close();
- if ( magicNumber == ONERA_MAGIC_NUMBER )
- {
+ if (magicNumber == ONERA_MAGIC_NUMBER)
+ {
return true;
- }
+ }
else
- {
+ {
return false;
- }
+ }
}
-
// Used to print information about this object
void ONERAImageIO::PrintSelf(std::ostream& os, itk::Indent indent) const
{
@@ -160,17 +159,16 @@ void ONERAImageIO::ReadVolume(void*)
{
}
-
// Read image
void ONERAImageIO::Read(void* buffer)
{
unsigned int dim;
const unsigned int dimensions = this->GetNumberOfDimensions();
- unsigned long numberOfPixels = 1;
- for (dim=0; dim< dimensions; ++dim )
- {
- numberOfPixels *= m_Dimensions[ dim ];
- }
+ unsigned long numberOfPixels = 1;
+ for (dim = 0; dim < dimensions; ++dim)
+ {
+ numberOfPixels *= m_Dimensions[dim];
+ }
unsigned char * p = static_cast<unsigned char *>(buffer);
@@ -179,89 +177,87 @@ void ONERAImageIO::Read(void* buffer)
int lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
- otbMsgDevMacro( <<" ONERAImageIO::Read() ");
- otbMsgDevMacro( <<" Image size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDevMacro( <<" Region read (IORegion) : "<<this->GetIORegion());
- otbMsgDevMacro( <<" Nb Of Components : "<<this->GetNumberOfComponents());
+ otbMsgDevMacro(<< " ONERAImageIO::Read() ");
+ otbMsgDevMacro(<< " Image size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDevMacro(<< " Region read (IORegion) : " << this->GetIORegion());
+ otbMsgDevMacro(<< " Nb Of Components : " << this->GetNumberOfComponents());
//read header information file:
- if ( ! this->OpenOneraDataFileForReading(m_FileName.c_str()) )
- {
+ if (!this->OpenOneraDataFileForReading(m_FileName.c_str()))
+ {
itkExceptionMacro(<< "Cannot read requested file");
- }
+ }
- std::streamoff numberOfBytesPerLines = static_cast<std::streamoff>(2 * m_width * m_NbOctetPixel);
- std::streamoff headerLength = ONERA_HEADER_LENGTH + numberOfBytesPerLines;
- std::streamoff offset;
- std::streamsize numberOfBytesToBeRead = 2 * m_NbOctetPixel *lNbColumns;
+ std::streamoff numberOfBytesPerLines = static_cast<std::streamoff>(2 * m_width * m_NbOctetPixel);
+ std::streamoff headerLength = ONERA_HEADER_LENGTH + numberOfBytesPerLines;
+ std::streamoff offset;
+ std::streamsize numberOfBytesToBeRead = 2 * m_NbOctetPixel * lNbColumns;
std::streamsize numberOfBytesRead;
- char* value = new char[numberOfBytesToBeRead];
+ char* value = new char[numberOfBytesToBeRead];
std::streamsize cpt = 0;
- for (int LineNo = lFirstLine;LineNo <lFirstLine + lNbLines; LineNo++ )
- {
+ for (int LineNo = lFirstLine; LineNo < lFirstLine + lNbLines; LineNo++)
+ {
offset = headerLength + numberOfBytesPerLines * static_cast<std::streamoff>(LineNo);
offset += static_cast<std::streamoff>(m_NbOctetPixel * lFirstColumn);
m_Datafile.seekg(offset, std::ios::beg);
- m_Datafile.read( static_cast<char *>( value ), numberOfBytesToBeRead );
+ m_Datafile.read(static_cast<char *>(value), numberOfBytesToBeRead);
numberOfBytesRead = m_Datafile.gcount();
#ifdef __APPLE_CC__
// fail() is broken in the Mac. It returns true when reaches eof().
- if ( numberOfBytesRead != numberOfBytesToBeRead )
+ if (numberOfBytesRead != numberOfBytesToBeRead)
#else
- if ( ( numberOfBytesRead != numberOfBytesToBeRead ) || m_Datafile.fail() )
+ if ((numberOfBytesRead != numberOfBytesToBeRead) || m_Datafile.fail())
#endif
- {
- itkExceptionMacro(<<"ONERAImageIO::Read() Can Read the specified Region"); // read failed
- }
+ {
+ itkExceptionMacro(<< "ONERAImageIO::Read() Can Read the specified Region"); // read failed
+ }
- memcpy((void*)(&(p[cpt])),(const void*)(value),(size_t)( numberOfBytesToBeRead));
+ memcpy((void*) (&(p[cpt])), (const void*) (value), (size_t) (numberOfBytesToBeRead));
cpt += numberOfBytesToBeRead;
- }
+ }
//byte swapping depending on pixel type:
unsigned long numberOfPixelsPerRegion = lNbLines * lNbColumns * 2;
// Swap bytes if necessary
- if ( 0 ) {}
- otbSwappFileToSystemMacro( float, FLOAT, buffer, numberOfPixelsPerRegion )
- otbSwappFileToSystemMacro( double, DOUBLE, buffer, numberOfPixelsPerRegion )
+ if (0) {}
+ otbSwappFileToSystemMacro(float, FLOAT, buffer, numberOfPixelsPerRegion)
+ otbSwappFileToSystemMacro(double, DOUBLE, buffer, numberOfPixelsPerRegion)
else
- {
- itkExceptionMacro(<<"ONERAImageIO::Read() undefined component type! " );
- }
-
+ {
+ itkExceptionMacro(<< "ONERAImageIO::Read() undefined component type! ");
+ }
- delete [] value;
+ delete[] value;
value = NULL;
}
-
bool ONERAImageIO::OpenOneraDataFileForReading(const char* filename)
{
// Make sure that we have a file to
std::string lFileName(filename);
- if ( lFileName.empty() )
- {
- itkExceptionMacro(<<"A FileName must be specified.");
+ if (lFileName.empty())
+ {
+ itkExceptionMacro(<< "A FileName must be specified.");
return false;
- }
+ }
// Close file from any previous image
- if ( m_Datafile.is_open() )
- {
+ if (m_Datafile.is_open())
+ {
m_Datafile.close();
- }
- const std::string DataFileName = System::GetRootName(filename)+".dat";
+ }
+ const std::string DataFileName = System::GetRootName(filename) + ".dat";
// Open the new file for reading
- m_Datafile.open( DataFileName.c_str(), std::ios::in | std::ios::binary );
- if ( m_Datafile.fail() )
- {
- otbMsgDebugMacro(<<"ONERAImageIO::CanReadFile() failed data open ! " );
+ m_Datafile.open(DataFileName.c_str(), std::ios::in | std::ios::binary);
+ if (m_Datafile.fail())
+ {
+ otbMsgDebugMacro(<< "ONERAImageIO::CanReadFile() failed data open ! ");
return false;
- }
+ }
return true;
}
@@ -269,27 +265,27 @@ bool ONERAImageIO::OpenOneraHeaderFileForReading(const char* filename)
{
// Make sure that we have a file to
std::string lFileName(filename);
- if ( lFileName.empty() )
- {
- itkExceptionMacro(<<"A FileName must be specified.");
+ if (lFileName.empty())
+ {
+ itkExceptionMacro(<< "A FileName must be specified.");
return false;
- }
+ }
// Close file from any previous image
- if ( m_Headerfile.is_open() )
- {
+ if (m_Headerfile.is_open())
+ {
m_Headerfile.close();
- }
- const std::string HeaderFileName = System::GetRootName(filename)+".ent";
+ }
+ const std::string HeaderFileName = System::GetRootName(filename) + ".ent";
// Open the new file for reading
// Actually open the file
- m_Headerfile.open( HeaderFileName.c_str(), std::ios::in );
- if ( m_Headerfile.fail() )
- {
- otbMsgDebugMacro(<<"ONERAImageIO::CanReadFile() failed header open ! " );
+ m_Headerfile.open(HeaderFileName.c_str(), std::ios::in);
+ if (m_Headerfile.fail())
+ {
+ otbMsgDebugMacro(<< "ONERAImageIO::CanReadFile() failed header open ! ");
return false;
- }
+ }
return true;
}
@@ -298,133 +294,129 @@ void ONERAImageIO::ReadImageInformation()
this->InternalReadImageInformation();
}
-
void ONERAImageIO::InternalReadImageInformation()
{
+ if (!this->OpenOneraDataFileForReading(m_FileName.c_str()))
+ {
+ itkExceptionMacro(<< "Cannot read ONERA data file " << m_FileName);
+ }
- if ( ! this->OpenOneraDataFileForReading(m_FileName.c_str()) )
- {
- itkExceptionMacro(<< "Cannot read ONERA data file "<<m_FileName );
- }
-
- if ( ! this->OpenOneraHeaderFileForReading(m_FileName.c_str()) )
- {
- itkExceptionMacro(<< "Cannot read ONERA header file "<<m_FileName);
- }
+ if (!this->OpenOneraHeaderFileForReading(m_FileName.c_str()))
+ {
+ itkExceptionMacro(<< "Cannot read ONERA header file " << m_FileName);
+ }
// check "Format_valeurs_look"
char* sHeader = new char[1024];
// skip 2 lines
- m_Headerfile.getline(sHeader,1024);
- m_Headerfile.getline(sHeader,1024);
- m_Headerfile.getline(sHeader,1024);
+ m_Headerfile.getline(sHeader, 1024);
+ m_Headerfile.getline(sHeader, 1024);
+ m_Headerfile.getline(sHeader, 1024);
std::string sPixelType(sHeader);
- if ( sPixelType.compare("cmplx_real_4") )
- {
+ if (sPixelType.compare("cmplx_real_4"))
+ {
m_NbBands = 1;
this->SetFileTypeToBinary();
this->SetNumberOfComponents(2);
this->SetPixelType(COMPLEX);
m_ComponentType = FLOAT;
m_NbOctetPixel = 4;
- }
+ }
else
- {
+ {
itkExceptionMacro(<< "data format not supported by OTB (only 'complex_real_4' is available)");
- }
-
+ }
// Check magic_number
int magicNumber;
- m_Datafile.seekg(0, std::ios::beg );
- m_Datafile.read((char*)(&magicNumber),4);
- if ( magicNumber == ONERA_MAGIC_NUMBER )
- {
+ m_Datafile.seekg(0, std::ios::beg);
+ m_Datafile.read((char*) (&magicNumber), 4);
+ if (magicNumber == ONERA_MAGIC_NUMBER)
+ {
m_FileByteOrder = m_ByteOrder;
- }
+ }
else
- {
- if ( m_ByteOrder == LittleEndian )
{
+ if (m_ByteOrder == LittleEndian)
+ {
m_FileByteOrder = BigEndian;
- }
- else if ( m_ByteOrder == BigEndian )
- {
+ }
+ else if (m_ByteOrder == BigEndian)
+ {
m_FileByteOrder = LittleEndian;
+ }
}
- }
otbSwappFileOrderToSystemOrderMacro(int, &magicNumber, 1);
// Find info.. : Number of Row , Nb of Columns
short NbCol;
- m_Datafile.seekg(ONERA_HEADER_LENGTH + 2, std::ios::beg );
- m_Datafile.read((char*)(&NbCol),2);
+ m_Datafile.seekg(ONERA_HEADER_LENGTH + 2, std::ios::beg);
+ m_Datafile.read((char*) (&NbCol), 2);
otbSwappFileOrderToSystemOrderMacro(short, &NbCol, 1);
m_Datafile.seekg(0, std::ios::end);
- long gcountHead = static_cast<long>(ONERA_HEADER_LENGTH + 2*4*NbCol);
+ long gcountHead = static_cast<long>(ONERA_HEADER_LENGTH + 2 * 4 * NbCol);
long gcount = static_cast<long>(m_Datafile.tellg());
// Defining the image size:
- m_width = static_cast<int> ( NbCol );
- m_height = static_cast<int> ( (gcount-gcountHead) / (4 * 2 * NbCol) );
+ m_width = static_cast<int> (NbCol);
+ m_height = static_cast<int> ((gcount - gcountHead) / (4 * 2 * NbCol));
- if ( (m_width==0) || (m_height==0))
- {
- itkExceptionMacro(<<"Unknown image dimension");
- }
+ if ((m_width == 0) || (m_height == 0))
+ {
+ itkExceptionMacro(<< "Unknown image dimension");
+ }
else
- {
+ {
// Set image dimensions into IO
m_Dimensions[0] = m_width;
m_Dimensions[1] = m_height;
- }
+ }
this->SetNumberOfDimensions(2);
- otbMsgDebugMacro( <<"Driver to read: ONERA");
- otbMsgDebugMacro( <<" Read file : "<< m_FileName);
- otbMsgDebugMacro( <<" Size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDebugMacro( <<" PixelType : "<<this->GetPixelTypeAsString(this->GetPixelType()));
- otbMsgDebugMacro( <<" ComponentType : "<<this->GetComponentTypeAsString(this->GetComponentType()));
- otbMsgDebugMacro( <<" ComponentSize : "<<this->GetComponentSize());
- otbMsgDebugMacro( <<" NumberOfComponents : "<<this->GetNumberOfComponents());
- otbMsgDebugMacro( <<" NbOctetPixel : "<<m_NbOctetPixel);
- otbMsgDebugMacro( <<" Host byte order : "<<this->GetByteOrderAsString(m_ByteOrder));
- otbMsgDebugMacro( <<" File byte order : "<<this->GetByteOrderAsString(m_FileByteOrder));
+ otbMsgDebugMacro(<< "Driver to read: ONERA");
+ otbMsgDebugMacro(<< " Read file : " << m_FileName);
+ otbMsgDebugMacro(<< " Size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDebugMacro(<< " PixelType : " << this->GetPixelTypeAsString(this->GetPixelType()));
+ otbMsgDebugMacro(<< " ComponentType : " << this->GetComponentTypeAsString(this->GetComponentType()));
+ otbMsgDebugMacro(<< " ComponentSize : " << this->GetComponentSize());
+ otbMsgDebugMacro(<< " NumberOfComponents : " << this->GetNumberOfComponents());
+ otbMsgDebugMacro(<< " NbOctetPixel : " << m_NbOctetPixel);
+ otbMsgDebugMacro(<< " Host byte order : " << this->GetByteOrderAsString(m_ByteOrder));
+ otbMsgDebugMacro(<< " File byte order : " << this->GetByteOrderAsString(m_FileByteOrder));
}
-
bool ONERAImageIO::OpenOneraDataFileForWriting(const char* filename)
{
// Make sure that we have a file to
std::string lFileName(filename);
- if ( lFileName.empty() )
- {
- itkExceptionMacro(<<"A FileName must be specified.");
+ if (lFileName.empty())
+ {
+ itkExceptionMacro(<< "A FileName must be specified.");
return false;
- }
+ }
// Close file from any previous image
- if ( m_Datafile.is_open() )
- {
+ if (m_Datafile.is_open())
+ {
m_Datafile.close();
- }
- const std::string DataFileName = System::GetRootName(filename)+".dat";
+ }
+ const std::string DataFileName = System::GetRootName(filename) + ".dat";
// Open the new file for reading
// Actually open the file
- m_Datafile.open( DataFileName.c_str(), std::ios::out | std::ios::trunc | std::ios::binary);
- if ( m_Datafile.fail() )
- {
- otbMsgDebugMacro(<<"ONERAImageIO::OpenOneraDataFileForWriting() failed data open ! " );
+ m_Datafile.open(DataFileName.c_str(), std::ios::out | std::ios::trunc | std::ios::binary);
+ if (m_Datafile.fail())
+ {
+ otbMsgDebugMacro(<< "ONERAImageIO::OpenOneraDataFileForWriting() failed data open ! ");
return false;
- }
+ }
return true;
}
@@ -432,56 +424,55 @@ bool ONERAImageIO::OpenOneraHeaderFileForWriting(const char* filename)
{
// Make sure that we have a file to
std::string lFileName(filename);
- if ( lFileName.empty() )
- {
- itkExceptionMacro(<<"A FileName must be specified.");
+ if (lFileName.empty())
+ {
+ itkExceptionMacro(<< "A FileName must be specified.");
return false;
- }
+ }
// Close file from any previous image
- if ( m_Headerfile.is_open() )
- {
+ if (m_Headerfile.is_open())
+ {
m_Headerfile.close();
- }
- const std::string HeaderFileName = System::GetRootName(filename)+".ent";
+ }
+ const std::string HeaderFileName = System::GetRootName(filename) + ".ent";
// Open the new file for reading
// Actually open the file
- m_Headerfile.open( HeaderFileName.c_str(), std::ios::out | std::ios::trunc | std::ios::binary );
- if ( m_Headerfile.fail() )
- {
- otbMsgDebugMacro(<<"ONERAImageIO::OpenOneraHeaderFileForWriting() failed header open ! " );
+ m_Headerfile.open(HeaderFileName.c_str(), std::ios::out | std::ios::trunc | std::ios::binary);
+ if (m_Headerfile.fail())
+ {
+ otbMsgDebugMacro(<< "ONERAImageIO::OpenOneraHeaderFileForWriting() failed header open ! ");
return false;
- }
+ }
return true;
}
-
-bool ONERAImageIO::CanWriteFile( const char* FileNameToWrite )
+bool ONERAImageIO::CanWriteFile(const char* FileNameToWrite)
{
std::string filename(FileNameToWrite);
- const std::string HeaderFileName = System::GetRootName(filename)+".ent";
- const std::string DataFileName = System::GetRootName(filename)+".dat";
+ const std::string HeaderFileName = System::GetRootName(filename) + ".ent";
+ const std::string DataFileName = System::GetRootName(filename) + ".dat";
- if ( filename == HeaderFileName )
- {
+ if (filename == HeaderFileName)
+ {
return true;
- }
+ }
else
- {
+ {
return false;
- }
+ }
}
void ONERAImageIO::Write(const void* buffer)
{
- if ( m_FlagWriteImageInformation == true )
- {
+ if (m_FlagWriteImageInformation == true)
+ {
this->WriteImageInformation();
m_FlagWriteImageInformation = false;
- }
+ }
unsigned long step = this->GetNumberOfComponents();
@@ -490,118 +481,117 @@ void ONERAImageIO::Write(const void* buffer)
unsigned int lNbLines = this->GetIORegion().GetSize()[1];
unsigned int lNbColumns = this->GetIORegion().GetSize()[0];
- int lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
- int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
+ int lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
+ int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
- otbMsgDevMacro( <<" ONERAImageIO::Write() ");
- otbMsgDevMacro( <<" Image size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDevMacro( <<" Region read (IORegion) : "<<this->GetIORegion());
- otbMsgDevMacro( <<" Nb Of Components : "<<this->GetNumberOfComponents());
+ otbMsgDevMacro(<< " ONERAImageIO::Write() ");
+ otbMsgDevMacro(<< " Image size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDevMacro(<< " Region read (IORegion) : " << this->GetIORegion());
+ otbMsgDevMacro(<< " Nb Of Components : " << this->GetNumberOfComponents());
// Cas particuliers : on controle que si la r�gion � �crire est de la m�me dimension que l'image enti�re,
// on commence l'offset � 0 (lorsque que l'on est pas en "Streaming")
- if ( (lNbLines == m_Dimensions[1]) && (lNbColumns == m_Dimensions[0]))
- {
- otbMsgDevMacro(<<"Force l'offset de l'IORegion a 0");
+ if ((lNbLines == m_Dimensions[1]) && (lNbColumns == m_Dimensions[0]))
+ {
+ otbMsgDevMacro(<< "Force l'offset de l'IORegion a 0");
lFirstLine = 0;
lFirstColumn = 0;
- }
+ }
std::streamsize numberOfBytesPerLines = step * lNbColumns * m_NbOctetPixel;
- std::streamoff headerLength = ONERA_HEADER_LENGTH + numberOfBytesPerLines;
- std::streamoff offset;
- unsigned long numberOfBytesRegion = step * m_NbOctetPixel *lNbColumns *lNbLines;
+ std::streamoff headerLength = ONERA_HEADER_LENGTH + numberOfBytesPerLines;
+ std::streamoff offset;
+ unsigned long numberOfBytesRegion = step * m_NbOctetPixel * lNbColumns * lNbLines;
char *tempmemory = new char[numberOfBytesRegion];
- memcpy(tempmemory,buffer,numberOfBytesRegion);
+ memcpy(tempmemory, buffer, numberOfBytesRegion);
- for (unsigned int LineNo = lFirstLine;LineNo <lFirstLine + lNbLines; LineNo++ )
- {
+ for (unsigned int LineNo = lFirstLine; LineNo < lFirstLine + lNbLines; LineNo++)
+ {
char* value = tempmemory + numberOfBytesPerLines * (LineNo - lFirstLine);
offset = headerLength + static_cast<std::streamoff>(numberOfBytesPerLines) * static_cast<std::streamoff>(LineNo);
offset += static_cast<std::streamoff>(m_NbOctetPixel * lFirstColumn);
m_Datafile.seekp(offset, std::ios::beg);
- m_Datafile.write( static_cast<char *>( value ), numberOfBytesPerLines );
- }
+ m_Datafile.write(static_cast<char *>(value), numberOfBytesPerLines);
+ }
- delete [] tempmemory;
+ delete[] tempmemory;
tempmemory = NULL;
}
void ONERAImageIO::WriteImageInformation()
{
- if ( ! this->OpenOneraHeaderFileForWriting(m_FileName.c_str()) )
- {
+ if (!this->OpenOneraHeaderFileForWriting(m_FileName.c_str()))
+ {
itkExceptionMacro(<< "Cannot read requested file");
- }
+ }
- if ( ! this->OpenOneraDataFileForWriting(m_FileName.c_str()) )
- {
+ if (!this->OpenOneraDataFileForWriting(m_FileName.c_str()))
+ {
itkExceptionMacro(<< "Cannot read requested file");
- }
+ }
/*-------- This part deals with writing header information ------ */
- const std::string DataFileName = System::GetRootName( m_FileName.c_str() )+".dat";
+ const std::string DataFileName = System::GetRootName(m_FileName.c_str()) + ".dat";
- m_Headerfile << "# [fichier en-tete produit par les routines de otb (Orfeo ToolBox) ]" << std::endl;
- m_Headerfile << "# Nom du look :"<< std::endl;
+ m_Headerfile << "# [fichier en-tete produit par les routines de otb (Orfeo ToolBox) ]" <<
+ std::endl;
+ m_Headerfile << "# Nom du look :" << std::endl;
m_Headerfile << "Look.dat= \t" << DataFileName.c_str() << std::endl;
m_Headerfile << std::endl;
- m_Headerfile << "# Structure du fichier et codage des pixels :"<< std::endl;
- m_Headerfile << "# 4 octets precedent la premiere ligne : ils correspondent a un nombre magique [I4= 33554433] "<< std::endl;
+ m_Headerfile << "# Structure du fichier et codage des pixels :" << std::endl;
+ m_Headerfile << "# 4 octets precedent la premiere ligne : ils correspondent a un nombre magique [I4= 33554433] " <<
+ std::endl;
m_Headerfile << "# [dans ordre LSBfirst = big-endian]" << std::endl;
std::string sPixelType("cmplx_real_4");
- if ( (m_PixelType == COMPLEX) && (m_ComponentType == FLOAT) )
- {
+ if ((m_PixelType == COMPLEX) && (m_ComponentType == FLOAT))
+ {
sPixelType = "cmplx_real_4";
- }
+ }
else
- {
+ {
itkExceptionMacro(<< "data format not supported by OTB (only 'complex_real_4' is available)");
- }
+ }
- m_Headerfile << "Format_valeurs_look= \t"<< sPixelType << std::endl;
- m_Headerfile << "Nb_case_par_ligne_look= \t"<< m_Dimensions[0] <<std::endl;
- m_Headerfile << "Nb_ligne_look= \t"<< m_Dimensions[1] <<" + 1 ligne en-tete en binaire (entiers 16 bit) " << std::endl;
+ m_Headerfile << "Format_valeurs_look= \t" << sPixelType << std::endl;
+ m_Headerfile << "Nb_case_par_ligne_look= \t" << m_Dimensions[0] << std::endl;
+ m_Headerfile << "Nb_ligne_look= \t" << m_Dimensions[1] <<
+ " + 1 ligne en-tete en binaire (entiers 16 bit) " << std::endl;
// write magic_number
- int magicNumber = ONERA_MAGIC_NUMBER;
+ int magicNumber = ONERA_MAGIC_NUMBER;
short NbCol = static_cast<short>(m_Dimensions[0]);
short NbRow = static_cast<short>(m_Dimensions[1]);
- int ByteSizeCol = NbCol*4*2;
+ int ByteSizeCol = NbCol * 4 * 2;
// itk::ByteSwapper< int>::SwapFromSystemToLittleEndian(&magicNumber);
- m_Datafile.seekp(0, std::ios::beg );
- m_Datafile.write((char*)(&magicNumber),4);
+ m_Datafile.seekp(0, std::ios::beg);
+ m_Datafile.write((char*) (&magicNumber), 4);
char * tab = new char[ByteSizeCol];
- for ( int i = 0; i < (NbRow + 1); ++i)
- {
- m_Datafile.write((char*)(tab),ByteSizeCol);
- }
- delete [] tab;
+ for (int i = 0; i < (NbRow + 1); ++i)
+ {
+ m_Datafile.write((char*) (tab), ByteSizeCol);
+ }
+ delete[] tab;
// write number of columns
// itk::ByteSwapper<short>::SwapFromSystemToLittleEndian(&NbCol);
- m_Datafile.seekp(ONERA_HEADER_LENGTH+2, std::ios::beg );
- m_Datafile.write((char*)(&NbCol),2);
-
-
- otbMsgDebugMacro( <<"Driver to write: ONERA");
- otbMsgDebugMacro( <<" Write file : "<< m_FileName);
- otbMsgDebugMacro( <<" Size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDebugMacro( <<" ComponentType : "<<this->GetComponentType() );
- otbMsgDebugMacro( <<" NumberOfComponents : "<<this->GetNumberOfComponents());
- otbMsgDebugMacro( <<" NbOctetPixel : "<<m_NbOctetPixel);
- otbMsgDebugMacro( <<" Host byte order : "<<this->GetByteOrderAsString(m_ByteOrder));
+ m_Datafile.seekp(ONERA_HEADER_LENGTH + 2, std::ios::beg);
+ m_Datafile.write((char*) (&NbCol), 2);
+ otbMsgDebugMacro(<< "Driver to write: ONERA");
+ otbMsgDebugMacro(<< " Write file : " << m_FileName);
+ otbMsgDebugMacro(<< " Size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDebugMacro(<< " ComponentType : " << this->GetComponentType());
+ otbMsgDebugMacro(<< " NumberOfComponents : " << this->GetNumberOfComponents());
+ otbMsgDebugMacro(<< " NbOctetPixel : " << m_NbOctetPixel);
+ otbMsgDebugMacro(<< " Host byte order : " << this->GetByteOrderAsString(m_ByteOrder));
}
-
} // end namespace otb
-
diff --git a/Code/IO/otbONERAImageIO.h b/Code/IO/otbONERAImageIO.h
index 893a7b06f4..6117699cd3 100644
--- a/Code/IO/otbONERAImageIO.h
+++ b/Code/IO/otbONERAImageIO.h
@@ -22,7 +22,6 @@
#include "itkImageIOBase.h"
#include <fstream>
-
namespace otb
{
@@ -43,8 +42,8 @@ public:
/** Standard class typedefs. */
typedef ONERAImageIO Self;
- typedef itk::ImageIOBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::ImageIOBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -52,7 +51,6 @@ public:
/** Run-time type information (and related methods). */
itkTypeMacro(ONERAImageIO, itk::ImageIOBase);
-
/*-------- This part of the interface deals with reading data. ------ */
/** Determine the file type. Returns true if this ImageIO can read the
@@ -63,7 +61,7 @@ public:
virtual bool CanStreamRead()
{
return true;
- };
+ }
/** Set the spacing and dimention information for the set filename. */
virtual void ReadImageInformation();
@@ -84,7 +82,7 @@ public:
virtual bool CanStreamWrite()
{
return true;
- };
+ }
/** Writes the spacing and dimentions of the image.
* Assumes SetFileName has been called with a valid file name. */
@@ -123,41 +121,41 @@ protected:
std::fstream m_Headerfile;
private:
- ONERAImageIO(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ONERAImageIO(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** M�thode analyse le nom du fichier a ouvrir. S'il s'agit d'un r�pertoire,
* on regarde s'il contient un produit le fichier ent�te (fichier "ENT...")
* Dans ce cas, ONERAFileName contient le nom du fichier a ouvrir.
* Sinon ONERAFileName contient filename
*/
- void GetOneraImageFileName( const char * filename, std::string & OneraFileName );
+ void GetOneraImageFileName(const char * filename, std::string& OneraFileName);
#define otbSwappFileOrderToSystemOrderMacro(StrongType, buffer, buffer_size) \
{ \
- typedef itk::ByteSwapper< StrongType > InternalByteSwapperType; \
- if ( m_ByteOrder != m_FileByteOrder ) \
+ typedef itk::ByteSwapper<StrongType> InternalByteSwapperType; \
+ if (m_ByteOrder != m_FileByteOrder) \
+ { \
+ if (m_ByteOrder == LittleEndian) \
+ { \
+ InternalByteSwapperType::SwapRangeFromSystemToBigEndian((StrongType *) buffer, buffer_size); \
+ } \
+ else if (m_ByteOrder == BigEndian) \
{ \
- if ( m_ByteOrder == LittleEndian ) \
- { \
- InternalByteSwapperType::SwapRangeFromSystemToBigEndian( (StrongType *)buffer, buffer_size ); \
- } \
- else if ( m_ByteOrder == BigEndian ) \
- { \
- InternalByteSwapperType::SwapRangeFromSystemToLittleEndian((StrongType *)buffer, buffer_size ); \
- } \
+ InternalByteSwapperType::SwapRangeFromSystemToLittleEndian((StrongType *) buffer, buffer_size); \
} \
+ } \
}
#define otbSwappFileToSystemMacro(StrongType, WeakType, buffer, buffer_size) \
- else if ( this->GetComponentType() == WeakType ) \
+ else if (this->GetComponentType() == WeakType) \
{ \
- otbSwappFileOrderToSystemOrderMacro( StrongType, buffer, buffer_size )\
+ otbSwappFileOrderToSystemOrderMacro(StrongType, buffer, buffer_size) \
}
/** Nombre d'octets par pixel */
- int m_NbOctetPixel;
- bool m_FlagWriteImageInformation;
+ int m_NbOctetPixel;
+ bool m_FlagWriteImageInformation;
/** File byte order */
itk::ImageIOBase::ByteOrder m_FileByteOrder;
diff --git a/Code/IO/otbONERAImageIOFactory.cxx b/Code/IO/otbONERAImageIOFactory.cxx
index 8197e680f7..2e8982597e 100644
--- a/Code/IO/otbONERAImageIOFactory.cxx
+++ b/Code/IO/otbONERAImageIOFactory.cxx
@@ -21,7 +21,6 @@
#include "otbONERAImageIO.h"
#include "itkVersion.h"
-
namespace otb
{
@@ -51,4 +50,3 @@ ONERAImageIOFactory::GetDescription() const
}
} // end namespace otb
-
diff --git a/Code/IO/otbONERAImageIOFactory.h b/Code/IO/otbONERAImageIOFactory.h
index 7e2a6eae8d..3f6d461d85 100644
--- a/Code/IO/otbONERAImageIOFactory.h
+++ b/Code/IO/otbONERAImageIOFactory.h
@@ -30,10 +30,10 @@ class ITK_EXPORT ONERAImageIOFactory : public itk::ObjectFactoryBase
{
public:
/** Standard class typedefs. */
- typedef ONERAImageIOFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ONERAImageIOFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -57,12 +57,11 @@ protected:
virtual ~ONERAImageIOFactory();
private:
- ONERAImageIOFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ONERAImageIOFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbPointSetFileReader.h b/Code/IO/otbPointSetFileReader.h
index c419a02161..206921796b 100644
--- a/Code/IO/otbPointSetFileReader.h
+++ b/Code/IO/otbPointSetFileReader.h
@@ -21,7 +21,6 @@
#include "otbPointSetSource.h"
#include "itkImageFileReader.h"
-
namespace otb
{
/**
@@ -35,13 +34,13 @@ namespace otb
*/
template<class TOutputPointSet>
-class ITK_EXPORT PointSetFileReader: public otb::PointSetSource< TOutputPointSet >
+class ITK_EXPORT PointSetFileReader : public otb::PointSetSource<TOutputPointSet>
{
public:
/** Standard class typedefs. */
- typedef PointSetFileReader Self;
- typedef otb::PointSetSource<TOutputPointSet> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef PointSetFileReader Self;
+ typedef otb::PointSetSource<TOutputPointSet> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -49,9 +48,8 @@ public:
/** Run-time type information (and related methods). */
itkTypeMacro(PointSetFileReader, PointSetSource);
-
/** Typedef */
- typedef TOutputPointSet PointSetType;
+ typedef TOutputPointSet PointSetType;
typedef typename PointSetType::PointType PointType;
typedef typename PointSetType::PixelType PixelType;
@@ -60,19 +58,17 @@ public:
itkGetStringMacro(FileName);
/** Get Macro*/
- itkGetMacro( NumberOfPoints, long int );
- itkGetMacro( MinX, double );
- itkGetMacro( MaxX, double );
- itkGetMacro( MinY, double );
- itkGetMacro( MaxY, double );
-
+ itkGetMacro(NumberOfPoints, long int);
+ itkGetMacro(MinX, double);
+ itkGetMacro(MaxX, double);
+ itkGetMacro(MinY, double);
+ itkGetMacro(MaxY, double);
virtual void GenerateOutputInformation(void);
/** Does the real work. */
virtual void GenerateData();
-
protected:
PointSetFileReader();
virtual ~PointSetFileReader();
@@ -81,15 +77,15 @@ protected:
void TestFileExistanceAndReadability();
std::string m_FileName; // The file to be read
- long int m_NumberOfPoints;
- double m_MinX;
- double m_MaxX;
- double m_MinY;
- double m_MaxY;
+ long int m_NumberOfPoints;
+ double m_MinX;
+ double m_MaxX;
+ double m_MinY;
+ double m_MaxY;
private:
- PointSetFileReader(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PointSetFileReader(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
std::string m_ExceptionMessage;
@@ -102,4 +98,3 @@ private:
#endif
#endif
-
diff --git a/Code/IO/otbPointSetFileReader.txx b/Code/IO/otbPointSetFileReader.txx
index f8771eaed0..c436f4cec5 100644
--- a/Code/IO/otbPointSetFileReader.txx
+++ b/Code/IO/otbPointSetFileReader.txx
@@ -33,11 +33,11 @@ template <class TOutputPointSet>
PointSetFileReader<TOutputPointSet>
::PointSetFileReader() : otb::PointSetSource<TOutputPointSet>()
{
- m_NumberOfPoints=-1;
- m_MinX=0;
- m_MaxX=0;
- m_MinY=0;
- m_MaxY=0;
+ m_NumberOfPoints = -1;
+ m_MinX = 0;
+ m_MaxX = 0;
+ m_MinY = 0;
+ m_MaxY = 0;
}
template <class TOutputPointSet>
@@ -46,7 +46,6 @@ PointSetFileReader<TOutputPointSet>
{
}
-
template <class TOutputPointSet>
void
PointSetFileReader<TOutputPointSet>
@@ -54,18 +53,17 @@ PointSetFileReader<TOutputPointSet>
{
typename TOutputPointSet::Pointer output = this->GetOutput();
- otbDebugMacro(<<"Reading file for GenerateOutputInformation()" << m_FileName);
+ otbDebugMacro(<< "Reading file for GenerateOutputInformation()" << m_FileName);
// Check to see if we can read the file given the name or prefix
//
- if ( m_FileName == "" )
- {
+ if (m_FileName == "")
+ {
throw itk::ImageFileReaderException(__FILE__, __LINE__, "FileName must be specified", ITK_LOCATION);
- }
+ }
this->TestFileExistanceAndReadability();
-
std::ifstream ifs;
ifs.open(m_FileName.c_str(), std::ios::in | std::ios::binary);
liblas::LASReader reader(ifs);
@@ -84,40 +82,39 @@ PointSetFileReader<TOutputPointSet>
}
-
template <class TOutputPointSet>
void
PointSetFileReader<TOutputPointSet>
::TestFileExistanceAndReadability()
{
// Test if the file exists.
- if ( ! itksys::SystemTools::FileExists( m_FileName.c_str() ) )
- {
+ if (!itksys::SystemTools::FileExists(m_FileName.c_str()))
+ {
itk::ImageFileReaderException e(__FILE__, __LINE__);
itk::OStringStream msg;
- msg <<"The file doesn't exist. "
- << std::endl << "Filename = " << m_FileName
- << std::endl;
+ msg << "The file doesn't exist. "
+ << std::endl << "Filename = " << m_FileName
+ << std::endl;
e.SetDescription(msg.str().c_str());
throw e;
return;
- }
+ }
// Test if the file can be open for reading access.
std::ifstream readTester;
- readTester.open( m_FileName.c_str() );
- if ( readTester.fail() )
- {
+ readTester.open(m_FileName.c_str());
+ if (readTester.fail())
+ {
readTester.close();
itk::OStringStream msg;
- msg <<"The file couldn't be opened for reading. "
- << std::endl << "Filename: " << m_FileName
- << std::endl;
- itk::ImageFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ msg << "The file couldn't be opened for reading. "
+ << std::endl << "Filename: " << m_FileName
+ << std::endl;
+ itk::ImageFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
return;
- }
+ }
readTester.close();
}
@@ -140,30 +137,29 @@ void PointSetFileReader<TOutputPointSet>
//If the output pointset is of dimension 2, altitude is stored as information
if (PointType::PointDimension == 2)
- {
- while (reader.ReadNextPoint())
{
+ while (reader.ReadNextPoint())
+ {
liblas::LASPoint const& p = reader.GetPoint();
PointType point;
point[0] = p.GetX();
point[1] = p.GetY();
-
unsigned long i = output->GetNumberOfPoints();
- output->SetPoint( i, point );
+ output->SetPoint(i, point);
PixelType V;
- V = static_cast<PixelType>( p.GetZ() );
- output->SetPointData( i, V );
+ V = static_cast<PixelType>(p.GetZ());
+ output->SetPointData(i, V);
+ }
}
- }
//If the output pointset is of dimension 3, store the altitude as information
else if (PointType::PointDimension == 3)
- {
- while (reader.ReadNextPoint())
{
+ while (reader.ReadNextPoint())
+ {
liblas::LASPoint const& p = reader.GetPoint();
PointType point;
@@ -172,23 +168,22 @@ void PointSetFileReader<TOutputPointSet>
point[2] = p.GetZ();
unsigned long i = output->GetNumberOfPoints();
- output->SetPoint( i, point );
+ output->SetPoint(i, point);
PixelType V;
- V = static_cast<PixelType>( p.GetZ() );
- output->SetPointData( i, V );
+ V = static_cast<PixelType>(p.GetZ());
+ output->SetPointData(i, V);
+ }
}
- }
else
- {
- itkExceptionMacro(<<"Can't handle pointset dimension other than 2 and 3");
- }
+ {
+ itkExceptionMacro(<< "Can't handle pointset dimension other than 2 and 3");
+ }
ifs.close();
}
-
template <class TOutputPointSet>
void PointSetFileReader<TOutputPointSet>
::PrintSelf(std::ostream& os, itk::Indent indent) const
@@ -206,4 +201,3 @@ void PointSetFileReader<TOutputPointSet>
} //namespace otb
#endif
-
diff --git a/Code/IO/otbPrepareSRTMDirectory.cxx b/Code/IO/otbPrepareSRTMDirectory.cxx
index d18b8665fb..69cd1fd013 100644
--- a/Code/IO/otbPrepareSRTMDirectory.cxx
+++ b/Code/IO/otbPrepareSRTMDirectory.cxx
@@ -46,7 +46,7 @@ void
PrepareSRTMDirectory
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
os << indent << " m_ULLon " << m_ULLon << std::endl;
os << indent << " m_ULLat " << m_ULLat << std::endl;
os << indent << " m_LRLon " << m_LRLon << std::endl;
@@ -55,21 +55,20 @@ PrepareSRTMDirectory
os << indent << " m_DEMDirectoryPath" << m_DEMDirectoryPath << std::endl;
}
-
bool PrepareSRTMDirectory::Evaluate()
{
// Check directories
- //
+ //
ossimFilename fullDir(m_FullDEMDirectoryPath.c_str());
- if( !fullDir.exists() || !fullDir.isDir() )
+ if (!fullDir.exists() || !fullDir.isDir())
{
- itkExceptionMacro(<<"Invalid FullDEMDirectoryPath: "<<m_FullDEMDirectoryPath);
+ itkExceptionMacro(<< "Invalid FullDEMDirectoryPath: " << m_FullDEMDirectoryPath);
}
-
+
ossimFilename DEMDir(m_DEMDirectoryPath.c_str());
- if( !DEMDir.exists() )
+ if (!DEMDir.exists())
{
- DEMDir.createDirectory();
+ DEMDir.createDirectory();
}
// Check input points
@@ -77,25 +76,24 @@ bool PrepareSRTMDirectory::Evaluate()
int endX = static_cast<int>(vcl_ceil(m_LRLon));
int startY = static_cast<int>(vcl_floor(m_LRLat));
int endY = static_cast<int>(vcl_ceil(m_ULLat));
-
- if( startX>endX || startY>endY )
+
+ if (startX > endX || startY > endY)
{
- itkExceptionMacro(<<"Invalid boundariy points");
+ itkExceptionMacro(<< "Invalid boundariy points");
}
- if(startX<-180 || startX>180 || endX<-180 || endX>180)
+ if (startX < -180 || startX > 180 || endX < -180 || endX > 180)
{
- itkExceptionMacro(<<"Invalid longitude coordinates, must be in [-180; 180].");
+ itkExceptionMacro(<< "Invalid longitude coordinates, must be in [-180; 180].");
}
- if(startY<-90 || startY>90 || endY<-90 || endY>90)
+ if (startY < -90 || startY > 90 || endY < -90 || endY > 90)
{
- itkExceptionMacro(<<"Invalid latitude coordinates, must be in [-90; 90]");
+ itkExceptionMacro(<< "Invalid latitude coordinates, must be in [-90; 90]");
}
-
- for (int j=startY; j<= endY; ++j)
- {
- for (int i=startX; i<= endX; ++i)
+ for (int j = startY; j <= endY; ++j)
{
+ for (int i = startX; i <= endX; ++i)
+ {
std::ostringstream inputfilename;
inputfilename << m_FullDEMDirectoryPath;
inputfilename << "/";
@@ -107,30 +105,30 @@ bool PrepareSRTMDirectory::Evaluate()
// Build the file name
if (j >= 0)
- {
+ {
inputfilename << "N";
outputfilename << "N";
- }
+ }
else
- {
+ {
inputfilename << "S";
- outputfilename << "S";
- }
-
+ outputfilename << "S";
+ }
+
inputfilename << std::setfill('0') << std::setw(2) << vcl_abs(j);
outputfilename << std::setfill('0') << std::setw(2) << vcl_abs(j);
if (i >= 0)
- {
+ {
inputfilename << "E";
outputfilename << "E";
- }
+ }
else
- {
+ {
inputfilename << "W";
outputfilename << "W";
- }
-
+ }
+
inputfilename << std::setfill('0') << std::setw(3) << vcl_abs(i);
outputfilename << std::setfill('0') << std::setw(3) << vcl_abs(i);
@@ -142,18 +140,16 @@ bool PrepareSRTMDirectory::Evaluate()
//copy input file to output file
ossimFilename inputFile(inputfilename.str().c_str());
ossimFilename outputFile(outputfilename.str().c_str());
- if(!inputFile.exists())
- {
- itkExceptionMacro(<<"ERROR, can't find file "<<inputFile);
- }
+ if (!inputFile.exists())
+ {
+ itkExceptionMacro(<< "ERROR, can't find file " << inputFile);
+ }
inputFile.copyFileTo(outputFile);
-
+ }
}
- }
return true;
}
} // namespace otb
-
diff --git a/Code/IO/otbPrepareSRTMDirectory.h b/Code/IO/otbPrepareSRTMDirectory.h
index 5a08d47b9e..188ab11eea 100644
--- a/Code/IO/otbPrepareSRTMDirectory.h
+++ b/Code/IO/otbPrepareSRTMDirectory.h
@@ -22,7 +22,6 @@
#include "itkObjectFactory.h"
#include "base/ossimFilename.h"
-
namespace otb
{
@@ -40,7 +39,6 @@ namespace otb
* versions of ossim. If you need to use it, please let us know the situation.
*/
-
class ITK_EXPORT PrepareSRTMDirectory : public itk::Object
{
public:
@@ -55,42 +53,39 @@ public:
itkTypeMacro(PrepareSRTMDirectory, itk::Object);
+ itkGetMacro(ULLon, double);
+ itkGetMacro(ULLat, double);
+ itkGetMacro(LRLon, double);
+ itkGetMacro(LRLat, double);
+ itkGetMacro(FullDEMDirectoryPath, std::string);
+ itkGetMacro(DEMDirectoryPath, std::string);
- itkGetMacro( ULLon, double );
- itkGetMacro( ULLat, double );
- itkGetMacro( LRLon, double );
- itkGetMacro( LRLat, double );
- itkGetMacro( FullDEMDirectoryPath, std::string );
- itkGetMacro( DEMDirectoryPath, std::string );
-
- itkSetMacro( ULLon, double );
- itkSetMacro( ULLat, double );
- itkSetMacro( LRLon, double );
- itkSetMacro( LRLat, double );
- itkSetMacro( FullDEMDirectoryPath, std::string );
- itkSetMacro( DEMDirectoryPath, std::string );
-
+ itkSetMacro(ULLon, double);
+ itkSetMacro(ULLat, double);
+ itkSetMacro(LRLon, double);
+ itkSetMacro(LRLat, double);
+ itkSetMacro(FullDEMDirectoryPath, std::string);
+ itkSetMacro(DEMDirectoryPath, std::string);
virtual bool Evaluate();
protected:
PrepareSRTMDirectory();
- virtual ~PrepareSRTMDirectory() {};
+ virtual ~PrepareSRTMDirectory() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- PrepareSRTMDirectory( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ PrepareSRTMDirectory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- double m_ULLon;
- double m_ULLat;
- double m_LRLon;
- double m_LRLat;
+ double m_ULLon;
+ double m_ULLat;
+ double m_LRLon;
+ double m_LRLat;
std::string m_FullDEMDirectoryPath;
std::string m_DEMDirectoryPath;
};
} // namespace otb
-
#endif
diff --git a/Code/IO/otbQuickBirdImageMetadataInterface.cxx b/Code/IO/otbQuickBirdImageMetadataInterface.cxx
index 6450482f16..80b0e35461 100644
--- a/Code/IO/otbQuickBirdImageMetadataInterface.cxx
+++ b/Code/IO/otbQuickBirdImageMetadataInterface.cxx
@@ -16,7 +16,6 @@
=========================================================================*/
-
#ifdef _MSC_VER
#pragma warning ( disable : 4786 )
#endif
@@ -29,85 +28,78 @@
#include "otbQuickBirdImageMetadataInterface.h"
#include "itkMetaDataObject.h"
-
namespace otb
{
-
QuickBirdImageMetadataInterface
::QuickBirdImageMetadataInterface()
{
}
-
bool
-QuickBirdImageMetadataInterface::CanRead( const MetaDataDictionaryType & dict ) const
+QuickBirdImageMetadataInterface::CanRead(const MetaDataDictionaryType& dict) const
{
std::string sensorID = GetSensorID(dict);
- if (sensorID.find("QB02") != std::string::npos)
- return true;
- else
- return false;
+ if (sensorID.find("QB02") != std::string::npos) return true;
+ else return false;
}
-
QuickBirdImageMetadataInterface::VariableLengthVectorType
-QuickBirdImageMetadataInterface::GetSolarIrradiance( const MetaDataDictionaryType & dict ) const
+QuickBirdImageMetadataInterface::GetSolarIrradiance(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
- VariableLengthVectorType outputValuesVariableLengthVector;
- ossimKeywordlist kwl;
- imageKeywordlist.convertToOSSIMKeywordlist(kwl);
+ VariableLengthVectorType outputValuesVariableLengthVector;
+ ossimKeywordlist kwl;
+ imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string keyBId= "support_data.band_id";
- ossimString keywordStringBId = kwl.find(keyBId.c_str());
- if( keywordStringBId == ossimString("P") )
+ std::string keyBId = "support_data.band_id";
+ ossimString keywordStringBId = kwl.find(keyBId.c_str());
+ if (keywordStringBId == ossimString("P"))
{
- outputValuesVariableLengthVector.SetSize(1);
- outputValuesVariableLengthVector.Fill(1381.79);
+ outputValuesVariableLengthVector.SetSize(1);
+ outputValuesVariableLengthVector.Fill(1381.79);
}
- else if(keywordStringBId == ossimString("Multi") )
+ else if (keywordStringBId == ossimString("Multi"))
{
- outputValuesVariableLengthVector.SetSize(4);
- outputValuesVariableLengthVector[0]=1924.59;
- outputValuesVariableLengthVector[1]=1843.08;
- outputValuesVariableLengthVector[2]=1574.77;
- outputValuesVariableLengthVector[3]=1113.71;
- }
- else
- {
- itkExceptionMacro(<<"Invalid bandID "<<keywordStringBId);
- }
+ outputValuesVariableLengthVector.SetSize(4);
+ outputValuesVariableLengthVector[0] = 1924.59;
+ outputValuesVariableLengthVector[1] = 1843.08;
+ outputValuesVariableLengthVector[2] = 1574.77;
+ outputValuesVariableLengthVector[3] = 1113.71;
+ }
+ else
+ {
+ itkExceptionMacro(<< "Invalid bandID " << keywordStringBId);
+ }
- return outputValuesVariableLengthVector;
+ return outputValuesVariableLengthVector;
}
-
int
-QuickBirdImageMetadataInterface::GetDay( const MetaDataDictionaryType & dict ) const
+QuickBirdImageMetadataInterface::GetDay(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -117,32 +109,30 @@ QuickBirdImageMetadataInterface::GetDay( const MetaDataDictionaryType & dict ) c
key = "support_data.tlc_date";
separatorList = "-T";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Day");
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Day");
- ossimString day = keywordStrings[2];
+ ossimString day = keywordStrings[2];
return day.toInt();
}
-
int
-QuickBirdImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict ) const
+QuickBirdImageMetadataInterface::GetMonth(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -152,11 +142,10 @@ QuickBirdImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict )
key = "support_data.tlc_date";
separatorList = "-T";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Month");
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Month");
ossimString month = keywordStrings[1];
@@ -164,19 +153,19 @@ QuickBirdImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict )
}
int
-QuickBirdImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) const
+QuickBirdImageMetadataInterface::GetYear(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -186,11 +175,10 @@ QuickBirdImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict )
key = "support_data.tlc_date";
separatorList = "-T";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 2 )
- itkExceptionMacro("Invalid Year");
+ if (keywordStrings.size() <= 2) itkExceptionMacro("Invalid Year");
ossimString year = keywordStrings[0];
@@ -198,19 +186,19 @@ QuickBirdImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict )
}
int
-QuickBirdImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) const
+QuickBirdImageMetadataInterface::GetHour(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -220,11 +208,10 @@ QuickBirdImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict )
key = "support_data.tlc_date";
separatorList = "-T:";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 2 )
- itkExceptionMacro("Invalid Hour");
+ if (keywordStrings.size() <= 2) itkExceptionMacro("Invalid Hour");
ossimString hour = keywordStrings[3];
@@ -232,20 +219,20 @@ QuickBirdImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict )
}
int
-QuickBirdImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict ) const
+QuickBirdImageMetadataInterface::GetMinute(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
-
+ }
+
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -254,31 +241,30 @@ QuickBirdImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict
key = "support_data.tlc_date";
separatorList = "-T:";
ossimString keywordString = kwl.find(key.c_str());
-
+
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 2 )
- itkExceptionMacro("Invalid Minute");
-
+ if (keywordStrings.size() <= 2) itkExceptionMacro("Invalid Minute");
+
ossimString minute = keywordStrings[4];
return minute.toInt();
}
int
-QuickBirdImageMetadataInterface::GetProductionDay( const MetaDataDictionaryType & dict ) const
+QuickBirdImageMetadataInterface::GetProductionDay(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -288,32 +274,30 @@ QuickBirdImageMetadataInterface::GetProductionDay( const MetaDataDictionaryType
key = "support_data.generation_date";
separatorList = "-T";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Day");
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Day");
- ossimString day = keywordStrings[2];
+ ossimString day = keywordStrings[2];
return day.toInt();
}
-
int
-QuickBirdImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryType & dict ) const
+QuickBirdImageMetadataInterface::GetProductionMonth(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -323,11 +307,10 @@ QuickBirdImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryTyp
key = "support_data.generation_date";
separatorList = "-T";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Month");
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Month");
ossimString month = keywordStrings[1];
@@ -335,19 +318,19 @@ QuickBirdImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryTyp
}
int
-QuickBirdImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType & dict ) const
+QuickBirdImageMetadataInterface::GetProductionYear(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -357,11 +340,10 @@ QuickBirdImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType
key = "support_data.generation_date";
separatorList = "-T";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 2 )
- itkExceptionMacro("Invalid Year");
+ if (keywordStrings.size() <= 2) itkExceptionMacro("Invalid Year");
ossimString year = keywordStrings[0];
@@ -370,61 +352,60 @@ QuickBirdImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType
QuickBirdImageMetadataInterface::VariableLengthVectorType
QuickBirdImageMetadataInterface
-::GetPhysicalBias( const MetaDataDictionaryType & dict ) const
+::GetPhysicalBias(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
ImageKeywordlistType ImageKeywordlist;
- if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, ImageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
ImageKeywordlist.convertToOSSIMKeywordlist(kwl);
VariableLengthVectorType outputValuesVariableLengthVector;
- std::string keyBId= "support_data.band_id";
- ossimString keywordStringBId = kwl.find(keyBId.c_str());
- if( keywordStringBId == ossimString("P") )
- {
- outputValuesVariableLengthVector.SetSize(1);
- outputValuesVariableLengthVector.Fill(0.0);
- }
- else if(keywordStringBId == ossimString("Multi") )
- {
- outputValuesVariableLengthVector.SetSize(4);
- outputValuesVariableLengthVector.Fill(0.0);
- }
+ std::string keyBId = "support_data.band_id";
+ ossimString keywordStringBId = kwl.find(keyBId.c_str());
+ if (keywordStringBId == ossimString("P"))
+ {
+ outputValuesVariableLengthVector.SetSize(1);
+ outputValuesVariableLengthVector.Fill(0.0);
+ }
+ else if (keywordStringBId == ossimString("Multi"))
+ {
+ outputValuesVariableLengthVector.SetSize(4);
+ outputValuesVariableLengthVector.Fill(0.0);
+ }
else
- {
- itkExceptionMacro(<<"Invalid bandID "<<keywordStringBId);
- }
+ {
+ itkExceptionMacro(<< "Invalid bandID " << keywordStringBId);
+ }
return outputValuesVariableLengthVector;
}
-
QuickBirdImageMetadataInterface::VariableLengthVectorType
QuickBirdImageMetadataInterface
-::GetPhysicalGain( const MetaDataDictionaryType & dict ) const
+::GetPhysicalGain(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
- ImageKeywordlistType ImageKeywordlist;
-
- if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
- itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, ImageKeywordlist);
- }
- ossimKeywordlist kwl;
- ImageKeywordlist.convertToOSSIMKeywordlist(kwl);
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
+ ImageKeywordlistType ImageKeywordlist;
+
+ if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
+ {
+ itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, ImageKeywordlist);
+ }
+ ossimKeywordlist kwl;
+ ImageKeywordlist.convertToOSSIMKeywordlist(kwl);
// std::string key= "support_data.generation_date";
// ossimString keywordString = kwl.find(key.c_str());
// std::string output(keywordString.chars());
@@ -437,189 +418,173 @@ QuickBirdImageMetadataInterface
// itkGenericExceptionMacro(<<"Could not retrieve the production date for Ikonos");
// }
- int productionYear = this->GetProductionYear(dict);//keywordStrings[0].toInt();
- int productionMonth = this->GetProductionMonth(dict);//keywordStrings[1].toInt();
- int productionDay = this->GetProductionDay(dict);//keywordStrings[2].toInt();
+ int productionYear = this->GetProductionYear(dict); //keywordStrings[0].toInt();
+ int productionMonth = this->GetProductionMonth(dict); //keywordStrings[1].toInt();
+ int productionDay = this->GetProductionDay(dict); //keywordStrings[2].toInt();
bool isPost20030606 = false;
- if(productionYear > 2003)
- isPost20030606 = true;
+ if (productionYear > 2003) isPost20030606 = true;
else
- {
- if(productionYear == 2003)
{
- if(productionMonth > 6)
- isPost20030606 = true;
+ if (productionYear == 2003)
+ {
+ if (productionMonth > 6) isPost20030606 = true;
else
- if(productionDay >= 6)
- isPost20030606 = true;
+ if (productionDay >= 6) isPost20030606 = true;
+ }
}
- }
//Value computed from
// Radiance Conversion of QuickBird Data - Technical Note.
ossimString keywordStringBitsPerPixel = kwl.find("support_data.bits_per_pixel");
- int bitsPerPixel = keywordStringBitsPerPixel.toInt();
+ int bitsPerPixel = keywordStringBitsPerPixel.toInt();
if (bitsPerPixel != 16 && bitsPerPixel != 8)
- {
- itkExceptionMacro(<<"Invalid bitsPerPixel "<<bitsPerPixel);
- }
+ {
+ itkExceptionMacro(<< "Invalid bitsPerPixel " << bitsPerPixel);
+ }
ossimString keywordStringTDILevel = kwl.find("support_data.TDI_level");
- int TDILevel = keywordStringTDILevel.toInt();
+ int TDILevel = keywordStringTDILevel.toInt();
if (TDILevel != 10 && TDILevel != 13 && TDILevel != 18 && TDILevel != 24 && TDILevel != 32)
- {
- itkExceptionMacro(<<"Invalid TDILevel "<<TDILevel);
- }
-
- std::string keyBId= "support_data.band_id";
+ {
+ itkExceptionMacro(<< "Invalid TDILevel " << TDILevel);
+ }
+
+ std::string keyBId = "support_data.band_id";
ossimString keywordStringBId = kwl.find(keyBId.c_str());
if (keywordStringBId != ossimString("P") && keywordStringBId != ossimString("Multi"))
- {
- itkExceptionMacro(<<"Invalid bandID "<<keywordStringBId);
- }
+ {
+ itkExceptionMacro(<< "Invalid bandID " << keywordStringBId);
+ }
VariableLengthVectorType outputValuesVariableLengthVector;
- if (keywordStringBId == ossimString("P") )
- outputValuesVariableLengthVector.SetSize(1);
- else
- outputValuesVariableLengthVector.SetSize(4);
+ if (keywordStringBId == ossimString("P")) outputValuesVariableLengthVector.SetSize(1);
+ else outputValuesVariableLengthVector.SetSize(4);
outputValuesVariableLengthVector.Fill(1.);
-
+
if (!isPost20030606)
- {
- if(bitsPerPixel==16)
- {
- if (keywordStringBId == ossimString("P"))
- {
- if (TDILevel != 10)
- outputValuesVariableLengthVector[0] = 0.08381880;
- else if (TDILevel != 13)
- outputValuesVariableLengthVector[0] = 0.06447600;
- else if (TDILevel != 18)
- outputValuesVariableLengthVector[0] = 0.04656600;
- else if (TDILevel != 24)
- outputValuesVariableLengthVector[0] = 0.03494440;
- else if (TDILevel != 32)
- outputValuesVariableLengthVector[0] = 0.02618840;
- }
- else
- {
- outputValuesVariableLengthVector[0] = 0.01604120;
- outputValuesVariableLengthVector[1] = 0.01438470;
- outputValuesVariableLengthVector[2] = 0.01267350;
- outputValuesVariableLengthVector[3] = 0.01542420;
- }
-
- }
- else
- {
- if (keywordStringBId == ossimString("P"))
- {
- if (TDILevel != 10)
- outputValuesVariableLengthVector[0] = 1.02681367;
- else if (TDILevel != 13)
- outputValuesVariableLengthVector[0] = 1.02848939;
- else if (TDILevel != 18)
- outputValuesVariableLengthVector[0] = 1.02794702;
- else if (TDILevel != 24)
- outputValuesVariableLengthVector[0] = 1.02989685;
- else if (TDILevel != 32)
- outputValuesVariableLengthVector[0] = 1.02739898;
-
- ossimString keywordStringAbsCalFactor = kwl.find("support_data.absCalFactor");
- outputValuesVariableLengthVector[0] *= keywordStringAbsCalFactor.toDouble();
- }
- else
- {
- ossimString keywordStringAcalFact = kwl.find("support_data.B_band_absCalFactor");
- outputValuesVariableLengthVector[0] = 1.12097834 * keywordStringAcalFact.toDouble();
- keywordStringAcalFact = kwl.find("support_data.G_band_absCalFactor");
- outputValuesVariableLengthVector[1] = 1.37652632 * keywordStringAcalFact.toDouble();
- keywordStringAcalFact = kwl.find("support_data.R_band_absCalFactor");
- outputValuesVariableLengthVector[2] = 1.30954587 * keywordStringAcalFact.toDouble();
- keywordStringAcalFact = kwl.find("support_data.N_band_absCalFactor");
- outputValuesVariableLengthVector[3] = 0.98368622 * keywordStringAcalFact.toDouble();
- }
- }
-
-
- }
+ {
+ if (bitsPerPixel == 16)
+ {
+ if (keywordStringBId == ossimString("P"))
+ {
+ if (TDILevel != 10) outputValuesVariableLengthVector[0] = 0.08381880;
+ else if (TDILevel != 13) outputValuesVariableLengthVector[0] = 0.06447600;
+ else if (TDILevel != 18) outputValuesVariableLengthVector[0] = 0.04656600;
+ else if (TDILevel != 24) outputValuesVariableLengthVector[0] = 0.03494440;
+ else if (TDILevel != 32) outputValuesVariableLengthVector[0] = 0.02618840;
+ }
+ else
+ {
+ outputValuesVariableLengthVector[0] = 0.01604120;
+ outputValuesVariableLengthVector[1] = 0.01438470;
+ outputValuesVariableLengthVector[2] = 0.01267350;
+ outputValuesVariableLengthVector[3] = 0.01542420;
+ }
+
+ }
+ else
+ {
+ if (keywordStringBId == ossimString("P"))
+ {
+ if (TDILevel != 10) outputValuesVariableLengthVector[0] = 1.02681367;
+ else if (TDILevel != 13) outputValuesVariableLengthVector[0] = 1.02848939;
+ else if (TDILevel != 18) outputValuesVariableLengthVector[0] = 1.02794702;
+ else if (TDILevel != 24) outputValuesVariableLengthVector[0] = 1.02989685;
+ else if (TDILevel != 32) outputValuesVariableLengthVector[0] = 1.02739898;
+
+ ossimString keywordStringAbsCalFactor = kwl.find("support_data.absCalFactor");
+ outputValuesVariableLengthVector[0] *= keywordStringAbsCalFactor.toDouble();
+ }
+ else
+ {
+ ossimString keywordStringAcalFact = kwl.find("support_data.B_band_absCalFactor");
+ outputValuesVariableLengthVector[0] = 1.12097834 * keywordStringAcalFact.toDouble();
+ keywordStringAcalFact = kwl.find("support_data.G_band_absCalFactor");
+ outputValuesVariableLengthVector[1] = 1.37652632 * keywordStringAcalFact.toDouble();
+ keywordStringAcalFact = kwl.find("support_data.R_band_absCalFactor");
+ outputValuesVariableLengthVector[2] = 1.30954587 * keywordStringAcalFact.toDouble();
+ keywordStringAcalFact = kwl.find("support_data.N_band_absCalFactor");
+ outputValuesVariableLengthVector[3] = 0.98368622 * keywordStringAcalFact.toDouble();
+ }
+ }
+
+ }
else
- {
- if (keywordStringBId == ossimString("P"))
- {
- ossimString keywordStringAbsCalFactor = kwl.find("support_data.absCalFactor");
- outputValuesVariableLengthVector[0] = keywordStringAbsCalFactor.toDouble();
- }
- else
- {
- ossimString keywordStringAcalFact = kwl.find("support_data.B_band_absCalFactor");
- outputValuesVariableLengthVector[0] = keywordStringAcalFact.toDouble();
- keywordStringAcalFact = kwl.find("support_data.G_band_absCalFactor");
- outputValuesVariableLengthVector[1] = keywordStringAcalFact.toDouble();
- keywordStringAcalFact = kwl.find("support_data.R_band_absCalFactor");
- outputValuesVariableLengthVector[2] = keywordStringAcalFact.toDouble();
- keywordStringAcalFact = kwl.find("support_data.N_band_absCalFactor");
- outputValuesVariableLengthVector[3] = keywordStringAcalFact.toDouble();
- }
- }
-
- if (keywordStringBId == ossimString("P") )
- {
- outputValuesVariableLengthVector[0] = 0.398 / outputValuesVariableLengthVector[0];
- }
+ {
+ if (keywordStringBId == ossimString("P"))
+ {
+ ossimString keywordStringAbsCalFactor = kwl.find("support_data.absCalFactor");
+ outputValuesVariableLengthVector[0] = keywordStringAbsCalFactor.toDouble();
+ }
+ else
+ {
+ ossimString keywordStringAcalFact = kwl.find("support_data.B_band_absCalFactor");
+ outputValuesVariableLengthVector[0] = keywordStringAcalFact.toDouble();
+ keywordStringAcalFact = kwl.find("support_data.G_band_absCalFactor");
+ outputValuesVariableLengthVector[1] = keywordStringAcalFact.toDouble();
+ keywordStringAcalFact = kwl.find("support_data.R_band_absCalFactor");
+ outputValuesVariableLengthVector[2] = keywordStringAcalFact.toDouble();
+ keywordStringAcalFact = kwl.find("support_data.N_band_absCalFactor");
+ outputValuesVariableLengthVector[3] = keywordStringAcalFact.toDouble();
+ }
+ }
+
+ if (keywordStringBId == ossimString("P"))
+ {
+ outputValuesVariableLengthVector[0] = 0.398 / outputValuesVariableLengthVector[0];
+ }
else
- {
- outputValuesVariableLengthVector[0] = 0.068 / outputValuesVariableLengthVector[0];
- outputValuesVariableLengthVector[1] = 0.099 / outputValuesVariableLengthVector[1];
- outputValuesVariableLengthVector[2] = 0.071 / outputValuesVariableLengthVector[2];
- outputValuesVariableLengthVector[3] = 0.114 / outputValuesVariableLengthVector[3];
- }
+ {
+ outputValuesVariableLengthVector[0] = 0.068 / outputValuesVariableLengthVector[0];
+ outputValuesVariableLengthVector[1] = 0.099 / outputValuesVariableLengthVector[1];
+ outputValuesVariableLengthVector[2] = 0.071 / outputValuesVariableLengthVector[2];
+ outputValuesVariableLengthVector[3] = 0.114 / outputValuesVariableLengthVector[3];
+ }
return outputValuesVariableLengthVector;
}
double
-QuickBirdImageMetadataInterface::GetSatElevation( const MetaDataDictionaryType & dict ) const
+QuickBirdImageMetadataInterface::GetSatElevation(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.sat_elevation_angle";
+ std::string key = "support_data.sat_elevation_angle";
ossimString keywordString = kwl.find(key.c_str());
return keywordString.toDouble();
}
double
-QuickBirdImageMetadataInterface::GetSatAzimuth( const MetaDataDictionaryType & dict ) const
+QuickBirdImageMetadataInterface::GetSatAzimuth(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.sat_azimuth_angle";
+ std::string key = "support_data.sat_azimuth_angle";
ossimString keywordString = kwl.find(key.c_str());
return keywordString.toDouble();
@@ -627,98 +592,96 @@ QuickBirdImageMetadataInterface::GetSatAzimuth( const MetaDataDictionaryType & d
QuickBirdImageMetadataInterface::VariableLengthVectorType
QuickBirdImageMetadataInterface
-::GetFirstWavelengths( const MetaDataDictionaryType & dict ) const
+::GetFirstWavelengths(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
-
+ }
+
VariableLengthVectorType wavel(1);
wavel.Fill(0.);
-
+
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
std::string key = "support_data.band_id";
ossimString keywordStringBId = kwl.find(key.c_str());
if (keywordStringBId != ossimString("P") && keywordStringBId != ossimString("Multi"))
- {
- itkExceptionMacro(<<"Invalid bandID "<<keywordStringBId);
- }
+ {
+ itkExceptionMacro(<< "Invalid bandID " << keywordStringBId);
+ }
// Panchromatic case
- if (keywordStringBId == ossimString("P") )
- {
+ if (keywordStringBId == ossimString("P"))
+ {
wavel.SetSize(1);
wavel.Fill(0.450);
- }
+ }
else
- {
- wavel.SetSize(4);
- wavel[0] = 0.450;
- wavel[1] = 0.520;
- wavel[2] = 0.630;
- wavel[3] = 0.760;
- }
+ {
+ wavel.SetSize(4);
+ wavel[0] = 0.450;
+ wavel[1] = 0.520;
+ wavel[2] = 0.630;
+ wavel[3] = 0.760;
+ }
return wavel;
}
-
QuickBirdImageMetadataInterface::VariableLengthVectorType
QuickBirdImageMetadataInterface
-::GetLastWavelengths( const MetaDataDictionaryType & dict ) const
+::GetLastWavelengths(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no QuickBird Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no QuickBird Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
-
+ }
+
VariableLengthVectorType wavel(1);
wavel.Fill(0.);
-
+
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
std::string key = "support_data.band_id";
ossimString keywordStringBId = kwl.find(key.c_str());
if (keywordStringBId != ossimString("P") && keywordStringBId != ossimString("Multi"))
- {
- itkExceptionMacro(<<"Invalid bandID "<<keywordStringBId);
- }
+ {
+ itkExceptionMacro(<< "Invalid bandID " << keywordStringBId);
+ }
// Panchromatic case
- if (keywordStringBId == ossimString("P") )
- {
+ if (keywordStringBId == ossimString("P"))
+ {
wavel.SetSize(1);
wavel.Fill(0.900);
- }
+ }
else
- {
- wavel.SetSize(4);
- wavel[0] = 0.520;
- wavel[1] = 0.600;
- wavel[2] = 0.690;
- wavel[3] = 0.900;
- }
+ {
+ wavel.SetSize(4);
+ wavel[0] = 0.520;
+ wavel[1] = 0.600;
+ wavel[2] = 0.690;
+ wavel[3] = 0.900;
+ }
return wavel;
}
-
} // end namespace otb
diff --git a/Code/IO/otbQuickBirdImageMetadataInterface.h b/Code/IO/otbQuickBirdImageMetadataInterface.h
index 73c2c757a5..8574d8721b 100644
--- a/Code/IO/otbQuickBirdImageMetadataInterface.h
+++ b/Code/IO/otbQuickBirdImageMetadataInterface.h
@@ -36,9 +36,9 @@ class ITK_EXPORT QuickBirdImageMetadataInterface : public ImageMetadataInterface
public:
typedef QuickBirdImageMetadataInterface Self;
- typedef ImageMetadataInterfaceBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageMetadataInterfaceBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -52,64 +52,61 @@ public:
typedef Superclass::VariableLengthVectorType VariableLengthVectorType;
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
+ /** Get the radiometric bias from the ossim metadata */
+ VariableLengthVectorType GetPhysicalBias(const MetaDataDictionaryType& dict) const;
- /** Get the radiometric bias from the ossim metadata */
- VariableLengthVectorType GetPhysicalBias( const MetaDataDictionaryType & dict ) const;
-
/** Get the radiometric gain from the ossim metadata */
- VariableLengthVectorType GetPhysicalGain( const MetaDataDictionaryType & dict ) const;
-
+ VariableLengthVectorType GetPhysicalGain(const MetaDataDictionaryType& dict) const;
+
/** Get the solar irradiance from the ossim metadata */
- VariableLengthVectorType GetSolarIrradiance( const MetaDataDictionaryType & dict ) const;
-
- /** Get the imaging acquisition day from the ossim metadata : TLCTime metadata value */
- int GetDay( const MetaDataDictionaryType & dict ) const;
-
+ VariableLengthVectorType GetSolarIrradiance(const MetaDataDictionaryType& dict) const;
+
+ /** Get the imaging acquisition day from the ossim metadata : TLCTime metadata value */
+ int GetDay(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging acquisition month from the ossim metadata : TLCTime metadata value */
- int GetMonth( const MetaDataDictionaryType & dict ) const;
-
+ int GetMonth(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging acquisition year from the ossim metadata : TLCTime metadata value */
- int GetYear( const MetaDataDictionaryType & dict ) const;
-
+ int GetYear(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging acquisition hour from the ossim metadata : TLCTime metadata value */
- int GetHour( const MetaDataDictionaryType & dict ) const;
-
+ int GetHour(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging acquisition year from the ossim metadata : TLCTime metadata value */
- int GetMinute( const MetaDataDictionaryType & dict ) const;
+ int GetMinute(const MetaDataDictionaryType& dict) const;
+
+ /** Get the imaging production day from the ossim metadata : generationTime metadata value */
+ int GetProductionDay(const MetaDataDictionaryType& dict) const;
- /** Get the imaging production day from the ossim metadata : generationTime metadata value */
- int GetProductionDay( const MetaDataDictionaryType & dict ) const;
-
/** Get the imaging production month from the ossim metadata : generationTime metadata value */
- int GetProductionMonth( const MetaDataDictionaryType & dict ) const;
-
+ int GetProductionMonth(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging production year from the ossim metadata : generationTime metadata value */
- int GetProductionYear( const MetaDataDictionaryType & dict ) const;
-
+ int GetProductionYear(const MetaDataDictionaryType& dict) const;
+
/** Get the sat elevation from the ossim metadata */
- double GetSatElevation( const MetaDataDictionaryType & dict ) const;
-
+ double GetSatElevation(const MetaDataDictionaryType& dict) const;
+
/** Get the sat azimuth from the ossim metadata */
- double GetSatAzimuth( const MetaDataDictionaryType & dict ) const;
+ double GetSatAzimuth(const MetaDataDictionaryType& dict) const;
/** Get the first wavelength for the spectral band definition */
- VariableLengthVectorType GetFirstWavelengths( const MetaDataDictionaryType & dict ) const;
-
+ VariableLengthVectorType GetFirstWavelengths(const MetaDataDictionaryType& dict) const;
+
/** Get the last wavelength for the spectral band definition */
- VariableLengthVectorType GetLastWavelengths( const MetaDataDictionaryType & dict ) const;
-
- bool CanRead( const MetaDataDictionaryType & dict) const;
-
+ VariableLengthVectorType GetLastWavelengths(const MetaDataDictionaryType& dict) const;
+
+ bool CanRead(const MetaDataDictionaryType& dict) const;
protected:
QuickBirdImageMetadataInterface();
- virtual ~QuickBirdImageMetadataInterface() {};
+ virtual ~QuickBirdImageMetadataInterface() {}
-
private:
- QuickBirdImageMetadataInterface(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ QuickBirdImageMetadataInterface(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/IO/otbQuickBirdImageMetadataInterfaceFactory.cxx b/Code/IO/otbQuickBirdImageMetadataInterfaceFactory.cxx
index 60e5d774d9..4880039777 100644
--- a/Code/IO/otbQuickBirdImageMetadataInterfaceFactory.cxx
+++ b/Code/IO/otbQuickBirdImageMetadataInterfaceFactory.cxx
@@ -16,7 +16,6 @@
=========================================================================*/
-
#ifdef _MSC_VER
#pragma warning ( disable : 4786 )
#endif
@@ -32,7 +31,6 @@
#include "itkCreateObjectFunction.h"
#include "itkVersion.h"
-
namespace otb
{
@@ -43,7 +41,7 @@ QuickBirdImageMetadataInterfaceFactory
"otbQuickBirdImageMetadataInterface",
"QuickBird Meteada Interface",
1,
- itk::CreateObjectFunction<QuickBirdImageMetadataInterface >::New());
+ itk::CreateObjectFunction<QuickBirdImageMetadataInterface>::New());
}
QuickBirdImageMetadataInterfaceFactory
diff --git a/Code/IO/otbQuickBirdImageMetadataInterfaceFactory.h b/Code/IO/otbQuickBirdImageMetadataInterfaceFactory.h
index f6690cf689..d8e13aed94 100644
--- a/Code/IO/otbQuickBirdImageMetadataInterfaceFactory.h
+++ b/Code/IO/otbQuickBirdImageMetadataInterfaceFactory.h
@@ -33,10 +33,10 @@ class ITK_EXPORT QuickBirdImageMetadataInterfaceFactory : public itk::ObjectFact
{
public:
/** Standard class typedefs. */
- typedef QuickBirdImageMetadataInterfaceFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef QuickBirdImageMetadataInterfaceFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -60,12 +60,11 @@ protected:
virtual ~QuickBirdImageMetadataInterfaceFactory();
private:
- QuickBirdImageMetadataInterfaceFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ QuickBirdImageMetadataInterfaceFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbRADImageIO.cxx b/Code/IO/otbRADImageIO.cxx
index 1ddd233c91..a9fbc936e7 100644
--- a/Code/IO/otbRADImageIO.cxx
+++ b/Code/IO/otbRADImageIO.cxx
@@ -29,7 +29,6 @@
#include <fstream>
#include <iostream>
-
namespace otb
{
@@ -39,22 +38,21 @@ RADImageIO::RADImageIO()
this->SetNumberOfDimensions(2);
// By default the type to CI2
- m_TypeRAD= "CR4";
- m_NbOctetPixel=8;
- m_NbOfChannels=1;
+ m_TypeRAD = "CR4";
+ m_NbOctetPixel = 8;
+ m_NbOfChannels = 1;
this->SetNumberOfComponents(2);
m_PixelType = COMPLEX;
m_ComponentType = FLOAT;
-
- if ( itk::ByteSwapper<char>::SystemIsLittleEndian() == true)
- {
+ if (itk::ByteSwapper<char>::SystemIsLittleEndian() == true)
+ {
m_ByteOrder = LittleEndian;
- }
+ }
else
- {
+ {
m_ByteOrder = BigEndian;
- }
+ }
m_FileByteOrder = m_ByteOrder;
@@ -78,50 +76,49 @@ RADImageIO::RADImageIO()
RADImageIO::~RADImageIO()
{
- if ( m_HeaderFile.is_open() )
- {
+ if (m_HeaderFile.is_open())
+ {
m_HeaderFile.close();
- }
- if ( m_ChannelsFile != NULL)
- {
- for (unsigned int numChannel = 0; numChannel< m_NbOfChannels; ++numChannel)
+ }
+ if (m_ChannelsFile != NULL)
{
- if ( m_ChannelsFile[numChannel].is_open() )
+ for (unsigned int numChannel = 0; numChannel < m_NbOfChannels; ++numChannel)
{
+ if (m_ChannelsFile[numChannel].is_open())
+ {
m_ChannelsFile[numChannel].close();
+ }
}
+ delete[] m_ChannelsFile;
}
- delete [] m_ChannelsFile;
- }
}
-bool RADImageIO::CanReadFile( const char* filename )
+bool RADImageIO::CanReadFile(const char* filename)
{
std::fstream header_file;
- std::string lFileName(filename);
- if ( System::IsADirName(lFileName) == true )
- {
+ std::string lFileName(filename);
+ if (System::IsADirName(lFileName) == true)
+ {
return false;
- }
- if ( System::SetToLower(System::GetExtension(lFileName)) != "rad" )
- {
+ }
+ if (System::SetToLower(System::GetExtension(lFileName)) != "rad")
+ {
return false;
- }
+ }
- header_file.open( lFileName.c_str(), std::ios::in );
- if ( header_file.fail() )
- {
- otbMsgDevMacro(<<"RADImageIO::CanReadFile() failed header open ! " );
+ header_file.open(lFileName.c_str(), std::ios::in);
+ if (header_file.fail())
+ {
+ otbMsgDevMacro(<< "RADImageIO::CanReadFile() failed header open ! ");
return false;
- }
+ }
//Read header informations
- bool lResult = InternalReadHeaderInformation(lFileName, header_file,false);
+ bool lResult = InternalReadHeaderInformation(lFileName, header_file, false);
header_file.close();
return (lResult);
}
-
// Used to print information about this object
void RADImageIO::PrintSelf(std::ostream& os, itk::Indent indent) const
{
@@ -137,127 +134,123 @@ void RADImageIO::ReadVolume(void*)
void RADImageIO::Read(void* buffer)
{
unsigned long step = this->GetNumberOfComponents();
- char * p = static_cast<char *>(buffer);
+ char * p = static_cast<char *>(buffer);
int lNbLines = this->GetIORegion().GetSize()[1];
int lNbColumns = this->GetIORegion().GetSize()[0];
int lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
- otbMsgDevMacro( <<" RADImageIO::Read() ");
- otbMsgDevMacro( <<" Image size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDevMacro( <<" Region read (IORegion) : "<<this->GetIORegion());
- otbMsgDevMacro( <<" Nb Of Components : "<<this->GetNumberOfComponents());
- otbMsgDevMacro( <<" Size Of Components : "<<this->GetComponentSize());
- otbMsgDevMacro( <<" Nb Of Channels : "<<m_NbOfChannels);
+ otbMsgDevMacro(<< " RADImageIO::Read() ");
+ otbMsgDevMacro(<< " Image size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDevMacro(<< " Region read (IORegion) : " << this->GetIORegion());
+ otbMsgDevMacro(<< " Nb Of Components : " << this->GetNumberOfComponents());
+ otbMsgDevMacro(<< " Size Of Components : " << this->GetComponentSize());
+ otbMsgDevMacro(<< " Nb Of Channels : " << m_NbOfChannels);
std::streamoff headerLength(0);
std::streamoff offset;
- std::streamoff numberOfBytesPerLines = static_cast<std::streamoff>( m_NbOctetPixel * m_Dimensions[0]);
+ std::streamoff numberOfBytesPerLines = static_cast<std::streamoff>(m_NbOctetPixel * m_Dimensions[0]);
std::streamsize numberOfBytesToBeRead = m_NbOctetPixel * lNbColumns;
std::streamsize numberOfBytesRead;
- unsigned long cpt = 0;
+ unsigned long cpt = 0;
// Update the step variable
- step = step * (unsigned long)(this->GetComponentSize());
+ step = step * (unsigned long) (this->GetComponentSize());
char * value = new char[numberOfBytesToBeRead];
- if (value==NULL)
- {
- itkExceptionMacro(<<"RADImageIO::Read(): Bad alloc");
+ if (value == NULL)
+ {
+ itkExceptionMacro(<< "RADImageIO::Read(): Bad alloc");
return;
- }
+ }
- otbMsgDevMacro( <<" sizeof(streamsize) : "<<sizeof(std::streamsize));
- otbMsgDevMacro( <<" sizeof(streampos) : "<<sizeof(std::streampos));
- otbMsgDevMacro( <<" sizeof(streamoff) : "<<sizeof(std::streamoff));
- otbMsgDevMacro( <<" sizeof(std::ios::beg) : "<<sizeof(std::ios::beg));
- otbMsgDevMacro( <<" sizeof(size_t) : "<<sizeof(size_t));
- otbMsgDevMacro( <<" sizeof(unsigned long) : "<<sizeof(unsigned long));
+ otbMsgDevMacro(<< " sizeof(streamsize) : " << sizeof(std::streamsize));
+ otbMsgDevMacro(<< " sizeof(streampos) : " << sizeof(std::streampos));
+ otbMsgDevMacro(<< " sizeof(streamoff) : " << sizeof(std::streamoff));
+ otbMsgDevMacro(<< " sizeof(std::ios::beg) : " << sizeof(std::ios::beg));
+ otbMsgDevMacro(<< " sizeof(size_t) : " << sizeof(size_t));
+ otbMsgDevMacro(<< " sizeof(unsigned long) : " << sizeof(unsigned long));
for (unsigned int numChannel = 0; numChannel < m_NbOfChannels; ++numChannel)
- {
- cpt = (unsigned long )(numChannel)* (unsigned long)(m_NbOctetPixel);
- //Read region of the channel
- for (int LineNo = lFirstLine;LineNo <lFirstLine + lNbLines; LineNo++ )
{
+ cpt = (unsigned long) (numChannel) * (unsigned long) (m_NbOctetPixel);
+ //Read region of the channel
+ for (int LineNo = lFirstLine; LineNo < lFirstLine + lNbLines; LineNo++)
+ {
offset = headerLength + numberOfBytesPerLines * static_cast<std::streamoff>(LineNo);
- offset += static_cast<std::streamoff>( m_NbOctetPixel * lFirstColumn);
+ offset += static_cast<std::streamoff>(m_NbOctetPixel * lFirstColumn);
m_ChannelsFile[numChannel].seekg(offset, std::ios::beg);
//Read a line
- m_ChannelsFile[numChannel].read( static_cast<char *>( value ), numberOfBytesToBeRead );
+ m_ChannelsFile[numChannel].read(static_cast<char *>(value), numberOfBytesToBeRead);
numberOfBytesRead = m_ChannelsFile[numChannel].gcount();
#ifdef __APPLE_CC__
// fail() is broken in the Mac. It returns true when reaches eof().
- if ( numberOfBytesRead != numberOfBytesToBeRead )
+ if (numberOfBytesRead != numberOfBytesToBeRead)
#else
- if ( ( numberOfBytesRead != numberOfBytesToBeRead ) || m_ChannelsFile[numChannel].fail() )
+ if ((numberOfBytesRead != numberOfBytesToBeRead) || m_ChannelsFile[numChannel].fail())
#endif
- {
- itkExceptionMacro(<<"RADImageIO::Read() Can Read the specified Region"); // read failed
- }
- for ( std::streamsize i=0; i < numberOfBytesToBeRead; i = i+static_cast<std::streamsize>(m_NbOctetPixel) )
- {
- memcpy((void*)(&(p[cpt])),(const void*)(&(value[i])),(size_t)(m_NbOctetPixel));
+ {
+ itkExceptionMacro(<< "RADImageIO::Read() Can Read the specified Region"); // read failed
+ }
+ for (std::streamsize i = 0; i < numberOfBytesToBeRead; i = i + static_cast<std::streamsize>(m_NbOctetPixel))
+ {
+ memcpy((void*) (&(p[cpt])), (const void*) (&(value[i])), (size_t) (m_NbOctetPixel));
cpt += step;
+ }
}
}
- }
unsigned long numberOfPixelsOfRegion = lNbLines * lNbColumns * this->GetNumberOfComponents();
-
// Swap bytes if necessary
- if ( 0 ) {}
- otbSwappFileToSystemMacro( unsigned short, USHORT, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( short, SHORT, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( char, CHAR, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( unsigned char, UCHAR, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( unsigned int, UINT, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( int, INT, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( long, LONG, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( unsigned long, ULONG, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( float, FLOAT, buffer, numberOfPixelsOfRegion )
- otbSwappFileToSystemMacro( double, DOUBLE, buffer, numberOfPixelsOfRegion )
+ if (0) {}
+ otbSwappFileToSystemMacro(unsigned short, USHORT, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(short, SHORT, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(char, CHAR, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(unsigned char, UCHAR, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(unsigned int, UINT, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(int, INT, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(long, LONG, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(unsigned long, ULONG, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(float, FLOAT, buffer, numberOfPixelsOfRegion)
+ otbSwappFileToSystemMacro(double, DOUBLE, buffer, numberOfPixelsOfRegion)
else
- {
- itkExceptionMacro(<<"RADImageIO::Read() undefined component type! " );
- }
-
+ {
+ itkExceptionMacro(<< "RADImageIO::Read() undefined component type! ");
+ }
- delete [] value;
+ delete[] value;
value = NULL;
}
-
void RADImageIO::ReadImageInformation()
{
- if ( m_HeaderFile.is_open() )
- {
+ if (m_HeaderFile.is_open())
+ {
m_HeaderFile.close();
- }
- m_HeaderFile.open( m_FileName.c_str(), std::ios::in );
- if ( m_HeaderFile.fail() )
- {
- itkExceptionMacro(<<"RADImageIO::ReadImageInformation() failed header open ! " );
- }
+ }
+ m_HeaderFile.open(m_FileName.c_str(), std::ios::in);
+ if (m_HeaderFile.fail())
+ {
+ itkExceptionMacro(<< "RADImageIO::ReadImageInformation() failed header open ! ");
+ }
//Read header informations
- InternalReadHeaderInformation(m_FileName, m_HeaderFile,true);
+ InternalReadHeaderInformation(m_FileName, m_HeaderFile, true);
- otbMsgDebugMacro( <<"Driver to read: RAD");
- otbMsgDebugMacro( <<" Read file : "<< m_FileName);
- otbMsgDebugMacro( <<" Size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDebugMacro( <<" ComponentType : "<<this->GetComponentType() );
- otbMsgDebugMacro( <<" NumberOfComponents : "<<this->GetNumberOfComponents());
- otbMsgDebugMacro( <<" ComponentSize : "<<this->GetComponentSize());
- otbMsgDebugMacro( <<" GetPixelSize : "<<this->GetPixelSize());
+ otbMsgDebugMacro(<< "Driver to read: RAD");
+ otbMsgDebugMacro(<< " Read file : " << m_FileName);
+ otbMsgDebugMacro(<< " Size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDebugMacro(<< " ComponentType : " << this->GetComponentType());
+ otbMsgDebugMacro(<< " NumberOfComponents : " << this->GetNumberOfComponents());
+ otbMsgDebugMacro(<< " ComponentSize : " << this->GetComponentSize());
+ otbMsgDebugMacro(<< " GetPixelSize : " << this->GetPixelSize());
}
-
-bool RADImageIO::InternalReadHeaderInformation(const std::string & file_name, std::fstream & file, const bool reportError)
+bool RADImageIO::InternalReadHeaderInformation(const std::string& file_name, std::fstream& file, const bool reportError)
{
std::string lString;
@@ -266,119 +259,118 @@ bool RADImageIO::InternalReadHeaderInformation(const std::string & file_name, st
// Read NBCOLONNES information
file >> lString;
lString = System::SetToUpper(lString);
- if ( (lString != "NBCOLONNES") && (lString != "NBCOLUMNS"))
- {
- if ( reportError == true )
+ if ((lString != "NBCOLONNES") && (lString != "NBCOLUMNS"))
{
+ if (reportError == true)
+ {
itkExceptionMacro(<< "RAD : 'NBCOLONNES' keyword is not find in the header file.");
- }
+ }
else
- {
+ {
return false;
+ }
}
- }
file >> m_Dimensions[0];
// Read NBLIGNES information
file >> lString;
lString = System::SetToUpper(lString);
- if ( (lString != "NBLIGNES") && (lString != "NBLINES") )
- {
- if ( reportError == true )
+ if ((lString != "NBLIGNES") && (lString != "NBLINES"))
{
+ if (reportError == true)
+ {
itkExceptionMacro(<< "RAD : 'NBLIGNES' keyword is not find in the header file.");
- }
+ }
else
- {
+ {
return false;
+ }
}
- }
file >> m_Dimensions[1];
// Read NBPLANS information
file >> lString;
lString = System::SetToUpper(lString);
- if ( (lString != "NBPLANS") && (lString != "NBBANDS") )
- {
- if ( reportError == true )
+ if ((lString != "NBPLANS") && (lString != "NBBANDS"))
{
+ if (reportError == true)
+ {
itkExceptionMacro(<< "RAD : 'NBPLANS' keyword is not find in the header file.");
- }
+ }
else
- {
+ {
return false;
+ }
}
- }
file >> m_NbOfChannels;
// Because we read complex : *2
- this->SetNumberOfComponents(2*m_NbOfChannels);
+ this->SetNumberOfComponents(2 * m_NbOfChannels);
// Read TYPECODAGE information
file >> lString;
lString = System::SetToUpper(lString);
- if ( (lString != "TYPECODAGE") && (lString != "TYPE") )
- {
- if ( reportError == true )
+ if ((lString != "TYPECODAGE") && (lString != "TYPE"))
{
+ if (reportError == true)
+ {
itkExceptionMacro(<< "RAD : the first line of the header file must be contains 'TYPECODAGE' caracters.");
- }
+ }
else
- {
+ {
return false;
+ }
}
- }
file >> lStrCodePix;
-
lStrCodePix = System::SetToUpper(lStrCodePix);
if (lStrCodePix == "OCT")
- {
+ {
m_PixelType = SCALAR;
SetComponentType(UCHAR);
- m_NbOctetPixel=1;
- }
+ m_NbOctetPixel = 1;
+ }
if (lStrCodePix == "PHA")
- {
+ {
m_PixelType = SCALAR;
SetComponentType(CHAR);
- m_NbOctetPixel=1;
- }
+ m_NbOctetPixel = 1;
+ }
if (lStrCodePix == "I2")
- {
+ {
m_PixelType = SCALAR;
SetComponentType(SHORT);
- m_NbOctetPixel=2;
- }
+ m_NbOctetPixel = 2;
+ }
if (lStrCodePix == "I4")
- {
+ {
m_PixelType = SCALAR;
SetComponentType(INT);
- m_NbOctetPixel=4;
- }
+ m_NbOctetPixel = 4;
+ }
if (lStrCodePix == "R4")
- {
+ {
m_PixelType = SCALAR;
SetComponentType(FLOAT);
- m_NbOctetPixel=4;
- }
+ m_NbOctetPixel = 4;
+ }
else if (lStrCodePix == "CI2")
- {
+ {
m_PixelType = COMPLEX;
SetComponentType(SHORT);
- m_NbOctetPixel=4;
- }
+ m_NbOctetPixel = 4;
+ }
else if (lStrCodePix == "CR4")
- {
+ {
m_PixelType = COMPLEX;
SetComponentType(FLOAT);
- m_NbOctetPixel=8;
- }
+ m_NbOctetPixel = 8;
+ }
else if (lStrCodePix == "COCT")
- {
+ {
m_PixelType = COMPLEX;
SetComponentType(UCHAR);
- m_NbOctetPixel=2;
- }
+ m_NbOctetPixel = 2;
+ }
/* else if(lStrCodePix == "C3B")
{
m_PixelType = COMPLEX;
@@ -400,151 +392,152 @@ bool RADImageIO::InternalReadHeaderInformation(const std::string & file_name, st
*/
else if (lStrCodePix == "CI4")
- {
+ {
m_PixelType = COMPLEX;
SetComponentType(INT);
- m_NbOctetPixel=8;
- }
+ m_NbOctetPixel = 8;
+ }
else if (lStrCodePix == "CR8")
- {
+ {
m_PixelType = COMPLEX;
SetComponentType(DOUBLE);
- m_NbOctetPixel=16;
- }
+ m_NbOctetPixel = 16;
+ }
else
- {
- if ( reportError == true )
{
- itkExceptionMacro(<< "RAD : the value type '"<<lStrCodePix<<"' (second line) set in the header file is not reconized as correct value.");
- }
+ if (reportError == true)
+ {
+ itkExceptionMacro(
+ << "RAD : the value type '" << lStrCodePix <<
+ "' (second line) set in the header file is not reconized as correct value.");
+ }
else
- {
+ {
return false;
+ }
}
- }
// Read "SENSCODAGE" informations (optionnal)
file >> lString;
- if ( lString.empty() == false)
- {
- lString = System::SetToUpper(lString);
- if ( (lString == "SENSCODAGE") || (lString == "ORDER") )
+ if (lString.empty() == false)
{
+ lString = System::SetToUpper(lString);
+ if ((lString == "SENSCODAGE") || (lString == "ORDER"))
+ {
file >> lString;
lString = System::SetToUpper(lString);
- if ( lString == "INTEL" )
- {
+ if (lString == "INTEL")
+ {
m_FileByteOrder = LittleEndian;
- }
- else if ( lString == "IEEE" )
- {
+ }
+ else if (lString == "IEEE")
+ {
m_FileByteOrder = BigEndian;
- }
+ }
else
- {
- if ( reportError == true )
{
- itkExceptionMacro(<< "RAD : the value SENSCODAGE '"<<lString<<"' set in the header file is not reconized as correct value. Possible values are INTEL or IEEE");
- }
+ if (reportError == true)
+ {
+ itkExceptionMacro(
+ << "RAD : the value SENSCODAGE '" << lString <<
+ "' set in the header file is not reconized as correct value. Possible values are INTEL or IEEE");
+ }
else
- {
+ {
return false;
+ }
}
}
}
- }
-
// Read FileName information
- std::string lPathName = System::GetPathName( file_name );
+ std::string lPathName = System::GetPathName(file_name);
m_ChannelsFileName.clear();
- for (unsigned int i=0; i<m_NbOfChannels; ++i)
- {
+ for (unsigned int i = 0; i < m_NbOfChannels; ++i)
+ {
file >> lString;
::itk::OStringStream lStream;
- lStream << lPathName <<"/"<< lString;
+ lStream << lPathName << "/" << lString;
m_ChannelsFileName.push_back(lStream.str());
- }
+ }
file.close();
m_ChannelsFile = new std::fstream[m_NbOfChannels];
// Try to open channels file
- for (unsigned int channels = 0; channels<m_ChannelsFileName.size(); ++channels)
- {
-
- m_ChannelsFile[channels].open( m_ChannelsFileName[channels].c_str(), std::ios::in | std::ios::binary );
- if ( m_ChannelsFile[channels].fail() )
+ for (unsigned int channels = 0; channels < m_ChannelsFileName.size(); ++channels)
{
- if ( reportError == true )
+
+ m_ChannelsFile[channels].open(m_ChannelsFileName[channels].c_str(), std::ios::in | std::ios::binary);
+ if (m_ChannelsFile[channels].fail())
{
- itkExceptionMacro(<< "RAD : impossible to find the file <"<<m_ChannelsFileName[channels]<<">.");
- }
+ if (reportError == true)
+ {
+ itkExceptionMacro(<< "RAD : impossible to find the file <" << m_ChannelsFileName[channels] << ">.");
+ }
else
- {
+ {
return false;
+ }
}
}
- }
this->SetFileTypeToBinary();
this->SetNumberOfDimensions(2);
- return(true);
+ return (true);
}
-
-bool RADImageIO::CanWriteFile( const char* filename )
+bool RADImageIO::CanWriteFile(const char* filename)
{
std::string lFileName(filename);
- if ( System::SetToLower(System::GetExtension(lFileName)) != "rad" )
- {
+ if (System::SetToLower(System::GetExtension(lFileName)) != "rad")
+ {
return false;
- }
- if ( System::IsADirName(lFileName) == true )
- {
+ }
+ if (System::IsADirName(lFileName) == true)
+ {
return false;
- }
+ }
return true;
}
void RADImageIO::Write(const void* buffer)
{
-
- if ( m_FlagWriteImageInformation == true )
- {
+ if (m_FlagWriteImageInformation == true)
+ {
this->WriteImageInformation();
m_FlagWriteImageInformation = false;
- }
+ }
unsigned long step = this->GetNumberOfComponents();
- unsigned int lNbLines = this->GetIORegion().GetSize()[1];
- unsigned int lNbColumns = this->GetIORegion().GetSize()[0];
- int lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
- int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
+ unsigned int lNbLines = this->GetIORegion().GetSize()[1];
+ unsigned int lNbColumns = this->GetIORegion().GetSize()[0];
+ int lFirstLine = this->GetIORegion().GetIndex()[1]; // [1... ]
+ int lFirstColumn = this->GetIORegion().GetIndex()[0]; // [1... ]
// Special case : we control that if the region to write has the same dimension that the entire picture,
// we start to the offset to 0 ( when ze4re not in "Streaming")
- if ( (lNbLines == m_Dimensions[1]) && (lNbColumns == m_Dimensions[0]))
- {
- otbMsgDevMacro(<<"Force the IORegion offset to 0");
+ if ((lNbLines == m_Dimensions[1]) && (lNbColumns == m_Dimensions[0]))
+ {
+ otbMsgDevMacro(<< "Force the IORegion offset to 0");
lFirstLine = 0;
lFirstColumn = 0;
- }
+ }
- otbMsgDevMacro( <<" RADImageIO::Write() ");
- otbMsgDevMacro( <<" Image size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDevMacro( <<" Region read (IORegion) : "<<this->GetIORegion());
- otbMsgDevMacro( <<" Nb Of Components : "<<this->GetNumberOfComponents());
- otbMsgDevMacro( <<" GetComponentSize : "<<this->GetComponentSize());
+ otbMsgDevMacro(<< " RADImageIO::Write() ");
+ otbMsgDevMacro(<< " Image size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDevMacro(<< " Region read (IORegion) : " << this->GetIORegion());
+ otbMsgDevMacro(<< " Nb Of Components : " << this->GetNumberOfComponents());
+ otbMsgDevMacro(<< " GetComponentSize : " << this->GetComponentSize());
- std::streamoff headerLength(0);
+ std::streamoff headerLength(0);
std::streamoff numberOfBytesPerLines = static_cast<std::streamoff>(m_NbOctetPixel * m_Dimensions[0]);
std::streamsize numberOfBytesToBeWrite = static_cast<std::streamsize>(m_NbOctetPixel * lNbColumns);
std::streamoff offset = 0;
- unsigned long cpt = 0;
+ unsigned long cpt = 0;
// Update the step variable
step = m_NbOctetPixel;
@@ -552,60 +545,59 @@ void RADImageIO::Write(const void* buffer)
const char * p = static_cast<const char *>(buffer);
char* value = new char[numberOfBytesToBeWrite];
- if (value==NULL)
- {
- itkExceptionMacro(<<"RADImageIO::Write : Bad Alloc");
+ if (value == NULL)
+ {
+ itkExceptionMacro(<< "RADImageIO::Write : Bad Alloc");
return;
- }
+ }
for (unsigned int numChannel = 0; numChannel < m_NbOfChannels; ++numChannel)
- {
- cpt = (unsigned long )(numChannel)* (unsigned long)(m_NbOctetPixel);
- //Read region of the channel
- for (unsigned int LineNo = lFirstLine;LineNo <lFirstLine + lNbLines; LineNo++ )
{
- for ( std::streamsize i=0; i < numberOfBytesToBeWrite; i = i+static_cast<std::streamsize>(m_NbOctetPixel) )
+ cpt = (unsigned long) (numChannel) * (unsigned long) (m_NbOctetPixel);
+ //Read region of the channel
+ for (unsigned int LineNo = lFirstLine; LineNo < lFirstLine + lNbLines; LineNo++)
{
- memcpy((void*)(&(value[i])),(const void*)(&(p[cpt])),(size_t)(m_NbOctetPixel));
+ for (std::streamsize i = 0; i < numberOfBytesToBeWrite; i = i + static_cast<std::streamsize>(m_NbOctetPixel))
+ {
+ memcpy((void*) (&(value[i])), (const void*) (&(p[cpt])), (size_t) (m_NbOctetPixel));
cpt += step;
- }
+ }
offset = headerLength + numberOfBytesPerLines * static_cast<std::streamoff>(LineNo);
offset += static_cast<std::streamoff>(m_NbOctetPixel * lFirstColumn);
m_ChannelsFile[numChannel].seekp(offset, std::ios::beg);
//Write a line
- m_ChannelsFile[numChannel].write( static_cast<char *>( value ), numberOfBytesToBeWrite );
+ m_ChannelsFile[numChannel].write(static_cast<char *>(value), numberOfBytesToBeWrite);
+ }
}
- }
- delete [] value;
+ delete[] value;
}
-
void RADImageIO::WriteImageInformation()
{
- if ( m_FileName == "" )
- {
- itkExceptionMacro(<<"A FileName must be specified.");
- }
- if ( CanWriteFile(m_FileName.c_str()) == false)
- {
- itkExceptionMacro(<< "The file "<<m_FileName.c_str()<<" is not defined as a RAD file");
- }
+ if (m_FileName == "")
+ {
+ itkExceptionMacro(<< "A FileName must be specified.");
+ }
+ if (CanWriteFile(m_FileName.c_str()) == false)
+ {
+ itkExceptionMacro(<< "The file " << m_FileName.c_str() << " is not defined as a RAD file");
+ }
// Close file from any previous image
- if ( m_HeaderFile.is_open() )
- {
+ if (m_HeaderFile.is_open())
+ {
m_HeaderFile.close();
- }
+ }
// Open the new file for writing
// Actually open the file
- m_HeaderFile.open( m_FileName.c_str(), std::ios::out | std::ios::trunc );
- if ( m_HeaderFile.fail() )
- {
- itkExceptionMacro(<< "Cannot write requested file "<<m_FileName.c_str()<<".");
- }
+ m_HeaderFile.open(m_FileName.c_str(), std::ios::out | std::ios::trunc);
+ if (m_HeaderFile.fail())
+ {
+ itkExceptionMacro(<< "Cannot write requested file " << m_FileName.c_str() << ".");
+ }
//Write COLUMNS information
m_HeaderFile << "NBCOLUMNS ";
@@ -623,67 +615,65 @@ void RADImageIO::WriteImageInformation()
//Write TYPE information
m_HeaderFile << "TYPECODAGE ";
-
std::string lExtension;
std::string lStringPixelType = System::SetToUpper(this->GetPixelTypeAsString(m_PixelType));
std::string lStringComponentType = System::SetToUpper(this->GetComponentTypeAsString(this->GetComponentType()));
-
if (lStringPixelType == "SCALAR")
- {
- if ( lStringComponentType =="UCHAR")
{
- m_NbOctetPixel=1;
+ if (lStringComponentType == "UCHAR")
+ {
+ m_NbOctetPixel = 1;
m_TypeRAD = "OCT";
- lExtension=".oct";
- }
- else if ( lStringComponentType =="CHAR")
- {
- m_NbOctetPixel=1;
+ lExtension = ".oct";
+ }
+ else if (lStringComponentType == "CHAR")
+ {
+ m_NbOctetPixel = 1;
m_TypeRAD = "PHA";
- lExtension=".pha";
- }
- else if ( lStringComponentType =="SHORT")
- {
- m_NbOctetPixel=2;
+ lExtension = ".pha";
+ }
+ else if (lStringComponentType == "SHORT")
+ {
+ m_NbOctetPixel = 2;
m_TypeRAD = "I2";
- lExtension=".i2";
- }
- else if ( lStringComponentType =="INT")
- {
- m_NbOctetPixel=4;
+ lExtension = ".i2";
+ }
+ else if (lStringComponentType == "INT")
+ {
+ m_NbOctetPixel = 4;
m_TypeRAD = "I4";
- lExtension=".i4";
- }
- else if ( lStringComponentType =="FLOAT")
- {
- m_NbOctetPixel=4;
+ lExtension = ".i4";
+ }
+ else if (lStringComponentType == "FLOAT")
+ {
+ m_NbOctetPixel = 4;
m_TypeRAD = "R4";
- lExtension=".r4";
+ lExtension = ".r4";
+ }
}
- }
- else if ( lStringPixelType == "COMPLEX")
- {
- if ( lStringComponentType == "SHORT" )
+ else if (lStringPixelType == "COMPLEX")
{
+ if (lStringComponentType == "SHORT")
+ {
- m_NbOctetPixel=4;
+ m_NbOctetPixel = 4;
m_TypeRAD = "CI2";
- lExtension=".ci2";
- }
- else if ( lStringComponentType == "FLOAT")
- {
- m_NbOctetPixel=8;
+ lExtension = ".ci2";
+ }
+ else if (lStringComponentType == "FLOAT")
+ {
+ m_NbOctetPixel = 8;
m_TypeRAD = "CR4";
- lExtension=".cr4";
- }
- if ( lStringComponentType == "CHAR")
- {
- m_NbOctetPixel=2;
+ lExtension = ".cr4";
+ }
+ if (lStringComponentType == "CHAR")
+ {
+ m_NbOctetPixel = 2;
m_TypeRAD = "COCT";
- lExtension=".coct";
- }
+ lExtension = ".coct";
+ }
/* if( this->GetComponentType()=="FLOAT")
{
m_NbOctetPixel=2;
@@ -700,92 +690,89 @@ void RADImageIO::WriteImageInformation()
m_TypeRAD = "C7B"
}
*/
- else if ( lStringComponentType == "INT")
- {
- m_NbOctetPixel=8;
+ else if (lStringComponentType == "INT")
+ {
+ m_NbOctetPixel = 8;
m_TypeRAD = "CI4";
- lExtension=".ci4";
- }
- else if ( lStringComponentType == "DOUBLE")
- {
- m_NbOctetPixel=16;
+ lExtension = ".ci4";
+ }
+ else if (lStringComponentType == "DOUBLE")
+ {
+ m_NbOctetPixel = 16;
m_TypeRAD = "CR8";
- lExtension=".cr8";
+ lExtension = ".cr8";
+ }
}
- }
m_HeaderFile << m_TypeRAD << std::endl;
//Write "SENSCODAGE" informations
m_HeaderFile << "SENSCODAGE "; // << std::endl;
- if ( m_ByteOrder == LittleEndian )
- {
+ if (m_ByteOrder == LittleEndian)
+ {
m_HeaderFile << "INTEL" << std::endl;
- }
+ }
else
- {
+ {
m_HeaderFile << "IEEE" << std::endl;
- }
+ }
//Define channels file name
- std::string lRootName = System::GetRootName( m_FileName );
+ std::string lRootName = System::GetRootName(m_FileName);
m_ChannelsFileName.clear();
- for (unsigned int i=0; i<m_NbOfChannels; ++i)
- {
+ for (unsigned int i = 0; i < m_NbOfChannels; ++i)
+ {
::itk::OStringStream lStream;
- lStream << lRootName <<"_"<< i+1 << lExtension;
+ lStream << lRootName << "_" << i + 1 << lExtension;
m_ChannelsFileName.push_back(lStream.str());
- }
+ }
- for (unsigned int i=0;i<m_NbOfChannels;++i)
- {
+ for (unsigned int i = 0; i < m_NbOfChannels; ++i)
+ {
m_HeaderFile << System::GetShortFileName(this->m_ChannelsFileName[i].c_str()) << std::endl;
- }
+ }
m_HeaderFile.close();
-
//Allocate buffer of stream file
m_ChannelsFile = new std::fstream[m_NbOfChannels];
//Try to open channels file
- for (unsigned int channels = 0; channels<m_ChannelsFileName.size(); ++channels)
- {
- m_ChannelsFile[channels].open( m_ChannelsFileName[channels].c_str(), std::ios::out | std::ios::trunc | std::ios::binary );
- if ( m_ChannelsFile[channels].fail() )
+ for (unsigned int channels = 0; channels < m_ChannelsFileName.size(); ++channels)
{
- itkExceptionMacro(<< "RAD : impossible to find the file <"<<m_ChannelsFileName[channels]<<">.");
+ m_ChannelsFile[channels].open(
+ m_ChannelsFileName[channels].c_str(), std::ios::out | std::ios::trunc | std::ios::binary);
+ if (m_ChannelsFile[channels].fail())
+ {
+ itkExceptionMacro(<< "RAD : impossible to find the file <" << m_ChannelsFileName[channels] << ">.");
+ }
}
- }
this->SetFileTypeToBinary();
this->SetNumberOfDimensions(2);
- this->SetNumberOfComponents(2*m_NbOfChannels);
+ this->SetNumberOfComponents(2 * m_NbOfChannels);
unsigned long numberOfBytesPerLines = m_NbOctetPixel * m_Dimensions[0];
- char* value = new char[numberOfBytesPerLines];
+ char* value = new char[numberOfBytesPerLines];
- for (unsigned int channels = 0; channels<m_ChannelsFileName.size(); ++channels)
- {
- m_ChannelsFile[channels].seekp(0, std::ios::beg );
- //Write Header line and all file (whitout information)
- for (unsigned int numLigne=0; numLigne<(m_Dimensions[1]); numLigne++)
+ for (unsigned int channels = 0; channels < m_ChannelsFileName.size(); ++channels)
{
- m_ChannelsFile[channels].write(value,numberOfBytesPerLines);
+ m_ChannelsFile[channels].seekp(0, std::ios::beg);
+ //Write Header line and all file (whitout information)
+ for (unsigned int numLigne = 0; numLigne < (m_Dimensions[1]); numLigne++)
+ {
+ m_ChannelsFile[channels].write(value, numberOfBytesPerLines);
+ }
}
- }
- delete [] value;
+ delete[] value;
- otbMsgDebugMacro( <<"Driver to write: RAD");
- otbMsgDebugMacro( <<" Write file : "<< m_FileName);
- otbMsgDebugMacro( <<" Size : "<<m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDebugMacro( <<" Type Rad : "<<m_TypeRAD);
- otbMsgDebugMacro( <<" ComponentType : "<<this->GetComponentType() );
- otbMsgDebugMacro( <<" NumberOfComponents : "<<this->GetNumberOfComponents());
- otbMsgDebugMacro( <<" ComponentSize : "<<this->GetComponentSize());
- otbMsgDebugMacro( <<" GetPixelSize : "<<this->GetPixelSize());
+ otbMsgDebugMacro(<< "Driver to write: RAD");
+ otbMsgDebugMacro(<< " Write file : " << m_FileName);
+ otbMsgDebugMacro(<< " Size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDebugMacro(<< " Type Rad : " << m_TypeRAD);
+ otbMsgDebugMacro(<< " ComponentType : " << this->GetComponentType());
+ otbMsgDebugMacro(<< " NumberOfComponents : " << this->GetNumberOfComponents());
+ otbMsgDebugMacro(<< " ComponentSize : " << this->GetComponentSize());
+ otbMsgDebugMacro(<< " GetPixelSize : " << this->GetPixelSize());
}
-
} // end namespace otb
-
-
diff --git a/Code/IO/otbRADImageIO.h b/Code/IO/otbRADImageIO.h
index ab24d15aaf..45120347f1 100644
--- a/Code/IO/otbRADImageIO.h
+++ b/Code/IO/otbRADImageIO.h
@@ -23,7 +23,6 @@
#include <string>
#include <vector>
-
namespace otb
{
@@ -41,12 +40,12 @@ class ITK_EXPORT RADImageIO : public itk::ImageIOBase
public:
/** Standard class typedefs. */
- typedef RADImageIO Self;
- typedef itk::ImageIOBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef RADImageIO Self;
+ typedef itk::ImageIOBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
/** Byte order typedef */
- typedef Superclass::ByteOrder ByteOrder;
+ typedef Superclass::ByteOrder ByteOrder;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -64,7 +63,7 @@ public:
virtual bool CanStreamRead()
{
return true;
- };
+ }
/** Set the spacing and dimention information for the set filename. */
virtual void ReadImageInformation();
@@ -85,7 +84,7 @@ public:
virtual bool CanStreamWrite()
{
return true;
- };
+ }
/** Writes the spacing and dimentions of the image.
* Assumes SetFileName has been called with a valid file name. */
@@ -115,50 +114,48 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- RADImageIO(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ RADImageIO(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Internal method to read header informations */
- bool InternalReadHeaderInformation(const std::string & file_name, std::fstream & file, const bool reportError);
-
+ bool InternalReadHeaderInformation(const std::string& file_name, std::fstream& file, const bool reportError);
#define otbSwappFileOrderToSystemOrderMacro(StrongType, buffer, buffer_size) \
{ \
- typedef itk::ByteSwapper< StrongType > InternalByteSwapperType; \
- if ( m_ByteOrder != m_FileByteOrder ) \
+ typedef itk::ByteSwapper<StrongType> InternalByteSwapperType; \
+ if (m_ByteOrder != m_FileByteOrder) \
+ { \
+ if (m_ByteOrder == LittleEndian) \
{ \
- if ( m_ByteOrder == LittleEndian ) \
- { \
- InternalByteSwapperType::SwapRangeFromSystemToBigEndian( (StrongType *)buffer, buffer_size ); \
- } \
- else if ( m_ByteOrder == BigEndian ) \
- { \
- InternalByteSwapperType::SwapRangeFromSystemToLittleEndian((StrongType *)buffer, buffer_size ); \
- } \
+ InternalByteSwapperType::SwapRangeFromSystemToBigEndian((StrongType *) buffer, buffer_size); \
} \
+ else if (m_ByteOrder == BigEndian) \
+ { \
+ InternalByteSwapperType::SwapRangeFromSystemToLittleEndian((StrongType *) buffer, buffer_size); \
+ } \
+ } \
}
#define otbSwappFileToSystemMacro(StrongType, WeakType, buffer, buffer_size) \
- else if ( this->GetComponentType() == WeakType ) \
+ else if (this->GetComponentType() == WeakType) \
{ \
- otbSwappFileOrderToSystemOrderMacro( StrongType, buffer, buffer_size )\
+ otbSwappFileOrderToSystemOrderMacro(StrongType, buffer, buffer_size) \
}
#define otbSetTypeRADMacro(WeakType, CAI_VALUE) \
- else if ( this->GetComponentType() == WeakType ) \
+ else if (this->GetComponentType() == WeakType) \
{ \
- m_TypeRAD = CAI_VALUE; \
+ m_TypeRAD = CAI_VALUE; \
}
-
- bool m_FlagWriteImageInformation;
+ bool m_FlagWriteImageInformation;
itk::ImageIOBase::ByteOrder m_FileByteOrder;
- std::fstream m_HeaderFile;
- std::string m_TypeRAD;
- std::vector< std::string > m_ChannelsFileName;
- std::fstream * m_ChannelsFile;
- unsigned int m_NbOfChannels;
- int m_NbOctetPixel;
+ std::fstream m_HeaderFile;
+ std::string m_TypeRAD;
+ std::vector<std::string> m_ChannelsFileName;
+ std::fstream * m_ChannelsFile;
+ unsigned int m_NbOfChannels;
+ int m_NbOctetPixel;
};
diff --git a/Code/IO/otbRADImageIOFactory.cxx b/Code/IO/otbRADImageIOFactory.cxx
index 60fa672fe3..95ba68d32c 100644
--- a/Code/IO/otbRADImageIOFactory.cxx
+++ b/Code/IO/otbRADImageIOFactory.cxx
@@ -21,7 +21,6 @@
#include "otbRADImageIO.h"
#include "itkVersion.h"
-
namespace otb
{
@@ -51,4 +50,3 @@ RADImageIOFactory::GetDescription() const
}
} // end namespace otb
-
diff --git a/Code/IO/otbRADImageIOFactory.h b/Code/IO/otbRADImageIOFactory.h
index bc8a029c7e..974f35f649 100644
--- a/Code/IO/otbRADImageIOFactory.h
+++ b/Code/IO/otbRADImageIOFactory.h
@@ -30,10 +30,10 @@ class ITK_EXPORT RADImageIOFactory : public itk::ObjectFactoryBase
{
public:
/** Standard class typedefs. */
- typedef RADImageIOFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef RADImageIOFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -57,12 +57,11 @@ protected:
virtual ~RADImageIOFactory();
private:
- RADImageIOFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ RADImageIOFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbSpatialObjectDXFReader.h b/Code/IO/otbSpatialObjectDXFReader.h
index 2e31718661..6ffb4a054a 100644
--- a/Code/IO/otbSpatialObjectDXFReader.h
+++ b/Code/IO/otbSpatialObjectDXFReader.h
@@ -33,13 +33,13 @@ namespace otb
*/
template <class TSpatialObject>
class ITK_EXPORT SpatialObjectDXFReader
- : public SpatialObjectSource< TSpatialObject >
+ : public SpatialObjectSource<TSpatialObject>
{
public:
- typedef SpatialObjectDXFReader Self;
+ typedef SpatialObjectDXFReader Self;
typedef SpatialObjectSource<TSpatialObject> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
@@ -48,7 +48,7 @@ public:
itkTypeMacro(SpatialObjectDXFReader, SpatialObjectSource);
/** Superclass Typedefs */
- typedef TSpatialObject GroupSpatialObjectType;
+ typedef TSpatialObject GroupSpatialObjectType;
typedef typename GroupSpatialObjectType::Pointer GroupSpatialObjectPointerType;
/** Set the filename */
@@ -75,8 +75,8 @@ protected:
virtual void GenerateData();
private:
- SpatialObjectDXFReader(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SpatialObjectDXFReader(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Test whether the given filename exist and it is readable,
this is intended to be called before attempting to use
@@ -86,7 +86,7 @@ private:
void TestFileExistanceAndReadability();
std::string m_FileName;
- std::string m_LayerName;
+ std::string m_LayerName;
};
} // end namespace otb
diff --git a/Code/IO/otbSpatialObjectDXFReader.txx b/Code/IO/otbSpatialObjectDXFReader.txx
index c3ff8c8c0b..df92b4891c 100644
--- a/Code/IO/otbSpatialObjectDXFReader.txx
+++ b/Code/IO/otbSpatialObjectDXFReader.txx
@@ -37,7 +37,7 @@ SpatialObjectDXFReader<TSpatialObject>
::SpatialObjectDXFReader()
{
m_FileName = "";
- m_LayerName="";
+ m_LayerName = "";
// this->itk::ProcessObject::ReleaseDataBeforeUpdateFlagOff();
this->GetOutput()->ReleaseData();
this->ResetPipeline();
@@ -69,38 +69,38 @@ SpatialObjectDXFReader<TSpatialObject>
::TestFileExistanceAndReadability()
{
// Test if the file exists.
- if ( ! itksys::SystemTools::FileExists( this->m_FileName.c_str() ) )
- {
+ if (!itksys::SystemTools::FileExists(this->m_FileName.c_str()))
+ {
itk::ImageFileReaderException e(__FILE__, __LINE__);
itk::OStringStream msg;
- msg <<"The file doesn't exist. "
- << std::endl << "Filename = " << this->m_FileName
- << std::endl;
+ msg << "The file doesn't exist. "
+ << std::endl << "Filename = " << this->m_FileName
+ << std::endl;
e.SetDescription(msg.str().c_str());
throw e;
return;
- }
+ }
// Test if the file can be open for reading access.
//Only if m_FileName speciy a filname (not a dirname)
- if ( System::IsAFileName( this->m_FileName ) == true )
- {
- std::ifstream readTester;
- readTester.open( this->m_FileName.c_str() );
- if ( readTester.fail() )
+ if (System::IsAFileName(this->m_FileName) == true)
{
+ std::ifstream readTester;
+ readTester.open(this->m_FileName.c_str());
+ if (readTester.fail())
+ {
readTester.close();
itk::OStringStream msg;
- msg <<"The file couldn't be opened for reading. "
- << std::endl << "Filename: " << this->m_FileName
- << std::endl;
- itk::ImageFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ msg << "The file couldn't be opened for reading. "
+ << std::endl << "Filename: " << this->m_FileName
+ << std::endl;
+ itk::ImageFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
return;
- }
+ }
readTester.close();
- }
+ }
}
/**
@@ -114,15 +114,15 @@ SpatialObjectDXFReader<TSpatialObject>
TestFileExistanceAndReadability();
typedef otb::DXFToSpatialObjectGroupFilter<TSpatialObject> CreationFilter;
typename CreationFilter::Pointer creationClass = CreationFilter::New();
- if (m_LayerName.size()>0)
- {
+ if (m_LayerName.size() > 0)
+ {
creationClass->SetLayer(m_LayerName.c_str());
- }
+ }
DL_Dxf dxf;
dxf.in(m_FileName, creationClass);
GroupSpatialObjectType * group = creationClass->GetOutput();
group->Update();
- this->SetNthOutput(0,group);
+ this->SetNthOutput(0, group);
}
template <class TSpatialObject>
diff --git a/Code/IO/otbSpotImageMetadataInterface.cxx b/Code/IO/otbSpotImageMetadataInterface.cxx
index 3b9977fe6a..7364e87468 100644
--- a/Code/IO/otbSpotImageMetadataInterface.cxx
+++ b/Code/IO/otbSpotImageMetadataInterface.cxx
@@ -16,7 +16,6 @@
=========================================================================*/
-
#ifdef _MSC_VER
#pragma warning ( disable : 4786 )
#endif
@@ -29,147 +28,140 @@
#include "otbSpotImageMetadataInterface.h"
#include "itkMetaDataObject.h"
-
namespace otb
{
-
SpotImageMetadataInterface
::SpotImageMetadataInterface()
{
}
bool
-SpotImageMetadataInterface::CanRead( const MetaDataDictionaryType & dict ) const
+SpotImageMetadataInterface::CanRead(const MetaDataDictionaryType& dict) const
{
std::string sensorID = GetSensorID(dict);
- if (sensorID.find("Spot") != std::string::npos)
- return true;
- else
- return false;
+ if (sensorID.find("Spot") != std::string::npos) return true;
+ else return false;
}
-
+
std::string
-SpotImageMetadataInterface::GetInstrument( const MetaDataDictionaryType & dict ) const
+SpotImageMetadataInterface::GetInstrument(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
-
- ossimKeywordlist kwl;
- imageKeywordlist.convertToOSSIMKeywordlist(kwl);
+ }
- std::string key = "support_data.instrument";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimKeywordlist kwl;
+ imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- return keywordString;
+ std::string key = "support_data.instrument";
+ ossimString keywordString = kwl.find(key.c_str());
+
+ return keywordString;
}
unsigned int
-SpotImageMetadataInterface::GetInstrumentIndex( const MetaDataDictionaryType & dict ) const
+SpotImageMetadataInterface::GetInstrumentIndex(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
-
- ossimKeywordlist kwl;
- imageKeywordlist.convertToOSSIMKeywordlist(kwl);
+ }
- std::string key = "support_data.instrument_index";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimKeywordlist kwl;
+ imageKeywordlist.convertToOSSIMKeywordlist(kwl);
+
+ std::string key = "support_data.instrument_index";
+ ossimString keywordString = kwl.find(key.c_str());
- return static_cast<unsigned int>(keywordString.toUInt32());
+ return static_cast<unsigned int>(keywordString.toUInt32());
}
-
SpotImageMetadataInterface::VariableLengthVectorType
-SpotImageMetadataInterface::GetSolarIrradiance( const MetaDataDictionaryType & dict ) const
+SpotImageMetadataInterface::GetSolarIrradiance(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
-
- VariableLengthVectorType outputValuesVariableLengthVector;
- ossimKeywordlist kwl;
- imageKeywordlist.convertToOSSIMKeywordlist(kwl);
-
- std::string key= "support_data.solar_irradiance";
- ossimString keywordString = kwl.find(key.c_str());
- ossimString separatorList = " ";
- std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- std::vector<double> outputValues;
- for (unsigned int i=0; i < keywordStrings.size(); ++i)
- {
- if (!keywordStrings[i].empty())
- {
- outputValues.push_back(keywordStrings[i].toDouble());
- }
- }
-
-
- outputValuesVariableLengthVector.SetSize(outputValues.size());
- outputValuesVariableLengthVector.Fill(0);
- //In the case of SPOT, the bands are in a different order:
- // XS3, XS2. XS1, SWIR in the tif file.
- if( outputValues.size() == 1 )
- {
- //this is a PAN image
- outputValuesVariableLengthVector[0]=outputValues[0];
- }
- else if ( outputValues.size() == 4 )
- {
- outputValuesVariableLengthVector[0]=outputValues[2];
- outputValuesVariableLengthVector[1]=outputValues[1];
- outputValuesVariableLengthVector[2]=outputValues[0];
- outputValuesVariableLengthVector[3]=outputValues[3];
- }
+ }
+
+ VariableLengthVectorType outputValuesVariableLengthVector;
+ ossimKeywordlist kwl;
+ imageKeywordlist.convertToOSSIMKeywordlist(kwl);
+
+ std::string key = "support_data.solar_irradiance";
+ ossimString keywordString = kwl.find(key.c_str());
+ ossimString separatorList = " ";
+ std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
+ std::vector<double> outputValues;
+ for (unsigned int i = 0; i < keywordStrings.size(); ++i)
+ {
+ if (!keywordStrings[i].empty())
+ {
+ outputValues.push_back(keywordStrings[i].toDouble());
+ }
+ }
+
+ outputValuesVariableLengthVector.SetSize(outputValues.size());
+ outputValuesVariableLengthVector.Fill(0);
+ //In the case of SPOT, the bands are in a different order:
+ // XS3, XS2. XS1, SWIR in the tif file.
+ if (outputValues.size() == 1)
+ {
+ //this is a PAN image
+ outputValuesVariableLengthVector[0] = outputValues[0];
+ }
+ else if (outputValues.size() == 4)
+ {
+ outputValuesVariableLengthVector[0] = outputValues[2];
+ outputValuesVariableLengthVector[1] = outputValues[1];
+ outputValuesVariableLengthVector[2] = outputValues[0];
+ outputValuesVariableLengthVector[3] = outputValues[3];
+ }
else
- {
- itkExceptionMacro("Invalid Physical Gain");
- }
-
+ {
+ itkExceptionMacro("Invalid Physical Gain");
+ }
+
return outputValuesVariableLengthVector;
}
-
int
-SpotImageMetadataInterface::GetDay( const MetaDataDictionaryType & dict ) const
+SpotImageMetadataInterface::GetDay(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -178,33 +170,31 @@ SpotImageMetadataInterface::GetDay( const MetaDataDictionaryType & dict ) const
ossimString separatorList;
key = "support_data.image_date";
separatorList = "-T";
-
- ossimString keywordString = kwl.find(key.c_str());
+
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
-
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Day");
-
- ossimString day = keywordStrings[2];
-
- return day.toInt();
- }
-
-
+
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Day");
+
+ ossimString day = keywordStrings[2];
+
+ return day.toInt();
+}
+
int
-SpotImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict ) const
+SpotImageMetadataInterface::GetMonth(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -213,34 +203,31 @@ SpotImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict ) cons
ossimString separatorList;
key = "support_data.image_date";
separatorList = "-T";
-
-
- ossimString keywordString = kwl.find(key.c_str());
+
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Month");
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Month");
ossimString month = keywordStrings[1];
-
+
return month.toInt();
}
-
int
-SpotImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) const
+SpotImageMetadataInterface::GetYear(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -249,11 +236,10 @@ SpotImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) const
key = "support_data.image_date";
separatorList = "-T";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 2 )
- itkExceptionMacro("Invalid Year");
+ if (keywordStrings.size() <= 2) itkExceptionMacro("Invalid Year");
ossimString year = keywordStrings[0];
@@ -261,19 +247,19 @@ SpotImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) const
}
int
-SpotImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) const
+SpotImageMetadataInterface::GetHour(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Spot Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -283,11 +269,10 @@ SpotImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) const
key = "support_data.image_date";
separatorList = "-T:";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 2 )
- itkExceptionMacro("Invalid Hour");
+ if (keywordStrings.size() <= 2) itkExceptionMacro("Invalid Hour");
ossimString hour = keywordStrings[3];
@@ -295,19 +280,19 @@ SpotImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) const
}
int
-SpotImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict ) const
+SpotImageMetadataInterface::GetMinute(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Spot Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -317,10 +302,9 @@ SpotImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict ) con
key = "support_data.image_date";
separatorList = "-T:";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 2 )
- itkExceptionMacro("Invalid Minute");
+ if (keywordStrings.size() <= 2) itkExceptionMacro("Invalid Minute");
ossimString minute = keywordStrings[4];
@@ -328,19 +312,19 @@ SpotImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict ) con
}
int
-SpotImageMetadataInterface::GetProductionDay( const MetaDataDictionaryType & dict ) const
+SpotImageMetadataInterface::GetProductionDay(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Spot Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -350,11 +334,10 @@ SpotImageMetadataInterface::GetProductionDay( const MetaDataDictionaryType & dic
key = "support_data.production_date";
separatorList = "-T:";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Day");
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Day");
ossimString day = keywordStrings[2];
@@ -362,19 +345,19 @@ SpotImageMetadataInterface::GetProductionDay( const MetaDataDictionaryType & dic
}
int
-SpotImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryType & dict ) const
+SpotImageMetadataInterface::GetProductionMonth(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Spot Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -384,32 +367,30 @@ SpotImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryType & d
key = "support_data.production_date";
separatorList = "-T";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Month");
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Month");
ossimString month = keywordStrings[1];
return month.toInt();
}
-
int
-SpotImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType & dict ) const
+SpotImageMetadataInterface::GetProductionYear(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Spot Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -419,11 +400,10 @@ SpotImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType & di
key = "support_data.production_date";
separatorList = "-T";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 2 )
- itkExceptionMacro("Invalid Year");
+ if (keywordStrings.size() <= 2) itkExceptionMacro("Invalid Year");
ossimString year = keywordStrings[0];
@@ -432,34 +412,34 @@ SpotImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType & di
SpotImageMetadataInterface::VariableLengthVectorType
SpotImageMetadataInterface
-::GetPhysicalBias( const MetaDataDictionaryType & dict ) const
+::GetPhysicalBias(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
-
+ }
+
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.physical_bias";
- ossimString keywordString = kwl.find(key.c_str());
- ossimString separatorList = " ";
+ std::string key = "support_data.physical_bias";
+ ossimString keywordString = kwl.find(key.c_str());
+ ossimString separatorList = " ";
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- std::vector<double> outputValues;
- for (unsigned int i=0; i < keywordStrings.size(); ++i)
- {
- if (!keywordStrings[i].empty())
+ std::vector<double> outputValues;
+ for (unsigned int i = 0; i < keywordStrings.size(); ++i)
{
+ if (!keywordStrings[i].empty())
+ {
outputValues.push_back(keywordStrings[i].toDouble());
+ }
}
- }
VariableLengthVectorType outputValuesVariableLengthVector;
outputValuesVariableLengthVector.SetSize(outputValues.size());
@@ -467,57 +447,56 @@ SpotImageMetadataInterface
//In the case of SPOT, the bands are in a different order:
// XS3, XS2. XS1, SWIR in the tif file.
- if( outputValues.size() == 1 )
- {
- //this is a PAN image
- outputValuesVariableLengthVector[0]=outputValues[0];
- }
- else if ( outputValues.size() == 4 )
- {
- outputValuesVariableLengthVector[0]=outputValues[2];
- outputValuesVariableLengthVector[1]=outputValues[1];
- outputValuesVariableLengthVector[2]=outputValues[0];
- outputValuesVariableLengthVector[3]=outputValues[3];
- }
+ if (outputValues.size() == 1)
+ {
+ //this is a PAN image
+ outputValuesVariableLengthVector[0] = outputValues[0];
+ }
+ else if (outputValues.size() == 4)
+ {
+ outputValuesVariableLengthVector[0] = outputValues[2];
+ outputValuesVariableLengthVector[1] = outputValues[1];
+ outputValuesVariableLengthVector[2] = outputValues[0];
+ outputValuesVariableLengthVector[3] = outputValues[3];
+ }
else
- {
- itkExceptionMacro("Invalid Physical Gain");
- }
+ {
+ itkExceptionMacro("Invalid Physical Gain");
+ }
return outputValuesVariableLengthVector;
}
-
SpotImageMetadataInterface::VariableLengthVectorType
SpotImageMetadataInterface
-::GetPhysicalGain( const MetaDataDictionaryType & dict ) const
+::GetPhysicalGain(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Ikonos Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Ikonos Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.physical_gain";
- ossimString keywordString = kwl.find(key.c_str());
- ossimString separatorList = " ";
+ std::string key = "support_data.physical_gain";
+ ossimString keywordString = kwl.find(key.c_str());
+ ossimString separatorList = " ";
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- std::vector<double> outputValues;
- for (unsigned int i=0; i < keywordStrings.size(); ++i)
- {
- if (!keywordStrings[i].empty())
+ std::vector<double> outputValues;
+ for (unsigned int i = 0; i < keywordStrings.size(); ++i)
{
+ if (!keywordStrings[i].empty())
+ {
outputValues.push_back(keywordStrings[i].toDouble());
+ }
}
- }
VariableLengthVectorType outputValuesVariableLengthVector;
outputValuesVariableLengthVector.SetSize(outputValues.size());
@@ -525,182 +504,171 @@ SpotImageMetadataInterface
//In the case of SPOT, the bands are in a different order:
// XS3, XS2. XS1, SWIR in the tif file.
- if( outputValues.size() == 1 )
- {
- //this is a PAN image
- outputValuesVariableLengthVector[0]=outputValues[0];
- }
- else if ( outputValues.size() == 4 )
- {
- outputValuesVariableLengthVector[0]=outputValues[2];
- outputValuesVariableLengthVector[1]=outputValues[1];
- outputValuesVariableLengthVector[2]=outputValues[0];
- outputValuesVariableLengthVector[3]=outputValues[3];
- }
+ if (outputValues.size() == 1)
+ {
+ //this is a PAN image
+ outputValuesVariableLengthVector[0] = outputValues[0];
+ }
+ else if (outputValues.size() == 4)
+ {
+ outputValuesVariableLengthVector[0] = outputValues[2];
+ outputValuesVariableLengthVector[1] = outputValues[1];
+ outputValuesVariableLengthVector[2] = outputValues[0];
+ outputValuesVariableLengthVector[3] = outputValues[3];
+ }
else
- {
- itkExceptionMacro("Invalid Physical Gain");
- }
+ {
+ itkExceptionMacro("Invalid Physical Gain");
+ }
return outputValuesVariableLengthVector;
}
double
-SpotImageMetadataInterface::GetSatElevation( const MetaDataDictionaryType & dict ) const
+SpotImageMetadataInterface::GetSatElevation(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Spot Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.incident_angle";
+ std::string key = "support_data.incident_angle";
ossimString keywordString = kwl.find(key.c_str());
- return ( 90.-keywordString.toDouble() );
+ return (90. - keywordString.toDouble());
}
double
-SpotImageMetadataInterface::GetSatAzimuth( const MetaDataDictionaryType & dict ) const
+SpotImageMetadataInterface::GetSatAzimuth(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Spot Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.step_count";
+ std::string key = "support_data.step_count";
ossimString keywordString = kwl.find(key.c_str());
- int step = keywordString.toInt();
-
- key= "support_data.scene_orientation";
+ int step = keywordString.toInt();
+
+ key = "support_data.scene_orientation";
keywordString = kwl.find(key.c_str());
double satAz = keywordString.toDouble();
-
- if( (step-48)<0 )
- {
- satAz += 90.;
- }
- else
- satAz = satAz - 90.;
+
+ if ((step - 48) < 0)
+ {
+ satAz += 90.;
+ }
+ else satAz = satAz - 90.;
return satAz;
}
SpotImageMetadataInterface::VariableLengthVectorType
SpotImageMetadataInterface
-::GetFirstWavelengths( const MetaDataDictionaryType & dict ) const
+::GetFirstWavelengths(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Spot Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
-
+ }
+
VariableLengthVectorType wavel(1);
wavel.Fill(0.);
-
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.number_bands";
- int nbBands = ossimString(kwl.find(key.c_str())).toInt();
+ std::string key = "support_data.number_bands";
+ int nbBands = ossimString(kwl.find(key.c_str())).toInt();
std::string sensorId = this->GetSensorID(dict);
// Panchromatic case
- if(nbBands==1)
- {
+ if (nbBands == 1)
+ {
wavel.SetSize(1);
- if(sensorId == "SPOT4")
- wavel.Fill(0.610);
- else if(sensorId == "SPOT5")
- wavel.Fill(0.480);
- else
- itkExceptionMacro(<<"Invalid Spot Sensor ID");
- }
- else if(nbBands>1 && nbBands<5)
- {
- wavel.SetSize(4);
- wavel[0] = 0.500;
- wavel[1] = 0.610;
- wavel[2] = 0.780;
- wavel[3] = 1.580;
- }
- else
- itkExceptionMacro(<<"Invalid number of bands...");
+ if (sensorId == "SPOT4") wavel.Fill(0.610);
+ else if (sensorId == "SPOT5") wavel.Fill(0.480);
+ else itkExceptionMacro(<< "Invalid Spot Sensor ID");
+ }
+ else if (nbBands > 1 && nbBands < 5)
+ {
+ wavel.SetSize(4);
+ wavel[0] = 0.500;
+ wavel[1] = 0.610;
+ wavel[2] = 0.780;
+ wavel[3] = 1.580;
+ }
+ else itkExceptionMacro(<< "Invalid number of bands...");
return wavel;
}
-
SpotImageMetadataInterface::VariableLengthVectorType
SpotImageMetadataInterface
-::GetLastWavelengths( const MetaDataDictionaryType & dict ) const
+::GetLastWavelengths(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no Spot Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no Spot Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
-
+ }
+
VariableLengthVectorType wavel(1);
wavel.Fill(0.);
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "support_data.number_bands";
- int nbBands = ossimString(kwl.find(key.c_str())).toInt();
+ std::string key = "support_data.number_bands";
+ int nbBands = ossimString(kwl.find(key.c_str())).toInt();
std::string sensorId = this->GetSensorID(dict);
// Panchromatic case
- if(nbBands==1)
- {
+ if (nbBands == 1)
+ {
wavel.SetSize(1);
- if(sensorId == "SPOT4")
- wavel.Fill(0.680);
- else if(sensorId == "SPOT5")
- wavel.Fill(0.710);
- else
- itkExceptionMacro(<<"Invalid Spot Sensor ID");
- }
- else if(nbBands>1 && nbBands<5)
- {
- wavel.SetSize(4);
- wavel[0] = 0.590;
- wavel[1] = 0.680;
- wavel[2] = 0.890;
- wavel[3] = 1.750;
- }
- else
- itkExceptionMacro(<<"Invalid number of bands...");
+ if (sensorId == "SPOT4") wavel.Fill(0.680);
+ else if (sensorId == "SPOT5") wavel.Fill(0.710);
+ else itkExceptionMacro(<< "Invalid Spot Sensor ID");
+ }
+ else if (nbBands > 1 && nbBands < 5)
+ {
+ wavel.SetSize(4);
+ wavel[0] = 0.590;
+ wavel[1] = 0.680;
+ wavel[2] = 0.890;
+ wavel[3] = 1.750;
+ }
+ else itkExceptionMacro(<< "Invalid number of bands...");
return wavel;
}
diff --git a/Code/IO/otbSpotImageMetadataInterface.h b/Code/IO/otbSpotImageMetadataInterface.h
index 2c523d265a..134896dec1 100644
--- a/Code/IO/otbSpotImageMetadataInterface.h
+++ b/Code/IO/otbSpotImageMetadataInterface.h
@@ -24,7 +24,6 @@
#include "otbImageMetadataInterfaceBase.h"
-
namespace otb
{
/** \class SpotImageMetadataInterface
@@ -36,10 +35,10 @@ class ITK_EXPORT SpotImageMetadataInterface : public ImageMetadataInterfaceBase
{
public:
- typedef SpotImageMetadataInterface Self;
- typedef ImageMetadataInterfaceBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SpotImageMetadataInterface Self;
+ typedef ImageMetadataInterfaceBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -53,70 +52,67 @@ public:
typedef Superclass::VariableLengthVectorType VariableLengthVectorType;
typedef Superclass::ImageKeywordlistType ImageKeywordlistType;
-
/** Get the radiometric bias from the ossim metadata */
- VariableLengthVectorType GetPhysicalBias( const MetaDataDictionaryType & dict ) const;
-
+ VariableLengthVectorType GetPhysicalBias(const MetaDataDictionaryType& dict) const;
+
/** Get the radiometric gain from the ossim metadata */
- VariableLengthVectorType GetPhysicalGain( const MetaDataDictionaryType & dict ) const;
-
+ VariableLengthVectorType GetPhysicalGain(const MetaDataDictionaryType& dict) const;
+
/** Get the solar irradiance from the ossim metadata */
- VariableLengthVectorType GetSolarIrradiance( const MetaDataDictionaryType & dict ) const;
-
+ VariableLengthVectorType GetSolarIrradiance(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging acquisition day from the ossim metadata : IMAGING_DATE metadata variable */
- int GetDay( const MetaDataDictionaryType & dict ) const;
-
+ int GetDay(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging acquisition month from the ossim metadata : IMAGING_DATE metadata variable */
- int GetMonth( const MetaDataDictionaryType & dict ) const;
-
+ int GetMonth(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
- int GetYear( const MetaDataDictionaryType & dict ) const;
-
+ int GetYear(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging acquisition hour from the ossim metadata : IMAGING_DATE metadata variable */
- int GetHour( const MetaDataDictionaryType & dict ) const;
-
+ int GetHour(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging acquisition year from the ossim metadata : IMAGING_DATE metadata variable */
- int GetMinute( const MetaDataDictionaryType & dict ) const;
+ int GetMinute(const MetaDataDictionaryType& dict) const;
+
+ /** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
+ int GetProductionDay(const MetaDataDictionaryType& dict) const;
- /** Get the imaging production day from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionDay( const MetaDataDictionaryType & dict ) const;
-
/** Get the imaging production month from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionMonth( const MetaDataDictionaryType & dict ) const;
-
+ int GetProductionMonth(const MetaDataDictionaryType& dict) const;
+
/** Get the imaging production year from the ossim metadata : DATASET_PRODUCTION_DATE metadata variable */
- int GetProductionYear( const MetaDataDictionaryType & dict ) const;
+ int GetProductionYear(const MetaDataDictionaryType& dict) const;
/** Get the sat elevation from the ossim metadata */
- double GetSatElevation( const MetaDataDictionaryType & dict ) const;
-
+ double GetSatElevation(const MetaDataDictionaryType& dict) const;
+
/** Get the sat azimuth from the ossim metadata */
- double GetSatAzimuth( const MetaDataDictionaryType & dict ) const;
-
+ double GetSatAzimuth(const MetaDataDictionaryType& dict) const;
+
/** Get the first wavelength for the spectral band definition */
- VariableLengthVectorType GetFirstWavelengths( const MetaDataDictionaryType & dict ) const;
-
+ VariableLengthVectorType GetFirstWavelengths(const MetaDataDictionaryType& dict) const;
+
/** Get the last wavelength for the spectral band definition */
- VariableLengthVectorType GetLastWavelengths( const MetaDataDictionaryType & dict ) const;
+ VariableLengthVectorType GetLastWavelengths(const MetaDataDictionaryType& dict) const;
/** Get Instrument */
- std::string GetInstrument( const MetaDataDictionaryType & dict ) const;
+ std::string GetInstrument(const MetaDataDictionaryType& dict) const;
/** Get Instrument Index */
- unsigned int GetInstrumentIndex( const MetaDataDictionaryType & dict ) const;
+ unsigned int GetInstrumentIndex(const MetaDataDictionaryType& dict) const;
- bool CanRead( const MetaDataDictionaryType & dict) const;
+ bool CanRead(const MetaDataDictionaryType& dict) const;
-
protected:
SpotImageMetadataInterface();
- virtual ~SpotImageMetadataInterface() {};
+ virtual ~SpotImageMetadataInterface() {}
-
private:
- SpotImageMetadataInterface(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SpotImageMetadataInterface(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/IO/otbSpotImageMetadataInterfaceFactory.cxx b/Code/IO/otbSpotImageMetadataInterfaceFactory.cxx
index a2403ebbe6..a34e832726 100644
--- a/Code/IO/otbSpotImageMetadataInterfaceFactory.cxx
+++ b/Code/IO/otbSpotImageMetadataInterfaceFactory.cxx
@@ -16,7 +16,6 @@
=========================================================================*/
-
#ifdef _MSC_VER
#pragma warning ( disable : 4786 )
#endif
@@ -41,7 +40,7 @@ SpotImageMetadataInterfaceFactory
"otbSpotImageMetadataInterface",
"Spot Meteada Interface",
1,
- itk::CreateObjectFunction<SpotImageMetadataInterface >::New());
+ itk::CreateObjectFunction<SpotImageMetadataInterface>::New());
}
SpotImageMetadataInterfaceFactory
@@ -61,5 +60,4 @@ SpotImageMetadataInterfaceFactory::GetDescription() const
return "Spot Metadata Interface Factory, handle Spot metadata in OTB";
}
-
} // end namespace otb
diff --git a/Code/IO/otbSpotImageMetadataInterfaceFactory.h b/Code/IO/otbSpotImageMetadataInterfaceFactory.h
index 5cbc827d5a..bed739315b 100644
--- a/Code/IO/otbSpotImageMetadataInterfaceFactory.h
+++ b/Code/IO/otbSpotImageMetadataInterfaceFactory.h
@@ -24,7 +24,6 @@
#include "itkObjectFactoryBase.h"
-
namespace otb
{
/** \class SpotImageMetadataInterfaceFactory
@@ -34,10 +33,10 @@ class ITK_EXPORT SpotImageMetadataInterfaceFactory : public itk::ObjectFactoryBa
{
public:
/** Standard class typedefs. */
- typedef SpotImageMetadataInterfaceFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SpotImageMetadataInterfaceFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -61,12 +60,11 @@ protected:
virtual ~SpotImageMetadataInterfaceFactory();
private:
- SpotImageMetadataInterfaceFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SpotImageMetadataInterfaceFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbStreamingImageFileWriter.h b/Code/IO/otbStreamingImageFileWriter.h
index fb83bc99e0..638c1324f0 100644
--- a/Code/IO/otbStreamingImageFileWriter.h
+++ b/Code/IO/otbStreamingImageFileWriter.h
@@ -52,26 +52,26 @@ class ITK_EXPORT StreamingImageFileWriter : public itk::ImageToImageFilter<TInpu
{
public:
/** Standard class typedefs. */
- typedef StreamingImageFileWriter Self;
- typedef itk::ImageToImageFilter<TInputImage, TInputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef StreamingImageFileWriter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TInputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(StreamingImageFileWriter,itk::ImageToImageFilter);
+ itkTypeMacro(StreamingImageFileWriter, itk::ImageToImageFilter);
/** Some typedefs for the input and output. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointer;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef TInputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputImagePixelType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointer;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef TInputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputImagePixelType;
typedef typename Superclass::DataObjectPointer DataObjectPointer;
/** Streaming traits helper typedef */
@@ -82,11 +82,11 @@ public:
InputImageType::ImageDimension);
/** SmartPointer to a region splitting object */
- typedef itk::ImageRegionSplitter<itkGetStaticConstMacro(InputImageDimension)> SplitterType;
- typedef typename SplitterType::Pointer RegionSplitterPointer;
+ typedef itk::ImageRegionSplitter<itkGetStaticConstMacro(InputImageDimension)> SplitterType;
+ typedef typename SplitterType::Pointer RegionSplitterPointer;
/** Set buffer memory size (in bytes) use to calculate the number of stream divisions */
- void SetBufferMemorySize(unsigned long );
+ void SetBufferMemorySize(unsigned long);
/** Set the buffer number of lines use to calculate the number of stream divisions */
void SetBufferNumberOfLinesDivisions(unsigned long);
@@ -124,8 +124,7 @@ public:
* or ThreadedGenerateData() method. Instead, all the work is done
* in UpdateOutputData() since it must update a little, execute a little,
* update some more, execute some more, etc. */
- virtual void UpdateOutputData(itk::DataObject *itkNotUsed(output));
-
+ virtual void UpdateOutputData(itk::DataObject * itkNotUsed(output));
/** ImageFileWriter Methods */
@@ -143,15 +142,14 @@ public:
this->Modified();
}
-
/** Specify the region to write. If left NULL, then the whole image
* is written. */
- void SetIORegion(const itk::ImageIORegion & region);
- itkGetConstReferenceMacro( IORegion, itk::ImageIORegion );
+ void SetIORegion(const itk::ImageIORegion& region);
+ itkGetConstReferenceMacro(IORegion, itk::ImageIORegion);
/** Set the compression On or Off */
- itkSetMacro(UseCompression,bool);
- itkGetConstReferenceMacro(UseCompression,bool);
+ itkSetMacro(UseCompression, bool);
+ itkGetConstReferenceMacro(UseCompression, bool);
itkBooleanMacro(UseCompression);
/** By default the MetaDataDictionary is taken from the input image and
@@ -160,8 +158,8 @@ public:
* the ImageSeriesWriter. This flag defined whether the MetaDataDictionary
* to use will be the one from the input image or the one already set in
* the ImageIO object. */
- itkSetMacro(UseInputMetaDataDictionary,bool);
- itkGetConstReferenceMacro(UseInputMetaDataDictionary,bool);
+ itkSetMacro(UseInputMetaDataDictionary, bool);
+ itkGetConstReferenceMacro(UseInputMetaDataDictionary, bool);
itkBooleanMacro(UseInputMetaDataDictionary);
itkSetObjectMacro(ImageIO, itk::ImageIOBase);
@@ -180,8 +178,8 @@ protected:
void GenerateData(void);
private:
- StreamingImageFileWriter(const StreamingImageFileWriter&); //purposely not implemented
- void operator=(const StreamingImageFileWriter&); //purposely not implemented
+ StreamingImageFileWriter(const StreamingImageFileWriter &); //purposely not implemented
+ void operator =(const StreamingImageFileWriter&); //purposely not implemented
/** This method calculate the number of stream divisions, by using the CalculationDivision type */
unsigned long CalculateNumberOfStreamDivisions(void);
@@ -197,14 +195,14 @@ private:
CalculationDivisionEnumType m_CalculationDivision;
/** ImageFileWriter Parameters */
- std::string m_FileName;
+ std::string m_FileName;
itk::ImageIOBase::Pointer m_ImageIO;
bool m_UserSpecifiedImageIO; //track whether the ImageIO is user specified
itk::ImageIORegion m_IORegion;
- bool m_UserSpecifiedIORegion; //
+ bool m_UserSpecifiedIORegion; //
//track whether the region is user specified
bool m_FactorySpecifiedImageIO; //track whether the factory mechanism set the ImageIO
bool m_UseCompression;
diff --git a/Code/IO/otbStreamingImageFileWriter.txx b/Code/IO/otbStreamingImageFileWriter.txx
index 763ce9b1fd..44149f6e4e 100644
--- a/Code/IO/otbStreamingImageFileWriter.txx
+++ b/Code/IO/otbStreamingImageFileWriter.txx
@@ -58,7 +58,6 @@ StreamingImageFileWriter<TInputImage>
// create default region splitter
m_RegionSplitter = itk::ImageRegionSplitter<InputImageDimension>::New();
-
m_UserSpecifiedIORegion = true;
m_FactorySpecifiedImageIO = false;
@@ -156,7 +155,7 @@ unsigned long
StreamingImageFileWriter<TInputImage>
::GetNumberOfStreamDivisions(void)
{
- return(CalculateNumberOfStreamDivisions());
+ return (CalculateNumberOfStreamDivisions());
}
/**
@@ -178,77 +177,75 @@ void
StreamingImageFileWriter<TInputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "File Name: "
- << (m_FileName.data() ? m_FileName.data() : "(none)") << std::endl;
+ << (m_FileName.data() ? m_FileName.data() : "(none)") << std::endl;
os << indent << "Image IO: ";
- if ( m_ImageIO.IsNull() )
- {
+ if (m_ImageIO.IsNull())
+ {
os << "(none)\n";
- }
+ }
else
- {
+ {
os << m_ImageIO << "\n";
- }
+ }
os << indent << "IO Region: " << m_IORegion << "\n";
-
if (m_UseCompression)
- {
+ {
os << indent << "Compression: On\n";
- }
+ }
else
- {
+ {
os << indent << "Compression: Off\n";
- }
+ }
if (m_UseInputMetaDataDictionary)
- {
+ {
os << indent << "UseInputMetaDataDictionary: On\n";
- }
+ }
else
- {
+ {
os << indent << "UseInputMetaDataDictionary: Off\n";
- }
+ }
if (m_FactorySpecifiedImageIO)
- {
+ {
os << indent << "FactorySpecifiedmageIO: On\n";
- }
+ }
else
- {
+ {
os << indent << "FactorySpecifiedmageIO: Off\n";
- }
-
+ }
os << indent << "Number of stream divisions: " << m_NumberOfStreamDivisions
- << std::endl;
+ << std::endl;
if (m_RegionSplitter)
- {
+ {
os << indent << "Region splitter:" << m_RegionSplitter << std::endl;
- }
+ }
else
- {
+ {
os << indent << "Region splitter: (none)" << std::endl;
- }
+ }
}
//---------------------------------------------------------
template<class TInputImage>
void
StreamingImageFileWriter<TInputImage>
-::SetIORegion (const itk::ImageIORegion& region)
+::SetIORegion(const itk::ImageIORegion& region)
{
- itkDebugMacro("setting IORegion to " << region );
- if ( m_IORegion != region)
- {
+ itkDebugMacro("setting IORegion to " << region);
+ if (m_IORegion != region)
+ {
m_IORegion = region;
this->Modified();
m_UserSpecifiedIORegion = true;
- }
+ }
}
/**
@@ -270,7 +267,6 @@ StreamingImageFileWriter<TInputImage>
m_BufferNumberOfLinesDivisions);
}
-
/**
*
*/
@@ -286,10 +282,9 @@ StreamingImageFileWriter<TInputImage>
* prevent chasing our tail
*/
if (this->m_Updating)
- {
+ {
return;
- }
-
+ }
/**
* Prepare all the outputs. This may deallocate previous bulk data.
@@ -301,90 +296,90 @@ StreamingImageFileWriter<TInputImage>
*/
unsigned int ninputs = this->GetNumberOfValidRequiredInputs();
if (ninputs < this->GetNumberOfRequiredInputs())
- {
- itkExceptionMacro(<< "At least " << static_cast<unsigned int>( this->GetNumberOfRequiredInputs() ) << " inputs are required but only " << ninputs << " are specified.");
+ {
+ itkExceptionMacro(<< "At least " << static_cast<unsigned int>(
+ this->GetNumberOfRequiredInputs()) << " inputs are required but only " << ninputs <<
+ " are specified.");
return;
- }
+ }
this->SetAbortGenerateData(0);
this->SetProgress(0.0);
this->m_Updating = true;
-
/**
* Tell all Observers that the filter is starting
*/
- this->InvokeEvent( itk::StartEvent() );
+ this->InvokeEvent(itk::StartEvent());
/**
* Allocate the output buffer.
*/
- OutputImagePointer outputPtr = this->GetOutput(0);
+ OutputImagePointer outputPtr = this->GetOutput(0);
OutputImageRegionType outputRegion = outputPtr->GetLargestPossibleRegion();
/** Prepare ImageIO : create ImageFactory */
// Make sure that we can write the file given the name
//
- if ( m_FileName == "" )
- {
- itkExceptionMacro(<<"No filename was specified");
- }
-
- if ( m_ImageIO.IsNull() ) //try creating via factory
- {
- itkDebugMacro(<<"Attempting factory creation of ImageIO for file: "
+ if (m_FileName == "")
+ {
+ itkExceptionMacro(<< "No filename was specified");
+ }
+
+ if (m_ImageIO.IsNull()) //try creating via factory
+ {
+ itkDebugMacro(<< "Attempting factory creation of ImageIO for file: "
<< m_FileName);
- this->SetImageIO( ImageIOFactory::CreateImageIO( m_FileName.c_str(),
- itk::ImageIOFactory::WriteMode ) );
+ this->SetImageIO(ImageIOFactory::CreateImageIO(m_FileName.c_str(),
+ itk::ImageIOFactory::WriteMode));
/* m_ImageIO = ImageIOFactory::CreateImageIO( m_FileName.c_str(),
itk::ImageIOFactory::WriteMode );*/
m_FactorySpecifiedImageIO = true;
- }
+ }
else
- {
- if ( m_FactorySpecifiedImageIO && !m_ImageIO->CanWriteFile( m_FileName.c_str() ) )
{
- itkDebugMacro(<<"ImageIO exists but doesn't know how to write file:"
- << m_FileName );
- itkDebugMacro(<<"Attempting creation of ImageIO with a factory for file:"
+ if (m_FactorySpecifiedImageIO && !m_ImageIO->CanWriteFile(m_FileName.c_str()))
+ {
+ itkDebugMacro(<< "ImageIO exists but doesn't know how to write file:"
<< m_FileName);
- m_ImageIO = ImageIOFactory::CreateImageIO( m_FileName.c_str(),
- itk::ImageIOFactory::WriteMode );
+ itkDebugMacro(<< "Attempting creation of ImageIO with a factory for file:"
+ << m_FileName);
+ m_ImageIO = ImageIOFactory::CreateImageIO(m_FileName.c_str(),
+ itk::ImageIOFactory::WriteMode);
m_FactorySpecifiedImageIO = true;
+ }
}
- }
- if ( m_ImageIO.IsNull() )
- {
+ if (m_ImageIO.IsNull())
+ {
itk::ImageFileWriterException e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << " Could not create IO object for file "
- << m_FileName.c_str() << std::endl;
+ << m_FileName.c_str() << std::endl;
msg << " Tried to create one of the following:" << std::endl;
std::list<itk::LightObject::Pointer> allobjects =
itk::ObjectFactoryBase::CreateAllInstance("itkImageIOBase");
for (std::list<itk::LightObject::Pointer>::iterator i = allobjects.begin();
i != allobjects.end(); ++i)
- {
+ {
itk::ImageIOBase* io = dynamic_cast<itk::ImageIOBase*>(i->GetPointer());
msg << " " << io->GetNameOfClass() << std::endl;
- }
+ }
msg << " You probably failed to set a file suffix, or" << std::endl;
msg << " set the suffix to an unsupported type." << std::endl;
e.SetDescription(msg.str().c_str());
e.SetLocation(ITK_LOCATION);
throw e;
- }
+ }
/** End of Prepare ImageIO : create ImageFactory */
-
/**
* Grab the input
*/
InputImagePointer inputPtr =
- const_cast< InputImageType * >( this->GetInput(0) );
+ const_cast<InputImageType *>(this->GetInput(0));
/**
* Determine of number of pieces to divide the input. This will be the
@@ -394,19 +389,21 @@ StreamingImageFileWriter<TInputImage>
unsigned int numDivisions;
/** Control if the ImageIO is CanStreamWrite */
- if ( m_ImageIO->CanStreamWrite() == false )
- {
- otbMsgDebugMacro(<<"WARNING : The ImageFactory selected for the image file <"<<m_FileName.c_str()<<"> is not StreamWrite. So, the streaming method is not use.");
+ if (m_ImageIO->CanStreamWrite() == false)
+ {
+ otbMsgDebugMacro(
+ << "WARNING : The ImageFactory selected for the image file <" << m_FileName.c_str() <<
+ "> is not StreamWrite. So, the streaming method is not use.");
numDivisions = 1;
- }
- else if ( inputPtr->GetBufferedRegion() == inputPtr->GetLargestPossibleRegion())
- {
- otbMsgDebugMacro(<<"WARNING : Buffered region is the largest possible region, there is no need for streaming.");
+ }
+ else if (inputPtr->GetBufferedRegion() == inputPtr->GetLargestPossibleRegion())
+ {
+ otbMsgDebugMacro(<< "WARNING : Buffered region is the largest possible region, there is no need for streaming.");
numDivisions = 1;
- }
+ }
else
- {
+ {
numDivisions = static_cast<unsigned int>(CalculateNumberOfStreamDivisions());
/*
otbDebugMacro(<< "NumberOfStreamDivisions : " << numDivisions);
@@ -419,7 +416,7 @@ StreamingImageFileWriter<TInputImage>
numDivisions = numDivisionsFromSplitter;
}
*/
- }
+ }
/**
* Loop over the number of pieces, execute the upstream pipeline on each
@@ -431,37 +428,35 @@ StreamingImageFileWriter<TInputImage>
// Setup the ImageIO
//
m_ImageIO->SetNumberOfDimensions(TInputImage::ImageDimension);
- const typename TInputImage::SpacingType& spacing = outputPtr->GetSpacing();
- const typename TInputImage::PointType& origin = outputPtr->GetOrigin();
+ const typename TInputImage::SpacingType& spacing = outputPtr->GetSpacing();
+ const typename TInputImage::PointType& origin = outputPtr->GetOrigin();
const typename TInputImage::DirectionType& direction = outputPtr->GetDirection();
- for (unsigned int i=0; i<TInputImage::ImageDimension; ++i)
- {
+ for (unsigned int i = 0; i < TInputImage::ImageDimension; ++i)
+ {
// Final image size
- m_ImageIO->SetDimensions(i,outputRegion.GetSize(i));
- m_ImageIO->SetSpacing(i,spacing[i]);
- m_ImageIO->SetOrigin(i,origin[i]);
- vnl_vector< double > axisDirection(TInputImage::ImageDimension);
+ m_ImageIO->SetDimensions(i, outputRegion.GetSize(i));
+ m_ImageIO->SetSpacing(i, spacing[i]);
+ m_ImageIO->SetOrigin(i, origin[i]);
+ vnl_vector<double> axisDirection(TInputImage::ImageDimension);
// Please note: direction cosines are stored as columns of the
// direction matrix
- for (unsigned int j=0; j<TInputImage::ImageDimension; ++j)
- {
+ for (unsigned int j = 0; j < TInputImage::ImageDimension; ++j)
+ {
axisDirection[j] = direction[j][i];
+ }
+ m_ImageIO->SetDirection(i, axisDirection);
}
- m_ImageIO->SetDirection( i, axisDirection );
- }
m_ImageIO->SetUseCompression(m_UseCompression);
m_ImageIO->SetMetaDataDictionary(inputPtr->GetMetaDataDictionary());
-
/** Create Image file */
// Setup the image IO for writing.
//
m_ImageIO->SetFileName(m_FileName.c_str());
m_ImageIO->WriteImageInformation();
-
/**
* Loop over the number of pieces, execute the upstream pipeline on each
* piece, and copy the results into the output image.
@@ -469,7 +464,7 @@ StreamingImageFileWriter<TInputImage>
otbMsgDebugMacro(<< "Number Of Stream Divisions : " << numDivisions);
// Notify end event observers
- this->InvokeEvent( itk::StartEvent() );
+ this->InvokeEvent(itk::StartEvent());
this->UpdateProgress(0);
@@ -477,60 +472,58 @@ StreamingImageFileWriter<TInputImage>
for (piece = 0;
piece < numDivisions && !this->GetAbortGenerateData();
piece++)
- {
+ {
streamRegion = m_RegionSplitter->GetSplit(piece, numDivisions,
- outputRegion);
+ outputRegion);
- otbMsgDebugMacro(<<"Piece : " << piece );
- otbMsgDebugMacro(<<"RegionSplit : Index(" << streamRegion.GetIndex()[0]
+ otbMsgDebugMacro(<< "Piece : " << piece);
+ otbMsgDebugMacro(<< "RegionSplit : Index(" << streamRegion.GetIndex()[0]
<< "," << streamRegion.GetIndex()[1]
<< ") Size(" << streamRegion.GetSize()[0]
<< "," << streamRegion.GetSize()[1] << ")");
-
inputPtr->SetRequestedRegion(streamRegion);
inputPtr->PropagateRequestedRegion();
inputPtr->UpdateOutputData();
// Write the whole image
itk::ImageIORegion ioRegion(TInputImage::ImageDimension);
- for (unsigned int i=0; i<TInputImage::ImageDimension; ++i)
- {
- ioRegion.SetSize(i,streamRegion.GetSize(i));
- ioRegion.SetIndex(i,streamRegion.GetIndex(i));
- }
- this->SetIORegion( ioRegion );
+ for (unsigned int i = 0; i < TInputImage::ImageDimension; ++i)
+ {
+ ioRegion.SetSize(i, streamRegion.GetSize(i));
+ ioRegion.SetIndex(i, streamRegion.GetIndex(i));
+ }
+ this->SetIORegion(ioRegion);
m_ImageIO->SetIORegion(m_IORegion);
-
// Start writing streamregion in the image file
this->GenerateData();
- this->UpdateProgress((float) piece / numDivisions );
- }
+ this->UpdateProgress((float) piece / numDivisions);
+ }
/**
* If we ended due to aborting, push the progress up to 1.0 (since
* it probably didn't end there)
*/
- if ( !this->GetAbortGenerateData() )
- {
+ if (!this->GetAbortGenerateData())
+ {
this->UpdateProgress(1.0);
- }
+ }
// Notify end event observers
- this->InvokeEvent( itk::EndEvent() );
+ this->InvokeEvent(itk::EndEvent());
/**
* Now we have to mark the data as up to data.
*/
for (idx = 0; idx < this->GetNumberOfOutputs(); ++idx)
- {
- if (this->GetOutput(idx))
{
+ if (this->GetOutput(idx))
+ {
this->GetOutput(idx)->DataHasBeenGenerated();
+ }
}
- }
// Write the image keyword list if any
ossimKeywordlist geom_kwl;
@@ -540,20 +533,20 @@ StreamingImageFileWriter<TInputImage>
itk::ExposeMetaData<ImageKeywordlist>(dict, MetaDataKey::OSSIMKeywordlistKey, otb_kwl);
otb_kwl.convertToOSSIMKeywordlist(geom_kwl);
- if(geom_kwl.getSize()>0)
+ if (geom_kwl.getSize() > 0)
{
- otbMsgDevMacro(<<"Exporting keywordlist ...");
+ otbMsgDevMacro(<< "Exporting keywordlist ...");
// ossimImageHandlerRegistry::instance()->addFactory(ossimImageHandlerSarFactory::instance());
ossimImageHandler* handler = ossimImageHandlerRegistry::instance()->open(ossimFilename(this->GetFileName()));
- if(!handler)
+ if (!handler)
{
- otbMsgDevMacro(<<"OSSIM Open Image FAILED !");
+ otbMsgDevMacro(<< "OSSIM Open Image FAILED !");
}
else
{
- //FIXME find out exactly what we are trying to do here
- //there is no meaning to blindly save the kwl if we didn't update it in the pipeline
+ //FIXME find out exactly what we are trying to do here
+ //there is no meaning to blindly save the kwl if we didn't update it in the pipeline
// handler->setImageGeometry(geom_kwl);
// handler->getImageGeometry()->getProjection()->loadState(geom_kwl);
//
@@ -571,7 +564,6 @@ StreamingImageFileWriter<TInputImage>
this->m_Updating = false;
}
-
//---------------------------------------------------------
/**
@@ -590,19 +582,19 @@ StreamingImageFileWriter<TInputImage>
// four components.
typedef typename InputImageType::PixelType ScalarType;
- if ( strcmp( input->GetNameOfClass(), "VectorImage" ) == 0 )
- {
+ if (strcmp(input->GetNameOfClass(), "VectorImage") == 0)
+ {
typedef typename InputImageType::InternalPixelType VectorImageScalarType;
- m_ImageIO->SetPixelTypeInfo( typeid(VectorImageScalarType) );
+ m_ImageIO->SetPixelTypeInfo(typeid(VectorImageScalarType));
typedef typename InputImageType::AccessorFunctorType AccessorFunctorType;
- m_ImageIO->SetNumberOfComponents( AccessorFunctorType::GetVectorLength(input) );
- }
+ m_ImageIO->SetNumberOfComponents(AccessorFunctorType::GetVectorLength(input));
+ }
else
- {
+ {
// Set the pixel and component type; the number of components.
m_ImageIO->SetPixelTypeInfo(typeid(ScalarType));
- }
+ }
// Setup the image IO for writing.
//
@@ -612,7 +604,6 @@ StreamingImageFileWriter<TInputImage>
}
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbStreamingImageVirtualWriter.h b/Code/IO/otbStreamingImageVirtualWriter.h
index 8fbe95539a..c4105a2ee3 100644
--- a/Code/IO/otbStreamingImageVirtualWriter.h
+++ b/Code/IO/otbStreamingImageVirtualWriter.h
@@ -46,26 +46,26 @@ namespace otb
* \sa PersistentImageStreamingDecorator.
*/
template <class TInputImage>
-class ITK_EXPORT StreamingImageVirtualWriter : public itk::ImageToImageFilter<TInputImage,TInputImage>
+class ITK_EXPORT StreamingImageVirtualWriter : public itk::ImageToImageFilter<TInputImage, TInputImage>
{
public:
/** Standard class typedefs. */
- typedef StreamingImageVirtualWriter Self;
- typedef itk::ImageToImageFilter<TInputImage,TInputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef StreamingImageVirtualWriter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TInputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(StreamingImageVirtualWriter,itk::ImageToImageFilter);
+ itkTypeMacro(StreamingImageVirtualWriter, itk::ImageToImageFilter);
/** Some typedefs for the input and output. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointer;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointer;
typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
/** Streaming traits helper typedef */
typedef StreamingTraits<InputImageType> StreamingTraitsType;
@@ -80,11 +80,11 @@ public:
const InputImageType * GetInput(unsigned int idx);
/** SmartPointer to a region splitting object */
- typedef itk::ImageRegionSplitter<itkGetStaticConstMacro(InputImageDimension)> SplitterType;
- typedef typename SplitterType::Pointer RegionSplitterPointer;
+ typedef itk::ImageRegionSplitter<itkGetStaticConstMacro(InputImageDimension)> SplitterType;
+ typedef typename SplitterType::Pointer RegionSplitterPointer;
/** Set buffer memory size (in bytes) use to calculate the number of stream divisions */
- void SetBufferMemorySize(unsigned long );
+ void SetBufferMemorySize(unsigned long);
/** Set the buffer number of lines use to calculate the number of stream divisions */
void SetBufferNumberOfLinesDivisions(unsigned long);
@@ -117,11 +117,9 @@ public:
/** Get the helper class for dividing the input into chunks. */
itkGetObjectMacro(RegionSplitter, SplitterType);
-
/** Type use to define number of divisions */
typedef StreamingMode CalculationDivisionEnumType;
-
virtual void GenerateInputRequestedRegion(void);
protected:
@@ -132,8 +130,8 @@ protected:
virtual void GenerateData(void);
private:
- StreamingImageVirtualWriter(const StreamingImageVirtualWriter&); //purposely not implemented
- void operator=(const StreamingImageVirtualWriter&); //purposely not implemented
+ StreamingImageVirtualWriter(const StreamingImageVirtualWriter &); //purposely not implemented
+ void operator =(const StreamingImageVirtualWriter&); //purposely not implemented
/** This method calculate the number of stream divisions, by using the CalculationDivision type */
unsigned long CalculateNumberOfStreamDivisions(void);
diff --git a/Code/IO/otbStreamingImageVirtualWriter.txx b/Code/IO/otbStreamingImageVirtualWriter.txx
index aa83620596..8f41e0f902 100644
--- a/Code/IO/otbStreamingImageVirtualWriter.txx
+++ b/Code/IO/otbStreamingImageVirtualWriter.txx
@@ -139,10 +139,9 @@ StreamingImageVirtualWriter<TInputImage>
{
// ProcessObject is not const_correct so this cast is required here.
this->itk::ProcessObject::SetNthInput(0,
- const_cast<TInputImage *>(input ) );
+ const_cast<TInputImage *>(input));
}
-
//---------------------------------------------------------
template <class TInputImage>
const typename StreamingImageVirtualWriter<TInputImage>::InputImageType *
@@ -150,15 +149,14 @@ StreamingImageVirtualWriter<TInputImage>
::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
return static_cast<TInputImage*>
- (this->itk::ProcessObject::GetInput(0));
+ (this->itk::ProcessObject::GetInput(0));
}
-
template <class TInputImage>
const typename StreamingImageVirtualWriter<TInputImage>::InputImageType *
StreamingImageVirtualWriter<TInputImage>
@@ -171,10 +169,10 @@ void
StreamingImageVirtualWriter<TInputImage>
::GenerateInputRequestedRegion(void)
{
- InputImagePointer inputPtr = const_cast< InputImageType * >( this->GetInput(0) );
- typename InputImageRegionType::SizeType size;
+ InputImagePointer inputPtr = const_cast<InputImageType *>(this->GetInput(0));
+ typename InputImageRegionType::SizeType size;
typename InputImageRegionType::IndexType index;
- InputImageRegionType region;
+ InputImageRegionType region;
index.Fill(0);
size.Fill(0);
region.SetSize(size);
@@ -189,7 +187,7 @@ unsigned long
StreamingImageVirtualWriter<TInputImage>
::GetNumberOfStreamDivisions(void)
{
- return(CalculateNumberOfStreamDivisions());
+ return (CalculateNumberOfStreamDivisions());
}
template<class TInputImage>
unsigned long
@@ -223,17 +221,17 @@ void
StreamingImageVirtualWriter<TInputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "Number of stream divisions: " << m_NumberOfStreamDivisions
- << std::endl;
+ << std::endl;
if (m_RegionSplitter)
- {
+ {
os << indent << "Region splitter:" << m_RegionSplitter << std::endl;
- }
+ }
else
- {
+ {
os << indent << "Region splitter: (none)" << std::endl;
- }
+ }
}
template<class TInputImage>
void
@@ -250,11 +248,11 @@ StreamingImageVirtualWriter<TInputImage>
/**
* Tell all Observers that the filter is starting
*/
- this->InvokeEvent( itk::StartEvent() );
+ this->InvokeEvent(itk::StartEvent());
/**
* Grab the input
*/
- InputImagePointer inputPtr = const_cast< InputImageType * >( this->GetInput(0) );
+ InputImagePointer inputPtr = const_cast<InputImageType *>(this->GetInput(0));
InputImageRegionType outputRegion = inputPtr->GetLargestPossibleRegion();
/**
* Determine of number of pieces to divide the input. This will be the
@@ -269,39 +267,39 @@ StreamingImageVirtualWriter<TInputImage>
* piece, and copy the results into the output image.
*/
InputImageRegionType streamRegion;
- unsigned int piece;
+ unsigned int piece;
for (piece = 0;
piece < numDivisions && !this->GetAbortGenerateData();
piece++)
- {
- streamRegion = m_RegionSplitter->GetSplit(piece, numDivisions,outputRegion);
+ {
+ streamRegion = m_RegionSplitter->GetSplit(piece, numDivisions, outputRegion);
inputPtr->ReleaseData();
inputPtr->SetRequestedRegion(streamRegion);
inputPtr->Update();
- this->UpdateProgress((float) piece / numDivisions );
- }
+ this->UpdateProgress((float) piece / numDivisions);
+ }
/**
* If we ended due to aborting, push the progress up to 1.0 (since
* it probably didn't end there)
*/
- if ( !this->GetAbortGenerateData() )
- {
+ if (!this->GetAbortGenerateData())
+ {
this->UpdateProgress(1.0);
- }
+ }
// Notify end event observers
- this->InvokeEvent( itk::EndEvent() );
+ this->InvokeEvent(itk::EndEvent());
/**
* Now we have to mark the data as up to data.
*/
for (unsigned int idx = 0; idx < this->GetNumberOfOutputs(); ++idx)
- {
- if (this->GetOutput(idx))
{
+ if (this->GetOutput(idx))
+ {
this->GetOutput(idx)->DataHasBeenGenerated();
+ }
}
- }
/**
* Release any inputs if marked for release
*/
diff --git a/Code/IO/otbTerraSarImageMetadataInterface.cxx b/Code/IO/otbTerraSarImageMetadataInterface.cxx
index 232e73edf3..14a3dd1434 100644
--- a/Code/IO/otbTerraSarImageMetadataInterface.cxx
+++ b/Code/IO/otbTerraSarImageMetadataInterface.cxx
@@ -34,57 +34,52 @@
namespace otb
{
-
TerraSarImageMetadataInterface
::TerraSarImageMetadataInterface()
{
}
-
std::string
-TerraSarImageMetadataInterface::GetSensorID( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetSensorID(const MetaDataDictionaryType& dict) const
{
ImageKeywordlistType ImageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, ImageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
ImageKeywordlist.convertToOSSIMKeywordlist(kwl);
- std::string key= "sensor";
+ std::string key = "sensor";
ossimString keywordString = kwl.find(key.c_str());
std::string output(keywordString.chars());
-
+
return output;
}
bool
-TerraSarImageMetadataInterface::CanRead( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::CanRead(const MetaDataDictionaryType& dict) const
{
std::string sensorID = GetSensorID(dict);
- if (sensorID.find("TSX") != std::string::npos)
- return true;
- else
- return false;
+ if (sensorID.find("TSX") != std::string::npos) return true;
+ else return false;
}
-
int
-TerraSarImageMetadataInterface::GetDay( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetDay(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -94,32 +89,30 @@ TerraSarImageMetadataInterface::GetDay( const MetaDataDictionaryType & dict ) co
key = "azimuth_start_time";
separatorList = "-T";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Day");
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Day");
- ossimString day = keywordStrings[2];
+ ossimString day = keywordStrings[2];
- return day.toInt();
+ return day.toInt();
}
-
int
-TerraSarImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetMonth(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
- }
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
+ }
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -129,33 +122,30 @@ TerraSarImageMetadataInterface::GetMonth( const MetaDataDictionaryType & dict )
key = "azimuth_start_time";
separatorList = "-T";
-
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Month");
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Month");
ossimString month = keywordStrings[1];
return month.toInt();
}
-
int
-TerraSarImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetYear(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -165,11 +155,10 @@ TerraSarImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) c
key = "azimuth_start_time";
separatorList = "-T";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 2 )
- itkExceptionMacro("Invalid Year");
+ if (keywordStrings.size() <= 2) itkExceptionMacro("Invalid Year");
ossimString year = keywordStrings[0];
@@ -178,19 +167,19 @@ TerraSarImageMetadataInterface::GetYear( const MetaDataDictionaryType & dict ) c
}
int
-TerraSarImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetHour(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -200,11 +189,10 @@ TerraSarImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) c
key = "azimuth_start_time";
separatorList = "-T:";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 4 )
- itkExceptionMacro("Invalid Hour");
+ if (keywordStrings.size() <= 4) itkExceptionMacro("Invalid Hour");
ossimString hour = keywordStrings[3];
@@ -212,19 +200,19 @@ TerraSarImageMetadataInterface::GetHour( const MetaDataDictionaryType & dict ) c
}
int
-TerraSarImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetMinute(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
- }
-
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
+ }
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -234,10 +222,9 @@ TerraSarImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict )
key = "azimuth_start_time";
separatorList = "-T:";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 5 )
- itkExceptionMacro("Invalid Minute");
+ if (keywordStrings.size() <= 5) itkExceptionMacro("Invalid Minute");
ossimString minute = keywordStrings[4];
@@ -245,19 +232,19 @@ TerraSarImageMetadataInterface::GetMinute( const MetaDataDictionaryType & dict )
}
int
-TerraSarImageMetadataInterface::GetProductionDay( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetProductionDay(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
- }
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
+ }
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -267,11 +254,10 @@ TerraSarImageMetadataInterface::GetProductionDay( const MetaDataDictionaryType &
key = "generation_time";
separatorList = "-T:";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Production Day");
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Production Day");
ossimString day = keywordStrings[2];
@@ -279,19 +265,19 @@ TerraSarImageMetadataInterface::GetProductionDay( const MetaDataDictionaryType &
}
int
-TerraSarImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetProductionMonth(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
- }
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
+ }
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -301,32 +287,30 @@ TerraSarImageMetadataInterface::GetProductionMonth( const MetaDataDictionaryType
key = "generation_time";
separatorList = "-T";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if(keywordStrings.size() <= 2)
- itkExceptionMacro(<<"Invalid Production Month");
+ if (keywordStrings.size() <= 2) itkExceptionMacro(<< "Invalid Production Month");
ossimString month = keywordStrings[1];
return month.toInt();
}
-
int
-TerraSarImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetProductionYear(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
- }
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
+ }
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -336,11 +320,10 @@ TerraSarImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType
key = "generation_time";
separatorList = "-T";
- ossimString keywordString = kwl.find(key.c_str());
+ ossimString keywordString = kwl.find(key.c_str());
std::vector<ossimString> keywordStrings = keywordString.split(separatorList);
- if( keywordStrings.size() <= 2 )
- itkExceptionMacro("Invalid Production Year");
+ if (keywordStrings.size() <= 2) itkExceptionMacro("Invalid Production Year");
ossimString year = keywordStrings[0];
@@ -348,19 +331,19 @@ TerraSarImageMetadataInterface::GetProductionYear( const MetaDataDictionaryType
}
double
-TerraSarImageMetadataInterface::GetCalibrationFactor( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetCalibrationFactor(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
- }
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
+ }
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -371,405 +354,394 @@ TerraSarImageMetadataInterface::GetCalibrationFactor( const MetaDataDictionaryTy
return calFac.toDouble();
}
-
ossimplugins::Noise *
-TerraSarImageMetadataInterface::GetNoise( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetNoise(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
- }
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
+ }
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
ossimplugins::Noise * noise = new ossimplugins::Noise();
- noise->loadState( kwl, "");
-
+ noise->loadState(kwl, "");
return noise;
}
unsigned int
-TerraSarImageMetadataInterface::GetNumberOfNoiseRecords( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetNumberOfNoiseRecords(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
- }
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
+ }
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
std::string key = "noise.numberOfNoiseRecords";
ossimString nbRec = kwl.find(key.c_str());
-
return static_cast<unsigned int>(nbRec.toInt());
}
-
TerraSarImageMetadataInterface::UIntVectorType
-TerraSarImageMetadataInterface::GetNoisePolynomialDegrees( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetNoisePolynomialDegrees(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
+ if (!this->CanRead(dict))
{
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
}
-
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- UIntVectorType polDeg;
+ UIntVectorType polDeg;
itk::OStringStream oss;
unsigned int nbRec = this->GetNumberOfNoiseRecords(dict);
- for(unsigned int i=0; i<nbRec; i++)
+ for (unsigned int i = 0; i < nbRec; i++)
{
- oss.str("");
- oss << "noise[" << i << "]imageNoise.noiseEstimate.polynomialDegree";
- ossimString tempVal = kwl.find(oss.str().c_str());
- polDeg.push_back( static_cast<unsigned int>(tempVal.toInt()) );
- }
-
+ oss.str("");
+ oss << "noise[" << i << "]imageNoise.noiseEstimate.polynomialDegree";
+ ossimString tempVal = kwl.find(oss.str().c_str());
+ polDeg.push_back(static_cast<unsigned int>(tempVal.toInt()));
+ }
+
return polDeg;
}
TerraSarImageMetadataInterface::DoubleVectorVectorType
-TerraSarImageMetadataInterface::GetNoisePolynomialCoefficientsList( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetNoisePolynomialCoefficientsList(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
+ if (!this->CanRead(dict))
{
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
}
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- unsigned int nbRec = this->GetNumberOfNoiseRecords(dict);
+ unsigned int nbRec = this->GetNumberOfNoiseRecords(dict);
UIntVectorType polDegs = this->GetNoisePolynomialDegrees(dict);
-
+
DoubleVectorVectorType polCoefList;
- DoubleVectorType polCoef;
- itk::OStringStream oss;
-
- for(unsigned int i=0; i<nbRec; i++)
- {
- polCoef.clear();
- // set <= condition because degree N means N+1 coeff
- for(unsigned int j=0; j<=polDegs.size(); j++)
- {
- oss.str("");
- oss << "noise[" << i << "]imageNoise.noiseEstimate.coefficient[" << j <<"]";
- ossimString tempVal = kwl.find(oss.str().c_str());
- polCoef.push_back( static_cast<double>(tempVal.toDouble()) );
- }
- polCoefList.push_back(polCoef);
- }
-
+ DoubleVectorType polCoef;
+ itk::OStringStream oss;
+
+ for (unsigned int i = 0; i < nbRec; i++)
+ {
+ polCoef.clear();
+ // set <= condition because degree N means N+1 coeff
+ for (unsigned int j = 0; j <= polDegs.size(); j++)
+ {
+ oss.str("");
+ oss << "noise[" << i << "]imageNoise.noiseEstimate.coefficient[" << j << "]";
+ ossimString tempVal = kwl.find(oss.str().c_str());
+ polCoef.push_back(static_cast<double>(tempVal.toDouble()));
+ }
+ polCoefList.push_back(polCoef);
+ }
+
return polCoefList;
}
-
TerraSarImageMetadataInterface::DoubleVectorType
-TerraSarImageMetadataInterface::GetNoiseTimeUTCList( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetNoiseTimeUTCList(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
+ if (!this->CanRead(dict))
{
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
}
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- DoubleVectorType timeList;
- itk::OStringStream oss;
- ossimString separatorList = "-T:Z";
+ DoubleVectorType timeList;
+ itk::OStringStream oss;
+ ossimString separatorList = "-T:Z";
std::vector<ossimString> splittedDate;
- int year, month, day, hour, minu, sec;
- double secDec, julianDay;
+ int year, month, day, hour, minu, sec;
+ double secDec, julianDay;
unsigned int nbRec = this->GetNumberOfNoiseRecords(dict);
- for(unsigned int i=0; i<nbRec; i++)
+ for (unsigned int i = 0; i < nbRec; i++)
{
- oss.str("");
- oss << "noise[" << i << "]imageNoise.timeUTC";
- ossimString tempVal = kwl.find(oss.str().c_str());
- splittedDate = tempVal.split(separatorList);
-
- year = splittedDate[0].toInt();
- month = splittedDate[1].toInt();
- day = splittedDate[2].toInt();
- hour = splittedDate[3].toInt();
- minu = splittedDate[4].toInt();
- double secFull = splittedDate[5].toDouble();
- sec = static_cast<int>(vcl_floor(secFull));
- // store the decimal second value
- secDec = secFull - vcl_floor(secFull);
- ossimDate myDate(month, day, year);
- myDate.setHour(hour);
- myDate.setMin(minu);
- myDate.setSec(sec);
-
- julianDay = myDate.getJulian();
-
- // add the decimal second to the julian day (1s <-> 1/24*60*60 = 1/86400 julienDay)
- julianDay += secDec/86400;
-
- timeList.push_back( julianDay );
- }
+ oss.str("");
+ oss << "noise[" << i << "]imageNoise.timeUTC";
+ ossimString tempVal = kwl.find(oss.str().c_str());
+ splittedDate = tempVal.split(separatorList);
+
+ year = splittedDate[0].toInt();
+ month = splittedDate[1].toInt();
+ day = splittedDate[2].toInt();
+ hour = splittedDate[3].toInt();
+ minu = splittedDate[4].toInt();
+ double secFull = splittedDate[5].toDouble();
+ sec = static_cast<int>(vcl_floor(secFull));
+ // store the decimal second value
+ secDec = secFull - vcl_floor(secFull);
+ ossimDate myDate(month, day, year);
+ myDate.setHour(hour);
+ myDate.setMin(minu);
+ myDate.setSec(sec);
+
+ julianDay = myDate.getJulian();
+
+ // add the decimal second to the julian day (1s <-> 1/24*60*60 = 1/86400 julienDay)
+ julianDay += secDec / 86400;
+
+ timeList.push_back(julianDay);
+ }
return timeList;
}
TerraSarImageMetadataInterface::DoubleVectorType
-TerraSarImageMetadataInterface::GetNoiseValidityRangeMaxList( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetNoiseValidityRangeMaxList(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
+ if (!this->CanRead(dict))
{
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
}
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- DoubleVectorType maxList;
+ DoubleVectorType maxList;
itk::OStringStream oss;
unsigned int nbRec = this->GetNumberOfNoiseRecords(dict);
- for(unsigned int i=0; i<nbRec; i++)
+ for (unsigned int i = 0; i < nbRec; i++)
{
- oss.str("");
- oss << "noise[" << i << "]imageNoise.noiseEstimate.validityRangeMax";
- ossimString tempVal = kwl.find(oss.str().c_str());
- maxList.push_back( tempVal.toDouble() );
- }
-
+ oss.str("");
+ oss << "noise[" << i << "]imageNoise.noiseEstimate.validityRangeMax";
+ ossimString tempVal = kwl.find(oss.str().c_str());
+ maxList.push_back(tempVal.toDouble());
+ }
return maxList;
}
TerraSarImageMetadataInterface::DoubleVectorType
-TerraSarImageMetadataInterface::GetNoiseValidityRangeMinList( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetNoiseValidityRangeMinList(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
+ if (!this->CanRead(dict))
{
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
}
- ImageKeywordlistType imageKeywordlist;
+ ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- DoubleVectorType minList;
+ DoubleVectorType minList;
itk::OStringStream oss;
unsigned int nbRec = this->GetNumberOfNoiseRecords(dict);
- for(unsigned int i=0; i<nbRec; i++)
+ for (unsigned int i = 0; i < nbRec; i++)
{
- oss.str("");
- oss << "noise[" << i << "]imageNoise.noiseEstimate.validityRangeMin";
- ossimString tempVal = kwl.find(oss.str().c_str());
+ oss.str("");
+ oss << "noise[" << i << "]imageNoise.noiseEstimate.validityRangeMin";
+ ossimString tempVal = kwl.find(oss.str().c_str());
- minList.push_back( tempVal.toDouble() );
- }
+ minList.push_back(tempVal.toDouble());
+ }
-
return minList;
}
TerraSarImageMetadataInterface::DoubleVectorType
-TerraSarImageMetadataInterface::GetNoiseReferencePointList( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetNoiseReferencePointList(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
+ if (!this->CanRead(dict))
{
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
}
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
- DoubleVectorType refPointList;
+ DoubleVectorType refPointList;
itk::OStringStream oss;
unsigned int nbRec = this->GetNumberOfNoiseRecords(dict);
- for(unsigned int i=0; i<nbRec; i++)
+ for (unsigned int i = 0; i < nbRec; i++)
{
- oss.str("");
- oss << "noise[" << i << "]imageNoise.noiseEstimate.referencePoint";
- ossimString tempVal = kwl.find(oss.str().c_str());
-
- refPointList.push_back( tempVal.toDouble() );
- }
+ oss.str("");
+ oss << "noise[" << i << "]imageNoise.noiseEstimate.referencePoint";
+ ossimString tempVal = kwl.find(oss.str().c_str());
+ refPointList.push_back(tempVal.toDouble());
+ }
return refPointList;
}
double
-TerraSarImageMetadataInterface::GetRadarFrequency( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetRadarFrequency(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
- }
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
+ }
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
-
+
ossimString tempVal = kwl.find("radarFrequency");
- double freq =tempVal.toDouble();
+ double freq = tempVal.toDouble();
return freq;
}
-
double
-TerraSarImageMetadataInterface::GetPRF( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetPRF(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
- }
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
+ }
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
ossimString tempVal = kwl.find("sensor_params.prf");
- double freq = tempVal.toDouble();
+ double freq = tempVal.toDouble();
return freq;
}
-
ossimplugins::IncidenceAngles*
-TerraSarImageMetadataInterface::GetIncidenceAngles( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetIncidenceAngles(const MetaDataDictionaryType& dict) const
{
- if( !this->CanRead( dict ) )
- {
- itkExceptionMacro(<<"Invalid Metadata, no TerraSar Image");
- }
+ if (!this->CanRead(dict))
+ {
+ itkExceptionMacro(<< "Invalid Metadata, no TerraSar Image");
+ }
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
ossimplugins::IncidenceAngles* incidenceAngles = new ossimplugins::IncidenceAngles();
- incidenceAngles->loadState( kwl, "");
-
+ incidenceAngles->loadState(kwl, "");
+
return incidenceAngles;
}
unsigned int
-TerraSarImageMetadataInterface::GetNumberOfCornerIncidenceAngles( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetNumberOfCornerIncidenceAngles(const MetaDataDictionaryType& dict) const
{
- ossimplugins::IncidenceAngles * ia = this->GetIncidenceAngles( dict );
-
+ ossimplugins::IncidenceAngles * ia = this->GetIncidenceAngles(dict);
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
std::string key = "incidenceAngles.numberOfCornerIncidenceAngles";
ossimString nbCornerAngles = kwl.find(key.c_str());
-
delete ia;
return static_cast<unsigned int>(nbCornerAngles.toInt());
}
double
-TerraSarImageMetadataInterface::GetMeanIncidenceAngles( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetMeanIncidenceAngles(const MetaDataDictionaryType& dict) const
{
- ossimplugins::IncidenceAngles * ia = this->GetIncidenceAngles( dict );
+ ossimplugins::IncidenceAngles * ia = this->GetIncidenceAngles(dict);
ImageKeywordlistType imageKeywordlist;
double sum = 0.;
-
+
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -778,59 +750,59 @@ TerraSarImageMetadataInterface::GetMeanIncidenceAngles( const MetaDataDictionary
std::string key = "incidenceAngles.centerInfoIncidenceAngle.infoIncidenceAngle.incidenceAngle";
ossimString centerIncidenceAngle = kwl.find(key.c_str());
-
+
sum += centerIncidenceAngle.toDouble();
-
+
unsigned int nbAngles = this->GetNumberOfCornerIncidenceAngles(dict);
- for(unsigned int i=0; i<nbAngles; i++)
- {
+ for (unsigned int i = 0; i < nbAngles; i++)
+ {
oss.str("");
oss << "incidenceAngles.cornersInfoIncidenceAngle[" << i << "].infoIncidenceAngle.incidenceAngle";
ossimString tempVal = kwl.find(oss.str().c_str());
-
+
sum += tempVal.toDouble();
- }
-
+ }
+
delete ia;
-
+
return (sum / (nbAngles + 1));
}
double
-TerraSarImageMetadataInterface::GetCenterIncidenceAngle( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetCenterIncidenceAngle(const MetaDataDictionaryType& dict) const
{
- ossimplugins::IncidenceAngles * ia = this->GetIncidenceAngles( dict );
-
+ ossimplugins::IncidenceAngles * ia = this->GetIncidenceAngles(dict);
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
std::string key = "incidenceAngles.centerInfoIncidenceAngle.infoIncidenceAngle.incidenceAngle";
ossimString tempVal = kwl.find(key.c_str());
-
+
delete ia;
return tempVal.toDouble();
}
-
+
TerraSarImageMetadataInterface::IndexType
-TerraSarImageMetadataInterface::GetCenterIncidenceAngleIndex( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetCenterIncidenceAngleIndex(const MetaDataDictionaryType& dict) const
{
- ossimplugins::IncidenceAngles * ia = this->GetIncidenceAngles( dict );
-
+ ossimplugins::IncidenceAngles * ia = this->GetIncidenceAngles(dict);
+
TerraSarImageMetadataInterface::IndexType it;
-
+
ImageKeywordlistType imageKeywordlist;
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
@@ -838,74 +810,74 @@ TerraSarImageMetadataInterface::GetCenterIncidenceAngleIndex( const MetaDataDict
ossimString tempVal = kwl.find(key.c_str());
it[0] = tempVal.toInt();
-
+
key = "incidenceAngles.centerInfoIncidenceAngle.infoIncidenceAngle.refColumn";
tempVal = kwl.find(key.c_str());
it[1] = tempVal.toInt();
-
+
delete ia;
return it;
}
TerraSarImageMetadataInterface::DoubleVectorType
-TerraSarImageMetadataInterface::GetCornersIncidenceAngles( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetCornersIncidenceAngles(const MetaDataDictionaryType& dict) const
{
- ossimplugins::IncidenceAngles * ia = this->GetIncidenceAngles( dict );
+ ossimplugins::IncidenceAngles * ia = this->GetIncidenceAngles(dict);
ImageKeywordlistType imageKeywordlist;
-
+
TerraSarImageMetadataInterface::DoubleVectorType dv;
-
+
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
-
+
itk::OStringStream oss;
-
+
unsigned int nbAngles = this->GetNumberOfCornerIncidenceAngles(dict);
- for(unsigned int i=0; i<nbAngles; i++)
- {
+ for (unsigned int i = 0; i < nbAngles; i++)
+ {
oss.str("");
oss << "incidenceAngles.cornersInfoIncidenceAngle[" << i << "].infoIncidenceAngle.incidenceAngle";
ossimString tempVal = kwl.find(oss.str().c_str());
dv.push_back(tempVal.toDouble());
- }
-
+ }
+
delete ia;
-
+
return dv;
}
-
+
TerraSarImageMetadataInterface::IndexVectorType
-TerraSarImageMetadataInterface::GetCornersIncidenceAnglesIndex( const MetaDataDictionaryType & dict ) const
+TerraSarImageMetadataInterface::GetCornersIncidenceAnglesIndex(const MetaDataDictionaryType& dict) const
{
- ossimplugins::IncidenceAngles * ia = this->GetIncidenceAngles( dict );
+ ossimplugins::IncidenceAngles * ia = this->GetIncidenceAngles(dict);
ImageKeywordlistType imageKeywordlist;
-
+
TerraSarImageMetadataInterface::IndexVectorType iv;
-
+
if (dict.HasKey(MetaDataKey::OSSIMKeywordlistKey))
- {
+ {
itk::ExposeMetaData<ImageKeywordlistType>(dict, MetaDataKey::OSSIMKeywordlistKey, imageKeywordlist);
- }
+ }
ossimKeywordlist kwl;
imageKeywordlist.convertToOSSIMKeywordlist(kwl);
-
+
itk::OStringStream oss;
itk::OStringStream oss2;
-
+
unsigned int nbAngles = this->GetNumberOfCornerIncidenceAngles(dict);
- for(unsigned int i=0; i<nbAngles; i++)
- {
+ for (unsigned int i = 0; i < nbAngles; i++)
+ {
TerraSarImageMetadataInterface::IndexType it;
oss.str("");
@@ -913,21 +885,20 @@ TerraSarImageMetadataInterface::GetCornersIncidenceAnglesIndex( const MetaDataDi
ossimString tempVal = kwl.find(oss.str().c_str());
it[0] = tempVal.toInt();
-
+
oss2.str("");
oss2 << "incidenceAngles.cornersInfoIncidenceAngle[" << i << "].infoIncidenceAngle.refColumn";
tempVal = kwl.find(oss2.str().c_str());
it[1] = tempVal.toInt();
-
+
iv.push_back(it);
- }
-
+ }
+
delete ia;
-
+
return iv;
-
-}
+}
} // end namespace otb
diff --git a/Code/IO/otbTerraSarImageMetadataInterface.h b/Code/IO/otbTerraSarImageMetadataInterface.h
index 7559c6dd19..9541a90745 100644
--- a/Code/IO/otbTerraSarImageMetadataInterface.h
+++ b/Code/IO/otbTerraSarImageMetadataInterface.h
@@ -40,7 +40,7 @@ namespace otb
* \brief Creation of an "otb" TerraSarImageMetadataInterface that gets metadata.
*
*/
- class ITK_EXPORT TerraSarImageMetadataInterface : public itk::Object
+class ITK_EXPORT TerraSarImageMetadataInterface : public itk::Object
{
public:
@@ -49,14 +49,13 @@ public:
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
-
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
itkTypeMacro(TerraSarImageMetadataInterface, itk::Object);
- typedef itk::ImageBase< 2 > ImageType;
+ typedef itk::ImageBase<2> ImageType;
typedef ImageType::IndexType IndexType;
typedef std::vector<IndexType> IndexVectorType;
typedef itk::MetaDataDictionary MetaDataDictionaryType;
@@ -68,101 +67,100 @@ public:
typedef std::vector<unsigned int> UIntVectorType;
/** Set the image used to get the metadata */
- itkSetObjectMacro(Image,ImageType);
+ itkSetObjectMacro(Image, ImageType);
/** Get the sensor ID from the ossim metadata */
- std::string GetSensorID(const MetaDataDictionaryType & dict ) const;
+ std::string GetSensorID(const MetaDataDictionaryType& dict) const;
/** Get the imaging start acquisition day from the ossim metadata */
- int GetDay( const MetaDataDictionaryType & ) const;
+ int GetDay(const MetaDataDictionaryType&) const;
/** Get the imaging start acquisition month from the ossim metadata */
- int GetMonth( const MetaDataDictionaryType & ) const;
+ int GetMonth(const MetaDataDictionaryType&) const;
/** Get the imaging start acquisition year from the ossim metadata */
- int GetYear( const MetaDataDictionaryType & ) const;
+ int GetYear(const MetaDataDictionaryType&) const;
/** Get the imaging start acquisition hour from the ossim metadata */
- int GetHour( const MetaDataDictionaryType & ) const;
+ int GetHour(const MetaDataDictionaryType&) const;
/** Get the imaging start acquisition minute from the ossim metadata */
- int GetMinute( const MetaDataDictionaryType & ) const;
+ int GetMinute(const MetaDataDictionaryType&) const;
/** Get the imaging production day from the ossim metadata : generationTime variable */
- int GetProductionDay( const MetaDataDictionaryType & ) const;
+ int GetProductionDay(const MetaDataDictionaryType&) const;
/** Get the imaging production month from the ossim metadata : generationTime variable */
- int GetProductionMonth( const MetaDataDictionaryType & ) const;
+ int GetProductionMonth(const MetaDataDictionaryType&) const;
/** Get the imaging production year from the ossim metadata : generationTime variable */
- int GetProductionYear( const MetaDataDictionaryType & ) const;
+ int GetProductionYear(const MetaDataDictionaryType&) const;
/** Get the calibration.calFactor : generationTime variable */
- double GetCalibrationFactor( const MetaDataDictionaryType & ) const;
+ double GetCalibrationFactor(const MetaDataDictionaryType&) const;
+
+ /** Get the noise structure */
+ ossimplugins::Noise * GetNoise(const MetaDataDictionaryType&) const;
+
+ /** Get the number of noise records */
+ unsigned int GetNumberOfNoiseRecords(const MetaDataDictionaryType&) const;
- /** Get the noise structure */
- ossimplugins::Noise * GetNoise( const MetaDataDictionaryType & ) const;
-
- /** Get the number of noise records */
- unsigned int GetNumberOfNoiseRecords( const MetaDataDictionaryType & ) const;
-
- /** Get the polynomial degree list */
- UIntVectorType GetNoisePolynomialDegrees( const MetaDataDictionaryType & ) const;
+ /** Get the polynomial degree list */
+ UIntVectorType GetNoisePolynomialDegrees(const MetaDataDictionaryType&) const;
/** Get the polynomial coefficient list */
- DoubleVectorVectorType GetNoisePolynomialCoefficientsList( const MetaDataDictionaryType & ) const;
-
- /** Get timeUTC noise acquisition list in Julian day */
- DoubleVectorType GetNoiseTimeUTCList( const MetaDataDictionaryType & ) const;
-
- /** Get noise minimum validity range list */
- DoubleVectorType GetNoiseValidityRangeMinList( const MetaDataDictionaryType & ) const;
-
- /** Get noise maximum validity range list */
- DoubleVectorType GetNoiseValidityRangeMaxList( const MetaDataDictionaryType & ) const;
-
- /** Get noise reference point list */
- DoubleVectorType GetNoiseReferencePointList( const MetaDataDictionaryType & ) const;
-
- /** Get the radar frequency */
- double GetRadarFrequency( const MetaDataDictionaryType & ) const;
-
- /** Get the PRF */
- double GetPRF( const MetaDataDictionaryType & ) const;
-
- /** Get the incidence angles structure */
- ossimplugins::IncidenceAngles* GetIncidenceAngles( const MetaDataDictionaryType & ) const;
-
- /** Get the number of corner incidence angles */
- unsigned int GetNumberOfCornerIncidenceAngles( const MetaDataDictionaryType & ) const;
-
- /** Get the Mean Incidence angles */
- double GetMeanIncidenceAngles( const MetaDataDictionaryType & ) const;
-
- /** Get the center incidence angle */
- double GetCenterIncidenceAngle( const MetaDataDictionaryType & ) const;
-
- /** Get the center index */
- IndexType GetCenterIncidenceAngleIndex( const MetaDataDictionaryType & ) const;
-
- /** Get the corners incidence angles */
- DoubleVectorType GetCornersIncidenceAngles( const MetaDataDictionaryType & ) const;
-
- /** Get the corners index */
- IndexVectorType GetCornersIncidenceAnglesIndex( const MetaDataDictionaryType & ) const;
-
- bool CanRead( const MetaDataDictionaryType & ) const;
+ DoubleVectorVectorType GetNoisePolynomialCoefficientsList(const MetaDataDictionaryType&) const;
+
+ /** Get timeUTC noise acquisition list in Julian day */
+ DoubleVectorType GetNoiseTimeUTCList(const MetaDataDictionaryType&) const;
+
+ /** Get noise minimum validity range list */
+ DoubleVectorType GetNoiseValidityRangeMinList(const MetaDataDictionaryType&) const;
+
+ /** Get noise maximum validity range list */
+ DoubleVectorType GetNoiseValidityRangeMaxList(const MetaDataDictionaryType&) const;
+
+ /** Get noise reference point list */
+ DoubleVectorType GetNoiseReferencePointList(const MetaDataDictionaryType&) const;
+
+ /** Get the radar frequency */
+ double GetRadarFrequency(const MetaDataDictionaryType&) const;
+
+ /** Get the PRF */
+ double GetPRF(const MetaDataDictionaryType&) const;
+
+ /** Get the incidence angles structure */
+ ossimplugins::IncidenceAngles* GetIncidenceAngles(const MetaDataDictionaryType&) const;
+
+ /** Get the number of corner incidence angles */
+ unsigned int GetNumberOfCornerIncidenceAngles(const MetaDataDictionaryType&) const;
+
+ /** Get the Mean Incidence angles */
+ double GetMeanIncidenceAngles(const MetaDataDictionaryType&) const;
+
+ /** Get the center incidence angle */
+ double GetCenterIncidenceAngle(const MetaDataDictionaryType&) const;
+
+ /** Get the center index */
+ IndexType GetCenterIncidenceAngleIndex(const MetaDataDictionaryType&) const;
+
+ /** Get the corners incidence angles */
+ DoubleVectorType GetCornersIncidenceAngles(const MetaDataDictionaryType&) const;
+
+ /** Get the corners index */
+ IndexVectorType GetCornersIncidenceAnglesIndex(const MetaDataDictionaryType&) const;
+
+ bool CanRead(const MetaDataDictionaryType&) const;
protected:
TerraSarImageMetadataInterface();
- virtual ~TerraSarImageMetadataInterface() {};
-
+ virtual ~TerraSarImageMetadataInterface() {}
private:
- TerraSarImageMetadataInterface(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ TerraSarImageMetadataInterface(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- OTB_GCP m_GCP;
+ OTB_GCP m_GCP;
ImageType::Pointer m_Image;
};
diff --git a/Code/IO/otbTileMapFetcher.cxx b/Code/IO/otbTileMapFetcher.cxx
index 147f47ad35..e1cae3bd8d 100644
--- a/Code/IO/otbTileMapFetcher.cxx
+++ b/Code/IO/otbTileMapFetcher.cxx
@@ -1,19 +1,19 @@
/*=========================================================================
-
+
Program: ORFEO Toolbox
Language: C++
Date: $Date$
Version: $Revision$
-
-
+
+
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
-
-
+
+
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
-
+
=========================================================================*/
#include "otbTileMapFetcher.h"
@@ -21,561 +21,553 @@
namespace otb
{
- /** Constructor */
- TileMapFetcher::TileMapFetcher()
- {
- // Set server name
- m_ServerName = "";
-
- // Set Extension
- m_FileSuffix = ".png";
-
- // Set Cache size
- m_CacheSize = 100;
-
- // Set cache directory
- m_CacheDirectory = "";
-
- // Set coordinates
- m_X = 0;
- m_Y = 0;
- m_Z = 1;
-
- // Generate Logo tile
- this->GenerateLogoTile();
- }
-
- /** Destructor */
- TileMapFetcher::~TileMapFetcher()
- {
- // Remove all tiles in cache directory
- this->UnregisterAllCachedTiles();
- }
-
- /** FetchTile */
- TileMapFetcher::ImagePointerType TileMapFetcher::FetchTile(unsigned int x, unsigned int y, unsigned int z)
- {
- bool isInCache = false;
- bool fetchingIsOK = true;
-
- /* Set coordinates */
- m_X = x;
- m_Y = y;
- m_Z = z;
-
- /* Create filename */
- this->GenerateFileName();
-
- /* Check if tile is in cache */
- isInCache = this->IsTileInCache();
-
- /* Fetch tile from web (check if local tile is out to date) */
- if(!isInCache)
+/** Constructor */
+TileMapFetcher::TileMapFetcher()
+{
+ // Set server name
+ m_ServerName = "";
+
+ // Set Extension
+ m_FileSuffix = ".png";
+
+ // Set Cache size
+ m_CacheSize = 100;
+
+ // Set cache directory
+ m_CacheDirectory = "";
+
+ // Set coordinates
+ m_X = 0;
+ m_Y = 0;
+ m_Z = 1;
+
+ // Generate Logo tile
+ this->GenerateLogoTile();
+}
+
+/** Destructor */
+TileMapFetcher::~TileMapFetcher()
+{
+ // Remove all tiles in cache directory
+ this->UnregisterAllCachedTiles();
+}
+
+/** FetchTile */
+TileMapFetcher::ImagePointerType TileMapFetcher::FetchTile(unsigned int x, unsigned int y, unsigned int z)
+{
+ bool isInCache = false;
+ bool fetchingIsOK = true;
+
+ /* Set coordinates */
+ m_X = x;
+ m_Y = y;
+ m_Z = z;
+
+ /* Create filename */
+ this->GenerateFileName();
+
+ /* Check if tile is in cache */
+ isInCache = this->IsTileInCache();
+
+ /* Fetch tile from web (check if local tile is out to date) */
+ if (!isInCache)
{
- // If fetching is ok
- if( this->FetchTileFromServer() )
+ // If fetching is ok
+ if (this->FetchTileFromServer())
{
- fetchingIsOK = true;
- // Register tile in cache
- this->RegisterTileInCache();
+ fetchingIsOK = true;
+ // Register tile in cache
+ this->RegisterTileInCache();
}
- else
+ else
{
- // Else get tile from cache
- fetchingIsOK = false;
+ // Else get tile from cache
+ fetchingIsOK = false;
}
-
+
}
-
- /* fetch tile from cache */
- return (this->ReadTileFromCache(fetchingIsOK));
- }
-
- /** Fetch Tile from Server and set it in cache */
- bool TileMapFetcher::FetchTileFromServer()
- {
- bool result = false;
-
- // Path and filename for this tile
- std::ostringstream pathAndFileName;
-
- pathAndFileName << m_CacheDirectory;
-
- if (m_CacheDirectory.at(m_CacheDirectory.size()-1) != '/')
- pathAndFileName << "/";
-
- pathAndFileName << m_FileName;
-
- // Open file
- FILE* output_file = fopen(pathAndFileName.str().c_str(),"w");
- if (output_file == NULL)
+
+ /* fetch tile from cache */
+ return (this->ReadTileFromCache(fetchingIsOK));
+}
+
+/** Fetch Tile from Server and set it in cache */
+bool TileMapFetcher::FetchTileFromServer()
+{
+ bool result = false;
+
+ // Path and filename for this tile
+ std::ostringstream pathAndFileName;
+
+ pathAndFileName << m_CacheDirectory;
+
+ if (m_CacheDirectory.at(m_CacheDirectory.size() - 1) != '/') pathAndFileName << "/";
+
+ pathAndFileName << m_FileName;
+
+ // Open file
+ FILE* output_file = fopen(pathAndFileName.str().c_str(), "w");
+ if (output_file == NULL)
{
- itkExceptionMacro(<<"FetchTileFromServer : bad file name.");
- return result;
+ itkExceptionMacro(<< "FetchTileFromServer : bad file name.");
+ return result;
}
-
- // Browser type
- std::ostringstream browserStream;
- browserStream << "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-GB; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11";
-
- // Init curl
- CURL *curl;
- CURLcode res;
- curl = curl_easy_init();
-
- // Generate URL
- this->GenerateOSMurl();
-
- if (m_OsmUrl == "")
+
+ // Browser type
+ std::ostringstream browserStream;
+ browserStream << "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-GB; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11";
+
+ // Init curl
+ CURL * curl;
+ CURLcode res;
+ curl = curl_easy_init();
+
+ // Generate URL
+ this->GenerateOSMurl();
+
+ if (m_OsmUrl == "")
{
- itkExceptionMacro(<<"FetchTileFromServer : bad url.");
- return false;
+ itkExceptionMacro(<< "FetchTileFromServer : bad url.");
+ return false;
}
-
- char url[200];
- strcpy(url,m_OsmUrl.data());
-
- char browser[200];
- strcpy(browser,browserStream.str().data());
-
- //Download the file
- if (curl)
+
+ char url[200];
+ strcpy(url, m_OsmUrl.data());
+
+ char browser[200];
+ strcpy(browser, browserStream.str().data());
+
+ //Download the file
+ if (curl)
{
- curl_easy_setopt(curl, CURLOPT_USERAGENT, browser);
- curl_easy_setopt(curl, CURLOPT_URL, url);
- curl_easy_setopt(curl, CURLOPT_WRITEDATA, output_file);
- res = curl_easy_perform(curl);
-
- // If res != 0 there is a problem while downloading (connection error)
- if (res != 0)
+ curl_easy_setopt(curl, CURLOPT_USERAGENT, browser);
+ curl_easy_setopt(curl, CURLOPT_URL, url);
+ curl_easy_setopt(curl, CURLOPT_WRITEDATA, output_file);
+ res = curl_easy_perform(curl);
+
+ // If res != 0 there is a problem while downloading (connection error)
+ if (res != 0)
{
- // Close and remove file in cache
- fclose(output_file);
- if (remove(pathAndFileName.str().c_str()) != 0)
+ // Close and remove file in cache
+ fclose(output_file);
+ if (remove(pathAndFileName.str().c_str()) != 0)
{
- itkDebugMacro(<<"FetchTileFromServer : transfert error - Error while deleting tile in cache!");
+ itkDebugMacro(<< "FetchTileFromServer : transfert error - Error while deleting tile in cache!");
}
- itkDebugMacro(<<"FetchTileFromServer : transfert error.");
- return false;
+ itkDebugMacro(<< "FetchTileFromServer : transfert error.");
+ return false;
}
- // Else download was proceed
- else
+ // Else download was proceed
+ else
{
- // Get error code
- int code;
- curl_easy_getinfo(curl,CURLINFO_HTTP_CODE, &code);
-
- // 404 Error (not found)
- if (code == 404)
+ // Get error code
+ int code;
+ curl_easy_getinfo(curl, CURLINFO_HTTP_CODE, &code);
+
+ // 404 Error (not found)
+ if (code == 404)
{
- // Close and remove file in cache
- fclose(output_file);
- if (remove(pathAndFileName.str().c_str()) != 0)
+ // Close and remove file in cache
+ fclose(output_file);
+ if (remove(pathAndFileName.str().c_str()) != 0)
{
- itkDebugMacro(<<"FetchTileFromServer : HTTP Error 404 - Error while deleting tile in cache!");
+ itkDebugMacro(<< "FetchTileFromServer : HTTP Error 404 - Error while deleting tile in cache!");
}
- itkDebugMacro(<<"FetchTileFromServer : HTTP Error 404");
- return false;
+ itkDebugMacro(<< "FetchTileFromServer : HTTP Error 404");
+ return false;
}
- // Tile is ok
- else
+ // Tile is ok
+ else
{
- result = true;
+ result = true;
}
}
}
- // close file
- fclose(output_file);
- // Cleanup curl
- curl_easy_cleanup(curl);
- return result;
- }
-
- /** Generate Tile FileName */
- void TileMapFetcher::GenerateFileName()
- {
- std::string server = m_ServerName.substr(7,m_ServerName.size()); // Get online server name without "http://"
-
- // replace "/" by "_" in server name
- for(unsigned int i=0; i<server.size(); i++)
+ // close file
+ fclose(output_file);
+ // Cleanup curl
+ curl_easy_cleanup(curl);
+ return result;
+}
+
+/** Generate Tile FileName */
+void TileMapFetcher::GenerateFileName()
+{
+ std::string server = m_ServerName.substr(7, m_ServerName.size()); // Get online server name without "http://"
+
+ // replace "/" by "_" in server name
+ for (unsigned int i = 0; i < server.size(); i++)
{
- if (server[i] == '/')
- server[i] = '_';
+ if (server[i] == '/') server[i] = '_';
}
-
- std::ostringstream filename;
-
- // Generate file name : serverName_Z_X_Y.png
- filename<<server;
- filename<<m_Z;
- filename<<"_";
- filename<<m_X;
- filename<<"_";
- filename<<m_Y;
- filename<<m_FileSuffix;
-
- m_FileName = filename.str();
- }
-
- /** Generate OSM url */
- void TileMapFetcher::GenerateOSMurl()
- {
- /* Check server name */
- if (m_ServerName[0]!='h'
- || m_ServerName[1]!='t'
- || m_ServerName[2]!='t'
- || m_ServerName[3]!='p')
+
+ std::ostringstream filename;
+
+ // Generate file name : serverName_Z_X_Y.png
+ filename << server;
+ filename << m_Z;
+ filename << "_";
+ filename << m_X;
+ filename << "_";
+ filename << m_Y;
+ filename << m_FileSuffix;
+
+ m_FileName = filename.str();
+}
+
+/** Generate OSM url */
+void TileMapFetcher::GenerateOSMurl()
+{
+ /* Check server name */
+ if (m_ServerName[0] != 'h'
+ || m_ServerName[1] != 't'
+ || m_ServerName[2] != 't'
+ || m_ServerName[3] != 'p')
{
- itkExceptionMacro(<<"Bad server name!");
+ itkExceptionMacro(<< "Bad server name!");
}
-
- /* Generate urlStream */
- std::ostringstream urlStream;
-
- urlStream << m_ServerName;
- if (m_ServerName.at(m_ServerName.size()-1) != '/')
- urlStream << "/";
- urlStream << m_Z;
- urlStream << "/";
- urlStream << m_X;
- urlStream << "/";
- urlStream << m_Y;
- urlStream << m_FileSuffix;
-
- m_OsmUrl = urlStream.str();
- }
-
- /** Check if tile is in cache */
- bool TileMapFetcher::IsTileInCache()
- {
- bool result = false;
-
- // First if filename exists
- if ( m_FileName == "" )
+
+ /* Generate urlStream */
+ std::ostringstream urlStream;
+
+ urlStream << m_ServerName;
+ if (m_ServerName.at(m_ServerName.size() - 1) != '/') urlStream << "/";
+ urlStream << m_Z;
+ urlStream << "/";
+ urlStream << m_X;
+ urlStream << "/";
+ urlStream << m_Y;
+ urlStream << m_FileSuffix;
+
+ m_OsmUrl = urlStream.str();
+}
+
+/** Check if tile is in cache */
+bool TileMapFetcher::IsTileInCache()
+{
+ bool result = false;
+
+ // First if filename exists
+ if (m_FileName == "")
{
- itkDebugMacro(<<"No filename specified.");
- return result;
+ itkDebugMacro(<< "No filename specified.");
+ return result;
}
-
- std::deque<otb::TileRecord>::iterator it;
-
- // Search tile with its filename
- for(it=m_CacheManagement.begin(); it!=m_CacheManagement.end(); it++)
+
+ std::deque<otb::TileRecord>::iterator it;
+
+ // Search tile with its filename
+ for (it = m_CacheManagement.begin(); it != m_CacheManagement.end(); it++)
{
- if(it->GetFileName() == m_FileName)
+ if (it->GetFileName() == m_FileName)
{
- result = true;
- break;
+ result = true;
+ break;
}
}
- return result;
- }
-
- /** Register Tile in cache */
- bool TileMapFetcher::RegisterTileInCache()
- {
- otb::TileRecord tr;
-
- // Configure Record
- tr.SetFileName(m_FileName);
- tr.SetDate();
-
- if(m_CacheManagement.size() > m_CacheSize)
+ return result;
+}
+
+/** Register Tile in cache */
+bool TileMapFetcher::RegisterTileInCache()
+{
+ otb::TileRecord tr;
+
+ // Configure Record
+ tr.SetFileName(m_FileName);
+ tr.SetDate();
+
+ if (m_CacheManagement.size() > m_CacheSize)
{
- this->UnregisterFirstCachedTile();
+ this->UnregisterFirstCachedTile();
}
-
- // Add record in deque
- m_CacheManagement.push_back(tr);
-
- return true;
- }
-
- /** Unregister Cached Tile */
- bool TileMapFetcher::UnregisterFirstCachedTile()
- {
- std::deque<otb::TileRecord>::iterator it;
-
- it=m_CacheManagement.begin();
-
- // Filename of the first input tile
- std::string filename = it->GetFileName();
-
- // Generate path and filename
+
+ // Add record in deque
+ m_CacheManagement.push_back(tr);
+
+ return true;
+}
+
+/** Unregister Cached Tile */
+bool TileMapFetcher::UnregisterFirstCachedTile()
+{
+ std::deque<otb::TileRecord>::iterator it;
+
+ it = m_CacheManagement.begin();
+
+ // Filename of the first input tile
+ std::string filename = it->GetFileName();
+
+ // Generate path and filename
+ std::ostringstream pathAndFileName;
+
+ pathAndFileName << m_CacheDirectory;
+
+ if (m_CacheDirectory.at(m_CacheDirectory.size() - 1) != '/') pathAndFileName << "/";
+
+ pathAndFileName << filename;
+
+ // Remove tile in deque
+ m_CacheManagement.pop_front();
+
+ // Remove tile file on hard drive
+ if (remove(pathAndFileName.str().c_str()) != 0)
+ {
+ itkDebugMacro(<< "Error when deleting tile in cache!");
+ return false;
+ }
+ return true;
+}
+
+/** Remove all tiles in cache */
+bool TileMapFetcher::UnregisterAllCachedTiles()
+{
+ bool result = true;
+ std::deque<otb::TileRecord>::iterator it;
+ std::string filename;
+
+ /* Loop on deque to get filename and delete file */
+ for (it = m_CacheManagement.begin(); it != m_CacheManagement.end(); it++)
+ {
+ filename = it->GetFileName();
+
std::ostringstream pathAndFileName;
-
+
pathAndFileName << m_CacheDirectory;
-
- if (m_CacheDirectory.at(m_CacheDirectory.size()-1) != '/')
- pathAndFileName << "/";
-
+
+ if (m_CacheDirectory.at(m_CacheDirectory.size() - 1) != '/') pathAndFileName << "/";
+
pathAndFileName << filename;
-
- // Remove tile in deque
- m_CacheManagement.pop_front();
-
- // Remove tile file on hard drive
+
if (remove(pathAndFileName.str().c_str()) != 0)
- {
- itkDebugMacro(<<"Error when deleting tile in cache!");
- return false;
- }
- return true;
- }
-
- /** Remove all tiles in cache */
- bool TileMapFetcher::UnregisterAllCachedTiles()
- {
- bool result = true;
- std::deque<otb::TileRecord>::iterator it;
- std::string filename;
-
- /* Loop on deque to get filename and delete file */
- for(it=m_CacheManagement.begin(); it!=m_CacheManagement.end(); it++)
- {
- filename = it->GetFileName();
-
- std::ostringstream pathAndFileName;
-
- pathAndFileName << m_CacheDirectory;
-
- if (m_CacheDirectory.at(m_CacheDirectory.size()-1) != '/')
- pathAndFileName << "/";
-
- pathAndFileName << filename;
-
- if (remove(pathAndFileName.str().c_str()) != 0)
{
- itkDebugMacro(<<"Error when deleting tile in cache!");
- result = false;
+ itkDebugMacro(<< "Error when deleting tile in cache!");
+ result = false;
}
}
- // Clear deque
- m_CacheManagement.clear();
- return result;
- }
-
- /** Read tile in cache directory */
- TileMapFetcher::ImagePointerType TileMapFetcher::ReadTileFromCache(bool fetchingIsOK)
- {
- // Create an output image
- ImagePointerType tempImage;
-
- // If fetch tile from server is ok
- if (fetchingIsOK)
+ // Clear deque
+ m_CacheManagement.clear();
+ return result;
+}
+
+/** Read tile in cache directory */
+TileMapFetcher::ImagePointerType TileMapFetcher::ReadTileFromCache(bool fetchingIsOK)
+{
+ // Create an output image
+ ImagePointerType tempImage;
+
+ // If fetch tile from server is ok
+ if (fetchingIsOK)
{
- // Create a reader
- itk::ImageFileReader<ImageType>::Pointer reader = itk::ImageFileReader<ImageType>::New();
-
- // Create path and filename
- std::ostringstream pathAndFileName;
-
- pathAndFileName << m_CacheDirectory;
-
- if (m_CacheDirectory.at(m_CacheDirectory.size()-1) != '/')
- pathAndFileName << "/";
-
- pathAndFileName << m_FileName;
-
- // Read file in cache directory
- reader->SetFileName(pathAndFileName.str());
- reader->Update();
-
- tempImage = reader->GetOutput();
-
+ // Create a reader
+ itk::ImageFileReader<ImageType>::Pointer reader = itk::ImageFileReader<ImageType>::New();
+
+ // Create path and filename
+ std::ostringstream pathAndFileName;
+
+ pathAndFileName << m_CacheDirectory;
+
+ if (m_CacheDirectory.at(m_CacheDirectory.size() - 1) != '/') pathAndFileName << "/";
+
+ pathAndFileName << m_FileName;
+
+ // Read file in cache directory
+ reader->SetFileName(pathAndFileName.str());
+ reader->Update();
+
+ tempImage = reader->GetOutput();
+
}
- // Else we return logo tile
- else
+ // Else we return logo tile
+ else
{
- // Read logo tile
- tempImage = m_LogoTile;
+ // Read logo tile
+ tempImage = m_LogoTile;
}
-
- return(tempImage);
- }
-
- /** Generate logo tile */
- void TileMapFetcher::GenerateLogoTile()
- {
- // Create image size
- ImageType::SizeType size;
- size.Fill(256);
-
- // Create index start
- ImageType::IndexType start;
- start.Fill( 0 );
-
- // Create region size
- ImageType::RegionType region;
- region.SetIndex( start );
- region.SetSize( size );
-
- // Create image, set properties, and allocate
- m_LogoTile = ImageType::New();
- m_LogoTile->SetRegions(region);
- m_LogoTile->SetNumberOfComponentsPerPixel(3);
- m_LogoTile->Allocate();
-
- // Create pixel
- ImageType::PixelType white(3);
-
- // Fill with white
- white.Fill(255);
-
- // Fill image buffer with white pixel
- m_LogoTile->FillBuffer(white);
- }
-
- /** Fetch Tile from Server and set it in cache - Check if tile must be update */
- /** Comment because cache is not persistant */
- /* bool TileMapFetcher::FetchTileFromServer(bool isInCache)
- {
- bool result = false;
-
- std::ostringstream pathAndFileName;
-
- pathAndFileName << m_CacheDirectory;
-
- if (m_CacheDirectory.at(m_CacheDirectory.size()-1) != '/')
- pathAndFileName << "/";
-
- pathAndFileName << m_FileName;
-
- FILE* output_file = fopen(pathAndFileName.str().c_str(),"w");
- if (output_file == NULL)
- {
- itkExceptionMacro(<<"FetchTileFromServer : bad file name.");
- return result;
- }
-
- std::ostringstream browserStream;
- browserStream << "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-GB; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11";
-
- CURL *curl;
- CURLcode res;
- curl = curl_easy_init();
-
- this->GenerateOSMurl();
-
- std::cout<<std::endl;
- std::cout<<"URL: "<<m_OsmUrl<<std::endl;
- std::cout<<"FILENAME: "<<pathAndFileName.str()<<std::endl;
- std::cout<<"IS IN CACHE: "<<isInCache<<std::endl;
- std::cout<<std::endl;
-
- if (m_OsmUrl == "")
- {
- itkExceptionMacro(<<"FetchTileFromServer : bad url.");
- return false;
- }
-
- char url[200];
- strcpy(url,m_OsmUrl.data());
-
- char browser[200];
- strcpy(browser,browserStream.str().data());
-
- //Download the file
- if (curl)
- {
- curl_easy_setopt(curl, CURLOPT_USERAGENT, browser);
- curl_easy_setopt(curl, CURLOPT_URL, url);
- curl_easy_setopt(curl, CURLOPT_WRITEDATA, output_file);
-
- // If tile is in cache, ask curl to check if tile is out to date
- if(isInCache)
- {
- // Search for time condition
- long time_condition;
-
- std::deque<otb::TileRecord>::iterator it;
- std::deque<otb::TileRecord>::iterator it2;
-
- for(it=m_CacheManagement.begin(); it!=m_CacheManagement.end(); it++)
- {
- if(it->GetFileName() == m_FileName)
- {
- it2 = it;
- break;
- }
- }
-
- time_condition = static_cast<long>(it2->GetDate());
-
- std::cout<<time_condition<<std::endl;
-
- curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
- curl_easy_setopt(curl, CURLOPT_TIMEVALUE, time_condition);
-
- res = curl_easy_perform(curl);
-
- if (res == 0)
- {
- long response;
- curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response);
- // 304 = Not Modified
- if (response == 304)
- {
- std::cout<<"TUILE NON MODIFIEE"<<std::endl;
- result = true;
- }
- // 200 = Ok
- else if (response == 200)
- {
- double size;
- // verify if curl sends us any data - this is a workaround on using CURLOPT_TIMECONDITION
- // when the server has a (incorrect) time earlier than the time on the file we already have
- curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &size);
- if (size == 0)
- {
- itkExceptionMacro(<<"FetchTileFromServer : transfert error - Size == 0.");
- return false;
- }
- else
- {
- // Update time in cache
- std::cout<<"TUILE MODIFIEE MISE A JOUR DU CACHE"<<std::endl;
- it2->SetDate();
- result = true;
- }
- }
- else
- {
- itkExceptionMacro(<<"FetchTileFromServer : transfert error.");
- return false;
- }
- }
- else
- {
- itkExceptionMacro(<<"FetchTileFromServer : transfert error.");
- return false;
- }
- }
- // Not in cache
- else
- {
- res = curl_easy_perform(curl);
- if (res != 0)
- {
- itkExceptionMacro(<<"FetchTileFromServer : transfert error.");
- return false;
- }
- else
- {
- std::cout<<"RECUPERATION DE LA TUILE"<<std::endl;
- result = true;
- }
- }
-
- fclose(output_file);
- // always cleanup
- curl_easy_cleanup(curl);
- return result;
- }
- return false;
- }
- */
-
+
+ return (tempImage);
}
+/** Generate logo tile */
+void TileMapFetcher::GenerateLogoTile()
+{
+ // Create image size
+ ImageType::SizeType size;
+ size.Fill(256);
+
+ // Create index start
+ ImageType::IndexType start;
+ start.Fill(0);
+
+ // Create region size
+ ImageType::RegionType region;
+ region.SetIndex(start);
+ region.SetSize(size);
+
+ // Create image, set properties, and allocate
+ m_LogoTile = ImageType::New();
+ m_LogoTile->SetRegions(region);
+ m_LogoTile->SetNumberOfComponentsPerPixel(3);
+ m_LogoTile->Allocate();
+
+ // Create pixel
+ ImageType::PixelType white(3);
+
+ // Fill with white
+ white.Fill(255);
+
+ // Fill image buffer with white pixel
+ m_LogoTile->FillBuffer(white);
+}
+
+/** Fetch Tile from Server and set it in cache - Check if tile must be update */
+/** Comment because cache is not persistant */
+/* bool TileMapFetcher::FetchTileFromServer(bool isInCache)
+ {
+ bool result = false;
+
+ std::ostringstream pathAndFileName;
+
+ pathAndFileName << m_CacheDirectory;
+ if (m_CacheDirectory.at(m_CacheDirectory.size()-1) != '/')
+ pathAndFileName << "/";
+
+ pathAndFileName << m_FileName;
+
+ FILE* output_file = fopen(pathAndFileName.str().c_str(),"w");
+ if (output_file == NULL)
+ {
+ itkExceptionMacro(<<"FetchTileFromServer : bad file name.");
+ return result;
+ }
+
+ std::ostringstream browserStream;
+ browserStream << "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-GB; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11";
+
+ CURL *curl;
+ CURLcode res;
+ curl = curl_easy_init();
+
+ this->GenerateOSMurl();
+
+ std::cout<<std::endl;
+ std::cout<<"URL: "<<m_OsmUrl<<std::endl;
+ std::cout<<"FILENAME: "<<pathAndFileName.str()<<std::endl;
+ std::cout<<"IS IN CACHE: "<<isInCache<<std::endl;
+ std::cout<<std::endl;
+
+ if (m_OsmUrl == "")
+ {
+ itkExceptionMacro(<<"FetchTileFromServer : bad url.");
+ return false;
+ }
+
+ char url[200];
+ strcpy(url,m_OsmUrl.data());
+
+ char browser[200];
+ strcpy(browser,browserStream.str().data());
+
+ //Download the file
+ if (curl)
+ {
+ curl_easy_setopt(curl, CURLOPT_USERAGENT, browser);
+ curl_easy_setopt(curl, CURLOPT_URL, url);
+ curl_easy_setopt(curl, CURLOPT_WRITEDATA, output_file);
+
+ // If tile is in cache, ask curl to check if tile is out to date
+ if(isInCache)
+ {
+ // Search for time condition
+ long time_condition;
+
+ std::deque<otb::TileRecord>::iterator it;
+ std::deque<otb::TileRecord>::iterator it2;
+
+ for(it=m_CacheManagement.begin(); it!=m_CacheManagement.end(); it++)
+ {
+ if(it->GetFileName() == m_FileName)
+ {
+ it2 = it;
+ break;
+ }
+ }
+
+ time_condition = static_cast<long>(it2->GetDate());
+
+ std::cout<<time_condition<<std::endl;
+
+ curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
+ curl_easy_setopt(curl, CURLOPT_TIMEVALUE, time_condition);
+
+ res = curl_easy_perform(curl);
+
+ if (res == 0)
+ {
+ long response;
+ curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response);
+ // 304 = Not Modified
+ if (response == 304)
+ {
+ std::cout<<"TUILE NON MODIFIEE"<<std::endl;
+ result = true;
+ }
+ // 200 = Ok
+ else if (response == 200)
+ {
+ double size;
+ // verify if curl sends us any data - this is a workaround on using CURLOPT_TIMECONDITION
+ // when the server has a (incorrect) time earlier than the time on the file we already have
+ curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD, &size);
+ if (size == 0)
+ {
+ itkExceptionMacro(<<"FetchTileFromServer : transfert error - Size == 0.");
+ return false;
+ }
+ else
+ {
+ // Update time in cache
+ std::cout<<"TUILE MODIFIEE MISE A JOUR DU CACHE"<<std::endl;
+ it2->SetDate();
+ result = true;
+ }
+ }
+ else
+ {
+ itkExceptionMacro(<<"FetchTileFromServer : transfert error.");
+ return false;
+ }
+ }
+ else
+ {
+ itkExceptionMacro(<<"FetchTileFromServer : transfert error.");
+ return false;
+ }
+ }
+ // Not in cache
+ else
+ {
+ res = curl_easy_perform(curl);
+ if (res != 0)
+ {
+ itkExceptionMacro(<<"FetchTileFromServer : transfert error.");
+ return false;
+ }
+ else
+ {
+ std::cout<<"RECUPERATION DE LA TUILE"<<std::endl;
+ result = true;
+ }
+ }
+
+ fclose(output_file);
+ // always cleanup
+ curl_easy_cleanup(curl);
+ return result;
+ }
+ return false;
+ }
+ */
+
+}
diff --git a/Code/IO/otbTileMapFetcher.h b/Code/IO/otbTileMapFetcher.h
index c70381bca0..612ac1f456 100644
--- a/Code/IO/otbTileMapFetcher.h
+++ b/Code/IO/otbTileMapFetcher.h
@@ -1,19 +1,19 @@
/*=========================================================================
-
+
Program: ORFEO Toolbox
Language: C++
Date: $Date$
Version: $Revision$
-
-
+
+
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
-
-
+
+
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
-
+
=========================================================================*/
#ifndef __otbTileMapFetcher_h
#define __otbTileMapFetcher_h
@@ -33,109 +33,108 @@
namespace otb
{
- /** \class TileMapFetcher
- * \brief Get tiles from servers like Open street map.
- *
- */
- class ITK_EXPORT TileMapFetcher : public itk::Object
- {
- public:
- /** Standard typedefs */
- typedef TileMapFetcher Self;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- typedef unsigned char PixelType;
- typedef otb::VectorImage<PixelType, 2> ImageType;
- typedef ImageType::Pointer ImagePointerType;
-
- itkNewMacro(Self);
-
- /** Constructor */
- TileMapFetcher();
-
- /** Destructor */
- virtual ~TileMapFetcher();
-
- /** Accessors */
- itkSetStringMacro(ServerName);
- itkGetStringMacro(ServerName);
-
- itkSetStringMacro(CacheDirectory);
- itkGetStringMacro(CacheDirectory);
-
- itkSetMacro(CacheSize, unsigned int);
- itkGetMacro(CacheSize, unsigned int);
-
- /** Fetcher */
- ImagePointerType FetchTile(unsigned int x, unsigned int y, unsigned int z);
-
- protected:
-
- private:
- /** Generate filename */
- void GenerateFileName();
-
- /** Generate OSM URL */
- void GenerateOSMurl();
-
- /** Check if file is in cache */
- bool IsTileInCache();
-
- /** Fetch Tile from Server */
+/** \class TileMapFetcher
+ * \brief Get tiles from servers like Open street map.
+ *
+ */
+class ITK_EXPORT TileMapFetcher : public itk::Object
+{
+public:
+ /** Standard typedefs */
+ typedef TileMapFetcher Self;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ typedef unsigned char PixelType;
+ typedef otb::VectorImage<PixelType, 2> ImageType;
+ typedef ImageType::Pointer ImagePointerType;
+
+ itkNewMacro(Self);
+
+ /** Constructor */
+ TileMapFetcher();
+
+ /** Destructor */
+ virtual ~TileMapFetcher();
+
+ /** Accessors */
+ itkSetStringMacro(ServerName);
+ itkGetStringMacro(ServerName);
+
+ itkSetStringMacro(CacheDirectory);
+ itkGetStringMacro(CacheDirectory);
+
+ itkSetMacro(CacheSize, unsigned int);
+ itkGetMacro(CacheSize, unsigned int);
+
+ /** Fetcher */
+ ImagePointerType FetchTile(unsigned int x, unsigned int y, unsigned int z);
+
+protected:
+
+private:
+ /** Generate filename */
+ void GenerateFileName();
+
+ /** Generate OSM URL */
+ void GenerateOSMurl();
+
+ /** Check if file is in cache */
+ bool IsTileInCache();
+
+ /** Fetch Tile from Server */
// bool FetchTileFromServer(bool isInCache); // Comment because cache is not persistant
- bool FetchTileFromServer();
-
- /** Read Tile From Cache */
- ImagePointerType ReadTileFromCache(bool fetchingIsOk);
-
- /** Register Tile in cache */
- bool RegisterTileInCache();
-
- /** Unregister cached tile */
- bool UnregisterFirstCachedTile();
-
- /** Unregister All Cached Tiles */
- bool UnregisterAllCachedTiles();
-
- /** Generate Tile with logo */
- void GenerateLogoTile();
-
- /** Fill buffer with a logo */
- void LogoToBuffer(PixelType* buffer);
-
- /** File suffix */
- std::string m_FileSuffix;
-
- /** Server Name */
- std::string m_ServerName;
-
- /** Cache directory */
- std::string m_CacheDirectory;
-
- /** Cache Size */
- unsigned int m_CacheSize;
-
- /** Coordinates */
- unsigned int m_X;
- unsigned int m_Y;
- unsigned int m_Z;
-
- /** FileName */
- std::string m_FileName;
-
- /** OSM Url */
- std::string m_OsmUrl;
-
- /** Cache Management */
- std::deque<otb::TileRecord> m_CacheManagement;
-
- /** Logo tile */
- ImagePointerType m_LogoTile;
-
- };
-
-
+ bool FetchTileFromServer();
+
+ /** Read Tile From Cache */
+ ImagePointerType ReadTileFromCache(bool fetchingIsOk);
+
+ /** Register Tile in cache */
+ bool RegisterTileInCache();
+
+ /** Unregister cached tile */
+ bool UnregisterFirstCachedTile();
+
+ /** Unregister All Cached Tiles */
+ bool UnregisterAllCachedTiles();
+
+ /** Generate Tile with logo */
+ void GenerateLogoTile();
+
+ /** Fill buffer with a logo */
+ void LogoToBuffer(PixelType* buffer);
+
+ /** File suffix */
+ std::string m_FileSuffix;
+
+ /** Server Name */
+ std::string m_ServerName;
+
+ /** Cache directory */
+ std::string m_CacheDirectory;
+
+ /** Cache Size */
+ unsigned int m_CacheSize;
+
+ /** Coordinates */
+ unsigned int m_X;
+ unsigned int m_Y;
+ unsigned int m_Z;
+
+ /** FileName */
+ std::string m_FileName;
+
+ /** OSM Url */
+ std::string m_OsmUrl;
+
+ /** Cache Management */
+ std::deque<otb::TileRecord> m_CacheManagement;
+
+ /** Logo tile */
+ ImagePointerType m_LogoTile;
+
+};
+
} // end namespace otb
#endif
diff --git a/Code/IO/otbTileMapImageIO.cxx b/Code/IO/otbTileMapImageIO.cxx
index 593e990177..1fab93ff55 100644
--- a/Code/IO/otbTileMapImageIO.cxx
+++ b/Code/IO/otbTileMapImageIO.cxx
@@ -68,14 +68,14 @@ TileMapImageIO::TileMapImageIO()
//Resolution depth
m_Depth = 8;
- m_BytePerPixel=1;
-
- m_UseCache=false;
- m_ServerName="";
- m_CacheDirectory=".";
- m_FileSuffix="png";
- m_AddressMode=TileMapAdressingStyle::OSM;
-
+ m_BytePerPixel = 1;
+
+ m_UseCache = false;
+ m_ServerName = "";
+ m_CacheDirectory = ".";
+ m_FileSuffix = "png";
+ m_AddressMode = TileMapAdressingStyle::OSM;
+
m_FileNameIsServerName = false;
// Initialize browser
@@ -99,32 +99,31 @@ TileMapImageIO::~TileMapImageIO()
{
}
-
// Tell only if the file can be read with TileMap.
bool TileMapImageIO::CanReadFile(const char* file)
-{
+{
// First check the extension
- if ( file == NULL )
- {
- itkDebugMacro(<<"No filename specified.");
+ if (file == NULL)
+ {
+ itkDebugMacro(<< "No filename specified.");
return false;
- }
+ }
- std::string filename = file;
+ std::string filename = file;
std::string::size_type gmPos = filename.rfind(".otb");
-
- if ( (gmPos != std::string::npos)
- && (gmPos == filename.length() - 4) )
- {
+
+ if ((gmPos != std::string::npos)
+ && (gmPos == filename.length() - 4))
+ {
m_FileNameIsServerName = false;
return true;
- }
+ }
// Filename is http server
else if (filename.find("http://") == 0)
- {
+ {
m_FileNameIsServerName = true;
return true;
- }
+ }
return false;
}
@@ -139,28 +138,28 @@ void TileMapImageIO::PrintSelf(std::ostream& os, itk::Indent indent) const
void TileMapImageIO::Read(void* buffer)
{
unsigned char * p = static_cast<unsigned char *>(buffer);
- if (p==NULL)
- {
- itkExceptionMacro(<<"Memory allocation error");
+ if (p == NULL)
+ {
+ itkExceptionMacro(<< "Memory allocation error");
return;
- }
+ }
int totLines = this->GetIORegion().GetSize()[1];
int totSamples = this->GetIORegion().GetSize()[0];
int firstLine = this->GetIORegion().GetIndex()[1];
int firstSample = this->GetIORegion().GetIndex()[0];
- int nTilesX = (int) ceil(totSamples/256.)+1;
- int nTilesY = (int) ceil(totLines/256.)+1;
+ int nTilesX = (int) ceil(totSamples / 256.) + 1;
+ int nTilesY = (int) ceil(totLines / 256.) + 1;
// Initialize curl multi handle
m_MultiHandle = curl_multi_init();
-
+
if (!m_MultiHandle)
- {
- itkExceptionMacro( << "Tile Map IO : Curl mutli handle init error.");
- }
-
+ {
+ itkExceptionMacro(<< "Tile Map IO : Curl mutli handle init error.");
+ }
+
// Clear vectors
m_ListCurlHandles.clear();
m_ListFiles.clear();
@@ -168,12 +167,12 @@ void TileMapImageIO::Read(void* buffer)
m_ListTiles.clear();
//Read all the required tiles
- for (int numTileY=0; numTileY<nTilesY; numTileY++)
- {
- for (int numTileX=0; numTileX<nTilesX; numTileX++)
+ for (int numTileY = 0; numTileY < nTilesY; numTileY++)
{
- double xTile = (firstSample+256*numTileX)/((1 << m_Depth)*256.);
- double yTile = (firstLine+256*numTileY)/((1 << m_Depth)*256.);
+ for (int numTileX = 0; numTileX < nTilesX; numTileX++)
+ {
+ double xTile = (firstSample + 256 * numTileX) / ((1 << m_Depth) * 256.);
+ double yTile = (firstLine + 256 * numTileY) / ((1 << m_Depth) * 256.);
std::string lFilename;
@@ -181,24 +180,24 @@ void TileMapImageIO::Read(void* buffer)
this->GenerateTileInfo(xTile, yTile, numTileX, numTileY);
// Try to read tile from cache
- if(!this->CanReadFromCache(m_ListTiles.back().filename))
- {
+ if (!this->CanReadFromCache(m_ListTiles.back().filename))
+ {
// Generate curl handle for this tile
this->GenerateCURLHandle(m_ListTiles.back());
+ }
}
}
- }
-
+
// Fetch tiles from net
this->FetchTiles();
// Cleanup datas use to download tiles
this->Cleanup();
-
+
// Generate buffer
this->GenerateBuffer(p);
- otbMsgDevMacro( << "TileMapImageIO::Read() completed");
+ otbMsgDevMacro(<< "TileMapImageIO::Read() completed");
}
/*
@@ -210,8 +209,8 @@ void TileMapImageIO::GenerateTileInfo(double x, double y, int numTileX, int numT
XYToQuadTree2(x, y, quad2);
std::ostringstream filename;
- BuildFileName(quad2, filename);
-
+ BuildFileName(quad2, filename);
+
// Build tile informations
TileNameAndCoordType lTileInfos;
lTileInfos.numTileX = numTileX;
@@ -219,7 +218,7 @@ void TileMapImageIO::GenerateTileInfo(double x, double y, int numTileX, int numT
lTileInfos.x = x;
lTileInfos.y = y;
lTileInfos.filename = filename.str();
-
+
// Add to vector
m_ListTiles.push_back(lTileInfos);
}
@@ -241,11 +240,11 @@ bool TileMapImageIO::CanReadFromCache(std::string filename)
}
else
{
- itkExceptionMacro( << "TileMapImageIO : Bad addressing Style");
+ itkExceptionMacro(<< "TileMapImageIO : Bad addressing Style");
}
bool lCanRead(false);
lCanRead = imageIO->CanReadFile(filename.c_str());
-
+
return lCanRead;
}
@@ -256,35 +255,35 @@ void TileMapImageIO::GenerateCURLHandle(TileNameAndCoordType tileInfo)
{
// Generate URL
this->GenerateURL(tileInfo.x, tileInfo.y);
-
+
// Initialize curl handle
CURL * lEasyHandle;
lEasyHandle = curl_easy_init();
-
+
if (!lEasyHandle)
- {
- itkExceptionMacro( <<"Tile Map IO : Curl easy handle init error.");
- }
-
+ {
+ itkExceptionMacro(<< "Tile Map IO : Curl easy handle init error.");
+ }
+
// Create file
FILE* lOutputFile = fopen(tileInfo.filename.c_str(), "w");
-
+
if (lOutputFile == NULL)
- {
- itkExceptionMacro(<<"TileMap read : bad file name.");
- }
-
+ {
+ itkExceptionMacro(<< "TileMap read : bad file name.");
+ }
+
// Add file to vector
m_ListFiles.push_back(lOutputFile);
-
+
// Param easy handle
curl_easy_setopt(lEasyHandle, CURLOPT_USERAGENT, m_Browser.data());
curl_easy_setopt(lEasyHandle, CURLOPT_URL, m_ListURLs.back().data());
curl_easy_setopt(lEasyHandle, CURLOPT_WRITEDATA, m_ListFiles.back());
-
+
// Add easy handle to multi handle
curl_multi_add_handle(m_MultiHandle, lEasyHandle);
-
+
// Add hanle to vector
m_ListCurlHandles.push_back(lEasyHandle);
}
@@ -295,53 +294,53 @@ void TileMapImageIO::GenerateCURLHandle(TileNameAndCoordType tileInfo)
void TileMapImageIO::GenerateURL(double x, double y)
{
std::ostringstream urlStream;
-
+
// Google Map
if (m_AddressMode == TileMapAdressingStyle::GM)
- {
+ {
std::ostringstream quad;
XYToQuadTree(x, y, quad);
urlStream << m_ServerName;
urlStream << quad.str();
- }
+ }
// Open Street Map
else if (m_AddressMode == TileMapAdressingStyle::OSM)
- {
+ {
urlStream << m_ServerName;
urlStream << m_Depth;
urlStream << "/";
- urlStream << (long int) (((double) x*(1 << m_Depth)));
+ urlStream << (long int) (((double) x * (1 << m_Depth)));
urlStream << "/";
- urlStream << (long int) (((double) y*(1 << m_Depth)));
+ urlStream << (long int) (((double) y * (1 << m_Depth)));
urlStream << "." << m_FileSuffix;
- }
+ }
// Near Map
else if (m_AddressMode == TileMapAdressingStyle::NEARMAP)
- {
+ {
urlStream << m_ServerName;
urlStream << "hl=en&x=";
- urlStream << vcl_floor(x*(1 << m_Depth) );
+ urlStream << vcl_floor(x * (1 << m_Depth));
urlStream << "&y=";
- urlStream << vcl_floor(y*(1 << m_Depth) );
+ urlStream << vcl_floor(y * (1 << m_Depth));
urlStream << "&z=";
urlStream << m_Depth;
urlStream << "&nml=Vert&s=Ga";
- }
+ }
// Local addressing
else if (m_AddressMode == TileMapAdressingStyle::LOCAL)
- {
+ {
std::ostringstream quad, filename;
XYToQuadTree2(x, y, quad);
BuildFileName(quad, filename, false);
urlStream << m_ServerName;
urlStream << filename.str();
- }
+ }
else
- {
- itkExceptionMacro( << "TileMapImageIO : Bad addressing Style");
- }
-
+ {
+ itkExceptionMacro(<< "TileMapImageIO : Bad addressing Style");
+ }
+
// Add url to vector
m_ListURLs.push_back(urlStream.str());
}
@@ -354,70 +353,72 @@ void TileMapImageIO::FetchTiles()
// Configure multi handle - set the maximum connections
curl_multi_setopt(m_MultiHandle, CURLMOPT_MAXCONNECTS, m_MaxConnect);
curl_multi_setopt(m_MultiHandle, CURLMOPT_PIPELINING, 0);
-
- // Perform
- int lStillRunning;
- while(
+ // Perform
+ int lStillRunning;
+
+ while (
CURLM_CALL_MULTI_PERFORM == curl_multi_perform(m_MultiHandle, &lStillRunning)
- );
+ )
+ ;
// Now get that URL
- while(lStillRunning)
- {
+ while (lStillRunning)
+ {
struct timeval timeout;
- int rc; // Return code
-
+ int rc; // Return code
+
fd_set fdread;
fd_set fdwrite;
fd_set fdexcep;
- int maxfd;
-
+ int maxfd;
+
FD_ZERO(&fdread);
FD_ZERO(&fdwrite);
FD_ZERO(&fdexcep);
-
+
/* set a suitable timeout to play around with */
timeout.tv_sec = 0;
timeout.tv_usec = 1;
-
+
/* get file descriptors from the transfers */
curl_multi_fdset(m_MultiHandle, &fdread, &fdwrite, &fdexcep, &maxfd);
-
- rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
-
- switch(rc) {
+
+ rc = select(maxfd + 1, &fdread, &fdwrite, &fdexcep, &timeout);
+
+ switch (rc)
+ {
case -1:
/* select error */
break;
case 0:
- /* timeout */
+ /* timeout */
default:
/* timeout or readable/writable sockets */
- while(
+ while (
CURLM_CALL_MULTI_PERFORM == curl_multi_perform(m_MultiHandle, &lStillRunning)
- );
+ )
+ ;
break;
+ }
}
- }
-
- int remaining_msgs = 1;
- int error = 0;
+
+ int remaining_msgs = 1;
+ int error = 0;
CURLMsg *msg;
while (remaining_msgs)
- {
+ {
msg = curl_multi_info_read(m_MultiHandle, &remaining_msgs);
if (msg != NULL)
- {
- if (CURLE_OK != msg->data.result)
- error = 1;
+ {
+ if (CURLE_OK != msg->data.result) error = 1;
+ }
}
- }
if (error != 0)
- {
- itkExceptionMacro( <<"TileMapImageIO : Error occurs while perform Multi handle");
- }
+ {
+ itkExceptionMacro(<< "TileMapImageIO : Error occurs while perform Multi handle");
+ }
}
/*
@@ -426,22 +427,22 @@ void TileMapImageIO::FetchTiles()
void TileMapImageIO::Cleanup()
{
// Close files
- for (unsigned int currentFile=0; currentFile<m_ListFiles.size(); currentFile++)
- {
+ for (unsigned int currentFile = 0; currentFile < m_ListFiles.size(); currentFile++)
+ {
fclose(m_ListFiles[currentFile]);
- }
+ }
m_ListFiles.clear();
-
+
// Cleanup easy handles
- for (unsigned int currentHandle=0; currentHandle<m_ListCurlHandles.size(); currentHandle++)
- {
+ for (unsigned int currentHandle = 0; currentHandle < m_ListCurlHandles.size(); currentHandle++)
+ {
curl_easy_cleanup(m_ListCurlHandles[currentHandle]);
- }
+ }
m_ListCurlHandles.clear();
-
+
// Cleanup multi handle
curl_multi_cleanup(m_MultiHandle);
-
+
// Cleanup url vector
m_ListURLs.clear();
}
@@ -457,55 +458,55 @@ void TileMapImageIO::GenerateBuffer(unsigned char *p)
int firstSample = this->GetIORegion().GetIndex()[0];
int nComponents = this->GetNumberOfComponents();
- for (unsigned int currentTile=0; currentTile<m_ListTiles.size(); currentTile++)
- {
- unsigned char * bufferTile = new unsigned char[256*256*nComponents];
-
+ for (unsigned int currentTile = 0; currentTile < m_ListTiles.size(); currentTile++)
+ {
+ unsigned char * bufferTile = new unsigned char[256 * 256 * nComponents];
+
// Read tile from cache
this->ReadTile(m_ListTiles[currentTile].filename, bufferTile);
-
+
int numTileX = m_ListTiles[currentTile].numTileX;
int numTileY = m_ListTiles[currentTile].numTileY;
-
- for (int tileJ=0; tileJ<256; tileJ++)
- {
- long int yImageOffset=(long int) (256*floor(firstLine/256.)+256*numTileY-firstLine+tileJ);
- if ((yImageOffset >= 0) && (yImageOffset < totLines))
+
+ for (int tileJ = 0; tileJ < 256; tileJ++)
{
+ long int yImageOffset = (long int) (256 * floor(firstLine / 256.) + 256 * numTileY - firstLine + tileJ);
+ if ((yImageOffset >= 0) && (yImageOffset < totLines))
+ {
long int xImageOffset = (long int)
- (256*floor(firstSample/256.)+256*numTileX-firstSample);
- unsigned char * dst = p+nComponents*(xImageOffset+totSamples*yImageOffset);
- unsigned char * src = bufferTile+nComponents*256*tileJ;
- int size = nComponents*256;
-
+ (256 * floor(firstSample / 256.) + 256 * numTileX - firstSample);
+ unsigned char * dst = p + nComponents * (xImageOffset + totSamples * yImageOffset);
+ unsigned char * src = bufferTile + nComponents * 256 * tileJ;
+ int size = nComponents * 256;
+
if (xImageOffset < 0)
- {
- dst -= nComponents*xImageOffset;
- src -= nComponents*xImageOffset;
- size += nComponents*xImageOffset;
- }
- if (xImageOffset+256 > totSamples)
- {
- size += nComponents*(totSamples-xImageOffset-256);
- }
+ {
+ dst -= nComponents * xImageOffset;
+ src -= nComponents * xImageOffset;
+ size += nComponents * xImageOffset;
+ }
+ if (xImageOffset + 256 > totSamples)
+ {
+ size += nComponents * (totSamples - xImageOffset - 256);
+ }
if (size > 0)
- {
+ {
memcpy(dst, src, size);
+ }
}
- }
- }//end of tile copy
+ } //end of tile copy
delete[] bufferTile;
- }//end of full image copy
+ } //end of full image copy
}
/*
* This method read tile in the cache
- */
+ */
void TileMapImageIO::ReadTile(std::string filename, void * buffer)
{
otbMsgDevMacro(<< "Retrieving " << filename);
- unsigned char * bufferCacheFault = NULL;
- itk::ImageIOBase::Pointer imageIO;
+ unsigned char * bufferCacheFault = NULL;
+ itk::ImageIOBase::Pointer imageIO;
if (m_FileSuffix == "png")
{
@@ -517,48 +518,47 @@ void TileMapImageIO::ReadTile(std::string filename, void * buffer)
}
else
{
- itkExceptionMacro( << "TileMapImageIO : Bad addressing Style");
+ itkExceptionMacro(<< "TileMapImageIO : Bad addressing Style");
}
bool lCanRead(false);
lCanRead = imageIO->CanReadFile(filename.c_str());
-
- if ( lCanRead == true)
- {
+
+ if (lCanRead == true)
+ {
imageIO->SetFileName(filename.c_str());
imageIO->Read(buffer);
- }
+ }
else
- {
- if (bufferCacheFault == NULL)
{
- bufferCacheFault = new unsigned char[256*256*3];
+ if (bufferCacheFault == NULL)
+ {
+ bufferCacheFault = new unsigned char[256 * 256 * 3];
FillCacheFaults(bufferCacheFault);
+ }
+ memcpy(buffer, bufferCacheFault, 256 * 256 * 3);
}
- memcpy(buffer, bufferCacheFault,256*256*3 );
- }
}
void TileMapImageIO::BuildFileName(const std::ostringstream& quad, std::ostringstream& filename, bool inCache) const
{
- int quadsize=quad.str().size();
+ int quadsize = quad.str().size();
std::ostringstream directory;
if (inCache)
{
directory << m_CacheDirectory;
}
//build directory name
- int i=0;
- while ((i<8) && (i<quadsize))
- {
+ int i = 0;
+ while ((i < 8) && (i < quadsize))
+ {
directory << "/";
directory << (quad.str().c_str())[i];
i++;
- }
+ }
ossimFilename directoryOssim(directory.str().c_str());
directoryOssim.createDirectory();
-
filename << directory.str();
filename << "/";
filename << "otb-";
@@ -570,19 +570,19 @@ void TileMapImageIO::BuildFileName(const std::ostringstream& quad, std::ostrings
/* Fill up dhe image information reading the ascii configuration file */
void TileMapImageIO::ReadImageInformation()
{
- if ( m_FileName.empty() == true )
- {
- itkExceptionMacro(<<"TileMap read : empty image file name file.");
- }
+ if (m_FileName.empty() == true)
+ {
+ itkExceptionMacro(<< "TileMap read : empty image file name file.");
+ }
if (m_FileName.find("http://") == 0)
- {
+ {
m_FileNameIsServerName = true;
- }
-
- m_Dimensions[0] = (1 << m_Depth)*256;
- m_Dimensions[1] = (1 << m_Depth)*256;
- otbMsgDevMacro(<<"Get Dimensions : x="<<m_Dimensions[0]<<" & y="<<m_Dimensions[1]);
+ }
+
+ m_Dimensions[0] = (1 << m_Depth) * 256;
+ m_Dimensions[1] = (1 << m_Depth) * 256;
+ otbMsgDevMacro(<< "Get Dimensions : x=" << m_Dimensions[0] << " & y=" << m_Dimensions[1]);
this->SetNumberOfComponents(3);
this->SetNumberOfDimensions(2);
this->SetFileTypeToBinary();
@@ -592,92 +592,92 @@ void TileMapImageIO::ReadImageInformation()
m_Spacing[1] = 1;
m_Origin[0] = 0;
m_Origin[1] = 0;
-
+
if (!m_FileNameIsServerName)
- {
- std::ifstream file(m_FileName.c_str(), std::ifstream::in );
+ {
+ std::ifstream file(m_FileName.c_str(), std::ifstream::in);
std::getline(file, m_ServerName);
if (m_ServerName.find("http://") != 0)
- {
- itkExceptionMacro(<<"Can't read server name from file");
- }
+ {
+ itkExceptionMacro(<< "Can't read server name from file");
+ }
std::getline(file, m_FileSuffix);
std::string mode;
std::getline(file, mode);
switch (atoi(mode.c_str()))
- {
- case 0:
- m_AddressMode = TileMapAdressingStyle::GM;
- return;
- case 1:
- m_AddressMode = TileMapAdressingStyle::OSM;
- return;
- case 2:
- m_AddressMode = TileMapAdressingStyle::NEARMAP;
- return;
- case 3:
- m_AddressMode = TileMapAdressingStyle::LOCAL;
- return;
- default:
- itkExceptionMacro(<<"Addressing style unknown");
- }
+ {
+ case 0:
+ m_AddressMode = TileMapAdressingStyle::GM;
+ return;
+ case 1:
+ m_AddressMode = TileMapAdressingStyle::OSM;
+ return;
+ case 2:
+ m_AddressMode = TileMapAdressingStyle::NEARMAP;
+ return;
+ case 3:
+ m_AddressMode = TileMapAdressingStyle::LOCAL;
+ return;
+ default:
+ itkExceptionMacro(<< "Addressing style unknown");
+ }
- otbMsgDevMacro( << "File parameters: " << m_ServerName << " " << m_FileSuffix << " " << m_AddressMode);
- }
+ otbMsgDevMacro(<< "File parameters: " << m_ServerName << " " << m_FileSuffix << " " << m_AddressMode);
+ }
else
- {
+ {
m_ServerName = m_FileName;
if (m_ServerName.find("http://") != 0)
- {
- itkExceptionMacro(<<"Can't read server name from file");
- }
+ {
+ itkExceptionMacro(<< "Can't read server name from file");
+ }
std::string osmServer = "http://tile.openstreetmap.org/";
std::string nmServer = "http://www.nearmap.com/maps/";
std::string otbServer1 = "http://tile.orfeo-toolbox.org/hillShade/";
-
+
if (m_ServerName == osmServer)
- {
+ {
m_FileSuffix = "png";
m_AddressMode = TileMapAdressingStyle::OSM;
- }
+ }
else if (m_ServerName == nmServer)
- {
+ {
m_FileSuffix = "jpg";
m_AddressMode = TileMapAdressingStyle::NEARMAP;
- }
+ }
else if (m_ServerName == otbServer1)
- {
+ {
m_FileSuffix = "jpg";
m_AddressMode = TileMapAdressingStyle::LOCAL;
- }
+ }
else
- {
+ {
m_FileSuffix = "jpg";
m_AddressMode = TileMapAdressingStyle::GM;
- }
-
+ }
+
// File suffix and addres mode must be set with accessors
- otbMsgDevMacro( << "File parameters: " << m_ServerName << " " << m_FileSuffix << " " << m_AddressMode);
- }
+ otbMsgDevMacro(<< "File parameters: " << m_ServerName << " " << m_FileSuffix << " " << m_AddressMode);
+ }
}
-bool TileMapImageIO::CanWriteFile( const char* name )
+bool TileMapImageIO::CanWriteFile(const char* name)
{
// First if filename is provided
- if ( name == NULL )
- {
- itkDebugMacro(<<"No filename specified.");
+ if (name == NULL)
+ {
+ itkDebugMacro(<< "No filename specified.");
return false;
- }
+ }
// Check for file extension
- std::string filename = name;
+ std::string filename = name;
std::string::size_type gmPos = filename.rfind(".otb");
- if ( (gmPos != std::string::npos)
- && (gmPos == filename.length() - 3) )
- {
+ if ((gmPos != std::string::npos)
+ && (gmPos == filename.length() - 3))
+ {
return true;
- }
+ }
return false;
}
@@ -689,113 +689,109 @@ void TileMapImageIO::Write(const void* buffer)
{
const unsigned char * p = static_cast<const unsigned char *>(buffer);
- if (p==NULL)
- {
- itkExceptionMacro(<<"Memory allocation error");
+ if (p == NULL)
+ {
+ itkExceptionMacro(<< "Memory allocation error");
return;
- }
+ }
- if ( m_FlagWriteImageInformation == true )
- {
+ if (m_FlagWriteImageInformation == true)
+ {
this->WriteImageInformation();
m_FlagWriteImageInformation = false;
- }
+ }
int totLines = this->GetIORegion().GetSize()[1];
int totSamples = this->GetIORegion().GetSize()[0];
int firstLine = this->GetIORegion().GetIndex()[1];
int firstSample = this->GetIORegion().GetIndex()[0];
- int originLine = (int)this->GetOrigin(1);
- int originSample = (int)this->GetOrigin(0);
+ int originLine = (int) this->GetOrigin(1);
+ int originSample = (int) this->GetOrigin(0);
int nComponents = this->GetNumberOfComponents();
- otbMsgDevMacro( << "TileMapImageIO::Write: Size " << totLines << ", "<< totSamples);
- otbMsgDevMacro( << "TileMapImageIO::Write: Index " << firstLine << ", "<< firstSample);
- otbMsgDevMacro( << "TileMapImageIO::Write: Origin " << originLine << ", "<< originSample);
-
- otbMsgDevMacro( <<" Image size : " << m_Dimensions[0]<<","<<m_Dimensions[1]);
- otbMsgDevMacro( <<" Region read (IORegion) : "<<this->GetIORegion());
- otbMsgDevMacro( <<" Nb Of Components : "<<this->GetNumberOfComponents());
+ otbMsgDevMacro(<< "TileMapImageIO::Write: Size " << totLines << ", " << totSamples);
+ otbMsgDevMacro(<< "TileMapImageIO::Write: Index " << firstLine << ", " << firstSample);
+ otbMsgDevMacro(<< "TileMapImageIO::Write: Origin " << originLine << ", " << originSample);
- otbMsgDevMacro( <<" sizeof(streamsize) : "<<sizeof(std::streamsize));
- otbMsgDevMacro( <<" sizeof(streampos) : "<<sizeof(std::streampos));
- otbMsgDevMacro( <<" sizeof(streamoff) : "<<sizeof(std::streamoff));
- otbMsgDevMacro( <<" sizeof(std::ios::beg) : "<<sizeof(std::ios::beg));
- otbMsgDevMacro( <<" sizeof(size_t) : "<<sizeof(size_t));
- otbMsgDevMacro( <<" sizeof(unsigned long) : "<<sizeof(unsigned long));
+ otbMsgDevMacro(<< " Image size : " << m_Dimensions[0] << "," << m_Dimensions[1]);
+ otbMsgDevMacro(<< " Region read (IORegion) : " << this->GetIORegion());
+ otbMsgDevMacro(<< " Nb Of Components : " << this->GetNumberOfComponents());
+ otbMsgDevMacro(<< " sizeof(streamsize) : " << sizeof(std::streamsize));
+ otbMsgDevMacro(<< " sizeof(streampos) : " << sizeof(std::streampos));
+ otbMsgDevMacro(<< " sizeof(streamoff) : " << sizeof(std::streamoff));
+ otbMsgDevMacro(<< " sizeof(std::ios::beg) : " << sizeof(std::ios::beg));
+ otbMsgDevMacro(<< " sizeof(size_t) : " << sizeof(size_t));
+ otbMsgDevMacro(<< " sizeof(unsigned long) : " << sizeof(unsigned long));
//Using integer division:
- int nTilesX = (originSample + totSamples -1)/256 - originSample/256 +1;
- int nTilesY = (originLine + totLines -1)/256 - originLine/256 +1;
- otbMsgDevMacro( << "Number of tile to process " << nTilesX << "x" << nTilesY);
+ int nTilesX = (originSample + totSamples - 1) / 256 - originSample / 256 + 1;
+ int nTilesY = (originLine + totLines - 1) / 256 - originLine / 256 + 1;
+ otbMsgDevMacro(<< "Number of tile to process " << nTilesX << "x" << nTilesY);
- unsigned char * bufferTile = new unsigned char[256*256*nComponents];
+ unsigned char * bufferTile = new unsigned char[256 * 256 * nComponents];
//Read all the required tiles
- for (int numTileY=0; numTileY<nTilesY; numTileY++)
- {
- for (int numTileX=0; numTileX<nTilesX; numTileX++)
+ for (int numTileY = 0; numTileY < nTilesY; numTileY++)
{
-
- //Set tile buffer to 0
- for (int iInit=0; iInit<256*256*nComponents; iInit++)
+ for (int numTileX = 0; numTileX < nTilesX; numTileX++)
{
- bufferTile[iInit]=0;
- }
+ //Set tile buffer to 0
+ for (int iInit = 0; iInit < 256 * 256 * nComponents; iInit++)
+ {
+ bufferTile[iInit] = 0;
+ }
- for (int tileJ=0; tileJ<256; tileJ++)
- {
- long int yImageOffset=(long int) (256*floor((originLine+firstLine)/256.)
- +256*numTileY-(originLine+firstLine)+tileJ);
- if ((yImageOffset >= 0) && (yImageOffset < totLines))
+ for (int tileJ = 0; tileJ < 256; tileJ++)
{
+ long int yImageOffset = (long int) (256 * floor((originLine + firstLine) / 256.)
+ + 256 * numTileY - (originLine + firstLine) + tileJ);
+ if ((yImageOffset >= 0) && (yImageOffset < totLines))
+ {
long int xImageOffset = (long int)
- (256*floor((originSample+firstSample)/256.)+256*numTileX-(originSample+firstSample));
- unsigned char * dst = bufferTile+nComponents*256*tileJ;
- const unsigned char * src = p+nComponents*(xImageOffset+totSamples*yImageOffset);
- int size = nComponents*256;
+ (256 *
+ floor((originSample +
+ firstSample) / 256.) + 256 * numTileX - (originSample + firstSample));
+ unsigned char * dst = bufferTile + nComponents * 256 * tileJ;
+ const unsigned char * src = p + nComponents * (xImageOffset + totSamples * yImageOffset);
+ int size = nComponents * 256;
if (xImageOffset < 0)
- {
- src -= nComponents*xImageOffset;
- dst -= nComponents*xImageOffset;
- size += nComponents*xImageOffset;
- }
- if (xImageOffset+256 > totSamples)
- {
- size += nComponents*(totSamples-xImageOffset-256);
- }
+ {
+ src -= nComponents * xImageOffset;
+ dst -= nComponents * xImageOffset;
+ size += nComponents * xImageOffset;
+ }
+ if (xImageOffset + 256 > totSamples)
+ {
+ size += nComponents * (totSamples - xImageOffset - 256);
+ }
if (size > 0)
- {
+ {
memcpy(dst, src, size);
- }
-
-
- }
- }//end of tile copy
+ }
+ }
+ } //end of tile copy
- double xTile = (originSample+firstSample+256*numTileX)/((1 << m_Depth)*256.);
- double yTile = (originLine+firstLine+256*numTileY)/((1 << m_Depth)*256.);
+ double xTile = (originSample + firstSample + 256 * numTileX) / ((1 << m_Depth) * 256.);
+ double yTile = (originLine + firstLine + 256 * numTileY) / ((1 << m_Depth) * 256.);
//Write the tile
InternalWrite(xTile, yTile, bufferTile);
-
- }
- }//end of full image copy
+ }
+ } //end of full image copy
delete[] bufferTile;
- otbMsgDevMacro( << "TileMapImageIO::Write() completed");
+ otbMsgDevMacro(<< "TileMapImageIO::Write() completed");
}
-
void TileMapImageIO::InternalWrite(double x, double y, const void* buffer)
{
std::ostringstream quad;
- otbMsgDevMacro( << x << ", " << y );
+ otbMsgDevMacro(<< x << ", " << y);
XYToQuadTree2(x, y, quad);
@@ -814,32 +810,32 @@ void TileMapImageIO::InternalWrite(double x, double y, const void* buffer)
}
else
{
- itkExceptionMacro( << "TileMapImageIO : Bad addressing Style");
+ itkExceptionMacro(<< "TileMapImageIO : Bad addressing Style");
}
bool lCanWrite(false);
lCanWrite = imageIO->CanWriteFile(filename.str().c_str());
- otbMsgDevMacro( << filename.str());
+ otbMsgDevMacro(<< filename.str());
- if ( lCanWrite == true)
- {
+ if (lCanWrite == true)
+ {
imageIO->SetNumberOfDimensions(2);
- imageIO->SetDimensions(0,256);
- imageIO->SetDimensions(1,256);
- imageIO->SetSpacing(0,1);
- imageIO->SetSpacing(1,1);
- imageIO->SetOrigin(0,0);
- imageIO->SetOrigin(1,0);
+ imageIO->SetDimensions(0, 256);
+ imageIO->SetDimensions(1, 256);
+ imageIO->SetSpacing(0, 1);
+ imageIO->SetSpacing(1, 1);
+ imageIO->SetOrigin(0, 0);
+ imageIO->SetOrigin(1, 0);
imageIO->SetNumberOfComponents(3);
- vnl_vector< double > axisDirection(2);
+ vnl_vector<double> axisDirection(2);
axisDirection[0] = 1;
axisDirection[1] = 0;
- imageIO->SetDirection( 0, axisDirection );
+ imageIO->SetDirection(0, axisDirection);
axisDirection[0] = 0;
axisDirection[1] = 1;
- imageIO->SetDirection( 1, axisDirection );
+ imageIO->SetDirection(1, axisDirection);
imageIO->SetUseCompression(1);
@@ -847,52 +843,52 @@ void TileMapImageIO::InternalWrite(double x, double y, const void* buffer)
imageIO->WriteImageInformation();
itk::ImageIORegion ioRegion(2);
- for (unsigned int i=0; i<2; i++)
- {
- ioRegion.SetSize(i,256);
- ioRegion.SetIndex(i,0);
- }
+ for (unsigned int i = 0; i < 2; i++)
+ {
+ ioRegion.SetSize(i, 256);
+ ioRegion.SetIndex(i, 0);
+ }
imageIO->SetIORegion(ioRegion);
imageIO->Write(buffer);
- }
+ }
else
- {
- itkExceptionMacro(<<"TileMap write : bad file name.");
- }
+ {
+ itkExceptionMacro(<< "TileMap write : bad file name.");
+ }
}
/** Generate the quadtree address in qrts style */
int TileMapImageIO::XYToQuadTree(double x, double y, std::ostringstream& quad) const
{
- int lDepth=m_Depth;
+ int lDepth = m_Depth;
while (lDepth--) // (post-decrement)
- {
+ {
// make sure we only look at fractional part
x -= floor(x);
y -= floor(y);
int quad_index = ((x >= 0.5 ? 1 : 0) + (y >= 0.5 ? 2 : 0));
switch (quad_index)
- {
+ {
case 0:
- quad<<"q";
+ quad << "q";
break;
case 1:
- quad<<"r";
+ quad << "r";
break;
case 2:
- quad<<"t";
+ quad << "t";
break;
case 3:
- quad<<"s";
+ quad << "s";
break;
- }
+ }
// level down
x *= 2;
y *= 2;
- }
+ }
return 0;
}
@@ -900,43 +896,43 @@ int TileMapImageIO::XYToQuadTree(double x, double y, std::ostringstream& quad) c
/** Generate the quadtree address in 0123 style */
int TileMapImageIO::XYToQuadTree2(double x, double y, std::ostringstream& quad) const
{
- int lDepth=m_Depth;
+ int lDepth = m_Depth;
while (lDepth--) // (post-decrement)
- {
+ {
// make sure we only look at fractional part
x -= floor(x);
y -= floor(y);
int quad_index = ((x >= 0.5 ? 1 : 0) + (y >= 0.5 ? 2 : 0));
switch (quad_index)
- {
+ {
case 0:
- quad<<"0";
+ quad << "0";
break;
case 1:
- quad<<"1";
+ quad << "1";
break;
case 2:
- quad<<"2";
+ quad << "2";
break;
case 3:
- quad<<"3";
+ quad << "3";
break;
- }
+ }
// level down
x *= 2;
y *= 2;
- }
+ }
return 0;
}
unsigned int
TileMapImageIO::GetActualNumberOfSplitsForWritingCanStreamWrite(unsigned int numberOfRequestedSplits,
- const ImageIORegion &pasteRegion) const
+ const ImageIORegion& pasteRegion) const
{
typedef itk::ImageRegion<2> RegionType;
- RegionType tileMapRegion;
+ RegionType tileMapRegion;
RegionType::IndexType index;
index[0] = this->GetOrigin(0);
index[1] = this->GetOrigin(1);
@@ -946,17 +942,19 @@ TileMapImageIO::GetActualNumberOfSplitsForWritingCanStreamWrite(unsigned int num
itk::ImageIORegion
TileMapImageIO::GetSplitRegionForWritingCanStreamWrite(unsigned int ithPiece,
- unsigned int numberOfActualSplits,
- const ImageIORegion &pasteRegion) const
+ unsigned int numberOfActualSplits,
+ const ImageIORegion& pasteRegion) const
{
typedef itk::ImageRegion<2> RegionType;
- RegionType tileMapRegion;
+ RegionType tileMapRegion;
RegionType::IndexType index;
index[0] = this->GetOrigin(0);
index[1] = this->GetOrigin(1);
itk::ImageIORegionAdaptor<2>::Convert(pasteRegion, tileMapRegion, index);
ImageIORegion returnRegion;
- itk::ImageIORegionAdaptor<2>::Convert(m_TileMapSplitter->GetSplit(ithPiece, numberOfActualSplits, tileMapRegion), returnRegion, index);
+ itk::ImageIORegionAdaptor<2>::Convert(m_TileMapSplitter->GetSplit(ithPiece,
+ numberOfActualSplits,
+ tileMapRegion), returnRegion, index);
return returnRegion;
}
@@ -1180,7 +1178,7 @@ void TileMapImageIO::FillCacheFaults(void* buffer) const
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\344\343\337\344\343\337\344\343\337\264\263\260+++\377\377\377"
"zzz\7\7\6\5\5\5\4\4\4\21\21\21\23\23\23\23\23\23\20\20\20\3\3\3\7\7\7\33"
- "\33\32\0\0\0\257\11\15""3\3\4jig\344\343\337\344\343\337\344\343\337\344"
+ "\33\32\0\0\0\257\11\15" "3\3\4jig\344\343\337\344\343\337\344\343\337\344"
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
@@ -1227,24 +1225,24 @@ void TileMapImageIO::FillCacheFaults(void* buffer) const
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\327\326\323--,VVV\360\360\360mmm\2\2\2\24\37-2Lo1Jm...\377\377"
- "\377\244\244\244\6\11\14Df\2241Kl\26!.\1\1\1""222\322\322\322\377\377\377"
+ "\377\244\244\244\6\11\14Df\2241Kl\26!.\1\1\1" "222\322\322\322\377\377\377"
"\377\377\377\35\35\35\0\0\0\0\0\0\12\12\11--,\20\20\17\1\1\1\2\1\1\1\1\1"
- "\4\4\4\34\34\34""443llj\314\313\307\344\343\337\344\343\337\344\343\337\344"
+ "\4\4\4\34\34\34" "443llj\314\313\307\344\343\337\344\343\337\344\343\337\344"
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
- "\343\337\344\342\336EEDHHH\342\342\342111\12\17\26""6RxFj\233Fj\2334Nr.."
+ "\343\337\344\342\336EEDHHH\342\342\342111\12\17\26" "6RxFj\233Fj\2334Nr.."
".\377\377\377\310\310\310\0\0\0Ab\216Fj\233Fj\233:X\177\20\30\"\11\11\11"
"nnn211\0\0\0\0\0\0\0\0\0\16\2\3j\13\15\250\15\20\275\15\20\306\14\20\303"
- "\14\20\266\15\20\237\14\17~\13\15""5\7\10\14\13\13\230\227\224\344\343\337"
+ "\14\20\266\15\20\237\14\17~\13\15" "5\7\10\14\13\13\230\227\224\344\343\337"
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\344\343\337\230\230\225\25\25\25\331\331\331&&&\25\40.Be\223"
- "Fj\233Fj\233Fj\2334Nr...\377\377\377\364\364\364\4\4\4""0IiFj\233Fj\233B"
- "c\220\"2F\2\2\1\0\0\0\0\0\0\0\0\0\12\20\11\36""2\33\16\26\15\0\0\0\24\3\4"
+ "Fj\233Fj\233Fj\2334Nr...\377\377\377\364\364\364\4\4\4" "0IiFj\233Fj\233B"
+ "c\220\"2F\2\2\1\0\0\0\0\0\0\0\0\0\12\20\11\36" "2\33\16\26\15\0\0\0\24\3\4"
"d\11\13\272\15\21\313\14\20\313\14\20\313\14\20\313\14\20\313\14\20\206\14"
"\17\11\5\5\253\252\247\344\343\337\344\343\337\344\343\337\344\343\337\344"
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
@@ -1252,7 +1250,7 @@ void TileMapImageIO::FillCacheFaults(void* buffer) const
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
"\343\337\344\343\337\344\343\337\344\343\33700/\212\212\212IIJ\17\27!Dg\227"
"Fj\233Fj\233Fj\233Fj\2334Nr...\377\377\377\377\377\377BBB\25\37,Fj\2330E"
- "c\7\11\14\7\12\16!1F+@]\4\5\10\0\0\0""2V0p\312op\312ob\255`:b7\13\17\11\21"
+ "c\7\11\14\7\12\16!1F+@]\4\5\10\0\0\0" "2V0p\312op\312ob\255`:b7\13\17\11\21"
"\3\3\225\14\17\313\14\20\313\14\20\313\14\20\313\14\20\313\14\20i\12\14$"
"$$\342\341\335\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
@@ -1260,14 +1258,14 @@ void TileMapImageIO::FillCacheFaults(void* buffer) const
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\323\322\317\2\2\2\223\223\223\3\5\7>^\212Fj\233Fj\233Fj\233"
"Fj\233Fj\2334Nr...\377\377\377\377\377\377\270\271\271\1\1\1\26\37+\5\7\12"
- "(<VDf\225Fj\233Fj\2330Hi\0\0\0""9e7p\312op\312op\312op\312ol\300j-H)\6\2"
+ "(<VDf\225Fj\233Fj\2330Hi\0\0\0" "9e7p\312op\312op\312op\312ol\300j-H)\6\2"
"\2\222\14\17\313\14\20\313\14\20\313\14\20\313\14\20\302\15\21\16\3\3\251"
"\250\246\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
- "\343\337\275\274\271\33\33\33""222!2IFj\233Fj\233Fj\233Fj\233Fj\233Fj\233"
- "4Nr...\377\377\377\377\377\377\363\363\363\32\32\31\1\1\1""4NoFj\233Fj\233"
+ "\343\337\275\274\271\33\33\33" "222!2IFj\233Fj\233Fj\233Fj\233Fj\233Fj\233"
+ "4Nr...\377\377\377\377\377\377\363\363\363\32\32\31\1\1\1" "4NoFj\233Fj\233"
"Fj\233Fj\2333Lm\0\0\0:f8p\312op\312op\312op\312op\312op\312o3S/\12\2\2\255"
"\15\20\313\14\20\313\14\20\313\14\20\313\14\20E\7\10qpn\344\343\337\344\343"
"\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343"
@@ -1316,7 +1314,7 @@ void TileMapImageIO::FillCacheFaults(void* buffer) const
"\337\344\343\337\344\343\337\232\231\227#4MFj\233Fj\233Fj\233Fj\233Fj\233"
"Fj\233Fj\233Fj\233Fj\2335Pv\6\5\6\312\312\312\377\377\377\377\377\377\377"
"\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377IHH`"
- "\7\11\313\14\20\177\14\16\4\1\1\26\"\24""5Y2.M,\17\26\15\3\1\1p\12\14\313"
+ "\7\11\313\14\20\177\14\16\4\1\1\26\"\24" "5Y2.M,\17\26\15\3\1\1p\12\14\313"
"\14\20\313\14\20\313\14\20\313\14\20V\10\12DDC\344\343\337\344\343\337\344"
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344"
@@ -1334,7 +1332,7 @@ void TileMapImageIO::FillCacheFaults(void* buffer) const
"\233Fj\233Fj\233Fj\233Fj\233Fj\233Fj\233Eh\230\26!1\40\40\40\304\304\304"
"\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
"\40\37\37\200\11\13\313\14\20\313\14\20\313\14\20\313\14\20\313\14\20\313"
- "\14\20\313\14\20\313\14\20\313\14\20\313\14\20\313\14\20\312\14\20""8\7\10"
+ "\14\20\313\14\20\313\14\20\313\14\20\313\14\20\313\14\20\312\14\20" "8\7\10"
"NML\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
@@ -1365,7 +1363,7 @@ void TileMapImageIO::FillCacheFaults(void* buffer) const
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
- "\344\343\337\344\343\337\263\262\257\24\30\36""8U}Fj\233Fj\233Fj\233Fj\233"
+ "\344\343\337\344\343\337\263\262\257\24\30\36" "8U}Fj\233Fj\233Fj\233Fj\233"
"Fj\233Fj\233Fj\233Fj\233Fj\233Fj\233Fj\233Fj\233Fj\233Fj\233Dg\226\30$4g"
"fd\250\247\244\13\12\12Y\11\13\266\16\21\313\14\20\313\14\20\313\14\20\262"
"\16\21d\12\14\15\3\3>=<\314\313\307\344\343\337\344\343\337\344\343\337\344"
@@ -1376,7 +1374,7 @@ void TileMapImageIO::FillCacheFaults(void* buffer) const
"\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\274"
"\273\270$%&(<XEi\231Fj\233Fj\233Fj\233Fj\233Fj\233Fj\233Fj\233Fj\233Fj\233"
"Fj\233Fj\2339V~\22\31\"}}z\344\343\337\344\343\337\267\266\263876\4\2\2+"
- "\5\5A\5\6&\5\6\3\2\2""887\236\236\233\344\343\337\344\343\337\344\343\337"
+ "\5\5A\5\6&\5\6\3\2\2" "887\236\236\233\344\343\337\344\343\337\344\343\337"
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
"\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337\344\343\337"
@@ -1593,13 +1591,13 @@ void TileMapImageIO::FillCacheFaults(void* buffer) const
"\343\337\344\343\337\344\343\337\344\343\337";
//replicate to make 256x256x3 pixels
- for (int line=0; line<256; line++)
- {
- memcpy(((unsigned char *) buffer)+line*256*3, logo+(line % 64)*64*3, 64*3);
- memcpy(((unsigned char *) buffer)+line*256*3+64*3, logo+(line % 64)*64*3, 64*3);
- memcpy(((unsigned char *) buffer)+line*256*3+64*3*2, logo+(line % 64)*64*3, 64*3);
- memcpy(((unsigned char *) buffer)+line*256*3+64*3*3, logo+(line % 64)*64*3, 64*3);
- }
+ for (int line = 0; line < 256; line++)
+ {
+ memcpy(((unsigned char *) buffer) + line * 256 * 3, logo + (line % 64) * 64 * 3, 64 * 3);
+ memcpy(((unsigned char *) buffer) + line * 256 * 3 + 64 * 3, logo + (line % 64) * 64 * 3, 64 * 3);
+ memcpy(((unsigned char *) buffer) + line * 256 * 3 + 64 * 3 * 2, logo + (line % 64) * 64 * 3, 64 * 3);
+ memcpy(((unsigned char *) buffer) + line * 256 * 3 + 64 * 3 * 3, logo + (line % 64) * 64 * 3, 64 * 3);
+ }
}
diff --git a/Code/IO/otbTileMapImageIO.h b/Code/IO/otbTileMapImageIO.h
index 245d506375..dfc0065b5e 100644
--- a/Code/IO/otbTileMapImageIO.h
+++ b/Code/IO/otbTileMapImageIO.h
@@ -36,10 +36,10 @@
namespace otb
{
- namespace TileMapAdressingStyle
- {
- enum TileMapAdressingStyle{GM=0, OSM=1, NEARMAP=2, LOCAL=3};
- }
+namespace TileMapAdressingStyle
+{
+enum TileMapAdressingStyle {GM = 0, OSM = 1, NEARMAP = 2, LOCAL = 3};
+}
/** \class TileMapImageIO
*
@@ -54,9 +54,9 @@ public:
typedef unsigned char InputPixelType;
/** Standard class typedefs. */
- typedef TileMapImageIO Self;
- typedef itk::ImageIOBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef TileMapImageIO Self;
+ typedef itk::ImageIOBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -70,36 +70,34 @@ public:
* 0-9; 0 = none, 9 = maximum. */
itkSetMacro(CompressionLevel, int);
itkGetMacro(CompressionLevel, int);
-
-
+
/** Set/Get the maximum number of connections */
itkSetMacro(MaxConnect, int);
itkGetMacro(MaxConnect, int);
-
- virtual void SetCacheDirectory (const char* _arg)
+ virtual void SetCacheDirectory(const char* _arg)
{
- if ( _arg && (_arg == this->m_CacheDirectory) )
- {
+ if (_arg && (_arg == this->m_CacheDirectory))
+ {
return;
- }
+ }
if (_arg)
- {
+ {
this->m_CacheDirectory = _arg;
- this->m_UseCache=true;
- }
+ this->m_UseCache = true;
+ }
else
- {
+ {
this->m_CacheDirectory = "";
- this->m_UseCache=false;
- }
+ this->m_UseCache = false;
+ }
this->Modified();
}
- virtual void SetCacheDirectory (const std::string & _arg)
+ virtual void SetCacheDirectory(const std::string& _arg)
{
- this->SetCacheDirectory( _arg.c_str() );
- this->m_UseCache=true;
+ this->SetCacheDirectory(_arg.c_str());
+ this->m_UseCache = true;
}
itkGetStringMacro(CacheDirectory);
@@ -143,7 +141,6 @@ public:
* that the IORegion has been set properly. */
virtual void Write(const void* buffer);
-
protected:
/** Constructor.*/
TileMapImageIO();
@@ -157,11 +154,11 @@ protected:
void InternalWriteImageInformation();
virtual unsigned int GetActualNumberOfSplitsForWritingCanStreamWrite(unsigned int numberOfRequestedSplits,
- const ImageIORegion &pasteRegion) const;
+ const ImageIORegion& pasteRegion) const;
virtual ImageIORegion GetSplitRegionForWritingCanStreamWrite(unsigned int ithPiece,
unsigned int numberOfActualSplits,
- const ImageIORegion &pasteRegion) const;
+ const ImageIORegion& pasteRegion) const;
/** Number of bands of the image*/
int m_NbBands;
@@ -181,11 +178,11 @@ private:
std::string filename;
} TileNameAndCoordType;
- TileMapImageIO(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ TileMapImageIO(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
void InternalWrite(double x, double y, const void* buffer);
- void BuildFileName(const std::ostringstream& quad, std::ostringstream& filename, bool inCache=true) const;
+ void BuildFileName(const std::ostringstream& quad, std::ostringstream& filename, bool inCache = true) const;
void FillCacheFaults(void* buffer) const;
int XYToQuadTree(double x, double y, std::ostringstream& quad) const;
int XYToQuadTree2(double x, double y, std::ostringstream& quad) const;
@@ -199,8 +196,7 @@ private:
void Cleanup();
void GenerateBuffer(unsigned char * p);
void ReadTile(std::string filename, void * buffer);
-
-
+
CURLM * m_MultiHandle;
std::vector<CURL *> m_ListCurlHandles;
std::vector<FILE *> m_ListFiles;
@@ -210,7 +206,7 @@ private:
int m_MaxConnect;
/** Byte per pixel pixel */
- int m_BytePerPixel;
+ int m_BytePerPixel;
/** Resolution depth*/
int m_Depth;
@@ -220,10 +216,9 @@ private:
std::string m_FileSuffix;
TileMapAdressingStyle::TileMapAdressingStyle m_AddressMode;
- bool m_FlagWriteImageInformation;
-
- bool m_FileNameIsServerName;
+ bool m_FlagWriteImageInformation;
+ bool m_FileNameIsServerName;
typedef otb::ImageRegionTileMapSplitter<2> SplitterType;
SplitterType::Pointer m_TileMapSplitter;
diff --git a/Code/IO/otbTileMapImageIOFactory.cxx b/Code/IO/otbTileMapImageIOFactory.cxx
index 1447c4d929..6c6e81a6bc 100644
--- a/Code/IO/otbTileMapImageIOFactory.cxx
+++ b/Code/IO/otbTileMapImageIOFactory.cxx
@@ -21,7 +21,6 @@
#include "otbTileMapImageIO.h"
#include "itkVersion.h"
-
namespace otb
{
@@ -51,4 +50,3 @@ TileMapImageIOFactory::GetDescription() const
}
} // end namespace otb
-
diff --git a/Code/IO/otbTileMapImageIOFactory.h b/Code/IO/otbTileMapImageIOFactory.h
index eb8c2c5e46..127edb15c2 100644
--- a/Code/IO/otbTileMapImageIOFactory.h
+++ b/Code/IO/otbTileMapImageIOFactory.h
@@ -31,10 +31,10 @@ class ITK_EXPORT TileMapImageIOFactory : public itk::ObjectFactoryBase
{
public:
/** Standard class typedefs. */
- typedef TileMapImageIOFactory Self;
- typedef itk::ObjectFactoryBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef TileMapImageIOFactory Self;
+ typedef itk::ObjectFactoryBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char* GetITKSourceVersion(void) const;
@@ -58,12 +58,11 @@ protected:
virtual ~TileMapImageIOFactory();
private:
- TileMapImageIOFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ TileMapImageIOFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbTileMapImageSource.h b/Code/IO/otbTileMapImageSource.h
index 9338abfb32..8f9f042b18 100644
--- a/Code/IO/otbTileMapImageSource.h
+++ b/Code/IO/otbTileMapImageSource.h
@@ -33,57 +33,57 @@ namespace otb
*/
template <class TOutputImage>
class ITK_EXPORT TileMapImageSource
- : public itk::ImageSource<TOutputImage>
+ : public itk::ImageSource<TOutputImage>
{
public:
/** Standard typedefs */
- typedef TileMapImageSource Self;
- typedef itk::ImageSource<TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef TileMapImageSource Self;
+ typedef itk::ImageSource<TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
/** Typedef for the output image PixelType. */
typedef typename TOutputImage::PixelType OutputImagePixelType;
-
+
/** Typedef to describe the output image region type. */
typedef typename TOutputImage::RegionType OutputImageRegionType;
-
+
/** Spacing typedef support. Spacing holds the size of a pixel. The
* spacing is the geometric distance between image samples. */
typedef typename TOutputImage::SpacingType SpacingType;
-
+
/** Origin typedef support. The origin is the geometric coordinates
* of the index (0,0). */
typedef typename TOutputImage::PointType PointType;
-
+
/** Direction typedef support. The direction is the direction
* cosines of the image. */
typedef typename TOutputImage::DirectionType DirectionType;
-
+
/** Size type matches that used for images */
- typedef typename TOutputImage::SizeType SizeType;
-
+ typedef typename TOutputImage::SizeType SizeType;
+
/** Dimensionality of the output image */
itkStaticConstMacro(NDimensions, unsigned int, TOutputImage::ImageDimension);
-
+
/** Run-time type information (and related methods). */
- itkTypeMacro(TileMapImageSource,ImageSource);
-
+ itkTypeMacro(TileMapImageSource, ImageSource);
+
/** Method for creation through the object factory. */
itkNewMacro(Self);
-
+
/** Specify the size of the output image. */
itkSetMacro(Size, SizeType);
itkGetMacro(Size, SizeType);
-
+
/** Set/Get the spacing of the output image. */
itkSetMacro(Spacing, SpacingType);
- itkGetConstReferenceMacro(Spacing,SpacingType);
-
+ itkGetConstReferenceMacro(Spacing, SpacingType);
+
/** Set/Get the origin of the output image. */
itkSetMacro(Origin, PointType);
- itkGetConstReferenceMacro(Origin,PointType);
-
+ itkGetConstReferenceMacro(Origin, PointType);
+
/** Specify the direction of the output image. */
itkSetMacro(Direction, DirectionType);
itkGetConstReferenceMacro(Direction, DirectionType);
@@ -91,62 +91,61 @@ public:
/** Set/Get the server name */
itkSetStringMacro(ServerName);
itkGetStringMacro(ServerName);
-
+
/** Set/Get the depth */
itkSetClampMacro(Depth, unsigned int, m_DepthMin, m_DepthMax);
itkGetMacro(Depth, unsigned int);
-
+
/** Set/Get latitude */
itkSetMacro(Latitude, double);
itkGetMacro(Latitude, double);
-
+
/** Set/Get longitude */
itkSetMacro(Longitude, double);
itkGetMacro(Longitude, double);
-
+
/** Set/Get cache directory */
itkSetStringMacro(CacheDirectory);
itkGetStringMacro(CacheDirectory);
-
+
protected:
/** Constructor */
TileMapImageSource();
/** Destructor */
- ~TileMapImageSource() {};
+ ~TileMapImageSource() {}
/**PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Generate Data */
void GenerateData();
/** GenerateOutputInformation */
void GenerateOutputInformation();
-
-
+
private:
/** Server name */
std::string m_ServerName;
-
+
/** Depth */
- unsigned int m_Depth;
+ unsigned int m_Depth;
static const unsigned int m_DepthMin = 1;
static const unsigned int m_DepthMax = 18;
-
+
/** Lat / Lon */
double m_Latitude;
double m_Longitude;
-
+
/** Output image information */
- SizeType m_Size; // size
- SpacingType m_Spacing; // spacing
- PointType m_Origin; // origin
- DirectionType m_Direction; // direction
-
+ SizeType m_Size; // size
+ SpacingType m_Spacing; // spacing
+ PointType m_Origin; // origin
+ DirectionType m_Direction; // direction
+
/** Tiles management */
std::string m_CacheDirectory; // cache directory
ossimRefPtr<ossimTileMapModel> m_TileMapModel;
-
+
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbTileMapImageSource.txx"
#endif
diff --git a/Code/IO/otbTileMapImageSource.txx b/Code/IO/otbTileMapImageSource.txx
index 5188811ddc..bf1041eaa4 100644
--- a/Code/IO/otbTileMapImageSource.txx
+++ b/Code/IO/otbTileMapImageSource.txx
@@ -1,22 +1,22 @@
/*=========================================================================
-
+
Program: ORFEO Toolbox
Language: C++
Date: $Date$
Version: $Revision$
-
-
+
+
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
-
+
Some parts of this code are derived from ITK. See ITKCopyright.txt
for details.
-
-
+
+
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
-
+
=========================================================================*/
#ifndef __otbTileMapImageSource_txx
#define __otbTileMapImageSource_txx
@@ -28,146 +28,146 @@
namespace otb
{
-
- template <class TOutputImage>
- TileMapImageSource<TOutputImage>
- ::TileMapImageSource()
- {
- //Initial image is 256 wide in each direction.
- for (unsigned int i=0; i<TOutputImage::GetImageDimension(); i++)
+
+template <class TOutputImage>
+TileMapImageSource<TOutputImage>
+::TileMapImageSource()
+{
+ //Initial image is 256 wide in each direction.
+ for (unsigned int i = 0; i < TOutputImage::GetImageDimension(); i++)
{
- m_Size[i] = 256;
- m_Spacing[i] = 1.0;
- m_Origin[i] = 0.0;
+ m_Size[i] = 256;
+ m_Spacing[i] = 1.0;
+ m_Origin[i] = 0.0;
}
- m_Direction.SetIdentity();
-
- // Initialize Tile Map
- m_Depth = m_DepthMin;
- m_Latitude = 0.;
- m_Longitude = 0.;
- m_ServerName = "";
-
- // Tile Management
- m_CacheDirectory = "./TileMapCache";
- m_TileMapModel = new ossimTileMapModel;
- }
-
- template <class TOutputImage>
- void
- TileMapImageSource<TOutputImage>
- ::PrintSelf(std::ostream& os, itk::Indent indent) const
- {
- Superclass::PrintSelf(os,indent);
-
- unsigned int i;
-
- os << indent << "Size: [";
- for (i=0; i < TOutputImage::GetImageDimension(); i++)
+ m_Direction.SetIdentity();
+
+ // Initialize Tile Map
+ m_Depth = m_DepthMin;
+ m_Latitude = 0.;
+ m_Longitude = 0.;
+ m_ServerName = "";
+
+ // Tile Management
+ m_CacheDirectory = "./TileMapCache";
+ m_TileMapModel = new ossimTileMapModel;
+}
+
+template <class TOutputImage>
+void
+TileMapImageSource<TOutputImage>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
+{
+ Superclass::PrintSelf(os, indent);
+
+ unsigned int i;
+
+ os << indent << "Size: [";
+ for (i = 0; i < TOutputImage::GetImageDimension(); i++)
{
- os << m_Size[i] << ", ";
+ os << m_Size[i] << ", ";
}
- os << "]" << std::endl;
-
- os << indent << "Origin: [";
- for (i=0; i < TOutputImage::GetImageDimension(); i++)
+ os << "]" << std::endl;
+
+ os << indent << "Origin: [";
+ for (i = 0; i < TOutputImage::GetImageDimension(); i++)
{
- os << m_Origin[i] << ", ";
+ os << m_Origin[i] << ", ";
}
- os << "]" << std::endl;
-
- os << indent << "Spacing: " << m_Spacing << std::endl;
-
- os << indent << "Direction:" << std::endl;
- os << m_Direction << std::endl;
-
- os << indent << "Server name:" << std::endl;
- os << m_ServerName << std::endl;
-
- os << indent << "Depth:" << std::endl;
- os << m_Depth << std::endl;
-
- os << indent << "Latitude:" << std::endl;
- os << m_Latitude << std::endl;
-
- os << indent << "Longitude:" << std::endl;
- os << m_Longitude << std::endl;
- }
-
- //----------------------------------------------------------------------------
- template <typename TOutputImage>
- void
- TileMapImageSource<TOutputImage>
- ::GenerateOutputInformation()
- {
- TOutputImage *output;
- typename TOutputImage::IndexType index = {{0}};
- typename TOutputImage::SizeType size = {{0}};
- size[0] = m_Size[0];
- size[1] = m_Size[1];
-
- output = this->GetOutput(0);
-
- typename TOutputImage::RegionType largestPossibleRegion;
- largestPossibleRegion.SetSize( size );
- largestPossibleRegion.SetIndex( index );
- output->SetLargestPossibleRegion( largestPossibleRegion );
-
- output->SetSpacing(m_Spacing);
- output->SetOrigin(m_Origin);
- output->SetDirection(m_Direction);
- }
-
- template <typename TOutputImage>
- void
- TileMapImageSource<TOutputImage>
- ::GenerateData()
- {
+ os << "]" << std::endl;
+
+ os << indent << "Spacing: " << m_Spacing << std::endl;
+
+ os << indent << "Direction:" << std::endl;
+ os << m_Direction << std::endl;
+
+ os << indent << "Server name:" << std::endl;
+ os << m_ServerName << std::endl;
+
+ os << indent << "Depth:" << std::endl;
+ os << m_Depth << std::endl;
+
+ os << indent << "Latitude:" << std::endl;
+ os << m_Latitude << std::endl;
+
+ os << indent << "Longitude:" << std::endl;
+ os << m_Longitude << std::endl;
+}
+
+//----------------------------------------------------------------------------
+template <typename TOutputImage>
+void
+TileMapImageSource<TOutputImage>
+::GenerateOutputInformation()
+{
+ TOutputImage * output;
+ typename TOutputImage::IndexType index = {{0}};
+ typename TOutputImage::SizeType size = {{0}};
+ size[0] = m_Size[0];
+ size[1] = m_Size[1];
+
+ output = this->GetOutput(0);
+
+ typename TOutputImage::RegionType largestPossibleRegion;
+ largestPossibleRegion.SetSize(size);
+ largestPossibleRegion.SetIndex(index);
+ output->SetLargestPossibleRegion(largestPossibleRegion);
+
+ output->SetSpacing(m_Spacing);
+ output->SetOrigin(m_Origin);
+ output->SetDirection(m_Direction);
+}
+
+template <typename TOutputImage>
+void
+TileMapImageSource<TOutputImage>
+::GenerateData()
+{
// typename TOutputImage::Pointer outputPtr = this->GetOutput();
-
- // allocate the output buffer
+
+ // allocate the output buffer
// outputPtr->SetBufferedRegion( outputPtr->GetRequestedRegion() );
// outputPtr->Allocate();
-
- // Create and initialize a new gaussian function
- /* typedef itk::GaussianSpatialFunction<double, NDimensions> FunctionType;
- typedef typename FunctionType::InputType FunctionPositionType;
- typename FunctionType::Pointer pGaussian = FunctionType::New();
-
- pGaussian->SetSigma(m_Sigma);
- pGaussian->SetMean(m_Mean);
- pGaussian->SetScale(m_Scale);
- pGaussian->SetNormalized(m_Normalized);
- */
- // Create an iterator that will walk the output region
- /* typedef ImageRegionIterator<TOutputImage> OutputIterator;
- OutputIterator outIt = OutputIterator(outputPtr,
- outputPtr->GetRequestedRegion());
-
- // The value get from net OSM
- double value;
-
- // The position at which the function is evaluated
- Point<double, TOutputImage::ImageDimension> evalPoint;
-
- ProgressReporter progress(this, 0,
- outputPtr->GetRequestedRegion()
- .GetNumberOfPixels());
-
- // Walk the output image, evaluating the spatial function at each pixel
- for (; !outIt.IsAtEnd(); ++outIt)
- {
- typename TOutputImage::IndexType index = outIt.GetIndex();
- outputPtr->TransformIndexToPhysicalPoint(index, evalPoint );
- value = pGaussian->Evaluate(evalPoint);
-
- // Set the pixel value to the function value
- outIt.Set( (typename TOutputImage::PixelType) value);
- progress.CompletedPixel();
- }
- } */
+
+ // Create and initialize a new gaussian function
+ /* typedef itk::GaussianSpatialFunction<double, NDimensions> FunctionType;
+ typedef typename FunctionType::InputType FunctionPositionType;
+ typename FunctionType::Pointer pGaussian = FunctionType::New();
+
+ pGaussian->SetSigma(m_Sigma);
+ pGaussian->SetMean(m_Mean);
+ pGaussian->SetScale(m_Scale);
+ pGaussian->SetNormalized(m_Normalized);
+ */
+ // Create an iterator that will walk the output region
+ /* typedef ImageRegionIterator<TOutputImage> OutputIterator;
+ OutputIterator outIt = OutputIterator(outputPtr,
+ outputPtr->GetRequestedRegion());
+
+ // The value get from net OSM
+ double value;
+
+ // The position at which the function is evaluated
+ Point<double, TOutputImage::ImageDimension> evalPoint;
+
+ ProgressReporter progress(this, 0,
+ outputPtr->GetRequestedRegion()
+ .GetNumberOfPixels());
+
+ // Walk the output image, evaluating the spatial function at each pixel
+ for (; !outIt.IsAtEnd(); ++outIt)
+ {
+ typename TOutputImage::IndexType index = outIt.GetIndex();
+ outputPtr->TransformIndexToPhysicalPoint(index, evalPoint );
+ value = pGaussian->Evaluate(evalPoint);
+
+ // Set the pixel value to the function value
+ outIt.Set( (typename TOutputImage::PixelType) value);
+ progress.CompletedPixel();
}
-
+ } */
+}
+
} // end namespace otb
#endif
diff --git a/Code/IO/otbTileRecord.cxx b/Code/IO/otbTileRecord.cxx
index a098fe54f9..67b84ca49d 100644
--- a/Code/IO/otbTileRecord.cxx
+++ b/Code/IO/otbTileRecord.cxx
@@ -1,52 +1,52 @@
/*=========================================================================
-
+
Program: ORFEO Toolbox
Language: C++
Date: $Date$
Version: $Revision$
-
-
+
+
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
-
-
+
+
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
-
+
=========================================================================*/
#include "otbTileRecord.h"
namespace otb
{
- TileRecord::TileRecord()
- {
- m_FileName = "";
- m_Date = time(NULL);
- }
-
- TileRecord::~TileRecord()
- {
- }
-
- void TileRecord::SetFileName(std::string _arg)
- {
- m_FileName = _arg;
- }
-
- std::string TileRecord::GetFileName()
- {
- return m_FileName;
- }
-
- void TileRecord::SetDate()
- {
- m_Date = time(NULL);
- }
-
- time_t TileRecord::GetDate()
- {
- return m_Date;
- }
-}
\ No newline at end of file
+TileRecord::TileRecord()
+{
+ m_FileName = "";
+ m_Date = time(NULL);
+}
+
+TileRecord::~TileRecord()
+{
+}
+
+void TileRecord::SetFileName(std::string _arg)
+{
+ m_FileName = _arg;
+}
+
+std::string TileRecord::GetFileName()
+{
+ return m_FileName;
+}
+
+void TileRecord::SetDate()
+{
+ m_Date = time(NULL);
+}
+
+time_t TileRecord::GetDate()
+{
+ return m_Date;
+}
+}
diff --git a/Code/IO/otbTileRecord.h b/Code/IO/otbTileRecord.h
index aa2f7e5ef6..f2ebe0b819 100644
--- a/Code/IO/otbTileRecord.h
+++ b/Code/IO/otbTileRecord.h
@@ -1,19 +1,19 @@
/*=========================================================================
-
+
Program: ORFEO Toolbox
Language: C++
Date: $Date$
Version: $Revision$
-
-
+
+
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
-
-
+
+
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
-
+
=========================================================================*/
#ifndef __otbTileRecord_h
#define __otbTileRecord_h
@@ -27,33 +27,33 @@
namespace otb
{
- /** \class TileMapFectcher
- * \brief Manages Tiles from OSM.
- *
- */
- class ITK_EXPORT TileRecord
- {
- public:
- /** Standard typedefs */
- typedef TileRecord Self;
-
- /** Constructor */
- TileRecord();
- ~TileRecord();
-
- /** Accessors */
- void SetFileName(std::string _arg);
- std::string GetFileName();
-
- void SetDate();
- time_t GetDate();
-
- private:
- /** File name */
- std::string m_FileName;
-
- /** Date time */
- time_t m_Date;
- };
+/** \class TileMapFectcher
+ * \brief Manages Tiles from OSM.
+ *
+ */
+class ITK_EXPORT TileRecord
+{
+public:
+ /** Standard typedefs */
+ typedef TileRecord Self;
+
+ /** Constructor */
+ TileRecord();
+ ~TileRecord();
+
+ /** Accessors */
+ void SetFileName(std::string _arg);
+ std::string GetFileName();
+
+ void SetDate();
+ time_t GetDate();
+
+private:
+ /** File name */
+ std::string m_FileName;
+
+ /** Date time */
+ time_t m_Date;
+};
}
#endif
diff --git a/Code/IO/otbVectorDataFileReader.h b/Code/IO/otbVectorDataFileReader.h
index 9fd113d0fd..7c925c436e 100644
--- a/Code/IO/otbVectorDataFileReader.h
+++ b/Code/IO/otbVectorDataFileReader.h
@@ -32,21 +32,21 @@ class VectorDataFileReaderException : public itk::ExceptionObject
{
public:
/** Run-time information. */
- itkTypeMacro( VectorDataFileReaderException, itk::ExceptionObject );
+ itkTypeMacro(VectorDataFileReaderException, itk::ExceptionObject);
/** Constructor. */
VectorDataFileReaderException(const char *file, unsigned int line,
const char* message = "Error in IO",
const char* loc = "Unknown") :
- itk::ExceptionObject(file, line, message, loc)
+ itk::ExceptionObject(file, line, message, loc)
{
}
/** Constructor. */
- VectorDataFileReaderException(const std::string &file, unsigned int line,
+ VectorDataFileReaderException(const std::string& file, unsigned int line,
const char* message = "Error in IO",
const char* loc = "Unknown") :
- itk::ExceptionObject(file, line, message, loc)
+ itk::ExceptionObject(file, line, message, loc)
{
}
};
@@ -77,17 +77,16 @@ public:
*
*/
-
template <class TOutputVectorData>
class ITK_EXPORT VectorDataFileReader : public VectorDataSource<TOutputVectorData>
{
-public :
+public:
/** Standard class typedefs. */
- typedef VectorDataFileReader Self;
- typedef VectorDataSource<TOutputVectorData> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef VectorDataFileReader Self;
+ typedef VectorDataSource<TOutputVectorData> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -95,12 +94,12 @@ public :
/** Run-time type information (and related methods). */
itkTypeMacro(VectorDataFileReader, VectorDataSource);
- typedef TOutputVectorData OutputVectorType;
+ typedef TOutputVectorData OutputVectorType;
typedef VectorDataIOBase<OutputVectorType> VectorDataIOBaseType;
itkStaticConstMacro(VDimension, unsigned int, OutputVectorType::DataNodeType::Dimension);
typedef itk::Vector<double, VDimension> SpacingType;
- typedef itk::Point<double, VDimension> PointType;
+ typedef itk::Point<double, VDimension> PointType;
/** Specify the file to read */
itkSetStringMacro(FileName);
@@ -112,14 +111,13 @@ public :
* instance that is created. Or you can directly specify the VectorDataIO
* to use to read a particular file in case the factory mechanism will
* not work properly (e.g., unknown or unusual extension). */
- void SetVectorDataIO( VectorDataIOBaseType * vectorDataIO );
- itkGetObjectMacro(VectorDataIO,VectorDataIOBaseType);
+ void SetVectorDataIO(VectorDataIOBaseType * vectorDataIO);
+ itkGetObjectMacro(VectorDataIO, VectorDataIOBaseType);
/** Prepare the allocation of the output vector data during the first back
* propagation of the pipeline. */
virtual void GenerateOutputInformation(void);
-
/** Does the real work. */
virtual void GenerateData();
@@ -129,22 +127,21 @@ protected:
std::string m_ExceptionMessage;
typename VectorDataIOBaseType::Pointer m_VectorDataIO;
- bool m_UserSpecifiedVectorDataIO; // keep track whether the
+ bool m_UserSpecifiedVectorDataIO; // keep track whether the
void PrintSelf(std::ostream& os, itk::Indent indent) const;
std::string m_FileName; // The file to be read
private:
- VectorDataFileReader(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorDataFileReader(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Test whether the given filename exist and it is readable.
If the file doesn't exist or it is not readable, and exception with an
appropriate message will be thrown. */
void TestFileExistanceAndReadability();
-
};
} // end namespace otb
@@ -154,5 +151,3 @@ private:
#endif
#endif // __otbVectorDataFileReader_h
-
-
diff --git a/Code/IO/otbVectorDataFileReader.txx b/Code/IO/otbVectorDataFileReader.txx
index 10a8ef587a..90e668fc02 100644
--- a/Code/IO/otbVectorDataFileReader.txx
+++ b/Code/IO/otbVectorDataFileReader.txx
@@ -34,9 +34,9 @@ namespace otb
template <class TOutputVectorData>
VectorDataFileReader<TOutputVectorData>
::VectorDataFileReader() :
- m_VectorDataIO(NULL),
- m_UserSpecifiedVectorDataIO(false),
- m_FileName("")
+ m_VectorDataIO(NULL),
+ m_UserSpecifiedVectorDataIO(false),
+ m_FileName("")
{
}
@@ -60,57 +60,56 @@ VectorDataFileReader<TOutputVectorData>
::TestFileExistanceAndReadability()
{
// Test if the file exists.
- if ( ! itksys::SystemTools::FileExists( this->m_FileName.c_str() ) )
- {
+ if (!itksys::SystemTools::FileExists(this->m_FileName.c_str()))
+ {
VectorDataFileReaderException e(__FILE__, __LINE__);
itk::OStringStream msg;
- msg <<"The file doesn't exist. "
- << std::endl << "Filename = " << this->m_FileName
- << std::endl;
+ msg << "The file doesn't exist. "
+ << std::endl << "Filename = " << this->m_FileName
+ << std::endl;
e.SetDescription(msg.str().c_str());
throw e;
return;
- }
+ }
// Test if the file can be open for reading access.
//Only if m_FileName speciy a filename (not a dirname)
// FIXME shapefile should be able to open a directory and load the
// individual shapefiles as layers
- if ( System::IsAFileName( this->m_FileName ) == true )
- {
- std::ifstream readTester;
- readTester.open( this->m_FileName.c_str() );
- if ( readTester.fail() )
+ if (System::IsAFileName(this->m_FileName) == true)
{
+ std::ifstream readTester;
+ readTester.open(this->m_FileName.c_str());
+ if (readTester.fail())
+ {
readTester.close();
itk::OStringStream msg;
- msg <<"The file couldn't be opened for reading. "
- << std::endl << "Filename: " << this->m_FileName
- << std::endl;
- VectorDataFileReaderException e(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
+ msg << "The file couldn't be opened for reading. "
+ << std::endl << "Filename: " << this->m_FileName
+ << std::endl;
+ VectorDataFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
return;
- }
+ }
readTester.close();
- }
+ }
}
template <class TOutputVectorData>
void
VectorDataFileReader<TOutputVectorData>
-::SetVectorDataIO( VectorDataIOBaseType * vectorDataIO)
+::SetVectorDataIO(VectorDataIOBaseType * vectorDataIO)
{
- itkDebugMacro("setting VectorDataIO to " << vectorDataIO );
- if (this->m_VectorDataIO != vectorDataIO )
- {
+ itkDebugMacro("setting VectorDataIO to " << vectorDataIO);
+ if (this->m_VectorDataIO != vectorDataIO)
+ {
this->m_VectorDataIO = vectorDataIO;
this->Modified();
- }
+ }
m_UserSpecifiedVectorDataIO = true;
}
-
template <class TOutputVectorData>
void
VectorDataFileReader<TOutputVectorData>
@@ -118,60 +117,61 @@ VectorDataFileReader<TOutputVectorData>
{
typename TOutputVectorData::Pointer output = this->GetOutput();
- itkDebugMacro(<<"Reading file for GenerateOutputInformation()" << m_FileName);
+ itkDebugMacro(<< "Reading file for GenerateOutputInformation()" << m_FileName);
// Check to see if we can read the file given the name or prefix
//
- if ( m_FileName == "" )
- {
+ if (m_FileName == "")
+ {
throw VectorDataFileReaderException(__FILE__, __LINE__, "FileName must be specified", ITK_LOCATION);
- }
+ }
// Test if the file exist and if it can be open.
// and exception will be thrown otherwise.
//
try
- {
+ {
m_ExceptionMessage = "";
this->TestFileExistanceAndReadability();
- }
- catch (itk::ExceptionObject &err)
- {
+ }
+ catch (itk::ExceptionObject & err)
+ {
m_ExceptionMessage = err.GetDescription();
- }
+ }
- if ( m_UserSpecifiedVectorDataIO == false ) //try creating via factory
- {
- m_VectorDataIO = VectorDataIOFactory<TOutputVectorData>::CreateVectorDataIO( m_FileName.c_str(), VectorDataIOFactory<TOutputVectorData>::ReadMode );
- }
+ if (m_UserSpecifiedVectorDataIO == false) //try creating via factory
+ {
+ m_VectorDataIO = VectorDataIOFactory<TOutputVectorData>::CreateVectorDataIO(
+ m_FileName.c_str(), VectorDataIOFactory<TOutputVectorData>::ReadMode);
+ }
- if ( m_VectorDataIO.IsNull() )
- {
+ if (m_VectorDataIO.IsNull())
+ {
itk::OStringStream msg;
msg << " Could not create IO object for file "
- << m_FileName.c_str() << std::endl;
+ << m_FileName.c_str() << std::endl;
if (m_ExceptionMessage.size())
- {
+ {
msg << m_ExceptionMessage;
- }
+ }
else
- {
+ {
msg << " Tried to create one of the following:" << std::endl;
std::list<itk::LightObject::Pointer> allobjects =
itk::ObjectFactoryBase::CreateAllInstance("otbVectorDataIOBase");
for (std::list<itk::LightObject::Pointer>::iterator i = allobjects.begin();
i != allobjects.end(); ++i)
- {
+ {
VectorDataIOBase<TOutputVectorData>* io = dynamic_cast<VectorDataIOBase<TOutputVectorData>*>(i->GetPointer());
msg << " " << io->GetNameOfClass() << std::endl;
- }
+ }
msg << " You probably failed to set a file suffix, or" << std::endl;
msg << " set the suffix to an unsupported type." << std::endl;
- }
+ }
VectorDataFileReaderException e(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
throw e;
return;
- }
+ }
m_VectorDataIO->SetFileName(m_FileName.c_str());
@@ -180,7 +180,6 @@ VectorDataFileReader<TOutputVectorData>
this->SetMetaDataDictionary(m_VectorDataIO->GetMetaDataDictionary());
}
-
template <class TOutputVectorData>
void
VectorDataFileReader<TOutputVectorData>
@@ -189,19 +188,19 @@ VectorDataFileReader<TOutputVectorData>
typename TOutputVectorData::Pointer output = this->GetOutput();
- itkDebugMacro ( << "VectorDataFileReader::GenerateData() \n");
+ itkDebugMacro (<< "VectorDataFileReader::GenerateData() \n");
// Test if the file exist and if it can be open.
// and exception will be thrown otherwise.
try
- {
+ {
m_ExceptionMessage = "";
this->TestFileExistanceAndReadability();
- }
- catch (itk::ExceptionObject &err)
- {
+ }
+ catch (itk::ExceptionObject & err)
+ {
m_ExceptionMessage = err.GetDescription();
- }
+ }
// Tell the VectorDataIO to read the file
//
@@ -213,7 +212,6 @@ VectorDataFileReader<TOutputVectorData>
return;
}
-
template <class TOutputVectorData>
void
VectorDataFileReader<TOutputVectorData>
@@ -222,20 +220,19 @@ VectorDataFileReader<TOutputVectorData>
Superclass::PrintSelf(os, indent);
if (m_VectorDataIO)
- {
+ {
os << indent << "VectorDataIO: \n";
m_VectorDataIO->Print(os, indent.GetNextIndent());
- }
+ }
else
- {
+ {
os << indent << "m_VectorDataIO: (null)" << "\n";
- }
+ }
os << indent << "UserSpecifiedVectorDataIO flag: " << m_UserSpecifiedVectorDataIO << "\n";
os << indent << "m_FileName: " << m_FileName << "\n";
}
-
} //namespace otb
#endif
diff --git a/Code/IO/otbVectorDataFileWriter.h b/Code/IO/otbVectorDataFileWriter.h
index 8b01b236fa..d633ee3ea6 100644
--- a/Code/IO/otbVectorDataFileWriter.h
+++ b/Code/IO/otbVectorDataFileWriter.h
@@ -32,26 +32,25 @@ class VectorDataFileWriterException : public itk::ExceptionObject
{
public:
/** Run-time information. */
- itkTypeMacro( VectorDataFileWriterException, ExceptionObject );
+ itkTypeMacro(VectorDataFileWriterException, ExceptionObject);
/** Constructor. */
VectorDataFileWriterException(const char *file, unsigned int line,
const char* message = "Error in IO",
- const char* loc = "Unknown" ) :
- ExceptionObject(file, line, message, loc)
+ const char* loc = "Unknown") :
+ ExceptionObject(file, line, message, loc)
{
}
/** Constructor. */
- VectorDataFileWriterException(const std::string &file, unsigned int line,
+ VectorDataFileWriterException(const std::string& file, unsigned int line,
const char* message = "Error in IO",
- const char* loc = "Unknown" ) :
- ExceptionObject(file, line, message, loc)
+ const char* loc = "Unknown") :
+ ExceptionObject(file, line, message, loc)
{
}
};
-
/** \class VectorDataFileWriter
* \brief This class writes vector data file format (shapefile and KML)
*
@@ -61,13 +60,13 @@ public:
template <class TInputVectorData>
class ITK_EXPORT VectorDataFileWriter : public itk::ProcessObject
{
-public :
+public:
/** Standard class typedefs. */
- typedef VectorDataFileWriter Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef VectorDataFileWriter Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -75,10 +74,9 @@ public :
/** Run-time type information (and related methods). */
itkTypeMacro(VectorDataFileWriter, itk::ProcessObject);
- typedef TInputVectorData InputVectorDataType;
+ typedef TInputVectorData InputVectorDataType;
typedef VectorDataIOBase<InputVectorDataType> VectorDataIOBaseType;
-
/** Set/Get the image input of this writer. */
void SetInput(const InputVectorDataType *input);
const InputVectorDataType * GetInput(void);
@@ -94,7 +92,6 @@ public :
this->Write();
}
-
/** Specify the name of the output shapefile to write. */
itkSetStringMacro(FileName);
itkGetStringMacro(FileName);
@@ -107,12 +104,12 @@ protected:
std::string m_FileName; // The file to be read
typename VectorDataIOBaseType::Pointer m_VectorDataIO;
- bool m_UserSpecifiedVectorDataIO; // track whether the VectorDataIO
+ bool m_UserSpecifiedVectorDataIO; // track whether the VectorDataIO
bool m_FactorySpecifiedVectorDataIO;
private:
- VectorDataFileWriter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorDataFileWriter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -123,5 +120,3 @@ private:
#endif
#endif // __otbVectorDataFileWriter_h
-
-
diff --git a/Code/IO/otbVectorDataFileWriter.txx b/Code/IO/otbVectorDataFileWriter.txx
index 4a5f3cbca6..155f34708e 100644
--- a/Code/IO/otbVectorDataFileWriter.txx
+++ b/Code/IO/otbVectorDataFileWriter.txx
@@ -19,7 +19,6 @@
#ifndef __otbVectorDataFileWriter_txx
#define __otbVectorDataFileWriter_txx
-
#include "otbMacro.h"
#include "otbVectorDataFileWriter.h"
#include "otbFileName.h"
@@ -33,9 +32,9 @@ namespace otb
template <class TInputVectorData>
VectorDataFileWriter<TInputVectorData>
::VectorDataFileWriter() :
- m_FileName(""),
- m_VectorDataIO(0),
- m_UserSpecifiedVectorDataIO(false)
+ m_FileName(""),
+ m_VectorDataIO(0),
+ m_UserSpecifiedVectorDataIO(false)
{
}
/**
@@ -47,7 +46,6 @@ VectorDataFileWriter<TInputVectorData>
{
}
-
//---------------------------------------------------------
template <class TInputVectorData>
void
@@ -56,10 +54,9 @@ VectorDataFileWriter<TInputVectorData>
{
// ProcessObject is not const_correct so this cast is required here.
this->ProcessObject::SetNthInput(0,
- const_cast<TInputVectorData *>(input ) );
+ const_cast<TInputVectorData *>(input));
}
-
//---------------------------------------------------------
template <class TInputVectorData>
const typename VectorDataFileWriter<TInputVectorData>::InputVectorDataType *
@@ -67,12 +64,12 @@ VectorDataFileWriter<TInputVectorData>
::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
return static_cast<TInputVectorData*>
- (this->ProcessObject::GetInput(0));
+ (this->ProcessObject::GetInput(0));
}
//---------------------------------------------------------
@@ -92,93 +89,95 @@ VectorDataFileWriter<TInputVectorData>
{
const InputVectorDataType * input = this->GetInput();
- itkDebugMacro( <<"Writing a vector data file" );
+ itkDebugMacro(<< "Writing a vector data file");
// Make sure input is available
- if ( input == 0 )
- {
+ if (input == 0)
+ {
itkExceptionMacro(<< "No input to writer!");
- }
+ }
// Make sure that we can write the file given the name
//
- if ( m_FileName == "" )
- {
- itkExceptionMacro(<<"No filename was specified");
- }
-
- if ( m_VectorDataIO.IsNull() ) //try creating via factory
- {
- itkDebugMacro(<<"Attempting factory creation of VectorDataIO for file: "
+ if (m_FileName == "")
+ {
+ itkExceptionMacro(<< "No filename was specified");
+ }
+
+ if (m_VectorDataIO.IsNull()) //try creating via factory
+ {
+ itkDebugMacro(<< "Attempting factory creation of VectorDataIO for file: "
<< m_FileName);
- m_VectorDataIO = VectorDataIOFactory<TInputVectorData>::CreateVectorDataIO( m_FileName.c_str(),
- VectorDataIOFactory<TInputVectorData>::WriteMode );
+ m_VectorDataIO = VectorDataIOFactory<TInputVectorData>::CreateVectorDataIO(
+ m_FileName.c_str(),
+ VectorDataIOFactory<TInputVectorData>::
+ WriteMode);
m_FactorySpecifiedVectorDataIO = true;
- }
+ }
else
- {
- if ( m_FactorySpecifiedVectorDataIO && !m_VectorDataIO->CanWriteFile( m_FileName.c_str() ) )
{
- itkDebugMacro(<<"VectorDataIO exists but doesn't know how to write file:"
- << m_FileName );
- itkDebugMacro(<<"Attempting creation of VectorDataIO with a factory for file:"
+ if (m_FactorySpecifiedVectorDataIO && !m_VectorDataIO->CanWriteFile(m_FileName.c_str()))
+ {
+ itkDebugMacro(<< "VectorDataIO exists but doesn't know how to write file:"
<< m_FileName);
- m_VectorDataIO = VectorDataIOFactory<TInputVectorData>::CreateVectorDataIO( m_FileName.c_str(),
- VectorDataIOFactory<TInputVectorData>::WriteMode );
+ itkDebugMacro(<< "Attempting creation of VectorDataIO with a factory for file:"
+ << m_FileName);
+ m_VectorDataIO = VectorDataIOFactory<TInputVectorData>::CreateVectorDataIO(
+ m_FileName.c_str(),
+ VectorDataIOFactory<TInputVectorData>
+ ::WriteMode);
m_FactorySpecifiedVectorDataIO = true;
+ }
}
- }
- if ( m_VectorDataIO.IsNull() )
- {
+ if (m_VectorDataIO.IsNull())
+ {
VectorDataFileWriterException e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << " Could not create IO object for file "
- << m_FileName.c_str() << std::endl;
+ << m_FileName.c_str() << std::endl;
msg << " Tried to create one of the following:" << std::endl;
std::list<itk::LightObject::Pointer> allobjects =
itk::ObjectFactoryBase::CreateAllInstance("otbVectorDataIOBase");
for (std::list<LightObject::Pointer>::iterator i = allobjects.begin();
i != allobjects.end(); ++i)
- {
+ {
VectorDataIOBase<TInputVectorData>* io = dynamic_cast<VectorDataIOBase<TInputVectorData>*>(i->GetPointer());
msg << " " << io->GetNameOfClass() << std::endl;
- }
+ }
msg << " You probably failed to set a file suffix, or" << std::endl;
msg << " set the suffix to an unsupported type." << std::endl;
e.SetDescription(msg.str().c_str());
e.SetLocation(ITK_LOCATION);
throw e;
- }
+ }
// NOTE: this const_cast<> is due to the lack of const-correctness
// of the ProcessObject.
InputVectorDataType * nonConstVectorData = const_cast<InputVectorDataType *>(input);
-
// Make sure the data is up-to-date.
- if ( nonConstVectorData->GetSource() )
- {
+ if (nonConstVectorData->GetSource())
+ {
nonConstVectorData->GetSource()->Update();
- }
+ }
// Notify start event observers
- this->InvokeEvent( itk::StartEvent() );
+ this->InvokeEvent(itk::StartEvent());
// Actually do something
this->GenerateData();
// Notify end event observers
- this->InvokeEvent( itk::EndEvent() );
+ this->InvokeEvent(itk::EndEvent());
// Release upstream data if requested
- if ( input->ShouldIReleaseData() )
- {
+ if (input->ShouldIReleaseData())
+ {
nonConstVectorData->ReleaseData();
- }
+ }
}
-
//---------------------------------------------------------
template <class TInputVectorData>
void
@@ -187,7 +186,7 @@ VectorDataFileWriter<TInputVectorData>
{
const InputVectorDataType * input = this->GetInput();
- itkDebugMacro(<<"Writing file: " << m_FileName);
+ itkDebugMacro(<< "Writing file: " << m_FileName);
// Setup the vector data IO for writing.
//
@@ -206,7 +205,6 @@ VectorDataFileWriter<TInputVectorData>
os << indent << "VectorDataFileWriter" << std::endl;
}
-
} //namespace otb
#endif
diff --git a/Code/IO/otbVectorDataIOBase.h b/Code/IO/otbVectorDataIOBase.h
index ee22e71d33..2bc1b37970 100644
--- a/Code/IO/otbVectorDataIOBase.h
+++ b/Code/IO/otbVectorDataIOBase.h
@@ -63,22 +63,21 @@ public:
/** Run-time type information (and related methods). */
itkTypeMacro(VectorDataIOBase, Superclass);
- typedef TData VectorDataType;
- typedef typename VectorDataType::Pointer VectorDataPointerType;
+ typedef TData VectorDataType;
+ typedef typename VectorDataType::Pointer VectorDataPointerType;
typedef typename VectorDataType::ConstPointer VectorDataConstPointerType;
itkStaticConstMacro(VDimension, unsigned int, VectorDataType::DataNodeType::Dimension);
typedef itk::Vector<double, VDimension> SpacingType;
- typedef itk::Point<double, VDimension> PointType;
+ typedef itk::Point<double, VDimension> PointType;
/** Set/Get the name of the file to be read. */
itkSetStringMacro(FileName);
itkGetStringMacro(FileName);
-
/** Enums used to specify byte order; whether Big Endian or Little Endian.
* Some subclasses use this, some ignore it. */
- typedef enum {BigEndian,LittleEndian,OrderNotApplicable} ByteOrder;
+ typedef enum {BigEndian, LittleEndian, OrderNotApplicable} ByteOrder;
/** These methods indicate the byte ordering of the file you are
* trying to read in. These methods will then either swap or not
@@ -91,8 +90,8 @@ public:
* a VAX or PC, SetByteOrderToLittleEndian() otherwise
* SetByteOrderToBigEndian(). Some ImageIOBase subclasses
* ignore these methods. */
- itkSetEnumMacro(ByteOrder,ByteOrder);
- itkGetEnumMacro(ByteOrder,ByteOrder);
+ itkSetEnumMacro(ByteOrder, ByteOrder);
+ itkGetEnumMacro(ByteOrder, ByteOrder);
void SetByteOrderToBigEndian()
{
this->SetByteOrder(BigEndian);
@@ -129,7 +128,6 @@ public:
/** Reads the data from disk into the memory buffer provided. */
virtual void Read(VectorDataPointerType data) = 0;
-
/*-------- This part of the interfaces deals with writing data ----- */
/** Determine the file type. Returns true if this VectorDataIO can read the
@@ -152,7 +150,6 @@ public:
* pointer to the beginning of the image data. */
virtual void Write(VectorDataConstPointerType data, char ** papszOptions = NULL) = 0;
-
protected:
VectorDataIOBase();
virtual ~VectorDataIOBase();
@@ -171,11 +168,9 @@ protected:
/** Return the object to an initialized state, ready to be used */
virtual void Reset(const bool freeDynamic = true);
-
private:
- VectorDataIOBase(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ VectorDataIOBase(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/IO/otbVectorDataIOBase.txx b/Code/IO/otbVectorDataIOBase.txx
index f36c23582c..2640057dab 100644
--- a/Code/IO/otbVectorDataIOBase.txx
+++ b/Code/IO/otbVectorDataIOBase.txx
@@ -28,12 +28,11 @@ namespace otb
template <class TData>
VectorDataIOBase<TData>
::VectorDataIOBase() :
- m_ByteOrder(OrderNotApplicable)
+ m_ByteOrder(OrderNotApplicable)
{
Reset(false);
}
-
template <class TData>
void
VectorDataIOBase<TData>
@@ -56,7 +55,7 @@ VectorDataIOBase<TData>
{
std::string s;
switch (t)
- {
+ {
case BigEndian:
return s = "BigEndian";
case LittleEndian:
@@ -64,11 +63,10 @@ VectorDataIOBase<TData>
case OrderNotApplicable:
default:
return s = "OrderNotApplicable";
- }
- return s="OrderNotApplicable";
+ }
+ return s = "OrderNotApplicable";
}
-
template <class TData>
void
VectorDataIOBase<TData>
diff --git a/Code/IO/otbVectorDataIOFactory.h b/Code/IO/otbVectorDataIOFactory.h
index 20e8950ba7..15bf3c9775 100644
--- a/Code/IO/otbVectorDataIOFactory.h
+++ b/Code/IO/otbVectorDataIOFactory.h
@@ -35,12 +35,11 @@ public:
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
- typedef TData DataType;
- typedef typename DataType::Pointer DataPointerType;
- typedef otb::VectorDataIOBase<DataType> VectorDataIOBaseType;
+ typedef TData DataType;
+ typedef typename DataType::Pointer DataPointerType;
+ typedef otb::VectorDataIOBase<DataType> VectorDataIOBaseType;
typedef typename VectorDataIOBaseType::Pointer VectorDataIOBasePointerType;
-
/** Class Methods used to interface with the registered factories */
/** Run-time type information (and related methods). */
@@ -63,12 +62,11 @@ protected:
~VectorDataIOFactory();
private:
- VectorDataIOFactory(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorDataIOFactory(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/IO/otbVectorDataIOFactory.txx b/Code/IO/otbVectorDataIOFactory.txx
index 5d7bf594ad..5e904f6d9e 100644
--- a/Code/IO/otbVectorDataIOFactory.txx
+++ b/Code/IO/otbVectorDataIOFactory.txx
@@ -40,41 +40,41 @@ VectorDataIOFactory<TData>
RegisterBuiltInFactories();
std::list<VectorDataIOBasePointerType> possibleVectorDataIO;
- std::list<itk::LightObject::Pointer> allobjects =
+ std::list<itk::LightObject::Pointer> allobjects =
itk::ObjectFactoryBase::CreateAllInstance("otbVectorDataIOBase");
for (std::list<itk::LightObject::Pointer>::iterator i = allobjects.begin();
i != allobjects.end(); ++i)
- {
+ {
VectorDataIOBaseType * io = dynamic_cast<VectorDataIOBaseType*>(i->GetPointer());
if (io)
- {
+ {
possibleVectorDataIO.push_back(io);
- }
+ }
else
- {
+ {
itkGenericExceptionMacro(<< "Error VectorDataIO factory did not return an VectorDataIOBase: "
<< (*i)->GetNameOfClass());
+ }
}
- }
for (typename std::list<VectorDataIOBasePointerType>::iterator k = possibleVectorDataIO.begin();
k != possibleVectorDataIO.end(); ++k)
- {
- if ( mode == ReadMode )
{
- if ((*k)->CanReadFile(path))
+ if (mode == ReadMode)
{
+ if ((*k)->CanReadFile(path))
+ {
return *k;
+ }
}
- }
- else if ( mode == WriteMode )
- {
- if ((*k)->CanWriteFile(path))
+ else if (mode == WriteMode)
{
+ if ((*k)->CanWriteFile(path))
+ {
return *k;
- }
+ }
+ }
}
- }
return 0;
}
template <class TData>
@@ -85,17 +85,17 @@ VectorDataIOFactory<TData>
static bool firstTime = true;
static itk::SimpleMutexLock mutex;
- {
+ {
// This helper class makes sure the Mutex is unlocked
// in the event an exception is thrown.
- itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder( mutex );
- if ( firstTime )
- {
- itk::ObjectFactoryBase::RegisterFactory( OGRVectorDataIOFactory<TData>::New() );
- itk::ObjectFactoryBase::RegisterFactory( KMLVectorDataIOFactory<TData>::New() );
+ itk::MutexLockHolder<itk::SimpleMutexLock> mutexHolder(mutex);
+ if (firstTime)
+ {
+ itk::ObjectFactoryBase::RegisterFactory(OGRVectorDataIOFactory<TData>::New());
+ itk::ObjectFactoryBase::RegisterFactory(KMLVectorDataIOFactory<TData>::New());
firstTime = false;
+ }
}
- }
}
} // end namespace otb
diff --git a/Code/IO/otbVectorDataKeywordlist.cxx b/Code/IO/otbVectorDataKeywordlist.cxx
index ebeb087add..72350389ab 100644
--- a/Code/IO/otbVectorDataKeywordlist.cxx
+++ b/Code/IO/otbVectorDataKeywordlist.cxx
@@ -22,29 +22,28 @@
namespace otb
{
-
VectorDataKeywordlist
- ::VectorDataKeywordlist()
+::VectorDataKeywordlist()
{
//Nothing to do here
}
VectorDataKeywordlist
- ::~VectorDataKeywordlist()
+::~VectorDataKeywordlist()
{
for (unsigned int i = 0; i < m_FieldList.size(); ++i)
- {
- if (m_FieldList[i].first->GetType() == OFTString)
{
- CPLFree( m_FieldList[i].second.String );
+ if (m_FieldList[i].first->GetType() == OFTString)
+ {
+ CPLFree(m_FieldList[i].second.String);
+ }
+ delete (m_FieldList[i].first);
}
- delete(m_FieldList[i].first);
- }
}
void
VectorDataKeywordlist
- ::AddField(OGRFieldDefn* fieldDefn, OGRField* field)
+::AddField(OGRFieldDefn* fieldDefn, OGRField* field)
{
FieldType newField;
newField.first = fieldDefn;
@@ -54,311 +53,308 @@ VectorDataKeywordlist
// keeping only pointer here. (but it does not seem
// necessary so far...)
m_FieldList.push_back(CopyOgrField(newField));
-};
-
+}
void
- VectorDataKeywordlist
- ::AddField(std::string key,std::string value)
+VectorDataKeywordlist
+::AddField(std::string key, std::string value)
{
FieldType newField;
OGRFieldDefn* fieldDefn = new OGRFieldDefn(key.c_str(), OFTString);
OGRField field;
- char * cstr = new char[value.length() + 1];
+ char * cstr = new char[value.length() + 1];
strcpy(cstr, value.c_str());
field.String = cstr;
- newField.first=fieldDefn;
- newField.second=field;
+ newField.first = fieldDefn;
+ newField.second = field;
m_FieldList.push_back(newField);
}
std::string
VectorDataKeywordlist
- ::GetFieldAsString(std::string key) const
+::GetFieldAsString(std::string key) const
{
for (unsigned int i = 0; i < m_FieldList.size(); ++i)
- {
- if (key.compare(m_FieldList[i].first->GetNameRef()) == 0)
{
- if (m_FieldList[i].first->GetType() == OFTString )
+ if (key.compare(m_FieldList[i].first->GetNameRef()) == 0)
{
+ if (m_FieldList[i].first->GetType() == OFTString)
+ {
return m_FieldList[i].second.String;
- }
- if (m_FieldList[i].first->GetType() == OFTReal )
- {
+ }
+ if (m_FieldList[i].first->GetType() == OFTReal)
+ {
std::ostringstream ss;
ss << std::setprecision(15) << m_FieldList[i].second.Real;
return ss.str();
+ }
+ itkExceptionMacro(<< "This type is not handled (yet) by GetFieldAsString(), please request for it");
}
- itkExceptionMacro(<<"This type is not handled (yet) by GetFieldAsString(), please request for it");
}
- }
return "";
}
bool
VectorDataKeywordlist
- ::HasField(std::string key) const
+::HasField(std::string key) const
{
for (unsigned int i = 0; i < m_FieldList.size(); ++i)
- {
- if (key.compare(m_FieldList[i].first->GetNameRef()) == 0)
{
+ if (key.compare(m_FieldList[i].first->GetNameRef()) == 0)
+ {
return true;
+ }
}
- }
return false;
}
void
VectorDataKeywordlist
- ::SetFieldAsString(std::string key,std::string value)
+::SetFieldAsString(std::string key, std::string value)
{
if (HasField(key))
- {
- for (unsigned int i = 0; i < m_FieldList.size(); ++i)
{
- if (key.compare(m_FieldList[i].first->GetNameRef()) == 0)
+ for (unsigned int i = 0; i < m_FieldList.size(); ++i)
{
- if (m_FieldList[i].first->GetType() == OFTString)
+ if (key.compare(m_FieldList[i].first->GetNameRef()) == 0)
{
+ if (m_FieldList[i].first->GetType() == OFTString)
+ {
OGRField field;
- char * cstr = new char[value.length() + 1];
+ char * cstr = new char[value.length() + 1];
strcpy(cstr, value.c_str());
field.String = cstr;
m_FieldList[i].second = field;
- }
+ }
else
- {
- itkExceptionMacro(<<"This type is not of string type, can't add the element in it");
+ {
+ itkExceptionMacro(<< "This type is not of string type, can't add the element in it");
+ }
}
}
}
- }
else
- {
- AddField(key,value);
- }
+ {
+ AddField(key, value);
+ }
}
VectorDataKeywordlist::FieldType
VectorDataKeywordlist
- ::GetNthField(unsigned int index) const
+::GetNthField(unsigned int index) const
{
if (index > m_FieldList.size())
- {
- itkExceptionMacro(<<" Accessing out-of-range metadata ");
- }
+ {
+ itkExceptionMacro(<< " Accessing out-of-range metadata ");
+ }
return m_FieldList[index];
}
unsigned int
VectorDataKeywordlist
- ::GetNumberOfFields() const
+::GetNumberOfFields() const
{
return m_FieldList.size();
}
void
VectorDataKeywordlist
- ::operator=(const Self& p)
+::operator =(const Self& p)
{
for (unsigned int i = 0; i < p.m_FieldList.size(); ++i)
- {
+ {
m_FieldList.push_back(CopyOgrField(p.m_FieldList[i]));
- }
+ }
}
void
VectorDataKeywordlist
- ::Print(std::ostream& os, itk::Indent indent) const
+::Print(std::ostream& os, itk::Indent indent) const
{
this->PrintSelf(os, indent.GetNextIndent());
}
void
VectorDataKeywordlist
- ::PrintSelf(std::ostream& os, itk::Indent indent) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
os << indent << " VectorData Keyword list: ";
os << indent << " - Size: " << m_FieldList.size() << std::endl;
for (unsigned int i = 0; i < m_FieldList.size(); ++i)
- {
+ {
os << indent << " " << PrintField(m_FieldList[i]);
- }
+ }
}
std::string
VectorDataKeywordlist
- ::PrintField(FieldType field) const
+::PrintField(FieldType field) const
{
std::stringstream output;
output << std::setprecision(15);
output << field.first->GetNameRef() << " (";
output << field.first->GetFieldTypeName(field.first->GetType()) << "): ";
- switch(field.first->GetType())
- {
- case OFTInteger:
+ switch (field.first->GetType())
+ {
+ case OFTInteger:
{
- output << field.second.Integer;
- break;
+ output << field.second.Integer;
+ break;
}
- case OFTIntegerList:
+ case OFTIntegerList:
{
- output << "Type not handled for printing";
- break;
+ output << "Type not handled for printing";
+ break;
}
- case OFTReal:
+ case OFTReal:
{
- output << field.second.Real;
- break;
+ output << field.second.Real;
+ break;
}
- case OFTRealList:
+ case OFTRealList:
{
- output << "Type not handled for printing";
- break;
+ output << "Type not handled for printing";
+ break;
}
- case OFTString:
+ case OFTString:
{
- if (field.second.String != NULL)
+ if (field.second.String != NULL)
{
- output << field.second.String;
+ output << field.second.String;
}
- break;
+ break;
}
- case OFTStringList:
+ case OFTStringList:
{
- output << "Type not handled for printing";
- break;
+ output << "Type not handled for printing";
+ break;
}
- case OFTWideString:
+ case OFTWideString:
{
- output << "Type not handled for printing";
- break;
+ output << "Type not handled for printing";
+ break;
}
- case OFTWideStringList:
+ case OFTWideStringList:
{
- output << "Type not handled for printing";
- break;
+ output << "Type not handled for printing";
+ break;
}
- case OFTBinary:
+ case OFTBinary:
{
- output << "Type not handled for printing";
- break;
+ output << "Type not handled for printing";
+ break;
}
- case OFTDate:
+ case OFTDate:
{
- output << field.second.Date.Year << field.second.Date.Month << field.second.Date.Day;
- break;
+ output << field.second.Date.Year << field.second.Date.Month << field.second.Date.Day;
+ break;
}
- case OFTTime:
+ case OFTTime:
{
- output << field.second.Date.Hour << field.second.Date.Minute << field.second.Date.Second;
- break;
+ output << field.second.Date.Hour << field.second.Date.Minute << field.second.Date.Second;
+ break;
}
- case OFTDateTime:
+ case OFTDateTime:
{
- output << field.second.Date.Year << field.second.Date.Month << field.second.Date.Day << "-"
- << field.second.Date.Hour << field.second.Date.Minute << field.second.Date.Second;
- break;
+ output << field.second.Date.Year << field.second.Date.Month << field.second.Date.Day << "-"
+ << field.second.Date.Hour << field.second.Date.Minute << field.second.Date.Second;
+ break;
+ }
}
- }
output << std::endl;
return output.str();
}
-
VectorDataKeywordlist::FieldType
VectorDataKeywordlist
- ::CopyOgrField(FieldType field)
+::CopyOgrField(FieldType field)
{
FieldType outField;
outField.first = new OGRFieldDefn(field.first);
- switch(field.first->GetType())
- {
- case OFTInteger:
+ switch (field.first->GetType())
+ {
+ case OFTInteger:
{
- outField.second.Integer = field.second.Integer;
- break;
+ outField.second.Integer = field.second.Integer;
+ break;
}
- case OFTIntegerList:
+ case OFTIntegerList:
{
- std::cerr << "OGR type not handled" << std::endl;
- break;
+ std::cerr << "OGR type not handled" << std::endl;
+ break;
}
- case OFTReal:
+ case OFTReal:
{
- outField.second.Real = field.second.Real;
- break;
+ outField.second.Real = field.second.Real;
+ break;
}
- case OFTRealList:
+ case OFTRealList:
{
- std::cerr << "OGR type not handled" << std::endl;
- break;
+ std::cerr << "OGR type not handled" << std::endl;
+ break;
}
- case OFTString:
+ case OFTString:
{
- if (field.second.String != NULL)
+ if (field.second.String != NULL)
{
- CPLFree( outField.second.String );
- outField.second.String = CPLStrdup( field.second.String );
+ CPLFree(outField.second.String);
+ outField.second.String = CPLStrdup(field.second.String);
}
- break;
+ break;
}
- case OFTStringList:
+ case OFTStringList:
{
- std::cerr << "OGR type not handled" << std::endl;
- break;
+ std::cerr << "OGR type not handled" << std::endl;
+ break;
}
- case OFTWideString:
+ case OFTWideString:
{
- std::cerr << "OGR type not handled" << std::endl;
- break;
+ std::cerr << "OGR type not handled" << std::endl;
+ break;
}
- case OFTWideStringList:
+ case OFTWideStringList:
{
- std::cerr << "OGR type not handled" << std::endl;
- break;
+ std::cerr << "OGR type not handled" << std::endl;
+ break;
}
- case OFTBinary:
+ case OFTBinary:
{
- std::cerr << "OGR type not handled" << std::endl;
- break;
+ std::cerr << "OGR type not handled" << std::endl;
+ break;
}
- case OFTDate:
+ case OFTDate:
{
- outField.second.Date.Year = field.second.Date.Year;
- outField.second.Date.Month = field.second.Date.Month;
- outField.second.Date.Day = field.second.Date.Day;
- break;
+ outField.second.Date.Year = field.second.Date.Year;
+ outField.second.Date.Month = field.second.Date.Month;
+ outField.second.Date.Day = field.second.Date.Day;
+ break;
}
- case OFTTime:
+ case OFTTime:
{
- outField.second.Date.Hour = field.second.Date.Hour;
- outField.second.Date.Minute = field.second.Date.Minute;
- outField.second.Date.Second = field.second.Date.Second;
- break;
+ outField.second.Date.Hour = field.second.Date.Hour;
+ outField.second.Date.Minute = field.second.Date.Minute;
+ outField.second.Date.Second = field.second.Date.Second;
+ break;
}
- case OFTDateTime:
+ case OFTDateTime:
{
- outField.second.Date.Year = field.second.Date.Year;
- outField.second.Date.Month = field.second.Date.Month;
- outField.second.Date.Day = field.second.Date.Day;
- outField.second.Date.Hour = field.second.Date.Hour;
- outField.second.Date.Minute = field.second.Date.Minute;
- outField.second.Date.Second = field.second.Date.Second;
- break;
+ outField.second.Date.Year = field.second.Date.Year;
+ outField.second.Date.Month = field.second.Date.Month;
+ outField.second.Date.Day = field.second.Date.Day;
+ outField.second.Date.Hour = field.second.Date.Hour;
+ outField.second.Date.Minute = field.second.Date.Minute;
+ outField.second.Date.Second = field.second.Date.Second;
+ break;
+ }
}
- }
return outField;
}
-
std::ostream &
- operator<<(std::ostream &os, const VectorDataKeywordlist &kwl)
+operator <<(std::ostream& os, const VectorDataKeywordlist& kwl)
{
kwl.Print(os);
return os;
diff --git a/Code/IO/otbVectorDataKeywordlist.h b/Code/IO/otbVectorDataKeywordlist.h
index 3ce6ac94f0..32af1c6a2f 100644
--- a/Code/IO/otbVectorDataKeywordlist.h
+++ b/Code/IO/otbVectorDataKeywordlist.h
@@ -23,7 +23,6 @@
#include <vector>
#include "ogr_feature.h"
-
namespace otb
{
/** \class VectorDataKeywordlist
@@ -41,87 +40,84 @@ namespace otb
class VectorDataKeywordlist
{
- public:
- /** Smart pointer typedef support. */
- typedef VectorDataKeywordlist Self;
-
- typedef std::pair<OGRFieldDefn*,OGRField> FieldType;
- typedef std::vector< FieldType > FieldListType;
+public:
+ /** Smart pointer typedef support. */
+ typedef VectorDataKeywordlist Self;
- virtual const char *GetNameOfClass() const
- {return "VectorDataKeywordlist";}
+ typedef std::pair<OGRFieldDefn*, OGRField> FieldType;
+ typedef std::vector<FieldType> FieldListType;
+ virtual const char *GetNameOfClass() const
+ {return "VectorDataKeywordlist"; }
- void AddField(OGRFieldDefn* fieldDefn, OGRField* field);
+ void AddField(OGRFieldDefn* fieldDefn, OGRField* field);
- /**
- * \param key The name of the field.
- * \param value The value of the field.
- */
- void AddField(std::string key,std::string value);
+ /**
+ * \param key The name of the field.
+ * \param value The value of the field.
+ */
+ void AddField(std::string key, std::string value);
/**
* Returns the value associated with a field name.
* \param key The name of the field.
* \return The value of the field. A default value is retuned if the key was not found.
*/
- std::string GetFieldAsString(std::string key) const;
+ std::string GetFieldAsString(std::string key) const;
/**
* \return True if the node contains the field named after the given key.
* \param key The name of the field.
*/
- bool HasField(std::string key) const;
+ bool HasField(std::string key) const;
- /**
- * \param key The name of the field.
- * \param value The value of the field.
- */
- void SetFieldAsString(std::string key,std::string value);
+ /**
+ * \param key The name of the field.
+ * \param value The value of the field.
+ */
+ void SetFieldAsString(std::string key, std::string value);
/**
* \return the nth field of the node as a std::pair of (key,value).
* \param index the index of the field to return.
*/
- FieldType GetNthField(unsigned int index) const;
+ FieldType GetNthField(unsigned int index) const;
/**
* \return the number of fields in the node.
*/
- unsigned int GetNumberOfFields() const;
-
- /**
- * Print the keyword list
- */
- virtual void Print(std::ostream& os, itk::Indent indent=0) const;
+ unsigned int GetNumberOfFields() const;
- /** Constructor */
- VectorDataKeywordlist();
- /** Destructor */
- virtual ~VectorDataKeywordlist();
+ /**
+ * Print the keyword list
+ */
+ virtual void Print(std::ostream& os, itk::Indent indent = 0) const;
- /** Constructor by copy (deep copy)*/
- VectorDataKeywordlist(const Self&);
+ /** Constructor */
+ VectorDataKeywordlist();
+ /** Destructor */
+ virtual ~VectorDataKeywordlist();
- /** Deep copy operator*/
- void operator=(const Self&);
+ /** Constructor by copy (deep copy)*/
+ VectorDataKeywordlist(const Self&);
- protected:
+ /** Deep copy operator*/
+ void operator =(const Self&);
- virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
+protected:
- private:
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
- std::string PrintField(FieldType field) const;
- FieldType CopyOgrField(FieldType field);
- FieldListType m_FieldList;
+private:
+ std::string PrintField(FieldType field) const;
+ FieldType CopyOgrField(FieldType field);
+ FieldListType m_FieldList;
};
-extern std::ostream & operator<<(std::ostream &os, const VectorDataKeywordlist &kwl);
+extern std::ostream & operator <<(std::ostream& os, const VectorDataKeywordlist& kwl);
}
#endif
-
diff --git a/Code/IO/otbVectorImage.h b/Code/IO/otbVectorImage.h
index 772c1cce28..755e28555c 100644
--- a/Code/IO/otbVectorImage.h
+++ b/Code/IO/otbVectorImage.h
@@ -33,20 +33,20 @@ namespace otb
* \brief Creation of an "otb" vector image which contains metadata.
*
*/
-template <class TPixel, unsigned int VImageDimension=2>
+template <class TPixel, unsigned int VImageDimension = 2>
class ITK_EXPORT VectorImage : public itk::VectorImage<TPixel, VImageDimension>
{
public:
/** Standard class typedefs. */
- typedef VectorImage Self;
- typedef itk::VectorImage<TPixel, VImageDimension> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef itk::WeakPointer<const Self> ConstWeakPointer;
+ typedef VectorImage Self;
+ typedef itk::VectorImage<TPixel, VImageDimension> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::WeakPointer<const Self> ConstWeakPointer;
- typedef DefaultImageMetadataInterface::VectorType VectorType;
- typedef DefaultImageMetadataInterface::ImageKeywordlistType ImageKeywordlistType;
+ typedef DefaultImageMetadataInterface::VectorType VectorType;
+ typedef DefaultImageMetadataInterface::ImageKeywordlistType ImageKeywordlistType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -75,11 +75,11 @@ public:
/** Functor to provide a common API between DefaultPixelAccessor and
* DefaultVectorPixelAccessor */
- typedef itk::DefaultVectorPixelAccessorFunctor< Self > AccessorFunctorType;
+ typedef itk::DefaultVectorPixelAccessorFunctor<Self> AccessorFunctorType;
/** Tyepdef for the functor used to access a neighborhood of pixel pointers.*/
typedef itk::VectorImageNeighborhoodAccessorFunctor<
- Self > NeighborhoodAccessorFunctorType;
+ Self> NeighborhoodAccessorFunctorType;
/** Dimension of the image. This constant is used by functions that are
* templated over image type (as opposed to being templated over pixel type
@@ -91,19 +91,19 @@ public:
typedef typename Superclass::PixelContainer PixelContainer;
/** Index typedef support. An index is used to access pixel values. */
- typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::IndexType IndexType;
/** Offset typedef support. An offset is used to access pixel values. */
typedef typename Superclass::OffsetType OffsetType;
/** Size typedef support. A size is used to define region bounds. */
- typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::SizeType SizeType;
/** Direction typedef support. A matrix of direction cosines. */
- typedef typename Superclass::DirectionType DirectionType;
+ typedef typename Superclass::DirectionType DirectionType;
/** Region typedef support. A region is used to specify a subset of an image. */
- typedef typename Superclass::RegionType RegionType;
+ typedef typename Superclass::RegionType RegionType;
/** Spacing typedef support. Spacing holds the size of a pixel. The
* spacing is the geometric distance between image samples. */
@@ -113,33 +113,32 @@ public:
* of the index (0,0). */
typedef typename Superclass::PointType PointType;
-
/** Get the projection coordinate system of the image. */
- virtual std::string GetProjectionRef( void ) const;
+ virtual std::string GetProjectionRef(void) const;
/** Get the GCP projection coordinates of the image. */
- virtual std::string GetGCPProjection( void ) const;
+ virtual std::string GetGCPProjection(void) const;
- virtual unsigned int GetGCPCount( void ) const;
+ virtual unsigned int GetGCPCount(void) const;
- virtual OTB_GCP & GetGCPs ( unsigned int GCPnum );
+ virtual OTB_GCP& GetGCPs(unsigned int GCPnum);
- virtual std::string GetGCPId( unsigned int GCPnum ) const;
- virtual std::string GetGCPInfo( unsigned int GCPnum ) const;
- virtual double GetGCPRow( unsigned int GCPnum ) const;
- virtual double GetGCPCol( unsigned int GCPnum ) const;
- virtual double GetGCPX( unsigned int GCPnum ) const;
- virtual double GetGCPY( unsigned int GCPnum ) const;
- virtual double GetGCPZ( unsigned int GCPnum ) const;
+ virtual std::string GetGCPId(unsigned int GCPnum) const;
+ virtual std::string GetGCPInfo(unsigned int GCPnum) const;
+ virtual double GetGCPRow(unsigned int GCPnum) const;
+ virtual double GetGCPCol(unsigned int GCPnum) const;
+ virtual double GetGCPX(unsigned int GCPnum) const;
+ virtual double GetGCPY(unsigned int GCPnum) const;
+ virtual double GetGCPZ(unsigned int GCPnum) const;
/** Get the six coefficients of affine geoTtransform. */
- virtual VectorType GetGeoTransform( void ) const;
+ virtual VectorType GetGeoTransform(void) const;
/** Get image corners. */
- virtual VectorType GetUpperLeftCorner( void ) const;
- virtual VectorType GetUpperRightCorner( void ) const;
- virtual VectorType GetLowerLeftCorner( void ) const;
- virtual VectorType GetLowerRightCorner( void ) const;
+ virtual VectorType GetUpperLeftCorner(void) const;
+ virtual VectorType GetUpperRightCorner(void) const;
+ virtual VectorType GetLowerLeftCorner(void) const;
+ virtual VectorType GetLowerRightCorner(void) const;
/** Get image keyword list */
virtual ImageKeywordlistType GetImageKeywordlist(void);
@@ -165,7 +164,7 @@ public:
/** Return the NeighborhoodAccessor functor */
NeighborhoodAccessorFunctorType GetNeighborhoodAccessor()
{
- return NeighborhoodAccessorFunctorType( this->GetNumberOfComponentsPerPixel() );
+ return NeighborhoodAccessorFunctorType(this->GetNumberOfComponentsPerPixel());
}
/** Return the NeighborhoodAccessor functor */
@@ -176,18 +175,17 @@ public:
protected:
VectorImage();
- virtual ~VectorImage() {};
+ virtual ~VectorImage() {}
private:
- VectorImage(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
- /** Only here to have access to projection and coordinates datas.
- Those method will disappear.
- Use Default because don't need to know the sensor type*/
+ VectorImage(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
+ /** Only here to have access to projection and coordinates datas.
+Those method will disappear.
+Use Default because don't need to know the sensor type*/
typename DefaultImageMetadataInterface::Pointer m_ImageMetadataInterface;
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/IO/otbVectorImage.txx b/Code/IO/otbVectorImage.txx
index 3042a2f7b1..effba428ea 100644
--- a/Code/IO/otbVectorImage.txx
+++ b/Code/IO/otbVectorImage.txx
@@ -18,7 +18,6 @@
#ifndef __otbVectorImage_txx
#define __otbVectorImage_txx
-
#ifdef _MSC_VER
#pragma warning ( disable : 4786 )
#endif
@@ -29,124 +28,124 @@ namespace otb
{
template <class TPixel, unsigned int VImageDimension>
-VectorImage<TPixel,VImageDimension>::VectorImage()
+VectorImage<TPixel, VImageDimension>::VectorImage()
{
m_ImageMetadataInterface = DefaultImageMetadataInterface::New();
}
template <class TPixel, unsigned int VImageDimension>
-std::string VectorImage<TPixel, VImageDimension>::GetProjectionRef( void ) const
+std::string VectorImage<TPixel, VImageDimension>::GetProjectionRef(void) const
{
- return ( m_ImageMetadataInterface->GetProjectionRef( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetProjectionRef(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
-std::string VectorImage<TPixel, VImageDimension>::GetGCPProjection( void ) const
+std::string VectorImage<TPixel, VImageDimension>::GetGCPProjection(void) const
{
- return ( m_ImageMetadataInterface->GetGCPProjection( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetGCPProjection(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
-unsigned int VectorImage<TPixel, VImageDimension>::GetGCPCount( void ) const
+unsigned int VectorImage<TPixel, VImageDimension>::GetGCPCount(void) const
{
- return ( m_ImageMetadataInterface->GetGCPCount( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetGCPCount(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
-OTB_GCP & VectorImage<TPixel, VImageDimension>::GetGCPs ( unsigned int GCPnum )
+OTB_GCP& VectorImage<TPixel, VImageDimension>::GetGCPs(unsigned int GCPnum)
{
- return ( m_ImageMetadataInterface->GetGCPs( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPs(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
-std::string VectorImage<TPixel, VImageDimension>::GetGCPId( unsigned int GCPnum ) const
+std::string VectorImage<TPixel, VImageDimension>::GetGCPId(unsigned int GCPnum) const
{
- return ( m_ImageMetadataInterface->GetGCPId( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPId(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
-std::string VectorImage<TPixel, VImageDimension>::GetGCPInfo( unsigned int GCPnum ) const
+std::string VectorImage<TPixel, VImageDimension>::GetGCPInfo(unsigned int GCPnum) const
{
- return ( m_ImageMetadataInterface->GetGCPInfo( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPInfo(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
-double VectorImage<TPixel, VImageDimension>::GetGCPRow( unsigned int GCPnum ) const
+double VectorImage<TPixel, VImageDimension>::GetGCPRow(unsigned int GCPnum) const
{
- return ( m_ImageMetadataInterface->GetGCPRow( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPRow(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
-double VectorImage<TPixel, VImageDimension>::GetGCPCol( unsigned int GCPnum ) const
+double VectorImage<TPixel, VImageDimension>::GetGCPCol(unsigned int GCPnum) const
{
- return ( m_ImageMetadataInterface->GetGCPCol( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPCol(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
-double VectorImage<TPixel, VImageDimension>::GetGCPX( unsigned int GCPnum ) const
+double VectorImage<TPixel, VImageDimension>::GetGCPX(unsigned int GCPnum) const
{
- return ( m_ImageMetadataInterface->GetGCPX( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPX(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
-double VectorImage<TPixel, VImageDimension>::GetGCPY( unsigned int GCPnum ) const
+double VectorImage<TPixel, VImageDimension>::GetGCPY(unsigned int GCPnum) const
{
- return ( m_ImageMetadataInterface->GetGCPY( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPY(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
-double VectorImage<TPixel, VImageDimension>::GetGCPZ( unsigned int GCPnum ) const
+double VectorImage<TPixel, VImageDimension>::GetGCPZ(unsigned int GCPnum) const
{
- return ( m_ImageMetadataInterface->GetGCPZ( this->GetMetaDataDictionary(), GCPnum ) );
+ return (m_ImageMetadataInterface->GetGCPZ(this->GetMetaDataDictionary(), GCPnum));
}
template <class TPixel, unsigned int VImageDimension>
typename VectorImage<TPixel, VImageDimension>::VectorType
-VectorImage<TPixel, VImageDimension>::GetGeoTransform( void ) const
+VectorImage<TPixel, VImageDimension>::GetGeoTransform(void) const
{
- return ( m_ImageMetadataInterface->GetGeoTransform( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetGeoTransform(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
typename VectorImage<TPixel, VImageDimension>::VectorType
-VectorImage<TPixel, VImageDimension>::GetUpperLeftCorner( void ) const
+VectorImage<TPixel, VImageDimension>::GetUpperLeftCorner(void) const
{
- return ( m_ImageMetadataInterface->GetUpperLeftCorner( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetUpperLeftCorner(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
typename VectorImage<TPixel, VImageDimension>::VectorType
-VectorImage<TPixel, VImageDimension>::GetUpperRightCorner( void ) const
+VectorImage<TPixel, VImageDimension>::GetUpperRightCorner(void) const
{
- return ( m_ImageMetadataInterface->GetUpperRightCorner( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetUpperRightCorner(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
typename VectorImage<TPixel, VImageDimension>::VectorType
-VectorImage<TPixel, VImageDimension>::GetLowerLeftCorner( void ) const
+VectorImage<TPixel, VImageDimension>::GetLowerLeftCorner(void) const
{
- return ( m_ImageMetadataInterface->GetLowerLeftCorner( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetLowerLeftCorner(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
typename VectorImage<TPixel, VImageDimension>::VectorType
-VectorImage<TPixel, VImageDimension>::GetLowerRightCorner( void ) const
+VectorImage<TPixel, VImageDimension>::GetLowerRightCorner(void) const
{
- return ( m_ImageMetadataInterface->GetLowerRightCorner( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetLowerRightCorner(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
typename VectorImage<TPixel, VImageDimension>::ImageKeywordlistType
-VectorImage<TPixel, VImageDimension>::GetImageKeywordlist( void )
+VectorImage<TPixel, VImageDimension>::GetImageKeywordlist(void)
{
- return ( m_ImageMetadataInterface->GetImageKeywordlist( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetImageKeywordlist(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
const typename VectorImage<TPixel, VImageDimension>::ImageKeywordlistType
-VectorImage<TPixel, VImageDimension>::GetImageKeywordlist( void ) const
+VectorImage<TPixel, VImageDimension>::GetImageKeywordlist(void) const
{
- return ( m_ImageMetadataInterface->GetImageKeywordlist( this->GetMetaDataDictionary() ) );
+ return (m_ImageMetadataInterface->GetImageKeywordlist(this->GetMetaDataDictionary()));
}
template <class TPixel, unsigned int VImageDimension>
@@ -162,11 +161,10 @@ template <class TPixel, unsigned int VImageDimension>
void
VectorImage<TPixel, VImageDimension>::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
- m_ImageMetadataInterface->PrintSelf( os, indent, this->GetMetaDataDictionary() );
+ m_ImageMetadataInterface->PrintSelf(os, indent, this->GetMetaDataDictionary());
}
-
} // end namespace otb
#endif
diff --git a/Code/IO/otbWorldFile.h b/Code/IO/otbWorldFile.h
index 9f3f29c0ca..61cd6cb171 100644
--- a/Code/IO/otbWorldFile.h
+++ b/Code/IO/otbWorldFile.h
@@ -22,14 +22,13 @@
namespace otb {
-
/**
* \class WorldFile
* \brief Handle the world file that associate geographic information to png, jpg
*
*/
-class ITK_EXPORT WorldFile: public itk::Object
+class ITK_EXPORT WorldFile : public itk::Object
{
public:
@@ -39,7 +38,7 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
itkGetMacro(LonOrigin, double)
itkSetMacro(LonOrigin, double)
@@ -60,13 +59,13 @@ public:
void Update()
{
if (m_ImageFilename.empty())
- {
+ {
itkExceptionMacro(<< "The image filename must be provided");
- }
+ }
std::string worldFilename;
- int i = m_ImageFilename.find_last_of('.');
- worldFilename = m_ImageFilename.substr(0,i) + ".wld";
+ int i = m_ImageFilename.find_last_of('.');
+ worldFilename = m_ImageFilename.substr(0, i) + ".wld";
std::ofstream file;
file.open(worldFilename.c_str());
@@ -81,16 +80,16 @@ public:
}
protected:
- WorldFile(): m_LonOrigin(0.0), m_LatOrigin(0.0),
- m_LonSpacing(0.0), m_LatSpacing(0.0),
- m_LonRotation(0.0), m_LatRotation(0.0),
- m_ImageFilename("")
- {};
- ~WorldFile() {};
+ WorldFile() : m_LonOrigin(0.0), m_LatOrigin(0.0),
+ m_LonSpacing(0.0), m_LatSpacing(0.0),
+ m_LonRotation(0.0), m_LatRotation(0.0),
+ m_ImageFilename("")
+ {};
+ ~WorldFile() {}
private:
- WorldFile(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ WorldFile(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
double m_LonOrigin;
double m_LatOrigin;
double m_LonSpacing;
diff --git a/Code/Learning/otbChangeProfileKernelFunctor.cxx b/Code/Learning/otbChangeProfileKernelFunctor.cxx
index 80c20722e0..28d66fbef5 100644
--- a/Code/Learning/otbChangeProfileKernelFunctor.cxx
+++ b/Code/Learning/otbChangeProfileKernelFunctor.cxx
@@ -25,57 +25,52 @@ namespace otb
ChangeProfileKernelFunctor
::ChangeProfileKernelFunctor ()
- : GenericKernelFunctorBase ()
+ : GenericKernelFunctorBase ()
{
m_Coef = 0.0;
m_Degree = 1.0;
m_Gamma = 1.0;
- SetValue( "Coef", m_Coef );
- SetValue( "Degree", m_Degree );
- SetValue( "Gamma", m_Gamma );
+ SetValue("Coef", m_Coef);
+ SetValue("Degree", m_Degree);
+ SetValue("Gamma", m_Gamma);
}
void
ChangeProfileKernelFunctor
-::Update ()
+::Update()
{
- m_Coef = GetValue<double>( "Coef" );
- m_Degree = GetValue<double>( "Degree" );
- m_Gamma = GetValue<double>( "Gamma" );
+ m_Coef = GetValue<double>("Coef");
+ m_Degree = GetValue<double>("Degree");
+ m_Gamma = GetValue<double>("Gamma");
}
double
ChangeProfileKernelFunctor
-::operator() ( const svm_node * x, const svm_node * y,
- const svm_parameter & /*param*/ ) const
+::operator ()(const svm_node * x, const svm_node * y,
+ const svm_parameter& /*param*/) const
{
double theMax(0.);
double theCur(0.);
while (x->index != -1 && y->index != -1)
- {
- if (x->index == y->index)
{
- theCur = fabs( x->value - y->value );
+ if (x->index == y->index)
+ {
+ theCur = fabs(x->value - y->value);
++x;
++y;
- }
+ }
else
- {
- if (x->index > y->index)
- ++y;
- else
- ++x;
- }
+ {
+ if (x->index > y->index) ++y;
+ else ++x;
+ }
- if ( theCur > theMax )
- theMax = theCur;
- }
+ if (theCur > theMax) theMax = theCur;
+ }
- return exp( - m_Gamma * pow( theMax, m_Degree ) + m_Coef );
+ return exp(-m_Gamma * pow(theMax, m_Degree) + m_Coef);
}
} // end of namespace otb
-
-
diff --git a/Code/Learning/otbChangeProfileKernelFunctor.h b/Code/Learning/otbChangeProfileKernelFunctor.h
index 134c890a72..af8dd7ae24 100644
--- a/Code/Learning/otbChangeProfileKernelFunctor.h
+++ b/Code/Learning/otbChangeProfileKernelFunctor.h
@@ -41,19 +41,19 @@ namespace otb
*/
class ChangeProfileKernelFunctor
- : public GenericKernelFunctorBase
+ : public GenericKernelFunctorBase
{
public:
- double operator() ( const svm_node * x, const svm_node * y,
- const svm_parameter & param ) const;
+ double operator ()(const svm_node * x, const svm_node * y,
+ const svm_parameter& param) const;
ChangeProfileKernelFunctor ();
- virtual ~ChangeProfileKernelFunctor () { }
+ virtual ~ChangeProfileKernelFunctor () {}
/** Specific implementation of \code Update \endcode to split m_MapParameters
* into specific variables to speed up kernel evaluations */
- void Update ();
+ void Update();
private:
double m_Coef;
@@ -63,7 +63,4 @@ private:
} // end of namespace otb
-
#endif
-
-
diff --git a/Code/Learning/otbCzihoSOMLearningBehaviorFunctor.h b/Code/Learning/otbCzihoSOMLearningBehaviorFunctor.h
index 24ca6c457e..5c41b0fd73 100644
--- a/Code/Learning/otbCzihoSOMLearningBehaviorFunctor.h
+++ b/Code/Learning/otbCzihoSOMLearningBehaviorFunctor.h
@@ -57,54 +57,52 @@ namespace Functor
* \sa SOM
*/
-
class CzihoSOMLearningBehaviorFunctor
{
-public :
+public:
/** Empty constructor / descructor */
CzihoSOMLearningBehaviorFunctor ()
{
m_IterationThreshold = 0;
}
- virtual ~CzihoSOMLearningBehaviorFunctor() { }
+ virtual ~CzihoSOMLearningBehaviorFunctor() {}
/** Accessors */
- unsigned int GetIterationThreshold ()
+ unsigned int GetIterationThreshold()
{
return this->m_IterationThreshold;
}
- template < unsigned int VDimension >
- void SetIterationThreshold ( const itk::Size<VDimension> & sizeInit, unsigned int iterMax )
+ template <unsigned int VDimension>
+ void SetIterationThreshold(const itk::Size<VDimension>& sizeInit, unsigned int iterMax)
{
- double V0 = static_cast<double>( sizeInit[0] );
- for (unsigned int i = 1; i < VDimension; ++i )
- {
- if ( V0 < static_cast<double>( sizeInit[i] ) )
- V0 = static_cast<double>( sizeInit[i] );
- }
+ double V0 = static_cast<double>(sizeInit[0]);
+ for (unsigned int i = 1; i < VDimension; ++i)
+ {
+ if (V0 < static_cast<double>(sizeInit[i])) V0 = static_cast<double>(sizeInit[i]);
+ }
m_IterationThreshold = static_cast<unsigned int>(
- static_cast<double>( iterMax ) * ( 1.0 - 1.0 / ::vcl_sqrt( V0 ) ) );
+ static_cast<double>(iterMax) * (1.0 - 1.0 / ::vcl_sqrt(V0)));
}
/** Functor */
- virtual double operator() ( unsigned int currentIteration,
- unsigned int numberOfIterations,
- double betaInit, double betaEnd ) const
+ virtual double operator ()(unsigned int currentIteration,
+ unsigned int numberOfIterations,
+ double betaInit, double betaEnd) const
{
- if ( currentIteration < m_IterationThreshold )
- {
- return betaInit * ( 1.0
- - static_cast<double>( currentIteration )
- / static_cast<double>( numberOfIterations ) );
- }
+ if (currentIteration < m_IterationThreshold)
+ {
+ return betaInit * (1.0
+ - static_cast<double>(currentIteration)
+ / static_cast<double>(numberOfIterations));
+ }
else
- {
- return betaEnd * ( 1.0
- - static_cast<double>( currentIteration - m_IterationThreshold )
- / static_cast<double>( numberOfIterations - m_IterationThreshold ) );
- }
+ {
+ return betaEnd * (1.0
+ - static_cast<double>(currentIteration - m_IterationThreshold)
+ / static_cast<double>(numberOfIterations - m_IterationThreshold));
+ }
}
private:
@@ -117,4 +115,3 @@ private:
} // end namespace otb
#endif
-
diff --git a/Code/Learning/otbCzihoSOMNeighborhoodBehaviorFunctor.h b/Code/Learning/otbCzihoSOMNeighborhoodBehaviorFunctor.h
index bd6516d7cc..16557db88a 100644
--- a/Code/Learning/otbCzihoSOMNeighborhoodBehaviorFunctor.h
+++ b/Code/Learning/otbCzihoSOMNeighborhoodBehaviorFunctor.h
@@ -21,7 +21,6 @@
#ifndef __otbCzihoSOMNeighborhoodBehaviorFunctor_h
#define __otbCzihoSOMNeighborhoodBehaviorFunctor_h
-
namespace otb
{
@@ -49,27 +48,27 @@ namespace Functor
*/
class CzihoSOMNeighborhoodBehaviorFunctor
{
-public :
+public:
/** Empty constructor / descructor */
- CzihoSOMNeighborhoodBehaviorFunctor () { }
- virtual ~CzihoSOMNeighborhoodBehaviorFunctor() { }
+ CzihoSOMNeighborhoodBehaviorFunctor () {}
+ virtual ~CzihoSOMNeighborhoodBehaviorFunctor() {}
/** Functor */
- template < unsigned int VDimension >
- itk::Size<VDimension> operator() ( unsigned int currentIteration,
- unsigned int numberOfIterations,
- const itk::Size<VDimension> & sizeInit ) const
+ template <unsigned int VDimension>
+ itk::Size<VDimension> operator ()(unsigned int currentIteration,
+ unsigned int numberOfIterations,
+ const itk::Size<VDimension>& sizeInit) const
{
itk::Size<VDimension> theSize;
- double weightening = ::vcl_pow( 1.0
- - static_cast<double>( currentIteration )
- / static_cast<double>( numberOfIterations ),
- 2.0 );
- for (unsigned int i = 0; i < VDimension; ++i )
- {
+ double weightening = ::vcl_pow(1.0
+ - static_cast<double>(currentIteration)
+ / static_cast<double>(numberOfIterations),
+ 2.0);
+ for (unsigned int i = 0; i < VDimension; ++i)
+ {
theSize[i] = static_cast<typename itk::Size<VDimension>::SizeValueType> (
- static_cast<double>( sizeInit[i] ) * weightening );
- }
+ static_cast<double>(sizeInit[i]) * weightening);
+ }
return theSize;
}
@@ -81,4 +80,3 @@ public :
} // end namespace otb
#endif
-
diff --git a/Code/Learning/otbExhaustiveExponentialOptimizer.cxx b/Code/Learning/otbExhaustiveExponentialOptimizer.cxx
index 874cace2e3..56268718aa 100644
--- a/Code/Learning/otbExhaustiveExponentialOptimizer.cxx
+++ b/Code/Learning/otbExhaustiveExponentialOptimizer.cxx
@@ -29,7 +29,7 @@ ExhaustiveExponentialOptimizer
::ExhaustiveExponentialOptimizer()
{
itkDebugMacro("Constructor");
-
+
m_GeometricProgression = 2.0;
m_StepLength = 1.0;
m_CurrentIteration = 0;
@@ -40,46 +40,44 @@ ExhaustiveExponentialOptimizer
m_NumberOfSteps.Fill(0);
}
-
/**
* Start walking
*/
-void ExhaustiveExponentialOptimizer::StartOptimization( void )
+void ExhaustiveExponentialOptimizer::StartOptimization(void)
{
this->StartWalking();
}
-
void
ExhaustiveExponentialOptimizer
-::StartWalking( void )
+::StartWalking(void)
{
itkDebugMacro("StartWalking");
- this->InvokeEvent( itk::StartEvent() );
+ this->InvokeEvent(itk::StartEvent());
ParametersType initialPos = this->GetInitialPosition();
m_MinimumMetricValuePosition = initialPos;
m_MaximumMetricValuePosition = initialPos;
- MeasureType initialValue = this->GetValue( this->GetInitialPosition() );
+ MeasureType initialValue = this->GetValue(this->GetInitialPosition());
m_MaximumMetricValue = initialValue;
m_MinimumMetricValue = initialValue;
-
+
m_CurrentIteration = 0;
m_MaximumNumberOfIterations = 1;
-
+
const unsigned int spaceDimension = this->GetInitialPosition().GetSize();
- for (unsigned int i=0; i< spaceDimension; i++)
+ for (unsigned int i = 0; i < spaceDimension; i++)
{
m_MaximumNumberOfIterations *= (2 * m_NumberOfSteps[i] + 1);
}
-
+
m_CurrentIndex.SetSize(spaceDimension);
m_CurrentIndex.Fill(0);
-
- ScalesType scales = this->GetScales();
+
+ ScalesType scales = this->GetScales();
// Make sure the scales have been set properly
if (scales.size() != spaceDimension)
@@ -92,41 +90,41 @@ ExhaustiveExponentialOptimizer
}
// Setup first grid position.
- ParametersType position( spaceDimension );
- for(unsigned int i=0; i<spaceDimension; i++)
+ ParametersType position(spaceDimension);
+ for (unsigned int i = 0; i < spaceDimension; i++)
{
- position[i] = this->GetInitialPosition()[i] * vcl_pow(m_GeometricProgression,- static_cast<double>( m_NumberOfSteps[i] ) * m_StepLength) * scales[i];
+ position[i] = this->GetInitialPosition()[i] *
+ vcl_pow(m_GeometricProgression, -static_cast<double>(m_NumberOfSteps[i]) * m_StepLength) * scales[i];
}
- this->SetCurrentPosition( position );
-
+ this->SetCurrentPosition(position);
+
itkDebugMacro("Calling ResumeWalking");
-
+
this->ResumeWalking();
}
-
/**
* Resume the optimization
*/
void
ExhaustiveExponentialOptimizer
-::ResumeWalking( void )
+::ResumeWalking(void)
{
itkDebugMacro("ResumeWalk");
m_Stop = false;
-
- while( !m_Stop )
+
+ while (!m_Stop)
{
ParametersType currentPosition = this->GetCurrentPosition();
-
- if( m_Stop )
+
+ if (m_Stop)
{
StopWalking();
break;
}
- m_CurrentValue = this->GetValue( currentPosition );
-
+ m_CurrentValue = this->GetValue(currentPosition);
+
if (m_CurrentValue > m_MaximumMetricValue)
{
m_MaximumMetricValue = m_CurrentValue;
@@ -137,62 +135,59 @@ ExhaustiveExponentialOptimizer
m_MinimumMetricValue = m_CurrentValue;
m_MinimumMetricValuePosition = currentPosition;
}
-
- if( m_Stop )
+
+ if (m_Stop)
{
this->StopWalking();
break;
}
- this->InvokeEvent( itk::IterationEvent() );
+ this->InvokeEvent(itk::IterationEvent());
this->AdvanceOneStep();
m_CurrentIteration++;
}
}
-
void
ExhaustiveExponentialOptimizer
-::StopWalking( void )
+::StopWalking(void)
{
itkDebugMacro("StopWalking");
-
+
m_Stop = true;
- this->InvokeEvent( itk::EndEvent() );
+ this->InvokeEvent(itk::EndEvent());
}
-
void
ExhaustiveExponentialOptimizer
-::AdvanceOneStep( void )
+::AdvanceOneStep(void)
{
itkDebugMacro("AdvanceOneStep");
- const unsigned int spaceDimension = m_CostFunction->GetNumberOfParameters();
+ const unsigned int spaceDimension = m_CostFunction->GetNumberOfParameters();
- ParametersType newPosition( spaceDimension );
- IncrementIndex( newPosition );
-
- itkDebugMacro(<< "new position = " << newPosition );
-
- this->SetCurrentPosition( newPosition );
-}
+ ParametersType newPosition(spaceDimension);
+ IncrementIndex(newPosition);
+
+ itkDebugMacro(<< "new position = " << newPosition);
+ this->SetCurrentPosition(newPosition);
+}
void
ExhaustiveExponentialOptimizer
-::IncrementIndex( ParametersType &newPosition )
+::IncrementIndex(ParametersType& newPosition)
{
- unsigned int idx = 0;
- const unsigned int spaceDimension = m_CostFunction->GetNumberOfParameters();
+ unsigned int idx = 0;
+ const unsigned int spaceDimension = m_CostFunction->GetNumberOfParameters();
- while( idx < spaceDimension )
+ while (idx < spaceDimension)
{
m_CurrentIndex[idx]++;
- if( m_CurrentIndex[idx] > (2*m_NumberOfSteps[idx]))
+ if (m_CurrentIndex[idx] > (2 * m_NumberOfSteps[idx]))
{
- m_CurrentIndex[idx]=0;
+ m_CurrentIndex[idx] = 0;
idx++;
}
else
@@ -200,27 +195,26 @@ ExhaustiveExponentialOptimizer
break;
}
}
-
- if( idx==spaceDimension )
+
+ if (idx == spaceDimension)
{
m_Stop = true;
}
- for(unsigned int i=0; i<spaceDimension; i++)
+ for (unsigned int i = 0; i < spaceDimension; i++)
{
newPosition[i] = this->GetInitialPosition()[i]
* this->GetScales()[i]
* vcl_pow(m_GeometricProgression,
- static_cast<double>(m_CurrentIndex[i]-m_NumberOfSteps[i]) * m_StepLength);
+ static_cast<double>(m_CurrentIndex[i] - m_NumberOfSteps[i]) * m_StepLength);
}
}
-
void
ExhaustiveExponentialOptimizer
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "CurrentValue = " << m_CurrentValue << std::endl;
os << indent << "NumberOfSteps = " << m_NumberOfSteps << std::endl;
diff --git a/Code/Learning/otbExhaustiveExponentialOptimizer.h b/Code/Learning/otbExhaustiveExponentialOptimizer.h
index 880d18fe36..36783c6ac5 100644
--- a/Code/Learning/otbExhaustiveExponentialOptimizer.h
+++ b/Code/Learning/otbExhaustiveExponentialOptimizer.h
@@ -22,7 +22,7 @@
namespace otb
{
-
+
/** \class ExhaustiveExponentialOptimizer
* \brief This optimizer performs an exhaustive search on an exponential scale.
*
@@ -40,71 +40,69 @@ namespace otb
* \ingroup Numerics Optimizers
*/
class ITK_EXPORT ExhaustiveExponentialOptimizer :
- public itk::SingleValuedNonLinearOptimizer
+ public itk::SingleValuedNonLinearOptimizer
{
public:
/** Standard "Self" typedef. */
- typedef ExhaustiveExponentialOptimizer Self;
+ typedef ExhaustiveExponentialOptimizer Self;
typedef itk::SingleValuedNonLinearOptimizer Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
-
- typedef itk::Array< unsigned long > StepsType;
+
+ typedef itk::Array<unsigned long> StepsType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
-
+
/** Run-time type information (and related methods). */
- itkTypeMacro( ExhaustiveExponentialOptimizer, SingleValuedNonLinearOptimizer );
-
- virtual void StartOptimization( void );
+ itkTypeMacro(ExhaustiveExponentialOptimizer, SingleValuedNonLinearOptimizer);
- void StartWalking( void );
- void ResumeWalking( void );
+ virtual void StartOptimization(void);
+
+ void StartWalking(void);
+ void ResumeWalking(void);
void StopWalking(void);
-
- itkSetMacro( GeometricProgression, double );
- itkSetMacro( NumberOfSteps, StepsType );
- itkSetMacro( StepLength , double);
- itkGetConstReferenceMacro( GeometricProgression, double );
- itkGetConstReferenceMacro( NumberOfSteps, StepsType );
- itkGetConstReferenceMacro( StepLength , double);
- itkGetConstReferenceMacro( CurrentValue, MeasureType );
- itkGetConstReferenceMacro( MaximumMetricValue, MeasureType );
- itkGetConstReferenceMacro( MinimumMetricValue, MeasureType );
- itkGetConstReferenceMacro( MinimumMetricValuePosition, ParametersType );
- itkGetConstReferenceMacro( MaximumMetricValuePosition, ParametersType );
- itkGetConstReferenceMacro( CurrentIndex, ParametersType );
- itkGetConstReferenceMacro( MaximumNumberOfIterations, unsigned long );
+ itkSetMacro(GeometricProgression, double);
+ itkSetMacro(NumberOfSteps, StepsType);
+ itkSetMacro(StepLength, double);
+ itkGetConstReferenceMacro(GeometricProgression, double);
+ itkGetConstReferenceMacro(NumberOfSteps, StepsType);
+ itkGetConstReferenceMacro(StepLength, double);
+ itkGetConstReferenceMacro(CurrentValue, MeasureType);
+ itkGetConstReferenceMacro(MaximumMetricValue, MeasureType);
+ itkGetConstReferenceMacro(MinimumMetricValue, MeasureType);
+ itkGetConstReferenceMacro(MinimumMetricValuePosition, ParametersType);
+ itkGetConstReferenceMacro(MaximumMetricValuePosition, ParametersType);
+ itkGetConstReferenceMacro(CurrentIndex, ParametersType);
+ itkGetConstReferenceMacro(MaximumNumberOfIterations, unsigned long);
protected:
ExhaustiveExponentialOptimizer();
- virtual ~ExhaustiveExponentialOptimizer() {};
+ virtual ~ExhaustiveExponentialOptimizer() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Advance to the next grid position. */
- void AdvanceOneStep( void );
- void IncrementIndex( ParametersType & param );
+ void AdvanceOneStep(void);
+ void IncrementIndex(ParametersType& param);
-
protected:
- MeasureType m_CurrentValue;
- StepsType m_NumberOfSteps;
- double m_StepLength;
- unsigned long m_CurrentIteration;
- bool m_Stop;
- unsigned int m_CurrentParameter;
- double m_GeometricProgression;
- ParametersType m_CurrentIndex;
- unsigned long m_MaximumNumberOfIterations;
- MeasureType m_MaximumMetricValue;
- MeasureType m_MinimumMetricValue;
- ParametersType m_MinimumMetricValuePosition;
- ParametersType m_MaximumMetricValuePosition;
-
+ MeasureType m_CurrentValue;
+ StepsType m_NumberOfSteps;
+ double m_StepLength;
+ unsigned long m_CurrentIteration;
+ bool m_Stop;
+ unsigned int m_CurrentParameter;
+ double m_GeometricProgression;
+ ParametersType m_CurrentIndex;
+ unsigned long m_MaximumNumberOfIterations;
+ MeasureType m_MaximumMetricValue;
+ MeasureType m_MinimumMetricValue;
+ ParametersType m_MinimumMetricValuePosition;
+ ParametersType m_MaximumMetricValuePosition;
+
private:
- ExhaustiveExponentialOptimizer(const Self&); //purposely not implemented
- void operator=(const Self&);//purposely not implemented
+ ExhaustiveExponentialOptimizer(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Learning/otbGaussianModelComponent.h b/Code/Learning/otbGaussianModelComponent.h
index 729d053d8d..ef6a6210d7 100644
--- a/Code/Learning/otbGaussianModelComponent.h
+++ b/Code/Learning/otbGaussianModelComponent.h
@@ -41,59 +41,59 @@ namespace Statistics
* \sa ModelComponentBase, SEMClassifier
*/
-template< class TSample >
+template<class TSample>
class ITK_EXPORT GaussianModelComponent :
- public ModelComponentBase< TSample >
+ public ModelComponentBase<TSample>
{
public:
/**Standard class typedefs. */
- typedef GaussianModelComponent Self;
- typedef ModelComponentBase< TSample > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef GaussianModelComponent Self;
+ typedef ModelComponentBase<TSample> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/**Standard Macros */
itkNewMacro(Self);
- itkTypeMacro( GaussianModelComponent, ModelComponentBase );
+ itkTypeMacro(GaussianModelComponent, ModelComponentBase);
/** Typedefs from the superclass */
typedef typename Superclass::MeasurementVectorType MeasurementVectorType;
typedef typename Superclass::MeasurementVectorSizeType
MeasurementVectorSizeType;
typedef typename Superclass::MembershipFunctionType MembershipFunctionType;
- typedef typename Superclass::ParametersType ParametersType;
+ typedef typename Superclass::ParametersType ParametersType;
/** Type of the membership function. Gaussian density function */
- typedef itk::Statistics::GaussianDensityFunction< MeasurementVectorType >
+ typedef itk::Statistics::GaussianDensityFunction<MeasurementVectorType>
NativeMembershipFunctionType;
/** Types of the mean and the covariance calculator that will update
* this component's distribution parameters */
- typedef itk::Statistics::MeanCalculator< TSample > MeanEstimatorType;
- typedef itk::Statistics::CovarianceCalculator< TSample >
+ typedef itk::Statistics::MeanCalculator<TSample> MeanEstimatorType;
+ typedef itk::Statistics::CovarianceCalculator<TSample>
CovarianceEstimatorType;
/** types of the mean and covariance to be used by
* NativeMembershipFunctionType */
- typedef itk::Array< double > MeanType;
- typedef itk::VariableSizeMatrix< double > CovarianceType;
+ typedef itk::Array<double> MeanType;
+ typedef itk::VariableSizeMatrix<double> CovarianceType;
/** Sets the input sample */
virtual void SetSample(const TSample* sample);
/** Sets the component's distribution parameters.
* e.g. Then user can call directly Pdf( MeasurementVectorType & ) */
- void SetParameters(const ParametersType ¶meters);
+ void SetParameters(const ParametersType& parameters);
/** Show the parameters in a minimal form in comparison to PrintSelf */
- virtual void ShowParameters ( std::ostream& os, itk::Indent indent) const;
+ virtual void ShowParameters(std::ostream& os, itk::Indent indent) const;
protected:
GaussianModelComponent();
virtual ~GaussianModelComponent() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
- void GenerateData ();
+ void GenerateData();
private:
typename NativeMembershipFunctionType::Pointer m_GaussianDensityFunction;
@@ -101,7 +101,7 @@ private:
typename MeanEstimatorType::Pointer m_MeanEstimator;
typename CovarianceEstimatorType::Pointer m_CovarianceEstimator;
- MeanType m_Mean;
+ MeanType m_Mean;
CovarianceType m_Covariance;
}; // end of class
@@ -114,4 +114,3 @@ private:
#endif
#endif
-
diff --git a/Code/Learning/otbGaussianModelComponent.txx b/Code/Learning/otbGaussianModelComponent.txx
index 12061708ea..6234ad2a14 100644
--- a/Code/Learning/otbGaussianModelComponent.txx
+++ b/Code/Learning/otbGaussianModelComponent.txx
@@ -31,8 +31,8 @@ namespace otb
namespace Statistics
{
-template< class TSample >
-GaussianModelComponent< TSample >
+template<class TSample>
+GaussianModelComponent<TSample>
::GaussianModelComponent()
{
m_MeanEstimator = 0;
@@ -40,9 +40,9 @@ GaussianModelComponent< TSample >
m_GaussianDensityFunction = 0;
}
-template< class TSample >
+template<class TSample>
void
-GaussianModelComponent< TSample >
+GaussianModelComponent<TSample>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
@@ -52,47 +52,47 @@ GaussianModelComponent< TSample >
os << indent << "GaussianDensityFunction: " << m_GaussianDensityFunction << std::endl;
}
-template < class TSample >
+template <class TSample>
void
-GaussianModelComponent< TSample >
-::ShowParameters ( std::ostream& os, itk::Indent indent) const
+GaussianModelComponent<TSample>
+::ShowParameters(std::ostream& os, itk::Indent indent) const
{
- unsigned int i,j;
+ unsigned int i, j;
os << indent << "Gaussian model component : \n";
os << indent << "Mean : ";
- for ( i = 0; i < m_Mean.Size(); ++i )
+ for (i = 0; i < m_Mean.Size(); ++i)
os << m_Mean[i] << "\t";
os << "\n" << indent << "Covariance : ";
- for ( i = 0; i < m_Mean.Size(); ++i )
- {
- for ( j = 0; j < m_Mean.Size(); ++j )
- os << m_Covariance(i,j) << "\t";
+ for (i = 0; i < m_Mean.Size(); ++i)
+ {
+ for (j = 0; j < m_Mean.Size(); ++j)
+ os << m_Covariance(i, j) << "\t";
os << "\n" << indent << " ";
- }
+ }
os << "\n";
}
-template< class TSample >
+template<class TSample>
void
-GaussianModelComponent< TSample >
+GaussianModelComponent<TSample>
::SetSample(const TSample* sample)
{
Superclass::SetSample(sample);
const MeasurementVectorSizeType measurementVectorLength
- = sample->GetMeasurementVectorSize();
+ = sample->GetMeasurementVectorSize();
- this->m_Parameters.SetSize( measurementVectorLength
- * ( 1 + measurementVectorLength ) );
+ this->m_Parameters.SetSize(measurementVectorLength
+ * (1 + measurementVectorLength));
- m_Mean.SetSize( measurementVectorLength );
+ m_Mean.SetSize(measurementVectorLength);
m_MeanEstimator = MeanEstimatorType::New();
m_MeanEstimator->SetInputSample(sample);
//m_MeanEstimator->Update();
- m_Covariance.SetSize( measurementVectorLength,
- measurementVectorLength );
+ m_Covariance.SetSize(measurementVectorLength,
+ measurementVectorLength);
m_CovarianceEstimator = CovarianceEstimatorType::New();
m_CovarianceEstimator->SetInputSample(sample);
@@ -102,16 +102,16 @@ GaussianModelComponent< TSample >
m_GaussianDensityFunction = NativeMembershipFunctionType::New();
this->m_PdfFunction = (MembershipFunctionType *) m_GaussianDensityFunction;
m_GaussianDensityFunction->SetMeasurementVectorSize(
- measurementVectorLength );
- this->SetPdfMembershipFunction( (MembershipFunctionType *)
- m_GaussianDensityFunction.GetPointer() );
+ measurementVectorLength);
+ this->SetPdfMembershipFunction((MembershipFunctionType *)
+ m_GaussianDensityFunction.GetPointer());
}
-template< class TSample >
+template<class TSample>
void
-GaussianModelComponent< TSample >
-::SetParameters(const ParametersType ¶meters)
+GaussianModelComponent<TSample>
+::SetParameters(const ParametersType& parameters)
{
Superclass::SetParameters(parameters);
@@ -119,51 +119,50 @@ GaussianModelComponent< TSample >
unsigned int i, j;
MeasurementVectorSizeType measurementVectorSize
- = this->GetSample()->GetMeasurementVectorSize();
+ = this->GetSample()->GetMeasurementVectorSize();
- m_Mean.SetSize ( measurementVectorSize );
- for ( i = 0; i < measurementVectorSize; ++i)
- {
+ m_Mean.SetSize (measurementVectorSize);
+ for (i = 0; i < measurementVectorSize; ++i)
+ {
m_Mean[i] = parameters[paramIndex];
++paramIndex;
- }
+ }
- m_Covariance.SetSize( measurementVectorSize, measurementVectorSize );
- for ( i = 0; i < measurementVectorSize; ++i )
- for ( j = 0; j < measurementVectorSize; ++j )
- {
+ m_Covariance.SetSize(measurementVectorSize, measurementVectorSize);
+ for (i = 0; i < measurementVectorSize; ++i)
+ for (j = 0; j < measurementVectorSize; ++j)
+ {
m_Covariance(i, j) = parameters[paramIndex];
++paramIndex;
- }
+ }
this->m_GaussianDensityFunction->SetMean(&m_Mean);
this->m_GaussianDensityFunction->SetCovariance(&m_Covariance);
}
-template< class TSample >
+template<class TSample>
void
-GaussianModelComponent< TSample >
-::GenerateData ()
+GaussianModelComponent<TSample>
+::GenerateData()
{
- if ( this->IsSampleModified() == 0 )
- return;
+ if (this->IsSampleModified() == 0) return;
MeasurementVectorSizeType measurementVectorSize
- = this->GetSample()->GetMeasurementVectorSize();
+ = this->GetSample()->GetMeasurementVectorSize();
unsigned int i, j;
- int paramIndex = 0;
+ int paramIndex = 0;
m_MeanEstimator->Update();
// m_Mean.SetSize( m_MeanEstimator->GetOutput()->GetSize() );
MeanType * mean = m_MeanEstimator->GetOutput();
- for ( i = 0; i < measurementVectorSize; ++i)
- {
+ for (i = 0; i < measurementVectorSize; ++i)
+ {
this->m_Parameters[paramIndex] = m_Mean[i] = mean->GetElement(i);
++paramIndex;
- }
+ }
m_CovarianceEstimator->SetMean(&m_Mean);
m_CovarianceEstimator->Update();
@@ -172,14 +171,14 @@ GaussianModelComponent< TSample >
const CovarianceType * covariance = m_CovarianceEstimator->GetOutput();
- for ( i = 0; i < measurementVectorSize; ++i )
- for ( j = 0; j < measurementVectorSize; ++j )
- {
+ for (i = 0; i < measurementVectorSize; ++i)
+ for (j = 0; j < measurementVectorSize; ++j)
+ {
this->m_Parameters[paramIndex]
- = m_Covariance(i,j)
- = covariance->GetVnlMatrix().get(i, j);
+ = m_Covariance(i, j)
+ = covariance->GetVnlMatrix().get(i, j);
++paramIndex;
- }
+ }
this->m_GaussianDensityFunction->SetMean(&m_Mean);
this->m_GaussianDensityFunction->SetCovariance(&m_Covariance);
@@ -191,5 +190,3 @@ GaussianModelComponent< TSample >
} // end of namesapce otb
#endif
-
-
diff --git a/Code/Learning/otbKMeansImageClassificationFilter.h b/Code/Learning/otbKMeansImageClassificationFilter.h
index a5ce5d68f9..c272bc5885 100644
--- a/Code/Learning/otbKMeansImageClassificationFilter.h
+++ b/Code/Learning/otbKMeansImageClassificationFilter.h
@@ -40,53 +40,52 @@ namespace otb
*/
template <class TInputImage, class TOutputImage, unsigned int VMaxSampleDimension = 10, class TMaskImage = TOutputImage>
class ITK_EXPORT KMeansImageClassificationFilter
- : public itk::InPlaceImageFilter<TInputImage,TOutputImage>
+ : public itk::InPlaceImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef KMeansImageClassificationFilter Self;
- typedef itk::InPlaceImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef KMeansImageClassificationFilter Self;
+ typedef itk::InPlaceImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(KMeansImageClassificationFilter,InPlaceImageFilter);
+ itkTypeMacro(KMeansImageClassificationFilter, InPlaceImageFilter);
/** The max dimension of the sample to classify.
* This filter internally uses itk::FixedArray as input for the classifier,
* so the max sample size has to be fixed at compilation time.
*/
- itkStaticConstMacro(MaxSampleDimension,unsigned int,VMaxSampleDimension);
+ itkStaticConstMacro(MaxSampleDimension, unsigned int, VMaxSampleDimension);
typedef TInputImage InputImageType;
typedef typename InputImageType::ConstPointer InputImageConstPointerType;
typedef typename InputImageType::InternalPixelType ValueType;
- typedef TMaskImage MaskImageType;
- typedef typename MaskImageType::ConstPointer MaskImageConstPointerType;
- typedef typename MaskImageType::Pointer MaskImagePointerType;
+ typedef TMaskImage MaskImageType;
+ typedef typename MaskImageType::ConstPointer MaskImageConstPointerType;
+ typedef typename MaskImageType::Pointer MaskImagePointerType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType LabelType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType LabelType;
-
- typedef itk::FixedArray<ValueType,MaxSampleDimension> SampleType;
- typedef itk::Array<double> KMeansParametersType;
- typedef std::map<LabelType,SampleType> CentroidsMapType;
+ typedef itk::FixedArray<ValueType, MaxSampleDimension> SampleType;
+ typedef itk::Array<double> KMeansParametersType;
+ typedef std::map<LabelType, SampleType> CentroidsMapType;
typedef itk::Statistics::EuclideanDistance<SampleType> DistanceType;
/** Set/Get the centroids */
- itkSetMacro(Centroids,KMeansParametersType);
- itkGetConstReferenceMacro(Centroids,KMeansParametersType);
+ itkSetMacro(Centroids, KMeansParametersType);
+ itkGetConstReferenceMacro(Centroids, KMeansParametersType);
/** Set/Get the default label */
- itkSetMacro(DefaultLabel,LabelType);
- itkGetMacro(DefaultLabel,LabelType);
+ itkSetMacro(DefaultLabel, LabelType);
+ itkGetMacro(DefaultLabel, LabelType);
/**
* If set, only pixels within the mask will be classified.
@@ -104,18 +103,18 @@ protected:
/** Constructor */
KMeansImageClassificationFilter();
/** Destructor */
- virtual ~KMeansImageClassificationFilter() {};
+ virtual ~KMeansImageClassificationFilter() {}
/** Threaded generate data */
- virtual void ThreadedGenerateData(const OutputImageRegionType &outputRegionForThread,int threadId);
+ virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
/** Before threaded generate data */
virtual void BeforeThreadedGenerateData();
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- KMeansImageClassificationFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ KMeansImageClassificationFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Centroids used for classification */
KMeansParametersType m_Centroids;
@@ -124,7 +123,7 @@ private:
/** Centroids - labels map */
CentroidsMapType m_CentroidsMap;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbKMeansImageClassificationFilter.txx"
#endif
diff --git a/Code/Learning/otbKMeansImageClassificationFilter.txx b/Code/Learning/otbKMeansImageClassificationFilter.txx
index 20bd3e79b6..23a0a0c07a 100644
--- a/Code/Learning/otbKMeansImageClassificationFilter.txx
+++ b/Code/Learning/otbKMeansImageClassificationFilter.txx
@@ -28,7 +28,7 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage, unsigned int VMaxSampleDimension, class TMaskImage>
-KMeansImageClassificationFilter<TInputImage,TOutputImage,VMaxSampleDimension,TMaskImage>
+KMeansImageClassificationFilter<TInputImage, TOutputImage, VMaxSampleDimension, TMaskImage>
::KMeansImageClassificationFilter()
{
this->SetNumberOfInputs(2);
@@ -38,68 +38,69 @@ KMeansImageClassificationFilter<TInputImage,TOutputImage,VMaxSampleDimension,TMa
template <class TInputImage, class TOutputImage, unsigned int VMaxSampleDimension, class TMaskImage>
void
-KMeansImageClassificationFilter<TInputImage,TOutputImage,VMaxSampleDimension,TMaskImage>
+KMeansImageClassificationFilter<TInputImage, TOutputImage, VMaxSampleDimension, TMaskImage>
::SetInputMask(const MaskImageType * mask)
{
- this->itk::ProcessObject::SetNthInput(1,const_cast<MaskImageType *>(mask));
+ this->itk::ProcessObject::SetNthInput(1, const_cast<MaskImageType *>(mask));
}
template <class TInputImage, class TOutputImage, unsigned int VMaxSampleDimension, class TMaskImage>
-const typename KMeansImageClassificationFilter<TInputImage,TOutputImage,VMaxSampleDimension,TMaskImage>
+const typename KMeansImageClassificationFilter<TInputImage, TOutputImage, VMaxSampleDimension, TMaskImage>
::MaskImageType *
-KMeansImageClassificationFilter<TInputImage,TOutputImage,VMaxSampleDimension,TMaskImage>
+KMeansImageClassificationFilter<TInputImage, TOutputImage, VMaxSampleDimension, TMaskImage>
::GetInputMask()
{
- if (this->GetNumberOfInputs()<2)
- {
+ if (this->GetNumberOfInputs() < 2)
+ {
return 0;
- }
- return static_cast<const MaskImageType *>(this->itk::ProcessObject::GetInput(1));
+ }
+ return static_cast<const MaskImageType *>(this->itk::ProcessObject::GetInput(1));
}
template <class TInputImage, class TOutputImage, unsigned int VMaxSampleDimension, class TMaskImage>
void
-KMeansImageClassificationFilter<TInputImage,TOutputImage,VMaxSampleDimension,TMaskImage>
+KMeansImageClassificationFilter<TInputImage, TOutputImage, VMaxSampleDimension, TMaskImage>
::BeforeThreadedGenerateData()
{
unsigned int sample_size = MaxSampleDimension;
- unsigned int nb_classes = m_Centroids.Size()/sample_size;
+ unsigned int nb_classes = m_Centroids.Size() / sample_size;
- for (LabelType label = 1;label<=static_cast<LabelType>(nb_classes);++label)
- {
+ for (LabelType label = 1; label <= static_cast<LabelType>(nb_classes); ++label)
+ {
SampleType new_centroid;
new_centroid.Fill(0);
- m_CentroidsMap[label]=new_centroid;
+ m_CentroidsMap[label] = new_centroid;
- for (unsigned int i=0;i<MaxSampleDimension;++i)
- {
- m_CentroidsMap[label][i] = static_cast<ValueType>(m_Centroids[MaxSampleDimension*(static_cast<unsigned int>(label)-1)+i]);
+ for (unsigned int i = 0; i < MaxSampleDimension; ++i)
+ {
+ m_CentroidsMap[label][i] =
+ static_cast<ValueType>(m_Centroids[MaxSampleDimension * (static_cast < unsigned int > (label) - 1) + i]);
+ }
}
- }
}
template <class TInputImage, class TOutputImage, unsigned int VMaxSampleDimension, class TMaskImage>
void
-KMeansImageClassificationFilter<TInputImage,TOutputImage,VMaxSampleDimension,TMaskImage>
-::ThreadedGenerateData(const OutputImageRegionType &outputRegionForThread, int threadId)
+KMeansImageClassificationFilter<TInputImage, TOutputImage, VMaxSampleDimension, TMaskImage>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
InputImageConstPointerType inputPtr = this->GetInput();
- MaskImageConstPointerType inputMaskPtr = this->GetInputMask();
+ MaskImageConstPointerType inputMaskPtr = this->GetInputMask();
OutputImagePointerType outputPtr = this->GetOutput();
typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
- typedef itk::ImageRegionConstIterator<MaskImageType> MaskIteratorType;
- typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
+ typedef itk::ImageRegionConstIterator<MaskImageType> MaskIteratorType;
+ typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
- InputIteratorType inIt(inputPtr,outputRegionForThread);
- OutputIteratorType outIt(outputPtr,outputRegionForThread);
+ InputIteratorType inIt(inputPtr, outputRegionForThread);
+ OutputIteratorType outIt(outputPtr, outputRegionForThread);
MaskIteratorType maskIt;
if (inputMaskPtr)
- {
- maskIt = MaskIteratorType(inputMaskPtr,outputRegionForThread);
+ {
+ maskIt = MaskIteratorType(inputMaskPtr, outputRegionForThread);
maskIt.GoToBegin();
- }
+ }
unsigned int maxDimension = SampleType::Dimension;
unsigned int sampleSize = std::min(inputPtr->GetNumberOfComponentsPerPixel(),
maxDimension);
@@ -107,10 +108,10 @@ KMeansImageClassificationFilter<TInputImage,TOutputImage,VMaxSampleDimension,TMa
bool validPoint = true;
while (!outIt.IsAtEnd())
- {
+ {
outIt.Set(m_DefaultLabel);
++outIt;
- }
+ }
outIt.GoToBegin();
@@ -118,47 +119,47 @@ KMeansImageClassificationFilter<TInputImage,TOutputImage,VMaxSampleDimension,TMa
typename DistanceType::Pointer distance = DistanceType::New();
- while (!outIt.IsAtEnd()&&(!inIt.IsAtEnd()))
- {
- if (inputMaskPtr)
+ while (!outIt.IsAtEnd() && (!inIt.IsAtEnd()))
{
- validPoint = maskIt.Get()>0;
+ if (inputMaskPtr)
+ {
+ validPoint = maskIt.Get() > 0;
++maskIt;
- }
+ }
if (validPoint)
- {
- LabelType label =1;
- LabelType current_label =1;
+ {
+ LabelType label = 1;
+ LabelType current_label = 1;
SampleType pixel;
pixel.Fill(0);
- for (unsigned int i=0;i<sampleSize;++i)
- {
- pixel[i]=inIt.Get()[i];
- }
+ for (unsigned int i = 0; i < sampleSize; ++i)
+ {
+ pixel[i] = inIt.Get()[i];
+ }
- double current_distance = distance->Evaluate(pixel,m_CentroidsMap[label]);
+ double current_distance = distance->Evaluate(pixel, m_CentroidsMap[label]);
- for (label=2;label<=static_cast<LabelType>(m_CentroidsMap.size());++label)
- {
- double tmp_dist = distance->Evaluate(pixel,m_CentroidsMap[label]);
- if (tmp_dist<current_distance)
+ for (label = 2; label <= static_cast<LabelType>(m_CentroidsMap.size()); ++label)
{
+ double tmp_dist = distance->Evaluate(pixel, m_CentroidsMap[label]);
+ if (tmp_dist < current_distance)
+ {
current_label = label;
current_distance = tmp_dist;
+ }
}
- }
outIt.Set(current_label);
- }
+ }
++outIt;
++inIt;
- }
+ }
}
/**
* PrintSelf Method
*/
template <class TInputImage, class TOutputImage, unsigned int VMaxSampleDimension, class TMaskImage>
void
-KMeansImageClassificationFilter<TInputImage,TOutputImage,VMaxSampleDimension,TMaskImage>
+KMeansImageClassificationFilter<TInputImage, TOutputImage, VMaxSampleDimension, TMaskImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/Learning/otbMixturePolyRBFKernelFunctor.cxx b/Code/Learning/otbMixturePolyRBFKernelFunctor.cxx
index 9b9d5647ed..e1429da79d 100644
--- a/Code/Learning/otbMixturePolyRBFKernelFunctor.cxx
+++ b/Code/Learning/otbMixturePolyRBFKernelFunctor.cxx
@@ -25,7 +25,7 @@ namespace otb
MixturePolyRBFKernelFunctor
::MixturePolyRBFKernelFunctor ()
- : GenericKernelFunctorBase ()
+ : GenericKernelFunctorBase ()
{
m_Mixture = 0.5;
m_GammaPoly = 1.0;
@@ -33,93 +33,92 @@ MixturePolyRBFKernelFunctor
m_DegreePoly = 2;
m_GammaRBF = 1.0;
- SetValue( "Mixture", m_Mixture );
- SetValue( "GammaPoly", m_GammaPoly );
- SetValue( "CoefPoly", m_CoefPoly );
- SetValue( "DegreePoly", m_DegreePoly );
- SetValue( "GammaRBF", m_GammaRBF );
+ SetValue("Mixture", m_Mixture);
+ SetValue("GammaPoly", m_GammaPoly);
+ SetValue("CoefPoly", m_CoefPoly);
+ SetValue("DegreePoly", m_DegreePoly);
+ SetValue("GammaRBF", m_GammaRBF);
}
double
MixturePolyRBFKernelFunctor
-::operator() ( const svm_node * x, const svm_node * y,
- const svm_parameter & /*param*/ ) const
+::operator ()(const svm_node * x, const svm_node * y,
+ const svm_parameter& /*param*/) const
{
double kernel_poly = 0.0;
- if ( m_Mixture > 0.0 )
- kernel_poly = powi( m_GammaPoly * this->dot( x, y ) + m_CoefPoly,
- m_DegreePoly );
+ if (m_Mixture > 0.0)
+ kernel_poly = powi(m_GammaPoly * this->dot(x, y) + m_CoefPoly,
+ m_DegreePoly);
double kernel_rbf = 0.0;
- if ( m_Mixture < 1.0 )
- {
- double sum = 0.0;
- while ( x->index != -1 && y->index != -1 )
+ if (m_Mixture < 1.0)
{
- if ( x->index == y->index )
+ double sum = 0.0;
+ while (x->index != -1 && y->index != -1)
{
+ if (x->index == y->index)
+ {
double d = x->value - y->value;
- sum += d*d;
+ sum += d * d;
++x;
++y;
- }
+ }
else
- {
- if ( x->index > y->index )
{
+ if (x->index > y->index)
+ {
sum += y->value * y->value;
++y;
- }
+ }
else
- {
+ {
sum += x->value * x->value;
++x;
+ }
}
}
- }
- while ( x->index != -1 )
- {
+ while (x->index != -1)
+ {
sum += x->value * x->value;
++x;
- }
+ }
- while ( y->index != -1 )
- {
+ while (y->index != -1)
+ {
sum += y->value * y->value;
++y;
- }
+ }
- kernel_rbf = exp( - m_GammaRBF * sum );
- }
+ kernel_rbf = exp(-m_GammaRBF * sum);
+ }
- return m_Mixture * kernel_poly + ( 1.0 - m_Mixture ) * kernel_rbf;
+ return m_Mixture * kernel_poly + (1.0 - m_Mixture) * kernel_rbf;
}
void
MixturePolyRBFKernelFunctor
-::Update ()
+::Update()
{
- m_Mixture = GetValue<double>( "Mixture" );
- m_GammaPoly = GetValue<double>( "GammaPoly" );
- m_CoefPoly = GetValue<double>( "CoefPoly" );
- m_DegreePoly = GetValue<int>( "DegreePoly" );
- m_GammaRBF = GetValue<double>( "GammaRBF" );
+ m_Mixture = GetValue<double>("Mixture");
+ m_GammaPoly = GetValue<double>("GammaPoly");
+ m_CoefPoly = GetValue<double>("CoefPoly");
+ m_DegreePoly = GetValue<int>("DegreePoly");
+ m_GammaRBF = GetValue<double>("GammaRBF");
}
double
MixturePolyRBFKernelFunctor
-::powi ( double base, int times ) const
+::powi(double base, int times) const
{
double tmp = base, ret = 1.0;
- for (int t=times; t>0; t/=2)
- {
- if (t%2==1) ret*=tmp;
+ for (int t = times; t > 0; t /= 2)
+ {
+ if (t % 2 == 1) ret *= tmp;
tmp = tmp * tmp;
- }
+ }
return ret;
}
} // end of namespace otb
-
diff --git a/Code/Learning/otbMixturePolyRBFKernelFunctor.h b/Code/Learning/otbMixturePolyRBFKernelFunctor.h
index 50df61c5ed..7dfd81f8b5 100644
--- a/Code/Learning/otbMixturePolyRBFKernelFunctor.h
+++ b/Code/Learning/otbMixturePolyRBFKernelFunctor.h
@@ -39,32 +39,30 @@ namespace otb
*/
class MixturePolyRBFKernelFunctor
- : public GenericKernelFunctorBase
+ : public GenericKernelFunctorBase
{
public:
- double operator() ( const svm_node * x, const svm_node * y,
- const svm_parameter & param ) const;
+ double operator ()(const svm_node * x, const svm_node * y,
+ const svm_parameter& param) const;
MixturePolyRBFKernelFunctor ();
- virtual ~MixturePolyRBFKernelFunctor () { }
+ virtual ~MixturePolyRBFKernelFunctor () {}
/** Specific implementation of \code Update \endcode to split m_MapParameters
* into specific variables to speed up kernel evaluations */
- void Update ();
+ void Update();
protected:
double m_Mixture;
double m_GammaPoly;
double m_CoefPoly;
- int m_DegreePoly;
+ int m_DegreePoly;
double m_GammaRBF;
private:
- inline double powi ( double base, int times ) const;
+ inline double powi(double base, int times) const;
};
} // end of namespace otb
-
#endif
-
diff --git a/Code/Learning/otbModelComponentBase.h b/Code/Learning/otbModelComponentBase.h
index ec57e6bd8b..a26aaa2c90 100644
--- a/Code/Learning/otbModelComponentBase.h
+++ b/Code/Learning/otbModelComponentBase.h
@@ -57,29 +57,29 @@ namespace Statistics
* \sa FIXME: StochasticExpectationMaximizationMixtureModelEstimator
*/
-template< class TSample >
+template<class TSample>
class ITK_EXPORT ModelComponentBase :
- public itk::Object
+ public itk::Object
{
public:
/**Standard class typedefs. */
- typedef ModelComponentBase Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef ModelComponentBase Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/**Standard Macros */
itkNewMacro(Self);
itkTypeMacro(ModelComponentBase, Object);
- typedef typename TSample::MeasurementVectorType MeasurementVectorType;
+ typedef typename TSample::MeasurementVectorType MeasurementVectorType;
typedef typename TSample::MeasurementVectorSizeType MeasurementVectorSizeType;
/** typedef for the MembershipFunctionBase */
- typedef itk::Statistics::MembershipFunctionBase< MeasurementVectorType >
+ typedef itk::Statistics::MembershipFunctionBase<MeasurementVectorType>
MembershipFunctionType;
- typedef itk::Array< double > ParametersType;
+ typedef itk::Array<double> ParametersType;
/** stores the sample pointer (does not update the estimation by itself) */
virtual void SetSample(const TSample* sample);
@@ -99,28 +99,28 @@ public:
* object after dynamic creation, when available (the Pdf part is
* protected as soon as it consodered to be known for all
* ModelComponent)*/
- void SetCdfMembershipFunction( MembershipFunctionType* function );
+ void SetCdfMembershipFunction(MembershipFunctionType* function);
/** Gets/Sets the parameter(s) required for the component */
- void SetParameters(const ParametersType ¶meters);
+ void SetParameters(const ParametersType& parameters);
ParametersType GetParameters()
{
return m_Parameters;
}
/** returns the pdf of the "measurements" vector */
- double Evaluate ( MeasurementVectorType & measurements );
- double Pdf( MeasurementVectorType& measurements );
+ double Evaluate(MeasurementVectorType& measurements);
+ double Pdf(MeasurementVectorType& measurements);
/** returns the cdf of the "measurements" vector */
- double Cdf( MeasurementVectorType& measurements );
+ double Cdf(MeasurementVectorType& measurements);
/** Update parameter estimation if necessary
* (mainly when sample has changed) */
virtual void Update();
/** Show the parameters in a minimal form in comparison to PrintSelf */
- virtual void ShowParameters ( std::ostream& os, itk::Indent indent) const;
+ virtual void ShowParameters(std::ostream& os, itk::Indent indent) const;
// TODO: Distance entre distribution via une sorte de fonction membre...
@@ -129,7 +129,7 @@ protected:
virtual ~ModelComponentBase() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
- virtual void GenerateData ();
+ virtual void GenerateData();
/** stores the pointer to the membership function.
* subclasses use this funtion to store their membership function
@@ -137,7 +137,7 @@ protected:
void SetPdfMembershipFunction(MembershipFunctionType* function);
/** Test on new data */
- int IsSampleModified ();
+ int IsSampleModified();
/** Set of parameters necessary for the statistical models */
ParametersType m_Parameters;
@@ -164,4 +164,3 @@ protected:
#endif
#endif
-
diff --git a/Code/Learning/otbModelComponentBase.txx b/Code/Learning/otbModelComponentBase.txx
index 61da62a33d..195276e15c 100644
--- a/Code/Learning/otbModelComponentBase.txx
+++ b/Code/Learning/otbModelComponentBase.txx
@@ -31,8 +31,8 @@ namespace otb
namespace Statistics
{
-template< class TSample >
-ModelComponentBase< TSample >
+template<class TSample>
+ModelComponentBase<TSample>
::ModelComponentBase()
{
m_Sample = 0;
@@ -41,153 +41,151 @@ ModelComponentBase< TSample >
m_SampleModified = 0;
}
-template< class TSample >
+template<class TSample>
void
-ModelComponentBase< TSample >
+ModelComponentBase<TSample>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "Sample: ";
- if ( m_Sample != 0 )
- {
+ if (m_Sample != 0)
+ {
os << m_Sample << std::endl;
- }
+ }
else
- {
+ {
os << "not set." << std::endl;
- }
+ }
os << indent << "Membership Function for pdf: ";
- if ( m_PdfFunction != 0 )
- {
+ if (m_PdfFunction != 0)
+ {
os << m_PdfFunction << std::endl;
- }
+ }
else
- {
+ {
os << "not instantiated yet." << std::endl;
- }
+ }
os << indent << "Membership Function for cdf: ";
- if ( m_CdfFunction != 0 )
- {
+ if (m_CdfFunction != 0)
+ {
os << m_CdfFunction << std::endl;
- }
+ }
else
- {
+ {
os << "not instantiated yet." << std::endl;
- }
+ }
os << indent << "Sample are modified and parameters updated: ";
os << m_SampleModified << std::endl;
}
-template < class TSample >
+template <class TSample>
void
-ModelComponentBase< TSample >
-::ShowParameters ( std::ostream& os, itk::Indent indent) const
+ModelComponentBase<TSample>
+::ShowParameters(std::ostream& os, itk::Indent indent) const
{
os << indent << "Generic class of model-component. Parameters :\n";
- for ( unsigned int i = 0; i < m_Parameters.Size(); ++i )
+ for (unsigned int i = 0; i < m_Parameters.Size(); ++i)
os << indent << m_Parameters[i] << "\n";
}
-template< class TSample >
+template<class TSample>
void
-ModelComponentBase< TSample >
+ModelComponentBase<TSample>
::SetSample(const TSample* sample)
{
m_Sample = sample;
m_SampleModified = 1;
}
-template< class TSample >
+template<class TSample>
const TSample*
-ModelComponentBase< TSample >
+ModelComponentBase<TSample>
::GetSample() const
{
return m_Sample;
}
-template< class TSample >
+template<class TSample>
void
-ModelComponentBase< TSample >
-::SetParameters(const ParametersType ¶meters)
+ModelComponentBase<TSample>
+::SetParameters(const ParametersType& parameters)
{
- if ( m_Parameters != parameters )
- m_Parameters = parameters;
+ if (m_Parameters != parameters) m_Parameters = parameters;
}
-template< class TSample >
+template<class TSample>
void
-ModelComponentBase< TSample >
+ModelComponentBase<TSample>
::SetPdfMembershipFunction(MembershipFunctionType* function)
{
m_PdfFunction = function;
}
-template< class TSample >
+template<class TSample>
void
-ModelComponentBase< TSample >
+ModelComponentBase<TSample>
::SetCdfMembershipFunction(MembershipFunctionType* function)
{
m_CdfFunction = function;
}
-template< class TSample >
-typename ModelComponentBase< TSample >::MembershipFunctionType*
-ModelComponentBase< TSample >
+template<class TSample>
+typename ModelComponentBase<TSample>::MembershipFunctionType*
+ModelComponentBase<TSample>
::GetPdfMembershipFunction()
{
return m_PdfFunction;
}
-template< class TSample >
-typename ModelComponentBase< TSample >::MembershipFunctionType*
-ModelComponentBase< TSample >
+template<class TSample>
+typename ModelComponentBase<TSample>::MembershipFunctionType*
+ModelComponentBase<TSample>
::GetCdfMembershipFunction()
{
return m_CdfFunction;
}
-template< class TSample >
+template<class TSample>
inline double
-ModelComponentBase< TSample >
+ModelComponentBase<TSample>
::Pdf(MeasurementVectorType& measurements)
{
return this->m_PdfFunction->Evaluate(measurements);
}
-template< class TSample >
+template<class TSample>
inline double
-ModelComponentBase< TSample >
+ModelComponentBase<TSample>
::Cdf(MeasurementVectorType& measurements)
{
return m_CdfFunction->Evaluate(measurements);
}
-template < class TSample >
+template <class TSample>
int
-ModelComponentBase< TSample >
-::IsSampleModified ()
+ModelComponentBase<TSample>
+::IsSampleModified()
{
return m_SampleModified;
}
-template< class TSample >
+template<class TSample>
void
-ModelComponentBase< TSample >
+ModelComponentBase<TSample>
::Update()
{
- if ( m_SampleModified )
- this->GenerateData();
+ if (m_SampleModified) this->GenerateData();
m_SampleModified = 0;
}
-template < class TSample >
+template <class TSample>
void
-ModelComponentBase< TSample >
-::GenerateData ()
+ModelComponentBase<TSample>
+::GenerateData()
{
/** subclasses should override this function to perform
* parameter estimation. But it allows to switch m_SampleModified
@@ -200,4 +198,3 @@ ModelComponentBase< TSample >
} // end of namespace otb
#endif
-
diff --git a/Code/Learning/otbNonGaussianRBFKernelFunctor.cxx b/Code/Learning/otbNonGaussianRBFKernelFunctor.cxx
index 696d014dcc..2c94fdaa25 100644
--- a/Code/Learning/otbNonGaussianRBFKernelFunctor.cxx
+++ b/Code/Learning/otbNonGaussianRBFKernelFunctor.cxx
@@ -25,49 +25,47 @@ namespace otb
NonGaussianRBFKernelFunctor
::NonGaussianRBFKernelFunctor ()
- : GenericKernelFunctorBase ()
+ : GenericKernelFunctorBase ()
{
m_Alpha = 1.0;
m_Beta = 2.0;
m_Gamma = 1.0;
- SetValue( "Alpha", m_Alpha );
- SetValue( "Beta", m_Beta );
- SetValue( "Gamma", m_Gamma );
+ SetValue("Alpha", m_Alpha);
+ SetValue("Beta", m_Beta);
+ SetValue("Gamma", m_Gamma);
}
double
NonGaussianRBFKernelFunctor
-::operator() ( const svm_node * x, const svm_node * y,
- const svm_parameter & /*param*/ ) const
+::operator ()(const svm_node * x, const svm_node * y,
+ const svm_parameter& /*param*/) const
{
double pr_x, pr_y, diff, sum = 0.0;
- while ( x->index != -1 && y->index != -1 )
- {
- pr_x = pow( x->value, m_Alpha );
- pr_y = pow( y->value, m_Alpha );
+ while (x->index != -1 && y->index != -1)
+ {
+ pr_x = pow(x->value, m_Alpha);
+ pr_y = pow(y->value, m_Alpha);
- diff = pow( fabs( pr_x - pr_y ), m_Beta );
+ diff = pow(fabs(pr_x - pr_y), m_Beta);
sum += diff;
++x;
++y;
- }
+ }
- return exp( - m_Gamma * sum );
+ return exp(-m_Gamma * sum);
}
void
NonGaussianRBFKernelFunctor
-::Update ()
+::Update()
{
- m_Alpha = GetValue<double>( "Alpha" );
- m_Beta = GetValue<double>( "Beta" );
- m_Gamma = GetValue<double>( "Gamma" );
+ m_Alpha = GetValue<double>("Alpha");
+ m_Beta = GetValue<double>("Beta");
+ m_Gamma = GetValue<double>("Gamma");
}
-
} // end of namespace otb
-
diff --git a/Code/Learning/otbNonGaussianRBFKernelFunctor.h b/Code/Learning/otbNonGaussianRBFKernelFunctor.h
index 40e71fe7d9..22e25a141a 100644
--- a/Code/Learning/otbNonGaussianRBFKernelFunctor.h
+++ b/Code/Learning/otbNonGaussianRBFKernelFunctor.h
@@ -38,19 +38,19 @@ namespace otb
*
*/
class NonGaussianRBFKernelFunctor
- : public GenericKernelFunctorBase
+ : public GenericKernelFunctorBase
{
public:
- double operator() ( const svm_node * x, const svm_node * y,
- const svm_parameter & param ) const;
+ double operator ()(const svm_node * x, const svm_node * y,
+ const svm_parameter& param) const;
NonGaussianRBFKernelFunctor ();
- virtual ~NonGaussianRBFKernelFunctor () { }
+ virtual ~NonGaussianRBFKernelFunctor () {}
/** Specific implementation of \code Update \endcode to split m_MapParameters
* into specific variables to speed up kernel evaluations */
- void Update ();
+ void Update();
protected:
double m_Alpha;
@@ -60,7 +60,4 @@ protected:
} // end of namespace otb
-
#endif
-
-
diff --git a/Code/Learning/otbPeriodicSOM.h b/Code/Learning/otbPeriodicSOM.h
index 2f554f8c4a..2d62ab9d3e 100644
--- a/Code/Learning/otbPeriodicSOM.h
+++ b/Code/Learning/otbPeriodicSOM.h
@@ -53,35 +53,35 @@ namespace otb
* \sa CzihoSOMNeighborhoodBehaviorFunctor
*/
template <class TListSample, class TMap,
-class TSOMLearningBehaviorFunctor = Functor::CzihoSOMLearningBehaviorFunctor,
-class TSOMNeighborhoodBehaviorFunctor = Functor::CzihoSOMNeighborhoodBehaviorFunctor >
+ class TSOMLearningBehaviorFunctor = Functor::CzihoSOMLearningBehaviorFunctor,
+ class TSOMNeighborhoodBehaviorFunctor = Functor::CzihoSOMNeighborhoodBehaviorFunctor>
class ITK_EXPORT PeriodicSOM
- : public SOM< TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor >
+ : public SOM<TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor>
{
public:
/** Standard typedefs */
typedef PeriodicSOM Self;
- typedef SOM< TListSample, TMap,
- TSOMLearningBehaviorFunctor,
- TSOMNeighborhoodBehaviorFunctor > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef SOM<TListSample, TMap,
+ TSOMLearningBehaviorFunctor,
+ TSOMNeighborhoodBehaviorFunctor> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Runtime informations macro */
- itkTypeMacro( PeriodicSOM, SOM );
+ itkTypeMacro(PeriodicSOM, SOM);
- typedef TListSample ListSampleType;
+ typedef TListSample ListSampleType;
typedef typename ListSampleType::Pointer ListSamplePointerType;
- typedef TMap MapType;
- typedef typename MapType::PixelType NeuronType;
- typedef typename NeuronType::ValueType ValueType;
- typedef typename MapType::IndexType IndexType;
- typedef typename MapType::SizeType SizeType;
- typedef typename MapType::RegionType RegionType;
- typedef typename MapType::Pointer MapPointerType;
+ typedef TMap MapType;
+ typedef typename MapType::PixelType NeuronType;
+ typedef typename NeuronType::ValueType ValueType;
+ typedef typename MapType::IndexType IndexType;
+ typedef typename MapType::SizeType SizeType;
+ typedef typename MapType::RegionType RegionType;
+ typedef typename MapType::Pointer MapPointerType;
protected:
/** Constructor */
@@ -89,7 +89,7 @@ protected:
/** Destructor */
virtual ~PeriodicSOM() {}
/** Output information redefinition */
- virtual void GenerateOutputInformation ()
+ virtual void GenerateOutputInformation()
{
Superclass::GenerateOutputInformation ();
}
@@ -115,17 +115,17 @@ protected:
*/
virtual void Step(unsigned int currentIteration)
{
- Superclass::Step( currentIteration );
+ Superclass::Step(currentIteration);
}
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
- PeriodicSOM(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ PeriodicSOM(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
}; // end of class
@@ -136,5 +136,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Learning/otbPeriodicSOM.txx b/Code/Learning/otbPeriodicSOM.txx
index 244d51839f..d13af11a56 100644
--- a/Code/Learning/otbPeriodicSOM.txx
+++ b/Code/Learning/otbPeriodicSOM.txx
@@ -26,7 +26,6 @@
#include "otbPeriodicSOM.h"
-
namespace otb
{
@@ -36,75 +35,74 @@ namespace otb
* \param beta The learning coefficient,
* \param radius The radius of the neighbourhood.
*/
-template < class TListSample, class TMap,
-class TSOMLearningBehaviorFunctor,
-class TSOMNeighborhoodBehaviorFunctor >
+template <class TListSample, class TMap,
+ class TSOMLearningBehaviorFunctor,
+ class TSOMNeighborhoodBehaviorFunctor>
void
-PeriodicSOM<TListSample,TMap,TSOMLearningBehaviorFunctor,TSOMNeighborhoodBehaviorFunctor>
+PeriodicSOM<TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor>
::UpdateMap(const NeuronType& sample, double beta, SizeType& radius)
{
- unsigned int i,j;
+ unsigned int i, j;
// output map pointer
MapPointerType map = this->GetOutput(0);
// winner index in the map
- IndexType position = map->GetWinner(sample);
+ IndexType position = map->GetWinner(sample);
NeuronType winner = map->GetPixel(position);
// Local neighborhood definition
- typedef typename MapType::Superclass ImageMapType;
- typedef itk::NeighborhoodIterator< ImageMapType > NeighborhoodIteratorType;
+ typedef typename MapType::Superclass ImageMapType;
+ typedef itk::NeighborhoodIterator<ImageMapType> NeighborhoodIteratorType;
typename MapType::RegionType mapRegion = map->GetLargestPossibleRegion();
- NeighborhoodIteratorType it ( radius, map, mapRegion );
+ NeighborhoodIteratorType it(radius, map, mapRegion);
// Here, the periodic update is achieved 'by hand' since
// PeriodicBoundaryCondition does not allow to modifiy
// VectorImage contents
- SizeType mapSize = mapRegion.GetSize();
+ SizeType mapSize = mapRegion.GetSize();
IndexType positionToUpdate;
// Iterate over the neighborhood ot the winner neuron
- it.SetLocation( position );
+ it.SetLocation(position);
- for ( i = 0; i < it.Size(); ++i )
- {
+ for (i = 0; i < it.Size(); ++i)
+ {
typename NeighborhoodIteratorType::OffsetType offset = it.GetOffset(i);
// The neighborhood is of elliptic shape
- double theDistance = itk::NumericTraits< double >::Zero;
- for ( j = 0; j < MapType::ImageDimension; ++j )
- theDistance += pow( static_cast<double>( offset[j] ), 2.0 )
- / pow( static_cast<double>( radius[j] ), 2.0 );
+ double theDistance = itk::NumericTraits<double>::Zero;
+ for (j = 0; j < MapType::ImageDimension; ++j)
+ theDistance += pow(static_cast<double>(offset[j]), 2.0)
+ / pow(static_cast<double>(radius[j]), 2.0);
- if ( theDistance <= 1.0 )
- {
- for ( j = 0; j < MapType::ImageDimension; ++j )
+ if (theDistance <= 1.0)
{
+ for (j = 0; j < MapType::ImageDimension; ++j)
+ {
int pos = offset[j] + position[j];
- positionToUpdate[j] = ( pos >= 0 ) ?
+ positionToUpdate[j] = (pos >= 0) ?
pos % mapSize[j] :
- ( mapSize[j] - ( (-pos) % mapSize[j] ) ) % mapSize[j];
- }
+ (mapSize[j] - ((-pos) % mapSize[j])) % mapSize[j];
+ }
NeuronType tempNeuron = it.GetPixel(i);
// NeuronType newNeuron ( tempNeuron.Size() );
// newNeuron.Fill( 0.0 ); // FIXME
- NeuronType newNeuron ( tempNeuron );
+ NeuronType newNeuron(tempNeuron);
- double tempBeta = beta / ( 1.0 + theDistance );
- for ( j = 0; j < newNeuron.Size(); ++j )
- {
+ double tempBeta = beta / (1.0 + theDistance);
+ for (j = 0; j < newNeuron.Size(); ++j)
+ {
newNeuron[j] += static_cast<typename NeuronType::ValueType>(
- ( sample[j] - tempNeuron[j] ) * tempBeta );
+ (sample[j] - tempNeuron[j]) * tempBeta);
+ }
+ map->SetPixel(positionToUpdate, newNeuron);
}
- map->SetPixel(positionToUpdate,newNeuron);
}
- }
}
} // end of namespace otb
#endif
-
diff --git a/Code/Learning/otbROIdataConversion.h b/Code/Learning/otbROIdataConversion.h
index 18f245d6a4..befe007e29 100644
--- a/Code/Learning/otbROIdataConversion.h
+++ b/Code/Learning/otbROIdataConversion.h
@@ -25,7 +25,6 @@
#include "otbImage.h"
#include "itkImageToImageFilter.h"
-
namespace otb
{
@@ -35,67 +34,66 @@ namespace otb
* A class that extract pixel value from an input image according to a ROI
* image and outputs it on a vector of PixelType.
*/
-template < class TInputImage, class TInputROIImage >
+template <class TInputImage, class TInputROIImage>
class ROIdataConversion
- : public itk::ImageToImageFilter< TInputImage, otb::Image<typename TInputImage::PixelType, 1> >
+ : public itk::ImageToImageFilter<TInputImage, otb::Image<typename TInputImage::PixelType, 1> >
{
public:
- typedef ROIdataConversion Self;
- typedef itk::ImageToImageFilter< TInputImage, otb::Image<typename TInputImage::PixelType, 1> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ROIdataConversion Self;
+ typedef itk::ImageToImageFilter<TInputImage, otb::Image<typename TInputImage::PixelType, 1> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
itkNewMacro(Self);
itkTypeMacro(ROIdataConversion, itk::ImageToImageFilter);
- typedef TInputImage InputImageType;
- typedef typename TInputImage::PixelType InputImagePixelType;
- typedef typename TInputImage::Pointer InputImagePointerType;
- typedef TInputROIImage InputROIImageType;
- typedef typename TInputROIImage::Pointer InputROIImagePointerType;
+ typedef TInputImage InputImageType;
+ typedef typename TInputImage::PixelType InputImagePixelType;
+ typedef typename TInputImage::Pointer InputImagePointerType;
+ typedef TInputROIImage InputROIImageType;
+ typedef typename TInputROIImage::Pointer InputROIImagePointerType;
typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
typedef typename OutputImageType::SizeType::SizeValueType SizeValueType;
/** Gets/Sets the input image */
- const InputImageType * GetInputImage ()
+ const InputImageType * GetInputImage()
{
return this->Superclass::GetInput();
}
- void SetInputImage ( const InputImageType * img )
+ void SetInputImage(const InputImageType * img)
{
this->Superclass::SetInput(img);
}
/** Gets/Sets the ROI image */
- InputROIImageType * GetROIImage ()
+ InputROIImageType * GetROIImage()
{
- return static_cast< InputROIImageType *> (this->itk::ProcessObject::GetInput(1));
+ return static_cast<InputROIImageType *> (this->itk::ProcessObject::GetInput(1));
}
- void SetROIImage ( const InputROIImageType * img )
+ void SetROIImage(const InputROIImageType * img)
{
- this->itk::ProcessObject::SetNthInput( 1, const_cast<InputROIImageType *>(img) );
+ this->itk::ProcessObject::SetNthInput(1, const_cast<InputROIImageType *>(img));
}
protected:
ROIdataConversion();
- virtual ~ROIdataConversion() { }
+ virtual ~ROIdataConversion() {}
virtual void GenerateOutputInformation();
virtual void GenerateInputRequestedRegion();
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
}
/** Performs its job! */
- virtual void GenerateData ();
+ virtual void GenerateData();
/** Count the number for sample in the training area */
- SizeValueType GetNumberOfSample ();
+ SizeValueType GetNumberOfSample();
};
-
} // end of namespace otb
#ifndef ITK_MANUAL_INSTANTIATION
@@ -103,5 +101,3 @@ protected:
#endif
#endif
-
-
diff --git a/Code/Learning/otbROIdataConversion.txx b/Code/Learning/otbROIdataConversion.txx
index 21307fc6c3..f72962eabc 100644
--- a/Code/Learning/otbROIdataConversion.txx
+++ b/Code/Learning/otbROIdataConversion.txx
@@ -28,103 +28,95 @@
#include "itkImageRegionConstIterator.h"
#include "itkImageRegionIterator.h"
-
namespace otb
{
-template < class TInputImage, class TInputROIImage >
-ROIdataConversion< TInputImage, TInputROIImage >
+template <class TInputImage, class TInputROIImage>
+ROIdataConversion<TInputImage, TInputROIImage>
::ROIdataConversion()
{
this->SetNumberOfInputs(2);
this->SetNumberOfRequiredInputs(2);
}
-
-template < class TInputImage, class TInputROIImage >
+template <class TInputImage, class TInputROIImage>
void
-ROIdataConversion< TInputImage, TInputROIImage >
+ROIdataConversion<TInputImage, TInputROIImage>
::GenerateOutputInformation(void)
{
- typename OutputImageType::Pointer outputPtr = this->GetOutput();
+ typename OutputImageType::Pointer outputPtr = this->GetOutput();
typename OutputImageType::SizeType outputSize = outputPtr->GetRequestedRegion().GetSize();
outputSize[0] = GetNumberOfSample();
- outputPtr->SetRegions( outputSize );
+ outputPtr->SetRegions(outputSize);
}
-
-template < class TInputImage, class TInputROIImage >
+template <class TInputImage, class TInputROIImage>
void
-ROIdataConversion< TInputImage, TInputROIImage >
+ROIdataConversion<TInputImage, TInputROIImage>
::GenerateInputRequestedRegion(void)
{
- typename InputImageType::Pointer inputImagePtr = const_cast<InputImageType *>(this->GetInputImage());
+ typename InputImageType::Pointer inputImagePtr = const_cast<InputImageType *>(this->GetInputImage());
typename InputROIImageType::Pointer inputROIPtr = this->GetROIImage();
inputImagePtr->SetRequestedRegion(inputImagePtr->GetLargestPossibleRegion());
inputROIPtr->SetRequestedRegion(inputROIPtr->GetLargestPossibleRegion());
}
-template <class TInputImage, class TInputROIImage >
+template <class TInputImage, class TInputROIImage>
void
-ROIdataConversion< TInputImage, TInputROIImage >
-::GenerateData ()
+ROIdataConversion<TInputImage, TInputROIImage>
+::GenerateData()
{
- typename InputImageType::Pointer inputImagePtr = const_cast<InputImageType *>(this->GetInputImage());
+ typename InputImageType::Pointer inputImagePtr = const_cast<InputImageType *>(this->GetInputImage());
typename InputROIImageType::ConstPointer inputROIPtr = this->GetROIImage();
- typename OutputImageType::Pointer outputPtr = this->GetOutput();
-
+ typename OutputImageType::Pointer outputPtr = this->GetOutput();
+
outputPtr->Allocate();
outputPtr->FillBuffer(static_cast<typename InputImageType::PixelType>(0));
-
- itk::ImageRegionConstIterator< InputImageType > inputIter
- ( inputImagePtr, inputImagePtr->GetRequestedRegion() );
- itk::ImageRegionConstIterator< InputROIImageType > trainingIter
- ( inputROIPtr, inputROIPtr->GetRequestedRegion() );
- itk::ImageRegionIterator< OutputImageType > outputIter
- ( outputPtr, outputPtr->GetRequestedRegion() );
+ itk::ImageRegionConstIterator<InputImageType> inputIter
+ (inputImagePtr, inputImagePtr->GetRequestedRegion());
+ itk::ImageRegionConstIterator<InputROIImageType> trainingIter
+ (inputROIPtr, inputROIPtr->GetRequestedRegion());
+ itk::ImageRegionIterator<OutputImageType> outputIter
+ (outputPtr, outputPtr->GetRequestedRegion());
inputIter.GoToBegin();
trainingIter.GoToBegin();
outputIter.GoToBegin();
- while ( !trainingIter.IsAtEnd() )
- {
- if ( trainingIter.Get() != 0 )
+ while (!trainingIter.IsAtEnd())
{
- outputIter.Set( inputIter.Get() );
+ if (trainingIter.Get() != 0)
+ {
+ outputIter.Set(inputIter.Get());
++outputIter;
- }
+ }
++inputIter;
++trainingIter;
- }
+ }
}
-template < class TInputImage, class TInputROIImage >
-typename ROIdataConversion< TInputImage, TInputROIImage >::SizeValueType
-ROIdataConversion< TInputImage, TInputROIImage >
-::GetNumberOfSample ()
+template <class TInputImage, class TInputROIImage>
+typename ROIdataConversion<TInputImage, TInputROIImage>::SizeValueType
+ROIdataConversion<TInputImage, TInputROIImage>
+::GetNumberOfSample()
{
InputROIImagePointerType inputROIPtr = GetROIImage();
- itk::ImageRegionConstIterator< InputROIImageType > trainingIter( inputROIPtr, inputROIPtr->GetRequestedRegion() );
-
+ itk::ImageRegionConstIterator<InputROIImageType> trainingIter(inputROIPtr, inputROIPtr->GetRequestedRegion());
+
trainingIter.GoToBegin();
-
+
SizeValueType count = 0L;
- while ( !trainingIter.IsAtEnd() )
- {
- if ( trainingIter.Get() != 0 )
- count++;
+ while (!trainingIter.IsAtEnd())
+ {
+ if (trainingIter.Get() != 0) count++;
++trainingIter;
- }
+ }
return count;
}
-
} // end of namespace otb
#endif
-
-
diff --git a/Code/Learning/otbSEMClassifier.h b/Code/Learning/otbSEMClassifier.h
index 9b88643d3b..bcf5ae4da5 100644
--- a/Code/Learning/otbSEMClassifier.h
+++ b/Code/Learning/otbSEMClassifier.h
@@ -9,7 +9,6 @@
#include "otbGaussianModelComponent.h"
-
namespace otb
{
@@ -40,63 +39,63 @@ namespace otb
*
* \sa ModelComponentBase, GaussianModelComponent
*/
-template< class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
class ITK_EXPORT SEMClassifier
- : public itk::Statistics::SampleClassifier<
- typename itk::Statistics::ListSample< typename TInputImage::PixelType > >
+ : public itk::Statistics::SampleClassifier<
+ typename itk::Statistics::ListSample<typename TInputImage::PixelType> >
{
public:
/** Standard class typedef*/
typedef SEMClassifier Self;
//typedef itk::Object Superclass;
typedef itk::Statistics::SampleClassifier<
- typename itk::Statistics::ListSample< typename TInputImage::PixelType > >
+ typename itk::Statistics::ListSample<typename TInputImage::PixelType> >
Superclass;
- typedef itk::SmartPointer< Self > Pointer;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Standard macros */
- itkTypeMacro( SEMClassifier, itk::Object );
- itkNewMacro( Self );
+ itkTypeMacro(SEMClassifier, itk::Object);
+ itkNewMacro(Self);
/** TSample template argument related typedefs */
- typedef typename itk::Statistics::ListSample< typename TInputImage::PixelType > SampleType;
- typedef typename itk::Statistics::Subsample< SampleType > ClassSampleType;
+ typedef typename itk::Statistics::ListSample<typename TInputImage::PixelType> SampleType;
+ typedef typename itk::Statistics::Subsample<SampleType> ClassSampleType;
- typedef typename SampleType::MeasurementType MeasurementType;
+ typedef typename SampleType::MeasurementType MeasurementType;
typedef typename SampleType::MeasurementVectorType MeasurementVectorType;
/** Type of the segmentation vector */
- typedef unsigned int ClassLabelType;
- typedef std::vector< ClassLabelType > ClassLabelVectorType;
+ typedef unsigned int ClassLabelType;
+ typedef std::vector<ClassLabelType> ClassLabelVectorType;
/** Output type for GetClassSample method */
- typedef itk::Statistics::MembershipSample< SampleType > OutputType;
+ typedef itk::Statistics::MembershipSample<SampleType> OutputType;
/** Type of the mixture model component base class.
* Due to the stochastic purpose, the inital list of sample (from TInputImage)
* is duplicated as many times as the number of classes (into SampleLists). */
- typedef otb::Statistics::ModelComponentBase< ClassSampleType > ComponentType;
- typedef typename ComponentType::Pointer ComponentPointerType;
+ typedef otb::Statistics::ModelComponentBase<ClassSampleType> ComponentType;
+ typedef typename ComponentType::Pointer ComponentPointerType;
/** Type of the component pointer storage, one component per class */
- typedef std::vector< ComponentPointerType > ComponentVectorType;
+ typedef std::vector<ComponentPointerType> ComponentVectorType;
/** type of the parameters needed for the component vectors */
- typedef itk::Array< double > ParameterType;
+ typedef itk::Array<double> ParameterType;
/** Type of the parameter pointer storage, one parameter set per class */
- typedef std::vector< ParameterType > ParameterVectorType;
+ typedef std::vector<ParameterType> ParameterVectorType;
/** Type of the vector of the probability values for each sample */
- typedef std::vector< double > ProportionVectorType;
- typedef std::vector< double > ProbaVectorType;
+ typedef std::vector<double> ProportionVectorType;
+ typedef std::vector<double> ProbaVectorType;
/** Type of the probability values of each sample per class */
- typedef std::vector< ProbaVectorType > ProbaByClassVectorType;
+ typedef std::vector<ProbaVectorType> ProbaByClassVectorType;
/** Sets the target data that will be classified by this */
- void SetSample ( const TInputImage * sample);
+ void SetSample(const TInputImage * sample);
/** Returns the target data */
const TInputImage* GetSample() const;
@@ -106,7 +105,7 @@ public:
* vector should be same as the number of component (or classes).
* Choose between SetInitialProportions, SetClassLabels or
* SetNumberOfComponents */
- void SetInitialProportions(ProportionVectorType &propotion);
+ void SetInitialProportions(ProportionVectorType& propotion);
ProportionVectorType* GetInitialProportions();
/** Gets the result proportion values */
@@ -114,31 +113,31 @@ public:
/** Set/Gets the initial segmentation. the size of the vector should be
* the same as the number of samples (length of MeasurementVector) */
- void SetClassLabels( OutputType * labels );
- void SetClassLabels( TOutputImage * imgLabels );
- ClassLabelVectorType & GetClassLabels();
+ void SetClassLabels(OutputType * labels);
+ void SetClassLabels(TOutputImage * imgLabels);
+ ClassLabelVectorType& GetClassLabels();
/** Sets/Gets the total number of classes currently plugged in. */
- void SetNumberOfClasses( int theSize );
+ void SetNumberOfClasses(int theSize);
unsigned int GetNumberOfClasses();
/** Set/Gets the maximum number of iterations. When the optimization
* process reaches the maximum number of interations, even if the
* class parameters aren't converged, the optimization process
* stops. */
- itkSetMacro(MaximumIteration,int);
- itkGetMacro(MaximumIteration,int);
+ itkSetMacro(MaximumIteration, int);
+ itkGetMacro(MaximumIteration, int);
/** Set/Gets the neighborhood to take into consideration
* in the contextual decision rule. Should be odd (def. 3). */
- void SetNeighborhood( int neighborhood );
+ void SetNeighborhood(int neighborhood);
int GetNeighborhood();
/** Gets the current iteration. */
int GetCurrentIteration();
/** Adds a new component (or class). Has to be called after SetNumberOfClasses */
- int AddComponent( int id, ComponentType* component );
+ int AddComponent(int id, ComponentType* component);
/** Runs the optimization process. */
void Update();
@@ -149,14 +148,14 @@ public:
/** Set/Get the termination threshold (ratio of the number of sample that
* change affected class during interation over the total number of
* samples (def is 1E-5) */
- itkSetMacro(TerminationThreshold,double);
- itkGetMacro(TerminationThreshold,double);
+ itkSetMacro(TerminationThreshold, double);
+ itkGetMacro(TerminationThreshold, double);
/** Gets the termination status */
- itkGetMacro(TerminationCode,TerminationCodeType);
+ itkGetMacro(TerminationCode, TerminationCodeType);
/* Return the classification result (as a standard classification result) */
- OutputType * GetOutput ();
+ OutputType * GetOutput();
/* Return the classification result (as an image) */
TOutputImage * GetOutputImage();
@@ -183,22 +182,22 @@ protected:
private:
/** Target data sample pointer*/
const TInputImage* m_Sample;
- int m_NbSamples;
+ int m_NbSamples;
typename SampleType::Pointer m_SampleList;
- int m_NbClasses;
- int m_MaximumIteration;
- int m_CurrentIteration;
- int m_NbChange;
+ int m_NbClasses;
+ int m_MaximumIteration;
+ int m_CurrentIteration;
+ int m_NbChange;
double m_TerminationThreshold;
- int m_Neighborhood;
+ int m_Neighborhood;
TerminationCodeType m_TerminationCode;
ComponentVectorType m_ComponentVector;
- ProportionVectorType m_InitialProportions;
- ProportionVectorType m_Proportions;
- ProbaByClassVectorType m_Proba;
- ClassLabelVectorType m_ClassLabels;
+ ProportionVectorType m_InitialProportions;
+ ProportionVectorType m_Proportions;
+ ProbaByClassVectorType m_Proba;
+ ClassLabelVectorType m_ClassLabels;
int m_ExternalLabels;
int m_ComponentDeclared;
@@ -213,7 +212,4 @@ private:
#include "otbSEMClassifier.txx"
#endif
-
#endif
-
-
diff --git a/Code/Learning/otbSEMClassifier.txx b/Code/Learning/otbSEMClassifier.txx
index c6731e1ab8..cd9be3878e 100644
--- a/Code/Learning/otbSEMClassifier.txx
+++ b/Code/Learning/otbSEMClassifier.txx
@@ -18,8 +18,8 @@
namespace otb
{
-template< class TInputImage, class TOutputImage >
-SEMClassifier< TInputImage, TOutputImage >
+template<class TInputImage, class TOutputImage>
+SEMClassifier<TInputImage, TOutputImage>
::SEMClassifier()
{
m_TerminationCode = NOT_CONVERGED;
@@ -38,446 +38,441 @@ SEMClassifier< TInputImage, TOutputImage >
}
-template< class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
void
-SEMClassifier< TInputImage, TOutputImage >
+SEMClassifier<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
- for ( int componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex )
- {
+ for (int componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex)
+ {
os << indent << "Component num " << componentIndex;
os << " (prop " << m_Proportions[componentIndex] << ") ";
- m_ComponentVector[componentIndex]->ShowParameters(os,indent);
- }
+ m_ComponentVector[componentIndex]->ShowParameters(os, indent);
+ }
}
-template< class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
void
-SEMClassifier< TInputImage, TOutputImage >
+SEMClassifier<TInputImage, TOutputImage>
::SetNeighborhood(int neighborhood)
{
- m_Neighborhood = 2*(neighborhood/2) + 1;
- if ( m_Neighborhood < 1 )
- m_Neighborhood = 1;
+ m_Neighborhood = 2 * (neighborhood / 2) + 1;
+ if (m_Neighborhood < 1) m_Neighborhood = 1;
}
-template< class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
int
-SEMClassifier< TInputImage, TOutputImage >
+SEMClassifier<TInputImage, TOutputImage>
::GetNeighborhood()
{
return m_Neighborhood;
}
-template< class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
void
-SEMClassifier< TInputImage, TOutputImage >
-::SetInitialProportions(ProportionVectorType &proportions)
+SEMClassifier<TInputImage, TOutputImage>
+::SetInitialProportions(ProportionVectorType& proportions)
{
m_InitialProportions = proportions;
m_ExternalLabels = 0;
}
-template< class TInputImage, class TOutputImage >
-typename SEMClassifier< TInputImage, TOutputImage >::ProportionVectorType*
-SEMClassifier< TInputImage, TOutputImage >
+template<class TInputImage, class TOutputImage>
+typename SEMClassifier<TInputImage, TOutputImage>::ProportionVectorType*
+SEMClassifier<TInputImage, TOutputImage>
::GetInitialProportions()
{
return m_InitialProportions;
}
-template< class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
void
-SEMClassifier< TInputImage, TOutputImage >
-::SetClassLabels( OutputType * labels )
+SEMClassifier<TInputImage, TOutputImage>
+::SetClassLabels(OutputType * labels)
{
- if ( m_Sample == NULL )
- {
- m_ClassLabels.resize( labels->Size() );
+ if (m_Sample == NULL)
+ {
+ m_ClassLabels.resize(labels->Size());
- ClassLabelVectorType::iterator iterClassLabel = m_ClassLabels.begin();
- typename OutputType::ConstIterator iterLabels = labels->Begin();
+ ClassLabelVectorType::iterator iterClassLabel = m_ClassLabels.begin();
+ typename OutputType::ConstIterator iterLabels = labels->Begin();
typename OutputType::InstanceIdentifier id = 0;
do
- {
- *iterClassLabel = iterLabels->GetClassLabel( id );
+ {
+ *iterClassLabel = iterLabels->GetClassLabel(id);
++iterLabels;
++iterClassLabel;
id++;
- }
- while ( iterLabels != labels->End() );
+ }
+ while (iterLabels != labels->End());
m_ExternalLabels = 1;
- }
- else if ( labels.size() == m_NbSamples )
- {
- m_ClassLabels.resize( labels->Size() );
+ }
+ else if (labels.size() == m_NbSamples)
+ {
+ m_ClassLabels.resize(labels->Size());
- ClassLabelVectorType::iterator iterClassLabel = m_ClassLabels.begin();
- typename OutputType::iterator iterLabels = labels->Begin();
+ ClassLabelVectorType::iterator iterClassLabel = m_ClassLabels.begin();
+ typename OutputType::iterator iterLabels = labels->Begin();
typename OutputType::InstanceIdentifier id = 0;
do
- {
- *iterClassLabel = iterLabels->GetClassLabel( id );
+ {
+ *iterClassLabel = iterLabels->GetClassLabel(id);
++iterLabels;
++iterClassLabel;
id++;
- }
- while ( iterLabels != labels->End() );
+ }
+ while (iterLabels != labels->End());
m_ExternalLabels = 1;
- }
+ }
else
- {
- otbMsgDebugMacro( << "m_ClassLabels size = " << GetClassLabels().size() << " / m_Sample size = " << m_NbSamples );
- throw itk::ExceptionObject( __FILE__, __LINE__, "Vector size missmatch", ITK_LOCATION );
- }
+ {
+ otbMsgDebugMacro(<< "m_ClassLabels size = " << GetClassLabels().size() << " / m_Sample size = " << m_NbSamples);
+ throw itk::ExceptionObject(__FILE__, __LINE__, "Vector size missmatch", ITK_LOCATION);
+ }
}
-template< class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
void
-SEMClassifier< TInputImage, TOutputImage >
-::SetClassLabels( TOutputImage * imgLabels )
+SEMClassifier<TInputImage, TOutputImage>
+::SetClassLabels(TOutputImage * imgLabels)
{
- otbMsgDebugMacro( << "Initalizing segmentation from an external image" );
+ otbMsgDebugMacro(<< "Initalizing segmentation from an external image");
typename TInputImage::SizeType size = imgLabels->GetBufferedRegion().GetSize();
- int theSize = (int) size[0] * size[1];
+ int theSize = (int) size[0] * size[1];
- if ( m_Sample == NULL )
- {
- m_ClassLabels.resize( theSize );
+ if (m_Sample == NULL)
+ {
+ m_ClassLabels.resize(theSize);
- typename itk::ImageRegionIterator< TOutputImage > imgLabelIter ( imgLabels,
- imgLabels->GetBufferedRegion() );
+ typename itk::ImageRegionIterator<TOutputImage> imgLabelIter(imgLabels,
+ imgLabels->GetBufferedRegion());
imgLabelIter.GoToBegin();
- typename itk::ImageRegionIterator< TOutputImage > imgLabelIterEnd ( imgLabels,
- imgLabels->GetBufferedRegion() );
+ typename itk::ImageRegionIterator<TOutputImage> imgLabelIterEnd(imgLabels,
+ imgLabels->GetBufferedRegion());
imgLabelIterEnd.GoToEnd();
ClassLabelVectorType::iterator iterClassLabel = m_ClassLabels.begin();
do
- {
+ {
*iterClassLabel = imgLabelIter.Get();
++imgLabelIter;
++iterClassLabel;
- }
- while ( imgLabelIter != imgLabelIterEnd );
+ }
+ while (imgLabelIter != imgLabelIterEnd);
m_ExternalLabels = 1;
- }
- else if ( theSize == m_NbSamples )
- {
- m_ClassLabels.resize( theSize );
+ }
+ else if (theSize == m_NbSamples)
+ {
+ m_ClassLabels.resize(theSize);
- typename itk::ImageRegionIterator< TOutputImage > imgLabelIter ( imgLabels,
- imgLabels->GetBufferedRegion() );
+ typename itk::ImageRegionIterator<TOutputImage> imgLabelIter(imgLabels,
+ imgLabels->GetBufferedRegion());
imgLabelIter.GoToBegin();
- typename itk::ImageRegionIterator< TOutputImage > imgLabelIterEnd ( imgLabels,
- imgLabels->GetBufferedRegion() );
+ typename itk::ImageRegionIterator<TOutputImage> imgLabelIterEnd(imgLabels,
+ imgLabels->GetBufferedRegion());
imgLabelIterEnd.GoToEnd();
ClassLabelVectorType::iterator iterClassLabel = m_ClassLabels.begin();
do
- {
+ {
*iterClassLabel = imgLabelIter.Get();
++imgLabelIter;
++iterClassLabel;
- }
- while ( imgLabelIter != imgLabelIterEnd );
+ }
+ while (imgLabelIter != imgLabelIterEnd);
m_ExternalLabels = 1;
- }
+ }
else
- {
- otbMsgDebugMacro( << "m_ClassLabels size = " << GetClassLabels().size() << " size of the image = " << theSize << " / m_Sample size = " << m_NbSamples );
- throw itk::ExceptionObject( __FILE__, __LINE__, "Vector size missmatch", ITK_LOCATION );
- }
+ {
+ otbMsgDebugMacro(
+ << "m_ClassLabels size = " << GetClassLabels().size() << " size of the image = " << theSize <<
+ " / m_Sample size = " << m_NbSamples);
+ throw itk::ExceptionObject(__FILE__, __LINE__, "Vector size missmatch", ITK_LOCATION);
+ }
}
template <class TInputImage, class TOutputImage>
-typename SEMClassifier< TInputImage, TOutputImage >::ClassLabelVectorType &
-SEMClassifier< TInputImage, TOutputImage >
+typename SEMClassifier<TInputImage, TOutputImage>::ClassLabelVectorType&
+SEMClassifier<TInputImage, TOutputImage>
::GetClassLabels()
{
return m_ClassLabels;
}
-
-template< class TInputImage, class TOutputImage >
-typename SEMClassifier< TInputImage, TOutputImage >::ProportionVectorType*
-SEMClassifier< TInputImage, TOutputImage >
+template<class TInputImage, class TOutputImage>
+typename SEMClassifier<TInputImage, TOutputImage>::ProportionVectorType*
+SEMClassifier<TInputImage, TOutputImage>
::GetProportions()
{
return &m_Proportions;
}
-template< class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
void
-SEMClassifier< TInputImage, TOutputImage >
-::SetSample ( const TInputImage* sample )
+SEMClassifier<TInputImage, TOutputImage>
+::SetSample(const TInputImage* sample)
{
m_Sample = sample;
m_NbSamples = 0;
m_SampleList = SampleType::New();
- m_SampleList->SetMeasurementVectorSize( m_Sample->GetVectorLength() );
+ m_SampleList->SetMeasurementVectorSize(m_Sample->GetVectorLength());
- itk::ImageRegionIterator< TInputImage > imgIter ( (TInputImage *) m_Sample,
- m_Sample->GetBufferedRegion() );
+ itk::ImageRegionIterator<TInputImage> imgIter((TInputImage *) m_Sample,
+ m_Sample->GetBufferedRegion());
imgIter.GoToBegin();
- itk::ImageRegionIterator< TInputImage > imgIterEnd ( (TInputImage *) m_Sample,
- m_Sample->GetBufferedRegion() );
+ itk::ImageRegionIterator<TInputImage> imgIterEnd((TInputImage *) m_Sample,
+ m_Sample->GetBufferedRegion());
imgIterEnd.GoToEnd();
do
- {
- m_SampleList->PushBack( imgIter.Get() );
+ {
+ m_SampleList->PushBack(imgIter.Get());
++m_NbSamples;
++imgIter;
- }
- while ( imgIter != imgIterEnd );
+ }
+ while (imgIter != imgIterEnd);
- if ( m_ExternalLabels )
- {
+ if (m_ExternalLabels)
+ {
typename TInputImage::SizeType size = m_Sample->GetBufferedRegion().GetSize();
- if ( ( size[0] * size[1] ) != m_ClassLabels.size() )
- throw itk::ExceptionObject( __FILE__, __LINE__,
- "Vector size missmatch", ITK_LOCATION );
- }
+ if ((size[0] * size[1]) != m_ClassLabels.size())
+ throw itk::ExceptionObject(__FILE__, __LINE__,
+ "Vector size missmatch", ITK_LOCATION);
+ }
}
-template< class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
const TInputImage *
-SEMClassifier< TInputImage, TOutputImage >
+SEMClassifier<TInputImage, TOutputImage>
::GetSample() const
{
return m_Sample;
}
-template< class TInputImage, class TOutputImage >
-typename SEMClassifier< TInputImage, TOutputImage >::SampleType *
-SEMClassifier< TInputImage, TOutputImage >
+template<class TInputImage, class TOutputImage>
+typename SEMClassifier<TInputImage, TOutputImage>::SampleType *
+SEMClassifier<TInputImage, TOutputImage>
::GetSampleList() const
{
return m_SampleList;
}
-template< class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
int
-SEMClassifier< TInputImage, TOutputImage >
+SEMClassifier<TInputImage, TOutputImage>
::GetCurrentIteration()
{
return m_CurrentIteration;
}
-template< class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
int
-SEMClassifier< TInputImage, TOutputImage >
-::AddComponent(int id, ComponentType * component )
+SEMClassifier<TInputImage, TOutputImage>
+::AddComponent(int id, ComponentType * component)
{
m_ComponentVector[id] = component;
m_ComponentDeclared = 1;
- return static_cast<int>( m_ComponentVector.size() );
+ return static_cast<int>(m_ComponentVector.size());
}
-template< class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
unsigned int
-SEMClassifier< TInputImage, TOutputImage >
+SEMClassifier<TInputImage, TOutputImage>
::GetNumberOfClasses()
{
return m_NbClasses;
}
-template < class TInputImage, class TOutputImage >
+template <class TInputImage, class TOutputImage>
void
-SEMClassifier< TInputImage, TOutputImage >
-::SetNumberOfClasses( int theNumberOfClasses )
+SEMClassifier<TInputImage, TOutputImage>
+::SetNumberOfClasses(int theNumberOfClasses)
{
m_NbClasses = theNumberOfClasses;
- m_ComponentVector.resize( theNumberOfClasses );
+ m_ComponentVector.resize(theNumberOfClasses);
- if ( m_ComponentDeclared == 1 )
- otbMsgDebugMacro( << "Previous component declarations will be lost since called before SetNumberOfClasses" );
+ if (m_ComponentDeclared == 1) otbMsgDebugMacro(
+ << "Previous component declarations will be lost since called before SetNumberOfClasses");
m_ComponentDeclared = 0;
}
-
-template < class TInputImage, class TOutputImage >
+template <class TInputImage, class TOutputImage>
TOutputImage *
-SEMClassifier< TInputImage, TOutputImage >
+SEMClassifier<TInputImage, TOutputImage>
::GetOutputImage()
{
return m_OutputImage;
}
-template < class TInputImage, class TOutputImage >
-typename SEMClassifier< TInputImage, TOutputImage >::OutputType *
-SEMClassifier< TInputImage, TOutputImage >
+template <class TInputImage, class TOutputImage>
+typename SEMClassifier<TInputImage, TOutputImage>::OutputType *
+SEMClassifier<TInputImage, TOutputImage>
::GetOutput()
{
return m_Output;
}
-template < class TInputImage, class TOutputImage >
+template <class TInputImage, class TOutputImage>
void
-SEMClassifier< TInputImage, TOutputImage >
+SEMClassifier<TInputImage, TOutputImage>
::InitParameters()
{
- if ( !m_ExternalLabels )
- {
- m_ClassLabels.resize( m_NbSamples );
- if ( static_cast<int>(m_InitialProportions.size()) != m_NbClasses )
+ if (!m_ExternalLabels)
{
- int label;
- for ( typename ClassLabelVectorType::iterator labelIter = m_ClassLabels.begin();
- labelIter != m_ClassLabels.end();
- ++labelIter )
+ m_ClassLabels.resize(m_NbSamples);
+ if (static_cast<int>(m_InitialProportions.size()) != m_NbClasses)
{
+ int label;
+ for (typename ClassLabelVectorType::iterator labelIter = m_ClassLabels.begin();
+ labelIter != m_ClassLabels.end();
+ ++labelIter)
+ {
//label = (int) floor( 0.5 + nbClassesDbl * ran / double(RAND_MAX+1) );
label = rand() % m_NbClasses;
- if ( label < 0 )
- label = 0;
- else if ( label >= m_NbClasses )
- label = m_NbClasses - 1;
+ if (label < 0) label = 0;
+ else if (label >= m_NbClasses) label = m_NbClasses - 1;
*labelIter = label;
+ }
}
- }
else
- {
+ {
// Be sure, the sum of intial proportion remains to 1
- double sumProportion = 0.0;
+ double sumProportion = 0.0;
typename ProportionVectorType::iterator iterProportion = m_InitialProportions.begin();
do
- {
+ {
sumProportion += *iterProportion;
- }
- while ( ++iterProportion != m_InitialProportions.end() );
+ }
+ while (++iterProportion != m_InitialProportions.end());
- if ( sumProportion != 1.0 )
- {
- for ( iterProportion = m_InitialProportions.begin();
- iterProportion != m_InitialProportions.end();
- ++iterProportion )
+ if (sumProportion != 1.0)
+ {
+ for (iterProportion = m_InitialProportions.begin();
+ iterProportion != m_InitialProportions.end();
+ ++iterProportion)
*iterProportion /= sumProportion;
- }
+ }
// non uniform random sampling according to m_InitialProportions
double sample;
double cumulativeProportion;
- for ( typename ClassLabelVectorType::iterator labelIter = m_ClassLabels.begin();
- labelIter != m_ClassLabels.end();
- ++labelIter )
- {
+ for (typename ClassLabelVectorType::iterator labelIter = m_ClassLabels.begin();
+ labelIter != m_ClassLabels.end();
+ ++labelIter)
+ {
cumulativeProportion = 0.0;
- sample = double( rand() ) / ( double( RAND_MAX) + 1.0 );
+ sample = double(rand()) / (double(RAND_MAX) + 1.0);
- *labelIter = m_NbClasses-1;
- for ( int componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex )
- {
- if ( cumulativeProportion <= sample
- && sample < cumulativeProportion + m_InitialProportions[componentIndex] )
+ *labelIter = m_NbClasses - 1;
+ for (int componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex)
{
+ if (cumulativeProportion <= sample
+ && sample < cumulativeProportion + m_InitialProportions[componentIndex])
+ {
*labelIter = componentIndex;
break;
+ }
+ else cumulativeProportion += m_InitialProportions[componentIndex];
}
- else
- cumulativeProportion += m_InitialProportions[componentIndex];
}
}
}
- }
- m_Proportions.resize( m_NbClasses );
- m_Proba.resize( m_NbClasses );
- for ( int i = 0; i < m_NbClasses; ++i )
- m_Proba[i].resize( m_NbSamples );
+ m_Proportions.resize(m_NbClasses);
+ m_Proba.resize(m_NbClasses);
+ for (int i = 0; i < m_NbClasses; ++i)
+ m_Proba[i].resize(m_NbSamples);
- if ( !m_ComponentDeclared )
- {
- otbMsgDebugMacro( << "default mixture initialization with " << m_NbClasses
- << " Gaussian components" );
- typedef otb::Statistics::GaussianModelComponent< ClassSampleType > GaussianType;
+ if (!m_ComponentDeclared)
+ {
+ otbMsgDebugMacro(<< "default mixture initialization with " << m_NbClasses
+ << " Gaussian components");
+ typedef otb::Statistics::GaussianModelComponent<ClassSampleType> GaussianType;
- for ( int componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex )
- AddComponent( componentIndex, GaussianType::New() );
- }
+ for (int componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex)
+ AddComponent(componentIndex, GaussianType::New());
+ }
- otbMsgDevMacro( << "num class : " << m_NbClasses );
- otbMsgDevMacro( << "num sample : " << GetSampleList()->Size() );
- otbMsgDevMacro( << "num labels : " << GetClassLabels().size() );
- otbMsgDevMacro( << "contextual neighborhood : " << m_Neighborhood );
- otbMsgDevMacro( << "terminationThreshold : " << m_TerminationThreshold );
+ otbMsgDevMacro(<< "num class : " << m_NbClasses);
+ otbMsgDevMacro(<< "num sample : " << GetSampleList()->Size());
+ otbMsgDevMacro(<< "num labels : " << GetClassLabels().size());
+ otbMsgDevMacro(<< "contextual neighborhood : " << m_Neighborhood);
+ otbMsgDevMacro(<< "terminationThreshold : " << m_TerminationThreshold);
}
template <class TInputImage, class TOutputImage>
void
-SEMClassifier< TInputImage, TOutputImage >
+SEMClassifier<TInputImage, TOutputImage>
::PerformStochasticProcess()
{
double x, y, z;
m_NbChange = 0;
int posSample = 0;
- for ( typename ClassLabelVectorType::iterator iter = m_ClassLabels.begin();
- iter != m_ClassLabels.end();
- ++iter )
- {
- x = double( rand() ) / ( double(RAND_MAX) + 1.0 );
+ for (typename ClassLabelVectorType::iterator iter = m_ClassLabels.begin();
+ iter != m_ClassLabels.end();
+ ++iter)
+ {
+ x = double(rand()) / (double(RAND_MAX) + 1.0);
z = 0.0;
- for ( int componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex )
- {
+ for (int componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex)
+ {
y = z;
z += m_Proba[componentIndex][posSample];
- if ( ( y < x ) && ( x <= z ) )
- {
- if ( static_cast<unsigned int>(componentIndex) != *iter )
- m_NbChange++;
+ if ((y < x) && (x <= z))
+ {
+ if (static_cast<unsigned int>(componentIndex) != *iter) m_NbChange++;
*iter = componentIndex;
break;
+ }
}
- }
posSample++;
- }
+ }
- switch ( GetCurrentIteration() )
- {
- case 0 :
- case 1 :
- otbMsgDebugMacro( << "Doing iteration " << GetCurrentIteration() );
+ switch (GetCurrentIteration())
+ {
+ case 0:
+ case 1:
+ otbMsgDebugMacro(<< "Doing iteration " << GetCurrentIteration());
break;
- default :
- otbMsgDebugMacro( << m_NbChange << " sample change at iteration "
- << GetCurrentIteration() );
- }
+ default:
+ otbMsgDebugMacro(<< m_NbChange << " sample change at iteration "
+ << GetCurrentIteration());
+ }
}
-template< class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
void
-SEMClassifier< TInputImage, TOutputImage >
+SEMClassifier<TInputImage, TOutputImage>
::PerformExpectationProcess()
{
int componentIndex;
- for ( componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex )
+ for (componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex)
m_Proportions[componentIndex] = 0.0;
- std::vector< typename ClassSampleType::Pointer > coeffByClass;
+ std::vector<typename ClassSampleType::Pointer> coeffByClass;
- for ( componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex )
- {
- coeffByClass.push_back( ClassSampleType::New() );
- coeffByClass[ componentIndex ]->SetMeasurementVectorSize(
- m_SampleList->GetMeasurementVectorSize() );
- coeffByClass[ componentIndex ]->SetSample( m_SampleList );
- }
+ for (componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex)
+ {
+ coeffByClass.push_back(ClassSampleType::New());
+ coeffByClass[componentIndex]->SetMeasurementVectorSize(
+ m_SampleList->GetMeasurementVectorSize());
+ coeffByClass[componentIndex]->SetSample(m_SampleList);
+ }
typename SampleType::ConstIterator iterSample = m_SampleList->Begin();
typename SampleType::ConstIterator lastSample = m_SampleList->End();
@@ -488,121 +483,118 @@ SEMClassifier< TInputImage, TOutputImage >
typename SampleType::InstanceIdentifier id = 0;
do
- {
- coeffByClass[ *iterLabel ]->AddInstance( id );
- m_Proportions[ *iterLabel ] += 1.0;
+ {
+ coeffByClass[*iterLabel]->AddInstance(id);
+ m_Proportions[*iterLabel] += 1.0;
id++;
- }
- while ( ++iterSample != lastSample && ++iterLabel != lastLabel );
+ }
+ while (++iterSample != lastSample && ++iterLabel != lastLabel);
- for ( componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex )
- {
- if ( m_Proportions[ componentIndex ] == 0.0 )
+ for (componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex)
{
+ if (m_Proportions[componentIndex] == 0.0)
+ {
std::cerr << "No sample on class " << componentIndex;
// std::cerr << " in " << __PRETTY_FUNCTION__ << std::endl;
std::cerr << " in " << ITK_LOCATION << std::endl;
continue;
- }
+ }
- m_ComponentVector[ componentIndex ]->SetSample( coeffByClass[componentIndex] );
- m_ComponentVector[ componentIndex ]->Update();
- }
+ m_ComponentVector[componentIndex]->SetSample(coeffByClass[componentIndex]);
+ m_ComponentVector[componentIndex]->Update();
+ }
- for ( componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex )
- m_Proportions[componentIndex] /= static_cast<double> ( m_NbSamples );
+ for (componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex)
+ m_Proportions[componentIndex] /= static_cast<double> (m_NbSamples);
}
-template <class TInputImage, class TOutputImage >
+template <class TInputImage, class TOutputImage>
void
-SEMClassifier< TInputImage, TOutputImage >
-::PerformMaximizationProcess ()
+SEMClassifier<TInputImage, TOutputImage>
+::PerformMaximizationProcess()
{
- int i,j,a,b;
- int voisinage = m_Neighborhood / 2;
- int componentIndex;
+ int i, j, a, b;
+ int voisinage = m_Neighborhood / 2;
+ int componentIndex;
double sumPdf, aPdf;
double neighborhoodWeight = (double) m_Neighborhood * m_Neighborhood;
- int line, cols;
+ int line, cols;
typename TInputImage::SizeType size = m_Sample->GetBufferedRegion().GetSize();
cols = (int) size[0];
line = (int) size[1];
- std::vector< double > pdf ( m_NbClasses );
- std::vector< double > localWeight ( m_NbClasses );
- std::vector< double > localCount ( m_NbClasses );
+ std::vector<double> pdf(m_NbClasses);
+ std::vector<double> localWeight(m_NbClasses);
+ std::vector<double> localCount(m_NbClasses);
typename SampleType::ConstIterator iterSample = m_SampleList->Begin();
typename SampleType::ConstIterator lastSample = m_SampleList->End();
- MeasurementVectorType measurementVector;
+ MeasurementVectorType measurementVector;
typename SampleType::InstanceIdentifier id = 0;
do
- {
+ {
id = iterSample.GetInstanceIdentifier();
- for ( componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex )
- localCount[ componentIndex ] = 0.0;
+ for (componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex)
+ localCount[componentIndex] = 0.0;
i = id / cols;
j = id % cols;
- for ( a = (i-voisinage); a <= (i+voisinage); a++ )
- for ( b = (j-voisinage); b <= (j+voisinage); b++ )
- {
- if ( a < 0 || a >= line )
- continue;
+ for (a = (i - voisinage); a <= (i + voisinage); a++)
+ for (b = (j - voisinage); b <= (j + voisinage); b++)
+ {
+ if (a < 0 || a >= line) continue;
- if ( b < 0 || b >= cols )
- continue;
+ if (b < 0 || b >= cols) continue;
- localCount[ m_ClassLabels[ a*cols+b ] ] += 1.0;
- }
+ localCount[m_ClassLabels[a * cols + b]] += 1.0;
+ }
- for ( componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex )
- localWeight[ componentIndex ] = localCount[ componentIndex ]
- / neighborhoodWeight;
+ for (componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex)
+ localWeight[componentIndex] = localCount[componentIndex]
+ / neighborhoodWeight;
sumPdf = 0.0;
- for ( componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex )
- {
+ for (componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex)
+ {
measurementVector = iterSample.GetMeasurementVector();
- aPdf = localWeight[ componentIndex ]
- * m_ComponentVector[componentIndex]->Pdf( measurementVector );
+ aPdf = localWeight[componentIndex]
+ * m_ComponentVector[componentIndex]->Pdf(measurementVector);
sumPdf += aPdf;
pdf[componentIndex] = aPdf;
- }
+ }
- for ( componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex )
- {
- if ( sumPdf == 0.0 )
- m_Proba[componentIndex][iterSample.GetInstanceIdentifier()] = 0.0;
+ for (componentIndex = 0; componentIndex < m_NbClasses; ++componentIndex)
+ {
+ if (sumPdf == 0.0) m_Proba[componentIndex][iterSample.GetInstanceIdentifier()] = 0.0;
else
m_Proba[componentIndex][iterSample.GetInstanceIdentifier()]
- = pdf[componentIndex] / sumPdf;
- }
+ = pdf[componentIndex] / sumPdf;
+ }
- }
- while ( ++iterSample != lastSample );
+ }
+ while (++iterSample != lastSample);
}
-template < class TInputImage, class TOutputImage >
+template <class TInputImage, class TOutputImage>
void
-SEMClassifier< TInputImage, TOutputImage >
-::GetMaximumAposterioriLabels ()
+SEMClassifier<TInputImage, TOutputImage>
+::GetMaximumAposterioriLabels()
{
// Class results initialization
m_Output = OutputType::New();
- m_Output->SetSample( this->GetSampleList() );
- m_Output->Resize( this->GetSampleList()->Size() );
- m_Output->SetNumberOfClasses( m_NbClasses );
+ m_Output->SetSample(this->GetSampleList());
+ m_Output->Resize(this->GetSampleList()->Size());
+ m_Output->SetNumberOfClasses(m_NbClasses);
// Image results classification
m_OutputImage = TOutputImage::New();
- m_OutputImage->SetRegions( GetSample()->GetBufferedRegion() );
+ m_OutputImage->SetRegions(GetSample()->GetBufferedRegion());
m_OutputImage->Allocate();
int cluster, componentIndex;
@@ -613,36 +605,34 @@ SEMClassifier< TInputImage, TOutputImage >
typename OutputType::ConstIterator outputIter = m_Output->Begin();
typename OutputType::ConstIterator outputIterEnd = m_Output->End();
- typename itk::ImageRegionIterator< TOutputImage > imgOutputIter ( m_OutputImage,
- m_OutputImage->GetBufferedRegion() );
+ typename itk::ImageRegionIterator<TOutputImage> imgOutputIter(m_OutputImage,
+ m_OutputImage->GetBufferedRegion());
imgOutputIter.GoToBegin();
- typename itk::ImageRegionIterator< TOutputImage > imgOutputIterEnd ( m_OutputImage,
- m_OutputImage->GetBufferedRegion() );
+ typename itk::ImageRegionIterator<TOutputImage> imgOutputIterEnd(m_OutputImage,
+ m_OutputImage->GetBufferedRegion());
imgOutputIterEnd.GoToEnd();
-
do
- {
- cluster = 0;
- for ( componentIndex = 1; componentIndex < m_NbClasses; ++componentIndex )
{
- if ( m_Proba[componentIndex][sampleIter.GetInstanceIdentifier()]
- > m_Proba[cluster][sampleIter.GetInstanceIdentifier()] )
- cluster = componentIndex;
- }
+ cluster = 0;
+ for (componentIndex = 1; componentIndex < m_NbClasses; ++componentIndex)
+ {
+ if (m_Proba[componentIndex][sampleIter.GetInstanceIdentifier()]
+ > m_Proba[cluster][sampleIter.GetInstanceIdentifier()]) cluster = componentIndex;
+ }
- m_Output->AddInstance( cluster, sampleIter.GetInstanceIdentifier() );
- imgOutputIter.Set( cluster );
+ m_Output->AddInstance(cluster, sampleIter.GetInstanceIdentifier());
+ imgOutputIter.Set(cluster);
- }
- while ( ++sampleIter != sampleIterEnd
- && ++outputIter != outputIterEnd
- && ++imgOutputIter != imgOutputIterEnd );
+ }
+ while (++sampleIter != sampleIterEnd
+ && ++outputIter != outputIterEnd
+ && ++imgOutputIter != imgOutputIterEnd);
}
-template< class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
void
-SEMClassifier< TInputImage, TOutputImage >
+SEMClassifier<TInputImage, TOutputImage>
::Update()
{
@@ -651,29 +641,28 @@ SEMClassifier< TInputImage, TOutputImage >
m_CurrentIteration = 0;
m_TerminationCode = NOT_CONVERGED;
- int oldNbChange = 0;
+ int oldNbChange = 0;
double step;
do
- {
+ {
oldNbChange = m_NbChange;
PerformStochasticProcess();
PerformExpectationProcess();
PerformMaximizationProcess();
- step = static_cast<double>( oldNbChange - m_NbChange );
- if ( step >= 0.0 )
- {
- if ( ( step / static_cast<double>( m_NbSamples ) )
- < GetTerminationThreshold() )
+ step = static_cast<double>(oldNbChange - m_NbChange);
+ if (step >= 0.0)
{
+ if ((step / static_cast<double>(m_NbSamples))
+ < GetTerminationThreshold())
+ {
m_TerminationCode = CONVERGED;
- if ( oldNbChange != 0 )
- break;
+ if (oldNbChange != 0) break;
+ }
}
}
- }
while (++m_CurrentIteration < m_MaximumIteration);
GetMaximumAposterioriLabels();
@@ -682,5 +671,3 @@ SEMClassifier< TInputImage, TOutputImage >
} // end of namesapce otb
#endif
-
-
diff --git a/Code/Learning/otbSOM.h b/Code/Learning/otbSOM.h
index 55794fadcc..219d2fa8fa 100644
--- a/Code/Learning/otbSOM.h
+++ b/Code/Learning/otbSOM.h
@@ -51,11 +51,11 @@ namespace otb
* \sa CzihoSOMLearningBehaviorFunctor
* \sa CzihoSOMNeighborhoodBehaviorFunctor
*/
-template < class TListSample, class TMap,
-class TSOMLearningBehaviorFunctor = Functor::CzihoSOMLearningBehaviorFunctor,
-class TSOMNeighborhoodBehaviorFunctor = Functor::CzihoSOMNeighborhoodBehaviorFunctor >
+template <class TListSample, class TMap,
+ class TSOMLearningBehaviorFunctor = Functor::CzihoSOMLearningBehaviorFunctor,
+ class TSOMNeighborhoodBehaviorFunctor = Functor::CzihoSOMNeighborhoodBehaviorFunctor>
class ITK_EXPORT SOM
- : public itk::ImageSource<TMap>
+ : public itk::ImageSource<TMap>
{
public:
/** Standard typedefs */
@@ -67,52 +67,52 @@ public:
/** Creation through object factory macro */
itkNewMacro(Self);
/** Runtime informations macro */
- itkTypeMacro(SOM,ImageSource);
+ itkTypeMacro(SOM, ImageSource);
typedef TListSample ListSampleType;
typedef typename ListSampleType::Pointer ListSamplePointerType;
- typedef TMap MapType;
- typedef typename MapType::PixelType NeuronType;
- typedef typename NeuronType::ValueType ValueType;
- typedef typename MapType::IndexType IndexType;
- typedef typename MapType::SizeType SizeType;
- typedef typename MapType::RegionType RegionType;
- typedef typename MapType::Pointer MapPointerType;
-
- typedef TSOMLearningBehaviorFunctor SOMLearningBehaviorFunctorType;
+ typedef TMap MapType;
+ typedef typename MapType::PixelType NeuronType;
+ typedef typename NeuronType::ValueType ValueType;
+ typedef typename MapType::IndexType IndexType;
+ typedef typename MapType::SizeType SizeType;
+ typedef typename MapType::RegionType RegionType;
+ typedef typename MapType::Pointer MapPointerType;
+
+ typedef TSOMLearningBehaviorFunctor SOMLearningBehaviorFunctorType;
typedef TSOMNeighborhoodBehaviorFunctor SOMNeighborhoodBehaviorFunctorType;
/** Map dimension */
- itkStaticConstMacro(MapDimension,unsigned int, MapType::ImageDimension);
+ itkStaticConstMacro(MapDimension, unsigned int, MapType::ImageDimension);
/** Accessors */
- itkSetMacro(NumberOfIterations,unsigned int);
- itkGetMacro(NumberOfIterations,unsigned int);
- itkSetMacro(BetaInit,double);
- itkGetMacro(BetaInit,double);
- itkSetMacro(BetaEnd,double);
- itkGetMacro(BetaEnd,double);
- itkSetMacro(MinWeight,ValueType);
- itkGetMacro(MinWeight,ValueType);
- itkSetMacro(MaxWeight,ValueType);
- itkGetMacro(MaxWeight,ValueType);
- itkSetMacro(MapSize,SizeType);
- itkGetMacro(MapSize,SizeType);
- itkSetMacro(NeighborhoodSizeInit,SizeType);
- itkGetMacro(NeighborhoodSizeInit,SizeType);
- itkSetMacro(RandomInit,bool);
- itkGetMacro(RandomInit,bool);
- itkSetMacro(Seed,unsigned int);
- itkGetMacro(Seed,unsigned int);
- itkGetObjectMacro(ListSample,ListSampleType);
- itkSetObjectMacro(ListSample,ListSampleType);
-
- void SetBetaFunctor ( const SOMLearningBehaviorFunctorType & functor )
+ itkSetMacro(NumberOfIterations, unsigned int);
+ itkGetMacro(NumberOfIterations, unsigned int);
+ itkSetMacro(BetaInit, double);
+ itkGetMacro(BetaInit, double);
+ itkSetMacro(BetaEnd, double);
+ itkGetMacro(BetaEnd, double);
+ itkSetMacro(MinWeight, ValueType);
+ itkGetMacro(MinWeight, ValueType);
+ itkSetMacro(MaxWeight, ValueType);
+ itkGetMacro(MaxWeight, ValueType);
+ itkSetMacro(MapSize, SizeType);
+ itkGetMacro(MapSize, SizeType);
+ itkSetMacro(NeighborhoodSizeInit, SizeType);
+ itkGetMacro(NeighborhoodSizeInit, SizeType);
+ itkSetMacro(RandomInit, bool);
+ itkGetMacro(RandomInit, bool);
+ itkSetMacro(Seed, unsigned int);
+ itkGetMacro(Seed, unsigned int);
+ itkGetObjectMacro(ListSample, ListSampleType);
+ itkSetObjectMacro(ListSample, ListSampleType);
+
+ void SetBetaFunctor(const SOMLearningBehaviorFunctorType& functor)
{
m_BetaFunctor = functor;
}
- void SetNeighborhoodSizeFunctor ( const SOMNeighborhoodBehaviorFunctorType & functor )
+ void SetNeighborhoodSizeFunctor(const SOMNeighborhoodBehaviorFunctorType& functor)
{
m_NeighborhoodSizeFunctor = functor;
}
@@ -123,7 +123,7 @@ protected:
/** Destructor */
virtual ~SOM();
/** Output information redefinition */
- virtual void GenerateOutputInformation ();
+ virtual void GenerateOutputInformation();
/** Output allocation redefinition */
virtual void AllocateOutputs();
/** Main computation method */
@@ -143,8 +143,8 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- SOM(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ SOM(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** Size of the neurons map */
SizeType m_MapSize;
/** Number of iterations */
diff --git a/Code/Learning/otbSOM.txx b/Code/Learning/otbSOM.txx
index 151d5016c1..2dee5e5ab0 100644
--- a/Code/Learning/otbSOM.txx
+++ b/Code/Learning/otbSOM.txx
@@ -34,32 +34,32 @@ namespace otb
/**
* Constructor
*/
-template < class TListSample, class TMap,
-class TSOMLearningBehaviorFunctor,
-class TSOMNeighborhoodBehaviorFunctor >
-SOM<TListSample,TMap,TSOMLearningBehaviorFunctor,TSOMNeighborhoodBehaviorFunctor>
+template <class TListSample, class TMap,
+ class TSOMLearningBehaviorFunctor,
+ class TSOMNeighborhoodBehaviorFunctor>
+SOM<TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor>
::SOM()
{
this->SetNumberOfRequiredInputs(0);
this->SetNumberOfRequiredOutputs(1);
m_MapSize.Fill(10);
- m_NumberOfIterations=10;
+ m_NumberOfIterations = 10;
m_BetaInit = 1.0;
m_BetaEnd = 0.2;
m_NeighborhoodSizeInit.Fill(3);
- m_MinWeight=static_cast<ValueType>(0.0);
- m_MaxWeight=static_cast<ValueType>(128.0);
- m_RandomInit=false;
- m_Seed=123574651;
+ m_MinWeight = static_cast<ValueType>(0.0);
+ m_MaxWeight = static_cast<ValueType>(128.0);
+ m_RandomInit = false;
+ m_Seed = 123574651;
}
/**
* Destructor
*/
-template < class TListSample, class TMap,
-class TSOMLearningBehaviorFunctor,
-class TSOMNeighborhoodBehaviorFunctor >
-SOM<TListSample,TMap,TSOMLearningBehaviorFunctor,TSOMNeighborhoodBehaviorFunctor>
+template <class TListSample, class TMap,
+ class TSOMLearningBehaviorFunctor,
+ class TSOMNeighborhoodBehaviorFunctor>
+SOM<TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor>
::~SOM()
{
}
@@ -69,122 +69,121 @@ SOM<TListSample,TMap,TSOMLearningBehaviorFunctor,TSOMNeighborhoodBehaviorFunctor
* \param beta The learning coefficient,
* \param radius The radius of the nieghbourhood.
*/
-template < class TListSample, class TMap,
-class TSOMLearningBehaviorFunctor,
-class TSOMNeighborhoodBehaviorFunctor >
+template <class TListSample, class TMap,
+ class TSOMLearningBehaviorFunctor,
+ class TSOMNeighborhoodBehaviorFunctor>
void
-SOM<TListSample,TMap,TSOMLearningBehaviorFunctor,TSOMNeighborhoodBehaviorFunctor>
-::UpdateMap( const NeuronType& sample, double beta, SizeType& radius )
+SOM<TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor>
+::UpdateMap(const NeuronType& sample, double beta, SizeType& radius)
{
// output map pointer
MapPointerType map = this->GetOutput(0);
// typedefs
- typedef itk::ImageRegionIteratorWithIndex<MapType> IteratorType;
- typedef itk::ContinuousIndex<double,MapType::ImageDimension> ContinuousIndexType;
+ typedef itk::ImageRegionIteratorWithIndex<MapType> IteratorType;
+ typedef itk::ContinuousIndex<double, MapType::ImageDimension> ContinuousIndexType;
typedef itk::Statistics::EuclideanDistance<ContinuousIndexType> DistanceType;
typename DistanceType::Pointer distance = DistanceType::New();
// winner index in the map
- IndexType position = map->GetWinner(sample);
+ IndexType position = map->GetWinner(sample);
NeuronType winner = map->GetPixel(position);
// Local neighborhood definition
RegionType localRegion;
- IndexType localIndex = position-radius;
+ IndexType localIndex = position - radius;
SizeType localSize;
- for (unsigned int i=0;i<MapType::ImageDimension;++i)
- {
- localSize[i]= 2*radius[i]+1;
- }
+ for (unsigned int i = 0; i < MapType::ImageDimension; ++i)
+ {
+ localSize[i] = 2 * radius[i] + 1;
+ }
localRegion.SetIndex(localIndex);
localRegion.SetSize(localSize);
- localRegion.Crop( map->GetLargestPossibleRegion() );
- IteratorType it ( map, localRegion );
+ localRegion.Crop(map->GetLargestPossibleRegion());
+ IteratorType it(map, localRegion);
// Walk through the map, and evolve each neuron depending on its
// distance to the winner.
- for (it.GoToBegin();!it.IsAtEnd();++it)
- {
+ for (it.GoToBegin(); !it.IsAtEnd(); ++it)
+ {
NeuronType tempNeuron = it.Get();
- NeuronType newNeuron ( tempNeuron.Size() );
+ NeuronType newNeuron(tempNeuron.Size());
double tempBeta = beta
- / ( 1 +
- distance->Evaluate( ContinuousIndexType(position),
- ContinuousIndexType(it.GetIndex()) ) );
+ / (1 +
+ distance->Evaluate(ContinuousIndexType(position),
+ ContinuousIndexType(it.GetIndex())));
- for (unsigned int i = 0; i < newNeuron.Size();++i)
- {
+ for (unsigned int i = 0; i < newNeuron.Size(); ++i)
+ {
newNeuron[i] = tempNeuron[i]
- +static_cast<typename NeuronType::ValueType>(
- ( sample[i] - tempNeuron[i] ) * tempBeta );
- }
+ + static_cast<typename NeuronType::ValueType>(
+ (sample[i] - tempNeuron[i]) * tempBeta);
+ }
it.Set(newNeuron);
- }
+ }
}
/**
* Step one iteration.
*/
-template < class TListSample, class TMap,
-class TSOMLearningBehaviorFunctor,
-class TSOMNeighborhoodBehaviorFunctor >
+template <class TListSample, class TMap,
+ class TSOMLearningBehaviorFunctor,
+ class TSOMNeighborhoodBehaviorFunctor>
void
-SOM<TListSample,TMap,TSOMLearningBehaviorFunctor,TSOMNeighborhoodBehaviorFunctor>
+SOM<TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor>
::Step(unsigned int currentIteration)
{
// Compute the new learning coefficient
double newBeta = m_BetaFunctor(
- currentIteration, m_NumberOfIterations, m_BetaInit, m_BetaEnd );
+ currentIteration, m_NumberOfIterations, m_BetaInit, m_BetaEnd);
// Compute the new neighborhood size
SizeType newSize = m_NeighborhoodSizeFunctor(
- currentIteration, m_NumberOfIterations, m_NeighborhoodSizeInit );
+ currentIteration, m_NumberOfIterations, m_NeighborhoodSizeInit);
// update the neurons map with each example of the training set.
- otbMsgDebugMacro(<<"Beta: "<<newBeta<<", radius: "<<newSize);
- for ( typename ListSampleType::Iterator it = m_ListSample->Begin();
- it != m_ListSample->End();
- ++it )
- {
- UpdateMap( it.GetMeasurementVector(), newBeta, newSize );
- }
+ otbMsgDebugMacro(<< "Beta: " << newBeta << ", radius: " << newSize);
+ for (typename ListSampleType::Iterator it = m_ListSample->Begin();
+ it != m_ListSample->End();
+ ++it)
+ {
+ UpdateMap(it.GetMeasurementVector(), newBeta, newSize);
+ }
}
/**
* Output information redefinition
*/
-template < class TListSample, class TMap,
-class TSOMLearningBehaviorFunctor,
-class TSOMNeighborhoodBehaviorFunctor >
+template <class TListSample, class TMap,
+ class TSOMLearningBehaviorFunctor,
+ class TSOMNeighborhoodBehaviorFunctor>
void
-SOM<TListSample,TMap,TSOMLearningBehaviorFunctor,TSOMNeighborhoodBehaviorFunctor>
-::GenerateOutputInformation ()
+SOM<TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor>
+::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
this->GetOutput()->SetNumberOfComponentsPerPixel(
- m_ListSample->GetMeasurementVectorSize() );
+ m_ListSample->GetMeasurementVectorSize());
IndexType index;
index.Fill(0);
RegionType region;
region.SetIndex(index);
- region.SetSize( this->GetMapSize() );
- this->GetOutput()->SetRegions( region );
+ region.SetSize(this->GetMapSize());
+ this->GetOutput()->SetRegions(region);
}
/**
* Output redefinition
*/
-template < class TListSample, class TMap,
-class TSOMLearningBehaviorFunctor,
-class TSOMNeighborhoodBehaviorFunctor >
+template <class TListSample, class TMap,
+ class TSOMLearningBehaviorFunctor,
+ class TSOMNeighborhoodBehaviorFunctor>
void
-SOM<TListSample,TMap,TSOMLearningBehaviorFunctor,TSOMNeighborhoodBehaviorFunctor>
+SOM<TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor>
::AllocateOutputs()
{
- if ( this->GetNumberOfOutputs() != 1 )
- itkExceptionMacro( << "Number of output image should be 1" );
+ if (this->GetNumberOfOutputs() != 1) itkExceptionMacro(<< "Number of output image should be 1");
// output neuron map fill
MapPointerType map = this->GetOutput(0);
@@ -194,11 +193,11 @@ SOM<TListSample,TMap,TSOMLearningBehaviorFunctor,TSOMNeighborhoodBehaviorFunctor
/**
* Main computation method
*/
-template < class TListSample, class TMap,
-class TSOMLearningBehaviorFunctor,
-class TSOMNeighborhoodBehaviorFunctor >
+template <class TListSample, class TMap,
+ class TSOMLearningBehaviorFunctor,
+ class TSOMNeighborhoodBehaviorFunctor>
void
-SOM<TListSample,TMap,TSOMLearningBehaviorFunctor,TSOMNeighborhoodBehaviorFunctor>
+SOM<TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor>
::GenerateData(void)
{
this->AllocateOutputs();
@@ -206,58 +205,57 @@ SOM<TListSample,TMap,TSOMLearningBehaviorFunctor,TSOMNeighborhoodBehaviorFunctor
MapPointerType map = this->GetOutput(0);
- if ( m_RandomInit )
- {
+ if (m_RandomInit)
+ {
typedef itk::Statistics::MersenneTwisterRandomVariateGenerator GeneratorType;
- typedef itk::ImageRegionIterator<MapType> IteratorType;
+ typedef itk::ImageRegionIterator<MapType> IteratorType;
GeneratorType::Pointer generator = GeneratorType::New();
generator->Initialize(m_Seed);
- NeuronType neuronInit ( m_ListSample->GetMeasurementVectorSize() );
- IteratorType it ( map, map->GetLargestPossibleRegion() );
+ NeuronType neuronInit(m_ListSample->GetMeasurementVectorSize());
+ IteratorType it(map, map->GetLargestPossibleRegion());
- for ( it.GoToBegin(); !it.IsAtEnd(); ++it )
- {
- for (unsigned int i=0;i< neuronInit.Size();++i)
+ for (it.GoToBegin(); !it.IsAtEnd(); ++it)
{
- neuronInit[i]=static_cast<typename NeuronType::ValueType>(
- generator->GetUniformVariate(static_cast<double>(m_MinWeight),
- static_cast<double>(m_MaxWeight)) );
- }
+ for (unsigned int i = 0; i < neuronInit.Size(); ++i)
+ {
+ neuronInit[i] = static_cast<typename NeuronType::ValueType>(
+ generator->GetUniformVariate(static_cast<double>(m_MinWeight),
+ static_cast<double>(m_MaxWeight)));
+ }
it.Set(neuronInit);
+ }
}
- }
else
- {
- NeuronType neuronInit ( m_ListSample->GetMeasurementVectorSize() );
+ {
+ NeuronType neuronInit(m_ListSample->GetMeasurementVectorSize());
neuronInit.Fill(m_MaxWeight);
map->FillBuffer(neuronInit);
- }
+ }
// Step through the iterations
- for (unsigned int i = 0;i<m_NumberOfIterations;++i)
- {
+ for (unsigned int i = 0; i < m_NumberOfIterations; ++i)
+ {
//otbMsgDebugMacro(<<"Step "<<i+1<<" / "<<m_NumberOfIterations);
- std::cerr << "Step "<< i+1 <<" / "<<m_NumberOfIterations << " \r";
+ std::cerr << "Step " << i + 1 << " / " << m_NumberOfIterations << " \r";
Step(i);
- }
+ }
this->AfterThreadedGenerateData();
}
/**
*PrintSelf method
*/
-template < class TListSample, class TMap,
-class TSOMLearningBehaviorFunctor,
-class TSOMNeighborhoodBehaviorFunctor >
+template <class TListSample, class TMap,
+ class TSOMLearningBehaviorFunctor,
+ class TSOMNeighborhoodBehaviorFunctor>
void
-SOM<TListSample,TMap,TSOMLearningBehaviorFunctor,TSOMNeighborhoodBehaviorFunctor>
+SOM<TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
#endif
-
diff --git a/Code/Learning/otbSOMActivationBuilder.h b/Code/Learning/otbSOMActivationBuilder.h
index bf62edb377..aea26802cc 100644
--- a/Code/Learning/otbSOMActivationBuilder.h
+++ b/Code/Learning/otbSOMActivationBuilder.h
@@ -34,36 +34,36 @@ namespace otb
*/
template <class TListSample, class TInputMap, class TOutputImage>
class ITK_EXPORT SOMActivationBuilder
- : public itk::ImageToImageFilter<TInputMap,TOutputImage>
+ : public itk::ImageToImageFilter<TInputMap, TOutputImage>
{
public:
/** Standard typedefs */
- typedef SOMActivationBuilder Self;
- typedef itk::ImageToImageFilter<TInputMap,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SOMActivationBuilder Self;
+ typedef itk::ImageToImageFilter<TInputMap, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory */
itkNewMacro(Self);
/** Runtime information macro */
- itkTypeMacro(SOMActivationBuilder,ImageToImageFilter);
+ itkTypeMacro(SOMActivationBuilder, ImageToImageFilter);
/** Template related typedefs */
- typedef TListSample ListSampleType;
+ typedef TListSample ListSampleType;
typedef TOutputImage OutputImageType;
- typedef TInputMap InputMapType;
+ typedef TInputMap InputMapType;
typedef typename ListSampleType::Pointer ListSamplePointerType;
typedef typename OutputImageType::Pointer OutputImagePointerType;
- typedef typename InputMapType::Pointer InputMapPointerType;
+ typedef typename InputMapType::Pointer InputMapPointerType;
/** Image Dimension */
- itkStaticConstMacro(ImageDimension,unsigned int, InputMapType::ImageDimension);
+ itkStaticConstMacro(ImageDimension, unsigned int, InputMapType::ImageDimension);
/** ListSample accessor */
- itkSetObjectMacro(ListSample,ListSampleType);
- itkGetObjectMacro(ListSample,ListSampleType);
+ itkSetObjectMacro(ListSample, ListSampleType);
+ itkGetObjectMacro(ListSample, ListSampleType);
protected:
/** Constructor */
@@ -76,8 +76,8 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- SOMActivationBuilder(const Self&); // purposely not implemented
- void operator=(const Self&);// purposely not implemented
+ SOMActivationBuilder(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** ListSample object */
ListSamplePointerType m_ListSample;
};
diff --git a/Code/Learning/otbSOMActivationBuilder.txx b/Code/Learning/otbSOMActivationBuilder.txx
index 13359e0829..8b553fae45 100644
--- a/Code/Learning/otbSOMActivationBuilder.txx
+++ b/Code/Learning/otbSOMActivationBuilder.txx
@@ -27,17 +27,17 @@ namespace otb
* Constructor.
*/
template <class TInputImage, class TInputMap, class TOutputImage>
-SOMActivationBuilder<TInputImage,TInputMap,TOutputImage>
+SOMActivationBuilder<TInputImage, TInputMap, TOutputImage>
::SOMActivationBuilder()
{
this->SetNumberOfRequiredInputs(1);
- this->SetNthOutput(0,OutputImageType::New());
+ this->SetNthOutput(0, OutputImageType::New());
}
/**
* Destructor.
*/
template <class TInputImage, class TInputMap, class TOutputImage>
-SOMActivationBuilder<TInputImage,TInputMap,TOutputImage>
+SOMActivationBuilder<TInputImage, TInputMap, TOutputImage>
::~SOMActivationBuilder()
{}
/**
@@ -45,11 +45,11 @@ SOMActivationBuilder<TInputImage,TInputMap,TOutputImage>
*/
template <class TInputImage, class TInputMap, class TOutputImage>
void
-SOMActivationBuilder<TInputImage,TInputMap,TOutputImage>
+SOMActivationBuilder<TInputImage, TInputMap, TOutputImage>
::GenerateData(void)
{
// Retrieve the inputs and output pointers
- InputMapType * map = const_cast<InputMapType*>(this->GetInput());
+ InputMapType * map = const_cast<InputMapType*>(this->GetInput());
OutputImagePointerType output = this->GetOutput();
// output initialization
@@ -61,28 +61,28 @@ SOMActivationBuilder<TInputImage,TInputMap,TOutputImage>
typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
typename InputMapType::IndexType index;
// Iterators instantiation
- OutputIteratorType outIt(output,output->GetLargestPossibleRegion());
+ OutputIteratorType outIt(output, output->GetLargestPossibleRegion());
// For each vector in the set
for (typename ListSampleType::Iterator it = m_ListSample->Begin();
- it!=m_ListSample->End();++it)
- {
+ it != m_ListSample->End(); ++it)
+ {
// Retrieve the index of the winner
index = map->GetWinner(it.GetMeasurementVector());
// increment the activation map
outIt.SetIndex(index);
- outIt.Set(outIt.Get()+1);
- }
+ outIt.Set(outIt.Get() + 1);
+ }
}
/**
*PrintSelf method
*/
template <class TInputImage, class TInputMap, class TOutputImage>
void
-SOMActivationBuilder<TInputImage,TInputMap,TOutputImage>
+SOMActivationBuilder<TInputImage, TInputMap, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
#endif
diff --git a/Code/Learning/otbSOMClassifier.h b/Code/Learning/otbSOMClassifier.h
index e34ad65d5b..06c0b9b870 100644
--- a/Code/Learning/otbSOMClassifier.h
+++ b/Code/Learning/otbSOMClassifier.h
@@ -38,15 +38,15 @@ namespace otb
* \sa SOM, SOMMap, SOMActivationBuilder.
*/
-template< class TSample, class TSOMMap, class TLabel>
+template<class TSample, class TSOMMap, class TLabel>
class ITK_EXPORT SOMClassifier :
- public itk::ProcessObject
+ public itk::ProcessObject
{
public:
/** Standard class typedef*/
- typedef SOMClassifier Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer< Self > Pointer;
+ typedef SOMClassifier Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Standard macros */
@@ -54,19 +54,19 @@ public:
itkNewMacro(Self);
/** typedefs from TSample object */
- typedef TSample SampleType;
- typedef typename SampleType::Pointer SamplePointerType;
- typedef typename SampleType::MeasurementType MeasurementType;
- typedef typename SampleType::MeasurementVectorType MeasurementVectorType;
+ typedef TSample SampleType;
+ typedef typename SampleType::Pointer SamplePointerType;
+ typedef typename SampleType::MeasurementType MeasurementType;
+ typedef typename SampleType::MeasurementVectorType MeasurementVectorType;
typedef typename SampleType::MeasurementVectorType::ValueType InputPixelType;
/** SOM Map typedefs */
- typedef TSOMMap SOMMapType;
+ typedef TSOMMap SOMMapType;
typedef typename SOMMapType::Pointer SOMMapPointerType;
/** Output typedefs */
typedef itk::Statistics::MembershipSample<SampleType> OutputType;
- typedef typename OutputType::Pointer OutputPointerType;
+ typedef typename OutputType::Pointer OutputPointerType;
/** Label type typedef */
typedef TLabel ClassLabelType;
@@ -74,10 +74,10 @@ public:
/// Accessors
void SetMap(SOMMapType * sommap);
SOMMapType * GetMap(void);
- itkSetObjectMacro(Sample,SampleType);
- itkGetObjectMacro(Sample,SampleType);
- itkSetObjectMacro(Output,OutputType);
- itkGetObjectMacro(Output,OutputType);
+ itkSetObjectMacro(Sample, SampleType);
+ itkGetObjectMacro(Sample, SampleType);
+ itkSetObjectMacro(Output, OutputType);
+ itkGetObjectMacro(Output, OutputType);
protected:
/** Constructor */
@@ -103,5 +103,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Learning/otbSOMClassifier.txx b/Code/Learning/otbSOMClassifier.txx
index 2b971af413..22862bf278 100644
--- a/Code/Learning/otbSOMClassifier.txx
+++ b/Code/Learning/otbSOMClassifier.txx
@@ -26,24 +26,24 @@ namespace otb
/**
* Constructor
*/
-template< class TSample, class TSOMMap, class TLabel >
-SOMClassifier< TSample, TSOMMap, TLabel >
+template<class TSample, class TSOMMap, class TLabel>
+SOMClassifier<TSample, TSOMMap, TLabel>
::SOMClassifier()
{
this->SetNumberOfRequiredInputs(1);
SOMMapPointerType sommap = SOMMapType::New();
- this->SetNthInput(0,sommap.GetPointer());
+ this->SetNthInput(0, sommap.GetPointer());
m_Sample = SampleType::New();
m_Output = OutputType::New();
- this->SetNthOutput(0,sommap.GetPointer());
+ this->SetNthOutput(0, sommap.GetPointer());
}
/**
* SOMMap getter.
*/
-template< class TSample, class TSOMMap, class TLabel >
-typename SOMClassifier< TSample, TSOMMap, TLabel >
+template<class TSample, class TSOMMap, class TLabel>
+typename SOMClassifier<TSample, TSOMMap, TLabel>
::SOMMapType *
-SOMClassifier< TSample, TSOMMap, TLabel >
+SOMClassifier<TSample, TSOMMap, TLabel>
::GetMap(void)
{
return dynamic_cast<SOMMapType *>(this->itk::ProcessObject::GetInput(0));
@@ -51,68 +51,65 @@ SOMClassifier< TSample, TSOMMap, TLabel >
/**
* SOMMap Setter.
*/
-template< class TSample, class TSOMMap, class TLabel >
+template<class TSample, class TSOMMap, class TLabel>
void
-SOMClassifier< TSample, TSOMMap, TLabel >
+SOMClassifier<TSample, TSOMMap, TLabel>
::SetMap(SOMMapType * sommap)
{
- this->itk::ProcessObject::SetNthInput(0,const_cast<SOMMapType *>(sommap));
+ this->itk::ProcessObject::SetNthInput(0, const_cast<SOMMapType *>(sommap));
}
/**
* PrintSelf method
*/
-template< class TSample, class TSOMMap, class TLabel >
+template<class TSample, class TSOMMap, class TLabel>
void
-SOMClassifier< TSample, TSOMMap, TLabel >
+SOMClassifier<TSample, TSOMMap, TLabel>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
/**
* Main computation class.
*/
-template< class TSample, class TSOMMap, class TLabel >
+template<class TSample, class TSOMMap, class TLabel>
void
-SOMClassifier< TSample, TSOMMap, TLabel >
+SOMClassifier<TSample, TSOMMap, TLabel>
::GenerateData()
{
typename OutputType::Pointer outputPtr = this->GetOutput();
outputPtr->SetSample(this->GetSample());
- outputPtr->Resize( this->GetSample()->Size());
+ outputPtr->Resize(this->GetSample()->Size());
typename SOMMapType::SizeType size = this->GetMap()->GetLargestPossibleRegion().GetSize();
- unsigned int numberOfClasses = 1;
- for (unsigned int i=0; i<SOMMapType::ImageDimension;++i)
- {
- numberOfClasses*=size[i];
- }
+ unsigned int numberOfClasses = 1;
+ for (unsigned int i = 0; i < SOMMapType::ImageDimension; ++i)
+ {
+ numberOfClasses *= size[i];
+ }
outputPtr->SetNumberOfClasses(numberOfClasses);
typename TSample::Iterator iter = this->GetSample()->Begin();
typename TSample::Iterator end = this->GetSample()->End();
-
- typename OutputType::ConstIterator iterO = outputPtr->Begin();
- typename OutputType::ConstIterator endO = outputPtr->End();
+ typename OutputType::ConstIterator iterO = outputPtr->Begin();
+ typename OutputType::ConstIterator endO = outputPtr->End();
typename TSample::MeasurementVectorType measurements;
typename SOMMapType::IndexType index;
SOMMapPointerType somMap = this->GetMap();
- otbMsgDebugMacro( << "Starting iterations " );
+ otbMsgDebugMacro(<< "Starting iterations ");
while (iter != end && iterO != endO)
- {
+ {
measurements = iter.GetMeasurementVector();
index = somMap->GetWinner(measurements);
- ClassLabelType classLabel = static_cast<ClassLabelType>((index[1]*size[1])+index[0]);
+ ClassLabelType classLabel = static_cast<ClassLabelType>((index[1] * size[1]) + index[0]);
outputPtr->AddInstance(classLabel, iterO.GetInstanceIdentifier());
++iter;
++iterO;
- }
+ }
}
} // end of namespace otb
#endif
-
-
diff --git a/Code/Learning/otbSOMImageClassificationFilter.h b/Code/Learning/otbSOMImageClassificationFilter.h
index 9caaa444f1..730850d93c 100644
--- a/Code/Learning/otbSOMImageClassificationFilter.h
+++ b/Code/Learning/otbSOMImageClassificationFilter.h
@@ -37,52 +37,52 @@ namespace otb
* \ingroup Streamed
* \ingroup Threaded
*/
-template <class TInputImage, class TOutputImage,class TSOMMap, class TMaskImage = TOutputImage>
+template <class TInputImage, class TOutputImage, class TSOMMap, class TMaskImage = TOutputImage>
class ITK_EXPORT SOMImageClassificationFilter
- : public itk::InPlaceImageFilter<TInputImage,TOutputImage>
+ : public itk::InPlaceImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef SOMImageClassificationFilter Self;
- typedef itk::InPlaceImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SOMImageClassificationFilter Self;
+ typedef itk::InPlaceImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(SOMImageClassificationFilter,InPlaceImageFilter);
+ itkTypeMacro(SOMImageClassificationFilter, InPlaceImageFilter);
typedef TInputImage InputImageType;
typedef typename InputImageType::ConstPointer InputImageConstPointerType;
typedef typename InputImageType::InternalPixelType ValueType;
- typedef TMaskImage MaskImageType;
- typedef typename MaskImageType::ConstPointer MaskImageConstPointerType;
- typedef typename MaskImageType::Pointer MaskImagePointerType;
+ typedef TMaskImage MaskImageType;
+ typedef typename MaskImageType::ConstPointer MaskImageConstPointerType;
+ typedef typename MaskImageType::Pointer MaskImagePointerType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType LabelType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType LabelType;
- typedef TSOMMap SOMMapType;
- typedef typename SOMMapType::Pointer SOMMapPointerType;
- typedef typename SOMMapType::PixelType SampleType;
+ typedef TSOMMap SOMMapType;
+ typedef typename SOMMapType::Pointer SOMMapPointerType;
+ typedef typename SOMMapType::PixelType SampleType;
- typedef itk::Statistics::ListSample<SampleType> ListSampleType;
- typedef typename ListSampleType::Pointer ListSamplePointerType;
- typedef otb::SOMClassifier<ListSampleType,SOMMapType,LabelType> ClassifierType;
- typedef typename ClassifierType::Pointer ClassifierPointerType;
+ typedef itk::Statistics::ListSample<SampleType> ListSampleType;
+ typedef typename ListSampleType::Pointer ListSamplePointerType;
+ typedef otb::SOMClassifier<ListSampleType, SOMMapType, LabelType> ClassifierType;
+ typedef typename ClassifierType::Pointer ClassifierPointerType;
/** Set/Get the svm model */
- itkSetObjectMacro(Map,SOMMapType);
- itkGetObjectMacro(Map,SOMMapType);
+ itkSetObjectMacro(Map, SOMMapType);
+ itkGetObjectMacro(Map, SOMMapType);
/** Set/Get the default label */
- itkSetMacro(DefaultLabel,LabelType);
- itkGetMacro(DefaultLabel,LabelType);
+ itkSetMacro(DefaultLabel, LabelType);
+ itkGetMacro(DefaultLabel, LabelType);
/**
* If set, only pixels within the mask will be classified.
@@ -100,27 +100,26 @@ protected:
/** Constructor */
SOMImageClassificationFilter();
/** Destructor */
- virtual ~SOMImageClassificationFilter() {};
+ virtual ~SOMImageClassificationFilter() {}
/** Threaded generate data */
- virtual void ThreadedGenerateData(const OutputImageRegionType &outputRegionForThread,int threadId);
+ virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
/** Before threaded generate data */
virtual void BeforeThreadedGenerateData();
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- SOMImageClassificationFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SOMImageClassificationFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The SOM model used for classification */
SOMMapPointerType m_Map;
/** Default label for invalid pixels (when using a mask) */
LabelType m_DefaultLabel;
-
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbSOMImageClassificationFilter.txx"
#endif
diff --git a/Code/Learning/otbSOMImageClassificationFilter.txx b/Code/Learning/otbSOMImageClassificationFilter.txx
index 8c547a7b47..f3e11e5536 100644
--- a/Code/Learning/otbSOMImageClassificationFilter.txx
+++ b/Code/Learning/otbSOMImageClassificationFilter.txx
@@ -28,7 +28,7 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage, class TSOMMap, class TMaskImage>
-SOMImageClassificationFilter<TInputImage,TOutputImage,TSOMMap,TMaskImage>
+SOMImageClassificationFilter<TInputImage, TOutputImage, TSOMMap, TMaskImage>
::SOMImageClassificationFilter()
{
this->SetNumberOfInputs(2);
@@ -38,131 +38,131 @@ SOMImageClassificationFilter<TInputImage,TOutputImage,TSOMMap,TMaskImage>
template <class TInputImage, class TOutputImage, class TSOMMap, class TMaskImage>
void
-SOMImageClassificationFilter<TInputImage,TOutputImage,TSOMMap,TMaskImage>
+SOMImageClassificationFilter<TInputImage, TOutputImage, TSOMMap, TMaskImage>
::SetInputMask(const MaskImageType * mask)
{
- this->itk::ProcessObject::SetNthInput(1,const_cast<MaskImageType *>(mask));
+ this->itk::ProcessObject::SetNthInput(1, const_cast<MaskImageType *>(mask));
}
template <class TInputImage, class TOutputImage, class TSOMMap, class TMaskImage>
-const typename SOMImageClassificationFilter<TInputImage,TOutputImage,TSOMMap,TMaskImage>
+const typename SOMImageClassificationFilter<TInputImage, TOutputImage, TSOMMap, TMaskImage>
::MaskImageType *
-SOMImageClassificationFilter<TInputImage,TOutputImage,TSOMMap,TMaskImage>
+SOMImageClassificationFilter<TInputImage, TOutputImage, TSOMMap, TMaskImage>
::GetInputMask()
{
- if (this->GetNumberOfInputs()<2)
- {
+ if (this->GetNumberOfInputs() < 2)
+ {
return 0;
- }
- return static_cast<const MaskImageType *>(this->itk::ProcessObject::GetInput(1));
+ }
+ return static_cast<const MaskImageType *>(this->itk::ProcessObject::GetInput(1));
}
template <class TInputImage, class TOutputImage, class TSOMMap, class TMaskImage>
void
-SOMImageClassificationFilter<TInputImage,TOutputImage,TSOMMap,TMaskImage>
+SOMImageClassificationFilter<TInputImage, TOutputImage, TSOMMap, TMaskImage>
::BeforeThreadedGenerateData()
{
if (!m_Map)
- {
- itkGenericExceptionMacro(<<"No model for classification");
- }
+ {
+ itkGenericExceptionMacro(<< "No model for classification");
+ }
}
template <class TInputImage, class TOutputImage, class TSOMMap, class TMaskImage>
void
-SOMImageClassificationFilter<TInputImage,TOutputImage,TSOMMap,TMaskImage>
-::ThreadedGenerateData(const OutputImageRegionType &outputRegionForThread, int threadId)
+SOMImageClassificationFilter<TInputImage, TOutputImage, TSOMMap, TMaskImage>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
InputImageConstPointerType inputPtr = this->GetInput();
- MaskImageConstPointerType inputMaskPtr = this->GetInputMask();
+ MaskImageConstPointerType inputMaskPtr = this->GetInputMask();
OutputImagePointerType outputPtr = this->GetOutput();
typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
- typedef itk::ImageRegionConstIterator<MaskImageType> MaskIteratorType;
- typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
+ typedef itk::ImageRegionConstIterator<MaskImageType> MaskIteratorType;
+ typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
ListSamplePointerType listSample = ListSampleType::New();
- InputIteratorType inIt(inputPtr,outputRegionForThread);
+ InputIteratorType inIt(inputPtr, outputRegionForThread);
MaskIteratorType maskIt;
if (inputMaskPtr)
- {
- maskIt = MaskIteratorType(inputMaskPtr,outputRegionForThread);
+ {
+ maskIt = MaskIteratorType(inputMaskPtr, outputRegionForThread);
maskIt.GoToBegin();
- }
+ }
unsigned int maxDimension = m_Map->GetNumberOfComponentsPerPixel();
unsigned int sampleSize = std::min(inputPtr->GetNumberOfComponentsPerPixel(),
maxDimension);
bool validPoint = true;
- for (inIt.GoToBegin();!inIt.IsAtEnd();++inIt)
- {
- if (inputMaskPtr)
+ for (inIt.GoToBegin(); !inIt.IsAtEnd(); ++inIt)
{
- validPoint = maskIt.Get()>0;
+ if (inputMaskPtr)
+ {
+ validPoint = maskIt.Get() > 0;
++maskIt;
- }
+ }
if (validPoint)
- {
+ {
SampleType sample;
sample.SetSize(sampleSize);
sample.Fill(itk::NumericTraits<ValueType>::ZeroValue());
- for (unsigned int i=0;i<sampleSize;++i)
- {
- sample[i]=inIt.Get()[i];
- }
+ for (unsigned int i = 0; i < sampleSize; ++i)
+ {
+ sample[i] = inIt.Get()[i];
+ }
listSample->PushBack(sample);
+ }
}
- }
- ClassifierPointerType classifier =ClassifierType::New();
+ ClassifierPointerType classifier = ClassifierType::New();
classifier->SetMap(m_Map);
classifier->SetSample(listSample);
classifier->Update();
- typename ClassifierType::OutputType::Pointer membershipSample = classifier->GetOutput();
+ typename ClassifierType::OutputType::Pointer membershipSample = classifier->GetOutput();
typename ClassifierType::OutputType::ConstIterator sampleIter = membershipSample->Begin();
typename ClassifierType::OutputType::ConstIterator sampleLast = membershipSample->End();
- OutputIteratorType outIt(outputPtr,outputRegionForThread);
+ OutputIteratorType outIt(outputPtr, outputRegionForThread);
outIt.GoToBegin();
- while (!outIt.IsAtEnd()&&(sampleIter!=sampleLast))
- {
+ while (!outIt.IsAtEnd() && (sampleIter != sampleLast))
+ {
outIt.Set(m_DefaultLabel);
++outIt;
- }
+ }
outIt.GoToBegin();
if (inputMaskPtr)
- {
+ {
maskIt.GoToBegin();
- }
+ }
validPoint = true;
- while (!outIt.IsAtEnd()&&(sampleIter!=sampleLast))
- {
- if (inputMaskPtr)
+ while (!outIt.IsAtEnd() && (sampleIter != sampleLast))
{
- validPoint = maskIt.Get()>0;
+ if (inputMaskPtr)
+ {
+ validPoint = maskIt.Get() > 0;
++maskIt;
- }
+ }
if (validPoint)
- {
+ {
outIt.Set(sampleIter.GetClassLabel());
++sampleIter;
- }
+ }
++outIt;
- }
+ }
}
/**
* PrintSelf Method
*/
template <class TInputImage, class TOutputImage, class TSOMMap, class TMaskImage>
void
-SOMImageClassificationFilter<TInputImage,TOutputImage,TSOMMap,TMaskImage>
+SOMImageClassificationFilter<TInputImage, TOutputImage, TSOMMap, TMaskImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/Learning/otbSOMLearningBehaviorFunctor.h b/Code/Learning/otbSOMLearningBehaviorFunctor.h
index 0ee4e9a2d8..0601beb23a 100644
--- a/Code/Learning/otbSOMLearningBehaviorFunctor.h
+++ b/Code/Learning/otbSOMLearningBehaviorFunctor.h
@@ -21,7 +21,6 @@
#ifndef __otbSOMLearningBehaviorFunctor_h
#define __otbSOMLearningBehaviorFunctor_h
-
namespace otb
{
@@ -43,19 +42,19 @@ namespace Functor
*/
class SOMLearningBehaviorFunctor
{
-public :
+public:
/** Empty constructor / descructor */
- CzihoSOMLearningBehaviorFunctor () { }
- virtual ~CzihoSOMLearningBehaviorFunctor() { }
+ CzihoSOMLearningBehaviorFunctor () {}
+ virtual ~CzihoSOMLearningBehaviorFunctor() {}
/** Functor */
- virtual double operator() ( unsigned int currentIteration,
- unsigned int numberOfIterations,
- double betaInit, double betaEnd ) const
+ virtual double operator ()(unsigned int currentIteration,
+ unsigned int numberOfIterations,
+ double betaInit, double betaEnd) const
{
- return betaInit + ( betaEnd - betaInit )
- * static_cast<double>( currentIteration )
- / static_cast<double>( numberOfIterations );
+ return betaInit + (betaEnd - betaInit)
+ * static_cast<double>(currentIteration)
+ / static_cast<double>(numberOfIterations);
}
}; // end of class SOMLearningBehaviorFunctor
@@ -65,5 +64,3 @@ public :
} // end namespace otb
#endif
-
-
diff --git a/Code/Learning/otbSOMMap.h b/Code/Learning/otbSOMMap.h
index 88479d8504..203e4e6d65 100644
--- a/Code/Learning/otbSOMMap.h
+++ b/Code/Learning/otbSOMMap.h
@@ -45,18 +45,18 @@ namespace otb
* \sa SOM
* \sa SOMActivationBuilder
*/
-template <class TNeuron=itk::VariableLengthVector<double>,
-class TDistance=itk::Statistics::EuclideanDistance<TNeuron>,
-unsigned int VMapDimension=2>
+template <class TNeuron = itk::VariableLengthVector<double>,
+ class TDistance = itk::Statistics::EuclideanDistance<TNeuron>,
+ unsigned int VMapDimension = 2>
class ITK_EXPORT SOMMap
- : public otb::VectorImage<typename TNeuron::ComponentType,VMapDimension>
+ : public otb::VectorImage<typename TNeuron::ComponentType, VMapDimension>
{
public:
/** Standard typedefs */
- typedef SOMMap Self;
- typedef otb::VectorImage<typename TNeuron::ComponentType,VMapDimension> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SOMMap Self;
+ typedef otb::VectorImage<typename TNeuron::ComponentType, VMapDimension> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
@@ -67,17 +67,17 @@ public:
* */
/** Template parameters related typedefs */
- typedef TNeuron NeuronType;
- typedef TDistance DistanceType;
+ typedef TNeuron NeuronType;
+ typedef TDistance DistanceType;
typedef typename DistanceType::Pointer DistancePointerType;
/** Superclass related typedefs */
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::SizeType SizeType;
typedef typename Superclass::DirectionType DirectionType;
- typedef typename Superclass::RegionType RegionType;
- typedef typename Superclass::SpacingType SpacingType;
- typedef typename Superclass::PointType PointType;
+ typedef typename Superclass::RegionType RegionType;
+ typedef typename Superclass::SpacingType SpacingType;
+ typedef typename Superclass::PointType PointType;
/**
* Get The index of the winning neuron for a sample.
* \param sample the sample.
@@ -94,8 +94,8 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- SOMMap(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ SOMMap(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
};
} // end namespace otb
diff --git a/Code/Learning/otbSOMMap.txx b/Code/Learning/otbSOMMap.txx
index b973588d9c..305f88cae1 100644
--- a/Code/Learning/otbSOMMap.txx
+++ b/Code/Learning/otbSOMMap.txx
@@ -28,15 +28,15 @@ namespace otb
/**
* Constructor
*/
-template <class TNeuron, class TDistance,unsigned int VMapDimension>
-SOMMap<TNeuron,TDistance,VMapDimension>
+template <class TNeuron, class TDistance, unsigned int VMapDimension>
+SOMMap<TNeuron, TDistance, VMapDimension>
::SOMMap()
{}
/**
* Destructor
*/
-template <class TNeuron, class TDistance,unsigned int VMapDimension>
-SOMMap<TNeuron,TDistance,VMapDimension>
+template <class TNeuron, class TDistance, unsigned int VMapDimension>
+SOMMap<TNeuron, TDistance, VMapDimension>
::~SOMMap()
{}
/**
@@ -44,10 +44,10 @@ SOMMap<TNeuron,TDistance,VMapDimension>
* \param the sample.
* \return The index of the winning neuron.
*/
-template <class TNeuron,class TDistance, unsigned int VMapDimension>
-typename SOMMap<TNeuron,TDistance,VMapDimension>
-:: IndexType
-SOMMap<TNeuron,TDistance,VMapDimension>
+template <class TNeuron, class TDistance, unsigned int VMapDimension>
+typename SOMMap<TNeuron, TDistance, VMapDimension>
+::IndexType
+SOMMap<TNeuron, TDistance, VMapDimension>
::GetWinner(const NeuronType& sample)
{
// Some typedefs
@@ -57,33 +57,33 @@ SOMMap<TNeuron,TDistance,VMapDimension>
DistancePointerType activation = DistanceType::New();
// Define the iterator used to walk through the map
- IteratorType it(this,this->GetLargestPossibleRegion());
+ IteratorType it(this, this->GetLargestPossibleRegion());
it.GoToBegin();
// Define the minimum distance and position
IndexType minPos = it.GetIndex();
- double minDistance = activation->Evaluate(sample,it.Get());
+ double minDistance = activation->Evaluate(sample, it.Get());
// Iterate through the map to get the minimum distance position
- for (;!it.IsAtEnd();++it)
- {
- double tempDistance = activation->Evaluate(sample,it.Get());
- if (tempDistance<=minDistance)
+ for (; !it.IsAtEnd(); ++it)
{
+ double tempDistance = activation->Evaluate(sample, it.Get());
+ if (tempDistance <= minDistance)
+ {
minDistance = tempDistance;
minPos = it.GetIndex();
+ }
}
- }
// Return the index of the winner
return minPos;
}
-template <class TNeuron, class TDistance,unsigned int VMapDimension>
+template <class TNeuron, class TDistance, unsigned int VMapDimension>
void
-SOMMap<TNeuron,TDistance,VMapDimension>
-::PrintSelf( std::ostream& os,itk::Indent indent ) const
+SOMMap<TNeuron, TDistance, VMapDimension>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
#endif
diff --git a/Code/Learning/otbSOMWithMissingValue.h b/Code/Learning/otbSOMWithMissingValue.h
index 5e045f5970..356294f0de 100644
--- a/Code/Learning/otbSOMWithMissingValue.h
+++ b/Code/Learning/otbSOMWithMissingValue.h
@@ -40,69 +40,78 @@ namespace otb
* \sa PeriodicSOM
* \sa EuclideanDistanceWithMissingValue
*/
-template < class TListSample, class TMap,
- class TSOMLearningBehaviorFunctor = Functor::CzihoSOMLearningBehaviorFunctor,
- class TSOMNeighborhoodBehaviorFunctor = Functor::CzihoSOMNeighborhoodBehaviorFunctor >
+template <class TListSample, class TMap,
+ class TSOMLearningBehaviorFunctor = Functor::CzihoSOMLearningBehaviorFunctor,
+ class TSOMNeighborhoodBehaviorFunctor = Functor::CzihoSOMNeighborhoodBehaviorFunctor>
class ITK_EXPORT SOMWithMissingValue
-: public PeriodicSOM< TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor >
+ : public PeriodicSOM<TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor>
{
- public:
+public:
/** Standard typedefs */
typedef SOMWithMissingValue Self;
- typedef PeriodicSOM< TListSample, TMap,
- TSOMLearningBehaviorFunctor,
- TSOMNeighborhoodBehaviorFunctor > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef PeriodicSOM<TListSample, TMap,
+ TSOMLearningBehaviorFunctor,
+ TSOMNeighborhoodBehaviorFunctor> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
- typedef TListSample ListSampleType;
+ typedef TListSample ListSampleType;
typedef typename ListSampleType::Pointer ListSamplePointerType;
- typedef TMap MapType;
- typedef typename MapType::PixelType NeuronType;
- typedef typename NeuronType::ValueType ValueType;
- typedef typename MapType::IndexType IndexType;
- typedef typename MapType::SizeType SizeType;
- typedef typename MapType::RegionType RegionType;
- typedef typename MapType::Pointer MapPointerType;
- typedef typename MapType::DistanceType DistanceType;
+ typedef TMap MapType;
+ typedef typename MapType::PixelType NeuronType;
+ typedef typename NeuronType::ValueType ValueType;
+ typedef typename MapType::IndexType IndexType;
+ typedef typename MapType::SizeType SizeType;
+ typedef typename MapType::RegionType RegionType;
+ typedef typename MapType::Pointer MapPointerType;
+ typedef typename MapType::DistanceType DistanceType;
typedef typename MapType::DistancePointerType DistancePointerType;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Runtime informations macro */
- itkTypeMacro(SOMWithMissingValue,PeriodicSOM);
+ itkTypeMacro(SOMWithMissingValue, PeriodicSOM);
- protected:
+protected:
/** Constructor */
- SOMWithMissingValue () { }
+ SOMWithMissingValue () {}
/** Destructor */
- virtual ~SOMWithMissingValue() { }
+ virtual ~SOMWithMissingValue() {}
/** Output information redefinition */
- virtual void GenerateOutputInformation () {
- Superclass::GenerateOutputInformation (); }
+ virtual void GenerateOutputInformation()
+ {
+ Superclass::GenerateOutputInformation ();
+ }
/** Output allocation redefinition */
- virtual void AllocateOutputs() {
- Superclass::AllocateOutputs(); }
+ virtual void AllocateOutputs()
+ {
+ Superclass::AllocateOutputs();
+ }
/** Main computation method */
- virtual void GenerateData(void) {
- Superclass::GenerateData(); }
+ virtual void GenerateData(void)
+ {
+ Superclass::GenerateData();
+ }
/**
* Update the output map with a new sample, depending on the availability of the data
*/
virtual void UpdateMap(const NeuronType& sample, double beta, SizeType& radius);
-
+
/** Step one iteration. */
- virtual void Step(unsigned int currentIteration) {
- Superclass::Step( currentIteration ); }
+ virtual void Step(unsigned int currentIteration)
+ {
+ Superclass::Step(currentIteration);
+ }
/** PrintSelf method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const {
- Superclass::PrintSelf(os,indent); }
-
- private:
- SOMWithMissingValue ( const Self & ); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void PrintSelf(std::ostream& os, itk::Indent indent) const
+ {
+ Superclass::PrintSelf(os, indent);
+ }
+private:
+ SOMWithMissingValue (const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
}; // end of class
@@ -112,7 +121,4 @@ class ITK_EXPORT SOMWithMissingValue
#include "otbSOMWithMissingValue.txx"
#endif
-
#endif
-
-
diff --git a/Code/Learning/otbSOMWithMissingValue.txx b/Code/Learning/otbSOMWithMissingValue.txx
index 4faef36415..8c06849743 100644
--- a/Code/Learning/otbSOMWithMissingValue.txx
+++ b/Code/Learning/otbSOMWithMissingValue.txx
@@ -39,72 +39,70 @@ namespace otb
* \param beta The learning coefficient,
* \param radius The radius of the nieghbourhood.
*/
-template < class TListSample, class TMap,
- class TSOMLearningBehaviorFunctor,
- class TSOMNeighborhoodBehaviorFunctor >
+template <class TListSample, class TMap,
+ class TSOMLearningBehaviorFunctor,
+ class TSOMNeighborhoodBehaviorFunctor>
void
-SOMWithMissingValue< TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor >
-::UpdateMap( const NeuronType& sample, double beta, SizeType& radius )
+SOMWithMissingValue<TListSample, TMap, TSOMLearningBehaviorFunctor, TSOMNeighborhoodBehaviorFunctor>
+::UpdateMap(const NeuronType& sample, double beta, SizeType& radius)
{
// output map pointer
MapPointerType map = this->GetOutput(0);
// winner index in the map
- IndexType position = map->GetWinner(sample);
+ IndexType position = map->GetWinner(sample);
NeuronType winner = map->GetPixel(position);
// Local neighborhood definition
- typedef typename MapType::Superclass ImageMapType;
- typedef itk::NeighborhoodIterator< ImageMapType > NeighborhoodIteratorType;
+ typedef typename MapType::Superclass ImageMapType;
+ typedef itk::NeighborhoodIterator<ImageMapType> NeighborhoodIteratorType;
typename MapType::RegionType mapRegion = map->GetLargestPossibleRegion();
- NeighborhoodIteratorType it ( radius, map, mapRegion );
+ NeighborhoodIteratorType it(radius, map, mapRegion);
// Here, the periodic update is achieved 'by hand' since
// PeriodicBoundaryCondition does not allow to modifiy
// VectorImage contents
- SizeType mapSize = mapRegion.GetSize();
+ SizeType mapSize = mapRegion.GetSize();
IndexType positionToUpdate;
// Iterate over the neighborhood ot the winner neuron
- it.SetLocation( position );
+ it.SetLocation(position);
- for (unsigned int i = 0; i < it.Size(); i++ )
- {
+ for (unsigned int i = 0; i < it.Size(); i++)
+ {
typename NeighborhoodIteratorType::OffsetType offset = it.GetOffset(i);
// The neighborhood is of elliptic shape
- double theDistance = itk::NumericTraits< double >::Zero;
- for (int j = 0; j < MapType::ImageDimension; j++ )
- theDistance += pow( static_cast<double>( offset[j] ), 2.0 )
- / pow( static_cast<double>( radius[j] ), 2.0 );
+ double theDistance = itk::NumericTraits<double>::Zero;
+ for (int j = 0; j < MapType::ImageDimension; j++)
+ theDistance += pow(static_cast<double>(offset[j]), 2.0)
+ / pow(static_cast<double>(radius[j]), 2.0);
- if ( theDistance <= 1.0 )
- {
- for (int j = 0; j < MapType::ImageDimension; j++ )
+ if (theDistance <= 1.0)
{
+ for (int j = 0; j < MapType::ImageDimension; j++)
+ {
int pos = offset[j] + position[j];
- positionToUpdate[j] = ( pos >= 0 ) ?
- pos % mapSize[j] :
- ( mapSize[j] - ( (-pos) % mapSize[j] ) ) % mapSize[j];
- }
+ positionToUpdate[j] = (pos >= 0) ?
+ pos % mapSize[j] :
+ (mapSize[j] - ((-pos) % mapSize[j])) % mapSize[j];
+ }
NeuronType tempNeuron = it.GetPixel(i);
- NeuronType newNeuron ( tempNeuron );
+ NeuronType newNeuron(tempNeuron);
- double tempBeta = beta / ( 1.0 + theDistance );
- for(unsigned int j = 0; j < newNeuron.Size(); j++ )
- {
- if ( !DistanceType::IsMissingValue( sample[j] ) )
+ double tempBeta = beta / (1.0 + theDistance);
+ for (unsigned int j = 0; j < newNeuron.Size(); j++)
+ {
+ if (!DistanceType::IsMissingValue(sample[j]))
newNeuron[j] += static_cast<typename NeuronType::ValueType>(
- ( sample[j] - tempNeuron[j] ) * tempBeta );
+ (sample[j] - tempNeuron[j]) * tempBeta);
+ }
+ map->SetPixel(positionToUpdate, newNeuron);
}
- map->SetPixel(positionToUpdate,newNeuron);
}
- }
}
} // end iof namespace otb
#endif
-
-
diff --git a/Code/Learning/otbSOMbasedImageFilter.h b/Code/Learning/otbSOMbasedImageFilter.h
index b4f3b3713c..6fe2648d71 100644
--- a/Code/Learning/otbSOMbasedImageFilter.h
+++ b/Code/Learning/otbSOMbasedImageFilter.h
@@ -28,53 +28,53 @@ namespace otb {
namespace Functor {
- /** \class SOMbasedImageFilterFunctor
- * \brief This class implements the functor that perform substitution between
- * input image pixels and the corresponding winning neurons of a Kohonen map.
- *
- * On the contrary to \doxygen{otb}{SOMClassifier}, it does not yield labels but the
- * value of the winning neurons. Also, it is threaded...
- */
- template < class TInput, class TOutput, class TDistanceMetric, class TMap >
- class ITK_EXPORT SOMbasedImageFilterFunctor
- {
- public:
- /** Standard typedefs */
- typedef SOMbasedImageFilterFunctor Self;
- typedef TMap MapType;
- typedef typename MapType::Pointer MapPointerType;
- typedef typename MapType::IndexType IndexType;
- typedef typename MapType::PixelType NeuronType;
-
- typedef TDistanceMetric DistanceType;
- typedef typename DistanceType::Pointer DistancePointerType;
-
- /** Standard Constructor */
- SOMbasedImageFilterFunctor () { }
- virtual ~SOMbasedImageFilterFunctor () { }
-
- /** Functor */
- TOutput operator() ( const TInput & input );
-
- /** Get/Set the Map */
- MapType * GetMap () const { return this->m_Map; }
- void SetMap ( const MapType * theMap );
-
- /** Get the DistanceMetric */
- DistanceType * GetDistance () { return this->m_Distance; }
-
- protected:
- /** GetWinner redefinition by using its own TDistanceMetric that
- * could be different from the one of the SOM map */
- IndexType GetWinner ( const NeuronType & sample );
-
- MapPointerType m_Map;
- DistancePointerType m_Distance;
-
- private:
- SOMbasedImageFilterFunctor ( const Self & ); // not implemented
- void operator= ( const Self & ); // not implemented
- };
+/** \class SOMbasedImageFilterFunctor
+ * \brief This class implements the functor that perform substitution between
+ * input image pixels and the corresponding winning neurons of a Kohonen map.
+ *
+ * On the contrary to \doxygen{otb}{SOMClassifier}, it does not yield labels but the
+ * value of the winning neurons. Also, it is threaded...
+ */
+template <class TInput, class TOutput, class TDistanceMetric, class TMap>
+class ITK_EXPORT SOMbasedImageFilterFunctor
+{
+public:
+ /** Standard typedefs */
+ typedef SOMbasedImageFilterFunctor Self;
+ typedef TMap MapType;
+ typedef typename MapType::Pointer MapPointerType;
+ typedef typename MapType::IndexType IndexType;
+ typedef typename MapType::PixelType NeuronType;
+
+ typedef TDistanceMetric DistanceType;
+ typedef typename DistanceType::Pointer DistancePointerType;
+
+ /** Standard Constructor */
+ SOMbasedImageFilterFunctor () {}
+ virtual ~SOMbasedImageFilterFunctor () {}
+
+ /** Functor */
+ TOutput operator ()(const TInput& input);
+
+ /** Get/Set the Map */
+ MapType * GetMap() const { return this->m_Map; }
+ void SetMap(const MapType * theMap);
+
+ /** Get the DistanceMetric */
+ DistanceType * GetDistance() { return this->m_Distance; }
+
+protected:
+ /** GetWinner redefinition by using its own TDistanceMetric that
+ * could be different from the one of the SOM map */
+ IndexType GetWinner(const NeuronType& sample);
+
+ MapPointerType m_Map;
+ DistancePointerType m_Distance;
+
+private:
+ SOMbasedImageFilterFunctor (const Self &); // not implemented
+ void operator =(const Self&); // not implemented
+};
} // end of namespace Functor
@@ -94,63 +94,62 @@ namespace Functor {
* \ingroup Streamed
* \sa EuclideanDistanceWithMissingValue
*/
-template < class TInputImage, class TOutputImage,
- class TDistanceMetric, class TMap >
+template <class TInputImage, class TOutputImage,
+ class TDistanceMetric, class TMap>
class ITK_EXPORT SOMbasedImageFilter
- : public itk::UnaryFunctorImageFilter< TInputImage, TOutputImage,
- Functor::SOMbasedImageFilterFunctor< typename TInputImage::PixelType,
- typename TOutputImage::PixelType,
- TDistanceMetric, TMap > >
+ : public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage,
+ Functor::SOMbasedImageFilterFunctor<typename TInputImage::PixelType,
+ typename TOutputImage::PixelType,
+ TDistanceMetric, TMap> >
{
- public:
+public:
/** Standard class typedefs. */
typedef SOMbasedImageFilter Self;
- typedef typename itk::UnaryFunctorImageFilter< TInputImage, TOutputImage,
- Functor::SOMbasedImageFilterFunctor<
- typename TInputImage::PixelType,
- typename TOutputImage::PixelType,
- TDistanceMetric, TMap > > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef typename itk::UnaryFunctorImageFilter<TInputImage, TOutputImage,
+ Functor::SOMbasedImageFilterFunctor<
+ typename TInputImage::PixelType,
+ typename TOutputImage::PixelType,
+ TDistanceMetric, TMap> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( SOMbasedImageFilter, UnaryFunctorImageFilter );
+ itkTypeMacro(SOMbasedImageFilter, UnaryFunctorImageFilter);
/** Some convenient typedefs. */
- typedef TDistanceMetric DistanceMetricType;
+ typedef TDistanceMetric DistanceMetricType;
typedef typename DistanceMetricType::Pointer DistanceMetricPointerType;
- typedef TMap MapType;
+ typedef TMap MapType;
typedef typename MapType::Pointer MapPointerType;
typedef Functor::SOMbasedImageFilterFunctor<
- typename TInputImage::PixelType,
- typename TOutputImage::PixelType,
- TDistanceMetric, TMap > FunctorType;
+ typename TInputImage::PixelType,
+ typename TOutputImage::PixelType,
+ TDistanceMetric, TMap> FunctorType;
/** Vectors that hold the training area */
typedef typename TInputImage::PixelType MeasurementType;
/** Set the SOM map (or VectorImage) */
- void SetMap ( const MapType * theMap );
+ void SetMap(const MapType * theMap);
- protected:
+protected:
// throw the Map to the functor
virtual void BeforeThreadedGenerateData(void);
SOMbasedImageFilter ();
- virtual ~SOMbasedImageFilter () { }
+ virtual ~SOMbasedImageFilter () {}
- private :
- SOMbasedImageFilter ( const Self & );
- void operator=(const Self&); //purposely not implemented
+private:
+ SOMbasedImageFilter (const Self &);
+ void operator =(const Self&); //purposely not implemented
MapPointerType m_Map;
-
}; // end of class SOMbasedImageFilter
} // end of namespace otb
@@ -160,5 +159,3 @@ class ITK_EXPORT SOMbasedImageFilter
#endif
#endif
-
-
diff --git a/Code/Learning/otbSOMbasedImageFilter.txx b/Code/Learning/otbSOMbasedImageFilter.txx
index 4c01f4097e..a5f9b4639c 100644
--- a/Code/Learning/otbSOMbasedImageFilter.txx
+++ b/Code/Learning/otbSOMbasedImageFilter.txx
@@ -27,50 +27,50 @@ namespace otb {
namespace Functor {
-template < class TInput, class TOutput, class TDistanceMetric, class TMap >
+template <class TInput, class TOutput, class TDistanceMetric, class TMap>
TOutput
-SOMbasedImageFilterFunctor< TInput, TOutput, TDistanceMetric, TMap >
-::operator () ( const TInput & input )
-{
- return static_cast<TOutput>( GetMap()->GetPixel( this->GetWinner( input ) ) );
-}
+SOMbasedImageFilterFunctor<TInput, TOutput, TDistanceMetric, TMap>
+::operator() (const TInput &input)
+ {
+ return static_cast<TOutput>(GetMap()->GetPixel(this->GetWinner(input)));
+ }
-template < class TInput, class TOutput, class TDistanceMetric, class TMap >
+template <class TInput, class TOutput, class TDistanceMetric, class TMap>
void
-SOMbasedImageFilterFunctor< TInput, TOutput, TDistanceMetric, TMap >
-::SetMap ( const MapType * theMap )
+SOMbasedImageFilterFunctor<TInput, TOutput, TDistanceMetric, TMap>
+::SetMap(const MapType * theMap)
{
- m_Map = const_cast<MapType *>( theMap );
+ m_Map = const_cast<MapType *>(theMap);
m_Distance = DistanceType::New();
}
-template < class TInput, class TOutput, class TDistanceMetric, class TMap >
-typename SOMbasedImageFilterFunctor< TInput, TOutput, TDistanceMetric, TMap >::IndexType
-SOMbasedImageFilterFunctor< TInput, TOutput, TDistanceMetric, TMap >
-::GetWinner ( const NeuronType & sample )
+template <class TInput, class TOutput, class TDistanceMetric, class TMap>
+typename SOMbasedImageFilterFunctor<TInput, TOutput, TDistanceMetric, TMap>::IndexType
+SOMbasedImageFilterFunctor<TInput, TOutput, TDistanceMetric, TMap>
+::GetWinner(const NeuronType& sample)
{
typedef itk::ImageRegionIteratorWithIndex<MapType> IteratorType;
- IteratorType it ( GetMap(), GetMap()->GetLargestPossibleRegion() );
+ IteratorType it(GetMap(), GetMap()->GetLargestPossibleRegion());
it.GoToBegin();
IndexType minPos = it.GetIndex();
double tempDistance,
- minDistance = GetDistance()->Evaluate( sample, it.Get() );
+ minDistance = GetDistance()->Evaluate(sample, it.Get());
++it;
- while ( !it.IsAtEnd() )
- {
- tempDistance = GetDistance()->Evaluate( sample, it.Get() );
-
- if ( tempDistance < minDistance )
+ while (!it.IsAtEnd())
{
+ tempDistance = GetDistance()->Evaluate(sample, it.Get());
+
+ if (tempDistance < minDistance)
+ {
minDistance = tempDistance;
minPos = it.GetIndex();
- }
+ }
++it;
- }
+ }
return minPos;
}
@@ -80,34 +80,32 @@ SOMbasedImageFilterFunctor< TInput, TOutput, TDistanceMetric, TMap >
/*
* Implementation of the class SOMbasedImageFilter
*/
-template < class TInputImage, class TOutputImage, class TDistanceMetric, class TMap >
-SOMbasedImageFilter< TInputImage, TOutputImage, TDistanceMetric, TMap >
+template <class TInputImage, class TOutputImage, class TDistanceMetric, class TMap>
+SOMbasedImageFilter<TInputImage, TOutputImage, TDistanceMetric, TMap>
::SOMbasedImageFilter ()
{
this->SetNumberOfRequiredInputs(1);
this->InPlaceOff();
}
-template < class TInputImage, class TOutputImage, class TDistanceMetric, class TMap >
+template <class TInputImage, class TOutputImage, class TDistanceMetric, class TMap>
void
-SOMbasedImageFilter< TInputImage, TOutputImage, TDistanceMetric, TMap >
-::SetMap ( const MapType * theMap )
+SOMbasedImageFilter<TInputImage, TOutputImage, TDistanceMetric, TMap>
+::SetMap(const MapType * theMap)
{
- m_Map = const_cast<MapType *>( theMap );
+ m_Map = const_cast<MapType *>(theMap);
this->Modified();
}
-template < class TInputImage, class TOutputImage, class TDistanceMetric, class TMap >
+template <class TInputImage, class TOutputImage, class TDistanceMetric, class TMap>
void
-SOMbasedImageFilter< TInputImage, TOutputImage, TDistanceMetric, TMap >
-::BeforeThreadedGenerateData ()
+SOMbasedImageFilter<TInputImage, TOutputImage, TDistanceMetric, TMap>
+::BeforeThreadedGenerateData()
{
m_Map->Update();
- this->GetFunctor().SetMap( m_Map );
+ this->GetFunctor().SetMap(m_Map);
}
} // end of namespace otb
#endif
-
-
diff --git a/Code/Learning/otbSVMClassifier.h b/Code/Learning/otbSVMClassifier.h
index eae51e0f97..4f1f3c54f6 100644
--- a/Code/Learning/otbSVMClassifier.h
+++ b/Code/Learning/otbSVMClassifier.h
@@ -46,28 +46,28 @@ namespace otb
*
*/
-template< class TSample, class TLabel >
+template<class TSample, class TLabel>
class ITK_EXPORT SVMClassifier :
- public itk::Statistics::SampleClassifier< TSample >
+ public itk::Statistics::SampleClassifier<TSample>
{
public:
/** Standard class typedef*/
- typedef SVMClassifier Self;
- typedef itk::Statistics::SampleClassifier< TSample > Superclass;
- typedef itk::SmartPointer< Self > Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SVMClassifier Self;
+ typedef itk::Statistics::SampleClassifier<TSample> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Standard macros */
itkTypeMacro(SVMClassifier, itk::Statistics::SampleClassifier);
itkNewMacro(Self);
/** Output type for GetClassSample method */
- typedef itk::Statistics::MembershipSample< TSample > OutputType;
+ typedef itk::Statistics::MembershipSample<TSample> OutputType;
/** typedefs from TSample object */
- typedef typename TSample::MeasurementType MeasurementType;
+ typedef typename TSample::MeasurementType MeasurementType;
typedef typename TSample::MeasurementVectorType MeasurementVectorType;
-
+
/** typedefs from Superclass */
typedef typename Superclass::MembershipFunctionPointerVector
MembershipFunctionPointerVector;
@@ -80,11 +80,11 @@ public:
void SetOutput(OutputType* output);
/** Type definitions for the SVM Model. */
- typedef SVMModel<MeasurementType,ClassLabelType> SVMModelType;
- typedef typename SVMModelType::Pointer SVMModelPointer;
+ typedef SVMModel<MeasurementType, ClassLabelType> SVMModelType;
+ typedef typename SVMModelType::Pointer SVMModelPointer;
/** Set the model */
- itkSetObjectMacro(Model,SVMModelType);
+ itkSetObjectMacro(Model, SVMModelType);
/** Get the number of classes. */
itkGetObjectMacro(Model, SVMModelType);
@@ -108,14 +108,10 @@ private:
SVMModelPointer m_Model;
}; // end of class
-
} // end of namespace otb
-
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbSVMClassifier.txx"
#endif
#endif
-
-
diff --git a/Code/Learning/otbSVMClassifier.txx b/Code/Learning/otbSVMClassifier.txx
index f66f58e3c4..b607b44f71 100644
--- a/Code/Learning/otbSVMClassifier.txx
+++ b/Code/Learning/otbSVMClassifier.txx
@@ -24,48 +24,46 @@
namespace otb
{
-template< class TSample, class TLabel >
-SVMClassifier< TSample, TLabel >
+template<class TSample, class TLabel>
+SVMClassifier<TSample, TLabel>
::SVMClassifier()
{
m_Output = OutputType::New();
}
-template< class TSample, class TLabel >
+template<class TSample, class TLabel>
void
-SVMClassifier< TSample, TLabel >
+SVMClassifier<TSample, TLabel>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-template< class TSample, class TLabel >
+template<class TSample, class TLabel>
void
-SVMClassifier< TSample, TLabel >
+SVMClassifier<TSample, TLabel>
::Update()
{
this->GenerateData();
}
-
-template< class TSample, class TLabel >
+template<class TSample, class TLabel>
void
-SVMClassifier< TSample, TLabel >
+SVMClassifier<TSample, TLabel>
::GenerateData()
{
- if(!m_Model)
+ if (!m_Model)
{
itkExceptionMacro("No model, can not do classification.");
}
- if(m_Model->GetNumberOfSupportVectors() == 0)
+ if (m_Model->GetNumberOfSupportVectors() == 0)
{
- itkExceptionMacro(<<"SVM model does not contain any support vector, can not perform classification.");
+ itkExceptionMacro(<< "SVM model does not contain any support vector, can not perform classification.");
}
-
m_Output->SetSample(this->GetSample());
- m_Output->Resize( this->GetSample()->Size() );
+ m_Output->Resize(this->GetSample()->Size());
unsigned int numberOfClasses = this->GetNumberOfClasses();
@@ -74,54 +72,51 @@ SVMClassifier< TSample, TLabel >
this->DoClassification();
}
-template< class TSample, class TLabel >
-typename SVMClassifier< TSample, TLabel >::OutputType*
-SVMClassifier< TSample, TLabel >
+template<class TSample, class TLabel>
+typename SVMClassifier<TSample, TLabel>::OutputType*
+SVMClassifier<TSample, TLabel>
::GetOutput()
{
return m_Output;
}
-template< class TSample, class TLabel >
+template<class TSample, class TLabel>
void
-SVMClassifier< TSample, TLabel >
-::SetOutput( OutputType * output )
+SVMClassifier<TSample, TLabel>
+::SetOutput(OutputType * output)
{
m_Output = output;
}
-
-template< class TSample, class TLabel >
+template<class TSample, class TLabel>
void
-SVMClassifier< TSample, TLabel >
+SVMClassifier<TSample, TLabel>
::DoClassification()
{
itk::TimeProbe probe;
-
typename TSample::ConstIterator iter = this->GetSample()->Begin();
typename TSample::ConstIterator end = this->GetSample()->End();
- typename OutputType::ConstIterator iterO = m_Output->Begin();
- typename OutputType::ConstIterator endO = m_Output->End();
+ typename OutputType::ConstIterator iterO = m_Output->Begin();
+ typename OutputType::ConstIterator endO = m_Output->End();
typename TSample::MeasurementVectorType measurements;
-
int numberOfComponentsPerSample = iter.GetMeasurementVector().Size();
- otbMsgDevMacro( << "Starting iterations " );
+ otbMsgDevMacro(<< "Starting iterations ");
while (iter != end && iterO != endO)
- {
- int i = 0;
- typename SVMModelType::MeasurementType modelMeasurement;
-
+ {
+ int i = 0;
+ typename SVMModelType::MeasurementType modelMeasurement;
+
measurements = iter.GetMeasurementVector();
// otbMsgDevMacro( << "Loop on components " << svm_type );
- for (i=0; i<numberOfComponentsPerSample; ++i)
- {
- modelMeasurement.push_back(measurements[i]);
- }
-
+ for (i = 0; i < numberOfComponentsPerSample; ++i)
+ {
+ modelMeasurement.push_back(measurements[i]);
+ }
+
ClassLabelType classLabel = m_Model->EvaluateLabel(modelMeasurement);
// Julien: Event if we support larger type for class labels,
// the AddInstance method wait for an unsigned int, so we cast it here.
@@ -129,7 +124,7 @@ SVMClassifier< TSample, TLabel >
++iter;
++iterO;
- }
+ }
}
} // end of namespace otb
diff --git a/Code/Learning/otbSVMCrossValidationCostFunction.h b/Code/Learning/otbSVMCrossValidationCostFunction.h
index a3068760a7..ae5b8ef96a 100644
--- a/Code/Learning/otbSVMCrossValidationCostFunction.h
+++ b/Code/Learning/otbSVMCrossValidationCostFunction.h
@@ -60,35 +60,35 @@ public:
itkNewMacro(Self);
/** Type definitions for the SVM Model. */
- typedef TModel SVMModelType;
- typedef typename SVMModelType::Pointer SVMModelPointer;
+ typedef TModel SVMModelType;
+ typedef typename SVMModelType::Pointer SVMModelPointer;
/** Superclass typedefs */
- typedef typename Superclass::MeasureType MeasurementType;
- typedef typename Superclass::ParametersType ParametersType;
- typedef typename Superclass::ParametersValueType ParametersValueType;
- typedef typename Superclass::DerivativeType DerivativeType;
+ typedef typename Superclass::MeasureType MeasurementType;
+ typedef typename Superclass::ParametersType ParametersType;
+ typedef typename Superclass::ParametersValueType ParametersValueType;
+ typedef typename Superclass::DerivativeType DerivativeType;
/** Set the model */
- itkSetObjectMacro(Model,SVMModelType);
- itkGetObjectMacro(Model,SVMModelType);
-
+ itkSetObjectMacro(Model, SVMModelType);
+ itkGetObjectMacro(Model, SVMModelType);
+
/** Set/Get the number of cross validation folders */
- itkSetMacro(NumberOfCrossValidationFolders,unsigned int);
- itkGetMacro(NumberOfCrossValidationFolders,unsigned int);
+ itkSetMacro(NumberOfCrossValidationFolders, unsigned int);
+ itkGetMacro(NumberOfCrossValidationFolders, unsigned int);
/** Set/Get the derivative step */
- itkSetMacro(DerivativeStep,ParametersValueType);
- itkGetMacro(DerivativeStep,ParametersValueType);
+ itkSetMacro(DerivativeStep, ParametersValueType);
+ itkGetMacro(DerivativeStep, ParametersValueType);
/** \return The accuracy value corresponding the parameters */
- virtual MeasureType GetValue(const ParametersType ¶meters) const;
+ virtual MeasureType GetValue(const ParametersType& parameters) const;
/** \return The accuracy derivative corresponding to the parameters */
- virtual void GetDerivative(const ParametersType ¶meters, DerivativeType &derivative) const;
-
+ virtual void GetDerivative(const ParametersType& parameters, DerivativeType& derivative) const;
+
/** \return the number of parameters to optimize */
- virtual unsigned int GetNumberOfParameters (void) const;
+ virtual unsigned int GetNumberOfParameters(void) const;
protected:
/// Constructor
@@ -98,11 +98,11 @@ protected:
/** Update svm parameters struct according to the input parameters
*/
- virtual void UpdateParameters(struct svm_parameter& svm_parameters, const ParametersType & parameters) const;
+ virtual void UpdateParameters(struct svm_parameter& svm_parameters, const ParametersType& parameters) const;
private:
- SVMCrossValidationCostFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SVMCrossValidationCostFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/**Pointer to the SVM model to optimize */
SVMModelPointer m_Model;
@@ -122,4 +122,3 @@ private:
#endif
#endif
-
diff --git a/Code/Learning/otbSVMCrossValidationCostFunction.txx b/Code/Learning/otbSVMCrossValidationCostFunction.txx
index 25ad5bcb07..2f47213337 100644
--- a/Code/Learning/otbSVMCrossValidationCostFunction.txx
+++ b/Code/Learning/otbSVMCrossValidationCostFunction.txx
@@ -22,139 +22,139 @@
namespace otb
{
- template<class TModel>
- SVMCrossValidationCostFunction<TModel>
- ::SVMCrossValidationCostFunction() : m_Model(), m_NumberOfCrossValidationFolders(10), m_DerivativeStep(0.001)
- {}
- template<class TModel>
- SVMCrossValidationCostFunction<TModel>
- ::~SVMCrossValidationCostFunction()
- {}
- template<class TModel>
- typename SVMCrossValidationCostFunction<TModel>
- ::MeasureType
- SVMCrossValidationCostFunction<TModel>
- ::GetValue(const ParametersType ¶meters) const
- {
- // Check the input model
- if(!m_Model)
- {
- itkExceptionMacro(<<"Model is null, can not evaluate accuracy.");
- }
-
- // Check for a positive and non-null C
- if(parameters[0]<=0)
- {
- return 0;
- }
-
- // Updates vm_parameters according to current parameters
- this->UpdateParameters(m_Model->GetParameters(),parameters);
-
- return m_Model->CrossValidation(m_NumberOfCrossValidationFolders);
- }
-
- template<class TModel>
- void
- SVMCrossValidationCostFunction<TModel>
- ::GetDerivative(const ParametersType ¶meters, DerivativeType &derivative) const
- {
- // Set derivative size
- derivative.SetSize(parameters.Size());
- derivative.Fill(itk::NumericTraits<ParametersValueType>::Zero);
-
- for(unsigned int i = 0; i < parameters.Size();++i)
- {
- MeasureType y1, y2;
- ParametersType x1, x2;
-
- x1 = parameters;
- x1[i]-=m_DerivativeStep;
- y1 = this->GetValue(x1);
-
- x2 = parameters;
- x2[i]+=m_DerivativeStep;
- y2 = this->GetValue(x2);
-
- derivative[i]=(y2-y1)/(2*m_DerivativeStep);
- std::cout<<"x1= "<<x1<<" x2= "<<x2<<", y1= "<<y1<<", y2= "<<y2<<std::endl;
- }
- std::cout<<"Position: "<<parameters<<", Value: "<<this->GetValue(parameters)<<", Derivatives: "<<derivative<<std::endl;
- }
-
- template<class TModel>
- unsigned int
- SVMCrossValidationCostFunction<TModel>
- ::GetNumberOfParameters (void) const
- {
- if(!m_Model)
+template<class TModel>
+SVMCrossValidationCostFunction<TModel>
+::SVMCrossValidationCostFunction() : m_Model(), m_NumberOfCrossValidationFolders(10), m_DerivativeStep(0.001)
+{}
+template<class TModel>
+SVMCrossValidationCostFunction<TModel>
+::~SVMCrossValidationCostFunction()
+{}
+template<class TModel>
+typename SVMCrossValidationCostFunction<TModel>
+::MeasureType
+SVMCrossValidationCostFunction<TModel>
+::GetValue(const ParametersType& parameters) const
+{
+ // Check the input model
+ if (!m_Model)
+ {
+ itkExceptionMacro(<< "Model is null, can not evaluate accuracy.");
+ }
+
+ // Check for a positive and non-null C
+ if (parameters[0] <= 0)
+ {
+ return 0;
+ }
+
+ // Updates vm_parameters according to current parameters
+ this->UpdateParameters(m_Model->GetParameters(), parameters);
+
+ return m_Model->CrossValidation(m_NumberOfCrossValidationFolders);
+}
+
+template<class TModel>
+void
+SVMCrossValidationCostFunction<TModel>
+::GetDerivative(const ParametersType& parameters, DerivativeType& derivative) const
+{
+ // Set derivative size
+ derivative.SetSize(parameters.Size());
+ derivative.Fill(itk::NumericTraits<ParametersValueType>::Zero);
+
+ for (unsigned int i = 0; i < parameters.Size(); ++i)
{
- itkExceptionMacro(<<"Model is null, can not evaluate number of parameters.");
+ MeasureType y1, y2;
+ ParametersType x1, x2;
+
+ x1 = parameters;
+ x1[i] -= m_DerivativeStep;
+ y1 = this->GetValue(x1);
+
+ x2 = parameters;
+ x2[i] += m_DerivativeStep;
+ y2 = this->GetValue(x2);
+
+ derivative[i] = (y2 - y1) / (2 * m_DerivativeStep);
+ std::cout << "x1= " << x1 << " x2= " << x2 << ", y1= " << y1 << ", y2= " << y2 << std::endl;
+ }
+ std::cout << "Position: " << parameters << ", Value: " << this->GetValue(parameters) << ", Derivatives: " <<
+ derivative << std::endl;
+}
+
+template<class TModel>
+unsigned int
+SVMCrossValidationCostFunction<TModel>
+::GetNumberOfParameters(void) const
+{
+ if (!m_Model)
+ {
+ itkExceptionMacro(<< "Model is null, can not evaluate number of parameters.");
}
- switch(m_Model->GetKernelType())
+ switch (m_Model->GetKernelType())
{
- case LINEAR:
- // C
- return 1;
+ case LINEAR:
+ // C
+ return 1;
- case POLY:
- // C, gamma and coef0
- return 3;
+ case POLY:
+ // C, gamma and coef0
+ return 3;
- case RBF:
- // C and gamma
- return 2;
+ case RBF:
+ // C and gamma
+ return 2;
- case SIGMOID:
- // C, gamma and coef0
- return 3;
+ case SIGMOID:
+ // C, gamma and coef0
+ return 3;
- default:
- // C
- return 1;
+ default:
+ // C
+ return 1;
}
- }
-
- template<class TModel>
- void
- SVMCrossValidationCostFunction<TModel>
- ::UpdateParameters(struct svm_parameter& svm_parameters, const ParametersType & parameters) const
- {
- switch(m_Model->GetKernelType())
- {
- case LINEAR:
- // C
- svm_parameters.C = parameters[0];
- break;
-
- case POLY:
- // C, gamma and coef0
- svm_parameters.C = parameters[0];
- svm_parameters.gamma = parameters[1];
- svm_parameters.coef0 = parameters[2];
- break;
-
- case RBF:
- // C and gamma
- svm_parameters.C = parameters[0];
- svm_parameters.gamma = parameters[1];
- break;
-
- case SIGMOID:
- // C, gamma and coef0
- svm_parameters.C = parameters[0];
- svm_parameters.gamma = parameters[1];
- svm_parameters.coef0 = parameters[2];
- break;
-
- default:
- svm_parameters.C = parameters[0];
- break;
- }
- }
+}
+
+template<class TModel>
+void
+SVMCrossValidationCostFunction<TModel>
+::UpdateParameters(struct svm_parameter& svm_parameters, const ParametersType& parameters) const
+{
+ switch (m_Model->GetKernelType())
+ {
+ case LINEAR:
+ // C
+ svm_parameters.C = parameters[0];
+ break;
+
+ case POLY:
+ // C, gamma and coef0
+ svm_parameters.C = parameters[0];
+ svm_parameters.gamma = parameters[1];
+ svm_parameters.coef0 = parameters[2];
+ break;
+
+ case RBF:
+ // C and gamma
+ svm_parameters.C = parameters[0];
+ svm_parameters.gamma = parameters[1];
+ break;
+
+ case SIGMOID:
+ // C, gamma and coef0
+ svm_parameters.C = parameters[0];
+ svm_parameters.gamma = parameters[1];
+ svm_parameters.coef0 = parameters[2];
+ break;
+
+ default:
+ svm_parameters.C = parameters[0];
+ break;
+ }
+}
} // namespace otb
#endif
-
diff --git a/Code/Learning/otbSVMImageClassificationFilter.h b/Code/Learning/otbSVMImageClassificationFilter.h
index dd644767cf..156d770045 100644
--- a/Code/Learning/otbSVMImageClassificationFilter.h
+++ b/Code/Learning/otbSVMImageClassificationFilter.h
@@ -37,20 +37,20 @@ namespace otb
*/
template <class TInputImage, class TOutputImage, class TMaskImage = TOutputImage>
class ITK_EXPORT SVMImageClassificationFilter
- : public itk::InPlaceImageFilter<TInputImage,TOutputImage>
+ : public itk::InPlaceImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef SVMImageClassificationFilter Self;
- typedef itk::InPlaceImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SVMImageClassificationFilter Self;
+ typedef itk::InPlaceImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(SVMImageClassificationFilter,InPlaceImageFilter);
+ itkTypeMacro(SVMImageClassificationFilter, InPlaceImageFilter);
/** The max dimension of the sample to classify.
* This filter internally uses itk::FixedArray as input for the classifier,
@@ -61,25 +61,25 @@ public:
typedef typename InputImageType::ConstPointer InputImageConstPointerType;
typedef typename InputImageType::InternalPixelType ValueType;
- typedef TMaskImage MaskImageType;
- typedef typename MaskImageType::ConstPointer MaskImageConstPointerType;
- typedef typename MaskImageType::Pointer MaskImagePointerType;
+ typedef TMaskImage MaskImageType;
+ typedef typename MaskImageType::ConstPointer MaskImageConstPointerType;
+ typedef typename MaskImageType::Pointer MaskImagePointerType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType LabelType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType LabelType;
- typedef SVMModel<ValueType,LabelType> ModelType;
- typedef typename ModelType::Pointer ModelPointerType;
+ typedef SVMModel<ValueType, LabelType> ModelType;
+ typedef typename ModelType::Pointer ModelPointerType;
/** Set/Get the svm model */
- itkSetObjectMacro(Model,ModelType);
- itkGetObjectMacro(Model,ModelType);
+ itkSetObjectMacro(Model, ModelType);
+ itkGetObjectMacro(Model, ModelType);
/** Set/Get the default label */
- itkSetMacro(DefaultLabel,LabelType);
- itkGetMacro(DefaultLabel,LabelType);
+ itkSetMacro(DefaultLabel, LabelType);
+ itkGetMacro(DefaultLabel, LabelType);
/**
* If set, only pixels within the mask will be classified.
@@ -97,27 +97,26 @@ protected:
/** Constructor */
SVMImageClassificationFilter();
/** Destructor */
- virtual ~SVMImageClassificationFilter() {};
+ virtual ~SVMImageClassificationFilter() {}
/** Threaded generate data */
- virtual void ThreadedGenerateData(const OutputImageRegionType &outputRegionForThread,int threadId);
+ virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
/** Before threaded generate data */
virtual void BeforeThreadedGenerateData();
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- SVMImageClassificationFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SVMImageClassificationFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The SVM model used for classification */
ModelPointerType m_Model;
/** Default label for invalid pixels (when using a mask) */
LabelType m_DefaultLabel;
-
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbSVMImageClassificationFilter.txx"
#endif
diff --git a/Code/Learning/otbSVMImageClassificationFilter.txx b/Code/Learning/otbSVMImageClassificationFilter.txx
index d297b83e3d..c6a1d2ddb5 100644
--- a/Code/Learning/otbSVMImageClassificationFilter.txx
+++ b/Code/Learning/otbSVMImageClassificationFilter.txx
@@ -28,7 +28,7 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage, class TMaskImage>
-SVMImageClassificationFilter<TInputImage,TOutputImage,TMaskImage>
+SVMImageClassificationFilter<TInputImage, TOutputImage, TMaskImage>
::SVMImageClassificationFilter()
{
this->SetNumberOfInputs(2);
@@ -38,94 +38,94 @@ SVMImageClassificationFilter<TInputImage,TOutputImage,TMaskImage>
template <class TInputImage, class TOutputImage, class TMaskImage>
void
-SVMImageClassificationFilter<TInputImage,TOutputImage,TMaskImage>
+SVMImageClassificationFilter<TInputImage, TOutputImage, TMaskImage>
::SetInputMask(const MaskImageType * mask)
{
- this->itk::ProcessObject::SetNthInput(1,const_cast<MaskImageType *>(mask));
+ this->itk::ProcessObject::SetNthInput(1, const_cast<MaskImageType *>(mask));
}
template <class TInputImage, class TOutputImage, class TMaskImage>
-const typename SVMImageClassificationFilter<TInputImage,TOutputImage,TMaskImage>
+const typename SVMImageClassificationFilter<TInputImage, TOutputImage, TMaskImage>
::MaskImageType *
-SVMImageClassificationFilter<TInputImage,TOutputImage,TMaskImage>
+SVMImageClassificationFilter<TInputImage, TOutputImage, TMaskImage>
::GetInputMask()
{
- if (this->GetNumberOfInputs()<2)
- {
+ if (this->GetNumberOfInputs() < 2)
+ {
return 0;
- }
- return static_cast<const MaskImageType *>(this->itk::ProcessObject::GetInput(1));
+ }
+ return static_cast<const MaskImageType *>(this->itk::ProcessObject::GetInput(1));
}
template <class TInputImage, class TOutputImage, class TMaskImage>
void
-SVMImageClassificationFilter<TInputImage,TOutputImage,TMaskImage>
+SVMImageClassificationFilter<TInputImage, TOutputImage, TMaskImage>
::BeforeThreadedGenerateData()
{
if (!m_Model)
- {
- itkGenericExceptionMacro(<<"No model for classification");
- }
+ {
+ itkGenericExceptionMacro(<< "No model for classification");
+ }
}
template <class TInputImage, class TOutputImage, class TMaskImage>
void
-SVMImageClassificationFilter<TInputImage,TOutputImage,TMaskImage>
-::ThreadedGenerateData(const OutputImageRegionType &outputRegionForThread, int threadId)
+SVMImageClassificationFilter<TInputImage, TOutputImage, TMaskImage>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
// Get the input pointers
InputImageConstPointerType inputPtr = this->GetInput();
- MaskImageConstPointerType inputMaskPtr = this->GetInputMask();
+ MaskImageConstPointerType inputMaskPtr = this->GetInputMask();
OutputImagePointerType outputPtr = this->GetOutput();
// Progress reporting
- itk::ProgressReporter progress(this,threadId,outputRegionForThread.GetNumberOfPixels());
+ itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
// Define iterators
typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
- typedef itk::ImageRegionConstIterator<MaskImageType> MaskIteratorType;
- typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
+ typedef itk::ImageRegionConstIterator<MaskImageType> MaskIteratorType;
+ typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
- InputIteratorType inIt(inputPtr,outputRegionForThread);
- OutputIteratorType outIt(outputPtr,outputRegionForThread);
+ InputIteratorType inIt(inputPtr, outputRegionForThread);
+ OutputIteratorType outIt(outputPtr, outputRegionForThread);
// Eventually iterate on masks
MaskIteratorType maskIt;
if (inputMaskPtr)
- {
- maskIt = MaskIteratorType(inputMaskPtr,outputRegionForThread);
+ {
+ maskIt = MaskIteratorType(inputMaskPtr, outputRegionForThread);
maskIt.GoToBegin();
- }
+ }
bool validPoint = true;
// Walk the part of the image
- for (inIt.GoToBegin(),outIt.GoToBegin();!inIt.IsAtEnd()&&!outIt.IsAtEnd();++inIt,++outIt)
- {
- // Check pixel validity
- if (inputMaskPtr)
+ for (inIt.GoToBegin(), outIt.GoToBegin(); !inIt.IsAtEnd() && !outIt.IsAtEnd(); ++inIt, ++outIt)
{
- validPoint = maskIt.Get()>0;
- ++maskIt;
- }
- // If point is valid
- if (validPoint)
- {
- // Classifify
- typename ModelType::MeasurementType measure;
- for(unsigned int i = 0; i<inIt.Get().Size();++i)
+ // Check pixel validity
+ if (inputMaskPtr)
{
- measure.push_back(inIt.Get()[i]);
+ validPoint = maskIt.Get() > 0;
+ ++maskIt;
}
- outIt.Set(m_Model->EvaluateLabel(measure));
- }
- else
- {
- // else, set default value
- outIt.Set(m_DefaultLabel);
+ // If point is valid
+ if (validPoint)
+ {
+ // Classifify
+ typename ModelType::MeasurementType measure;
+ for (unsigned int i = 0; i < inIt.Get().Size(); ++i)
+ {
+ measure.push_back(inIt.Get()[i]);
+ }
+ outIt.Set(m_Model->EvaluateLabel(measure));
+ }
+ else
+ {
+ // else, set default value
+ outIt.Set(m_DefaultLabel);
+ }
+ progress.CompletedPixel();
}
- progress.CompletedPixel();
- }
}
/**
@@ -133,7 +133,7 @@ SVMImageClassificationFilter<TInputImage,TOutputImage,TMaskImage>
*/
template <class TInputImage, class TOutputImage, class TMaskImage>
void
-SVMImageClassificationFilter<TInputImage,TOutputImage,TMaskImage>
+SVMImageClassificationFilter<TInputImage, TOutputImage, TMaskImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/Learning/otbSVMImageClassificationWithRuleFilter.h b/Code/Learning/otbSVMImageClassificationWithRuleFilter.h
index 0e9efd7d7c..0bf5c9a900 100644
--- a/Code/Learning/otbSVMImageClassificationWithRuleFilter.h
+++ b/Code/Learning/otbSVMImageClassificationWithRuleFilter.h
@@ -38,23 +38,23 @@ namespace otb {
* \ingroup Streamed
* \ingroup Threaded
*/
-template < class TInputImage, class TOutputImage, class TMaskImage = TOutputImage >
+template <class TInputImage, class TOutputImage, class TMaskImage = TOutputImage>
class ITK_EXPORT SVMImageClassificationWithRuleFilter
- : public SVMImageClassificationFilter< TInputImage, TOutputImage, TMaskImage >
+ : public SVMImageClassificationFilter<TInputImage, TOutputImage, TMaskImage>
{
public:
/** Standard typedefs */
- typedef SVMImageClassificationWithRuleFilter Self;
- typedef SVMImageClassificationFilter< TInputImage,
- TOutputImage, TMaskImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SVMImageClassificationWithRuleFilter Self;
+ typedef SVMImageClassificationFilter<TInputImage,
+ TOutputImage, TMaskImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(SVMImageClassificationWithRuleFilter,SVMImageClassificationFilter);
+ itkTypeMacro(SVMImageClassificationWithRuleFilter, SVMImageClassificationFilter);
typedef typename Superclass::InputImageType InputImageType;
typedef typename Superclass::InputImageConstPointerType InputImageConstPointerType;
@@ -64,51 +64,50 @@ public:
typedef typename Superclass::MaskImageConstPointerType MaskImageConstPointerType;
typedef typename Superclass::MaskImagePointerType MaskImagePointerType;
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
- typedef typename Superclass::OutputImageRegionType OutputImageRegionType;
- typedef typename Superclass::LabelType LabelType;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
+ typedef typename Superclass::OutputImageRegionType OutputImageRegionType;
+ typedef typename Superclass::LabelType LabelType;
- typedef typename Superclass::ModelType ModelType;
- typedef typename Superclass::ModelPointerType ModelPointerType;
- typedef typename ModelType::NodeCacheType NodeCacheType;
- typedef typename ModelType::MeasurementType MeasurementType;
- typedef typename ModelType::DistancesVectorType DistanceValueType;
- typedef typename DistanceValueType::ValueType RuleValueType;
-
- typedef VectorImage< RuleValueType, OutputImageType::ImageDimension >
- OutputRuleImageType;
- typedef typename OutputRuleImageType::Pointer OutputRuleImagePointerType;
- typedef typename OutputRuleImageType::RegionType OutputRuleImageRegionType;
- typedef typename OutputRuleImageType::PixelType RuleType;
+ typedef typename Superclass::ModelType ModelType;
+ typedef typename Superclass::ModelPointerType ModelPointerType;
+ typedef typename ModelType::NodeCacheType NodeCacheType;
+ typedef typename ModelType::MeasurementType MeasurementType;
+ typedef typename ModelType::DistancesVectorType DistanceValueType;
+ typedef typename DistanceValueType::ValueType RuleValueType;
+ typedef VectorImage<RuleValueType, OutputImageType::ImageDimension>
+ OutputRuleImageType;
+ typedef typename OutputRuleImageType::Pointer OutputRuleImagePointerType;
+ typedef typename OutputRuleImageType::RegionType OutputRuleImageRegionType;
+ typedef typename OutputRuleImageType::PixelType RuleType;
/** Access to the Rule image */
- itkGetObjectMacro(OutputRule,OutputRuleImageType);
+ itkGetObjectMacro(OutputRule, OutputRuleImageType);
protected:
/** Constructor */
SVMImageClassificationWithRuleFilter();
/** Destructor */
- virtual ~SVMImageClassificationWithRuleFilter() {};
+ virtual ~SVMImageClassificationWithRuleFilter() {}
/** GenerateOutputInformation
* Set the number of bands of the output rule image.
* Copy informations from the input image if existing.
**/
- virtual void GenerateOutputInformation();
+ virtual void GenerateOutputInformation();
- /** AllocateOutputs
- * Output allocation redefinition for VectorImage (used in TOutputRuleImage)
- **/
- virtual void AllocateOutputs();
+ /** AllocateOutputs
+ * Output allocation redefinition for VectorImage (used in TOutputRuleImage)
+ **/
+ virtual void AllocateOutputs();
/** Threaded generate data */
- virtual void ThreadedGenerateData(const OutputImageRegionType &outputRegionForThread,int threadId);
+ virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
private:
- SVMImageClassificationWithRuleFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SVMImageClassificationWithRuleFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
OutputRuleImagePointerType m_OutputRule;
@@ -120,7 +119,4 @@ private:
#include "otbSVMImageClassificationWithRuleFilter.txx"
#endif
-
#endif
-
-
diff --git a/Code/Learning/otbSVMImageClassificationWithRuleFilter.txx b/Code/Learning/otbSVMImageClassificationWithRuleFilter.txx
index b3d4872ac9..189af9b70d 100644
--- a/Code/Learning/otbSVMImageClassificationWithRuleFilter.txx
+++ b/Code/Learning/otbSVMImageClassificationWithRuleFilter.txx
@@ -26,56 +26,56 @@
namespace otb {
-template < class TInputImage, class TOutputImage, class TMaskImage >
-SVMImageClassificationWithRuleFilter< TInputImage, TOutputImage, TMaskImage >
+template <class TInputImage, class TOutputImage, class TMaskImage>
+SVMImageClassificationWithRuleFilter<TInputImage, TOutputImage, TMaskImage>
::SVMImageClassificationWithRuleFilter()
{
m_OutputRule = OutputRuleImageType::New();
}
-template < class TInputImage, class TOutputImage, class TMaskImage >
+template <class TInputImage, class TOutputImage, class TMaskImage>
void
-SVMImageClassificationWithRuleFilter< TInputImage, TOutputImage, TMaskImage >
-::GenerateOutputInformation ()
+SVMImageClassificationWithRuleFilter<TInputImage, TOutputImage, TMaskImage>
+::GenerateOutputInformation()
{
- Superclass::GenerateOutputInformation();
+ Superclass::GenerateOutputInformation();
- if ( this->GetModel() == NULL )
- {
- itkGenericExceptionMacro(<<"No model for classification");
- }
+ if (this->GetModel() == NULL)
+ {
+ itkGenericExceptionMacro(<< "No model for classification");
+ }
// add output information on the rule image
- this->GetOutputRule()->SetNumberOfComponentsPerPixel(
- this->GetModel()->GetNumberOfClasses() * ( this->GetModel()->GetNumberOfClasses()-1 ) / 2 );
+ this->GetOutputRule()->SetNumberOfComponentsPerPixel(
+ this->GetModel()->GetNumberOfClasses() * (this->GetModel()->GetNumberOfClasses() - 1) / 2);
- this->GetOutputRule()->CopyInformation( this->GetInput() );
- this->GetOutputRule()->SetRegions( this->GetInput()->GetLargestPossibleRegion() );
+ this->GetOutputRule()->CopyInformation(this->GetInput());
+ this->GetOutputRule()->SetRegions(this->GetInput()->GetLargestPossibleRegion());
}
-template < class TInputImage, class TOutputImage, class TMaskImage >
+template <class TInputImage, class TOutputImage, class TMaskImage>
void
-SVMImageClassificationWithRuleFilter< TInputImage, TOutputImage, TMaskImage >
-::AllocateOutputs ()
+SVMImageClassificationWithRuleFilter<TInputImage, TOutputImage, TMaskImage>
+::AllocateOutputs()
{
Superclass::AllocateOutputs();
- if ( this->GetModel() == NULL )
- {
- itkGenericExceptionMacro(<<"No model for classification");
- }
+ if (this->GetModel() == NULL)
+ {
+ itkGenericExceptionMacro(<< "No model for classification");
+ }
// add allocation for the rule image
- OutputRuleImageType * output = this->GetOutputRule();
- output->SetNumberOfComponentsPerPixel(
- this->GetModel()->GetNumberOfClasses() * ( this->GetModel()->GetNumberOfClasses()-1 ) / 2 );
- output->Allocate();
+ OutputRuleImageType * output = this->GetOutputRule();
+ output->SetNumberOfComponentsPerPixel(
+ this->GetModel()->GetNumberOfClasses() * (this->GetModel()->GetNumberOfClasses() - 1) / 2);
+ output->Allocate();
}
-template < class TInputImage, class TOutputImage, class TMaskImage >
+template <class TInputImage, class TOutputImage, class TMaskImage>
void
-SVMImageClassificationWithRuleFilter< TInputImage, TOutputImage, TMaskImage >
-::ThreadedGenerateData ( const OutputImageRegionType &outputRegionForThread, int threadId )
+SVMImageClassificationWithRuleFilter<TInputImage, TOutputImage, TMaskImage>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId)
{
// Get the input pointers
InputImageConstPointerType inputPtr = this->GetInput();
@@ -84,67 +84,65 @@ SVMImageClassificationWithRuleFilter< TInputImage, TOutputImage, TMaskImage >
OutputRuleImagePointerType outputRulePtr = this->GetOutputRule();
// Progress reporting
- itk::ProgressReporter progress(this,threadId,outputRegionForThread.GetNumberOfPixels());
+ itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
// Define iterators
typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
- typedef itk::ImageRegionConstIterator<MaskImageType> MaskIteratorType;
- typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
+ typedef itk::ImageRegionConstIterator<MaskImageType> MaskIteratorType;
+ typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
typedef itk::ImageRegionIterator<OutputRuleImageType> OutputRuleIteratorType;
- InputIteratorType inIt(inputPtr,outputRegionForThread);
- OutputIteratorType outIt(outputPtr,outputRegionForThread);
- OutputRuleIteratorType outRuleIt(outputRulePtr,outputRegionForThread);
+ InputIteratorType inIt(inputPtr, outputRegionForThread);
+ OutputIteratorType outIt(outputPtr, outputRegionForThread);
+ OutputRuleIteratorType outRuleIt(outputRulePtr, outputRegionForThread);
// Eventually iterate on masks
MaskIteratorType maskIt;
if (inputMaskPtr)
- {
- maskIt = MaskIteratorType(inputMaskPtr,outputRegionForThread);
+ {
+ maskIt = MaskIteratorType(inputMaskPtr, outputRegionForThread);
maskIt.GoToBegin();
- }
+ }
bool validPoint = true;
typename ModelType::DistancesVectorType defaultDistancesVector
- ( outputRulePtr->GetNumberOfComponentsPerPixel() );
- defaultDistancesVector.Fill( itk::NumericTraits< RuleValueType >::ZeroValue() );
+ (outputRulePtr->GetNumberOfComponentsPerPixel());
+ defaultDistancesVector.Fill(itk::NumericTraits<RuleValueType>::ZeroValue());
// Walk the part of the images
- for ( inIt.GoToBegin(), outIt.GoToBegin(), outRuleIt.GoToBegin();
- !inIt.IsAtEnd() && !outIt.IsAtEnd() && !outRuleIt.IsAtEnd();
- ++inIt, ++outIt, ++outRuleIt )
- {
+ for (inIt.GoToBegin(), outIt.GoToBegin(), outRuleIt.GoToBegin();
+ !inIt.IsAtEnd() && !outIt.IsAtEnd() && !outRuleIt.IsAtEnd();
+ ++inIt, ++outIt, ++outRuleIt)
+ {
// Check pixel validity
if (inputMaskPtr)
- {
- validPoint = maskIt.Get()>0;
+ {
+ validPoint = maskIt.Get() > 0;
++maskIt;
- }
+ }
// If point is valid
if (validPoint)
- {
+ {
// Classifify
MeasurementType measure;
- for ( unsigned int i = 0; i < inIt.Get().Size(); ++i )
- {
- measure.push_back( inIt.Get()[i] );
- }
- outIt.Set( this->GetModel()->EvaluateLabel(measure) );
+ for (unsigned int i = 0; i < inIt.Get().Size(); ++i)
+ {
+ measure.push_back(inIt.Get()[i]);
+ }
+ outIt.Set(this->GetModel()->EvaluateLabel(measure));
// And get rules
- outRuleIt.Set( this->GetModel()->EvaluateHyperplanesDistances( measure ) );
- }
+ outRuleIt.Set(this->GetModel()->EvaluateHyperplanesDistances(measure));
+ }
else
- {
+ {
// else, set default value
- outIt.Set( this->GetDefaultLabel() );
- outRuleIt.Set( defaultDistancesVector );
- }
+ outIt.Set(this->GetDefaultLabel());
+ outRuleIt.Set(defaultDistancesVector);
+ }
progress.CompletedPixel();
- }
+ }
}
} // end of namespace otb
#endif
-
-
diff --git a/Code/Learning/otbSVMImageModelEstimator.h b/Code/Learning/otbSVMImageModelEstimator.h
index 565ed35dc9..c0f983d583 100644
--- a/Code/Learning/otbSVMImageModelEstimator.h
+++ b/Code/Learning/otbSVMImageModelEstimator.h
@@ -46,18 +46,18 @@ namespace otb
* \ingroup ClassificationFilters
*/
template <class TInputImage, class TTrainingImage>
-class ITK_EXPORT SVMImageModelEstimator:
- public SVMModelEstimator<ITK_TYPENAME TInputImage::InternalPixelType, ITK_TYPENAME TTrainingImage::PixelType>
+class ITK_EXPORT SVMImageModelEstimator :
+ public SVMModelEstimator<ITK_TYPENAME TInputImage::InternalPixelType, ITK_TYPENAME TTrainingImage::PixelType>
{
public:
/** Standard class typedefs. */
- typedef SVMImageModelEstimator Self;
+ typedef SVMImageModelEstimator Self;
typedef SVMModelEstimator<ITK_TYPENAME TInputImage::PixelType::ComponentType,
- ITK_TYPENAME TTrainingImage::PixelType>
+ ITK_TYPENAME TTrainingImage::PixelType>
Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -67,7 +67,7 @@ public:
/** Type definition for the input image. */
/** Type definitions for the training image. */
- typedef typename TInputImage::Pointer InputImagePointer;
+ typedef typename TInputImage::Pointer InputImagePointer;
/** Type definitions for the training image. */
typedef typename TTrainingImage::Pointer TrainingImagePointer;
@@ -82,10 +82,10 @@ public:
/** Type definitions for the iterators for the input and training images. */
typedef
- itk::ImageRegionIterator< TInputImage > InputImageIterator;
+ itk::ImageRegionIterator<TInputImage> InputImageIterator;
typedef
- itk::ImageRegionIterator< TTrainingImage > TrainingImageIterator;
-
+ itk::ImageRegionIterator<TTrainingImage> TrainingImageIterator;
+
/** Set the input image */
void SetInputImage(const TInputImage * inputImage);
@@ -110,8 +110,8 @@ protected:
virtual void PrepareData();
private:
- SVMImageModelEstimator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SVMImageModelEstimator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
}; // class SVMImageModelEstimator
@@ -121,6 +121,4 @@ private:
#include "otbSVMImageModelEstimator.txx"
#endif
-
#endif
-
diff --git a/Code/Learning/otbSVMImageModelEstimator.txx b/Code/Learning/otbSVMImageModelEstimator.txx
index fe406ea4d3..ad2ed43b06 100644
--- a/Code/Learning/otbSVMImageModelEstimator.txx
+++ b/Code/Learning/otbSVMImageModelEstimator.txx
@@ -24,7 +24,6 @@
#include "itkCommand.h"
#include "itkImageRegionConstIterator.h"
-
namespace otb
{
@@ -36,7 +35,7 @@ SVMImageModelEstimator<TInputImage, TTrainingImage>
}
template<class TInputImage,
-class TTrainingImage>
+ class TTrainingImage>
SVMImageModelEstimator<TInputImage, TTrainingImage>
::~SVMImageModelEstimator(void)
{}
@@ -45,12 +44,12 @@ SVMImageModelEstimator<TInputImage, TTrainingImage>
* PrintSelf
*/
template<class TInputImage,
-class TTrainingImage>
+ class TTrainingImage>
void
SVMImageModelEstimator<TInputImage, TTrainingImage>
-::PrintSelf( std::ostream& os, itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
template<class TInputImage, class TTrainingImage>
@@ -58,16 +57,15 @@ void
SVMImageModelEstimator<TInputImage, TTrainingImage>
::SetInputImage(const TInputImage * inputImage)
{
- this->itk::ProcessObject::SetNthInput(0,const_cast<TInputImage*>(inputImage));
+ this->itk::ProcessObject::SetNthInput(0, const_cast<TInputImage*>(inputImage));
}
-
template<class TInputImage, class TTrainingImage>
void
SVMImageModelEstimator<TInputImage, TTrainingImage>
::SetTrainingImage(const TTrainingImage * trainingImage)
{
- this->itk::ProcessObject::SetNthInput(1,const_cast<TTrainingImage*>(trainingImage));
+ this->itk::ProcessObject::SetNthInput(1, const_cast<TTrainingImage*>(trainingImage));
}
template<class TInputImage, class TTrainingImage>
@@ -75,7 +73,7 @@ const TInputImage *
SVMImageModelEstimator<TInputImage, TTrainingImage>
::GetInputImage()
{
- if(this->GetNumberOfInputs()<1)
+ if (this->GetNumberOfInputs() < 1)
{
return 0;
}
@@ -87,7 +85,7 @@ const TTrainingImage *
SVMImageModelEstimator<TInputImage, TTrainingImage>
::GetTrainingImage()
{
- if(this->GetNumberOfInputs()<2)
+ if (this->GetNumberOfInputs() < 2)
{
return 0;
}
@@ -98,34 +96,38 @@ SVMImageModelEstimator<TInputImage, TTrainingImage>
* Generate data (start the model building process)
*/
template<class TInputImage,
-class TTrainingImage>
+ class TTrainingImage>
void
SVMImageModelEstimator<TInputImage, TTrainingImage>
::PrepareData()
{
// Get input and output pointers
- const TInputImage * inputImage = this->GetInputImage();
- const TTrainingImage * trainingImage = this->GetTrainingImage();
+ const TInputImage * inputImage = this->GetInputImage();
+ const TTrainingImage * trainingImage = this->GetTrainingImage();
typename Superclass::ModelType * model = this->GetModel();
// Do some error checking
typename TInputImage::SizeType
- inputImageSize = inputImage->GetBufferedRegion().GetSize();
+ inputImageSize = inputImage->GetBufferedRegion().GetSize();
typename TTrainingImage::SizeType
- trainingImageSize = trainingImage->GetBufferedRegion().GetSize();
+ trainingImageSize = trainingImage->GetBufferedRegion().GetSize();
// Check if size of the two inputs are same
- for ( unsigned int i = 0; i < TInputImage::ImageDimension; ++i)
- {
- if ( inputImageSize[i] != trainingImageSize[i] ) throw itk::ExceptionObject(__FILE__, __LINE__,"Input image size is not the same as the training image size.",ITK_LOCATION);
- }
+ for (unsigned int i = 0; i < TInputImage::ImageDimension; ++i)
+ {
+ if (inputImageSize[i] != trainingImageSize[i]) throw itk::ExceptionObject(
+ __FILE__,
+ __LINE__,
+ "Input image size is not the same as the training image size.",
+ ITK_LOCATION);
+ }
// Declaration of the iterators on the input and training images
- typedef itk::ImageRegionConstIterator< TInputImage > InputIteratorType;
- typedef itk::ImageRegionConstIterator< TTrainingImage > TrainingIteratorType;
+ typedef itk::ImageRegionConstIterator<TInputImage> InputIteratorType;
+ typedef itk::ImageRegionConstIterator<TTrainingImage> TrainingIteratorType;
- InputIteratorType inIt(inputImage,inputImage->GetBufferedRegion());
- TrainingIteratorType trIt(trainingImage,trainingImage->GetBufferedRegion());
+ InputIteratorType inIt(inputImage, inputImage->GetBufferedRegion());
+ TrainingIteratorType trIt(trainingImage, trainingImage->GetBufferedRegion());
inIt.GoToBegin();
trIt.GoToBegin();
@@ -137,21 +139,21 @@ SVMImageModelEstimator<TInputImage, TTrainingImage>
unsigned int numberOfComponents = inIt.Get().Size();
while (!inIt.IsAtEnd() && !trIt.IsAtEnd())
- {
- if (trIt.Get()!=0)
{
- typename Superclass::ModelType::MeasurementType v;
-
- for (unsigned int k=0; k<numberOfComponents; ++k)
+ if (trIt.Get() != 0)
{
- v.push_back(inIt.Get()[k]);
+ typename Superclass::ModelType::MeasurementType v;
+
+ for (unsigned int k = 0; k < numberOfComponents; ++k)
+ {
+ v.push_back(inIt.Get()[k]);
+ }
+
+ model->AddSample(v, trIt.Get());
}
-
- model->AddSample(v,trIt.Get());
- }
++inIt;
++trIt;
- }
+ }
}
-}//End namespace OTB
+} //End namespace OTB
#endif
diff --git a/Code/Learning/otbSVMKernels.h b/Code/Learning/otbSVMKernels.h
index deac7d6c32..48bcafa789 100644
--- a/Code/Learning/otbSVMKernels.h
+++ b/Code/Learning/otbSVMKernels.h
@@ -32,15 +32,15 @@ namespace otb
class CustomKernelFunctor : public GenericKernelFunctorBase
{
public:
- CustomKernelFunctor(): GenericKernelFunctorBase()
+ CustomKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("custom");
- };
- virtual ~CustomKernelFunctor() {};
+ }
+ virtual ~CustomKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& /*param*/) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& /*param*/) const
{
- return ( dot(x, x) - 2.0 * dot( x, y) + dot(y, y) );
+ return (dot(x, x) - 2.0 * dot(x, y) + dot(y, y));
}
};
@@ -50,22 +50,22 @@ public:
class InvMultiQuadricKernelFunctor : public GenericKernelFunctorBase
{
public:
- InvMultiQuadricKernelFunctor(): GenericKernelFunctorBase()
+ InvMultiQuadricKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("invMultiQuadric");
this->SetValue<double>("const_coef", 1);
- };
- virtual ~InvMultiQuadricKernelFunctor() {};
+ }
+ virtual ~InvMultiQuadricKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
{
CustomKernelFunctor custom;
- double mq = this->GetValue<double>("const_coef") + custom(x, y, param );
- if ( mq == 0.0 )
- {
+ double mq = this->GetValue<double>("const_coef") + custom(x, y, param);
+ if (mq == 0.0)
+ {
return itk::NumericTraits<double>::max();
- }
- return 1.0 / sqrt( mq );
+ }
+ return 1.0 / sqrt(mq);
}
};
@@ -75,23 +75,23 @@ public:
class KModKernelFunctor : public GenericKernelFunctorBase
{
public:
- KModKernelFunctor(): GenericKernelFunctorBase()
+ KModKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("KMod");
this->SetValue<double>("const_coef", 1);
- };
- virtual ~KModKernelFunctor() {};
+ }
+ virtual ~KModKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
{
CustomKernelFunctor custom;
- double mq = this->GetValue<double>("const_coef") + custom(x, y, param);
+ double mq = this->GetValue<double>("const_coef") + custom(x, y, param);
- if ( mq == 0.0 )
- {
+ if (mq == 0.0)
+ {
return itk::NumericTraits<double>::max();
- }
- return exp( param.gamma / mq ) - 1.0;
+ }
+ return exp(param.gamma / mq) - 1.0;
}
};
@@ -101,21 +101,21 @@ public:
class SAMKernelFunctor : public GenericKernelFunctorBase
{
public:
- SAMKernelFunctor(): GenericKernelFunctorBase()
+ SAMKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("SAM");
- };
- virtual ~SAMKernelFunctor() {};
+ }
+ virtual ~SAMKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& /*param*/) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& /*param*/) const
{
double den = dot(x, x) * dot(y, y);
- if ( den <= 0. )
- {
+ if (den <= 0.)
+ {
return 0.0;
- }
- double ss = dot( x, y );
- return vcl_acos( ss / vcl_sqrt( den ) );
+ }
+ double ss = dot(x, y);
+ return vcl_acos(ss / vcl_sqrt(den));
}
};
@@ -125,16 +125,16 @@ public:
class RadialSAMKernelFunctor : public GenericKernelFunctorBase
{
public:
- RadialSAMKernelFunctor(): GenericKernelFunctorBase()
+ RadialSAMKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("RadialSAM");
- };
- virtual ~RadialSAMKernelFunctor() {};
+ }
+ virtual ~RadialSAMKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
{
SAMKernelFunctor sam;
- return vcl_exp( - param.gamma * sam( x, y, param ) );
+ return vcl_exp(-param.gamma * sam(x, y, param));
}
};
@@ -144,43 +144,42 @@ public:
class InverseCosSAMKernelFunctor : public GenericKernelFunctorBase
{
public:
- InverseCosSAMKernelFunctor(): GenericKernelFunctorBase()
+ InverseCosSAMKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("InverseCosSAM");
- };
- virtual ~InverseCosSAMKernelFunctor() {};
+ }
+ virtual ~InverseCosSAMKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
{
SAMKernelFunctor sam;
- return 1.0 - vcl_cos( sam( x, y, param ) );
+ return 1.0 - vcl_cos(sam(x, y, param));
}
};
-
/** \class InvMultiQuadraticSAMKernelFunctor
* \brief Undocumented
*/
class InvMultiQuadraticSAMKernelFunctor : public GenericKernelFunctorBase
{
public:
- InvMultiQuadraticSAMKernelFunctor(): GenericKernelFunctorBase()
+ InvMultiQuadraticSAMKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("invMultiQuadraticSAM");
this->SetValue<double>("const_coef", 1);
- };
- virtual ~InvMultiQuadraticSAMKernelFunctor() {};
+ }
+ virtual ~InvMultiQuadraticSAMKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
{
SAMKernelFunctor sam;
- double mq = this->GetValue<double>("const_coef") + sam( x, y, param );
+ double mq = this->GetValue<double>("const_coef") + sam(x, y, param);
- if ( mq == 0. )
- {
+ if (mq == 0.)
+ {
return itk::NumericTraits<double>::max();
- }
- return 1. / sqrt( mq );
+ }
+ return 1. / sqrt(mq);
}
};
@@ -190,23 +189,23 @@ public:
class KModSAMKernelFunctor : public GenericKernelFunctorBase
{
public:
- KModSAMKernelFunctor(): GenericKernelFunctorBase()
+ KModSAMKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("KModSAM");
this->SetValue<double>("const_coef", 1);
- };
- virtual ~KModSAMKernelFunctor() {};
+ }
+ virtual ~KModSAMKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
{
SAMKernelFunctor sam;
- double mq = this->GetValue<double>("const_coef") + sam( x, y, param );
+ double mq = this->GetValue<double>("const_coef") + sam(x, y, param);
- if ( mq == 0. )
- {
+ if (mq == 0.)
+ {
return itk::NumericTraits<double>::max();
- }
- return vcl_exp( param.gamma / mq ) - 1.0;
+ }
+ return vcl_exp(param.gamma / mq) - 1.0;
}
};
@@ -216,88 +215,95 @@ public:
class RBFKernelFunctor : public GenericKernelFunctorBase
{
public:
- RBFKernelFunctor(): GenericKernelFunctorBase()
+ RBFKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("RBF");
this->SetValue<double>("gamma_coef", 0.5);
- };
- virtual ~RBFKernelFunctor() {};
+ }
+ virtual ~RBFKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
{
CustomKernelFunctor custom;
- double res = this->GetValue<double>("gamma_coef") * custom( x, y, param );
+ double res = this->GetValue<double>("gamma_coef") * custom(x, y, param);
return vcl_exp(-res);
}
- virtual double derivative(const svm_node *x, const svm_node *y, const svm_parameter& param, int degree, int index, bool isAtEnd, double constValue) const
+ virtual double derivative(const svm_node *x,
+ const svm_node *y,
+ const svm_parameter& param,
+ int degree,
+ int index,
+ bool isAtEnd,
+ double constValue) const
{
double gamma = this->GetValue<double>("gamma_coef");
double kernelValue = 0.;
double xval = 0.;
double yval = 0.;
- int compt = 0;
+ int compt = 0;
const svm_node *xtemp = x;
const svm_node *ytemp = y;
bool stop = false;
while (xtemp->index != -1 && ytemp->index != -1 && stop == false)
- {
- if (xtemp->index == ytemp->index)
{
- if (compt == index)
+ if (xtemp->index == ytemp->index)
{
+ if (compt == index)
+ {
xval = xtemp->value;
yval = ytemp->value;
stop = true;
- }
+ }
else
- {
+ {
compt++;
++ytemp;
++xtemp;
+ }
}
- }
else
- {
- if (xtemp->index > ytemp->index)
- ++ytemp;
- else
- ++xtemp;
+ {
+ if (xtemp->index > ytemp->index) ++ytemp;
+ else ++xtemp;
+ }
}
- }
if (isAtEnd == true)
- {
- kernelValue = this->operator()(x, y, param);
- }
+ {
+ kernelValue = this->operator ()(x, y, param);
+ }
else
- {
+ {
kernelValue = constValue;
- }
+ }
if (degree < 0)
- {
+ {
return 0;
- }
+ }
switch (degree)
- {
+ {
case 0:
return kernelValue;
break;
case 1:
- return (-2*gamma*(yval - xval)*kernelValue);
+ return (-2 * gamma * (yval - xval) * kernelValue);
break;
default:
- return (-2*gamma*((degree - 1) * this->derivative(x, y, param, degree-2, index, isAtEnd, constValue) + (yval - xval)* derivative(x, y, param, degree-1, index, isAtEnd, constValue)));
+ return (-2 * gamma *
+ ((degree -
+ 1) *
+ this->derivative(x, y, param, degree - 2, index, isAtEnd,
+ constValue) + (yval - xval) * derivative(x, y, param, degree - 1, index, isAtEnd, constValue)));
break;
- }
+ }
}
-
};
/** \class RBFRBFSAMKernelFunctor
@@ -306,19 +312,19 @@ public:
class RBFRBFSAMKernelFunctor : public GenericKernelFunctorBase
{
public:
- RBFRBFSAMKernelFunctor(): GenericKernelFunctorBase()
+ RBFRBFSAMKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("RBFRBFSAM");
this->SetValue<double>("lin_coef", 1.);
- };
- virtual ~RBFRBFSAMKernelFunctor() {};
+ }
+ virtual ~RBFRBFSAMKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
{
CustomKernelFunctor custom;
RadialSAMKernelFunctor radialSam;
- return ( this->GetValue<double>("lin_coef") * vcl_exp( -param.gamma * custom(x, y, param) )
- + ( 1.0 - this->GetValue<double>("lin_coef") ) * radialSam( x, y, param ) );
+ return (this->GetValue<double>("lin_coef") * vcl_exp(-param.gamma * custom(x, y, param))
+ + (1.0 - this->GetValue<double>("lin_coef")) * radialSam(x, y, param));
}
};
@@ -328,20 +334,20 @@ public:
class PolyRBFSAMKernelFunctor : public GenericKernelFunctorBase
{
public:
- PolyRBFSAMKernelFunctor(): GenericKernelFunctorBase()
+ PolyRBFSAMKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("polyRBFSAM");
this->SetValue<double>("const_coef", 1);
this->SetValue<double>("lin_coef", 1);
- };
- virtual ~PolyRBFSAMKernelFunctor() {};
+ }
+ virtual ~PolyRBFSAMKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
{
RadialSAMKernelFunctor radialSam;
- return this->GetValue<double>("const_lin") * vcl_pow( dot(x, y)+this->GetValue<double>("const_coef") , param.degree)
- + ( 1.0 - this->GetValue<double>("const_coef") )
- * radialSam( x, y, param );
+ return this->GetValue<double>("const_lin") * vcl_pow(dot(x, y) + this->GetValue<double>("const_coef"), param.degree)
+ + (1.0 - this->GetValue<double>("const_coef"))
+ * radialSam(x, y, param);
}
};
@@ -351,37 +357,37 @@ public:
class RBFDiffKernelFunctor : public GenericKernelFunctorBase
{
public:
- RBFDiffKernelFunctor(): GenericKernelFunctorBase()
+ RBFDiffKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("RBFDiff");
- };
- virtual ~RBFDiffKernelFunctor() {};
+ }
+ virtual ~RBFDiffKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
{
double total = 0.;
while (x->index != -1 && y->index != -1)
- {
- if (x->index == y->index)
{
- total = total + vcl_exp(-param.gamma*(x->value - y->value));
+ if (x->index == y->index)
+ {
+ total = total + vcl_exp(-param.gamma * (x->value - y->value));
++x;
++y;
- }
+ }
else
- {
- if (x->index < y->index)
{
+ if (x->index < y->index)
+ {
++x;
- }
+ }
else
- {
+ {
++y;
+ }
}
}
- }
return total;
}
};
@@ -392,16 +398,16 @@ public:
class CustomLinearKernelFunctor : public GenericKernelFunctorBase
{
public:
- CustomLinearKernelFunctor(): GenericKernelFunctorBase()
+ CustomLinearKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("customLinear");
- };
- virtual ~CustomLinearKernelFunctor() {};
+ }
+ virtual ~CustomLinearKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
{
CustomKernelFunctor custom;
- return( vcl_exp(-param.gamma*custom(x, y, param)) );
+ return (vcl_exp(-param.gamma * custom(x, y, param)));
}
};
@@ -411,35 +417,34 @@ public:
class GroupedRBFKernelFunctor : public GenericKernelFunctorBase
{
public:
- GroupedRBFKernelFunctor(): GenericKernelFunctorBase()
+ GroupedRBFKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("groupedRBF");
- };
- virtual ~GroupedRBFKernelFunctor() {};
+ }
+ virtual ~GroupedRBFKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
{
- const char *parameters = param.custom;
+ const char * parameters = param.custom;
const char * twoPoints = ":";
const char * position = strpbrk (parameters, twoPoints);
- int twoPointsPosition = 0;
- double total = 0.;
- double value = 0.;
- int numberOfGroups = atoi(parameters);
-
+ int twoPointsPosition = 0;
+ double total = 0.;
+ double value = 0.;
+ int numberOfGroups = atoi(parameters);
twoPointsPosition = position - parameters;
parameters = parameters + twoPointsPosition + 1;
- int i,j;
+ int i, j;
std::vector<int> begin;
begin.resize(numberOfGroups);
std::vector<int> end;
end.resize(numberOfGroups);
for (i = 0; i < numberOfGroups; ++i)
- {
+ {
begin[i] = atoi(parameters);
position = strpbrk (parameters, twoPoints);
twoPointsPosition = position - parameters;
@@ -447,8 +452,7 @@ public:
end[i] = atoi(parameters);
parameters = parameters + twoPointsPosition + 1;
- }
-
+ }
const svm_node * xBuff = x;
const svm_node * yBuff = y;
@@ -457,150 +461,142 @@ public:
int sizeY = 0;
while (xBuff->index != 1)
- {
+ {
sizeX++;
++xBuff;
- }
+ }
while (yBuff->index != 1)
- {
+ {
sizeY++;
++yBuff;
- }
-
+ }
const svm_node * xTemp = NULL;
const svm_node * yTemp = NULL;
int index = 0;
-
if (sizeX && sizeY)
- {
+ {
svm_node* xGroup = new svm_node[sizeX];
svm_node* yGroup = new svm_node[sizeY];
for (j = 0; j < numberOfGroups; ++j)
- {
+ {
xTemp = x;
yTemp = y;
index = 0;
while (xTemp->index != 1 && yTemp->index != 1)
- {
+ {
xGroup[index].index = xTemp->index;
yGroup[index].index = yTemp->index;
if ((xTemp->index < begin[j]) || (xTemp->index > end[j]))
- {
+ {
xGroup[index].value = 0;
yGroup[index].value = 0;
- }
+ }
else
- {
+ {
xGroup[index].value = xTemp->value;
yGroup[index].value = yTemp->value;
- }
+ }
++index;
++xTemp;
++yTemp;
- }
+ }
// value can have different value according to j
CustomLinearKernelFunctor customLinear;
value = customLinear(xGroup, yGroup, param);
total += value;
+ }
+ delete[] xGroup;
+ delete[] yGroup;
}
- delete [] xGroup;
- delete [] yGroup;
- }
-
else if ((sizeX > 0) && (sizeY == 0))
- {
+ {
svm_node* xGroup = new svm_node[sizeX];
svm_node* yGroup = new svm_node[sizeY];
for (j = 0; j < numberOfGroups; ++j)
- {
+ {
xTemp = x;
index = 0;
while (xTemp->index != -1)
- {
+ {
xGroup[index].index = xTemp->index;
yGroup[index].index = xTemp->index;
if ((xTemp->index < begin[j]) || (xTemp->index > end[j]))
- {
+ {
xGroup[index].value = 0;
yGroup[index].value = 0;
- }
+ }
else
- {
+ {
xGroup[index].value = xTemp->value;
yGroup[index].value = 0;
- }
+ }
++index;
++xTemp;
- }
+ }
// value can have different value according to j
CustomLinearKernelFunctor customLinear;
value = customLinear(xGroup, yGroup, param);
total += value;
+ }
+ delete[] xGroup;
+ delete[] yGroup;
}
- delete [] xGroup;
- delete [] yGroup;
- }
-
else
- {
+ {
CustomLinearKernelFunctor customLinear;
total = static_cast<double>(numberOfGroups) * customLinear(x, y, param);
- }
+ }
- if (xTemp != NULL)
- delete xTemp;
- if (yTemp != NULL)
- delete yTemp;
+ if (xTemp != NULL) delete xTemp;
+ if (yTemp != NULL) delete yTemp;
return total;
}
};
-
/** \class GroupingAdaptiveKernelFunctor
* \brief Undocumented
*/
class GroupingAdaptiveKernelFunctor : public GenericKernelFunctorBase
{
public:
- GroupingAdaptiveKernelFunctor(): GenericKernelFunctorBase()
+ GroupingAdaptiveKernelFunctor() : GenericKernelFunctorBase()
{
this->SetName("groupingAdaptive");
this->SetValue<double>("lin_coef", 1.);
this->SetValue<double>("const_coef", 1.);
- };
- virtual ~GroupingAdaptiveKernelFunctor() {};
+ }
+ virtual ~GroupingAdaptiveKernelFunctor() {}
- virtual double operator()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
+ virtual double operator ()(const svm_node *x, const svm_node *y, const svm_parameter& param) const
{
const char * parameters = param.custom;
const char * twoPoints = ":";
const char * position = strpbrk (parameters, twoPoints);
- int twoPointsPosition = 0;
- double total = 0.;
- double value = 0.;
- int numberOfGroups = atoi(parameters);
-
+ int twoPointsPosition = 0;
+ double total = 0.;
+ double value = 0.;
+ int numberOfGroups = atoi(parameters);
twoPointsPosition = position - parameters;
parameters = parameters + twoPointsPosition + 1;
- int i,j;
+ int i, j;
std::vector<int> begin;
begin.resize(numberOfGroups);
@@ -608,7 +604,7 @@ public:
end.resize(numberOfGroups);
for (i = 0; i < numberOfGroups; ++i)
- {
+ {
begin[i] = atoi(parameters);
position = strpbrk (parameters, twoPoints);
twoPointsPosition = position - parameters;
@@ -616,8 +612,7 @@ public:
end[i] = atoi(parameters);
parameters = parameters + twoPointsPosition + 1;
- }
-
+ }
const svm_node * xBuff = x;
const svm_node * yBuff = y;
@@ -626,107 +621,106 @@ public:
int sizeY = 0;
while (xBuff->index != 1)
- {
+ {
sizeX++;
++xBuff;
- }
+ }
while (yBuff->index != 1)
- {
+ {
sizeY++;
++yBuff;
- }
-
+ }
const svm_node * xTemp = NULL;
const svm_node * yTemp = NULL;
int index = 0;
-
if (sizeX && sizeY)
- {
+ {
svm_node* xGroup = new svm_node[sizeX];
svm_node* yGroup = new svm_node[sizeY];
for (j = 0; j < numberOfGroups; ++j)
- {
+ {
xTemp = x;
yTemp = y;
index = 0;
while (xTemp->index != 1 && yTemp->index != 1)
- {
+ {
xGroup[index].index = xTemp->index;
yGroup[index].index = yTemp->index;
if ((xTemp->index < begin[j]) || (xTemp->index > end[j]))
- {
+ {
xGroup[index].value = 0;
yGroup[index].value = 0;
- }
+ }
else
- {
+ {
xGroup[index].value = xTemp->value;
yGroup[index].value = yTemp->value;
- }
+ }
++index;
++xTemp;
++yTemp;
- }
+ }
// value can have different value according to j
- value = vcl_pow(this->GetValue<double>("lin_coef")*dot(xGroup,yGroup)+this->GetValue<double>("const_coef"),static_cast<double>(param.degree));
+ value = vcl_pow(this->GetValue<double>("lin_coef") * dot(xGroup, yGroup) + this->GetValue<double>(
+ "const_coef"), static_cast<double>(param.degree));
total += value;
+ }
+ delete[] xGroup;
+ delete[] yGroup;
}
- delete [] xGroup;
- delete [] yGroup;
- }
-
else if ((sizeX > 0) && (sizeY == 0))
- {
+ {
svm_node* xGroup = new svm_node[sizeX];
svm_node* yGroup = new svm_node[sizeY];
for (j = 0; j < numberOfGroups; ++j)
- {
+ {
xTemp = x;
index = 0;
while (xTemp->index != 1)
- {
+ {
xGroup[index].index = xTemp->index;
yGroup[index].index = xTemp->index;
if ((xTemp->index < begin[j]) || (xTemp->index > end[j]))
- {
+ {
xGroup[index].value = 0;
yGroup[index].value = 0;
- }
+ }
else
- {
+ {
xGroup[index].value = xTemp->value;
yGroup[index].value = 0;
- }
+ }
++index;
++xTemp;
- }
+ }
// value can have different value according to j
- value = vcl_pow(this->GetValue<double>("lin_coef")*dot(xGroup,yGroup)+this->GetValue<double>("const_coef"),static_cast<double>(param.degree));
+ value = vcl_pow(this->GetValue<double>("lin_coef") * dot(xGroup, yGroup) + this->GetValue<double>(
+ "const_coef"), static_cast<double>(param.degree));
total += value;
+ }
+ delete[] xGroup;
+ delete[] yGroup;
}
- delete [] xGroup;
- delete [] yGroup;
- }
else
- {
+ {
CustomKernelFunctor custom;
total = static_cast<double>(numberOfGroups) * custom(x, y, param);
- }
+ }
return total;
}
diff --git a/Code/Learning/otbSVMModel.h b/Code/Learning/otbSVMModel.h
index 101d4cde32..2f69b7504c 100644
--- a/Code/Learning/otbSVMModel.h
+++ b/Code/Learning/otbSVMModel.h
@@ -64,41 +64,41 @@ class ITK_EXPORT SVMModel : public itk::DataObject
{
public:
/** Standard class typedefs. */
- typedef SVMModel Self;
- typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SVMModel Self;
+ typedef itk::DataObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Value type */
- typedef TValue ValueType;
+ typedef TValue ValueType;
/** Label Type */
- typedef TLabel LabelType;
- typedef std::vector<ValueType> MeasurementType;
- typedef std::pair<MeasurementType,LabelType> SampleType;
- typedef std::vector<SampleType> SamplesVectorType;
+ typedef TLabel LabelType;
+ typedef std::vector<ValueType> MeasurementType;
+ typedef std::pair<MeasurementType, LabelType> SampleType;
+ typedef std::vector<SampleType> SamplesVectorType;
/** Cache vector type */
- typedef std::vector<struct svm_node *> CacheVectorType;
+ typedef std::vector<struct svm_node *> CacheVectorType;
/** Distances vector */
- typedef itk::VariableLengthVector<double> ProbabilitiesVectorType;
- typedef itk::VariableLengthVector<double> DistancesVectorType;
+ typedef itk::VariableLengthVector<double> ProbabilitiesVectorType;
+ typedef itk::VariableLengthVector<double> DistancesVectorType;
- typedef struct svm_node * NodeCacheType;
+ typedef struct svm_node * NodeCacheType;
/** Run-time type information (and related methods). */
itkNewMacro(Self);
- itkTypeMacro(SVMModel,itk::DataObject);
+ itkTypeMacro(SVMModel, itk::DataObject);
/** Get the number of classes. */
unsigned int GetNumberOfClasses(void) const
{
- return (unsigned int)(m_Model->nr_class);
+ return (unsigned int) (m_Model->nr_class);
}
/** Get the number of hyperplane. */
unsigned int GetNumberOfHyperplane(void) const
{
- return (unsigned int)(m_Model->nr_class*(m_Model->nr_class-1)/2);
+ return (unsigned int) (m_Model->nr_class * (m_Model->nr_class - 1) / 2);
}
/** Set a new model. To avoid pointers holding conflicts, this
@@ -112,20 +112,19 @@ public:
}
/** Gets the parameters */
- struct svm_parameter & GetParameters()
+ struct svm_parameter& GetParameters()
{
return m_Parameters;
}
/** Gets the parameters */
- const struct svm_parameter & GetParameters() const
- {
- return m_Parameters;
- }
+ const struct svm_parameter& GetParameters() const
+ {
+ return m_Parameters;
+ }
/** Saves the model to a file */
void SaveModel(const char* model_file_name) const;
-
/** Loads the model from a file */
void LoadModel(const char* model_file_name);
@@ -280,7 +279,6 @@ public:
return static_cast<bool>(m_Parameters.shrinking);
}
-
/** Do probability estimates */
void DoProbabilityEstimates(bool prob)
{
@@ -295,7 +293,7 @@ public:
}
/** Get/Set methods for generic kernel functor */
- virtual GenericKernelFunctorBase * GetKernelFunctor(void)const
+ virtual GenericKernelFunctorBase * GetKernelFunctor(void) const
{
return m_Parameters.kernel_generic;
}
@@ -310,7 +308,7 @@ public:
{
return m_Model->l;
}
-
+
/** Return rho values */
double * GetRho(void) const
{
@@ -325,12 +323,12 @@ public:
void SetSupportVectors(svm_node ** sv, int nbOfSupportVector);
/** Return the alphas values (SV Coef) */
- double ** GetAlpha (void)
+ double ** GetAlpha(void)
{
return m_Model->sv_coef;
}
/** Set the alphas values (SV Coef) */
- void SetAlpha( double ** alpha, int nbOfSupportVector );
+ void SetAlpha(double ** alpha, int nbOfSupportVector);
/** Return the labels lists */
int * GetLabels()
@@ -344,7 +342,7 @@ public:
return m_Model->nSV;
}
- struct svm_problem & GetProblem()
+ struct svm_problem& GetProblem()
{
return m_Problem;
}
@@ -372,13 +370,13 @@ public:
* thread safe. If you want to run multiple concurrent instances of
* this method, please consider using the GetCopy() method to clone the
* model.)*/
- LabelType EvaluateLabel(const MeasurementType & measure) const;
+ LabelType EvaluateLabel(const MeasurementType& measure) const;
/** Evaluate hyperplan distances (Please note that due to caching this method is not
* thread safe. If you want to run multiple concurrent instances of
* this method, please consider using the GetCopy() method to clone the
* model.)**/
- DistancesVectorType EvaluateHyperplanesDistances(const MeasurementType & measure) const;
+ DistancesVectorType EvaluateHyperplanesDistances(const MeasurementType& measure) const;
/** Evaluate probabilities of each class. Returns a probability vector ordered
* by increasing class label value
@@ -386,16 +384,16 @@ public:
* If you want to run multiple concurrent instances of
* this method, please consider using the GetCopy() method to clone the
* model.)**/
- ProbabilitiesVectorType EvaluateProbabilities(const MeasurementType & measure) const;
+ ProbabilitiesVectorType EvaluateProbabilities(const MeasurementType& measure) const;
/** Add a new sample to the list */
- void AddSample(const MeasurementType & measure, const LabelType & label);
-
+ void AddSample(const MeasurementType& measure, const LabelType& label);
+
/** Clear all samples */
void ClearSamples();
/** Set the samples vector */
- void SetSamples(const SamplesVectorType & samples);
+ void SetSamples(const SamplesVectorType& samples);
/** Reset all the model, leaving it in the same state that just
* before constructor call */
@@ -411,7 +409,7 @@ protected:
/** Delete any allocated problem */
void DeleteProblem();
-
+
/** Delete any allocated model */
void DeleteModel();
@@ -419,8 +417,8 @@ protected:
void Initialize();
private:
- SVMModel(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SVMModel(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Container to hold the SVM model itself */
struct svm_model* m_Model;
@@ -438,13 +436,11 @@ private:
bool m_ProblemUpToDate;
/** Contains the samples */
- SamplesVectorType m_Samples;
+ SamplesVectorType m_Samples;
}; // class SVMModel
-
} // namespace otb
-
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbSVMModel.txx"
#endif
diff --git a/Code/Learning/otbSVMModel.txx b/Code/Learning/otbSVMModel.txx
index 0f6dcef6c1..490c144b25 100644
--- a/Code/Learning/otbSVMModel.txx
+++ b/Code/Learning/otbSVMModel.txx
@@ -27,8 +27,8 @@
namespace otb
{
// TODO: Check memory allocation in this class
-template <class TValue,class TLabel>
-SVMModel<TValue,TLabel>::SVMModel()
+template <class TValue, class TLabel>
+SVMModel<TValue, TLabel>::SVMModel()
{
// Default parameters
this->SetSVMType(C_SVC);
@@ -56,18 +56,18 @@ SVMModel<TValue,TLabel>::SVMModel()
this->Initialize();
}
-template <class TValue,class TLabel>
-SVMModel<TValue,TLabel>::~SVMModel()
+template <class TValue, class TLabel>
+SVMModel<TValue, TLabel>::~SVMModel()
{
this->DeleteModel();
this->DeleteProblem();
}
-template <class TValue,class TLabel>
+template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::Initialize()
+SVMModel<TValue, TLabel>::Initialize()
{
// Initialize model
- if(!m_Model)
+ if (!m_Model)
{
m_Model = new struct svm_model;
m_Model->delete_composed = false;
@@ -83,7 +83,7 @@ SVMModel<TValue,TLabel>::Initialize()
m_ModelUpToDate = false;
- }
+ }
// Intialize problem
m_Problem.l = 0;
@@ -93,71 +93,69 @@ SVMModel<TValue,TLabel>::Initialize()
m_ProblemUpToDate = false;
}
-
-template <class TValue,class TLabel>
+template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::Reset()
+SVMModel<TValue, TLabel>::Reset()
{
this->DeleteProblem();
this->DeleteModel();
// Clear samples
m_Samples.clear();
-
+
// Initialize values
this->Initialize();
}
-template <class TValue,class TLabel>
+template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::DeleteModel()
+SVMModel<TValue, TLabel>::DeleteModel()
{
- if(m_Model)
+ if (m_Model)
{
svm_destroy_model(m_Model);
m_Model = NULL;
}
}
-template <class TValue,class TLabel>
+template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::DeleteProblem()
+SVMModel<TValue, TLabel>::DeleteProblem()
{
// Deallocate any existing problem
- if(m_Problem.y)
+ if (m_Problem.y)
{
- delete [] m_Problem.y;
+ delete[] m_Problem.y;
m_Problem.y = NULL;
}
-
- if(m_Problem.x)
+
+ if (m_Problem.x)
{
- for(int i = 0; i < m_Problem.l;++i)
+ for (int i = 0; i < m_Problem.l; ++i)
{
- if(m_Problem.x[i])
- {
- delete [] m_Problem.x[i];
- }
+ if (m_Problem.x[i])
+ {
+ delete[] m_Problem.x[i];
+ }
}
- delete [] m_Problem.x;
+ delete[] m_Problem.x;
m_Problem.x = NULL;
}
m_Problem.l = 0;
m_ProblemUpToDate = false;
}
-
template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::AddSample(const MeasurementType & measure, const LabelType & label)
+SVMModel<TValue, TLabel>::AddSample(const MeasurementType& measure, const LabelType& label)
{
- SampleType newSample(measure,label);
+ SampleType newSample(measure, label);
m_Samples.push_back(newSample);
m_ProblemUpToDate = false;
}
template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::ClearSamples()
+SVMModel<TValue, TLabel>::ClearSamples()
{
m_Samples.clear();
m_ProblemUpToDate = false;
@@ -165,7 +163,7 @@ SVMModel<TValue,TLabel>::ClearSamples()
template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::SetSamples(const SamplesVectorType & samples)
+SVMModel<TValue, TLabel>::SetSamples(const SamplesVectorType& samples)
{
m_Samples = samples;
m_ProblemUpToDate = false;
@@ -173,10 +171,10 @@ SVMModel<TValue,TLabel>::SetSamples(const SamplesVectorType & samples)
template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::BuildProblem()
+SVMModel<TValue, TLabel>::BuildProblem()
{
// Check if problem is up-to-date
- if(m_ProblemUpToDate)
+ if (m_ProblemUpToDate)
{
return;
}
@@ -184,15 +182,14 @@ SVMModel<TValue,TLabel>::BuildProblem()
// Get number of samples
int probl = m_Samples.size();
- if(probl < 1)
+ if (probl < 1)
{
- itkExceptionMacro(<<"No samples, can not build SVM problem.");
+ itkExceptionMacro(<< "No samples, can not build SVM problem.");
}
- std::cout<<"Rebuilding problem ..."<<std::endl;
+ std::cout << "Rebuilding problem ..." << std::endl;
// Get the size of the samples
- long int elements = m_Samples[0].first.size()+1;
-
+ long int elements = m_Samples[0].first.size() + 1;
// Deallocate any previous problem
this->DeleteProblem();
@@ -202,14 +199,14 @@ SVMModel<TValue,TLabel>::BuildProblem()
m_Problem.y = new double[probl];
m_Problem.x = new struct svm_node*[probl];
- for(int i = 0; i<probl;++i)
+ for (int i = 0; i < probl; ++i)
{
// Initialize labels to 0
m_Problem.y[i] = 0;
m_Problem.x[i] = new struct svm_node[elements];
// Intialize elements (value = 0; index = -1)
- for(unsigned int j = 0; j<static_cast<unsigned int>(elements);++j)
+ for (unsigned int j = 0; j < static_cast<unsigned int>(elements); ++j)
{
m_Problem.x[i][j].index = -1;
m_Problem.x[i][j].value = 0;
@@ -218,44 +215,43 @@ SVMModel<TValue,TLabel>::BuildProblem()
// Iterate on the samples
typename SamplesVectorType::const_iterator sIt = m_Samples.begin();
- int sampleIndex = 0;
- int maxElementIndex = 0;
+ int sampleIndex = 0;
+ int maxElementIndex = 0;
- while(sIt != m_Samples.end())
+ while (sIt != m_Samples.end())
{
// Get the sample measurement and label
MeasurementType measure = sIt->first;
- LabelType label = sIt->second;
-
+ LabelType label = sIt->second;
+
// Set the label
m_Problem.y[sampleIndex] = label;
- int elementIndex = 0;
-
- // Populate the svm nodes
- for(typename MeasurementType::const_iterator eIt = measure.begin();
- eIt!=measure.end() && elementIndex < elements; ++eIt,++elementIndex)
- {
- m_Problem.x[sampleIndex][elementIndex].index = elementIndex+1;
- m_Problem.x[sampleIndex][elementIndex].value = (*eIt);
- }
-
- // Get the max index
- if(elementIndex > maxElementIndex)
- {
- maxElementIndex = elementIndex;
- }
-
- ++sampleIndex;
- ++sIt;
- }
-
+ int elementIndex = 0;
+
+ // Populate the svm nodes
+ for (typename MeasurementType::const_iterator eIt = measure.begin();
+ eIt != measure.end() && elementIndex < elements; ++eIt, ++elementIndex)
+ {
+ m_Problem.x[sampleIndex][elementIndex].index = elementIndex + 1;
+ m_Problem.x[sampleIndex][elementIndex].value = (*eIt);
+ }
+
+ // Get the max index
+ if (elementIndex > maxElementIndex)
+ {
+ maxElementIndex = elementIndex;
+ }
+
+ ++sampleIndex;
+ ++sIt;
+ }
+
// Compute the kernel gamma from maxElementIndex if necessary
if (this->GetKernelGamma() == 0
&& this->GetParameters().kernel_type != COMPOSED
- && this->GetParameters().kernel_type != GENERIC)
- this->SetKernelGamma(1.0/static_cast<double>(maxElementIndex));
+ && this->GetParameters().kernel_type != GENERIC) this->SetKernelGamma(1.0 / static_cast<double>(maxElementIndex));
// problem is up-to-date
m_ProblemUpToDate = true;
@@ -263,7 +259,7 @@ SVMModel<TValue,TLabel>::BuildProblem()
template <class TValue, class TLabel>
double
-SVMModel<TValue,TLabel>::CrossValidation(unsigned int nbFolders)
+SVMModel<TValue, TLabel>::CrossValidation(unsigned int nbFolders)
{
// Build problem
this->BuildProblem();
@@ -273,94 +269,94 @@ SVMModel<TValue,TLabel>::CrossValidation(unsigned int nbFolders)
// Get the length of the problem
int length = m_Problem.l;
-
- // Temporary memory to store cross validation results
- double *target = new double[length];
-
- // Do cross validation
- svm_cross_validation(&m_Problem,&m_Parameters,nbFolders,target);
-
- // Evaluate accuracy
- int i;
- double total_correct = 0.;
-
- for(i=0;i<length;i++)
+
+ // Temporary memory to store cross validation results
+ double *target = new double[length];
+
+ // Do cross validation
+ svm_cross_validation(&m_Problem, &m_Parameters, nbFolders, target);
+
+ // Evaluate accuracy
+ int i;
+ double total_correct = 0.;
+
+ for (i = 0; i < length; i++)
+ {
+ if (target[i] == m_Problem.y[i])
{
- if(target[i] == m_Problem.y[i])
- {
- ++total_correct;
- }
+ ++total_correct;
}
- double accuracy = total_correct/length;
-
- // Free temporary memory
- delete [] target;
+ }
+ double accuracy = total_correct / length;
- // return accuracy value
- return accuracy;
+ // Free temporary memory
+ delete[] target;
+
+ // return accuracy value
+ return accuracy;
}
template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::ConsistencyCheck()
+SVMModel<TValue, TLabel>::ConsistencyCheck()
{
if (m_Parameters.svm_type == ONE_CLASS && this->GetDoProbabilityEstimates())
{
- otbMsgDebugMacro(<<"Disabling SVM probability estimates for ONE_CLASS SVM type.");
+ otbMsgDebugMacro(<< "Disabling SVM probability estimates for ONE_CLASS SVM type.");
this->DoProbabilityEstimates(false);
}
-
- const char* error_msg = svm_check_parameter(&m_Problem,&m_Parameters);
-
+
+ const char* error_msg = svm_check_parameter(&m_Problem, &m_Parameters);
+
if (error_msg)
- {
- throw itk::ExceptionObject(__FILE__, __LINE__,error_msg,ITK_LOCATION);
- }
+ {
+ throw itk::ExceptionObject(__FILE__, __LINE__, error_msg, ITK_LOCATION);
+ }
}
template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::Train()
+SVMModel<TValue, TLabel>::Train()
{
// If the model is already up-to-date, return
- if(m_ModelUpToDate)
+ if (m_ModelUpToDate)
{
return;
}
// Build problem
this->BuildProblem();
-
+
// Check consistency
this->ConsistencyCheck();
-
+
// retrieve parameters
struct svm_parameter parameters = m_Parameters;
-
+
// train the model
- m_Model = svm_train(&m_Problem,¶meters);
-
+ m_Model = svm_train(&m_Problem, ¶meters);
+
// Reset the parameters
m_Parameters = parameters;
-
+
// Set the model as up-to-date
m_ModelUpToDate = true;
}
template <class TValue, class TLabel>
-typename SVMModel<TValue,TLabel>::LabelType
-SVMModel<TValue,TLabel>::EvaluateLabel(const MeasurementType & measure) const
+typename SVMModel<TValue, TLabel>::LabelType
+SVMModel<TValue, TLabel>::EvaluateLabel(const MeasurementType& measure) const
{
// Check if model is up-to-date
- if(!m_ModelUpToDate)
+ if (!m_ModelUpToDate)
{
- itkExceptionMacro(<<"Model is not up-to-date, can not predict label");
+ itkExceptionMacro(<< "Model is not up-to-date, can not predict label");
}
// Check probability prediction
bool predict_probability = 1;
- if (svm_check_probability_model(m_Model)==0)
+ if (svm_check_probability_model(m_Model) == 0)
{
if (this->GetSVMType() == ONE_CLASS)
{
@@ -369,156 +365,158 @@ SVMModel<TValue,TLabel>::EvaluateLabel(const MeasurementType & measure) const
else
{
throw itk::ExceptionObject(__FILE__, __LINE__,
- "Model does not support probabiliy estimates",ITK_LOCATION);
+ "Model does not support probabiliy estimates", ITK_LOCATION);
}
}
-
+
// Get type and number of classes
- int svm_type=svm_get_svm_type(m_Model);
- int nr_class=svm_get_nr_class(m_Model);
-
+ int svm_type = svm_get_svm_type(m_Model);
+ int nr_class = svm_get_nr_class(m_Model);
+
// Allocate space for labels
- double *prob_estimates=NULL;
+ double *prob_estimates = NULL;
// Eventually allocate space for probabilities
if (predict_probability)
{
- if (svm_type==NU_SVR || svm_type==EPSILON_SVR)
+ if (svm_type == NU_SVR || svm_type == EPSILON_SVR)
{
- otbMsgDevMacro(<<"Prob. model for test data: target value = predicted value + z,\nz: Laplace distribution e^(-|z|/sigma)/(2sigma),sigma="<<svm_get_svr_probability(m_Model));
+ otbMsgDevMacro(
+ <<
+ "Prob. model for test data: target value = predicted value + z,\nz: Laplace distribution e^(-|z|/sigma)/(2sigma),sigma="
+ << svm_get_svr_probability(m_Model));
}
else
{
prob_estimates = new double[nr_class];
}
}
-
+
// Allocate nodes (/TODO if performances problems are related to too
// many allocations, a cache approach can be set)
- struct svm_node * x = new struct svm_node[measure.size()+1];
-
+ struct svm_node * x = new struct svm_node[measure.size() + 1];
+
int valueIndex = 0;
-
+
// Fill the node
- for(typename MeasurementType::const_iterator mIt = measure.begin();mIt!=measure.end();++mIt,++valueIndex)
+ for (typename MeasurementType::const_iterator mIt = measure.begin(); mIt != measure.end(); ++mIt, ++valueIndex)
{
- x[valueIndex].index=valueIndex+1;
- x[valueIndex].value=(*mIt);
+ x[valueIndex].index = valueIndex + 1;
+ x[valueIndex].value = (*mIt);
}
-
+
// terminate node
x[measure.size()].index = -1;
x[measure.size()].value = 0;
LabelType label = 0;
- if(predict_probability && (svm_type==C_SVC || svm_type==NU_SVC))
+ if (predict_probability && (svm_type == C_SVC || svm_type == NU_SVC))
{
- label = static_cast<LabelType>(svm_predict_probability(m_Model,x,prob_estimates));
+ label = static_cast<LabelType>(svm_predict_probability(m_Model, x, prob_estimates));
}
else
{
- label = static_cast<LabelType>(svm_predict(m_Model,x));
+ label = static_cast<LabelType>(svm_predict(m_Model, x));
}
// Free allocated memory
- delete [] x;
-
- if(prob_estimates)
+ delete[] x;
+
+ if (prob_estimates)
{
- delete [] prob_estimates;
+ delete[] prob_estimates;
}
return label;
}
template <class TValue, class TLabel>
-typename SVMModel<TValue,TLabel>::DistancesVectorType
-SVMModel<TValue,TLabel>::EvaluateHyperplanesDistances(const MeasurementType & measure) const
+typename SVMModel<TValue, TLabel>::DistancesVectorType
+SVMModel<TValue, TLabel>::EvaluateHyperplanesDistances(const MeasurementType& measure) const
{
// Check if model is up-to-date
- if(!m_ModelUpToDate)
+ if (!m_ModelUpToDate)
{
- itkExceptionMacro(<<"Model is not up-to-date, can not predict label");
+ itkExceptionMacro(<< "Model is not up-to-date, can not predict label");
}
// Allocate nodes (/TODO if performances problems are related to too
// many allocations, a cache approach can be set)
- struct svm_node * x = new struct svm_node[measure.size()+1];
+ struct svm_node * x = new struct svm_node[measure.size() + 1];
int valueIndex = 0;
-
+
// Fill the node
- for(typename MeasurementType::const_iterator mIt = measure.begin();mIt!=measure.end();++mIt,++valueIndex)
+ for (typename MeasurementType::const_iterator mIt = measure.begin(); mIt != measure.end(); ++mIt, ++valueIndex)
{
- x[valueIndex].index=valueIndex+1;
- x[valueIndex].value=(*mIt);
+ x[valueIndex].index = valueIndex + 1;
+ x[valueIndex].value = (*mIt);
}
-
+
// terminate node
x[measure.size()].index = -1;
x[measure.size()].value = 0;
-
+
// Intialize distances vector
- DistancesVectorType distances(m_Model->nr_class*(m_Model->nr_class-1)/2);
-
+ DistancesVectorType distances(m_Model->nr_class*(m_Model->nr_class - 1) / 2);
+
// predict distances vector
- svm_predict_values(m_Model,x, (double*)(distances.GetDataPointer()));
-
+ svm_predict_values(m_Model, x, (double*) (distances.GetDataPointer()));
+
// Free allocated memory
- delete [] x;
-
+ delete[] x;
+
return (distances);
}
-
template <class TValue, class TLabel>
-typename SVMModel<TValue,TLabel>::ProbabilitiesVectorType
-SVMModel<TValue,TLabel>::EvaluateProbabilities(const MeasurementType & measure) const
+typename SVMModel<TValue, TLabel>::ProbabilitiesVectorType
+SVMModel<TValue, TLabel>::EvaluateProbabilities(const MeasurementType& measure) const
{
// Check if model is up-to-date
- if(!m_ModelUpToDate)
+ if (!m_ModelUpToDate)
{
- itkExceptionMacro(<<"Model is not up-to-date, can not predict probabilities");
+ itkExceptionMacro(<< "Model is not up-to-date, can not predict probabilities");
}
- if (svm_check_probability_model(m_Model)==0)
+ if (svm_check_probability_model(m_Model) == 0)
{
throw itk::ExceptionObject(__FILE__, __LINE__,
- "Model does not support probability estimates",ITK_LOCATION);
+ "Model does not support probability estimates", ITK_LOCATION);
}
// Get number of classes
- int nr_class=svm_get_nr_class(m_Model);
+ int nr_class = svm_get_nr_class(m_Model);
// Allocate nodes (/TODO if performances problems are related to too
// many allocations, a cache approach can be set)
- struct svm_node * x = new struct svm_node[measure.size()+1];
+ struct svm_node * x = new struct svm_node[measure.size() + 1];
int valueIndex = 0;
// Fill the node
- for(typename MeasurementType::const_iterator mIt = measure.begin();mIt!=measure.end();++mIt,++valueIndex)
+ for (typename MeasurementType::const_iterator mIt = measure.begin(); mIt != measure.end(); ++mIt, ++valueIndex)
{
- x[valueIndex].index=valueIndex+1;
- x[valueIndex].value=(*mIt);
+ x[valueIndex].index = valueIndex + 1;
+ x[valueIndex].value = (*mIt);
}
// Termination node
x[measure.size()].index = -1;
x[measure.size()].value = 0;
- double* dec_values = new double [nr_class];
- svm_predict_probability(m_Model,x,dec_values);
+ double* dec_values = new double[nr_class];
+ svm_predict_probability(m_Model, x, dec_values);
// Reorder values in increasing class label
int* labels = m_Model->label;
std::vector<int> orderedLabels(nr_class);
- std::copy( labels, labels + nr_class, orderedLabels.begin() );
- std::sort( orderedLabels.begin(), orderedLabels.end() );
+ std::copy(labels, labels + nr_class, orderedLabels.begin());
+ std::sort(orderedLabels.begin(), orderedLabels.end());
ProbabilitiesVectorType probabilities(nr_class);
- for ( int i = 0; i < nr_class; i++ )
+ for (int i = 0; i < nr_class; i++)
{
// svm_predict_probability is such that "dec_values[i]" corresponds to label "labels[i]"
std::vector<int>::iterator it = std::find(orderedLabels.begin(), orderedLabels.end(), labels[i]);
@@ -526,81 +524,78 @@ SVMModel<TValue,TLabel>::EvaluateProbabilities(const MeasurementType & measure)
}
// Free allocated memory
- delete [] x;
- delete [] dec_values;
+ delete[] x;
+ delete[] dec_values;
return probabilities;
}
-
-template <class TValue,class TLabel>
+template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::SetModel(struct svm_model* aModel)
+SVMModel<TValue, TLabel>::SetModel(struct svm_model* aModel)
{
this->DeleteModel();
m_Model = svm_copy_model(aModel);
m_ModelUpToDate = true;
}
-
-template <class TValue,class TLabel>
+template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::SaveModel(const char* model_file_name) const
+SVMModel<TValue, TLabel>::SaveModel(const char* model_file_name) const
{
- if (svm_save_model(model_file_name, m_Model)!=0)
- {
- itkExceptionMacro( << "Problem while saving SVM model "
- << std::string(model_file_name) );
- }
+ if (svm_save_model(model_file_name, m_Model) != 0)
+ {
+ itkExceptionMacro(<< "Problem while saving SVM model "
+ << std::string(model_file_name));
+ }
}
-template <class TValue,class TLabel>
+template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::LoadModel(const char* model_file_name)
+SVMModel<TValue, TLabel>::LoadModel(const char* model_file_name)
{
this->DeleteModel();
m_Model = svm_load_model(model_file_name, m_Parameters.kernel_generic);
if (m_Model == 0)
- {
- itkExceptionMacro( << "Problem while loading SVM model "
- << std::string(model_file_name) );
- }
+ {
+ itkExceptionMacro(<< "Problem while loading SVM model "
+ << std::string(model_file_name));
+ }
m_Parameters = m_Model->param;
m_ModelUpToDate = true;
}
-template <class TValue,class TLabel>
-typename SVMModel<TValue,TLabel>::Pointer
-SVMModel<TValue,TLabel>::GetCopy() const
+template <class TValue, class TLabel>
+typename SVMModel<TValue, TLabel>::Pointer
+SVMModel<TValue, TLabel>::GetCopy() const
{
Pointer modelCopy = New();
- modelCopy->SetModel( m_Model );
+ modelCopy->SetModel(m_Model);
// We do not copy the problem to avoid sharing allocated memory
return modelCopy;
}
-template <class TValue,class TLabel>
+template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::PrintSelf(std::ostream& os, itk::Indent indent) const
+SVMModel<TValue, TLabel>::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-template <class TValue,class TLabel>
+template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::SetSupportVectors(svm_node ** sv, int nbOfSupportVector)
+SVMModel<TValue, TLabel>::SetSupportVectors(svm_node ** sv, int nbOfSupportVector)
{
// TODO: rewrite this to check memory allocation
-
// erase the old SV
// delete just the first element, it destoyes the whole pointers (cf SV filling with x_space)
- delete [] (m_Model->SV[0]);
+ delete[] (m_Model->SV[0]);
- for (int n = 0; n<m_Model->l; ++n)
- {
+ for (int n = 0; n < m_Model->l; ++n)
+ {
m_Model->SV[n] = NULL;
- }
+ }
delete[] (m_Model->SV);
m_Model->SV = NULL;
@@ -611,79 +606,79 @@ SVMModel<TValue,TLabel>::SetSupportVectors(svm_node ** sv, int nbOfSupportVector
// Compute the total number of SV elements.
unsigned int elements = 0;
- for (int p=0; p<nbOfSupportVector; ++p)
- {
- std::cout<<p<<" ";
+ for (int p = 0; p < nbOfSupportVector; ++p)
+ {
+ std::cout << p << " ";
const svm_node *tempNode = sv[p];
- std::cout<<p<<" ";
+ std::cout << p << " ";
while (tempNode->index != -1)
- {
+ {
tempNode++;
++elements;
+ }
+ ++elements; // for -1 values
}
- ++elements;// for -1 values
- }
- if (m_Model->l>0)
- {
+ if (m_Model->l > 0)
+ {
SV[0] = new struct svm_node[elements];
- memcpy( SV[0],sv[0],sizeof(svm_node*)*elements);
- }
+ memcpy(SV[0], sv[0], sizeof(svm_node*) * elements);
+ }
svm_node *x_space = SV[0];
int j = 0;
- for (int i=0; i<m_Model->l; ++i)
- {
+ for (int i = 0; i < m_Model->l; ++i)
+ {
// SV
SV[i] = &x_space[j];
const svm_node *p = sv[i];
- svm_node *pCpy = SV[i];
+ svm_node * pCpy = SV[i];
while (p->index != -1)
- {
+ {
pCpy->index = p->index;
pCpy->value = p->value;
++p;
++pCpy;
++j;
- }
+ }
pCpy->index = -1;
++j;
- }
+ }
- if(m_Model->l>0)
+ if (m_Model->l > 0)
{
- delete [] SV[0];
+ delete[] SV[0];
}
}
-template <class TValue,class TLabel>
+template <class TValue, class TLabel>
void
-SVMModel<TValue,TLabel>::SetAlpha( double ** alpha, int nbOfSupportVector )
+SVMModel<TValue, TLabel>::SetAlpha(double ** alpha, int nbOfSupportVector)
{
// TODO: Check memory allocation
// Erase the old sv_coef
- for (int i=0; i<m_Model->nr_class-1; ++i)
- {
+ for (int i = 0; i < m_Model->nr_class - 1; ++i)
+ {
delete[] m_Model->sv_coef[i];
- }
- delete [] m_Model->sv_coef;
+ }
+ delete[] m_Model->sv_coef;
// copy new sv_coef values
- m_Model->sv_coef = new double*[m_Model->nr_class-1];
- for (int i=0; i<m_Model->nr_class-1; ++i)
+ m_Model->sv_coef = new double*[m_Model->nr_class - 1];
+ for (int i = 0; i < m_Model->nr_class - 1; ++i)
m_Model->sv_coef[i] = new double[m_Model->l];
- for (int i=0; i<m_Model->l; ++i)
- {
- // sv_coef
- for (int k=0; k<m_Model->nr_class-1; ++k)
+ for (int i = 0; i < m_Model->l; ++i)
{
+ // sv_coef
+ for (int k = 0; k < m_Model->nr_class - 1; ++k)
+ {
m_Model->sv_coef[k][i] = alpha[k][i];
+ }
}
- }
}
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/Learning/otbSVMModelEstimator.h b/Code/Learning/otbSVMModelEstimator.h
index 9e19ea94c4..d4a26b6056 100644
--- a/Code/Learning/otbSVMModelEstimator.h
+++ b/Code/Learning/otbSVMModelEstimator.h
@@ -64,9 +64,9 @@ public:
typedef itk::ProcessObject Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
-
+
/** Model typedef */
- typedef SVMModel<InputPixelType,LabelPixelType> ModelType;
+ typedef SVMModel<InputPixelType, LabelPixelType> ModelType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -78,29 +78,29 @@ public:
const ModelType * GetModel() const;
/** Type definitions for the SVM Model. */
- typedef SVMModel< InputPixelType, LabelPixelType > SVMModelType;
- typedef typename SVMModelType::Pointer SVMModelPointer;
+ typedef SVMModel<InputPixelType, LabelPixelType> SVMModelType;
+ typedef typename SVMModelType::Pointer SVMModelPointer;
/** Get the cross validation accuracy measures */
- itkGetMacro(InitialCrossValidationAccuracy,double);
- itkGetMacro(FinalCrossValidationAccuracy,double);
+ itkGetMacro(InitialCrossValidationAccuracy, double);
+ itkGetMacro(FinalCrossValidationAccuracy, double);
/** Activate/Deactivate parameters optimization */
- itkSetMacro(ParametersOptimization,bool);
- itkGetMacro(ParametersOptimization,bool);
+ itkSetMacro(ParametersOptimization, bool);
+ itkGetMacro(ParametersOptimization, bool);
itkBooleanMacro(ParametersOptimization);
/** Set/Get the number of steps for the coarse optimization */
- itkSetMacro(CoarseOptimizationNumberOfSteps,unsigned int);
- itkGetMacro(CoarseOptimizationNumberOfSteps,unsigned int);
+ itkSetMacro(CoarseOptimizationNumberOfSteps, unsigned int);
+ itkGetMacro(CoarseOptimizationNumberOfSteps, unsigned int);
/** Set/Get the number of steps for the fine optimization */
- itkSetMacro(FineOptimizationNumberOfSteps,unsigned int);
- itkGetMacro(FineOptimizationNumberOfSteps,unsigned int);
+ itkSetMacro(FineOptimizationNumberOfSteps, unsigned int);
+ itkGetMacro(FineOptimizationNumberOfSteps, unsigned int);
/** Set/Get the number of cross validation folders */
- itkSetMacro(NumberOfCrossValidationFolders,unsigned int);
- itkGetMacro(NumberOfCrossValidationFolders,unsigned int);
+ itkSetMacro(NumberOfCrossValidationFolders, unsigned int);
+ itkGetMacro(NumberOfCrossValidationFolders, unsigned int);
/** Set the number of classes. This method is deprecated and is
* maintained for backward compatibility only */
@@ -149,7 +149,6 @@ public:
this->Modified();
}
-
/** Get the degree of the polynomial kernel */
int GetPolynomialKernelDegree(void)
{
@@ -233,7 +232,6 @@ public:
return this->GetModel()->GetEpsilon();
}
-
/* Set the value of p for EPSILON_SVR */
void SetP(double p)
{
@@ -242,7 +240,6 @@ public:
this->Modified();
}
-
/* Get the value of p for EPSILON_SVR */
double GetP(void)
{
@@ -262,7 +259,6 @@ public:
return (this->GetModel()->GetDoShrinking());
}
-
/** Do probability estimates */
void DoProbabilityEstimates(bool prob)
{
@@ -277,7 +273,7 @@ public:
}
/** Get/Set methods for generic kernel functor */
- virtual GenericKernelFunctorBase * GetKernelFunctor(void)const
+ virtual GenericKernelFunctorBase * GetKernelFunctor(void) const
{
return this->GetModel()->GetKernelFunctor();
}
@@ -305,17 +301,17 @@ protected:
/** This virtual function must be implemented in subclasses to
populate the model with samples */
- virtual void PrepareData(){};
+ virtual void PrepareData(){}
/** Optimize parameters */
void OptimizeParameters();
-
+
/** The number of classes */
- unsigned int m_NumberOfClasses;
+ unsigned int m_NumberOfClasses;
private:
- SVMModelEstimator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SVMModelEstimator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
// Initial cross validation accuracy
double m_InitialCrossValidationAccuracy;
@@ -328,7 +324,7 @@ private:
// Number of steps for the coarse search
unsigned int m_CoarseOptimizationNumberOfSteps;
-
+
// Number of steps for the fine search
unsigned int m_FineOptimizationNumberOfSteps;
@@ -343,6 +339,4 @@ private:
#include "otbSVMModelEstimator.txx"
#endif
-
#endif
-
diff --git a/Code/Learning/otbSVMModelEstimator.txx b/Code/Learning/otbSVMModelEstimator.txx
index d011a0e524..5a063e690d 100644
--- a/Code/Learning/otbSVMModelEstimator.txx
+++ b/Code/Learning/otbSVMModelEstimator.txx
@@ -25,13 +25,12 @@
#include "otbMacro.h"
#include "itkCommand.h"
-
namespace otb
{
template<class InputPixelType, class LabelPixelType>
SVMModelEstimator<InputPixelType, LabelPixelType>
-::SVMModelEstimator(void):
- m_NumberOfClasses( 0 )
+::SVMModelEstimator(void) :
+ m_NumberOfClasses(0)
{
// Cross validation accuracy measures
m_InitialCrossValidationAccuracy = 0.;
@@ -43,15 +42,15 @@ SVMModelEstimator<InputPixelType, LabelPixelType>
this->SetNumberOfInputs(0);
this->SetNumberOfOutputs(1);
- this->SetNthOutput(0,ModelType::New());
+ this->SetNthOutput(0, ModelType::New());
}
template<class InputPixelType, class LabelPixelType>
-typename SVMModelEstimator<InputPixelType,LabelPixelType>::ModelType *
+typename SVMModelEstimator<InputPixelType, LabelPixelType>::ModelType *
SVMModelEstimator<InputPixelType, LabelPixelType>
::GetModel()
{
- if(this->GetNumberOfOutputs()<1)
+ if (this->GetNumberOfOutputs() < 1)
{
return 0;
}
@@ -59,11 +58,11 @@ SVMModelEstimator<InputPixelType, LabelPixelType>
}
template<class InputPixelType, class LabelPixelType>
-const typename SVMModelEstimator<InputPixelType,LabelPixelType>::ModelType *
+const typename SVMModelEstimator<InputPixelType, LabelPixelType>::ModelType *
SVMModelEstimator<InputPixelType, LabelPixelType>
::GetModel() const
{
- if(this->GetNumberOfOutputs()<1)
+ if (this->GetNumberOfOutputs() < 1)
{
return 0;
}
@@ -81,12 +80,11 @@ SVMModelEstimator<InputPixelType, LabelPixelType>
template<class InputPixelType, class LabelPixelType>
void
SVMModelEstimator<InputPixelType, LabelPixelType>
-::PrintSelf( std::ostream& os, itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
-
-}// end PrintSelf
+ Superclass::PrintSelf(os, indent);
+} // end PrintSelf
/**
* Generate data (start the model building process)
@@ -94,7 +92,7 @@ SVMModelEstimator<InputPixelType, LabelPixelType>
template<class InputPixelType, class LabelPixelType>
void
SVMModelEstimator<InputPixelType, LabelPixelType>
-::GenerateData( )
+::GenerateData()
{
// Get the pointer to the output model
ModelType * outputPtr = this->GetModel();
@@ -104,15 +102,14 @@ SVMModelEstimator<InputPixelType, LabelPixelType>
// Prepare data
this->PrepareData();
-
+
// Compute accuracy and eventually optimize parameters
this->OptimizeParameters();
// Train the model
outputPtr->Train();
-}// end Generate data
-
+} // end Generate data
template<class InputPixelType, class LabelPixelType>
void
@@ -128,52 +125,52 @@ SVMModelEstimator<InputPixelType, LabelPixelType>
typename CrossValidationFunctionType::ParametersType initialParameters, coarseBestParameters, fineBestParameters;
- switch(this->GetModel()->GetKernelType())
- {
- case LINEAR:
- // C
- initialParameters.SetSize(1);
- initialParameters[0] = this->GetModel()->GetC();
- break;
-
- case POLY:
- // C, gamma and coef0
- initialParameters.SetSize(3);
- initialParameters[0] = this->GetModel()->GetC();
- initialParameters[1] = this->GetModel()->GetKernelGamma();
- initialParameters[2] = this->GetModel()->GetKernelCoef0();
- break;
-
- case RBF:
- // C and gamma
- initialParameters.SetSize(2);
- initialParameters[0] = this->GetModel()->GetC();
- initialParameters[1] = this->GetModel()->GetKernelGamma();
- break;
-
- case SIGMOID:
- // C, gamma and coef0
- initialParameters.SetSize(3);
- initialParameters[0] = this->GetModel()->GetC();
- initialParameters[1] = this->GetModel()->GetKernelGamma();
- initialParameters[2] = this->GetModel()->GetKernelCoef0();
- break;
-
- default:
- // Only C
- initialParameters.SetSize(1);
- initialParameters[0] = this->GetModel()->GetC();
- break;
- }
+ switch (this->GetModel()->GetKernelType())
+ {
+ case LINEAR:
+ // C
+ initialParameters.SetSize(1);
+ initialParameters[0] = this->GetModel()->GetC();
+ break;
+
+ case POLY:
+ // C, gamma and coef0
+ initialParameters.SetSize(3);
+ initialParameters[0] = this->GetModel()->GetC();
+ initialParameters[1] = this->GetModel()->GetKernelGamma();
+ initialParameters[2] = this->GetModel()->GetKernelCoef0();
+ break;
+
+ case RBF:
+ // C and gamma
+ initialParameters.SetSize(2);
+ initialParameters[0] = this->GetModel()->GetC();
+ initialParameters[1] = this->GetModel()->GetKernelGamma();
+ break;
+
+ case SIGMOID:
+ // C, gamma and coef0
+ initialParameters.SetSize(3);
+ initialParameters[0] = this->GetModel()->GetC();
+ initialParameters[1] = this->GetModel()->GetKernelGamma();
+ initialParameters[2] = this->GetModel()->GetKernelCoef0();
+ break;
+
+ default:
+ // Only C
+ initialParameters.SetSize(1);
+ initialParameters[0] = this->GetModel()->GetC();
+ break;
+ }
m_InitialCrossValidationAccuracy = crossValidationFunction->GetValue(initialParameters);
m_FinalCrossValidationAccuracy = m_InitialCrossValidationAccuracy;
- otbMsgDebugMacro(<<"Initial accuracy : "<<m_InitialCrossValidationAccuracy);
+ otbMsgDebugMacro(<< "Initial accuracy : " << m_InitialCrossValidationAccuracy);
- if(m_ParametersOptimization)
+ if (m_ParametersOptimization)
{
- otbMsgDebugMacro(<<"Model parameters optimization");
+ otbMsgDebugMacro(<< "Model parameters optimization");
typename ExhaustiveExponentialOptimizer::Pointer coarseOptimizer = ExhaustiveExponentialOptimizer::New();
typename ExhaustiveExponentialOptimizer::StepsType coarseNbSteps(initialParameters.Size());
@@ -186,8 +183,12 @@ SVMModelEstimator<InputPixelType, LabelPixelType>
coarseBestParameters = coarseOptimizer->GetMaximumMetricValuePosition();
- otbMsgDevMacro(<<"Coarse minimum accuracy: "<< coarseOptimizer->GetMinimumMetricValue() <<" "<< coarseOptimizer->GetMinimumMetricValuePosition());
- otbMsgDevMacro(<<"Coarse maximum accuracy: "<< coarseOptimizer->GetMaximumMetricValue() <<" "<< coarseOptimizer->GetMaximumMetricValuePosition());
+ otbMsgDevMacro(
+ << "Coarse minimum accuracy: " << coarseOptimizer->GetMinimumMetricValue() << " " <<
+ coarseOptimizer->GetMinimumMetricValuePosition());
+ otbMsgDevMacro(
+ << "Coarse maximum accuracy: " << coarseOptimizer->GetMaximumMetricValue() << " " <<
+ coarseOptimizer->GetMaximumMetricValuePosition());
typename ExhaustiveExponentialOptimizer::Pointer fineOptimizer = ExhaustiveExponentialOptimizer::New();
typename ExhaustiveExponentialOptimizer::StepsType fineNbSteps(initialParameters.Size());
@@ -201,48 +202,51 @@ SVMModelEstimator<InputPixelType, LabelPixelType>
fineOptimizer->SetInitialPosition(coarseBestParameters);
fineOptimizer->StartOptimization();
-
- otbMsgDevMacro(<<"Fine minimum accuracy: "<< fineOptimizer->GetMinimumMetricValue() << " " << fineOptimizer->GetMinimumMetricValuePosition());
- otbMsgDevMacro(<<"Fine maximum accuracy: "<< fineOptimizer->GetMaximumMetricValue() << " " << fineOptimizer->GetMaximumMetricValuePosition());
+ otbMsgDevMacro(
+ << "Fine minimum accuracy: " << fineOptimizer->GetMinimumMetricValue() << " " <<
+ fineOptimizer->GetMinimumMetricValuePosition());
+ otbMsgDevMacro(
+ << "Fine maximum accuracy: " << fineOptimizer->GetMaximumMetricValue() << " " <<
+ fineOptimizer->GetMaximumMetricValuePosition());
fineBestParameters = fineOptimizer->GetMaximumMetricValuePosition();
m_FinalCrossValidationAccuracy = fineOptimizer->GetMaximumMetricValue();
- switch(this->GetModel()->GetKernelType())
+ switch (this->GetModel()->GetKernelType())
{
- case LINEAR:
- // C
- this->GetModel()->SetC(fineBestParameters[0]);
- break;
-
- case POLY:
- // C, gamma and coef0
- this->GetModel()->SetC(fineBestParameters[0]);
- this->GetModel()->SetKernelGamma(fineBestParameters[1]);
- this->GetModel()->SetKernelCoef0(fineBestParameters[2]);
- break;
-
- case RBF:
- // C and gamma
- this->GetModel()->SetC(fineBestParameters[0]);
- this->GetModel()->SetKernelGamma(fineBestParameters[1]);
- break;
-
- case SIGMOID:
- // C, gamma and coef0
- this->GetModel()->SetC(fineBestParameters[0]);
- this->GetModel()->SetKernelGamma(fineBestParameters[1]);
- this->GetModel()->SetKernelCoef0(fineBestParameters[2]);
- break;
-
- default:
- // Only C
- this->GetModel()->SetC(fineBestParameters[0]);
- break;
+ case LINEAR:
+ // C
+ this->GetModel()->SetC(fineBestParameters[0]);
+ break;
+
+ case POLY:
+ // C, gamma and coef0
+ this->GetModel()->SetC(fineBestParameters[0]);
+ this->GetModel()->SetKernelGamma(fineBestParameters[1]);
+ this->GetModel()->SetKernelCoef0(fineBestParameters[2]);
+ break;
+
+ case RBF:
+ // C and gamma
+ this->GetModel()->SetC(fineBestParameters[0]);
+ this->GetModel()->SetKernelGamma(fineBestParameters[1]);
+ break;
+
+ case SIGMOID:
+ // C, gamma and coef0
+ this->GetModel()->SetC(fineBestParameters[0]);
+ this->GetModel()->SetKernelGamma(fineBestParameters[1]);
+ this->GetModel()->SetKernelCoef0(fineBestParameters[2]);
+ break;
+
+ default:
+ // Only C
+ this->GetModel()->SetC(fineBestParameters[0]);
+ break;
}
}
}
-}//End namespace OTB
+} //End namespace OTB
#endif
diff --git a/Code/Learning/otbSVMPointSetModelEstimator.h b/Code/Learning/otbSVMPointSetModelEstimator.h
index 06075c4fc4..3a7e7be601 100644
--- a/Code/Learning/otbSVMPointSetModelEstimator.h
+++ b/Code/Learning/otbSVMPointSetModelEstimator.h
@@ -44,17 +44,20 @@ namespace otb
*
* \ingroup ClassificationFilters
*/
-template <class TInputPointSet,class TTrainingPointSet>
+template <class TInputPointSet, class TTrainingPointSet>
class ITK_EXPORT SVMPointSetModelEstimator :
- public SVMModelEstimator<typename TInputPointSet::PixelType::value_type, typename TTrainingPointSet::PixelType>
+ public SVMModelEstimator<typename TInputPointSet::PixelType::value_type, typename TTrainingPointSet::PixelType>
{
public:
/** Standard class typedefs. */
- typedef SVMPointSetModelEstimator Self;
- typedef SVMModelEstimator<typename TInputPointSet::PixelType::value_type, typename TTrainingPointSet::PixelType> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef SVMPointSetModelEstimator Self;
+ typedef SVMModelEstimator<typename TInputPointSet::PixelType::value_type,
+ typename TTrainingPointSet::PixelType> Superclass;
+ typedef itk::SmartPointer<Self>
+ Pointer;
+ typedef itk::SmartPointer<const Self>
+ ConstPointer;
+
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -62,7 +65,7 @@ public:
itkTypeMacro(SVMPointSetModelEstimator, SVMModelEstimator);
/** Type definition for the input image. */
- typedef typename TInputPointSet::Pointer InputPointSetPointer;
+ typedef typename TInputPointSet::Pointer InputPointSetPointer;
/** Type definitions for the training image. */
typedef typename TTrainingPointSet::Pointer TrainingPointSetPointer;
@@ -78,7 +81,7 @@ public:
/** Type definitions for the iterators for the input and training images. */
typedef typename
- TInputPointSet::PointsContainerConstIterator InputPointSetIteratorType;
+ TInputPointSet::PointsContainerConstIterator InputPointSetIteratorType;
typedef typename
TTrainingPointSet::PointsContainerConstIterator TrainingPointSetIteratorType;
@@ -93,7 +96,7 @@ public:
/** Get the training image */
const TTrainingPointSet * GetTrainingPointSet();
-
+
protected:
/** Constructor */
SVMPointSetModelEstimator();
@@ -105,8 +108,8 @@ protected:
virtual void PrepareData();
private:
- SVMPointSetModelEstimator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SVMPointSetModelEstimator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
}; // class SVMPointSetModelEstimator
@@ -116,6 +119,4 @@ private:
#include "otbSVMPointSetModelEstimator.txx"
#endif
-
#endif
-
diff --git a/Code/Learning/otbSVMPointSetModelEstimator.txx b/Code/Learning/otbSVMPointSetModelEstimator.txx
index fffb151472..b2e1dcda18 100644
--- a/Code/Learning/otbSVMPointSetModelEstimator.txx
+++ b/Code/Learning/otbSVMPointSetModelEstimator.txx
@@ -25,16 +25,16 @@
namespace otb
{
template<class TInputPointSet,
-class TTrainingPointSet>
+ class TTrainingPointSet>
SVMPointSetModelEstimator<TInputPointSet, TTrainingPointSet>
-::SVMPointSetModelEstimator(void): SVMModelEstimator<ITK_TYPENAME TInputPointSet::PixelType::value_type,
- ITK_TYPENAME TTrainingPointSet::PixelType>()
+::SVMPointSetModelEstimator(void) : SVMModelEstimator<ITK_TYPENAME TInputPointSet::PixelType::value_type,
+ ITK_TYPENAME TTrainingPointSet::PixelType>()
{
this->SetNumberOfRequiredInputs(2);
}
template<class TInputPointSet,
-class TTrainingPointSet>
+ class TTrainingPointSet>
SVMPointSetModelEstimator<TInputPointSet, TTrainingPointSet>
::~SVMPointSetModelEstimator(void)
{}
@@ -43,30 +43,28 @@ SVMPointSetModelEstimator<TInputPointSet, TTrainingPointSet>
* PrintSelf
*/
template<class TInputPointSet,
-class TTrainingPointSet>
+ class TTrainingPointSet>
void
SVMPointSetModelEstimator<TInputPointSet, TTrainingPointSet>
-::PrintSelf( std::ostream& os, itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
-}// end PrintSelf
-
+ Superclass::PrintSelf(os, indent);
+} // end PrintSelf
template<class TInputPointSet, class TTrainingPointSet>
void
SVMPointSetModelEstimator<TInputPointSet, TTrainingPointSet>
::SetInputPointSet(const TInputPointSet * inputPointSet)
{
- this->itk::ProcessObject::SetNthInput(0,const_cast<TInputPointSet *>(inputPointSet));
+ this->itk::ProcessObject::SetNthInput(0, const_cast<TInputPointSet *>(inputPointSet));
}
-
template<class TInputPointSet, class TTrainingPointSet>
void
SVMPointSetModelEstimator<TInputPointSet, TTrainingPointSet>
::SetTrainingPointSet(const TTrainingPointSet * trainingPointSet)
{
- this->itk::ProcessObject::SetNthInput(1,const_cast<TTrainingPointSet*>(trainingPointSet));
+ this->itk::ProcessObject::SetNthInput(1, const_cast<TTrainingPointSet*>(trainingPointSet));
}
template<class TInputPointSet, class TTrainingPointSet>
@@ -74,7 +72,7 @@ const TInputPointSet *
SVMPointSetModelEstimator<TInputPointSet, TTrainingPointSet>
::GetInputPointSet()
{
- if(this->GetNumberOfInputs()<1)
+ if (this->GetNumberOfInputs() < 1)
{
return 0;
}
@@ -86,7 +84,7 @@ const TTrainingPointSet *
SVMPointSetModelEstimator<TInputPointSet, TTrainingPointSet>
::GetTrainingPointSet()
{
- if(this->GetNumberOfInputs()<2)
+ if (this->GetNumberOfInputs() < 2)
{
return 0;
}
@@ -97,64 +95,68 @@ SVMPointSetModelEstimator<TInputPointSet, TTrainingPointSet>
* Generate data (start the model building process)
*/
template<class TInputPointSet,
-class TTrainingPointSet>
+ class TTrainingPointSet>
void
SVMPointSetModelEstimator<TInputPointSet, TTrainingPointSet>
::PrepareData()
{
//Do some error checking
- const TInputPointSet * inputPointSet = this->GetInputPointSet();
- const TTrainingPointSet * trainingPointSet = this->GetTrainingPointSet();
+ const TInputPointSet * inputPointSet = this->GetInputPointSet();
+ const TTrainingPointSet * trainingPointSet = this->GetTrainingPointSet();
typename Superclass::ModelType * model = this->GetModel();
- int inputPointSetSize = inputPointSet->GetNumberOfPoints();
+ int inputPointSetSize = inputPointSet->GetNumberOfPoints();
int trainingPointSetSize = trainingPointSet->GetNumberOfPoints();
// Check if size of the two inputs are same
- if ( inputPointSetSize != trainingPointSetSize ) throw itk::ExceptionObject(__FILE__, __LINE__,"Input pointset size is not the same as the training pointset size.",ITK_LOCATION);
+ if (inputPointSetSize != trainingPointSetSize) throw itk::ExceptionObject(
+ __FILE__,
+ __LINE__,
+ "Input pointset size is not the same as the training pointset size.",
+ ITK_LOCATION);
// Declaration of the iterators on the input and training images
- InputPointSetIteratorType inIt = inputPointSet->GetPoints()->Begin();
+ InputPointSetIteratorType inIt = inputPointSet->GetPoints()->Begin();
TrainingPointSetIteratorType trIt = trainingPointSet->GetPoints()->Begin();
- InputPointSetIteratorType inEnd = inputPointSet->GetPoints()->End();
+ InputPointSetIteratorType inEnd = inputPointSet->GetPoints()->End();
TrainingPointSetIteratorType trEnd = trainingPointSet->GetPoints()->End();
// Erase previous samples
model->ClearSamples();
- otbMsgDevMacro( << " Input nb points " << inputPointSetSize );
- otbMsgDevMacro( << " Training nb points " << trainingPointSetSize );
+ otbMsgDevMacro(<< " Input nb points " << inputPointSetSize);
+ otbMsgDevMacro(<< " Training nb points " << trainingPointSetSize);
unsigned int dataId = 0;
- while (inIt!=inEnd && trIt!=trEnd)
- {
- typename TTrainingPointSet::PixelType label = itk::NumericTraits<typename TTrainingPointSet::PixelType>::Zero;
- trainingPointSet->GetPointData( dataId, & label );
-
- otbMsgDevMacro( << " Label " << label );
-
- typename TInputPointSet::PixelType value;
- inputPointSet->GetPointData( dataId, & value );
-
- typename Superclass::ModelType::MeasurementType v;
-
- typename TInputPointSet::PixelType::iterator pIt = value.begin();
- typename TInputPointSet::PixelType::iterator pEnd = value.end();
-
- while (pIt!=pEnd)
+ while (inIt != inEnd && trIt != trEnd)
{
- v.push_back(*pIt);
- ++pIt;
+ typename TTrainingPointSet::PixelType label = itk::NumericTraits<typename TTrainingPointSet::PixelType>::Zero;
+ trainingPointSet->GetPointData(dataId, &label);
+
+ otbMsgDevMacro(<< " Label " << label);
+
+ typename TInputPointSet::PixelType value;
+ inputPointSet->GetPointData(dataId, &value);
+
+ typename Superclass::ModelType::MeasurementType v;
+
+ typename TInputPointSet::PixelType::iterator pIt = value.begin();
+ typename TInputPointSet::PixelType::iterator pEnd = value.end();
+
+ while (pIt != pEnd)
+ {
+ v.push_back(*pIt);
+ ++pIt;
+ }
+
+ model->AddSample(v, label);
+
+ ++inIt;
+ ++trIt;
+ ++dataId;
}
-
- model->AddSample(v,label);
-
- ++inIt;
- ++trIt;
- ++dataId;
- }
}
-}//End namespace OTB
+} //End namespace OTB
#endif
diff --git a/Code/Learning/otbSVMSampleListModelEstimator.h b/Code/Learning/otbSVMSampleListModelEstimator.h
index c34c73b61b..3fde9b74f5 100644
--- a/Code/Learning/otbSVMSampleListModelEstimator.h
+++ b/Code/Learning/otbSVMSampleListModelEstimator.h
@@ -37,14 +37,14 @@ template <class TVector>
class VectorToMeasurementVectorFunctor
{
public:
- typedef TVector VectorType;
+ typedef TVector VectorType;
typedef std::vector<typename VectorType::ValueType> MeasurementVectorType;
- inline MeasurementVectorType operator()(const VectorType & value) const
+ inline MeasurementVectorType operator ()(const VectorType& value) const
{
MeasurementVectorType output;
- for(unsigned int i = 0; i<value.Size();++i)
+ for (unsigned int i = 0; i < value.Size(); ++i)
{
output.push_back(value[i]);
}
@@ -61,18 +61,18 @@ template <class TVector>
class VariableLengthVectorToMeasurementVectorFunctor
{
public:
- typedef TVector VectorType;
+ typedef TVector VectorType;
typedef std::vector<typename VectorType::ValueType> MeasurementVectorType;
- inline MeasurementVectorType operator()(const VectorType & value) const
+ inline MeasurementVectorType operator ()(const VectorType& value) const
{
MeasurementVectorType output;
-
- for(unsigned int i = 0; i < value.GetNumberOfElements(); ++i)
+
+ for (unsigned int i = 0; i < value.GetNumberOfElements(); ++i)
{
output.push_back(value.GetElement(i));
}
-
+
return output;
}
};
@@ -101,19 +101,20 @@ public:
* \ingroup ClassificationFilters
*/
template <class TInputSampleList,
-class TTrainingSampleList, class TMeasurementFunctor = Functor::VectorToMeasurementVectorFunctor<typename TInputSampleList::MeasurementVectorType > >
-class ITK_EXPORT SVMSampleListModelEstimator:
- public SVMModelEstimator<typename TInputSampleList::MeasurementType, typename TTrainingSampleList::MeasurementType>
+ class TTrainingSampleList, class TMeasurementFunctor =
+ Functor::VectorToMeasurementVectorFunctor<typename TInputSampleList::MeasurementVectorType> >
+class ITK_EXPORT SVMSampleListModelEstimator :
+ public SVMModelEstimator<typename TInputSampleList::MeasurementType, typename TTrainingSampleList::MeasurementType>
{
public:
/** Standard class typedefs. */
- typedef SVMSampleListModelEstimator Self;
+ typedef SVMSampleListModelEstimator Self;
typedef SVMModelEstimator<typename TInputSampleList::MeasurementType,
- typename TTrainingSampleList::MeasurementType>
+ typename TTrainingSampleList::MeasurementType>
Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -123,7 +124,7 @@ public:
/** Type definition for the input image. */
/** Type definitions for the training image. */
- typedef typename TInputSampleList::Pointer InputSampleListPointer;
+ typedef typename TInputSampleList::Pointer InputSampleListPointer;
/** Type definitions for the training image. */
typedef typename TTrainingSampleList::Pointer TrainingSampleListPointer;
@@ -138,7 +139,7 @@ public:
/** Type definitions for the iterators for the input and training images. */
typedef typename
- TInputSampleList::ConstIterator InputSampleListIteratorType;
+ TInputSampleList::ConstIterator InputSampleListIteratorType;
typedef typename
TTrainingSampleList::ConstIterator TrainingSampleListIteratorType;
@@ -146,17 +147,16 @@ public:
typedef TMeasurementFunctor MeasurementFunctorType;
/** Set the input image. */
- itkSetObjectMacro(InputSampleList,TInputSampleList);
+ itkSetObjectMacro(InputSampleList, TInputSampleList);
/** Get the input image. */
- itkGetObjectMacro(InputSampleList,TInputSampleList);
-
+ itkGetObjectMacro(InputSampleList, TInputSampleList);
/** Set the training image. */
- itkSetMacro(TrainingSampleList,TrainingSampleListPointer);
+ itkSetMacro(TrainingSampleList, TrainingSampleListPointer);
/** Get the training image. */
- itkGetMacro(TrainingSampleList,TrainingSampleListPointer);
+ itkGetMacro(TrainingSampleList, TrainingSampleListPointer);
protected:
/** Constructor */
@@ -170,11 +170,11 @@ protected:
virtual void PrepareData();
private:
- SVMSampleListModelEstimator(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ SVMSampleListModelEstimator(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- TrainingSampleListPointer m_TrainingSampleList;
- InputSampleListPointer m_InputSampleList;
+ TrainingSampleListPointer m_TrainingSampleList;
+ InputSampleListPointer m_InputSampleList;
}; // class SVMSampleListModelEstimator
@@ -184,6 +184,4 @@ private:
#include "otbSVMSampleListModelEstimator.txx"
#endif
-
#endif
-
diff --git a/Code/Learning/otbSVMSampleListModelEstimator.txx b/Code/Learning/otbSVMSampleListModelEstimator.txx
index f62f14fed4..e2ac4eb5bb 100644
--- a/Code/Learning/otbSVMSampleListModelEstimator.txx
+++ b/Code/Learning/otbSVMSampleListModelEstimator.txx
@@ -26,14 +26,14 @@
namespace otb
{
template<class TInputSampleList,
-class TTrainingSampleList, class TMeasurementFunctor>
+ class TTrainingSampleList, class TMeasurementFunctor>
SVMSampleListModelEstimator<TInputSampleList, TTrainingSampleList, TMeasurementFunctor>
-::SVMSampleListModelEstimator(void): SVMModelEstimator<ITK_TYPENAME TInputSampleList::MeasurementType,
- ITK_TYPENAME TTrainingSampleList::MeasurementType>()
+::SVMSampleListModelEstimator(void) : SVMModelEstimator<ITK_TYPENAME TInputSampleList::MeasurementType,
+ ITK_TYPENAME TTrainingSampleList::MeasurementType>()
{}
template<class TInputSampleList,
-class TTrainingSampleList, class TMeasurementFunctor>
+ class TTrainingSampleList, class TMeasurementFunctor>
SVMSampleListModelEstimator<TInputSampleList, TTrainingSampleList, TMeasurementFunctor>
::~SVMSampleListModelEstimator(void)
{}
@@ -42,59 +42,62 @@ SVMSampleListModelEstimator<TInputSampleList, TTrainingSampleList, TMeasurementF
* PrintSelf
*/
template<class TInputSampleList,
-class TTrainingSampleList, class TMeasurementFunctor>
+ class TTrainingSampleList, class TMeasurementFunctor>
void
SVMSampleListModelEstimator<TInputSampleList, TTrainingSampleList, TMeasurementFunctor>
-::PrintSelf( std::ostream& os, itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
-}// end PrintSelf
-
+ Superclass::PrintSelf(os, indent);
+} // end PrintSelf
/**
* Generate data (start the model building process)
*/
template<class TInputSampleList,
-class TTrainingSampleList, class TMeasurementFunctor>
+ class TTrainingSampleList, class TMeasurementFunctor>
void
SVMSampleListModelEstimator<TInputSampleList, TTrainingSampleList, TMeasurementFunctor>
::PrepareData()
{
//Do some error checking
- InputSampleListPointer inputSampleList = this->GetInputSampleList();
- TrainingSampleListPointer trainingSampleList = this->GetTrainingSampleList();
+ InputSampleListPointer inputSampleList = this->GetInputSampleList();
+ TrainingSampleListPointer trainingSampleList = this->GetTrainingSampleList();
typename Superclass::ModelType * model = this->GetModel();
- int inputSampleListSize = inputSampleList->Size();
+ int inputSampleListSize = inputSampleList->Size();
int trainingSampleListSize = trainingSampleList->Size();
// Check if size of the two inputs are same
- if ( inputSampleListSize != trainingSampleListSize ) throw itk::ExceptionObject(__FILE__, __LINE__,"Input pointset size is not the same as the training pointset size.",ITK_LOCATION);
-
+ if (inputSampleListSize != trainingSampleListSize) throw itk::ExceptionObject(
+ __FILE__,
+ __LINE__,
+ "Input pointset size is not the same as the training pointset size.",
+ ITK_LOCATION);
+
// Declaration of the iterators on the input and training images
- InputSampleListIteratorType inIt = inputSampleList->Begin();
+ InputSampleListIteratorType inIt = inputSampleList->Begin();
TrainingSampleListIteratorType trIt = trainingSampleList->Begin();
- InputSampleListIteratorType inEnd = inputSampleList->End();
+ InputSampleListIteratorType inEnd = inputSampleList->End();
TrainingSampleListIteratorType trEnd = trainingSampleList->End();
// Clear previous samples
model->ClearSamples();
- otbMsgDebugMacro( << " Input nb points " << inputSampleListSize );
- otbMsgDebugMacro( << " Training nb points " << trainingSampleListSize );
+ otbMsgDebugMacro(<< " Input nb points " << inputSampleListSize);
+ otbMsgDebugMacro(<< " Training nb points " << trainingSampleListSize);
MeasurementFunctorType mfunctor;
- while (inIt!=inEnd && trIt!=trEnd)
- {
+ while (inIt != inEnd && trIt != trEnd)
+ {
typename TTrainingSampleList::MeasurementType label =
trIt.GetMeasurementVector()[0];
typename TInputSampleList::MeasurementVectorType value =
inIt.GetMeasurementVector();
- model->AddSample(mfunctor(value),label);
+ model->AddSample(mfunctor(value), label);
++inIt;
++trIt;
- }
+ }
}
-}//End namespace OTB
+} //End namespace OTB
#endif
diff --git a/Code/Learning/otbSpectralAngleKernelFunctor.cxx b/Code/Learning/otbSpectralAngleKernelFunctor.cxx
index 04b22fcca7..ef0996eff8 100644
--- a/Code/Learning/otbSpectralAngleKernelFunctor.cxx
+++ b/Code/Learning/otbSpectralAngleKernelFunctor.cxx
@@ -27,45 +27,41 @@ namespace otb
SpectralAngleKernelFunctor
::SpectralAngleKernelFunctor ()
- : GenericKernelFunctorBase ()
+ : GenericKernelFunctorBase ()
{
m_Coef = 2.0;
- SetValue( "Coef", m_Coef );
+ SetValue("Coef", m_Coef);
}
void
SpectralAngleKernelFunctor
-::Update ()
+::Update()
{
- m_Coef = GetValue<double>( "Coef" );
+ m_Coef = GetValue<double>("Coef");
}
double
SpectralAngleKernelFunctor
-::operator()( const svm_node * x, const svm_node * y,
- const svm_parameter & /*param*/ ) const
+::operator ()(const svm_node * x, const svm_node * y,
+ const svm_parameter& /*param*/) const
{
- double mq = m_Coef + SAM( x, y );
+ double mq = m_Coef + SAM(x, y);
- if ( mq == 0.0 )
- return DBL_MAX;
+ if (mq == 0.0) return DBL_MAX;
- return 1.0 / sqrt( mq );
+ return 1.0 / sqrt(mq);
}
double
SpectralAngleKernelFunctor
-::SAM ( const svm_node * x, const svm_node * y ) const
+::SAM(const svm_node * x, const svm_node * y) const
{
- double den = dot(x,x) * dot(y,y);
- if ( den <= 0.0 )
- return 0.0;
+ double den = dot(x, x) * dot(y, y);
+ if (den <= 0.0) return 0.0;
- double ss = dot(x,y);
- return /*acos*/( ss / sqrt( den ) );
+ double ss = dot(x, y);
+ return /*acos*/ (ss / sqrt(den));
}
}
-
-
diff --git a/Code/Learning/otbSpectralAngleKernelFunctor.h b/Code/Learning/otbSpectralAngleKernelFunctor.h
index 2e7b659fbe..e183ae12c3 100644
--- a/Code/Learning/otbSpectralAngleKernelFunctor.h
+++ b/Code/Learning/otbSpectralAngleKernelFunctor.h
@@ -42,32 +42,27 @@ namespace otb
*
*/
-
class SpectralAngleKernelFunctor
- : public GenericKernelFunctorBase
+ : public GenericKernelFunctorBase
{
public:
-
- double operator() ( const svm_node * x, const svm_node * y,
- const svm_parameter & param ) const;
+ double operator ()(const svm_node * x, const svm_node * y,
+ const svm_parameter& param) const;
SpectralAngleKernelFunctor ();
- virtual ~SpectralAngleKernelFunctor () { }
+ virtual ~SpectralAngleKernelFunctor () {}
/** Specific implementation of \code Update \endcode to split m_MapParameters
* into specific variables to speed up kernel evaluations */
- void Update ();
+ void Update();
protected:
- inline double SAM ( const svm_node * x, const svm_node * y ) const;
+ inline double SAM(const svm_node * x, const svm_node * y) const;
double m_Coef;
};
} // end of namespace otb
-
#endif
-
-
diff --git a/Code/Markov/otbMRFEnergy.h b/Code/Markov/otbMRFEnergy.h
index bee33cfedc..9075879d84 100644
--- a/Code/Markov/otbMRFEnergy.h
+++ b/Code/Markov/otbMRFEnergy.h
@@ -34,14 +34,14 @@ namespace otb
*
* \ingroup Markov
*/
-template< class TInput1, class TInput2 >
+template<class TInput1, class TInput2>
class ITK_EXPORT MRFEnergy : public itk::Object
{
public:
- typedef MRFEnergy Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MRFEnergy Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
typedef TInput1 InputImageType;
typedef TInput2 LabelledImageType;
@@ -49,88 +49,87 @@ public:
typedef typename LabelledImageType::PixelType LabelledImagePixelType;
typedef itk::ConstNeighborhoodIterator
- < LabelledImageType > LabelledNeighborhoodIterator;
+ <LabelledImageType> LabelledNeighborhoodIterator;
typedef itk::ConstNeighborhoodIterator
- < InputImageType > InputNeighborhoodIterator;
+ <InputImageType> InputNeighborhoodIterator;
- typedef itk::Array< double > ParametersType;
+ typedef itk::Array<double> ParametersType;
itkNewMacro(Self);
- itkTypeMacro(MRFEnergy,itk::Object);
-
+ itkTypeMacro(MRFEnergy, itk::Object);
itkSetMacro(NumberOfParameters, unsigned int);
itkGetConstMacro(NumberOfParameters, unsigned int);
// Get the parameters
- const ParametersType& GetParameters( void ) const
+ const ParametersType& GetParameters(void) const
{
return this->m_Parameters;
}
- void SetParameters( const ParametersType & parameters )
+ void SetParameters(const ParametersType& parameters)
{
- if ( parameters.Size() != m_NumberOfParameters )
- {
- itkExceptionMacro(<<"Invalid number of parameters");
- }
+ if (parameters.Size() != m_NumberOfParameters)
+ {
+ itkExceptionMacro(<< "Invalid number of parameters");
+ }
m_Parameters = parameters;
this->Modified();
}
- virtual double GetSingleValue(const InputImagePixelType & value1, const LabelledImagePixelType & value2)
+ virtual double GetSingleValue(const InputImagePixelType& value1, const LabelledImagePixelType& value2)
{
- itkExceptionMacro(<<"GetSingleValue() has to be declared in child classes.");
+ itkExceptionMacro(<< "GetSingleValue() has to be declared in child classes.");
}
- double GetValue(const InputImagePixelType & value1, const LabelledImagePixelType & value2)
+ double GetValue(const InputImagePixelType& value1, const LabelledImagePixelType& value2)
{
return GetSingleValue(value1, value2);
}
- double GetValue(const LabelledNeighborhoodIterator & it, const LabelledImagePixelType & value2)
+ double GetValue(const LabelledNeighborhoodIterator& it, const LabelledImagePixelType& value2)
{
- double result = 0.0;
- unsigned int centerIndex = it.GetCenterNeighborhoodIndex();
+ double result = 0.0;
+ unsigned int centerIndex = it.GetCenterNeighborhoodIndex();
InputImagePixelType value1; //TODO put also the other neighborhood ?
- bool isInside=false;
- unsigned int insideNeighbors = 0;
- for (unsigned long pos = 0; pos< it.Size(); ++pos)
- {
- if (pos != centerIndex)//TODO put outside loop for faster access ?
+ bool isInside = false;
+ unsigned int insideNeighbors = 0;
+ for (unsigned long pos = 0; pos < it.Size(); ++pos)
{
+ if (pos != centerIndex) //TODO put outside loop for faster access ?
+ {
value1 = it.GetPixel(pos, isInside);
if (isInside)
- {
+ {
result += GetSingleValue(value1, value2);
++insideNeighbors;
+ }
}
}
- }
- return result/insideNeighbors;
+ return result / insideNeighbors;
}
- double GetValue(const InputNeighborhoodIterator & it, const LabelledImagePixelType & value2)
+ double GetValue(const InputNeighborhoodIterator& it, const LabelledImagePixelType& value2)
{
- double result = 0.0;
- unsigned int centerIndex = it.GetCenterNeighborhoodIndex();
+ double result = 0.0;
+ unsigned int centerIndex = it.GetCenterNeighborhoodIndex();
InputImagePixelType value1; //TODO put also the other neighborhood ?
- bool isInside=false;
- unsigned int insideNeighbors = 0;
- for (unsigned long pos = 0; pos< it.Size(); ++pos)
- {
- if (pos != centerIndex)//TODO put outside loop for faster access ?
+ bool isInside = false;
+ unsigned int insideNeighbors = 0;
+ for (unsigned long pos = 0; pos < it.Size(); ++pos)
{
+ if (pos != centerIndex) //TODO put outside loop for faster access ?
+ {
value1 = it.GetPixel(pos, isInside);
if (isInside)
- {
+ {
result += GetSingleValue(value1, value2);
++insideNeighbors;
+ }
}
}
- }
- return result/insideNeighbors;
+ return result / insideNeighbors;
}
protected:
@@ -138,96 +137,91 @@ protected:
MRFEnergy() :
m_NumberOfParameters(1),
m_Parameters(0)
- {};
- virtual ~MRFEnergy() {};
- unsigned int m_NumberOfParameters;
+ {};
+ virtual ~MRFEnergy() {}
+ unsigned int m_NumberOfParameters;
ParametersType m_Parameters;
};
-
-template< class TInput2>
-class ITK_EXPORT MRFEnergy<TInput2,TInput2> : public itk::Object
+template<class TInput2>
+class ITK_EXPORT MRFEnergy<TInput2, TInput2> : public itk::Object
{
public:
- typedef MRFEnergy Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MRFEnergy Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef TInput2 LabelledImageType;
- typedef typename LabelledImageType::PixelType LabelledImagePixelType;
+ typedef TInput2 LabelledImageType;
+ typedef typename LabelledImageType::PixelType LabelledImagePixelType;
typedef itk::ConstNeighborhoodIterator
- < LabelledImageType > LabelledNeighborhoodIterator;
- typedef itk::Array< double > ParametersType;
+ <LabelledImageType> LabelledNeighborhoodIterator;
+ typedef itk::Array<double> ParametersType;
itkNewMacro(Self);
itkTypeMacro(MRFEnergy, itk::Object);
-
itkSetMacro(NumberOfParameters, unsigned int);
itkGetConstMacro(NumberOfParameters, unsigned int);
-
// Get the parameters
- const ParametersType& GetParameters( void ) const
+ const ParametersType& GetParameters(void) const
{
return this->m_Parameters;
}
-
- void SetParameters( const ParametersType & parameters )
+ void SetParameters(const ParametersType& parameters)
{
- if ( parameters.Size() != m_NumberOfParameters )
- {
- itkExceptionMacro(<<"Invalid number of parameters");
- }
+ if (parameters.Size() != m_NumberOfParameters)
+ {
+ itkExceptionMacro(<< "Invalid number of parameters");
+ }
m_Parameters = parameters;
this->Modified();
}
- virtual double GetSingleValue(const LabelledImagePixelType & value1, const LabelledImagePixelType & value2)
+ virtual double GetSingleValue(const LabelledImagePixelType& value1, const LabelledImagePixelType& value2)
{
- itkExceptionMacro(<<"GetSingleValue() has to be declared in child classes.");
+ itkExceptionMacro(<< "GetSingleValue() has to be declared in child classes.");
}
- double GetValue(const LabelledImagePixelType & value1, const LabelledImagePixelType & value2)
+ double GetValue(const LabelledImagePixelType& value1, const LabelledImagePixelType& value2)
{
return GetSingleValue(value1, value2);
}
- double GetValue(const LabelledNeighborhoodIterator & it, const LabelledImagePixelType & value2)
+ double GetValue(const LabelledNeighborhoodIterator& it, const LabelledImagePixelType& value2)
{
- double result = 0.0;
- unsigned int centerIndex = it.GetCenterNeighborhoodIndex();
+ double result = 0.0;
+ unsigned int centerIndex = it.GetCenterNeighborhoodIndex();
LabelledImagePixelType value1; //TODO put also the other neighborhood ?
- bool isInside=false;
- unsigned int insideNeighbors = 0;
- for (unsigned long pos = 0; pos< it.Size(); ++pos)
- {
- if (pos != centerIndex)//TODO put outside loop for faster access ?
+ bool isInside = false;
+ unsigned int insideNeighbors = 0;
+ for (unsigned long pos = 0; pos < it.Size(); ++pos)
{
+ if (pos != centerIndex) //TODO put outside loop for faster access ?
+ {
value1 = it.GetPixel(pos, isInside);
if (isInside)
- {
+ {
result += GetSingleValue(value1, value2);
++insideNeighbors;
+ }
}
}
- }
- return result/insideNeighbors;
+ return result / insideNeighbors;
}
-
protected:
// The constructor and destructor.
- MRFEnergy():
+ MRFEnergy() :
m_NumberOfParameters(1),
m_Parameters(0)
- {};
- virtual ~MRFEnergy() {};
- unsigned int m_NumberOfParameters;
+ {};
+ virtual ~MRFEnergy() {}
+ unsigned int m_NumberOfParameters;
ParametersType m_Parameters;
};
}
diff --git a/Code/Markov/otbMRFEnergyEdgeFidelity.h b/Code/Markov/otbMRFEnergyEdgeFidelity.h
index 63b52c0e1e..b8e7317492 100644
--- a/Code/Markov/otbMRFEnergyEdgeFidelity.h
+++ b/Code/Markov/otbMRFEnergyEdgeFidelity.h
@@ -41,36 +41,35 @@ namespace otb
* \ingroup Markov
*/
-template< class TInput1, class TInput2>
-class ITK_EXPORT MRFEnergyEdgeFidelity : public MRFEnergy< TInput1, TInput2>
+template<class TInput1, class TInput2>
+class ITK_EXPORT MRFEnergyEdgeFidelity : public MRFEnergy<TInput1, TInput2>
{
public:
- typedef MRFEnergyEdgeFidelity Self;
- typedef MRFEnergy< TInput1, TInput2> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MRFEnergyEdgeFidelity Self;
+ typedef MRFEnergy<TInput1, TInput2> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef itk::ConstNeighborhoodIterator< TInput1 > NeighborhoodIterator;
- typedef typename TInput1::PixelType InputImagePixelType;
- typedef typename TInput2::PixelType LabelledImagePixelType;
+ typedef itk::ConstNeighborhoodIterator<TInput1> NeighborhoodIterator;
+ typedef typename TInput1::PixelType InputImagePixelType;
+ typedef typename TInput2::PixelType LabelledImagePixelType;
itkNewMacro(Self);
itkTypeMacro(MRFEnergyEdgeFidelity, MRFEnergy);
- double GetSingleValue(const InputImagePixelType & value1, const LabelledImagePixelType & value2)
+ double GetSingleValue(const InputImagePixelType& value1, const LabelledImagePixelType& value2)
{
double val1 = static_cast<double>(value1);
double val2 = static_cast<double>(value2);
- return vnl_math_sqr((val1 - val2))/(1+vnl_math_sqr(val1 - val2));
+ return vnl_math_sqr((val1 - val2)) / (1 + vnl_math_sqr(val1 - val2));
}
-
protected:
// The constructor and destructor.
MRFEnergyEdgeFidelity() {};
- virtual ~MRFEnergyEdgeFidelity() {};
+ virtual ~MRFEnergyEdgeFidelity() {}
};
}
diff --git a/Code/Markov/otbMRFEnergyGaussian.h b/Code/Markov/otbMRFEnergyGaussian.h
index 23a1914e44..2e50d26c84 100644
--- a/Code/Markov/otbMRFEnergyGaussian.h
+++ b/Code/Markov/otbMRFEnergyGaussian.h
@@ -43,40 +43,40 @@ namespace otb
* \ingroup Markov
*/
-template< class TInput1, class TInput2>
-class ITK_EXPORT MRFEnergyGaussian:public MRFEnergy< TInput1, TInput2>
+template<class TInput1, class TInput2>
+class ITK_EXPORT MRFEnergyGaussian : public MRFEnergy<TInput1, TInput2>
{
public:
- typedef MRFEnergyGaussian Self;
- typedef MRFEnergy< TInput1, TInput2> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MRFEnergyGaussian Self;
+ typedef MRFEnergy<TInput1, TInput2> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
typedef TInput1 InputImageType;
typedef TInput2 LabelledImageType;
typedef typename InputImageType::PixelType InputImagePixelType;
typedef typename LabelledImageType::PixelType LabelledImagePixelType;
- typedef itk::Array< double > ParametersType;
+ typedef itk::Array<double> ParametersType;
itkTypeMacro(MRFEnergyGaussian, MRFEnergy);
itkNewMacro(Self);
- double GetSingleValue(const InputImagePixelType & value1, const LabelledImagePixelType & value2)
+ double GetSingleValue(const InputImagePixelType& value1, const LabelledImagePixelType& value2)
{
return vnl_math_sqr((static_cast<double>(value1))
- - (static_cast<double>(value2)) );
+ - (static_cast<double>(value2)));
}
protected:
// The constructor and destructor.
MRFEnergyGaussian()
- {
+ {
this->m_NumberOfParameters = 0;
this->m_Parameters.SetSize(this->m_NumberOfParameters);
- };
- virtual ~MRFEnergyGaussian() {};
+ };
+ virtual ~MRFEnergyGaussian() {}
};
}
diff --git a/Code/Markov/otbMRFEnergyGaussianClassification.h b/Code/Markov/otbMRFEnergyGaussianClassification.h
index 457c1c084b..2cddf6cfc7 100644
--- a/Code/Markov/otbMRFEnergyGaussianClassification.h
+++ b/Code/Markov/otbMRFEnergyGaussianClassification.h
@@ -40,20 +40,20 @@ namespace otb
* \ingroup Markov
*/
-template< class TInput1, class TInput2>
-class ITK_EXPORT MRFEnergyGaussianClassification:public MRFEnergy< TInput1, TInput2>
+template<class TInput1, class TInput2>
+class ITK_EXPORT MRFEnergyGaussianClassification : public MRFEnergy<TInput1, TInput2>
{
public:
- typedef MRFEnergyGaussianClassification Self;
- typedef MRFEnergy< TInput1, TInput2> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MRFEnergyGaussianClassification Self;
+ typedef MRFEnergy<TInput1, TInput2> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
typedef TInput1 InputImageType;
typedef TInput2 LabelledImageType;
typedef typename InputImageType::PixelType InputImagePixelType;
typedef typename LabelledImageType::PixelType LabelledImagePixelType;
- typedef itk::Array < double > ParametersType;
+ typedef itk::Array <double> ParametersType;
itkNewMacro(Self);
@@ -66,28 +66,25 @@ public:
this->Modified();
}
-
- double GetSingleValue(const InputImagePixelType & value1, const LabelledImagePixelType & value2)
+ double GetSingleValue(const InputImagePixelType& value1, const LabelledImagePixelType& value2)
{
- if ((unsigned int)value2 >= this->GetNumberOfParameters()/2)
- {
- itkExceptionMacro(<<"Number of parameters does not correspond to number of classes" );
- }
+ if ((unsigned int) value2 >= this->GetNumberOfParameters() / 2)
+ {
+ itkExceptionMacro(<< "Number of parameters does not correspond to number of classes");
+ }
double val1 = static_cast<double>(value1);
- double result = vnl_math_sqr(val1-this->m_Parameters[2*static_cast<int>(value2)])
- / (2*vnl_math_sqr(this->m_Parameters[2*static_cast<int>(value2)+1]))
- + vcl_log(vcl_sqrt(CONST_2PI)*this->m_Parameters[2*static_cast<int>(value2)+1]);
+ double result = vnl_math_sqr(val1 - this->m_Parameters[2 * static_cast<int>(value2)])
+ / (2 * vnl_math_sqr(this->m_Parameters[2 * static_cast<int>(value2) + 1]))
+ + vcl_log(vcl_sqrt(CONST_2PI) * this->m_Parameters[2 * static_cast<int>(value2) + 1]);
- return static_cast<double>( result );
+ return static_cast<double>(result);
}
-
-
protected:
// The constructor and destructor.
MRFEnergyGaussianClassification() {};
- virtual ~MRFEnergyGaussianClassification() {};
+ virtual ~MRFEnergyGaussianClassification() {}
};
}
diff --git a/Code/Markov/otbMRFEnergyPotts.h b/Code/Markov/otbMRFEnergyPotts.h
index b90ed696af..f675ec4041 100644
--- a/Code/Markov/otbMRFEnergyPotts.h
+++ b/Code/Markov/otbMRFEnergyPotts.h
@@ -41,47 +41,47 @@ namespace otb
* \ingroup Markov
*/
-template< class TInput1, class TInput2>
-class ITK_EXPORT MRFEnergyPotts:public MRFEnergy< TInput1, TInput2>
+template<class TInput1, class TInput2>
+class ITK_EXPORT MRFEnergyPotts : public MRFEnergy<TInput1, TInput2>
{
public:
- typedef MRFEnergyPotts Self;
- typedef MRFEnergy< TInput1, TInput2> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MRFEnergyPotts Self;
+ typedef MRFEnergy<TInput1, TInput2> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
typedef TInput1 InputImageType;
typedef TInput2 LabelledImageType;
typedef typename InputImageType::PixelType InputImagePixelType;
typedef typename LabelledImageType::PixelType LabelledImagePixelType;
- typedef itk::Array< double > ParametersType;
+ typedef itk::Array<double> ParametersType;
itkTypeMacro(MRFEnergyPotts, MRFEnergy);
itkNewMacro(Self);
- double GetSingleValue(const InputImagePixelType & value1, const LabelledImagePixelType & value2)
+ double GetSingleValue(const InputImagePixelType& value1, const LabelledImagePixelType& value2)
{
if (value1 != value2)
- {
+ {
return this->m_Parameters[0];
- }
+ }
else
- {
+ {
return -this->m_Parameters[0];
- }
+ }
}
protected:
// The constructor and destructor.
MRFEnergyPotts()
- {
+ {
this->m_NumberOfParameters = 1;
this->m_Parameters.SetSize(this->m_NumberOfParameters);
this->m_Parameters[0] = 1.0;
- };
- virtual ~MRFEnergyPotts() {};
+ };
+ virtual ~MRFEnergyPotts() {}
};
}
diff --git a/Code/Markov/otbMRFOptimizer.h b/Code/Markov/otbMRFOptimizer.h
index f0cc46d260..17708f2a6e 100644
--- a/Code/Markov/otbMRFOptimizer.h
+++ b/Code/Markov/otbMRFOptimizer.h
@@ -42,24 +42,25 @@ public:
typedef itk::Object Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
- typedef itk::Array< double > ParametersType;
+ typedef itk::Array<double> ParametersType;
itkTypeMacro(MRFOptimizer, itk::Object);
itkGetConstMacro(NumberOfParameters, unsigned int);
// Get the parameters
- const ParametersType& GetParameters( void ) const
+ const ParametersType& GetParameters(void) const
{
return this->m_Parameters;
}
- virtual void SetParameters( const ParametersType & parameters )
+ virtual void SetParameters(const ParametersType& parameters)
{
- if ( parameters.GetSize() != m_NumberOfParameters )
- {
- itkExceptionMacro(<<"Invalid number of parameters ("<<parameters.GetSize()<<" , "<<m_NumberOfParameters<<")");
- }
+ if (parameters.GetSize() != m_NumberOfParameters)
+ {
+ itkExceptionMacro(
+ << "Invalid number of parameters (" << parameters.GetSize() << " , " << m_NumberOfParameters << ")");
+ }
m_Parameters = parameters;
this->Modified();
}
@@ -70,13 +71,12 @@ protected:
MRFOptimizer() :
m_NumberOfParameters(1),
m_Parameters(1)
- {}
+ {}
virtual ~MRFOptimizer() {}
- unsigned int m_NumberOfParameters;
+ unsigned int m_NumberOfParameters;
ParametersType m_Parameters;
};
}
#endif
-
diff --git a/Code/Markov/otbMRFOptimizerICM.h b/Code/Markov/otbMRFOptimizerICM.h
index edad099c69..2f10ff4e29 100644
--- a/Code/Markov/otbMRFOptimizerICM.h
+++ b/Code/Markov/otbMRFOptimizerICM.h
@@ -45,22 +45,20 @@ public:
itkNewMacro(Self);
- itkTypeMacro(MRFOptimizerICM,MRFOptimizer);
-
+ itkTypeMacro(MRFOptimizerICM, MRFOptimizer);
inline bool Compute(double deltaEnergy)
{
if (deltaEnergy < 0)
- {
+ {
return true;
- }
+ }
else
- {
+ {
return false;
- }
+ }
}
-
protected:
MRFOptimizerICM() {}
virtual ~MRFOptimizerICM() {}
@@ -70,4 +68,3 @@ protected:
}
#endif
-
diff --git a/Code/Markov/otbMRFOptimizerMetropolis.h b/Code/Markov/otbMRFOptimizerMetropolis.h
index 9208762be8..a85e7fb33b 100644
--- a/Code/Markov/otbMRFOptimizerMetropolis.h
+++ b/Code/Markov/otbMRFOptimizerMetropolis.h
@@ -47,45 +47,44 @@ class ITK_EXPORT MRFOptimizerMetropolis : public MRFOptimizer
{
public:
- typedef MRFOptimizerMetropolis Self;
- typedef MRFOptimizer Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef Superclass::ParametersType ParametersType;
+ typedef MRFOptimizerMetropolis Self;
+ typedef MRFOptimizer Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef Superclass::ParametersType ParametersType;
typedef itk::Statistics::MersenneTwisterRandomVariateGenerator RandomGeneratorType;
itkNewMacro(Self);
- itkTypeMacro(MRFOptimizerMetropolis,MRFOptimizer);
+ itkTypeMacro(MRFOptimizerMetropolis, MRFOptimizer);
/** Set parameter to a one array filled with paramVal.*/
- void SetSingleParameter( double parameterVal )
+ void SetSingleParameter(double parameterVal)
{
this->m_Parameters.SetSize(1);
this->m_Parameters.Fill(parameterVal);
this->Modified();
}
-
inline bool Compute(double deltaEnergy)
{
if (deltaEnergy < 0)
- {
+ {
return true;
- }
+ }
if (deltaEnergy == 0)
- {
+ {
return false;
- }
+ }
else
- {
- double proba = vcl_exp(-(deltaEnergy)/this->m_Parameters[0]);
- if ( (m_Generator->GetIntegerVariate() % 10000) < proba*10000)
{
+ double proba = vcl_exp(-(deltaEnergy) / this->m_Parameters[0]);
+ if ((m_Generator->GetIntegerVariate() % 10000) < proba * 10000)
+ {
return true;
+ }
}
- }
return false;
}
@@ -101,13 +100,13 @@ public:
protected:
MRFOptimizerMetropolis()
- {
+ {
this->m_NumberOfParameters = 1;
this->m_Parameters.SetSize(1);
this->m_Parameters[0] = 1.0;
m_Generator = RandomGeneratorType::New();
m_Generator->SetSeed();
- }
+ }
virtual ~MRFOptimizerMetropolis() {}
RandomGeneratorType::Pointer m_Generator;
};
@@ -115,4 +114,3 @@ protected:
}
#endif
-
diff --git a/Code/Markov/otbMRFSampler.h b/Code/Markov/otbMRFSampler.h
index 23366024db..c3695ec1b5 100644
--- a/Code/Markov/otbMRFSampler.h
+++ b/Code/Markov/otbMRFSampler.h
@@ -35,31 +35,31 @@ namespace otb
* \ingroup Markov
*/
-template< class TInput1, class TInput2>
+template<class TInput1, class TInput2>
class ITK_EXPORT MRFSampler : public itk::Object
{
public:
- typedef MRFSampler Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MRFSampler Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
typedef itk::ConstNeighborhoodIterator
- < TInput1 > InputImageNeighborhoodIterator;
- typedef typename TInput1::PixelType InputImagePixelType;
+ <TInput1> InputImageNeighborhoodIterator;
+ typedef typename TInput1::PixelType InputImagePixelType;
typedef itk::NeighborhoodIterator
- < TInput2 > LabelledImageNeighborhoodIterator;
- typedef typename TInput2::PixelType LabelledImagePixelType;
+ <TInput2> LabelledImageNeighborhoodIterator;
+ typedef typename TInput2::PixelType LabelledImagePixelType;
- typedef MRFEnergy<TInput1, TInput2> EnergyFidelityType;
- typedef MRFEnergy<TInput2, TInput2> EnergyRegularizationType;
+ typedef MRFEnergy<TInput1, TInput2> EnergyFidelityType;
+ typedef MRFEnergy<TInput2, TInput2> EnergyRegularizationType;
- typedef typename EnergyFidelityType::Pointer EnergyFidelityPointer;
+ typedef typename EnergyFidelityType::Pointer EnergyFidelityPointer;
typedef typename EnergyRegularizationType::Pointer EnergyRegularizationPointer;
- itkTypeMacro(MRFSampler,Object);
+ itkTypeMacro(MRFSampler, Object);
itkSetMacro(NumberOfClasses, unsigned int);
itkGetMacro(NumberOfClasses, unsigned int);
@@ -74,40 +74,39 @@ public:
itkGetConstMacro(EnergyBefore, double);
itkGetConstMacro(EnergyAfter, double);
- itkSetObjectMacro( EnergyRegularization, EnergyRegularizationType);
- itkSetObjectMacro( EnergyFidelity, EnergyFidelityType);
+ itkSetObjectMacro(EnergyRegularization, EnergyRegularizationType);
+ itkSetObjectMacro(EnergyFidelity, EnergyFidelityType);
- virtual int Compute( const InputImageNeighborhoodIterator & itData,
- const LabelledImageNeighborhoodIterator & itRegul) = 0;
+ virtual int Compute(const InputImageNeighborhoodIterator& itData,
+ const LabelledImageNeighborhoodIterator& itRegul) = 0;
protected:
unsigned int m_NumberOfClasses;
- double m_EnergyBefore;
- double m_EnergyAfter;
- double m_DeltaEnergy;
- double m_EnergyCurrent;
- double m_Lambda;
-
- LabelledImagePixelType m_Value;
- EnergyRegularizationPointer m_EnergyRegularization;
- EnergyFidelityPointer m_EnergyFidelity;
- LabelledImagePixelType m_ValueCurrent;
+ double m_EnergyBefore;
+ double m_EnergyAfter;
+ double m_DeltaEnergy;
+ double m_EnergyCurrent;
+ double m_Lambda;
+ LabelledImagePixelType m_Value;
+ EnergyRegularizationPointer m_EnergyRegularization;
+ EnergyFidelityPointer m_EnergyFidelity;
+ LabelledImagePixelType m_ValueCurrent;
protected:
// The constructor and destructor.
- MRFSampler():
+ MRFSampler() :
m_NumberOfClasses(1),
m_EnergyBefore(1.0),
m_EnergyAfter(1.0),
m_DeltaEnergy(1.0),
m_EnergyCurrent(1.0),
m_Lambda(1.0)
- {
+ {
m_EnergyRegularization = EnergyRegularizationType::New();
m_EnergyFidelity = EnergyFidelityType::New();
- };
- virtual ~MRFSampler() {};
+ };
+ virtual ~MRFSampler() {}
};
diff --git a/Code/Markov/otbMRFSamplerMAP.h b/Code/Markov/otbMRFSamplerMAP.h
index c32af1a99d..4a0f95f831 100644
--- a/Code/Markov/otbMRFSamplerMAP.h
+++ b/Code/Markov/otbMRFSamplerMAP.h
@@ -36,15 +36,15 @@ namespace otb
* \ingroup Markov
*/
-template< class TInput1, class TInput2>
-class ITK_EXPORT MRFSamplerMAP : public MRFSampler< TInput1, TInput2>
+template<class TInput1, class TInput2>
+class ITK_EXPORT MRFSamplerMAP : public MRFSampler<TInput1, TInput2>
{
public:
- typedef MRFSamplerMAP Self;
- typedef MRFSampler< TInput1, TInput2> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MRFSamplerMAP Self;
+ typedef MRFSampler<TInput1, TInput2> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
typedef typename Superclass::InputImageNeighborhoodIterator InputImageNeighborhoodIterator;
typedef typename Superclass::LabelledImageNeighborhoodIterator LabelledImageNeighborhoodIterator;
@@ -57,17 +57,17 @@ public:
itkNewMacro(Self);
- itkTypeMacro(MRFSamplerMAP,MRFSampler);
+ itkTypeMacro(MRFSamplerMAP, MRFSampler);
- inline int Compute( const InputImageNeighborhoodIterator & itData,
- const LabelledImageNeighborhoodIterator & itRegul)
+ inline int Compute(const InputImageNeighborhoodIterator& itData,
+ const LabelledImageNeighborhoodIterator& itRegul)
{
if (this->m_NumberOfClasses == 0)
- {
- itkExceptionMacro(<<"NumberOfClasse has to be greater than 0.");
- }
+ {
+ itkExceptionMacro(<< "NumberOfClasse has to be greater than 0.");
+ }
- this->m_EnergyBefore=this->m_EnergyFidelity->GetValue(itData, itRegul.GetCenterPixel());
+ this->m_EnergyBefore = this->m_EnergyFidelity->GetValue(itData, itRegul.GetCenterPixel());
this->m_EnergyBefore += this->m_Lambda
* this->m_EnergyRegularization->GetValue(itRegul, itRegul.GetCenterPixel());
@@ -76,33 +76,32 @@ public:
this->m_Value = itRegul.GetCenterPixel();
LabelledImagePixelType valueCurrent = 0;
- while ( valueCurrent<static_cast<LabelledImagePixelType>(this->GetNumberOfClasses()) && valueCurrent != itk::NumericTraits<LabelledImagePixelType>::max() )
- {
+ while (valueCurrent < static_cast<LabelledImagePixelType>(this->GetNumberOfClasses()) && valueCurrent !=
+ itk::NumericTraits<LabelledImagePixelType>::max())
+ {
this->m_EnergyCurrent = this->m_EnergyFidelity->GetValue(itData, valueCurrent);
this->m_EnergyCurrent += this->m_Lambda
* this->m_EnergyRegularization->GetValue(itRegul, valueCurrent);
if (this->m_EnergyCurrent < this->m_EnergyAfter)
- {
+ {
this->m_EnergyAfter = this->m_EnergyCurrent;
this->m_Value = valueCurrent;
- }
+ }
valueCurrent++;
- }
+ }
this->m_DeltaEnergy = this->m_EnergyAfter - this->m_EnergyBefore;
return 0;
}
-
protected:
// The constructor and destructor.
MRFSamplerMAP() {};
- virtual ~MRFSamplerMAP() {};
+ virtual ~MRFSamplerMAP() {}
};
-
}
#endif
diff --git a/Code/Markov/otbMRFSamplerRandom.h b/Code/Markov/otbMRFSamplerRandom.h
index c080a91372..cfd8a83a8c 100644
--- a/Code/Markov/otbMRFSamplerRandom.h
+++ b/Code/Markov/otbMRFSamplerRandom.h
@@ -37,8 +37,8 @@ namespace otb
* \ingroup Markov
*/
-template< class TInput1, class TInput2>
-class ITK_EXPORT MRFSamplerRandom: public MRFSampler< TInput1, TInput2>
+template<class TInput1, class TInput2>
+class ITK_EXPORT MRFSamplerRandom : public MRFSampler<TInput1, TInput2>
{
public:
typedef MRFSamplerRandom Self;
@@ -59,9 +59,9 @@ public:
itkNewMacro(Self);
- itkTypeMacro(MRFSamplerRandom,MRFSampler);
+ itkTypeMacro(MRFSamplerRandom, MRFSampler);
- inline int Compute( const InputImageNeighborhoodIterator & itData, const LabelledImageNeighborhoodIterator & itRegul)
+ inline int Compute(const InputImageNeighborhoodIterator& itData, const LabelledImageNeighborhoodIterator& itRegul)
{
this->m_EnergyBefore = this->m_EnergyFidelity->GetValue(itData, itRegul.GetCenterPixel());
this->m_EnergyBefore += this->m_Lambda
@@ -70,7 +70,7 @@ public:
this->m_Value = static_cast<LabelledImagePixelType>(m_Generator->GetIntegerVariate() % this->m_NumberOfClasses);
this->m_EnergyAfter = this->m_EnergyFidelity->GetValue(itData, this->m_Value);
this->m_EnergyAfter += this->m_Lambda * this->m_EnergyRegularization->GetValue(itRegul, this->m_Value);
- this->m_DeltaEnergy= this->m_EnergyAfter - this->m_EnergyBefore;
+ this->m_DeltaEnergy = this->m_EnergyAfter - this->m_EnergyBefore;
return 0;
}
@@ -88,13 +88,12 @@ public:
protected:
// The constructor and destructor.
MRFSamplerRandom()
- {
+ {
m_Generator = RandomGeneratorType::New();
m_Generator->SetSeed();
- }
+ }
virtual ~MRFSamplerRandom() {}
-
private:
RandomGeneratorType::Pointer m_Generator;
};
diff --git a/Code/Markov/otbMRFSamplerRandomMAP.h b/Code/Markov/otbMRFSamplerRandomMAP.h
index 14ade9429a..61ca7fa4f9 100644
--- a/Code/Markov/otbMRFSamplerRandomMAP.h
+++ b/Code/Markov/otbMRFSamplerRandomMAP.h
@@ -43,8 +43,8 @@ namespace otb
* \ingroup Markov
*/
-template< class TInput1, class TInput2>
-class ITK_EXPORT MRFSamplerRandomMAP: public MRFSampler< TInput1, TInput2>
+template<class TInput1, class TInput2>
+class ITK_EXPORT MRFSamplerRandomMAP : public MRFSampler<TInput1, TInput2>
{
public:
@@ -65,30 +65,27 @@ public:
itkNewMacro(Self);
- itkTypeMacro(MRFSamplerRandomMAP,MRFSampler);
-
+ itkTypeMacro(MRFSamplerRandomMAP, MRFSampler);
void SetNumberOfClasses(const unsigned int nClasses)
{
if ((nClasses != this->m_NumberOfClasses) || (m_EnergiesInvalid == true))
- {
+ {
this->m_NumberOfClasses = nClasses;
- if (m_Energy != NULL)
- free(m_Energy);
- if (m_RepartitionFunction != NULL)
- free(m_RepartitionFunction);
+ if (m_Energy != NULL) free(m_Energy);
+ if (m_RepartitionFunction != NULL) free(m_RepartitionFunction);
m_Energy = (double *) calloc(this->m_NumberOfClasses, sizeof(double));
m_RepartitionFunction = (double *) calloc(this->m_NumberOfClasses, sizeof(double));
this->Modified();
- }
+ }
}
- inline int Compute( const InputImageNeighborhoodIterator & itData, const LabelledImageNeighborhoodIterator & itRegul)
+ inline int Compute(const InputImageNeighborhoodIterator& itData, const LabelledImageNeighborhoodIterator& itRegul)
{
if (this->m_NumberOfClasses == 0)
- {
- itkExceptionMacro(<<"NumberOfClasse has to be greater than 0.");
- }
+ {
+ itkExceptionMacro(<< "NumberOfClasse has to be greater than 0.");
+ }
this->m_EnergyBefore = this->m_EnergyFidelity->GetValue(itData, itRegul.GetCenterPixel());
this->m_EnergyBefore += this->m_Lambda
@@ -99,44 +96,47 @@ public:
this->m_Value = itRegul.GetCenterPixel();
//Compute probability for each possibility
- double totalProba=0.0;
- unsigned int valueCurrent = 0;
+ double totalProba = 0.0;
+ unsigned int valueCurrent = 0;
for (valueCurrent = 0; valueCurrent < this->m_NumberOfClasses; ++valueCurrent)
- {
+ {
this->m_EnergyCurrent = this->m_EnergyFidelity->GetValue(itData, static_cast<LabelledImagePixelType>(valueCurrent));
this->m_EnergyCurrent += this->m_Lambda
- * this->m_EnergyRegularization->GetValue(itRegul, static_cast<LabelledImagePixelType>(valueCurrent));
+ * this->m_EnergyRegularization->GetValue(itRegul,
+ static_cast<LabelledImagePixelType>(
+ valueCurrent));
m_Energy[valueCurrent] = this->m_EnergyCurrent;
- m_RepartitionFunction[valueCurrent] = vcl_exp(-this->m_EnergyCurrent)+totalProba;
+ m_RepartitionFunction[valueCurrent] = vcl_exp(-this->m_EnergyCurrent) + totalProba;
totalProba = m_RepartitionFunction[valueCurrent];
- }
+ }
//Pick a value according to probability
//double select = (m_Generator->GetIntegerVariate()/(double(RAND_MAX)+1) * totalProba);
- double select = (m_Generator->GetIntegerVariate()/(double(itk::NumericTraits<RandomGeneratorType::IntegerType>::max())+1) * totalProba);
+ double select =
+ (m_Generator->GetIntegerVariate() /
+ (double(itk::NumericTraits<RandomGeneratorType::IntegerType>::max()) + 1) * totalProba);
valueCurrent = 0;
- while ( (valueCurrent < this->GetNumberOfClasses())
- && (m_RepartitionFunction[valueCurrent] <= select))
- {
+ while ((valueCurrent < this->GetNumberOfClasses())
+ && (m_RepartitionFunction[valueCurrent] <= select))
+ {
valueCurrent++;
- }
-
- if ( valueCurrent == this->GetNumberOfClasses() )
- {
- valueCurrent = this->GetNumberOfClasses()-1;
- }
+ }
+ if (valueCurrent == this->GetNumberOfClasses())
+ {
+ valueCurrent = this->GetNumberOfClasses() - 1;
+ }
- if ( this->m_Value != static_cast<LabelledImagePixelType>(valueCurrent))
- {
+ if (this->m_Value != static_cast<LabelledImagePixelType>(valueCurrent))
+ {
this->m_Value = static_cast<LabelledImagePixelType>(valueCurrent);
this->m_EnergyAfter = m_Energy[static_cast<unsigned int>(valueCurrent)];
- }
+ }
- this->m_DeltaEnergy= this->m_EnergyAfter - this->m_EnergyBefore;
+ this->m_DeltaEnergy = this->m_EnergyAfter - this->m_EnergyBefore;
return 0;
}
@@ -153,26 +153,24 @@ public:
protected:
// The constructor and destructor.
- MRFSamplerRandomMAP():
+ MRFSamplerRandomMAP() :
m_RepartitionFunction(NULL),
m_Energy(NULL),
m_EnergiesInvalid(true)
- {
+ {
m_Generator = RandomGeneratorType::New();
m_Generator->SetSeed();
- }
+ }
virtual ~MRFSamplerRandomMAP()
- {
- if (m_Energy != NULL)
- free(m_Energy);
- if (m_RepartitionFunction != NULL)
- free(m_RepartitionFunction);
- }
+ {
+ if (m_Energy != NULL) free(m_Energy);
+ if (m_RepartitionFunction != NULL) free(m_RepartitionFunction);
+ }
private:
- double * m_RepartitionFunction;
- double * m_Energy;
- bool m_EnergiesInvalid;
+ double * m_RepartitionFunction;
+ double * m_Energy;
+ bool m_EnergiesInvalid;
RandomGeneratorType::Pointer m_Generator;
};
}
diff --git a/Code/Markov/otbMarkovRandomFieldFilter.h b/Code/Markov/otbMarkovRandomFieldFilter.h
index 2364b759bb..1edbc02eee 100644
--- a/Code/Markov/otbMarkovRandomFieldFilter.h
+++ b/Code/Markov/otbMarkovRandomFieldFilter.h
@@ -84,67 +84,66 @@ namespace otb
template <class TInputImage, class TClassifiedImage>
class ITK_EXPORT MarkovRandomFieldFilter :
- public itk::ImageToImageFilter<TInputImage,TClassifiedImage>
+ public itk::ImageToImageFilter<TInputImage, TClassifiedImage>
{
public:
/** Standard class typedefs. */
- typedef MarkovRandomFieldFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TClassifiedImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::OutputImagePointer OutputImagePointer;
+ typedef MarkovRandomFieldFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TClassifiedImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef typename Superclass::OutputImagePointer OutputImagePointer;
/** Run-time type information (and related methods). */
- itkTypeMacro(MarkovRandomFieldFilter,itk::ImageToImageFilter);
+ itkTypeMacro(MarkovRandomFieldFilter, itk::ImageToImageFilter);
/** Method for creation through the object factory. */
itkNewMacro(Self);
-
/** Type definition for the input image. */
- typedef TInputImage InputImageType;
- typedef typename TInputImage::Pointer InputImagePointer;
- typedef typename TInputImage::ConstPointer InputImageConstPointer;
+ typedef TInputImage InputImageType;
+ typedef typename TInputImage::Pointer InputImagePointer;
+ typedef typename TInputImage::ConstPointer InputImageConstPointer;
/** Type definition for the input image pixel type. */
- typedef typename TInputImage::PixelType InputImagePixelType;
+ typedef typename TInputImage::PixelType InputImagePixelType;
/** Type definition for the input image region type. */
- typedef typename TInputImage::RegionType InputImageRegionType;
+ typedef typename TInputImage::RegionType InputImageRegionType;
/** Type definition for the input image region iterator */
- typedef itk::ImageRegionIterator<TInputImage> InputImageRegionIterator;
- typedef itk::ImageRegionConstIterator<TInputImage> InputImageRegionConstIterator;
+ typedef itk::ImageRegionIterator<TInputImage> InputImageRegionIterator;
+ typedef itk::ImageRegionConstIterator<TInputImage> InputImageRegionConstIterator;
/** Image dimension */
itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/** Type definitions for the training image. */
- typedef TClassifiedImage TrainingImageType;
- typedef typename TClassifiedImage::Pointer TrainingImagePointer;
+ typedef TClassifiedImage TrainingImageType;
+ typedef typename TClassifiedImage::Pointer TrainingImagePointer;
/** Type definitions for the training image pixel type. */
- typedef typename TClassifiedImage::PixelType TrainingImagePixelType;
+ typedef typename TClassifiedImage::PixelType TrainingImagePixelType;
/** Type definitions for the labelled image.
* It is derived from the training image. */
- typedef TClassifiedImage LabelledImageType;
- typedef typename TClassifiedImage::Pointer LabelledImagePointer;
+ typedef TClassifiedImage LabelledImageType;
+ typedef typename TClassifiedImage::Pointer LabelledImagePointer;
/** Type definitions for the classified image pixel type.
* It has to be the same type as the training image. */
- typedef typename TClassifiedImage::PixelType LabelledImagePixelType;
+ typedef typename TClassifiedImage::PixelType LabelledImagePixelType;
/** Type definitions for the classified image pixel type.
* It has to be the same type as the training image. */
- typedef typename TClassifiedImage::RegionType LabelledImageRegionType;
+ typedef typename TClassifiedImage::RegionType LabelledImageRegionType;
/** Type definition for the classified image index type. */
- typedef typename TClassifiedImage::IndexType LabelledImageIndexType;
- typedef typename LabelledImageIndexType::IndexValueType IndexValueType;
+ typedef typename TClassifiedImage::IndexType LabelledImageIndexType;
+ typedef typename LabelledImageIndexType::IndexValueType IndexValueType;
/** Type definition for the classified image offset type. */
- typedef typename TClassifiedImage::OffsetType LabelledImageOffsetType;
+ typedef typename TClassifiedImage::OffsetType LabelledImageOffsetType;
/** Type definition for the input image region iterator */
typedef itk::ImageRegionIterator<TClassifiedImage>
@@ -158,7 +157,7 @@ public:
TClassifiedImage::ImageDimension);
/** Type definitions for classifier to be used for the MRF lavbelling. */
- typedef itk::ImageClassifierBase<TInputImage,TClassifiedImage> ClassifierType;
+ typedef itk::ImageClassifierBase<TInputImage, TClassifiedImage> ClassifierType;
/** Size and value typedef support. */
typedef typename TInputImage::SizeType SizeType;
@@ -167,14 +166,13 @@ public:
typedef typename TInputImage::SizeType NeighborhoodRadiusType;
/** Input image neighborhood iterator and kernel size typedef */
- typedef itk::ConstNeighborhoodIterator< TInputImage >
+ typedef itk::ConstNeighborhoodIterator<TInputImage>
InputImageNeighborhoodIterator;
-
typedef typename InputImageNeighborhoodIterator::RadiusType
InputImageNeighborhoodRadiusType;
- typedef itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator< TInputImage >
+ typedef itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TInputImage>
InputImageFacesCalculator;
typedef typename InputImageFacesCalculator::FaceListType
@@ -184,13 +182,13 @@ public:
InputImageFaceListIterator;
/** Labelled image neighborhood interator typedef */
- typedef itk::NeighborhoodIterator< TClassifiedImage >
+ typedef itk::NeighborhoodIterator<TClassifiedImage>
LabelledImageNeighborhoodIterator;
typedef typename LabelledImageNeighborhoodIterator::RadiusType
LabelledImageNeighborhoodRadiusType;
- typedef itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator< TClassifiedImage >
+ typedef itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<TClassifiedImage>
LabelledImageFacesCalculator;
typedef typename LabelledImageFacesCalculator::FaceListType
@@ -202,40 +200,36 @@ public:
/** Typedef for random values. */
typedef itk::Statistics::MersenneTwisterRandomVariateGenerator RandomGeneratorType;
-
/** Set the pointer to the classifer being used. */
- void SetClassifier( typename ClassifierType::Pointer ptrToClassifier );
-
+ void SetClassifier(typename ClassifierType::Pointer ptrToClassifier);
/** Set pipeline elements */
- typedef MRFEnergy< TClassifiedImage, TClassifiedImage> EnergyRegularizationType;
- typedef MRFEnergy< TInputImage, TClassifiedImage> EnergyFidelityType;
+ typedef MRFEnergy<TClassifiedImage, TClassifiedImage> EnergyRegularizationType;
+ typedef MRFEnergy<TInputImage, TClassifiedImage> EnergyFidelityType;
typedef typename EnergyRegularizationType::Pointer EnergyRegularizationPointer;
- typedef typename EnergyFidelityType::Pointer EnergyFidelityPointer;
+ typedef typename EnergyFidelityType::Pointer EnergyFidelityPointer;
- typedef MRFSampler< TInputImage, TClassifiedImage> SamplerType;
- typedef typename SamplerType::Pointer SamplerPointer;
+ typedef MRFSampler<TInputImage, TClassifiedImage> SamplerType;
+ typedef typename SamplerType::Pointer SamplerPointer;
- typedef MRFOptimizer OptimizerType;
+ typedef MRFOptimizer OptimizerType;
typedef typename OptimizerType::Pointer OptimizerPointer;
-
/**
************ ACCESSORS ************
*/
- itkSetObjectMacro( EnergyRegularization, EnergyRegularizationType);
- itkGetObjectMacro( EnergyRegularization, EnergyRegularizationType);
+ itkSetObjectMacro(EnergyRegularization, EnergyRegularizationType);
+ itkGetObjectMacro(EnergyRegularization, EnergyRegularizationType);
- itkSetObjectMacro( EnergyFidelity, EnergyFidelityType);
- itkGetObjectMacro( EnergyFidelity, EnergyFidelityType);
+ itkSetObjectMacro(EnergyFidelity, EnergyFidelityType);
+ itkGetObjectMacro(EnergyFidelity, EnergyFidelityType);
- itkSetObjectMacro( Sampler, SamplerType);
- itkGetObjectMacro( Sampler, SamplerType);
-
- itkSetObjectMacro( Optimizer, OptimizerType);
- itkGetObjectMacro( Optimizer, OptimizerType);
+ itkSetObjectMacro(Sampler, SamplerType);
+ itkGetObjectMacro(Sampler, SamplerType);
+ itkSetObjectMacro(Optimizer, OptimizerType);
+ itkGetObjectMacro(Optimizer, OptimizerType);
/** Set/Get the number of classes. */
itkSetMacro(NumberOfClasses, unsigned int);
@@ -261,28 +255,26 @@ public:
itkSetMacro(Lambda, double);
itkGetMacro(Lambda, double);
-
/** Set the neighborhood radius */
- void SetNeighborhoodRadius(const NeighborhoodRadiusType &);
+ void SetNeighborhoodRadius(const NeighborhoodRadiusType&);
/** Sets the radius for the neighborhood, calculates size from the
* radius, and allocates storage. */
- void SetNeighborhoodRadius( const unsigned long );
- void SetNeighborhoodRadius( const unsigned long *radiusArray );
+ void SetNeighborhoodRadius(const unsigned long);
+ void SetNeighborhoodRadius(const unsigned long *radiusArray);
/** Get the neighborhood radius */
const NeighborhoodRadiusType GetNeighborhoodRadius() const
{
NeighborhoodRadiusType m_NeighborhoodRadius;
- for (int i=0; i<InputImageDimension; ++i)
+ for (int i = 0; i < InputImageDimension; ++i)
m_NeighborhoodRadius[i] = m_InputImageNeighborhoodRadius[i];
return m_NeighborhoodRadius;
}
-
/** Set training image for the starting point. This is not compulsory:
* if the starting image is not specified, a random image will be used
* instead.
@@ -290,23 +282,22 @@ public:
* image should contain values corresponding to the class number (consecutive
* integers).
*/
- virtual void SetTrainingInput( const TrainingImageType * trainingImage);
+ virtual void SetTrainingInput(const TrainingImageType * trainingImage);
const TrainingImageType* GetTrainingInput(void);
-
//Enum to get the stopping condition of the MRF filter
typedef enum
- {
- MaximumNumberOfIterations=1,
+ {
+ MaximumNumberOfIterations = 1,
ErrorTolerance
- } StopConditionType;
+ } StopConditionType;
/** Get condition that stops the MRF filter (Number of Iterations
* / Error tolerance ) */
- itkGetConstReferenceMacro( StopCondition, StopConditionType );
+ itkGetConstReferenceMacro(StopCondition, StopConditionType);
/** Get macro for number of iterations */
- itkGetConstReferenceMacro( NumberOfIterations, unsigned int );
+ itkGetConstReferenceMacro(NumberOfIterations, unsigned int);
#ifdef ITK_USE_CONCEPT_CHECKING
/** Begin concept checking */
@@ -335,7 +326,7 @@ public:
protected:
MarkovRandomFieldFilter();
- virtual ~MarkovRandomFieldFilter(){};
+ virtual ~MarkovRandomFieldFilter(){}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Allocate memory for labelled images. This is automatically called
@@ -346,51 +337,47 @@ protected:
/** Connect the pipeline and propagate the required parameters. This
* is automatically called in GenerateData().
*/
- void Initialize() throw (itk::ExceptionObject);
-
+ void Initialize()
+ throw (itk::ExceptionObject);
virtual void ApplyMarkovRandomFieldFilter();
-
virtual void GenerateData();
virtual void GenerateInputRequestedRegion();
- virtual void EnlargeOutputRequestedRegion( itk::DataObject * );
+ virtual void EnlargeOutputRequestedRegion(itk::DataObject *);
virtual void GenerateOutputInformation();
-
- MarkovRandomFieldFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MarkovRandomFieldFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
typedef typename TInputImage::SizeType InputImageSizeType;
+ InputImageNeighborhoodRadiusType m_InputImageNeighborhoodRadius;
+ LabelledImageNeighborhoodRadiusType m_LabelledImageNeighborhoodRadius;
- InputImageNeighborhoodRadiusType m_InputImageNeighborhoodRadius;
- LabelledImageNeighborhoodRadiusType m_LabelledImageNeighborhoodRadius;
+ unsigned int m_NumberOfClasses;
+ unsigned int m_MaximumNumberOfIterations;
- unsigned int m_NumberOfClasses;
- unsigned int m_MaximumNumberOfIterations;
+ int m_ErrorCounter;
+ double m_ImageDeltaEnergy;
- int m_ErrorCounter;
- double m_ImageDeltaEnergy;
+ int m_NeighborhoodRadius;
+ int m_TotalNumberOfValidPixelsInOutputImage;
+ int m_TotalNumberOfPixelsInInputImage;
+ double m_ErrorTolerance;
+ double m_SmoothingFactor;
- int m_NeighborhoodRadius;
- int m_TotalNumberOfValidPixelsInOutputImage;
- int m_TotalNumberOfPixelsInInputImage;
- double m_ErrorTolerance;
- double m_SmoothingFactor;
+ unsigned int m_NumberOfIterations;
- unsigned int m_NumberOfIterations;
+ double m_Lambda;
+ bool m_ExternalClassificationSet;
+ StopConditionType m_StopCondition;
+ TrainingImagePointer m_TrainingImage;
- double m_Lambda;
- bool m_ExternalClassificationSet;
- StopConditionType m_StopCondition;
-
- TrainingImagePointer m_TrainingImage;
-
- std::vector<double> m_MRFNeighborhoodWeight;
- std::vector<double> m_NeighborInfluence;
- std::vector<double> m_DummyVector;
+ std::vector<double> m_MRFNeighborhoodWeight;
+ std::vector<double> m_NeighborInfluence;
+ std::vector<double> m_DummyVector;
RandomGeneratorType::Pointer m_Generator;
@@ -407,7 +394,6 @@ private:
}; // class MarkovRandomFieldFilter
-
} // namespace otb
#ifndef ITK_MANUAL_INSTANTIATION
@@ -415,4 +401,3 @@ private:
#endif
#endif
-
diff --git a/Code/Markov/otbMarkovRandomFieldFilter.txx b/Code/Markov/otbMarkovRandomFieldFilter.txx
index b0a8f27192..857dd3b462 100644
--- a/Code/Markov/otbMarkovRandomFieldFilter.txx
+++ b/Code/Markov/otbMarkovRandomFieldFilter.txx
@@ -23,7 +23,7 @@
namespace otb
{
template<class TInputImage, class TClassifiedImage>
-MarkovRandomFieldFilter<TInputImage,TClassifiedImage>
+MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
::MarkovRandomFieldFilter(void) :
m_NumberOfClasses(0),
m_MaximumNumberOfIterations(50),
@@ -43,12 +43,13 @@ MarkovRandomFieldFilter<TInputImage,TClassifiedImage>
m_Generator->SetSeed();
this->SetNumberOfRequiredInputs(1);
- if ( (int)InputImageDimension != (int)ClassifiedImageDimension )
- {
+ if ((int) InputImageDimension != (int) ClassifiedImageDimension)
+ {
itk::OStringStream msg;
- msg << "Input image dimension: " << InputImageDimension << " != output image dimension: " << ClassifiedImageDimension;
- throw itk::ExceptionObject(__FILE__, __LINE__,msg.str().c_str(),ITK_LOCATION);
- }
+ msg << "Input image dimension: " << InputImageDimension << " != output image dimension: " <<
+ ClassifiedImageDimension;
+ throw itk::ExceptionObject(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
+ }
m_InputImageNeighborhoodRadius.Fill(m_NeighborhoodRadius);
// m_MRFNeighborhoodWeight.resize(0);
// m_NeighborInfluence.resize(0);
@@ -67,55 +68,52 @@ MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
{
m_ExternalClassificationSet = true;
// Process object is not const-correct so the const_cast is required here
- this->itk::ProcessObject::SetNthInput(1, const_cast< TrainingImageType * >( trainingImage ) );
+ this->itk::ProcessObject::SetNthInput(1, const_cast<TrainingImageType *>(trainingImage));
this->Modified();
}
-
template <class TInputImage, class TClassifiedImage>
const typename MarkovRandomFieldFilter<TInputImage, TClassifiedImage>::TrainingImageType*
MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
::GetTrainingInput(void)
{
if (this->GetNumberOfInputs() < 2)
- {
+ {
return 0;
- }
- return static_cast<const TrainingImageType * >
- (this->itk::ProcessObject::GetInput(1) );
+ }
+ return static_cast<const TrainingImageType *>
+ (this->itk::ProcessObject::GetInput(1));
}
-
template<class TInputImage, class TClassifiedImage>
void
MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
-::PrintSelf( std::ostream& os, itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
- os << indent <<" MRF Image filter object " << std::endl;
+ os << indent << " MRF Image filter object " << std::endl;
- os << indent <<" Number of classes: " << m_NumberOfClasses << std::endl;
+ os << indent << " Number of classes: " << m_NumberOfClasses << std::endl;
- os << indent <<" Maximum number of iterations: " <<
+ os << indent << " Maximum number of iterations: " <<
m_MaximumNumberOfIterations << std::endl;
- os << indent <<" Error tolerance for convergence: " <<
+ os << indent << " Error tolerance for convergence: " <<
m_ErrorTolerance << std::endl;
- os << indent <<" Size of the MRF neighborhood radius:" <<
+ os << indent << " Size of the MRF neighborhood radius:" <<
m_InputImageNeighborhoodRadius << std::endl;
os << indent << "StopCondition: "
- << m_StopCondition << std::endl;
+ << m_StopCondition << std::endl;
- os << indent <<" Number of iterations: " <<
+ os << indent << " Number of iterations: " <<
m_NumberOfIterations << std::endl;
- os << indent <<" Lambda: " <<
+ os << indent << " Lambda: " <<
m_Lambda << std::endl;
-}// end PrintSelf
-
+} // end PrintSelf
/**
* GenerateInputRequestedRegion method.
@@ -128,28 +126,26 @@ MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
// this filter requires the all of the input images
// to be at the size of the output requested region
InputImagePointer inputPtr =
- const_cast< InputImageType * >( this->GetInput() );
+ const_cast<InputImageType *>(this->GetInput());
OutputImagePointer outputPtr = this->GetOutput();
- inputPtr->SetRequestedRegion( outputPtr->GetRequestedRegion() );
+ inputPtr->SetRequestedRegion(outputPtr->GetRequestedRegion());
}
-
/**
* EnlargeOutputRequestedRegion method.
*/
template <class TInputImage, class TClassifiedImage>
void
MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
-::EnlargeOutputRequestedRegion( itk::DataObject *output )
+::EnlargeOutputRequestedRegion(itk::DataObject *output)
{
// this filter requires the all of the output image to be in
// the buffer
TClassifiedImage *imgData;
- imgData = dynamic_cast<TClassifiedImage*>( output );
+ imgData = dynamic_cast<TClassifiedImage*>(output);
imgData->SetRequestedRegionToLargestPossibleRegion();
}
-
/**
* GenerateOutputInformation method.
*/
@@ -160,7 +156,7 @@ MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
{
typename TInputImage::ConstPointer input = this->GetInput();
typename TClassifiedImage::Pointer output = this->GetOutput();
- output->SetLargestPossibleRegion( input->GetLargestPossibleRegion() );
+ output->SetLargestPossibleRegion(input->GetLargestPossibleRegion());
}
template<class TInputImage, class TClassifiedImage>
@@ -180,8 +176,7 @@ MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
//Run the Markov random field
this->ApplyMarkovRandomFieldFilter();
-
-}// end GenerateData
+} // end GenerateData
/**
* Set the neighborhood radius from a single value
@@ -189,18 +184,17 @@ MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
template<class TInputImage, class TClassifiedImage>
void
MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
-::SetNeighborhoodRadius( const unsigned long radiusValue)
+::SetNeighborhoodRadius(const unsigned long radiusValue)
{
//Set up the neighbor hood
NeighborhoodRadiusType radius;
- for (unsigned int i=0; i < InputImageDimension; ++i)
- {
+ for (unsigned int i = 0; i < InputImageDimension; ++i)
+ {
radius[i] = radiusValue;
- }
- this->SetNeighborhoodRadius( radius );
-
-}// end SetNeighborhoodRadius
+ }
+ this->SetNeighborhoodRadius(radius);
+} // end SetNeighborhoodRadius
/**
* Set the neighborhood radius from an array
@@ -208,18 +202,17 @@ MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
template<class TInputImage, class TClassifiedImage>
void
MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
-::SetNeighborhoodRadius( const unsigned long *radiusArray)
+::SetNeighborhoodRadius(const unsigned long *radiusArray)
{
- NeighborhoodRadiusType radius;
- for (unsigned int i=0; i < InputImageDimension; ++i)
- {
+ NeighborhoodRadiusType radius;
+ for (unsigned int i = 0; i < InputImageDimension; ++i)
+ {
radius[i] = radiusArray[i];
- }
+ }
//Set up the neighbor hood
- this->SetNeighborhoodRadius( radius );
-
-}// end SetNeighborhoodRadius
+ this->SetNeighborhoodRadius(radius);
+} // end SetNeighborhoodRadius
/**
* Set the neighborhood radius from a radius object
@@ -227,19 +220,18 @@ MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
template<class TInputImage, class TClassifiedImage>
void
MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
-::SetNeighborhoodRadius( const NeighborhoodRadiusType &radius)
+::SetNeighborhoodRadius(const NeighborhoodRadiusType& radius)
{
//Set up the neighbor hood
- for (unsigned int i=0; i < InputImageDimension; ++i)
- {
- m_InputImageNeighborhoodRadius[ i ] = radius[ i ];
- m_LabelledImageNeighborhoodRadius[ i ] =radius[ i ];
- }
+ for (unsigned int i = 0; i < InputImageDimension; ++i)
+ {
+ m_InputImageNeighborhoodRadius[i] = radius[i];
+ m_LabelledImageNeighborhoodRadius[i] = radius[i];
+ }
-}// end SetNeighborhoodRadius
+} // end SetNeighborhoodRadius
//-------------------------------------------------------
-
/**
* Allocate algorithm specific resources
*/
@@ -248,54 +240,53 @@ void
MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
::Allocate()
{
- if ( m_NumberOfClasses <= 0 )
- {
- throw itk::ExceptionObject(__FILE__, __LINE__,"NumberOfClasses <= 0.",ITK_LOCATION);
- }
-
+ if (m_NumberOfClasses <= 0)
+ {
+ throw itk::ExceptionObject(__FILE__, __LINE__, "NumberOfClasses <= 0.", ITK_LOCATION);
+ }
//Set the output labelled and allocate the memory
LabelledImagePointer outputPtr = this->GetOutput();
//Allocate the output buffer memory
- outputPtr->SetBufferedRegion( outputPtr->GetRequestedRegion() );
+ outputPtr->SetBufferedRegion(outputPtr->GetRequestedRegion());
outputPtr->Allocate();
//Copy input data in the output buffer memory or
//initialize to random values if not set
LabelledImageRegionIterator
- outImageIt( outputPtr, outputPtr->GetRequestedRegion() );
+ outImageIt(outputPtr, outputPtr->GetRequestedRegion());
if (m_ExternalClassificationSet)
- {
- typename TrainingImageType::ConstPointer trainingImage = this->GetTrainingInput();
+ {
+ typename TrainingImageType::ConstPointer trainingImage = this->GetTrainingInput();
LabelledImageRegionConstIterator
- trainingImageIt( trainingImage, outputPtr->GetRequestedRegion() );
+ trainingImageIt(trainingImage, outputPtr->GetRequestedRegion());
- while ( !outImageIt.IsAtEnd() )
- {
+ while (!outImageIt.IsAtEnd())
+ {
LabelledImagePixelType labelvalue = static_cast<LabelledImagePixelType> (trainingImageIt.Get());
- outImageIt.Set( labelvalue );
+ outImageIt.Set(labelvalue);
++trainingImageIt;
++outImageIt;
- }// end while
- }
+ } // end while
+ }
else //set to random value
- {
-// srand((unsigned)time(0));
- while ( !outImageIt.IsAtEnd() )
{
+// srand((unsigned)time(0));
+ while (!outImageIt.IsAtEnd())
+ {
LabelledImagePixelType randomvalue = static_cast<LabelledImagePixelType>(
- m_Generator->GetIntegerVariate() % static_cast<int>(m_NumberOfClasses)
- );
- outImageIt.Set( randomvalue );
+ m_Generator->GetIntegerVariate() % static_cast<int>(m_NumberOfClasses)
+ );
+ outImageIt.Set(randomvalue);
++outImageIt;
- }// end while
+ } // end while
- }
+ }
-}// Allocate
+} // Allocate
/**
* Initialize pipeline and values
@@ -304,9 +295,9 @@ template<class TInputImage, class TClassifiedImage>
void
MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
::Initialize() throw (itk::ExceptionObject)
-{
+ {
- m_ImageDeltaEnergy=0.0;
+ m_ImageDeltaEnergy = 0.0;
InputImageSizeType inputImageSize =
this->GetInput()->GetBufferedRegion().GetSize();
@@ -318,44 +309,42 @@ MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
m_TotalNumberOfPixelsInInputImage = 1;
m_TotalNumberOfValidPixelsInOutputImage = 1;
- for ( unsigned int i=0; i < InputImageDimension; ++i )
- {
+ for (unsigned int i = 0; i < InputImageDimension; ++i)
+ {
m_TotalNumberOfPixelsInInputImage *= static_cast<int>(inputImageSize[i]);
m_TotalNumberOfValidPixelsInOutputImage *=
- ( static_cast<int>(inputImageSize[i])
- - 2*m_InputImageNeighborhoodRadius[i] );
- }
-
+ (static_cast<int>(inputImageSize[i])
+ - 2 * m_InputImageNeighborhoodRadius[i]);
+ }
- srand((unsigned)time(0));
+ srand((unsigned) time(0));
- if ( !m_EnergyRegularization )
- {
- itkExceptionMacro(<<"EnergyRegularization is not present" );
- }
+ if (!m_EnergyRegularization)
+ {
+ itkExceptionMacro(<< "EnergyRegularization is not present");
+ }
- if ( !m_EnergyFidelity )
- {
- itkExceptionMacro(<<"EnergyFidelity is not present" );
- }
+ if (!m_EnergyFidelity)
+ {
+ itkExceptionMacro(<< "EnergyFidelity is not present");
+ }
- if ( !m_Optimizer )
- {
- itkExceptionMacro(<<"Optimizer is not present" );
- }
+ if (!m_Optimizer)
+ {
+ itkExceptionMacro(<< "Optimizer is not present");
+ }
- if ( !m_Sampler )
- {
- itkExceptionMacro(<<"Sampler is not present");
- }
+ if (!m_Sampler)
+ {
+ itkExceptionMacro(<< "Sampler is not present");
+ }
m_Sampler->SetLambda(m_Lambda);
m_Sampler->SetEnergyRegularization(m_EnergyRegularization);
m_Sampler->SetEnergyFidelity(m_EnergyFidelity);
m_Sampler->SetNumberOfClasses(m_NumberOfClasses);
-}
-
+ }
/**
*Apply the MRF image filter
@@ -367,26 +356,26 @@ MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
{
//Note: error should be defined according to the number of valid pixel in the output
- int maxNumPixelError = (int) ( vnl_math_rnd (m_ErrorTolerance *
- m_TotalNumberOfPixelsInInputImage) );
+ int maxNumPixelError = (int) (vnl_math_rnd (m_ErrorTolerance *
+ m_TotalNumberOfPixelsInInputImage));
m_NumberOfIterations = 0;
m_ErrorCounter = m_TotalNumberOfValidPixelsInOutputImage;
- while (( m_NumberOfIterations < m_MaximumNumberOfIterations ) &&
- ( m_ErrorCounter >= maxNumPixelError ) )
- {
+ while ((m_NumberOfIterations < m_MaximumNumberOfIterations) &&
+ (m_ErrorCounter >= maxNumPixelError))
+ {
otbMsgDevMacro(<< "Iteration No." << m_NumberOfIterations);
this->MinimizeOnce();
otbMsgDevMacro(<< "m_ErrorCounter/m_TotalNumberOfPixelsInInputImage: "
- << m_ErrorCounter/((double)(m_TotalNumberOfPixelsInInputImage)));
+ << m_ErrorCounter / ((double) (m_TotalNumberOfPixelsInInputImage)));
otbMsgDevMacro(<< "m_ImageDeltaEnergy: " << m_ImageDeltaEnergy);
++m_NumberOfIterations;
- }
+ }
otbMsgDevMacro(<< "m_NumberOfIterations: " << m_NumberOfIterations);
otbMsgDevMacro(<< "m_MaximumNumberOfIterations: " << m_MaximumNumberOfIterations);
@@ -394,17 +383,16 @@ MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
otbMsgDevMacro(<< "maxNumPixelError: " << maxNumPixelError);
//Determine stop condition
- if ( m_NumberOfIterations >= m_MaximumNumberOfIterations )
- {
+ if (m_NumberOfIterations >= m_MaximumNumberOfIterations)
+ {
m_StopCondition = MaximumNumberOfIterations;
- }
- else if ( m_ErrorCounter <= maxNumPixelError )
- {
+ }
+ else if (m_ErrorCounter <= maxNumPixelError)
+ {
m_StopCondition = ErrorTolerance;
- }
-
-}// ApplyMarkovRandomFieldFilter
+ }
+} // ApplyMarkovRandomFieldFilter
/**
*Apply the MRF image filter on the whole image once
@@ -416,33 +404,32 @@ MarkovRandomFieldFilter<TInputImage, TClassifiedImage>
{
LabelledImageNeighborhoodIterator
labelledIterator(m_LabelledImageNeighborhoodRadius, this->GetOutput(),
- this->GetOutput()->GetLargestPossibleRegion() );
+ this->GetOutput()->GetLargestPossibleRegion());
InputImageNeighborhoodIterator
dataIterator(m_InputImageNeighborhoodRadius, this->GetInput(),
- this->GetInput()->GetLargestPossibleRegion() );
+ this->GetInput()->GetLargestPossibleRegion());
m_ErrorCounter = 0;
for (labelledIterator.GoToBegin(), dataIterator.GoToBegin();
!labelledIterator.IsAtEnd();
++labelledIterator, ++dataIterator)
- {
+ {
LabelledImagePixelType value;
- bool changeValueBool;
- m_Sampler->Compute(dataIterator,labelledIterator);
- value=m_Sampler->GetValue();
- changeValueBool= m_Optimizer->Compute(m_Sampler->GetDeltaEnergy());
+ bool changeValueBool;
+ m_Sampler->Compute(dataIterator, labelledIterator);
+ value = m_Sampler->GetValue();
+ changeValueBool = m_Optimizer->Compute(m_Sampler->GetDeltaEnergy());
if (changeValueBool)
- {
+ {
labelledIterator.SetCenterPixel(value);
++m_ErrorCounter;
m_ImageDeltaEnergy += m_Sampler->GetDeltaEnergy();
+ }
}
- }
}
-
} // namespace otb
#endif
diff --git a/Code/MultiScale/otbConvexOrConcaveClassificationFilter.h b/Code/MultiScale/otbConvexOrConcaveClassificationFilter.h
index ed72df0a02..116cdd4e7e 100644
--- a/Code/MultiScale/otbConvexOrConcaveClassificationFilter.h
+++ b/Code/MultiScale/otbConvexOrConcaveClassificationFilter.h
@@ -50,7 +50,7 @@ namespace Functor
* \f]
*
*/
-template<class TInput,class TOutput>
+template<class TInput, class TOutput>
class ConvexOrConcaveDecisionRule
{
@@ -68,25 +68,25 @@ public:
/**
* Destructor
*/
- virtual ~ConvexOrConcaveDecisionRule() {};
+ virtual ~ConvexOrConcaveDecisionRule() {}
/**
* Label the pixel to convex, concave or flat
* \return The label of the pixel
* \param x The image value
* \param xlevel The leveling value
*/
- inline TOutput operator()(const TInput& x, const TInput& xlevel)
+ inline TOutput operator ()(const TInput& x, const TInput& xlevel)
{
TOutput resp = m_FlatLabel;
- if (static_cast<double>(x-xlevel)>m_Sigma)
- {
+ if (static_cast<double>(x - xlevel) > m_Sigma)
+ {
resp = m_ConvexLabel;
- }
- else if (static_cast<double>(xlevel-x)>m_Sigma)
- {
+ }
+ else if (static_cast<double>(xlevel - x) > m_Sigma)
+ {
resp = m_ConcaveLabel;
- }
+ }
return resp;
}
/**
@@ -95,7 +95,7 @@ public:
*/
void SetConvexLabel(const TOutput& label)
{
- m_ConvexLabel=label;
+ m_ConvexLabel = label;
}
/**
* Get the convex label
@@ -111,7 +111,7 @@ public:
*/
void SetConcaveLabel(const TOutput& label)
{
- m_ConcaveLabel=label;
+ m_ConcaveLabel = label;
}
/**
* Get the concave label
@@ -127,7 +127,7 @@ public:
*/
void SetFlatLabel(const TOutput& label)
{
- m_FlatLabel=label;
+ m_FlatLabel = label;
}
/**
* Get the flat label
@@ -141,7 +141,7 @@ public:
* Set the tolerance value
* \param sigma the tolerance value
*/
- void SetSigma(const double & sigma)
+ void SetSigma(const double& sigma)
{
m_Sigma = sigma;
}
@@ -176,31 +176,32 @@ private:
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT ConvexOrConcaveClassificationFilter
- : public itk::BinaryFunctorImageFilter<TInputImage,TInputImage, TOutputImage,
- Functor::ConvexOrConcaveDecisionRule<typename TInputImage::PixelType,
- typename TOutputImage::PixelType> >
+ : public itk::BinaryFunctorImageFilter<TInputImage, TInputImage, TOutputImage,
+ Functor::ConvexOrConcaveDecisionRule<typename TInputImage::PixelType,
+ typename TOutputImage::PixelType> >
{
public:
/** Standard typedefs */
typedef ConvexOrConcaveClassificationFilter Self;
- typedef itk::BinaryFunctorImageFilter<TInputImage,TInputImage, TOutputImage,
- Functor::ConvexOrConcaveDecisionRule<typename TInputImage::PixelType,
- typename TOutputImage::PixelType> > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::BinaryFunctorImageFilter<TInputImage, TInputImage, TOutputImage,
+ Functor::ConvexOrConcaveDecisionRule<typename TInputImage::PixelType,
+ typename TOutputImage::PixelType> >
+ Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(ConvexOrConcaveClassificationFilter,BinaryFunctorImageFilter);
+ itkTypeMacro(ConvexOrConcaveClassificationFilter, BinaryFunctorImageFilter);
/** Template class typedef */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
typedef typename OutputImageType::PixelType LabelType;
typedef Functor::ConvexOrConcaveDecisionRule<typename TInputImage::PixelType,
- typename TOutputImage::PixelType> DecisionFunctorType;
+ typename TOutputImage::PixelType> DecisionFunctorType;
/**
* Set the input image
* \param image the input image
@@ -220,17 +221,17 @@ public:
this->SetInput2(leveling);
}
/** Set/Get the convex label */
- itkSetMacro(ConvexLabel,LabelType);
- itkGetMacro(ConvexLabel,LabelType);
+ itkSetMacro(ConvexLabel, LabelType);
+ itkGetMacro(ConvexLabel, LabelType);
/** Set/Get the concave label */
- itkSetMacro(ConcaveLabel,LabelType);
- itkGetMacro(ConcaveLabel,LabelType);
+ itkSetMacro(ConcaveLabel, LabelType);
+ itkGetMacro(ConcaveLabel, LabelType);
/** Set/Get the flat label */
- itkSetMacro(FlatLabel,LabelType);
- itkGetMacro(FlatLabel,LabelType);
+ itkSetMacro(FlatLabel, LabelType);
+ itkGetMacro(FlatLabel, LabelType);
/** Set/Get the tolerance value */
- itkSetMacro(Sigma,double);
- itkGetMacro(Sigma,double);
+ itkSetMacro(Sigma, double);
+ itkGetMacro(Sigma, double);
/** Set the functor parameters before calling the ThreadedGenerateData() */
virtual void BeforeThreadedGenerateData(void)
@@ -244,27 +245,27 @@ public:
protected:
/** Constructor */
ConvexOrConcaveClassificationFilter()
- {
+ {
m_ConvexLabel = 1;
m_ConcaveLabel = 2;
m_FlatLabel = 0;
m_Sigma = 0.0;
- };
+ };
/** Destructor */
- virtual ~ConvexOrConcaveClassificationFilter() {};
+ virtual ~ConvexOrConcaveClassificationFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"ConvexLabel: "<<m_ConvexLabel<<std::endl;
- os<<indent<<"ConcaveLabel: "<<m_ConcaveLabel<<std::endl;
- os<<indent<<"FlatLabel: "<<m_FlatLabel<<std::endl;
- os<<indent<<"Sigma: "<<m_Sigma<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "ConvexLabel: " << m_ConvexLabel << std::endl;
+ os << indent << "ConcaveLabel: " << m_ConcaveLabel << std::endl;
+ os << indent << "FlatLabel: " << m_FlatLabel << std::endl;
+ os << indent << "Sigma: " << m_Sigma << std::endl;
}
private:
- ConvexOrConcaveClassificationFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ConvexOrConcaveClassificationFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Label of the convex class */
LabelType m_ConvexLabel;
@@ -275,5 +276,5 @@ private:
/** Tolerance value */
double m_Sigma;
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h b/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h
index aa1aac99e0..d9f60e08fb 100644
--- a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h
+++ b/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h
@@ -79,14 +79,14 @@ namespace otb
*/
template <class TInputImage, class TOutputImage, class TStructuringElement>
class ITK_EXPORT GeodesicMorphologyDecompositionImageFilter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef GeodesicMorphologyDecompositionImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef GeodesicMorphologyDecompositionImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -95,27 +95,33 @@ public:
itkTypeMacro(GeodesicMorphologyDecompositionImageFilter, ImageToImageFilter);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
- typedef TStructuringElement StructuringElementType;
+ typedef TStructuringElement
+ StructuringElementType;
typedef typename StructuringElementType::RadiusType RadiusType;
- typedef itk::OpeningByReconstructionImageFilter<InputImageType,InputImageType,StructuringElementType> OpeningFilterType;
- typedef itk::ClosingByReconstructionImageFilter<InputImageType,InputImageType,StructuringElementType> ClosingFilterType;
- typedef itk::SubtractImageFilter<InputImageType,InputImageType,OutputImageType> ConvexFilterType;
- typedef itk::SubtractImageFilter<OutputImageType,InputImageType,OutputImageType> ConcaveFilterType;
- typedef otb::GeodesicMorphologyLevelingFilter<InputImageType,OutputImageType,OutputImageType> LevelingFilterType;
+ typedef itk::OpeningByReconstructionImageFilter<InputImageType, InputImageType,
+ StructuringElementType> OpeningFilterType;
+ typedef itk::ClosingByReconstructionImageFilter<InputImageType, InputImageType,
+ StructuringElementType> ClosingFilterType;
+ typedef itk::SubtractImageFilter<InputImageType, InputImageType,
+ OutputImageType> ConvexFilterType;
+ typedef itk::SubtractImageFilter<OutputImageType, InputImageType,
+ OutputImageType> ConcaveFilterType;
+ typedef otb::GeodesicMorphologyLevelingFilter<InputImageType, OutputImageType,
+ OutputImageType> LevelingFilterType;
/** Pointers typedefs*/
- typedef typename OpeningFilterType::Pointer OpeningFilterPointerType;
- typedef typename ClosingFilterType::Pointer ClosingFilterPointerType;
+ typedef typename OpeningFilterType::Pointer OpeningFilterPointerType;
+ typedef typename ClosingFilterType::Pointer ClosingFilterPointerType;
typedef typename LevelingFilterType::Pointer LevelingFilterPointerType;
- typedef typename ConvexFilterType::Pointer ConvexFilterPointerType;
- typedef typename ConcaveFilterType::Pointer ConcaveFilterPointerType;
+ typedef typename ConvexFilterType::Pointer ConvexFilterPointerType;
+ typedef typename ConcaveFilterType::Pointer ConcaveFilterPointerType;
/** Radius of the structuring element */
- itkSetMacro(Radius,RadiusType);
- itkGetConstReferenceMacro(Radius,RadiusType);
+ itkSetMacro(Radius, RadiusType);
+ itkGetConstReferenceMacro(Radius, RadiusType);
/**
* Get the convex likehood map.
@@ -130,11 +136,11 @@ public:
OutputImageType * GetConcaveMap(void);
/** FullyConnected flag */
- itkSetMacro(FullyConnected,bool);
- itkGetMacro(FullyConnected,bool);
+ itkSetMacro(FullyConnected, bool);
+ itkGetMacro(FullyConnected, bool);
/** Preserve intensities flag */
- itkSetMacro(PreserveIntensities,bool);
- itkGetMacro(PreserveIntensities,bool);
+ itkSetMacro(PreserveIntensities, bool);
+ itkGetMacro(PreserveIntensities, bool);
protected:
/** GenerateData */
@@ -142,13 +148,13 @@ protected:
/** Constructor */
GeodesicMorphologyDecompositionImageFilter();
/** Destructor */
- virtual ~GeodesicMorphologyDecompositionImageFilter() {};
+ virtual ~GeodesicMorphologyDecompositionImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- GeodesicMorphologyDecompositionImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ GeodesicMorphologyDecompositionImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Radius of the structuring element */
RadiusType m_Radius;
@@ -168,7 +174,7 @@ private:
bool m_FullyConnected;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbGeodesicMorphologyDecompositionImageFilter.txx"
#endif
diff --git a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.txx b/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.txx
index 95ea2b7970..e8b335e902 100644
--- a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.txx
+++ b/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.txx
@@ -26,13 +26,13 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage, class TStructuringElement>
-GeodesicMorphologyDecompositionImageFilter<TInputImage,TOutputImage,TStructuringElement>
+GeodesicMorphologyDecompositionImageFilter<TInputImage, TOutputImage, TStructuringElement>
::GeodesicMorphologyDecompositionImageFilter()
{
this->SetNumberOfOutputs(3);
- this->SetNthOutput(0,OutputImageType::New());
- this->SetNthOutput(1,OutputImageType::New());
- this->SetNthOutput(2,OutputImageType::New());
+ this->SetNthOutput(0, OutputImageType::New());
+ this->SetNthOutput(1, OutputImageType::New());
+ this->SetNthOutput(2, OutputImageType::New());
m_Radius.Fill(1);
@@ -50,7 +50,7 @@ GeodesicMorphologyDecompositionImageFilter<TInputImage,TOutputImage,TStructuring
*/
template <class TInputImage, class TOutputImage, class TStructuringElement>
void
-GeodesicMorphologyDecompositionImageFilter<TInputImage,TOutputImage,TStructuringElement>
+GeodesicMorphologyDecompositionImageFilter<TInputImage, TOutputImage, TStructuringElement>
::GenerateData()
{
StructuringElementType se;
@@ -79,11 +79,11 @@ GeodesicMorphologyDecompositionImageFilter<TInputImage,TOutputImage,TStructuring
m_ConvexFilter->GraftOutput(this->GetConvexMap());
m_ConvexFilter->Update();
- this->GraftNthOutput(1,m_ConvexFilter->GetOutput());
+ this->GraftNthOutput(1, m_ConvexFilter->GetOutput());
m_ConcaveFilter->GraftOutput(this->GetConcaveMap());
m_ConcaveFilter->Update();
- this->GraftNthOutput(2,m_ConcaveFilter->GetOutput());
+ this->GraftNthOutput(2, m_ConcaveFilter->GetOutput());
m_LevelingFilter->GraftOutput(this->GetOutput());
m_LevelingFilter->Update();
@@ -95,15 +95,15 @@ GeodesicMorphologyDecompositionImageFilter<TInputImage,TOutputImage,TStructuring
*/
template <class TInputImage, class TOutputImage, class TStructuringElement>
TOutputImage *
-GeodesicMorphologyDecompositionImageFilter<TInputImage,TOutputImage,TStructuringElement>
+GeodesicMorphologyDecompositionImageFilter<TInputImage, TOutputImage, TStructuringElement>
::GetConvexMap()
{
if (this->GetNumberOfOutputs() < 2)
- {
+ {
return 0;
- }
- return static_cast<OutputImageType * >
- (this->itk::ProcessObject::GetOutput(1));
+ }
+ return static_cast<OutputImageType *>
+ (this->itk::ProcessObject::GetOutput(1));
}
/**
@@ -111,15 +111,15 @@ GeodesicMorphologyDecompositionImageFilter<TInputImage,TOutputImage,TStructuring
*/
template <class TInputImage, class TOutputImage, class TStructuringElement>
TOutputImage *
-GeodesicMorphologyDecompositionImageFilter<TInputImage,TOutputImage,TStructuringElement>
+GeodesicMorphologyDecompositionImageFilter<TInputImage, TOutputImage, TStructuringElement>
::GetConcaveMap()
{
if (this->GetNumberOfOutputs() < 3)
- {
+ {
return 0;
- }
- return static_cast<OutputImageType * >
- (this->itk::ProcessObject::GetOutput(2));
+ }
+ return static_cast<OutputImageType *>
+ (this->itk::ProcessObject::GetOutput(2));
}
/**
@@ -127,7 +127,7 @@ GeodesicMorphologyDecompositionImageFilter<TInputImage,TOutputImage,TStructuring
*/
template <class TInputImage, class TOutputImage, class TStructuringElement>
void
-GeodesicMorphologyDecompositionImageFilter<TInputImage,TOutputImage,TStructuringElement>
+GeodesicMorphologyDecompositionImageFilter<TInputImage, TOutputImage, TStructuringElement>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.h b/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
index da710e17a8..b9b22653c3 100644
--- a/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
+++ b/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
@@ -62,47 +62,49 @@ namespace otb
*/
template <class TImage, class TStructuringElement>
class ITK_EXPORT GeodesicMorphologyIterativeDecompositionImageFilter
- : public ImageToImageListFilter<TImage,TImage>
+ : public ImageToImageListFilter<TImage, TImage>
{
public:
/** Standard typedefs */
typedef GeodesicMorphologyIterativeDecompositionImageFilter Self;
- typedef ImageToImageListFilter<TImage,TImage> Superclass;
+ typedef ImageToImageListFilter<TImage, TImage> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(GeodesicMorphologyIterativeDecompositionImageFilter,ImageToImageListFilter);
+ itkTypeMacro(GeodesicMorphologyIterativeDecompositionImageFilter, ImageToImageListFilter);
/** Input image dimension constant macro */
- itkStaticConstMacro(InputImageDimension, unsigned int,TImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TImage::ImageDimension);
/** Output related typedefs */
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::OutputImageListType OutputImageListType;
- typedef typename OutputImageListType::Pointer OutputImageListPointerType;
- typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::OutputImageListType OutputImageListType;
+ typedef typename OutputImageListType::Pointer OutputImageListPointerType;
+ typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
/** Input related typedefs */
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::InputImageRegionType InputImageRegionType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename InputImageType::ConstPointer InputImageConstPointerType;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::ValueType ValueType;
- typedef typename InputImageType::PixelType PixelType;
- typedef typename InputImageType::SpacingType SpacingType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::InputImageRegionType InputImageRegionType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::ConstPointer InputImageConstPointerType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::ValueType ValueType;
+ typedef typename InputImageType::PixelType PixelType;
+ typedef typename InputImageType::SpacingType SpacingType;
typedef TStructuringElement StructuringElementType;
/** Typedef of the decomposition filter */
- typedef GeodesicMorphologyDecompositionImageFilter<InputImageType,InputImageType,StructuringElementType> DecompositionFilterType;
- typedef typename DecompositionFilterType::Pointer DecompositionFilterPointerType;
+ typedef GeodesicMorphologyDecompositionImageFilter<InputImageType, InputImageType,
+ StructuringElementType> DecompositionFilterType;
+ typedef typename DecompositionFilterType::Pointer
+ DecompositionFilterPointerType;
/** Accessors */
- itkSetMacro(Step,unsigned int);
- itkGetMacro(Step,unsigned int);
- itkSetMacro(InitialValue,unsigned int);
- itkGetMacro(InitialValue,unsigned int);
- itkSetMacro(NumberOfIterations,unsigned int);
+ itkSetMacro(Step, unsigned int);
+ itkGetMacro(Step, unsigned int);
+ itkSetMacro(InitialValue, unsigned int);
+ itkGetMacro(InitialValue, unsigned int);
+ itkSetMacro(NumberOfIterations, unsigned int);
itkGetMacro(NumberOfIterations, unsigned int);
/**
@@ -125,7 +127,7 @@ protected:
/** Constructor */
GeodesicMorphologyIterativeDecompositionImageFilter();
/** Destructor */
- virtual ~GeodesicMorphologyIterativeDecompositionImageFilter() {};
+ virtual ~GeodesicMorphologyIterativeDecompositionImageFilter() {}
/** Generate output information */
virtual void GenerateOutputInformation();
/** Generate input requested region */
@@ -144,7 +146,7 @@ private:
unsigned int m_NumberOfIterations;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbGeodesicMorphologyIterativeDecompositionImageFilter.txx"
diff --git a/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx b/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
index 59614cc8db..53aaed9f91 100644
--- a/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
+++ b/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
@@ -40,11 +40,11 @@ GeodesicMorphologyIterativeDecompositionImageFilter<TImage, TStructuringElement>
m_InitialValue = 1;
m_Step = 1;
OutputImageListPointerType convList = OutputImageListType::New();
- this->SetNthOutput(0,convList.GetPointer());
+ this->SetNthOutput(0, convList.GetPointer());
OutputImageListPointerType concList = OutputImageListType::New();
- this->SetNthOutput(1,concList.GetPointer());
+ this->SetNthOutput(1, concList.GetPointer());
OutputImageListPointerType outputList = OutputImageListType::New();
- this->SetNthOutput(2,outputList.GetPointer());
+ this->SetNthOutput(2, outputList.GetPointer());
}
template <class TImage, class TStructuringElement>
@@ -74,93 +74,91 @@ GeodesicMorphologyIterativeDecompositionImageFilter<TImage, TStructuringElement>
return dynamic_cast<OutputImageListType*>(this->itk::ProcessObject::GetOutput(1));
}
-
template <class TImage, class TStructuringElement>
void
GeodesicMorphologyIterativeDecompositionImageFilter<TImage, TStructuringElement>
::GenerateOutputInformation(void)
{
// Retrieving input/output pointers
- InputImagePointerType inputPtr = this->GetInput();
+ InputImagePointerType inputPtr = this->GetInput();
OutputImageListPointerType outputPtr = this->GetOutput();
OutputImageListPointerType convOutputPtr = this->GetConvexOutput();
OutputImageListPointerType concOutputPtr = this->GetConcaveOutput();
if (outputPtr)
- {
- if (outputPtr->Size()!=m_NumberOfIterations)
{
+ if (outputPtr->Size() != m_NumberOfIterations)
+ {
// in this case, clear the list
outputPtr->Clear();
- for (unsigned int i = 0;i<m_NumberOfIterations;++i)
- {
+ for (unsigned int i = 0; i < m_NumberOfIterations; ++i)
+ {
//Create the output image
outputPtr->PushBack(OutputImageType::New());
+ }
}
- }
// For each output image
typename OutputImageListType::Iterator outputListIt = outputPtr->Begin();
- while (outputListIt!=outputPtr->End())
- {
+ while (outputListIt != outputPtr->End())
+ {
//Set the image information
outputListIt.Get()->CopyInformation(this->GetInput());
outputListIt.Get()->SetRequestedRegion(this->GetInput()->GetLargestPossibleRegion());
++outputListIt;
+ }
}
- }
if (convOutputPtr)
- {
- if (convOutputPtr->Size()!=m_NumberOfIterations)
{
+ if (convOutputPtr->Size() != m_NumberOfIterations)
+ {
// in this case, clear the list
convOutputPtr->Clear();
- for (unsigned int i = 0;i<m_NumberOfIterations;++i)
- {
+ for (unsigned int i = 0; i < m_NumberOfIterations; ++i)
+ {
//Create the output image
convOutputPtr->PushBack(OutputImageType::New());
+ }
}
- }
// For each output image
typename OutputImageListType::Iterator outputListIt = convOutputPtr->Begin();
- while (outputListIt!=convOutputPtr->End())
- {
+ while (outputListIt != convOutputPtr->End())
+ {
//Set the image information
outputListIt.Get()->CopyInformation(this->GetInput());
outputListIt.Get()->SetRequestedRegion(this->GetInput()->GetLargestPossibleRegion());
++outputListIt;
+ }
}
- }
if (concOutputPtr)
- {
- if (concOutputPtr->Size()!=m_NumberOfIterations)
{
+ if (concOutputPtr->Size() != m_NumberOfIterations)
+ {
// in this case, clear the list
concOutputPtr->Clear();
- for (unsigned int i = 0;i<m_NumberOfIterations;++i)
- {
+ for (unsigned int i = 0; i < m_NumberOfIterations; ++i)
+ {
//Create the output image
concOutputPtr->PushBack(OutputImageType::New());
+ }
}
- }
// For each output image
typename OutputImageListType::Iterator outputListIt = concOutputPtr->Begin();
- while (outputListIt!=concOutputPtr->End())
- {
+ while (outputListIt != concOutputPtr->End())
+ {
//Set the image information
outputListIt.Get()->CopyInformation(this->GetInput());
outputListIt.Get()->SetRequestedRegion(this->GetInput()->GetLargestPossibleRegion());
++outputListIt;
+ }
}
- }
}
-
template <class TImage, class TStructuringElement>
void
GeodesicMorphologyIterativeDecompositionImageFilter<TImage, TStructuringElement>
::GenerateInputRequestedRegion(void)
{
// Retrieving input/output pointers
- InputImagePointerType inputPtr = this->GetInput();
+ InputImagePointerType inputPtr = this->GetInput();
OutputImageListPointerType outputPtr = this->GetOutput();
// For each output image
@@ -177,7 +175,7 @@ GeodesicMorphologyIterativeDecompositionImageFilter<TImage, TStructuringElement>
::GenerateData(void)
{
//Input image pointer
- InputImagePointerType current = this->GetInput();
+ InputImagePointerType current = this->GetInput();
OutputImageListPointerType outputPtr = this->GetOutput();
OutputImageListPointerType convOutputPtr = this->GetConvexOutput();
OutputImageListPointerType concOutputPtr = this->GetConcaveOutput();
@@ -186,11 +184,11 @@ GeodesicMorphologyIterativeDecompositionImageFilter<TImage, TStructuringElement>
DecompositionFilterPointerType filter;
- while (i<m_NumberOfIterations)
- {
+ while (i < m_NumberOfIterations)
+ {
filter = DecompositionFilterType::New();
typename StructuringElementType::RadiusType radius;
- radius.Fill(m_InitialValue+i*m_Step);
+ radius.Fill(m_InitialValue + i * m_Step);
filter->SetRadius(radius);
filter->SetInput(current);
filter->GetOutput()->UpdateOutputInformation();
@@ -198,14 +196,14 @@ GeodesicMorphologyIterativeDecompositionImageFilter<TImage, TStructuringElement>
filter->GetOutput()->PropagateRequestedRegion();
filter->GetOutput()->UpdateOutputData();
- outputPtr->SetNthElement(i,filter->GetOutput());
- concOutputPtr->SetNthElement(i,filter->GetConvexMap());
- convOutputPtr->SetNthElement(i,filter->GetConcaveMap());
+ outputPtr->SetNthElement(i, filter->GetOutput());
+ concOutputPtr->SetNthElement(i, filter->GetConvexMap());
+ convOutputPtr->SetNthElement(i, filter->GetConcaveMap());
- current=filter->GetOutput();
+ current = filter->GetOutput();
++i;
- }
+ }
}
/**
@@ -217,9 +215,9 @@ GeodesicMorphologyIterativeDecompositionImageFilter<TImage, TStructuringElement>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
- os<<indent<<"NumberOfIterations: "<<m_NumberOfIterations<<std::endl;
- os<<indent<<"IntialValue: "<<m_InitialValue<<std::endl;
- os<<indent<<"Step: "<<m_Step<<std::endl;
+ os << indent << "NumberOfIterations: " << m_NumberOfIterations << std::endl;
+ os << indent << "IntialValue: " << m_InitialValue << std::endl;
+ os << indent << "Step: " << m_Step << std::endl;
}
} // End namespace otb
#endif
diff --git a/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h b/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h
index 93a7d922a1..c31b6bfb8e 100644
--- a/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h
+++ b/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h
@@ -18,7 +18,6 @@
#ifndef __otbGeodesicMorphologyLevelingFilter_h
#define __otbGeodesicMorphologyLevelingFilter_h
-
#include "itkTernaryFunctorImageFilter.h"
namespace otb
@@ -36,30 +35,30 @@ class LevelingFunctor
{
public:
/// Constructor
- LevelingFunctor() {};
+ LevelingFunctor() {}
/// Destructor
- virtual ~LevelingFunctor() {};
+ virtual ~LevelingFunctor() {}
- inline TOutput operator()(const TInput& pixel, const TInputMap& convexPixel, const TInputMap& concavePixel)
+ inline TOutput operator ()(const TInput& pixel, const TInputMap& convexPixel, const TInputMap& concavePixel)
{
TOutput result;
- if (convexPixel>concavePixel)
- {
- result = static_cast<TOutput>(pixel-convexPixel);
- }
- else if (convexPixel<concavePixel)
- {
- result = static_cast<TOutput>(concavePixel+pixel);
- }
+ if (convexPixel > concavePixel)
+ {
+ result = static_cast<TOutput>(pixel - convexPixel);
+ }
+ else if (convexPixel < concavePixel)
+ {
+ result = static_cast<TOutput>(concavePixel + pixel);
+ }
else
- {
+ {
result = static_cast<TOutput>(pixel);
- }
+ }
return result;
}
};
-}// end namespace Functor
+} // end namespace Functor
/** \class GeodesicMorphologyLevelingFilter
* \brief This filter performs the leveling operation defined in the documentation of
@@ -70,28 +69,28 @@ public:
*/
template <class TInputImage, class TInputMaps, class TOutputImage>
class ITK_EXPORT GeodesicMorphologyLevelingFilter
- : public itk::TernaryFunctorImageFilter<TInputImage,TInputImage,
- TInputImage,TOutputImage,
- Functor::LevelingFunctor<typename TInputImage::PixelType,
- typename TInputMaps::PixelType,
- typename TOutputImage::PixelType> >
+ : public itk::TernaryFunctorImageFilter<TInputImage, TInputImage,
+ TInputImage, TOutputImage,
+ Functor::LevelingFunctor<typename TInputImage::PixelType,
+ typename TInputMaps::PixelType,
+ typename TOutputImage::PixelType> >
{
public:
/** Standard typedefs */
- typedef GeodesicMorphologyLevelingFilter Self;
- typedef itk::TernaryFunctorImageFilter<TInputImage,TInputImage,
- TInputImage,TOutputImage,
- Functor::LevelingFunctor<typename TInputImage::PixelType,
- typename TInputMaps::PixelType,
- typename TOutputImage::PixelType> >Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef GeodesicMorphologyLevelingFilter Self;
+ typedef itk::TernaryFunctorImageFilter<TInputImage, TInputImage,
+ TInputImage, TOutputImage,
+ Functor::LevelingFunctor<typename TInputImage::PixelType,
+ typename TInputMaps::PixelType,
+ typename TOutputImage::PixelType> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(GeodesicMorphologyLevelingFilter,TernaryFunctorImageFilter);
+ itkTypeMacro(GeodesicMorphologyLevelingFilter, TernaryFunctorImageFilter);
/**
* Set the convex membership image.
@@ -119,16 +118,16 @@ protected:
/** Constructor */
GeodesicMorphologyLevelingFilter() {};
/** Destructor */
- virtual ~GeodesicMorphologyLevelingFilter() {};
+ virtual ~GeodesicMorphologyLevelingFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
- GeodesicMorphologyLevelingFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ GeodesicMorphologyLevelingFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/MultiScale/otbImageToProfileFilter.h b/Code/MultiScale/otbImageToProfileFilter.h
index fad0c1d802..d3ba48a41b 100644
--- a/Code/MultiScale/otbImageToProfileFilter.h
+++ b/Code/MultiScale/otbImageToProfileFilter.h
@@ -40,14 +40,14 @@ namespace otb
*/
template <class TInputImage, class TOutputImage, class TFilter, class TParameter = unsigned int>
class ITK_EXPORT ImageToProfileFilter
- : public ImageToImageListFilter<TInputImage,TOutputImage>
+ : public ImageToImageListFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef ImageToProfileFilter Self;
- typedef ImageToImageListFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageToProfileFilter Self;
+ typedef ImageToImageListFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -56,36 +56,36 @@ public:
itkTypeMacro(ImageToProfileFilter, ImageToImageListFilter);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
- typedef TParameter ParameterType;
- typedef TFilter FilterType;
- typedef typename FilterType::Pointer FilterPointerType;
- typedef typename Superclass::OutputImageListType OutputImageListType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
+ typedef TParameter ParameterType;
+ typedef TFilter FilterType;
+ typedef typename FilterType::Pointer FilterPointerType;
+ typedef typename Superclass::OutputImageListType OutputImageListType;
typedef typename Superclass::OutputImageListPointerType OutputImageListPointerType;
- typedef typename Superclass::InputImagePointer InputImagePointerType;
+ typedef typename Superclass::InputImagePointer InputImagePointerType;
/** Get/Set the initial value */
- itkSetMacro(InitialValue,ParameterType);
- itkGetMacro(InitialValue,ParameterType);
+ itkSetMacro(InitialValue, ParameterType);
+ itkGetMacro(InitialValue, ParameterType);
/** Get/Set the profile size */
- itkSetMacro(ProfileSize,unsigned int);
- itkGetMacro(ProfileSize,unsigned int);
+ itkSetMacro(ProfileSize, unsigned int);
+ itkGetMacro(ProfileSize, unsigned int);
/** Get/Set the profile step */
- itkSetMacro(Step,ParameterType);
- itkGetMacro(Step,ParameterType);
+ itkSetMacro(Step, ParameterType);
+ itkGetMacro(Step, ParameterType);
/** Get/Set the output index */
- itkSetMacro(OutputIndex,unsigned int);
- itkGetMacro(OutputIndex,unsigned int);
+ itkSetMacro(OutputIndex, unsigned int);
+ itkGetMacro(OutputIndex, unsigned int);
protected:
/**
* Set the profile parameter
* \param param The parameter to set
*/
- virtual void SetProfileParameter(ParameterType param) {};
+ virtual void SetProfileParameter(ParameterType param) {}
/** Get the pointer to the filter */
- itkGetObjectMacro(Filter,FilterType);
+ itkGetObjectMacro(Filter, FilterType);
/** GenerateData method */
virtual void GenerateData(void);
/** GenerateOutputInformation method */
@@ -95,13 +95,13 @@ protected:
/** Constructor */
ImageToProfileFilter();
/** Destructor */
- virtual ~ImageToProfileFilter() {};
+ virtual ~ImageToProfileFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageToProfileFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageToProfileFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The filter used to compute the profile */
FilterPointerType m_Filter;
@@ -115,7 +115,7 @@ private:
unsigned int m_OutputIndex;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbImageToProfileFilter.txx"
#endif
diff --git a/Code/MultiScale/otbImageToProfileFilter.txx b/Code/MultiScale/otbImageToProfileFilter.txx
index 72f38481e1..461c38d0be 100644
--- a/Code/MultiScale/otbImageToProfileFilter.txx
+++ b/Code/MultiScale/otbImageToProfileFilter.txx
@@ -26,61 +26,61 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage, class TFilter, class TParameter>
-ImageToProfileFilter<TInputImage,TOutputImage,TFilter,TParameter>
+ImageToProfileFilter<TInputImage, TOutputImage, TFilter, TParameter>
::ImageToProfileFilter()
{
m_InitialValue = 0;
m_Step = 1;
m_ProfileSize = 10;
m_OutputIndex = 0;
- m_Filter= FilterType::New();
+ m_Filter = FilterType::New();
}
/**
* GenerateOutputInformation method
*/
template <class TInputImage, class TOutputImage, class TFilter, class TParameter>
void
-ImageToProfileFilter<TInputImage,TOutputImage,TFilter,TParameter>
+ImageToProfileFilter<TInputImage, TOutputImage, TFilter, TParameter>
::GenerateOutputInformation(void)
{
// Retrieving input/output pointers
- InputImagePointerType inputPtr = this->GetInput();
+ InputImagePointerType inputPtr = this->GetInput();
OutputImageListPointerType outputPtr = this->GetOutput();
if (outputPtr)
- {
- if (outputPtr->Size()!=m_ProfileSize)
{
+ if (outputPtr->Size() != m_ProfileSize)
+ {
// in this case, clear the list
outputPtr->Clear();
- for (unsigned int i = 0;i<m_ProfileSize;++i)
- {
+ for (unsigned int i = 0; i < m_ProfileSize; ++i)
+ {
//Create the output image
outputPtr->PushBack(OutputImageType::New());
+ }
}
- }
// For each output image
typename OutputImageListType::Iterator outputListIt = outputPtr->Begin();
m_Filter->SetInput(inputPtr);
m_Filter->UpdateOutputInformation();
- while (outputListIt!=outputPtr->End())
- {
+ while (outputListIt != outputPtr->End())
+ {
//Set the image information
outputListIt.Get()->CopyInformation(m_Filter->GetOutput(m_OutputIndex));
outputListIt.Get()->SetLargestPossibleRegion(m_Filter->GetOutput(m_OutputIndex)->GetLargestPossibleRegion());
++outputListIt;
+ }
}
- }
}
/**
* Generate input requested region
*/
template <class TInputImage, class TOutputImage, class TFilter, class TParameter>
void
-ImageToProfileFilter<TInputImage,TOutputImage,TFilter,TParameter>
+ImageToProfileFilter<TInputImage, TOutputImage, TFilter, TParameter>
::GenerateInputRequestedRegion(void)
{
// Retrieving input/output pointers
- InputImagePointerType inputPtr = this->GetInput();
+ InputImagePointerType inputPtr = this->GetInput();
OutputImageListPointerType outputPtr = this->GetOutput();
// For each output image
@@ -89,35 +89,35 @@ ImageToProfileFilter<TInputImage,TOutputImage,TFilter,TParameter>
m_Filter->SetInput(inputPtr);
// Use the filter to generate input requested region
- while (outputListIt!=outputPtr->End())
- {
+ while (outputListIt != outputPtr->End())
+ {
m_Filter->GetOutput(m_OutputIndex)->SetRequestedRegion(outputListIt.Get()->GetRequestedRegion());
m_Filter->PropagateRequestedRegion(outputListIt.Get());
++outputListIt;
- }
+ }
}
/**
* GenerateData method
*/
template <class TInputImage, class TOutputImage, class TFilter, class TParameter>
void
-ImageToProfileFilter<TInputImage,TOutputImage,TFilter,TParameter>
+ImageToProfileFilter<TInputImage, TOutputImage, TFilter, TParameter>
::GenerateData(void)
{
// Retrieving input/output pointers
- InputImagePointerType inputPtr = this->GetInput();
+ InputImagePointerType inputPtr = this->GetInput();
OutputImageListPointerType outputPtr = this->GetOutput();
m_Filter->SetInput(inputPtr);
- for (unsigned int i = 0;i<m_ProfileSize;++i)
- {
- ParameterType profileParameter = m_InitialValue + static_cast<ParameterType>(i)*m_Step;
+ for (unsigned int i = 0; i < m_ProfileSize; ++i)
+ {
+ ParameterType profileParameter = m_InitialValue + static_cast<ParameterType>(i) * m_Step;
this->SetProfileParameter(profileParameter);
m_Filter->GetOutput(m_OutputIndex)->SetRequestedRegion(outputPtr->GetNthElement(i)->GetRequestedRegion());
m_Filter->Update();
- outputPtr->SetNthElement(i,static_cast<OutputImageType *>(m_Filter->GetOutput(m_OutputIndex)));
+ outputPtr->SetNthElement(i, static_cast<OutputImageType *>(m_Filter->GetOutput(m_OutputIndex)));
outputPtr->GetNthElement(i)->DisconnectPipeline();
- }
+ }
}
/**
@@ -125,16 +125,15 @@ ImageToProfileFilter<TInputImage,TOutputImage,TFilter,TParameter>
*/
template <class TInputImage, class TOutputImage, class TFilter, class TParameter>
void
-ImageToProfileFilter<TInputImage,TOutputImage,TFilter,TParameter>
+ImageToProfileFilter<TInputImage, TOutputImage, TFilter, TParameter>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
- os<<indent<<"Filter: " <<m_Filter->GetNameOfClass() <<std::endl;
- os<<indent<<"OutputIndex: " <<m_OutputIndex <<std::endl;
- os<<indent<<"ProfileSize: " <<m_ProfileSize <<std::endl;
- os<<indent<<"InitialValue: "<<m_InitialValue <<std::endl;
- os<<indent<<"Step: " <<m_Step <<std::endl;
-
+ os << indent << "Filter: " << m_Filter->GetNameOfClass() << std::endl;
+ os << indent << "OutputIndex: " << m_OutputIndex << std::endl;
+ os << indent << "ProfileSize: " << m_ProfileSize << std::endl;
+ os << indent << "InitialValue: " << m_InitialValue << std::endl;
+ os << indent << "Step: " << m_Step << std::endl;
}
} // End namespace otb
diff --git a/Code/MultiScale/otbMorphologicalClosingProfileFilter.h b/Code/MultiScale/otbMorphologicalClosingProfileFilter.h
index 3d047985ac..8603494380 100644
--- a/Code/MultiScale/otbMorphologicalClosingProfileFilter.h
+++ b/Code/MultiScale/otbMorphologicalClosingProfileFilter.h
@@ -43,30 +43,30 @@ namespace otb
* \sa ImageToProfileFilter
* \sa itk::ClosingByReconstructionImageFilter
*/
-template <class TInputImage,class TOutputImage, class TStructuringElement>
+template <class TInputImage, class TOutputImage, class TStructuringElement>
class ITK_EXPORT MorphologicalClosingProfileFilter
- : public ImageToProfileFilter<TInputImage,TOutputImage,
- itk::ClosingByReconstructionImageFilter
- <TInputImage, TOutputImage, TStructuringElement>,
- unsigned int>
+ : public ImageToProfileFilter<TInputImage, TOutputImage,
+ itk::ClosingByReconstructionImageFilter
+ <TInputImage, TOutputImage, TStructuringElement>,
+ unsigned int>
{
public:
/** Standard typedefs */
- typedef MorphologicalClosingProfileFilter Self;
- typedef ImageToProfileFilter<TInputImage,TOutputImage,
- itk::ClosingByReconstructionImageFilter
- <TInputImage, TOutputImage, TStructuringElement>,
- unsigned int> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MorphologicalClosingProfileFilter Self;
+ typedef ImageToProfileFilter<TInputImage, TOutputImage,
+ itk::ClosingByReconstructionImageFilter
+ <TInputImage, TOutputImage, TStructuringElement>,
+ unsigned int> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(MorphologicalClosingProfileFilter,ImageToProfileFilter);
+ itkTypeMacro(MorphologicalClosingProfileFilter, ImageToProfileFilter);
- typedef TStructuringElement StructuringElementType;
+ typedef TStructuringElement StructuringElementType;
typedef typename Superclass::ParameterType ParameterType;
protected:
@@ -77,20 +77,20 @@ protected:
se.SetRadius(param);
se.CreateStructuringElement();
this->GetFilter()->SetKernel(se);
- };
+ }
/** Constructor */
MorphologicalClosingProfileFilter() {};
/** Destructor */
- virtual ~MorphologicalClosingProfileFilter() {};
+ virtual ~MorphologicalClosingProfileFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- };
+ Superclass::PrintSelf(os, indent);
+ }
private:
- MorphologicalClosingProfileFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MorphologicalClosingProfileFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/MultiScale/otbMorphologicalOpeningProfileFilter.h b/Code/MultiScale/otbMorphologicalOpeningProfileFilter.h
index 4f81e6ad89..0b04b48c06 100644
--- a/Code/MultiScale/otbMorphologicalOpeningProfileFilter.h
+++ b/Code/MultiScale/otbMorphologicalOpeningProfileFilter.h
@@ -43,30 +43,30 @@ namespace otb
* \sa ImageToProfileFilter
* \sa itk::OpeningByReconstructionImageFilter
*/
-template <class TInputImage,class TOutputImage, class TStructuringElement>
+template <class TInputImage, class TOutputImage, class TStructuringElement>
class ITK_EXPORT MorphologicalOpeningProfileFilter
- : public ImageToProfileFilter<TInputImage,TOutputImage,
- itk::OpeningByReconstructionImageFilter
- <TInputImage, TOutputImage, TStructuringElement>,
- unsigned int>
+ : public ImageToProfileFilter<TInputImage, TOutputImage,
+ itk::OpeningByReconstructionImageFilter
+ <TInputImage, TOutputImage, TStructuringElement>,
+ unsigned int>
{
public:
/** Standard typedefs */
- typedef MorphologicalOpeningProfileFilter Self;
- typedef ImageToProfileFilter<TInputImage,TOutputImage,
- itk::OpeningByReconstructionImageFilter
- <TInputImage, TOutputImage, TStructuringElement>,
- unsigned int> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MorphologicalOpeningProfileFilter Self;
+ typedef ImageToProfileFilter<TInputImage, TOutputImage,
+ itk::OpeningByReconstructionImageFilter
+ <TInputImage, TOutputImage, TStructuringElement>,
+ unsigned int> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(MorphologicalOpeningProfileFilter,ImageToProfileFilter);
+ itkTypeMacro(MorphologicalOpeningProfileFilter, ImageToProfileFilter);
- typedef TStructuringElement StructuringElementType;
+ typedef TStructuringElement StructuringElementType;
typedef typename Superclass::ParameterType ParameterType;
protected:
@@ -77,20 +77,20 @@ protected:
se.SetRadius(param);
se.CreateStructuringElement();
this->GetFilter()->SetKernel(se);
- };
+ }
/** Constructor */
MorphologicalOpeningProfileFilter() {};
/** Destructor */
- virtual ~MorphologicalOpeningProfileFilter() {};
+ virtual ~MorphologicalOpeningProfileFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- };
+ Superclass::PrintSelf(os, indent);
+ }
private:
- MorphologicalOpeningProfileFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MorphologicalOpeningProfileFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.h b/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.h
index 31dc033a01..98baa11d43 100644
--- a/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.h
+++ b/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.h
@@ -48,37 +48,37 @@ namespace otb
*/
template <class TInputImage, class TOutputImage, class TMorphoFilter>
class ITK_EXPORT MorphologicalPyramidAnalysisFilter
- : public ImageToImageListFilter<TInputImage,TOutputImage>
+ : public ImageToImageListFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef MorphologicalPyramidAnalysisFilter Self;
- typedef ImageToImageListFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MorphologicalPyramidAnalysisFilter Self;
+ typedef ImageToImageListFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(MorphologicalPyramidAnalysisFilter,MorphologicalPyramidAnalysisFilter);
+ itkTypeMacro(MorphologicalPyramidAnalysisFilter, MorphologicalPyramidAnalysisFilter);
/** Input image dimension constant macro */
- itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/** Template parameters typedefs */
- typedef TMorphoFilter MorphoFilterType;
+ typedef TMorphoFilter MorphoFilterType;
typedef typename MorphoFilterType::KernelType KernelType;
/** Output related typedefs */
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::OutputImageListType OutputImageListType;
- typedef typename OutputImageListType::Pointer OutputImageListPointerType;
- typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::OutputImageListType OutputImageListType;
+ typedef typename OutputImageListType::Pointer OutputImageListPointerType;
+ typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
/** Input related typedefs */
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::InputImageRegionType InputImageRegionType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename InputImageType::ConstPointer InputImageConstPointerType;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::ValueType ValueType;
- typedef typename InputImageType::PixelType PixelType;
- typedef typename InputImageType::SpacingType SpacingType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::InputImageRegionType InputImageRegionType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::ConstPointer InputImageConstPointerType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::ValueType ValueType;
+ typedef typename InputImageType::PixelType PixelType;
+ typedef typename InputImageType::SpacingType SpacingType;
/** Accessors */
itkSetMacro(NumberOfLevels, int);
itkSetMacro(DecimationRatio, double);
@@ -115,7 +115,7 @@ protected:
MorphologicalPyramidAnalysisFilter();
/** Destructor */
virtual ~MorphologicalPyramidAnalysisFilter();
- virtual void GenerateOutputInformation() {}; // does nothing
+ virtual void GenerateOutputInformation() {} // does nothing
/** Main computation method */
virtual void GenerateData();
/** Printself method */
@@ -127,7 +127,7 @@ private:
/** Subsampling scale used */
double m_DecimationRatio;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbMorphologicalPyramidAnalysisFilter.txx"
diff --git a/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx b/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx
index 5e272cf63e..860f43f8f0 100644
--- a/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx
@@ -35,37 +35,37 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage, class TMorphoFilter>
-MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage, TMorphoFilter>
+MorphologicalPyramidAnalysisFilter<TInputImage, TOutputImage, TMorphoFilter>
::MorphologicalPyramidAnalysisFilter()
{
this->SetNumberOfRequiredOutputs(2);
m_DecimationRatio = 2.0;
m_NumberOfLevels = 4;
OutputImageListPointerType supFilter = OutputImageListType::New();
- this->SetNthOutput(0,supFilter.GetPointer());
+ this->SetNthOutput(0, supFilter.GetPointer());
OutputImageListPointerType infFilter = OutputImageListType::New();
- this->SetNthOutput(1,infFilter.GetPointer());
+ this->SetNthOutput(1, infFilter.GetPointer());
OutputImageListPointerType outputList = OutputImageListType::New();
- this->SetNthOutput(2,outputList.GetPointer());
+ this->SetNthOutput(2, outputList.GetPointer());
OutputImageListPointerType supDeci = OutputImageListType::New();
- this->SetNthOutput(3,supDeci.GetPointer());
+ this->SetNthOutput(3, supDeci.GetPointer());
OutputImageListPointerType infDeci = OutputImageListType::New();
- this->SetNthOutput(4,infDeci.GetPointer());
+ this->SetNthOutput(4, infDeci.GetPointer());
}
/**
* Destructor
*/
template <class TInputImage, class TOutputImage, class TMorphoFilter>
-MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
+MorphologicalPyramidAnalysisFilter<TInputImage, TOutputImage, TMorphoFilter>
::~MorphologicalPyramidAnalysisFilter() {}
/**
* Get The Analyse image at each level of the pyramid.
* \return The analysed image at each level of the pyramid.
*/
template <class TInputImage, class TOutputImage, class TMorphoFilter>
-typename MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
+typename MorphologicalPyramidAnalysisFilter<TInputImage, TOutputImage, TMorphoFilter>
::OutputImageListType*
-MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
+MorphologicalPyramidAnalysisFilter<TInputImage, TOutputImage, TMorphoFilter>
::GetOutput(void)
{
return dynamic_cast<OutputImageListType*>(this->itk::ProcessObject::GetOutput(2));
@@ -75,9 +75,9 @@ MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
* \return The brighter details extracted from the filtering operation.
*/
template <class TInputImage, class TOutputImage, class TMorphoFilter>
-typename MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
+typename MorphologicalPyramidAnalysisFilter<TInputImage, TOutputImage, TMorphoFilter>
::OutputImageListType*
-MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
+MorphologicalPyramidAnalysisFilter<TInputImage, TOutputImage, TMorphoFilter>
::GetSupFilter(void)
{
return dynamic_cast<OutputImageListType*>(this->itk::ProcessObject::GetOutput(0));
@@ -87,9 +87,9 @@ MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
* \return The darker details extracted from the filtering operation.
*/
template <class TInputImage, class TOutputImage, class TMorphoFilter>
-typename MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
+typename MorphologicalPyramidAnalysisFilter<TInputImage, TOutputImage, TMorphoFilter>
::OutputImageListType*
-MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
+MorphologicalPyramidAnalysisFilter<TInputImage, TOutputImage, TMorphoFilter>
::GetInfFilter(void)
{
return dynamic_cast<OutputImageListType*>(this->itk::ProcessObject::GetOutput(1));
@@ -99,9 +99,9 @@ MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
* \return The brighter details extracted from the resampling operation.
*/
template <class TInputImage, class TOutputImage, class TMorphoFilter>
-typename MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
+typename MorphologicalPyramidAnalysisFilter<TInputImage, TOutputImage, TMorphoFilter>
::OutputImageListType*
-MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
+MorphologicalPyramidAnalysisFilter<TInputImage, TOutputImage, TMorphoFilter>
::GetSupDeci(void)
{
return dynamic_cast<OutputImageListType*>(this->itk::ProcessObject::GetOutput(3));
@@ -111,9 +111,9 @@ MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
* \return The brighter details extracted from the resampling operation.
*/
template <class TInputImage, class TOutputImage, class TMorphoFilter>
-typename MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
+typename MorphologicalPyramidAnalysisFilter<TInputImage, TOutputImage, TMorphoFilter>
::OutputImageListType*
-MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
+MorphologicalPyramidAnalysisFilter<TInputImage, TOutputImage, TMorphoFilter>
::GetInfDeci(void)
{
return dynamic_cast<OutputImageListType*>(this->itk::ProcessObject::GetOutput(4));
@@ -123,11 +123,11 @@ MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
*/
template <class TInputImage, class TOutputImage, class TMorphoFilter>
void
-MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
+MorphologicalPyramidAnalysisFilter<TInputImage, TOutputImage, TMorphoFilter>
::GenerateData(void)
{
// Input image pointer
- OutputImageListType * OutputImageList = this->GetOutput();
+ OutputImageListType * OutputImageList = this->GetOutput();
// Output images pointers
OutputImageListType * supFilter = this->GetSupFilter();
@@ -136,20 +136,20 @@ MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
OutputImageListType * infDeci = this->GetInfDeci();
// typedefs of the filters
- typedef itk::SubtractImageFilter<InputImageType,InputImageType,OutputImageType> SubtractFilterType;
- typedef itk::MaximumImageFilter<InputImageType,InputImageType,InputImageType> MaxFilterType;
- typedef itk::ImageDuplicator<InputImageType> DuplicatorType;
- typedef otb::MorphologicalPyramid::Resampler<InputImageType,OutputImageType> ResamplerType;
+ typedef itk::SubtractImageFilter<InputImageType, InputImageType, OutputImageType> SubtractFilterType;
+ typedef itk::MaximumImageFilter<InputImageType, InputImageType, InputImageType> MaxFilterType;
+ typedef itk::ImageDuplicator<InputImageType> DuplicatorType;
+ typedef otb::MorphologicalPyramid::Resampler<InputImageType, OutputImageType> ResamplerType;
// Input Image duplication to the currentImage Pointer
typename DuplicatorType::Pointer duplicator = DuplicatorType::New();
duplicator->SetInputImage(this->GetInput());
duplicator->Update();
- typename InputImageType::Pointer currentImage =duplicator->GetOutput();
+ typename InputImageType::Pointer currentImage = duplicator->GetOutput();
typename InputImageType::Pointer upsampled;
// Structuring element size computation
- const int structElementDimension=static_cast<int>(vcl_ceil(this->GetDecimationRatio()/2.));
+ const int structElementDimension = static_cast<int>(vcl_ceil(this->GetDecimationRatio() / 2.));
// Structuring element creation
KernelType structuringElement;
@@ -157,10 +157,10 @@ MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
structuringElement.CreateStructuringElement();
// Filters declarations
- typename MorphoFilterType::Pointer morphoFilter;
- typename MaxFilterType::Pointer max;
- typename SubtractFilterType::Pointer subtract1,subtract2,subtract3,subtract4;
- typename ResamplerType::Pointer resampler1, resampler2;
+ typename MorphoFilterType::Pointer morphoFilter;
+ typename MaxFilterType::Pointer max;
+ typename SubtractFilterType::Pointer subtract1, subtract2, subtract3, subtract4;
+ typename ResamplerType::Pointer resampler1, resampler2;
// Size declaration
typename InputImageType::SizeType size;
@@ -172,9 +172,9 @@ MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
// Main loop //
//--------------------------------------------------------//
// While the number of iterations is not reached
- otbMsgDevMacro(<<"Entering main loop");
- while (i<this->GetNumberOfLevels())
- {
+ otbMsgDevMacro(<< "Entering main loop");
+ while (i < this->GetNumberOfLevels())
+ {
// morphological filtering
morphoFilter = MorphoFilterType::New();
@@ -183,7 +183,7 @@ MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
morphoFilter->Update();
// Maximum between current and filtered image
- max=MaxFilterType::New();
+ max = MaxFilterType::New();
max->SetInput1(morphoFilter->GetOutput());
max->SetInput2(currentImage);
max->Update();
@@ -193,28 +193,32 @@ MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
subtract1->SetInput1(max->GetOutput());
subtract1->SetInput2(morphoFilter->GetOutput());
subtract1->Update();
- otbMsgDevMacro(<<"MorphologicalPyramidAnalysisFilter: subtract1 OK "<<subtract1->GetOutput()->GetLargestPossibleRegion().GetSize());
+ otbMsgDevMacro(
+ << "MorphologicalPyramidAnalysisFilter: subtract1 OK " <<
+ subtract1->GetOutput()->GetLargestPossibleRegion().GetSize());
supFilter->PushBack(subtract1->GetOutput());
- otbMsgDevMacro("MorphologicalPyramidAnalysisFilter: step "<<i<<" - Image appended to SupFilter");
+ otbMsgDevMacro("MorphologicalPyramidAnalysisFilter: step " << i << " - Image appended to SupFilter");
// InfFilter detail image computation
subtract2 = SubtractFilterType::New();
subtract2->SetInput1(max->GetOutput());
subtract2->SetInput2(currentImage);
subtract2->Update();
- otbMsgDevMacro(<<"MorphologicalPyramidAnalysisFilter: subtract2 OK "<<subtract2->GetOutput()->GetLargestPossibleRegion().GetSize());
+ otbMsgDevMacro(
+ << "MorphologicalPyramidAnalysisFilter: subtract2 OK " <<
+ subtract2->GetOutput()->GetLargestPossibleRegion().GetSize());
infFilter->PushBack(subtract2->GetOutput());
- otbMsgDevMacro("MorphologicalPyramidAnalysisFilter: step "<<i<<" - Image appended to InfFilter");
+ otbMsgDevMacro("MorphologicalPyramidAnalysisFilter: step " << i << " - Image appended to InfFilter");
// New Size
size = morphoFilter->GetOutput()->GetLargestPossibleRegion().GetSize();
- for (int j =0; j<InputImageType::ImageDimension;++j)
- {
- sizeTmp=size[j];
+ for (int j = 0; j < InputImageType::ImageDimension; ++j)
+ {
+ sizeTmp = size[j];
// As we knwow that our values will always be positive ones, we can simulate round by ceil(value+0.5)
- size[j]=static_cast<unsigned int>(vcl_ceil((static_cast<double>(sizeTmp)/this->GetDecimationRatio())+0.5));
- }
- otbMsgDevMacro(<<"New size: "<<size);
+ size[j] = static_cast<unsigned int>(vcl_ceil((static_cast<double>(sizeTmp) / this->GetDecimationRatio()) + 0.5));
+ }
+ otbMsgDevMacro(<< "New size: " << size);
// Image subsampling
// Current image becomes the newly subsampled image
@@ -222,9 +226,10 @@ MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
resampler1->SetInput(morphoFilter->GetOutput());
resampler1->SetSize(size);
resampler1->Update();
- currentImage=resampler1->GetOutput();
+ currentImage = resampler1->GetOutput();
- otbMsgDevMacro(<<"MorphologicalPyramidAnalysisFilter: DownSampling OK "<<currentImage->GetLargestPossibleRegion().GetSize());
+ otbMsgDevMacro(
+ << "MorphologicalPyramidAnalysisFilter: DownSampling OK " << currentImage->GetLargestPossibleRegion().GetSize());
// New current image is appeneded to the output list
OutputImageList->PushBack(currentImage);
@@ -234,43 +239,50 @@ MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
resampler2->SetSize(morphoFilter->GetOutput()->GetLargestPossibleRegion().GetSize());
resampler2->Update();
- otbMsgDevMacro(<<"MorphologicalPyramidAnalysisFilter: UpSampling OK "<<resampler2->GetOutput()->GetLargestPossibleRegion().GetSize());
+ otbMsgDevMacro(
+ << "MorphologicalPyramidAnalysisFilter: UpSampling OK " <<
+ resampler2->GetOutput()->GetLargestPossibleRegion().GetSize());
// Computation of the details lost in the subsampling operation
- max=MaxFilterType::New();
+ max = MaxFilterType::New();
max->SetInput1(morphoFilter->GetOutput());
max->SetInput2(resampler2->GetOutput());
max->Update();
- otbMsgDevMacro(<<"MorphologicalPyramidAnalysisFilter: Max OK "<<max->GetOutput()->GetLargestPossibleRegion().GetSize());
+ otbMsgDevMacro(
+ << "MorphologicalPyramidAnalysisFilter: Max OK " << max->GetOutput()->GetLargestPossibleRegion().GetSize());
// InfDeci detail image computation
subtract4 = SubtractFilterType::New();
subtract4->SetInput1(max->GetOutput());
subtract4->SetInput2(morphoFilter->GetOutput());
subtract4->Update();
- otbMsgDevMacro(<<"MorphologicalPyramidAnalysisFilter: subtract4 OK "<<subtract4->GetOutput()->GetLargestPossibleRegion().GetSize());
+ otbMsgDevMacro(
+ << "MorphologicalPyramidAnalysisFilter: subtract4 OK " <<
+ subtract4->GetOutput()->GetLargestPossibleRegion().GetSize());
infDeci->PushBack(subtract4->GetOutput());
- otbMsgDevMacro("MorphologicalPyramidAnalysisFilter: step "<<i<<" - Image appended to InfDeci");
+ otbMsgDevMacro("MorphologicalPyramidAnalysisFilter: step " << i << " - Image appended to InfDeci");
// SupDeci detail image computation
subtract3 = SubtractFilterType::New();
subtract3->SetInput1(max->GetOutput());
subtract3->SetInput2(resampler2->GetOutput());
subtract3->Update();
- otbMsgDevMacro(<<"MorphologicalPyramidAnalysisFilter: subtract3 OK "<<subtract3->GetOutput()->GetLargestPossibleRegion().GetSize());
+ otbMsgDevMacro(
+ << "MorphologicalPyramidAnalysisFilter: subtract3 OK " <<
+ subtract3->GetOutput()->GetLargestPossibleRegion().GetSize());
supDeci->PushBack(subtract3->GetOutput());
- otbMsgDevMacro("MorphologicalPyramidAnalysisFilter: step "<<i<<" - Image appended to SupDeci");
+ otbMsgDevMacro("MorphologicalPyramidAnalysisFilter: step " << i << " - Image appended to SupDeci");
// Iteration ounter incrementation
++i;
- }
- otbMsgDevMacro(<<"Exiting main loop");
+ }
+ otbMsgDevMacro(<< "Exiting main loop");
}
/**
* PrintSelf method
*/
template <class TInputImage, class TOutputImage, class TMorphoFilter>
void
-MorphologicalPyramidAnalysisFilter<TInputImage,TOutputImage,TMorphoFilter>
+MorphologicalPyramidAnalysisFilter<TInputImage, TOutputImage, TMorphoFilter>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.h b/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.h
index f2e660d007..918bcea4ca 100644
--- a/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.h
+++ b/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.h
@@ -37,24 +37,24 @@ namespace MorphologicalPyramid
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT MRToMSConverter
- : public ImageListToImageListFilter<TInputImage,TOutputImage>
+ : public ImageListToImageListFilter<TInputImage, TOutputImage>
{
-public :
+public:
/** Standard typedefs */
- typedef MRToMSConverter Self;
- typedef ImageListToImageListFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MRToMSConverter Self;
+ typedef ImageListToImageListFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(MRToMSConverter,ImageListToImageListFilter);
+ itkTypeMacro(MRToMSConverter, ImageListToImageListFilter);
/** Input parameters typedefs */
- typedef TInputImage InputImageType;
- typedef typename Superclass::InputImagePointer InputImagePointer;
- typedef typename Superclass::InputImageListType InputImageListType;
- typedef typename Superclass::InputImageListPointerType InputImageListPointerType;
- typedef typename InputImageListType::Iterator InputImageListIteratorType;
+ typedef TInputImage InputImageType;
+ typedef typename Superclass::InputImagePointer InputImagePointer;
+ typedef typename Superclass::InputImageListType InputImageListType;
+ typedef typename Superclass::InputImageListPointerType InputImageListPointerType;
+ typedef typename InputImageListType::Iterator InputImageListIteratorType;
/** Output parameters typedefs */
typedef TOutputImage OutputImageType;
typedef typename Superclass::OutputImagePointer OutputImagePointerType;
@@ -146,19 +146,19 @@ protected:
/** Constructor */
MRToMSConverter();
/** Destructor */
- ~MRToMSConverter() {};
+ ~MRToMSConverter() {}
/** Main computation method */
void GenerateData();
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-private :
- MRToMSConverter(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+private:
+ MRToMSConverter(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
};
} // End namespace MorphologicalPyramid
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbMorphologicalPyramidMRToMSConverter.txx"
diff --git a/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.txx b/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.txx
index 6708992a0c..33bdc36576 100644
--- a/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.txx
@@ -29,22 +29,22 @@ namespace MorphologicalPyramid
/**
* Constructor
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
MRToMSConverter<TInputImage, TOutputImage>
::MRToMSConverter()
{
this->SetNumberOfRequiredInputs(2);
this->SetNumberOfRequiredOutputs(2);
OutputImageListPointerType supFilter = OutputImageListType::New();
- this->SetNthOutput(0,supFilter.GetPointer());
+ this->SetNthOutput(0, supFilter.GetPointer());
OutputImageListPointerType infFilter = OutputImageListType::New();
- this->SetNthOutput(1,infFilter.GetPointer());
+ this->SetNthOutput(1, infFilter.GetPointer());
OutputImageListPointerType outputList = OutputImageListType::New();
- this->SetNthOutput(2,outputList.GetPointer());
+ this->SetNthOutput(2, outputList.GetPointer());
OutputImageListPointerType supDeci = OutputImageListType::New();
- this->SetNthOutput(3,supDeci.GetPointer());
+ this->SetNthOutput(3, supDeci.GetPointer());
OutputImageListPointerType infDeci = OutputImageListType::New();
- this->SetNthOutput(4,infDeci.GetPointer());
+ this->SetNthOutput(4, infDeci.GetPointer());
}
/**
* Get The inputList at full resolution.
@@ -52,9 +52,9 @@ MRToMSConverter<TInputImage, TOutputImage>
* resampled at full resolution.
*/
template <class TInputImage, class TOutputImage>
-typename MRToMSConverter<TInputImage,TOutputImage>
+typename MRToMSConverter<TInputImage, TOutputImage>
::OutputImageListType*
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::GetOutput(void)
{
return dynamic_cast<OutputImageListType*>(this->itk::ProcessObject::GetOutput(2));
@@ -65,9 +65,9 @@ MRToMSConverter<TInputImage,TOutputImage>
* resampled at full resolution.
*/
template <class TInputImage, class TOutputImage>
-typename MRToMSConverter<TInputImage,TOutputImage>
+typename MRToMSConverter<TInputImage, TOutputImage>
::OutputImageListType*
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::GetSupFilterFullResolution(void)
{
return dynamic_cast<OutputImageListType*>(this->itk::ProcessObject::GetOutput(0));
@@ -78,9 +78,9 @@ MRToMSConverter<TInputImage,TOutputImage>
* resampled at full resolution.
*/
template <class TInputImage, class TOutputImage>
-typename MRToMSConverter<TInputImage,TOutputImage>
+typename MRToMSConverter<TInputImage, TOutputImage>
::OutputImageListType*
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::GetInfFilterFullResolution(void)
{
return dynamic_cast<OutputImageListType*>(this->itk::ProcessObject::GetOutput(1));
@@ -91,9 +91,9 @@ MRToMSConverter<TInputImage,TOutputImage>
* resampled at full resolution.
*/
template <class TInputImage, class TOutputImage>
-typename MRToMSConverter<TInputImage,TOutputImage>
+typename MRToMSConverter<TInputImage, TOutputImage>
::OutputImageListType*
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::GetSupDeciFullResolution(void)
{
return dynamic_cast<OutputImageListType*>(this->itk::ProcessObject::GetOutput(3));
@@ -104,9 +104,9 @@ MRToMSConverter<TInputImage,TOutputImage>
* resampled at full resolution.
*/
template <class TInputImage, class TOutputImage>
-typename MRToMSConverter<TInputImage,TOutputImage>
+typename MRToMSConverter<TInputImage, TOutputImage>
::OutputImageListType*
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::GetInfDeciFullResolution(void)
{
return dynamic_cast<OutputImageListType*>(this->itk::ProcessObject::GetOutput(4));
@@ -117,10 +117,10 @@ MRToMSConverter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::SetInput(InputImageListType * imageList)
{
- this->SetNthInput(2,const_cast<InputImageListType *>(imageList));
+ this->SetNthInput(2, const_cast<InputImageListType *>(imageList));
}
/**
* Set The SupFilter details
@@ -128,10 +128,10 @@ MRToMSConverter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::SetSupFilter(InputImageListType * imageList)
{
- this->SetNthInput(0,const_cast<InputImageListType *>(imageList));
+ this->SetNthInput(0, const_cast<InputImageListType *>(imageList));
}
/**
* Set The InfFilter details
@@ -139,10 +139,10 @@ MRToMSConverter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::SetInfFilter(InputImageListType * imageList)
{
- this->SetNthInput(1,const_cast<InputImageListType *>(imageList));
+ this->SetNthInput(1, const_cast<InputImageListType *>(imageList));
}
/**
* Set The SupDeci details
@@ -150,10 +150,10 @@ MRToMSConverter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::SetSupDeci(InputImageListType * imageList)
{
- this->SetNthInput(3,const_cast<InputImageListType *>(imageList));
+ this->SetNthInput(3, const_cast<InputImageListType *>(imageList));
}
/**
* Set The InfDeci details
@@ -161,19 +161,19 @@ MRToMSConverter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::SetInfDeci(InputImageListType * imageList)
{
- this->SetNthInput(4,const_cast<InputImageListType *>(imageList));
+ this->SetNthInput(4, const_cast<InputImageListType *>(imageList));
}
/**
* Get the input list.
* \return The list of the analysed image at each pyramid level.
*/
template <class TInputImage, class TOutputImage>
-typename MRToMSConverter<TInputImage,TOutputImage>
+typename MRToMSConverter<TInputImage, TOutputImage>
::InputImageListType*
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::GetInput(void)
{
return dynamic_cast<InputImageListType *>(this->itk::ProcessObject::GetInput(2));
@@ -183,9 +183,9 @@ MRToMSConverter<TInputImage,TOutputImage>
* \return The brighter details extracted from the filtering operation
*/
template <class TInputImage, class TOutputImage>
-typename MRToMSConverter<TInputImage,TOutputImage>
+typename MRToMSConverter<TInputImage, TOutputImage>
::InputImageListType*
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::GetSupFilter(void)
{
return dynamic_cast<InputImageListType *>(this->itk::ProcessObject::GetInput(0));
@@ -195,9 +195,9 @@ MRToMSConverter<TInputImage,TOutputImage>
* \return The darker details extracted from the filtering operation
*/
template <class TInputImage, class TOutputImage>
-typename MRToMSConverter<TInputImage,TOutputImage>
+typename MRToMSConverter<TInputImage, TOutputImage>
::InputImageListType*
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::GetInfFilter(void)
{
return dynamic_cast<InputImageListType *>(this->itk::ProcessObject::GetInput(1));
@@ -207,9 +207,9 @@ MRToMSConverter<TInputImage,TOutputImage>
* \return The brighter details extracted from the resampling operation
*/
template <class TInputImage, class TOutputImage>
-typename MRToMSConverter<TInputImage,TOutputImage>
+typename MRToMSConverter<TInputImage, TOutputImage>
::InputImageListType*
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::GetSupDeci(void)
{
return dynamic_cast<InputImageListType *>(this->itk::ProcessObject::GetInput(3));
@@ -219,9 +219,9 @@ MRToMSConverter<TInputImage,TOutputImage>
* \return The darker details extracted from the resampling operation.
*/
template <class TInputImage, class TOutputImage>
-typename MRToMSConverter<TInputImage,TOutputImage>
+typename MRToMSConverter<TInputImage, TOutputImage>
::InputImageListType*
-MRToMSConverter<TInputImage,TOutputImage>
+MRToMSConverter<TInputImage, TOutputImage>
::GetInfDeci(void)
{
return dynamic_cast<InputImageListType *>(this->itk::ProcessObject::GetInput(4));
@@ -229,127 +229,127 @@ MRToMSConverter<TInputImage,TOutputImage>
/**
* Main computation method
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
void
MRToMSConverter<TInputImage, TOutputImage>
::GenerateData()
{
// Input images lists pointers
- InputImageListPointerType supFilter = this->GetSupFilter();
- InputImageListPointerType infFilter = this->GetInfFilter();
- InputImageListPointerType supDeci = this->GetSupDeci();
- InputImageListPointerType infDeci = this->GetInfDeci();
- InputImageListPointerType inputList = this->GetInput();
+ InputImageListPointerType supFilter = this->GetSupFilter();
+ InputImageListPointerType infFilter = this->GetInfFilter();
+ InputImageListPointerType supDeci = this->GetSupDeci();
+ InputImageListPointerType infDeci = this->GetInfDeci();
+ InputImageListPointerType inputList = this->GetInput();
// Output images lists pointers
- OutputImageListPointerType supFilterFullResolution = this->GetSupFilterFullResolution();
- OutputImageListPointerType infFilterFullResolution = this->GetInfFilterFullResolution();
- OutputImageListPointerType supDeciFullResolution = this->GetSupDeciFullResolution();
- OutputImageListPointerType infDeciFullResolution = this->GetInfDeciFullResolution();
- OutputImageListPointerType outputList = this->GetOutput();
+ OutputImageListPointerType supFilterFullResolution = this->GetSupFilterFullResolution();
+ OutputImageListPointerType infFilterFullResolution = this->GetInfFilterFullResolution();
+ OutputImageListPointerType supDeciFullResolution = this->GetSupDeciFullResolution();
+ OutputImageListPointerType infDeciFullResolution = this->GetInfDeciFullResolution();
+ OutputImageListPointerType outputList = this->GetOutput();
// typedef of the resampling filter
- typedef otb::MorphologicalPyramid::Resampler<InputImageType,OutputImageType> ResamplerType;
+ typedef otb::MorphologicalPyramid::Resampler<InputImageType, OutputImageType> ResamplerType;
// Definition of the resampler filters
typename ResamplerType::Pointer resampler;
// Full resolution size
typename InputImageType::SizeType frsize = supFilter->Front()->GetLargestPossibleRegion().GetSize();
- otbMsgDevMacro(<<"MRToMSConverter: Full resolution size: "<<frsize);
+ otbMsgDevMacro(<< "MRToMSConverter: Full resolution size: " << frsize);
// SupFilter resampling
- otbMsgDevMacro(<<"MRToMSConverter: SupFilter resampling.");
+ otbMsgDevMacro(<< "MRToMSConverter: SupFilter resampling.");
InputImageListIteratorType it = supFilter->Begin();
// The first image does not need any resampling
supFilterFullResolution->PushBack(it.Get());
++it;
- for (;it!=supFilter->End();++it)
- {
+ for (; it != supFilter->End(); ++it)
+ {
resampler = ResamplerType::New();
resampler->SetSize(frsize);
resampler->SetInput(it.Get());
resampler->Update();
supFilterFullResolution->PushBack(resampler->GetOutput());
- }
- otbMsgDevMacro(<<"MRToMSConverter: InfFilter resampling.");
+ }
+ otbMsgDevMacro(<< "MRToMSConverter: InfFilter resampling.");
// InfFilter resampling
it = infFilter->Begin();
// The first image does not need any resampling
infFilterFullResolution->PushBack(it.Get());
++it;
- for (;it!=infFilter->End();++it)
- {
+ for (; it != infFilter->End(); ++it)
+ {
resampler = ResamplerType::New();
resampler->SetSize(frsize);
resampler->SetInput(it.Get());
resampler->Update();
infFilterFullResolution->PushBack(resampler->GetOutput());
- }
+ }
if (inputList)
- {
- otbMsgDevMacro(<<"MRToMSConverter: Optional inputList resampling.");
+ {
+ otbMsgDevMacro(<< "MRToMSConverter: Optional inputList resampling.");
// Analyse image resampling
it = inputList->Begin();
// The first image does not need any resampling
outputList->PushBack(it.Get());
++it;
- for (;it!=inputList->End();++it)
- {
+ for (; it != inputList->End(); ++it)
+ {
resampler = ResamplerType::New();
resampler->SetSize(frsize);
resampler->SetInput(it.Get());
resampler->Update();
outputList->PushBack(resampler->GetOutput());
+ }
}
- }
if (supDeci)
- {
- otbMsgDevMacro(<<"MRToMSConverter: Optional supDeci resampling.");
+ {
+ otbMsgDevMacro(<< "MRToMSConverter: Optional supDeci resampling.");
// SupDeci resampling
it = supDeci->Begin();
// The first image does not need any resampling
supDeciFullResolution->PushBack(it.Get());
++it;
- for (;it!=supDeci->End();++it)
- {
+ for (; it != supDeci->End(); ++it)
+ {
resampler = ResamplerType::New();
resampler->SetSize(frsize);
resampler->SetInput(it.Get());
resampler->Update();
supDeciFullResolution->PushBack(resampler->GetOutput());
+ }
}
- }
if (infDeci)
- {
- otbMsgDevMacro(<<"MRToMSConverter: Optional infDeci resampling.");
+ {
+ otbMsgDevMacro(<< "MRToMSConverter: Optional infDeci resampling.");
// InfDeci resampling
it = infDeci->Begin();
// The first image does not need any resampling
infDeciFullResolution->PushBack(it.Get());
++it;
- for (;it!=infDeci->End();++it)
- {
+ for (; it != infDeci->End(); ++it)
+ {
resampler = ResamplerType::New();
resampler->SetSize(frsize);
resampler->SetInput(it.Get());
resampler->Update();
infDeciFullResolution->PushBack(resampler->GetOutput());
+ }
}
- }
}
/**
* PrintSelf method
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
void
MRToMSConverter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // End namespace MorphologicalPyramid
} // End namespace otb
diff --git a/Code/MultiScale/otbMorphologicalPyramidResampler.h b/Code/MultiScale/otbMorphologicalPyramidResampler.h
index 8ee13ff261..b89474f484 100644
--- a/Code/MultiScale/otbMorphologicalPyramidResampler.h
+++ b/Code/MultiScale/otbMorphologicalPyramidResampler.h
@@ -42,18 +42,18 @@ namespace MorphologicalPyramid
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT Resampler
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
-public :
+public:
/** Standard typedefs */
- typedef Resampler Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef Resampler Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(Resampler,ImageToImageFilter);
+ itkTypeMacro(Resampler, ImageToImageFilter);
/** Template parameters typedefs */
typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
@@ -65,32 +65,32 @@ public :
typedef typename OutputImageType::SizeType SizeType;
typedef typename OutputImageType::SpacingType SpacingType;
/** Size parameter accessor */
- itkSetMacro(Size,SizeType);
- itkGetMacro(Size,SizeType);
+ itkSetMacro(Size, SizeType);
+ itkGetMacro(Size, SizeType);
protected:
/** Constructor */
Resampler();
/** Destructor */
- virtual ~Resampler() {};
+ virtual ~Resampler() {}
/** Generate output information */
virtual void GenerateOutputInformation();
/** Configure input requested region to be the largest possible region */
virtual void GenerateInputRequestedRegion();
/** Configure output requested region to be the largest possible region */
- virtual void EnlargeOutputRequestedRegion(itk::DataObject *itkNotUsed(output));
+ virtual void EnlargeOutputRequestedRegion(itk::DataObject * itkNotUsed(output));
/** Main computation method */
void GenerateData();
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-private :
- Resampler(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+private:
+ Resampler(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/// Output image size
SizeType m_Size;
};
} // End namespace MorphologicalPyramid
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbMorphologicalPyramidResampler.txx"
diff --git a/Code/MultiScale/otbMorphologicalPyramidResampler.txx b/Code/MultiScale/otbMorphologicalPyramidResampler.txx
index acd8c47bf0..8f9e809799 100644
--- a/Code/MultiScale/otbMorphologicalPyramidResampler.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidResampler.txx
@@ -33,19 +33,19 @@ namespace MorphologicalPyramid
/**
* Constructor
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
Resampler<TInputImage, TOutputImage>
::Resampler()
{
- for (int i=0;i<InputImageType::ImageDimension;++i)
- {
- m_Size[i]=0;
- }
+ for (int i = 0; i < InputImageType::ImageDimension; ++i)
+ {
+ m_Size[i] = 0;
+ }
}
/**
* Configure input requested region to be the largest possible region.
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
void
Resampler<TInputImage, TOutputImage>
::GenerateInputRequestedRegion()
@@ -56,56 +56,56 @@ Resampler<TInputImage, TOutputImage>
InputImagePointer inputPtr = const_cast<InputImageType *> (this->GetInput());
OutputImagePointer outputPtr = this->GetOutput();
// If the pointers are not correct
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
// exit
return;
- }
+ }
// else
// Configure input requested region to be the largest possible region
- inputPtr->SetRequestedRegion( inputPtr->GetLargestPossibleRegion());
+ inputPtr->SetRequestedRegion(inputPtr->GetLargestPossibleRegion());
}
/**
* Configure output requested region to be the largest possible region
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
void
Resampler<TInputImage, TOutputImage>
::EnlargeOutputRequestedRegion(itk::DataObject *itkNotUsed(output))
{
- this->GetOutput()->SetRequestedRegion( this->GetOutput()->GetLargestPossibleRegion());
+ this->GetOutput()->SetRequestedRegion(this->GetOutput()->GetLargestPossibleRegion());
}
/**
* Generate output information
*/
template <class TInputImage, class TOutputImage>
void
-Resampler<TInputImage,TOutputImage>
+Resampler<TInputImage, TOutputImage>
::GenerateOutputInformation()
{
// Superclass method call
Superclass::GenerateOutputInformation();
// Input and output image pointers retrieval
- InputImageConstPointer inputPtr = this->GetInput();
- OutputImagePointer outputPtr = this->GetOutput();
+ InputImageConstPointer inputPtr = this->GetInput();
+ OutputImagePointer outputPtr = this->GetOutput();
// If the pointers are not correct
- if ( !inputPtr || !outputPtr )
- {
+ if (!inputPtr || !outputPtr)
+ {
// exit
return;
- }
+ }
unsigned int i;
// Computing output spacing, size and index from input data
const typename InputImageType::SpacingType& inputSpacing = inputPtr->GetSpacing();
const typename InputImageType::IndexType& inputStartIndex = inputPtr->GetLargestPossibleRegion().GetIndex();
- typename OutputImageType::IndexType outputStartIndex;
- typename OutputImageType::SpacingType spacing;
+ typename OutputImageType::IndexType outputStartIndex;
+ typename OutputImageType::SpacingType spacing;
for (i = 0; i < OutputImageType::ImageDimension; ++i)
- {
+ {
outputStartIndex[i] = inputStartIndex[i];
- }
+ }
// Affectation du spacing � l'image de sortie
- outputPtr->SetSpacing( inputSpacing );
+ outputPtr->SetSpacing(inputSpacing);
// G�n�ration de la r�gion de l'image de sortie
typename OutputImageType::RegionType outputLargestPossibleRegion;
outputLargestPossibleRegion.SetSize(this->GetSize());
@@ -115,7 +115,7 @@ Resampler<TInputImage,TOutputImage>
/**
* Main computation method
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
void
Resampler<TInputImage, TOutputImage>
::GenerateData()
@@ -123,23 +123,23 @@ Resampler<TInputImage, TOutputImage>
typename OutputImageType::Pointer result;
// Filters typedefs
- typedef itk::ResampleImageFilter<InputImageType,OutputImageType> ResampleFilterType;
- typedef itk::ScaleTransform<double,InputImageType::ImageDimension> TransformType;
- typedef itk::LinearInterpolateImageFunction<InputImageType,double> InterpolatorType;
- typedef itk::ImageRegionConstIterator<OutputImageType> ConstIteratorType;
- typedef itk::ImageRegionIterator<OutputImageType> IteratorType;
+ typedef itk::ResampleImageFilter<InputImageType, OutputImageType> ResampleFilterType;
+ typedef itk::ScaleTransform<double, InputImageType::ImageDimension> TransformType;
+ typedef itk::LinearInterpolateImageFunction<InputImageType, double> InterpolatorType;
+ typedef itk::ImageRegionConstIterator<OutputImageType> ConstIteratorType;
+ typedef itk::ImageRegionIterator<OutputImageType> IteratorType;
// Resampling filter creation
typename ResampleFilterType::Pointer resampler = ResampleFilterType::New();
- typename InterpolatorType::Pointer interpolator = InterpolatorType::New();
- typename TransformType::Pointer transform = TransformType::New();
+ typename InterpolatorType::Pointer interpolator = InterpolatorType::New();
+ typename TransformType::Pointer transform = TransformType::New();
// Scale parameters computation
typename TransformType::ParametersType scales(2);
- typename InputImageType::SizeType inputSize = this->GetInput()->GetLargestPossibleRegion().GetSize();
+ typename InputImageType::SizeType inputSize = this->GetInput()->GetLargestPossibleRegion().GetSize();
typename InputImageType::SpacingType inputSpacing = this->GetInput()->GetSpacing();
- scales[0]=static_cast<double>(inputSize[0]-1)/static_cast<double>(m_Size[0]-1);
- scales[1]=static_cast<double>(inputSize[1]-1)/static_cast<double>(m_Size[1]-1);
+ scales[0] = static_cast<double>(inputSize[0] - 1) / static_cast<double>(m_Size[0] - 1);
+ scales[1] = static_cast<double>(inputSize[1] - 1) / static_cast<double>(m_Size[1] - 1);
transform->SetParameters(scales);
transform->SetCenter(this->GetInput()->GetOrigin());
@@ -167,12 +167,12 @@ Resampler<TInputImage, TOutputImage>
/**
* PrintSelf method
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
void
Resampler<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "Size: " << m_Size << std::endl;
}
} // End namespace MorphologicalPyramid
diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.h b/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.h
index 7a60f05f48..1404bebcd4 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.h
+++ b/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.h
@@ -54,44 +54,44 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT MorphologicalPyramidSegmentationFilter
- : public ImageListToImageListFilter<TInputImage,TOutputImage>
+ : public ImageListToImageListFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef MorphologicalPyramidSegmentationFilter Self;
- typedef ImageListToImageListFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MorphologicalPyramidSegmentationFilter Self;
+ typedef ImageListToImageListFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(MorphologicalPyramidSegmentationFilter,ImageListToImageListFilter);
+ itkTypeMacro(MorphologicalPyramidSegmentationFilter, ImageListToImageListFilter);
/** Input image dimension constant macro */
- itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/** Output related typedefs */
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename Superclass::OutputImageListType OutputImageListType;
- typedef typename OutputImageListType::Pointer OutputImageListPointerType;
- typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
- typedef typename OutputImageListType::Iterator OutputImageListIteratorType;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename Superclass::OutputImageListType OutputImageListType;
+ typedef typename OutputImageListType::Pointer OutputImageListPointerType;
+ typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
+ typedef typename OutputImageListType::Iterator OutputImageListIteratorType;
/** Input related typedefs */
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename Superclass::InputImageListType InputImageListType;
- typedef typename InputImageListType::Pointer InputImageListPointerType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename Superclass::InputImageListType InputImageListType;
+ typedef typename InputImageListType::Pointer InputImageListPointerType;
/** Vector of number of objects */
- typedef std::vector<OutputPixelType> NumberOfObjectsVectorType;
+ typedef std::vector<OutputPixelType> NumberOfObjectsVectorType;
/** Min object size parameter accessor */
- itkSetMacro(MinimumObjectSize,unsigned long);
- itkGetMacro(MinimumObjectSize,unsigned long);
+ itkSetMacro(MinimumObjectSize, unsigned long);
+ itkGetMacro(MinimumObjectSize, unsigned long);
/** Quantile for seeds extraction */
- itkSetMacro(SeedsQuantile,double);
- itkGetMacro(SeedsQuantile,double);
+ itkSetMacro(SeedsQuantile, double);
+ itkGetMacro(SeedsQuantile, double);
/** Quantile for connected thresholding */
- itkSetMacro(ConnectedThresholdQuantile,double);
- itkGetMacro(ConnectedThresholdQuantile,double);
+ itkSetMacro(ConnectedThresholdQuantile, double);
+ itkGetMacro(ConnectedThresholdQuantile, double);
/**
* Get a vector containing the number of segmented objects for each image.
* \return The vector.
@@ -137,13 +137,13 @@ protected:
MorphologicalPyramidSegmentationFilter();
/** Destructor */
virtual ~MorphologicalPyramidSegmentationFilter();
- virtual void GenerateOutputInformation() {}; // does nothing
+ virtual void GenerateOutputInformation() {} // does nothing
/** Main computation method */
virtual void GenerateData();
/** Printself method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- unsigned long m_MinimumObjectSize;
+ unsigned long m_MinimumObjectSize;
/** Quantile for seeds determination */
double m_SeedsQuantile;
/** Quantile to set the connectedThresholdFilter threshold */
@@ -151,7 +151,7 @@ private:
/** Number of segmented objects per images */
NumberOfObjectsVectorType m_NumberOfObjectsVector;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbMorphologicalPyramidSegmentationFilter.txx"
diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx b/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx
index 35e19e9eab..03521bb256 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx
@@ -24,14 +24,13 @@
#include "otbMorphologicalPyramidSegmenter.h"
#include "otbMacro.h"
-
namespace otb
{
/**
* Constructor
*/
template <class TInputImage, class TOutputImage>
-MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::MorphologicalPyramidSegmentationFilter()
{
this->SetNumberOfRequiredInputs(3);
@@ -43,7 +42,7 @@ MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
* Destructor
*/
template <class TInputImage, class TOutputImage>
-MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::~MorphologicalPyramidSegmentationFilter() {}
/**
@@ -52,10 +51,10 @@ MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::SetReferenceImage(InputImageType * image)
{
- this->SetNthInput(0,const_cast<InputImageType *>(image));
+ this->SetNthInput(0, const_cast<InputImageType *>(image));
}
/**
* Set the brighter details from the pyramid. The brighter details are the supFilter or
@@ -64,10 +63,10 @@ MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::SetBrighterDetails(InputImageListType * imageList)
{
- this->SetNthInput(1,const_cast<InputImageListType *>(imageList));
+ this->SetNthInput(1, const_cast<InputImageListType *>(imageList));
}
/**
* Set the darker details from the pyramid. The darker details are the supFilter or
@@ -76,19 +75,19 @@ MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::SetDarkerDetails(InputImageListType * imageList)
{
- this->SetNthInput(2,const_cast<InputImageListType *>(imageList));
+ this->SetNthInput(2, const_cast<InputImageListType *>(imageList));
}
/**
* Get the reference image
* \return The reference image.
*/
template <class TInputImage, class TOutputImage>
-typename MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+typename MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::InputImageType*
-MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::GetReferenceImage(void)
{
return dynamic_cast<InputImageType *>(this->itk::ProcessObject::GetInput(0));
@@ -99,9 +98,9 @@ MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
* \param imageList The brighter details extracted from the filtering operation.
*/
template <class TInputImage, class TOutputImage>
-typename MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+typename MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::InputImageListType*
-MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::GetBrighterDetails(void)
{
return dynamic_cast<InputImageListType *>(this->itk::ProcessObject::GetInput(1));
@@ -112,9 +111,9 @@ MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
* \return The darker details extracted from the resampling operation.
*/
template <class TInputImage, class TOutputImage>
-typename MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+typename MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::InputImageListType*
-MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::GetDarkerDetails(void)
{
return dynamic_cast<InputImageListType *>(this->itk::ProcessObject::GetInput(2));
@@ -125,9 +124,9 @@ MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
* \return The vector.
*/
template <class TInputImage, class TOutputImage>
-typename MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+typename MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::NumberOfObjectsVectorType
-MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::GetNumberOfObjectsVector(void)
{
return m_NumberOfObjectsVector;
@@ -137,21 +136,21 @@ MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::GenerateData(void)
{
// Reference image pointer
InputImagePointerType referenceImage = this->GetReferenceImage();
- otbMsgDevMacro("SegmentationFilter: reference image size: "<<referenceImage->GetLargestPossibleRegion().GetSize());
+ otbMsgDevMacro("SegmentationFilter: reference image size: " << referenceImage->GetLargestPossibleRegion().GetSize());
// Output images list pointer
OutputImageListPointerType outputList = this->GetOutput();
// Multi resolution to multi scale filter typedef
- typedef otb::MorphologicalPyramid::MRToMSConverter<InputImageType,InputImageType> MRToMSConverterType;
+ typedef otb::MorphologicalPyramid::MRToMSConverter<InputImageType, InputImageType> MRToMSConverterType;
// Segmentation filter typedef
- typedef otb::MorphologicalPyramid::Segmenter<InputImageType,OutputImageType> SegmenterType;
+ typedef otb::MorphologicalPyramid::Segmenter<InputImageType, OutputImageType> SegmenterType;
// MR To MS conversion
typename MRToMSConverterType::Pointer mrtoms = MRToMSConverterType::New();
@@ -166,8 +165,8 @@ MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
// Segmentation filter definition
typename InputImageListType::Iterator it;
// Segment the supFilter details
- for (it= brighter->Begin();it!=brighter->End();++it)
- {
+ for (it = brighter->Begin(); it != brighter->End(); ++it)
+ {
typename SegmenterType::Pointer segmenter = SegmenterType::New();
segmenter->SetMinimumObjectSize(m_MinimumObjectSize);
segmenter->SetSeedsQuantile(m_SeedsQuantile);
@@ -177,12 +176,11 @@ MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
segmenter->Update();
m_NumberOfObjectsVector.push_back(segmenter->GetNumberOfObjects());
outputList->PushBack(segmenter->GetOutput());
- }
-
+ }
// Segment the infFilter details
- for (it= darker->Begin();it!= darker->End();++it)
- {
+ for (it = darker->Begin(); it != darker->End(); ++it)
+ {
typename SegmenterType::Pointer segmenter = SegmenterType::New();
segmenter->SetMinimumObjectSize(m_MinimumObjectSize);
segmenter->SetSeedsQuantile(m_SeedsQuantile);
@@ -194,14 +192,14 @@ MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
segmenter->Update();
m_NumberOfObjectsVector.push_back(segmenter->GetNumberOfObjects());
outputList->PushBack(segmenter->GetOutput());
- }
+ }
}
/**
* PrintSelf method
*/
template <class TInputImage, class TOutputImage>
void
-MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSegmentationFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
@@ -209,4 +207,3 @@ MorphologicalPyramidSegmentationFilter<TInputImage,TOutputImage>
} // End namespace otb
#endif
-
diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmenter.h b/Code/MultiScale/otbMorphologicalPyramidSegmenter.h
index a491a8fbac..1ddd313c76 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSegmenter.h
+++ b/Code/MultiScale/otbMorphologicalPyramidSegmenter.h
@@ -44,18 +44,18 @@ namespace MorphologicalPyramid
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT Segmenter
- : public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
-public :
+public:
/** Standard typedefs */
- typedef Segmenter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef Segmenter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(Segmenter,ImageToImageFilter);
+ itkTypeMacro(Segmenter, ImageToImageFilter);
/** Template parameters typedefs */
typedef TInputImage InputImageType;
typedef typename InputImageType::PixelType InputPixelType;
@@ -96,26 +96,26 @@ public :
InputImageType * GetOriginalImage(void);
/** Min object size parameter accessor */
- itkSetMacro(MinimumObjectSize,unsigned long);
- itkGetMacro(MinimumObjectSize,unsigned long);
+ itkSetMacro(MinimumObjectSize, unsigned long);
+ itkGetMacro(MinimumObjectSize, unsigned long);
/** Quantile for seeds extraction */
- itkSetMacro(SeedsQuantile,double);
- itkGetMacro(SeedsQuantile,double);
+ itkSetMacro(SeedsQuantile, double);
+ itkGetMacro(SeedsQuantile, double);
/** Quantile for connected thresholding */
- itkSetMacro(ConnectedThresholdQuantile,double);
- itkGetMacro(ConnectedThresholdQuantile,double);
+ itkSetMacro(ConnectedThresholdQuantile, double);
+ itkGetMacro(ConnectedThresholdQuantile, double);
/** Toogle the darker detail segmentation */
- itkSetMacro(SegmentDarkDetailsBool,bool);
- itkGetMacro(SegmentDarkDetailsBool,bool);
+ itkSetMacro(SegmentDarkDetailsBool, bool);
+ itkGetMacro(SegmentDarkDetailsBool, bool);
itkBooleanMacro(SegmentDarkDetailsBool);
/** Get the number of segmented objects */
- itkGetMacro(NumberOfObjects,OutputPixelType);
+ itkGetMacro(NumberOfObjects, OutputPixelType);
protected:
/** Constructor */
Segmenter();
/** Destructor */
- ~Segmenter() {};
+ ~Segmenter() {}
/** Main computation method */
void GenerateData(void);
/** PrintSelf method */
@@ -129,11 +129,11 @@ protected:
*/
void EnlargeOutputRequestedRegion(void);
-private :
- Segmenter(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+private:
+ Segmenter(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** Minimum size for the segmented object */
- unsigned long m_MinimumObjectSize;
+ unsigned long m_MinimumObjectSize;
/** Quantile for seeds determination */
double m_SeedsQuantile;
/** Quantile to set the connectedThresholdFilter threshold */
@@ -144,7 +144,7 @@ private :
OutputPixelType m_NumberOfObjects;
};
} // End namespace MorphologicalPyramid
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbMorphologicalPyramidSegmenter.txx"
diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmenter.txx b/Code/MultiScale/otbMorphologicalPyramidSegmenter.txx
index 888ba03c94..308157edf4 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSegmenter.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidSegmenter.txx
@@ -40,7 +40,7 @@ namespace MorphologicalPyramid
/**
* Constructor
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
Segmenter<TInputImage, TOutputImage>
::Segmenter()
{
@@ -55,18 +55,18 @@ Segmenter<TInputImage, TOutputImage>
* Set the details image.
* \param detailsImage The details image from the morphological pyramid
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
void
Segmenter<TInputImage, TOutputImage>
::SetDetailsImage(const InputImageType * detailsImage)
{
- this->SetNthInput(0,const_cast<TInputImage *>(detailsImage));
+ this->SetNthInput(0, const_cast<TInputImage *>(detailsImage));
}
/**
* Set the details image.
* \return detailsImage The input details image.
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
typename Segmenter<TInputImage, TOutputImage>::InputImageType *
Segmenter<TInputImage, TOutputImage>
::GetDetailsImage(void)
@@ -77,18 +77,18 @@ Segmenter<TInputImage, TOutputImage>
* Set the original image.
* \param originalImage The original image to segment.
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
void
Segmenter<TInputImage, TOutputImage>
::SetOriginalImage(const InputImageType * originalImage)
{
- this->SetNthInput(1,const_cast<TInputImage *>(originalImage));
+ this->SetNthInput(1, const_cast<TInputImage *>(originalImage));
}
/**
* Get the original image.
* \return originalImage The original image to segment.
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
typename Segmenter<TInputImage, TOutputImage>::InputImageType *
Segmenter<TInputImage, TOutputImage>
::GetOriginalImage(void)
@@ -98,7 +98,7 @@ Segmenter<TInputImage, TOutputImage>
/**
* Configure the input datas.
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
void
Segmenter<TInputImage, TOutputImage>
::GenerateInputRequestedRegion()
@@ -107,16 +107,16 @@ Segmenter<TInputImage, TOutputImage>
Superclass::GenerateInputRequestedRegion();
// get pointers to the inputs
- InputImagePointerType detailsPtr =
- const_cast< InputImageType * >( this->GetInput(0) );
+ InputImagePointerType detailsPtr =
+ const_cast<InputImageType *>(this->GetInput(0));
- InputImagePointerType origPtr =
- const_cast< InputImageType * >( this->GetInput(1) );
+ InputImagePointerType origPtr =
+ const_cast<InputImageType *>(this->GetInput(1));
- if ( !detailsPtr || !origPtr )
- {
+ if (!detailsPtr || !origPtr)
+ {
return;
- }
+ }
// We need to
// configure the inputs such that all the data is available.
@@ -126,19 +126,19 @@ Segmenter<TInputImage, TOutputImage>
/**
* Configure the output data
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
void
Segmenter<TInputImage, TOutputImage>
::EnlargeOutputRequestedRegion(void)
{
this->GetOutput()
- ->SetRequestedRegion( this->GetOutput()->GetLargestPossibleRegion() );
+ ->SetRequestedRegion(this->GetOutput()->GetLargestPossibleRegion());
}
/**
* Main computation method
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
void
Segmenter<TInputImage, TOutputImage>
::GenerateData()
@@ -148,38 +148,38 @@ Segmenter<TInputImage, TOutputImage>
InputImagePointerType original = this->GetOriginalImage();
// Typedefs for details image enhancement
- typedef double FloatPixelType;
- typedef otb::Image<FloatPixelType,InputImageType::ImageDimension> FloatImageType;
- typedef itk::InvertIntensityImageFilter<InputImageType,InputImageType> InvertFilterType;
- typedef itk::MultiplyImageFilter<FloatImageType,FloatImageType,InputImageType> MultiplyFilterType;
- typedef itk::CastImageFilter<InputImageType,FloatImageType> CastImageFilterType;
- typedef itk::MinimumMaximumImageCalculator<InputImageType> MinMaxCalculatorType;
+ typedef double FloatPixelType;
+ typedef otb::Image<FloatPixelType, InputImageType::ImageDimension> FloatImageType;
+ typedef itk::InvertIntensityImageFilter<InputImageType, InputImageType> InvertFilterType;
+ typedef itk::MultiplyImageFilter<FloatImageType, FloatImageType, InputImageType> MultiplyFilterType;
+ typedef itk::CastImageFilter<InputImageType, FloatImageType> CastImageFilterType;
+ typedef itk::MinimumMaximumImageCalculator<InputImageType> MinMaxCalculatorType;
//Typedefs for seeds extraction
- typedef itk::PointSet<InputPixelType,InputImageType::ImageDimension> PointSetType;
- typedef otb::ThresholdImageToPointSetFilter<InputImageType,PointSetType> PointSetFilterType;
- typedef typename PointSetType::PointsContainer::Iterator PointSetIteratorType;
- typedef typename PointSetType::PointType PointType;
+ typedef itk::PointSet<InputPixelType, InputImageType::ImageDimension> PointSetType;
+ typedef otb::ThresholdImageToPointSetFilter<InputImageType, PointSetType> PointSetFilterType;
+ typedef typename PointSetType::PointsContainer::Iterator PointSetIteratorType;
+ typedef typename PointSetType::PointType PointType;
// Typedefs for segmentation
- typedef itk::ConnectedThresholdImageFilter<InputImageType,InputImageType> ConnectedFilterType;
- typedef itk::ConnectedComponentImageFilter<InputImageType,OutputImageType> LabelFilterType;
- typedef itk::RelabelComponentImageFilter<OutputImageType,OutputImageType> RelabelFilterType;
- typedef itk::ThresholdImageFilter<OutputImageType> ThresholdFilterType;
+ typedef itk::ConnectedThresholdImageFilter<InputImageType, InputImageType> ConnectedFilterType;
+ typedef itk::ConnectedComponentImageFilter<InputImageType, OutputImageType> LabelFilterType;
+ typedef itk::RelabelComponentImageFilter<OutputImageType, OutputImageType> RelabelFilterType;
+ typedef itk::ThresholdImageFilter<OutputImageType> ThresholdFilterType;
// Typedefs for statistics computation
typedef itk::Statistics::ScalarImageToHistogramGenerator<InputImageType> HistGeneratorType;
- typedef typename HistGeneratorType::HistogramType HistogramType;
+ typedef typename HistGeneratorType::HistogramType HistogramType;
/////////////////////////////////////
//// Details image enhancement //////
/////////////////////////////////////
// Filters instantiation
- typename InvertFilterType::Pointer invert;
- typename CastImageFilterType::Pointer cast1 = CastImageFilterType::New();
- typename CastImageFilterType::Pointer cast2 = CastImageFilterType::New();
- typename MultiplyFilterType::Pointer mult = MultiplyFilterType::New();
+ typename InvertFilterType::Pointer invert;
+ typename CastImageFilterType::Pointer cast1 = CastImageFilterType::New();
+ typename CastImageFilterType::Pointer cast2 = CastImageFilterType::New();
+ typename MultiplyFilterType::Pointer mult = MultiplyFilterType::New();
typename MinMaxCalculatorType::Pointer minMax = MinMaxCalculatorType::New();
// Pipeline connection
@@ -188,19 +188,18 @@ Segmenter<TInputImage, TOutputImage>
minMax->SetImage(original);
minMax->ComputeMaximum();
-
// If we want to segment darker detail, the original image must have its itensity inverted
if (m_SegmentDarkDetailsBool)
- {
+ {
invert = InvertFilterType::New();
invert->SetInput(original);
invert->SetMaximum(minMax->GetMaximum());
cast2->SetInput(invert->GetOutput());
- }
+ }
else
- {
+ {
cast2->SetInput(original);
- }
+ }
mult->SetInput1(cast1->GetOutput());
mult->SetInput2(cast2->GetOutput());
mult->Update();
@@ -216,8 +215,8 @@ Segmenter<TInputImage, TOutputImage>
histogram->SetNumberOfBins(255);
histogram->SetMarginalScale(10.0);
histogram->Compute();
- InputPixelType pointSetThreshold =
- static_cast<InputPixelType>(histogram->GetOutput()->Quantile(0,m_SeedsQuantile));
+ InputPixelType pointSetThreshold =
+ static_cast<InputPixelType>(histogram->GetOutput()->Quantile(0, m_SeedsQuantile));
// Segmentation Threshold is computed from the quantile
histogram = HistGeneratorType::New();
@@ -225,15 +224,15 @@ Segmenter<TInputImage, TOutputImage>
histogram->SetNumberOfBins(255);
histogram->SetMarginalScale(10.0);
histogram->Compute();
- InputPixelType connectedThresholdValue =
- static_cast<InputPixelType>(histogram->GetOutput()->Quantile(0,m_ConnectedThresholdQuantile));
+ InputPixelType connectedThresholdValue =
+ static_cast<InputPixelType>(histogram->GetOutput()->Quantile(0, m_ConnectedThresholdQuantile));
/////////////////////////////////////
//// Seeds extraction ///////////////
/////////////////////////////////////
typename PointSetFilterType::Pointer pointSetFilter = PointSetFilterType::New();
- pointSetFilter->SetInput(0,details);
+ pointSetFilter->SetInput(0, details);
pointSetFilter->SetLowerThreshold(pointSetThreshold);
pointSetFilter->Update();
@@ -243,8 +242,8 @@ Segmenter<TInputImage, TOutputImage>
// Filters instantiation
typename ConnectedFilterType::Pointer connectedThreshold = ConnectedFilterType::New();
- typename LabelFilterType::Pointer labeler = LabelFilterType::New();
- typename RelabelFilterType::Pointer relabeler = RelabelFilterType::New();
+ typename LabelFilterType::Pointer labeler = LabelFilterType::New();
+ typename RelabelFilterType::Pointer relabeler = RelabelFilterType::New();
typename ThresholdFilterType::Pointer threshold = ThresholdFilterType::New();
//Passing seeds to the connected filter
@@ -252,14 +251,14 @@ Segmenter<TInputImage, TOutputImage>
connectedThreshold->ClearSeeds();
connectedThreshold->SetInput(mult->GetOutput());
PointSetIteratorType it = pointSetFilter->GetOutput()->GetPoints()->Begin();
- while (it!=pointSetFilter->GetOutput()->GetPoints()->End())
- {
+ while (it != pointSetFilter->GetOutput()->GetPoints()->End())
+ {
typename OutputImageType::IndexType index;
- index[0]=static_cast<long int>(it.Value()[0]);
- index[1]=static_cast<long int>(it.Value()[1]);
+ index[0] = static_cast<long int>(it.Value()[0]);
+ index[1] = static_cast<long int>(it.Value()[1]);
connectedThreshold->AddSeed(index);
it++;
- }
+ }
// segmentation
connectedThreshold->SetLower(connectedThresholdValue);
@@ -277,24 +276,24 @@ Segmenter<TInputImage, TOutputImage>
threshold = ThresholdFilterType::New();
threshold->SetInput(relabeler->GetOutput());
OutputPixelType num = 0;
- if (relabeler->GetNumberOfObjects()==1)
- {
- unsigned int surface = mult->GetOutput()->GetLargestPossibleRegion().GetSize()[0]
- *mult->GetOutput()->GetLargestPossibleRegion().GetSize()[1];
- if (relabeler->GetSizeOfObjectsInPixels()[0]==surface)
+ if (relabeler->GetNumberOfObjects() == 1)
{
+ unsigned int surface = mult->GetOutput()->GetLargestPossibleRegion().GetSize()[0]
+ * mult->GetOutput()->GetLargestPossibleRegion().GetSize()[1];
+ if (relabeler->GetSizeOfObjectsInPixels()[0] == surface)
+ {
num = 0;
- }
+ }
else
- {
- num=1;
+ {
+ num = 1;
+ }
}
- }
else
- {
- num= static_cast<OutputPixelType>(relabeler->GetNumberOfObjects());
- }
- threshold->ThresholdOutside(0,num);
+ {
+ num = static_cast<OutputPixelType>(relabeler->GetNumberOfObjects());
+ }
+ threshold->ThresholdOutside(0, num);
// Output connection
threshold->GraftOutput(this->GetOutput());
@@ -305,12 +304,12 @@ Segmenter<TInputImage, TOutputImage>
/**
* PrintSelf method
*/
-template <class TInputImage,class TOutputImage>
+template <class TInputImage, class TOutputImage>
void
Segmenter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // End namespace MorphologicalPyramid
diff --git a/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.h b/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.h
index e192a293ba..79379de0e3 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.h
+++ b/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.h
@@ -42,42 +42,42 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT MorphologicalPyramidSynthesisFilter
- : public ImageToImageListFilter<TInputImage,TOutputImage>
+ : public ImageToImageListFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef MorphologicalPyramidSynthesisFilter Self;
- typedef ImageToImageListFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MorphologicalPyramidSynthesisFilter Self;
+ typedef ImageToImageListFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
itkNewMacro(Self);
/** Type macro */
- itkTypeMacro(MorphologicalPyramidSynthesisFilter,MorphologicalPyramidSynthesisFilter);
+ itkTypeMacro(MorphologicalPyramidSynthesisFilter, MorphologicalPyramidSynthesisFilter);
/** Input image dimension constant macro */
- itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/** Output related typedefs */
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::OutputImageListType OutputImageListType;
- typedef typename OutputImageListType::Pointer OutputImageListPointerType;
- typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
- typedef typename Superclass::OutputImageListType::Iterator ImageListIterator;
- typedef typename Superclass::OutputImageListType::ReverseIterator ImageListReverseIterator;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::OutputImageListType OutputImageListType;
+ typedef typename OutputImageListType::Pointer OutputImageListPointerType;
+ typedef typename Superclass::OutputImagePointerType OutputImagePointerType;
+ typedef typename Superclass::OutputImageListType::Iterator ImageListIterator;
+ typedef typename Superclass::OutputImageListType::ReverseIterator ImageListReverseIterator;
/** Input related typedefs */
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::InputImageRegionType InputImageRegionType;
- typedef typename InputImageType::Pointer InputImagePointer;
- typedef typename InputImageType::ConstPointer InputImageConstPointer;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::ValueType ValueType;
- typedef typename InputImageType::PixelType PixelType;
- typedef typename InputImageType::SpacingType SpacingType;
- typedef otb::ImageList<InputImageType> InputImageListType;
- typedef typename InputImageListType::Pointer InputImageListPointerType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::InputImageRegionType InputImageRegionType;
+ typedef typename InputImageType::Pointer InputImagePointer;
+ typedef typename InputImageType::ConstPointer InputImageConstPointer;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::ValueType ValueType;
+ typedef typename InputImageType::PixelType PixelType;
+ typedef typename InputImageType::SpacingType SpacingType;
+ typedef otb::ImageList<InputImageType> InputImageListType;
+ typedef typename InputImageListType::Pointer InputImageListPointerType;
/** Size vector typedefs */
- typedef std::vector<SizeType> SizeVectorType;
- typedef typename SizeVectorType::iterator SizeIterator;
- typedef typename SizeVectorType::reverse_iterator SizeReverseIterator;
+ typedef std::vector<SizeType> SizeVectorType;
+ typedef typename SizeVectorType::iterator SizeIterator;
+ typedef typename SizeVectorType::reverse_iterator SizeReverseIterator;
/**
* Set The SupFilter details
* \param imageList The brighter details extracted from the filtering operation.
@@ -124,13 +124,13 @@ protected:
MorphologicalPyramidSynthesisFilter();
/** Destructor */
virtual ~MorphologicalPyramidSynthesisFilter();
- virtual void GenerateOutputInformation() {}; // does nothing
+ virtual void GenerateOutputInformation() {} // does nothing
/** Main computation method */
virtual void GenerateData();
/** Printself method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbMorphologicalPyramidSynthesisFilter.txx"
diff --git a/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx b/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx
index 4e956864d3..eb93afda44 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx
@@ -32,7 +32,7 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage>
-MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::MorphologicalPyramidSynthesisFilter()
{
this->SetNumberOfRequiredInputs(5);
@@ -41,7 +41,7 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
* Destructor
*/
template <class TInputImage, class TOutputImage>
-MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::~MorphologicalPyramidSynthesisFilter() {}
/**
* Set The SupFilter details
@@ -49,10 +49,10 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::SetSupFilter(InputImageListType * imageList)
{
- this->SetNthInput(1,const_cast<InputImageListType *>(imageList));
+ this->SetNthInput(1, const_cast<InputImageListType *>(imageList));
}
/**
* Set The InfFilter details
@@ -60,10 +60,10 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::SetInfFilter(InputImageListType * imageList)
{
- this->SetNthInput(2,const_cast<InputImageListType *>(imageList));
+ this->SetNthInput(2, const_cast<InputImageListType *>(imageList));
}
/**
@@ -72,10 +72,10 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::SetSupDeci(InputImageListType * imageList)
{
- this->SetNthInput(3,const_cast<InputImageListType *>(imageList));
+ this->SetNthInput(3, const_cast<InputImageListType *>(imageList));
}
/**
* Set The InfDeci details
@@ -83,10 +83,10 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::SetInfDeci(InputImageListType * imageList)
{
- this->SetNthInput(4,const_cast<InputImageListType *>(imageList));
+ this->SetNthInput(4, const_cast<InputImageListType *>(imageList));
}
/**
@@ -94,9 +94,9 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
* \return The brighter details extracted from the filtering operation.
*/
template <class TInputImage, class TOutputImage>
-typename MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+typename MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::InputImageListType*
-MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::GetSupFilter(void)
{
return dynamic_cast<InputImageListType *>(this->itk::ProcessObject::GetInput(1));
@@ -106,9 +106,9 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
* \return The darker details extracted from the filtering operation.
*/
template <class TInputImage, class TOutputImage>
-typename MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+typename MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::InputImageListType*
-MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::GetInfFilter(void)
{
return dynamic_cast<InputImageListType *>(this->itk::ProcessObject::GetInput(2));
@@ -118,9 +118,9 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
* \return The brighter details extracted from the resampling operation.
*/
template <class TInputImage, class TOutputImage>
-typename MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+typename MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::InputImageListType*
-MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::GetSupDeci(void)
{
return dynamic_cast<InputImageListType *>(this->itk::ProcessObject::GetInput(3));
@@ -130,9 +130,9 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
* \return The darker details extracted from the resampling operation.
*/
template <class TInputImage, class TOutputImage>
-typename MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+typename MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::InputImageListType*
-MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::GetInfDeci(void)
{
return dynamic_cast<InputImageListType *>(this->itk::ProcessObject::GetInput(4));
@@ -142,10 +142,10 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
*/
template <class TInputImage, class TOutputImage>
void
-MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::GenerateData(void)
{
- otbMsgDevMacro(<<"MorphologicalPyramidSynthesisFilter : Entering main method.");
+ otbMsgDevMacro(<< "MorphologicalPyramidSynthesisFilter : Entering main method.");
// Input image pointer
InputImageListType * supFilter = this->GetSupFilter();
InputImageListType * infFilter = this->GetInfFilter();
@@ -153,14 +153,13 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
InputImageListType * infDeci = this->GetInfDeci();
// Output pointer
- OutputImageListType * OutputImageList = this->GetOutput();
-
+ OutputImageListType * OutputImageList = this->GetOutput();
// typedefs of the filters
- typedef itk::SubtractImageFilter<InputImageType,InputImageType,OutputImageType> SubtractFilterType;
- typedef itk::AddImageFilter<InputImageType,InputImageType,InputImageType> AddFilterType;
- typedef otb::MorphologicalPyramid::Resampler<InputImageType,InputImageType> ResamplerType;
- typedef itk::ImageDuplicator<InputImageType> DuplicatorType;
+ typedef itk::SubtractImageFilter<InputImageType, InputImageType, OutputImageType> SubtractFilterType;
+ typedef itk::AddImageFilter<InputImageType, InputImageType, InputImageType> AddFilterType;
+ typedef otb::MorphologicalPyramid::Resampler<InputImageType, InputImageType> ResamplerType;
+ typedef itk::ImageDuplicator<InputImageType> DuplicatorType;
// Input Image duplication to the currentImage Pointer
typename DuplicatorType::Pointer duplicator = DuplicatorType::New();
@@ -168,43 +167,42 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
duplicator->Update();
// Input Image duplication to the currentImage Pointer
- typename InputImageType::Pointer currentImage =duplicator->GetOutput();
+ typename InputImageType::Pointer currentImage = duplicator->GetOutput();
// Filters declarations
- typename AddFilterType::Pointer add1, add2;
- typename SubtractFilterType::Pointer subtract1,subtract2;
- typename ResamplerType::Pointer resampler;
-
+ typename AddFilterType::Pointer add1, add2;
+ typename SubtractFilterType::Pointer subtract1, subtract2;
+ typename ResamplerType::Pointer resampler;
// Size vector computation
SizeVectorType size;
ImageListIterator it = supFilter->Begin();
- while (it!=supFilter->End())
- {
+ while (it != supFilter->End())
+ {
size.push_back(it.Get()->GetLargestPossibleRegion().GetSize());
++it;
- }
- otbMsgDevMacro(<<"MorphologicalPyramidSynthesisFilter : Size vector computation OK");
+ }
+ otbMsgDevMacro(<< "MorphologicalPyramidSynthesisFilter : Size vector computation OK");
// Iterators definition
ImageListReverseIterator itinfFilter = infFilter->ReverseBegin();
ImageListReverseIterator itsupFilter = supFilter->ReverseBegin();
ImageListReverseIterator itinfDeci = infDeci->ReverseBegin();
ImageListReverseIterator itsupDeci = supDeci->ReverseBegin();
- SizeReverseIterator itSize = size.rbegin();
+ SizeReverseIterator itSize = size.rbegin();
- int i =1;
+ int i = 1;
+//--------------------------------------------------------//
+// Main loop //
//--------------------------------------------------------//
- // Main loop //
- //--------------------------------------------------------//
- while ( itinfFilter!=infFilter->ReverseEnd()
- && itsupFilter!=supFilter->ReverseEnd()
- && itinfDeci!=infDeci->ReverseEnd()
- && itsupDeci!=supDeci->ReverseEnd()
- && itSize!=size.rend())
- {
+ while (itinfFilter != infFilter->ReverseEnd()
+ && itsupFilter != supFilter->ReverseEnd()
+ && itinfDeci != infDeci->ReverseEnd()
+ && itsupDeci != supDeci->ReverseEnd()
+ && itSize != size.rend())
+ {
++i;
// Upsampling current image
@@ -212,28 +210,27 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
resampler->SetSize(*itSize);
resampler->SetInput(currentImage);
resampler->Update();
- otbMsgDevMacro(<<"MorphologicalPyramidSynthesisFilter: step "<<i<<" Upsampling OK");
+ otbMsgDevMacro(<< "MorphologicalPyramidSynthesisFilter: step " << i << " Upsampling OK");
// Adding *sup details from current level
- add1= AddFilterType::New();
+ add1 = AddFilterType::New();
add1->SetInput1(resampler->GetOutput());
add1->SetInput2(itsupFilter.Get());
- add2= AddFilterType::New();
+ add2 = AddFilterType::New();
add2->SetInput1(add1->GetOutput());
add2->SetInput2(itsupDeci.Get());
// Adding *inf details from current level
- subtract1= SubtractFilterType::New();
+ subtract1 = SubtractFilterType::New();
subtract1->SetInput1(add2->GetOutput());
subtract1->SetInput2(itinfFilter.Get());
- subtract2= SubtractFilterType::New();
+ subtract2 = SubtractFilterType::New();
subtract2->SetInput1(subtract1->GetOutput());
subtract2->SetInput2(itinfDeci.Get());
subtract2->Update();
- otbMsgDevMacro(<<"MorphologicalPyramidSynthesisFilter: step "<<i<<" Details addition OK");
-
+ otbMsgDevMacro(<< "MorphologicalPyramidSynthesisFilter: step " << i << " Details addition OK");
// Updating current image
- currentImage=subtract2->GetOutput();
+ currentImage = subtract2->GetOutput();
OutputImageList->PushBack(currentImage);
// Iterators incrementation
@@ -242,15 +239,15 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
++itsupDeci;
++itinfDeci;
++itSize;
- }
- otbMsgDevMacro(<<"MorphologicalPyramidSynthesisFilter: Exiting main method.");
+ }
+ otbMsgDevMacro(<< "MorphologicalPyramidSynthesisFilter: Exiting main method.");
}
/**
* PrintSelf method
*/
template <class TInputImage, class TOutputImage>
void
-MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
+MorphologicalPyramidSynthesisFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
@@ -258,4 +255,3 @@ MorphologicalPyramidSynthesisFilter<TInputImage,TOutputImage>
} // End namespace otb
#endif
-
diff --git a/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.h b/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.h
index c3d115b373..67570bab1e 100644
--- a/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.h
+++ b/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.h
@@ -52,7 +52,7 @@ namespace Functor
* This functor is the decision rule used for multi-scale classification using
* morphological profiles.
*/
-template<class TInput,class TLabeled>
+template<class TInput, class TLabeled>
class MultiScaleConvexOrConcaveDecisionRule
{
@@ -68,7 +68,7 @@ public:
/**
* Destructor
*/
- virtual ~MultiScaleConvexOrConcaveDecisionRule() {};
+ virtual ~MultiScaleConvexOrConcaveDecisionRule() {}
/**
* Label the pixel to convex, concave or flat
* \return The label of the pixel
@@ -77,25 +77,28 @@ public:
* \param opDeChar The characteristic of the opening profile
* \param cloDeChar The characteristic of the closing profile
*/
- inline TLabeled operator()(const TInput& opDeMax, const TInput& cloDeMax,const TLabeled& opDeChar, const TLabeled& cloDeChar)
+ inline TLabeled operator ()(const TInput& opDeMax,
+ const TInput& cloDeMax,
+ const TLabeled& opDeChar,
+ const TLabeled& cloDeChar)
{
TLabeled resp = 0;
- if ( opDeMax>cloDeMax && static_cast<double>(opDeMax)>m_Sigma)
- {
+ if (opDeMax > cloDeMax && static_cast<double>(opDeMax) > m_Sigma)
+ {
resp = m_LabelSeparator + opDeChar;
- }
- else if (cloDeMax>opDeMax && static_cast<double>(cloDeMax)>m_Sigma)
- {
+ }
+ else if (cloDeMax > opDeMax && static_cast<double>(cloDeMax) > m_Sigma)
+ {
resp = cloDeChar;
- }
+ }
return resp;
}
/**
* Set the tolerance value
* \param sigma the tolerance value
*/
- void SetSigma(const double & sigma)
+ void SetSigma(const double& sigma)
{
m_Sigma = sigma;
}
@@ -141,31 +144,32 @@ private:
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT MultiScaleConvexOrConcaveClassificationFilter
- : public QuaternaryFunctorImageFilter<TInputImage,TInputImage, TOutputImage,TOutputImage,TOutputImage,
- Functor::MultiScaleConvexOrConcaveDecisionRule<typename TInputImage::PixelType,
- typename TOutputImage::PixelType> >
+ : public QuaternaryFunctorImageFilter<TInputImage, TInputImage, TOutputImage, TOutputImage, TOutputImage,
+ Functor::MultiScaleConvexOrConcaveDecisionRule<typename TInputImage::PixelType,
+ typename TOutputImage::PixelType> >
{
public:
/** Standard typedefs */
typedef MultiScaleConvexOrConcaveClassificationFilter Self;
- typedef QuaternaryFunctorImageFilter<TInputImage,TInputImage, TOutputImage,TOutputImage,TOutputImage,
- Functor::MultiScaleConvexOrConcaveDecisionRule<typename TInputImage::PixelType,
- typename TOutputImage::PixelType> >Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef QuaternaryFunctorImageFilter<TInputImage, TInputImage, TOutputImage, TOutputImage, TOutputImage,
+ Functor::MultiScaleConvexOrConcaveDecisionRule<typename TInputImage::PixelType,
+ typename TOutputImage::PixelType> >
+ Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(MultiScaleConvexOrConcaveClassificationFilter,QuaternaryFunctorImageFilter);
+ itkTypeMacro(MultiScaleConvexOrConcaveClassificationFilter, QuaternaryFunctorImageFilter);
/** Template class typedef */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
typedef typename OutputImageType::PixelType LabelType;
typedef Functor::MultiScaleConvexOrConcaveDecisionRule<typename TInputImage::PixelType,
- typename TOutputImage::PixelType> DecisionFunctorType;
+ typename TOutputImage::PixelType> DecisionFunctorType;
/**
* Set the opening profile derivative maxima image
* \param derivativeMaxima the opening profile derivative maxima image
@@ -204,12 +208,11 @@ public:
}
/** Set/Get the tolerance value */
- itkSetMacro(Sigma,double);
- itkGetMacro(Sigma,double);
+ itkSetMacro(Sigma, double);
+ itkGetMacro(Sigma, double);
/** Set/Get the label separator */
- itkSetMacro(LabelSeparator,LabelType);
- itkGetMacro(LabelSeparator,LabelType);
-
+ itkSetMacro(LabelSeparator, LabelType);
+ itkGetMacro(LabelSeparator, LabelType);
/** Set the functor parameters before calling the ThreadedGenerateData() */
virtual void BeforeThreadedGenerateData(void)
@@ -221,28 +224,28 @@ public:
protected:
/** Constructor */
MultiScaleConvexOrConcaveClassificationFilter()
- {
+ {
m_LabelSeparator = 10;
m_Sigma = 0.0;
- };
+ };
/** Destructor */
- virtual ~MultiScaleConvexOrConcaveClassificationFilter() {};
+ virtual ~MultiScaleConvexOrConcaveClassificationFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"LabelSeparator: "<<m_LabelSeparator<<std::endl;
- os<<indent<<"Sigma: "<<m_Sigma<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "LabelSeparator: " << m_LabelSeparator << std::endl;
+ os << indent << "Sigma: " << m_Sigma << std::endl;
}
private:
- MultiScaleConvexOrConcaveClassificationFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MultiScaleConvexOrConcaveClassificationFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Label separator between convex and concave labels */
LabelType m_LabelSeparator;
/** Tolerance value */
double m_Sigma;
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h b/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
index 39fde13a4d..b8cf55eef4 100644
--- a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
+++ b/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
@@ -38,33 +38,33 @@ namespace otb
*/
template <class TInputImage, class TOutputImage, class TLabeledImage>
class ITK_EXPORT ProfileDerivativeToMultiScaleCharacteristicsFilter
- : public ImageListToImageFilter<TInputImage, TOutputImage>
+ : public ImageListToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef ProfileDerivativeToMultiScaleCharacteristicsFilter Self;
- typedef ImageListToImageFilter<TInputImage, TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ProfileDerivativeToMultiScaleCharacteristicsFilter Self;
+ typedef ImageListToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(ProfileDerivativeToMultiScaleCharacteristicsFilter,ImageToImageListFilter);
+ itkTypeMacro(ProfileDerivativeToMultiScaleCharacteristicsFilter, ImageToImageListFilter);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
- typedef TLabeledImage LabeledImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
- typedef typename LabeledImageType::Pointer LabeledImagePointerType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
+ typedef TLabeledImage LabeledImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename LabeledImageType::Pointer LabeledImagePointerType;
typedef typename Superclass::InputImageListType InputImageListType;
- typedef typename InputImageListType::Pointer InputImageListPointerType;
- typedef typename OutputImageType::RegionType RegionType;
- typedef typename LabeledImageType::PixelType LabeledPixelType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename InputImageListType::Pointer InputImageListPointerType;
+ typedef typename OutputImageType::RegionType RegionType;
+ typedef typename LabeledImageType::PixelType LabeledPixelType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
/**
* Returns the characteristics image.
@@ -73,12 +73,11 @@ public:
virtual TLabeledImage * GetOutputCharacteristics(void);
/** Set/Get the initial profile value */
- itkSetMacro(InitialValue,LabeledPixelType);
- itkGetMacro(InitialValue,LabeledPixelType);
+ itkSetMacro(InitialValue, LabeledPixelType);
+ itkGetMacro(InitialValue, LabeledPixelType);
/** Set/Get the profile step */
- itkSetMacro(Step,LabeledPixelType);
- itkGetMacro(Step,LabeledPixelType);
-
+ itkSetMacro(Step, LabeledPixelType);
+ itkGetMacro(Step, LabeledPixelType);
protected:
/** Main computation method */
@@ -99,20 +98,20 @@ protected:
/** Constructor */
ProfileDerivativeToMultiScaleCharacteristicsFilter();
/** Destructor */
- virtual ~ProfileDerivativeToMultiScaleCharacteristicsFilter() {};
+ virtual ~ProfileDerivativeToMultiScaleCharacteristicsFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ProfileDerivativeToMultiScaleCharacteristicsFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ProfileDerivativeToMultiScaleCharacteristicsFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The initial value of the profile */
LabeledPixelType m_InitialValue;
/** The step of the profile */
LabeledPixelType m_Step;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx"
#endif
diff --git a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx b/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
index 15ef5743b4..d05302c343 100644
--- a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
+++ b/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
@@ -27,55 +27,55 @@
namespace otb
{
template <class TInputImage, class TOutputImage, class TLabeledImage>
-ProfileDerivativeToMultiScaleCharacteristicsFilter<TInputImage,TOutputImage,TLabeledImage>
+ProfileDerivativeToMultiScaleCharacteristicsFilter<TInputImage, TOutputImage, TLabeledImage>
::ProfileDerivativeToMultiScaleCharacteristicsFilter(void)
{
this->SetNumberOfOutputs(2);
- this->SetNthOutput(0,OutputImageType::New());
- this->SetNthOutput(1,LabeledImageType::New());
+ this->SetNthOutput(0, OutputImageType::New());
+ this->SetNthOutput(1, LabeledImageType::New());
m_InitialValue = 0;
m_Step = 1;
}
template <class TInputImage, class TOutputImage, class TLabeledImage>
TLabeledImage *
-ProfileDerivativeToMultiScaleCharacteristicsFilter<TInputImage,TOutputImage,TLabeledImage>
+ProfileDerivativeToMultiScaleCharacteristicsFilter<TInputImage, TOutputImage, TLabeledImage>
::GetOutputCharacteristics(void)
{
if (this->GetNumberOfOutputs() < 2)
- {
+ {
return 0;
- }
- return static_cast<LabeledImageType * >
- (this->itk::ProcessObject::GetOutput(1) );
+ }
+ return static_cast<LabeledImageType *>
+ (this->itk::ProcessObject::GetOutput(1));
}
/**
* GenerateOutputInformation
*/
template <class TInputImage, class TOutputImage, class TLabeledImage>
void
-ProfileDerivativeToMultiScaleCharacteristicsFilter<TInputImage,TOutputImage,TLabeledImage>
+ProfileDerivativeToMultiScaleCharacteristicsFilter<TInputImage, TOutputImage, TLabeledImage>
::GenerateOutputInformation(void)
{
InputImageListPointerType inputPtr = this->GetInput();
- OutputImagePointerType outputPtr = this->GetOutput();
- LabeledImagePointerType outputLabeledPtr = this->GetOutputCharacteristics();
- if (inputPtr->Size()>0)
- {
+ OutputImagePointerType outputPtr = this->GetOutput();
+ LabeledImagePointerType outputLabeledPtr = this->GetOutputCharacteristics();
+ if (inputPtr->Size() > 0)
+ {
typename InputImageListType::ConstIterator inputListIt = inputPtr->Begin();
outputPtr->CopyInformation(inputListIt.Get());
outputLabeledPtr->CopyInformation(inputListIt.Get());
- }
+ }
}
/**
* GenerateInputRequestedRegion
*/
template <class TInputImage, class TOutputImage, class TLabeledImage>
void
-ProfileDerivativeToMultiScaleCharacteristicsFilter<TInputImage,TOutputImage,TLabeledImage>
+ProfileDerivativeToMultiScaleCharacteristicsFilter<TInputImage, TOutputImage, TLabeledImage>
::GenerateInputRequestedRegion(void)
{
- InputImageListPointerType inputPtr = this->GetInput();
+ InputImageListPointerType inputPtr = this->GetInput();
typename InputImageListType::ConstIterator inputListIt = inputPtr->Begin();
RegionType region1 = this->GetOutput()->GetRequestedRegion();
@@ -85,60 +85,60 @@ ProfileDerivativeToMultiScaleCharacteristicsFilter<TInputImage,TOutputImage,TLab
* Compute the appropriate requested region:
* This is the smaller region containing the two output regions
*/
- if (region1==this->GetOutput()->GetLargestPossibleRegion()
- &®ion2!=this->GetOutputCharacteristics()->GetLargestPossibleRegion())
- {
+ if (region1 == this->GetOutput()->GetLargestPossibleRegion()
+ && region2 != this->GetOutputCharacteristics()->GetLargestPossibleRegion())
+ {
region = region2;
- }
- else if (region1!=this->GetOutput()->GetLargestPossibleRegion()
- &®ion2==this->GetOutputCharacteristics()->GetLargestPossibleRegion())
- {
+ }
+ else if (region1 != this->GetOutput()->GetLargestPossibleRegion()
+ && region2 == this->GetOutputCharacteristics()->GetLargestPossibleRegion())
+ {
region = region1;
- }
+ }
else
- {
+ {
int xul1 = region1.GetIndex()[0];
int xul2 = region2.GetIndex()[0];
int yul1 = region1.GetIndex()[1];
int yul2 = region2.GetIndex()[1];
- int xlr1 = region1.GetIndex()[0]+region1.GetSize()[0];
- int xlr2 = region2.GetIndex()[0]+region2.GetSize()[0];
- int ylr1 = region1.GetIndex()[1]+region1.GetSize()[1];
- int ylr2 = region2.GetIndex()[1]+region2.GetSize()[1];
+ int xlr1 = region1.GetIndex()[0] + region1.GetSize()[0];
+ int xlr2 = region2.GetIndex()[0] + region2.GetSize()[0];
+ int ylr1 = region1.GetIndex()[1] + region1.GetSize()[1];
+ int ylr2 = region2.GetIndex()[1] + region2.GetSize()[1];
- int xul = std::min(xul1,xul2);
- int yul = std::min(yul1,yul2);
- int xlr = std::max(xlr1,xlr2);
- int ylr = std::max(ylr1,ylr2);
+ int xul = std::min(xul1, xul2);
+ int yul = std::min(yul1, yul2);
+ int xlr = std::max(xlr1, xlr2);
+ int ylr = std::max(ylr1, ylr2);
typename RegionType::IndexType index;
- index[0]=xul;
- index[1]=yul;
+ index[0] = xul;
+ index[1] = yul;
typename RegionType::SizeType size;
- size[0]=static_cast<unsigned int>(xlr-xul);
- size[1]=static_cast<unsigned int>(ylr-yul);
+ size[0] = static_cast<unsigned int>(xlr - xul);
+ size[1] = static_cast<unsigned int>(ylr - yul);
region.SetIndex(index);
region.SetSize(size);
- }
+ }
- while (inputListIt!=inputPtr->End())
- {
+ while (inputListIt != inputPtr->End())
+ {
inputListIt.Get()->SetRequestedRegion(region);
++inputListIt;
- }
+ }
}
/**
* Main computation method
*/
template <class TInputImage, class TOutputImage, class TLabeledImage>
void
-ProfileDerivativeToMultiScaleCharacteristicsFilter<TInputImage,TOutputImage,TLabeledImage>
+ProfileDerivativeToMultiScaleCharacteristicsFilter<TInputImage, TOutputImage, TLabeledImage>
::GenerateData(void)
{
- OutputImagePointerType outputPtr = this->GetOutput();
- LabeledImagePointerType outputLabeledPtr = this->GetOutputCharacteristics();
+ OutputImagePointerType outputPtr = this->GetOutput();
+ LabeledImagePointerType outputLabeledPtr = this->GetOutputCharacteristics();
InputImageListPointerType inputPtr = this->GetInput();
// Output image initializations
@@ -152,8 +152,8 @@ ProfileDerivativeToMultiScaleCharacteristicsFilter<TInputImage,TOutputImage,TLab
// defines input and output iterators
typedef itk::ImageRegionConstIterator<InputImageType> InputIteratorType;
- typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
- typedef itk::ImageRegionIterator<LabeledImageType> LabeledIteratorType;
+ typedef itk::ImageRegionIterator<OutputImageType> OutputIteratorType;
+ typedef itk::ImageRegionIterator<LabeledImageType> LabeledIteratorType;
typename InputImageListType::ConstIterator inputListIt = inputPtr->Begin();
@@ -162,54 +162,53 @@ ProfileDerivativeToMultiScaleCharacteristicsFilter<TInputImage,TOutputImage,TLab
InputIteratorListType inputIteratorList;
// fills the vector of input iterators
- for (;inputListIt!=inputPtr->End();++inputListIt)
- {
- inputIteratorList.push_back(InputIteratorType(inputListIt.Get(),inputListIt.Get()->GetRequestedRegion()));
+ for (; inputListIt != inputPtr->End(); ++inputListIt)
+ {
+ inputIteratorList.push_back(InputIteratorType(inputListIt.Get(), inputListIt.Get()->GetRequestedRegion()));
inputIteratorList.back().GoToBegin();
- }
+ }
// walk through the output images
- OutputIteratorType outputIt(outputPtr,outputPtr->GetRequestedRegion());
+ OutputIteratorType outputIt(outputPtr, outputPtr->GetRequestedRegion());
outputIt.GoToBegin();
- LabeledIteratorType labeledIt(outputLabeledPtr,outputLabeledPtr->GetRequestedRegion());
+ LabeledIteratorType labeledIt(outputLabeledPtr, outputLabeledPtr->GetRequestedRegion());
labeledIt.GoToBegin();
bool inputIteratorsAtEnd = false;
for (typename InputIteratorListType::iterator it = inputIteratorList.begin();
- it != inputIteratorList.end();++it)
- {
+ it != inputIteratorList.end(); ++it)
+ {
inputIteratorsAtEnd = inputIteratorsAtEnd || it->IsAtEnd();
- }
-
+ }
while (!outputIt.IsAtEnd() && !labeledIt.IsAtEnd() && !inputIteratorsAtEnd)
- {
- unsigned int index = 0;
- OutputPixelType outputPixel = 0;
+ {
+ unsigned int index = 0;
+ OutputPixelType outputPixel = 0;
LabeledPixelType outputChar = 0;
// for each input iterator, check the output and characteristics
for (typename InputIteratorListType::iterator it = inputIteratorList.begin();
- it != inputIteratorList.end();++it)
- {
- if (it->Get()>outputPixel)
+ it != inputIteratorList.end(); ++it)
{
+ if (it->Get() > outputPixel)
+ {
outputPixel = it->Get();
- outputChar = m_InitialValue+m_Step*(static_cast<LabeledPixelType>(index));
- }
+ outputChar = m_InitialValue + m_Step * (static_cast<LabeledPixelType>(index));
+ }
++index;
- }
+ }
outputIt.Set(outputPixel);
labeledIt.Set(outputChar);
++outputIt;
++labeledIt;
for (typename InputIteratorListType::iterator it = inputIteratorList.begin();
- it != inputIteratorList.end();++it)
- {
+ it != inputIteratorList.end(); ++it)
+ {
++(*it);
inputIteratorsAtEnd = inputIteratorsAtEnd || it->IsAtEnd();
+ }
}
- }
}
/**
* PrintSelf Method
diff --git a/Code/MultiScale/otbProfileToProfileDerivativeFilter.h b/Code/MultiScale/otbProfileToProfileDerivativeFilter.h
index 56d5512889..9961bffe38 100644
--- a/Code/MultiScale/otbProfileToProfileDerivativeFilter.h
+++ b/Code/MultiScale/otbProfileToProfileDerivativeFilter.h
@@ -40,14 +40,14 @@ namespace otb
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT ProfileToProfileDerivativeFilter
- : public ImageListToImageListFilter<TInputImage,TOutputImage>
+ : public ImageListToImageListFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef ProfileToProfileDerivativeFilter Self;
- typedef ImageListToImageListFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ProfileToProfileDerivativeFilter Self;
+ typedef ImageListToImageListFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -56,19 +56,19 @@ public:
itkTypeMacro(ProfileToProfileDerivativeFilter, ImageListToImageListFilter);
/** Template parameters typedefs */
- typedef typename Superclass::InputImageListType InputImageListType;
- typedef typename InputImageListType::Pointer InputImageListPointerType;
+ typedef typename Superclass::InputImageListType InputImageListType;
+ typedef typename InputImageListType::Pointer InputImageListPointerType;
typedef typename Superclass::OutputImageListType OutputImageListType;
- typedef typename OutputImageListType::Pointer OutputImageListPointerType;
- typedef typename OutputImageListType::ImageType OutputImageType;
- typedef typename InputImageListType::ImageType InputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename OutputImageListType::Pointer OutputImageListPointerType;
+ typedef typename OutputImageListType::ImageType OutputImageType;
+ typedef typename InputImageListType::ImageType InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
/** typedefs of the filters used for the derivative */
- typedef itk::SubtractImageFilter<InputImageType,InputImageType,InputImageType> SubtractFilterType;
- typedef itk::AbsImageFilter<InputImageType,InputImageType> AbsFilterType;
- typedef typename SubtractFilterType::Pointer SubtractFilterPointerType;
- typedef typename AbsFilterType::Pointer AbsFilterPointerType;
+ typedef itk::SubtractImageFilter<InputImageType, InputImageType, InputImageType> SubtractFilterType;
+ typedef itk::AbsImageFilter<InputImageType, InputImageType> AbsFilterType;
+ typedef typename SubtractFilterType::Pointer SubtractFilterPointerType;
+ typedef typename AbsFilterType::Pointer AbsFilterPointerType;
/** Generate output information for the ImageList and for each image
in the list. */
@@ -83,20 +83,20 @@ protected:
/** Constructor */
ProfileToProfileDerivativeFilter();
/** Destructor */
- virtual ~ProfileToProfileDerivativeFilter() {};
+ virtual ~ProfileToProfileDerivativeFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ProfileToProfileDerivativeFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ProfileToProfileDerivativeFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Subtract filter for the dervivative */
SubtractFilterPointerType m_SubtractFilter;
/** Abs filter for the derivative */
AbsFilterPointerType m_AbsFilter;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbProfileToProfileDerivativeFilter.txx"
#endif
diff --git a/Code/MultiScale/otbProfileToProfileDerivativeFilter.txx b/Code/MultiScale/otbProfileToProfileDerivativeFilter.txx
index 88e00539ab..b3e0f9577c 100644
--- a/Code/MultiScale/otbProfileToProfileDerivativeFilter.txx
+++ b/Code/MultiScale/otbProfileToProfileDerivativeFilter.txx
@@ -26,7 +26,7 @@ namespace otb
* Constructor
*/
template <class TInputImageList, class TOutputImageList>
-ProfileToProfileDerivativeFilter<TInputImageList,TOutputImageList>
+ProfileToProfileDerivativeFilter<TInputImageList, TOutputImageList>
::ProfileToProfileDerivativeFilter()
{
m_SubtractFilter = SubtractFilterType::New();
@@ -36,103 +36,103 @@ ProfileToProfileDerivativeFilter<TInputImageList,TOutputImageList>
in the List. */
template <class TInputImageList, class TOutputImageList>
void
-ProfileToProfileDerivativeFilter<TInputImageList,TOutputImageList>
+ProfileToProfileDerivativeFilter<TInputImageList, TOutputImageList>
::GenerateOutputInformation()
{
// Retrieving input/output pointers
- InputImageListPointerType inputPtr = this->GetInput();
+ InputImageListPointerType inputPtr = this->GetInput();
OutputImageListPointerType outputPtr = this->GetOutput();
if (outputPtr)
- {
- if (outputPtr->Size()!=inputPtr->Size()-1)
{
+ if (outputPtr->Size() != inputPtr->Size() - 1)
+ {
// in this case, clear the list
outputPtr->Clear();
typename InputImageListType::ConstIterator inputListIt = inputPtr->Begin();
++inputListIt;
- while (inputListIt!=inputPtr->End())
- {
+ while (inputListIt != inputPtr->End())
+ {
outputPtr->PushBack(OutputImageType::New());
++inputListIt;
+ }
}
- }
// For each input image
typename InputImageListType::ConstIterator inputListIt = inputPtr->Begin();
- typename OutputImageListType::Iterator outputListIt = outputPtr->Begin();
+ typename OutputImageListType::Iterator outputListIt = outputPtr->Begin();
++inputListIt;
- while (inputListIt!=inputPtr->End()&&outputListIt!=outputPtr->End())
- {
+ while (inputListIt != inputPtr->End() && outputListIt != outputPtr->End())
+ {
// Create the output image and set its information
outputListIt.Get()->CopyInformation(inputListIt.Get());
outputListIt.Get()->SetLargestPossibleRegion(inputListIt.Get()->GetLargestPossibleRegion());
++inputListIt;
++outputListIt;
+ }
}
- }
}
/** Generate input requested region for each image in the List. */
template <class TInputImageList, class TOutputImageList>
void
-ProfileToProfileDerivativeFilter<TInputImageList,TOutputImageList>
+ProfileToProfileDerivativeFilter<TInputImageList, TOutputImageList>
::GenerateInputRequestedRegion()
{
// Retrieving input/output pointers
- InputImageListPointerType inputPtr = this->GetInput();
+ InputImageListPointerType inputPtr = this->GetInput();
OutputImageListPointerType outputPtr = this->GetOutput();
// For each input image and corresponding output image
typename InputImageListType::ConstIterator inputListIt = inputPtr->Begin();
- typename OutputImageListType::Iterator outputListIt = outputPtr->Begin();
+ typename OutputImageListType::Iterator outputListIt = outputPtr->Begin();
// Use the filter to generate input requested region
- while (inputListIt!=inputPtr->End()&&outputListIt!=outputPtr->End())
- {
- inputListIt.Get() ->SetRequestedRegion(outputListIt.Get()->GetRequestedRegion());
+ while (inputListIt != inputPtr->End() && outputListIt != outputPtr->End())
+ {
+ inputListIt.Get()->SetRequestedRegion(outputListIt.Get()->GetRequestedRegion());
++inputListIt;
++outputListIt;
- }
+ }
}
/** Main computation method */
template <class TInputImageList, class TOutputImageList>
void
-ProfileToProfileDerivativeFilter<TInputImageList,TOutputImageList>
+ProfileToProfileDerivativeFilter<TInputImageList, TOutputImageList>
::GenerateData()
{
m_AbsFilter->SetInput(m_SubtractFilter->GetOutput());
// Retrieving input/output pointers
- InputImageListPointerType inputPtr = this->GetInput();
+ InputImageListPointerType inputPtr = this->GetInput();
OutputImageListPointerType outputPtr = this->GetOutput();
// For each input image and corresponding output image
typename InputImageListType::ConstIterator inputListIt = inputPtr->Begin();
- typename OutputImageListType::Iterator outputListIt = outputPtr->Begin();
- unsigned int counter = 0;
+ typename OutputImageListType::Iterator outputListIt = outputPtr->Begin();
+ unsigned int counter = 0;
InputImagePointerType lastImage = inputListIt.Get();
++inputListIt;
- while (inputListIt!=inputPtr->End()&&outputListIt!=outputPtr->End())
- {
+ while (inputListIt != inputPtr->End() && outputListIt != outputPtr->End())
+ {
m_SubtractFilter->SetInput1(inputListIt.Get());
m_SubtractFilter->SetInput2(lastImage);
m_AbsFilter->GetOutput()->SetRequestedRegion(outputListIt.Get()->GetRequestedRegion());
m_AbsFilter->Update();
- outputPtr->SetNthElement(counter,static_cast<OutputImageType *>(m_AbsFilter->GetOutput()));
+ outputPtr->SetNthElement(counter, static_cast<OutputImageType *>(m_AbsFilter->GetOutput()));
outputListIt.Get()->DisconnectPipeline();
- lastImage=inputListIt.Get();
+ lastImage = inputListIt.Get();
++inputListIt;
++outputListIt;
++counter;
- }
+ }
}
/**
* PrintSelf Method
*/
template <class TInputImageList, class TOutputImageList>
void
-ProfileToProfileDerivativeFilter<TInputImageList,TOutputImageList>
+ProfileToProfileDerivativeFilter<TInputImageList, TOutputImageList>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/MultiScale/otbSubsampleImageFilter.h b/Code/MultiScale/otbSubsampleImageFilter.h
index 79aa3f2d1d..1448a2ca9d 100644
--- a/Code/MultiScale/otbSubsampleImageFilter.h
+++ b/Code/MultiScale/otbSubsampleImageFilter.h
@@ -45,17 +45,17 @@ namespace otb {
* \sa SubsampleImageRegionConstIterator
* \sa DecimateImageFilter
*/
-template < class TInputImage, class TOutputImage,
- Wavelet::WaveletDirection TDirectionOfTransformation >
+template <class TInputImage, class TOutputImage,
+ Wavelet::WaveletDirection TDirectionOfTransformation>
class ITK_EXPORT SubsampleImageFilter :
- public itk::ImageToImageFilter< TInputImage, TOutputImage >
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef SubsampleImageFilter Self;
- typedef itk::ImageToImageFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SubsampleImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -71,49 +71,49 @@ public:
/** Direction definition */
typedef Wavelet::WaveletDirection DirectionOfTransformationEnumType;
- itkStaticConstMacro(DirectionOfTransformation,DirectionOfTransformationEnumType,TDirectionOfTransformation);
+ itkStaticConstMacro(DirectionOfTransformation, DirectionOfTransformationEnumType, TDirectionOfTransformation);
/** Image typedef support. */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::IndexType InputImageIndexType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::IndexType InputImageIndexType;
typedef typename InputImageIndexType::IndexValueType InputImageIndexValueType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::SizeType OutputImageSizeType;
- typedef typename OutputImageType::IndexType OutputImageIndexType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::SizeType OutputImageSizeType;
+ typedef typename OutputImageType::IndexType OutputImageIndexType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
/** Set/Get the SubsampleFactor */
- itkGetMacro(SubsampleFactor,const InputImageIndexType &);
- itkSetMacro(SubsampleFactor,InputImageIndexType &);
- void SetSubSampleFactor( InputImageIndexValueType factor )
+ itkGetMacro(SubsampleFactor, const InputImageIndexType &);
+ itkSetMacro(SubsampleFactor, InputImageIndexType &);
+ void SetSubSampleFactor(InputImageIndexValueType factor)
{
InputImageIndexType indexFactor;
- indexFactor.Fill( factor );
- SetSubSampleFactor( indexFactor );
+ indexFactor.Fill(factor);
+ SetSubSampleFactor(indexFactor);
}
protected:
SubsampleImageFilter ()
- {
- m_SubsampleFactor.Fill( 1 );
+ {
+ m_SubsampleFactor.Fill(1);
//this->SetNumberOfThreads(1);
- }
+ }
virtual ~SubsampleImageFilter() {}
/** Internal test function to check if there is any direction to subsample */
- bool IsSubsampleFactorOne () const;
+ bool IsSubsampleFactorOne() const;
/** Since input and output image are very likely to be of different size.
* Region estimation functions has to be reimplemented
*/
virtual void CallCopyOutputRegionToInputRegion
- ( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion );
+ (InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion);
virtual void CallCopyInputRegionToOutputRegion
- ( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion );
+ (OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion);
/** Output image region size is not of the same dimension as the input.
* That is why GenerateOutputInformation has to be redefined.
@@ -121,17 +121,17 @@ protected:
virtual void GenerateOutputInformation();
/** Set output image to 0 before processing */
- virtual void BeforeThreadedGenerateData ();
+ virtual void BeforeThreadedGenerateData();
/** Allows multithreading */
virtual void ThreadedGenerateData
- ( const OutputImageRegionType & outputRegionForThread, int threadId );
+ (const OutputImageRegionType& outputRegionForThread, int threadId);
- virtual void PrintSelf( std::ostream & os, itk::Indent indent ) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- SubsampleImageFilter ( const Self & ); // purposely not implemented
- void operator= ( const Self & ); // purposely not implemented
+ SubsampleImageFilter (const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
InputImageIndexType m_SubsampleFactor;
}; // end of class
@@ -142,7 +142,4 @@ private:
#include "otbSubsampleImageFilter.txx"
#endif
-
#endif
-
-
diff --git a/Code/MultiScale/otbSubsampleImageFilter.txx b/Code/MultiScale/otbSubsampleImageFilter.txx
index 50b4f0ba48..fa4343229c 100644
--- a/Code/MultiScale/otbSubsampleImageFilter.txx
+++ b/Code/MultiScale/otbSubsampleImageFilter.txx
@@ -29,191 +29,186 @@
#include "itkImageRegionIterator.h"
#include "itkProgressReporter.h"
-
namespace otb {
-template < class TInputImage, class TOutputImage,
- Wavelet::WaveletDirection TDirectionOfTransformation >
+template <class TInputImage, class TOutputImage,
+ Wavelet::WaveletDirection TDirectionOfTransformation>
void
-SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
-::PrintSelf( std::ostream & os, itk::Indent indent ) const
+SubsampleImageFilter<TInputImage, TOutputImage, TDirectionOfTransformation>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
+ Superclass::PrintSelf(os, indent);
os << indent << "SubsampleFactor = [" << m_SubsampleFactor[0];
- for ( unsigned int i = 1; i < InputImageDimension; i++ )
- {
+ for (unsigned int i = 1; i < InputImageDimension; i++)
+ {
os << ", " << m_SubsampleFactor[i];
- }
+ }
os << "]\n";
}
-template < class TInputImage, class TOutputImage,
- Wavelet::WaveletDirection TDirectionOfTransformation >
+template <class TInputImage, class TOutputImage,
+ Wavelet::WaveletDirection TDirectionOfTransformation>
bool
-SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
-::IsSubsampleFactorOne () const
+SubsampleImageFilter<TInputImage, TOutputImage, TDirectionOfTransformation>
+::IsSubsampleFactorOne() const
{
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
- {
- if ( m_SubsampleFactor[i] != 1 )
- return false;
- }
+ for (unsigned int i = 0; i < InputImageDimension; i++)
+ {
+ if (m_SubsampleFactor[i] != 1) return false;
+ }
return true;
}
-template < class TInputImage, class TOutputImage,
- Wavelet::WaveletDirection TDirectionOfTransformation >
+template <class TInputImage, class TOutputImage,
+ Wavelet::WaveletDirection TDirectionOfTransformation>
void
-SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
+SubsampleImageFilter<TInputImage, TOutputImage, TDirectionOfTransformation>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
- if ( !IsSubsampleFactorOne() )
- {
+ if (!IsSubsampleFactorOne())
+ {
OutputImageRegionType newRegion;
- this->CallCopyInputRegionToOutputRegion( newRegion, this->GetInput()->GetLargestPossibleRegion() );
- this->GetOutput()->SetRegions( newRegion );
- }
+ this->CallCopyInputRegionToOutputRegion(newRegion, this->GetInput()->GetLargestPossibleRegion());
+ this->GetOutput()->SetRegions(newRegion);
+ }
}
template <class TInputImage, class TOutputImage,
- Wavelet::WaveletDirection TDirectionOfTransformation >
+ Wavelet::WaveletDirection TDirectionOfTransformation>
void
-SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
+SubsampleImageFilter<TInputImage, TOutputImage, TDirectionOfTransformation>
::CallCopyOutputRegionToInputRegion
-( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion )
+ (InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion)
{
- Superclass::CallCopyOutputRegionToInputRegion( destRegion, srcRegion );
+ Superclass::CallCopyOutputRegionToInputRegion(destRegion, srcRegion);
- if ( static_cast<int>( DirectionOfTransformation ) == Wavelet::INVERSE )
- {
+ if (static_cast<int>(DirectionOfTransformation) == Wavelet::INVERSE)
+ {
typename OutputImageRegionType::IndexType srcIndex = srcRegion.GetIndex();
- typename OutputImageRegionType::SizeType srcSize = srcRegion.GetSize();
+ typename OutputImageRegionType::SizeType srcSize = srcRegion.GetSize();
typename InputImageRegionType::IndexType destIndex;
- typename InputImageRegionType::SizeType destSize;
+ typename InputImageRegionType::SizeType destSize;
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
- {
+ for (unsigned int i = 0; i < InputImageDimension; i++)
+ {
// TODO: This seems not right in odd index cases
destIndex[i] = srcIndex[i] / m_SubsampleFactor[i];
destSize[i] = srcSize[i] / m_SubsampleFactor[i];
- }
+ }
- destRegion.SetIndex( destIndex );
- destRegion.SetSize( destSize );
- }
+ destRegion.SetIndex(destIndex);
+ destRegion.SetSize(destSize);
+ }
}
template <class TInputImage, class TOutputImage,
- Wavelet::WaveletDirection TDirectionOfTransformation >
+ Wavelet::WaveletDirection TDirectionOfTransformation>
void
-SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
+SubsampleImageFilter<TInputImage, TOutputImage, TDirectionOfTransformation>
::CallCopyInputRegionToOutputRegion
-( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
+ (OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion)
{
- Superclass::CallCopyInputRegionToOutputRegion( destRegion, srcRegion );
+ Superclass::CallCopyInputRegionToOutputRegion(destRegion, srcRegion);
- if ( static_cast<int>( DirectionOfTransformation ) == Wavelet::INVERSE )
- {
+ if (static_cast<int>(DirectionOfTransformation) == Wavelet::INVERSE)
+ {
typename InputImageRegionType::IndexType srcIndex = srcRegion.GetIndex();
- typename InputImageRegionType::SizeType srcSize = srcRegion.GetSize();
+ typename InputImageRegionType::SizeType srcSize = srcRegion.GetSize();
typename OutputImageRegionType::IndexType destIndex;
- typename OutputImageRegionType::SizeType destSize;
+ typename OutputImageRegionType::SizeType destSize;
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
- {
+ for (unsigned int i = 0; i < InputImageDimension; i++)
+ {
destIndex[i] = srcIndex[i] * m_SubsampleFactor[i];
destSize[i] = srcSize[i] * m_SubsampleFactor[i];
- }
+ }
- destRegion.SetIndex( destIndex );
- destRegion.SetSize( destSize );
- }
+ destRegion.SetIndex(destIndex);
+ destRegion.SetSize(destSize);
+ }
}
template <class TInputImage, class TOutputImage,
- Wavelet::WaveletDirection TDirectionOfTransformation >
+ Wavelet::WaveletDirection TDirectionOfTransformation>
void
-SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
-::BeforeThreadedGenerateData ()
+SubsampleImageFilter<TInputImage, TOutputImage, TDirectionOfTransformation>
+::BeforeThreadedGenerateData()
{
OutputImagePointerType output = this->GetOutput();
output->FillBuffer(0);
}
template <class TInputImage, class TOutputImage,
- Wavelet::WaveletDirection TDirectionOfTransformation >
+ Wavelet::WaveletDirection TDirectionOfTransformation>
void
-SubsampleImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
+SubsampleImageFilter<TInputImage, TOutputImage, TDirectionOfTransformation>
::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
int threadId)
{
OutputImagePointerType output = this->GetOutput();
- SubsampledImageRegionIterator< OutputImageType > outputIter
- ( this->GetOutput(), outputRegionForThread );
+ SubsampledImageRegionIterator<OutputImageType> outputIter
+ (this->GetOutput(), outputRegionForThread);
outputIter.SetSubsampleFactor(1);
outputIter.GoToBegin();
InputImageRegionType inputRegionForThread;
- this->CallCopyOutputRegionToInputRegion( inputRegionForThread, outputRegionForThread );
+ this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
- SubsampledImageRegionConstIterator< InputImageType > inputIter
- ( this->GetInput(), inputRegionForThread );
+ SubsampledImageRegionConstIterator<InputImageType> inputIter
+ (this->GetInput(), inputRegionForThread);
- switch ( DirectionOfTransformation )
- {
- case Wavelet::FORWARD:
+ switch (DirectionOfTransformation)
+ {
+ case Wavelet::FORWARD:
{
- inputIter.SetSubsampleFactor( GetSubsampleFactor() );
- inputIter.GoToBegin();
+ inputIter.SetSubsampleFactor(GetSubsampleFactor());
+ inputIter.GoToBegin();
- while ( !inputIter.IsAtEnd() )
+ while (!inputIter.IsAtEnd())
{
- outputIter.SetOffset(
- static_cast< typename SubsampledImageRegionIterator< OutputImageType >::OffsetType >
- ( inputIter.GetOffset() ) );
- outputIter.Set( static_cast< OutputPixelType >( inputIter.Get() ) );
- ++inputIter;
+ outputIter.SetOffset(
+ static_cast<typename SubsampledImageRegionIterator<OutputImageType>::OffsetType>
+ (inputIter.GetOffset()));
+ outputIter.Set(static_cast<OutputPixelType>(inputIter.Get()));
+ ++inputIter;
}
- break;
+ break;
}
- case Wavelet::INVERSE:
+ case Wavelet::INVERSE:
{
- inputIter.SetSubsampleFactor( 1 );
- inputIter.GoToBegin();
+ inputIter.SetSubsampleFactor(1);
+ inputIter.GoToBegin();
- while ( !inputIter.IsAtEnd() )
+ while (!inputIter.IsAtEnd())
{
- InputImageIndexType inputIndex = inputIter.GetIndex();
- OutputImageIndexType outputIndex;
- for ( unsigned int i = 0; i < OutputImageDimension; i++ )
+ InputImageIndexType inputIndex = inputIter.GetIndex();
+ OutputImageIndexType outputIndex;
+ for (unsigned int i = 0; i < OutputImageDimension; i++)
{
- outputIndex[i] = inputIndex[i] * m_SubsampleFactor[i];
+ outputIndex[i] = inputIndex[i] * m_SubsampleFactor[i];
}
- outputIter.SetIndex( outputIndex );
- outputIter.Set( static_cast< OutputPixelType >( inputIter.Get() ) );
- ++inputIter;
+ outputIter.SetIndex(outputIndex);
+ outputIter.Set(static_cast<OutputPixelType>(inputIter.Get()));
+ ++inputIter;
}
- break;
+ break;
}
- default:
+ default:
{
- itkExceptionMacro(<<"otb::SubsampleImageFilter have to be Wavelet::FORWARD or Wavelet::INVERSE only!!");
- break;
+ itkExceptionMacro(<< "otb::SubsampleImageFilter have to be Wavelet::FORWARD or Wavelet::INVERSE only!!");
+ break;
+ }
}
- }
}
-
} // end of namespace otb
#endif
-
-
diff --git a/Code/MultiScale/otbWaveletFilterBank.h b/Code/MultiScale/otbWaveletFilterBank.h
index 403ecb39a6..67dfa5bfd0 100644
--- a/Code/MultiScale/otbWaveletFilterBank.h
+++ b/Code/MultiScale/otbWaveletFilterBank.h
@@ -76,34 +76,34 @@ namespace otb {
*
* \ingroup Streamed
*/
-template < class TInputImage, class TOutputImage,
- class TWaveletOperator,
- Wavelet::WaveletDirection TDirectionOfTransformation >
+template <class TInputImage, class TOutputImage,
+ class TWaveletOperator,
+ Wavelet::WaveletDirection TDirectionOfTransformation>
class ITK_EXPORT WaveletFilterBank
- : public itk::ImageToImageFilter< TInputImage, TOutputImage >
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef WaveletFilterBank Self;
- typedef itk::ImageToImageFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef WaveletFilterBank Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(WaveletFilterBank,ImageToImageFilter);
+ itkTypeMacro(WaveletFilterBank, ImageToImageFilter);
protected:
WaveletFilterBank();
virtual ~WaveletFilterBank();
private:
- WaveletFilterBank( const Self & );
- void operator=( const Self & );
+ WaveletFilterBank(const Self &);
+ void operator =(const Self&);
}; // end of class
-
+
/** \class WaveletFilterBank
* \brief Template specialization of FilterBank for forward transformaiton
*
@@ -145,30 +145,30 @@ private:
*
* \sa WaveletOperator
*/
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
-class ITK_EXPORT WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD >
- : public itk::ImageToImageFilter< TInputImage, TOutputImage >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
+class ITK_EXPORT WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef WaveletFilterBank Self;
- typedef itk::ImageToImageFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef WaveletFilterBank Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(WaveletFilterBank,ImageToImageFilter);
+ itkTypeMacro(WaveletFilterBank, ImageToImageFilter);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::SizeType InputSizeType;
- typedef typename InputImageType::IndexType InputIndexType;
- typedef typename InputImageType::PixelType InputPixelType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::SizeType InputSizeType;
+ typedef typename InputImageType::IndexType InputIndexType;
+ typedef typename InputImageType::PixelType InputPixelType;
typedef TOutputImage OutputImageType;
typedef typename OutputImageType::Pointer OutputImagePointerType;
@@ -182,7 +182,7 @@ public:
typedef typename WaveletOperatorType::HighPassOperator HighPassOperatorType;
typedef Wavelet::WaveletDirection DirectionOfTransformationEnumType;
- itkStaticConstMacro(DirectionOfTransformation,DirectionOfTransformationEnumType,Wavelet::FORWARD);
+ itkStaticConstMacro(DirectionOfTransformation, DirectionOfTransformationEnumType, Wavelet::FORWARD);
/** Dimension */
itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
@@ -191,8 +191,8 @@ public:
/**
* Set/Get the level of up sampling of the filter used in the A-trou algorithm.
*/
- itkGetMacro(UpSampleFilterFactor,unsigned int);
- itkSetMacro(UpSampleFilterFactor,unsigned int);
+ itkGetMacro(UpSampleFilterFactor, unsigned int);
+ itkSetMacro(UpSampleFilterFactor, unsigned int);
/**
* Set/Get the level of down sampling of the image used in forward algorithm.
@@ -201,8 +201,8 @@ public:
* In this implementation, we are not dealing with M-band decomposition then m_SubsampleImageFactor
* is most likely to be 1 or 2... but in any case integer and not real...
*/
- itkGetMacro(SubsampleImageFactor,unsigned int);
- itkSetMacro(SubsampleImageFactor,unsigned int);
+ itkGetMacro(SubsampleImageFactor, unsigned int);
+ itkSetMacro(SubsampleImageFactor, unsigned int);
protected:
WaveletFilterBank();
@@ -223,23 +223,24 @@ protected:
* pipeline execution model.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
- virtual void GenerateInputRequestedRegion() throw ( itk::InvalidRequestedRegionError );
+ virtual void GenerateInputRequestedRegion()
+ throw (itk::InvalidRequestedRegionError);
/** BeforeThreadedGenerateData.
* It allocates also internal images
*/
- virtual void BeforeThreadedGenerateData ();
+ virtual void BeforeThreadedGenerateData();
/** Internal Data Allocation
* If m_SubsampleImageFactor != 1, internal data with progressive region size
* subsampling if required...
*/
- virtual void AllocateInternalData ( const OutputImageRegionType& outputRegion );
+ virtual void AllocateInternalData(const OutputImageRegionType& outputRegion);
/** AfterThreadedGenerateData.
* It enforce memory destruction of internal images
*/
- virtual void AfterThreadedGenerateData ();
+ virtual void AfterThreadedGenerateData();
/** CallCopyOutputRegionToInputRegion
* Since input and output image may be of different size when a
@@ -247,30 +248,32 @@ protected:
* functions has to be reimplemented
*/
virtual void CallCopyOutputRegionToInputRegion
- ( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion );
+ (InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion);
virtual void CallCopyInputRegionToOutputRegion
- ( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion );
+ (OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion);
/** CallCopyOutputRegionToInputRegion
* This function is also redefined in order to adapt the shape of the regions with
* resect to the direction (among the dimensions) of the filtering.
*/
- virtual void CallCopyOutputRegionToInputRegion ( unsigned int direction,
- InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion );
- virtual void CallCopyInputRegionToOutputRegion ( unsigned int direction,
- OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion );
+ virtual void CallCopyOutputRegionToInputRegion(unsigned int direction,
+ InputImageRegionType& destRegion,
+ const OutputImageRegionType& srcRegion);
+ virtual void CallCopyInputRegionToOutputRegion(unsigned int direction,
+ OutputImageRegionType& destRegion,
+ const InputImageRegionType& srcRegion);
/** Generate data redefinition */
- virtual void ThreadedGenerateData ( const OutputImageRegionType& outputRegionForThread, int threadId );
+ virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
/** Iterative call to the forward filter bank at each dimension. */
- virtual void ThreadedGenerateDataAtDimensionN ( unsigned int idx, unsigned int direction,
- itk::ProgressReporter & reporter,
- const OutputImageRegionType& outputRegionForThread, int threadId );
+ virtual void ThreadedGenerateDataAtDimensionN(unsigned int idx, unsigned int direction,
+ itk::ProgressReporter& reporter,
+ const OutputImageRegionType& outputRegionForThread, int threadId);
private:
- WaveletFilterBank( const Self & );
- void operator=( const Self & );
+ WaveletFilterBank(const Self &);
+ void operator =(const Self&);
unsigned int m_UpSampleFilterFactor;
unsigned int m_SubsampleImageFactor;
@@ -280,10 +283,9 @@ private:
* size ImageDimension-1 and each InternalImagesTabular contains intermediate
* images.
*/
- typedef std::vector< OutputImagePointerType > InternalImagesTabular;
- std::vector< InternalImagesTabular > m_InternalImages;
+ typedef std::vector<OutputImagePointerType> InternalImagesTabular;
+ std::vector<InternalImagesTabular> m_InternalImages;
}; // end of class
-
/** \class WaveletFilterBank
* \brief Template specialization of FilterBank for inverse transformation
@@ -326,30 +328,30 @@ private:
*
* \sa WaveletOperator
*/
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
-class ITK_EXPORT WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE >
- : public itk::ImageToImageFilter< TInputImage, TOutputImage >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
+class ITK_EXPORT WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
+ : public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef WaveletFilterBank Self;
- typedef itk::ImageToImageFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef WaveletFilterBank Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(WaveletFilterBank,ImageToImageFilter);
+ itkTypeMacro(WaveletFilterBank, ImageToImageFilter);
/** Template parameters typedefs */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::SizeType InputSizeType;
- typedef typename InputImageType::IndexType InputIndexType;
- typedef typename InputImageType::PixelType InputPixelType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::SizeType InputSizeType;
+ typedef typename InputImageType::IndexType InputIndexType;
+ typedef typename InputImageType::PixelType InputPixelType;
typedef TOutputImage OutputImageType;
typedef typename OutputImageType::Pointer OutputImagePointerType;
@@ -363,7 +365,7 @@ public:
typedef typename WaveletOperatorType::HighPassOperator HighPassOperatorType;
typedef Wavelet::WaveletDirection DirectionOfTransformationEnumType;
- itkStaticConstMacro(DirectionOfTransformation,DirectionOfTransformationEnumType,Wavelet::INVERSE);
+ itkStaticConstMacro(DirectionOfTransformation, DirectionOfTransformationEnumType, Wavelet::INVERSE);
/** Dimension */
itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
@@ -372,8 +374,8 @@ public:
/**
* Set/Get the level of up sampling of the filter used in the A-trou algorithm.
*/
- itkGetMacro(UpSampleFilterFactor,unsigned int);
- itkSetMacro(UpSampleFilterFactor,unsigned int);
+ itkGetMacro(UpSampleFilterFactor, unsigned int);
+ itkSetMacro(UpSampleFilterFactor, unsigned int);
/**
* Set/Get the level of down sampling of the image used in forward algorithm.
@@ -382,9 +384,8 @@ public:
* In this implementation, we are dealing with M-band decomposition then m_SubsampleImageFactor
* is most likely to be 1 or 2... but in any case integer and not real...
*/
- itkGetMacro(SubsampleImageFactor,unsigned int);
- itkSetMacro(SubsampleImageFactor,unsigned int);
-
+ itkGetMacro(SubsampleImageFactor, unsigned int);
+ itkSetMacro(SubsampleImageFactor, unsigned int);
protected:
WaveletFilterBank();
@@ -405,24 +406,24 @@ protected:
* pipeline execution model.
*
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */
- virtual void GenerateInputRequestedRegion() throw ( itk::InvalidRequestedRegionError );
-
+ virtual void GenerateInputRequestedRegion()
+ throw (itk::InvalidRequestedRegionError);
/** BeforeThreadedGenerateData
* If SubsampleImageFactor neq 1, it is necessary to up sample input images in the Wavelet::INVERSE mode
*/
- virtual void BeforeThreadedGenerateData ();
+ virtual void BeforeThreadedGenerateData();
/** Internal Data Allocation
* If m_SubsampleImageFactor != 1, internal data with progressive region size
* subsampling if required...
*/
- virtual void AllocateInternalData ( const OutputImageRegionType& outputRegion );
+ virtual void AllocateInternalData(const OutputImageRegionType& outputRegion);
/** AfterThreadedGenerateData.
* It enforce memory destruction of internal images
*/
- virtual void AfterThreadedGenerateData ();
+ virtual void AfterThreadedGenerateData();
/** CallCopyOutputRegionToInputRegion
* Since input and output image may be of different size when a
@@ -430,33 +431,35 @@ protected:
* functions has to be reimplemented
*/
virtual void CallCopyOutputRegionToInputRegion
- ( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion );
+ (InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion);
virtual void CallCopyInputRegionToOutputRegion
- ( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion );
+ (OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion);
/** CallCopyOutputRegionToInputRegion
* This function is also redefined in order to adapt the shape of the regions with
* resect to the direction (among the dimensions) of the filtering.
*/
- virtual void CallCopyOutputRegionToInputRegion ( unsigned int direction,
- InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion );
- virtual void CallCopyInputRegionToOutputRegion ( unsigned int direction,
- OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion );
+ virtual void CallCopyOutputRegionToInputRegion(unsigned int direction,
+ InputImageRegionType& destRegion,
+ const OutputImageRegionType& srcRegion);
+ virtual void CallCopyInputRegionToOutputRegion(unsigned int direction,
+ OutputImageRegionType& destRegion,
+ const InputImageRegionType& srcRegion);
/** Generate data redefinition */
- virtual void ThreadedGenerateData ( const OutputImageRegionType& outputRegionForThread, int threadId );
+ virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
/**
* Iterative call to the forward filter bank at each dimension.
* Used for the multiresolution case only.
*/
- virtual void ThreadedGenerateDataAtDimensionN ( unsigned int direction,
- itk::ProgressReporter & reporter,
- const OutputImageRegionType& outputRegionForThread, int threadId );
+ virtual void ThreadedGenerateDataAtDimensionN(unsigned int direction,
+ itk::ProgressReporter& reporter,
+ const OutputImageRegionType& outputRegionForThread, int threadId);
private:
- WaveletFilterBank( const Self & );
- void operator=( const Self & );
+ WaveletFilterBank(const Self &);
+ void operator =(const Self&);
unsigned int m_UpSampleFilterFactor;
unsigned int m_SubsampleImageFactor;
@@ -466,11 +469,11 @@ private:
* size ImageDimension-1 and each InternalImagesTabular contains intermediate
* images. Internal images are used for multiresolution case only.
*/
- typedef std::vector< OutputImagePointerType > InternalImagesTabular;
- std::vector< InternalImagesTabular > m_InternalImages;
+ typedef std::vector<OutputImagePointerType> InternalImagesTabular;
+ std::vector<InternalImagesTabular> m_InternalImages;
}; // end of class
-
+
} // end of namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/MultiScale/otbWaveletFilterBank.txx b/Code/MultiScale/otbWaveletFilterBank.txx
index 29337b6f62..c686cabfcb 100644
--- a/Code/MultiScale/otbWaveletFilterBank.txx
+++ b/Code/MultiScale/otbWaveletFilterBank.txx
@@ -41,20 +41,20 @@ namespace otb {
* Template Specialization for the Wavelet::FORWARD case
*/
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
::WaveletFilterBank ()
{
this->SetNumberOfRequiredInputs(1);
this->SetNumberOfInputs(1);
- unsigned int numOfOutputs = 1<<InputImageDimension;
+ unsigned int numOfOutputs = 1 << InputImageDimension;
- this->SetNumberOfOutputs( numOfOutputs );
- for ( unsigned int i = 0; i < numOfOutputs; i++ )
- {
- this->SetNthOutput(i,OutputImageType::New());
- }
+ this->SetNumberOfOutputs(numOfOutputs);
+ for (unsigned int i = 0; i < numOfOutputs; i++)
+ {
+ this->SetNthOutput(i, OutputImageType::New());
+ }
m_UpSampleFilterFactor = 0;
m_SubsampleImageFactor = 1;
@@ -62,182 +62,179 @@ WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD
//this->SetNumberOfThreads(1);
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD >
-::GenerateOutputInformation ()
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
+::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
- if ( GetSubsampleImageFactor() == 1 )
- return;
-
+ if (GetSubsampleImageFactor() == 1) return;
#if __myDebug__
- otbGenericMsgDebugMacro( << " down sampling output regions by a factor of " << GetSubsampleImageFactor() );
- otbGenericMsgDebugMacro( << "initial region " << this->GetInput()->GetLargestPossibleRegion().GetSize()[0]
- << "," << this->GetInput()->GetLargestPossibleRegion().GetSize()[1] );
+ otbGenericMsgDebugMacro(<< " down sampling output regions by a factor of " << GetSubsampleImageFactor());
+ otbGenericMsgDebugMacro(<< "initial region " << this->GetInput()->GetLargestPossibleRegion().GetSize()[0]
+ << "," << this->GetInput()->GetLargestPossibleRegion().GetSize()[1]);
#endif
OutputImageRegionType newRegion;
- this->CallCopyInputRegionToOutputRegion( newRegion, this->GetInput()->GetLargestPossibleRegion() );
+ this->CallCopyInputRegionToOutputRegion(newRegion, this->GetInput()->GetLargestPossibleRegion());
- for ( unsigned int i = 0; i < this->GetNumberOfOutputs(); i++ )
- {
- this->GetOutput(i)->SetRegions( newRegion );
- }
+ for (unsigned int i = 0; i < this->GetNumberOfOutputs(); i++)
+ {
+ this->GetOutput(i)->SetRegions(newRegion);
+ }
#if __myDebug__
- otbGenericMsgDebugMacro( << "new region output " << newRegion.GetSize()[0] << "," << newRegion.GetSize()[1] );
+ otbGenericMsgDebugMacro(<< "new region output " << newRegion.GetSize()[0] << "," << newRegion.GetSize()[1]);
#endif
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD >
-::GenerateInputRequestedRegion ()
- throw ( itk::InvalidRequestedRegionError )
-{
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
+::GenerateInputRequestedRegion()
+throw (itk::InvalidRequestedRegionError)
+ {
Superclass::GenerateInputRequestedRegion();
// Filter length calculation
LowPassOperatorType lowPassOperator;
lowPassOperator.SetDirection(0);
- lowPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ lowPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
lowPassOperator.CreateDirectional();
unsigned int radius = lowPassOperator.GetRadius()[0];
HighPassOperatorType highPassOperator;
highPassOperator.SetDirection(0);
- highPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ highPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
highPassOperator.CreateDirectional();
- if ( radius < highPassOperator.GetRadius()[0] )
- radius = highPassOperator.GetRadius()[0];
+ if (radius < highPassOperator.GetRadius()[0]) radius = highPassOperator.GetRadius()[0];
// Get the requested regionand pad it
- InputImagePointerType input = const_cast< InputImageType* >( this->GetInput() );
- InputImageRegionType inputRegion = input->GetRequestedRegion();
- inputRegion.PadByRadius( radius );
+ InputImagePointerType input = const_cast<InputImageType*>(this->GetInput());
+ InputImageRegionType inputRegion = input->GetRequestedRegion();
+ inputRegion.PadByRadius(radius);
- if ( inputRegion.Crop( input->GetLargestPossibleRegion() ) )
- {
- input->SetRequestedRegion( inputRegion );
- }
+ if (inputRegion.Crop(input->GetLargestPossibleRegion()))
+ {
+ input->SetRequestedRegion(inputRegion);
+ }
else
- {
- input->SetRequestedRegion( inputRegion );
- itk::InvalidRequestedRegionError err ( __FILE__, __LINE__ );
+ {
+ input->SetRequestedRegion(inputRegion);
+ itk::InvalidRequestedRegionError err(__FILE__, __LINE__);
err.SetLocation(ITK_LOCATION);
err.SetDescription("Requested region is (at least partially) outside the largest possible region.");
- err.SetDataObject( input );
+ err.SetDataObject(input);
throw err;
+ }
}
-}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD >
-::BeforeThreadedGenerateData ()
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
+::BeforeThreadedGenerateData()
{
- if ( m_SubsampleImageFactor > 1 )
- {
- // Check the dimension
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
+ if (m_SubsampleImageFactor > 1)
{
- if ( ( m_SubsampleImageFactor
- * ( this->GetInput()->GetRequestedRegion().GetSize()[i] / m_SubsampleImageFactor ) )
- != this->GetInput()->GetRequestedRegion().GetSize()[i] )
+ // Check the dimension
+ for (unsigned int i = 0; i < InputImageDimension; i++)
{
- itk::InvalidRequestedRegionError err ( __FILE__, __LINE__ );
+ if ((m_SubsampleImageFactor
+ * (this->GetInput()->GetRequestedRegion().GetSize()[i] / m_SubsampleImageFactor))
+ != this->GetInput()->GetRequestedRegion().GetSize()[i])
+ {
+ itk::InvalidRequestedRegionError err(__FILE__, __LINE__);
err.SetLocation(ITK_LOCATION);
err.SetDescription("Requested region dimension cannot be used in multiresolution analysis (crop it).");
- err.SetDataObject( const_cast< InputImageType* >( this->GetInput() ) );
+ err.SetDataObject(const_cast<InputImageType*>(this->GetInput()));
throw err;
+ }
}
- }
- if ( InputImageDimension > 1 )
- {
- // Internal images will be used only if m_SubsampledInputImages != 1
- m_InternalImages.resize( InputImageDimension-1 );
- for ( unsigned int i = 0; i < m_InternalImages.size(); i++ )
+ if (InputImageDimension > 1)
{
+ // Internal images will be used only if m_SubsampledInputImages != 1
+ m_InternalImages.resize(InputImageDimension - 1);
+ for (unsigned int i = 0; i < m_InternalImages.size(); i++)
+ {
// the size is linked to the SubsampleImageFactor that is assume to be 2!!!
- m_InternalImages[InputImageDimension-2-i].resize( 1<<(i+1) );
- }
+ m_InternalImages[InputImageDimension - 2 - i].resize(1 << (i + 1));
+ }
OutputImageRegionType intermediateRegion;
- this->Superclass::CallCopyInputRegionToOutputRegion( intermediateRegion,
- this->GetInput()->GetLargestPossibleRegion() );
+ this->Superclass::CallCopyInputRegionToOutputRegion(intermediateRegion,
+ this->GetInput()->GetLargestPossibleRegion());
- AllocateInternalData( intermediateRegion );
+ AllocateInternalData(intermediateRegion);
+ }
}
- }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
::AllocateInternalData
-( const OutputImageRegionType& outputRegion )
+ (const OutputImageRegionType& outputRegion)
{
OutputImageRegionType smallerRegion;
OutputImageRegionType largerRegion = outputRegion;
- for ( unsigned int direction = 0; direction < InputImageDimension-1; direction++ )
- {
- this->CallCopyInputRegionToOutputRegion( InputImageDimension-1-direction,
- smallerRegion, largerRegion );
-
- for ( unsigned int i = 0; i < m_InternalImages[direction].size(); i++ )
+ for (unsigned int direction = 0; direction < InputImageDimension - 1; direction++)
{
- m_InternalImages[InputImageDimension-2-direction][i] = OutputImageType::New();
- m_InternalImages[InputImageDimension-2-direction][i]->SetRegions( smallerRegion );
- m_InternalImages[InputImageDimension-2-direction][i]->Allocate();
- m_InternalImages[InputImageDimension-2-direction][i]->FillBuffer(0);
- }
+ this->CallCopyInputRegionToOutputRegion(InputImageDimension - 1 - direction,
+ smallerRegion, largerRegion);
+
+ for (unsigned int i = 0; i < m_InternalImages[direction].size(); i++)
+ {
+ m_InternalImages[InputImageDimension - 2 - direction][i] = OutputImageType::New();
+ m_InternalImages[InputImageDimension - 2 - direction][i]->SetRegions(smallerRegion);
+ m_InternalImages[InputImageDimension - 2 - direction][i]->Allocate();
+ m_InternalImages[InputImageDimension - 2 - direction][i]->FillBuffer(0);
+ }
largerRegion = smallerRegion;
- }
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD >
-::AfterThreadedGenerateData ()
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
+::AfterThreadedGenerateData()
{
- if ( m_SubsampleImageFactor > 1 && InputImageDimension > 1 )
- {
+ if (m_SubsampleImageFactor > 1 && InputImageDimension > 1)
+ {
m_InternalImages.clear();
- }
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
::CallCopyOutputRegionToInputRegion
-( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion )
+ (InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion)
{
- Superclass::CallCopyOutputRegionToInputRegion( destRegion, srcRegion );
+ Superclass::CallCopyOutputRegionToInputRegion(destRegion, srcRegion);
- if ( GetSubsampleImageFactor() > 1 )
- {
+ if (GetSubsampleImageFactor() > 1)
+ {
OutputIndexType srcIndex = srcRegion.GetIndex();
- OutputSizeType srcSize = srcRegion.GetSize();
+ OutputSizeType srcSize = srcRegion.GetSize();
InputIndexType destIndex;
- InputSizeType destSize;
+ InputSizeType destSize;
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
- {
+ for (unsigned int i = 0; i < InputImageDimension; i++)
+ {
destIndex[i] = srcIndex[i] * GetSubsampleImageFactor();
destSize[i] = srcSize[i] * GetSubsampleImageFactor();
- }
+ }
- destRegion.SetIndex( destIndex );
- destRegion.SetSize( destSize );
+ destRegion.SetIndex(destIndex);
+ destRegion.SetSize(destSize);
#if 0
// Contrairement a Wavelet::INVERSE, ici ca ne sera a rien apparemment...
@@ -245,179 +242,178 @@ WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD
// Region Padding
LowPassOperatorType lowPassOperator;
lowPassOperator.SetDirection(0);
- lowPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ lowPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
lowPassOperator.CreateDirectional();
- unsigned long radius [ InputImageDimension ];
+ unsigned long radius[InputImageDimension];
radius[0] = lowPassOperator.GetRadius()[0];
HighPassOperatorType highPassOperator;
highPassOperator.SetDirection(0);
- highPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ highPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
highPassOperator.CreateDirectional();
- if ( radius[0] < highPassOperator.GetRadius()[0] )
- radius[0] = highPassOperator.GetRadius()[0];
+ if (radius[0] < highPassOperator.GetRadius()[0]) radius[0] = highPassOperator.GetRadius()[0];
- for ( unsigned int i = 1; i < InputImageDimension; i++ )
+ for (unsigned int i = 1; i < InputImageDimension; i++)
radius[i] = 0;
InputImageRegionType paddedRegion = destRegion;
- paddedRegion.PadByRadius( radius );
+ paddedRegion.PadByRadius(radius);
- if ( paddedRegion.Crop( this->GetInput()->GetLargestPossibleRegion() ) )
- {
+ if (paddedRegion.Crop(this->GetInput()->GetLargestPossibleRegion()))
+ {
destRegion = paddedRegion;
- }
+ }
#endif
- }
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
::CallCopyOutputRegionToInputRegion
-( unsigned int direction,
- InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion )
+ (unsigned int direction,
+ InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion)
{
- Superclass::CallCopyOutputRegionToInputRegion( destRegion, srcRegion );
+ Superclass::CallCopyOutputRegionToInputRegion(destRegion, srcRegion);
- if ( GetSubsampleImageFactor() > 1 )
- {
+ if (GetSubsampleImageFactor() > 1)
+ {
OutputIndexType srcIndex = srcRegion.GetIndex();
- OutputSizeType srcSize = srcRegion.GetSize();
+ OutputSizeType srcSize = srcRegion.GetSize();
InputIndexType destIndex;
- InputSizeType destSize;
+ InputSizeType destSize;
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
- {
- if ( i == direction )
+ for (unsigned int i = 0; i < InputImageDimension; i++)
{
+ if (i == direction)
+ {
destIndex[i] = srcIndex[i] * GetSubsampleImageFactor();
destSize[i] = srcSize[i] * GetSubsampleImageFactor();
- }
+ }
else
- {
+ {
destIndex[i] = srcIndex[i];
destSize[i] = srcSize[i];
+ }
}
- }
- destRegion.SetIndex( destIndex );
- destRegion.SetSize( destSize );
- }
+ destRegion.SetIndex(destIndex);
+ destRegion.SetSize(destSize);
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
::CallCopyInputRegionToOutputRegion
-( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
+ (OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion)
{
- Superclass::CallCopyInputRegionToOutputRegion( destRegion, srcRegion );
+ Superclass::CallCopyInputRegionToOutputRegion(destRegion, srcRegion);
- if ( GetSubsampleImageFactor() > 1 )
- {
+ if (GetSubsampleImageFactor() > 1)
+ {
typename InputImageRegionType::IndexType srcIndex = srcRegion.GetIndex();
- typename InputImageRegionType::SizeType srcSize = srcRegion.GetSize();
+ typename InputImageRegionType::SizeType srcSize = srcRegion.GetSize();
typename OutputImageRegionType::IndexType destIndex;
- typename OutputImageRegionType::SizeType destSize;
+ typename OutputImageRegionType::SizeType destSize;
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
- {
+ for (unsigned int i = 0; i < InputImageDimension; i++)
+ {
// TODO: This seems not right in odd index cases
destIndex[i] = srcIndex[i] / GetSubsampleImageFactor();
destSize[i] = srcSize[i] / GetSubsampleImageFactor();
- }
+ }
- destRegion.SetIndex( destIndex );
- destRegion.SetSize( destSize );
- }
+ destRegion.SetIndex(destIndex);
+ destRegion.SetSize(destSize);
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
::CallCopyInputRegionToOutputRegion
-( unsigned int direction,
- OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
+ (unsigned int direction,
+ OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion)
{
- Superclass::CallCopyInputRegionToOutputRegion( destRegion, srcRegion );
+ Superclass::CallCopyInputRegionToOutputRegion(destRegion, srcRegion);
- if ( GetSubsampleImageFactor() > 1 )
- {
+ if (GetSubsampleImageFactor() > 1)
+ {
typename InputImageRegionType::IndexType srcIndex = srcRegion.GetIndex();
- typename InputImageRegionType::SizeType srcSize = srcRegion.GetSize();
+ typename InputImageRegionType::SizeType srcSize = srcRegion.GetSize();
typename OutputImageRegionType::IndexType destIndex;
- typename OutputImageRegionType::SizeType destSize;
+ typename OutputImageRegionType::SizeType destSize;
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
- {
- if ( i == direction )
+ for (unsigned int i = 0; i < InputImageDimension; i++)
{
+ if (i == direction)
+ {
// TODO: This seems not right in odd index cases
destIndex[i] = srcIndex[i] / GetSubsampleImageFactor();
destSize[i] = srcSize[i] / GetSubsampleImageFactor();
- }
+ }
else
- {
+ {
destIndex[i] = srcIndex[i];
destSize[i] = srcSize[i];
+ }
}
- }
- destRegion.SetIndex( destIndex );
- destRegion.SetSize( destSize );
- }
+ destRegion.SetIndex(destIndex);
+ destRegion.SetSize(destSize);
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
::ThreadedGenerateData
-( const OutputImageRegionType& outputRegionForThread, int threadId )
+ (const OutputImageRegionType& outputRegionForThread, int threadId)
{
- unsigned int dir = InputImageDimension-1;
+ unsigned int dir = InputImageDimension - 1;
- if ( (1<<dir) >= static_cast<int>( this->GetNumberOfOutputs() ) )
- {
+ if ((1 << dir) >= static_cast<int>(this->GetNumberOfOutputs()))
+ {
itk::OStringStream msg;
- msg << "Output number 1<<" << dir << " = " << (1<<dir) << " not allocated\n";
+ msg << "Output number 1<<" << dir << " = " << (1 << dir) << " not allocated\n";
msg << "Number of excpected outputs " << this->GetNumberOfOutputs() << "\n";
- throw itk::ExceptionObject( __FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION );
- }
+ throw itk::ExceptionObject(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
+ }
- itk::ProgressReporter reporter ( this, threadId,
- outputRegionForThread.GetNumberOfPixels() * this->GetNumberOfOutputs() * 2 );
+ itk::ProgressReporter reporter(this, threadId,
+ outputRegionForThread.GetNumberOfPixels() * this->GetNumberOfOutputs() * 2);
const InputImageType * input = this->GetInput();
- InputImageRegionType inputRegionForThread;
- this->CallCopyOutputRegionToInputRegion( inputRegionForThread, outputRegionForThread );
+ InputImageRegionType inputRegionForThread;
+ this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
- OutputImagePointerType outputLowPass = this->GetOutput( 0 );
- OutputImagePointerType outputHighPass = this->GetOutput( 1<<dir );
+ OutputImagePointerType outputLowPass = this->GetOutput(0);
+ OutputImagePointerType outputHighPass = this->GetOutput(1 << dir);
// On multidimensional case, if m_SubsampleImageFactor != 1, we need internal images of different size
- if ( dir != 0 && m_SubsampleImageFactor > 1 )
- {
- outputLowPass = m_InternalImages[dir-1][0];
- outputHighPass = m_InternalImages[dir-1][1];
- }
+ if (dir != 0 && m_SubsampleImageFactor > 1)
+ {
+ outputLowPass = m_InternalImages[dir - 1][0];
+ outputHighPass = m_InternalImages[dir - 1][1];
+ }
// typedef for the iterations over the input image
- typedef itk::ConstNeighborhoodIterator< InputImageType > NeighborhoodIteratorType;
- typedef itk::NeighborhoodInnerProduct< InputImageType > InnerProductType;
- typedef itk::ImageRegionIterator< OutputImageType > IteratorType;
- typedef typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator< InputImageType > FaceCalculatorType;
- typedef typename FaceCalculatorType::FaceListType FaceListType;
- typedef typename FaceListType::iterator FaceListIterator;
+ typedef itk::ConstNeighborhoodIterator<InputImageType> NeighborhoodIteratorType;
+ typedef itk::NeighborhoodInnerProduct<InputImageType> InnerProductType;
+ typedef itk::ImageRegionIterator<OutputImageType> IteratorType;
+ typedef typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<InputImageType> FaceCalculatorType;
+ typedef typename FaceCalculatorType::FaceListType FaceListType;
+ typedef typename FaceListType::iterator FaceListIterator;
// Prepare the subsampling image factor, if any.
- typedef SubsampledImageRegionConstIterator< InputImageType > SubsampleIteratorType;
+ typedef SubsampledImageRegionConstIterator<InputImageType> SubsampleIteratorType;
typename SubsampleIteratorType::IndexType subsampling;
subsampling.Fill(1);
subsampling[dir] = GetSubsampleImageFactor();
@@ -428,119 +424,119 @@ WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD
// High pass part calculation
HighPassOperatorType highPassOperator;
highPassOperator.SetDirection(dir);
- highPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ highPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
highPassOperator.CreateDirectional();
- SubsampleIteratorType subItHighPass ( input, inputRegionForThread );
- subItHighPass.SetSubsampleFactor( subsampling );
+ SubsampleIteratorType subItHighPass(input, inputRegionForThread);
+ subItHighPass.SetSubsampleFactor(subsampling);
subItHighPass.GoToBegin();
- NeighborhoodIteratorType itHighPass ( highPassOperator.GetRadius(), input, inputRegionForThread );
- itk::PeriodicBoundaryCondition< InputImageType > boundaryCondition;
+ NeighborhoodIteratorType itHighPass(highPassOperator.GetRadius(), input, inputRegionForThread);
+ itk::PeriodicBoundaryCondition<InputImageType> boundaryCondition;
//otb::MirrorBoundaryCondition< InputImageType > boundaryCondition;
- itHighPass.OverrideBoundaryCondition( &boundaryCondition );
+ itHighPass.OverrideBoundaryCondition(&boundaryCondition);
- IteratorType outHighPass ( outputHighPass, subItHighPass.GenerateOutputInformation() );
+ IteratorType outHighPass(outputHighPass, subItHighPass.GenerateOutputInformation());
outHighPass.GoToBegin();
- while ( !subItHighPass.IsAtEnd() && !outHighPass.IsAtEnd() )
- {
- itHighPass.SetLocation( subItHighPass.GetIndex() );
- outHighPass.Set( innerProduct( itHighPass, highPassOperator ) );
+ while (!subItHighPass.IsAtEnd() && !outHighPass.IsAtEnd())
+ {
+ itHighPass.SetLocation(subItHighPass.GetIndex());
+ outHighPass.Set(innerProduct(itHighPass, highPassOperator));
++subItHighPass;
++outHighPass;
reporter.CompletedPixel();
- }
+ }
// Low pass part calculation
LowPassOperatorType lowPassOperator;
lowPassOperator.SetDirection(dir);
- lowPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ lowPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
lowPassOperator.CreateDirectional();
- SubsampleIteratorType subItLowPass ( input, inputRegionForThread );
- subItLowPass.SetSubsampleFactor( subsampling );
+ SubsampleIteratorType subItLowPass(input, inputRegionForThread);
+ subItLowPass.SetSubsampleFactor(subsampling);
subItLowPass.GoToBegin();
- NeighborhoodIteratorType itLowPass ( lowPassOperator.GetRadius(), input, inputRegionForThread );
- itLowPass.OverrideBoundaryCondition( &boundaryCondition );
+ NeighborhoodIteratorType itLowPass(lowPassOperator.GetRadius(), input, inputRegionForThread);
+ itLowPass.OverrideBoundaryCondition(&boundaryCondition);
- IteratorType outLowPass ( outputLowPass, subItLowPass.GenerateOutputInformation() );
+ IteratorType outLowPass(outputLowPass, subItLowPass.GenerateOutputInformation());
outLowPass.GoToBegin();
- while ( !subItLowPass.IsAtEnd() && !outLowPass.IsAtEnd() )
- {
- itLowPass.SetLocation( subItLowPass.GetIndex() );
- outLowPass.Set( innerProduct( itLowPass, lowPassOperator ) );
+ while (!subItLowPass.IsAtEnd() && !outLowPass.IsAtEnd())
+ {
+ itLowPass.SetLocation(subItLowPass.GetIndex());
+ outLowPass.Set(innerProduct(itLowPass, lowPassOperator));
++subItLowPass;
++outLowPass;
reporter.CompletedPixel();
- }
+ }
- if ( dir > 0 )
- {
+ if (dir > 0)
+ {
// Note that outputImageRegion correspond to the actual region of (local) input !
OutputImageRegionType outputImageRegion;
- this->CallCopyInputRegionToOutputRegion( dir, outputImageRegion, inputRegionForThread );
+ this->CallCopyInputRegionToOutputRegion(dir, outputImageRegion, inputRegionForThread);
- ThreadedGenerateDataAtDimensionN( 0, dir-1, reporter, outputImageRegion, threadId );
- ThreadedGenerateDataAtDimensionN( 1<<dir, dir-1, reporter, outputImageRegion, threadId );
- }
+ ThreadedGenerateDataAtDimensionN(0, dir - 1, reporter, outputImageRegion, threadId);
+ ThreadedGenerateDataAtDimensionN(1 << dir, dir - 1, reporter, outputImageRegion, threadId);
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
::ThreadedGenerateDataAtDimensionN
-( unsigned int idx, unsigned int direction, itk::ProgressReporter & reporter,
- const OutputImageRegionType& outputRegionForThread, int threadId )
+ (unsigned int idx, unsigned int direction, itk::ProgressReporter& reporter,
+ const OutputImageRegionType& outputRegionForThread, int threadId)
{
// Note that outputRegionForThread correspond to the actual region of input !
- OutputImagePointerType input = this->GetOutput( idx );
- OutputImagePointerType outputHighPass = this->GetOutput( idx + (1<<direction) );
+ OutputImagePointerType input = this->GetOutput(idx);
+ OutputImagePointerType outputHighPass = this->GetOutput(idx + (1 << direction));
OutputImagePointerType outputLowPass = OutputImageType::New();
OutputImageRegionType outputImageRegion;
- this->CallCopyInputRegionToOutputRegion( direction, outputImageRegion, outputRegionForThread );
-
- if ( m_SubsampleImageFactor > 1 )
- {
- input = m_InternalImages[direction][ idx / (1<<(direction+1))];
+ this->CallCopyInputRegionToOutputRegion(direction, outputImageRegion, outputRegionForThread);
- if ( direction != 0 )
+ if (m_SubsampleImageFactor > 1)
{
- outputLowPass = m_InternalImages[direction-1][ idx / (1<<direction) ];
- outputHighPass = m_InternalImages[direction-1][ idx / (1<<direction) + 1];
+ input = m_InternalImages[direction][idx / (1 << (direction + 1))];
+
+ if (direction != 0)
+ {
+ outputLowPass = m_InternalImages[direction - 1][idx / (1 << direction)];
+ outputHighPass = m_InternalImages[direction - 1][idx / (1 << direction) + 1];
+ }
}
- }
- if ( direction == 0 )
- {
+ if (direction == 0)
+ {
// The output image has to be allocated
// May be not valid on multithreaded process ???
- outputLowPass->SetRegions( outputImageRegion );
+ outputLowPass->SetRegions(outputImageRegion);
outputLowPass->Allocate(); // FIXME Check this line...
outputLowPass->FillBuffer(0);
- }
+ }
/** Inner product iterators */
- typedef itk::ConstNeighborhoodIterator< OutputImageType > NeighborhoodIteratorType;
- typedef itk::NeighborhoodInnerProduct< OutputImageType > InnerProductType;
- typedef itk::ImageRegionIterator< OutputImageType > IteratorType;
+ typedef itk::ConstNeighborhoodIterator<OutputImageType> NeighborhoodIteratorType;
+ typedef itk::NeighborhoodInnerProduct<OutputImageType> InnerProductType;
+ typedef itk::ImageRegionIterator<OutputImageType> IteratorType;
typedef typename itk::NeighborhoodAlgorithm
- ::ImageBoundaryFacesCalculator< OutputImageType > FaceCalculatorType;
+ ::ImageBoundaryFacesCalculator<OutputImageType> FaceCalculatorType;
typedef typename FaceCalculatorType::FaceListType FaceListType;
- typedef typename FaceListType::iterator FaceListIterator;
+ typedef typename FaceListType::iterator FaceListIterator;
// Prepare the subsampling image factor, if any.
- typedef SubsampledImageRegionConstIterator< InputImageType > SubsampleIteratorType;
+ typedef SubsampledImageRegionConstIterator<InputImageType> SubsampleIteratorType;
typename SubsampleIteratorType::IndexType subsampling;
subsampling.Fill(1);
- subsampling[ direction ] = GetSubsampleImageFactor();
+ subsampling[direction] = GetSubsampleImageFactor();
// Inner products
InnerProductType innerProduct;
@@ -548,88 +544,88 @@ WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD
// High pass part calculation
HighPassOperatorType highPassOperator;
highPassOperator.SetDirection(direction);
- highPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ highPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
highPassOperator.CreateDirectional();
- SubsampleIteratorType subItHighPass ( input, outputRegionForThread );
- subItHighPass.SetSubsampleFactor( subsampling );
+ SubsampleIteratorType subItHighPass(input, outputRegionForThread);
+ subItHighPass.SetSubsampleFactor(subsampling);
subItHighPass.GoToBegin();
- NeighborhoodIteratorType itHighPass ( highPassOperator.GetRadius(), input, outputRegionForThread );
- itk::PeriodicBoundaryCondition< OutputImageType > boundaryCondition;
+ NeighborhoodIteratorType itHighPass(highPassOperator.GetRadius(), input, outputRegionForThread);
+ itk::PeriodicBoundaryCondition<OutputImageType> boundaryCondition;
//otb::MirrorBoundaryCondition< OutputImageType > boundaryCondition;
- itHighPass.OverrideBoundaryCondition( &boundaryCondition );
+ itHighPass.OverrideBoundaryCondition(&boundaryCondition);
- IteratorType outHighPass ( outputHighPass, subItHighPass.GenerateOutputInformation() );
+ IteratorType outHighPass(outputHighPass, subItHighPass.GenerateOutputInformation());
outHighPass.GoToBegin();
- while ( !subItHighPass.IsAtEnd() && !outHighPass.IsAtEnd() )
- {
- itHighPass.SetLocation( subItHighPass.GetIndex() );
- outHighPass.Set( innerProduct( itHighPass, highPassOperator ) );
+ while (!subItHighPass.IsAtEnd() && !outHighPass.IsAtEnd())
+ {
+ itHighPass.SetLocation(subItHighPass.GetIndex());
+ outHighPass.Set(innerProduct(itHighPass, highPassOperator));
++subItHighPass;
++outHighPass;
reporter.CompletedPixel();
- }
+ }
// Low pass part calculation
LowPassOperatorType lowPassOperator;
lowPassOperator.SetDirection(direction);
- lowPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ lowPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
lowPassOperator.CreateDirectional();
- SubsampleIteratorType subItLowPass ( input, outputRegionForThread );
- subItLowPass.SetSubsampleFactor( subsampling );
+ SubsampleIteratorType subItLowPass(input, outputRegionForThread);
+ subItLowPass.SetSubsampleFactor(subsampling);
subItLowPass.GoToBegin();
- NeighborhoodIteratorType itLowPass ( lowPassOperator.GetRadius(), input, outputRegionForThread );
- itLowPass.OverrideBoundaryCondition( &boundaryCondition );
+ NeighborhoodIteratorType itLowPass(lowPassOperator.GetRadius(), input, outputRegionForThread);
+ itLowPass.OverrideBoundaryCondition(&boundaryCondition);
- IteratorType outLowPass ( outputLowPass, subItLowPass.GenerateOutputInformation() );
+ IteratorType outLowPass(outputLowPass, subItLowPass.GenerateOutputInformation());
outLowPass.GoToBegin();
- while ( !subItLowPass.IsAtEnd() && !outLowPass.IsAtEnd() )
- {
- itLowPass.SetLocation( subItLowPass.GetIndex() );
- outLowPass.Set( innerProduct( itLowPass, lowPassOperator ) );
+ while (!subItLowPass.IsAtEnd() && !outLowPass.IsAtEnd())
+ {
+ itLowPass.SetLocation(subItLowPass.GetIndex());
+ outLowPass.Set(innerProduct(itLowPass, lowPassOperator));
++subItLowPass;
++outLowPass;
reporter.CompletedPixel();
- }
+ }
// Swap input and lowPassOutput
- itk::ImageRegionConstIterator< OutputImageType > inIt ( outputLowPass, outputImageRegion );
- IteratorType outIt ( ( direction != 0 && m_SubsampleImageFactor > 1 ) ?
- static_cast<OutputImageType*>( m_InternalImages[direction-2][idx/(1<<(direction-1))] )
- : this->GetOutput( idx ),
- outputImageRegion );
+ itk::ImageRegionConstIterator<OutputImageType> inIt(outputLowPass, outputImageRegion);
+ IteratorType outIt((direction != 0 && m_SubsampleImageFactor > 1) ?
+ static_cast<OutputImageType*>(m_InternalImages[direction - 2][idx / (1 << (direction - 1))])
+ : this->GetOutput(idx),
+ outputImageRegion);
- for ( inIt.GoToBegin(), outIt.GoToBegin(); !inIt.IsAtEnd(); ++inIt, ++outIt )
- {
- outIt.Set( inIt.Get() );
- }
+ for (inIt.GoToBegin(), outIt.GoToBegin(); !inIt.IsAtEnd(); ++inIt, ++outIt)
+ {
+ outIt.Set(inIt.Get());
+ }
- if ( direction != 0 )
- {
- ThreadedGenerateDataAtDimensionN( idx, direction-1, reporter, outputImageRegion, threadId );
- ThreadedGenerateDataAtDimensionN( idx + (1<<direction), direction-1, reporter, outputImageRegion, threadId );
- }
+ if (direction != 0)
+ {
+ ThreadedGenerateDataAtDimensionN(idx, direction - 1, reporter, outputImageRegion, threadId);
+ ThreadedGenerateDataAtDimensionN(idx + (1 << direction), direction - 1, reporter, outputImageRegion, threadId);
+ }
}
/**
* Template Specialization for the Wavelet::INVERSE case
*/
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
::WaveletFilterBank ()
{
- this->SetNumberOfRequiredInputs( 1 << InputImageDimension );
- this->SetNumberOfInputs( 1 << InputImageDimension );
+ this->SetNumberOfRequiredInputs(1 << InputImageDimension);
+ this->SetNumberOfInputs(1 << InputImageDimension);
this->SetNumberOfOutputs(1);
m_UpSampleFilterFactor = 0;
@@ -640,182 +636,180 @@ WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE
this->SetNumberOfThreads(1);
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
- for ( unsigned int i = 1; i < this->GetNumberOfInputs(); i++ )
- {
- for ( unsigned int dim = 0; dim < InputImageDimension; dim++ )
+ for (unsigned int i = 1; i < this->GetNumberOfInputs(); i++)
{
- if ( this->GetInput(0)->GetLargestPossibleRegion().GetSize()[dim]
- != this->GetInput(i)->GetLargestPossibleRegion().GetSize()[dim] )
+ for (unsigned int dim = 0; dim < InputImageDimension; dim++)
{
- throw itk::ExceptionObject( __FILE__, __LINE__,
- "Input images are not of the same dimension", ITK_LOCATION );
+ if (this->GetInput(0)->GetLargestPossibleRegion().GetSize()[dim]
+ != this->GetInput(i)->GetLargestPossibleRegion().GetSize()[dim])
+ {
+ throw itk::ExceptionObject(__FILE__, __LINE__,
+ "Input images are not of the same dimension", ITK_LOCATION);
+ }
}
}
- }
-
#if __myDebug__
- otbGenericMsgDebugMacro( << " up sampling output regions by a factor of " << GetSubsampleImageFactor() );
+ otbGenericMsgDebugMacro(<< " up sampling output regions by a factor of " << GetSubsampleImageFactor());
- otbGenericMsgDebugMacro( << "initial region "
- << this->GetInput(0)->GetLargestPossibleRegion().GetSize()[0]
- << "," << this->GetInput(0)->GetLargestPossibleRegion().GetSize()[1] );
+ otbGenericMsgDebugMacro(<< "initial region "
+ << this->GetInput(0)->GetLargestPossibleRegion().GetSize()[0]
+ << "," << this->GetInput(0)->GetLargestPossibleRegion().GetSize()[1]);
#endif
OutputImageRegionType newRegion;
- this->CallCopyInputRegionToOutputRegion( newRegion, this->GetInput(0)->GetLargestPossibleRegion() );
- this->GetOutput()->SetRegions( newRegion );
+ this->CallCopyInputRegionToOutputRegion(newRegion, this->GetInput(0)->GetLargestPossibleRegion());
+ this->GetOutput()->SetRegions(newRegion);
#if __myDebug__
- otbGenericMsgDebugMacro( << "new region output " << newRegion.GetSize()[0] << "," << newRegion.GetSize()[1] );
+ otbGenericMsgDebugMacro(<< "new region output " << newRegion.GetSize()[0] << "," << newRegion.GetSize()[1]);
#endif
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE >
-::GenerateInputRequestedRegion ()
- throw ( itk::InvalidRequestedRegionError )
-{
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
+::GenerateInputRequestedRegion()
+throw (itk::InvalidRequestedRegionError)
+ {
Superclass::GenerateInputRequestedRegion();
// Filter length calculation
LowPassOperatorType lowPassOperator;
lowPassOperator.SetDirection(0);
- lowPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ lowPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
lowPassOperator.CreateDirectional();
unsigned int radius = lowPassOperator.GetRadius()[0];
HighPassOperatorType highPassOperator;
highPassOperator.SetDirection(0);
- highPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ highPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
highPassOperator.CreateDirectional();
- if ( radius < highPassOperator.GetRadius()[0] )
- radius = highPassOperator.GetRadius()[0];
+ if (radius < highPassOperator.GetRadius()[0]) radius = highPassOperator.GetRadius()[0];
// Get the requested regionand pad it
- for ( unsigned int idx = 0; idx < this->GetNumberOfInputs(); idx++ )
- {
- InputImagePointerType input = const_cast< InputImageType* >( this->GetInput(idx) );
- InputImageRegionType inputRegion = input->GetRequestedRegion();
- inputRegion.PadByRadius( radius );
-
- if ( inputRegion.Crop( input->GetLargestPossibleRegion() ) )
+ for (unsigned int idx = 0; idx < this->GetNumberOfInputs(); idx++)
{
- input->SetRequestedRegion( inputRegion );
- }
+ InputImagePointerType input = const_cast<InputImageType*>(this->GetInput(idx));
+ InputImageRegionType inputRegion = input->GetRequestedRegion();
+ inputRegion.PadByRadius(radius);
+
+ if (inputRegion.Crop(input->GetLargestPossibleRegion()))
+ {
+ input->SetRequestedRegion(inputRegion);
+ }
else
- {
- input->SetRequestedRegion( inputRegion );
- itk::InvalidRequestedRegionError err ( __FILE__, __LINE__ );
+ {
+ input->SetRequestedRegion(inputRegion);
+ itk::InvalidRequestedRegionError err(__FILE__, __LINE__);
err.SetLocation(ITK_LOCATION);
err.SetDescription("Requested region is (at least partially) outside the largest possible region.");
- err.SetDataObject( input );
+ err.SetDataObject(input);
throw err;
+ }
}
}
-}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE >
-::BeforeThreadedGenerateData ()
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
+::BeforeThreadedGenerateData()
{
- if ( InputImageDimension > 1 )
- {
- // Internal images will be used only if m_SubsampleImageFactor != 1
- m_InternalImages.resize( InputImageDimension-1 );
- for ( unsigned int i = 0; i < m_InternalImages.size(); i++ )
+ if (InputImageDimension > 1)
{
+ // Internal images will be used only if m_SubsampleImageFactor != 1
+ m_InternalImages.resize(InputImageDimension - 1);
+ for (unsigned int i = 0; i < m_InternalImages.size(); i++)
+ {
// the size is linked to the SubsampleImageFactor that is assume to be 2!!!
- m_InternalImages[i].resize( 1<<(i+1) );
- }
+ m_InternalImages[i].resize(1 << (i + 1));
+ }
OutputImageRegionType intermediateRegion;
- Superclass::CallCopyInputRegionToOutputRegion( intermediateRegion,
- this->GetInput(0)->GetLargestPossibleRegion() );
+ Superclass::CallCopyInputRegionToOutputRegion(intermediateRegion,
+ this->GetInput(0)->GetLargestPossibleRegion());
- AllocateInternalData( intermediateRegion );
- }
+ AllocateInternalData(intermediateRegion);
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
::AllocateInternalData
-( const OutputImageRegionType& outputRegion )
+ (const OutputImageRegionType& outputRegion)
{
OutputImageRegionType largerRegion;
OutputImageRegionType smallerRegion = outputRegion;
- for ( unsigned int direction = 0; direction < InputImageDimension-1; direction++ )
- {
- this->CallCopyInputRegionToOutputRegion( direction,
- largerRegion, smallerRegion );
-
- for ( unsigned int i = 0; i < m_InternalImages[direction].size(); i++ )
+ for (unsigned int direction = 0; direction < InputImageDimension - 1; direction++)
{
+ this->CallCopyInputRegionToOutputRegion(direction,
+ largerRegion, smallerRegion);
+
+ for (unsigned int i = 0; i < m_InternalImages[direction].size(); i++)
+ {
m_InternalImages[direction][i] = OutputImageType::New();
- m_InternalImages[direction][i]->SetRegions( largerRegion );
+ m_InternalImages[direction][i]->SetRegions(largerRegion);
m_InternalImages[direction][i]->Allocate();
m_InternalImages[direction][i]->FillBuffer(0);
- }
+ }
smallerRegion = largerRegion;
- }
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE >
-::AfterThreadedGenerateData ()
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
+::AfterThreadedGenerateData()
{
- if ( m_SubsampleImageFactor > 1 && InputImageDimension > 1 )
- {
+ if (m_SubsampleImageFactor > 1 && InputImageDimension > 1)
+ {
m_InternalImages.clear();
- }
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
::CallCopyOutputRegionToInputRegion
-( InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion )
+ (InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion)
{
- Superclass::CallCopyOutputRegionToInputRegion( destRegion, srcRegion );
+ Superclass::CallCopyOutputRegionToInputRegion(destRegion, srcRegion);
- if ( GetSubsampleImageFactor() > 1 )
- {
+ if (GetSubsampleImageFactor() > 1)
+ {
OutputIndexType srcIndex = srcRegion.GetIndex();
- OutputSizeType srcSize = srcRegion.GetSize();
+ OutputSizeType srcSize = srcRegion.GetSize();
InputIndexType destIndex;
- InputSizeType destSize;
+ InputSizeType destSize;
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
- {
- // TODO: This seems not right in odd index cases
+ for (unsigned int i = 0; i < InputImageDimension; i++)
+ {
+ // TODO: This seems not right in odd index cases
destIndex[i] = srcIndex[i] / GetSubsampleImageFactor();
destSize[i] = srcSize[i] / GetSubsampleImageFactor();
- }
+ }
- destRegion.SetIndex( destIndex );
- destRegion.SetSize( destSize );
+ destRegion.SetIndex(destIndex);
+ destRegion.SetSize(destSize);
#if 1
// Region Padding
LowPassOperatorType lowPassOperator;
lowPassOperator.SetDirection(0);
- lowPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ lowPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
lowPassOperator.CreateDirectional();
typename InputImageRegionType::SizeType radius;
@@ -823,13 +817,12 @@ WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE
HighPassOperatorType highPassOperator;
highPassOperator.SetDirection(0);
- highPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ highPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
highPassOperator.CreateDirectional();
- if ( radius[0] < highPassOperator.GetRadius()[0] )
- radius[0] = highPassOperator.GetRadius()[0];
+ if (radius[0] < highPassOperator.GetRadius()[0]) radius[0] = highPassOperator.GetRadius()[0];
- for ( unsigned int i = 1; i < InputImageDimension; i++ )
+ for (unsigned int i = 1; i < InputImageDimension; i++)
radius[i] = 0;
// for ( unsigned int i = 0; i < InputImageDimension; i++ )
@@ -840,494 +833,493 @@ WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE
// }
InputImageRegionType paddedRegion = destRegion;
- paddedRegion.PadByRadius( radius );
+ paddedRegion.PadByRadius(radius);
- if ( paddedRegion.Crop( this->GetInput(0)->GetLargestPossibleRegion() ) )
- {
+ if (paddedRegion.Crop(this->GetInput(0)->GetLargestPossibleRegion()))
+ {
destRegion = paddedRegion;
- }
+ }
#endif
- }
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
::CallCopyInputRegionToOutputRegion
-( OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
+ (OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion)
{
- Superclass::CallCopyInputRegionToOutputRegion( destRegion, srcRegion );
+ Superclass::CallCopyInputRegionToOutputRegion(destRegion, srcRegion);
- if ( GetSubsampleImageFactor() > 1 )
- {
+ if (GetSubsampleImageFactor() > 1)
+ {
OutputIndexType srcIndex = srcRegion.GetIndex();
- OutputSizeType srcSize = srcRegion.GetSize();
+ OutputSizeType srcSize = srcRegion.GetSize();
InputIndexType destIndex;
- InputSizeType destSize;
+ InputSizeType destSize;
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
- {
+ for (unsigned int i = 0; i < InputImageDimension; i++)
+ {
destIndex[i] = srcIndex[i] * GetSubsampleImageFactor();
destSize[i] = srcSize[i] * GetSubsampleImageFactor();
- }
+ }
- destRegion.SetIndex( destIndex );
- destRegion.SetSize( destSize );
- }
+ destRegion.SetIndex(destIndex);
+ destRegion.SetSize(destSize);
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
::CallCopyOutputRegionToInputRegion
-( unsigned int direction,
- InputImageRegionType & destRegion, const OutputImageRegionType & srcRegion )
+ (unsigned int direction,
+ InputImageRegionType& destRegion, const OutputImageRegionType& srcRegion)
{
- Superclass::CallCopyOutputRegionToInputRegion( destRegion, srcRegion );
+ Superclass::CallCopyOutputRegionToInputRegion(destRegion, srcRegion);
- if ( GetSubsampleImageFactor() > 1 )
- {
+ if (GetSubsampleImageFactor() > 1)
+ {
OutputIndexType srcIndex = srcRegion.GetIndex();
- OutputSizeType srcSize = srcRegion.GetSize();
+ OutputSizeType srcSize = srcRegion.GetSize();
InputIndexType destIndex;
- InputSizeType destSize;
+ InputSizeType destSize;
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
- {
- if ( i == direction )
+ for (unsigned int i = 0; i < InputImageDimension; i++)
{
+ if (i == direction)
+ {
// TODO: This seems not right in odd index cases
destIndex[i] = srcIndex[i] / GetSubsampleImageFactor();
destSize[i] = srcSize[i] / GetSubsampleImageFactor();
- }
+ }
else
- {
+ {
destIndex[i] = srcIndex[i];
destSize[i] = srcSize[i];
+ }
}
- }
- destRegion.SetIndex( destIndex );
- destRegion.SetSize( destSize );
- }
+ destRegion.SetIndex(destIndex);
+ destRegion.SetSize(destSize);
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
::CallCopyInputRegionToOutputRegion
-( unsigned int direction,
- OutputImageRegionType & destRegion, const InputImageRegionType & srcRegion )
+ (unsigned int direction,
+ OutputImageRegionType& destRegion, const InputImageRegionType& srcRegion)
{
- Superclass::CallCopyInputRegionToOutputRegion( destRegion, srcRegion );
+ Superclass::CallCopyInputRegionToOutputRegion(destRegion, srcRegion);
- if ( GetSubsampleImageFactor() > 1 )
- {
+ if (GetSubsampleImageFactor() > 1)
+ {
typename InputImageRegionType::IndexType srcIndex = srcRegion.GetIndex();
- typename InputImageRegionType::SizeType srcSize = srcRegion.GetSize();
+ typename InputImageRegionType::SizeType srcSize = srcRegion.GetSize();
typename OutputImageRegionType::IndexType destIndex;
- typename OutputImageRegionType::SizeType destSize;
+ typename OutputImageRegionType::SizeType destSize;
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
- {
- if ( i == direction )
+ for (unsigned int i = 0; i < InputImageDimension; i++)
{
+ if (i == direction)
+ {
destIndex[i] = srcIndex[i] * GetSubsampleImageFactor();
destSize[i] = srcSize[i] * GetSubsampleImageFactor();
- }
+ }
else
- {
+ {
destIndex[i] = srcIndex[i];
destSize[i] = srcSize[i];
+ }
}
- }
- destRegion.SetIndex( destIndex );
- destRegion.SetSize( destSize );
- }
+ destRegion.SetIndex(destIndex);
+ destRegion.SetSize(destSize);
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
::ThreadedGenerateData
-( const OutputImageRegionType& outputRegionForThread, int threadId )
+ (const OutputImageRegionType& outputRegionForThread, int threadId)
{
- itk::ProgressReporter reporter ( this, threadId,
- outputRegionForThread.GetNumberOfPixels() * this->GetNumberOfInputs() );
+ itk::ProgressReporter reporter(this, threadId,
+ outputRegionForThread.GetNumberOfPixels() * this->GetNumberOfInputs());
InputImageRegionType inputRegionForThread;
- this->CallCopyOutputRegionToInputRegion( inputRegionForThread, outputRegionForThread );
+ this->CallCopyOutputRegionToInputRegion(inputRegionForThread, outputRegionForThread);
unsigned int dir = 0;
// Low pass part calculation
LowPassOperatorType lowPassOperator;
lowPassOperator.SetDirection(dir);
- lowPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ lowPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
lowPassOperator.CreateDirectional();
// High pass part calculation
HighPassOperatorType highPassOperator;
highPassOperator.SetDirection(dir);
- highPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ highPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
highPassOperator.CreateDirectional();
// typedef for the iterations over the input image
- typedef itk::ConstNeighborhoodIterator< OutputImageType > NeighborhoodIteratorType;
- typedef itk::NeighborhoodInnerProduct< OutputImageType > InnerProductType;
- typedef itk::ImageRegionIterator< OutputImageType > IteratorType;
- typedef typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator< OutputImageType > FaceCalculatorType;
- typedef typename FaceCalculatorType::FaceListType FaceListType;
- typedef typename FaceListType::iterator FaceListIterator;
+ typedef itk::ConstNeighborhoodIterator<OutputImageType> NeighborhoodIteratorType;
+ typedef itk::NeighborhoodInnerProduct<OutputImageType> InnerProductType;
+ typedef itk::ImageRegionIterator<OutputImageType> IteratorType;
+ typedef typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<OutputImageType> FaceCalculatorType;
+ typedef typename FaceCalculatorType::FaceListType FaceListType;
+ typedef typename FaceListType::iterator FaceListIterator;
// Faces iterations
typename NeighborhoodIteratorType::RadiusType radiusMax;
- for ( unsigned int idx = 0; idx < OutputImageDimension; idx++ )
- {
+ for (unsigned int idx = 0; idx < OutputImageDimension; idx++)
+ {
radiusMax[idx] = lowPassOperator.GetRadius(idx);
- if ( radiusMax[idx] < highPassOperator.GetRadius(idx) )
- radiusMax[idx] = highPassOperator.GetRadius(idx);
- }
-
+ if (radiusMax[idx] < highPassOperator.GetRadius(idx)) radiusMax[idx] = highPassOperator.GetRadius(idx);
+ }
// The multiresolution case requires a SubsampleImageFilter step
- if ( m_SubsampleImageFactor > 1 )
- {
- for ( unsigned int i = 0; i < this->GetNumberOfInputs(); i+=2 )
+ if (m_SubsampleImageFactor > 1)
{
- InputImagePointerType imgLowPass = const_cast<InputImageType*>( this->GetInput(i) );
- InputImagePointerType imgHighPass = const_cast<InputImageType*>( this->GetInput(i+1) );
+ for (unsigned int i = 0; i < this->GetNumberOfInputs(); i += 2)
+ {
+ InputImagePointerType imgLowPass = const_cast<InputImageType*>(this->GetInput(i));
+ InputImagePointerType imgHighPass = const_cast<InputImageType*>(this->GetInput(i + 1));
OutputImagePointerType outputImage = this->GetOutput();
- if ( dir != InputImageDimension-1 )
- {
- outputImage = m_InternalImages[0][i/2];
- }
+ if (dir != InputImageDimension - 1)
+ {
+ outputImage = m_InternalImages[0][i / 2];
+ }
- typedef otb::SubsampleImageFilter< InputImageType, OutputImageType, Wavelet::INVERSE > FilterType;
+ typedef otb::SubsampleImageFilter<InputImageType, OutputImageType, Wavelet::INVERSE> FilterType;
typename FilterType::InputImageIndexType delta;
delta.Fill(1);
- delta[ dir ] = this->GetSubsampleImageFactor();
+ delta[dir] = this->GetSubsampleImageFactor();
InputImagePointerType cropedLowPass = InputImageType::New();
- cropedLowPass->SetRegions( inputRegionForThread );
+ cropedLowPass->SetRegions(inputRegionForThread);
cropedLowPass->Allocate();
cropedLowPass->FillBuffer(0.);
- itk::ImageRegionIterator< InputImageType > cropedLowPassIt ( cropedLowPass, inputRegionForThread );
- itk::ImageRegionIterator< InputImageType > imgLowPassIt ( imgLowPass, inputRegionForThread );
- for ( cropedLowPassIt.GoToBegin(), imgLowPassIt.GoToBegin();
- !cropedLowPassIt.IsAtEnd() && !imgLowPassIt.IsAtEnd();
- ++cropedLowPassIt, ++imgLowPassIt )
- {
- cropedLowPassIt.Set( imgLowPassIt.Get() );
- }
+ itk::ImageRegionIterator<InputImageType> cropedLowPassIt(cropedLowPass, inputRegionForThread);
+ itk::ImageRegionIterator<InputImageType> imgLowPassIt(imgLowPass, inputRegionForThread);
+ for (cropedLowPassIt.GoToBegin(), imgLowPassIt.GoToBegin();
+ !cropedLowPassIt.IsAtEnd() && !imgLowPassIt.IsAtEnd();
+ ++cropedLowPassIt, ++imgLowPassIt)
+ {
+ cropedLowPassIt.Set(imgLowPassIt.Get());
+ }
typename FilterType::Pointer overSampledLowPass = FilterType::New();
- overSampledLowPass->SetInput( cropedLowPass );
- overSampledLowPass->SetSubsampleFactor( delta );
+ overSampledLowPass->SetInput(cropedLowPass);
+ overSampledLowPass->SetSubsampleFactor(delta);
overSampledLowPass->Update();
InputImagePointerType cropedHighPass = InputImageType::New();
- cropedHighPass->SetRegions( inputRegionForThread );
+ cropedHighPass->SetRegions(inputRegionForThread);
cropedHighPass->Allocate();
cropedHighPass->FillBuffer(0.);
- itk::ImageRegionIterator< InputImageType > cropedHighPassIt ( cropedHighPass, inputRegionForThread );
- itk::ImageRegionIterator< InputImageType > imgHighPassIt ( imgHighPass, inputRegionForThread );
- for ( cropedHighPassIt.GoToBegin(), imgHighPassIt.GoToBegin();
- !cropedHighPassIt.IsAtEnd() && !imgHighPassIt.IsAtEnd();
- ++cropedHighPassIt, ++imgHighPassIt )
- {
- cropedHighPassIt.Set( imgHighPassIt.Get() );
- }
+ itk::ImageRegionIterator<InputImageType> cropedHighPassIt(cropedHighPass, inputRegionForThread);
+ itk::ImageRegionIterator<InputImageType> imgHighPassIt(imgHighPass, inputRegionForThread);
+ for (cropedHighPassIt.GoToBegin(), imgHighPassIt.GoToBegin();
+ !cropedHighPassIt.IsAtEnd() && !imgHighPassIt.IsAtEnd();
+ ++cropedHighPassIt, ++imgHighPassIt)
+ {
+ cropedHighPassIt.Set(imgHighPassIt.Get());
+ }
typename FilterType::Pointer overSampledHighPass = FilterType::New();
- overSampledHighPass->SetInput( cropedHighPass );
- overSampledHighPass->SetSubsampleFactor( delta );
+ overSampledHighPass->SetInput(cropedHighPass);
+ overSampledHighPass->SetSubsampleFactor(delta);
overSampledHighPass->Update();
InnerProductType innerProduct;
- itk::ImageRegionIterator< OutputImageType > out
- ( outputImage, overSampledLowPass->GetOutput()->GetRequestedRegion() );
+ itk::ImageRegionIterator<OutputImageType> out
+ (outputImage, overSampledLowPass->GetOutput()->GetRequestedRegion());
- NeighborhoodIteratorType lowIter ( lowPassOperator.GetRadius(),
- overSampledLowPass->GetOutput(), overSampledLowPass->GetOutput()->GetRequestedRegion() );
- itk::PeriodicBoundaryCondition< OutputImageType > boundaryCondition;
+ NeighborhoodIteratorType lowIter(lowPassOperator.GetRadius(),
+ overSampledLowPass->GetOutput(),
+ overSampledLowPass->GetOutput()->GetRequestedRegion());
+ itk::PeriodicBoundaryCondition<OutputImageType> boundaryCondition;
//otb::MirrorBoundaryCondition< OutputImageType > boundaryCondition;
- lowIter.OverrideBoundaryCondition( &boundaryCondition );
+ lowIter.OverrideBoundaryCondition(&boundaryCondition);
- NeighborhoodIteratorType highIter ( highPassOperator.GetRadius(),
- overSampledHighPass->GetOutput(), overSampledHighPass->GetOutput()->GetRequestedRegion() );
- highIter.OverrideBoundaryCondition( &boundaryCondition );
+ NeighborhoodIteratorType highIter(highPassOperator.GetRadius(),
+ overSampledHighPass->GetOutput(),
+ overSampledHighPass->GetOutput()->GetRequestedRegion());
+ highIter.OverrideBoundaryCondition(&boundaryCondition);
lowIter.GoToBegin();
highIter.GoToBegin();
out.GoToBegin();
- while ( !out.IsAtEnd() )
- {
- out.Set( innerProduct( lowIter, lowPassOperator )
- + innerProduct( highIter, highPassOperator ) );
+ while (!out.IsAtEnd())
+ {
+ out.Set(innerProduct(lowIter, lowPassOperator)
+ + innerProduct(highIter, highPassOperator));
++lowIter;
++highIter;
++out;
reporter.CompletedPixel();
- }
- } // end for each overSampledLowPass/overSampledhighPass pair of entry
- }
+ }
+ } // end for each overSampledLowPass/overSampledhighPass pair of entry
+ }
else // multiscale case
- {
- for ( unsigned int i = 0; i < this->GetNumberOfInputs(); i+=2 )
{
- InputImagePointerType imgLowPass = const_cast<InputImageType*>( this->GetInput(i) );
- InputImagePointerType imgHighPass = const_cast<InputImageType*>( this->GetInput(i+1) );
+ for (unsigned int i = 0; i < this->GetNumberOfInputs(); i += 2)
+ {
+ InputImagePointerType imgLowPass = const_cast<InputImageType*>(this->GetInput(i));
+ InputImagePointerType imgHighPass = const_cast<InputImageType*>(this->GetInput(i + 1));
OutputImagePointerType outputImage = this->GetOutput();
- if ( dir != InputImageDimension-1 )
- {
- outputImage = m_InternalImages[0][i/2];
- }
+ if (dir != InputImageDimension - 1)
+ {
+ outputImage = m_InternalImages[0][i / 2];
+ }
FaceCalculatorType faceCalculator;
- FaceListType faceList;
- faceList = faceCalculator( imgLowPass, imgLowPass->GetRequestedRegion(), radiusMax );
+ FaceListType faceList;
+ faceList = faceCalculator(imgLowPass, imgLowPass->GetRequestedRegion(), radiusMax);
InnerProductType innerProduct;
- for ( FaceListIterator faceIt = faceList.begin(); faceIt != faceList.end(); ++faceIt )
- {
- itk::ImageRegionIterator< OutputImageType > out ( outputImage, *faceIt );
+ for (FaceListIterator faceIt = faceList.begin(); faceIt != faceList.end(); ++faceIt)
+ {
+ itk::ImageRegionIterator<OutputImageType> out(outputImage, *faceIt);
- NeighborhoodIteratorType lowIter ( lowPassOperator.GetRadius(), imgLowPass, *faceIt );
- itk::PeriodicBoundaryCondition< OutputImageType > boundaryCondition;
+ NeighborhoodIteratorType lowIter(lowPassOperator.GetRadius(), imgLowPass, *faceIt);
+ itk::PeriodicBoundaryCondition<OutputImageType> boundaryCondition;
//otb::MirrorBoundaryCondition< OutputImageType > boundaryCondition;
- lowIter.OverrideBoundaryCondition( &boundaryCondition );
+ lowIter.OverrideBoundaryCondition(&boundaryCondition);
- NeighborhoodIteratorType highIter ( highPassOperator.GetRadius(), imgHighPass, *faceIt );
- highIter.OverrideBoundaryCondition( &boundaryCondition );
+ NeighborhoodIteratorType highIter(highPassOperator.GetRadius(), imgHighPass, *faceIt);
+ highIter.OverrideBoundaryCondition(&boundaryCondition);
lowIter.GoToBegin();
highIter.GoToBegin();
out.GoToBegin();
- while ( !out.IsAtEnd() )
- {
- out.Set( ( innerProduct( lowIter, lowPassOperator )
- + innerProduct( highIter, highPassOperator ) ) / 2. );
+ while (!out.IsAtEnd())
+ {
+ out.Set((innerProduct(lowIter, lowPassOperator)
+ + innerProduct(highIter, highPassOperator)) / 2.);
++lowIter;
++highIter;
++out;
reporter.CompletedPixel();
+ }
}
- }
- } // end for each imgLowPass/imghighPass pair of entry
- } // end multiscale case
+ } // end for each imgLowPass/imghighPass pair of entry
+ } // end multiscale case
- if ( dir != InputImageDimension-1 )
- {
+ if (dir != InputImageDimension - 1)
+ {
// Note that outputImageRegion correspond to the actual region of (local) input !
OutputImageRegionType outputImageRegion;
- this->CallCopyInputRegionToOutputRegion( dir, outputImageRegion, inputRegionForThread );
+ this->CallCopyInputRegionToOutputRegion(dir, outputImageRegion, inputRegionForThread);
- ThreadedGenerateDataAtDimensionN( dir+1, reporter, outputImageRegion, threadId );
- }
+ ThreadedGenerateDataAtDimensionN(dir + 1, reporter, outputImageRegion, threadId);
+ }
}
-template < class TInputImage, class TOutputImage, class TWaveletOperator >
+template <class TInputImage, class TOutputImage, class TWaveletOperator>
void
-WaveletFilterBank< TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE >
+WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
::ThreadedGenerateDataAtDimensionN
-( unsigned int direction,
- itk::ProgressReporter & reporter,
- const OutputImageRegionType& outputRegionForThread, int threadId )
+ (unsigned int direction,
+ itk::ProgressReporter& reporter,
+ const OutputImageRegionType& outputRegionForThread, int threadId)
{
OutputImageRegionType outputImageRegion;
- this->CallCopyInputRegionToOutputRegion( direction, outputImageRegion, outputRegionForThread );
+ this->CallCopyInputRegionToOutputRegion(direction, outputImageRegion, outputRegionForThread);
// Low pass part calculation
LowPassOperatorType lowPassOperator;
lowPassOperator.SetDirection(direction);
- lowPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ lowPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
lowPassOperator.CreateDirectional();
// High pass part calculation
HighPassOperatorType highPassOperator;
highPassOperator.SetDirection(direction);
- highPassOperator.SetUpSampleFactor( this->GetUpSampleFilterFactor() );
+ highPassOperator.SetUpSampleFactor(this->GetUpSampleFilterFactor());
highPassOperator.CreateDirectional();
// typedef for the iterations over the input image
- typedef itk::ConstNeighborhoodIterator< OutputImageType > NeighborhoodIteratorType;
- typedef itk::NeighborhoodInnerProduct< OutputImageType > InnerProductType;
- typedef itk::ImageRegionIterator< OutputImageType > IteratorType;
- typedef typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator< OutputImageType > FaceCalculatorType;
- typedef typename FaceCalculatorType::FaceListType FaceListType;
- typedef typename FaceListType::iterator FaceListIterator;
+ typedef itk::ConstNeighborhoodIterator<OutputImageType> NeighborhoodIteratorType;
+ typedef itk::NeighborhoodInnerProduct<OutputImageType> InnerProductType;
+ typedef itk::ImageRegionIterator<OutputImageType> IteratorType;
+ typedef typename itk::NeighborhoodAlgorithm::ImageBoundaryFacesCalculator<OutputImageType> FaceCalculatorType;
+ typedef typename FaceCalculatorType::FaceListType FaceListType;
+ typedef typename FaceListType::iterator FaceListIterator;
// Faces iterations
typename NeighborhoodIteratorType::RadiusType radiusMax;
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
- {
+ for (unsigned int i = 0; i < InputImageDimension; i++)
+ {
radiusMax[i] = lowPassOperator.GetRadius(i);
- if ( radiusMax[i] < highPassOperator.GetRadius(i) )
- radiusMax[i] = highPassOperator.GetRadius(i);
- }
+ if (radiusMax[i] < highPassOperator.GetRadius(i)) radiusMax[i] = highPassOperator.GetRadius(i);
+ }
// The multiresolution case requires a SubsampleImageFilter step
- if ( m_SubsampleImageFactor > 1 )
- {
- for ( unsigned int i = 0; i < m_InternalImages[direction-1].size(); i+=2 )
+ if (m_SubsampleImageFactor > 1)
{
- InputImagePointerType imgLowPass = m_InternalImages[direction-1][i];
- InputImagePointerType imgHighPass = m_InternalImages[direction-1][i+1];
+ for (unsigned int i = 0; i < m_InternalImages[direction - 1].size(); i += 2)
+ {
+ InputImagePointerType imgLowPass = m_InternalImages[direction - 1][i];
+ InputImagePointerType imgHighPass = m_InternalImages[direction - 1][i + 1];
OutputImagePointerType outputImage = this->GetOutput();
- if ( direction < InputImageDimension-1 )
- {
- outputImage = m_InternalImages[direction][i/2];
- }
+ if (direction < InputImageDimension - 1)
+ {
+ outputImage = m_InternalImages[direction][i / 2];
+ }
- typedef otb::SubsampleImageFilter< OutputImageType, OutputImageType, Wavelet::INVERSE > FilterType;
+ typedef otb::SubsampleImageFilter<OutputImageType, OutputImageType, Wavelet::INVERSE> FilterType;
typename FilterType::InputImageIndexType delta;
delta.Fill(1);
- delta[ direction ] = this->GetSubsampleImageFactor();
+ delta[direction] = this->GetSubsampleImageFactor();
InputImagePointerType cropedLowPass = InputImageType::New();
- cropedLowPass->SetRegions( outputRegionForThread );
+ cropedLowPass->SetRegions(outputRegionForThread);
cropedLowPass->Allocate();
cropedLowPass->FillBuffer(0.);
- itk::ImageRegionIterator< InputImageType > cropedLowPassIt ( cropedLowPass, outputRegionForThread );
- itk::ImageRegionIterator< InputImageType > imgLowPassIt ( imgLowPass, outputRegionForThread );
- for ( cropedLowPassIt.GoToBegin(), imgLowPassIt.GoToBegin();
- !cropedLowPassIt.IsAtEnd() && !imgLowPassIt.IsAtEnd();
- ++cropedLowPassIt, ++imgLowPassIt )
- {
- cropedLowPassIt.Set( imgLowPassIt.Get() );
- }
+ itk::ImageRegionIterator<InputImageType> cropedLowPassIt(cropedLowPass, outputRegionForThread);
+ itk::ImageRegionIterator<InputImageType> imgLowPassIt(imgLowPass, outputRegionForThread);
+ for (cropedLowPassIt.GoToBegin(), imgLowPassIt.GoToBegin();
+ !cropedLowPassIt.IsAtEnd() && !imgLowPassIt.IsAtEnd();
+ ++cropedLowPassIt, ++imgLowPassIt)
+ {
+ cropedLowPassIt.Set(imgLowPassIt.Get());
+ }
typename FilterType::Pointer overSampledLowPass = FilterType::New();
- overSampledLowPass->SetInput( cropedLowPass );
- overSampledLowPass->SetSubsampleFactor( delta );
+ overSampledLowPass->SetInput(cropedLowPass);
+ overSampledLowPass->SetSubsampleFactor(delta);
overSampledLowPass->Update();
InputImagePointerType cropedHighPass = InputImageType::New();
- cropedHighPass->SetRegions( outputRegionForThread );
+ cropedHighPass->SetRegions(outputRegionForThread);
cropedHighPass->Allocate();
cropedHighPass->FillBuffer(0.);
- itk::ImageRegionIterator< InputImageType > cropedHighPassIt ( cropedHighPass, outputRegionForThread );
- itk::ImageRegionIterator< InputImageType > imgHighPassIt ( imgHighPass, outputRegionForThread );
- for ( cropedHighPassIt.GoToBegin(), imgHighPassIt.GoToBegin();
- !cropedHighPassIt.IsAtEnd() && !imgHighPassIt.IsAtEnd();
- ++cropedHighPassIt, ++imgHighPassIt )
- {
- cropedHighPassIt.Set( imgHighPassIt.Get() );
- }
+ itk::ImageRegionIterator<InputImageType> cropedHighPassIt(cropedHighPass, outputRegionForThread);
+ itk::ImageRegionIterator<InputImageType> imgHighPassIt(imgHighPass, outputRegionForThread);
+ for (cropedHighPassIt.GoToBegin(), imgHighPassIt.GoToBegin();
+ !cropedHighPassIt.IsAtEnd() && !imgHighPassIt.IsAtEnd();
+ ++cropedHighPassIt, ++imgHighPassIt)
+ {
+ cropedHighPassIt.Set(imgHighPassIt.Get());
+ }
typename FilterType::Pointer overSampledHighPass = FilterType::New();
- overSampledHighPass->SetInput( cropedHighPass );
- overSampledHighPass->SetSubsampleFactor( delta );
+ overSampledHighPass->SetInput(cropedHighPass);
+ overSampledHighPass->SetSubsampleFactor(delta);
overSampledHighPass->Update();
InnerProductType innerProduct;
- itk::ImageRegionIterator< OutputImageType > out ( outputImage,
- overSampledLowPass->GetOutput()->GetRequestedRegion() );
+ itk::ImageRegionIterator<OutputImageType> out(outputImage,
+ overSampledLowPass->GetOutput()->GetRequestedRegion());
// TODO: This might be the cause of the multithreading bug : we use a neighborhood iterator on cropped data
// Are we sure that we have cropped enough data to access the neighborhood ?
- NeighborhoodIteratorType lowIter ( lowPassOperator.GetRadius(),
- overSampledLowPass->GetOutput(), overSampledLowPass->GetOutput()->GetRequestedRegion() );
- itk::PeriodicBoundaryCondition< OutputImageType > boundaryCondition;
+ NeighborhoodIteratorType lowIter(lowPassOperator.GetRadius(),
+ overSampledLowPass->GetOutput(),
+ overSampledLowPass->GetOutput()->GetRequestedRegion());
+ itk::PeriodicBoundaryCondition<OutputImageType> boundaryCondition;
//otb::MirrorBoundaryCondition< OutputImageType > boundaryCondition;
- lowIter.OverrideBoundaryCondition( &boundaryCondition );
+ lowIter.OverrideBoundaryCondition(&boundaryCondition);
- NeighborhoodIteratorType highIter ( highPassOperator.GetRadius(),
- overSampledHighPass->GetOutput(), overSampledHighPass->GetOutput()->GetRequestedRegion() );
- highIter.OverrideBoundaryCondition( &boundaryCondition );
+ NeighborhoodIteratorType highIter(highPassOperator.GetRadius(),
+ overSampledHighPass->GetOutput(),
+ overSampledHighPass->GetOutput()->GetRequestedRegion());
+ highIter.OverrideBoundaryCondition(&boundaryCondition);
lowIter.GoToBegin();
highIter.GoToBegin();
out.GoToBegin();
- while ( !out.IsAtEnd() )
- {
- out.Set( innerProduct( lowIter, lowPassOperator )
- + innerProduct( highIter, highPassOperator ) );
+ while (!out.IsAtEnd())
+ {
+ out.Set(innerProduct(lowIter, lowPassOperator)
+ + innerProduct(highIter, highPassOperator));
++lowIter;
++highIter;
++out;
reporter.CompletedPixel();
- }
- } // end for each overSampledLowPass/overSampledhighPass pair of entry
- }
+ }
+ } // end for each overSampledLowPass/overSampledhighPass pair of entry
+ }
else // multiscale case
- {
- for ( unsigned int i = 0; i < m_InternalImages[direction-1].size(); i+=2 )
{
- InputImagePointerType imgLowPass = m_InternalImages[direction-1][i];
- InputImagePointerType imgHighPass = m_InternalImages[direction-1][i+1];
+ for (unsigned int i = 0; i < m_InternalImages[direction - 1].size(); i += 2)
+ {
+ InputImagePointerType imgLowPass = m_InternalImages[direction - 1][i];
+ InputImagePointerType imgHighPass = m_InternalImages[direction - 1][i + 1];
OutputImagePointerType outputImage = this->GetOutput();
- if ( direction < InputImageDimension-1 )
- {
- outputImage = m_InternalImages[direction][i/2];
- }
+ if (direction < InputImageDimension - 1)
+ {
+ outputImage = m_InternalImages[direction][i / 2];
+ }
- InnerProductType innerProduct;
+ InnerProductType innerProduct;
FaceCalculatorType faceCalculator;
- FaceListType faceList;
- faceList = faceCalculator( imgLowPass, imgLowPass->GetRequestedRegion(), radiusMax );
+ FaceListType faceList;
+ faceList = faceCalculator(imgLowPass, imgLowPass->GetRequestedRegion(), radiusMax);
- for ( FaceListIterator faceIt = faceList.begin(); faceIt != faceList.end(); ++faceIt )
- {
- itk::ImageRegionIterator< OutputImageType > out ( outputImage, *faceIt );
+ for (FaceListIterator faceIt = faceList.begin(); faceIt != faceList.end(); ++faceIt)
+ {
+ itk::ImageRegionIterator<OutputImageType> out(outputImage, *faceIt);
- NeighborhoodIteratorType lowIter ( lowPassOperator.GetRadius(), imgLowPass, *faceIt );
- itk::PeriodicBoundaryCondition< OutputImageType > boundaryCondition;
+ NeighborhoodIteratorType lowIter(lowPassOperator.GetRadius(), imgLowPass, *faceIt);
+ itk::PeriodicBoundaryCondition<OutputImageType> boundaryCondition;
//otb::MirrorBoundaryCondition< OutputImageType > boundaryCondition;
- lowIter.OverrideBoundaryCondition( &boundaryCondition );
+ lowIter.OverrideBoundaryCondition(&boundaryCondition);
- NeighborhoodIteratorType highIter ( highPassOperator.GetRadius(), imgHighPass, *faceIt );
- highIter.OverrideBoundaryCondition( &boundaryCondition );
+ NeighborhoodIteratorType highIter(highPassOperator.GetRadius(), imgHighPass, *faceIt);
+ highIter.OverrideBoundaryCondition(&boundaryCondition);
lowIter.GoToBegin();
highIter.GoToBegin();
out.GoToBegin();
- while ( !out.IsAtEnd() )
- {
- out.Set( ( innerProduct( lowIter, lowPassOperator )
- + innerProduct( highIter, highPassOperator ) ) / 2. );
+ while (!out.IsAtEnd())
+ {
+ out.Set((innerProduct(lowIter, lowPassOperator)
+ + innerProduct(highIter, highPassOperator)) / 2.);
++lowIter;
++highIter;
++out;
reporter.CompletedPixel();
+ }
}
- }
- } // end for each imgLowPass/imghighPass pair of entry
- }
+ } // end for each imgLowPass/imghighPass pair of entry
+ }
- if ( direction < InputImageDimension-1 )
- {
- ThreadedGenerateDataAtDimensionN( direction+1, reporter, outputImageRegion, threadId );
- }
+ if (direction < InputImageDimension - 1)
+ {
+ ThreadedGenerateDataAtDimensionN(direction + 1, reporter, outputImageRegion, threadId);
+ }
}
} // end of namespace
#endif
-
-
diff --git a/Code/MultiScale/otbWaveletForwardTransform.txx b/Code/MultiScale/otbWaveletForwardTransform.txx
index 5e64645e6a..7076d0dd1c 100644
--- a/Code/MultiScale/otbWaveletForwardTransform.txx
+++ b/Code/MultiScale/otbWaveletForwardTransform.txx
@@ -25,8 +25,8 @@
namespace otb {
-template < class TInputImage, class TOutputImage, class TFilter >
-WaveletForwardTransform< TInputImage, TOutputImage, TFilter >
+template <class TInputImage, class TOutputImage, class TFilter>
+WaveletForwardTransform<TInputImage, TOutputImage, TFilter>
::WaveletForwardTransform ()
{
this->SetNumberOfRequiredInputs(1);
@@ -38,46 +38,46 @@ WaveletForwardTransform< TInputImage, TOutputImage, TFilter >
m_UseSubSampleImage = false;
}
-template < class TInputImage, class TOutputImage, class TFilter >
+template <class TInputImage, class TOutputImage, class TFilter>
void
-WaveletForwardTransform< TInputImage, TOutputImage, TFilter >
-::SetNumberOfDecompositions ( unsigned int num )
+WaveletForwardTransform<TInputImage, TOutputImage, TFilter>
+::SetNumberOfDecompositions(unsigned int num)
{
this->m_NumberOfDecompositions = num;
- m_FilterList->Reserve( this->GetNumberOfDecompositions() );
- for ( unsigned int i = 0; i < this->GetNumberOfDecompositions(); ++i )
- m_FilterList->PushBack( FilterType::New() );
+ m_FilterList->Reserve(this->GetNumberOfDecompositions());
+ for (unsigned int i = 0; i < this->GetNumberOfDecompositions(); ++i)
+ m_FilterList->PushBack(FilterType::New());
unsigned int nbOutputsPerFilter = this->GetFilter(0)->GetNumberOfOutputs();
- unsigned int nbOutputs = 1 + this->GetNumberOfDecompositions() * ( nbOutputsPerFilter-1 );
+ unsigned int nbOutputs = 1 + this->GetNumberOfDecompositions() * (nbOutputsPerFilter - 1);
- this->SetNumberOfOutputs( nbOutputs );
+ this->SetNumberOfOutputs(nbOutputs);
unsigned int idx = 0;
- GetFilter(0)->GraftNthOutput( 0, this->GetOutput(idx++) );
-
- for ( unsigned int i = 0; i < this->GetNumberOfDecompositions(); ++i )
- {
- for ( unsigned int j = 1; j < this->GetFilter(i)->GetNumberOfOutputs(); ++j )
+ GetFilter(0)->GraftNthOutput(0, this->GetOutput(idx++));
+
+ for (unsigned int i = 0; i < this->GetNumberOfDecompositions(); ++i)
{
- this->SetNthOutput( idx, OutputImageType::New() );
- GetFilter(i)->GraftNthOutput( j, this->GetOutput( idx++ ) );
+ for (unsigned int j = 1; j < this->GetFilter(i)->GetNumberOfOutputs(); ++j)
+ {
+ this->SetNthOutput(idx, OutputImageType::New());
+ GetFilter(i)->GraftNthOutput(j, this->GetOutput(idx++));
+ }
}
- }
this->Modified();
}
-template < class TInputImage, class TOutputImage, class TFilter >
+template <class TInputImage, class TOutputImage, class TFilter>
void
-WaveletForwardTransform< TInputImage, TOutputImage, TFilter >
-::GenerateData ()
+WaveletForwardTransform<TInputImage, TOutputImage, TFilter>
+::GenerateData()
{
this->AllocateOutputs();
- unsigned int nbDecomp = this->GetNumberOfDecompositions()-1;
- GetFilter(nbDecomp)->SetInput( this->GetInput() );
+ unsigned int nbDecomp = this->GetNumberOfDecompositions() - 1;
+ GetFilter(nbDecomp)->SetInput(this->GetInput());
unsigned int idx;
unsigned int outputIdxForGraft = this->GetNumberOfOutputs() - 1;
@@ -89,8 +89,8 @@ WaveletForwardTransform< TInputImage, TOutputImage, TFilter >
*/
unsigned int subSampleFactor = 0;
- while ( nbDecomp > 0 )
- {
+ while (nbDecomp > 0)
+ {
/*
std::cerr << "Doing Decomp " << nbDecomp << "\n";
std::cerr << "outputIdxForGraft = " << outputIdxForGraft << "\n";
@@ -99,22 +99,21 @@ WaveletForwardTransform< TInputImage, TOutputImage, TFilter >
*/
idx = this->GetFilter(nbDecomp)->GetNumberOfOutputs();
- while ( idx-- > 1 )
- GetFilter(nbDecomp)->GraftNthOutput( idx, this->GetOutput( outputIdxForGraft-- ) );
+ while (idx-- > 1)
+ GetFilter(nbDecomp)->GraftNthOutput(idx, this->GetOutput(outputIdxForGraft--));
- if ( m_UseSubSampleImage == false )
- GetFilter(nbDecomp)->SetUpSampleFilterFactor( ++subSampleFactor );
+ if (m_UseSubSampleImage == false) GetFilter(nbDecomp)->SetUpSampleFilterFactor(++subSampleFactor);
- GetFilter( nbDecomp )->Update();
+ GetFilter(nbDecomp)->Update();
idx = this->GetFilter(nbDecomp)->GetNumberOfOutputs();
- while ( idx-- > 1 )
- this->GetOutput( outputIdxToGraft-- )->Graft( GetFilter(nbDecomp)->GetOutput( idx ) );
+ while (idx-- > 1)
+ this->GetOutput(outputIdxToGraft--)->Graft(GetFilter(nbDecomp)->GetOutput(idx));
- GetFilter( nbDecomp-1 )->SetInput( GetFilter( nbDecomp )->GetOutput(0) );
+ GetFilter(nbDecomp - 1)->SetInput(GetFilter(nbDecomp)->GetOutput(0));
--nbDecomp;
- }
+ }
/*
std::cerr << "Doing last Decomp (nbDecomp=" << nbDecomp << ")\n";
@@ -124,21 +123,18 @@ WaveletForwardTransform< TInputImage, TOutputImage, TFilter >
*/
idx = this->GetFilter(nbDecomp)->GetNumberOfOutputs();
- while ( idx-- > 0 )
- GetFilter(nbDecomp)->GraftNthOutput( idx, this->GetOutput( outputIdxForGraft-- ) );
+ while (idx-- > 0)
+ GetFilter(nbDecomp)->GraftNthOutput(idx, this->GetOutput(outputIdxForGraft--));
- if ( m_UseSubSampleImage == false )
- GetFilter(nbDecomp)->SetUpSampleFilterFactor( ++subSampleFactor );
+ if (m_UseSubSampleImage == false) GetFilter(nbDecomp)->SetUpSampleFilterFactor(++subSampleFactor);
- GetFilter( nbDecomp )->Update();
+ GetFilter(nbDecomp)->Update();
idx = this->GetFilter(nbDecomp)->GetNumberOfOutputs();
- while ( idx-- > 0 )
- this->GetOutput( outputIdxToGraft-- )->Graft( GetFilter(nbDecomp)->GetOutput( idx ) );
+ while (idx-- > 0)
+ this->GetOutput(outputIdxToGraft--)->Graft(GetFilter(nbDecomp)->GetOutput(idx));
}
} // end of namespace otb
#endif
-
-
diff --git a/Code/MultiScale/otbWaveletGenerator.cxx b/Code/MultiScale/otbWaveletGenerator.cxx
index b84c20acbe..1ba66cae68 100644
--- a/Code/MultiScale/otbWaveletGenerator.cxx
+++ b/Code/MultiScale/otbWaveletGenerator.cxx
@@ -30,42 +30,42 @@ namespace otb {
/**
* Standart (useless) definition for unknown wavelet
*/
-template < Wavelet::Wavelet TMotherWaveletOperator >
+template <Wavelet::Wavelet TMotherWaveletOperator>
const char *
-WaveletGenerator< TMotherWaveletOperator >
-::GetWaveletName () const
+WaveletGenerator<TMotherWaveletOperator>
+::GetWaveletName() const
{
itk::OStringStream msg;
msg << "The mother wavelet ID " << TMotherWaveletOperator;
msg << " is unkown or has to be implemented...\n";
- throw itk::ExceptionObject( __FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION );
+ throw itk::ExceptionObject(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
return "Unknown";
}
-template < Wavelet::Wavelet TMotherWaveletOperator >
+template <Wavelet::Wavelet TMotherWaveletOperator>
void
-WaveletGenerator< TMotherWaveletOperator >
-::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
+WaveletGenerator<TMotherWaveletOperator>
+::GetLowPassCoefficientVector(CoefficientVector& coeff) const
{
itk::OStringStream msg;
msg << "The mother wavelet ID " << TMotherWaveletOperator;
msg << " is unkown or has to be implemented...\n";
- throw itk::ExceptionObject( __FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION );
+ throw itk::ExceptionObject(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
CoefficientVector vector;
return vector;
}
-template < Wavelet::Wavelet TMotherWaveletOperator >
+template <Wavelet::Wavelet TMotherWaveletOperator>
void
-WaveletGenerator< TMotherWaveletOperator >
-::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
+WaveletGenerator<TMotherWaveletOperator>
+::GetHighPassCoefficientVector(CoefficientVector& coeff) const
{
itk::OStringStream msg;
msg << "The mother wavelet ID " << TMotherWaveletOperator;
msg << " is unkown or has to be implemented (check the txx file)...\n";
- throw itk::ExceptionObject( __FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION );
+ throw itk::ExceptionObject(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
CoefficientVector vector;
return vector;
@@ -75,18 +75,18 @@ WaveletGenerator< TMotherWaveletOperator >
* Template specialization for the Haar wavelet
*/
template <>
-const char * WaveletGenerator<Wavelet::HAAR>::GetWaveletName () const
+const char * WaveletGenerator<Wavelet::HAAR>::GetWaveletName() const
{
- static const std::string waveletName ( "Haar" );
+ static const std::string waveletName ("Haar");
return waveletName.c_str();
}
template <>
void
WaveletGenerator<Wavelet::HAAR>
-::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetLowPassCoefficientVector(CoefficientVector& coeff) const
{
- static const double sqrt2 = ::vcl_sqrt( 2.0 );
+ static const double sqrt2 = ::vcl_sqrt(2.0);
coeff.resize(3);
// stands for z^{-1}
@@ -100,9 +100,9 @@ WaveletGenerator<Wavelet::HAAR>
template <>
void
WaveletGenerator<Wavelet::HAAR>
-::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetHighPassCoefficientVector(CoefficientVector& coeff) const
{
- static const double sqrt2 = ::vcl_sqrt( 2.0 );
+ static const double sqrt2 = ::vcl_sqrt(2.0);
coeff.resize(3);
// stands for z^{-1}
@@ -117,41 +117,41 @@ WaveletGenerator<Wavelet::HAAR>
* Template specialization for the Daubechies 4 wavelet
*/
template <>
-const char * WaveletGenerator<Wavelet::DAUBECHIES4>::GetWaveletName () const
+const char * WaveletGenerator<Wavelet::DAUBECHIES4>::GetWaveletName() const
{
- static const std::string waveletName ( "Daubechies_4" );
+ static const std::string waveletName ("Daubechies_4");
return waveletName.c_str();
}
template <>
void
WaveletGenerator<Wavelet::DAUBECHIES4>
-::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetLowPassCoefficientVector(CoefficientVector& coeff) const
{
static const double sqrt2 = ::vcl_sqrt(2.);
static const double sqrt3 = ::vcl_sqrt(3.);
coeff.push_back(0.);
- coeff.push_back( (1 + sqrt3) / 8.0 * sqrt2 );
- coeff.push_back( (3 + sqrt3) / 8.0 * sqrt2 );
- coeff.push_back( (3 - sqrt3) / 8.0 * sqrt2 );
- coeff.push_back( (1 - sqrt3) / 8.0 * sqrt2 );
+ coeff.push_back((1 + sqrt3) / 8.0 * sqrt2);
+ coeff.push_back((3 + sqrt3) / 8.0 * sqrt2);
+ coeff.push_back((3 - sqrt3) / 8.0 * sqrt2);
+ coeff.push_back((1 - sqrt3) / 8.0 * sqrt2);
coeff.resize(5);
}
template <>
void
WaveletGenerator<Wavelet::DAUBECHIES4>
-::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetHighPassCoefficientVector(CoefficientVector& coeff) const
{
static const double sqrt2 = ::vcl_sqrt(2.);
static const double sqrt3 = ::vcl_sqrt(3.);
coeff.push_back(0);
- coeff.push_back( -(1 - sqrt3) / 8.0 * sqrt2 );
- coeff.push_back( (3 - sqrt3) / 8.0 * sqrt2 );
- coeff.push_back( -(3 + sqrt3) / 8.0 * sqrt2 );
- coeff.push_back( (1 + sqrt3) / 8.0 * sqrt2 );
+ coeff.push_back(-(1 - sqrt3) / 8.0 * sqrt2);
+ coeff.push_back((3 - sqrt3) / 8.0 * sqrt2);
+ coeff.push_back(-(3 + sqrt3) / 8.0 * sqrt2);
+ coeff.push_back((1 + sqrt3) / 8.0 * sqrt2);
coeff.resize(5);
}
@@ -159,39 +159,39 @@ WaveletGenerator<Wavelet::DAUBECHIES4>
* Template specialization for the Daubechies 6 tap wavelet
*/
template <>
-const char * WaveletGenerator<Wavelet::DAUBECHIES6>::GetWaveletName () const
+const char * WaveletGenerator<Wavelet::DAUBECHIES6>::GetWaveletName() const
{
- static const std::string waveletName ( "Daubechies_6" );
+ static const std::string waveletName ("Daubechies_6");
return waveletName.c_str();
}
template <>
void
WaveletGenerator<Wavelet::DAUBECHIES6>
-::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetLowPassCoefficientVector(CoefficientVector& coeff) const
{
- coeff.push_back( 0. );
- coeff.push_back( 0.332670552950 );
- coeff.push_back( 0.806891509311 );
- coeff.push_back( 0.459877502118 );
- coeff.push_back(-0.135011020010 );
- coeff.push_back(-0.085441273882 );
- coeff.push_back( 0.035226291882 );
+ coeff.push_back(0.);
+ coeff.push_back(0.332670552950);
+ coeff.push_back(0.806891509311);
+ coeff.push_back(0.459877502118);
+ coeff.push_back(-0.135011020010);
+ coeff.push_back(-0.085441273882);
+ coeff.push_back(0.035226291882);
coeff.resize(7);
}
template <>
void
WaveletGenerator<Wavelet::DAUBECHIES6>
-::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetHighPassCoefficientVector(CoefficientVector& coeff) const
{
- coeff.push_back( 0. );
- coeff.push_back(-0.035226291882 );
- coeff.push_back(-0.085441273882 );
- coeff.push_back( 0.135011020010 );
- coeff.push_back( 0.459877502118 );
- coeff.push_back(-0.806891509311 );
- coeff.push_back( 0.332670552950 );
+ coeff.push_back(0.);
+ coeff.push_back(-0.035226291882);
+ coeff.push_back(-0.085441273882);
+ coeff.push_back(0.135011020010);
+ coeff.push_back(0.459877502118);
+ coeff.push_back(-0.806891509311);
+ coeff.push_back(0.332670552950);
coeff.resize(7);
}
@@ -199,43 +199,43 @@ WaveletGenerator<Wavelet::DAUBECHIES6>
* Template specialization for the Daubechies 8 wavelet
*/
template <>
-const char * WaveletGenerator<Wavelet::DAUBECHIES8>::GetWaveletName () const
+const char * WaveletGenerator<Wavelet::DAUBECHIES8>::GetWaveletName() const
{
- static const std::string waveletName ( "Daubechies_8" );
+ static const std::string waveletName ("Daubechies_8");
return waveletName.c_str();
}
template <>
void
WaveletGenerator<Wavelet::DAUBECHIES8>
-::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetLowPassCoefficientVector(CoefficientVector& coeff) const
{
- coeff.push_back( 0. );
- coeff.push_back( 0.2303778133090 );
- coeff.push_back( 0.7148465705530 );
- coeff.push_back( 0.6308807667930 );
- coeff.push_back(-0.0279837694170 );
- coeff.push_back(-0.1870348117190 );
- coeff.push_back( 0.0308413818360 );
- coeff.push_back( 0.0328830116670 );
- coeff.push_back(-0.0105974017850 );
+ coeff.push_back(0.);
+ coeff.push_back(0.2303778133090);
+ coeff.push_back(0.7148465705530);
+ coeff.push_back(0.6308807667930);
+ coeff.push_back(-0.0279837694170);
+ coeff.push_back(-0.1870348117190);
+ coeff.push_back(0.0308413818360);
+ coeff.push_back(0.0328830116670);
+ coeff.push_back(-0.0105974017850);
coeff.resize(9);
}
template <>
void
WaveletGenerator<Wavelet::DAUBECHIES8>
-::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetHighPassCoefficientVector(CoefficientVector& coeff) const
{
- coeff.push_back( 0. );
- coeff.push_back( 0.0105974017850 );
- coeff.push_back( 0.0328830116670 );
- coeff.push_back(-0.0308413818360 );
- coeff.push_back(-0.1870348117190 );
- coeff.push_back( 0.0279837694170 );
- coeff.push_back( 0.6308807667930 );
- coeff.push_back(-0.7148465705530 );
- coeff.push_back( 0.2303778133090 );
+ coeff.push_back(0.);
+ coeff.push_back(0.0105974017850);
+ coeff.push_back(0.0328830116670);
+ coeff.push_back(-0.0308413818360);
+ coeff.push_back(-0.1870348117190);
+ coeff.push_back(0.0279837694170);
+ coeff.push_back(0.6308807667930);
+ coeff.push_back(-0.7148465705530);
+ coeff.push_back(0.2303778133090);
coeff.resize(9);
}
@@ -243,51 +243,51 @@ WaveletGenerator<Wavelet::DAUBECHIES8>
* Template specialization for the Daubechies 12 tap wavelet
*/
template <>
-const char * WaveletGenerator<Wavelet::DAUBECHIES12>::GetWaveletName () const
+const char * WaveletGenerator<Wavelet::DAUBECHIES12>::GetWaveletName() const
{
- static const std::string waveletName ( "Daubechies_12" );
+ static const std::string waveletName ("Daubechies_12");
return waveletName.c_str();
}
template <>
void
WaveletGenerator<Wavelet::DAUBECHIES12>
-::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetLowPassCoefficientVector(CoefficientVector& coeff) const
{
- coeff.push_back( 0. );
- coeff.push_back( 0.1115407433501095 );
- coeff.push_back( 0.4946238903984533 );
- coeff.push_back( 0.7511339080210959 );
- coeff.push_back( 0.3152503517091982 );
- coeff.push_back(-0.2262646939654400 );
- coeff.push_back(-0.1297668675672625 );
- coeff.push_back( 0.0975016055873225 );
- coeff.push_back( 0.0275228655303053 );
- coeff.push_back(-0.0315820393184862 );
- coeff.push_back( 0.0005538422011614 );
- coeff.push_back( 0.0047772575119455 );
- coeff.push_back(-0.0010773010853085 );
+ coeff.push_back(0.);
+ coeff.push_back(0.1115407433501095);
+ coeff.push_back(0.4946238903984533);
+ coeff.push_back(0.7511339080210959);
+ coeff.push_back(0.3152503517091982);
+ coeff.push_back(-0.2262646939654400);
+ coeff.push_back(-0.1297668675672625);
+ coeff.push_back(0.0975016055873225);
+ coeff.push_back(0.0275228655303053);
+ coeff.push_back(-0.0315820393184862);
+ coeff.push_back(0.0005538422011614);
+ coeff.push_back(0.0047772575119455);
+ coeff.push_back(-0.0010773010853085);
coeff.resize(13);
}
template <>
void
WaveletGenerator<Wavelet::DAUBECHIES12>
-::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetHighPassCoefficientVector(CoefficientVector& coeff) const
{
- coeff.push_back( 0. );
- coeff.push_back( 0.0010773010853085 );
- coeff.push_back( 0.0047772575119455 );
- coeff.push_back(-0.0005538422011614 );
- coeff.push_back(-0.0315820393184862 );
- coeff.push_back(-0.0275228655303053 );
- coeff.push_back( 0.0975016055873225 );
- coeff.push_back( 0.1297668675672625 );
- coeff.push_back(-0.2262646939654400 );
- coeff.push_back(-0.3152503517091982 );
- coeff.push_back( 0.7511339080210959 );
- coeff.push_back(-0.4946238903984533 );
- coeff.push_back( 0.1115407433501095 );
+ coeff.push_back(0.);
+ coeff.push_back(0.0010773010853085);
+ coeff.push_back(0.0047772575119455);
+ coeff.push_back(-0.0005538422011614);
+ coeff.push_back(-0.0315820393184862);
+ coeff.push_back(-0.0275228655303053);
+ coeff.push_back(0.0975016055873225);
+ coeff.push_back(0.1297668675672625);
+ coeff.push_back(-0.2262646939654400);
+ coeff.push_back(-0.3152503517091982);
+ coeff.push_back(0.7511339080210959);
+ coeff.push_back(-0.4946238903984533);
+ coeff.push_back(0.1115407433501095);
coeff.resize(13);
}
@@ -295,67 +295,67 @@ WaveletGenerator<Wavelet::DAUBECHIES12>
* Template specialization for the Daubechies 20 tap wavelet
*/
template <>
-const char * WaveletGenerator<Wavelet::DAUBECHIES20>::GetWaveletName () const
+const char * WaveletGenerator<Wavelet::DAUBECHIES20>::GetWaveletName() const
{
- static const std::string waveletName ( "Daubechies_20" );
+ static const std::string waveletName ("Daubechies_20");
return waveletName.c_str();
}
template <>
void
WaveletGenerator<Wavelet::DAUBECHIES20>
-::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetLowPassCoefficientVector(CoefficientVector& coeff) const
{
- coeff.push_back( 0. );
- coeff.push_back(0.026670057901 );
- coeff.push_back( 0.188176800078 );
- coeff.push_back( 0.527201188932 );
- coeff.push_back( 0.688459039454 );
- coeff.push_back( 0.281172343661 );
- coeff.push_back(-0.249846424327 );
- coeff.push_back(-0.195946274377 );
- coeff.push_back( 0.127369340336 );
- coeff.push_back( 0.093057364604 );
- coeff.push_back(-0.071394147166 );
- coeff.push_back(-0.029457536822 );
- coeff.push_back( 0.033212674059 );
- coeff.push_back( 0.003606553567 );
- coeff.push_back(-0.010733175483 );
- coeff.push_back( 0.001395351747 );
- coeff.push_back( 0.001992405295 );
- coeff.push_back(-0.000685856695 );
- coeff.push_back(-0.000116466855 );
- coeff.push_back( 0.000093588670 );
- coeff.push_back(-0.000013264203 );
+ coeff.push_back(0.);
+ coeff.push_back(0.026670057901);
+ coeff.push_back(0.188176800078);
+ coeff.push_back(0.527201188932);
+ coeff.push_back(0.688459039454);
+ coeff.push_back(0.281172343661);
+ coeff.push_back(-0.249846424327);
+ coeff.push_back(-0.195946274377);
+ coeff.push_back(0.127369340336);
+ coeff.push_back(0.093057364604);
+ coeff.push_back(-0.071394147166);
+ coeff.push_back(-0.029457536822);
+ coeff.push_back(0.033212674059);
+ coeff.push_back(0.003606553567);
+ coeff.push_back(-0.010733175483);
+ coeff.push_back(0.001395351747);
+ coeff.push_back(0.001992405295);
+ coeff.push_back(-0.000685856695);
+ coeff.push_back(-0.000116466855);
+ coeff.push_back(0.000093588670);
+ coeff.push_back(-0.000013264203);
coeff.resize(21);
}
template <>
void
WaveletGenerator<Wavelet::DAUBECHIES20>
-::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetHighPassCoefficientVector(CoefficientVector& coeff) const
{
- coeff.push_back( 0. );
- coeff.push_back( 0.000013264203 );
- coeff.push_back( 0.000093588670 );
- coeff.push_back( 0.000116466855 );
- coeff.push_back(-0.000685856695 );
- coeff.push_back(-0.001992405295 );
- coeff.push_back( 0.001395351747 );
- coeff.push_back( 0.010733175483 );
- coeff.push_back( 0.003606553567 );
- coeff.push_back(-0.033212674059 );
- coeff.push_back(-0.029457536822 );
- coeff.push_back( 0.071394147166 );
- coeff.push_back( 0.093057364604 );
- coeff.push_back(-0.127369340336 );
- coeff.push_back(-0.195946274377 );
- coeff.push_back( 0.249846424327 );
- coeff.push_back( 0.281172343661 );
- coeff.push_back(-0.688459039454 );
- coeff.push_back( 0.527201188932 );
- coeff.push_back(-0.188176800078 );
- coeff.push_back( 0.026670057901 );
+ coeff.push_back(0.);
+ coeff.push_back(0.000013264203);
+ coeff.push_back(0.000093588670);
+ coeff.push_back(0.000116466855);
+ coeff.push_back(-0.000685856695);
+ coeff.push_back(-0.001992405295);
+ coeff.push_back(0.001395351747);
+ coeff.push_back(0.010733175483);
+ coeff.push_back(0.003606553567);
+ coeff.push_back(-0.033212674059);
+ coeff.push_back(-0.029457536822);
+ coeff.push_back(0.071394147166);
+ coeff.push_back(0.093057364604);
+ coeff.push_back(-0.127369340336);
+ coeff.push_back(-0.195946274377);
+ coeff.push_back(0.249846424327);
+ coeff.push_back(0.281172343661);
+ coeff.push_back(-0.688459039454);
+ coeff.push_back(0.527201188932);
+ coeff.push_back(-0.188176800078);
+ coeff.push_back(0.026670057901);
coeff.resize(21);
}
@@ -368,28 +368,28 @@ WaveletGenerator<Wavelet::DAUBECHIES20>
* vol 1(2), pp:205-220, April 1992
*/
template <>
-const char * WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_2_4>::GetWaveletName () const
+const char * WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_2_4>::GetWaveletName() const
{
- static const std::string waveletName ( "SplineBiorthoonal_2_4" );
+ static const std::string waveletName ("SplineBiorthoonal_2_4");
return waveletName.c_str();
}
template <>
void
WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_2_4>
-::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetLowPassCoefficientVector(CoefficientVector& coeff) const
{
- static const double sqrt2 = ::vcl_sqrt( 2.0 );
-
- coeff.push_back( 3.0 / 128.0 * sqrt2 );
- coeff.push_back( - 3.0 / 64.0 * sqrt2 );
- coeff.push_back( - 1.0 / 8.0 * sqrt2 );
- coeff.push_back( 19.0 / 64.0 * sqrt2 );
- coeff.push_back( 45.0 / 64.0 * sqrt2 );
- coeff.push_back( 19.0 / 64.0 * sqrt2 );
- coeff.push_back( - 1.0 / 8.0 * sqrt2 );
- coeff.push_back( - 3.0 / 64.0 * sqrt2 );
- coeff.push_back( 3.0 / 128.0 * sqrt2 );
+ static const double sqrt2 = ::vcl_sqrt(2.0);
+
+ coeff.push_back(3.0 / 128.0 * sqrt2);
+ coeff.push_back(-3.0 / 64.0 * sqrt2);
+ coeff.push_back(-1.0 / 8.0 * sqrt2);
+ coeff.push_back(19.0 / 64.0 * sqrt2);
+ coeff.push_back(45.0 / 64.0 * sqrt2);
+ coeff.push_back(19.0 / 64.0 * sqrt2);
+ coeff.push_back(-1.0 / 8.0 * sqrt2);
+ coeff.push_back(-3.0 / 64.0 * sqrt2);
+ coeff.push_back(3.0 / 128.0 * sqrt2);
coeff.resize(9);
}
@@ -397,18 +397,18 @@ WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_2_4>
template <>
void
WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_2_4>
-::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetHighPassCoefficientVector(CoefficientVector& coeff) const
{
- static const double sqrt2 = ::vcl_sqrt( 2.0 );
+ static const double sqrt2 = ::vcl_sqrt(2.0);
- coeff.push_back(-1.0 / 4.0 * sqrt2 );
- coeff.push_back( 1.0 / 2.0 * sqrt2 );
- coeff.push_back(-1.0 / 4.0 * sqrt2 );
- coeff.push_back( 0. );
- coeff.push_back( 0. );
+ coeff.push_back(-1.0 / 4.0 * sqrt2);
+ coeff.push_back(1.0 / 2.0 * sqrt2);
+ coeff.push_back(-1.0 / 4.0 * sqrt2);
+ coeff.push_back(0.);
+ coeff.push_back(0.);
coeff.resize(5);
}
-
+
/**
* Template specialization for the Spline Biorthogonal Wavelet.
*
@@ -423,47 +423,47 @@ WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_2_4>
* Also known as 7/9 filter.
*/
template <>
-const char * WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_4_4>::GetWaveletName () const
+const char * WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_4_4>::GetWaveletName() const
{
- static const std::string waveletName ( "SplineBiorthoonal_4_4" );
+ static const std::string waveletName ("SplineBiorthoonal_4_4");
return waveletName.c_str();
}
template <>
void
WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_4_4>
-::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetLowPassCoefficientVector(CoefficientVector& coeff) const
{
- static const double sqrt2 = ::vcl_sqrt( 2.0 );
-
- coeff.push_back( 0.026748757411 * sqrt2 );
- coeff.push_back(-0.016864118443 * sqrt2 );
- coeff.push_back(-0.078223266529 * sqrt2 );
- coeff.push_back( 0.266864118443 * sqrt2 );
- coeff.push_back( 0.602949018236 * sqrt2 );
- coeff.push_back( 0.266864118443 * sqrt2 );
- coeff.push_back(-0.078223266529 * sqrt2 );
- coeff.push_back(-0.016864118443 * sqrt2 );
- coeff.push_back( 0.026748757411 * sqrt2 );
+ static const double sqrt2 = ::vcl_sqrt(2.0);
+
+ coeff.push_back(0.026748757411 * sqrt2);
+ coeff.push_back(-0.016864118443 * sqrt2);
+ coeff.push_back(-0.078223266529 * sqrt2);
+ coeff.push_back(0.266864118443 * sqrt2);
+ coeff.push_back(0.602949018236 * sqrt2);
+ coeff.push_back(0.266864118443 * sqrt2);
+ coeff.push_back(-0.078223266529 * sqrt2);
+ coeff.push_back(-0.016864118443 * sqrt2);
+ coeff.push_back(0.026748757411 * sqrt2);
coeff.resize(9);
}
template <>
void
WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_4_4>
-::GetHighPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetHighPassCoefficientVector(CoefficientVector& coeff) const
{
- static const double sqrt2 = ::vcl_sqrt( 2.0 );
-
- coeff.push_back( 0.045635881557 * sqrt2 );
- coeff.push_back(-0.028771763114 * sqrt2 );
- coeff.push_back(-0.295635881557 * sqrt2 );
- coeff.push_back( 0.557543526229 * sqrt2 );
- coeff.push_back(-0.295635881557 * sqrt2 );
- coeff.push_back(-0.028771763114 * sqrt2 );
- coeff.push_back( 0.045635881557 * sqrt2 );
- coeff.push_back( 0. );
- coeff.push_back( 0. );
+ static const double sqrt2 = ::vcl_sqrt(2.0);
+
+ coeff.push_back(0.045635881557 * sqrt2);
+ coeff.push_back(-0.028771763114 * sqrt2);
+ coeff.push_back(-0.295635881557 * sqrt2);
+ coeff.push_back(0.557543526229 * sqrt2);
+ coeff.push_back(-0.295635881557 * sqrt2);
+ coeff.push_back(-0.028771763114 * sqrt2);
+ coeff.push_back(0.045635881557 * sqrt2);
+ coeff.push_back(0.);
+ coeff.push_back(0.);
coeff.resize(9);
}
@@ -471,42 +471,42 @@ WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_4_4>
* Template specialization for the Symlet 8 tap orthogonal wavelet
*/
template <>
-const char * WaveletGenerator<Wavelet::SYMLET8>::GetWaveletName () const
+const char * WaveletGenerator<Wavelet::SYMLET8>::GetWaveletName() const
{
- static const std::string waveletName ( "Symlet_8" );
+ static const std::string waveletName ("Symlet_8");
return waveletName.c_str();
}
template <>
void
WaveletGenerator<Wavelet::SYMLET8>
-::GetLowPassCoefficientVector ( CoefficientVector & coeff ) const
+::GetLowPassCoefficientVector(CoefficientVector& coeff) const
{
- coeff.push_back( 0. );
+ coeff.push_back(0.);
coeff.push_back(-0.075765714789273);
coeff.push_back(-0.029635527645999);
- coeff.push_back( 0.497618667632015);
- coeff.push_back( 0.803738751805916);
- coeff.push_back( 0.297857795605277);
+ coeff.push_back(0.497618667632015);
+ coeff.push_back(0.803738751805916);
+ coeff.push_back(0.297857795605277);
coeff.push_back(-0.099219543576847);
coeff.push_back(-0.012603967262038);
- coeff.push_back( 0.032223100604043);
+ coeff.push_back(0.032223100604043);
coeff.resize(9);
}
template <>
void
WaveletGenerator<Wavelet::SYMLET8>
-::GetHighPassCoefficientVector( CoefficientVector & coeff ) const
+::GetHighPassCoefficientVector(CoefficientVector& coeff) const
{
- coeff.push_back( 0. );
+ coeff.push_back(0.);
coeff.push_back(-0.032223100604043);
coeff.push_back(-0.012603967262038);
- coeff.push_back( 0.099219543576847);
- coeff.push_back( 0.297857795605277);
+ coeff.push_back(0.099219543576847);
+ coeff.push_back(0.297857795605277);
coeff.push_back(-0.803738751805916);
- coeff.push_back( 0.497618667632015);
- coeff.push_back( 0.029635527645999);
+ coeff.push_back(0.497618667632015);
+ coeff.push_back(0.029635527645999);
coeff.push_back(-0.075765714789273);
coeff.resize(9);
}
@@ -515,18 +515,16 @@ WaveletGenerator<Wavelet::SYMLET8>
* Forcing instantiation
*/
-template class WaveletGenerator< Wavelet::HAAR >;
-template class WaveletGenerator< Wavelet::DB4 >;
-template class WaveletGenerator< Wavelet::DB6 >;
-template class WaveletGenerator< Wavelet::DB8 >;
-template class WaveletGenerator< Wavelet::DB12 >;
-template class WaveletGenerator< Wavelet::DB20 >;
-template class WaveletGenerator< Wavelet::SPLINE_BIORTHOGONAL_2_4 >;
-template class WaveletGenerator< Wavelet::SPLINE_BIORTHOGONAL_4_4 >;
-template class WaveletGenerator< Wavelet::SYMLET8 >;
+template class WaveletGenerator<Wavelet::HAAR>;
+template class WaveletGenerator<Wavelet::DB4>;
+template class WaveletGenerator<Wavelet::DB6>;
+template class WaveletGenerator<Wavelet::DB8>;
+template class WaveletGenerator<Wavelet::DB12>;
+template class WaveletGenerator<Wavelet::DB20>;
+template class WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_2_4>;
+template class WaveletGenerator<Wavelet::SPLINE_BIORTHOGONAL_4_4>;
+template class WaveletGenerator<Wavelet::SYMLET8>;
} // end of namespace otb
//#endif
-
-
diff --git a/Code/MultiScale/otbWaveletGenerator.h b/Code/MultiScale/otbWaveletGenerator.h
index aaf606d106..88ae02946c 100644
--- a/Code/MultiScale/otbWaveletGenerator.h
+++ b/Code/MultiScale/otbWaveletGenerator.h
@@ -31,7 +31,7 @@ namespace otb
namespace Wavelet
{
-enum Wavelet{
+enum Wavelet {
HAAR = 0,
DAUBECHIES4 = 1, DB4 = 1,
DAUBECHIES6 = 2, DB6 = 2,
@@ -42,7 +42,7 @@ enum Wavelet{
SPLINE_BIORTHOGONAL_4_4, // 7
SYMLET8, // 8
TotalNumberOfDefinedMotherWavelets
-};
+ };
}
/** \class WaveletGenerator
@@ -57,25 +57,25 @@ enum Wavelet{
* exception if the template specialization is not defined
* according to the wavelet ID.
*/
-template < Wavelet::Wavelet TMotherWaveletOperator >
+template <Wavelet::Wavelet TMotherWaveletOperator>
class ITK_EXPORT WaveletGenerator
: public itk::LightObject
{
public:
/** Standard typedefs */
- typedef WaveletGenerator Self;
- typedef itk::LightObject Superclass;
- typedef itk::SmartPointer< Self > Pointer;
- typedef itk::SmartPointer< const Self > ConstPointer;
+ typedef WaveletGenerator Self;
+ typedef itk::LightObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro( WaveletGenerator, LightObject );
+ itkTypeMacro(WaveletGenerator, LightObject);
/** Typedef similar to itk::NeighborhoodOperator */
- typedef std::vector< double > CoefficientVector;
+ typedef std::vector<double> CoefficientVector;
/**
* GetWaveletName
@@ -87,21 +87,21 @@ public:
* GetLowPassCoefficientVector
* By default (without template specification) it does nothing usable
*/
- void GetLowPassCoefficientVector ( CoefficientVector & coeff ) const;
+ void GetLowPassCoefficientVector(CoefficientVector& coeff) const;
/**
* GetHighPassCoefficientVector
* By default (without template specification) it does nothing usable
*/
- void GetHighPassCoefficientVector ( CoefficientVector & coeff ) const;
+ void GetHighPassCoefficientVector(CoefficientVector& coeff) const;
protected:
WaveletGenerator() {}
virtual ~WaveletGenerator() {}
private:
- WaveletGenerator( const Self& ); // not implemented
- void operator=(const Self &); // not implemented
+ WaveletGenerator(const Self &); // not implemented
+ void operator =(const Self&); // not implemented
}; // end of class
} // end of namespace otb
@@ -113,5 +113,3 @@ private:
*/
#endif
-
-
diff --git a/Code/MultiScale/otbWaveletHighPassOperator.h b/Code/MultiScale/otbWaveletHighPassOperator.h
index 6bacde2623..5af9076852 100644
--- a/Code/MultiScale/otbWaveletHighPassOperator.h
+++ b/Code/MultiScale/otbWaveletHighPassOperator.h
@@ -35,29 +35,29 @@ namespace otb {
* \sa WaveletOperator
* \sa WaveletGenerator
*/
-template < Wavelet::Wavelet TMotherWaveletOperator,
- Wavelet::WaveletDirection TDirectionOfTransformation,
- class TPixel, unsigned int VDimension,
- class TAllocator = itk::NeighborhoodAllocator< TPixel > >
+template <Wavelet::Wavelet TMotherWaveletOperator,
+ Wavelet::WaveletDirection TDirectionOfTransformation,
+ class TPixel, unsigned int VDimension,
+ class TAllocator = itk::NeighborhoodAllocator<TPixel> >
class ITK_EXPORT WaveletHighPassOperator
- : public WaveletOperatorBase< TMotherWaveletOperator,
- TPixel, VDimension, TAllocator >
+ : public WaveletOperatorBase<TMotherWaveletOperator,
+ TPixel, VDimension, TAllocator>
{
public:
/** Standard typedefs */
typedef WaveletHighPassOperator Self;
- typedef WaveletOperatorBase< TMotherWaveletOperator,
- TPixel, VDimension, TAllocator> Superclass;
+ typedef WaveletOperatorBase<TMotherWaveletOperator,
+ TPixel, VDimension, TAllocator> Superclass;
itkTypeMacro(WaveletHighPassOperator, WaveletOperatorBase);
typedef typename Superclass::SizeType SizeType;
- typedef Wavelet::WaveletDirection DirectionOfTransformationEnumType;
- itkStaticConstMacro(DirectionOfTransformation,DirectionOfTransformationEnumType,TDirectionOfTransformation);
+ typedef Wavelet::WaveletDirection DirectionOfTransformationEnumType;
+ itkStaticConstMacro(DirectionOfTransformation, DirectionOfTransformationEnumType, TDirectionOfTransformation);
protected:
- virtual void PrintSelf(std::ostream &os, itk::Indent i) const
+ virtual void PrintSelf(std::ostream& os, itk::Indent i) const
{
os << i << "WaveletHighPassOperator {this=" << this << "}" << std::endl;
Superclass::PrintSelf(os, i.GetNextIndent());
@@ -68,7 +68,7 @@ protected:
* work around compiler bug on VC++.
*/
typedef typename Superclass::CoefficientVector CoefficientVector;
- typedef typename Superclass::PixelType PixelType;
+ typedef typename Superclass::PixelType PixelType;
/**
* Set operator coefficients.
@@ -76,20 +76,20 @@ protected:
CoefficientVector GenerateCoefficients()
{
CoefficientVector coeff;
- switch ( DirectionOfTransformation )
- {
- case Wavelet::FORWARD:
- this->m_WaveletGenerator->GetHighPassCoefficientVector( coeff );
- break;
- case Wavelet::INVERSE:
- this->m_WaveletGenerator->GetLowPassCoefficientVector( coeff );
- Superclass::GenerateInverseHighPassFilterFromLowPassFilter( coeff );
- break;
- default: // Here to prevent from compilation warnings
- break;
- }
-
- Superclass::UpSamplingCoefficients( coeff );
+ switch (DirectionOfTransformation)
+ {
+ case Wavelet::FORWARD:
+ this->m_WaveletGenerator->GetHighPassCoefficientVector(coeff);
+ break;
+ case Wavelet::INVERSE:
+ this->m_WaveletGenerator->GetLowPassCoefficientVector(coeff);
+ Superclass::GenerateInverseHighPassFilterFromLowPassFilter(coeff);
+ break;
+ default: // Here to prevent from compilation warnings
+ break;
+ }
+
+ Superclass::UpSamplingCoefficients(coeff);
return coeff;
}
}; // end of class
@@ -97,5 +97,3 @@ protected:
} // end of namespace otb
#endif
-
-
diff --git a/Code/MultiScale/otbWaveletLowPassOperator.h b/Code/MultiScale/otbWaveletLowPassOperator.h
index 186d6bf0b4..59b151d4ee 100644
--- a/Code/MultiScale/otbWaveletLowPassOperator.h
+++ b/Code/MultiScale/otbWaveletLowPassOperator.h
@@ -34,29 +34,29 @@ namespace otb {
* \sa WaveletOperatorBase
* \sa WaveletGenerator
*/
-template < Wavelet::Wavelet TMotherWaveletOperator,
- Wavelet::WaveletDirection TDirectionOfTransformation,
- class TPixel, unsigned int VDimension,
- class TAllocator = itk::NeighborhoodAllocator< TPixel > >
+template <Wavelet::Wavelet TMotherWaveletOperator,
+ Wavelet::WaveletDirection TDirectionOfTransformation,
+ class TPixel, unsigned int VDimension,
+ class TAllocator = itk::NeighborhoodAllocator<TPixel> >
class ITK_EXPORT WaveletLowPassOperator
- : public WaveletOperatorBase< TMotherWaveletOperator,
- TPixel, VDimension, TAllocator >
+ : public WaveletOperatorBase<TMotherWaveletOperator,
+ TPixel, VDimension, TAllocator>
{
public:
/** Standard typedefs */
typedef WaveletLowPassOperator Self;
- typedef WaveletOperatorBase< TMotherWaveletOperator,
- TPixel, VDimension, TAllocator> Superclass;
+ typedef WaveletOperatorBase<TMotherWaveletOperator,
+ TPixel, VDimension, TAllocator> Superclass;
itkTypeMacro(WaveletLowPassOperator, WaveletOperatorBase);
typedef typename Superclass::SizeType SizeType;
- typedef Wavelet::WaveletDirection DirectionOfTransformationEnumType;
- itkStaticConstMacro(DirectionOfTransformation,DirectionOfTransformationEnumType,TDirectionOfTransformation);
+ typedef Wavelet::WaveletDirection DirectionOfTransformationEnumType;
+ itkStaticConstMacro(DirectionOfTransformation, DirectionOfTransformationEnumType, TDirectionOfTransformation);
protected:
- virtual void PrintSelf(std::ostream &os, itk::Indent i) const
+ virtual void PrintSelf(std::ostream& os, itk::Indent i) const
{
os << i << "WaveletLowPassOperator {this=" << this << "}" << std::endl;
Superclass::PrintSelf(os, i.GetNextIndent());
@@ -67,7 +67,7 @@ protected:
* work around compiler bug on VC++.
*/
typedef typename Superclass::CoefficientVector CoefficientVector;
- typedef typename Superclass::PixelType PixelType;
+ typedef typename Superclass::PixelType PixelType;
/**
* Set operator coefficients.
@@ -75,20 +75,20 @@ protected:
CoefficientVector GenerateCoefficients()
{
CoefficientVector coeff;
- switch ( DirectionOfTransformation )
- {
- case Wavelet::FORWARD:
- this->m_WaveletGenerator->GetLowPassCoefficientVector( coeff );
- break;
- case Wavelet::INVERSE:
- this->m_WaveletGenerator->GetHighPassCoefficientVector( coeff );
- Superclass::GenerateInverseLowPassFilterFromHighPassFilter( coeff );
- break;
- default: // Here to prevent from compilation warnings
- break;
- }
-
- Superclass::UpSamplingCoefficients( coeff );
+ switch (DirectionOfTransformation)
+ {
+ case Wavelet::FORWARD:
+ this->m_WaveletGenerator->GetLowPassCoefficientVector(coeff);
+ break;
+ case Wavelet::INVERSE:
+ this->m_WaveletGenerator->GetHighPassCoefficientVector(coeff);
+ Superclass::GenerateInverseLowPassFilterFromHighPassFilter(coeff);
+ break;
+ default: // Here to prevent from compilation warnings
+ break;
+ }
+
+ Superclass::UpSamplingCoefficients(coeff);
return coeff;
}
}; // end of class
@@ -96,5 +96,3 @@ protected:
} // end of namespace otb
#endif
-
-
diff --git a/Code/MultiScale/otbWaveletOperator.h b/Code/MultiScale/otbWaveletOperator.h
index 211ce81f83..669ca99c27 100644
--- a/Code/MultiScale/otbWaveletOperator.h
+++ b/Code/MultiScale/otbWaveletOperator.h
@@ -46,10 +46,10 @@ namespace otb {
* \sa WaveletLowPassOperator
* \sa WaveletHighPassOperator
*/
-template < Wavelet::Wavelet TMotherWaveletOperator,
- Wavelet::WaveletDirection TDirectionOfTransformation,
- class TPixel, unsigned int VDimension,
- class TAllocator = itk::NeighborhoodAllocator< TPixel > >
+template <Wavelet::Wavelet TMotherWaveletOperator,
+ Wavelet::WaveletDirection TDirectionOfTransformation,
+ class TPixel, unsigned int VDimension,
+ class TAllocator = itk::NeighborhoodAllocator<TPixel> >
class ITK_EXPORT WaveletOperator
{
public:
@@ -58,13 +58,13 @@ public:
/** Typedefs redirections */
typedef WaveletLowPassOperator<
- TMotherWaveletOperator, TDirectionOfTransformation,
- TPixel, VDimension, TAllocator >
- LowPassOperator;
+ TMotherWaveletOperator, TDirectionOfTransformation,
+ TPixel, VDimension, TAllocator>
+ LowPassOperator;
typedef WaveletHighPassOperator<
- TMotherWaveletOperator, TDirectionOfTransformation,
- TPixel, VDimension, TAllocator >
- HighPassOperator;
+ TMotherWaveletOperator, TDirectionOfTransformation,
+ TPixel, VDimension, TAllocator>
+ HighPassOperator;
private:
/**
@@ -72,12 +72,10 @@ private:
* Intentionally not implemented
*/
WaveletOperator ();
- WaveletOperator ( const Self & );
+ WaveletOperator (const Self &);
~WaveletOperator();
};
} // end of namespace otb
#endif
-
-
diff --git a/Code/MultiScale/otbWaveletOperatorBase.h b/Code/MultiScale/otbWaveletOperatorBase.h
index 2b6dd96f41..04dd14bc3b 100644
--- a/Code/MultiScale/otbWaveletOperatorBase.h
+++ b/Code/MultiScale/otbWaveletOperatorBase.h
@@ -31,7 +31,7 @@ namespace otb
namespace Wavelet
{
- enum WaveletDirection{FORWARD, INVERSE};
+enum WaveletDirection {FORWARD, INVERSE};
}
/**
@@ -64,44 +64,44 @@ namespace Wavelet
*
* \ingroup Operators
*/
-template < Wavelet::Wavelet TMotherWaveletOperator,
- class TPixel, unsigned int VDimension,
- class TAllocator = itk::NeighborhoodAllocator< TPixel > >
+template <Wavelet::Wavelet TMotherWaveletOperator,
+ class TPixel, unsigned int VDimension,
+ class TAllocator = itk::NeighborhoodAllocator<TPixel> >
class ITK_EXPORT WaveletOperatorBase
- : public itk::NeighborhoodOperator<TPixel, VDimension, TAllocator>
+ : public itk::NeighborhoodOperator<TPixel, VDimension, TAllocator>
{
public:
/** Standard typedefs */
- typedef WaveletOperatorBase Self;
+ typedef WaveletOperatorBase Self;
typedef itk::NeighborhoodOperator<TPixel, VDimension, TAllocator> Superclass;
- itkTypeMacro(WaveletOperatorBase,NeighborhoodOperator);
+ itkTypeMacro(WaveletOperatorBase, NeighborhoodOperator);
typedef typename Superclass::SizeType SizeType;
typedef Wavelet::Wavelet MotherWaveletOperatorEnumType;
- itkStaticConstMacro( MotherWaveletOperator, MotherWaveletOperatorEnumType, TMotherWaveletOperator );
+ itkStaticConstMacro(MotherWaveletOperator, MotherWaveletOperatorEnumType, TMotherWaveletOperator);
/** Construction */
WaveletOperatorBase() :
- m_UpSampleFactor( 0 )
- {
+ m_UpSampleFactor(0)
+ {
m_WaveletGenerator = WaveletGeneratorType::New();
- }
+ }
/** Construction by copy */
- WaveletOperatorBase( const Self & other )
+ WaveletOperatorBase(const Self &other)
: itk::NeighborhoodOperator<TPixel, VDimension, TAllocator> (other),
- m_UpSampleFactor( other.GetUpSampleFactor() )
- {
+ m_UpSampleFactor(other.GetUpSampleFactor())
+ {
m_WaveletGenerator = WaveletGeneratorType::New();
- }
+ }
virtual ~WaveletOperatorBase() {}
/** Assignment operator */
- Self &operator=(const Self& other)
+ Self & operator =(const Self& other)
{
- Superclass::operator=(other);
+ Superclass::operator =(other);
m_UpSampleFactor = other.GetUpSampleFactor();
return *this;
}
@@ -109,7 +109,7 @@ public:
/**
* Get the level of up sampling of the filter
*/
- unsigned int GetUpSampleFactor () const
+ unsigned int GetUpSampleFactor() const
{
return this->m_UpSampleFactor;
}
@@ -117,7 +117,7 @@ public:
/**
* Set the level of up sampling of the filter
*/
- void SetUpSampleFactor ( unsigned int upSampleFactor )
+ void SetUpSampleFactor(unsigned int upSampleFactor)
{
this->m_UpSampleFactor = upSampleFactor;
}
@@ -125,35 +125,37 @@ public:
/**
* Get the name of the wavelet when necessary
*/
- virtual const char * GetWaveletName () const {
- return this->m_WaveletGenerator->GetWaveletName(); }
+ virtual const char * GetWaveletName() const
+ {
+ return this->m_WaveletGenerator->GetWaveletName();
+ }
protected:
/**
* Prints some debugging information
*/
- virtual void PrintSelf(std::ostream &os, itk::Indent i) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent i) const;
- typedef WaveletGenerator< TMotherWaveletOperator > WaveletGeneratorType;
- typedef typename WaveletGeneratorType::Pointer WaveletGeneratorPointerType;
+ typedef WaveletGenerator<TMotherWaveletOperator> WaveletGeneratorType;
+ typedef typename WaveletGeneratorType::Pointer WaveletGeneratorPointerType;
/**
* Typedef support for coefficient vector type. Necessary to
* work around compiler bug on VC++.
*/
typedef typename Superclass::CoefficientVector CoefficientVector;
- typedef typename Superclass::PixelType PixelType;
+ typedef typename Superclass::PixelType PixelType;
/**
* Perform the "a-trou" algorithm for shift-invariant transformation.
* It transforms the filter \f$ H(z) \f$ into \f$ H(z^2) \f$.
*/
- void UpSamplingCoefficients ( CoefficientVector & coeff );
-
+ void UpSamplingCoefficients(CoefficientVector& coeff);
+
/**
* Performs filter reversion, ie. \f$ H(z^{-1}) \f$.
*/
- void RevertFilter ( CoefficientVector & coeff );
+ void RevertFilter(CoefficientVector& coeff);
/**
* Performs the definition of high pass filter in an orthogonal framework
@@ -165,7 +167,7 @@ protected:
* According to Daubechies'notation, it concerns the synthesis (Inverse)
* part of the filter banc.
*/
- void GenerateForwardHighPassFilterFromLowPassFilter ( CoefficientVector & coeff );
+ void GenerateForwardHighPassFilterFromLowPassFilter(CoefficientVector& coeff);
/**
* Performs the definition of high pass filter in an orthogonal framework
@@ -177,7 +179,7 @@ protected:
* According to Daubechies'notation, it concerns the synthesis (Inverse)
* part of the filter banc.
*/
- void GenerateInverseHighPassFilterFromLowPassFilter ( CoefficientVector & coeff );
+ void GenerateInverseHighPassFilterFromLowPassFilter(CoefficientVector& coeff);
/**
* Performs the definition of low pass filter in the reconstruction
@@ -185,12 +187,12 @@ protected:
*
* It defines filter coefficients as \f$ {\tilde H}(z) = G(-z) \f$.
*/
- void GenerateInverseLowPassFilterFromHighPassFilter( CoefficientVector & coeff );
+ void GenerateInverseLowPassFilterFromHighPassFilter(CoefficientVector& coeff);
/**
* Reduce extra zeros on filters
*/
- void ReduceFilterLength ( CoefficientVector & coeff );
+ void ReduceFilterLength(CoefficientVector& coeff);
/** Arranges coefficients spatially in the memory buffer. */
void Fill(const CoefficientVector& coeff)
@@ -204,44 +206,43 @@ protected:
* bi-orthogonal framework (ie. Quadrature mirror filter).
* It defines filter coefficients as \f$ g_n = (-1)^{n+1} h_{-n} \f$
*/
- void GetHighPassFilterFromQuadratureLowPassFilter ( CoefficientVector & coeff )
+ void GetHighPassFilterFromQuadratureLowPassFilter(CoefficientVector& coeff)
{
unsigned int length = coeff.size();
- CoefficientVector highPassCoeff ( length );
- int medianPosition = static_cast<int>( length ) / 2;
+ CoefficientVector highPassCoeff (length);
+ int medianPosition = static_cast<int>(length) / 2;
highPassCoeff[medianPosition] = -coeff[medianPosition];
double sign = 1.;
- for ( int i = 1; i <= medianPosition; i++ )
- {
- highPassCoeff[ medianPosition+i ] = sign * coeff[ medianPosition-i ];
- highPassCoeff[ medianPosition-i ] = sign * coeff[ medianPosition+i ];
+ for (int i = 1; i <= medianPosition; i++)
+ {
+ highPassCoeff[medianPosition + i] = sign * coeff[medianPosition - i];
+ highPassCoeff[medianPosition - i] = sign * coeff[medianPosition + i];
sign *= -1.;
- }
+ }
coeff = highPassCoeff;
}
-
/**
* Performs the definition of synthesis filter from analysis one.
* Input is the forward low pass filter coefficients.
* It performs \f$ {\tilde G}(z) = -H(-z) \f$.
*/
- void GetInverseHighPassFilterFromForwardLowPassFilter ( CoefficientVector & coeff )
+ void GetInverseHighPassFilterFromForwardLowPassFilter(CoefficientVector& coeff)
{
- unsigned long length = static_cast<unsigned long>( coeff.size() );
- unsigned long medianPosition = length/2;
+ unsigned long length = static_cast<unsigned long>(coeff.size());
+ unsigned long medianPosition = length / 2;
// Wavelet coefficients are always of add size, so that 2*medianPosition < length
coeff[medianPosition] *= -1.;
- for ( unsigned int i = 2; i <= medianPosition; i+=2 )
- {
+ for (unsigned int i = 2; i <= medianPosition; i += 2)
+ {
coeff[medianPosition + i] *= -1.;
coeff[medianPosition - i] *= -1.;
- }
+ }
}
/**
@@ -250,17 +251,17 @@ protected:
* for orthogonal and biorthogonal cases.
* It performs \f$ {\tilde H}(z) = G(-z) \f$.
*/
- void GetInverseLowPassFilterFromForwardHighPassFilter ( CoefficientVector & coeff )
+ void GetInverseLowPassFilterFromForwardHighPassFilter(CoefficientVector& coeff)
{
- unsigned long length = static_cast<unsigned long>( coeff.size() );
- unsigned long medianPosition = length/2;
+ unsigned long length = static_cast<unsigned long>(coeff.size());
+ unsigned long medianPosition = length / 2;
// Wavelet coefficients are always of add size, so that 2*medianPosition < length
- for ( unsigned int i = 1; i <= medianPosition; i+=2 )
- {
+ for (unsigned int i = 1; i <= medianPosition; i += 2)
+ {
coeff[medianPosition + i] *= -1.;
coeff[medianPosition - i] *= -1.;
- }
+ }
}
/**
@@ -270,13 +271,13 @@ protected:
* Input are the inverse low pass filter coefficients.
* It performs \f$ G(z) = {\tilde H}(-z)\f$.
*/
- void GetForwardHighPassFilterFromInverseLowPassFilter ( CoefficientVector & coeff )
+ void GetForwardHighPassFilterFromInverseLowPassFilter(CoefficientVector& coeff)
{
- GetInverseLowPassFilterFromForwardHighPassFilter( coeff );
+ GetInverseLowPassFilterFromForwardHighPassFilter(coeff);
}
#endif
- unsigned int m_UpSampleFactor;
+ unsigned int m_UpSampleFactor;
WaveletGeneratorPointerType m_WaveletGenerator;
};
@@ -287,5 +288,3 @@ protected:
#endif
#endif
-
-
diff --git a/Code/MultiScale/otbWaveletOperatorBase.txx b/Code/MultiScale/otbWaveletOperatorBase.txx
index 9edd8751df..5f5f01a681 100644
--- a/Code/MultiScale/otbWaveletOperatorBase.txx
+++ b/Code/MultiScale/otbWaveletOperatorBase.txx
@@ -24,172 +24,169 @@
namespace otb {
-template < Wavelet::Wavelet TMotherWaveletOperator,
- class TPixel, unsigned int VDimension, class TAllocator >
+template <Wavelet::Wavelet TMotherWaveletOperator,
+ class TPixel, unsigned int VDimension, class TAllocator>
void
-WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
-::PrintSelf ( std::ostream &os, itk::Indent i ) const
+WaveletOperatorBase<TMotherWaveletOperator, TPixel, VDimension, TAllocator>
+::PrintSelf(std::ostream& os, itk::Indent i) const
{
os << i << "Wavelet kind : " << GetWaveletName() << "\n";
os << i << "Up-Sampling factor " << GetUpSampleFactor() << "\n";
Superclass::PrintSelf(os, i.GetNextIndent());
os << i << "Wavelet coeff: [ ";
- for ( typename Superclass::ConstIterator iter = Superclass::Begin();
- iter != Superclass::End();
- ++iter )
- {
+ for (typename Superclass::ConstIterator iter = Superclass::Begin();
+ iter != Superclass::End();
+ ++iter)
+ {
os << *iter << ' ';
- }
+ }
os << "]\n";
}
-
-template < Wavelet::Wavelet TMotherWaveletOperator,
- class TPixel, unsigned int VDimension, class TAllocator >
+template <Wavelet::Wavelet TMotherWaveletOperator,
+ class TPixel, unsigned int VDimension, class TAllocator>
void
-WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
-::UpSamplingCoefficients ( CoefficientVector & coeff )
+WaveletOperatorBase<TMotherWaveletOperator, TPixel, VDimension, TAllocator>
+::UpSamplingCoefficients(CoefficientVector& coeff)
{
- if ( m_UpSampleFactor <= 1 )
- return;
+ if (m_UpSampleFactor <= 1) return;
- unsigned long radius = static_cast<unsigned long>( coeff.size() ) >> 1;
+ unsigned long radius = static_cast<unsigned long>(coeff.size()) >> 1;
unsigned long upSampleRadius = radius * m_UpSampleFactor;
CoefficientVector upSampledCoeff;
- upSampledCoeff.resize( 2*upSampleRadius+1 );
- upSampledCoeff.assign( 2*upSampleRadius, 0. );
+ upSampledCoeff.resize(2 * upSampleRadius + 1);
+ upSampledCoeff.assign(2 * upSampleRadius, 0.);
upSampledCoeff[upSampleRadius] = coeff[radius];
- for ( unsigned int i = 0; i <= radius; ++i )
- {
- upSampledCoeff[ upSampleRadius + m_UpSampleFactor * i ] = coeff[radius + i];
- upSampledCoeff[ upSampleRadius - m_UpSampleFactor * i ] = coeff[radius - i];
- }
+ for (unsigned int i = 0; i <= radius; ++i)
+ {
+ upSampledCoeff[upSampleRadius + m_UpSampleFactor * i] = coeff[radius + i];
+ upSampledCoeff[upSampleRadius - m_UpSampleFactor * i] = coeff[radius - i];
+ }
coeff = upSampledCoeff;
}
-template < Wavelet::Wavelet TMotherWaveletOperator,
- class TPixel, unsigned int VDimension, class TAllocator >
+template <Wavelet::Wavelet TMotherWaveletOperator,
+ class TPixel, unsigned int VDimension, class TAllocator>
void
-WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
-::RevertFilter ( CoefficientVector & coeff )
+WaveletOperatorBase<TMotherWaveletOperator, TPixel, VDimension, TAllocator>
+::RevertFilter(CoefficientVector& coeff)
{
const unsigned int length = coeff.size();
const unsigned int medianPosition = length / 2;
- CoefficientVector newCoeff ( length );
- newCoeff[ medianPosition ] = coeff[ medianPosition ];
- for ( unsigned int i = 1; i <= medianPosition; i++ )
- {
- newCoeff[ medianPosition+i ] = coeff[ medianPosition-i ];
- newCoeff[ medianPosition-i ] = coeff[ medianPosition+i ];
- }
+ CoefficientVector newCoeff(length);
+ newCoeff[medianPosition] = coeff[medianPosition];
+ for (unsigned int i = 1; i <= medianPosition; i++)
+ {
+ newCoeff[medianPosition + i] = coeff[medianPosition - i];
+ newCoeff[medianPosition - i] = coeff[medianPosition + i];
+ }
coeff = newCoeff;
}
-template < Wavelet::Wavelet TMotherWaveletOperator,
- class TPixel, unsigned int VDimension, class TAllocator >
+template <Wavelet::Wavelet TMotherWaveletOperator,
+ class TPixel, unsigned int VDimension, class TAllocator>
void
-WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
-::GenerateForwardHighPassFilterFromLowPassFilter ( CoefficientVector & coeff )
+WaveletOperatorBase<TMotherWaveletOperator, TPixel, VDimension, TAllocator>
+::GenerateForwardHighPassFilterFromLowPassFilter(CoefficientVector& coeff)
{
const unsigned int length = coeff.size();
//const unsigned int medianPosition = length / 2;
- CoefficientVector highPassCoeff ( length + 2 );
+ CoefficientVector highPassCoeff(length + 2);
highPassCoeff[0] = 0.;
highPassCoeff[1] = 0.;
double sign = -1; //(medianPosition&1)==1 ? -1. : 1.;
- for ( unsigned int i = 0; i < length; i++ )
- {
- highPassCoeff[i+2] = sign * coeff[length-1-i];
+ for (unsigned int i = 0; i < length; i++)
+ {
+ highPassCoeff[i + 2] = sign * coeff[length - 1 - i];
sign *= -1.;
- }
+ }
//highPassCoeff[length] = 0.;
//highPassCoeff[length+1] = 0.;
coeff = highPassCoeff;
- while ( coeff[0] == coeff[ coeff.size()-1 ] )
- {
- ReduceFilterLength( coeff );
- }
+ while (coeff[0] == coeff[coeff.size() - 1])
+ {
+ ReduceFilterLength(coeff);
+ }
}
-template < Wavelet::Wavelet TMotherWaveletOperator,
- class TPixel, unsigned int VDimension, class TAllocator >
+template <Wavelet::Wavelet TMotherWaveletOperator,
+ class TPixel, unsigned int VDimension, class TAllocator>
void
-WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
-::GenerateInverseHighPassFilterFromLowPassFilter ( CoefficientVector & coeff )
+WaveletOperatorBase<TMotherWaveletOperator, TPixel, VDimension, TAllocator>
+::GenerateInverseHighPassFilterFromLowPassFilter(CoefficientVector& coeff)
{
const unsigned int length = coeff.size();
- CoefficientVector highPassCoeff ( length + 2 );
+ CoefficientVector highPassCoeff(length + 2);
double sign = -1;
- for ( unsigned int i = 0; i < length; i++ )
- {
+ for (unsigned int i = 0; i < length; i++)
+ {
highPassCoeff[i] = sign * coeff[i];
sign *= -1.;
- }
+ }
highPassCoeff[length] = 0.;
- highPassCoeff[length+1] = 0.;
+ highPassCoeff[length + 1] = 0.;
coeff = highPassCoeff;
- while ( coeff[0] == coeff[ coeff.size()-1 ] )
- {
- ReduceFilterLength( coeff );
- }
+ while (coeff[0] == coeff[coeff.size() - 1])
+ {
+ ReduceFilterLength(coeff);
+ }
}
-template < Wavelet::Wavelet TMotherWaveletOperator,
- class TPixel, unsigned int VDimension, class TAllocator >
+template <Wavelet::Wavelet TMotherWaveletOperator,
+ class TPixel, unsigned int VDimension, class TAllocator>
void
-WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
-::GenerateInverseLowPassFilterFromHighPassFilter ( CoefficientVector & coeff )
+WaveletOperatorBase<TMotherWaveletOperator, TPixel, VDimension, TAllocator>
+::GenerateInverseLowPassFilterFromHighPassFilter(CoefficientVector& coeff)
{
const unsigned int length = coeff.size();
- CoefficientVector highPassCoeff ( length + 2 );
+ CoefficientVector highPassCoeff(length + 2);
double sign = 1;
- for ( unsigned int i = 0; i < length; i++ )
- {
+ for (unsigned int i = 0; i < length; i++)
+ {
highPassCoeff[i] = sign * coeff[i];
sign *= -1.;
- }
+ }
highPassCoeff[length] = 0.;
- highPassCoeff[length+1] = 0.;
+ highPassCoeff[length + 1] = 0.;
coeff = highPassCoeff;
- while ( coeff[0] == coeff[ coeff.size()-1 ] )
- {
- ReduceFilterLength( coeff );
- }
+ while (coeff[0] == coeff[coeff.size() - 1])
+ {
+ ReduceFilterLength(coeff);
+ }
}
-template < Wavelet::Wavelet TMotherWaveletOperator,
- class TPixel, unsigned int VDimension, class TAllocator >
+template <Wavelet::Wavelet TMotherWaveletOperator,
+ class TPixel, unsigned int VDimension, class TAllocator>
void
-WaveletOperatorBase< TMotherWaveletOperator, TPixel, VDimension, TAllocator >
-::ReduceFilterLength ( CoefficientVector & coeff )
+WaveletOperatorBase<TMotherWaveletOperator, TPixel, VDimension, TAllocator>
+::ReduceFilterLength(CoefficientVector& coeff)
{
const unsigned int length = coeff.size();
- CoefficientVector newFilter ( length-2 );
- for ( unsigned int i = 0; i < newFilter.size(); i++ )
- {
- newFilter[i] = coeff[i+1];
- }
+ CoefficientVector newFilter(length - 2);
+ for (unsigned int i = 0; i < newFilter.size(); i++)
+ {
+ newFilter[i] = coeff[i + 1];
+ }
coeff = newFilter;
}
} // end of namespace otb
#endif
-
diff --git a/Code/MultiScale/otbWaveletPacketDecompositionCosts.h b/Code/MultiScale/otbWaveletPacketDecompositionCosts.h
index c83221f68d..5b8832c898 100644
--- a/Code/MultiScale/otbWaveletPacketDecompositionCosts.h
+++ b/Code/MultiScale/otbWaveletPacketDecompositionCosts.h
@@ -34,22 +34,22 @@ namespace otb {
*
* \sa WaveletPacketForwardTransform
*/
-template < class TImage >
+template <class TImage>
class ITK_EXPORT FullyDecomposedWaveletPacketCost
: public itk::Object
{
public:
/** Standard typedefs */
typedef FullyDecomposedWaveletPacketCost Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(FullyDecomposedWaveletPacketCost,Object);
+ itkTypeMacro(FullyDecomposedWaveletPacketCost, Object);
typedef TImage ImageType;
@@ -57,9 +57,9 @@ public:
static unsigned int NumberOfAllowedDecompositions;
/** Evaluate the cost */
- bool Evaluate ( unsigned int decomposition, const ImageType * image )
+ bool Evaluate(unsigned int decomposition, const ImageType * image)
{
- return ( decomposition < NumberOfAllowedDecompositions );
+ return (decomposition < NumberOfAllowedDecompositions);
}
protected:
@@ -67,16 +67,14 @@ protected:
virtual ~FullyDecomposedWaveletPacketCost() {}
private:
- FullyDecomposedWaveletPacketCost ( const Self & ); // not implemented
- void operator= ( const Self & );
+ FullyDecomposedWaveletPacketCost (const Self &); // not implemented
+ void operator =(const Self&);
}; // end of class
-template < class TImage >
-unsigned int FullyDecomposedWaveletPacketCost< TImage >::NumberOfAllowedDecompositions = 1;
+template <class TImage>
+unsigned int FullyDecomposedWaveletPacketCost<TImage>::NumberOfAllowedDecompositions = 1;
} // end of namespace otb
#endif
-
-
diff --git a/Code/MultiScale/otbWaveletPacketTransform.h b/Code/MultiScale/otbWaveletPacketTransform.h
index c74c38f865..4c243724ff 100644
--- a/Code/MultiScale/otbWaveletPacketTransform.h
+++ b/Code/MultiScale/otbWaveletPacketTransform.h
@@ -53,24 +53,24 @@ namespace otb {
* \sa WaveletFilterBank
* \sa WaveletTransform
*/
-template < class TInputImage, class TOutputImage, class TFilter,
- Wavelet::WaveletDirection TDirectionOfTransformation,
- class TCost = FullyDecomposedWaveletPacketCost< TInputImage > >
+template <class TInputImage, class TOutputImage, class TFilter,
+ Wavelet::WaveletDirection TDirectionOfTransformation,
+ class TCost = FullyDecomposedWaveletPacketCost<TInputImage> >
class ITK_EXPORT WaveletPacketTransform
- : public itk::ImageSource< TOutputImage >
+ : public itk::ImageSource<TOutputImage>
{
public:
/** Standard typedefs */
- typedef WaveletPacketTransform Self;
- typedef itk::ImageSource< TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef WaveletPacketTransform Self;
+ typedef itk::ImageSource<TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(WaveletPacketTransform,ImageSource);
+ itkTypeMacro(WaveletPacketTransform, ImageSource);
protected:
/** But this class cannot do any thing! No constructor is implemented */
@@ -78,8 +78,8 @@ protected:
virtual ~WaveletPacketTransform();
private:
- WaveletPacketTransform ( const Self & );
- void operator= ( const Self & );
+ WaveletPacketTransform (const Self &);
+ void operator =(const Self&);
};
/** \class WaveletPacketTransform
@@ -107,22 +107,22 @@ private:
* \sa WaveletFilterBank
* \sa WaveletTransform
*/
-template < class TInputImage, class TOutputImage, class TFilter, class TCost >
-class ITK_EXPORT WaveletPacketTransform< TInputImage, TOutputImage, TFilter, Wavelet::FORWARD, TCost >
- : public ImageToImageListFilter< TInputImage, TOutputImage >
+template <class TInputImage, class TOutputImage, class TFilter, class TCost>
+class ITK_EXPORT WaveletPacketTransform<TInputImage, TOutputImage, TFilter, Wavelet::FORWARD, TCost>
+ : public ImageToImageListFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef WaveletPacketTransform Self;
- typedef ImageToImageListFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef WaveletPacketTransform Self;
+ typedef ImageToImageListFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(WaveletPacketTransform,ImageToImageListFilter);
+ itkTypeMacro(WaveletPacketTransform, ImageToImageListFilter);
typedef TInputImage InputImageType;
typedef typename InputImageType::Pointer InputImagePointerType;
@@ -140,29 +140,30 @@ public:
typedef TFilter FilterType;
typedef typename FilterType::Pointer FilterPointerType;
- typedef ObjectList< FilterType > FilterListType;
+ typedef ObjectList<FilterType> FilterListType;
typedef typename FilterListType::Pointer FilterListPointerType;
typedef typename FilterListType::Iterator FilterListIterator;
- itkGetObjectMacro(FilterList,FilterListType);
+ itkGetObjectMacro(FilterList, FilterListType);
- typedef TCost CostType;
+ typedef TCost CostType;
typedef typename CostType::Pointer CostPointerType;
- itkGetObjectMacro(Cost,CostType);
+ itkGetObjectMacro(Cost, CostType);
typedef Wavelet::WaveletDirection DirectionOfTransformationEnumType;
- itkStaticConstMacro(DirectionOfTransformation,DirectionOfTransformationEnumType,Wavelet::FORWARD);
+ itkStaticConstMacro(DirectionOfTransformation, DirectionOfTransformationEnumType, Wavelet::FORWARD);
/** Get the recursive description of the packet decomposition */
- const std::vector<bool> & GetWaveletPacketRule () const {
+ const std::vector<bool>& GetWaveletPacketRule() const
+ {
return this->m_WaveletPacketRule;
}
/** Get information on the decomposition */
- itkGetMacro(NumberOfFilters,unsigned int);
- itkGetMacro(DepthOfDecomposition,unsigned int);
+ itkGetMacro(NumberOfFilters, unsigned int);
+ itkGetMacro(DepthOfDecomposition, unsigned int);
- itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/**
* Set/Get the level of down sampling of the image used in forward algorithm.
@@ -172,8 +173,8 @@ public:
* then m_SubsampleImageFactor is most likely to be 1 or 2... but in any case integer
* and not real...
*/
- itkGetMacro(SubsampleImageFactor,unsigned int);
- itkSetMacro(SubsampleImageFactor,unsigned int);
+ itkGetMacro(SubsampleImageFactor, unsigned int);
+ itkSetMacro(SubsampleImageFactor, unsigned int);
protected:
WaveletPacketTransform();
@@ -183,15 +184,15 @@ protected:
* This class does not performs multi-threading directly. But it uses step by step the
* GenerateData() of TFilter. If This one can thread, the transformation is threaded
* (e.g. WaveletFilterBank) */
- virtual void GenerateData ();
+ virtual void GenerateData();
/** Performs (if any) the local decomposition (called recursively) */
- virtual void GenerateData ( unsigned int depth, OutputImageType * outputPtr,
- itk::ProgressAccumulator * accumulator );
+ virtual void GenerateData(unsigned int depth, OutputImageType * outputPtr,
+ itk::ProgressAccumulator * accumulator);
private:
- WaveletPacketTransform ( const Self &);
- void operator= ( const Self & );
+ WaveletPacketTransform (const Self &);
+ void operator =(const Self&);
/**
* For multiscale decomposition, m_SubsampleImageFactor is set to 1.
@@ -206,9 +207,8 @@ private:
unsigned int m_DepthOfDecomposition;
FilterListPointerType m_FilterList;
- CostPointerType m_Cost;
- std::vector<bool> m_WaveletPacketRule;
-
+ CostPointerType m_Cost;
+ std::vector<bool> m_WaveletPacketRule;
}; // end of class
@@ -236,32 +236,32 @@ private:
* \sa WaveletFilterBank
* \sa WaveletTransform
*/
-template < class TInputImage, class TOutputImage, class TFilter >
-class ITK_EXPORT WaveletPacketTransform< TInputImage, TOutputImage, TFilter,
- Wavelet::INVERSE, FullyDecomposedWaveletPacketCost< TInputImage > >
- : public ImageListToImageFilter< TInputImage, TOutputImage >
+template <class TInputImage, class TOutputImage, class TFilter>
+class ITK_EXPORT WaveletPacketTransform<TInputImage, TOutputImage, TFilter,
+ Wavelet::INVERSE, FullyDecomposedWaveletPacketCost<TInputImage> >
+ : public ImageListToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef WaveletPacketTransform Self;
- typedef ImageListToImageFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef WaveletPacketTransform Self;
+ typedef ImageListToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(WaveletPacketTransform,ImageListToImageFilter);
+ itkTypeMacro(WaveletPacketTransform, ImageListToImageFilter);
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename InputImageType::ConstPointer InputImageConstPointerType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::IndexType IndexType;
- typedef typename InputImageType::ValueType ValueType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename InputImageType::ConstPointer InputImageConstPointerType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::IndexType IndexType;
+ typedef typename InputImageType::ValueType ValueType;
typedef typename Superclass::InputImageListType InputImageListType;
typedef typename InputImageListType::Pointer InputImageListPointerType;
@@ -275,21 +275,25 @@ public:
typedef TFilter FilterType;
typedef typename FilterType::Pointer FilterPointerType;
- typedef ObjectList< FilterType > FilterListType;
+ typedef ObjectList<FilterType> FilterListType;
typedef typename FilterListType::Pointer FilterListPointerType;
typedef typename FilterListType::Iterator FilterListIterator;
- itkGetObjectMacro(FilterList,FilterListType);
+ itkGetObjectMacro(FilterList, FilterListType);
typedef Wavelet::WaveletDirection DirectionOfTransformationEnumType;
- itkStaticConstMacro(DirectionOfTransformation,DirectionOfTransformationEnumType,Wavelet::INVERSE);
+ itkStaticConstMacro(DirectionOfTransformation, DirectionOfTransformationEnumType, Wavelet::INVERSE);
/** Get/Set the decomposition rule */
- const std::vector<bool> & GetWaveletPacketRule () const {
- return this->m_WaveletPacketRule; }
- void SetWaveletPacketRule ( const std::vector<bool> & rule ) {
+ const std::vector<bool>& GetWaveletPacketRule() const
+ {
+ return this->m_WaveletPacketRule;
+ }
+ void SetWaveletPacketRule(const std::vector<bool>& rule)
+ {
this->m_WaveletPacketRule = rule;
- this->Modified(); }
+ this->Modified();
+ }
/**
* Set/Get the level of down sampling of the image used in forward algorithm.
@@ -299,14 +303,14 @@ public:
* then m_SubsampleImageFactor is most likely to be 1 or 2... but in any case integer
* and not real...
*/
- itkGetMacro(SubsampleImageFactor,unsigned int);
- itkSetMacro(SubsampleImageFactor,unsigned int);
+ itkGetMacro(SubsampleImageFactor, unsigned int);
+ itkSetMacro(SubsampleImageFactor, unsigned int);
/** Get information on the decomposition */
- itkGetMacro(NumberOfFilters,unsigned int);
- itkGetMacro(DepthOfDecomposition,unsigned int);
+ itkGetMacro(NumberOfFilters, unsigned int);
+ itkGetMacro(DepthOfDecomposition, unsigned int);
- itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
protected:
WaveletPacketTransform();
@@ -322,19 +326,19 @@ protected:
* This class does not performs multi-threading directly. But it uses step by step the
* GenerateData() of TFilter. If This one can thread, the transformation is threaded
* (e.g. WaveletFilterBank) */
- virtual void GenerateData ();
+ virtual void GenerateData();
/** Performs (if any) the local decomposition (called recursively) */
- virtual unsigned int SetInputFilters ( unsigned int & ruleID, InputImageIterator & inputIter,
- unsigned int filterID );
+ virtual unsigned int SetInputFilters(unsigned int& ruleID, InputImageIterator& inputIter,
+ unsigned int filterID);
/** Get the depth of decomposition and the number of filters from m_WaveletPacketRule */
- void InterpretRule ();
- void InterpretRule ( unsigned int & ruleID, unsigned int curDepth );
+ void InterpretRule();
+ void InterpretRule(unsigned int& ruleID, unsigned int curDepth);
private:
- WaveletPacketTransform ( const Self &);
- void operator= ( const Self & );
+ WaveletPacketTransform (const Self &);
+ void operator =(const Self&);
/**
* For multiscale decomposition, m_SubsampleImageFactor is set to 1.
@@ -349,7 +353,7 @@ private:
unsigned int m_DepthOfDecomposition;
FilterListPointerType m_FilterList;
- std::vector<bool> m_WaveletPacketRule;
+ std::vector<bool> m_WaveletPacketRule;
}; // end of class
@@ -360,5 +364,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/MultiScale/otbWaveletPacketTransform.txx b/Code/MultiScale/otbWaveletPacketTransform.txx
index 58f9e65a49..ff0ea5b5e7 100644
--- a/Code/MultiScale/otbWaveletPacketTransform.txx
+++ b/Code/MultiScale/otbWaveletPacketTransform.txx
@@ -28,266 +28,261 @@ namespace otb {
* Template specialization for the Wavelet::FORWARD transformation
*/
-template < class TInputImage, class TOutputImage, class TFilter, class TCost >
-WaveletPacketTransform< TInputImage, TOutputImage, TFilter, Wavelet::FORWARD, TCost >
+template <class TInputImage, class TOutputImage, class TFilter, class TCost>
+WaveletPacketTransform<TInputImage, TOutputImage, TFilter, Wavelet::FORWARD, TCost>
::WaveletPacketTransform ()
: m_SubsampleImageFactor(2), m_NumberOfFilters(0), m_DepthOfDecomposition(0)
{
this->SetNumberOfRequiredInputs(1);
this->SetNumberOfInputs(1);
this->SetNumberOfOutputs(1);
- this->SetNthOutput(0,OutputImageListType::New());
+ this->SetNthOutput(0, OutputImageListType::New());
m_FilterList = FilterListType::New();
m_Cost = CostType::New();
}
-template < class TInputImage, class TOutputImage, class TFilter, class TCost >
+template <class TInputImage, class TOutputImage, class TFilter, class TCost>
void
-WaveletPacketTransform< TInputImage, TOutputImage, TFilter, Wavelet::FORWARD, TCost >
-::GenerateData ()
+WaveletPacketTransform<TInputImage, TOutputImage, TFilter, Wavelet::FORWARD, TCost>
+::GenerateData()
{
/*
* Start with a decomposition
*/
m_WaveletPacketRule.clear();
-
+
m_NumberOfFilters = 0;
m_DepthOfDecomposition = 0;
itk::ProgressAccumulator::Pointer progress = itk::ProgressAccumulator::New();
progress->SetMiniPipelineFilter(this);
- GenerateData( 0, this->GetInput(), progress );
-
+ GenerateData(0, this->GetInput(), progress);
+
}
-template < class TInputImage, class TOutputImage, class TFilter, class TCost >
+template <class TInputImage, class TOutputImage, class TFilter, class TCost>
void
-WaveletPacketTransform< TInputImage, TOutputImage, TFilter, Wavelet::FORWARD, TCost >
+WaveletPacketTransform<TInputImage, TOutputImage, TFilter, Wavelet::FORWARD, TCost>
::GenerateData
-( unsigned int depth,
+ (unsigned int depth,
OutputImageType * outputPtr,
- itk::ProgressAccumulator * progress )
+ itk::ProgressAccumulator * progress)
{
// We cannot know in advance the nomber of filters in this mini-pipeline
// So we decrease the weigth of each filter in order to tend to 1... slowly...
static float accumulatorWeight = 1.;
- if ( this->GetCost()->Evaluate( depth, outputPtr ) )
- {
- if ( m_DepthOfDecomposition < depth )
- m_DepthOfDecomposition = depth;
+ if (this->GetCost()->Evaluate(depth, outputPtr))
+ {
+ if (m_DepthOfDecomposition < depth) m_DepthOfDecomposition = depth;
- m_WaveletPacketRule.push_back( true );
+ m_WaveletPacketRule.push_back(true);
- this->GetFilterList()->PushBack( FilterType::New() );
- FilterPointerType filter = this->GetFilterList()->GetNthElement( m_NumberOfFilters );
+ this->GetFilterList()->PushBack(FilterType::New());
+ FilterPointerType filter = this->GetFilterList()->GetNthElement(m_NumberOfFilters);
m_NumberOfFilters++;
- filter->SetSubsampleImageFactor( GetSubsampleImageFactor() );
- if ( GetSubsampleImageFactor() == 1 )
- filter->SetUpSampleFilterFactor( depth );
-
+ filter->SetSubsampleImageFactor(GetSubsampleImageFactor());
+ if (GetSubsampleImageFactor() == 1) filter->SetUpSampleFilterFactor(depth);
+
accumulatorWeight /= 2.;
- progress->RegisterInternalFilter( filter, accumulatorWeight );
- filter->SetInput( outputPtr );
-
+ progress->RegisterInternalFilter(filter, accumulatorWeight);
+ filter->SetInput(outputPtr);
+
filter->Update();
-
- for ( unsigned int idx = 0; idx < filter->GetNumberOfOutputs(); idx++ )
- {
- GenerateData( depth+1, filter->GetOutput( idx ), progress );
+ for (unsigned int idx = 0; idx < filter->GetNumberOfOutputs(); idx++)
+ {
+ GenerateData(depth + 1, filter->GetOutput(idx), progress);
+ }
}
- }
else
- {
- m_WaveletPacketRule.push_back( false );
- this->GetOutput()->PushBack( outputPtr );
- }
+ {
+ m_WaveletPacketRule.push_back(false);
+ this->GetOutput()->PushBack(outputPtr);
+ }
}
/**
* Template specialozation for the Wavelet::INVERSE transformation
*/
-template < class TInputImage, class TOutputImage, class TFilter >
-WaveletPacketTransform< TInputImage, TOutputImage, TFilter, Wavelet::INVERSE, FullyDecomposedWaveletPacketCost< TInputImage > >
+template <class TInputImage, class TOutputImage, class TFilter>
+WaveletPacketTransform<TInputImage, TOutputImage, TFilter, Wavelet::INVERSE,
+ FullyDecomposedWaveletPacketCost<TInputImage> >
::WaveletPacketTransform ()
: m_SubsampleImageFactor(2), m_NumberOfFilters(0), m_DepthOfDecomposition(0)
{
this->SetNumberOfRequiredInputs(1);
this->SetNumberOfInputs(1);
this->SetNumberOfOutputs(1);
- this->SetNthOutput(0,OutputImageType::New());
+ this->SetNthOutput(0, OutputImageType::New());
m_FilterList = FilterListType::New();
}
-template < class TInputImage, class TOutputImage, class TFilter >
+template <class TInputImage, class TOutputImage, class TFilter>
void
-WaveletPacketTransform< TInputImage, TOutputImage, TFilter, Wavelet::INVERSE, FullyDecomposedWaveletPacketCost< TInputImage > >
-::GenerateOutputInformation ()
+WaveletPacketTransform<TInputImage, TOutputImage, TFilter, Wavelet::INVERSE,
+ FullyDecomposedWaveletPacketCost<TInputImage> >
+::GenerateOutputInformation()
{
- if ( m_NumberOfFilters == 0 )
- InterpretRule();
+ if (m_NumberOfFilters == 0) InterpretRule();
- this->GetOutput()->CopyInformation( this->GetInput()->GetNthElement(0) );
+ this->GetOutput()->CopyInformation(this->GetInput()->GetNthElement(0));
InputImageRegionType inputRegion = this->GetInput()->GetNthElement(0)->GetLargestPossibleRegion();
- SizeType inputSize = inputRegion.GetSize();
- IndexType inputIndex = inputRegion.GetIndex();
+ SizeType inputSize = inputRegion.GetSize();
+ IndexType inputIndex = inputRegion.GetIndex();
- OutputImageSizeType outputSize;
+ OutputImageSizeType outputSize;
OutputImageIndexType outputIndex;
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
- {
+ for (unsigned int i = 0; i < InputImageDimension; i++)
+ {
outputIndex[i] = inputIndex[i] * GetSubsampleImageFactor() * GetDepthOfDecomposition();
outputSize[i] = inputSize[i] * GetSubsampleImageFactor() * GetDepthOfDecomposition();
- }
+ }
std::cerr << "Output Size [" << outputSize[0] << "," << outputSize[1] << "]\n";
OutputImageRegionType outputRegion;
- outputRegion.SetIndex( outputIndex );
- outputRegion.SetSize( outputSize );
- this->GetOutput()->SetRegions( outputRegion );
+ outputRegion.SetIndex(outputIndex);
+ outputRegion.SetSize(outputSize);
+ this->GetOutput()->SetRegions(outputRegion);
}
-template < class TInputImage, class TOutputImage, class TFilter >
+template <class TInputImage, class TOutputImage, class TFilter>
void
-WaveletPacketTransform< TInputImage, TOutputImage, TFilter, Wavelet::INVERSE, FullyDecomposedWaveletPacketCost< TInputImage > >
-::GenerateData ()
+WaveletPacketTransform<TInputImage, TOutputImage, TFilter, Wavelet::INVERSE,
+ FullyDecomposedWaveletPacketCost<TInputImage> >
+::GenerateData()
{
- if ( m_WaveletPacketRule[0] != true )
- {
- throw itk::ExceptionObject( __FILE__, __LINE__,
- "No decomposition to perform in Generic data... Check WaveletPacketRule tab",
- ITK_LOCATION );
- }
+ if (m_WaveletPacketRule[0] != true)
+ {
+ throw itk::ExceptionObject(__FILE__, __LINE__,
+ "No decomposition to perform in Generic data... Check WaveletPacketRule tab",
+ ITK_LOCATION);
+ }
- if ( m_NumberOfFilters == 0 )
- InterpretRule();
+ if (m_NumberOfFilters == 0) InterpretRule();
std::cerr << "nbFilter = " << m_NumberOfFilters << "\n";
std::cerr << "depth = " << m_DepthOfDecomposition << "\n";
std::cerr << "rule size = " << m_WaveletPacketRule.size() << "\n";
- if ( m_NumberOfFilters == 0 )
- {
- throw itk::ExceptionObject( __FILE__, __LINE__,
- "No filter found in the decomposition tree... Check WaveletPacketRule tab",
- ITK_LOCATION );
- }
+ if (m_NumberOfFilters == 0)
+ {
+ throw itk::ExceptionObject(__FILE__, __LINE__,
+ "No filter found in the decomposition tree... Check WaveletPacketRule tab",
+ ITK_LOCATION);
+ }
InputImageIterator inputIterator = this->GetInput()->Begin();
unsigned int pos = 1;
- SetInputFilters( pos, inputIterator, 0 );
+ SetInputFilters(pos, inputIterator, 0);
- if ( pos != m_WaveletPacketRule.size() || inputIterator != this->GetInput()->End() )
- {
- throw itk::ExceptionObject( __FILE__, __LINE__,
- "Bad decomposition tree implementation...",
- ITK_LOCATION );
- }
+ if (pos != m_WaveletPacketRule.size() || inputIterator != this->GetInput()->End())
+ {
+ throw itk::ExceptionObject(__FILE__, __LINE__,
+ "Bad decomposition tree implementation...",
+ ITK_LOCATION);
+ }
- m_FilterList->GetNthElement( 0 )->GraftOutput( this->GetOutput() );
+ m_FilterList->GetNthElement(0)->GraftOutput(this->GetOutput());
itk::ProgressAccumulator::Pointer progress = itk::ProgressAccumulator::New();
progress->SetMiniPipelineFilter(this);
- for ( pos = m_NumberOfFilters; pos > 0; pos-- )
- {
- FilterPointerType filter = m_FilterList->GetNthElement(pos-1);
- progress->RegisterInternalFilter( filter, 1.f/static_cast<float>( m_NumberOfFilters ) );
+ for (pos = m_NumberOfFilters; pos > 0; pos--)
+ {
+ FilterPointerType filter = m_FilterList->GetNthElement(pos - 1);
+ progress->RegisterInternalFilter(filter, 1.f / static_cast<float>(m_NumberOfFilters));
filter->Update();
- }
+ }
- this->GraftOutput( m_FilterList->GetNthElement(0)->GetOutput() );
+ this->GraftOutput(m_FilterList->GetNthElement(0)->GetOutput());
}
-template < class TInputImage, class TOutputImage, class TFilter >
+template <class TInputImage, class TOutputImage, class TFilter>
unsigned int
-WaveletPacketTransform< TInputImage, TOutputImage, TFilter, Wavelet::INVERSE, FullyDecomposedWaveletPacketCost< TInputImage > >
+WaveletPacketTransform<TInputImage, TOutputImage, TFilter, Wavelet::INVERSE,
+ FullyDecomposedWaveletPacketCost<TInputImage> >
::SetInputFilters
-( unsigned int & ruleID, InputImageIterator & imgIt, unsigned int filterID )
+ (unsigned int& ruleID, InputImageIterator& imgIt, unsigned int filterID)
{
- unsigned int nextFilterID = filterID+1;
+ unsigned int nextFilterID = filterID + 1;
- if ( ruleID == m_WaveletPacketRule.size() )
- return m_FilterList->Size();
+ if (ruleID == m_WaveletPacketRule.size()) return m_FilterList->Size();
- for ( unsigned int i = 0; i < m_FilterList->GetNthElement(filterID)->GetNumberOfInputs(); i++ )
- {
- if ( m_WaveletPacketRule[ruleID++] == true )
+ for (unsigned int i = 0; i < m_FilterList->GetNthElement(filterID)->GetNumberOfInputs(); i++)
{
- m_FilterList->GetNthElement(filterID)->SetInput( i,
- m_FilterList->GetNthElement(nextFilterID)->GetOutput() );
- nextFilterID = SetInputFilters( ruleID, imgIt, nextFilterID );
- }
+ if (m_WaveletPacketRule[ruleID++] == true)
+ {
+ m_FilterList->GetNthElement(filterID)->SetInput(i,
+ m_FilterList->GetNthElement(nextFilterID)->GetOutput());
+ nextFilterID = SetInputFilters(ruleID, imgIt, nextFilterID);
+ }
else
- {
- m_FilterList->GetNthElement(filterID)->SetInput( i, imgIt.Get() );
+ {
+ m_FilterList->GetNthElement(filterID)->SetInput(i, imgIt.Get());
++imgIt;
+ }
}
- }
return nextFilterID;
}
-template < class TInputImage, class TOutputImage, class TFilter >
+template <class TInputImage, class TOutputImage, class TFilter>
void
-WaveletPacketTransform< TInputImage, TOutputImage, TFilter, Wavelet::INVERSE, FullyDecomposedWaveletPacketCost< TInputImage > >
-::InterpretRule ()
+WaveletPacketTransform<TInputImage, TOutputImage, TFilter, Wavelet::INVERSE,
+ FullyDecomposedWaveletPacketCost<TInputImage> >
+::InterpretRule()
{
- if ( m_FilterList && m_FilterList->Size() != 0 )
- {
- if ( m_NumberOfFilters != 0 )
- itkExceptionMacro(<<"Incoherency between member value");
- }
+ if (m_FilterList && m_FilterList->Size() != 0)
+ {
+ if (m_NumberOfFilters != 0) itkExceptionMacro(<< "Incoherency between member value");
+ }
m_NumberOfFilters = 0;
m_DepthOfDecomposition = 0;
- for ( unsigned int posRule = 0; posRule < m_WaveletPacketRule.size(); posRule++ )
- InterpretRule( posRule, 0 );
+ for (unsigned int posRule = 0; posRule < m_WaveletPacketRule.size(); posRule++)
+ InterpretRule(posRule, 0);
}
-template < class TInputImage, class TOutputImage, class TFilter >
+template <class TInputImage, class TOutputImage, class TFilter>
void
-WaveletPacketTransform< TInputImage, TOutputImage, TFilter, Wavelet::INVERSE, FullyDecomposedWaveletPacketCost< TInputImage > >
+WaveletPacketTransform<TInputImage, TOutputImage, TFilter, Wavelet::INVERSE,
+ FullyDecomposedWaveletPacketCost<TInputImage> >
::InterpretRule
-( unsigned int & ruleID, unsigned int curDepth )
+ (unsigned int& ruleID, unsigned int curDepth)
{
- if ( curDepth > m_DepthOfDecomposition )
- m_DepthOfDecomposition = curDepth;
+ if (curDepth > m_DepthOfDecomposition) m_DepthOfDecomposition = curDepth;
- if ( m_WaveletPacketRule[ruleID] == true )
- {
- m_FilterList->PushBack( FilterType::New() );
+ if (m_WaveletPacketRule[ruleID] == true)
+ {
+ m_FilterList->PushBack(FilterType::New());
- FilterPointerType filter = m_FilterList->GetNthElement( m_NumberOfFilters );
- filter->SetSubsampleImageFactor( GetSubsampleImageFactor() );
- if ( GetSubsampleImageFactor() == 1 )
- filter->SetUpSampleFilterFactor( curDepth );
+ FilterPointerType filter = m_FilterList->GetNthElement(m_NumberOfFilters);
+ filter->SetSubsampleImageFactor(GetSubsampleImageFactor());
+ if (GetSubsampleImageFactor() == 1) filter->SetUpSampleFilterFactor(curDepth);
m_NumberOfFilters++;
- for ( unsigned int i = 0; i < filter->GetNumberOfInputs(); i++ )
- {
+ for (unsigned int i = 0; i < filter->GetNumberOfInputs(); i++)
+ {
ruleID++;
- InterpretRule( ruleID, curDepth+1 );
+ InterpretRule(ruleID, curDepth + 1);
+ }
}
- }
}
-
} // end of namespace otb
#endif
-
diff --git a/Code/MultiScale/otbWaveletTransform.h b/Code/MultiScale/otbWaveletTransform.h
index c0a7d14062..264184b746 100644
--- a/Code/MultiScale/otbWaveletTransform.h
+++ b/Code/MultiScale/otbWaveletTransform.h
@@ -47,23 +47,23 @@ namespace otb {
* \sa WaveletPacketTransform
*
*/
-template < class TInputImage, class TOutputImage, class TFilter,
- Wavelet::WaveletDirection TDirectionOfTransformation >
+template <class TInputImage, class TOutputImage, class TFilter,
+ Wavelet::WaveletDirection TDirectionOfTransformation>
class ITK_EXPORT WaveletTransform
- : public itk::ImageSource< TOutputImage >
+ : public itk::ImageSource<TOutputImage>
{
public:
/** Standard typedefs */
- typedef WaveletTransform Self;
- typedef itk::ImageSource< TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef WaveletTransform Self;
+ typedef itk::ImageSource<TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(WaveletTransform,ImageSource);
+ itkTypeMacro(WaveletTransform, ImageSource);
protected:
/** But this class cannot do any thing! No constructor is implemented */
@@ -71,8 +71,8 @@ protected:
virtual ~WaveletTransform();
private:
- WaveletTransform ( const Self & );
- void operator= ( const Self & );
+ WaveletTransform (const Self &);
+ void operator =(const Self&);
};
/** \class WaveletTransform
@@ -97,22 +97,22 @@ private:
* \sa WaveletPacketTransform
*
*/
-template < class TInputImage, class TOutputImage, class TFilter >
-class ITK_EXPORT WaveletTransform< TInputImage, TOutputImage, TFilter, Wavelet::FORWARD >
- : public ImageToImageListFilter< TInputImage, TOutputImage >
+template <class TInputImage, class TOutputImage, class TFilter>
+class ITK_EXPORT WaveletTransform<TInputImage, TOutputImage, TFilter, Wavelet::FORWARD>
+ : public ImageToImageListFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef WaveletTransform Self;
- typedef ImageToImageListFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef WaveletTransform Self;
+ typedef ImageToImageListFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(WaveletTransform,ImageToImageListFilter);
+ itkTypeMacro(WaveletTransform, ImageToImageListFilter);
typedef TInputImage InputImageType;
typedef typename InputImageType::Pointer InputImagePointerType;
@@ -130,29 +130,29 @@ public:
typedef TFilter FilterType;
typedef typename FilterType::Pointer FilterPointerType;
- typedef ObjectList< FilterType > FilterListType;
+ typedef ObjectList<FilterType> FilterListType;
typedef typename FilterListType::Pointer FilterListPointerType;
typedef typename FilterListType::Iterator FilterListIterator;
- itkGetObjectMacro(FilterList,FilterListType);
- FilterType * GetNthFilter ( unsigned int idx ) const
+ itkGetObjectMacro(FilterList, FilterListType);
+ FilterType * GetNthFilter(unsigned int idx) const
{
- if ( idx >= m_NumberOfDecompositions )
- {
- itkExceptionMacro( << "Impossible to GetNthFilter with the index element "
- << idx << "; this element don't exist, the size of the filter list is "
- << m_FilterList->Size() << "." );
- }
- return static_cast< FilterType* >( m_FilterList->GetNthElement( idx ) );
+ if (idx >= m_NumberOfDecompositions)
+ {
+ itkExceptionMacro(<< "Impossible to GetNthFilter with the index element "
+ << idx << "; this element don't exist, the size of the filter list is "
+ << m_FilterList->Size() << ".");
+ }
+ return static_cast<FilterType*>(m_FilterList->GetNthElement(idx));
}
typedef Wavelet::WaveletDirection DirectionOfTransformationEnumType;
- itkStaticConstMacro(DirectionOfTransformation,DirectionOfTransformationEnumType,Wavelet::FORWARD);
+ itkStaticConstMacro(DirectionOfTransformation, DirectionOfTransformationEnumType, Wavelet::FORWARD);
- itkGetMacro(NumberOfDecompositions,unsigned int);
- itkSetMacro(NumberOfDecompositions,unsigned int);
+ itkGetMacro(NumberOfDecompositions, unsigned int);
+ itkSetMacro(NumberOfDecompositions, unsigned int);
- itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/**
* Set/Get the level of down sampling of the image used in forward algorithm.
@@ -162,19 +162,19 @@ public:
* then m_SubsampleImageFactor is most likely to be 1 or 2... but in any case integer
* and not real...
*/
- itkGetMacro(SubsampleImageFactor,unsigned int);
- itkSetMacro(SubsampleImageFactor,unsigned int);
+ itkGetMacro(SubsampleImageFactor, unsigned int);
+ itkSetMacro(SubsampleImageFactor, unsigned int);
protected:
WaveletTransform();
virtual ~WaveletTransform() {}
/** Generate data redefinition */
- virtual void GenerateData ();
+ virtual void GenerateData();
private:
- WaveletTransform ( const Self &);
- void operator= ( const Self & );
+ WaveletTransform (const Self &);
+ void operator =(const Self&);
/**
* Number of decomposition of the multi-scale/-resolution decomposition.
@@ -221,22 +221,22 @@ private:
* \sa WaveletPacketTransform
*
*/
-template < class TInputImage, class TOutputImage, class TFilter >
-class ITK_EXPORT WaveletTransform< TInputImage, TOutputImage, TFilter, Wavelet::INVERSE >
- : public ImageListToImageFilter< TInputImage, TOutputImage >
+template <class TInputImage, class TOutputImage, class TFilter>
+class ITK_EXPORT WaveletTransform<TInputImage, TOutputImage, TFilter, Wavelet::INVERSE>
+ : public ImageListToImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard typedefs */
- typedef WaveletTransform Self;
- typedef ImageListToImageFilter< TInputImage, TOutputImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef WaveletTransform Self;
+ typedef ImageListToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(WaveletTransform,ImageListToImageFilter);
+ itkTypeMacro(WaveletTransform, ImageListToImageFilter);
typedef TInputImage InputImageType;
typedef typename InputImageType::Pointer InputImagePointerType;
@@ -260,28 +260,28 @@ public:
typedef TFilter FilterType;
typedef typename FilterType::Pointer FilterPointerType;
- typedef ObjectList< FilterType > FilterListType;
+ typedef ObjectList<FilterType> FilterListType;
typedef typename FilterListType::Pointer FilterListPointerType;
typedef typename FilterListType::Iterator FilterListIterator;
- itkGetObjectMacro(FilterList,FilterListType);
- FilterType * GetNthFilter ( unsigned int idx ) const
+ itkGetObjectMacro(FilterList, FilterListType);
+ FilterType * GetNthFilter(unsigned int idx) const
{
- if ( idx >= m_NumberOfDecompositions )
- {
- itkExceptionMacro( << "Impossible to GetNthFilter with the index element "
- << idx << "; this element don't exist, the size of the filter list is "
- << m_FilterList->Size() << "." );
- }
- return static_cast< FilterType* >( m_FilterList->GetNthElement( idx ) );
+ if (idx >= m_NumberOfDecompositions)
+ {
+ itkExceptionMacro(<< "Impossible to GetNthFilter with the index element "
+ << idx << "; this element don't exist, the size of the filter list is "
+ << m_FilterList->Size() << ".");
+ }
+ return static_cast<FilterType*>(m_FilterList->GetNthElement(idx));
}
typedef Wavelet::WaveletDirection DirectionOfTransformationEnumType;
- itkStaticConstMacro(DirectionOfTransformation,DirectionOfTransformationEnumType,Wavelet::INVERSE);
+ itkStaticConstMacro(DirectionOfTransformation, DirectionOfTransformationEnumType, Wavelet::INVERSE);
- itkGetMacro(NumberOfDecompositions,unsigned int);
+ itkGetMacro(NumberOfDecompositions, unsigned int);
- itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/**
* Set/Get the level of down sampling of the image used in forward algorithm.
@@ -291,8 +291,8 @@ public:
* then m_SubsampleImageFactor is most likely to be 1 or 2... but in any case integer
* and not real...
*/
- itkGetMacro(SubsampleImageFactor,unsigned int);
- itkSetMacro(SubsampleImageFactor,unsigned int);
+ itkGetMacro(SubsampleImageFactor, unsigned int);
+ itkSetMacro(SubsampleImageFactor, unsigned int);
protected:
WaveletTransform();
@@ -305,11 +305,11 @@ protected:
virtual void GenerateOutputInformation();
/** Generate data redefinition */
- virtual void GenerateData ();
+ virtual void GenerateData();
private:
- WaveletTransform ( const Self &);
- void operator= ( const Self & );
+ WaveletTransform (const Self &);
+ void operator =(const Self&);
/**
* Number of decomposition of the multi-scale/-resolution decomposition.
@@ -337,5 +337,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/MultiScale/otbWaveletTransform.txx b/Code/MultiScale/otbWaveletTransform.txx
index 5c7cd5ddc0..a6de4b39a2 100644
--- a/Code/MultiScale/otbWaveletTransform.txx
+++ b/Code/MultiScale/otbWaveletTransform.txx
@@ -32,203 +32,201 @@ namespace otb {
* Template Specialization for the Wavelet::FORWARD case
*/
-template < class TInputImage, class TOutputImage, class TFilter >
-WaveletTransform< TInputImage, TOutputImage, TFilter, Wavelet::FORWARD >
+template <class TInputImage, class TOutputImage, class TFilter>
+WaveletTransform<TInputImage, TOutputImage, TFilter, Wavelet::FORWARD>
::WaveletTransform ()
: m_NumberOfDecompositions(1), m_SubsampleImageFactor(2)
{
this->SetNumberOfRequiredInputs(1);
this->SetNumberOfInputs(1);
this->SetNumberOfOutputs(1);
- this->SetNthOutput(0,OutputImageListType::New());
+ this->SetNthOutput(0, OutputImageListType::New());
m_FilterList = FilterListType::New();
}
-template < class TInputImage, class TOutputImage, class TFilter >
+template <class TInputImage, class TOutputImage, class TFilter>
void
-WaveletTransform< TInputImage, TOutputImage, TFilter, Wavelet::FORWARD >
-::GenerateData ()
+WaveletTransform<TInputImage, TOutputImage, TFilter, Wavelet::FORWARD>
+::GenerateData()
{
itk::ProgressAccumulator::Pointer progress = itk::ProgressAccumulator::New();
progress->SetMiniPipelineFilter(this);
- GetFilterList()->Resize( GetNumberOfDecompositions() );
+ GetFilterList()->Resize(GetNumberOfDecompositions());
- this->GetFilterList()->SetNthElement( 0, FilterType::New() );
+ this->GetFilterList()->SetNthElement(0, FilterType::New());
FilterPointerType filter = this->GetFilterList()->GetNthElement(0); //GetNthFilter( 0 );
- filter->SetInput( this->GetInput() );
- filter->SetSubsampleImageFactor( GetSubsampleImageFactor() );
+ filter->SetInput(this->GetInput());
+ filter->SetSubsampleImageFactor(GetSubsampleImageFactor());
- std::cerr << "Allocating " << (1 + GetNumberOfDecompositions() * ( filter->GetNumberOfOutputs() - 1 ) ) << " output\n";
+ std::cerr << "Allocating " << (1 + GetNumberOfDecompositions() * (filter->GetNumberOfOutputs() - 1)) << " output\n";
this->GetOutput()->Resize(
- 1 + GetNumberOfDecompositions() * ( filter->GetNumberOfOutputs() - 1 ) );
+ 1 + GetNumberOfDecompositions() * (filter->GetNumberOfOutputs() - 1));
std::cerr << "Using " << this->GetOutput()->Size() << " outputs...\n";
- for ( unsigned int idx = 0; idx < this->GetOutput()->Size(); idx++ )
- {
- this->GetOutput()->SetNthElement( idx, OutputImageType::New() );
- }
+ for (unsigned int idx = 0; idx < this->GetOutput()->Size(); idx++)
+ {
+ this->GetOutput()->SetNthElement(idx, OutputImageType::New());
+ }
- progress->RegisterInternalFilter( filter,
- 1.f/static_cast<float>( GetNumberOfDecompositions() ) );
+ progress->RegisterInternalFilter(filter,
+ 1.f / static_cast<float>(GetNumberOfDecompositions()));
filter->Update();
- for ( unsigned int idx = 1; idx < filter->GetNumberOfOutputs(); idx++ )
- {
+ for (unsigned int idx = 1; idx < filter->GetNumberOfOutputs(); idx++)
+ {
this->GetOutput()->SetNthElement(
this->GetOutput()->Size() - filter->GetNumberOfOutputs() + idx,
- filter->GetOutput( idx ) );
- }
+ filter->GetOutput(idx));
+ }
- for ( unsigned int nbDecomp = 1; nbDecomp < GetNumberOfDecompositions(); nbDecomp++ )
- {
- this->GetFilterList()->SetNthElement( nbDecomp, FilterType::New() );
+ for (unsigned int nbDecomp = 1; nbDecomp < GetNumberOfDecompositions(); nbDecomp++)
+ {
+ this->GetFilterList()->SetNthElement(nbDecomp, FilterType::New());
filter = this->GetFilterList()->GetNthElement(nbDecomp); //this->GetNthFilter( nbDecomp );
- filter->SetInput( this->GetNthFilter( nbDecomp-1 )->GetOutput( 0 ) );
- filter->SetSubsampleImageFactor( GetSubsampleImageFactor() );
- if ( GetSubsampleImageFactor() == 1 )
- filter->SetUpSampleFilterFactor( nbDecomp+1 );
+ filter->SetInput(this->GetNthFilter(nbDecomp - 1)->GetOutput(0));
+ filter->SetSubsampleImageFactor(GetSubsampleImageFactor());
+ if (GetSubsampleImageFactor() == 1) filter->SetUpSampleFilterFactor(nbDecomp + 1);
- progress->RegisterInternalFilter( filter,
- 1.f/static_cast<float>( GetNumberOfDecompositions() ) );
+ progress->RegisterInternalFilter(filter,
+ 1.f / static_cast<float>(GetNumberOfDecompositions()));
filter->Update();
- for ( unsigned int idx = 1; idx < filter->GetNumberOfOutputs(); idx++ )
- {
+ for (unsigned int idx = 1; idx < filter->GetNumberOfOutputs(); idx++)
+ {
this->GetOutput()->SetNthElement(
- this->GetOutput()->Size() - 1 - (nbDecomp+1) * (filter->GetNumberOfOutputs()-1) + idx,
- filter->GetOutput( idx ) );
+ this->GetOutput()->Size() - 1 - (nbDecomp + 1) * (filter->GetNumberOfOutputs() - 1) + idx,
+ filter->GetOutput(idx));
+ }
}
- }
- this->GetOutput()->SetNthElement( 0, filter->GetOutput( 0 ) );
+ this->GetOutput()->SetNthElement(0, filter->GetOutput(0));
}
/**
* Template Specialization for the Wavelet::INVERSE case
*/
-template < class TInputImage, class TOutputImage, class TFilter >
-WaveletTransform< TInputImage, TOutputImage, TFilter, Wavelet::INVERSE >
+template <class TInputImage, class TOutputImage, class TFilter>
+WaveletTransform<TInputImage, TOutputImage, TFilter, Wavelet::INVERSE>
::WaveletTransform ()
: m_NumberOfDecompositions(1), m_SubsampleImageFactor(2)
{
this->SetNumberOfRequiredInputs(1);
this->SetNumberOfInputs(1);
this->SetNumberOfOutputs(1);
- this->SetNthOutput(0,OutputImageType::New());
+ this->SetNthOutput(0, OutputImageType::New());
m_FilterList = FilterListType::New();
}
-template < class TInputImage, class TOutputImage, class TFilter >
+template <class TInputImage, class TOutputImage, class TFilter>
void
-WaveletTransform< TInputImage, TOutputImage, TFilter, Wavelet::INVERSE >
-::GenerateOutputInformation ()
+WaveletTransform<TInputImage, TOutputImage, TFilter, Wavelet::INVERSE>
+::GenerateOutputInformation()
{
- this->GetOutput()->CopyInformation( this->GetInput()->GetNthElement(0) );
+ this->GetOutput()->CopyInformation(this->GetInput()->GetNthElement(0));
- if ( GetSubsampleImageFactor() != 1 )
- {
+ if (GetSubsampleImageFactor() != 1)
+ {
InputImageRegionType inputRegion = this->GetInput()->GetNthElement(0)->GetLargestPossibleRegion();
- SizeType inputSize = inputRegion.GetSize();
- IndexType inputIndex = inputRegion.GetIndex();
+ SizeType inputSize = inputRegion.GetSize();
+ IndexType inputIndex = inputRegion.GetIndex();
- OutputImageSizeType outputSize;
+ OutputImageSizeType outputSize;
OutputImageIndexType outputIndex;
- for ( unsigned int i = 0; i < InputImageDimension; i++ )
- {
+ for (unsigned int i = 0; i < InputImageDimension; i++)
+ {
outputIndex[i] = inputIndex[i] * GetSubsampleImageFactor() * GetNumberOfDecompositions();
outputSize[i] = inputSize[i] * GetSubsampleImageFactor() * GetNumberOfDecompositions();
- }
+ }
OutputImageRegionType outputRegion;
- outputRegion.SetIndex( outputIndex );
- outputRegion.SetSize( outputSize );
+ outputRegion.SetIndex(outputIndex);
+ outputRegion.SetSize(outputSize);
- this->GetOutput()->SetRegions( outputRegion );
- }
+ this->GetOutput()->SetRegions(outputRegion);
+ }
}
-template < class TInputImage, class TOutputImage, class TFilter >
+template <class TInputImage, class TOutputImage, class TFilter>
void
-WaveletTransform< TInputImage, TOutputImage, TFilter, Wavelet::INVERSE >
-::GenerateData ()
+WaveletTransform<TInputImage, TOutputImage, TFilter, Wavelet::INVERSE>
+::GenerateData()
{
FilterPointerType filter = FilterType::New();
- m_NumberOfDecompositions = ( this->GetInput()->Size() - 1 )
- / ( filter->GetNumberOfInputs() - 1 );
+ m_NumberOfDecompositions = (this->GetInput()->Size() - 1)
+ / (filter->GetNumberOfInputs() - 1);
std::cerr << "Found " << m_NumberOfDecompositions << " decompositions\n";
itk::ProgressAccumulator::Pointer progress = itk::ProgressAccumulator::New();
progress->SetMiniPipelineFilter(this);
- this->GetFilterList()->Resize( GetNumberOfDecompositions() );
-
+ this->GetFilterList()->Resize(GetNumberOfDecompositions());
+
InputImageIterator inputIterator = this->GetInput()->Begin();
- this->GetFilterList()->SetNthElement( 0, FilterType::New() );
- filter = this->GetNthFilter( 0 );
- for ( unsigned int i = 0; i < filter->GetNumberOfInputs(); i++ )
- {
- filter->SetInput( i, inputIterator.Get() );
+ this->GetFilterList()->SetNthElement(0, FilterType::New());
+ filter = this->GetNthFilter(0);
+ for (unsigned int i = 0; i < filter->GetNumberOfInputs(); i++)
+ {
+ filter->SetInput(i, inputIterator.Get());
++inputIterator;
- }
+ }
- filter->SetSubsampleImageFactor( GetSubsampleImageFactor() );
- if ( GetSubsampleImageFactor() == 1 )
- {
- filter->SetUpSampleFilterFactor( GetNumberOfDecompositions() );
- }
+ filter->SetSubsampleImageFactor(GetSubsampleImageFactor());
+ if (GetSubsampleImageFactor() == 1)
+ {
+ filter->SetUpSampleFilterFactor(GetNumberOfDecompositions());
+ }
- progress->RegisterInternalFilter( filter,
- 1.f/static_cast<float>( GetNumberOfDecompositions() ) );
+ progress->RegisterInternalFilter(filter,
+ 1.f / static_cast<float>(GetNumberOfDecompositions()));
filter->Update();
- for ( unsigned int idx = 1; idx < GetNumberOfDecompositions(); idx++ )
- {
- this->GetFilterList()->SetNthElement( idx, FilterType::New() );
- filter = this->GetNthFilter( idx );
- filter->SetInput( 0, this->GetNthFilter( idx-1 )->GetOutput() );
-
- for ( unsigned int i = 1; i < filter->GetNumberOfInputs(); i++ )
+ for (unsigned int idx = 1; idx < GetNumberOfDecompositions(); idx++)
{
- filter->SetInput( i, inputIterator.Get() );
+ this->GetFilterList()->SetNthElement(idx, FilterType::New());
+ filter = this->GetNthFilter(idx);
+ filter->SetInput(0, this->GetNthFilter(idx - 1)->GetOutput());
+
+ for (unsigned int i = 1; i < filter->GetNumberOfInputs(); i++)
+ {
+ filter->SetInput(i, inputIterator.Get());
++inputIterator;
- }
+ }
- filter->SetSubsampleImageFactor( GetSubsampleImageFactor() );
- if ( GetSubsampleImageFactor() == 1 )
- {
- filter->SetUpSampleFilterFactor( GetNumberOfDecompositions() - idx );
- }
+ filter->SetSubsampleImageFactor(GetSubsampleImageFactor());
+ if (GetSubsampleImageFactor() == 1)
+ {
+ filter->SetUpSampleFilterFactor(GetNumberOfDecompositions() - idx);
+ }
- progress->RegisterInternalFilter( filter,
- 1.f/static_cast<float>( GetNumberOfDecompositions() ) );
+ progress->RegisterInternalFilter(filter,
+ 1.f / static_cast<float>(GetNumberOfDecompositions()));
filter->Update();
- }
+ }
// This step is necessary to transtype output image to the wanted format
- this->GetOutput()->CopyInformation( filter->GetOutput() );
- this->GetOutput()->SetRegions( filter->GetOutput()->GetLargestPossibleRegion() );
+ this->GetOutput()->CopyInformation(filter->GetOutput());
+ this->GetOutput()->SetRegions(filter->GetOutput()->GetLargestPossibleRegion());
this->GetOutput()->Allocate();
this->GetOutput()->FillBuffer(0);
- itk::ImageRegionIterator< OutputImageType > outputIter
- ( this->GetOutput(), this->GetOutput()->GetLargestPossibleRegion() );
- itk::ImageRegionConstIterator< typename FilterType::OutputImageType > outFltIter
- ( filter->GetOutput(), filter->GetOutput()->GetLargestPossibleRegion() );
+ itk::ImageRegionIterator<OutputImageType> outputIter
+ (this->GetOutput(), this->GetOutput()->GetLargestPossibleRegion());
+ itk::ImageRegionConstIterator<typename FilterType::OutputImageType> outFltIter
+ (filter->GetOutput(), filter->GetOutput()->GetLargestPossibleRegion());
- for ( outputIter.GoToBegin(), outFltIter.GoToBegin(); !outputIter.IsAtEnd(); ++outputIter, ++outFltIter )
- {
- outputIter.Set( static_cast< OutputValueType >( outFltIter.Get() ) );
- }
+ for (outputIter.GoToBegin(), outFltIter.GoToBegin(); !outputIter.IsAtEnd(); ++outputIter, ++outFltIter)
+ {
+ outputIter.Set(static_cast<OutputValueType>(outFltIter.Get()));
+ }
}
} // end of namespace otb
#endif
-
diff --git a/Code/Projections/otbCompositeTransform.h b/Code/Projections/otbCompositeTransform.h
index 6228be4d07..1496526689 100644
--- a/Code/Projections/otbCompositeTransform.h
+++ b/Code/Projections/otbCompositeTransform.h
@@ -28,7 +28,6 @@
namespace otb
{
-
/** \class CompositeTransform
* \brief Class which compose two itk::Transform to obtain one itk::Transform
@@ -50,28 +49,27 @@ namespace otb
//} ProjectionTypeEnum;
template <class TFirstTransform,
-class TSecondTransform,
-class TScalarType= typename TFirstTransform::ScalarType,
-unsigned int NInputDimensions=TFirstTransform::InputSpaceDimension,
-unsigned int NOutputDimensions=TSecondTransform::OutputSpaceDimension>
-class ITK_EXPORT CompositeTransform: public itk::Transform<TScalarType, // Data type for scalars
- NInputDimensions, // Number of dimensions in the input space
- NOutputDimensions> // Number of dimensions in the output space
+ class TSecondTransform,
+ class TScalarType = typename TFirstTransform::ScalarType,
+ unsigned int NInputDimensions = TFirstTransform::InputSpaceDimension,
+ unsigned int NOutputDimensions = TSecondTransform::OutputSpaceDimension>
+class ITK_EXPORT CompositeTransform : public itk::Transform<TScalarType, // Data type for scalars
+ NInputDimensions, // Number of dimensions in the input space
+ NOutputDimensions> // Number of dimensions in the output space
{
-public :
-
+public:
/** Standard class typedefs */
- typedef itk::Transform< TScalarType,
- NInputDimensions,
- NOutputDimensions > Superclass;
- typedef CompositeTransform Self;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- typedef TFirstTransform FirstTransformType;
+ typedef itk::Transform<TScalarType,
+ NInputDimensions,
+ NOutputDimensions> Superclass;
+ typedef CompositeTransform Self;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ typedef TFirstTransform FirstTransformType;
typedef typename TFirstTransform::Pointer FirstTransformPointerType;
- typedef TSecondTransform SecondTransformType;
+ typedef TSecondTransform SecondTransformType;
typedef typename TSecondTransform::Pointer SecondTransformPointerType;
/** Standard vector type for this class. */
@@ -92,32 +90,31 @@ public :
/** TSecondTransform::InputPointType is purposely not defined
* It contrains user to choose First Transform Output compatible
* with Second Transform Input */
- typedef typename Superclass::OutputPointType SecondTransformOutputPointType;
+ typedef typename Superclass::OutputPointType SecondTransformOutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( CompositeTransform, itk::Transform );
+ itkTypeMacro(CompositeTransform, itk::Transform);
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
- itkStaticConstMacro(OutputSpaceDimension,unsigned int, NOutputDimensions);
+ itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
itkStaticConstMacro(SpaceDimension, unsigned int, NInputDimensions);
- itkStaticConstMacro(ParametersDimension, unsigned int, NInputDimensions*(NInputDimensions+1));
+ itkStaticConstMacro(ParametersDimension, unsigned int, NInputDimensions * (NInputDimensions + 1));
/** Set first transformation */
- itkSetObjectMacro(FirstTransform,FirstTransformType);
+ itkSetObjectMacro(FirstTransform, FirstTransformType);
/** Set second transformation */
- itkSetObjectMacro(SecondTransform,SecondTransformType);
+ itkSetObjectMacro(SecondTransform, SecondTransformType);
/** Get First and second transform*/
- itkGetConstReferenceMacro(FirstTransform,FirstTransformPointerType);
- itkGetConstReferenceMacro(SecondTransform,SecondTransformPointerType);
-
+ itkGetConstReferenceMacro(FirstTransform, FirstTransformPointerType);
+ itkGetConstReferenceMacro(SecondTransform, SecondTransformPointerType);
/** Method to transform a point. */
- virtual SecondTransformOutputPointType TransformPoint(const FirstTransformInputPointType & ) const;
+ virtual SecondTransformOutputPointType TransformPoint(const FirstTransformInputPointType&) const;
/** Method to transform a vector. */
// virtual OutputVectorType TransformVector(const InputVectorType &) const;
@@ -136,8 +133,8 @@ protected:
SecondTransformPointerType m_SecondTransform;
private:
- CompositeTransform(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ CompositeTransform(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Projections/otbCompositeTransform.txx b/Code/Projections/otbCompositeTransform.txx
index 730c10e1ff..f794e8dea3 100644
--- a/Code/Projections/otbCompositeTransform.txx
+++ b/Code/Projections/otbCompositeTransform.txx
@@ -29,58 +29,57 @@ namespace otb
{
template<class TFirstTransform,
-class TSecondTransform,
-class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions>
+ class TSecondTransform,
+ class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
CompositeTransform<TFirstTransform,
-TSecondTransform,
-TScalarType,
-NInputDimensions,
-NOutputDimensions>
-::CompositeTransform() : Superclass(SpaceDimension,ParametersDimension)
+ TSecondTransform,
+ TScalarType,
+ NInputDimensions,
+ NOutputDimensions>
+::CompositeTransform() : Superclass(SpaceDimension, ParametersDimension)
{
m_FirstTransform = 0;
m_SecondTransform = 0;
}
template<class TFirstTransform,
-class TSecondTransform,
-class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions>
+ class TSecondTransform,
+ class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
CompositeTransform<TFirstTransform,
-TSecondTransform,
-TScalarType,
-NInputDimensions,
-NOutputDimensions>
+ TSecondTransform,
+ TScalarType,
+ NInputDimensions,
+ NOutputDimensions>
::~CompositeTransform()
{
}
-
template<class TFirstTransform,
-class TSecondTransform,
-class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions>
+ class TSecondTransform,
+ class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
typename CompositeTransform<TFirstTransform,
-TSecondTransform,
-TScalarType,
-NInputDimensions,
-NOutputDimensions>::SecondTransformOutputPointType
+ TSecondTransform,
+ TScalarType,
+ NInputDimensions,
+ NOutputDimensions>::SecondTransformOutputPointType
CompositeTransform<TFirstTransform,
-TSecondTransform,
-TScalarType,
-NInputDimensions,
-NOutputDimensions>
-::TransformPoint(const FirstTransformInputPointType &point1) const
+ TSecondTransform,
+ TScalarType,
+ NInputDimensions,
+ NOutputDimensions>
+::TransformPoint(const FirstTransformInputPointType& point1) const
{
FirstTransformOutputPointType geoPoint;
- geoPoint=m_FirstTransform->TransformPoint(point1);
+ geoPoint = m_FirstTransform->TransformPoint(point1);
SecondTransformOutputPointType outputPoint;
- outputPoint=m_SecondTransform->TransformPoint(geoPoint);
+ outputPoint = m_SecondTransform->TransformPoint(geoPoint);
// otbMsgDevMacro(<< std::setprecision(15) << "Converting: " << point1 << " -> " << geoPoint<< " -> " << outputPoint);
@@ -129,8 +128,6 @@ NOutputDimensions>
return covariantVector2;
}*/
-
} // namespace otb
#endif
-
diff --git a/Code/Projections/otbEckert4MapProjection.h b/Code/Projections/otbEckert4MapProjection.h
index f1efc9e97d..bb4e37df1a 100644
--- a/Code/Projections/otbEckert4MapProjection.h
+++ b/Code/Projections/otbEckert4MapProjection.h
@@ -29,39 +29,39 @@ namespace otb
* It converts coordinates in longitude,latitude (WGS84) to Eckert4 map coordinates.
*/
template <InverseOrForwardTransformationEnum transform>
-class ITK_EXPORT Eckert4MapProjection : public MapProjection<ossimEckert4Projection,transform>
+class ITK_EXPORT Eckert4MapProjection : public MapProjection<ossimEckert4Projection, transform>
{
-public :
+public:
/** Standard class typedefs. */
- typedef Eckert4MapProjection Self;
- typedef MapProjection<ossimEckert4Projection,transform> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef Eckert4MapProjection Self;
+ typedef MapProjection<ossimEckert4Projection, transform> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::ScalarType ScalarType;
- typedef itk::Point<ScalarType,2 > InputPointType;
- typedef itk::Point<ScalarType,2 > OutputPointType;
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef itk::Point<ScalarType, 2> InputPointType;
+ typedef itk::Point<ScalarType, 2> OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( Eckert4MapProjection, MapProjection );
+ itkTypeMacro(Eckert4MapProjection, MapProjection);
virtual void SetFalseEasting(double falseEasting);
virtual void SetFalseNorthing(double falseNorthing);
virtual double GetFalseNorthing() const;
virtual double GetFalseEasting() const;
- virtual void SetParameters(double falseEasting,double falseNorthing);
+ virtual void SetParameters(double falseEasting, double falseNorthing);
virtual void SetDefaults();
-protected :
+protected:
Eckert4MapProjection();
virtual ~Eckert4MapProjection();
-private :
- Eckert4MapProjection(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ Eckert4MapProjection(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Projections/otbEckert4MapProjection.txx b/Code/Projections/otbEckert4MapProjection.txx
index 16109170bb..f74bfad664 100644
--- a/Code/Projections/otbEckert4MapProjection.txx
+++ b/Code/Projections/otbEckert4MapProjection.txx
@@ -30,7 +30,6 @@ Eckert4MapProjection<transform>
{
}
-
template <InverseOrForwardTransformationEnum transform>
Eckert4MapProjection<transform>
::~Eckert4MapProjection()
@@ -66,7 +65,7 @@ template <InverseOrForwardTransformationEnum transform>
double Eckert4MapProjection<transform>
::GetFalseNorthing() const
{
- double falseNorthing=this->m_MapProjection->getFalseNorthing();
+ double falseNorthing = this->m_MapProjection->getFalseNorthing();
return falseNorthing;
}
@@ -75,15 +74,15 @@ template <InverseOrForwardTransformationEnum transform>
double Eckert4MapProjection<transform>
::GetFalseEasting() const
{
- double falseEasting=this->m_MapProjection->getFalseEasting();
+ double falseEasting = this->m_MapProjection->getFalseEasting();
return falseEasting;
}
template <InverseOrForwardTransformationEnum transform>
void Eckert4MapProjection<transform>
-::SetParameters(double falseEasting,double falseNorthing)
+::SetParameters(double falseEasting, double falseNorthing)
{
- this->m_MapProjection->setFalseEastingNorthing(falseEasting,falseNorthing);
+ this->m_MapProjection->setFalseEastingNorthing(falseEasting, falseNorthing);
}
} // namespace otb
diff --git a/Code/Projections/otbForwardSensorModel.h b/Code/Projections/otbForwardSensorModel.h
index 9a45413a19..385b270a2d 100644
--- a/Code/Projections/otbForwardSensorModel.h
+++ b/Code/Projections/otbForwardSensorModel.h
@@ -41,36 +41,36 @@ namespace otb
*/
template <class TScalarType,
-unsigned int NInputDimensions=2,
-unsigned int NOutputDimensions=2>
+ unsigned int NInputDimensions = 2,
+ unsigned int NOutputDimensions = 2>
class ITK_EXPORT ForwardSensorModel : public SensorModelBase<TScalarType,
- NInputDimensions,
- NOutputDimensions>
+ NInputDimensions,
+ NOutputDimensions>
{
-public :
+public:
/** Standard class typedefs. */
- typedef ForwardSensorModel Self;
- typedef SensorModelBase< TScalarType,
+ typedef ForwardSensorModel Self;
+ typedef SensorModelBase<TScalarType,
NInputDimensions,
NOutputDimensions> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::InputPointType InputPointType;
- typedef typename Superclass::OutputPointType OutputPointType;
+ typedef typename Superclass::InputPointType InputPointType;
+ typedef typename Superclass::OutputPointType OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( ForwardSensorModel, SensorModelBase );
+ itkTypeMacro(ForwardSensorModel, SensorModelBase);
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
/** Compute the world coordinates. */
- OutputPointType TransformPoint(const InputPointType &point) const;
+ OutputPointType TransformPoint(const InputPointType& point) const;
protected:
ForwardSensorModel();
@@ -79,10 +79,10 @@ protected:
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-private :
+private:
- ForwardSensorModel(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ForwardSensorModel(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Difference between consecutives heights in iterative transform point with DEM */
double m_Epsilon;
@@ -91,7 +91,6 @@ private :
double m_NbIter;
};
-
} // namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Projections/otbForwardSensorModel.txx b/Code/Projections/otbForwardSensorModel.txx
index 706a243ddc..f930ec6679 100644
--- a/Code/Projections/otbForwardSensorModel.txx
+++ b/Code/Projections/otbForwardSensorModel.txx
@@ -18,7 +18,6 @@
#ifndef __otbForwardSensorModel_txx
#define __otbForwardSensorModel_txx
-
#include "otbForwardSensorModel.h"
#include "itkExceptionObject.h"
#include "otbMacro.h"
@@ -26,25 +25,24 @@
namespace otb
{
-template < class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions >
-ForwardSensorModel< TScalarType, NInputDimensions, NOutputDimensions>
+template <class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+ForwardSensorModel<TScalarType, NInputDimensions, NOutputDimensions>
::ForwardSensorModel()
{
m_Epsilon = 0.0001;
m_NbIter = 1;
}
-template < class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions >
-ForwardSensorModel< TScalarType, NInputDimensions, NOutputDimensions>
+template <class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+ForwardSensorModel<TScalarType, NInputDimensions, NOutputDimensions>
::~ForwardSensorModel()
{
}
-
-template < class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions >
-typename ForwardSensorModel< TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType
-ForwardSensorModel< TScalarType, NInputDimensions, NOutputDimensions>
-::TransformPoint(const InputPointType &point) const
+template <class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+typename ForwardSensorModel<TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType
+ForwardSensorModel<TScalarType, NInputDimensions, NOutputDimensions>
+::TransformPoint(const InputPointType& point) const
{
// otbMsgDevMacro(<< "Point in sensor geometry: (" << point[0] << "," << point[1] << ")");
@@ -54,29 +52,28 @@ ForwardSensorModel< TScalarType, NInputDimensions, NOutputDimensions>
// Calculation
ossimGpt ossimGPoint;
- if ( this->m_Model == NULL)
- {
- itkExceptionMacro(<<"TransformPoint(): Invalid Model pointer m_Model == NULL !");
- }
+ if (this->m_Model == NULL)
+ {
+ itkExceptionMacro(<< "TransformPoint(): Invalid Model pointer m_Model == NULL !");
+ }
//Use of DEM: need iteration to reach the correct point
if (this->m_UseDEM)
- {
+ {
this->m_Model->lineSampleToWorld(ossimPoint, ossimGPoint);
ossimGpt ossimGPointRef = ossimGPoint;
double height(0.), heightTmp(0.);
- double diffHeight = 100; // arbitrary value
+ double diffHeight = 100; // arbitrary value
itk::Point<double, 2> currentPoint;
- int nbIter = 0;
+ int nbIter = 0;
otbMsgDevMacro(<< "USING DEM ! ");
while ((diffHeight > m_Epsilon) && (nbIter < m_NbIter))
- {
+ {
otbMsgDevMacro(<< "Iter " << nbIter);
- if (nbIter != 0)
- height = heightTmp;
+ if (nbIter != 0) height = heightTmp;
// otbMsgDevMacro(<< "PointG Before iter : (" << ossimGPointRef.lat << "," << ossimGPointRef.lon <<")");
@@ -95,45 +92,43 @@ ForwardSensorModel< TScalarType, NInputDimensions, NOutputDimensions>
diffHeight = fabs(heightTmp - height);
++nbIter;
+ }
+ ossimGPoint = ossimGPointRef;
}
- ossimGPoint = ossimGPointRef;
- }
//Altitude of the point is provided (in the sensor coordinate)
else if (InputPointType::PointDimension == 3)
- {
+ {
this->m_Model->lineSampleHeightToWorld(ossimPoint, point[2], ossimGPoint);
- }
+ }
//Use of average elevation
else if (this->m_AverageElevation != -32768.0)
- {
+ {
this->m_Model->lineSampleHeightToWorld(ossimPoint, this->m_AverageElevation, ossimGPoint);
- }
+ }
//Otherwise, just don't consider the altitude
else
- {
+ {
this->m_Model->lineSampleToWorld(ossimPoint, ossimGPoint);
- }
-
+ }
// "OutputPointType" storage.
OutputPointType outputPoint;
- outputPoint[0]=ossimGPoint.lon;
- outputPoint[1]=ossimGPoint.lat;
+ outputPoint[0] = ossimGPoint.lon;
+ outputPoint[1] = ossimGPoint.lat;
// otbMsgDevMacro(<< "Geographic point lon/lat : (" << outputPoint[1] << "," << outputPoint[0] << ")");
return outputPoint;
}
-template < class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions >
+template <class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
void
-ForwardSensorModel< TScalarType, NInputDimensions, NOutputDimensions>
+ForwardSensorModel<TScalarType, NInputDimensions, NOutputDimensions>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // namespace otb
#endif
-
diff --git a/Code/Projections/otbGCPsToRPCSensorModelImageFilter.h b/Code/Projections/otbGCPsToRPCSensorModelImageFilter.h
index 4312f00b00..1351c44ac7 100644
--- a/Code/Projections/otbGCPsToRPCSensorModelImageFilter.h
+++ b/Code/Projections/otbGCPsToRPCSensorModelImageFilter.h
@@ -10,8 +10,8 @@
See OTBCopyright.txt for details.
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
@@ -28,20 +28,20 @@ namespace otb {
/** \class GCPsToRPCSensorModelImageFilter
* \brief This filter estimates a RPC sensor models from GCPs.
- *
+ *
* This filters estimates an RPC sensor model from a list of user
* defined GCPs. Internally, it uses an ossimRpcSolver, which performs
* the estimation using the well known least-square method.
*
* The UseImageGCPs flag allows to import GCPs from the image
* metadata, if any.
- *
+ *
* GCPs can be passed to the filter using one of the AddGCP method
* implementation.
- *
+ *
* The first implementation takes geographic points with elevation (3D
* points).
- *
+ *
* The second implementation accepts geographic points without the
* elevation information. In this case, either the mean elevation or
* an elevation fetch from a SRT directory is used, depending on the
@@ -52,9 +52,9 @@ namespace otb {
* using the appropriate setter, or configure the existing internal
* DEMHandler using the Getter.
*
- * The RMS (root mean square) ground error is available through the
+ * The RMS (root mean square) ground error is available through the
* appropriate getter.
- *
+ *
* Please note that GCPs are infered to be given in physical
* coordinates. This is seamless in most cases.
*
@@ -64,34 +64,34 @@ namespace otb {
*
* This filter does not modify the image buffer, but only the
* metadata. Therefore, it is implemented as an InPlaceImageFilter.
- *
+ *
* The output image can be given to the OrthorectificationFilter.
*
*/
-template < class TImage>
+template <class TImage>
class ITK_EXPORT GCPsToRPCSensorModelImageFilter :
- public itk::InPlaceImageFilter< TImage >
+ public itk::InPlaceImageFilter<TImage>
{
public:
/** Standard class typedefs. */
- typedef GCPsToRPCSensorModelImageFilter Self;
- typedef itk::InPlaceImageFilter< TImage > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef GCPsToRPCSensorModelImageFilter Self;
+ typedef itk::InPlaceImageFilter<TImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** GCPs typedefs */
- typedef itk::Point<double,2> Point2DType;
- typedef itk::Point<double,3> Point3DType;
- typedef std::pair<Point2DType,Point3DType> GCPType;
+ typedef itk::Point<double, 2> Point2DType;
+ typedef itk::Point<double, 3> Point3DType;
+ typedef std::pair<Point2DType, Point3DType> GCPType;
typedef std::vector<GCPType> GCPsContainerType;
typedef std::vector<double> ErrorsContainerType;
- typedef itk::ContinuousIndex<> ContinuousIndexType;
- typedef itk::ContinuousIndex<double, 3> Continuous3DIndexType;
+ typedef itk::ContinuousIndex<> ContinuousIndexType;
+ typedef itk::ContinuousIndex<double, 3> Continuous3DIndexType;
/** DEM typedef */
- typedef otb::DEMHandler DEMHandlerType;
- typedef typename DEMHandlerType::Pointer DEMHandlerPointerType;
+ typedef otb::DEMHandler DEMHandlerType;
+ typedef typename DEMHandlerType::Pointer DEMHandlerPointerType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -111,34 +111,34 @@ public:
void LoadImageGCPs();
/** Set/Get/toogle the UseDEM flag */
- itkSetMacro(UseDEM,bool);
- itkGetMacro(UseDEM,bool);
+ itkSetMacro(UseDEM, bool);
+ itkGetMacro(UseDEM, bool);
itkBooleanMacro(UseDEM);
/** Set/Get the mean elevation */
- itkSetMacro(MeanElevation,double);
- itkGetConstReferenceMacro(MeanElevation,double);
+ itkSetMacro(MeanElevation, double);
+ itkGetConstReferenceMacro(MeanElevation, double);
/** Set/Get the DEMHandler */
- itkSetObjectMacro(DEMHandler,DEMHandlerType);
- itkGetObjectMacro(DEMHandler,DEMHandlerType);
+ itkSetObjectMacro(DEMHandler, DEMHandlerType);
+ itkGetObjectMacro(DEMHandler, DEMHandlerType);
/** Get the residual ground error */
- itkGetConstReferenceMacro(RMSGroundError,double);
-
+ itkGetConstReferenceMacro(RMSGroundError, double);
+
/** Get the Error container */
- ErrorsContainerType & GetErrorsContainer();
-
+ ErrorsContainerType& GetErrorsContainer();
+
/** Get the mean error */
- itkGetConstReferenceMacro(MeanError,double);
-
+ itkGetConstReferenceMacro(MeanError, double);
+
/** Get the GCPsContainer
* \return The GCPs container */
- GCPsContainerType & GetGCPsContainer();
+ GCPsContainerType& GetGCPsContainer();
/** Set the GCP container */
- void SetGCPsContainer(const GCPsContainerType & container);
-
+ void SetGCPsContainer(const GCPsContainerType& container);
+
/** Get Keywordlist */
itkGetConstReferenceMacro(Keywordlist, ImageKeywordlist);
@@ -151,72 +151,72 @@ public:
* accepts a 3D ground point and use the DEM or MeanElevation to get
* the corresponding elevation before calling the AddGCP acception 3D
* ground points.*/
- void AddGCP(const Point2DType& sensorPoint, const Point2DType & groundPoint);
+ void AddGCP(const Point2DType& sensorPoint, const Point2DType& groundPoint);
/** Remove a GCP given by it's coordinates */
void RemoveGCP(unsigned int id);
/** Clear all GCPs */
void ClearGCPs();
-
+
/** Transform point */
- void TransformPoint(const Point2DType sensorPoint, Point3DType & groundPoint, double height=0.);
+ void TransformPoint(const Point2DType sensorPoint, Point3DType& groundPoint, double height = 0.);
protected:
/** Constructor */
GCPsToRPCSensorModelImageFilter();
/** Destructor */
virtual ~GCPsToRPCSensorModelImageFilter();
-
+
/** The PrintSelf method */
- virtual void PrintSelf( std::ostream & os, itk::Indent indent ) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Actual estimation of the sensor model takes place in the
* GenerateOutputInformation() method */
virtual void GenerateOutputInformation();
-
+
virtual void ThreadedGenerateData(const typename TImage::RegionType&, int) {}
private:
- GCPsToRPCSensorModelImageFilter ( const Self & ); // purposely not implemented
- void operator= ( const Self & ); // purposely not implemented
+ GCPsToRPCSensorModelImageFilter (const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** Transform all GCPs and compute the error and mean error */
void ComputeErrors();
/** True to use GCPs from image metadata as well */
- bool m_UseImageGCPs;
+ bool m_UseImageGCPs;
/** The residual ground error */
- double m_RMSGroundError;
-
+ double m_RMSGroundError;
+
/** The GCP error list */
- ErrorsContainerType m_ErrorsContainer;
-
+ ErrorsContainerType m_ErrorsContainer;
+
/** The mean error */
- double m_MeanError;
+ double m_MeanError;
/** True if a DEM should be used */
- bool m_UseDEM;
+ bool m_UseDEM;
- /** If no DEM is used, a MeanElevation
+ /** If no DEM is used, a MeanElevation
* over the image is used instead */
- double m_MeanElevation;
+ double m_MeanElevation;
/** The DEMHandler */
- DEMHandlerPointerType m_DEMHandler;
+ DEMHandlerPointerType m_DEMHandler;
/** Container of GCPs */
- GCPsContainerType m_GCPsContainer;
-
+ GCPsContainerType m_GCPsContainer;
+
/** RPC Projection */
ossimRefPtr<ossimRpcProjection> m_RpcProjection;
-
+
/** Projection */
- ossimRefPtr<ossimProjection> m_Projection;
-
+ ossimRefPtr<ossimProjection> m_Projection;
+
/** Keywordlist */
- ImageKeywordlist m_Keywordlist;
+ ImageKeywordlist m_Keywordlist;
}; // end of class
diff --git a/Code/Projections/otbGCPsToRPCSensorModelImageFilter.txx b/Code/Projections/otbGCPsToRPCSensorModelImageFilter.txx
index dc75ee4b84..31f7a92554 100644
--- a/Code/Projections/otbGCPsToRPCSensorModelImageFilter.txx
+++ b/Code/Projections/otbGCPsToRPCSensorModelImageFilter.txx
@@ -10,8 +10,8 @@
See OTBCopyright.txt for details.
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
@@ -27,18 +27,18 @@
namespace otb {
-template < class TImage >
+template <class TImage>
GCPsToRPCSensorModelImageFilter<TImage>
-::GCPsToRPCSensorModelImageFilter() : m_UseImageGCPs(false),
- m_RMSGroundError(0.),
- m_ErrorsContainer(),
- m_MeanError(0.),
- m_UseDEM(false),
- m_MeanElevation(0.),
- m_DEMHandler(),
- m_GCPsContainer(),
- m_RpcProjection(),
- m_Projection()
+::GCPsToRPCSensorModelImageFilter() : m_UseImageGCPs(false),
+ m_RMSGroundError(0.),
+ m_ErrorsContainer(),
+ m_MeanError(0.),
+ m_UseDEM(false),
+ m_MeanElevation(0.),
+ m_DEMHandler(),
+ m_GCPsContainer(),
+ m_RpcProjection(),
+ m_Projection()
{
// This filter does not modify the image buffer, but only its
// metadata.Therefore, it can be run inplace to reduce memory print.
@@ -46,7 +46,7 @@ GCPsToRPCSensorModelImageFilter<TImage>
// Clear the GCPs container
this->ClearGCPs();
-
+
// Create projection
m_RpcProjection = new ossimRpcProjection();
@@ -54,38 +54,38 @@ GCPsToRPCSensorModelImageFilter<TImage>
m_DEMHandler = DEMHandler::New();
}
-template < class TImage >
-GCPsToRPCSensorModelImageFilter< TImage >
+template <class TImage>
+GCPsToRPCSensorModelImageFilter<TImage>
::~GCPsToRPCSensorModelImageFilter()
{
// Clear the GCPs container
this->ClearGCPs();
}
-template < class TImage >
-typename GCPsToRPCSensorModelImageFilter< TImage >
-::GCPsContainerType &
-GCPsToRPCSensorModelImageFilter< TImage >
+template <class TImage>
+typename GCPsToRPCSensorModelImageFilter<TImage>
+::GCPsContainerType&
+GCPsToRPCSensorModelImageFilter<TImage>
::GetGCPsContainer()
{
// return the GCPs container
return m_GCPsContainer;
}
-template < class TImage >
-typename GCPsToRPCSensorModelImageFilter< TImage >
-::ErrorsContainerType &
-GCPsToRPCSensorModelImageFilter< TImage >
+template <class TImage>
+typename GCPsToRPCSensorModelImageFilter<TImage>
+::ErrorsContainerType&
+GCPsToRPCSensorModelImageFilter<TImage>
::GetErrorsContainer()
{
// return the GCPs container
return m_ErrorsContainer;
}
-template < class TImage >
+template <class TImage>
void
-GCPsToRPCSensorModelImageFilter< TImage >
-::SetGCPsContainer(const GCPsContainerType & container)
+GCPsToRPCSensorModelImageFilter<TImage>
+::SetGCPsContainer(const GCPsContainerType& container)
{
// Set the GCPs container
m_GCPsContainer = container;
@@ -93,75 +93,74 @@ GCPsToRPCSensorModelImageFilter< TImage >
this->Modified();
}
-template < class TImage >
+template <class TImage>
void
-GCPsToRPCSensorModelImageFilter< TImage >
-::AddGCP(const Point2DType& sensorPoint, const Point3DType & groundPoint)
+GCPsToRPCSensorModelImageFilter<TImage>
+::AddGCP(const Point2DType& sensorPoint, const Point3DType& groundPoint)
{
// Create a new GCP
- GCPType newGCP(sensorPoint,groundPoint);
+ GCPType newGCP(sensorPoint, groundPoint);
// Add it to the container
m_GCPsContainer.push_back(newGCP);
// Call the modified method */
this->Modified();
}
-template < class TImage >
+template <class TImage>
void
-GCPsToRPCSensorModelImageFilter< TImage >
-::AddGCP(const Point2DType& sensorPoint, const Point2DType & groundPoint)
+GCPsToRPCSensorModelImageFilter<TImage>
+::AddGCP(const Point2DType& sensorPoint, const Point2DType& groundPoint)
{
// Create the ground point with elevation
Point3DType groundPointWithElevation;
// Fill it with ground point data
groundPointWithElevation[0] = groundPoint[0];
groundPointWithElevation[1] = groundPoint[1];
-
+
// Check wether we are using a DEM or not
- if(m_UseDEM)
- {
+ if (m_UseDEM)
+ {
// If so, use it to get the elevation
double height = m_DEMHandler->GetHeightAboveMSL(groundPoint);
// To avoid nan value
- if (height != height)
- height = 0;
+ if (height != height) height = 0;
groundPointWithElevation[2] = height;
- }
+ }
else
- {
+ {
// Use the MeanElevation value
groundPointWithElevation[2] = m_MeanElevation;
- }
-
+ }
+
// Call the 3D version of the method
- this->AddGCP(sensorPoint,groundPointWithElevation);
+ this->AddGCP(sensorPoint, groundPointWithElevation);
}
-template< class TImage >
+template<class TImage>
void
-GCPsToRPCSensorModelImageFilter< TImage >
+GCPsToRPCSensorModelImageFilter<TImage>
::RemoveGCP(unsigned int id)
{
if (id < m_GCPsContainer.size())
- {
+ {
m_GCPsContainer.erase(m_GCPsContainer.begin() + id);
- }
-
+ }
+
this->Modified();
}
-template < class TImage >
+template <class TImage>
void
-GCPsToRPCSensorModelImageFilter< TImage >
+GCPsToRPCSensorModelImageFilter<TImage>
::ClearGCPs()
{
m_GCPsContainer.clear();
this->Modified();
}
-template < class TImage >
+template <class TImage>
void
-GCPsToRPCSensorModelImageFilter< TImage >
+GCPsToRPCSensorModelImageFilter<TImage>
::SetUseImageGCPs(bool use)
{
// Set the internal value
@@ -170,94 +169,92 @@ GCPsToRPCSensorModelImageFilter< TImage >
this->LoadImageGCPs();
}
-template < class TImage >
+template <class TImage>
void
-GCPsToRPCSensorModelImageFilter< TImage >
+GCPsToRPCSensorModelImageFilter<TImage>
::LoadImageGCPs()
{
// First, retrieve the image pointer
typename TImage::Pointer imagePtr = this->GetOutput();
// Iterate on the image GCPs
- for( unsigned int i=0; i<imagePtr->GetGCPCount(); i++ )
- {
+ for (unsigned int i = 0; i < imagePtr->GetGCPCount(); i++)
+ {
// Store row/col in an index
typename TImage::IndexType index;
index[0] = static_cast<long int>(imagePtr->GetGCPCol(i));
index[1] = static_cast<long int>(imagePtr->GetGCPRow(i));
-
+
// Transform to physical point
Point2DType sensorPoint;
- imagePtr->TransformIndexToPhysicalPoint(index,sensorPoint);
-
+ imagePtr->TransformIndexToPhysicalPoint(index, sensorPoint);
+
// Sensor and Ground points
Point3DType groundPoint;
-
+
groundPoint[1] = imagePtr->GetGCPX(i); // Lat
groundPoint[0] = imagePtr->GetGCPY(i); // Lon
groundPoint[2] = imagePtr->GetGCPZ(i);
-
+
// Search image GCPs and remove them from container
bool found = false;
-
+
unsigned int currentGCP = 0;
-
- while( (currentGCP < m_GCPsContainer.size()) && !found)
- {
- if((m_GCPsContainer[currentGCP].first == sensorPoint)
- && (m_GCPsContainer[currentGCP].second == groundPoint))
+
+ while ((currentGCP < m_GCPsContainer.size()) && !found)
{
+ if ((m_GCPsContainer[currentGCP].first == sensorPoint)
+ && (m_GCPsContainer[currentGCP].second == groundPoint))
+ {
// If we don't use image GCPs, erase the GCP
- if (!m_UseImageGCPs)
- m_GCPsContainer.erase(m_GCPsContainer.begin() + currentGCP);
-
+ if (!m_UseImageGCPs) m_GCPsContainer.erase(m_GCPsContainer.begin() + currentGCP);
+
found = true;
- }
-
+ }
+
currentGCP++;
- }
-
+ }
+
// If we use image GCPs, add it to the container
- if (m_UseImageGCPs && !found)
- this->AddGCP(sensorPoint, groundPoint);
- }
-
+ if (m_UseImageGCPs && !found) this->AddGCP(sensorPoint, groundPoint);
+ }
+
this->Modified();
}
/** Transform point */
-template < class TImage >
+template <class TImage>
void
-GCPsToRPCSensorModelImageFilter< TImage >
-::TransformPoint(const Point2DType sensorPoint, Point3DType & groundPoint, double height)
+GCPsToRPCSensorModelImageFilter<TImage>
+::TransformPoint(const Point2DType sensorPoint, Point3DType& groundPoint, double height)
{
ossimDpt spoint(sensorPoint[0], sensorPoint[1]);
ossimGpt gpoint;
-
+
gpoint.hgt = height;
-
- if( m_Projection != NULL )
- {
+
+ if (m_Projection != NULL)
+ {
m_Projection->lineSampleToWorld(spoint, gpoint);
-
+
groundPoint[0] = gpoint.lon;
groundPoint[1] = gpoint.lat;
groundPoint[2] = gpoint.hgt;
- }
+ }
else
- {
+ {
groundPoint[0] = 0.;
groundPoint[1] = 0.;
groundPoint[2] = 0.;
- }
+ }
}
-template < class TImage >
+template <class TImage>
void
-GCPsToRPCSensorModelImageFilter< TImage >
+GCPsToRPCSensorModelImageFilter<TImage>
::ComputeErrors()
{
- ContinuousIndexType idFix, idOut;
+ ContinuousIndexType idFix, idOut;
Continuous3DIndexType idOut3D, idTrans3D;
Point2DType sensorPoint;
@@ -269,45 +266,45 @@ GCPsToRPCSensorModelImageFilter< TImage >
// Clear Error container
m_ErrorsContainer.clear();
- for (unsigned int i=0; i<m_GCPsContainer.size(); i++)
- {
- // GCP value
+ for (unsigned int i = 0; i < m_GCPsContainer.size(); i++)
+ {
+ // GCP value
sensorPoint = m_GCPsContainer[i].first;
groundPoint = m_GCPsContainer[i].second;
-
+
// Compute Transform
Point3DType groundPointTemp;
this->TransformPoint(sensorPoint, groundPointTemp, groundPoint[2]);
-
+
// Compute Euclidian distance
idFix[0] = sensorPoint[0];
idFix[1] = sensorPoint[1];
-
+
idOut3D[0] = groundPoint[0];
idOut3D[1] = groundPoint[1];
- idOut3D[2] = groundPoint[2];
+ idOut3D[2] = groundPoint[2];
idTrans3D[0] = groundPointTemp[0];
idTrans3D[1] = groundPointTemp[1];
idTrans3D[2] = groundPointTemp[2];
-
+
double distance = idOut3D.EuclideanDistanceTo(idTrans3D);
double error = vcl_sqrt(distance);
-
+
// Add error to the container
m_ErrorsContainer.push_back(error);
-
+
// Compute mean error
sum += distance;
- }
-
+ }
+
sum = vcl_sqrt(sum);
m_MeanError = sum / static_cast<double>(m_ErrorsContainer.size());
}
-template< class TImage >
+template<class TImage>
void
-GCPsToRPCSensorModelImageFilter< TImage >
+GCPsToRPCSensorModelImageFilter<TImage>
::GenerateOutputInformation()
{
// First, call the superclass implementation
@@ -318,7 +315,7 @@ GCPsToRPCSensorModelImageFilter< TImage >
// The vector where geo and sensor points are stored
std::vector<ossimDpt> sensorPoints;
- std::vector<ossimGpt> geoPoints;
+ std::vector<ossimGpt> geoPoints;
// Temporary points variable
ossimDpt sensorPoint;
@@ -326,44 +323,45 @@ GCPsToRPCSensorModelImageFilter< TImage >
// Retrieve the additional GCPs
typename GCPsContainerType::const_iterator gcpIt;
- for(gcpIt = m_GCPsContainer.begin(); gcpIt!=m_GCPsContainer.end();++gcpIt)
+ for (gcpIt = m_GCPsContainer.begin(); gcpIt != m_GCPsContainer.end(); ++gcpIt)
{
// Fill sensor point
- sensorPoint = ossimDpt(gcpIt->first[0],gcpIt->first[1]);
-
+ sensorPoint = ossimDpt(gcpIt->first[0], gcpIt->first[1]);
+
// Fill geo point
- geoPoint = ossimGpt(gcpIt->second[0],gcpIt->second[1],gcpIt->second[2]);
-
+ geoPoint = ossimGpt(gcpIt->second[0], gcpIt->second[1], gcpIt->second[2]);
+
// Add the sensor point to the list
sensorPoints.push_back(sensorPoint);
- // Add the geo point to the list
+ // Add the geo point to the list
geoPoints.push_back(geoPoint);
}
// Build the ossim rpc solver
- ossimRefPtr<ossimRpcSolver> rpcSolver = new ossimRpcSolver(false,false);
+ ossimRefPtr<ossimRpcSolver> rpcSolver = new ossimRpcSolver(false, false);
// Call the solve method
- rpcSolver->solveCoefficients(sensorPoints,geoPoints);
+ rpcSolver->solveCoefficients(sensorPoints, geoPoints);
// Retrieve the residual ground error
m_RMSGroundError = rpcSolver->getRmsError();
// Retrieve the output RPC projection
ossimRefPtr<ossimRpcModel> rpcModel = dynamic_cast<ossimRpcModel*>(rpcSolver->createRpcModel()->getProjection());
-
+
// Export the sensor model in an ossimKeywordlist
ossimKeywordlist geom_kwl;
rpcModel->saveState(geom_kwl);
-
+
// Compute projection
- ossimRefPtr< ossimRpcProjection > objp = dynamic_cast<ossimRpcProjection*>(rpcSolver->createRpcProjection()->getProjection());
+ ossimRefPtr<ossimRpcProjection> objp = dynamic_cast<ossimRpcProjection*>(
+ rpcSolver->createRpcProjection()->getProjection());
ossimKeywordlist kwl;
objp->saveState(kwl);
m_RpcProjection->loadState(kwl);
m_Projection = m_RpcProjection.get();
-
+
// Compute errors
this->ComputeErrors();
@@ -375,26 +373,24 @@ GCPsToRPCSensorModelImageFilter< TImage >
// Encapsulate it
itk::MetaDataDictionary& dict = imagePtr->GetMetaDataDictionary();
- itk::EncapsulateMetaData< ImageKeywordlist >( dict, MetaDataKey::OSSIMKeywordlistKey, otb_kwl );
+ itk::EncapsulateMetaData<ImageKeywordlist>(dict, MetaDataKey::OSSIMKeywordlistKey, otb_kwl);
}
-template < class TImage >
+template <class TImage>
void
-GCPsToRPCSensorModelImageFilter< TImage >
-::PrintSelf( std::ostream & os, itk::Indent indent ) const
+GCPsToRPCSensorModelImageFilter<TImage>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf( os, indent );
- os<<indent<<"UseImageGCPs: "<<(m_UseImageGCPs ? "yes" : "no")<<std::endl;
- os<<indent<<"UseDEM: "<<(m_UseDEM ? "yes" : "no")<<std::endl;
- if(!m_UseDEM)
+ Superclass::PrintSelf(os, indent);
+ os << indent << "UseImageGCPs: " << (m_UseImageGCPs ? "yes" : "no") << std::endl;
+ os << indent << "UseDEM: " << (m_UseDEM ? "yes" : "no") << std::endl;
+ if (!m_UseDEM)
{
- os<<indent<<"MeanElevation: "<<m_MeanElevation<<std::endl;
+ os << indent << "MeanElevation: " << m_MeanElevation << std::endl;
}
- os<<indent<<"RMS ground error: "<<m_RMSGroundError<<std::endl;
+ os << indent << "RMS ground error: " << m_RMSGroundError << std::endl;
}
} // end of namespace otb
#endif
-
-
diff --git a/Code/Projections/otbGenericMapProjection.h b/Code/Projections/otbGenericMapProjection.h
index 443f5a79dc..f570f454db 100644
--- a/Code/Projections/otbGenericMapProjection.h
+++ b/Code/Projections/otbGenericMapProjection.h
@@ -49,48 +49,47 @@ namespace otb
*
**/
-typedef enum {FORWARD=0, INVERSE=1} InverseOrForwardTransformationEnum;
+typedef enum {FORWARD = 0, INVERSE = 1} InverseOrForwardTransformationEnum;
template <InverseOrForwardTransformationEnum TDirectionOfMapping,
-class TScalarType = double,
-unsigned int NInputDimensions=2,
-unsigned int NOutputDimensions=2>
-class ITK_EXPORT GenericMapProjection: public itk::Transform<TScalarType, // Data type for scalars
- NInputDimensions, // Number of dimensions in the input space
- NOutputDimensions> // Number of dimensions in the output space
+ class TScalarType = double,
+ unsigned int NInputDimensions = 2,
+ unsigned int NOutputDimensions = 2>
+class ITK_EXPORT GenericMapProjection : public itk::Transform<TScalarType, // Data type for scalars
+ NInputDimensions, // Number of dimensions in the input space
+ NOutputDimensions> // Number of dimensions in the output space
{
-public :
+public:
/** Standard class typedefs. */
- typedef itk::Transform< TScalarType,
- NInputDimensions,
- NOutputDimensions > Superclass;
- typedef GenericMapProjection Self;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::Transform<TScalarType,
+ NInputDimensions,
+ NOutputDimensions> Superclass;
+ typedef GenericMapProjection Self;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
typedef typename Superclass::ScalarType ScalarType;
typedef ossimProjection OssimMapProjectionType;
- typedef itk::Point<ScalarType,NInputDimensions > InputPointType;
- typedef itk::Point<ScalarType,NOutputDimensions > OutputPointType;
+ typedef itk::Point<ScalarType, NInputDimensions> InputPointType;
+ typedef itk::Point<ScalarType, NOutputDimensions> OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( GenericMapProjection, itk::Transform );
+ itkTypeMacro(GenericMapProjection, itk::Transform);
- itkSetObjectMacro(MapProjection,OssimMapProjectionType);
- virtual OssimMapProjectionType* GetMapProjection ();
- virtual const OssimMapProjectionType* GetMapProjection () const;
+ itkSetObjectMacro(MapProjection, OssimMapProjectionType);
+ virtual OssimMapProjectionType* GetMapProjection();
+ virtual const OssimMapProjectionType* GetMapProjection() const;
typedef InverseOrForwardTransformationEnum DirectionOfMappingEnumType;
- itkStaticConstMacro(DirectionOfMapping,DirectionOfMappingEnumType,TDirectionOfMapping);
+ itkStaticConstMacro(DirectionOfMapping, DirectionOfMappingEnumType, TDirectionOfMapping);
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
itkStaticConstMacro(SpaceDimension, unsigned int, NInputDimensions);
- itkStaticConstMacro(ParametersDimension, unsigned int,NInputDimensions*(NInputDimensions+1));
-
+ itkStaticConstMacro(ParametersDimension, unsigned int, NInputDimensions * (NInputDimensions + 1));
/** Return the Wkt representation of the projection*/
virtual std::string GetWkt();
@@ -100,7 +99,7 @@ public :
virtual void PrintMap() const;
- OutputPointType TransformPoint(const InputPointType &point) const;
+ OutputPointType TransformPoint(const InputPointType& point) const;
virtual bool InstanciateProjection();
@@ -108,17 +107,16 @@ protected:
GenericMapProjection();
virtual ~GenericMapProjection();
OssimMapProjectionType* m_MapProjection;
- std::string m_ProjectionRefWkt;
+ std::string m_ProjectionRefWkt;
bool reinstanciateProjection;
-private :
- GenericMapProjection(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ GenericMapProjection(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Projections/otbGenericMapProjection.txx b/Code/Projections/otbGenericMapProjection.txx
index 2d197c164e..35b91e029e 100644
--- a/Code/Projections/otbGenericMapProjection.txx
+++ b/Code/Projections/otbGenericMapProjection.txx
@@ -26,58 +26,60 @@
namespace otb
{
-template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::GenericMapProjection() : Superclass(SpaceDimension,ParametersDimension)
+::GenericMapProjection() : Superclass(SpaceDimension, ParametersDimension)
{
m_MapProjection = NULL;
m_ProjectionRefWkt.clear();
- reinstanciateProjection=true;
+ reinstanciateProjection = true;
}
-
-template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions>
::~GenericMapProjection()
{
if (m_MapProjection != NULL)
- {
+ {
delete m_MapProjection;
- }
+ }
}
-
-template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
typename GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions>::OssimMapProjectionType*
GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::GetMapProjection ()
+::GetMapProjection()
{
- itkDebugMacro("returning MapProjection address " << this->m_MapProjection );
+ itkDebugMacro("returning MapProjection address " << this->m_MapProjection);
if ((reinstanciateProjection) || (m_MapProjection == NULL))
- {
+ {
this->InstanciateProjection();
- }
+ }
return this->m_MapProjection;
}
-
-template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
-const typename GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions>::OssimMapProjectionType*
+template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
+const typename GenericMapProjection<Transform, TScalarType, NInputDimensions,
+ NOutputDimensions>::OssimMapProjectionType*
GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::GetMapProjection () const
+::GetMapProjection() const
{
- itkDebugMacro("returning MapProjection address " << this->m_MapProjection );
+ itkDebugMacro("returning MapProjection address " << this->m_MapProjection);
if ((reinstanciateProjection) || (m_MapProjection == NULL))
- {
- itkExceptionMacro(<<"m_MapProjection not up-to-date, call InstanciateProjection() first");
- }
+ {
+ itkExceptionMacro(<< "m_MapProjection not up-to-date, call InstanciateProjection() first");
+ }
return this->m_MapProjection;
}
-
-template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
std::string
GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions>
::GetWkt()
@@ -85,70 +87,72 @@ GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions
ossimKeywordlist kwl;
this->GetMapProjection()->saveState(kwl);
ossimOgcWktTranslator wktTranslator;
- std::string wkt;
+ std::string wkt;
wkt = wktTranslator.fromOssimKwl(kwl);
return wkt;
}
-template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
void
GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions>
::SetWkt(std::string projectionRefWkt)
{
- this->m_ProjectionRefWkt=projectionRefWkt;
+ this->m_ProjectionRefWkt = projectionRefWkt;
reinstanciateProjection = true;
this->InstanciateProjection();
this->Modified();
}
-template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
bool
GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions>
::InstanciateProjection()
{
if ((this->reinstanciateProjection) || (m_MapProjection == NULL))
- {
- ossimKeywordlist kwl;
+ {
+ ossimKeywordlist kwl;
ossimOgcWktTranslator wktTranslator;
bool projectionInformationAvailable = wktTranslator.toOssimKwl(m_ProjectionRefWkt, kwl);
if (!projectionInformationAvailable)
- {
- otbMsgDevMacro(<<"WARNING: Impossible to create the projection from string: "<< m_ProjectionRefWkt);
+ {
+ otbMsgDevMacro(<< "WARNING: Impossible to create the projection from string: " << m_ProjectionRefWkt);
return false;
- }
+ }
//we don't want to have a ossimEquDistCylProjection here:
//see discussion in May 2009 on ossim list;
//a better solution might be available...
if (std::string(kwl.find("type")) == "ossimEquDistCylProjection")
- {
+ {
otbMsgDevMacro(<< "WARNING: Not instanciating a ossimEquDistCylProjection");
return false;
- }
+ }
m_MapProjection = ossimMapProjectionFactory::instance()->createProjection(kwl);
this->reinstanciateProjection = false;
return true;
- }
+ }
return false;
}
-
-template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
typename GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType
GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::TransformPoint(const InputPointType & point) const
+::TransformPoint(const InputPointType& point) const
{
OutputPointType outputPoint;
// otbMsgDevMacro(<< "DirectionOfMapping: " << DirectionOfMapping);
switch (DirectionOfMapping)
- {
+ {
case INVERSE:
- {
+ {
// otbMsgDevMacro(<< "Cartographic coordinates: (" << point[0] << "," << point[1] << ")");
//from "itk::point" to "ossim::ossimDpt"
@@ -156,51 +160,51 @@ GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions
//map projection
ossimGpt ossimGPoint;
- ossimGPoint=this->GetMapProjection()->inverse(ossimDPoint);
- ossimGPoint.changeDatum(ossimDatumFactory::instance()->wgs84() );
+ ossimGPoint = this->GetMapProjection()->inverse(ossimDPoint);
+ ossimGPoint.changeDatum(ossimDatumFactory::instance()->wgs84());
// otbGenericMsgDebugMacro(<< "Inverse : " << std::endl << m_MapProjection->print(std::cout));
- outputPoint[0]=ossimGPoint.lon;
- outputPoint[1]=ossimGPoint.lat;
+ outputPoint[0] = ossimGPoint.lon;
+ outputPoint[1] = ossimGPoint.lat;
// otbMsgDevMacro(<< "Geographic coordinates (lon, lat) : (" << outputPoint[0] << "," << outputPoint[1] << ")");
if ((InputPointType::PointDimension == 3) && (OutputPointType::PointDimension == 3))
- {
+ {
outputPoint[2] = point[2];
- }
+ }
break;
- }
+ }
case FORWARD:
- {
+ {
// otbMsgDevMacro(<< "Geographic coordinates (lon, lat) : (" << point[1] << "," << point[0] << ")");
//from "itk::point" to "ossim::ossimGpt"
ossimGpt ossimGPoint(point[1], point[0]);
//map projection
ossimDpt ossimDPoint;
- ossimDPoint=this->GetMapProjection()->forward(ossimGPoint);
+ ossimDPoint = this->GetMapProjection()->forward(ossimGPoint);
// otbGenericMsgDebugMacro(<< "Forward : ========================= " << std::endl << m_MapProjection->print(std::cout));
- outputPoint[0]=ossimDPoint.x;
- outputPoint[1]=ossimDPoint.y;
+ outputPoint[0] = ossimDPoint.x;
+ outputPoint[1] = ossimDPoint.y;
// otbMsgDevMacro(<< "Cartographic coordinates: (" << outputPoint[0] << "," << outputPoint[1] << ")");
if ((InputPointType::PointDimension == 3) && (OutputPointType::PointDimension == 3))
- {
+ {
outputPoint[2] = point[2];
- }
+ }
break;
- }
+ }
default:
- {
- itkExceptionMacro(<<"Model is INVERSE or FORWARD only !!");
+ {
+ itkExceptionMacro(<< "Model is INVERSE or FORWARD only !!");
break;
- }
- }
+ }
+ }
return outputPoint;
}
-
-template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
void
GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions>
::PrintMap() const
@@ -208,7 +212,6 @@ GenericMapProjection<Transform, TScalarType, NInputDimensions, NOutputDimensions
std::cout << m_MapProjection->print(std::cout);
}
-
} // namespace otb
#endif
diff --git a/Code/Projections/otbGenericRSTransform.h b/Code/Projections/otbGenericRSTransform.h
index da09ea0d82..cb1b7aae34 100644
--- a/Code/Projections/otbGenericRSTransform.h
+++ b/Code/Projections/otbGenericRSTransform.h
@@ -29,209 +29,204 @@
namespace otb
{
- namespace Projection
+namespace Projection
+{
+enum TransformAccuracy {UNKNOWN, ESTIMATE, PRECISE};
+}
+/** \class GenericRSTransform
+ * \brief This is the class to handle generic remote sensing transform
+ *
+ * The transformation will transform the coordinate from any map projection or sensor
+ * model to any map projection or sensor model.
+ *
+ *
+ * \ingroup Projection
+ *
+ **/
+
+template <class TScalarType = double,
+ unsigned int NInputDimensions = 2,
+ unsigned int NOutputDimensions = 2>
+class ITK_EXPORT GenericRSTransform : public itk::Transform<TScalarType, // Data type for scalars
+ NInputDimensions, // Number of dimensions in the input space
+ NOutputDimensions> // Number of dimensions in the output space
+{
+public:
+ /** Standard class typedefs. */
+ typedef itk::Transform<TScalarType,
+ NInputDimensions,
+ NOutputDimensions> Superclass;
+ typedef GenericRSTransform Self;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef ossimProjection OssimMapProjectionType;
+ typedef itk::Point<ScalarType, NInputDimensions> InputPointType;
+ typedef itk::Point<ScalarType, NOutputDimensions> OutputPointType;
+
+ typedef itk::Vector<double, 2> SpacingType;
+ typedef itk::Point<double, 2> OriginType;
+
+ typedef itk::Transform<double, NInputDimensions, NOutputDimensions> GenericTransformType;
+ typedef typename GenericTransformType::Pointer GenericTransformPointerType;
+ typedef otb::CompositeTransform<GenericTransformType, GenericTransformType> TransformType;
+ typedef typename TransformType::Pointer TransformPointerType;
+
+ typedef typename Superclass::InverseTransformBasePointer InverseTransformBasePointer;
+
+ /** Method for creation through the object factory. */
+ itkNewMacro(Self);
+
+ /** Run-time type information (and related methods). */
+ itkTypeMacro(GenericRSTransform, itk::Transform);
+
+ typedef InverseOrForwardTransformationEnum DirectionOfMappingEnumType;
+
+ itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
+ itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
+ itkStaticConstMacro(SpaceDimension, unsigned int, NInputDimensions);
+ itkStaticConstMacro(ParametersDimension, unsigned int, NInputDimensions * (NInputDimensions + 1));
+
+ /** Set/Get for input and output projections. */
+ itkSetStringMacro(InputProjectionRef);
+ itkGetStringMacro(InputProjectionRef);
+
+ itkSetStringMacro(OutputProjectionRef);
+ itkGetStringMacro(OutputProjectionRef);
+
+ itkSetStringMacro(DEMDirectory);
+ itkGetStringMacro(DEMDirectory);
+
+ itkSetMacro(AverageElevation, double);
+ itkGetMacro(AverageElevation, double);
+
+ /** Set/Get Dictionary*/
+ const itk::MetaDataDictionary& GetInputDictionary() const
{
- enum TransformAccuracy {UNKNOWN, ESTIMATE, PRECISE};
+ return m_InputDictionary;
}
- /** \class GenericRSTransform
- * \brief This is the class to handle generic remote sensing transform
- *
- * The transformation will transform the coordinate from any map projection or sensor
- * model to any map projection or sensor model.
- *
- *
- * \ingroup Projection
- *
- **/
-
- template <class TScalarType = double,
- unsigned int NInputDimensions=2,
- unsigned int NOutputDimensions=2>
- class ITK_EXPORT GenericRSTransform: public itk::Transform<TScalarType, // Data type for scalars
- NInputDimensions, // Number of dimensions in the input space
- NOutputDimensions> // Number of dimensions in the output space
- {
- public :
- /** Standard class typedefs. */
- typedef itk::Transform< TScalarType,
- NInputDimensions,
- NOutputDimensions > Superclass;
- typedef GenericRSTransform Self;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- typedef typename Superclass::ScalarType ScalarType;
- typedef ossimProjection OssimMapProjectionType;
- typedef itk::Point<ScalarType,NInputDimensions > InputPointType;
- typedef itk::Point<ScalarType,NOutputDimensions > OutputPointType;
-
- typedef itk::Vector<double, 2> SpacingType;
- typedef itk::Point<double, 2> OriginType;
-
- typedef itk::Transform<double, NInputDimensions, NOutputDimensions> GenericTransformType;
- typedef typename GenericTransformType::Pointer GenericTransformPointerType;
- typedef otb::CompositeTransform<GenericTransformType, GenericTransformType> TransformType;
- typedef typename TransformType::Pointer TransformPointerType;
-
- typedef typename Superclass::InverseTransformBasePointer InverseTransformBasePointer;
-
- /** Method for creation through the object factory. */
- itkNewMacro( Self );
-
- /** Run-time type information (and related methods). */
- itkTypeMacro( GenericRSTransform, itk::Transform );
-
- typedef InverseOrForwardTransformationEnum DirectionOfMappingEnumType;
-
- itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
- itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
- itkStaticConstMacro(SpaceDimension, unsigned int, NInputDimensions);
- itkStaticConstMacro(ParametersDimension, unsigned int,NInputDimensions*(NInputDimensions+1));
-
- /** Set/Get for input and output projections. */
- itkSetStringMacro(InputProjectionRef);
- itkGetStringMacro(InputProjectionRef);
-
- itkSetStringMacro(OutputProjectionRef);
- itkGetStringMacro(OutputProjectionRef);
-
- itkSetStringMacro(DEMDirectory);
- itkGetStringMacro(DEMDirectory);
-
- itkSetMacro(AverageElevation, double);
- itkGetMacro(AverageElevation, double);
-
- /** Set/Get Dictionary*/
- const itk::MetaDataDictionary& GetInputDictionary() const
- {
- return m_InputDictionary;
- }
-
- void SetInputDictionary(const itk::MetaDataDictionary & dictionary)
- {
- m_InputDictionary = dictionary;
- this->Modified();
- }
-
- const itk::MetaDataDictionary& GetOutputDictionary() const
- {
- return m_OutputDictionary;
- }
-
- void SetOutputDictionary(const itk::MetaDataDictionary & dictionary)
- {
- m_OutputDictionary = dictionary;
- this->Modified();
- }
-
- /** Set/Get Keywordlist*/
-
- itkGetMacro(InputKeywordList,ImageKeywordlist);
- void SetInputKeywordList(const ImageKeywordlist& kwl)
- {
- this->m_InputKeywordList = kwl;
- this->Modified();
- }
-
- itkGetMacro(OutputKeywordList,ImageKeywordlist);
- void SetOutputKeywordList(const ImageKeywordlist& kwl)
- {
- this->m_OutputKeywordList = kwl;
- this->Modified();
- }
-
- /** Set the origin of the vector data.
- * \sa GetOrigin() */
- itkSetMacro(InputOrigin, OriginType);
- itkGetConstReferenceMacro(InputOrigin, OriginType);
-
-
- /** Set the spacing (size of a pixel) of the vector data.
- * \sa GetSpacing() */
- itkSetMacro(InputSpacing, SpacingType);
- itkGetConstReferenceMacro(InputSpacing, SpacingType);
-
-
- /** Set the origin of the vector data.
- * \sa GetOrigin() */
- itkSetMacro(OutputOrigin, OriginType);
- itkGetConstReferenceMacro(OutputOrigin, OriginType);
+ void SetInputDictionary(const itk::MetaDataDictionary& dictionary)
+ {
+ m_InputDictionary = dictionary;
+ this->Modified();
+ }
- /** Set the spacing (size of a pixel) of the vector data.
- * \sa GetSpacing() */
- itkSetMacro(OutputSpacing, SpacingType);
- itkGetConstReferenceMacro(OutputSpacing, SpacingType);
+ const itk::MetaDataDictionary& GetOutputDictionary() const
+ {
+ return m_OutputDictionary;
+ }
- /** Check if the transform is up to date */
- virtual bool IsUpToDate()
- {
- return m_TransformUpToDate;
- }
+ void SetOutputDictionary(const itk::MetaDataDictionary& dictionary)
+ {
+ m_OutputDictionary = dictionary;
+ this->Modified();
+ }
- /** Get Transform accuracy */
- itkGetMacro(TransformAccuracy, Projection::TransformAccuracy);
+ /** Set/Get Keywordlist*/
- /** Methods prototypes */
- virtual const TransformType * GetTransform() const;
+ itkGetMacro(InputKeywordList, ImageKeywordlist);
+ void SetInputKeywordList(const ImageKeywordlist& kwl)
+ {
+ this->m_InputKeywordList = kwl;
+ this->Modified();
+ }
+
+ itkGetMacro(OutputKeywordList, ImageKeywordlist);
+ void SetOutputKeywordList(const ImageKeywordlist& kwl)
+ {
+ this->m_OutputKeywordList = kwl;
+ this->Modified();
+ }
+
+ /** Set the origin of the vector data.
+ * \sa GetOrigin() */
+ itkSetMacro(InputOrigin, OriginType);
+ itkGetConstReferenceMacro(InputOrigin, OriginType);
+
+ /** Set the spacing (size of a pixel) of the vector data.
+ * \sa GetSpacing() */
+ itkSetMacro(InputSpacing, SpacingType);
+ itkGetConstReferenceMacro(InputSpacing, SpacingType);
+
+ /** Set the origin of the vector data.
+ * \sa GetOrigin() */
+ itkSetMacro(OutputOrigin, OriginType);
+ itkGetConstReferenceMacro(OutputOrigin, OriginType);
+
+ /** Set the spacing (size of a pixel) of the vector data.
+ * \sa GetSpacing() */
+ itkSetMacro(OutputSpacing, SpacingType);
+ itkGetConstReferenceMacro(OutputSpacing, SpacingType);
+
+ /** Check if the transform is up to date */
+ virtual bool IsUpToDate()
+ {
+ return m_TransformUpToDate;
+ }
+
+ /** Get Transform accuracy */
+ itkGetMacro(TransformAccuracy, Projection::TransformAccuracy);
+
+ /** Methods prototypes */
+ virtual const TransformType * GetTransform() const;
+
+ OutputPointType TransformPoint(const InputPointType& point) const;
- OutputPointType TransformPoint(const InputPointType &point) const;
+ virtual void InstanciateTransform();
- virtual void InstanciateTransform();
+ // Get inverse methods
+ bool GetInverse(Self * inverseTransform) const;
+ virtual InverseTransformBasePointer GetInverseTransform() const;
- // Get inverse methods
- bool GetInverse(Self * inverseTransform) const;
- virtual InverseTransformBasePointer GetInverseTransform() const;
-
-
- protected:
- GenericRSTransform();
- virtual ~GenericRSTransform()
- {};
-
- virtual void Modified()
- {
- this->Superclass::Modified();
- m_TransformUpToDate = false;
- }
+protected:
+ GenericRSTransform();
+ virtual ~GenericRSTransform()
+ {}
- void PrintSelf(std::ostream& os, itk::Indent indent) const
- {
- Superclass::PrintSelf(os,indent);
- os<<indent<<"Up to date: "<<m_TransformUpToDate<<std::endl;
- os<<indent<<"Input transform: "<<m_InputTransform<<std::endl;
- os<<indent<<"Output transform: "<<m_OutputTransform<<std::endl;
- }
-
- private :
- GenericRSTransform(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ virtual void Modified()
+ {
+ this->Superclass::Modified();
+ m_TransformUpToDate = false;
+ }
+
+ void PrintSelf(std::ostream& os, itk::Indent indent) const
+ {
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Up to date: " << m_TransformUpToDate << std::endl;
+ os << indent << "Input transform: " << m_InputTransform << std::endl;
+ os << indent << "Output transform: " << m_OutputTransform << std::endl;
+ }
- ImageKeywordlist m_InputKeywordList;
- ImageKeywordlist m_OutputKeywordList;
+private:
+ GenericRSTransform(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- itk::MetaDataDictionary m_InputDictionary;
- itk::MetaDataDictionary m_OutputDictionary;
+ ImageKeywordlist m_InputKeywordList;
+ ImageKeywordlist m_OutputKeywordList;
- std::string m_InputProjectionRef;
- std::string m_OutputProjectionRef;
- std::string m_DEMDirectory;
- double m_AverageElevation;
+ itk::MetaDataDictionary m_InputDictionary;
+ itk::MetaDataDictionary m_OutputDictionary;
- SpacingType m_InputSpacing;
- OriginType m_InputOrigin;
- SpacingType m_OutputSpacing;
- OriginType m_OutputOrigin;
+ std::string m_InputProjectionRef;
+ std::string m_OutputProjectionRef;
+ std::string m_DEMDirectory;
+ double m_AverageElevation;
- TransformPointerType m_Transform;
+ SpacingType m_InputSpacing;
+ OriginType m_InputOrigin;
+ SpacingType m_OutputSpacing;
+ OriginType m_OutputOrigin;
- GenericTransformPointerType m_InputTransform;
- GenericTransformPointerType m_OutputTransform;
- bool m_TransformUpToDate;
- Projection::TransformAccuracy m_TransformAccuracy;
+ TransformPointerType m_Transform;
- };
+ GenericTransformPointerType m_InputTransform;
+ GenericTransformPointerType m_OutputTransform;
+ bool m_TransformUpToDate;
+ Projection::TransformAccuracy m_TransformAccuracy;
+};
} // namespace otb
diff --git a/Code/Projections/otbGenericRSTransform.txx b/Code/Projections/otbGenericRSTransform.txx
index f079449ecf..88bd588287 100644
--- a/Code/Projections/otbGenericRSTransform.txx
+++ b/Code/Projections/otbGenericRSTransform.txx
@@ -32,7 +32,8 @@ namespace otb
template<class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
-::GenericRSTransform() : Superclass(SpaceDimension,ParametersDimension), m_DEMDirectory(""), m_AverageElevation(-32768.0)
+::GenericRSTransform() : Superclass(SpaceDimension,
+ ParametersDimension), m_DEMDirectory(""), m_AverageElevation(-32768.0)
{
m_InputProjectionRef.clear();
m_OutputProjectionRef.clear();
@@ -50,17 +51,16 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
m_TransformAccuracy = Projection::UNKNOWN;
}
-
template<class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
- const typename GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>::TransformType*
+const typename GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>::TransformType*
GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
::GetTransform() const
{
- itkDebugMacro("returning MapProjection address " << this->m_Transform );
+ itkDebugMacro("returning MapProjection address " << this->m_Transform);
if ((!m_TransformUpToDate) || (m_Transform.IsNull()))
- {
- itkExceptionMacro(<<"m_Transform not up-to-date, call InstanciateTransform() first");
- }
+ {
+ itkExceptionMacro(<< "m_Transform not up-to-date, call InstanciateTransform() first");
+ }
return this->m_Transform;
}
@@ -76,22 +76,22 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
m_Transform = TransformType::New();
if (m_InputKeywordList.GetSize() == 0)
- {
- itk::ExposeMetaData<ImageKeywordlist>(m_InputDictionary, MetaDataKey::OSSIMKeywordlistKey, m_InputKeywordList );
- }
+ {
+ itk::ExposeMetaData<ImageKeywordlist>(m_InputDictionary, MetaDataKey::OSSIMKeywordlistKey, m_InputKeywordList);
+ }
if (m_InputProjectionRef.empty())
- {
- itk::ExposeMetaData<std::string>(m_InputDictionary, MetaDataKey::ProjectionRefKey, m_InputProjectionRef );
- }
+ {
+ itk::ExposeMetaData<std::string>(m_InputDictionary, MetaDataKey::ProjectionRefKey, m_InputProjectionRef);
+ }
otbMsgDevMacro(<< "Information to instanciate transform: ");
otbMsgDevMacro(<< " * Input Origin: " << m_InputOrigin);
otbMsgDevMacro(<< " * Input Spacing: " << m_InputSpacing);
otbMsgDevMacro(<< " * Input keyword list: "
- << ((m_InputKeywordList.GetSize() == 0)?"Empty":"Full"));
+ << ((m_InputKeywordList.GetSize() == 0) ? "Empty" : "Full"));
otbMsgDevMacro(<< " * Input projection: " << m_InputProjectionRef);
otbMsgDevMacro(<< " * Output keyword list: "
- << ((m_OutputKeywordList.GetSize() == 0)?"Empty":"Full"));
+ << ((m_OutputKeywordList.GetSize() == 0) ? "Empty" : "Full"));
otbMsgDevMacro(<< " * Output projection: " << m_OutputProjectionRef);
otbMsgDevMacro(<< " * Output Origin: " << m_OutputOrigin);
otbMsgDevMacro(<< " * Output Spacing: " << m_OutputSpacing);
@@ -110,154 +110,155 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
//Set the input transformation
//*****************************
try
- {
-
- // First, try to make a geo transform
- if (!m_InputProjectionRef.empty())//map projection
- {
- typedef otb::GenericMapProjection<otb::INVERSE, ScalarType, InputSpaceDimension, InputSpaceDimension> InverseMapProjectionType;
- typename InverseMapProjectionType::Pointer mapTransform = InverseMapProjectionType::New();
- mapTransform->SetWkt(m_InputProjectionRef);
- if (mapTransform->GetMapProjection() != NULL)
{
- m_InputTransform = mapTransform.GetPointer();
- inputTransformIsMap = true;
- otbMsgDevMacro(<< "Input projection set to map transform: " << m_InputTransform);
- }
- }
- // If not, try to make a sensor model
- if ((m_InputTransform.IsNull()) && (m_InputKeywordList.GetSize() > 0))
- {
- typedef otb::ForwardSensorModel<double, InputSpaceDimension, InputSpaceDimension> ForwardSensorModelType;
- typename ForwardSensorModelType::Pointer sensorModel = ForwardSensorModelType::New();
- sensorModel->SetImageGeometry(m_InputKeywordList);
- if ( !m_DEMDirectory.empty())
+ // First, try to make a geo transform
+ if (!m_InputProjectionRef.empty()) //map projection
{
- sensorModel->SetDEMDirectory(m_DEMDirectory);
+ typedef otb::GenericMapProjection<otb::INVERSE, ScalarType, InputSpaceDimension,
+ InputSpaceDimension> InverseMapProjectionType;
+ typename InverseMapProjectionType::Pointer mapTransform = InverseMapProjectionType::New();
+ mapTransform->SetWkt(m_InputProjectionRef);
+ if (mapTransform->GetMapProjection() != NULL)
+ {
+ m_InputTransform = mapTransform.GetPointer();
+ inputTransformIsMap = true;
+ otbMsgDevMacro(<< "Input projection set to map transform: " << m_InputTransform);
+ }
}
- else if (m_AverageElevation != -32768.0)
+
+ // If not, try to make a sensor model
+ if ((m_InputTransform.IsNull()) && (m_InputKeywordList.GetSize() > 0))
{
- sensorModel->SetAverageElevation(m_AverageElevation);
+ typedef otb::ForwardSensorModel<double, InputSpaceDimension, InputSpaceDimension> ForwardSensorModelType;
+ typename ForwardSensorModelType::Pointer sensorModel = ForwardSensorModelType::New();
+ sensorModel->SetImageGeometry(m_InputKeywordList);
+ if (!m_DEMDirectory.empty())
+ {
+ sensorModel->SetDEMDirectory(m_DEMDirectory);
+ }
+ else if (m_AverageElevation != -32768.0)
+ {
+ sensorModel->SetAverageElevation(m_AverageElevation);
+ }
+ m_InputTransform = sensorModel.GetPointer();
+ inputTransformIsSensor = true;
+ otbMsgDevMacro(<< "Input projection set to sensor model.");
}
- m_InputTransform = sensorModel.GetPointer();
- inputTransformIsSensor = true;
- otbMsgDevMacro(<< "Input projection set to sensor model.");
}
- }
catch(itk::ExceptionObject &)
{
- otbMsgDevMacro(<<" Input keyword list does not describe a sensor model.");
+ otbMsgDevMacro(<< " Input keyword list does not describe a sensor model.");
}
-
- if (m_InputTransform.IsNull())//default if we didn't manage to instantiate it before
- {
- m_InputTransform = itk::IdentityTransform< double, NInputDimensions >::New();
+
+ if (m_InputTransform.IsNull()) //default if we didn't manage to instantiate it before
+ {
+ m_InputTransform = itk::IdentityTransform<double, NInputDimensions>::New();
// firstTransformGiveGeo = false;
- OGRSpatialReferenceH hSRS = NULL;
+ OGRSpatialReferenceH hSRS = NULL;
hSRS = OSRNewSpatialReference(NULL);
const char * wktString = m_InputProjectionRef.c_str();
- if( OSRImportFromWkt( hSRS, (char **) &wktString ) != OGRERR_NONE )
- {
- OSRDestroySpatialReference( hSRS );
+ if (OSRImportFromWkt(hSRS, (char **) &wktString) != OGRERR_NONE)
+ {
+ OSRDestroySpatialReference(hSRS);
firstTransformGiveGeo = false;
- }
+ }
else if (static_cast<OGRSpatialReference *>(hSRS)->IsGeographic())
- {
- OSRDestroySpatialReference( hSRS );
+ {
+ OSRDestroySpatialReference(hSRS);
firstTransformGiveGeo = true;
- }
+ }
else
- {
- OSRDestroySpatialReference( hSRS );
+ {
+ OSRDestroySpatialReference(hSRS);
firstTransformGiveGeo = false;
- }
+ }
otbMsgDevMacro(<< "Input projection set to identity")
- }
+ }
//*****************************
//Set the output transformation
//*****************************
try
- {
- // First, try to make a geo transform
- if (!m_OutputProjectionRef.empty())//map projection
{
- typedef otb::GenericMapProjection<otb::FORWARD, ScalarType, InputSpaceDimension, OutputSpaceDimension> ForwardMapProjectionType;
- typename ForwardMapProjectionType::Pointer mapTransform = ForwardMapProjectionType::New();
- mapTransform->SetWkt(m_OutputProjectionRef);
- if (mapTransform->GetMapProjection() != NULL)
+ // First, try to make a geo transform
+ if (!m_OutputProjectionRef.empty()) //map projection
{
- m_OutputTransform = mapTransform.GetPointer();
- outputTransformIsMap = true;
- otbMsgDevMacro(<< "Output projection set to map transform: " << m_OutputTransform);
+ typedef otb::GenericMapProjection<otb::FORWARD, ScalarType, InputSpaceDimension,
+ OutputSpaceDimension> ForwardMapProjectionType;
+ typename ForwardMapProjectionType::Pointer mapTransform = ForwardMapProjectionType::New();
+ mapTransform->SetWkt(m_OutputProjectionRef);
+ if (mapTransform->GetMapProjection() != NULL)
+ {
+ m_OutputTransform = mapTransform.GetPointer();
+ outputTransformIsMap = true;
+ otbMsgDevMacro(<< "Output projection set to map transform: " << m_OutputTransform);
+ }
}
- }
- // If not, try to make a sensor model
+ // If not, try to make a sensor model
if ((m_OutputTransform.IsNull()) && (m_OutputKeywordList.GetSize() > 0))
- {
+ {
typedef otb::InverseSensorModel<double, InputSpaceDimension, OutputSpaceDimension> InverseSensorModelType;
typename InverseSensorModelType::Pointer sensorModel = InverseSensorModelType::New();
sensorModel->SetImageGeometry(m_OutputKeywordList);
- if ( !m_DEMDirectory.empty())
- {
+ if (!m_DEMDirectory.empty())
+ {
sensorModel->SetDEMDirectory(m_DEMDirectory);
- }
+ }
else if (m_AverageElevation != -32768.0)
- {
+ {
sensorModel->SetAverageElevation(m_AverageElevation);
- }
+ }
m_OutputTransform = sensorModel.GetPointer();
outputTransformIsSensor = true;
otbMsgDevMacro(<< "Output projection set to sensor model");
+ }
}
- }
catch(itk::ExceptionObject &)
- {
- otbMsgDevMacro(<<" Output keyword list does not describe a sensor model.");
- }
-
- if (m_OutputTransform.IsNull())//default if we didn't manage to instantiate it before
- {
- m_OutputTransform = itk::IdentityTransform< double, NOutputDimensions >::New();
- if (firstTransformGiveGeo)
{
- m_OutputProjectionRef = "GEOGCS[\"GCS_WGS_1984\",DATUM[\"D_WGS_1984\",SPHEROID[\"WGS_1984\",6378137,298.257223563]],PRIMEM[\"Greenwich\",0],UNIT[\"Degree\",0.017453292519943295]]";
+ otbMsgDevMacro(<< " Output keyword list does not describe a sensor model.");
}
- otbMsgDevMacro(<< "Output projection set to identity");
- }
+ if (m_OutputTransform.IsNull()) //default if we didn't manage to instantiate it before
+ {
+ m_OutputTransform = itk::IdentityTransform<double, NOutputDimensions>::New();
+ if (firstTransformGiveGeo)
+ {
+ m_OutputProjectionRef =
+ "GEOGCS[\"GCS_WGS_1984\",DATUM[\"D_WGS_1984\",SPHEROID[\"WGS_1984\",6378137,298.257223563]],PRIMEM[\"Greenwich\",0],UNIT[\"Degree\",0.017453292519943295]]";
+ }
+ otbMsgDevMacro(<< "Output projection set to identity");
+ }
m_Transform->SetFirstTransform(m_InputTransform);
m_Transform->SetSecondTransform(m_OutputTransform);
m_TransformUpToDate = true;
//The acurracy information is a simplistic model for now and should be refined
if ((inputTransformIsSensor || outputTransformIsSensor) && (m_DEMDirectory.empty()))
- {
+ {
//Sensor model without DEM
m_TransformAccuracy = Projection::ESTIMATE;
- }
+ }
else if (!inputTransformIsSensor && !outputTransformIsSensor && !inputTransformIsMap && !outputTransformIsMap)
- {
+ {
//no transform
m_TransformAccuracy = Projection::UNKNOWN;
- }
+ }
else
- {
+ {
m_TransformAccuracy = Projection::PRECISE;
- }
+ }
}
-
template<class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
typename GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType
GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
-::TransformPoint(const InputPointType & point) const
+::TransformPoint(const InputPointType& point) const
{
InputPointType inputPoint = point;
@@ -284,7 +285,7 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
::GetInverse(Self * inverseTransform) const
{
// Test the inverseTransform pointer
- if(inverseTransform == NULL)
+ if (inverseTransform == NULL)
{
return false;
}
@@ -308,11 +309,11 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
// Switch origins
inverseTransform->SetInputOrigin(m_OutputOrigin);
inverseTransform->SetOutputOrigin(m_InputOrigin);
-
+
// Copy some more parameters
inverseTransform->SetAverageElevation(m_AverageElevation);
inverseTransform->SetDEMDirectory(m_DEMDirectory);
-
+
// Instantiate transform
inverseTransform->InstanciateTransform();
@@ -329,16 +330,15 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
bool success = this->GetInverse(inverseTransform);
- if(!success)
+ if (!success)
{
- itkExceptionMacro(<<"Failed to create inverse transform");
+ itkExceptionMacro(<< "Failed to create inverse transform");
}
return inverseTransform;
}
-
- //TODO
+//TODO
// template<class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
// void
// GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
@@ -348,7 +348,6 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
// std::cout << m_Transform->print(std::cout);
// }
-
} // namespace otb
#endif
diff --git a/Code/Projections/otbGeocentricTransform.h b/Code/Projections/otbGeocentricTransform.h
index 3b5c82eaf2..57bb827a9b 100644
--- a/Code/Projections/otbGeocentricTransform.h
+++ b/Code/Projections/otbGeocentricTransform.h
@@ -25,62 +25,59 @@
namespace otb
{
- /** \class GeocentricTransform
- *
- * \brief Convert coordinates from geocentric (X,Y,Z) to geographic (lon, lat, h)
- *
- */
- template <InverseOrForwardTransformationEnum TDirectionOfMapping,
- class TScalarType = double,
- unsigned int NInputDimensions=3,
- unsigned int NOutputDimensions=3>
- class ITK_EXPORT GeocentricTransform: public itk::Transform<TScalarType, // Data type for scalars
- NInputDimensions, // Number of dimensions in the input space
- NOutputDimensions> // Number of dimensions in the output space
- {
- public :
- /** Standard class typedefs. */
- typedef itk::Transform< TScalarType,
- NInputDimensions,
- NOutputDimensions > Superclass;
- typedef GeocentricTransform Self;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- typedef typename Superclass::ScalarType ScalarType;
- typedef ossimProjection OssimMapProjectionType;
- typedef itk::Point<ScalarType,NInputDimensions > InputPointType;
- typedef itk::Point<ScalarType,NOutputDimensions > OutputPointType;
-
- /** Method for creation through the object factory. */
- itkNewMacro( Self );
-
- /** Run-time type information (and related methods). */
- itkTypeMacro( GeocentricTransform, itk::Transform );
-
-
- typedef InverseOrForwardTransformationEnum DirectionOfMappingEnumType;
-
- itkStaticConstMacro(DirectionOfMapping,DirectionOfMappingEnumType,TDirectionOfMapping);
- itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
- itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
- itkStaticConstMacro(SpaceDimension, unsigned int, NInputDimensions);
- itkStaticConstMacro(ParametersDimension, unsigned int,NInputDimensions*(NInputDimensions+1));
-
-
- OutputPointType TransformPoint(const InputPointType &point) const;
-
-
- protected:
- GeocentricTransform();
- virtual ~GeocentricTransform();
- ossimEllipsoid* m_Ellipsoid;
-
- private :
- GeocentricTransform(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
- };
+/** \class GeocentricTransform
+ *
+ * \brief Convert coordinates from geocentric (X,Y,Z) to geographic (lon, lat, h)
+ *
+ */
+template <InverseOrForwardTransformationEnum TDirectionOfMapping,
+ class TScalarType = double,
+ unsigned int NInputDimensions = 3,
+ unsigned int NOutputDimensions = 3>
+class ITK_EXPORT GeocentricTransform : public itk::Transform<TScalarType, // Data type for scalars
+ NInputDimensions, // Number of dimensions in the input space
+ NOutputDimensions> // Number of dimensions in the output space
+{
+public:
+ /** Standard class typedefs. */
+ typedef itk::Transform<TScalarType,
+ NInputDimensions,
+ NOutputDimensions> Superclass;
+ typedef GeocentricTransform Self;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef ossimProjection OssimMapProjectionType;
+ typedef itk::Point<ScalarType, NInputDimensions> InputPointType;
+ typedef itk::Point<ScalarType, NOutputDimensions> OutputPointType;
+
+ /** Method for creation through the object factory. */
+ itkNewMacro(Self);
+
+ /** Run-time type information (and related methods). */
+ itkTypeMacro(GeocentricTransform, itk::Transform);
+
+ typedef InverseOrForwardTransformationEnum DirectionOfMappingEnumType;
+
+ itkStaticConstMacro(DirectionOfMapping, DirectionOfMappingEnumType, TDirectionOfMapping);
+ itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
+ itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
+ itkStaticConstMacro(SpaceDimension, unsigned int, NInputDimensions);
+ itkStaticConstMacro(ParametersDimension, unsigned int, NInputDimensions * (NInputDimensions + 1));
+
+ OutputPointType TransformPoint(const InputPointType& point) const;
+
+protected:
+ GeocentricTransform();
+ virtual ~GeocentricTransform();
+ ossimEllipsoid* m_Ellipsoid;
+
+private:
+ GeocentricTransform(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
+
+};
} // namespace otb
@@ -88,5 +85,4 @@ namespace otb
#include "otbGeocentricTransform.txx"
#endif
-
#endif
diff --git a/Code/Projections/otbGeocentricTransform.txx b/Code/Projections/otbGeocentricTransform.txx
index 66ff679bd8..610059adae 100644
--- a/Code/Projections/otbGeocentricTransform.txx
+++ b/Code/Projections/otbGeocentricTransform.txx
@@ -23,53 +23,55 @@
namespace otb
{
- template<InverseOrForwardTransformationEnum TransformDirection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
- GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
- ::GeocentricTransform() : Superclass(SpaceDimension,ParametersDimension)
- {
- m_Ellipsoid = new ossimEllipsoid();
- }
+template<InverseOrForwardTransformationEnum TransformDirection, class TScalarType, unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
+GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
+::GeocentricTransform() : Superclass(SpaceDimension, ParametersDimension)
+{
+ m_Ellipsoid = new ossimEllipsoid();
+}
- template<InverseOrForwardTransformationEnum TransformDirection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
- GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
- ::~GeocentricTransform()
- {
- if (m_Ellipsoid != NULL)
+template<InverseOrForwardTransformationEnum TransformDirection, class TScalarType, unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
+GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
+::~GeocentricTransform()
+{
+ if (m_Ellipsoid != NULL)
{
- delete m_Ellipsoid;
+ delete m_Ellipsoid;
}
- }
+}
- template<InverseOrForwardTransformationEnum TransformDirection, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
- typename GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType
- GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
- ::TransformPoint(const InputPointType & point) const
- {
- OutputPointType outputPoint;
+template<InverseOrForwardTransformationEnum TransformDirection, class TScalarType, unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
+typename GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType
+GeocentricTransform<TransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
+::TransformPoint(const InputPointType& point) const
+{
+ OutputPointType outputPoint;
- switch (DirectionOfMapping)
+ switch (DirectionOfMapping)
{
- case INVERSE:
- {
- m_Ellipsoid->XYZToLatLonHeight(point[0], point[1], point[2], outputPoint[1],outputPoint[0],outputPoint[2]);
- break;
- }
- case FORWARD:
- {
- m_Ellipsoid->latLonHeightToXYZ(point[1], point[0], point[2], outputPoint[0],outputPoint[1],outputPoint[2]);
-
- break;
- }
- default:
- {
- itkExceptionMacro(<<"Model is INVERSE or FORWARD only !!");
- break;
- }
+ case INVERSE:
+ {
+ m_Ellipsoid->XYZToLatLonHeight(point[0], point[1], point[2], outputPoint[1], outputPoint[0], outputPoint[2]);
+ break;
}
- //To be completed
- return outputPoint;
- }
+ case FORWARD:
+ {
+ m_Ellipsoid->latLonHeightToXYZ(point[1], point[0], point[2], outputPoint[0], outputPoint[1], outputPoint[2]);
+ break;
+ }
+ default:
+ {
+ itkExceptionMacro(<< "Model is INVERSE or FORWARD only !!");
+ break;
+ }
+ }
+ //To be completed
+ return outputPoint;
+}
} // namespace otb
diff --git a/Code/Projections/otbInverseSensorModel.h b/Code/Projections/otbInverseSensorModel.h
index c2dd35d0ff..725bc68525 100644
--- a/Code/Projections/otbInverseSensorModel.h
+++ b/Code/Projections/otbInverseSensorModel.h
@@ -24,7 +24,6 @@
#include "itkSmartPointer.h"
#include "itkObject.h"
-
namespace otb
{
@@ -42,40 +41,39 @@ namespace otb
* \ingroup Projection
*/
template <class TScalarType,
-unsigned int NInputDimensions=2,
-unsigned int NOutputDimensions=2>
+ unsigned int NInputDimensions = 2,
+ unsigned int NOutputDimensions = 2>
class ITK_EXPORT InverseSensorModel : public SensorModelBase<TScalarType,
- NInputDimensions,
- NOutputDimensions>
+ NInputDimensions,
+ NOutputDimensions>
{
-public :
+public:
/** Standard class typedefs. */
- typedef InverseSensorModel Self;
- typedef SensorModelBase< TScalarType,
+ typedef InverseSensorModel Self;
+ typedef SensorModelBase<TScalarType,
NInputDimensions,
NOutputDimensions> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::InputPointType InputPointType;
- typedef typename Superclass::OutputPointType OutputPointType;
+ typedef typename Superclass::InputPointType InputPointType;
+ typedef typename Superclass::OutputPointType OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( InverseSensorModel, SensorModelBase );
+ itkTypeMacro(InverseSensorModel, SensorModelBase);
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
// Transform of geographic point in image sensor index
- virtual OutputPointType TransformPoint(const InputPointType &point) const;
+ virtual OutputPointType TransformPoint(const InputPointType& point) const;
// Transform of geographic point in image sensor index -- Backward Compatibility
// OutputPointType TransformPoint(const InputPointType &point, double height) const;
-
protected:
InverseSensorModel();
virtual ~InverseSensorModel();
@@ -83,10 +81,10 @@ protected:
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-private :
+private:
- InverseSensorModel(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ InverseSensorModel(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -96,5 +94,4 @@ private :
#include "otbInverseSensorModel.txx"
#endif
-
#endif
diff --git a/Code/Projections/otbInverseSensorModel.txx b/Code/Projections/otbInverseSensorModel.txx
index f8bf8dbf38..ca351bcc72 100644
--- a/Code/Projections/otbInverseSensorModel.txx
+++ b/Code/Projections/otbInverseSensorModel.txx
@@ -18,7 +18,6 @@
#ifndef __otbInverseSensorModel_txx
#define __otbInverseSensorModel_txx
-
#include "otbInverseSensorModel.h"
#include "itkExceptionObject.h"
#include "otbMacro.h"
@@ -26,23 +25,22 @@
namespace otb
{
-template < class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
-InverseSensorModel< TScalarType, NInputDimensions, NOutputDimensions >
+template <class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+InverseSensorModel<TScalarType, NInputDimensions, NOutputDimensions>
::InverseSensorModel()
{
}
-template < class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
-InverseSensorModel< TScalarType, NInputDimensions, NOutputDimensions>
+template <class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+InverseSensorModel<TScalarType, NInputDimensions, NOutputDimensions>
::~InverseSensorModel()
{
}
-
-template < class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
-typename InverseSensorModel< TScalarType,NInputDimensions,NOutputDimensions>::OutputPointType
-InverseSensorModel< TScalarType, NInputDimensions, NOutputDimensions>
-::TransformPoint(const InputPointType &point) const
+template <class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+typename InverseSensorModel<TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType
+InverseSensorModel<TScalarType, NInputDimensions, NOutputDimensions>
+::TransformPoint(const InputPointType& point) const
{
// otbMsgDevMacro(<< "Geographic point lon/lat : (" << point[0] << "," << point[1] << ")");
@@ -50,7 +48,7 @@ InverseSensorModel< TScalarType, NInputDimensions, NOutputDimensions>
ossimGpt ossimGPoint(point[1], point[0]);
if (this->m_UseDEM)
- {
+ {
// otbMsgDevMacro(<< "USING DEM ! ");
// otbMsgDevMacro(<< "Point : (" << point[1] << "," << point[0] << ")");
itk::Point<double, 2> currentPoint;
@@ -59,49 +57,46 @@ InverseSensorModel< TScalarType, NInputDimensions, NOutputDimensions>
double height = this->m_DEMHandler->GetHeightAboveMSL(currentPoint);
// otbMsgDevMacro(<< "height : " << height);
ossimGPoint.height(height);
- }
+ }
else if (InputPointType::PointDimension == 3)
- {
+ {
ossimGPoint.height(point[2]);
- }
+ }
else if (this->m_AverageElevation != -32768.0)
- {
+ {
ossimGPoint.height(this->m_AverageElevation);
- }
-
+ }
ossimDpt ossimDPoint;
- if ( this->m_Model == NULL)
- {
- itkExceptionMacro(<<"TransformPoint(): Invalid Model pointer m_Model == NULL !");
- }
+ if (this->m_Model == NULL)
+ {
+ itkExceptionMacro(<< "TransformPoint(): Invalid Model pointer m_Model == NULL !");
+ }
this->m_Model->worldToLineSample(ossimGPoint, ossimDPoint); //"worldToLineSample" call "lineSampleHeightToWorld" method for take in care elevation information.
OutputPointType outputPoint;
-
- outputPoint[0]=ossimDPoint.x;
- outputPoint[1]=ossimDPoint.y;
+ outputPoint[0] = ossimDPoint.x;
+ outputPoint[1] = ossimDPoint.y;
if (OutputPointType::PointDimension == 3)
{
- outputPoint[2] = ossimGPoint.height();
+ outputPoint[2] = ossimGPoint.height();
}
// otbMsgDevMacro(<< "Point in sensor geometry: (" << outputPoint[0] << "," << outputPoint[1] << ")");
return outputPoint;
}
-template < class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template <class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
void
-InverseSensorModel< TScalarType, NInputDimensions, NOutputDimensions>
+InverseSensorModel<TScalarType, NInputDimensions, NOutputDimensions>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // namespace otb
#endif
-
diff --git a/Code/Projections/otbLambert2EtenduProjection.h b/Code/Projections/otbLambert2EtenduProjection.h
index f907ebc366..123b878a71 100644
--- a/Code/Projections/otbLambert2EtenduProjection.h
+++ b/Code/Projections/otbLambert2EtenduProjection.h
@@ -18,7 +18,6 @@
#ifndef __otbLambert2EtenduProjection_h
#define __otbLambert2EtenduProjection_h
-
#include "projection/ossimMapProjection.h"
#include "projection/ossimLambertConformalConicProjection.h"
#include "otbMapProjection.h"
@@ -33,31 +32,30 @@ namespace otb
template <InverseOrForwardTransformationEnum transform>
class ITK_EXPORT Lambert2EtenduProjection : public LambertConformalConicMapProjection<transform>
{
-public :
+public:
/** Standard class typedefs. */
- typedef Lambert2EtenduProjection Self;
- typedef LambertConformalConicMapProjection<transform> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef Lambert2EtenduProjection Self;
+ typedef LambertConformalConicMapProjection<transform> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::ScalarType ScalarType;
- typedef itk::Point<ScalarType,2 > InputPointType;
- typedef itk::Point<ScalarType,2 > OutputPointType;
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef itk::Point<ScalarType, 2> InputPointType;
+ typedef itk::Point<ScalarType, 2> OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( Lambert2EtenduProjection, LambertConformalConicMapProjection );
-
+ itkTypeMacro(Lambert2EtenduProjection, LambertConformalConicMapProjection);
protected:
Lambert2EtenduProjection();
virtual ~Lambert2EtenduProjection();
-private :
- Lambert2EtenduProjection(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ Lambert2EtenduProjection(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // namespace otb
diff --git a/Code/Projections/otbLambert2EtenduProjection.txx b/Code/Projections/otbLambert2EtenduProjection.txx
index 9cea8f80fe..f3b037e0d5 100644
--- a/Code/Projections/otbLambert2EtenduProjection.txx
+++ b/Code/Projections/otbLambert2EtenduProjection.txx
@@ -28,19 +28,17 @@ template <InverseOrForwardTransformationEnum transform>
Lambert2EtenduProjection<transform>
::Lambert2EtenduProjection()
{
- itk::Point<double,2> origin;
- origin[0]=2.33722778;
- origin[1]=46.8;
+ itk::Point<double, 2> origin;
+ origin[0] = 2.33722778;
+ origin[1] = 46.8;
std::string datum = "NTF";
-
- double parall1=45.89891944;
- double parall2=47.69601389;
- double falseEasting=600000;
- double falseNorthing=2200000;
+ double parall1 = 45.89891944;
+ double parall2 = 47.69601389;
+ double falseEasting = 600000;
+ double falseNorthing = 2200000;
std::string ellipsoid = "CE";
-
//TODO: 29-02-2008 Emmanuel: when ossim version > 1.7.2 only
// SetOrigin required (remove SetEllipsoid)
this->SetOrigin(origin, datum);
@@ -54,7 +52,6 @@ Lambert2EtenduProjection<transform>
{
}
-
} // namespace otb
#endif
diff --git a/Code/Projections/otbLambert3CartoSudProjection.h b/Code/Projections/otbLambert3CartoSudProjection.h
index 7568e4501e..ee00c07708 100644
--- a/Code/Projections/otbLambert3CartoSudProjection.h
+++ b/Code/Projections/otbLambert3CartoSudProjection.h
@@ -18,7 +18,6 @@
#ifndef __otbLambert3CartoSudProjection_h
#define __otbLambert3CartoSudProjection_h
-
#include "projection/ossimMapProjection.h"
#include "projection/ossimLambertConformalConicProjection.h"
#include "otbMapProjection.h"
@@ -33,31 +32,30 @@ namespace otb
template <InverseOrForwardTransformationEnum transform>
class ITK_EXPORT Lambert3CartoSudProjection : public LambertConformalConicMapProjection<transform>
{
-public :
+public:
/** Standard class typedefs. */
- typedef Lambert3CartoSudProjection Self;
- typedef LambertConformalConicMapProjection<transform> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef Lambert3CartoSudProjection Self;
+ typedef LambertConformalConicMapProjection<transform> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::ScalarType ScalarType;
- typedef itk::Point<ScalarType,2 > InputPointType;
- typedef itk::Point<ScalarType,2 > OutputPointType;
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef itk::Point<ScalarType, 2> InputPointType;
+ typedef itk::Point<ScalarType, 2> OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( Lambert3CartoSudProjection, LambertConformalConicMapProjection);
-
+ itkTypeMacro(Lambert3CartoSudProjection, LambertConformalConicMapProjection);
protected:
Lambert3CartoSudProjection();
virtual ~Lambert3CartoSudProjection();
-private :
- Lambert3CartoSudProjection(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ Lambert3CartoSudProjection(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // namespace otb
diff --git a/Code/Projections/otbLambert3CartoSudProjection.txx b/Code/Projections/otbLambert3CartoSudProjection.txx
index 333630b36a..6ab09ce5f7 100644
--- a/Code/Projections/otbLambert3CartoSudProjection.txx
+++ b/Code/Projections/otbLambert3CartoSudProjection.txx
@@ -28,16 +28,15 @@ template <InverseOrForwardTransformationEnum transform>
Lambert3CartoSudProjection<transform>
::Lambert3CartoSudProjection()
{
- itk::Point<double,2> origin;
- origin[0]=3;
- origin[1]=46.5;
+ itk::Point<double, 2> origin;
+ origin[0] = 3;
+ origin[1] = 46.5;
std::string datum = "WE"; //WGS84 datum
-
- double parall1=43.1992913888888888888888888889;
- double parall2=44.9960938888888888888888888888;
- double falseEasting=600000;
- double falseNorthing=3200000;
+ double parall1 = 43.1992913888888888888888888889;
+ double parall2 = 44.9960938888888888888888888888;
+ double falseEasting = 600000;
+ double falseNorthing = 3200000;
std::string ellipsoid = "CE";
//TODO: 29-02-2008 Emmanuel: when ossim version > 1.7.2 only
@@ -53,7 +52,6 @@ Lambert3CartoSudProjection<transform>
{
}
-
} // namespace otb
#endif
diff --git a/Code/Projections/otbLambert93Projection.h b/Code/Projections/otbLambert93Projection.h
index 6436bb435c..46cffa46b4 100644
--- a/Code/Projections/otbLambert93Projection.h
+++ b/Code/Projections/otbLambert93Projection.h
@@ -18,7 +18,6 @@
#ifndef __otbLambert93Projection_h
#define __otbLambert93Projection_h
-
#include "projection/ossimMapProjection.h"
#include "projection/ossimLambertConformalConicProjection.h"
#include "otbMapProjection.h"
@@ -33,31 +32,30 @@ namespace otb
template <InverseOrForwardTransformationEnum transform>
class ITK_EXPORT Lambert93Projection : public LambertConformalConicMapProjection<transform>
{
-public :
+public:
/** Standard class typedefs. */
- typedef Lambert93Projection Self;
- typedef LambertConformalConicMapProjection<transform> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef Lambert93Projection Self;
+ typedef LambertConformalConicMapProjection<transform> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::ScalarType ScalarType;
- typedef itk::Point<ScalarType,2 > InputPointType;
- typedef itk::Point<ScalarType,2 > OutputPointType;
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef itk::Point<ScalarType, 2> InputPointType;
+ typedef itk::Point<ScalarType, 2> OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( Lambert93Projection, LambertConformalConicMapProjection);
-
+ itkTypeMacro(Lambert93Projection, LambertConformalConicMapProjection);
protected:
Lambert93Projection();
virtual ~Lambert93Projection();
-private :
- Lambert93Projection(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ Lambert93Projection(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // namespace otb
diff --git a/Code/Projections/otbLambert93Projection.txx b/Code/Projections/otbLambert93Projection.txx
index bd7777499e..5d567f55f2 100644
--- a/Code/Projections/otbLambert93Projection.txx
+++ b/Code/Projections/otbLambert93Projection.txx
@@ -28,19 +28,17 @@ template <InverseOrForwardTransformationEnum transform>
Lambert93Projection<transform>
::Lambert93Projection()
{
- itk::Point<double,2> origin;
- origin[0]=3;
- origin[1]=46.5;
+ itk::Point<double, 2> origin;
+ origin[0] = 3;
+ origin[1] = 46.5;
std::string datum = "WE"; //WGS84 datum
-
- double parall1=44;
- double parall2=49;
- double falseEasting=700000;
- double falseNorthing=6600000;
+ double parall1 = 44;
+ double parall2 = 49;
+ double falseEasting = 700000;
+ double falseNorthing = 6600000;
std::string ellipsoid = "RF"; //GRS-80 ellipsoid
-
//TODO: 29-02-2008 Emmanuel: when ossim version > 1.7.2 only
// SetOrigin required (remove SetEllipsoid)
this->SetOrigin(origin, datum);
@@ -54,7 +52,6 @@ Lambert93Projection<transform>
{
}
-
} // namespace otb
#endif
diff --git a/Code/Projections/otbLambertConformalConicMapProjection.h b/Code/Projections/otbLambertConformalConicMapProjection.h
index 364fce1ee3..0074d4829a 100644
--- a/Code/Projections/otbLambertConformalConicMapProjection.h
+++ b/Code/Projections/otbLambertConformalConicMapProjection.h
@@ -30,43 +30,43 @@ namespace otb
*
*/
template <InverseOrForwardTransformationEnum transform>
-class ITK_EXPORT LambertConformalConicMapProjection : public MapProjection<ossimLambertConformalConicProjection,transform>
+class ITK_EXPORT LambertConformalConicMapProjection : public MapProjection<ossimLambertConformalConicProjection,
+ transform>
{
-public :
+public:
/** Standard class typedefs. */
- typedef LambertConformalConicMapProjection Self;
- typedef MapProjection<ossimLambertConformalConicProjection,transform> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LambertConformalConicMapProjection Self;
+ typedef MapProjection<ossimLambertConformalConicProjection, transform> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::ScalarType ScalarType;
- typedef itk::Point<ScalarType,2 > InputPointType;
- typedef itk::Point<ScalarType,2 > OutputPointType;
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef itk::Point<ScalarType, 2> InputPointType;
+ typedef itk::Point<ScalarType, 2> OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( LambertConformalConicMapProjection, MapProjection );
+ itkTypeMacro(LambertConformalConicMapProjection, MapProjection);
- void SetStandardParallel1 (double degree);
- void SetStandardParallel2 (double degree);
- void SetStandardParallels (double parallel1Degree,double parallel2Degree);
+ void SetStandardParallel1(double degree);
+ void SetStandardParallel2(double degree);
+ void SetStandardParallels(double parallel1Degree, double parallel2Degree);
void SetFalseEasting(double falseEasting);
void SetFalseNorthing(double falseNorthing);
double GetFalseNorthing() const;
double GetFalseEasting() const;
- void SetParameters(double parallel1Degree,double parallel2Degree,double falseEasting,double falseNorthing);
+ void SetParameters(double parallel1Degree, double parallel2Degree, double falseEasting, double falseNorthing);
void SetDefaults();
-
protected:
LambertConformalConicMapProjection();
virtual ~LambertConformalConicMapProjection();
-private :
- LambertConformalConicMapProjection(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ LambertConformalConicMapProjection(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // namespace otb
diff --git a/Code/Projections/otbLambertConformalConicMapProjection.txx b/Code/Projections/otbLambertConformalConicMapProjection.txx
index 1129f3d7db..f5d81a3651 100644
--- a/Code/Projections/otbLambertConformalConicMapProjection.txx
+++ b/Code/Projections/otbLambertConformalConicMapProjection.txx
@@ -36,7 +36,6 @@ LambertConformalConicMapProjection<transform>
{
}
-
/// Parallel1 specification
template <InverseOrForwardTransformationEnum transform>
void LambertConformalConicMapProjection<transform>
@@ -56,9 +55,9 @@ void LambertConformalConicMapProjection<transform>
/// Specification of the 2 parallels
template <InverseOrForwardTransformationEnum transform>
void LambertConformalConicMapProjection<transform>
-::SetStandardParallels(double parallel1Degree,double parallel2Degree)
+::SetStandardParallels(double parallel1Degree, double parallel2Degree)
{
- this->m_MapProjection->setStandardParallels(parallel1Degree,parallel2Degree);
+ this->m_MapProjection->setStandardParallels(parallel1Degree, parallel2Degree);
}
/// False easting specification
@@ -80,7 +79,7 @@ void LambertConformalConicMapProjection<transform>
/// Set the parameters
template <InverseOrForwardTransformationEnum transform>
void LambertConformalConicMapProjection<transform>
-::SetParameters(double parallel1Degree,double parallel2Degree,double falseEasting,double falseNorthing)
+::SetParameters(double parallel1Degree, double parallel2Degree, double falseEasting, double falseNorthing)
{
this->m_MapProjection->setParameters(parallel1Degree, parallel2Degree, falseEasting, falseNorthing);
}
@@ -98,7 +97,7 @@ template <InverseOrForwardTransformationEnum transform>
double LambertConformalConicMapProjection<transform>
::GetFalseNorthing() const
{
- double falseNorthing=this->m_MapProjection->getFalseNorthing();
+ double falseNorthing = this->m_MapProjection->getFalseNorthing();
return falseNorthing;
}
@@ -108,7 +107,7 @@ template <InverseOrForwardTransformationEnum transform>
double LambertConformalConicMapProjection<transform>
::GetFalseEasting() const
{
- double falseEasting=this->m_MapProjection->getFalseEasting();
+ double falseEasting = this->m_MapProjection->getFalseEasting();
return falseEasting;
}
diff --git a/Code/Projections/otbLeastSquareAffineTransformEstimator.h b/Code/Projections/otbLeastSquareAffineTransformEstimator.h
index 3c296d640a..3a531805c5 100644
--- a/Code/Projections/otbLeastSquareAffineTransformEstimator.h
+++ b/Code/Projections/otbLeastSquareAffineTransformEstimator.h
@@ -10,8 +10,8 @@
See OTBCopyright.txt for details.
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
@@ -31,17 +31,17 @@ namespace otb {
*
* This class uses the classical least square optimisation to estimate
* an affine transfrom from a set of tie points.
- *
+ *
* This implementation supports points of any dimension.
*
* Tie points can be added through the AddTiePoints() method.
- *
+ *
* The ClearTiePoints() method allows to remove all the tie points
* that has been previously set.
*
* Once all the tie points have been feeded into the estimator, the
* Compute() method will perform the optimization.
- *
+ *
* Matrix of the estimated affine transform can be retrieved using the
* GetMatrix() method.
*
@@ -50,7 +50,7 @@ namespace otb {
*
* Alternatively, the GetAffineTransfrom() methods return a pointer to
* a fully set-up forward affine transfrom (\sa AffineTransform).
- *
+ *
* Estimation errors are available per dimension using the
* GetRMSError() (root mean square location error) or
* GetRelativeResidual() (relative residual error).
@@ -59,16 +59,16 @@ namespace otb {
* back to TPoint::CoordRepType.
*
*/
-template < class TPoint >
+template <class TPoint>
class ITK_EXPORT LeastSquareAffineTransformEstimator :
- public itk::Object
+ public itk::Object
{
public:
/** Standard class typedefs. */
- typedef LeastSquareAffineTransformEstimator Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LeastSquareAffineTransformEstimator Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -79,46 +79,46 @@ public:
/** Extract dimension from input and output image. */
itkStaticConstMacro(PointDimension, unsigned int,
TPoint::PointDimension);
-
+
/** Points typedefs */
- typedef TPoint PointType;
- typedef typename PointType::CoordRepType PrecisionType;
+ typedef TPoint PointType;
+ typedef typename PointType::CoordRepType PrecisionType;
typedef itk::CovariantVector<PrecisionType,
- PointDimension> CovariantVectorType;
- typedef std::pair<PointType,PointType> TiePointsType;
- typedef std::vector<TiePointsType> TiePointsContainerType;
+ PointDimension> CovariantVectorType;
+ typedef std::pair<PointType, PointType> TiePointsType;
+ typedef std::vector<TiePointsType> TiePointsContainerType;
/** Affine transform components typedefs */
typedef itk::Matrix<PrecisionType,
- PointDimension,
- PointDimension> MatrixType;
+ PointDimension,
+ PointDimension> MatrixType;
typedef itk::Vector<PrecisionType,
- PointDimension> VectorType;
+ PointDimension> VectorType;
typedef itk::AffineTransform<PrecisionType,
- PointDimension> AffineTransformType;
- typedef typename AffineTransformType::Pointer AffineTransformPointerType;
+ PointDimension> AffineTransformType;
+ typedef typename AffineTransformType::Pointer AffineTransformPointerType;
/** Get the affine transform matrix */
- itkGetConstReferenceMacro(Matrix,MatrixType);
-
+ itkGetConstReferenceMacro(Matrix, MatrixType);
+
/** Get the affine transform offset */
- itkGetConstReferenceMacro(Offset,VectorType);
+ itkGetConstReferenceMacro(Offset, VectorType);
/** Get the estimated affine transfrom */
- itkGetObjectMacro(AffineTransform,AffineTransformType);
+ itkGetObjectMacro(AffineTransform, AffineTransformType);
/** Get the RMS error */
- itkGetConstReferenceMacro(RMSError,CovariantVectorType);
-
+ itkGetConstReferenceMacro(RMSError, CovariantVectorType);
+
/** Get the relative residual */
- itkGetConstReferenceMacro(RelativeResidual,CovariantVectorType);
-
+ itkGetConstReferenceMacro(RelativeResidual, CovariantVectorType);
+
/** Get the GCPsContainer
* \return The GCPs container */
- TiePointsContainerType & GetTiePointsContainer();
+ TiePointsContainerType& GetTiePointsContainer();
/** Set the GCP container */
- void SetTiePointsContainer(const TiePointsContainerType & container);
+ void SetTiePointsContainer(const TiePointsContainerType& container);
/** Add a pair of tie points */
void AddTiePoints(const PointType& src, const PointType& dst);
@@ -128,19 +128,19 @@ public:
/** The Compute method does the affine least square estimation */
void Compute();
-
+
protected:
/** Constructor */
LeastSquareAffineTransformEstimator();
/** Destructor */
virtual ~LeastSquareAffineTransformEstimator();
-
+
/** The PrintSelf method */
- virtual void PrintSelf( std::ostream & os, itk::Indent indent ) const;
+ virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- LeastSquareAffineTransformEstimator ( const Self & ); // purposely not implemented
- void operator= ( const Self & ); // purposely not implemented
+ LeastSquareAffineTransformEstimator (const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** Container of GCPs */
TiePointsContainerType m_TiePointsContainer;
@@ -153,7 +153,7 @@ private:
/** Affine transform matrix */
MatrixType m_Matrix;
-
+
/** Affine transform offset */
VectorType m_Offset;
diff --git a/Code/Projections/otbLeastSquareAffineTransformEstimator.txx b/Code/Projections/otbLeastSquareAffineTransformEstimator.txx
index a7e9797d37..5d393d15fe 100644
--- a/Code/Projections/otbLeastSquareAffineTransformEstimator.txx
+++ b/Code/Projections/otbLeastSquareAffineTransformEstimator.txx
@@ -10,8 +10,8 @@
See OTBCopyright.txt for details.
- This software is distributed WITHOUT ANY WARRANTY; without even
- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
@@ -26,20 +26,20 @@
namespace otb {
-template < class TPoint >
+template <class TPoint>
LeastSquareAffineTransformEstimator<TPoint>
-::LeastSquareAffineTransformEstimator() : m_TiePointsContainer(),
- m_RMSError(),
- m_RelativeResidual(),
- m_Matrix(),
- m_Offset(),
- m_AffineTransform()
+::LeastSquareAffineTransformEstimator() : m_TiePointsContainer(),
+ m_RMSError(),
+ m_RelativeResidual(),
+ m_Matrix(),
+ m_Offset(),
+ m_AffineTransform()
{
// Build the affine transform object
m_AffineTransform = AffineTransformType::New();
}
-template <class TPoint >
+template <class TPoint>
LeastSquareAffineTransformEstimator<TPoint>
::~LeastSquareAffineTransformEstimator()
{
@@ -47,16 +47,16 @@ LeastSquareAffineTransformEstimator<TPoint>
this->ClearTiePoints();
}
-template < class TPoint >
+template <class TPoint>
typename LeastSquareAffineTransformEstimator<TPoint>
-::TiePointsContainerType &
+::TiePointsContainerType&
LeastSquareAffineTransformEstimator<TPoint>
::GetTiePointsContainer()
{
return m_TiePointsContainer;
}
-template < class TPoint >
+template <class TPoint>
void
LeastSquareAffineTransformEstimator<TPoint>
::SetTiePointsContainer(const TiePointsContainerType& container)
@@ -64,7 +64,7 @@ LeastSquareAffineTransformEstimator<TPoint>
m_TiePointsContainer = container;
}
-template < class TPoint >
+template <class TPoint>
void
LeastSquareAffineTransformEstimator<TPoint>
::ClearTiePoints()
@@ -73,19 +73,19 @@ LeastSquareAffineTransformEstimator<TPoint>
m_TiePointsContainer.clear();
}
-template < class TPoint >
+template <class TPoint>
void
LeastSquareAffineTransformEstimator<TPoint>
::AddTiePoints(const PointType& src, const PointType& dst)
{
// Build the tie point
- TiePointsType tpoints(src,dst);
-
+ TiePointsType tpoints(src, dst);
+
// Add it to the container
m_TiePointsContainer.push_back(tpoints);
}
-template < class TPoint >
+template <class TPoint>
void
LeastSquareAffineTransformEstimator<TPoint>
::Compute()
@@ -94,9 +94,9 @@ LeastSquareAffineTransformEstimator<TPoint>
unsigned int nbPoints = m_TiePointsContainer.size();
// Check if there are some points in
- if(nbPoints == 0)
+ if (nbPoints == 0)
{
- itkExceptionMacro(<<"No tie points were given to the LeastSquareAffineTransformEstimator");
+ itkExceptionMacro(<< "No tie points were given to the LeastSquareAffineTransformEstimator");
}
// Convenient typedefs
@@ -105,49 +105,49 @@ LeastSquareAffineTransformEstimator<TPoint>
// Step 1: build linear systems
// Build one linear system per dimension
- std::vector<VnlMatrixType> matrixPerDim(PointDimension,VnlMatrixType(nbPoints,PointDimension+1));
- std::vector<VnlVectorType> vectorPerDim(PointDimension,VnlVectorType(nbPoints));
+ std::vector<VnlMatrixType> matrixPerDim(PointDimension, VnlMatrixType(nbPoints, PointDimension + 1));
+ std::vector<VnlVectorType> vectorPerDim(PointDimension, VnlVectorType(nbPoints));
// Iterate on points
- for(unsigned int pId = 0; pId < nbPoints; ++pId)
+ for (unsigned int pId = 0; pId < nbPoints; ++pId)
{
// Iterate on dimension
- for(unsigned int dim1 = 0; dim1 < PointDimension; ++dim1)
+ for (unsigned int dim1 = 0; dim1 < PointDimension; ++dim1)
{
// Fill the vector
vectorPerDim[dim1][pId] = static_cast<double>(m_TiePointsContainer[pId].second[dim1]);
// Iterate on dimension (second loop)
- for(unsigned int dim2 = 0; dim2 < PointDimension; ++dim2)
- {
- matrixPerDim[dim1](pId,dim2) = static_cast<double>(m_TiePointsContainer[pId].first[dim2]);
- }
-
+ for (unsigned int dim2 = 0; dim2 < PointDimension; ++dim2)
+ {
+ matrixPerDim[dim1](pId, dim2) = static_cast<double>(m_TiePointsContainer[pId].first[dim2]);
+ }
+
// Fill the last column
- matrixPerDim[dim1](pId,PointDimension) = 1.;
+ matrixPerDim[dim1](pId, PointDimension) = 1.;
}
}
// Step 2: Solve linear systems
- for(unsigned int dim1 = 0; dim1 < PointDimension; ++dim1)
+ for (unsigned int dim1 = 0; dim1 < PointDimension; ++dim1)
{
// Declare a linear system
- vnl_sparse_matrix_linear_system<double> linearSystem(matrixPerDim[dim1],vectorPerDim[dim1]);
+ vnl_sparse_matrix_linear_system<double> linearSystem(matrixPerDim[dim1], vectorPerDim[dim1]);
// Check if there are enough points to solve
- if(linearSystem.get_number_of_unknowns() > nbPoints*PointDimension)
+ if (linearSystem.get_number_of_unknowns() > nbPoints * PointDimension)
{
- itkExceptionMacro(<<"There are "<<linearSystem.get_number_of_unknowns()
- <<" unknowns in the linear systems but only "<<nbPoints
- <<" points are provided.");
+ itkExceptionMacro(<< "There are " << linearSystem.get_number_of_unknowns()
+ << " unknowns in the linear systems but only " << nbPoints
+ << " points are provided.");
}
- otbMsgDebugMacro(<<"Number of unknowns: "<<linearSystem.get_number_of_unknowns());
- otbMsgDebugMacro(<<"Number of equations: "<<nbPoints);
-
+ otbMsgDebugMacro(<< "Number of unknowns: " << linearSystem.get_number_of_unknowns());
+ otbMsgDebugMacro(<< "Number of equations: " << nbPoints);
+
// A vector where the solution will be stored
- vnl_vector<double> solution(PointDimension+1);
-
+ vnl_vector<double> solution(PointDimension + 1);
+
// Declare the solver
vnl_lsqr linearSystemSolver(linearSystem);
@@ -159,33 +159,32 @@ LeastSquareAffineTransformEstimator<TPoint>
// Get the relative residual
m_RelativeResidual[dim1] = linearSystem.get_relative_residual(solution);
-
+
// Fill the affine transform matrix
- for(unsigned int dim2 = 0; dim2 < PointDimension; ++dim2)
+ for (unsigned int dim2 = 0; dim2 < PointDimension; ++dim2)
{
- m_Matrix(dim1,dim2) = static_cast<PrecisionType>(solution[dim2]);
+ m_Matrix(dim1, dim2) = static_cast<PrecisionType>(solution[dim2]);
}
// Fill the offset
m_Offset[dim1] = static_cast<PrecisionType>(solution[PointDimension]);
- }
+ }
// Set the affine transform parameters
m_AffineTransform->SetMatrix(m_Matrix);
m_AffineTransform->SetOffset(m_Offset);
}
-template < class TPoint >
+template <class TPoint>
void
LeastSquareAffineTransformEstimator<TPoint>
-::PrintSelf( std::ostream & os, itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"Number of tie points: "<<m_TiePointsContainer.size()<<std::endl;
- os<<indent<<"RMS error: "<<m_RMSError<<std::endl;
- os<<indent<<"Relative residual: "<<m_RelativeResidual<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Number of tie points: " << m_TiePointsContainer.size() << std::endl;
+ os << indent << "RMS error: " << m_RMSError << std::endl;
+ os << indent << "Relative residual: " << m_RelativeResidual << std::endl;
}
-
} // end namespace otb
#endif
diff --git a/Code/Projections/otbMapProjection.h b/Code/Projections/otbMapProjection.h
index 710a3110cf..9a2132ad6b 100644
--- a/Code/Projections/otbMapProjection.h
+++ b/Code/Projections/otbMapProjection.h
@@ -54,53 +54,52 @@ namespace otb
**/
template <class TOssimMapProjection,
-InverseOrForwardTransformationEnum TDirectionOfMapping,
-class TScalarType = double,
-unsigned int NInputDimensions=2,
-unsigned int NOutputDimensions=2>
-class ITK_EXPORT MapProjection: public itk::Transform<TScalarType, // Data type for scalars
- NInputDimensions, // Number of dimensions in the input space
- NOutputDimensions> // Number of dimensions in the output space
+ InverseOrForwardTransformationEnum TDirectionOfMapping,
+ class TScalarType = double,
+ unsigned int NInputDimensions = 2,
+ unsigned int NOutputDimensions = 2>
+class ITK_EXPORT MapProjection : public itk::Transform<TScalarType, // Data type for scalars
+ NInputDimensions, // Number of dimensions in the input space
+ NOutputDimensions> // Number of dimensions in the output space
{
-public :
+public:
/** Standard class typedefs. */
- typedef itk::Transform< TScalarType,
- NInputDimensions,
- NOutputDimensions > Superclass;
- typedef MapProjection Self;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::Transform<TScalarType,
+ NInputDimensions,
+ NOutputDimensions> Superclass;
+ typedef MapProjection Self;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
typedef typename Superclass::ScalarType ScalarType;
typedef TOssimMapProjection OssimMapProjectionType;
typedef ossimRefPtr<OssimMapProjectionType> OssimMapProjectionPointerType;
- typedef itk::Point<ScalarType,NInputDimensions > InputPointType;
- typedef itk::Point<ScalarType,NOutputDimensions > OutputPointType;
+ typedef itk::Point<ScalarType, NInputDimensions> InputPointType;
+ typedef itk::Point<ScalarType, NOutputDimensions> OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( MapProjection, itk::Transform );
+ itkTypeMacro(MapProjection, itk::Transform);
- virtual const OssimMapProjectionType* GetMapProjection () const;
- virtual OssimMapProjectionType* GetMapProjection ();
+ virtual const OssimMapProjectionType* GetMapProjection() const;
+ virtual OssimMapProjectionType* GetMapProjection();
typedef InverseOrForwardTransformationEnum DirectionOfMappingEnumType;
- itkStaticConstMacro(DirectionOfMapping,DirectionOfMappingEnumType,TDirectionOfMapping);
+ itkStaticConstMacro(DirectionOfMapping, DirectionOfMappingEnumType, TDirectionOfMapping);
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
itkStaticConstMacro(SpaceDimension, unsigned int, NInputDimensions);
- itkStaticConstMacro(ParametersDimension, unsigned int,NInputDimensions*(NInputDimensions+1));
+ itkStaticConstMacro(ParametersDimension, unsigned int, NInputDimensions * (NInputDimensions + 1));
-
- virtual void SetEllipsoid ();
- void SetEllipsoid (const ossimEllipsoid &ellipsoid);
+ virtual void SetEllipsoid();
+ void SetEllipsoid(const ossimEllipsoid& ellipsoid);
void SetEllipsoid(std::string code);
- void SetEllipsoid(const double &major_axis, const double &minor_axis);
+ void SetEllipsoid(const double& major_axis, const double& minor_axis);
- OutputPointType TransformPoint(const InputPointType &point) const;
+ OutputPointType TransformPoint(const InputPointType& point) const;
virtual InputPointType Origin();
virtual double GetFalseNorthing() const;
virtual double GetFalseEasting() const;
@@ -114,17 +113,25 @@ public :
virtual OutputPointType GetMetersPerPixel() const;
virtual OutputPointType GetDecimalDegreesPerPixel() const;
virtual void SetAB(double a, double b);
- virtual void SetOrigin(const InputPointType &origin);
- virtual void SetOrigin(const InputPointType &origin, std::string datumCode);
- virtual void SetMetersPerPixel(const OutputPointType &point);
- virtual void SetDecimalDegreesPerPixel(const OutputPointType &point);
- virtual void ComputeDegreesPerPixel(const InputPointType &ground, const OutputPointType &metersPerPixel, double &deltaLat, double &deltaLon);
- virtual void ComputeMetersPerPixel(const InputPointType ¢er, double deltaDegreesPerPixelLat, double deltaDegreesPerPixelLon, OutputPointType &metersPerPixel);
- virtual void ComputeMetersPerPixel(double deltaDegreesPerPixelLat, double deltaDegreesPerPixelLon, OutputPointType &metersPerPixel);
+ virtual void SetOrigin(const InputPointType& origin);
+ virtual void SetOrigin(const InputPointType& origin, std::string datumCode);
+ virtual void SetMetersPerPixel(const OutputPointType& point);
+ virtual void SetDecimalDegreesPerPixel(const OutputPointType& point);
+ virtual void ComputeDegreesPerPixel(const InputPointType& ground,
+ const OutputPointType& metersPerPixel,
+ double& deltaLat,
+ double& deltaLon);
+ virtual void ComputeMetersPerPixel(const InputPointType& center,
+ double deltaDegreesPerPixelLat,
+ double deltaDegreesPerPixelLon,
+ OutputPointType& metersPerPixel);
+ virtual void ComputeMetersPerPixel(double deltaDegreesPerPixelLat,
+ double deltaDegreesPerPixelLon,
+ OutputPointType& metersPerPixel);
//virtual void SetMatrix(double rotation, const OutputPointType &scale, const OutputPointType &translation);
virtual void SetFalseEasting(double falseEasting)
{
- itkExceptionMacro(<<"Subclasses should override this method");
+ itkExceptionMacro(<< "Subclasses should override this method");
}
/** Return the Wkt representation of the projection*/
@@ -135,21 +142,19 @@ public :
virtual void PrintMap() const;
-
protected:
MapProjection();
virtual ~MapProjection();
OssimMapProjectionPointerType m_MapProjection;
- std::string m_ProjectionRefWkt;
+ std::string m_ProjectionRefWkt;
virtual void InstanciateProjection();
-private :
- MapProjection(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ MapProjection(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Projections/otbMapProjection.txx b/Code/Projections/otbMapProjection.txx
index 2f67025a61..3371e5c316 100644
--- a/Code/Projections/otbMapProjection.txx
+++ b/Code/Projections/otbMapProjection.txx
@@ -24,51 +24,54 @@
namespace otb
{
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::MapProjection() : Superclass(SpaceDimension,ParametersDimension)
+::MapProjection() : Superclass(SpaceDimension, ParametersDimension)
{
m_MapProjection = NULL;
m_ProjectionRefWkt.clear();
this->InstanciateProjection();
}
-
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::~MapProjection()
{
m_MapProjection = NULL;
}
-
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
const TOssimMapProjection*
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::GetMapProjection () const
+::GetMapProjection() const
{
return this->m_MapProjection.get();
}
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
TOssimMapProjection*
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::GetMapProjection ()
+::GetMapProjection()
{
return this->m_MapProjection.release();
}
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::InstanciateProjection ()
+::InstanciateProjection()
{
m_MapProjection = new OssimMapProjectionType();
}
-
/// Method to set the projection ellipsoid
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::SetEllipsoid()
{
@@ -77,15 +80,17 @@ void MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions
}
/// Method to set the projection ellipsoid by copy
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::SetEllipsoid(const ossimEllipsoid &ellipsoid)
+::SetEllipsoid(const ossimEllipsoid& ellipsoid)
{
m_MapProjection->setEllipsoid(ellipsoid);
}
///// Method to set the projection ellipsoid by knowing its code
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::SetEllipsoid(std::string code)
{
@@ -94,25 +99,28 @@ void MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions
}
///// Method to set the projection ellipsoid by knowing its axis
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::SetEllipsoid(const double &major_axis, const double &minor_axis)
+::SetEllipsoid(const double& major_axis, const double& minor_axis)
{
- ossimEllipsoid ellipsoid(major_axis,minor_axis);
+ ossimEllipsoid ellipsoid(major_axis, minor_axis);
m_MapProjection->setEllipsoid(ellipsoid);
}
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
-typename MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
+typename MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions,
+ NOutputDimensions>::OutputPointType
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::TransformPoint(const InputPointType & point) const
+::TransformPoint(const InputPointType& point) const
{
OutputPointType outputPoint;
switch (DirectionOfMapping)
- {
+ {
case INVERSE:
- {
+ {
// otbMsgDevMacro(<< "Cartographic coordinates: (" << point[0] << "," << point[1] << ")");
//from "itk::point" to "ossim::ossimDpt"
@@ -120,115 +128,122 @@ MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOu
//map projection
ossimGpt ossimGPoint;
- ossimGPoint=m_MapProjection->inverse(ossimDPoint);
- ossimGPoint.changeDatum(ossimDatumFactory::instance()->wgs84() );
+ ossimGPoint = m_MapProjection->inverse(ossimDPoint);
+ ossimGPoint.changeDatum(ossimDatumFactory::instance()->wgs84());
// otbGenericMsgDebugMacro(<< "Inverse : " << std::endl << m_MapProjection->print(std::cout));
- outputPoint[0]=ossimGPoint.lon;
- outputPoint[1]=ossimGPoint.lat;
+ outputPoint[0] = ossimGPoint.lon;
+ outputPoint[1] = ossimGPoint.lat;
// otbMsgDevMacro(<< "Geographic coordinates (lon, lat) : (" << outputPoint[0] << "," << outputPoint[1] << ")");
break;
- }
+ }
case FORWARD:
- {
+ {
// otbMsgDevMacro(<< "Geographic coordinates (lon, lat) : (" << point[1] << "," << point[0] << ")");
//from "itk::point" to "ossim::ossimGpt"
ossimGpt ossimGPoint(point[1], point[0]);
//map projection
ossimDpt ossimDPoint;
- ossimDPoint=m_MapProjection->forward(ossimGPoint);
+ ossimDPoint = m_MapProjection->forward(ossimGPoint);
// otbGenericMsgDebugMacro(<< "Forward : ========================= " << std::endl << m_MapProjection->print(std::cout));
- outputPoint[0]=ossimDPoint.x;
- outputPoint[1]=ossimDPoint.y;
+ outputPoint[0] = ossimDPoint.x;
+ outputPoint[1] = ossimDPoint.y;
// otbMsgDevMacro(<< "Cartographic coordinates: (" << outputPoint[0] << "," << outputPoint[1] << ")");
break;
- }
+ }
default:
- {
- itkExceptionMacro(<<"Model is INVERSE or FORWARD only !!");
+ {
+ itkExceptionMacro(<< "Model is INVERSE or FORWARD only !!");
break;
- }
- }
+ }
+ }
return outputPoint;
}
-
///\return The geographic point corresponding to (0,0)
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
-typename MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>::InputPointType
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
+typename MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions,
+ NOutputDimensions>::InputPointType
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::Origin()
{
- ossimGpt ossimOrigin=m_MapProjection->origin();
+ ossimGpt ossimOrigin = m_MapProjection->origin();
InputPointType otbOrigin;
- otbOrigin[0]= ossimOrigin.lat;
- otbOrigin[1]= ossimOrigin.lon;
+ otbOrigin[0] = ossimOrigin.lat;
+ otbOrigin[1] = ossimOrigin.lon;
return otbOrigin;
}
///\return The False Northing(avoid negative coordinates)
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
double
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::GetFalseNorthing() const
{
- double falseNorthing=m_MapProjection->getFalseNorthing();
+ double falseNorthing = m_MapProjection->getFalseNorthing();
return falseNorthing;
}
///\return The FalseEasting(avoid negative coordinates)
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
double
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::GetFalseEasting() const
{
- double falseEasting=m_MapProjection->getFalseEasting();
+ double falseEasting = m_MapProjection->getFalseEasting();
return falseEasting;
}
///\return The StandardParallel1(depends on the projection type)
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
double
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::GetStandardParallel1() const
{
- double standardParallel1=m_MapProjection->getStandardParallel1();
+ double standardParallel1 = m_MapProjection->getStandardParallel1();
return standardParallel1;
}
///\return The StandardParallel2(depends on the projection type)
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
double
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::GetStandardParallel2() const
{
- double standardParallel2=m_MapProjection->getStandardParallel2();
+ double standardParallel2 = m_MapProjection->getStandardParallel2();
return standardParallel2;
}
///\return The projection name
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
std::string
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::GetProjectionName() const
{
std::string projectionName;
- projectionName=m_MapProjection->getProjectionName();
+ projectionName = m_MapProjection->getProjectionName();
return projectionName;
}
///Check if the projection is geographic
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
bool
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::IsGeographic() const
@@ -237,149 +252,175 @@ MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOu
}
///\return the major axis of the ellipsoid
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
double
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::GetA() const
{
- double majorAxis=m_MapProjection->getA();
+ double majorAxis = m_MapProjection->getA();
return majorAxis;
}
///\return the minor axis of the ellipsoid
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
double
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::GetB() const
{
- double minorAxis=m_MapProjection->getB();
+ double minorAxis = m_MapProjection->getB();
return minorAxis;
}
///\return the flatening of the ellipsoid
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
double
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::GetF() const
{
- double flattening=m_MapProjection->getF();
+ double flattening = m_MapProjection->getF();
return flattening;
}
///\return The resolution in meters
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
-typename MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
+typename MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions,
+ NOutputDimensions>::OutputPointType
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::GetMetersPerPixel() const
{
- ossimDpt ossimMetersPerPixels=m_MapProjection->getMetersPerPixel();
+ ossimDpt ossimMetersPerPixels = m_MapProjection->getMetersPerPixel();
OutputPointType metersPerPixels;
- metersPerPixels[0]=ossimMetersPerPixels.x;
- metersPerPixels[1]=ossimMetersPerPixels.y;
+ metersPerPixels[0] = ossimMetersPerPixels.x;
+ metersPerPixels[1] = ossimMetersPerPixels.y;
return metersPerPixels;
}
///\return The resolution in degree
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
-typename MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
+typename MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions,
+ NOutputDimensions>::OutputPointType
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::GetDecimalDegreesPerPixel() const
{
- ossimDpt ossimDecimalDegreesPerPixels=m_MapProjection->getDecimalDegreesPerPixel();
+ ossimDpt ossimDecimalDegreesPerPixels = m_MapProjection->getDecimalDegreesPerPixel();
OutputPointType DecimalDegreesPerPixels;
- DecimalDegreesPerPixels[0]=ossimDecimalDegreesPerPixels.x;
- DecimalDegreesPerPixels[1]=ossimDecimalDegreesPerPixels.y;
+ DecimalDegreesPerPixels[0] = ossimDecimalDegreesPerPixels.x;
+ DecimalDegreesPerPixels[1] = ossimDecimalDegreesPerPixels.y;
return DecimalDegreesPerPixels;
}
///Set the ellipsoid axis
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::SetAB(double a, double b)
{
- m_MapProjection->setAB(a,b);
+ m_MapProjection->setAB(a, b);
}
///Set the origin
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::SetOrigin(const InputPointType &origin)
+::SetOrigin(const InputPointType& origin)
{
ossimGpt ossimOrigin(origin[1], origin[0]);
m_MapProjection->setOrigin(ossimOrigin);
}
///Set the origin in a given datum
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::SetOrigin(const InputPointType &origin, std::string datumCode)
+::SetOrigin(const InputPointType& origin, std::string datumCode)
{
ossimGpt ossimOrigin(origin[1], origin[0], 0, ossimDatumFactory::instance()->create(datumCode));
m_MapProjection->setOrigin(ossimOrigin);
}
///Set the map resolution in meters
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::SetMetersPerPixel(const OutputPointType &point)
+::SetMetersPerPixel(const OutputPointType& point)
{
ossimDpt ossimDPoint(point[0], point[1]);
m_MapProjection->setMetersPerPixel(ossimDPoint);
}
///Set the map resolution in degree
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::SetDecimalDegreesPerPixel(const OutputPointType &point)
+::SetDecimalDegreesPerPixel(const OutputPointType& point)
{
ossimDpt ossimDPoint(point[0], point[1]);
m_MapProjection->setDecimalDegreesPerPixel(ossimDPoint);
}
///\return an approximation of the resolution in degree
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::ComputeDegreesPerPixel(const InputPointType &ground, const OutputPointType &metersPerPixel, double &deltaLat, double &deltaLon)
+::ComputeDegreesPerPixel(const InputPointType& ground,
+ const OutputPointType& metersPerPixel,
+ double& deltaLat,
+ double& deltaLon)
{
ossimDpt ossimMetersPerPixel(metersPerPixel[0], metersPerPixel[1]);
- ossimGpt ossimGround(ground[1],ground[0]);
- m_MapProjection->computeDegreesPerPixel(ossimGround,ossimMetersPerPixel,deltaLat,deltaLon);
+ ossimGpt ossimGround(ground[1], ground[0]);
+ m_MapProjection->computeDegreesPerPixel(ossimGround, ossimMetersPerPixel, deltaLat, deltaLon);
}
///\return an approximation of the resolution in meters
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::ComputeMetersPerPixel(const InputPointType ¢er, double deltaDegreesPerPixelLat, double deltaDegreesPerPixelLon, OutputPointType &metersPerPixel)
+::ComputeMetersPerPixel(const InputPointType& center,
+ double deltaDegreesPerPixelLat,
+ double deltaDegreesPerPixelLon,
+ OutputPointType& metersPerPixel)
{
//Correction
- ossimGpt ossimCenter(center[1],center[0]);
+ ossimGpt ossimCenter(center[1], center[0]);
ossimDpt ossimMetersPerPixel;
- m_MapProjection->computeMetersPerPixel(ossimCenter,deltaDegreesPerPixelLat, deltaDegreesPerPixelLon,ossimMetersPerPixel);
- metersPerPixel[0]=ossimMetersPerPixel.x;
- metersPerPixel[1]=ossimMetersPerPixel.y;
+ m_MapProjection->computeMetersPerPixel(ossimCenter,
+ deltaDegreesPerPixelLat,
+ deltaDegreesPerPixelLon,
+ ossimMetersPerPixel);
+ metersPerPixel[0] = ossimMetersPerPixel.x;
+ metersPerPixel[1] = ossimMetersPerPixel.y;
}
///\return an approximation of the resolution in meters
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
-::ComputeMetersPerPixel(double deltaDegreesPerPixelLat, double deltaDegreesPerPixelLon, OutputPointType &metersPerPixel)
+::ComputeMetersPerPixel(double deltaDegreesPerPixelLat, double deltaDegreesPerPixelLon, OutputPointType& metersPerPixel)
{
ossimDpt ossimMetersPerPixel;
- m_MapProjection->computeMetersPerPixel(m_MapProjection->origin(),deltaDegreesPerPixelLat, deltaDegreesPerPixelLon,ossimMetersPerPixel);
- metersPerPixel[0]=ossimMetersPerPixel.x;
- metersPerPixel[1]=ossimMetersPerPixel.y;
+ m_MapProjection->computeMetersPerPixel(
+ m_MapProjection->origin(), deltaDegreesPerPixelLat, deltaDegreesPerPixelLon, ossimMetersPerPixel);
+ metersPerPixel[0] = ossimMetersPerPixel.x;
+ metersPerPixel[1] = ossimMetersPerPixel.y;
}
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
std::string
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::GetWkt() const
@@ -387,21 +428,23 @@ MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOu
ossimKeywordlist kwl;
m_MapProjection->saveState(kwl);
ossimOgcWktTranslator wktTranslator;
- std::string wkt;
+ std::string wkt;
wkt = wktTranslator.fromOssimKwl(kwl);
return wkt;
}
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::SetWkt(std::string projectionRefWkt)
{
- this->m_ProjectionRefWkt=projectionRefWkt;
+ this->m_ProjectionRefWkt = projectionRefWkt;
this->Modified();
}
-template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+template<class TOssimMapProjection, InverseOrForwardTransformationEnum Transform, class TScalarType,
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void
MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOutputDimensions>
::PrintMap() const
@@ -409,7 +452,6 @@ MapProjection<TOssimMapProjection, Transform, TScalarType, NInputDimensions, NOu
std::cout << m_MapProjection->print(std::cout);
}
-
} // namespace otb
#endif
diff --git a/Code/Projections/otbMapProjections.h b/Code/Projections/otbMapProjections.h
index 061660b231..79043bdf74 100644
--- a/Code/Projections/otbMapProjections.h
+++ b/Code/Projections/otbMapProjections.h
@@ -61,72 +61,72 @@
namespace otb
{
-typedef MapProjection<ossimAlbersProjection,INVERSE> AlbersInverseProjection;
-typedef MapProjection<ossimAlbersProjection,FORWARD> AlbersForwardProjection;
-typedef MapProjection<ossimAzimEquDistProjection,INVERSE> AzimEquDistInverseProjection;
-typedef MapProjection<ossimAzimEquDistProjection,FORWARD> AzimEquDistForwardProjection;
-typedef MapProjection<ossimBngProjection,INVERSE> BngInverseProjection;
-typedef MapProjection<ossimBngProjection,FORWARD> BngForwardProjection;
-typedef MapProjection<ossimBonneProjection,INVERSE> BonneInverseProjection;
-typedef MapProjection<ossimBonneProjection,FORWARD> BonneForwardProjection;
-typedef MapProjection<ossimCadrgProjection,INVERSE> CadrgInverseProjection;
-typedef MapProjection<ossimCadrgProjection,FORWARD> CadrgForwardProjection;
-typedef MapProjection<ossimCassiniProjection,INVERSE> CassiniInverseProjection;
-typedef MapProjection<ossimCassiniProjection,FORWARD> CassiniForwardProjection;
-typedef MapProjection<ossimCylEquAreaProjection,INVERSE> CylEquAreaInverseProjection;
-typedef MapProjection<ossimCylEquAreaProjection,FORWARD> CylEquAreaForwardProjection;
-typedef Eckert4MapProjection<INVERSE> Eckert4InverseProjection;
-typedef Eckert4MapProjection<FORWARD> Eckert4ForwardProjection;
-typedef MapProjection<ossimEckert6Projection,INVERSE> Eckert6InverseProjection;
-typedef MapProjection<ossimEckert6Projection,FORWARD> Eckert6ForwardProjection;
-typedef MapProjection<ossimGnomonicProjection,INVERSE> GnomonicInverseProjection;
-typedef MapProjection<ossimGnomonicProjection,FORWARD> GnomonicForwardProjection;
-typedef LambertConformalConicMapProjection<INVERSE> LambertConformalConicInverseProjection;
-typedef LambertConformalConicMapProjection<FORWARD> LambertConformalConicForwardProjection;
-typedef Lambert2EtenduProjection<INVERSE> Lambert2EtenduInverseProjection;
-typedef Lambert2EtenduProjection<FORWARD> Lambert2EtenduForwardProjection;
-typedef Lambert3CartoSudProjection<INVERSE> Lambert3CartoSudInverseProjection;
-typedef Lambert3CartoSudProjection<FORWARD> Lambert3CartoSudForwardProjection;
-typedef Lambert93Projection<INVERSE> Lambert93InverseProjection;
-typedef Lambert93Projection<FORWARD> Lambert93ForwardProjection;
-typedef SVY21MapProjection<INVERSE> SVY21InverseProjection;
-typedef SVY21MapProjection<FORWARD> SVY21ForwardProjection;
-typedef MapProjection<ossimLlxyProjection,INVERSE> LlxyInverseProjection;
-typedef MapProjection<ossimLlxyProjection,FORWARD> LlxyForwardProjection;
-typedef MapProjection<ossimEquDistCylProjection,INVERSE> EquDistCylInverseProjection;
-typedef MapProjection<ossimEquDistCylProjection,FORWARD> EquDistCylForwardProjection;
-typedef MapProjection<ossimMercatorProjection,INVERSE> MercatorInverseProjection;
-typedef MapProjection<ossimMercatorProjection,FORWARD> MercatorForwardProjection;
-typedef MapProjection<ossimMillerProjection,INVERSE> MillerInverseProjection;
-typedef MapProjection<ossimMillerProjection,FORWARD> MillerForwardProjection;
-typedef MollweidMapProjection<INVERSE> MollweidInverseProjection;
-typedef MollweidMapProjection<FORWARD> MollweidForwardProjection;
-typedef MapProjection<ossimNewZealandMapGridProjection,INVERSE> NewZealandMapGridInverseProjection;
-typedef MapProjection<ossimNewZealandMapGridProjection,FORWARD> NewZealandMapGridForwardProjection;
-typedef MapProjection<ossimObliqueMercatorProjection,INVERSE> ObliqueMercatorInverseProjection;
-typedef MapProjection<ossimObliqueMercatorProjection,FORWARD> ObliqueMercatorForwardProjection;
-typedef MapProjection<ossimOrthoGraphicProjection,INVERSE> OrthoGraphicInverseProjection;
-typedef MapProjection<ossimOrthoGraphicProjection,FORWARD> OrthoGraphicForwardProjection;
-typedef MapProjection<ossimPolarStereoProjection,INVERSE> PolarStereoInverseProjection;
-typedef MapProjection<ossimPolarStereoProjection,FORWARD> PolarStereoForwardProjection;
-typedef MapProjection<ossimPolyconicProjection,INVERSE> PolyconicInverseProjection;
-typedef MapProjection<ossimPolyconicProjection,FORWARD> PolyconicForwardProjection;
-typedef SinusoidalMapProjection<INVERSE> SinusoidalInverseProjection;
-typedef SinusoidalMapProjection<FORWARD> SinusoidalForwardProjection;
-typedef MapProjection<ossimSpaceObliqueMercatorProjection,INVERSE> SpaceObliqueMercatorInverseProjection;
-typedef MapProjection<ossimSpaceObliqueMercatorProjection,FORWARD> SpaceObliqueMercatorForwardProjection;
-typedef MapProjection<ossimStereographicProjection,INVERSE> StereographicInverseProjection;
-typedef MapProjection<ossimStereographicProjection,FORWARD> StereographicForwardProjection;
-typedef MapProjection<ossimTransCylEquAreaProjection,INVERSE> TransCylEquAreaInverseProjection;
-typedef MapProjection<ossimTransCylEquAreaProjection,FORWARD> TransCylEquAreaForwardProjection;
-typedef TransMercatorMapProjection<INVERSE> TransMercatorInverseProjection;
-typedef TransMercatorMapProjection<FORWARD> TransMercatorForwardProjection;
-typedef MapProjection<ossimUpsProjection,INVERSE> UpsInverseProjection;
-typedef MapProjection<ossimUpsProjection,FORWARD> UpsForwardProjection;
-typedef UtmMapProjection<INVERSE> UtmInverseProjection;
-typedef UtmMapProjection<FORWARD> UtmForwardProjection;
-typedef MapProjection<ossimVanDerGrintenProjection,INVERSE> VanDerGrintenInverseProjection;
-typedef MapProjection<ossimVanDerGrintenProjection,FORWARD> VanDerGrintenForwardProjection;
+typedef MapProjection<ossimAlbersProjection, INVERSE> AlbersInverseProjection;
+typedef MapProjection<ossimAlbersProjection, FORWARD> AlbersForwardProjection;
+typedef MapProjection<ossimAzimEquDistProjection, INVERSE> AzimEquDistInverseProjection;
+typedef MapProjection<ossimAzimEquDistProjection, FORWARD> AzimEquDistForwardProjection;
+typedef MapProjection<ossimBngProjection, INVERSE> BngInverseProjection;
+typedef MapProjection<ossimBngProjection, FORWARD> BngForwardProjection;
+typedef MapProjection<ossimBonneProjection, INVERSE> BonneInverseProjection;
+typedef MapProjection<ossimBonneProjection, FORWARD> BonneForwardProjection;
+typedef MapProjection<ossimCadrgProjection, INVERSE> CadrgInverseProjection;
+typedef MapProjection<ossimCadrgProjection, FORWARD> CadrgForwardProjection;
+typedef MapProjection<ossimCassiniProjection, INVERSE> CassiniInverseProjection;
+typedef MapProjection<ossimCassiniProjection, FORWARD> CassiniForwardProjection;
+typedef MapProjection<ossimCylEquAreaProjection, INVERSE> CylEquAreaInverseProjection;
+typedef MapProjection<ossimCylEquAreaProjection, FORWARD> CylEquAreaForwardProjection;
+typedef Eckert4MapProjection<INVERSE> Eckert4InverseProjection;
+typedef Eckert4MapProjection<FORWARD> Eckert4ForwardProjection;
+typedef MapProjection<ossimEckert6Projection, INVERSE> Eckert6InverseProjection;
+typedef MapProjection<ossimEckert6Projection, FORWARD> Eckert6ForwardProjection;
+typedef MapProjection<ossimGnomonicProjection, INVERSE> GnomonicInverseProjection;
+typedef MapProjection<ossimGnomonicProjection, FORWARD> GnomonicForwardProjection;
+typedef LambertConformalConicMapProjection<INVERSE> LambertConformalConicInverseProjection;
+typedef LambertConformalConicMapProjection<FORWARD> LambertConformalConicForwardProjection;
+typedef Lambert2EtenduProjection<INVERSE> Lambert2EtenduInverseProjection;
+typedef Lambert2EtenduProjection<FORWARD> Lambert2EtenduForwardProjection;
+typedef Lambert3CartoSudProjection<INVERSE> Lambert3CartoSudInverseProjection;
+typedef Lambert3CartoSudProjection<FORWARD> Lambert3CartoSudForwardProjection;
+typedef Lambert93Projection<INVERSE> Lambert93InverseProjection;
+typedef Lambert93Projection<FORWARD> Lambert93ForwardProjection;
+typedef SVY21MapProjection<INVERSE> SVY21InverseProjection;
+typedef SVY21MapProjection<FORWARD> SVY21ForwardProjection;
+typedef MapProjection<ossimLlxyProjection, INVERSE> LlxyInverseProjection;
+typedef MapProjection<ossimLlxyProjection, FORWARD> LlxyForwardProjection;
+typedef MapProjection<ossimEquDistCylProjection, INVERSE> EquDistCylInverseProjection;
+typedef MapProjection<ossimEquDistCylProjection, FORWARD> EquDistCylForwardProjection;
+typedef MapProjection<ossimMercatorProjection, INVERSE> MercatorInverseProjection;
+typedef MapProjection<ossimMercatorProjection, FORWARD> MercatorForwardProjection;
+typedef MapProjection<ossimMillerProjection, INVERSE> MillerInverseProjection;
+typedef MapProjection<ossimMillerProjection, FORWARD> MillerForwardProjection;
+typedef MollweidMapProjection<INVERSE> MollweidInverseProjection;
+typedef MollweidMapProjection<FORWARD> MollweidForwardProjection;
+typedef MapProjection<ossimNewZealandMapGridProjection, INVERSE> NewZealandMapGridInverseProjection;
+typedef MapProjection<ossimNewZealandMapGridProjection, FORWARD> NewZealandMapGridForwardProjection;
+typedef MapProjection<ossimObliqueMercatorProjection, INVERSE> ObliqueMercatorInverseProjection;
+typedef MapProjection<ossimObliqueMercatorProjection, FORWARD> ObliqueMercatorForwardProjection;
+typedef MapProjection<ossimOrthoGraphicProjection, INVERSE> OrthoGraphicInverseProjection;
+typedef MapProjection<ossimOrthoGraphicProjection, FORWARD> OrthoGraphicForwardProjection;
+typedef MapProjection<ossimPolarStereoProjection, INVERSE> PolarStereoInverseProjection;
+typedef MapProjection<ossimPolarStereoProjection, FORWARD> PolarStereoForwardProjection;
+typedef MapProjection<ossimPolyconicProjection, INVERSE> PolyconicInverseProjection;
+typedef MapProjection<ossimPolyconicProjection, FORWARD> PolyconicForwardProjection;
+typedef SinusoidalMapProjection<INVERSE> SinusoidalInverseProjection;
+typedef SinusoidalMapProjection<FORWARD> SinusoidalForwardProjection;
+typedef MapProjection<ossimSpaceObliqueMercatorProjection, INVERSE> SpaceObliqueMercatorInverseProjection;
+typedef MapProjection<ossimSpaceObliqueMercatorProjection, FORWARD> SpaceObliqueMercatorForwardProjection;
+typedef MapProjection<ossimStereographicProjection, INVERSE> StereographicInverseProjection;
+typedef MapProjection<ossimStereographicProjection, FORWARD> StereographicForwardProjection;
+typedef MapProjection<ossimTransCylEquAreaProjection, INVERSE> TransCylEquAreaInverseProjection;
+typedef MapProjection<ossimTransCylEquAreaProjection, FORWARD> TransCylEquAreaForwardProjection;
+typedef TransMercatorMapProjection<INVERSE> TransMercatorInverseProjection;
+typedef TransMercatorMapProjection<FORWARD> TransMercatorForwardProjection;
+typedef MapProjection<ossimUpsProjection, INVERSE> UpsInverseProjection;
+typedef MapProjection<ossimUpsProjection, FORWARD> UpsForwardProjection;
+typedef UtmMapProjection<INVERSE> UtmInverseProjection;
+typedef UtmMapProjection<FORWARD> UtmForwardProjection;
+typedef MapProjection<ossimVanDerGrintenProjection, INVERSE> VanDerGrintenInverseProjection;
+typedef MapProjection<ossimVanDerGrintenProjection, FORWARD> VanDerGrintenForwardProjection;
-}//namespace otb
+} //namespace otb
#endif
diff --git a/Code/Projections/otbMapToMapProjection.h b/Code/Projections/otbMapToMapProjection.h
index 1be9742f3f..d3eab396e8 100644
--- a/Code/Projections/otbMapToMapProjection.h
+++ b/Code/Projections/otbMapToMapProjection.h
@@ -28,7 +28,6 @@
namespace otb
{
-
/** \class MapToMapProjection
*
* \brief <b>DEPRECATED</b>: Class for switching from a Map Projection coordinates to
@@ -43,52 +42,52 @@ namespace otb
* \sa GenericMapProjection
*/
template <class TInputMapProjection,
-class TOutputMapProjection,
-class TScalarType=double,
-unsigned int NInputDimensions=2,
-unsigned int NOutputDimensions=2>
-class ITK_EXPORT MapToMapProjection: public itk::Transform<TScalarType, // Data type for scalars
- NInputDimensions, // Number of dimensions in the input space
- NOutputDimensions> // Number of dimensions in the output space
+ class TOutputMapProjection,
+ class TScalarType = double,
+ unsigned int NInputDimensions = 2,
+ unsigned int NOutputDimensions = 2>
+class ITK_EXPORT MapToMapProjection : public itk::Transform<TScalarType, // Data type for scalars
+ NInputDimensions, // Number of dimensions in the input space
+ NOutputDimensions> // Number of dimensions in the output space
{
-public :
+public:
/** Standard class typedefs */
- typedef itk::Transform< TScalarType,
- NInputDimensions,
- NOutputDimensions > Superclass;
- typedef MapToMapProjection Self;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- typedef TInputMapProjection InputMapProjectionType;
- typedef typename InputMapProjectionType::Pointer InputMapProjectionPointerType;
+ typedef itk::Transform<TScalarType,
+ NInputDimensions,
+ NOutputDimensions> Superclass;
+ typedef MapToMapProjection Self;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ typedef TInputMapProjection InputMapProjectionType;
+ typedef typename InputMapProjectionType::Pointer InputMapProjectionPointerType;
typedef typename InputMapProjectionType::OutputPointType OutputPointOfInputMapProjectionType;
- typedef TOutputMapProjection OutputMapProjectionType;
- typedef typename OutputMapProjectionType::Pointer OutputMapProjectionPointerType;
+ typedef TOutputMapProjection OutputMapProjectionType;
+ typedef typename OutputMapProjectionType::Pointer OutputMapProjectionPointerType;
typedef typename Superclass::InputPointType InputPointType;
- typedef typename Superclass::OutputPointType OutputPointType;
+ typedef typename Superclass::OutputPointType OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( MapToMapProjection, itk::Transform );
+ itkTypeMacro(MapToMapProjection, itk::Transform);
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
itkStaticConstMacro(SpaceDimension, unsigned int, NInputDimensions);
- itkStaticConstMacro(ParametersDimension, unsigned int, NInputDimensions*(NInputDimensions+1));
+ itkStaticConstMacro(ParametersDimension, unsigned int, NInputDimensions * (NInputDimensions + 1));
/** Set MapProjection1. */
- itkSetObjectMacro(InputMapProjection,InputMapProjectionType);
+ itkSetObjectMacro(InputMapProjection, InputMapProjectionType);
/** Set MapProjection2. */
- itkSetObjectMacro(OutputMapProjection,OutputMapProjectionType);
+ itkSetObjectMacro(OutputMapProjection, OutputMapProjectionType);
/** Transform Point from MapProjection1 to MapProjection2 */
- OutputPointType TransformPoint(const InputPointType &point) const;
+ OutputPointType TransformPoint(const InputPointType& point) const;
// Compute MapProjection1 coordinates to MapProjection2 coordinates. */
// OutputPointType ComputeProjection1ToProjection2(const InputPointType &point1);
@@ -104,8 +103,8 @@ protected:
OutputMapProjectionPointerType m_OutputMapProjection;
private:
- MapToMapProjection(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MapToMapProjection(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Projections/otbMapToMapProjection.txx b/Code/Projections/otbMapToMapProjection.txx
index 66c858802f..e7f2cd92d9 100644
--- a/Code/Projections/otbMapToMapProjection.txx
+++ b/Code/Projections/otbMapToMapProjection.txx
@@ -24,30 +24,30 @@ namespace otb
{
template<class TInputMapProjection,
-class TOutputMapProjection,
-class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions>
+ class TOutputMapProjection,
+ class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
MapToMapProjection<TInputMapProjection,
-TOutputMapProjection,
-TScalarType,
-NInputDimensions,
-NOutputDimensions>
+ TOutputMapProjection,
+ TScalarType,
+ NInputDimensions,
+ NOutputDimensions>
::MapToMapProjection()
- : Superclass(SpaceDimension,ParametersDimension)
+ : Superclass(SpaceDimension, ParametersDimension)
{
}
template<class TInputMapProjection,
-class TOutputMapProjection,
-class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions>
+ class TOutputMapProjection,
+ class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
MapToMapProjection<TInputMapProjection,
-TOutputMapProjection,
-TScalarType,
-NInputDimensions,
-NOutputDimensions>
+ TOutputMapProjection,
+ TScalarType,
+ NInputDimensions,
+ NOutputDimensions>
::~MapToMapProjection()
{
}
@@ -110,31 +110,31 @@ NOutputDimensions>
}*/
template<class TInputMapProjection,
-class TOutputMapProjection,
-class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions>
+ class TOutputMapProjection,
+ class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
typename MapToMapProjection<TInputMapProjection,
-TOutputMapProjection,
-TScalarType,
-NInputDimensions,
-NOutputDimensions>
+ TOutputMapProjection,
+ TScalarType,
+ NInputDimensions,
+ NOutputDimensions>
::OutputPointType
MapToMapProjection<TInputMapProjection,
-TOutputMapProjection,
-TScalarType,
-NInputDimensions,
-NOutputDimensions>::
-TransformPoint(const InputPointType &point) const
+ TOutputMapProjection,
+ TScalarType,
+ NInputDimensions,
+ NOutputDimensions>::
+TransformPoint(const InputPointType& point) const
{
OutputPointOfInputMapProjectionType geopoint;
- OutputPointType point2;
+ OutputPointType point2;
//(lat,lon) projection
- geopoint=m_InputMapProjection->TransformPoint(point);
+ geopoint = m_InputMapProjection->TransformPoint(point);
//map projection
- point2=m_OutputMapProjection->TransformPoint(geopoint);
+ point2 = m_OutputMapProjection->TransformPoint(geopoint);
return point2;
}
@@ -142,4 +142,3 @@ TransformPoint(const InputPointType &point) const
} // namespace otb
#endif
-
diff --git a/Code/Projections/otbMollweidMapProjection.h b/Code/Projections/otbMollweidMapProjection.h
index 96c1a38841..32dd440c06 100644
--- a/Code/Projections/otbMollweidMapProjection.h
+++ b/Code/Projections/otbMollweidMapProjection.h
@@ -29,42 +29,41 @@ namespace otb
* It converts coordinates in longitude,latitude (WGS84) to Mollweid map coordinates.
*/
template <InverseOrForwardTransformationEnum transform>
-class ITK_EXPORT MollweidMapProjection : public MapProjection<ossimMollweidProjection, transform>
+class ITK_EXPORT MollweidMapProjection : public MapProjection<ossimMollweidProjection, transform>
{
-public :
+public:
/** Standard class typedefs. */
- typedef MollweidMapProjection Self;
- typedef MapProjection<ossimMollweidProjection,transform> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MollweidMapProjection Self;
+ typedef MapProjection<ossimMollweidProjection, transform> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::ScalarType ScalarType;
- typedef itk::Point<ScalarType,2 > InputPointType;
- typedef itk::Point<ScalarType,2 > OutputPointType;
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef itk::Point<ScalarType, 2> InputPointType;
+ typedef itk::Point<ScalarType, 2> OutputPointType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( MollweidMapProjection, MapProjection );
+ itkTypeMacro(MollweidMapProjection, MapProjection);
virtual void SetFalseEasting(double falseEasting);
virtual void SetFalseNorthing(double falseNorthing);
virtual double GetFalseNorthing() const;
virtual double GetFalseEasting() const;
- virtual void SetParameters(double falseEasting,double falseNorthing);
+ virtual void SetParameters(double falseEasting, double falseNorthing);
virtual void SetDefaults();
protected:
MollweidMapProjection();
virtual ~MollweidMapProjection();
-private :
- MollweidMapProjection(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ MollweidMapProjection(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Projections/otbMollweidMapProjection.txx b/Code/Projections/otbMollweidMapProjection.txx
index 4c632bcc15..1a3711635c 100644
--- a/Code/Projections/otbMollweidMapProjection.txx
+++ b/Code/Projections/otbMollweidMapProjection.txx
@@ -65,7 +65,7 @@ template <InverseOrForwardTransformationEnum transform>
double MollweidMapProjection<transform>
::GetFalseNorthing() const
{
- double falseNorthing=this->m_MapProjection->getFalseNorthing();
+ double falseNorthing = this->m_MapProjection->getFalseNorthing();
return falseNorthing;
}
@@ -75,19 +75,18 @@ template <InverseOrForwardTransformationEnum transform>
double MollweidMapProjection<transform>
::GetFalseEasting() const
{
- double falseEasting=this->m_MapProjection->getFalseEasting();
+ double falseEasting = this->m_MapProjection->getFalseEasting();
return falseEasting;
}
template <InverseOrForwardTransformationEnum transform>
void MollweidMapProjection<transform>
-::SetParameters(double falseEasting,double falseNorthing)
+::SetParameters(double falseEasting, double falseNorthing)
{
- this->m_MapProjection->setFalseEastingNorthing(falseEasting,falseNorthing);
+ this->m_MapProjection->setFalseEastingNorthing(falseEasting, falseNorthing);
}
} // end namespace otb
-
#endif
diff --git a/Code/Projections/otbOrthoRectificationFilter.h b/Code/Projections/otbOrthoRectificationFilter.h
index 8ed2602900..d62a0619d2 100644
--- a/Code/Projections/otbOrthoRectificationFilter.h
+++ b/Code/Projections/otbOrthoRectificationFilter.h
@@ -46,52 +46,52 @@ namespace otb
*
*/
-template <class TInputImage, class TOutputImage, class TMapProjection, class TInterpolatorPrecision=double>
+template <class TInputImage, class TOutputImage, class TMapProjection, class TInterpolatorPrecision = double>
class ITK_EXPORT OrthoRectificationFilter :
- public StreamingResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecision>
+ public StreamingResampleImageFilter<TInputImage, TOutputImage, TInterpolatorPrecision>
{
-public :
+public:
/** Standard class typedefs */
typedef StreamingResampleImageFilter<TInputImage,
- TOutputImage,
- TInterpolatorPrecision> Superclass;
- typedef OrthoRectificationFilter Self;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ TOutputImage,
+ TInterpolatorPrecision> Superclass;
+ typedef OrthoRectificationFilter Self;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename TInputImage::IndexType IndexType;
- typedef typename TInputImage::SizeType SizeType;
- typedef typename TInputImage::SpacingType SpacingType;
- typedef typename TInputImage::PointType PointType;
- typedef typename TInputImage::RegionType RegionType;
+ typedef typename TInputImage::IndexType IndexType;
+ typedef typename TInputImage::SizeType SizeType;
+ typedef typename TInputImage::SpacingType SpacingType;
+ typedef typename TInputImage::PointType PointType;
+ typedef typename TInputImage::RegionType RegionType;
- typedef typename TOutputImage::PixelType OutputPixelType;
+ typedef typename TOutputImage::PixelType OutputPixelType;
- typedef TMapProjection MapProjectionType;
- typedef typename TMapProjection::Pointer MapProjectionPointerType;
+ typedef TMapProjection MapProjectionType;
+ typedef typename TMapProjection::Pointer MapProjectionPointerType;
- typedef InverseSensorModel<double> SensorModelType;
- typedef typename SensorModelType::Pointer SensorModelPointerType;
+ typedef InverseSensorModel<double> SensorModelType;
+ typedef typename SensorModelType::Pointer SensorModelPointerType;
- typedef CompositeTransform< MapProjectionType,SensorModelType> CompositeTransformType;
+ typedef CompositeTransform<MapProjectionType, SensorModelType> CompositeTransformType;
typedef typename CompositeTransformType::Pointer CompositeTransformPointerType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( OrthoRectificationFilter, StreamingResampleImageFilter );
+ itkTypeMacro(OrthoRectificationFilter, StreamingResampleImageFilter);
/** Accessors */
- virtual void SetMapProjection (MapProjectionType* arg)
+ virtual void SetMapProjection(MapProjectionType* arg)
{
if (this->m_MapProjection != arg)
- {
+ {
this->m_MapProjection = arg;
m_CompositeTransform->SetFirstTransform(arg);
m_IsComputed = false;
this->Modified();
- }
+ }
}
itkGetObjectMacro(MapProjection, MapProjectionType);
@@ -117,7 +117,6 @@ public :
this->Modified();
}
-
/** Specify average elevation.*/
virtual void SetAverageElevation(double elevation)
{
@@ -125,18 +124,17 @@ public :
this->Modified();
}
-
protected:
OrthoRectificationFilter();
virtual ~OrthoRectificationFilter();
void PrintSelf(std::ostream& os, itk::Indent indent) const;
virtual void GenerateInputRequestedRegion();
- virtual void GenerateOutputInformation( void );
+ virtual void GenerateOutputInformation(void);
private:
- OrthoRectificationFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ OrthoRectificationFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Calculate transformation model from sensor model and map projection composition */
void ComputeResampleTransformationModel();
diff --git a/Code/Projections/otbOrthoRectificationFilter.txx b/Code/Projections/otbOrthoRectificationFilter.txx
index ee3ca3b819..b67cfe8d23 100644
--- a/Code/Projections/otbOrthoRectificationFilter.txx
+++ b/Code/Projections/otbOrthoRectificationFilter.txx
@@ -50,7 +50,6 @@ void OrthoRectificationFilter<TInputImage, TOutputImage, TMapProjection, TInterp
os << indent << "OrthoRectification" << "\n";
}
-
template <class TInputImage, class TOutputImage, class TMapProjection, class TInterpolatorPrecision>
void
OrthoRectificationFilter<TInputImage, TOutputImage, TMapProjection, TInterpolatorPrecision>
@@ -71,11 +70,11 @@ OrthoRectificationFilter<TInputImage, TOutputImage, TMapProjection, TInterpolato
// fill up the metadata information for ProjectionRef
typename TOutputImage::Pointer output = this->GetOutput();
- itk::MetaDataDictionary & dict = output->GetMetaDataDictionary();
+ itk::MetaDataDictionary& dict = output->GetMetaDataDictionary();
std::string projectionRef = m_MapProjection->GetWkt();
- itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef );
+ itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, projectionRef);
// Set an empty keyword list as the output is not in sensor geometry anymore
// ImageKeywordlist otb_kwl;
@@ -83,14 +82,13 @@ OrthoRectificationFilter<TInputImage, TOutputImage, TMapProjection, TInterpolato
}
-
template <class TInputImage, class TOutputImage, class TMapProjection, class TInterpolatorPrecision>
void
OrthoRectificationFilter<TInputImage, TOutputImage, TMapProjection, TInterpolatorPrecision>
::ComputeResampleTransformationModel()
{
if (m_IsComputed == false)
- {
+ {
otbMsgDevMacro(<< "COMPUTE RESAMPLE TRANSFORMATION MODEL");
typename TInputImage::ConstPointer input = this->GetInput();
@@ -108,7 +106,7 @@ OrthoRectificationFilter<TInputImage, TOutputImage, TMapProjection, TInterpolato
m_CompositeTransform->SetSecondTransform(m_SensorModel);
this->SetTransform(m_CompositeTransform);
m_IsComputed = true;
- }
+ }
}
} //namespace otb
diff --git a/Code/Projections/otbPlaceNameToLonLat.cxx b/Code/Projections/otbPlaceNameToLonLat.cxx
index d0432bd6e6..da87940b30 100644
--- a/Code/Projections/otbPlaceNameToLonLat.cxx
+++ b/Code/Projections/otbPlaceNameToLonLat.cxx
@@ -20,7 +20,6 @@
#include "tinyxml.h"
#include <curl/curl.h>
-
namespace otb
{
@@ -43,48 +42,47 @@ void
PlaceNameToLonLat
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
os << indent << " m_Lon " << m_Lon << std::endl;
os << indent << " m_Lat " << m_Lat << std::endl;
os << indent << " m_PlaceName " << m_PlaceName << std::endl;
}
-
bool PlaceNameToLonLat::Evaluate()
{
- std::string::size_type loc = m_PlaceName.find(" ", 0 );
+ std::string::size_type loc = m_PlaceName.find(" ", 0);
while (loc != std::string::npos)
- {
+ {
m_PlaceName.replace(loc, 1, "+");
loc = m_PlaceName.find(" ", loc);
- }
+ }
if ((m_Lat == -1000.0) && (m_Lon == -1000.0))
- {
+ {
std::ostringstream urlStream;
urlStream << "http://maps.google.com/maps?q=";
urlStream << m_PlaceName;
urlStream << "&sll=38.9594,-95.2655&sspn=119.526,360&output=kml&ie=utf-8&v=2.2&cv=4.2.0180.1134&hl=en";
RetrieveXML(urlStream);
ParseXMLGoogle();
- }
+ }
if ((m_Lat == -1000.0) && (m_Lon == -1000.0))
- {
+ {
std::ostringstream urlStream;
urlStream << "http://api.local.yahoo.com/MapsService/V1/geocode?appid=com.sun.blueprints.ui.geocoder&location=";
urlStream << m_PlaceName;
RetrieveXML(urlStream);
ParseXMLYahoo();
- }
+ }
if ((m_Lat == -1000.0) && (m_Lon == -1000.0))
- {
+ {
std::cout << "Search Error: fallback on the origin" << std::endl;
m_Lat = 43.560204;
m_Lon = 1.480736;
return false;
- }
+ }
return true;
}
@@ -110,21 +108,20 @@ curlHandlerWriteMemoryCallback(void *ptr, size_t size, size_t nmemb,
void PlaceNameToLonLat::RetrieveXML(std::ostringstream& urlStream)
{
- CURL *curl;
+ CURL * curl;
CURLcode res;
- FILE* output_file = fopen("out.xml","w");
+ FILE* output_file = fopen("out.xml", "w");
curl = curl_easy_init();
// std::cout << "URL data " << urlStream.str().data() << std::endl;
-
char url[256];
- strcpy(url,urlStream.str().data());
+ strcpy(url, urlStream.str().data());
// std::cout << url << std::endl;
if (curl)
- {
+ {
std::vector<char> chunk;
curl_easy_setopt(curl, CURLOPT_URL, url);
/*
@@ -132,56 +129,57 @@ void PlaceNameToLonLat::RetrieveXML(std::ostringstream& urlStream)
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,this->curlHandlerWriteMemoryCallback);
curl_easy_setopt(curl, CURLOPT_FILE, (void *)&chunk);
*/
-
+
// Set 5s timeout
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 5);
-
+
curl_easy_setopt(curl, CURLOPT_WRITEDATA, output_file);
res = curl_easy_perform(curl);
fclose(output_file);
/* always cleanup */
curl_easy_cleanup(curl);
- }
+ }
}
-
void PlaceNameToLonLat::ParseXMLYahoo()
{
- TiXmlDocument doc( "out.xml" );
+ TiXmlDocument doc("out.xml");
doc.LoadFile();
- TiXmlHandle docHandle( &doc );
-
- TiXmlElement* childLat = docHandle.FirstChild( "ResultSet" ).FirstChild( "Result" ).FirstChild( "Latitude" ).Element();
- if ( childLat )
- {
- m_Lat=atof(childLat->GetText());
- }
- TiXmlElement* childLon = docHandle.FirstChild( "ResultSet" ).FirstChild( "Result" ).FirstChild( "Longitude" ).Element();
- if ( childLon )
- {
- m_Lon=atof(childLon->GetText());
- }
+ TiXmlHandle docHandle(&doc);
+
+ TiXmlElement* childLat = docHandle.FirstChild("ResultSet").FirstChild("Result").FirstChild("Latitude").Element();
+ if (childLat)
+ {
+ m_Lat = atof(childLat->GetText());
+ }
+ TiXmlElement* childLon = docHandle.FirstChild("ResultSet").FirstChild("Result").FirstChild("Longitude").Element();
+ if (childLon)
+ {
+ m_Lon = atof(childLon->GetText());
+ }
}
void PlaceNameToLonLat::ParseXMLGoogle()
{
- TiXmlDocument doc( "out.xml" );
+ TiXmlDocument doc("out.xml");
doc.LoadFile();
- TiXmlHandle docHandle( &doc );
-
- TiXmlElement* childLat = docHandle.FirstChild( "kml" ).FirstChild( "Placemark" ).FirstChild( "LookAt" ).FirstChild( "latitude" ).Element();
- if ( childLat )
- {
- m_Lat=atof(childLat->GetText());
- }
- TiXmlElement* childLon = docHandle.FirstChild( "kml" ).FirstChild( "Placemark" ).FirstChild( "LookAt" ).FirstChild( "longitude" ).Element();
- if ( childLon )
- {
- m_Lon=atof(childLon->GetText());
- }
+ TiXmlHandle docHandle(&doc);
+
+ TiXmlElement* childLat = docHandle.FirstChild("kml").FirstChild("Placemark").FirstChild("LookAt").FirstChild(
+ "latitude").Element();
+ if (childLat)
+ {
+ m_Lat = atof(childLat->GetText());
+ }
+ TiXmlElement* childLon = docHandle.FirstChild("kml").FirstChild("Placemark").FirstChild("LookAt").FirstChild(
+ "longitude").Element();
+ if (childLon)
+ {
+ m_Lon = atof(childLon->GetText());
+ }
}
void PlaceNameToLonLat::ParseXMLGeonames()
diff --git a/Code/Projections/otbPlaceNameToLonLat.h b/Code/Projections/otbPlaceNameToLonLat.h
index 5d6b3b8c8b..f68a3671a4 100644
--- a/Code/Projections/otbPlaceNameToLonLat.h
+++ b/Code/Projections/otbPlaceNameToLonLat.h
@@ -31,15 +31,13 @@ namespace otb
*/
-
class ITK_EXPORT PlaceNameToLonLat : public itk::Object
{
public:
/** Standard class typedefs. */
- typedef PlaceNameToLonLat Self;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef PlaceNameToLonLat Self;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
typedef itk::Object Superclass;
@@ -47,33 +45,33 @@ public:
/** Method for creation through the object factory. */
itkNewMacro(Self);
- itkGetMacro( Lon, double );
- itkGetMacro( Lat, double );
- itkGetMacro( PlaceName, std::string );
+ itkGetMacro(Lon, double);
+ itkGetMacro(Lat, double);
+ itkGetMacro(PlaceName, std::string);
- itkSetMacro( PlaceName, std::string );
+ itkSetMacro(PlaceName, std::string);
- typedef enum {ALL, GEONAMES, GOOGLE, YAHOO} SearchMethodEnum;//Not implemented yet TODO
+ typedef enum {ALL, GEONAMES, GOOGLE, YAHOO} SearchMethodEnum; //Not implemented yet TODO
virtual bool Evaluate();
protected:
PlaceNameToLonLat();
- virtual ~PlaceNameToLonLat() {};
+ virtual ~PlaceNameToLonLat() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
void RetrieveXML(std::ostringstream& urlStream);
void ParseXMLYahoo();
void ParseXMLGoogle();
- void ParseXMLGeonames();//Not implemented yet TODO
+ void ParseXMLGeonames(); //Not implemented yet TODO
private:
- PlaceNameToLonLat( const Self& ); //purposely not implemented
- void operator=( const Self& ); //purposely not implemented
+ PlaceNameToLonLat(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
- double m_Lon;
- double m_Lat;
- std::string m_PlaceName;
- SearchMethodEnum m_SearchMethod;//Not implemented yet TODO
+ double m_Lon;
+ double m_Lat;
+ std::string m_PlaceName;
+ SearchMethodEnum m_SearchMethod; //Not implemented yet TODO
};
} // namespace otb
diff --git a/Code/Projections/otbSVY21MapProjection.h b/Code/Projections/otbSVY21MapProjection.h
index 2e1f292ec4..0f03737cda 100644
--- a/Code/Projections/otbSVY21MapProjection.h
+++ b/Code/Projections/otbSVY21MapProjection.h
@@ -18,7 +18,6 @@
#ifndef __otbSVY21MapProjection_h
#define __otbSVY21MapProjection_h
-
#include "projection/ossimMapProjection.h"
#include "projection/ossimTransMercatorProjection.h"
#include "otbMapProjection.h"
@@ -33,31 +32,30 @@ namespace otb
template <InverseOrForwardTransformationEnum transform>
class ITK_EXPORT SVY21MapProjection : public TransMercatorMapProjection<transform>
{
-public :
+public:
/** Standard class typedefs. */
- typedef SVY21MapProjection Self;
- typedef TransMercatorMapProjection<transform> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SVY21MapProjection Self;
+ typedef TransMercatorMapProjection<transform> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::ScalarType ScalarType;
- typedef itk::Point<ScalarType,2 > InputPointType;
- typedef itk::Point<ScalarType,2 > OutputPointType;
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef itk::Point<ScalarType, 2> InputPointType;
+ typedef itk::Point<ScalarType, 2> OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( SVY21MapProjection, TransMercatorMapProjection );
-
+ itkTypeMacro(SVY21MapProjection, TransMercatorMapProjection);
protected:
SVY21MapProjection();
virtual ~SVY21MapProjection();
-private :
- SVY21MapProjection(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ SVY21MapProjection(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // namespace otb
diff --git a/Code/Projections/otbSVY21MapProjection.txx b/Code/Projections/otbSVY21MapProjection.txx
index 67f0f5e10c..eca7df17eb 100644
--- a/Code/Projections/otbSVY21MapProjection.txx
+++ b/Code/Projections/otbSVY21MapProjection.txx
@@ -28,18 +28,16 @@ template <InverseOrForwardTransformationEnum transform>
SVY21MapProjection<transform>
::SVY21MapProjection()
{
- itk::Point<double,2> origin;
- origin[0]=103.83333333333333;
- origin[1]=1.3666666666666667;
+ itk::Point<double, 2> origin;
+ origin[0] = 103.83333333333333;
+ origin[1] = 1.3666666666666667;
std::string datum = "WE"; //WGS84 datum
-
- double falseEasting=28001.642;
- double falseNorthing=38744.572;
- double scaleFactor=1.00000;
+ double falseEasting = 28001.642;
+ double falseNorthing = 38744.572;
+ double scaleFactor = 1.00000;
std::string ellipsoid = "WE"; //GRS-80 ellipsoid
-
//TODO: 29-02-2008 Emmanuel: when ossim version > 1.7.2 only
// SetOrigin required (remove SetEllipsoid)
this->SetOrigin(origin, datum);
@@ -53,7 +51,6 @@ SVY21MapProjection<transform>
{
}
-
} // namespace otb
#endif
diff --git a/Code/Projections/otbSensorModelBase.h b/Code/Projections/otbSensorModelBase.h
index 6af2fa1cc9..5828d6b92c 100644
--- a/Code/Projections/otbSensorModelBase.h
+++ b/Code/Projections/otbSensorModelBase.h
@@ -41,34 +41,34 @@ namespace otb
*
*/
template <class TScalarType,
-unsigned int NInputDimensions=3,
-unsigned int NOutputDimensions=2>
+ unsigned int NInputDimensions = 3,
+ unsigned int NOutputDimensions = 2>
class ITK_EXPORT SensorModelBase : public itk::Transform<TScalarType,
- NInputDimensions,
- NOutputDimensions>
+ NInputDimensions,
+ NOutputDimensions>
{
-public :
+public:
/** Standard class typedefs. */
- typedef SensorModelBase Self;
- typedef itk::Transform< TScalarType,
- NInputDimensions,
- NOutputDimensions > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SensorModelBase Self;
+ typedef itk::Transform<TScalarType,
+ NInputDimensions,
+ NOutputDimensions> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef itk::Point<TScalarType, NInputDimensions > InputPointType;
- typedef itk::Point<TScalarType, NOutputDimensions > OutputPointType;
+ typedef itk::Point<TScalarType, NInputDimensions> InputPointType;
+ typedef itk::Point<TScalarType, NOutputDimensions> OutputPointType;
- typedef DEMHandler DEMHandlerType;
- typedef typename DEMHandlerType::Pointer DEMHandlerPointerType;
+ typedef DEMHandler DEMHandlerType;
+ typedef typename DEMHandlerType::Pointer DEMHandlerPointerType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( SensorModelBase, Transform );
+ itkTypeMacro(SensorModelBase, Transform);
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
@@ -81,10 +81,10 @@ public :
ossimProjection* GetOssimModel(void);
/* Set the Imagekeywordlist and affect the ossim projection ( m_Model) */
- virtual void SetImageGeometry(const ImageKeywordlist &image_kwl);
+ virtual void SetImageGeometry(const ImageKeywordlist& image_kwl);
/* Set the Imagekeywordlist and affect the ossim projection ( m_Model) */
- virtual void SetImageGeometry(const ossimKeywordlist &geom_kwl);
+ virtual void SetImageGeometry(const ossimKeywordlist& geom_kwl);
/** Set/Get the average elevation if the DEM is not used*/
itkSetMacro(AverageElevation, TScalarType);
@@ -93,7 +93,7 @@ public :
virtual void SetDEMDirectory(const std::string& directory)
{
m_DEMHandler->OpenDEMDirectory(directory.c_str());
- m_DEMIsLoaded=true;
+ m_DEMIsLoaded = true;
this->EnableDEM();
}
@@ -105,8 +105,7 @@ public :
virtual void EnableDEM()
{
- if (m_DEMIsLoaded)
- m_UseDEM = true;
+ if (m_DEMIsLoaded) m_UseDEM = true;
this->Modified();
}
@@ -115,7 +114,7 @@ protected:
virtual ~SensorModelBase();
/** Create the projection ( m_Model). Called by the SetImageGeometry methods */
- void CreateProjection(const ImageKeywordlist & image_kwl);
+ void CreateProjection(const ImageKeywordlist& image_kwl);
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -137,9 +136,9 @@ protected:
/** Specify if DEM is loaded */
bool m_DEMIsLoaded;
-private :
- SensorModelBase(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ SensorModelBase(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -149,5 +148,4 @@ private :
#include "otbSensorModelBase.txx"
#endif
-
#endif
diff --git a/Code/Projections/otbSensorModelBase.txx b/Code/Projections/otbSensorModelBase.txx
index 01fc87adaf..719747774d 100644
--- a/Code/Projections/otbSensorModelBase.txx
+++ b/Code/Projections/otbSensorModelBase.txx
@@ -33,11 +33,11 @@
namespace otb
{
-template < class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions >
-SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
-::SensorModelBase(): Superclass(OutputSpaceDimension, 0)
+template <class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
+SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
+::SensorModelBase() : Superclass(OutputSpaceDimension, 0)
{
m_Model = NULL;
m_DEMHandler = DEMHandlerType::New();
@@ -47,38 +47,36 @@ SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
}
-
-template < class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions >
-SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
+template <class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
+SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
::~SensorModelBase()
{
- if ( m_Model != NULL)
- {
+ if (m_Model != NULL)
+ {
delete m_Model;
m_Model = NULL;
- }
+ }
}
-
/// Get the Geometry Keyword list
-template < class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions >
+template <class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
ImageKeywordlist
-SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
-::GetImageGeometryKeywordlist(void)const
+SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
+::GetImageGeometryKeywordlist(void) const
{
return m_ImageKeywordlist;
}
/// Get the Geometry Keyword list
-template < class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions >
+template <class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
ossimKeywordlist
-SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
+SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
::GetOssimKeywordlist(void)
{
ossimKeywordlist geom;
@@ -88,11 +86,11 @@ SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
}
/// Get the ossim model
-template < class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions >
+template <class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
ossimProjection*
-SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
+SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
::GetOssimModel(void)
{
@@ -100,38 +98,37 @@ SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
}
/** Set the Imagekeywordlist and affect the ossim projection ( m_Model) */
-template < class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions >
+template <class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
void
-SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
-::SetImageGeometry(const ImageKeywordlist & image_kwl)
+SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
+::SetImageGeometry(const ImageKeywordlist& image_kwl)
{
m_ImageKeywordlist = image_kwl;
CreateProjection(m_ImageKeywordlist);
}
/** Set the Imagekeywordlist and affect the ossim projection ( m_Model) */
-template < class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions >
+template <class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
void
-SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
-::SetImageGeometry(const ossimKeywordlist & geom_kwl)
+SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
+::SetImageGeometry(const ossimKeywordlist& geom_kwl)
{
m_ImageKeywordlist.Clear();
m_ImageKeywordlist.SetKeywordlist(geom_kwl);
CreateProjection(m_ImageKeywordlist);
}
-
/** Instatiate the sensor model from metadata. */
-template < class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions >
+template <class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
void
-SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
-::CreateProjection(const ImageKeywordlist & image_kwl)
+SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
+::CreateProjection(const ImageKeywordlist& image_kwl)
{
ossimKeywordlist geom;
@@ -140,27 +137,27 @@ SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
otbMsgDevMacro(<< "* type: " << geom.find("type"));
m_Model = ossimSensorModelFactory::instance()->createProjection(geom);
- if ( m_Model == NULL)
- {
+ if (m_Model == NULL)
+ {
m_Model = ossimplugins::ossimPluginProjectionFactory::instance()->createProjection(geom);
- }
- if ( m_Model == NULL)
- {
+ }
+ if (m_Model == NULL)
+ {
itkExceptionMacro(<< "Invalid Model pointer m_Model == NULL!\n The ossim keywordlist is invalid!");
- }
+ }
}
/**
* PrintSelf method
*/
-template < class TScalarType,
-unsigned int NInputDimensions,
-unsigned int NOutputDimensions >
+template <class TScalarType,
+ unsigned int NInputDimensions,
+ unsigned int NOutputDimensions>
void
-SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
+SensorModelBase<TScalarType, NInputDimensions, NOutputDimensions>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "Model: " << m_Model << std::endl;
os << indent << "Keywordlist: " << m_ImageKeywordlist << std::endl;
}
@@ -168,4 +165,3 @@ SensorModelBase< TScalarType,NInputDimensions,NOutputDimensions>
} // namespace otb
#endif
-
diff --git a/Code/Projections/otbSinusoidalMapProjection.h b/Code/Projections/otbSinusoidalMapProjection.h
index 2e7aadfc08..266b1f2f88 100644
--- a/Code/Projections/otbSinusoidalMapProjection.h
+++ b/Code/Projections/otbSinusoidalMapProjection.h
@@ -30,40 +30,40 @@ namespace otb
* It converts coordinates in longitude,latitude (WGS84) to Sinusoidal map coordinates.
*/
template <InverseOrForwardTransformationEnum transform>
-class ITK_EXPORT SinusoidalMapProjection : public MapProjection<ossimSinusoidalProjection, transform>
+class ITK_EXPORT SinusoidalMapProjection : public MapProjection<ossimSinusoidalProjection, transform>
{
-public :
+public:
/** Standard class typedefs. */
- typedef SinusoidalMapProjection Self;
- typedef MapProjection<ossimSinusoidalProjection, transform> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SinusoidalMapProjection Self;
+ typedef MapProjection<ossimSinusoidalProjection, transform> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::ScalarType ScalarType;
- typedef itk::Point<ScalarType,2> InputPointType;
- typedef itk::Point<ScalarType,2> OutputPointType;
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef itk::Point<ScalarType, 2> InputPointType;
+ typedef itk::Point<ScalarType, 2> OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( SinusoidalMapProjection, MapProjection );
+ itkTypeMacro(SinusoidalMapProjection, MapProjection);
virtual void SetFalseEasting(double falseEasting);
virtual void SetFalseNorthing(double falseNorthing);
virtual double GetFalseNorthing() const;
virtual double GetFalseEasting() const;
- virtual void SetParameters(double falseEasting,double falseNorthing);
+ virtual void SetParameters(double falseEasting, double falseNorthing);
virtual void SetDefaults();
protected:
SinusoidalMapProjection();
virtual ~SinusoidalMapProjection();
-private :
- SinusoidalMapProjection(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ SinusoidalMapProjection(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Projections/otbSinusoidalMapProjection.txx b/Code/Projections/otbSinusoidalMapProjection.txx
index f998a3ae50..558f5eadae 100644
--- a/Code/Projections/otbSinusoidalMapProjection.txx
+++ b/Code/Projections/otbSinusoidalMapProjection.txx
@@ -30,7 +30,6 @@ SinusoidalMapProjection<transform>
{
}
-
template <InverseOrForwardTransformationEnum transform>
SinusoidalMapProjection<transform>
::~SinusoidalMapProjection()
@@ -66,7 +65,7 @@ template <InverseOrForwardTransformationEnum transform>
double SinusoidalMapProjection<transform>
::GetFalseNorthing() const
{
- double falseNorthing=this->m_MapProjection->getFalseNorthing();
+ double falseNorthing = this->m_MapProjection->getFalseNorthing();
return falseNorthing;
}
@@ -76,18 +75,17 @@ template <InverseOrForwardTransformationEnum transform>
double SinusoidalMapProjection<transform>
::GetFalseEasting() const
{
- double falseEasting=this->m_MapProjection->getFalseEasting();
+ double falseEasting = this->m_MapProjection->getFalseEasting();
return falseEasting;
}
template <InverseOrForwardTransformationEnum transform>
void SinusoidalMapProjection<transform>
-::SetParameters(double falseEasting,double falseNorthing)
+::SetParameters(double falseEasting, double falseNorthing)
{
- this->m_MapProjection->setFalseEastingNorthing(falseEasting,falseNorthing);
+ this->m_MapProjection->setFalseEastingNorthing(falseEasting, falseNorthing);
}
-
}
#endif
diff --git a/Code/Projections/otbTileMapTransform.h b/Code/Projections/otbTileMapTransform.h
index e558e9955a..d3cd3cd84e 100644
--- a/Code/Projections/otbTileMapTransform.h
+++ b/Code/Projections/otbTileMapTransform.h
@@ -43,46 +43,45 @@ namespace otb
* \brief to do
**/
-
template <InverseOrForwardTransformationEnum TTransformDirection,
-class TScalarType = double,
-unsigned int NInputDimensions=2,
-unsigned int NOutputDimensions=2>
-class ITK_EXPORT TileMapTransform: public itk::Transform<TScalarType, // Data type for scalars
- NInputDimensions, // Number of dimensions in the input space
- NOutputDimensions> // Number of dimensions in the output space
+ class TScalarType = double,
+ unsigned int NInputDimensions = 2,
+ unsigned int NOutputDimensions = 2>
+class ITK_EXPORT TileMapTransform : public itk::Transform<TScalarType, // Data type for scalars
+ NInputDimensions, // Number of dimensions in the input space
+ NOutputDimensions> // Number of dimensions in the output space
{
-public :
+public:
/** Standard class typedefs. */
- typedef TileMapTransform Self;
- typedef itk::Transform< TScalarType,
- NInputDimensions, NOutputDimensions > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef TileMapTransform Self;
+ typedef itk::Transform<TScalarType,
+ NInputDimensions, NOutputDimensions> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
typedef typename Superclass::ScalarType ScalarType;
typedef ossimTileMapModel OssimTileMapTransformType;
- typedef itk::Point<ScalarType,NInputDimensions > InputPointType;
- typedef itk::Point<ScalarType,NOutputDimensions > OutputPointType;
+ typedef itk::Point<ScalarType, NInputDimensions> InputPointType;
+ typedef itk::Point<ScalarType, NOutputDimensions> OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( TileMapTransform, Transform );
+ itkTypeMacro(TileMapTransform, Transform);
typedef InverseOrForwardTransformationEnum DirectionOfMappingEnumType;
- itkStaticConstMacro(DirectionOfMapping,DirectionOfMappingEnumType,TTransformDirection);
+ itkStaticConstMacro(DirectionOfMapping, DirectionOfMappingEnumType, TTransformDirection);
itkStaticConstMacro(InputSpaceDimension, unsigned int, NInputDimensions);
itkStaticConstMacro(OutputSpaceDimension, unsigned int, NOutputDimensions);
itkStaticConstMacro(SpaceDimension, unsigned int, NInputDimensions);
- itkStaticConstMacro(ParametersDimension, unsigned int,NInputDimensions*(NInputDimensions+1));
+ itkStaticConstMacro(ParametersDimension, unsigned int, NInputDimensions * (NInputDimensions + 1));
void SetLevel(unsigned int level);
unsigned int GetLevel() const;
- OutputPointType TransformPoint(const InputPointType &point) const;
+ OutputPointType TransformPoint(const InputPointType& point) const;
virtual InputPointType Origin();
virtual void PrintMap() const;
@@ -98,9 +97,9 @@ protected:
virtual ~TileMapTransform();
OssimTileMapTransformType* m_TileMapTransform;
-private :
- TileMapTransform(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ TileMapTransform(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // namespace otb
diff --git a/Code/Projections/otbTileMapTransform.txx b/Code/Projections/otbTileMapTransform.txx
index 3207ea86eb..554a5a09e3 100644
--- a/Code/Projections/otbTileMapTransform.txx
+++ b/Code/Projections/otbTileMapTransform.txx
@@ -25,35 +25,33 @@ namespace otb
{
template<InverseOrForwardTransformationEnum TTransformDirection, class TScalarType,
-unsigned int NInputDimensions, unsigned int NOutputDimensions>
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
-::TileMapTransform() : Superclass(SpaceDimension,ParametersDimension)
+::TileMapTransform() : Superclass(SpaceDimension, ParametersDimension)
{
m_TileMapTransform = new OssimTileMapTransformType();
}
-
template<InverseOrForwardTransformationEnum TTransformDirection, class TScalarType,
-unsigned int NInputDimensions, unsigned int NOutputDimensions>
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
::~TileMapTransform()
{
delete m_TileMapTransform;
}
-
template<InverseOrForwardTransformationEnum TTransformDirection, class TScalarType,
-unsigned int NInputDimensions, unsigned int NOutputDimensions>
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
typename TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDimensions>::OutputPointType
TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
-::TransformPoint(const InputPointType & point) const
+::TransformPoint(const InputPointType& point) const
{
OutputPointType outputPoint;
switch (DirectionOfMapping)
- {
+ {
case INVERSE:
- {
+ {
// otbMsgDevMacro(<< "Cartographic coordinates: (" << point[0] << "," << point[1] << ")");
//from "itk::point" to "ossim::ossimDpt"
@@ -65,13 +63,13 @@ TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDime
m_TileMapTransform->lineSampleToWorld(ossimDPoint, ossimGPoint);
// otbGenericMsgDebugMacro(<< "Inverse : " << std::endl << m_TileMapTransform->print(std::cout));
- outputPoint[0]=ossimGPoint.lon;
- outputPoint[1]=ossimGPoint.lat;
+ outputPoint[0] = ossimGPoint.lon;
+ outputPoint[1] = ossimGPoint.lat;
// otbMsgDevMacro(<< "Geographic coordinates (long/lat) : (" << outputPoint[0] << "," << outputPoint[1] << ")");
break;
- }
+ }
case FORWARD:
- {
+ {
// otbMsgDevMacro(<< "Geographic coordinates (long/lat) : (" << point[1] << "," << point[0] << ")");
//from "itk::point" to "ossim::ossimGpt"
ossimGpt ossimGPoint(point[1], point[0]);
@@ -82,42 +80,40 @@ TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDime
m_TileMapTransform->worldToLineSample(ossimGPoint, ossimDPoint);
// otbGenericMsgDebugMacro(<< "Forward : ========================= \n"
// << m_TileMapTransform->print(std::cout));
- outputPoint[0]=ossimDPoint.x;
- outputPoint[1]=ossimDPoint.y;
+ outputPoint[0] = ossimDPoint.x;
+ outputPoint[1] = ossimDPoint.y;
// otbMsgDevMacro(<< "Cartographic coordinates: (" << outputPoint[0] << "," << outputPoint[1] << ")");
break;
- }
+ }
default:
- {
- itkExceptionMacro(<<"Model is INVERSE or FORWARD only !!");
+ {
+ itkExceptionMacro(<< "Model is INVERSE or FORWARD only !!");
break;
- }
- }
+ }
+ }
return outputPoint;
}
-
///\return The geographic point corresponding to (0,0)
template<InverseOrForwardTransformationEnum TTransformDirection, class TScalarType,
-unsigned int NInputDimensions, unsigned int NOutputDimensions>
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
typename TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDimensions>::InputPointType
TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
::Origin()
{
- ossimGpt ossimOrigin=m_TileMapTransform->origin();
+ ossimGpt ossimOrigin = m_TileMapTransform->origin();
InputPointType otbOrigin;
- otbOrigin[0]= ossimOrigin.lat;
- otbOrigin[1]= ossimOrigin.lon;
+ otbOrigin[0] = ossimOrigin.lat;
+ otbOrigin[1] = ossimOrigin.lon;
return otbOrigin;
}
-
template<InverseOrForwardTransformationEnum TTransformDirection, class TScalarType,
-unsigned int NInputDimensions, unsigned int NOutputDimensions>
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void
TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
::PrintMap() const
@@ -126,7 +122,7 @@ TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDime
}
template<InverseOrForwardTransformationEnum TTransformDirection, class TScalarType,
-unsigned int NInputDimensions, unsigned int NOutputDimensions>
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
void TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
::SetLevel(unsigned int level)
{
@@ -134,7 +130,7 @@ void TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutpu
}
template<InverseOrForwardTransformationEnum TTransformDirection, class TScalarType,
-unsigned int NInputDimensions, unsigned int NOutputDimensions>
+ unsigned int NInputDimensions, unsigned int NOutputDimensions>
unsigned int TileMapTransform<TTransformDirection, TScalarType, NInputDimensions, NOutputDimensions>
::GetLevel() const
{
diff --git a/Code/Projections/otbTransMercatorMapProjection.h b/Code/Projections/otbTransMercatorMapProjection.h
index a8c4f51bb5..325308399b 100644
--- a/Code/Projections/otbTransMercatorMapProjection.h
+++ b/Code/Projections/otbTransMercatorMapProjection.h
@@ -30,29 +30,29 @@ namespace otb
*
*/
template <InverseOrForwardTransformationEnum transform>
-class ITK_EXPORT TransMercatorMapProjection : public MapProjection<ossimTransMercatorProjection,transform>
+class ITK_EXPORT TransMercatorMapProjection : public MapProjection<ossimTransMercatorProjection, transform>
{
-public :
+public:
/** Standard class typedefs. */
- typedef TransMercatorMapProjection Self;
- typedef MapProjection<ossimTransMercatorProjection, transform> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef TransMercatorMapProjection Self;
+ typedef MapProjection<ossimTransMercatorProjection, transform> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::ScalarType ScalarType;
- typedef itk::Point<ScalarType,2> InputPointType;
- typedef itk::Point<ScalarType,2> OutputPointType;
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef itk::Point<ScalarType, 2> InputPointType;
+ typedef itk::Point<ScalarType, 2> OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( TransMercatorMapProjection, MapProjection );
+ itkTypeMacro(TransMercatorMapProjection, MapProjection);
virtual void SetFalseEasting(double falseEasting);
virtual void SetFalseNorthing(double falseNorthing);
virtual void SetScaleFactor(double scaleFactor);
- virtual void SetParameters(double falseEasting,double falseNorthing, double scaleFactor);
+ virtual void SetParameters(double falseEasting, double falseNorthing, double scaleFactor);
virtual void SetDefaults();
virtual double GetFalseNorthing() const;
virtual double GetFalseEasting() const;
@@ -62,13 +62,12 @@ protected:
TransMercatorMapProjection();
virtual ~TransMercatorMapProjection();
-private :
- TransMercatorMapProjection(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+private:
+ TransMercatorMapProjection(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
} // namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Projections/otbTransMercatorMapProjection.txx b/Code/Projections/otbTransMercatorMapProjection.txx
index 3f63051156..bdecfc31c6 100644
--- a/Code/Projections/otbTransMercatorMapProjection.txx
+++ b/Code/Projections/otbTransMercatorMapProjection.txx
@@ -27,8 +27,8 @@ template <InverseOrForwardTransformationEnum transform>
TransMercatorMapProjection<transform>
::TransMercatorMapProjection()
{
- ossimEllipsoid ellipsoid= *(ossimEllipsoidFactory::instance()->create("WE"));
- ossimGpt origin(49.83,6.16); //TODO check where this is coming from
+ ossimEllipsoid ellipsoid = *(ossimEllipsoidFactory::instance()->create("WE"));
+ ossimGpt origin(49.83, 6.16); //TODO check where this is coming from
this->m_MapProjection->setEllipsoid(ellipsoid);
this->m_MapProjection->setOrigin(origin);
}
@@ -40,7 +40,6 @@ TransMercatorMapProjection<transform>
{
}
-
///Set the false Easting
template <InverseOrForwardTransformationEnum transform>
void TransMercatorMapProjection<transform>
@@ -68,7 +67,7 @@ void TransMercatorMapProjection<transform>
///Set the parameters
template <InverseOrForwardTransformationEnum transform>
void TransMercatorMapProjection<transform>
-::SetParameters(double falseEasting,double falseNorthing,double scaleFactor)
+::SetParameters(double falseEasting, double falseNorthing, double scaleFactor)
{
this->m_MapProjection->setParameters(falseEasting, falseNorthing, scaleFactor);
}
@@ -87,7 +86,7 @@ double TransMercatorMapProjection<transform>
::GetScaleFactor() const
{
double scaleFactor;
- scaleFactor=this->m_MapProjection->getScaleFactor();
+ scaleFactor = this->m_MapProjection->getScaleFactor();
return scaleFactor;
}
@@ -97,7 +96,7 @@ template <InverseOrForwardTransformationEnum transform>
double TransMercatorMapProjection<transform>
::GetFalseNorthing() const
{
- double falseNorthing=this->m_MapProjection->getFalseNorthing();
+ double falseNorthing = this->m_MapProjection->getFalseNorthing();
return falseNorthing;
}
@@ -107,7 +106,7 @@ template <InverseOrForwardTransformationEnum transform>
double TransMercatorMapProjection<transform>
::GetFalseEasting() const
{
- double falseEasting=this->m_MapProjection->getFalseEasting();
+ double falseEasting = this->m_MapProjection->getFalseEasting();
return falseEasting;
}
diff --git a/Code/Projections/otbUtmMapProjection.h b/Code/Projections/otbUtmMapProjection.h
index ad2c9abb2b..03b7b985e8 100644
--- a/Code/Projections/otbUtmMapProjection.h
+++ b/Code/Projections/otbUtmMapProjection.h
@@ -29,33 +29,33 @@ namespace otb
* It converts coordinates in longitude,latitude (WGS84) to UTM map coordinates.
*/
template <InverseOrForwardTransformationEnum transform>
-class ITK_EXPORT UtmMapProjection : public MapProjection<ossimUtmProjection,transform>
+class ITK_EXPORT UtmMapProjection : public MapProjection<ossimUtmProjection, transform>
{
-public :
+public:
/** Standard class typedefs. */
- typedef UtmMapProjection Self;
- typedef MapProjection<ossimUtmProjection,transform> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef UtmMapProjection Self;
+ typedef MapProjection<ossimUtmProjection, transform> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::ScalarType ScalarType;
- typedef itk::Point<ScalarType,2> InputPointType;
- typedef itk::Point<ScalarType,2> OutputPointType;
+ typedef typename Superclass::ScalarType ScalarType;
+ typedef itk::Point<ScalarType, 2> InputPointType;
+ typedef itk::Point<ScalarType, 2> OutputPointType;
/** Method for creation through the object factory. */
- itkNewMacro( Self );
+ itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro( UtmMapProjection, MapProjection );
+ itkTypeMacro(UtmMapProjection, MapProjection);
virtual void SetZone(long zone);
- virtual void SetZone(const InputPointType &ground);
+ virtual void SetZone(const InputPointType& ground);
virtual void SetHemisphere(char hemisphere);
virtual long GetZone();
virtual const char GetHemisphere() const;
- virtual void SetZoneAndHemisphereFromGeoPoint(const InputPointType &geoPoint);
+ virtual void SetZoneAndHemisphereFromGeoPoint(const InputPointType& geoPoint);
// virtual void SetZoneAndHemisphereFromCartoPoint(const OutputPointType &cartoPoint);
virtual int GetZoneFromGeoPoint(const InputPointType& geoPoint);
@@ -65,15 +65,13 @@ protected:
UtmMapProjection();
virtual ~UtmMapProjection();
-
private:
- UtmMapProjection(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ UtmMapProjection(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // namespace otb
-
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbUtmMapProjection.txx"
#endif
diff --git a/Code/Projections/otbUtmMapProjection.txx b/Code/Projections/otbUtmMapProjection.txx
index 3c035beb0f..6e9d3f90b4 100644
--- a/Code/Projections/otbUtmMapProjection.txx
+++ b/Code/Projections/otbUtmMapProjection.txx
@@ -22,7 +22,6 @@
#include "otbUtmMapProjection.h"
#include "otbMapProjections.h"
-
namespace otb
{
template <InverseOrForwardTransformationEnum transform>
@@ -49,11 +48,11 @@ void UtmMapProjection<transform>
///Set the zone
template <InverseOrForwardTransformationEnum transform>
void UtmMapProjection<transform>
-::SetZone(const InputPointType &ground)
+::SetZone(const InputPointType& ground)
{
ossimGpt ossimGround;
- ossimGround.lon=ground[0];
- ossimGround.lat=ground[1];
+ ossimGround.lon = ground[0];
+ ossimGround.lat = ground[1];
this->m_MapProjection->setZone(ossimGround);
this->Modified();
}
@@ -69,16 +68,14 @@ void UtmMapProjection<transform>
template <InverseOrForwardTransformationEnum transform>
void UtmMapProjection<transform>
-::SetZoneAndHemisphereFromGeoPoint(const InputPointType &geoPoint)
+::SetZoneAndHemisphereFromGeoPoint(const InputPointType& geoPoint)
{
double latitude = geoPoint[1];
- char hemisphere;
- int zone;
+ char hemisphere;
+ int zone;
- if (latitude > 0.)
- hemisphere = 'N';
- else
- hemisphere = 'S';
+ if (latitude > 0.) hemisphere = 'N';
+ else hemisphere = 'S';
this->SetHemisphere(hemisphere);
zone = this->GetZoneFromGeoPoint(geoPoint);
@@ -96,14 +93,13 @@ geoPoint = this->TransformPoint(cartoPoint);
this->SetZoneAndHemisphereFromGeoPoint(geoPoint);
} */
-
///\return the zone
template <InverseOrForwardTransformationEnum transform>
long UtmMapProjection<transform>
::GetZone()
{
long zone;
- zone=this->m_MapProjection->getZone();
+ zone = this->m_MapProjection->getZone();
return zone;
}
@@ -113,13 +109,12 @@ template <InverseOrForwardTransformationEnum transform>
const char UtmMapProjection<transform>
::GetHemisphere() const
{
- char hemisphere=0;
- hemisphere=this->m_MapProjection->getHemisphere();
+ char hemisphere = 0;
+ hemisphere = this->m_MapProjection->getHemisphere();
return hemisphere;
}
-
template <InverseOrForwardTransformationEnum transform>
int UtmMapProjection<transform>
::GetZoneFromGeoPoint(const InputPointType& geoPoint)
@@ -131,7 +126,7 @@ int UtmMapProjection<transform>
// Each UTM zone is a narrow zone of 6 degrees in width
// Zone 31 is between 0 and 6 degrees (lon)
// There is 60 zones in each hemisphere
- zone = ((static_cast<int>(floor(longitude/6))+30)%60+60)%60+1;
+ zone = ((static_cast<int>(floor(longitude / 6)) + 30) % 60 + 60) % 60 + 1;
return zone;
}
@@ -143,6 +138,5 @@ int UtmMapProjection<transform>
this->SetZoneAndHemisphereFromCartoPoint(middlePoint);
}*/
-
}
#endif
diff --git a/Code/Projections/otbVectorDataProjectionFilter.h b/Code/Projections/otbVectorDataProjectionFilter.h
index 80d6cce2ba..51fcd75764 100644
--- a/Code/Projections/otbVectorDataProjectionFilter.h
+++ b/Code/Projections/otbVectorDataProjectionFilter.h
@@ -63,57 +63,54 @@ namespace otb
template <class TInputVectorData, class TOutputVectorData>
class ITK_EXPORT VectorDataProjectionFilter :
- public otb::VectorDataToVectorDataFilter<TInputVectorData,TOutputVectorData>
+ public otb::VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData>
{
public:
/** Standard class typedefs. */
- typedef VectorDataProjectionFilter Self;
- typedef otb::VectorDataToVectorDataFilter<TInputVectorData,TOutputVectorData> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef VectorDataProjectionFilter Self;
+ typedef otb::VectorDataToVectorDataFilter<TInputVectorData, TOutputVectorData> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef TInputVectorData InputVectorDataType;
- typedef TOutputVectorData OutputVectorDataType;
+ typedef TInputVectorData InputVectorDataType;
+ typedef TOutputVectorData OutputVectorDataType;
typedef typename TInputVectorData::ConstPointer InputVectorDataPointer;
- typedef typename TOutputVectorData::Pointer OutputVectorDataPointer;
+ typedef typename TOutputVectorData::Pointer OutputVectorDataPointer;
/** Some typedefs. */
- typedef itk::Transform<double, 2, 2> GenericTransformType;
+ typedef itk::Transform<double, 2, 2> GenericTransformType;
typedef typename GenericTransformType::Pointer GenericTransformPointerType;
// typedef otb::CompositeTransform<GenericTransformType, GenericTransformType, double, 2, 2> InternalTransformType;
- typedef otb::GenericRSTransform<double, 2, 2> InternalTransformType;
+ typedef otb::GenericRSTransform<double, 2, 2> InternalTransformType;
typedef typename InternalTransformType::Pointer InternalTransformPointerType;
typedef itk::Vector<double, 2> SpacingType;
- typedef itk::Point<double, 2> OriginType;
+ typedef itk::Point<double, 2> OriginType;
- typedef itk::PreOrderTreeIterator<typename InputVectorDataType::DataTreeType> InputTreeIteratorType;
- typedef typename InputVectorDataType::DataNodePointerType InputDataNodePointerType;
- typedef typename OutputVectorDataType::DataNodeType OutputDataNodeType;
- typedef typename OutputVectorDataType::DataNodePointerType OutputDataNodePointerType;
- typedef typename OutputVectorDataType::DataTreePointerType OutputDataTreePointerType;
-
-
- typedef typename InputVectorDataType::DataTreeType::TreeNodeType InputInternalTreeNodeType;
- typedef typename OutputVectorDataType::DataTreeType::TreeNodeType OutputInternalTreeNodeType;
- typedef typename InputInternalTreeNodeType::ChildrenListType InputChildrenListType;
+ typedef itk::PreOrderTreeIterator<typename InputVectorDataType::DataTreeType> InputTreeIteratorType;
+ typedef typename InputVectorDataType::DataNodePointerType InputDataNodePointerType;
+ typedef typename OutputVectorDataType::DataNodeType OutputDataNodeType;
+ typedef typename OutputVectorDataType::DataNodePointerType OutputDataNodePointerType;
+ typedef typename OutputVectorDataType::DataTreePointerType OutputDataTreePointerType;
+ typedef typename InputVectorDataType::DataTreeType::TreeNodeType InputInternalTreeNodeType;
+ typedef typename OutputVectorDataType::DataTreeType::TreeNodeType OutputInternalTreeNodeType;
+ typedef typename InputInternalTreeNodeType::ChildrenListType InputChildrenListType;
typedef typename OutputDataNodeType::PointType PointType;
- typedef typename OutputDataNodeType::LineType LineType;
+ typedef typename OutputDataNodeType::LineType LineType;
typedef typename OutputDataNodeType::LineConstPointerType LineConstPointerType;
- typedef typename OutputDataNodeType::LinePointerType LinePointerType;
+ typedef typename OutputDataNodeType::LinePointerType LinePointerType;
- typedef typename OutputDataNodeType::PolygonType PolygonType;
+ typedef typename OutputDataNodeType::PolygonType PolygonType;
typedef typename OutputDataNodeType::PolygonConstPointerType PolygonConstPointerType;
- typedef typename OutputDataNodeType::PolygonPointerType PolygonPointerType;
+ typedef typename OutputDataNodeType::PolygonPointerType PolygonPointerType;
- typedef typename OutputDataNodeType::PolygonListType PolygonListType;
+ typedef typename OutputDataNodeType::PolygonListType PolygonListType;
typedef typename OutputDataNodeType::PolygonListConstPointerType PolygonListConstPointerType;
- typedef typename OutputDataNodeType::PolygonListPointerType PolygonListPointerType;
-
+ typedef typename OutputDataNodeType::PolygonListPointerType PolygonListPointerType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -134,15 +131,14 @@ public:
itkSetMacro(AverageElevation, double);
itkGetMacro(AverageElevation, double);
-
- itkGetMacro(InputKeywordList,ImageKeywordlist);
+ itkGetMacro(InputKeywordList, ImageKeywordlist);
void SetInputKeywordList(ImageKeywordlist kwl)
{
this->m_InputKeywordList = kwl;
this->Modified();
}
- itkGetMacro(OutputKeywordList,ImageKeywordlist);
+ itkGetMacro(OutputKeywordList, ImageKeywordlist);
void SetOutputKeywordList(ImageKeywordlist kwl)
{
this->m_OutputKeywordList = kwl;
@@ -152,42 +148,38 @@ public:
/** Set the origin of the vector data.
* \sa GetOrigin() */
itkSetMacro(InputOrigin, OriginType);
- virtual void SetInputOrigin( const double origin[2] );
- virtual void SetInputOrigin( const float origin[2] );
+ virtual void SetInputOrigin(const double origin[2]);
+ virtual void SetInputOrigin(const float origin[2]);
itkGetConstReferenceMacro(InputOrigin, OriginType);
-
/** Set the spacing (size of a pixel) of the vector data.
* \sa GetSpacing() */
- virtual void SetInputSpacing (const SpacingType & spacing);
- virtual void SetInputSpacing (const double spacing[2]);
- virtual void SetInputSpacing (const float spacing[2]);
+ virtual void SetInputSpacing(const SpacingType& spacing);
+ virtual void SetInputSpacing(const double spacing[2]);
+ virtual void SetInputSpacing(const float spacing[2]);
itkGetConstReferenceMacro(InputSpacing, SpacingType);
-
/** Set the origin of the vector data.
* \sa GetOrigin() */
itkSetMacro(OutputOrigin, OriginType);
- virtual void SetOutputOrigin( const double origin[2] );
- virtual void SetOutputOrigin( const float origin[2] );
+ virtual void SetOutputOrigin(const double origin[2]);
+ virtual void SetOutputOrigin(const float origin[2]);
itkGetConstReferenceMacro(OutputOrigin, OriginType);
-
/** Set the spacing (size of a pixel) of the vector data.
* \sa GetSpacing() */
- virtual void SetOutputSpacing (const SpacingType & spacing);
- virtual void SetOutputSpacing (const double spacing[2]);
- virtual void SetOutputSpacing (const float spacing[2]);
+ virtual void SetOutputSpacing(const SpacingType& spacing);
+ virtual void SetOutputSpacing(const double spacing[2]);
+ virtual void SetOutputSpacing(const float spacing[2]);
itkGetConstReferenceMacro(OutputSpacing, SpacingType);
-
protected:
VectorDataProjectionFilter();
- virtual ~VectorDataProjectionFilter() {};
+ virtual ~VectorDataProjectionFilter() {}
PointType ReprojectPoint(PointType point) const;
LinePointerType ReprojectLine(LinePointerType line) const;
@@ -202,24 +194,24 @@ protected:
void ProcessNode(InputInternalTreeNodeType * source, OutputInternalTreeNodeType * destination);
private:
- VectorDataProjectionFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorDataProjectionFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
InternalTransformPointerType m_Transform;
- GenericTransformPointerType m_InputTransform;
- GenericTransformPointerType m_OutputTransform;
- std::string m_InputProjectionRef;
- std::string m_OutputProjectionRef;
- ImageKeywordlist m_InputKeywordList;
- ImageKeywordlist m_OutputKeywordList;
+ GenericTransformPointerType m_InputTransform;
+ GenericTransformPointerType m_OutputTransform;
+ std::string m_InputProjectionRef;
+ std::string m_OutputProjectionRef;
+ ImageKeywordlist m_InputKeywordList;
+ ImageKeywordlist m_OutputKeywordList;
std::string m_DEMDirectory;
- double m_AverageElevation;
+ double m_AverageElevation;
- SpacingType m_InputSpacing;
- OriginType m_InputOrigin;
- SpacingType m_OutputSpacing;
- OriginType m_OutputOrigin;
+ SpacingType m_InputSpacing;
+ OriginType m_InputOrigin;
+ SpacingType m_OutputSpacing;
+ OriginType m_OutputOrigin;
};
diff --git a/Code/Projections/otbVectorDataProjectionFilter.txx b/Code/Projections/otbVectorDataProjectionFilter.txx
index c3bfcc79a7..34f59f2432 100644
--- a/Code/Projections/otbVectorDataProjectionFilter.txx
+++ b/Code/Projections/otbVectorDataProjectionFilter.txx
@@ -35,9 +35,9 @@ namespace otb
/**
* Constructor
*/
-template <class TInputVectorData, class TOutputVectorData >
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
-::VectorDataProjectionFilter(): m_DEMDirectory(""), m_AverageElevation(-32768.0)
+template <class TInputVectorData, class TOutputVectorData>
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
+::VectorDataProjectionFilter() : m_DEMDirectory(""), m_AverageElevation(-32768.0)
{
m_InputProjectionRef.clear();
m_OutputProjectionRef.clear();
@@ -49,185 +49,175 @@ VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
m_OutputOrigin.Fill(0);
}
-
//----------------------------------------------------------------------------
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
-::SetInputSpacing(const SpacingType & spacing )
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
+::SetInputSpacing(const SpacingType& spacing)
{
itkDebugMacro("setting Spacing to " << spacing);
- if ( this->m_InputSpacing != spacing )
- {
+ if (this->m_InputSpacing != spacing)
+ {
this->m_InputSpacing = spacing;
this->Modified();
- }
+ }
}
-
//----------------------------------------------------------------------------
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
-::SetInputSpacing(const double spacing[2] )
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
+::SetInputSpacing(const double spacing[2])
{
SpacingType s(spacing);
this->SetInputSpacing(s);
}
-
//----------------------------------------------------------------------------
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
-::SetInputSpacing(const float spacing[2] )
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
+::SetInputSpacing(const float spacing[2])
{
itk::Vector<float, 2> sf(spacing);
SpacingType s;
- s.CastFrom( sf );
+ s.CastFrom(sf);
this->SetInputSpacing(s);
}
//----------------------------------------------------------------------------
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
-::SetInputOrigin(const double origin[2] )
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
+::SetInputOrigin(const double origin[2])
{
OriginType p(origin);
- this->SetInputOrigin( p );
+ this->SetInputOrigin(p);
}
-
//----------------------------------------------------------------------------
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
-::SetInputOrigin(const float origin[2] )
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
+::SetInputOrigin(const float origin[2])
{
itk::Point<float, 2> of(origin);
OriginType p;
- p.CastFrom( of );
- this->SetInputOrigin( p );
+ p.CastFrom(of);
+ this->SetInputOrigin(p);
}
-
//----------------------------------------------------------------------------
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
-::SetOutputSpacing(const SpacingType & spacing )
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
+::SetOutputSpacing(const SpacingType& spacing)
{
itkDebugMacro("setting Spacing to " << spacing);
- if ( this->m_OutputSpacing != spacing )
- {
+ if (this->m_OutputSpacing != spacing)
+ {
this->m_OutputSpacing = spacing;
this->Modified();
- }
+ }
}
-
//----------------------------------------------------------------------------
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
-::SetOutputSpacing(const double spacing[2] )
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
+::SetOutputSpacing(const double spacing[2])
{
SpacingType s(spacing);
this->SetOutputSpacing(s);
}
-
//----------------------------------------------------------------------------
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
-::SetOutputSpacing(const float spacing[2] )
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
+::SetOutputSpacing(const float spacing[2])
{
itk::Vector<float, 2> sf(spacing);
SpacingType s;
- s.CastFrom( sf );
+ s.CastFrom(sf);
this->SetOutputSpacing(s);
}
//----------------------------------------------------------------------------
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
-::SetOutputOrigin(const double origin[2] )
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
+::SetOutputOrigin(const double origin[2])
{
OriginType p(origin);
- this->SetOutputOrigin( p );
+ this->SetOutputOrigin(p);
}
-
//----------------------------------------------------------------------------
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
-::SetOutputOrigin(const float origin[2] )
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
+::SetOutputOrigin(const float origin[2])
{
itk::Point<float, 2> of(origin);
OriginType p;
- p.CastFrom( of );
- this->SetOutputOrigin( p );
+ p.CastFrom(of);
+ this->SetOutputOrigin(p);
}
-
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
::GenerateOutputInformation(void)
{
Superclass::GenerateOutputInformation();
- OutputVectorDataPointer output = this->GetOutput();
- itk::MetaDataDictionary & dict = output->GetMetaDataDictionary();
+ OutputVectorDataPointer output = this->GetOutput();
+ itk::MetaDataDictionary& dict = output->GetMetaDataDictionary();
- itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, m_OutputProjectionRef );
+ itk::EncapsulateMetaData<std::string>(dict, MetaDataKey::ProjectionRefKey, m_OutputProjectionRef);
}
/**
* Convert point
*/
-template <class TInputVectorData, class TOutputVectorData >
-typename VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>::PointType
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
+template <class TInputVectorData, class TOutputVectorData>
+typename VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>::PointType
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
::ReprojectPoint(PointType pointCoord) const
{
- itk::Point<double,2> point;
+ itk::Point<double, 2> point;
point = m_Transform->TransformPoint(pointCoord);
return point;
}
-
/**
* Convert line
*/
-template <class TInputVectorData, class TOutputVectorData >
-typename VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>::LinePointerType
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
+template <class TInputVectorData, class TOutputVectorData>
+typename VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>::LinePointerType
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
::ReprojectLine(LinePointerType line) const
{
typedef typename LineType::VertexListType::ConstPointer VertexListConstPointerType;
- typedef typename LineType::VertexListConstIteratorType VertexListConstIteratorType;
+ typedef typename LineType::VertexListConstIteratorType VertexListConstIteratorType;
VertexListConstPointerType vertexList = line->GetVertexList();
VertexListConstIteratorType it = vertexList->Begin();
- typename LineType::Pointer newLine = LineType::New();
- while ( it != vertexList->End())
- {
- itk::Point<double,2> point;
- itk::ContinuousIndex<double,2> index;
- typename LineType::VertexType pointCoord = it.Value();
+ typename LineType::Pointer newLine = LineType::New();
+ while (it != vertexList->End())
+ {
+ itk::Point<double, 2> point;
+ itk::ContinuousIndex<double, 2> index;
+ typename LineType::VertexType pointCoord = it.Value();
point = m_Transform->TransformPoint(pointCoord);
- index[0]=point[0];
- index[1]=point[1];
+ index[0] = point[0];
+ index[1] = point[1];
// otbMsgDevMacro(<< "Converting: " << it.Value() << " -> " << pointCoord << " -> " << point << " -> " << index);
newLine->AddVertex(index);
it++;
- }
+ }
return newLine;
}
@@ -235,54 +225,54 @@ VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
/**
* Convert polygon
*/
-template <class TInputVectorData, class TOutputVectorData >
-typename VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>::PolygonPointerType
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
+template <class TInputVectorData, class TOutputVectorData>
+typename VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>::PolygonPointerType
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
::ReprojectPolygon(PolygonPointerType polygon) const
{
typedef typename PolygonType::VertexListType::ConstPointer VertexListConstPointerType;
- typedef typename PolygonType::VertexListConstIteratorType VertexListConstIteratorType;
- VertexListConstPointerType vertexList = polygon->GetVertexList();
- VertexListConstIteratorType it = vertexList->Begin();
+ typedef typename PolygonType::VertexListConstIteratorType VertexListConstIteratorType;
+ VertexListConstPointerType vertexList = polygon->GetVertexList();
+ VertexListConstIteratorType it = vertexList->Begin();
typename PolygonType::Pointer newPolygon = PolygonType::New();
- while ( it != vertexList->End())
- {
- itk::Point<double,2> point;
- itk::ContinuousIndex<double,2> index;
+ while (it != vertexList->End())
+ {
+ itk::Point<double, 2> point;
+ itk::ContinuousIndex<double, 2> index;
typename PolygonType::VertexType pointCoord = it.Value();
point = m_Transform->TransformPoint(pointCoord);
- index[0]=point[0];
- index[1]=point[1];
+ index[0] = point[0];
+ index[1] = point[1];
newPolygon->AddVertex(index);
it++;
- }
+ }
return newPolygon;
}
/**
* Convert polygon list
*/
-template <class TInputVectorData, class TOutputVectorData >
-typename VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>::PolygonListPointerType
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
+template <class TInputVectorData, class TOutputVectorData>
+typename VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>::PolygonListPointerType
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
::ReprojectPolygonList(PolygonListPointerType polygonList) const
{
PolygonListPointerType newPolygonList = PolygonListType::New();
for (typename PolygonListType::ConstIterator it = polygonList->Begin();
it != polygonList->End(); ++it)
- {
+ {
newPolygonList->PushBack(this->ReprojectPolygon(it.Get()));
- }
+ }
return newPolygonList;
}
/**
* Instanciate the transformation according to informations
*/
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
::InstanciateTransform(void)
{
@@ -298,16 +288,13 @@ VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
// otbMsgDevMacro(<< " * Output Origin: " << m_OutputOrigin);
// otbMsgDevMacro(<< " * Output Spacing: " << m_OutputSpacing);
-
m_Transform = InternalTransformType::New();
+ InputVectorDataPointer input = this->GetInput();
+ const itk::MetaDataDictionary& inputDict = input->GetMetaDataDictionary();
- InputVectorDataPointer input = this->GetInput();
- const itk::MetaDataDictionary & inputDict = input->GetMetaDataDictionary();
-
- OutputVectorDataPointer output = this->GetOutput();
- itk::MetaDataDictionary & outputDict = output->GetMetaDataDictionary();
-
+ OutputVectorDataPointer output = this->GetOutput();
+ itk::MetaDataDictionary& outputDict = output->GetMetaDataDictionary();
// m_Transform->SetInputDictionary(input->GetMetaDataDictionary());
m_Transform->SetInputDictionary(inputDict);
@@ -330,36 +317,33 @@ VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
// only the m_Transform will know
m_OutputProjectionRef = m_Transform->GetOutputProjectionRef();
-
//If the projection information for the output is provided, propagate it
-
if (m_OutputKeywordList.GetSize() != 0)
- {
+ {
ossimKeywordlist kwl;
m_OutputKeywordList.convertToOSSIMKeywordlist (kwl);
- itk::EncapsulateMetaData<ossimKeywordlist>(outputDict, MetaDataKey::OSSIMKeywordlistKey, kwl );
- }
- if ( !m_OutputProjectionRef.empty())
- {
- itk::EncapsulateMetaData<std::string>(outputDict, MetaDataKey::ProjectionRefKey, m_OutputProjectionRef );
- }
+ itk::EncapsulateMetaData<ossimKeywordlist>(outputDict, MetaDataKey::OSSIMKeywordlistKey, kwl);
+ }
+ if (!m_OutputProjectionRef.empty())
+ {
+ itk::EncapsulateMetaData<std::string>(outputDict, MetaDataKey::ProjectionRefKey, m_OutputProjectionRef);
+ }
output->SetSpacing(m_OutputSpacing);
output->SetOrigin(m_OutputOrigin);
}
-
/**
* GenerateData Performs the coordinate convertion for each element in the tree
*/
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
::GenerateData(void)
{
this->AllocateOutputs();
- InputVectorDataPointer inputPtr = this->GetInput();
+ InputVectorDataPointer inputPtr = this->GetInput();
OutputVectorDataPointer outputPtr = this->GetOutput();
//Instanciate the transform
@@ -367,7 +351,6 @@ VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
OutputDataTreePointerType tree = outputPtr->GetDataTree();
-
// Get the input tree root
InputInternalTreeNodeType * inputRoot = const_cast<InputInternalTreeNodeType *>(inputPtr->GetDataTree()->GetRoot());
@@ -382,123 +365,121 @@ VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
// Start recursive processing
itk::TimeProbe chrono;
chrono.Start();
- ProcessNode(inputRoot,outputRoot);
+ ProcessNode(inputRoot, outputRoot);
chrono.Stop();
- otbMsgDevMacro(<<"VectoDataProjectionFilter: features Processed in "<<chrono.GetMeanTime()<<" seconds.");
+ otbMsgDevMacro(<< "VectoDataProjectionFilter: features Processed in " << chrono.GetMeanTime() << " seconds.");
}
-
-template <class TInputVectorData, class TOutputVectorData >
+template <class TInputVectorData, class TOutputVectorData>
void
-VectorDataProjectionFilter<TInputVectorData,TOutputVectorData>
+VectorDataProjectionFilter<TInputVectorData, TOutputVectorData>
::ProcessNode(InputInternalTreeNodeType * source, OutputInternalTreeNodeType * destination)
{
// Get the children list from the input node
InputChildrenListType children = source->GetChildrenList();
// For each child
-typename InputChildrenListType::iterator it = children.begin();
-while(it!=children.end())
+ typename InputChildrenListType::iterator it = children.begin();
+ while (it != children.end())
//for(typename InputChildrenListType::iterator it = children.begin(); it!=children.end();++it)
- {
+ {
typename OutputInternalTreeNodeType::Pointer newContainer;
// Copy input DataNode info
- InputDataNodePointerType dataNode = (*it)->Get();
+ InputDataNodePointerType dataNode = (*it)->Get();
OutputDataNodePointerType newDataNode = OutputDataNodeType::New();
newDataNode->SetNodeType(dataNode->GetNodeType());
newDataNode->SetNodeId(dataNode->GetNodeId());
newDataNode->SetMetaDataDictionary(dataNode->GetMetaDataDictionary());
- switch(dataNode->GetNodeType())
- {
- case ROOT:
+ switch (dataNode->GetNodeType())
+ {
+ case ROOT:
{
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it),newContainer);
- break;
+ newContainer = OutputInternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ ProcessNode((*it), newContainer);
+ break;
}
- case DOCUMENT:
+ case DOCUMENT:
{
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it),newContainer);
- break;
+ newContainer = OutputInternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ ProcessNode((*it), newContainer);
+ break;
}
- case FOLDER:
+ case FOLDER:
{
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it),newContainer);
- break;
+ newContainer = OutputInternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ ProcessNode((*it), newContainer);
+ break;
}
- case FEATURE_POINT:
+ case FEATURE_POINT:
{
- newDataNode->SetPoint(this->ReprojectPoint(dataNode->GetPoint()));
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- break;
+ newDataNode->SetPoint(this->ReprojectPoint(dataNode->GetPoint()));
+ newContainer = OutputInternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ break;
}
- case FEATURE_LINE:
+ case FEATURE_LINE:
{
- newDataNode->SetLine(this->ReprojectLine(dataNode->GetLine()));
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- break;
+ newDataNode->SetLine(this->ReprojectLine(dataNode->GetLine()));
+ newContainer = OutputInternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ break;
}
- case FEATURE_POLYGON:
+ case FEATURE_POLYGON:
{
- newDataNode->SetPolygonExteriorRing(this->ReprojectPolygon(dataNode->GetPolygonExteriorRing()));
- newDataNode->SetPolygonInteriorRings(this->ReprojectPolygonList(dataNode->GetPolygonInteriorRings()));
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- break;
+ newDataNode->SetPolygonExteriorRing(this->ReprojectPolygon(dataNode->GetPolygonExteriorRing()));
+ newDataNode->SetPolygonInteriorRings(this->ReprojectPolygonList(dataNode->GetPolygonInteriorRings()));
+ newContainer = OutputInternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ break;
}
- case FEATURE_MULTIPOINT:
+ case FEATURE_MULTIPOINT:
{
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it),newContainer);
- break;
+ newContainer = OutputInternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ ProcessNode((*it), newContainer);
+ break;
}
- case FEATURE_MULTILINE:
+ case FEATURE_MULTILINE:
{
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it),newContainer);
- break;
+ newContainer = OutputInternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ ProcessNode((*it), newContainer);
+ break;
}
- case FEATURE_MULTIPOLYGON:
+ case FEATURE_MULTIPOLYGON:
{
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it),newContainer);
- break;
+ newContainer = OutputInternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ ProcessNode((*it), newContainer);
+ break;
}
- case FEATURE_COLLECTION:
+ case FEATURE_COLLECTION:
{
- newContainer = OutputInternalTreeNodeType::New();
- newContainer->Set(newDataNode);
- destination->AddChild(newContainer);
- ProcessNode((*it),newContainer);
- break;
+ newContainer = OutputInternalTreeNodeType::New();
+ newContainer->Set(newDataNode);
+ destination->AddChild(newContainer);
+ ProcessNode((*it), newContainer);
+ break;
}
+ }
+ ++it;
}
-++it;
- }
}
-
} // end namespace otb
#endif
diff --git a/Code/Radiometry/otbAeronetData.cxx b/Code/Radiometry/otbAeronetData.cxx
index e04e40e6cb..3918ddfb8c 100644
--- a/Code/Radiometry/otbAeronetData.cxx
+++ b/Code/Radiometry/otbAeronetData.cxx
@@ -24,7 +24,7 @@ namespace otb
*/
AeronetData
-::AeronetData():
+::AeronetData() :
m_AngstromCoefficient(0),
m_Water(0),
m_AerosolOpticalThickness(0),
@@ -34,7 +34,7 @@ AeronetData
m_DataDate(""),
m_EpsilonDate(0.0),
m_NumberOfDateUsed(0)
-{};
+{}
/**
* PrintSelf method
@@ -42,9 +42,9 @@ AeronetData
void
AeronetData
-::PrintSelf( std::ostream& os,itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << "Angstrom coefficient : " << m_AngstromCoefficient << std::endl;
os << "Water data : " << m_Water << std::endl;
os << "Aerosol optical thickness data: " << m_AerosolOpticalThickness << std::endl;
@@ -56,4 +56,4 @@ AeronetData
os << "Number of date used: " << m_NumberOfDateUsed << std::endl;
}
-}// end namespace otb
+} // end namespace otb
diff --git a/Code/Radiometry/otbAeronetData.h b/Code/Radiometry/otbAeronetData.h
index 03efdd801d..1a02e28a38 100644
--- a/Code/Radiometry/otbAeronetData.h
+++ b/Code/Radiometry/otbAeronetData.h
@@ -35,53 +35,53 @@ class ITK_EXPORT AeronetData : public itk::DataObject
{
public:
/** Standard class typedefs. */
- typedef AeronetData Self;
- typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef AeronetData Self;
+ typedef itk::DataObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(AeronetData,itk::DataObject);
+ itkTypeMacro(AeronetData, itk::DataObject);
/** Set/Get Solar Zenith Angle data */
- itkSetMacro(SolarZenithAngle,double);
- itkGetMacro(SolarZenithAngle,double);
+ itkSetMacro(SolarZenithAngle, double);
+ itkGetMacro(SolarZenithAngle, double);
/** Set/Get Angst data */
- itkSetMacro(AngstromCoefficient,double);
- itkGetMacro(AngstromCoefficient,double);
+ itkSetMacro(AngstromCoefficient, double);
+ itkGetMacro(AngstromCoefficient, double);
/** Set/Get Water data */
- itkSetMacro(Water,double);
- itkGetMacro(Water,double);
+ itkSetMacro(Water, double);
+ itkGetMacro(Water, double);
/** Set/Get AerosolOpticalThickness data */
- itkSetMacro(AerosolOpticalThickness,double);
- itkGetMacro(AerosolOpticalThickness,double);
+ itkSetMacro(AerosolOpticalThickness, double);
+ itkGetMacro(AerosolOpticalThickness, double);
/** Statistic : Standard deviation data */
- itkSetMacro(StdDev,double);
- itkGetMacro(StdDev,double);
+ itkSetMacro(StdDev, double);
+ itkGetMacro(StdDev, double);
/** Set/Get Cloud estimation data */
- itkSetMacro(CloudEstimation,bool);
- itkGetMacro(CloudEstimation,bool);
+ itkSetMacro(CloudEstimation, bool);
+ itkGetMacro(CloudEstimation, bool);
/** Set/Get Data Date */
- itkSetMacro(DataDate,std::string);
- itkGetMacro(DataDate,std::string);
+ itkSetMacro(DataDate, std::string);
+ itkGetMacro(DataDate, std::string);
/** Set/Get Number of date used */
- itkSetMacro(NumberOfDateUsed,unsigned int);
- itkGetMacro(NumberOfDateUsed,unsigned int);
+ itkSetMacro(NumberOfDateUsed, unsigned int);
+ itkGetMacro(NumberOfDateUsed, unsigned int);
/** Statistic : Epsilon date */
- itkSetMacro(EpsilonDate,double);
- itkGetMacro(EpsilonDate,double);
+ itkSetMacro(EpsilonDate, double);
+ itkGetMacro(EpsilonDate, double);
protected:
/** Constructor */
AeronetData();
/** Destructor */
- ~AeronetData() {};
+ ~AeronetData() {}
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
diff --git a/Code/Radiometry/otbAeronetFileReader.cxx b/Code/Radiometry/otbAeronetFileReader.cxx
index 833c1f637c..ebf58a5f3d 100644
--- a/Code/Radiometry/otbAeronetFileReader.cxx
+++ b/Code/Radiometry/otbAeronetFileReader.cxx
@@ -29,7 +29,7 @@ namespace otb
* Constructor
*/
AeronetFileReader
-::AeronetFileReader():
+::AeronetFileReader() :
m_FileName(""),
m_Day(1),
m_Month(1),
@@ -58,43 +58,42 @@ AeronetData *
AeronetFileReader
::GetOutput(void)
{
- if (this->GetNumberOfOutputs()<1)
- {
+ if (this->GetNumberOfOutputs() < 1)
+ {
return 0;
- }
+ }
return static_cast<AeronetData *> (this->ProcessObject::GetOutput(0));
}
-
/**
* Parse line method
*/
AeronetFileReader::VectorString
AeronetFileReader
-::ParseLine(const std::string & line)const
+::ParseLine(const std::string& line) const
{
VectorString strVector;
- std::string word("");
+ std::string word("");
strVector.clear();
- for (unsigned int i=0; i<line.size(); ++i)
- {
- if (line[i] == ',' )
+ for (unsigned int i = 0; i < line.size(); ++i)
{
+ if (line[i] == ',')
+ {
strVector.push_back(word);
word = "";
- }
- else if (i == (line.size()-1) )
- {
+ }
+ else if (i == (line.size() - 1))
+ {
word.push_back(line[i]);
strVector.push_back(word);
word = "";
- }
+ }
else
- {
+ {
word.push_back(line[i]);
+ }
}
- }
return strVector;
}
@@ -103,10 +102,10 @@ AeronetFileReader
*/
ossimLocalTm
AeronetFileReader
-::ParseDate(const std::string & date, const std::string & time)const
+::ParseDate(const std::string& date, const std::string& time) const
{
ossimLocalTm currentDate;
- ossimString word("");
+ ossimString word("");
word = date[0];
word += date[1];
currentDate.setDay(word.toInt());
@@ -137,7 +136,13 @@ AeronetFileReader
*/
void
AeronetFileReader
-::ParseValidLine(const double & ref_date, const VectorString & line, const double & epsilon, VectorDouble & water, VectorDouble & angst, VectorDouble & tau_day, VectorDouble & solarZenithAngle)const
+::ParseValidLine(const double& ref_date,
+ const VectorString& line,
+ const double& epsilon,
+ VectorDouble& water,
+ VectorDouble& angst,
+ VectorDouble& tau_day,
+ VectorDouble& solarZenithAngle) const
{
unsigned int col_date = 0;
unsigned int col_time = 1;
@@ -148,55 +153,54 @@ AeronetFileReader
unsigned int col_solarZenithAngle = 44;
ossimLocalTm current_date = ParseDate(line[col_date], line[col_time]);
- double dcurrent_date = current_date.getJulian();
+ double dcurrent_date = current_date.getJulian();
// Check hour +/- epsilon
- if(vcl_abs(dcurrent_date-ref_date) < epsilon)
- {
+ if (vcl_abs(dcurrent_date - ref_date) < epsilon)
+ {
double dwater = atof(line[col_vapor].c_str());
double dangst = atof(line[col_angst].c_str());
double dsolarZenithAngle = atof(line[col_solarZenithAngle].c_str());
double dtau_670 = atof(line[col_670].c_str());
double dtau_440 = atof(line[col_440].c_str());
- double dtau_550 = ((670.-550.)*dtau_440+(550-440)*dtau_670)/(670.-440.);
+ double dtau_550 = ((670. - 550.) * dtau_440 + (550 - 440) * dtau_670) / (670. - 440.);
tau_day.push_back(dtau_550);
angst.push_back(dangst);
water.push_back(dwater);
solarZenithAngle.push_back(dsolarZenithAngle);
- }
+ }
}
-
/**
* Compute statistics method
*/
void
AeronetFileReader
-::GetStatistics(const VectorDouble & vec, double & mean, double & stddev)const
+::GetStatistics(const VectorDouble& vec, double& mean, double& stddev) const
{
double sum(0.);
double sumOfSquares(0.);
mean = 0.;
stddev = 0.;
- if ( vec.size() <= 0 ) return;
- for(unsigned int i=0; i <vec.size(); i++)
- {
- sum += vec[i];
- sumOfSquares += vec[i] * vec[i];
- }
+ if (vec.size() <= 0) return;
+ for (unsigned int i = 0; i < vec.size(); i++)
+ {
+ sum += vec[i];
+ sumOfSquares += vec[i] * vec[i];
+ }
// get the mean value
- const double num = static_cast<double>( vec.size() );
- if( num == 1 )
- {
+ const double num = static_cast<double>(vec.size());
+ if (num == 1)
+ {
mean = sum;
stddev = 0.;
- }
- else if( num > 1 )
- {
+ }
+ else if (num > 1)
+ {
mean = sum / num;
- stddev = (sumOfSquares - ( sum*sum / num ) ) / ( num - 1. );
- }
+ stddev = (sumOfSquares - (sum * sum / num)) / (num - 1.);
+ }
}
/**
@@ -209,29 +213,29 @@ AeronetFileReader
{
std::ifstream fin;
- std::string line;
+ std::string line;
// open file input stream
fin.open(m_FileName.c_str());
// Test if the file has been opened correctly
if (!fin)
- {
+ {
AeronetFileReaderException e(__FILE__, __LINE__);
- itk::OStringStream msg;
+ itk::OStringStream msg;
msg << " Could not open IO object for file ";
- msg<<m_FileName<<"."<<std::endl;
+ msg << m_FileName << "." << std::endl;
e.SetDescription(msg.str().c_str());
throw e;
return;
- }
+ }
// Read informations lines (5 lines)
- std::getline(fin,line);
- std::getline(fin,line);
- std::getline(fin,line);
- std::getline(fin,line);
- std::getline(fin,line);
+ std::getline(fin, line);
+ std::getline(fin, line);
+ std::getline(fin, line);
+ std::getline(fin, line);
+ std::getline(fin, line);
unsigned int col_date = 0;
unsigned int col_time = 1;
@@ -243,23 +247,23 @@ AeronetFileReader
VectorString list_str;
list_str = ParseLine(line);
- if( (list_str[col_date] != "Date(dd-mm-yy)") ||
- (list_str[col_time] != "Time(hh:mm:ss)") ||
- (list_str[col_670] != "AOT_675") ||
- (list_str[col_440] != "AOT_440") ||
- (list_str[col_angst] != "440-870Angstrom") ||
- (list_str[col_vapor] != "Water(cm)") ||
- (list_str[col_solarZenithAngle] != "Solar_Zenith_Angle")
- )
- {
+ if ((list_str[col_date] != "Date(dd-mm-yy)") ||
+ (list_str[col_time] != "Time(hh:mm:ss)") ||
+ (list_str[col_670] != "AOT_675") ||
+ (list_str[col_440] != "AOT_440") ||
+ (list_str[col_angst] != "440-870Angstrom") ||
+ (list_str[col_vapor] != "Water(cm)") ||
+ (list_str[col_solarZenithAngle] != "Solar_Zenith_Angle")
+ )
+ {
AeronetFileReaderException e(__FILE__, __LINE__);
- itk::OStringStream msg;
+ itk::OStringStream msg;
msg << " The file ";
- msg<<m_FileName<<" is not conform."<<std::endl;
+ msg << m_FileName << " is not conform." << std::endl;
e.SetDescription(msg.str().c_str());
throw e;
return;
- }
+ }
//Compute input date
ossimLocalTm inputDate;
@@ -274,32 +278,33 @@ AeronetFileReader
MatrixString tabStr;
// if so, parse it and select only valid lines for the input date
while (!fin.eof())
- {
- std::getline(fin,line);
- std::string word("");
+ {
+ std::getline(fin, line);
+ std::string word("");
VectorString listStr;
listStr = ParseLine(line);
// Select only valid lines: good day
- if(listStr.size() > 0)
- {
- ossimLocalTm currentDate = ParseDate(listStr[col_date],listStr[col_time]);
- if( (listStr[col_670] != "N/A") &&
- (listStr[col_440] != "N/A") &&
- (static_cast<int>(currentDate.getJulian()) == static_cast<int>(dinputDate) )
- )
+ if (listStr.size() > 0)
{
+ ossimLocalTm currentDate = ParseDate(listStr[col_date], listStr[col_time]);
+ if ((listStr[col_670] != "N/A") &&
+ (listStr[col_440] != "N/A") &&
+ (static_cast<int>(currentDate.getJulian()) == static_cast<int>(dinputDate))
+ )
+ {
tabStr.push_back(listStr);
+ }
}
}
- }
fin.close();
- if ( tabStr.size() <= 0 )
- {
- itkExceptionMacro(<<"The aeronet file ("<<m_FileName<<") doesn't contain valid data for the day (dd/mm/yyyy) "<<m_Day<<"/"<<m_Month<<"/"<<m_Year<<".");
- }
-
+ if (tabStr.size() <= 0)
+ {
+ itkExceptionMacro(
+ << "The aeronet file (" << m_FileName << ") doesn't contain valid data for the day (dd/mm/yyyy) " << m_Day <<
+ "/" << m_Month << "/" << m_Year << ".");
+ }
//Compute time for one hour
ossimLocalTm temp;
@@ -316,31 +321,33 @@ AeronetFileReader
// Update epsilon for one hour
double epsilon = m_Epsilon * (dhour2 - dhour1);
-
VectorDouble water;
VectorDouble tau_day;
VectorDouble angst;
VectorDouble solarZenithAngle;
- for(unsigned int idCurrentLine=0; idCurrentLine < tabStr.size(); idCurrentLine++)
- {
- VectorString current_line2 = tabStr[idCurrentLine];
- ossimLocalTm currentDate = ParseDate(current_line2[col_date],current_line2[col_time]);
- ParseValidLine(dinputDate, current_line2, epsilon, water, angst, tau_day, solarZenithAngle);
- }
-
- if ( tau_day.size() <=0 )
- {
- itkExceptionMacro(<<"The aeronet file ("<<m_FileName<<") doesn't contain valid data for the time (hh:mm:ss) "<<m_Hour<<":"<<m_Minute<<":00 with a tolerance of "<<m_Epsilon<<". Select an other file or increase the epsilon value.");
- }
+ for (unsigned int idCurrentLine = 0; idCurrentLine < tabStr.size(); idCurrentLine++)
+ {
+ VectorString current_line2 = tabStr[idCurrentLine];
+ ossimLocalTm currentDate = ParseDate(current_line2[col_date], current_line2[col_time]);
+ ParseValidLine(dinputDate, current_line2, epsilon, water, angst, tau_day, solarZenithAngle);
+ }
+
+ if (tau_day.size() <= 0)
+ {
+ itkExceptionMacro(
+ << "The aeronet file (" << m_FileName << ") doesn't contain valid data for the time (hh:mm:ss) " << m_Hour <<
+ ":" << m_Minute << ":00 with a tolerance of " << m_Epsilon <<
+ ". Select an other file or increase the epsilon value.");
+ }
double tau_mean(0.);
double tau_stddev(0.);
- GetStatistics(tau_day,tau_mean,tau_stddev);
- if( tau_stddev > 0.8)
- {
- itkExceptionMacro(<<"The stddev of the Aerosol Optical Thickness selected is upper than 0.8.");
- }
+ GetStatistics(tau_day, tau_mean, tau_stddev);
+ if (tau_stddev > 0.8)
+ {
+ itkExceptionMacro(<< "The stddev of the Aerosol Optical Thickness selected is upper than 0.8.");
+ }
double angst_mean(0.);
double angst_stddev(0.);
@@ -350,9 +357,9 @@ AeronetFileReader
double solarZenithAngle_stddev(0.);
// double stddev = (0.02 > tau_stddev ? 0.02 : tau_stddev );
double stddev(tau_stddev);
- GetStatistics(angst,angst_mean,angst_stddev);
- GetStatistics(water,water_mean,water_stddev);
- GetStatistics(solarZenithAngle,solarZenithAngle_mean,solarZenithAngle_stddev);
+ GetStatistics(angst, angst_mean, angst_stddev);
+ GetStatistics(water, water_mean, water_stddev);
+ GetStatistics(solarZenithAngle, solarZenithAngle_mean, solarZenithAngle_stddev);
AeronetData * aeronetData = this->GetOutput();
aeronetData->SetAerosolOpticalThickness(tau_mean);
@@ -361,20 +368,21 @@ AeronetFileReader
aeronetData->SetWater(water_mean);
aeronetData->SetSolarZenithAngle(solarZenithAngle_mean);
itk::OStringStream msg;
- msg << "(hh/mm/yyyy hh:mm:ss) "<<m_Day<<"/"<<m_Month<<"/"<<m_Year<<" "<<m_Hour<<":"<<m_Minute<<":00";
+ msg << "(hh/mm/yyyy hh:mm:ss) " << m_Day << "/" << m_Month << "/" << m_Year << " " << m_Hour << ":" << m_Minute <<
+ ":00";
std::string str(msg.str());
aeronetData->SetDataDate(str);
aeronetData->SetNumberOfDateUsed(tau_day.size());
aeronetData->SetEpsilonDate(m_Epsilon);
// Cloud estimation
- if ( stddev > 0.05 )
- {
+ if (stddev > 0.05)
+ {
aeronetData->SetCloudEstimation(true);
- }
+ }
else
- {
+ {
aeronetData->SetCloudEstimation(false);
- }
+ }
}
/**
@@ -382,8 +390,8 @@ AeronetFileReader
*/
void
AeronetFileReader
-::PrintSelf( std::ostream& os,itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/Radiometry/otbAeronetFileReader.h b/Code/Radiometry/otbAeronetFileReader.h
index 89795f03a0..a1c6b1abd5 100644
--- a/Code/Radiometry/otbAeronetFileReader.h
+++ b/Code/Radiometry/otbAeronetFileReader.h
@@ -32,24 +32,24 @@ namespace otb
* \brief Base exception class for Aeronet problems during reading.
*/
class ITK_EXPORT AeronetFileReaderException
- : public itk::ExceptionObject
+ : public itk::ExceptionObject
{
public:
/** Run-time information. */
- itkTypeMacro( AeronetFileReaderException, ExceptionObject );
+ itkTypeMacro(AeronetFileReaderException, ExceptionObject);
/** Constructor. */
AeronetFileReaderException(const char *file, unsigned int line,
- const char* message = "Error in Radiometry IO",
- const char* loc = "Unknown" ) :
- ExceptionObject(file, line, message, loc)
- {}
+ const char* message = "Error in Radiometry IO",
+ const char* loc = "Unknown") :
+ ExceptionObject(file, line, message, loc)
+ {}
/** Constructor. */
- AeronetFileReaderException(const std::string &file, unsigned int line,
- const char* message = "Error in Radiometry IO",
- const char* loc = "Unknown" ) :
- ExceptionObject(file, line, message, loc)
- {}
+ AeronetFileReaderException(const std::string & file, unsigned int line,
+ const char* message = "Error in Radiometry IO",
+ const char* loc = "Unknown") :
+ ExceptionObject(file, line, message, loc)
+ {}
};
/**
@@ -74,14 +74,14 @@ class ITK_EXPORT AeronetFileReader : public itk::ProcessObject
{
public:
/** Standards typedef */
- typedef AeronetFileReader Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef AeronetFileReader Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through the object factory */
itkNewMacro(Self);
/** Runtime type informations */
- itkTypeMacro(AeronetFileReader,itk::ProcessObject);
+ itkTypeMacro(AeronetFileReader, itk::ProcessObject);
/** Overiding of the GetOutput() method */
virtual AeronetData * GetOutput(void);
@@ -92,28 +92,28 @@ public:
itkGetStringMacro(FileName);
/** Set/Get the day value */
- itkSetMacro(Day,int);
- itkGetMacro(Day,int);
+ itkSetMacro(Day, int);
+ itkGetMacro(Day, int);
/** Set/Get the month value */
- itkSetMacro(Month,int);
- itkGetMacro(Month,int);
+ itkSetMacro(Month, int);
+ itkGetMacro(Month, int);
/** Set/Get the year value */
- itkSetMacro(Year,int);
- itkGetMacro(Year,int);
+ itkSetMacro(Year, int);
+ itkGetMacro(Year, int);
/** Set/Get the hour value */
- itkSetMacro(Hour,int);
- itkGetMacro(Hour,int);
+ itkSetMacro(Hour, int);
+ itkGetMacro(Hour, int);
/** Set/Get the minute value */
- itkSetMacro(Minute,int);
- itkGetMacro(Minute,int);
+ itkSetMacro(Minute, int);
+ itkGetMacro(Minute, int);
/** Set/Get the epsilon for the time (tolerance for one hour) */
- itkSetMacro(Epsilon,double);
- itkGetMacro(Epsilon,double);
+ itkSetMacro(Epsilon, double);
+ itkGetMacro(Epsilon, double);
protected:
/** Constructor */
@@ -130,24 +130,30 @@ private:
/** Standards privates typedefs */
typedef std::vector<std::string> VectorString;
- typedef std::vector<double> VectorDouble;
- typedef std::vector< VectorString > MatrixString;
+ typedef std::vector<double> VectorDouble;
+ typedef std::vector<VectorString> MatrixString;
/** Parse the string and return a list of strings which separated by ',' char */
- VectorString ParseLine(const std::string & line)const;
+ VectorString ParseLine(const std::string& line) const;
/** Parse the string and return the date and time */
- ossimLocalTm ParseDate(const std::string & date, const std::string & time)const;
+ ossimLocalTm ParseDate(const std::string& date, const std::string& time) const;
/**
* Parse valid line method
*/
- void ParseValidLine(const double & ref_date, const VectorString & line, const double & epsilon, VectorDouble & water, VectorDouble & angst, VectorDouble & tau_day, VectorDouble & solarZenithAngle)const;
+ void ParseValidLine(const double& ref_date,
+ const VectorString& line,
+ const double& epsilon,
+ VectorDouble& water,
+ VectorDouble& angst,
+ VectorDouble& tau_day,
+ VectorDouble& solarZenithAngle) const;
/**
* Compute statistics method (mean and stddev)
*/
- void GetStatistics(const VectorDouble & vec, double & mean, double & stddev)const;
+ void GetStatistics(const VectorDouble& vec, double& mean, double& stddev) const;
/** File name */
std::string m_FileName;
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx b/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
index 0425ea8a4c..12235edbaf 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
+++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
@@ -22,7 +22,6 @@
#include "base/ossimFilename.h"
#include <fstream>
-
namespace otb
{
/*********************** FilterFunctionValues **************************/
@@ -32,7 +31,7 @@ FilterFunctionValues
m_MinSpectralValue = 0;
m_MaxSpectralValue = 1;
// Fill with 1. Size 3 for 6S interpolation
- m_FilterFunctionValues = ValuesVectorType(3,1.);
+ m_FilterFunctionValues = ValuesVectorType(3, 1.);
m_UserStep = 0.0025;
}
@@ -45,18 +44,17 @@ FilterFunctionValues
os << indent << "Maximum spectral value : " << m_MaxSpectralValue << std::endl;
os << indent << "Wavelenght spectral band step: " << m_UserStep << std::endl;
os << indent << "Filter function values: " << std::endl;
- for (unsigned int i=0; i<m_FilterFunctionValues.size(); ++i)
- {
- os << indent << m_FilterFunctionValues[i] <<std::endl;
- }
+ for (unsigned int i = 0; i < m_FilterFunctionValues.size(); ++i)
+ {
+ os << indent << m_FilterFunctionValues[i] << std::endl;
+ }
os << indent << "6S Filter function values: " << std::endl;
- for (unsigned int i=0; i<m_FilterFunctionValues6S.size(); ++i)
- {
- os << indent << m_FilterFunctionValues6S[i] <<std::endl;
- }
+ for (unsigned int i = 0; i < m_FilterFunctionValues6S.size(); ++i)
+ {
+ os << indent << m_FilterFunctionValues6S[i] << std::endl;
+ }
}
-
/*********************** AtmosphericCorrectionParameters **************************/
/**
* Constructor
@@ -82,11 +80,10 @@ AtmosphericCorrectionParameters
/** Get data from aeronet file*/
void
AtmosphericCorrectionParameters
-::UpdateAeronetData( std::string file, int year, int month, int day, int hour, int minute, double epsi )
+::UpdateAeronetData(std::string file, int year, int month, int day, int hour, int minute, double epsi)
{
- if(file == "")
- itkExceptionMacro(<<"No Aeronet filename specified.");
-
+ if (file == "") itkExceptionMacro(<< "No Aeronet filename specified.");
+
AeronetFileReader::Pointer reader = AeronetFileReader::New();
reader->SetFileName(file);
reader->SetDay(day);
@@ -95,70 +92,63 @@ AtmosphericCorrectionParameters
reader->SetHour(hour);
reader->SetMinute(minute);
reader->SetEpsilon(epsi);
-
+
reader->Update();
-
+
m_AerosolOptical = reader->GetOutput()->GetAerosolOpticalThickness();
m_WaterVaporAmount = reader->GetOutput()->GetWater();
}
-
/** Get data from filter function file*/
void
AtmosphericCorrectionParameters
-::LoadFilterFunctionValue( std::string filename )
+::LoadFilterFunctionValue(std::string filename)
{
m_WavelenghtSpectralBand.clear();
FilterFunctionValues::Pointer ffv = FilterFunctionValues::New();
ossimFilename fname(filename);
- if(!fname.exists())
- itkExceptionMacro("Filename "<<filename<<" doesn not exist.");
+ if (!fname.exists()) itkExceptionMacro("Filename " << filename << " doesn not exist.");
- std::ifstream file( filename.c_str() );
+ std::ifstream file(filename.c_str());
- if ( !file )
- itkExceptionMacro("Enable to read "<<filename<<" file.");
+ if (!file) itkExceptionMacro("Enable to read " << filename << " file.");
- int bandId = 0;
+ int bandId = 0;
std::string line;
ossimString separatorList = " ";
- FilterFunctionValues::Pointer function = FilterFunctionValues::New();
+ FilterFunctionValues::Pointer function = FilterFunctionValues::New();
FilterFunctionValues::ValuesVectorType vect;
m_WavelenghtSpectralBand.clear();
vect.clear();
-
- while ( std::getline( file, line ) )
- {
- ossimString osLine(line);
- std::vector<ossimString> keywordStrings = osLine.split(separatorList);
- if(keywordStrings.size() == 2 || keywordStrings.size() == 3)
+ while (std::getline(file, line))
{
- if(bandId != 0)
+ ossimString osLine(line);
+ std::vector<ossimString> keywordStrings = osLine.split(separatorList);
+
+ if (keywordStrings.size() == 2 || keywordStrings.size() == 3)
{
- function->SetFilterFunctionValues(vect);
- m_WavelenghtSpectralBand.push_back(function);
- function = FilterFunctionValues::New();
- vect.clear();
- }
+ if (bandId != 0)
+ {
+ function->SetFilterFunctionValues(vect);
+ m_WavelenghtSpectralBand.push_back(function);
+ function = FilterFunctionValues::New();
+ vect.clear();
+ }
bandId++;
function->SetMinSpectralValue(keywordStrings[0].toDouble());
function->SetMaxSpectralValue(keywordStrings[1].toDouble());
- if(keywordStrings.size() == 3)
- function->SetUserStep(keywordStrings[2].toDouble());
- }
- else if(keywordStrings.size()==1)
- vect.push_back(keywordStrings[0].toDouble());
- else if(keywordStrings.size()!=0)
- itkExceptionMacro("File "<<filename<<" not valid.");
+ if (keywordStrings.size() == 3) function->SetUserStep(keywordStrings[2].toDouble());
+ }
+ else if (keywordStrings.size() == 1) vect.push_back(keywordStrings[0].toDouble());
+ else if (keywordStrings.size() != 0) itkExceptionMacro("File " << filename << " not valid.");
}
function->SetFilterFunctionValues(vect);
m_WavelenghtSpectralBand.push_back(function);
}
-
/**PrintSelf method */
void
AtmosphericCorrectionParameters
@@ -178,10 +168,10 @@ AtmosphericCorrectionParameters
// Function values print :
os << "Filter function values: " << std::endl;
- for (unsigned int i=0; i<m_WavelenghtSpectralBand.size(); ++i)
- {
- os << indent << "Channel "<< i+1 <<" : " << std::endl;
- os << indent << m_WavelenghtSpectralBand[i]<< std::endl;
- }
+ for (unsigned int i = 0; i < m_WavelenghtSpectralBand.size(); ++i)
+ {
+ os << indent << "Channel " << i + 1 << " : " << std::endl;
+ os << indent << m_WavelenghtSpectralBand[i] << std::endl;
+ }
}
} // end namespace otb
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.h b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
index 833dc45ffd..04a1bc4cc3 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParameters.h
+++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
@@ -46,7 +46,7 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
- itkTypeMacro(FilterFunctionValues,DataObject);
+ itkTypeMacro(FilterFunctionValues, DataObject);
/** Creation through object factory macro */
itkNewMacro(Self);
@@ -55,56 +55,54 @@ public:
typedef std::vector<WavelenghtSpectralBandType> ValuesVectorType;
/** Set vector that contains the filter function value. */
- void SetFilterFunctionValues(const ValuesVectorType & vect)
+ void SetFilterFunctionValues(const ValuesVectorType& vect)
{
m_FilterFunctionValues = vect;
this->Modified();
- };
+ }
/** Get vector that contains the filter function value. */
- const ValuesVectorType & GetFilterFunctionValues() const
+ const ValuesVectorType& GetFilterFunctionValues() const
{
return m_FilterFunctionValues;
- };
+ }
/** Get vector that contains the filter function value 6S. */
- void SetFilterFunctionValues6S(const ValuesVectorType & vect)
+ void SetFilterFunctionValues6S(const ValuesVectorType& vect)
{
m_FilterFunctionValues6S = vect;
this->Modified();
- };
+ }
/** Get vector that contains the filter function value 6S. */
- const ValuesVectorType & GetFilterFunctionValues6S() const
+ const ValuesVectorType& GetFilterFunctionValues6S() const
{
return m_FilterFunctionValues6S;
- };
+ }
/** Set minimum spectral value. */
- itkSetMacro(MinSpectralValue,WavelenghtSpectralBandType);
+ itkSetMacro(MinSpectralValue, WavelenghtSpectralBandType);
/** Get minimum spectral value. */
- itkGetMacro(MinSpectralValue,WavelenghtSpectralBandType);
+ itkGetMacro(MinSpectralValue, WavelenghtSpectralBandType);
/** Set maximum spectral value. This value is automatically computed.*/
- itkSetMacro(MaxSpectralValue,WavelenghtSpectralBandType);
+ itkSetMacro(MaxSpectralValue, WavelenghtSpectralBandType);
/** Get maximum spectral value. This value is automatically computed.*/
- itkGetMacro(MaxSpectralValue,WavelenghtSpectralBandType);
+ itkGetMacro(MaxSpectralValue, WavelenghtSpectralBandType);
/** Set user step between each wavelenght spectral band values. */
- itkSetMacro(UserStep,WavelenghtSpectralBandType);
+ itkSetMacro(UserStep, WavelenghtSpectralBandType);
/** Get user step between each wavelenght spectral band values. */
- itkGetMacro(UserStep,WavelenghtSpectralBandType);
-
+ itkGetMacro(UserStep, WavelenghtSpectralBandType);
protected:
/** Constructor */
FilterFunctionValues();
/** Destructor */
- ~FilterFunctionValues() {};
+ ~FilterFunctionValues() {}
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
private:
- FilterFunctionValues(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ FilterFunctionValues(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
+
/** Vector that contains the filter function value. */
ValuesVectorType m_FilterFunctionValues;
/** Vector that contains the filter function value in 6S format (step of 0.0025µm).
@@ -119,7 +117,6 @@ private:
WavelenghtSpectralBandType m_UserStep;
};
-
/** \class AtmosphericCorrectionParameters
* \brief This class contains all atmospheric correction parameters.
*
@@ -134,136 +131,137 @@ class ITK_EXPORT AtmosphericCorrectionParameters : public itk::DataObject
public:
/** Standard typedefs */
typedef AtmosphericCorrectionParameters Self;
- typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::DataObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
- itkTypeMacro(AtmosphericCorrectionParameters,DataObject);
+ itkTypeMacro(AtmosphericCorrectionParameters, DataObject);
/** Creation through object factory macro */
itkNewMacro(Self);
- typedef enum {NO_AEROSOL=0,CONTINENTAL=1,MARITIME=2,URBAN=3,DESERTIC=5} AerosolModelType;
- typedef std::vector<FilterFunctionValues::Pointer> WavelenghtSpectralBandVectorType;
+ typedef enum {NO_AEROSOL = 0, CONTINENTAL = 1, MARITIME = 2, URBAN = 3, DESERTIC = 5} AerosolModelType;
+ typedef std::vector<FilterFunctionValues::Pointer>
+ WavelenghtSpectralBandVectorType;
/**
* Set/Get the solar zenithal angle.
*/
- itkSetMacro(SolarZenithalAngle,double);
- itkGetMacro(SolarZenithalAngle,double);
+ itkSetMacro(SolarZenithalAngle, double);
+ itkGetMacro(SolarZenithalAngle, double);
/**
* Set/Get the solar azimutal angle.
*/
- itkSetMacro(SolarAzimutalAngle,double);
- itkGetMacro(SolarAzimutalAngle,double);
+ itkSetMacro(SolarAzimutalAngle, double);
+ itkGetMacro(SolarAzimutalAngle, double);
/**
* Set/Get the viewing zenithal angle.
*/
- itkSetMacro(ViewingZenithalAngle,double);
- itkGetMacro(ViewingZenithalAngle,double);
+ itkSetMacro(ViewingZenithalAngle, double);
+ itkGetMacro(ViewingZenithalAngle, double);
/**
* Set/Get the viewing azimutal angle.
*/
- itkSetMacro(ViewingAzimutalAngle,double);
- itkGetMacro(ViewingAzimutalAngle,double);
+ itkSetMacro(ViewingAzimutalAngle, double);
+ itkGetMacro(ViewingAzimutalAngle, double);
/**
* Set/Get the month.
*/
- itkSetClampMacro(Month,unsigned int,1,12);
- itkGetMacro(Month,unsigned int);
+ itkSetClampMacro(Month, unsigned int, 1, 12);
+ itkGetMacro(Month, unsigned int);
/**
* Set/Get the day.
*/
- itkSetClampMacro(Day,unsigned int,1,31);
- itkGetMacro(Day,unsigned int);
+ itkSetClampMacro(Day, unsigned int, 1, 31);
+ itkGetMacro(Day, unsigned int);
/**
* Set/Get the atmospheric pressure.
*/
- itkSetMacro(AtmosphericPressure,double);
- itkGetMacro(AtmosphericPressure,double);
+ itkSetMacro(AtmosphericPressure, double);
+ itkGetMacro(AtmosphericPressure, double);
/**
* Set/Get the water vapor amount.
*/
- itkSetMacro(WaterVaporAmount,double);
- itkGetMacro(WaterVaporAmount,double);
+ itkSetMacro(WaterVaporAmount, double);
+ itkGetMacro(WaterVaporAmount, double);
/**
* Set/Get the ozone amount.
*/
- itkSetMacro(OzoneAmount,double);
- itkGetMacro(OzoneAmount,double);
+ itkSetMacro(OzoneAmount, double);
+ itkGetMacro(OzoneAmount, double);
/**
* Set/Get the aerosol model.
*/
- itkSetEnumMacro(AerosolModel,AerosolModelType);
- itkGetEnumMacro(AerosolModel,AerosolModelType);
+ itkSetEnumMacro(AerosolModel, AerosolModelType);
+ itkGetEnumMacro(AerosolModel, AerosolModelType);
/**
* Set/Get the aerosol optical.
*/
- itkSetMacro(AerosolOptical,double);
- itkGetMacro(AerosolOptical,double);
+ itkSetMacro(AerosolOptical, double);
+ itkGetMacro(AerosolOptical, double);
/**
* Set/Get the wavelenght spectral band.
*/
- void SetWavelenghtSpectralBand( const WavelenghtSpectralBandVectorType & waveband)
+ void SetWavelenghtSpectralBand(const WavelenghtSpectralBandVectorType& waveband)
{
m_WavelenghtSpectralBand = waveband;
- };
- void SetWavelenghtSpectralBandWithIndex( unsigned int id, const FilterFunctionValues::Pointer & function)
+ }
+ void SetWavelenghtSpectralBandWithIndex(unsigned int id, const FilterFunctionValues::Pointer& function)
{
- if (m_WavelenghtSpectralBand.size() < id+1)
- {
- for (unsigned int j=0; j<(id+1-m_WavelenghtSpectralBand.size());++j)
+ if (m_WavelenghtSpectralBand.size() < id + 1)
{
+ for (unsigned int j = 0; j < (id + 1 - m_WavelenghtSpectralBand.size()); ++j)
+ {
FilterFunctionValues::Pointer temp;
m_WavelenghtSpectralBand.push_back(temp);
+ }
}
- }
m_WavelenghtSpectralBand[id] = function;
- };
+ }
WavelenghtSpectralBandVectorType GetWavelenghtSpectralBand()
{
return m_WavelenghtSpectralBand;
- };
+ }
WavelenghtSpectralBandVectorType * GetWavelenghtSpectralBandRef()
{
return &m_WavelenghtSpectralBand;
- };
+ }
/** Read the aeronet data and extract aerosol optical and water vapor amount. */
- void UpdateAeronetData( std::string file, int year, int month, int day, int hour, int minute, double epsi );
- void UpdateAeronetData( std::string file, int year, int month, int day, int hour, int minute )
+ void UpdateAeronetData(std::string file, int year, int month, int day, int hour, int minute, double epsi);
+ void UpdateAeronetData(std::string file, int year, int month, int day, int hour, int minute)
{
- this->UpdateAeronetData( file, year, month, day, hour, minute, 0.4 );
- };
- void UpdateAeronetData( std::string file, int year, int hour, int minute, double epsi )
+ this->UpdateAeronetData(file, year, month, day, hour, minute, 0.4);
+ }
+ void UpdateAeronetData(std::string file, int year, int hour, int minute, double epsi)
{
- this->UpdateAeronetData( file, year, m_Month, m_Day, hour, minute, epsi );
- };
- void UpdateAeronetData( std::string file, int year, int hour, int minute )
+ this->UpdateAeronetData(file, year, m_Month, m_Day, hour, minute, epsi);
+ }
+ void UpdateAeronetData(std::string file, int year, int hour, int minute)
{
- this->UpdateAeronetData( file, year, m_Month, m_Day, hour, minute, 0.4 );
- };
-
+ this->UpdateAeronetData(file, year, m_Month, m_Day, hour, minute, 0.4);
+ }
+
/** Read a file that contains filter function values.
* Format is MinSpectralValue MaxSpectralValue UserStep and then the list of coefficients for each band.
* NB : if no UserStep writen, the default value will be 0,0025µm
*/
- void LoadFilterFunctionValue( std::string filename );
-
+ void LoadFilterFunctionValue(std::string filename);
+
/** Constructor */
AtmosphericCorrectionParameters();
/** Destructor */
- ~AtmosphericCorrectionParameters() {};
+ ~AtmosphericCorrectionParameters() {}
protected:
@@ -271,8 +269,8 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- AtmosphericCorrectionParameters(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ AtmosphericCorrectionParameters(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The Solar zenithal angle */
double m_SolarZenithalAngle;
@@ -303,5 +301,3 @@ private:
} // end namespace otb
#endif
-
-
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx b/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
index f3ada1673f..600c783998 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
+++ b/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.cxx
@@ -32,9 +32,9 @@ AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
// Create the output. We use static_cast<> here because we know the default
// output must be of type TOutputPointSet
AtmosphericRadiativeTermsPointer output
- = static_cast<AtmosphericRadiativeTermsType*>(this->MakeOutput(0).GetPointer());
+ = static_cast<AtmosphericRadiativeTermsType*>(this->MakeOutput(0).GetPointer());
- this->ProcessObject::SetNthOutput( 0, output.GetPointer() );
+ this->ProcessObject::SetNthOutput(0, output.GetPointer());
}
/**
@@ -57,7 +57,6 @@ AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
this->GraftNthOutput(0, graft);
}
-
/**
*
*/
@@ -65,21 +64,21 @@ void
AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
::GraftNthOutput(unsigned int idx, itk::DataObject *graft)
{
- if ( idx >= this->GetNumberOfOutputs() )
- {
- itkExceptionMacro(<<"Requested to graft output " << idx <<
+ if (idx >= this->GetNumberOfOutputs())
+ {
+ itkExceptionMacro(<< "Requested to graft output " << idx <<
" but this filter only has " << this->GetNumberOfOutputs() << " Outputs.");
- }
+ }
- if ( !graft )
- {
- itkExceptionMacro(<<"Requested to graft output that is a NULL pointer" );
- }
+ if (!graft)
+ {
+ itkExceptionMacro(<< "Requested to graft output that is a NULL pointer");
+ }
- itk::DataObject * output = this->GetOutput( idx );
+ itk::DataObject * output = this->GetOutput(idx);
// Call Graft on the PointSet in order to copy meta-information, and containers.
- output->Graft( graft );
+ output->Graft(graft);
}
/**
@@ -91,10 +90,10 @@ AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms::AtmosphericRadiati
AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
::GetOutput(void)
{
- if (this->GetNumberOfOutputs()<1)
- {
+ if (this->GetNumberOfOutputs() < 1)
+ {
return 0;
- }
+ }
return static_cast<AtmosphericRadiativeTermsType *> (this->ProcessObject::GetOutput(0));
}
@@ -109,13 +108,12 @@ AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
(this->itk::ProcessObject::GetOutput(idx));
}
-
void
AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
::SetInput(const AtmosphericCorrectionParametersType *object)
{
// A single input image
- this->itk::ProcessObject::SetNthInput(0,const_cast<AtmosphericCorrectionParametersType*>(object));
+ this->itk::ProcessObject::SetNthInput(0, const_cast<AtmosphericCorrectionParametersType*>(object));
}
AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms::AtmosphericCorrectionParametersType *
@@ -123,29 +121,28 @@ AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
::GetInput(void)
{
// If there is no input
- if (this->GetNumberOfInputs()!=1)
- {
+ if (this->GetNumberOfInputs() != 1)
+ {
// exit
return 0;
- }
+ }
// else return the first input
- return static_cast<AtmosphericCorrectionParametersType * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<AtmosphericCorrectionParametersType *>
+ (this->itk::ProcessObject::GetInput(0));
}
-
void
AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
::GenerateData()
{
AtmosphericCorrectionParametersPointer input = this->GetInput();
- AtmosphericRadiativeTermsPointer output = this->GetOutput();
+ AtmosphericRadiativeTermsPointer output = this->GetOutput();
output->GetValues().clear();
typedef AtmosphericCorrectionParameters::WavelenghtSpectralBandVectorType WavelenghtSpectralBandVectorType;
WavelenghtSpectralBandVectorType WavelenghtSpectralBandVector = input->GetWavelenghtSpectralBand();
- unsigned int NbBand = WavelenghtSpectralBandVector.size();
+ unsigned int NbBand = WavelenghtSpectralBandVector.size();
double atmosphericReflectance(0.);
double atmosphericSphericalAlbedo(0.);
@@ -156,9 +153,9 @@ AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
double upwardDirectTransmittance(0.);
double upwardDiffuseTransmittanceForRayleigh(0.);
double upwardDiffuseTransmittanceForAerosol(0.);
-
- for (unsigned int i=0; i<NbBand; ++i)
- {
+
+ for (unsigned int i = 0; i < NbBand; ++i)
+ {
atmosphericReflectance = 0.;
atmosphericSphericalAlbedo = 0.;
totalGaseousTransmission = 0.;
@@ -191,20 +188,19 @@ AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
upwardDirectTransmittance, /** Upward direct transmittance */
upwardDiffuseTransmittanceForRayleigh, /** Upward diffuse transmittance for rayleigh */
upwardDiffuseTransmittanceForAerosol /** Upward diffuse transmittance for aerosols */
- );
-
+ );
output->SetIntrinsicAtmosphericReflectance(i, atmosphericReflectance);
output->SetSphericalAlbedo(i, atmosphericSphericalAlbedo);
output->SetTotalGaseousTransmission(i, totalGaseousTransmission);
output->SetDownwardTransmittance(i, downwardTransmittance);
output->SetUpwardTransmittance(i, upwardTransmittance);
- output->SetUpwardDiffuseTransmittance(i, upwardDiffuseTransmittance );
+ output->SetUpwardDiffuseTransmittance(i, upwardDiffuseTransmittance);
output->SetUpwardDirectTransmittance(i, upwardDirectTransmittance);
- output->SetUpwardDiffuseTransmittanceForRayleigh(i,upwardDiffuseTransmittanceForRayleigh );
+ output->SetUpwardDiffuseTransmittanceForRayleigh(i, upwardDiffuseTransmittanceForRayleigh);
output->SetUpwardDiffuseTransmittanceForAerosol(i, upwardDiffuseTransmittanceForAerosol);
- }
+ }
}
/**
@@ -214,7 +210,7 @@ void
AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-}// end namespace otb
+} // end namespace otb
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h b/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h
index 10358ccc07..ca23c54782 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h
+++ b/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h
@@ -34,25 +34,24 @@ namespace otb
* \ingroup Radiometry
*/
class ITK_EXPORT AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
- : public itk::ProcessObject
+ : public itk::ProcessObject
{
public:
/** Standard typedefs */
typedef AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Runtime information */
- itkTypeMacro(AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms,itk::ProcessObject);
+ itkTypeMacro(AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms, itk::ProcessObject);
/** Creation througth the object factory */
itkNewMacro(Self);
/** Template parameters typedefs */
- typedef AtmosphericCorrectionParameters AtmosphericCorrectionParametersType;
+ typedef AtmosphericCorrectionParameters AtmosphericCorrectionParametersType;
typedef AtmosphericCorrectionParametersType::Pointer AtmosphericCorrectionParametersPointer;
- typedef AtmosphericRadiativeTerms AtmosphericRadiativeTermsType;
- typedef AtmosphericRadiativeTermsType::Pointer AtmosphericRadiativeTermsPointer;
+ typedef AtmosphericRadiativeTerms AtmosphericRadiativeTermsType;
+ typedef AtmosphericRadiativeTermsType::Pointer AtmosphericRadiativeTermsPointer;
/** Set the Atmospheric Correction Parameters input of this process object */
void SetInput(const AtmosphericCorrectionParametersType *object);
@@ -64,7 +63,6 @@ public:
void GraftOutput(itk::DataObject *graft);
void GraftNthOutput(unsigned int idx, itk::DataObject *graft);
-
/** Get the Atmospheric Radiative Terms output of this process object. */
virtual AtmosphericRadiativeTermsType * GetOutput(void);
virtual AtmosphericRadiativeTermsType * GetOutput(unsigned int idx);
@@ -81,8 +79,8 @@ protected:
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms(const Self&);//purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Radiometry/otbAtmosphericRadiativeTerms.cxx b/Code/Radiometry/otbAtmosphericRadiativeTerms.cxx
index 3a2a0a0f8f..c9634ebe90 100644
--- a/Code/Radiometry/otbAtmosphericRadiativeTerms.cxx
+++ b/Code/Radiometry/otbAtmosphericRadiativeTerms.cxx
@@ -36,13 +36,12 @@ AtmosphericRadiativeTermsSingleChannel
m_UpwardDiffuseTransmittanceForAerosol = 0.04;
}
-
/**PrintSelf method */
void
AtmosphericRadiativeTermsSingleChannel
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "Atmospheric Intrinsic Reflectance : " << m_IntrinsicAtmosphericReflectance << std::endl;
os << indent << "Atmosphere Shperical Albedo : " << m_SphericalAlbedo << std::endl;
os << indent << "Total Gaseous Transmission : " << m_TotalGaseousTransmission << std::endl;
@@ -54,7 +53,6 @@ AtmosphericRadiativeTermsSingleChannel
os << indent << "Upward Diffuse Transmittance for aerosols: " << m_UpwardDiffuseTransmittanceForAerosol << std::endl;
}
-
/*********************************** AtmosphericRadiativeTerms **********************************************************/
/**CONSTRUCTOR. */
AtmosphericRadiativeTerms
@@ -68,281 +66,281 @@ void
AtmosphericRadiativeTerms
::ValuesInitialization(unsigned int nbChannel)
{
- for (unsigned int j=0; j<nbChannel; ++j)
- {
+ for (unsigned int j = 0; j < nbChannel; ++j)
+ {
ValueType temp = AtmosphericRadiativeTermsSingleChannel::New();
m_Values.push_back(temp);
- }
+ }
m_IsInitialized = true;
}
/** SET ACCESSORS WITH VECTORS. */
void
AtmosphericRadiativeTerms
-::SetIntrinsicAtmosphericReflectances(const DataVectorType & vect)
+::SetIntrinsicAtmosphericReflectances(const DataVectorType& vect)
{
- if ( !m_IsInitialized)
- {
+ if (!m_IsInitialized)
+ {
this->ValuesInitialization(vect.size());
- }
- for (unsigned int nbChannel=0; nbChannel<vect.size(); ++nbChannel)
- {
+ }
+ for (unsigned int nbChannel = 0; nbChannel < vect.size(); ++nbChannel)
+ {
m_Values[nbChannel]->SetIntrinsicAtmosphericReflectance(vect[nbChannel]);
- }
+ }
}
void
AtmosphericRadiativeTerms
-::SetSphericalAlbedos(const DataVectorType & vect)
+::SetSphericalAlbedos(const DataVectorType& vect)
{
- if ( !m_IsInitialized)
- {
+ if (!m_IsInitialized)
+ {
this->ValuesInitialization(vect.size());
- }
- for (unsigned int nbChannel=0; nbChannel<vect.size(); ++nbChannel)
- {
+ }
+ for (unsigned int nbChannel = 0; nbChannel < vect.size(); ++nbChannel)
+ {
m_Values[nbChannel]->SetSphericalAlbedo(vect[nbChannel]);
- }
+ }
}
void
AtmosphericRadiativeTerms
-::SetTotalGaseousTransmissions(const DataVectorType & vect)
+::SetTotalGaseousTransmissions(const DataVectorType& vect)
{
- if ( !m_IsInitialized)
- {
+ if (!m_IsInitialized)
+ {
this->ValuesInitialization(vect.size());
- }
- for (unsigned int nbChannel=0; nbChannel<vect.size(); ++nbChannel)
- {
+ }
+ for (unsigned int nbChannel = 0; nbChannel < vect.size(); ++nbChannel)
+ {
m_Values[nbChannel]->SetTotalGaseousTransmission(vect[nbChannel]);
- }
+ }
}
void
AtmosphericRadiativeTerms
-::SetDownwardTransmittances(const DataVectorType & vect)
+::SetDownwardTransmittances(const DataVectorType& vect)
{
- if ( !m_IsInitialized)
- {
+ if (!m_IsInitialized)
+ {
this->ValuesInitialization(vect.size());
- }
- for (unsigned int nbChannel=0; nbChannel<vect.size(); ++nbChannel)
- {
+ }
+ for (unsigned int nbChannel = 0; nbChannel < vect.size(); ++nbChannel)
+ {
m_Values[nbChannel]->SetDownwardTransmittance(vect[nbChannel]);
- }
+ }
}
void
AtmosphericRadiativeTerms
-::SetUpwardTransmittances(const DataVectorType & vect)
+::SetUpwardTransmittances(const DataVectorType& vect)
{
- if ( !m_IsInitialized)
- {
+ if (!m_IsInitialized)
+ {
this->ValuesInitialization(vect.size());
- }
- for (unsigned int nbChannel=0; nbChannel<vect.size(); ++nbChannel)
- {
+ }
+ for (unsigned int nbChannel = 0; nbChannel < vect.size(); ++nbChannel)
+ {
m_Values[nbChannel]->SetUpwardTransmittance(vect[nbChannel]);
- }
+ }
}
void
AtmosphericRadiativeTerms
-::SetUpwardDiffuseTransmittances(const DataVectorType & vect)
+::SetUpwardDiffuseTransmittances(const DataVectorType& vect)
{
- if ( !m_IsInitialized)
- {
+ if (!m_IsInitialized)
+ {
this->ValuesInitialization(vect.size());
- }
- for (unsigned int nbChannel=0; nbChannel<vect.size(); ++nbChannel)
- {
+ }
+ for (unsigned int nbChannel = 0; nbChannel < vect.size(); ++nbChannel)
+ {
m_Values[nbChannel]->SetUpwardDiffuseTransmittance(vect[nbChannel]);
- }
+ }
}
void
AtmosphericRadiativeTerms
-::SetUpwardDirectTransmittances(const DataVectorType & vect)
+::SetUpwardDirectTransmittances(const DataVectorType& vect)
{
- if ( !m_IsInitialized)
- {
+ if (!m_IsInitialized)
+ {
this->ValuesInitialization(vect.size());
- }
- for (unsigned int nbChannel=0; nbChannel<vect.size(); ++nbChannel)
- {
+ }
+ for (unsigned int nbChannel = 0; nbChannel < vect.size(); ++nbChannel)
+ {
m_Values[nbChannel]->SetUpwardDirectTransmittance(vect[nbChannel]);
- }
+ }
}
void
AtmosphericRadiativeTerms
-::SetUpwardDiffuseTransmittancesForRayleigh(const DataVectorType & vect)
+::SetUpwardDiffuseTransmittancesForRayleigh(const DataVectorType& vect)
{
- if ( !m_IsInitialized)
- {
+ if (!m_IsInitialized)
+ {
this->ValuesInitialization(vect.size());
- }
- for (unsigned int nbChannel=0; nbChannel<vect.size(); ++nbChannel)
- {
+ }
+ for (unsigned int nbChannel = 0; nbChannel < vect.size(); ++nbChannel)
+ {
m_Values[nbChannel]->SetUpwardDiffuseTransmittanceForRayleigh(vect[nbChannel]);
- }
+ }
}
void
AtmosphericRadiativeTerms
-::SetUpwardDiffuseTransmittancesForAerosol(const DataVectorType & vect)
+::SetUpwardDiffuseTransmittancesForAerosol(const DataVectorType& vect)
{
- if ( !m_IsInitialized)
- {
+ if (!m_IsInitialized)
+ {
this->ValuesInitialization(vect.size());
- }
- for (unsigned int nbChannel=0; nbChannel<vect.size(); ++nbChannel)
- {
+ }
+ for (unsigned int nbChannel = 0; nbChannel < vect.size(); ++nbChannel)
+ {
m_Values[nbChannel]->SetUpwardDiffuseTransmittanceForAerosol(vect[nbChannel]);
- }
+ }
}
/** SET ACCESSORS WITH INDEX. */
void
AtmosphericRadiativeTerms
-::SetValueByIndex(unsigned int id, const ValueType & val)
+::SetValueByIndex(unsigned int id, const ValueType& val)
{
- if ( m_IsInitialized )
- {
- if ( m_Values.size()<id+1 )
+ if (m_IsInitialized)
{
- for (unsigned int j=0; j<(id+1-m_Values.size());++j)
+ if (m_Values.size() < id + 1)
{
+ for (unsigned int j = 0; j < (id + 1 - m_Values.size()); ++j)
+ {
ValueType temp = AtmosphericRadiativeTermsSingleChannel::New();
m_Values.push_back(temp);
+ }
}
- }
m_Values[id] = val;
- }
+ }
else
- {
- itkExceptionMacro(<< "Can't insert value before iniatilizing vector value..."<<std::endl);
- }
+ {
+ itkExceptionMacro(<< "Can't insert value before iniatilizing vector value..." << std::endl);
+ }
}
void
AtmosphericRadiativeTerms
-::SetIntrinsicAtmosphericReflectance(unsigned int id, const double & val)
+::SetIntrinsicAtmosphericReflectance(unsigned int id, const double& val)
{
- if ( m_Values.size()<id+1 )
- {
- for (unsigned int j=0; j<(id+1-m_Values.size());++j)
+ if (m_Values.size() < id + 1)
{
+ for (unsigned int j = 0; j < (id + 1 - m_Values.size()); ++j)
+ {
ValueType temp = AtmosphericRadiativeTermsSingleChannel::New();
m_Values.push_back(temp);
+ }
}
- }
m_Values[id]->SetIntrinsicAtmosphericReflectance(val);
}
void
AtmosphericRadiativeTerms
-::SetSphericalAlbedo(unsigned int id, const double & val)
+::SetSphericalAlbedo(unsigned int id, const double& val)
{
- if ( m_Values.size()<id+1 )
- {
- for (unsigned int j=0; j<(id+1-m_Values.size());++j)
+ if (m_Values.size() < id + 1)
{
+ for (unsigned int j = 0; j < (id + 1 - m_Values.size()); ++j)
+ {
ValueType temp = AtmosphericRadiativeTermsSingleChannel::New();
m_Values.push_back(temp);
+ }
}
- }
m_Values[id]->SetSphericalAlbedo(val);
}
void
AtmosphericRadiativeTerms
-::SetTotalGaseousTransmission(unsigned int id, const double & val)
+::SetTotalGaseousTransmission(unsigned int id, const double& val)
{
- if ( m_Values.size()<id+1 )
- {
- for (unsigned int j=0; j<(id+1-m_Values.size());++j)
+ if (m_Values.size() < id + 1)
{
+ for (unsigned int j = 0; j < (id + 1 - m_Values.size()); ++j)
+ {
ValueType temp = AtmosphericRadiativeTermsSingleChannel::New();
m_Values.push_back(temp);
+ }
}
- }
m_Values[id]->SetTotalGaseousTransmission(val);
}
void
AtmosphericRadiativeTerms
-::SetDownwardTransmittance(unsigned int id, const double & val )
+::SetDownwardTransmittance(unsigned int id, const double& val)
{
- if ( m_Values.size()<id+1 )
- {
- for (unsigned int j=0; j<(id+1-m_Values.size());++j)
+ if (m_Values.size() < id + 1)
{
+ for (unsigned int j = 0; j < (id + 1 - m_Values.size()); ++j)
+ {
ValueType temp = AtmosphericRadiativeTermsSingleChannel::New();
m_Values.push_back(temp);
+ }
}
- }
m_Values[id]->SetDownwardTransmittance(val);
}
void
AtmosphericRadiativeTerms
-::SetUpwardTransmittance(unsigned int id, const double & val )
+::SetUpwardTransmittance(unsigned int id, const double& val)
{
- if ( m_Values.size()<id+1 )
- {
- for (unsigned int j=0; j<(id+1-m_Values.size());++j)
+ if (m_Values.size() < id + 1)
{
+ for (unsigned int j = 0; j < (id + 1 - m_Values.size()); ++j)
+ {
ValueType temp = AtmosphericRadiativeTermsSingleChannel::New();
m_Values.push_back(temp);
+ }
}
- }
m_Values[id]->SetUpwardTransmittance(val);
}
void
AtmosphericRadiativeTerms
-::SetUpwardDiffuseTransmittance(unsigned int id, const double & val )
+::SetUpwardDiffuseTransmittance(unsigned int id, const double& val)
{
- if ( m_Values.size()<id+1 )
- {
- for (unsigned int j=0; j<(id+1-m_Values.size());++j)
+ if (m_Values.size() < id + 1)
{
+ for (unsigned int j = 0; j < (id + 1 - m_Values.size()); ++j)
+ {
ValueType temp = AtmosphericRadiativeTermsSingleChannel::New();
m_Values.push_back(temp);
+ }
}
- }
m_Values[id]->SetUpwardDiffuseTransmittance(val);
}
void
AtmosphericRadiativeTerms
-::SetUpwardDirectTransmittance(unsigned int id, const double & val )
+::SetUpwardDirectTransmittance(unsigned int id, const double& val)
{
- if ( m_Values.size()<id+1 )
- {
- for (unsigned int j=0; j<(id+1-m_Values.size());++j)
+ if (m_Values.size() < id + 1)
{
+ for (unsigned int j = 0; j < (id + 1 - m_Values.size()); ++j)
+ {
ValueType temp = AtmosphericRadiativeTermsSingleChannel::New();
m_Values.push_back(temp);
+ }
}
- }
m_Values[id]->SetUpwardDirectTransmittance(val);
}
void
AtmosphericRadiativeTerms
-::SetUpwardDiffuseTransmittanceForRayleigh(unsigned int id, const double & val )
+::SetUpwardDiffuseTransmittanceForRayleigh(unsigned int id, const double& val)
{
- if ( m_Values.size()<id+1 )
- {
- for (unsigned int j=0; j<(id+1-m_Values.size());++j)
+ if (m_Values.size() < id + 1)
{
+ for (unsigned int j = 0; j < (id + 1 - m_Values.size()); ++j)
+ {
ValueType temp = AtmosphericRadiativeTermsSingleChannel::New();
m_Values.push_back(temp);
+ }
}
- }
m_Values[id]->SetUpwardDiffuseTransmittanceForRayleigh(val);
}
void
AtmosphericRadiativeTerms
-::SetUpwardDiffuseTransmittanceForAerosol(unsigned int id, const double & val )
+::SetUpwardDiffuseTransmittanceForAerosol(unsigned int id, const double& val)
{
- if ( m_Values.size()<id+1 )
- {
- for (unsigned int j=0; j<(id+1-m_Values.size());++j)
+ if (m_Values.size() < id + 1)
{
+ for (unsigned int j = 0; j < (id + 1 - m_Values.size()); ++j)
+ {
ValueType temp = AtmosphericRadiativeTermsSingleChannel::New();
m_Values.push_back(temp);
+ }
}
- }
m_Values[id]->SetUpwardDiffuseTransmittanceForAerosol(val);
}
@@ -352,10 +350,10 @@ AtmosphericRadiativeTerms
::GetIntrinsicAtmosphericReflectances()
{
DataVectorType vect(m_Values.size(), 0);
- for (unsigned int nbChannel=0; nbChannel<m_Values.size(); ++nbChannel)
- {
+ for (unsigned int nbChannel = 0; nbChannel < m_Values.size(); ++nbChannel)
+ {
vect[nbChannel] = m_Values[nbChannel]->GetIntrinsicAtmosphericReflectance();
- }
+ }
return vect;
}
AtmosphericRadiativeTerms::DataVectorType
@@ -363,10 +361,10 @@ AtmosphericRadiativeTerms
::GetSphericalAlbedos()
{
DataVectorType vect(m_Values.size(), 0);
- for (unsigned int nbChannel=0; nbChannel<m_Values.size(); ++nbChannel)
- {
+ for (unsigned int nbChannel = 0; nbChannel < m_Values.size(); ++nbChannel)
+ {
vect[nbChannel] = m_Values[nbChannel]->GetSphericalAlbedo();
- }
+ }
return vect;
}
AtmosphericRadiativeTerms::DataVectorType
@@ -374,10 +372,10 @@ AtmosphericRadiativeTerms
::GetTotalGaseousTransmissions()
{
DataVectorType vect(m_Values.size(), 0);
- for (unsigned int nbChannel=0; nbChannel<m_Values.size(); ++nbChannel)
- {
+ for (unsigned int nbChannel = 0; nbChannel < m_Values.size(); ++nbChannel)
+ {
vect[nbChannel] = m_Values[nbChannel]->GetTotalGaseousTransmission();
- }
+ }
return vect;
}
AtmosphericRadiativeTerms::DataVectorType
@@ -385,10 +383,10 @@ AtmosphericRadiativeTerms
::GetDownwardTransmittances()
{
DataVectorType vect(m_Values.size(), 0);
- for (unsigned int nbChannel=0; nbChannel<m_Values.size(); ++nbChannel)
- {
+ for (unsigned int nbChannel = 0; nbChannel < m_Values.size(); ++nbChannel)
+ {
vect[nbChannel] = m_Values[nbChannel]->GetDownwardTransmittance();
- }
+ }
return vect;
}
AtmosphericRadiativeTerms::DataVectorType
@@ -396,10 +394,10 @@ AtmosphericRadiativeTerms
::GetUpwardTransmittances()
{
DataVectorType vect(m_Values.size(), 0);
- for (unsigned int nbChannel=0; nbChannel<m_Values.size(); ++nbChannel)
- {
+ for (unsigned int nbChannel = 0; nbChannel < m_Values.size(); ++nbChannel)
+ {
vect[nbChannel] = m_Values[nbChannel]->GetUpwardTransmittance();
- }
+ }
return vect;
}
AtmosphericRadiativeTerms::DataVectorType
@@ -407,10 +405,10 @@ AtmosphericRadiativeTerms
::GetUpwardDiffuseTransmittances()
{
DataVectorType vect(m_Values.size(), 0);
- for (unsigned int nbChannel=0; nbChannel<m_Values.size(); ++nbChannel)
- {
+ for (unsigned int nbChannel = 0; nbChannel < m_Values.size(); ++nbChannel)
+ {
vect[nbChannel] = m_Values[nbChannel]->GetUpwardDiffuseTransmittance();
- }
+ }
return vect;
}
AtmosphericRadiativeTerms::DataVectorType
@@ -418,10 +416,10 @@ AtmosphericRadiativeTerms
::GetUpwardDirectTransmittances()
{
DataVectorType vect(m_Values.size(), 0);
- for (unsigned int nbChannel=0; nbChannel<m_Values.size(); ++nbChannel)
- {
+ for (unsigned int nbChannel = 0; nbChannel < m_Values.size(); ++nbChannel)
+ {
vect[nbChannel] = m_Values[nbChannel]->GetUpwardDirectTransmittance();
- }
+ }
return vect;
}
AtmosphericRadiativeTerms::DataVectorType
@@ -429,10 +427,10 @@ AtmosphericRadiativeTerms
::GetUpwardDiffuseTransmittancesForRayleigh()
{
DataVectorType vect(m_Values.size(), 0);
- for (unsigned int nbChannel=0; nbChannel<m_Values.size(); ++nbChannel)
- {
+ for (unsigned int nbChannel = 0; nbChannel < m_Values.size(); ++nbChannel)
+ {
vect[nbChannel] = m_Values[nbChannel]->GetUpwardDiffuseTransmittanceForRayleigh();
- }
+ }
return vect;
}
AtmosphericRadiativeTerms::DataVectorType
@@ -440,10 +438,10 @@ AtmosphericRadiativeTerms
::GetUpwardDiffuseTransmittancesForAerosol()
{
DataVectorType vect(m_Values.size(), 0);
- for (unsigned int nbChannel=0; nbChannel<m_Values.size(); ++nbChannel)
- {
+ for (unsigned int nbChannel = 0; nbChannel < m_Values.size(); ++nbChannel)
+ {
vect[nbChannel] = m_Values[nbChannel]->GetUpwardDiffuseTransmittanceForAerosol();
- }
+ }
return vect;
}
@@ -515,22 +513,26 @@ void
AtmosphericRadiativeTerms
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- for (unsigned int i=0; i<m_Values.size(); ++i)
- {
- os << "Channel "<< i << " : "<< std::endl;
+ for (unsigned int i = 0; i < m_Values.size(); ++i)
+ {
+ os << "Channel " << i << " : " << std::endl;
//ValueType::(os,indent);
- os << indent << "Intrinsic Atmospheric Reflectance : " << m_Values[i]->GetIntrinsicAtmosphericReflectance() << std::endl;
+ os << indent << "Intrinsic Atmospheric Reflectance : " << m_Values[i]->GetIntrinsicAtmosphericReflectance() <<
+ std::endl;
os << indent << "Shperical Albedo of the Atmosphere : " << m_Values[i]->GetSphericalAlbedo() << std::endl;
- os << indent << "Total Gaseous Transmission : " << m_Values[i]->GetTotalGaseousTransmission() << std::endl;
+ os << indent << "Total Gaseous Transmission : " << m_Values[i]->GetTotalGaseousTransmission() <<
+ std::endl;
os << indent << "Atmosphere Downward Transmittance : " << m_Values[i]->GetDownwardTransmittance() << std::endl;
os << indent << "Atmosphere Upward Transmittance : " << m_Values[i]->GetUpwardTransmittance() << std::endl;
- os << indent << "Upward Diffuse Transmittance : " << m_Values[i]->GetUpwardDiffuseTransmittance() << std::endl;
- os << indent << "Upward Direct Transmittance : " << m_Values[i]->GetUpwardDirectTransmittance() << std::endl;
- os << indent << "Rayleigh Upward Diffuse Transmittance : " << m_Values[i]->GetUpwardDiffuseTransmittanceForRayleigh() << std::endl;
- os << indent << "Aerosols Upward Diffuse Transmittance : " << m_Values[i]->GetUpwardDiffuseTransmittanceForAerosol() << std::endl;
- }
+ os << indent << "Upward Diffuse Transmittance : " << m_Values[i]->GetUpwardDiffuseTransmittance() <<
+ std::endl;
+ os << indent << "Upward Direct Transmittance : " << m_Values[i]->GetUpwardDirectTransmittance() <<
+ std::endl;
+ os << indent << "Rayleigh Upward Diffuse Transmittance : " <<
+ m_Values[i]->GetUpwardDiffuseTransmittanceForRayleigh() << std::endl;
+ os << indent << "Aerosols Upward Diffuse Transmittance : " <<
+ m_Values[i]->GetUpwardDiffuseTransmittanceForAerosol() << std::endl;
+ }
}
-
} // end namespace otb
-
diff --git a/Code/Radiometry/otbAtmosphericRadiativeTerms.h b/Code/Radiometry/otbAtmosphericRadiativeTerms.h
index bf39d9bc47..5d132d1f84 100644
--- a/Code/Radiometry/otbAtmosphericRadiativeTerms.h
+++ b/Code/Radiometry/otbAtmosphericRadiativeTerms.h
@@ -23,7 +23,6 @@
#include "itkMacro.h"
#include <vector>
-
namespace otb
{
@@ -39,84 +38,81 @@ class ITK_EXPORT AtmosphericRadiativeTermsSingleChannel : public itk::DataObject
{
public:
/** Standard typedefs */
- typedef AtmosphericRadiativeTermsSingleChannel Self;
- typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef AtmosphericRadiativeTermsSingleChannel Self;
+ typedef itk::DataObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
- itkTypeMacro(AtmosphericRadiativeTermsSingleChannel,DataObject);
+ itkTypeMacro(AtmosphericRadiativeTermsSingleChannel, DataObject);
/** Creation through object factory macro */
itkNewMacro(Self);
-
/**
* Set/Get the intrinsic atmospheric reflectance.
*/
- itkSetMacro(IntrinsicAtmosphericReflectance,double);
- itkGetMacro(IntrinsicAtmosphericReflectance,double);
-
+ itkSetMacro(IntrinsicAtmosphericReflectance, double);
+ itkGetMacro(IntrinsicAtmosphericReflectance, double);
/**
* Set/Get the spherical albedo of the atmosphere.
*/
- itkSetMacro(SphericalAlbedo,double);
- itkGetMacro(SphericalAlbedo,double);
+ itkSetMacro(SphericalAlbedo, double);
+ itkGetMacro(SphericalAlbedo, double);
/**
* Set/Get the total gaseous transmission.
*/
- itkSetMacro(TotalGaseousTransmission,double);
- itkGetMacro(TotalGaseousTransmission,double);
+ itkSetMacro(TotalGaseousTransmission, double);
+ itkGetMacro(TotalGaseousTransmission, double);
/**
* Set/Get the downward transmittance of the atmosphere.
*/
- itkSetMacro(DownwardTransmittance,double);
- itkGetMacro(DownwardTransmittance,double);
+ itkSetMacro(DownwardTransmittance, double);
+ itkGetMacro(DownwardTransmittance, double);
/**
* Set/Get the upward transmittance of the atmosphere.
*/
- itkSetMacro(UpwardTransmittance,double);
- itkGetMacro(UpwardTransmittance,double);
+ itkSetMacro(UpwardTransmittance, double);
+ itkGetMacro(UpwardTransmittance, double);
/**
* Set/Get the upward diffuse transmittance
*/
- itkSetMacro(UpwardDiffuseTransmittance,double);
- itkGetMacro(UpwardDiffuseTransmittance,double);
+ itkSetMacro(UpwardDiffuseTransmittance, double);
+ itkGetMacro(UpwardDiffuseTransmittance, double);
/**
* Set/Get the upward direct transmittance
*/
- itkSetMacro(UpwardDirectTransmittance,double);
- itkGetMacro(UpwardDirectTransmittance,double);
+ itkSetMacro(UpwardDirectTransmittance, double);
+ itkGetMacro(UpwardDirectTransmittance, double);
/**
* Set/Get the upward diffuse transmittance for rayleigh
*/
- itkSetMacro(UpwardDiffuseTransmittanceForRayleigh,double);
- itkGetMacro(UpwardDiffuseTransmittanceForRayleigh,double);
+ itkSetMacro(UpwardDiffuseTransmittanceForRayleigh, double);
+ itkGetMacro(UpwardDiffuseTransmittanceForRayleigh, double);
/**
* Set/Get the upward diffuse transmittance for aerosols
*/
- itkSetMacro(UpwardDiffuseTransmittanceForAerosol,double);
- itkGetMacro(UpwardDiffuseTransmittanceForAerosol,double);
+ itkSetMacro(UpwardDiffuseTransmittanceForAerosol, double);
+ itkGetMacro(UpwardDiffuseTransmittanceForAerosol, double);
protected:
/** Constructor */
AtmosphericRadiativeTermsSingleChannel();
/** Destructor */
- ~AtmosphericRadiativeTermsSingleChannel() {};
+ ~AtmosphericRadiativeTermsSingleChannel() {}
/**PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- AtmosphericRadiativeTermsSingleChannel(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ AtmosphericRadiativeTermsSingleChannel(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The intrinsic atmospheric reflectance. */
double m_IntrinsicAtmosphericReflectance;
@@ -146,7 +142,6 @@ private:
double m_UpwardDiffuseTransmittanceForAerosol;
};
-
/** \class AtmosphericRadiativeTerms
* \brief This class is a vector of AtmosphericRadiativeTermsSingleChannel,
* it contains all atmospheric radiative terms for each studied channel.
@@ -155,67 +150,66 @@ private:
* \ingroup Radiometry
*/
-
class ITK_EXPORT AtmosphericRadiativeTerms : public itk::DataObject
{
public:
/** Standard typedefs */
- typedef AtmosphericRadiativeTerms Self;
- typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef AtmosphericRadiativeTerms Self;
+ typedef itk::DataObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
- itkTypeMacro(AtmosphericRadiativeTerms,DataObject);
+ itkTypeMacro(AtmosphericRadiativeTerms, DataObject);
/** Creation through object factory macro */
itkNewMacro(Self);
- typedef AtmosphericRadiativeTermsSingleChannel::Pointer ValueType;
- typedef std::vector<ValueType> VectorValueType;
- typedef std::vector<double> DataVectorType;
+ typedef AtmosphericRadiativeTermsSingleChannel::Pointer ValueType;
+ typedef std::vector<ValueType> VectorValueType;
+ typedef std::vector<double> DataVectorType;
/**
* Set/Get the values.
*/
- void SetValues( const VectorValueType & val)
+ void SetValues(const VectorValueType& val)
{
m_Values = val;
this->Modified();
- };
- VectorValueType & GetValues()
+ }
+ VectorValueType& GetValues()
{
return m_Values;
- };
- const VectorValueType & GetValues() const
+ }
+ const VectorValueType& GetValues() const
{
return m_Values;
- };
+ }
/** Set/Get the data classified by channel. */
/** Set methods with vectors. */
- void SetIntrinsicAtmosphericReflectances(const DataVectorType & vect);
- void SetSphericalAlbedos(const DataVectorType & vect);
- void SetTotalGaseousTransmissions(const DataVectorType & vect);
- void SetDownwardTransmittances(const DataVectorType & vect);
- void SetUpwardTransmittances(const DataVectorType & vect);
+ void SetIntrinsicAtmosphericReflectances(const DataVectorType& vect);
+ void SetSphericalAlbedos(const DataVectorType& vect);
+ void SetTotalGaseousTransmissions(const DataVectorType& vect);
+ void SetDownwardTransmittances(const DataVectorType& vect);
+ void SetUpwardTransmittances(const DataVectorType& vect);
- void SetUpwardDiffuseTransmittances(const DataVectorType & vect);
- void SetUpwardDirectTransmittances(const DataVectorType & vect);
- void SetUpwardDiffuseTransmittancesForRayleigh(const DataVectorType & vect);
- void SetUpwardDiffuseTransmittancesForAerosol(const DataVectorType & vect);
+ void SetUpwardDiffuseTransmittances(const DataVectorType& vect);
+ void SetUpwardDirectTransmittances(const DataVectorType& vect);
+ void SetUpwardDiffuseTransmittancesForRayleigh(const DataVectorType& vect);
+ void SetUpwardDiffuseTransmittancesForAerosol(const DataVectorType& vect);
/** Set methods with index. */
- void SetValueByIndex(unsigned int id, const ValueType & val);
- void SetIntrinsicAtmosphericReflectance(unsigned int id, const double & val);
- void SetSphericalAlbedo(unsigned int id, const double & val);
- void SetTotalGaseousTransmission(unsigned int id, const double & val);
- void SetDownwardTransmittance(unsigned int id, const double & val );
- void SetUpwardTransmittance(unsigned int id, const double & val );
-
- void SetUpwardDiffuseTransmittance(unsigned int id, const double & val );
- void SetUpwardDirectTransmittance(unsigned int id, const double & val );
- void SetUpwardDiffuseTransmittanceForRayleigh(unsigned int id, const double & val );
- void SetUpwardDiffuseTransmittanceForAerosol(unsigned int id, const double & val );
+ void SetValueByIndex(unsigned int id, const ValueType& val);
+ void SetIntrinsicAtmosphericReflectance(unsigned int id, const double& val);
+ void SetSphericalAlbedo(unsigned int id, const double& val);
+ void SetTotalGaseousTransmission(unsigned int id, const double& val);
+ void SetDownwardTransmittance(unsigned int id, const double& val);
+ void SetUpwardTransmittance(unsigned int id, const double& val);
+
+ void SetUpwardDiffuseTransmittance(unsigned int id, const double& val);
+ void SetUpwardDirectTransmittance(unsigned int id, const double& val);
+ void SetUpwardDiffuseTransmittanceForRayleigh(unsigned int id, const double& val);
+ void SetUpwardDiffuseTransmittanceForAerosol(unsigned int id, const double& val);
/** Get methods with vectors. */
DataVectorType GetIntrinsicAtmosphericReflectances();
@@ -249,13 +243,13 @@ protected:
/** Constructor */
AtmosphericRadiativeTerms();
/** Destructor */
- ~AtmosphericRadiativeTerms() {};
+ ~AtmosphericRadiativeTerms() {}
/**PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- AtmosphericRadiativeTerms(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ AtmosphericRadiativeTerms(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The vector containing each channel information. */
VectorValueType m_Values;
@@ -263,9 +257,6 @@ private:
bool m_IsInitialized;
};
-
} // end namespace otb
#endif
-
-
diff --git a/Code/Radiometry/otbBuiltUpIndicesFunctor.h b/Code/Radiometry/otbBuiltUpIndicesFunctor.h
index 5a9b519ffa..00e62845a5 100644
--- a/Code/Radiometry/otbBuiltUpIndicesFunctor.h
+++ b/Code/Radiometry/otbBuiltUpIndicesFunctor.h
@@ -47,20 +47,20 @@ public:
typedef itk::VariableLengthVector<TInput1> InputVectorType;
// Operator on vector pixel type
- inline TOutput operator()(const InputVectorType & inputVector)
+ inline TOutput operator ()(const InputVectorType& inputVector)
{
- return this->Evaluate(inputVector[m_TM4Index-1],static_cast<TInput2>(inputVector[m_TM5Index-1]));
+ return this->Evaluate(inputVector[m_TM4Index - 1], static_cast<TInput2>(inputVector[m_TM5Index - 1]));
}
// Binary operator
- inline TOutput operator()(const TInput1 &tm4, const TInput2 &tm5)
+ inline TOutput operator ()(const TInput1& tm4, const TInput2& tm5)
{
- return this->Evaluate(tm4,tm5);
- };
+ return this->Evaluate(tm4, tm5);
+ }
/// Constructor
- TM4AndTM5IndexBase() : m_TM4Index(4), m_TM5Index(5) {};
+ TM4AndTM5IndexBase() : m_TM4Index(4), m_TM5Index(5) {}
/// Desctructor
- virtual ~TM4AndTM5IndexBase() {};
+ virtual ~TM4AndTM5IndexBase() {}
/// Set TM4 Index
void SetIndex1(unsigned int channel)
@@ -85,14 +85,13 @@ public:
protected:
// This method must be reimplemented in subclasses to actually
// compute the index value
- virtual TOutput Evaluate(const TInput1 & tm4, const TInput2 & tm5) const = 0;
+ virtual TOutput Evaluate(const TInput1& tm4, const TInput2& tm5) const = 0;
private:
unsigned int m_TM4Index;
unsigned int m_TM5Index;
};
-
/** \class NDBI
* \brief This functor computes the Normalized Difference Built Up Index (NDBI)
*
@@ -102,25 +101,25 @@ private:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TOutput>
-class NDBI : public TM4AndTM5IndexBase<TInput1,TInput2,TOutput>
+class NDBI : public TM4AndTM5IndexBase<TInput1, TInput2, TOutput>
{
public:
/// Constructor
- NDBI() {};
+ NDBI() {}
/// Desctructor
- virtual ~NDBI() {};
+ virtual ~NDBI() {}
// Operator on r and nir single pixel values
protected:
- inline TOutput Evaluate(const TInput1 &pTM4, const TInput2 &pTM5) const
+ inline TOutput Evaluate(const TInput1& pTM4, const TInput2& pTM5) const
{
double dTM4 = static_cast<double>(pTM4);
double dTM5 = static_cast<double>(pTM5);
- if ( dTM5+dTM4 == 0 )
+ if (dTM5 + dTM4 == 0)
{
return static_cast<TOutput>(0.);
}
- return ( static_cast<TOutput>((dTM5-dTM4)/(dTM5+dTM4)) );
+ return (static_cast<TOutput>((dTM5 - dTM4) / (dTM5 + dTM4)));
}
};
@@ -133,44 +132,44 @@ protected:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TOutput>
-class ISU : public RAndNIRIndexBase<TInput1,TInput2,TOutput>
+class ISU : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
/// Constructor
- ISU() : m_A(100.), m_B(25.) {};
+ ISU() : m_A(100.), m_B(25.) {}
/// Desctructor
- virtual ~ISU() {};
+ virtual ~ISU() {}
/** Set/Get A correction */
void SetA(const double pA)
{
m_A = pA;
}
- double GetA(void)const
+ double GetA(void) const
{
- return ( m_A );
+ return (m_A);
}
/** Set/Get B correction */
void SetB(const double pB)
{
m_B = pB;
}
- double GetB(void)const
+ double GetB(void) const
{
- return ( m_B );
+ return (m_B);
}
protected:
- inline TOutput Evaluate(const TInput1 &pRed, const TInput2 &pNIR) const
+ inline TOutput Evaluate(const TInput1& pRed, const TInput2& pNIR) const
{
double dRed = static_cast<double>(pRed);
double dNIR = static_cast<double>(pNIR);
- if ( dNIR == 0 )
+ if (dNIR == 0)
{
return static_cast<TOutput>(0.);
}
- return ( static_cast<TOutput>(m_A - (m_B*dRed)/(dNIR)) );
+ return (static_cast<TOutput>(m_A - (m_B * dRed) / (dNIR)));
}
private:
@@ -178,7 +177,6 @@ private:
double m_B;
};
-
} // namespace Functor
} // namespace otb
diff --git a/Code/Radiometry/otbDEMCaracteristicsExtractor.h b/Code/Radiometry/otbDEMCaracteristicsExtractor.h
index 30a2b5ce61..391f5d6347 100644
--- a/Code/Radiometry/otbDEMCaracteristicsExtractor.h
+++ b/Code/Radiometry/otbDEMCaracteristicsExtractor.h
@@ -21,7 +21,6 @@
#ifndef __otbDEMCaracteristicsExtractor_h
#define __otbDEMCaracteristicsExtractor_h
-
#include "otbImage.h"
#include "otbVectorImage.h"
#include "itkImageToImageFilter.h"
@@ -53,24 +52,24 @@ namespace otb
* \ingroup DEMToImageGenerator
* \ingroup Radiometry
*/
-template <class TInputImage, class TOutputImage >
+template <class TInputImage, class TOutputImage>
class ITK_EXPORT DEMCaracteristicsExtractor :
- public itk::ImageToImageFilter<TInputImage, TOutputImage>
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** Extract input and output images dimensions.*/
- itkStaticConstMacro( InputImageDimension, unsigned int, TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
/** "typedef" to simplify the variables definition and the declaration. */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
/** "typedef" for standard classes. */
- typedef DEMCaracteristicsExtractor Self;
- typedef itk::ImageToImageFilter< TInputImage, OutputImageType > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef DEMCaracteristicsExtractor Self;
+ typedef itk::ImageToImageFilter<TInputImage, OutputImageType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** object factory method. */
itkNewMacro(Self);
@@ -79,53 +78,54 @@ public:
itkTypeMacro(DEMCaracteristicsExtractor, ImageToImageFilter);
/** Supported images definition. */
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::InternalPixelType InputInternalPixelType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
- typedef itk::CovariantVector< InputInternalPixelType, 2 > VectorPixelType;
- typedef Image< VectorPixelType, 2 > VectorGradientImageType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::InternalPixelType InputInternalPixelType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
+ typedef itk::CovariantVector<InputInternalPixelType, 2> VectorPixelType;
+ typedef Image<VectorPixelType, 2> VectorGradientImageType;
/** Filter definition */
- typedef itk::GradientMagnitudeImageFilter<InputImageType, OutputImageType> GradientMagnitudeFilterType;
- typedef itk::GradientImageFilter<InputImageType, InputInternalPixelType, InputInternalPixelType> GradientRecursiveGaussianImageFilterType;
- typedef typename GradientRecursiveGaussianImageFilterType::OutputImageType tutuType;
- typedef itk::NthElementImageAdaptor<tutuType, InputInternalPixelType> AdaptorType;
- typedef itk::Atan2ImageFilter<AdaptorType, AdaptorType, OutputImageType> Atan2FilterType;
- typedef itk::AtanImageFilter<OutputImageType, OutputImageType> AtanFilterType;
+ typedef itk::GradientMagnitudeImageFilter<InputImageType,
+ OutputImageType> GradientMagnitudeFilterType;
+ typedef itk::GradientImageFilter<InputImageType, InputInternalPixelType,
+ InputInternalPixelType> GradientRecursiveGaussianImageFilterType;
+ typedef typename GradientRecursiveGaussianImageFilterType::OutputImageType tutuType;
+ typedef itk::NthElementImageAdaptor<tutuType, InputInternalPixelType> AdaptorType;
+ typedef itk::Atan2ImageFilter<AdaptorType, AdaptorType, OutputImageType> Atan2FilterType;
+ typedef itk::AtanImageFilter<OutputImageType, OutputImageType> AtanFilterType;
/** Operation Filters*/
- typedef MultiplyByScalarImageFilter<OutputImageType, OutputImageType> MultiplyByScalarImageFilterType;
- typedef itk::MultiplyImageFilter<OutputImageType, OutputImageType, OutputImageType> MultiplyImageFilterType;
- typedef itk::AcosImageFilter<OutputImageType, OutputImageType> AcosImageFilterType;
- typedef itk::CosImageFilter<OutputImageType, OutputImageType> CosImageFilterType;
- typedef itk::SinImageFilter<OutputImageType, OutputImageType> SinImageFilterType;
- typedef itk::ShiftScaleImageFilter<OutputImageType, OutputImageType> ShiftScaleImageFilterType;
- typedef itk::AddImageFilter<OutputImageType, OutputImageType, OutputImageType> AddImageFilterType;
+ typedef MultiplyByScalarImageFilter<OutputImageType, OutputImageType> MultiplyByScalarImageFilterType;
+ typedef itk::MultiplyImageFilter<OutputImageType, OutputImageType, OutputImageType> MultiplyImageFilterType;
+ typedef itk::AcosImageFilter<OutputImageType, OutputImageType> AcosImageFilterType;
+ typedef itk::CosImageFilter<OutputImageType, OutputImageType> CosImageFilterType;
+ typedef itk::SinImageFilter<OutputImageType, OutputImageType> SinImageFilterType;
+ typedef itk::ShiftScaleImageFilter<OutputImageType, OutputImageType> ShiftScaleImageFilterType;
+ typedef itk::AddImageFilter<OutputImageType, OutputImageType, OutputImageType> AddImageFilterType;
/** Get the slop output image */
OutputImageType* GetSlopOutput()
{
- return static_cast<OutputImageType*>( this->itk::ProcessObject::GetOutput(0) );
- };
+ return static_cast<OutputImageType*>(this->itk::ProcessObject::GetOutput(0));
+ }
/** Get the aspect output image */
OutputImageType* GetAspectOutput()
{
- return static_cast<OutputImageType*>( this->itk::ProcessObject::GetOutput(1) );
- };
+ return static_cast<OutputImageType*>(this->itk::ProcessObject::GetOutput(1));
+ }
/** Get the incidence output image */
OutputImageType* GetIncidenceOutput()
{
- return static_cast<OutputImageType*>( this->itk::ProcessObject::GetOutput(2) );
- };
+ return static_cast<OutputImageType*>(this->itk::ProcessObject::GetOutput(2));
+ }
/** Get the exitance output image */
OutputImageType* GetExitanceOutput()
{
- return static_cast<OutputImageType*>( this->itk::ProcessObject::GetOutput(3) );
- };
-
+ return static_cast<OutputImageType*>(this->itk::ProcessObject::GetOutput(3));
+ }
/** Angle parameters*/
/** Set/Get Solar Angle */
@@ -149,7 +149,6 @@ protected:
void GenerateData();
-
private:
/** Angle parameters*/
/** Solar Angle */
@@ -169,4 +168,3 @@ private:
#endif
#endif
-
diff --git a/Code/Radiometry/otbDEMCaracteristicsExtractor.txx b/Code/Radiometry/otbDEMCaracteristicsExtractor.txx
index 9eee81e2c6..8fdf86785e 100644
--- a/Code/Radiometry/otbDEMCaracteristicsExtractor.txx
+++ b/Code/Radiometry/otbDEMCaracteristicsExtractor.txx
@@ -36,10 +36,10 @@ DEMCaracteristicsExtractor<TInputImage, TOutputImage>
this->SetNumberOfInputs(1);
this->SetNumberOfOutputs(3);
- this->SetNthOutput(0,OutputImageType::New());
- this->SetNthOutput(1,OutputImageType::New());
- this->SetNthOutput(2,OutputImageType::New());
- this->SetNthOutput(3,OutputImageType::New());
+ this->SetNthOutput(0, OutputImageType::New());
+ this->SetNthOutput(1, OutputImageType::New());
+ this->SetNthOutput(2, OutputImageType::New());
+ this->SetNthOutput(3, OutputImageType::New());
m_SolarAngle = 0;
m_SolarAzimut = 0;
@@ -47,20 +47,18 @@ DEMCaracteristicsExtractor<TInputImage, TOutputImage>
m_ViewAzimut = 0;
}
-
template <class TInputImage, class TOutputImage>
DEMCaracteristicsExtractor<TInputImage, TOutputImage>
::~DEMCaracteristicsExtractor()
{
}
-
/**
* ThreadedGenerateData Performs the pixel-wise addition
*/
template <class TInputImage, class TOutputImage>
void
-DEMCaracteristicsExtractor<TInputImage,TOutputImage>
+DEMCaracteristicsExtractor<TInputImage, TOutputImage>
::GenerateData()
{
// Input and output pointer definition
@@ -73,9 +71,10 @@ DEMCaracteristicsExtractor<TInputImage,TOutputImage>
// Gradient Magnitude Image Filter used to compute the slope.
typename GradientMagnitudeFilterType::Pointer GradientMagnitudeFilter = GradientMagnitudeFilterType::New();
// Gradient Recursive Gaussian Image Filter used to compute the aspect.
- typename GradientRecursiveGaussianImageFilterType::Pointer GradientRecursiveGaussianFilter= GradientRecursiveGaussianImageFilterType::New();
+ typename GradientRecursiveGaussianImageFilterType::Pointer GradientRecursiveGaussianFilter =
+ GradientRecursiveGaussianImageFilterType::New();
// Atan used to compute the slop
- typename AtanFilterType::Pointer AtanFilter = AtanFilterType::New();
+ typename AtanFilterType::Pointer AtanFilter = AtanFilterType::New();
// Atan2 Image Filter used to compute the aspect.
typename Atan2FilterType::Pointer AspectFilter = Atan2FilterType::New();
// Inverse cosinus Image filter used to compute the incidence image
@@ -85,19 +84,19 @@ DEMCaracteristicsExtractor<TInputImage,TOutputImage>
// Degrees To Radian _-> Radian To Degree coefficient
double rad2degCoef;
- rad2degCoef = 180/CONST_PI;
+ rad2degCoef = 180 / CONST_PI;
// Slop calculation
GradientMagnitudeFilter->SetInput(inputPtr);
- AtanFilter->SetInput( GradientMagnitudeFilter->GetOutput() );
+ AtanFilter->SetInput(GradientMagnitudeFilter->GetOutput());
// Transform values from radian to degrees.
typename MultiplyByScalarImageFilterType::Pointer rad2DegFilter = MultiplyByScalarImageFilterType::New();
//rad2DegFilter->SetInput( GradientMagnitudeFilter->GetOutput() );
- rad2DegFilter->SetInput( AtanFilter->GetOutput() );
- rad2DegFilter->SetCoef( rad2degCoef );
- rad2DegFilter->GraftOutput( SlopOutputPtr );
+ rad2DegFilter->SetInput(AtanFilter->GetOutput());
+ rad2DegFilter->SetCoef(rad2degCoef);
+ rad2DegFilter->GraftOutput(SlopOutputPtr);
rad2DegFilter->Update();
- this->GraftNthOutput( 0, rad2DegFilter->GetOutput() );
+ this->GraftNthOutput(0, rad2DegFilter->GetOutput());
// Aspect calcultation
GradientRecursiveGaussianFilter->SetInput(inputPtr);
@@ -115,108 +114,105 @@ DEMCaracteristicsExtractor<TInputImage,TOutputImage>
AspectFilter->SetInput2(YAdaptator);
// // Transform values from radian to degres.
typename MultiplyByScalarImageFilterType::Pointer rad2DegFilter1 = MultiplyByScalarImageFilterType::New();
- rad2DegFilter1->SetInput( AspectFilter->GetOutput() );
- rad2DegFilter1->SetCoef( rad2degCoef );
- rad2DegFilter1->GraftOutput( AspectOutputPtr );
+ rad2DegFilter1->SetInput(AspectFilter->GetOutput());
+ rad2DegFilter1->SetCoef(rad2degCoef);
+ rad2DegFilter1->GraftOutput(AspectOutputPtr);
rad2DegFilter1->Update();
- this->GraftNthOutput( 1, rad2DegFilter1->GetOutput() );
-
+ this->GraftNthOutput(1, rad2DegFilter1->GetOutput());
// Angle calculation :
// sin(slop)
typename SinImageFilterType::Pointer sinS = SinImageFilterType::New();
- sinS->SetInput( GradientMagnitudeFilter->GetOutput() );
+ sinS->SetInput(GradientMagnitudeFilter->GetOutput());
// cos (slop)
typename CosImageFilterType::Pointer cosS = CosImageFilterType::New();
- cosS->SetInput( GradientMagnitudeFilter->GetOutput() );
+ cosS->SetInput(GradientMagnitudeFilter->GetOutput());
// -aspect
typename MultiplyByScalarImageFilterType::Pointer oppositeFilter = MultiplyByScalarImageFilterType::New();
- oppositeFilter->SetInput( AspectFilter->GetOutput() );
- oppositeFilter->SetCoef( -1 );
+ oppositeFilter->SetInput(AspectFilter->GetOutput());
+ oppositeFilter->SetCoef(-1);
// Incidence calculation
typename ShiftScaleImageFilterType::Pointer addAzimut = ShiftScaleImageFilterType::New();
addAzimut->SetScale(1.);
- addAzimut->SetShift( m_SolarAzimut/rad2degCoef );
- addAzimut->SetInput( oppositeFilter->GetOutput() );
+ addAzimut->SetShift(m_SolarAzimut / rad2degCoef);
+ addAzimut->SetInput(oppositeFilter->GetOutput());
typename CosImageFilterType::Pointer cosAAzimut = CosImageFilterType::New();
- cosAAzimut->SetInput( addAzimut->GetOutput() );
+ cosAAzimut->SetInput(addAzimut->GetOutput());
typename MultiplyByScalarImageFilterType::Pointer sinSsinSolarAngleFilter = MultiplyByScalarImageFilterType::New();
- sinSsinSolarAngleFilter->SetCoef( vcl_sin(m_SolarAngle/rad2degCoef ));
- sinSsinSolarAngleFilter->SetInput( sinS->GetOutput() );
+ sinSsinSolarAngleFilter->SetCoef(vcl_sin(m_SolarAngle / rad2degCoef));
+ sinSsinSolarAngleFilter->SetInput(sinS->GetOutput());
typename MultiplyImageFilterType::Pointer cosAAzimuthsinSsinAngle = MultiplyImageFilterType::New();
- cosAAzimuthsinSsinAngle->SetInput1( sinSsinSolarAngleFilter->GetOutput() );
- cosAAzimuthsinSsinAngle->SetInput2( cosAAzimut->GetOutput() );
+ cosAAzimuthsinSsinAngle->SetInput1(sinSsinSolarAngleFilter->GetOutput());
+ cosAAzimuthsinSsinAngle->SetInput2(cosAAzimut->GetOutput());
typename MultiplyByScalarImageFilterType::Pointer cosScosSolarAngleFilter = MultiplyByScalarImageFilterType::New();
- cosScosSolarAngleFilter->SetCoef( vcl_cos(m_SolarAngle/rad2degCoef) );
- cosScosSolarAngleFilter->SetInput( cosS->GetOutput() );
+ cosScosSolarAngleFilter->SetCoef(vcl_cos(m_SolarAngle / rad2degCoef));
+ cosScosSolarAngleFilter->SetInput(cosS->GetOutput());
typename AddImageFilterType::Pointer cosIncidence = AddImageFilterType::New();
- cosIncidence->SetInput1( cosAAzimuthsinSsinAngle->GetOutput() );
- cosIncidence->SetInput2( cosScosSolarAngleFilter->GetOutput() );
+ cosIncidence->SetInput1(cosAAzimuthsinSsinAngle->GetOutput());
+ cosIncidence->SetInput2(cosScosSolarAngleFilter->GetOutput());
- IncidenceFilter->SetInput( cosIncidence->GetOutput() );
+ IncidenceFilter->SetInput(cosIncidence->GetOutput());
// // Change radians in degres
typename MultiplyByScalarImageFilterType::Pointer rad2DegFilter2 = MultiplyByScalarImageFilterType::New();
- rad2DegFilter2->SetInput( IncidenceFilter->GetOutput() );
- rad2DegFilter2->SetCoef( rad2degCoef );
+ rad2DegFilter2->SetInput(IncidenceFilter->GetOutput());
+ rad2DegFilter2->SetCoef(rad2degCoef);
// // Link to the output
- rad2DegFilter2->GraftOutput( IncidenceOutputPtr );
+ rad2DegFilter2->GraftOutput(IncidenceOutputPtr);
rad2DegFilter2->Update();
- this->GraftNthOutput( 2, rad2DegFilter2->GetOutput() );
-
+ this->GraftNthOutput(2, rad2DegFilter2->GetOutput());
// Exitance calculation
typename ShiftScaleImageFilterType::Pointer addAzimut2 = ShiftScaleImageFilterType::New();
addAzimut2->SetScale(1.);
- addAzimut2->SetShift( m_ViewAzimut/rad2degCoef );
- addAzimut2->SetInput( oppositeFilter->GetOutput() );
+ addAzimut2->SetShift(m_ViewAzimut / rad2degCoef);
+ addAzimut2->SetInput(oppositeFilter->GetOutput());
typename CosImageFilterType::Pointer cosAAzimut2 = CosImageFilterType::New();
- cosAAzimut2->SetInput( addAzimut2->GetOutput() );
+ cosAAzimut2->SetInput(addAzimut2->GetOutput());
typename MultiplyByScalarImageFilterType::Pointer sinSsinSolarAngleFilter2 = MultiplyByScalarImageFilterType::New();
- sinSsinSolarAngleFilter2->SetCoef( vcl_sin(m_ViewAngle/rad2degCoef) );
- sinSsinSolarAngleFilter2->SetInput( sinS->GetOutput() );
+ sinSsinSolarAngleFilter2->SetCoef(vcl_sin(m_ViewAngle / rad2degCoef));
+ sinSsinSolarAngleFilter2->SetInput(sinS->GetOutput());
typename MultiplyImageFilterType::Pointer cosAAzimuthsinSsinAngle2 = MultiplyImageFilterType::New();
- cosAAzimuthsinSsinAngle2->SetInput1( sinSsinSolarAngleFilter2->GetOutput() );
- cosAAzimuthsinSsinAngle2->SetInput2( cosAAzimut2->GetOutput() );
-
+ cosAAzimuthsinSsinAngle2->SetInput1(sinSsinSolarAngleFilter2->GetOutput());
+ cosAAzimuthsinSsinAngle2->SetInput2(cosAAzimut2->GetOutput());
typename MultiplyByScalarImageFilterType::Pointer cosScosSolarAngleFilter2 = MultiplyByScalarImageFilterType::New();
- cosScosSolarAngleFilter2->SetCoef( vcl_cos(m_ViewAngle/rad2degCoef) );
- cosScosSolarAngleFilter2->SetInput( cosS->GetOutput() );
+ cosScosSolarAngleFilter2->SetCoef(vcl_cos(m_ViewAngle / rad2degCoef));
+ cosScosSolarAngleFilter2->SetInput(cosS->GetOutput());
typename AddImageFilterType::Pointer cosIncidence2 = AddImageFilterType::New();
- cosIncidence2->SetInput1( cosAAzimuthsinSsinAngle2->GetOutput() );
- cosIncidence2->SetInput2( cosScosSolarAngleFilter2->GetOutput() );
+ cosIncidence2->SetInput1(cosAAzimuthsinSsinAngle2->GetOutput());
+ cosIncidence2->SetInput2(cosScosSolarAngleFilter2->GetOutput());
- ExitanceFilter->SetInput( cosIncidence2->GetOutput() );
+ ExitanceFilter->SetInput(cosIncidence2->GetOutput());
// // Change radians in degres
typename MultiplyByScalarImageFilterType::Pointer rad2DegFilter3 = MultiplyByScalarImageFilterType::New();
- rad2DegFilter3->SetInput( ExitanceFilter->GetOutput() );
- rad2DegFilter3->SetCoef( rad2degCoef );
+ rad2DegFilter3->SetInput(ExitanceFilter->GetOutput());
+ rad2DegFilter3->SetCoef(rad2degCoef);
// // Link to the output
- rad2DegFilter3->GraftOutput( ExitanceOutputPtr );
+ rad2DegFilter3->GraftOutput(ExitanceOutputPtr);
rad2DegFilter3->Update();
- this->GraftNthOutput( 3, rad2DegFilter3->GetOutput() );
+ this->GraftNthOutput(3, rad2DegFilter3->GetOutput());
}
/**PrintSelf method */
template <class TInputImage, class TOutputImage>
void
-DEMCaracteristicsExtractor<TInputImage,TOutputImage>
+DEMCaracteristicsExtractor<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
os << indent << "Solar Angle: " << m_SolarAngle << std::endl;
os << indent << "Solar Azimut: " << m_SolarAzimut << std::endl;
os << indent << "View Angle: " << m_ViewAngle << std::endl;
diff --git a/Code/Radiometry/otbGAndRIndexImageFilter.h b/Code/Radiometry/otbGAndRIndexImageFilter.h
index b750613452..7c6d6365d6 100644
--- a/Code/Radiometry/otbGAndRIndexImageFilter.h
+++ b/Code/Radiometry/otbGAndRIndexImageFilter.h
@@ -32,41 +32,42 @@ namespace otb
*/
template <class TInputImageG, class TInputImageR, class TOutputImage,
-class TFunction = Functor::IR< typename TInputImageG::PixelType,
-typename TInputImageR::PixelType,
-typename TOutputImage::PixelType > >
-class ITK_EXPORT GAndRIndexImageFilter : public itk::BinaryFunctorImageFilter< TInputImageG, TInputImageR, TOutputImage, TFunction >
+ class TFunction = Functor::IR<typename TInputImageG::PixelType,
+ typename TInputImageR::PixelType,
+ typename TOutputImage::PixelType> >
+class ITK_EXPORT GAndRIndexImageFilter : public itk::BinaryFunctorImageFilter<TInputImageG, TInputImageR, TOutputImage,
+ TFunction>
{
public:
/** Standard typedefs */
- typedef GAndRIndexImageFilter Self;
- typedef itk::BinaryFunctorImageFilter< TInputImageG, TInputImageR, TOutputImage, TFunction > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef GAndRIndexImageFilter Self;
+ typedef itk::BinaryFunctorImageFilter<TInputImageG, TInputImageR, TOutputImage, TFunction> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(GAndRIndexImageFilter,BinaryFunctorImageFilter);
+ itkTypeMacro(GAndRIndexImageFilter, BinaryFunctorImageFilter);
- void SetInputG( const TInputImageG * image1 );
- void SetInputR( const TInputImageR * image2 );
+ void SetInputG(const TInputImageG * image1);
+ void SetInputR(const TInputImageR * image2);
/** Template parameters typedefs */
- typedef typename Superclass::Input1ImageType GInputImageType;
- typedef typename Superclass::Input1ImagePointer GInputImagePointer;
- typedef typename Superclass::Input2ImageType RInputImageType;
- typedef typename Superclass::Input2ImagePointer RInputImagePointer;
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::OutputImagePointer OutputImagePointer;
- typedef typename Superclass::FunctorType FunctorType;
+ typedef typename Superclass::Input1ImageType GInputImageType;
+ typedef typename Superclass::Input1ImagePointer GInputImagePointer;
+ typedef typename Superclass::Input2ImageType RInputImageType;
+ typedef typename Superclass::Input2ImagePointer RInputImagePointer;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::OutputImagePointer OutputImagePointer;
+ typedef typename Superclass::FunctorType FunctorType;
typedef typename Superclass::OutputImageRegionType OutputImageRegionType;
protected:
GAndRIndexImageFilter();
- virtual ~GAndRIndexImageFilter() {};
+ virtual ~GAndRIndexImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -74,9 +75,8 @@ protected:
int threadId );
*/
private:
- GAndRIndexImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ GAndRIndexImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -86,5 +86,4 @@ private:
#include "otbGAndRIndexImageFilter.txx"
#endif
-
#endif
diff --git a/Code/Radiometry/otbGAndRIndexImageFilter.txx b/Code/Radiometry/otbGAndRIndexImageFilter.txx
index 11d0fd84ae..92ab31b5e4 100644
--- a/Code/Radiometry/otbGAndRIndexImageFilter.txx
+++ b/Code/Radiometry/otbGAndRIndexImageFilter.txx
@@ -31,42 +31,39 @@ namespace otb
* Constructor
*/
template <class TInputImageG, class TInputImageR,
-class TOutputImage, class TFunction >
-GAndRIndexImageFilter<TInputImageG,TInputImageR,TOutputImage,TFunction>
+ class TOutputImage, class TFunction>
+GAndRIndexImageFilter<TInputImageG, TInputImageR, TOutputImage, TFunction>
::GAndRIndexImageFilter()
{
}
-
/**
* Connect one of the operands for pixel-wise addition
*/
template <class TInputImageG, class TInputImageR,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-GAndRIndexImageFilter<TInputImageG,TInputImageR,TOutputImage,TFunction>
-::SetInputG( const TInputImageG * image1 )
+GAndRIndexImageFilter<TInputImageG, TInputImageR, TOutputImage, TFunction>
+::SetInputG(const TInputImageG * image1)
{
// Process object is not const-correct so the const casting is required.
- SetInput1( image1 );
+ SetInput1(image1);
}
-
/**
* Connect one of the operands for pixel-wise addition
*/
template <class TInputImageG, class TInputImageR,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-GAndRIndexImageFilter<TInputImageG,TInputImageR,TOutputImage,TFunction>
-::SetInputR( const TInputImageR * image2 )
+GAndRIndexImageFilter<TInputImageG, TInputImageR, TOutputImage, TFunction>
+::SetInputR(const TInputImageR * image2)
{
// Process object is not const-correct so the const casting is required.
// SetNthInput(1, const_cast<TInputImageR *>( image2 ));
- SetInput2( image2 );
+ SetInput2(image2);
}
-
/**
* ThreadedGenerateData Performs the pixel-wise addition
*/
@@ -109,12 +106,12 @@ GAndRIndexImageFilter<TInputImageG, TInputImageR, TOutputImage, TFunction>
}
*/
-template <class TInputImageG, class TInputImageR, class TOutputImage, class TFunction >
+template <class TInputImageG, class TInputImageR, class TOutputImage, class TFunction>
void
GAndRIndexImageFilter<TInputImageG, TInputImageR, TOutputImage, TFunction>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
}
diff --git a/Code/Radiometry/otbImageToLuminanceImageFilter.h b/Code/Radiometry/otbImageToLuminanceImageFilter.h
index 3bfa54e742..816c0858c4 100644
--- a/Code/Radiometry/otbImageToLuminanceImageFilter.h
+++ b/Code/Radiometry/otbImageToLuminanceImageFilter.h
@@ -31,7 +31,6 @@
#include "otbImageMetadataInterfaceBase.h"
#include "otbImageMetadataInterfaceFactory.h"
-
#include <fstream>
namespace otb
@@ -51,36 +50,35 @@ template <class TInput, class TOutput>
class ImageToLuminanceImageFunctor
{
public:
- ImageToLuminanceImageFunctor():
+ ImageToLuminanceImageFunctor() :
m_Alpha(1.),
m_Beta(0.)
- {};
+ {}
- virtual ~ImageToLuminanceImageFunctor() {};
+ virtual ~ImageToLuminanceImageFunctor() {}
void SetAlpha(double alpha)
{
m_Alpha = alpha;
- };
+ }
void SetBeta(double beta)
{
m_Beta = beta;
- };
+ }
double GetAlpha()
{
return m_Alpha;
- };
+ }
double GetBeta()
{
return m_Beta;
- };
-
+ }
- inline TOutput operator() (const TInput & inPixel) const
+ inline TOutput operator ()(const TInput& inPixel) const
{
TOutput outPixel;
- double temp;
- temp = static_cast<double>(inPixel)/m_Alpha + m_Beta;
+ double temp;
+ temp = static_cast<double>(inPixel) / m_Alpha + m_Beta;
outPixel = static_cast<TOutput>(temp);
return outPixel;
}
@@ -106,28 +104,31 @@ private:
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT ImageToLuminanceImageFilter :
- public UnaryImageFunctorWithVectorImageFilter< TInputImage,
- TOutputImage,
- ITK_TYPENAME Functor::ImageToLuminanceImageFunctor< ITK_TYPENAME TInputImage::InternalPixelType,
- ITK_TYPENAME TOutputImage::InternalPixelType > >
+ public UnaryImageFunctorWithVectorImageFilter<TInputImage,
+ TOutputImage,
+ ITK_TYPENAME Functor::ImageToLuminanceImageFunctor<ITK_TYPENAME
+ TInputImage::
+ InternalPixelType,
+ ITK_TYPENAME
+ TOutputImage::
+ InternalPixelType> >
{
public:
/** Extract input and output images dimensions.*/
- itkStaticConstMacro( InputImageDimension, unsigned int, TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
/** "typedef" to simplify the variables definition and the declaration. */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
typedef typename Functor::ImageToLuminanceImageFunctor<ITK_TYPENAME InputImageType::InternalPixelType,
- ITK_TYPENAME OutputImageType::InternalPixelType> FunctorType;
-
+ ITK_TYPENAME OutputImageType::InternalPixelType> FunctorType;
/** "typedef" for standard classes. */
- typedef ImageToLuminanceImageFilter Self;
- typedef UnaryImageFunctorWithVectorImageFilter< InputImageType, OutputImageType, FunctorType > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageToLuminanceImageFilter Self;
+ typedef UnaryImageFunctorWithVectorImageFilter<InputImageType, OutputImageType, FunctorType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** object factory method. */
itkNewMacro(Self);
@@ -136,15 +137,14 @@ public:
itkTypeMacro(ImageToLuminanceImageFilter, UnaryImageFunctorWithVectorImageFiltermageFilter);
/** Supported images definition. */
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::InternalPixelType InputInternalPixelType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
-
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::InternalPixelType InputInternalPixelType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename itk::VariableLengthVector<double> VectorType;
+ typedef typename itk::VariableLengthVector<double> VectorType;
/** Image size "typedef" definition. */
typedef typename InputImageType::SizeType SizeType;
@@ -160,53 +160,52 @@ public:
/** Give the absolute calibration bias. */
itkGetConstReferenceMacro(Beta, VectorType);
-
protected:
/** Constructor */
ImageToLuminanceImageFilter()
- {
+ {
m_Alpha.SetSize(0);
m_Beta.SetSize(0);
- };
+ };
/** Destructor */
- virtual ~ImageToLuminanceImageFilter() {};
+ virtual ~ImageToLuminanceImageFilter() {}
/** Update the functor list and input parameters */
virtual void BeforeThreadedGenerateData(void)
{
- ImageMetadataInterfaceBase::Pointer imageMetadataInterface = ImageMetadataInterfaceFactory::CreateIMI(this->GetInput()->GetMetaDataDictionary());
- if(m_Alpha.GetSize() == 0)
- {
+ ImageMetadataInterfaceBase::Pointer imageMetadataInterface = ImageMetadataInterfaceFactory::CreateIMI(
+ this->GetInput()->GetMetaDataDictionary());
+ if (m_Alpha.GetSize() == 0)
+ {
m_Alpha = imageMetadataInterface->GetPhysicalGain(this->GetInput()->GetMetaDataDictionary());
- }
+ }
- if(m_Beta.GetSize() == 0)
- {
+ if (m_Beta.GetSize() == 0)
+ {
m_Beta = imageMetadataInterface->GetPhysicalBias(this->GetInput()->GetMetaDataDictionary());
- }
+ }
if ((m_Alpha.GetSize() != this->GetInput()->GetNumberOfComponentsPerPixel())
- || (m_Beta.GetSize() != this->GetInput()->GetNumberOfComponentsPerPixel()))
- {
- itkExceptionMacro(<<"Alpha and Beta parameters should have the same size as the number of bands");
- }
+ || (m_Beta.GetSize() != this->GetInput()->GetNumberOfComponentsPerPixel()))
+ {
+ itkExceptionMacro(<< "Alpha and Beta parameters should have the same size as the number of bands");
+ }
- otbMsgDevMacro( << "Using correction parameters: ");
- otbMsgDevMacro( << "Alpha (gain): " << m_Alpha);
- otbMsgDevMacro( << "Beta (bias): " << m_Beta);
+ otbMsgDevMacro(<< "Using correction parameters: ");
+ otbMsgDevMacro(<< "Alpha (gain): " << m_Alpha);
+ otbMsgDevMacro(<< "Beta (bias): " << m_Beta);
this->GetFunctorVector().clear();
- for (unsigned int i = 0;i<this->GetInput()->GetNumberOfComponentsPerPixel();++i)
- {
+ for (unsigned int i = 0; i < this->GetInput()->GetNumberOfComponentsPerPixel(); ++i)
+ {
FunctorType functor;
functor.SetAlpha(m_Alpha[i]);
functor.SetBeta(m_Beta[i]);
this->GetFunctorVector().push_back(functor);
- }
+ }
}
-
private:
/** Ponderation declaration*/
VectorType m_Alpha;
diff --git a/Code/Radiometry/otbImageToReflectanceImageFilter.h b/Code/Radiometry/otbImageToReflectanceImageFilter.h
index 0c8959f82c..e00ddaf1f5 100644
--- a/Code/Radiometry/otbImageToReflectanceImageFilter.h
+++ b/Code/Radiometry/otbImageToReflectanceImageFilter.h
@@ -29,7 +29,6 @@
#include "itkNumericTraits.h"
#include "itkVariableLengthVector.h"
-
namespace otb
{
namespace Functor
@@ -49,47 +48,47 @@ template <class TInput, class TOutput>
class ImageToReflectanceImageFunctor
{
public:
- ImageToReflectanceImageFunctor() {};
- virtual ~ImageToReflectanceImageFunctor() {};
+ ImageToReflectanceImageFunctor() {}
+ virtual ~ImageToReflectanceImageFunctor() {}
- typedef Functor::ImageToLuminanceImageFunctor<TInput, TOutput> ImToLumFunctorType;
- typedef Functor::LuminanceToReflectanceImageFunctor<TInput, TOutput> LumToReflecFunctorType;
+ typedef Functor::ImageToLuminanceImageFunctor<TInput, TOutput> ImToLumFunctorType;
+ typedef Functor::LuminanceToReflectanceImageFunctor<TInput, TOutput> LumToReflecFunctorType;
void SetAlpha(double alpha)
{
m_ImToLumFunctor.SetAlpha(alpha);
- };
+ }
void SetBeta(double beta)
{
m_ImToLumFunctor.SetBeta(beta);
- };
+ }
void SetSolarIllumination(double solarIllumination)
{
m_LumToReflecFunctor.SetSolarIllumination(solarIllumination);
- };
+ }
void SetIlluminationCorrectionCoefficient(double coef)
{
m_LumToReflecFunctor.SetIlluminationCorrectionCoefficient(coef);
- };
+ }
double GetAlpha()
{
return m_ImToLumFunctor.GetAlpha();
- };
+ }
double GetBeta()
{
return m_ImToLumFunctor.GetBeta();
- };
+ }
double GetSolarIllumination()
{
- return m_LumToReflecFunctor.GetSolarIllumination();
- };
+ return m_LumToReflecFunctor.GetSolarIllumination();
+ }
double GetIlluminationCorrectionCoefficient()
{
return m_LumToReflecFunctor.GetIlluminationCorrectionCoefficient();
- };
+ }
- inline TOutput operator() (const TInput & inPixel) const
+ inline TOutput operator ()(const TInput& inPixel) const
{
TOutput outPixel;
TOutput tempPix;
@@ -100,10 +99,9 @@ public:
}
private:
- ImToLumFunctorType m_ImToLumFunctor;
+ ImToLumFunctorType m_ImToLumFunctor;
LumToReflecFunctorType m_LumToReflecFunctor;
-
};
}
@@ -126,28 +124,31 @@ private:
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT ImageToReflectanceImageFilter :
- public UnaryImageFunctorWithVectorImageFilter< TInputImage,
- TOutputImage,
- ITK_TYPENAME Functor::ImageToReflectanceImageFunctor< ITK_TYPENAME TInputImage::InternalPixelType,
- ITK_TYPENAME TOutputImage::InternalPixelType > >
+ public UnaryImageFunctorWithVectorImageFilter<TInputImage,
+ TOutputImage,
+ ITK_TYPENAME Functor::ImageToReflectanceImageFunctor<ITK_TYPENAME
+ TInputImage::
+ InternalPixelType,
+ ITK_TYPENAME
+ TOutputImage::
+ InternalPixelType> >
{
public:
/** Extract input and output images dimensions.*/
- itkStaticConstMacro( InputImageDimension, unsigned int, TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
/** "typedef" to simplify the variables definition and the declaration. */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
typedef typename Functor::ImageToReflectanceImageFunctor<ITK_TYPENAME InputImageType::InternalPixelType,
- ITK_TYPENAME OutputImageType::InternalPixelType> FunctorType;
-
+ ITK_TYPENAME OutputImageType::InternalPixelType> FunctorType;
/** "typedef" for standard classes. */
- typedef ImageToReflectanceImageFilter Self;
- typedef UnaryImageFunctorWithVectorImageFilter< InputImageType, OutputImageType, FunctorType > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageToReflectanceImageFilter Self;
+ typedef UnaryImageFunctorWithVectorImageFilter<InputImageType, OutputImageType, FunctorType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** object factory method. */
itkNewMacro(Self);
@@ -156,15 +157,14 @@ public:
itkTypeMacro(ImageToReflectanceImageFilter, UnaryImageFunctorWithVectorImageFiltermageFilter);
/** Supported images definition. */
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::InternalPixelType InputInternalPixelType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
-
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::InternalPixelType InputInternalPixelType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename itk::VariableLengthVector<double> VectorType;
+ typedef typename itk::VariableLengthVector<double> VectorType;
/** Image size "typedef" definition. */
typedef typename InputImageType::SizeType SizeType;
@@ -194,10 +194,10 @@ public:
{
double zenithalAngle = 90.0 - elevationAngle;
if (this->m_ZenithalSolarAngle != zenithalAngle)
- {
+ {
this->m_ZenithalSolarAngle = zenithalAngle;
this->Modified();
- }
+ }
}
virtual double GetElevationSolarAngle() const
@@ -211,7 +211,7 @@ public:
m_FluxNormalizationCoefficient = coef;
m_IsSetFluxNormalizationCoefficient = true;
this->Modified();
- };
+ }
/** Set the acquisition day. */
itkSetClampMacro(Day, int, 1, 31);
@@ -222,109 +222,111 @@ public:
/** Set the acquisition mounth. */
itkGetConstReferenceMacro(Month, int);
-
protected:
/** Constructor */
- ImageToReflectanceImageFilter():
- m_ZenithalSolarAngle(120.),//invalid value which will lead to negative radiometry
+ ImageToReflectanceImageFilter() :
+ m_ZenithalSolarAngle(120.), //invalid value which will lead to negative radiometry
m_FluxNormalizationCoefficient(1.),
m_IsSetFluxNormalizationCoefficient(false),
m_Day(0),
m_Month(0)
- {
+ {
m_Alpha.SetSize(0);
m_Beta.SetSize(0);
m_SolarIllumination.SetSize(0);
- };
+ };
/** Destructor */
- virtual ~ImageToReflectanceImageFilter() {};
+ virtual ~ImageToReflectanceImageFilter() {}
/** Update the functor list and input parameters */
virtual void BeforeThreadedGenerateData(void)
{
- ImageMetadataInterfaceBase::Pointer imageMetadataInterface = ImageMetadataInterfaceFactory::CreateIMI(this->GetInput()->GetMetaDataDictionary());
- if(m_Alpha.GetSize() == 0)
- {
+ ImageMetadataInterfaceBase::Pointer imageMetadataInterface = ImageMetadataInterfaceFactory::CreateIMI(
+ this->GetInput()->GetMetaDataDictionary());
+ if (m_Alpha.GetSize() == 0)
+ {
m_Alpha = imageMetadataInterface->GetPhysicalGain(this->GetInput()->GetMetaDataDictionary());
- }
+ }
- if(m_Beta.GetSize() == 0)
- {
+ if (m_Beta.GetSize() == 0)
+ {
m_Beta = imageMetadataInterface->GetPhysicalBias(this->GetInput()->GetMetaDataDictionary());
- }
+ }
if ((m_Day == 0) && (!m_IsSetFluxNormalizationCoefficient))
- {
+ {
m_Day = imageMetadataInterface->GetDay(this->GetInput()->GetMetaDataDictionary());
- }
+ }
if ((m_Month == 0) && (!m_IsSetFluxNormalizationCoefficient))
- {
+ {
m_Month = imageMetadataInterface->GetMonth(this->GetInput()->GetMetaDataDictionary());
- }
+ }
- if(m_SolarIllumination.GetSize() == 0)
- {
+ if (m_SolarIllumination.GetSize() == 0)
+ {
m_SolarIllumination = imageMetadataInterface->GetSolarIrradiance(this->GetInput()->GetMetaDataDictionary());
- }
+ }
- if(m_ZenithalSolarAngle == 120.0)
- {
+ if (m_ZenithalSolarAngle == 120.0)
+ {
//the zenithal angle is the complementary of the elevation angle
- m_ZenithalSolarAngle = 90.0-imageMetadataInterface->GetSunElevation(this->GetInput()->GetMetaDataDictionary());
- }
+ m_ZenithalSolarAngle = 90.0 - imageMetadataInterface->GetSunElevation(this->GetInput()->GetMetaDataDictionary());
+ }
- otbMsgDevMacro( << "Using correction parameters: ");
- otbMsgDevMacro( << "Alpha (gain): " << m_Alpha);
- otbMsgDevMacro( << "Beta (bias): " << m_Beta);
- otbMsgDevMacro( << "Day: " << m_Day);
- otbMsgDevMacro( << "Month: " << m_Month);
- otbMsgDevMacro( << "Solar irradiance: " << m_SolarIllumination);
- otbMsgDevMacro( << "Zenithal angle: " << m_ZenithalSolarAngle);
+ otbMsgDevMacro(<< "Using correction parameters: ");
+ otbMsgDevMacro(<< "Alpha (gain): " << m_Alpha);
+ otbMsgDevMacro(<< "Beta (bias): " << m_Beta);
+ otbMsgDevMacro(<< "Day: " << m_Day);
+ otbMsgDevMacro(<< "Month: " << m_Month);
+ otbMsgDevMacro(<< "Solar irradiance: " << m_SolarIllumination);
+ otbMsgDevMacro(<< "Zenithal angle: " << m_ZenithalSolarAngle);
if ((m_Alpha.GetSize() != this->GetInput()->GetNumberOfComponentsPerPixel())
- || (m_Beta.GetSize() != this->GetInput()->GetNumberOfComponentsPerPixel())
- || (m_SolarIllumination.GetSize() != this->GetInput()->GetNumberOfComponentsPerPixel()))
- {
- itkExceptionMacro(<<"Alpha, Beta and SolarIllumination parameters should have the same size as the number of bands");
- }
+ || (m_Beta.GetSize() != this->GetInput()->GetNumberOfComponentsPerPixel())
+ || (m_SolarIllumination.GetSize() != this->GetInput()->GetNumberOfComponentsPerPixel()))
+ {
+ itkExceptionMacro(
+ << "Alpha, Beta and SolarIllumination parameters should have the same size as the number of bands");
+ }
this->GetFunctorVector().clear();
- for (unsigned int i = 0;i<this->GetInput()->GetNumberOfComponentsPerPixel();++i)
- {
+ for (unsigned int i = 0; i < this->GetInput()->GetNumberOfComponentsPerPixel(); ++i)
+ {
FunctorType functor;
- double coefTemp = 0.;
+ double coefTemp = 0.;
if (!m_IsSetFluxNormalizationCoefficient)
- {
- if (m_Day*m_Month != 0 && m_Day<32 && m_Month<13)
{
+ if (m_Day * m_Month != 0 && m_Day < 32 && m_Month < 13)
+ {
otb_6s_doublereal dsol = 0.;
- otb_6s_integer day = static_cast<otb_6s_integer>(m_Day);
- otb_6s_integer month = static_cast<otb_6s_integer>(m_Month);
- int cr(0);
+ otb_6s_integer day = static_cast<otb_6s_integer>(m_Day);
+ otb_6s_integer month = static_cast<otb_6s_integer>(m_Month);
+ int cr(0);
cr = otb_6s_varsol_(&day, &month, &dsol);
- coefTemp = vcl_cos(m_ZenithalSolarAngle*CONST_PI_180)*static_cast<double>(dsol);
- }
+ coefTemp = vcl_cos(m_ZenithalSolarAngle * CONST_PI_180) * static_cast<double>(dsol);
+ }
else
- {
- itkExceptionMacro( << "Day has to be included between 1 and 31, Month beetween 1 and 12.");
+ {
+ itkExceptionMacro(<< "Day has to be included between 1 and 31, Month beetween 1 and 12.");
+ }
}
- }
else
- {
- coefTemp = vcl_cos(m_ZenithalSolarAngle*CONST_PI_180)*m_FluxNormalizationCoefficient*m_FluxNormalizationCoefficient;
- }
+ {
+ coefTemp =
+ vcl_cos(m_ZenithalSolarAngle *
+ CONST_PI_180) * m_FluxNormalizationCoefficient * m_FluxNormalizationCoefficient;
+ }
functor.SetIlluminationCorrectionCoefficient(1. / coefTemp);
functor.SetAlpha(m_Alpha[i]);
functor.SetBeta(m_Beta[i]);
functor.SetSolarIllumination(m_SolarIllumination[i]);
this->GetFunctorVector().push_back(functor);
- }
+ }
}
-
private:
/** Ponderation declaration*/
VectorType m_Alpha;
diff --git a/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h b/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h
index 543274a34b..7c5d3026ec 100644
--- a/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h
+++ b/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h
@@ -57,39 +57,39 @@ public:
LuminanceToReflectanceImageFunctor() :
m_SolarIllumination(1.0),
m_IlluminationCorrectionCoefficient(1.0)
- {};
+ {}
- virtual ~LuminanceToReflectanceImageFunctor() {};
+ virtual ~LuminanceToReflectanceImageFunctor() {}
void SetSolarIllumination(double solarIllumination)
{
m_SolarIllumination = solarIllumination;
- };
+ }
void SetIlluminationCorrectionCoefficient(double coef)
{
m_IlluminationCorrectionCoefficient = coef;
- };
+ }
double GetSolarIllumination()
{
return m_SolarIllumination;
- };
+ }
double GetIlluminationCorrectionCoefficient()
{
return m_IlluminationCorrectionCoefficient;
- };
+ }
- inline TOutput operator() (const TInput & inPixel) const
+ inline TOutput operator ()(const TInput& inPixel) const
{
TOutput outPixel;
- double temp;
+ double temp;
temp = static_cast<double>(inPixel)
* static_cast<double>(CONST_PI)
* m_IlluminationCorrectionCoefficient
/ m_SolarIllumination;
-
- outPixel = static_cast<TOutput>( temp );
-
+
+ outPixel = static_cast<TOutput>(temp);
+
return outPixel;
}
@@ -114,28 +114,32 @@ private:
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT LuminanceToReflectanceImageFilter :
- public UnaryImageFunctorWithVectorImageFilter< TInputImage,
- TOutputImage,
- ITK_TYPENAME Functor::LuminanceToReflectanceImageFunctor< ITK_TYPENAME TInputImage::InternalPixelType,
- ITK_TYPENAME TOutputImage::InternalPixelType > >
+ public UnaryImageFunctorWithVectorImageFilter<TInputImage,
+ TOutputImage,
+ ITK_TYPENAME Functor::LuminanceToReflectanceImageFunctor<ITK_TYPENAME
+ TInputImage::
+ InternalPixelType,
+ ITK_TYPENAME
+ TOutputImage::
+ InternalPixelType> >
{
public:
/** Extract input and output images dimensions.*/
- itkStaticConstMacro( InputImageDimension, unsigned int, TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
/** "typedef" to simplify the variables definition and the declaration. */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
typedef typename Functor::LuminanceToReflectanceImageFunctor<ITK_TYPENAME InputImageType::InternalPixelType,
- ITK_TYPENAME OutputImageType::InternalPixelType> FunctorType;
-
+ ITK_TYPENAME OutputImageType::InternalPixelType>
+ FunctorType;
/** "typedef" for standard classes. */
- typedef LuminanceToReflectanceImageFilter Self;
- typedef UnaryImageFunctorWithVectorImageFilter< InputImageType, OutputImageType, FunctorType > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LuminanceToReflectanceImageFilter Self;
+ typedef UnaryImageFunctorWithVectorImageFilter<InputImageType, OutputImageType, FunctorType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** object factory method. */
itkNewMacro(Self);
@@ -144,15 +148,14 @@ public:
itkTypeMacro(LuminanceToReflectanceImageFilter, UnaryImageFunctorWithVectorImageFiltermageFilter);
/** Supported images definition. */
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::InternalPixelType InputInternalPixelType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
-
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::InternalPixelType InputInternalPixelType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename itk::VariableLengthVector<double> VectorType;
+ typedef typename itk::VariableLengthVector<double> VectorType;
/** Image size "typedef" definition. */
typedef typename InputImageType::SizeType SizeType;
@@ -172,10 +175,10 @@ public:
{
double zenithalAngle = 90.0 - elevationAngle;
if (this->m_ZenithalSolarAngle != zenithalAngle)
- {
+ {
this->m_ZenithalSolarAngle = zenithalAngle;
this->Modified();
- }
+ }
}
virtual double GetElevationSolarAngle() const
@@ -199,7 +202,7 @@ public:
m_FluxNormalizationCoefficient = coef;
m_IsSetFluxNormalizationCoefficient = true;
this->Modified();
- };
+ }
/** Give the flux normalization coefficient. */
itkGetConstReferenceMacro(FluxNormalizationCoefficient, double);
@@ -210,86 +213,89 @@ public:
protected:
/** Constructor */
- LuminanceToReflectanceImageFilter():
- m_ZenithalSolarAngle(120.0),//invalid value which will lead to negative radiometry
+ LuminanceToReflectanceImageFilter() :
+ m_ZenithalSolarAngle(120.0), //invalid value which will lead to negative radiometry
m_FluxNormalizationCoefficient(1.),
m_Day(0),
m_Month(0),
m_IsSetFluxNormalizationCoefficient(false)
- {
+ {
m_SolarIllumination.SetSize(0);
- };
+ };
/** Destructor */
- virtual ~LuminanceToReflectanceImageFilter() {};
+ virtual ~LuminanceToReflectanceImageFilter() {}
/** Update the functor list and input parameters */
virtual void BeforeThreadedGenerateData(void)
{
- ImageMetadataInterfaceBase::Pointer imageMetadataInterface = ImageMetadataInterfaceFactory::CreateIMI(this->GetInput()->GetMetaDataDictionary());
+ ImageMetadataInterfaceBase::Pointer imageMetadataInterface = ImageMetadataInterfaceFactory::CreateIMI(
+ this->GetInput()->GetMetaDataDictionary());
if ((m_Day == 0) && (!m_IsSetFluxNormalizationCoefficient))
- {
+ {
m_Day = imageMetadataInterface->GetDay(this->GetInput()->GetMetaDataDictionary());
- }
+ }
if ((m_Month == 0) && (!m_IsSetFluxNormalizationCoefficient))
- {
+ {
m_Month = imageMetadataInterface->GetMonth(this->GetInput()->GetMetaDataDictionary());
- }
+ }
- if(m_SolarIllumination.GetSize() == 0)
- {
+ if (m_SolarIllumination.GetSize() == 0)
+ {
m_SolarIllumination = imageMetadataInterface->GetSolarIrradiance(this->GetInput()->GetMetaDataDictionary());
- }
+ }
- if(m_ZenithalSolarAngle == 120.0)
- {
+ if (m_ZenithalSolarAngle == 120.0)
+ {
//the zenithal angle is the complementary of the elevation angle
- m_ZenithalSolarAngle = 90.0-imageMetadataInterface->GetSunElevation(this->GetInput()->GetMetaDataDictionary());
- }
+ m_ZenithalSolarAngle = 90.0 - imageMetadataInterface->GetSunElevation(this->GetInput()->GetMetaDataDictionary());
+ }
- otbMsgDevMacro( << "Using correction parameters: ");
- otbMsgDevMacro( << "Day: " << m_Day);
- otbMsgDevMacro( << "Month: " << m_Month);
- otbMsgDevMacro( << "Solar irradiance: " << m_SolarIllumination);
- otbMsgDevMacro( << "Zenithal angle: " << m_ZenithalSolarAngle);
+ otbMsgDevMacro(<< "Using correction parameters: ");
+ otbMsgDevMacro(<< "Day: " << m_Day);
+ otbMsgDevMacro(<< "Month: " << m_Month);
+ otbMsgDevMacro(<< "Solar irradiance: " << m_SolarIllumination);
+ otbMsgDevMacro(<< "Zenithal angle: " << m_ZenithalSolarAngle);
if ((m_SolarIllumination.GetSize() != this->GetInput()->GetNumberOfComponentsPerPixel()))
- {
- itkExceptionMacro(<<"SolarIllumination parameter should have the same size as the number of bands");
- }
+ {
+ itkExceptionMacro(<< "SolarIllumination parameter should have the same size as the number of bands");
+ }
this->GetFunctorVector().clear();
- for (unsigned int i = 0;i<this->GetInput()->GetNumberOfComponentsPerPixel();++i)
- {
+ for (unsigned int i = 0; i < this->GetInput()->GetNumberOfComponentsPerPixel(); ++i)
+ {
FunctorType functor;
- double coefTemp = 0.;
+ double coefTemp = 0.;
if (!m_IsSetFluxNormalizationCoefficient)
- {
- if (m_Day*m_Month != 0 && m_Day<32 && m_Month<13)
{
+ if (m_Day * m_Month != 0 && m_Day < 32 && m_Month < 13)
+ {
otb_6s_doublereal dsol = 0.;
- otb_6s_integer day = static_cast<otb_6s_integer>(m_Day);
- otb_6s_integer month = static_cast<otb_6s_integer>(m_Month);
- int cr(0);
+ otb_6s_integer day = static_cast<otb_6s_integer>(m_Day);
+ otb_6s_integer month = static_cast<otb_6s_integer>(m_Month);
+ int cr(0);
cr = otb_6s_varsol_(&day, &month, &dsol);
- coefTemp = vcl_cos(m_ZenithalSolarAngle*CONST_PI_180)*static_cast<double>(dsol);
- }
+ coefTemp = vcl_cos(m_ZenithalSolarAngle * CONST_PI_180) * static_cast<double>(dsol);
+ }
else
- {
- itkExceptionMacro( << "Day has to be included between 1 and 31, Month beetween 1 and 12.");
+ {
+ itkExceptionMacro(<< "Day has to be included between 1 and 31, Month beetween 1 and 12.");
+ }
}
- }
else
- {
- coefTemp = vcl_cos(m_ZenithalSolarAngle*CONST_PI_180)*m_FluxNormalizationCoefficient*m_FluxNormalizationCoefficient;
- }
+ {
+ coefTemp =
+ vcl_cos(m_ZenithalSolarAngle *
+ CONST_PI_180) * m_FluxNormalizationCoefficient * m_FluxNormalizationCoefficient;
+ }
functor.SetIlluminationCorrectionCoefficient(1. / coefTemp);
functor.SetSolarIllumination(static_cast<double>(m_SolarIllumination[i]));
this->GetFunctorVector().push_back(functor);
- }
+ }
}
private:
diff --git a/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.h b/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.h
index adc1734278..2eb1e0c908 100644
--- a/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.h
+++ b/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.h
@@ -36,18 +36,18 @@ namespace otb
* \ingroup Radiometry
*/
template <class TInputImage, class TOutputImage,
- class TFunction = Functor::IR< typename TInputImage::InternalPixelType,
- typename TInputImage::InternalPixelType,
- typename TOutputImage::PixelType> >
+ class TFunction = Functor::IR<typename TInputImage::InternalPixelType,
+ typename TInputImage::InternalPixelType,
+ typename TOutputImage::PixelType> >
class ITK_EXPORT MultiChannelGAndRIndexImageFilter
- : public itk::UnaryFunctorImageFilter<TInputImage,TOutputImage, TFunction>
+ : public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction>
{
public:
/** Standard class typedefs. */
- typedef MultiChannelGAndRIndexImageFilter Self;
- typedef itk::UnaryFunctorImageFilter<TInputImage,TOutputImage, TFunction> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MultiChannelGAndRIndexImageFilter Self;
+ typedef itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -56,28 +56,28 @@ public:
itkTypeMacro(MultiChannelGAndRIndexImageFilter, UnaryFunctorImageFilter);
/** Some typedefs. */
- typedef TFunction FunctorType;
+ typedef TFunction FunctorType;
/** Set/Get the Green channel index. Value must be in [1...[ */
- itkSetMacro(GreenIndex,unsigned int);
- itkGetMacro(GreenIndex,unsigned int);
+ itkSetMacro(GreenIndex, unsigned int);
+ itkGetMacro(GreenIndex, unsigned int);
/** Set/Get the Red channel index. Value must be in [1...[ */
- itkSetMacro(RedIndex,unsigned int);
- itkGetMacro(RedIndex,unsigned int);
+ itkSetMacro(RedIndex, unsigned int);
+ itkGetMacro(RedIndex, unsigned int);
protected:
/// Constructor
- MultiChannelGAndRIndexImageFilter(): m_GreenIndex(1), m_RedIndex(2) {};
+ MultiChannelGAndRIndexImageFilter() : m_GreenIndex(1), m_RedIndex(2) {};
/// Destructor
- virtual ~MultiChannelGAndRIndexImageFilter() {};
+ virtual ~MultiChannelGAndRIndexImageFilter() {}
/// Before generating data, set functor parameters
virtual void BeforeThreadedGenerateData()
{
unsigned int lNbChan = this->GetInput()->GetNumberOfComponentsPerPixel();
- if(m_GreenIndex < 1 || m_RedIndex < 1 ||
- m_GreenIndex > lNbChan || m_RedIndex > lNbChan )
+ if (m_GreenIndex < 1 || m_RedIndex < 1 ||
+ m_GreenIndex > lNbChan || m_RedIndex > lNbChan)
{
- itkExceptionMacro(<<"Channel indices must belong to range [1, ...[");
+ itkExceptionMacro(<< "Channel indices must belong to range [1, ...[");
}
this->GetFunctor().SetGreenIndex(m_GreenIndex);
this->GetFunctor().SetRedIndex(m_RedIndex);
@@ -85,13 +85,13 @@ protected:
/// PrintSelf Method
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
- os << indent << "Green index: "<<m_GreenIndex<<std::endl;
- os << indent << "Red index: "<<m_RedIndex<<std::endl;
+ this->Superclass::PrintSelf(os, indent);
+ os << indent << "Green index: " << m_GreenIndex << std::endl;
+ os << indent << "Red index: " << m_RedIndex << std::endl;
}
private:
- MultiChannelGAndRIndexImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MultiChannelGAndRIndexImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Green channel index */
unsigned int m_GreenIndex;
/** Red channel index */
diff --git a/Code/Radiometry/otbMultiChannelRAndBAndNIRIndexImageFilter.h b/Code/Radiometry/otbMultiChannelRAndBAndNIRIndexImageFilter.h
index 8cb9dae7c1..6c69a7c16c 100644
--- a/Code/Radiometry/otbMultiChannelRAndBAndNIRIndexImageFilter.h
+++ b/Code/Radiometry/otbMultiChannelRAndBAndNIRIndexImageFilter.h
@@ -36,19 +36,19 @@ namespace otb
* \ingroup Radiometry
*/
template <class TInputImage, class TOutputImage,
- class TFunction = Functor::ARVI< typename TInputImage::InternalPixelType,
- typename TInputImage::InternalPixelType,
- typename TInputImage::InternalPixelType,
- typename TOutputImage::PixelType> >
+ class TFunction = Functor::ARVI<typename TInputImage::InternalPixelType,
+ typename TInputImage::InternalPixelType,
+ typename TInputImage::InternalPixelType,
+ typename TOutputImage::PixelType> >
class ITK_EXPORT MultiChannelRAndBAndNIRIndexImageFilter
- : public itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,TFunction>
+ : public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction>
{
public:
/** Standard class typedefs. */
- typedef MultiChannelRAndBAndNIRIndexImageFilter Self;
- typedef itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,TFunction> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MultiChannelRAndBAndNIRIndexImageFilter Self;
+ typedef itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -57,31 +57,31 @@ public:
itkTypeMacro(MultiChannelRAndBAndNIRIndexImageFilter, UnaryFunctorImageFilter);
/** Some typedefs. */
- typedef TFunction FunctorType;
+ typedef TFunction FunctorType;
/** Set/Get the red channel index. Value must be in [1...[ */
- itkSetMacro(RedIndex,unsigned int);
- itkGetMacro(RedIndex,unsigned int);
+ itkSetMacro(RedIndex, unsigned int);
+ itkGetMacro(RedIndex, unsigned int);
/** Set/Get the blue channel index. Value must be in [1...[ */
- itkSetMacro(BlueIndex,unsigned int);
- itkGetMacro(BlueIndex,unsigned int);
+ itkSetMacro(BlueIndex, unsigned int);
+ itkGetMacro(BlueIndex, unsigned int);
/** Set/Get the nir channel index. Value must be in [1...[ */
- itkSetMacro(NIRIndex,unsigned int);
- itkGetMacro(NIRIndex,unsigned int);
+ itkSetMacro(NIRIndex, unsigned int);
+ itkGetMacro(NIRIndex, unsigned int);
protected:
/// Constructor
- MultiChannelRAndBAndNIRIndexImageFilter(): m_RedIndex(3),m_BlueIndex(1),m_NIRIndex(4) {};
+ MultiChannelRAndBAndNIRIndexImageFilter() : m_RedIndex(3), m_BlueIndex(1), m_NIRIndex(4) {};
/// Destructor
- virtual ~MultiChannelRAndBAndNIRIndexImageFilter() {};
+ virtual ~MultiChannelRAndBAndNIRIndexImageFilter() {}
/// Before generating data, set functor parameters
virtual void BeforeThreadedGenerateData()
{
unsigned int lNbChan = this->GetInput()->GetNumberOfComponentsPerPixel();
- if(m_RedIndex < 1 || m_BlueIndex < 1 || m_NIRIndex < 1 ||
- m_RedIndex > lNbChan || m_BlueIndex > lNbChan || m_NIRIndex > lNbChan)
+ if (m_RedIndex < 1 || m_BlueIndex < 1 || m_NIRIndex < 1 ||
+ m_RedIndex > lNbChan || m_BlueIndex > lNbChan || m_NIRIndex > lNbChan)
{
- itkExceptionMacro(<<"Channel indices must belong to range [1, ...[");
+ itkExceptionMacro(<< "Channel indices must belong to range [1, ...[");
}
this->GetFunctor().SetRedIndex(m_RedIndex);
this->GetFunctor().SetBlueIndex(m_BlueIndex);
@@ -90,15 +90,15 @@ protected:
/// PrintSelf
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
- os << indent << "Red index: "<<m_RedIndex<<std::endl;
- os << indent << "Blue index: "<<m_BlueIndex<<std::endl;
- os << indent << "NIR index: "<<m_NIRIndex<<std::endl;
+ this->Superclass::PrintSelf(os, indent);
+ os << indent << "Red index: " << m_RedIndex << std::endl;
+ os << indent << "Blue index: " << m_BlueIndex << std::endl;
+ os << indent << "NIR index: " << m_NIRIndex << std::endl;
}
private:
- MultiChannelRAndBAndNIRIndexImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MultiChannelRAndBAndNIRIndexImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Red channel index */
unsigned int m_RedIndex;
diff --git a/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.h b/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.h
index d39c85eb0a..8a1b211813 100644
--- a/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.h
+++ b/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.h
@@ -35,12 +35,12 @@ namespace otb
* \ingroup Radiometry
*/
template <class TInputImage, class TOutputImage,
- class TFunction = Functor::ARVI< typename TInputImage::InternalPixelType,
- typename TInputImage::InternalPixelType,
- typename TInputImage::InternalPixelType,
- typename TOutputImage::PixelType> >
+ class TFunction = Functor::ARVI<typename TInputImage::InternalPixelType,
+ typename TInputImage::InternalPixelType,
+ typename TInputImage::InternalPixelType,
+ typename TOutputImage::PixelType> >
class ITK_EXPORT MultiChannelRAndBAndNIRVegetationIndexImageFilter
- : public MultiChannelRAndBAndNIRIndexImageFilter<TInputImage,TOutputImage,TFunction>
+ : public MultiChannelRAndBAndNIRIndexImageFilter<TInputImage, TOutputImage, TFunction>
{
};
diff --git a/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilter.h b/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilter.h
index 35a0c0d8ba..30f7711c0f 100644
--- a/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilter.h
+++ b/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilter.h
@@ -36,19 +36,19 @@ namespace otb
* \ingroup Radiometry
*/
template <class TInputImage, class TOutputImage,
- class TFunction = Functor::AVI< typename TInputImage::InternalPixelType,
- typename TInputImage::InternalPixelType,
- typename TInputImage::InternalPixelType,
- typename TOutputImage::PixelType> >
+ class TFunction = Functor::AVI<typename TInputImage::InternalPixelType,
+ typename TInputImage::InternalPixelType,
+ typename TInputImage::InternalPixelType,
+ typename TOutputImage::PixelType> >
class ITK_EXPORT MultiChannelRAndGAndNIRIndexImageFilter
- : public itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,TFunction>
+ : public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction>
{
public:
/** Standard class typedefs. */
- typedef MultiChannelRAndGAndNIRIndexImageFilter Self;
- typedef itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,TFunction> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MultiChannelRAndGAndNIRIndexImageFilter Self;
+ typedef itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -57,32 +57,32 @@ public:
itkTypeMacro(MultiChannelRAndGAndNIRIndexImageFilter, UnaryFunctorImageFilter);
/** Some typedefs. */
- typedef TFunction FunctorType;
+ typedef TFunction FunctorType;
/** Set/Get the red channel index. Value must be in [1...[ */
- itkSetMacro(RedIndex,unsigned int);
- itkGetMacro(RedIndex,unsigned int);
+ itkSetMacro(RedIndex, unsigned int);
+ itkGetMacro(RedIndex, unsigned int);
/** Set/Get the green channel index. Value must be in [1...[ */
- itkSetMacro(GreenIndex,unsigned int);
- itkGetMacro(GreenIndex,unsigned int);
+ itkSetMacro(GreenIndex, unsigned int);
+ itkGetMacro(GreenIndex, unsigned int);
/** Set/Get the nir channel index. Value must be in [1...[ */
- itkSetMacro(NIRIndex,unsigned int);
- itkGetMacro(NIRIndex,unsigned int);
+ itkSetMacro(NIRIndex, unsigned int);
+ itkGetMacro(NIRIndex, unsigned int);
protected:
/// Constructor
- MultiChannelRAndGAndNIRIndexImageFilter(): m_RedIndex(3),m_GreenIndex(2),m_NIRIndex(4) {};
+ MultiChannelRAndGAndNIRIndexImageFilter() : m_RedIndex(3), m_GreenIndex(2), m_NIRIndex(4) {};
/// Destructor
- virtual ~MultiChannelRAndGAndNIRIndexImageFilter() {};
+ virtual ~MultiChannelRAndGAndNIRIndexImageFilter() {}
/// Before generating data, set functor parameters
virtual void BeforeThreadedGenerateData()
{
unsigned int lNbChan = this->GetInput()->GetNumberOfComponentsPerPixel();
- if(m_RedIndex < 1 || m_GreenIndex < 1 || m_NIRIndex < 1 ||
- m_RedIndex > lNbChan || m_GreenIndex > lNbChan || m_NIRIndex > lNbChan)
+ if (m_RedIndex < 1 || m_GreenIndex < 1 || m_NIRIndex < 1 ||
+ m_RedIndex > lNbChan || m_GreenIndex > lNbChan || m_NIRIndex > lNbChan)
{
- itkExceptionMacro(<<"Channel indices must belong to range [1, ...[");
+ itkExceptionMacro(<< "Channel indices must belong to range [1, ...[");
}
this->GetFunctor().SetRedIndex(m_RedIndex);
this->GetFunctor().SetGreenIndex(m_GreenIndex);
@@ -91,15 +91,15 @@ protected:
/// PrintSelf
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
- os << indent << "Red index: "<<m_RedIndex<<std::endl;
- os << indent << "Green index: "<<m_GreenIndex<<std::endl;
- os << indent << "NIR index: "<<m_NIRIndex<<std::endl;
+ this->Superclass::PrintSelf(os, indent);
+ os << indent << "Red index: " << m_RedIndex << std::endl;
+ os << indent << "Green index: " << m_GreenIndex << std::endl;
+ os << indent << "NIR index: " << m_NIRIndex << std::endl;
}
private:
- MultiChannelRAndGAndNIRIndexImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MultiChannelRAndGAndNIRIndexImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Red channel index */
unsigned int m_RedIndex;
diff --git a/Code/Radiometry/otbMultiChannelRAndGAndNIRVegetationIndexImageFilter.h b/Code/Radiometry/otbMultiChannelRAndGAndNIRVegetationIndexImageFilter.h
index a3cc4a987c..cba0777c16 100644
--- a/Code/Radiometry/otbMultiChannelRAndGAndNIRVegetationIndexImageFilter.h
+++ b/Code/Radiometry/otbMultiChannelRAndGAndNIRVegetationIndexImageFilter.h
@@ -35,12 +35,12 @@ namespace otb
* \ingroup Radiometry
*/
template <class TInputImage, class TOutputImage,
- class TFunction = Functor::AVI< typename TInputImage::InternalPixelType,
- typename TInputImage::InternalPixelType,
- typename TInputImage::InternalPixelType,
- typename TOutputImage::PixelType> >
+ class TFunction = Functor::AVI<typename TInputImage::InternalPixelType,
+ typename TInputImage::InternalPixelType,
+ typename TInputImage::InternalPixelType,
+ typename TOutputImage::PixelType> >
class ITK_EXPORT MultiChannelRAndGAndNIRVegetationIndexImageFilter
- : public MultiChannelRAndGAndNIRIndexImageFilter<TInputImage,TOutputImage,TFunction>
+ : public MultiChannelRAndGAndNIRIndexImageFilter<TInputImage, TOutputImage, TFunction>
{
};
diff --git a/Code/Radiometry/otbMultiChannelRAndNIRIndexImageFilter.h b/Code/Radiometry/otbMultiChannelRAndNIRIndexImageFilter.h
index b7eb8d85e9..688593e2ac 100644
--- a/Code/Radiometry/otbMultiChannelRAndNIRIndexImageFilter.h
+++ b/Code/Radiometry/otbMultiChannelRAndNIRIndexImageFilter.h
@@ -36,18 +36,18 @@ namespace otb
* \ingroup Radiometry
*/
template <class TInputImage, class TOutputImage,
- class TFunction = Functor::NDVI< typename TInputImage::InternalPixelType,
- typename TInputImage::InternalPixelType,
- typename TOutputImage::PixelType> >
+ class TFunction = Functor::NDVI<typename TInputImage::InternalPixelType,
+ typename TInputImage::InternalPixelType,
+ typename TOutputImage::PixelType> >
class ITK_EXPORT MultiChannelRAndNIRIndexImageFilter
- : public itk::UnaryFunctorImageFilter<TInputImage,TOutputImage, TFunction>
+ : public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction>
{
public:
/** Standard class typedefs. */
- typedef MultiChannelRAndNIRIndexImageFilter Self;
- typedef itk::UnaryFunctorImageFilter<TInputImage,TOutputImage, TFunction> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MultiChannelRAndNIRIndexImageFilter Self;
+ typedef itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -56,28 +56,28 @@ public:
itkTypeMacro(MultiChannelRAndNIRIndexImageFilter, UnaryFunctorImageFilter);
/** Some typedefs. */
- typedef TFunction FunctorType;
+ typedef TFunction FunctorType;
/** Set/Get the red channel index. Value must be in [1...[ */
- itkSetMacro(RedIndex,unsigned int);
- itkGetMacro(RedIndex,unsigned int);
+ itkSetMacro(RedIndex, unsigned int);
+ itkGetMacro(RedIndex, unsigned int);
/** Set/Get the nir channel index. Value must be in [1...[ */
- itkSetMacro(NIRIndex,unsigned int);
- itkGetMacro(NIRIndex,unsigned int);
+ itkSetMacro(NIRIndex, unsigned int);
+ itkGetMacro(NIRIndex, unsigned int);
protected:
/// Constructor
- MultiChannelRAndNIRIndexImageFilter(): m_RedIndex(3), m_NIRIndex(4) {};
+ MultiChannelRAndNIRIndexImageFilter() : m_RedIndex(3), m_NIRIndex(4) {};
/// Destructor
- virtual ~MultiChannelRAndNIRIndexImageFilter() {};
+ virtual ~MultiChannelRAndNIRIndexImageFilter() {}
/// Before generating data, set functor parameters
virtual void BeforeThreadedGenerateData()
{
unsigned int lNbChan = this->GetInput()->GetNumberOfComponentsPerPixel();
- if(m_RedIndex < 1 || m_NIRIndex < 1 ||
- m_RedIndex > lNbChan || m_NIRIndex > lNbChan)
+ if (m_RedIndex < 1 || m_NIRIndex < 1 ||
+ m_RedIndex > lNbChan || m_NIRIndex > lNbChan)
{
- itkExceptionMacro(<<"Channel indices must belong to range [1, ...[");
+ itkExceptionMacro(<< "Channel indices must belong to range [1, ...[");
}
this->GetFunctor().SetRedIndex(m_RedIndex);
this->GetFunctor().SetNIRIndex(m_NIRIndex);
@@ -85,13 +85,13 @@ protected:
/// PrintSelf Method
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
- os << indent << "Red index: "<<m_RedIndex<<std::endl;
- os << indent << "NIR index: "<<m_NIRIndex<<std::endl;
+ this->Superclass::PrintSelf(os, indent);
+ os << indent << "Red index: " << m_RedIndex << std::endl;
+ os << indent << "NIR index: " << m_NIRIndex << std::endl;
}
private:
- MultiChannelRAndNIRIndexImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ MultiChannelRAndNIRIndexImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Red channel index */
unsigned int m_RedIndex;
/** NIR channel index */
diff --git a/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.h b/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.h
index 4a159f965d..bb33dfa033 100644
--- a/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.h
+++ b/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.h
@@ -36,11 +36,11 @@ namespace otb
* \ingroup Radiometry
*/
template <class TInputImage, class TOutputImage,
- class TFunction = Functor::NDVI< typename TInputImage::InternalPixelType,
- typename TInputImage::InternalPixelType,
- typename TOutputImage::PixelType> >
+ class TFunction = Functor::NDVI<typename TInputImage::InternalPixelType,
+ typename TInputImage::InternalPixelType,
+ typename TOutputImage::PixelType> >
class ITK_EXPORT MultiChannelRAndNIRVegetationIndexImageFilter
- : public MultiChannelRAndNIRIndexImageFilter<TInputImage,TOutputImage, TFunction>
+ : public MultiChannelRAndNIRIndexImageFilter<TInputImage, TOutputImage, TFunction>
{
};
} // end namespace otb
diff --git a/Code/Radiometry/otbRAndBAndNIRIndexImageFilter.h b/Code/Radiometry/otbRAndBAndNIRIndexImageFilter.h
index d9baec3496..cc18fc0f6e 100644
--- a/Code/Radiometry/otbRAndBAndNIRIndexImageFilter.h
+++ b/Code/Radiometry/otbRAndBAndNIRIndexImageFilter.h
@@ -32,47 +32,50 @@ namespace otb
*/
template <class TInputImageR, class TInputImageB, class TInputImageNIR, class TOutputImage,
-class TFunction = Functor::ARVI< typename TInputImageR::PixelType,
-typename TInputImageB::PixelType,
-typename TInputImageNIR::PixelType,
-typename TOutputImage::PixelType > >
-class ITK_EXPORT RAndBAndNIRIndexImageFilter : public itk::TernaryFunctorImageFilter< TInputImageR, TInputImageB, TInputImageNIR, TOutputImage, TFunction >
+ class TFunction = Functor::ARVI<typename TInputImageR::PixelType,
+ typename TInputImageB::PixelType,
+ typename TInputImageNIR::PixelType,
+ typename TOutputImage::PixelType> >
+class ITK_EXPORT RAndBAndNIRIndexImageFilter : public itk::TernaryFunctorImageFilter<TInputImageR, TInputImageB,
+ TInputImageNIR, TOutputImage,
+ TFunction>
{
public:
/** Standard typedefs */
- typedef RAndBAndNIRIndexImageFilter Self;
- typedef itk::TernaryFunctorImageFilter< TInputImageR, TInputImageB, TInputImageNIR, TOutputImage, TFunction > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef RAndBAndNIRIndexImageFilter Self;
+ typedef itk::TernaryFunctorImageFilter<TInputImageR, TInputImageB, TInputImageNIR, TOutputImage,
+ TFunction> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self>
+ ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(RAndBAndNIRIndexImageFilter,TernaryFunctorImageFilter);
+ itkTypeMacro(RAndBAndNIRIndexImageFilter, TernaryFunctorImageFilter);
- void SetInputR( const TInputImageR * image );
- void SetInputB( const TInputImageB * image );
- void SetInputNIR( const TInputImageNIR * image );
+ void SetInputR(const TInputImageR * image);
+ void SetInputB(const TInputImageB * image);
+ void SetInputNIR(const TInputImageNIR * image);
/** Template parameters typedefs */
typedef typename Superclass::Input1ImageType RInputImageType;
typedef typename Superclass::Input2ImageType BInputImageType;
typedef typename Superclass::Input3ImageType NIRInputImageType;
typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::FunctorType FunctorType;
+ typedef typename Superclass::FunctorType FunctorType;
protected:
RAndBAndNIRIndexImageFilter();
- virtual ~RAndBAndNIRIndexImageFilter() {};
+ virtual ~RAndBAndNIRIndexImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- RAndBAndNIRIndexImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ RAndBAndNIRIndexImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -82,5 +85,4 @@ private:
#include "otbRAndBAndNIRIndexImageFilter.txx"
#endif
-
#endif
diff --git a/Code/Radiometry/otbRAndBAndNIRIndexImageFilter.txx b/Code/Radiometry/otbRAndBAndNIRIndexImageFilter.txx
index 678294436b..70fc3f09ed 100644
--- a/Code/Radiometry/otbRAndBAndNIRIndexImageFilter.txx
+++ b/Code/Radiometry/otbRAndBAndNIRIndexImageFilter.txx
@@ -27,57 +27,55 @@ namespace otb
* Constructor
*/
template <class TInputImageR, class TInputImageB, class TInputImageNIR,
-class TOutputImage, class TFunction >
-RAndBAndNIRIndexImageFilter<TInputImageR,TInputImageB,TInputImageNIR,TOutputImage,TFunction>
+ class TOutputImage, class TFunction>
+RAndBAndNIRIndexImageFilter<TInputImageR, TInputImageB, TInputImageNIR, TOutputImage, TFunction>
::RAndBAndNIRIndexImageFilter()
{
}
-
/**
* Connect one of the operands for pixel-wise addition
*/
template <class TInputImageR, class TInputImageB, class TInputImageNIR,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-RAndBAndNIRIndexImageFilter<TInputImageR,TInputImageB,TInputImageNIR,TOutputImage,TFunction>
-::SetInputR( const TInputImageR * image )
+RAndBAndNIRIndexImageFilter<TInputImageR, TInputImageB, TInputImageNIR, TOutputImage, TFunction>
+::SetInputR(const TInputImageR * image)
{
// Process object is not const-correct so the const casting is required.
- SetInput1( image );
+ SetInput1(image);
}
-
/**
* Connect one of the operands for pixel-wise addition
*/
template <class TInputImageR, class TInputImageB, class TInputImageNIR,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-RAndBAndNIRIndexImageFilter<TInputImageR,TInputImageB,TInputImageNIR,TOutputImage,TFunction>
-::SetInputB( const TInputImageB * image )
+RAndBAndNIRIndexImageFilter<TInputImageR, TInputImageB, TInputImageNIR, TOutputImage, TFunction>
+::SetInputB(const TInputImageB * image)
{
- SetInput2( image );
+ SetInput2(image);
}
/**
* Connect one of the operands for pixel-wise addition
*/
template <class TInputImageR, class TInputImageB, class TInputImageNIR,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-RAndBAndNIRIndexImageFilter<TInputImageR,TInputImageB,TInputImageNIR,TOutputImage,TFunction>
-::SetInputNIR( const TInputImageNIR * image )
+RAndBAndNIRIndexImageFilter<TInputImageR, TInputImageB, TInputImageNIR, TOutputImage, TFunction>
+::SetInputNIR(const TInputImageNIR * image)
{
- SetInput3( image );
+ SetInput3(image);
}
-template <class TInputImageR, class TInputImageB, class TInputImageNIR, class TOutputImage, class TFunction >
+template <class TInputImageR, class TInputImageB, class TInputImageNIR, class TOutputImage, class TFunction>
void
RAndBAndNIRIndexImageFilter<TInputImageR, TInputImageB, TInputImageNIR, TOutputImage, TFunction>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
}
diff --git a/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.h b/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.h
index 2a93cb3651..98cb2b739e 100644
--- a/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.h
+++ b/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.h
@@ -32,15 +32,16 @@ namespace otb
*/
template <class TInputImageR, class TInputImageB, class TInputImageNIR, class TOutputImage,
-class TFunction = Functor::ARVI< typename TInputImageR::PixelType,
-typename TInputImageB::PixelType,
-typename TInputImageNIR::PixelType,
-typename TOutputImage::PixelType > >
-class ITK_EXPORT RAndBAndNIRVegetationIndexImageFilter : public RAndBAndNIRIndexImageFilter< TInputImageR, TInputImageB, TInputImageNIR, TOutputImage, TFunction >
+ class TFunction = Functor::ARVI<typename TInputImageR::PixelType,
+ typename TInputImageB::PixelType,
+ typename TInputImageNIR::PixelType,
+ typename TOutputImage::PixelType> >
+class ITK_EXPORT RAndBAndNIRVegetationIndexImageFilter : public RAndBAndNIRIndexImageFilter<TInputImageR, TInputImageB,
+ TInputImageNIR,
+ TOutputImage, TFunction>
{
};
} // end namespace otb
-
#endif
diff --git a/Code/Radiometry/otbRAndGAndNIRIndexImageFilter.h b/Code/Radiometry/otbRAndGAndNIRIndexImageFilter.h
index 428d21d3a1..486ee44393 100644
--- a/Code/Radiometry/otbRAndGAndNIRIndexImageFilter.h
+++ b/Code/Radiometry/otbRAndGAndNIRIndexImageFilter.h
@@ -32,47 +32,50 @@ namespace otb
*/
template <class TInputImageR, class TInputImageG, class TInputImageNIR, class TOutputImage,
-class TFunction = Functor::AVI< typename TInputImageR::PixelType,
-typename TInputImageG::PixelType,
-typename TInputImageNIR::PixelType,
-typename TOutputImage::PixelType > >
-class ITK_EXPORT RAndGAndNIRIndexImageFilter : public itk::TernaryFunctorImageFilter< TInputImageR, TInputImageG, TInputImageNIR, TOutputImage, TFunction >
+ class TFunction = Functor::AVI<typename TInputImageR::PixelType,
+ typename TInputImageG::PixelType,
+ typename TInputImageNIR::PixelType,
+ typename TOutputImage::PixelType> >
+class ITK_EXPORT RAndGAndNIRIndexImageFilter : public itk::TernaryFunctorImageFilter<TInputImageR, TInputImageG,
+ TInputImageNIR, TOutputImage,
+ TFunction>
{
public:
/** Standard typedefs */
- typedef RAndGAndNIRIndexImageFilter Self;
- typedef itk::TernaryFunctorImageFilter< TInputImageR, TInputImageG, TInputImageNIR, TOutputImage, TFunction > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef RAndGAndNIRIndexImageFilter Self;
+ typedef itk::TernaryFunctorImageFilter<TInputImageR, TInputImageG, TInputImageNIR, TOutputImage,
+ TFunction> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self>
+ ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(RAndGAndNIRIndexImageFilter,TernaryFunctorImageFilter);
+ itkTypeMacro(RAndGAndNIRIndexImageFilter, TernaryFunctorImageFilter);
- void SetInputR( const TInputImageR * image );
- void SetInputG( const TInputImageG * image );
- void SetInputNIR( const TInputImageNIR * image );
+ void SetInputR(const TInputImageR * image);
+ void SetInputG(const TInputImageG * image);
+ void SetInputNIR(const TInputImageNIR * image);
/** Template parameters typedefs */
typedef typename Superclass::Input1ImageType RInputImageType;
typedef typename Superclass::Input2ImageType GInputImageType;
typedef typename Superclass::Input3ImageType NIRInputImageType;
typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::FunctorType FunctorType;
+ typedef typename Superclass::FunctorType FunctorType;
protected:
RAndGAndNIRIndexImageFilter();
- virtual ~RAndGAndNIRIndexImageFilter() {};
+ virtual ~RAndGAndNIRIndexImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- RAndGAndNIRIndexImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ RAndGAndNIRIndexImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -82,5 +85,4 @@ private:
#include "otbRAndGAndNIRIndexImageFilter.txx"
#endif
-
#endif
diff --git a/Code/Radiometry/otbRAndGAndNIRIndexImageFilter.txx b/Code/Radiometry/otbRAndGAndNIRIndexImageFilter.txx
index 2efd153883..65e6fbf33f 100644
--- a/Code/Radiometry/otbRAndGAndNIRIndexImageFilter.txx
+++ b/Code/Radiometry/otbRAndGAndNIRIndexImageFilter.txx
@@ -27,57 +27,55 @@ namespace otb
* Constructor
*/
template <class TInputImageR, class TInputImageG, class TInputImageNIR,
-class TOutputImage, class TFunction >
-RAndGAndNIRIndexImageFilter<TInputImageR,TInputImageG,TInputImageNIR,TOutputImage,TFunction>
+ class TOutputImage, class TFunction>
+RAndGAndNIRIndexImageFilter<TInputImageR, TInputImageG, TInputImageNIR, TOutputImage, TFunction>
::RAndGAndNIRIndexImageFilter()
{
}
-
/**
* Connect one of the operands for pixel-wise addition
*/
template <class TInputImageR, class TInputImageG, class TInputImageNIR,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-RAndGAndNIRIndexImageFilter<TInputImageR,TInputImageG,TInputImageNIR,TOutputImage,TFunction>
-::SetInputR( const TInputImageR * image )
+RAndGAndNIRIndexImageFilter<TInputImageR, TInputImageG, TInputImageNIR, TOutputImage, TFunction>
+::SetInputR(const TInputImageR * image)
{
// Process object is not const-correct so the const casting is required.
- SetInput1( image );
+ SetInput1(image);
}
-
/**
* Connect one of the operands for pixel-wise addition
*/
template <class TInputImageR, class TInputImageG, class TInputImageNIR,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-RAndGAndNIRIndexImageFilter<TInputImageR,TInputImageG,TInputImageNIR,TOutputImage,TFunction>
-::SetInputG( const TInputImageG * image )
+RAndGAndNIRIndexImageFilter<TInputImageR, TInputImageG, TInputImageNIR, TOutputImage, TFunction>
+::SetInputG(const TInputImageG * image)
{
- SetInput2( image );
+ SetInput2(image);
}
/**
* Connect one of the operands for pixel-wise addition
*/
template <class TInputImageR, class TInputImageG, class TInputImageNIR,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-RAndGAndNIRIndexImageFilter<TInputImageR,TInputImageG,TInputImageNIR,TOutputImage,TFunction>
-::SetInputNIR( const TInputImageNIR * image )
+RAndGAndNIRIndexImageFilter<TInputImageR, TInputImageG, TInputImageNIR, TOutputImage, TFunction>
+::SetInputNIR(const TInputImageNIR * image)
{
- SetInput3( image );
+ SetInput3(image);
}
-template <class TInputImageR, class TInputImageG, class TInputImageNIR, class TOutputImage, class TFunction >
+template <class TInputImageR, class TInputImageG, class TInputImageNIR, class TOutputImage, class TFunction>
void
RAndGAndNIRIndexImageFilter<TInputImageR, TInputImageG, TInputImageNIR, TOutputImage, TFunction>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
}
diff --git a/Code/Radiometry/otbRAndGAndNIRVegetationIndexImageFilter.h b/Code/Radiometry/otbRAndGAndNIRVegetationIndexImageFilter.h
index 29a047d6e0..8450c8f102 100644
--- a/Code/Radiometry/otbRAndGAndNIRVegetationIndexImageFilter.h
+++ b/Code/Radiometry/otbRAndGAndNIRVegetationIndexImageFilter.h
@@ -32,47 +32,51 @@ namespace otb
*/
template <class TInputImageR, class TInputImageG, class TInputImageNIR, class TOutputImage,
-class TFunction = Functor::AVI< typename TInputImageR::PixelType,
-typename TInputImageG::PixelType,
-typename TInputImageNIR::PixelType,
-typename TOutputImage::PixelType > >
-class ITK_EXPORT RAndGAndNIRVegetationIndexImageFilter : public itk::TernaryFunctorImageFilter< TInputImageR, TInputImageG, TInputImageNIR, TOutputImage, TFunction >
+ class TFunction = Functor::AVI<typename TInputImageR::PixelType,
+ typename TInputImageG::PixelType,
+ typename TInputImageNIR::PixelType,
+ typename TOutputImage::PixelType> >
+class ITK_EXPORT RAndGAndNIRVegetationIndexImageFilter : public itk::TernaryFunctorImageFilter<TInputImageR,
+ TInputImageG,
+ TInputImageNIR,
+ TOutputImage, TFunction>
{
public:
/** Standard typedefs */
- typedef RAndGAndNIRVegetationIndexImageFilter Self;
- typedef itk::TernaryFunctorImageFilter< TInputImageR, TInputImageG, TInputImageNIR, TOutputImage, TFunction > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef RAndGAndNIRVegetationIndexImageFilter Self;
+ typedef itk::TernaryFunctorImageFilter<TInputImageR, TInputImageG, TInputImageNIR, TOutputImage,
+ TFunction> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self>
+ ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(RAndGAndNIRVegetationIndexImageFilter,TernaryFunctorImageFilter);
+ itkTypeMacro(RAndGAndNIRVegetationIndexImageFilter, TernaryFunctorImageFilter);
- void SetInputR( const TInputImageR * image );
- void SetInputG( const TInputImageG * image );
- void SetInputNIR( const TInputImageNIR * image );
+ void SetInputR(const TInputImageR * image);
+ void SetInputG(const TInputImageG * image);
+ void SetInputNIR(const TInputImageNIR * image);
/** Template parameters typedefs */
typedef typename Superclass::Input1ImageType RInputImageType;
typedef typename Superclass::Input2ImageType GInputImageType;
typedef typename Superclass::Input3ImageType NIRInputImageType;
typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::FunctorType FunctorType;
+ typedef typename Superclass::FunctorType FunctorType;
protected:
RAndGAndNIRVegetationIndexImageFilter();
- virtual ~RAndGAndNIRVegetationIndexImageFilter() {};
+ virtual ~RAndGAndNIRVegetationIndexImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- RAndGAndNIRVegetationIndexImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ RAndGAndNIRVegetationIndexImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -82,5 +86,4 @@ private:
#include "otbRAndGAndNIRVegetationIndexImageFilter.txx"
#endif
-
#endif
diff --git a/Code/Radiometry/otbRAndNIRIndexImageFilter.h b/Code/Radiometry/otbRAndNIRIndexImageFilter.h
index 7419755184..638187a81c 100644
--- a/Code/Radiometry/otbRAndNIRIndexImageFilter.h
+++ b/Code/Radiometry/otbRAndNIRIndexImageFilter.h
@@ -31,41 +31,42 @@ namespace otb
*/
template <class TInputImageR, class TInputImageNIR, class TOutputImage,
-class TFunction = Functor::NDVI< typename TInputImageR::PixelType,
-typename TInputImageNIR::PixelType,
-typename TOutputImage::PixelType > >
-class ITK_EXPORT RAndNIRIndexImageFilter : public itk::BinaryFunctorImageFilter< TInputImageR, TInputImageNIR, TOutputImage, TFunction >
+ class TFunction = Functor::NDVI<typename TInputImageR::PixelType,
+ typename TInputImageNIR::PixelType,
+ typename TOutputImage::PixelType> >
+class ITK_EXPORT RAndNIRIndexImageFilter : public itk::BinaryFunctorImageFilter<TInputImageR, TInputImageNIR,
+ TOutputImage, TFunction>
{
public:
/** Standard typedefs */
- typedef RAndNIRIndexImageFilter Self;
- typedef itk::BinaryFunctorImageFilter< TInputImageR, TInputImageNIR, TOutputImage, TFunction > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef RAndNIRIndexImageFilter Self;
+ typedef itk::BinaryFunctorImageFilter<TInputImageR, TInputImageNIR, TOutputImage, TFunction> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(RAndNIRIndexImageFilter,BinaryFunctorImageFilter);
+ itkTypeMacro(RAndNIRIndexImageFilter, BinaryFunctorImageFilter);
- void SetInputR( const TInputImageR * image1 );
- void SetInputNIR( const TInputImageNIR * image2 );
+ void SetInputR(const TInputImageR * image1);
+ void SetInputNIR(const TInputImageNIR * image2);
/** Template parameters typedefs */
- typedef typename Superclass::Input1ImageType RInputImageType;
- typedef typename Superclass::Input1ImagePointer RInputImagePointer;
- typedef typename Superclass::Input2ImageType NIRInputImageType;
- typedef typename Superclass::Input2ImagePointer NIRInputImagePointer;
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename Superclass::OutputImagePointer OutputImagePointer;
- typedef typename Superclass::FunctorType FunctorType;
+ typedef typename Superclass::Input1ImageType RInputImageType;
+ typedef typename Superclass::Input1ImagePointer RInputImagePointer;
+ typedef typename Superclass::Input2ImageType NIRInputImageType;
+ typedef typename Superclass::Input2ImagePointer NIRInputImagePointer;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::OutputImagePointer OutputImagePointer;
+ typedef typename Superclass::FunctorType FunctorType;
typedef typename Superclass::OutputImageRegionType OutputImageRegionType;
protected:
RAndNIRIndexImageFilter();
- virtual ~RAndNIRIndexImageFilter() {};
+ virtual ~RAndNIRIndexImageFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -73,9 +74,8 @@ protected:
int threadId );
*/
private:
- RAndNIRIndexImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ RAndNIRIndexImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
@@ -85,5 +85,4 @@ private:
#include "otbRAndNIRIndexImageFilter.txx"
#endif
-
#endif
diff --git a/Code/Radiometry/otbRAndNIRIndexImageFilter.txx b/Code/Radiometry/otbRAndNIRIndexImageFilter.txx
index 560679b7e7..2c16ddb1c1 100644
--- a/Code/Radiometry/otbRAndNIRIndexImageFilter.txx
+++ b/Code/Radiometry/otbRAndNIRIndexImageFilter.txx
@@ -31,42 +31,39 @@ namespace otb
* Constructor
*/
template <class TInputImageR, class TInputImageNIR,
-class TOutputImage, class TFunction >
-RAndNIRIndexImageFilter<TInputImageR,TInputImageNIR,TOutputImage,TFunction>
+ class TOutputImage, class TFunction>
+RAndNIRIndexImageFilter<TInputImageR, TInputImageNIR, TOutputImage, TFunction>
::RAndNIRIndexImageFilter()
{
}
-
/**
* Connect one of the operands for pixel-wise addition
*/
template <class TInputImageR, class TInputImageNIR,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-RAndNIRIndexImageFilter<TInputImageR,TInputImageNIR,TOutputImage,TFunction>
-::SetInputR( const TInputImageR * image1 )
+RAndNIRIndexImageFilter<TInputImageR, TInputImageNIR, TOutputImage, TFunction>
+::SetInputR(const TInputImageR * image1)
{
// Process object is not const-correct so the const casting is required.
- SetInput1( image1 );
+ SetInput1(image1);
}
-
/**
* Connect one of the operands for pixel-wise addition
*/
template <class TInputImageR, class TInputImageNIR,
-class TOutputImage, class TFunction >
+ class TOutputImage, class TFunction>
void
-RAndNIRIndexImageFilter<TInputImageR,TInputImageNIR,TOutputImage,TFunction>
-::SetInputNIR( const TInputImageNIR * image2 )
+RAndNIRIndexImageFilter<TInputImageR, TInputImageNIR, TOutputImage, TFunction>
+::SetInputNIR(const TInputImageNIR * image2)
{
// Process object is not const-correct so the const casting is required.
// SetNthInput(1, const_cast<TInputImageNIR *>( image2 ));
- SetInput2( image2 );
+ SetInput2(image2);
}
-
/**
* ThreadedGenerateData Performs the pixel-wise addition
*/
@@ -109,12 +106,12 @@ RAndNIRIndexImageFilter<TInputImageR, TInputImageNIR, TOutputImage, TFunction>
}
*/
-template <class TInputImageR, class TInputImageNIR, class TOutputImage, class TFunction >
+template <class TInputImageR, class TInputImageNIR, class TOutputImage, class TFunction>
void
RAndNIRIndexImageFilter<TInputImageR, TInputImageNIR, TOutputImage, TFunction>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
}
diff --git a/Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.h b/Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.h
index fc476f34d0..9adfca8b4f 100644
--- a/Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.h
+++ b/Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.h
@@ -31,13 +31,13 @@ namespace otb
*/
template <class TInputImageR, class TInputImageNIR, class TOutputImage,
-class TFunction = Functor::NDVI< typename TInputImageR::PixelType,
-typename TInputImageNIR::PixelType,
-typename TOutputImage::PixelType > >
-class ITK_EXPORT RAndNIRVegetationIndexImageFilter : public RAndNIRIndexImageFilter< TInputImageR, TInputImageNIR, TOutputImage, TFunction >
+ class TFunction = Functor::NDVI<typename TInputImageR::PixelType,
+ typename TInputImageNIR::PixelType,
+ typename TOutputImage::PixelType> >
+class ITK_EXPORT RAndNIRVegetationIndexImageFilter : public RAndNIRIndexImageFilter<TInputImageR, TInputImageNIR,
+ TOutputImage, TFunction>
{
};
} // end namespace otb
-
#endif
diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
index 4bf508d714..d779a62c66 100644
--- a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
+++ b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
@@ -22,7 +22,6 @@
#ifndef __otbReflectanceToSurfaceReflectanceImageFilter_h
#define __otbReflectanceToSurfaceReflectanceImageFilter_h
-
#include "otbUnaryImageFunctorWithVectorImageFilter.h"
#include "otbAtmosphericRadiativeTerms.h"
@@ -51,20 +50,20 @@ public:
m_Coefficient = 1.;
m_Residu = 1.;
m_SphericalAlbedo = 1.;
- };
- virtual ~ReflectanceToSurfaceReflectanceImageFunctor() {};
+ }
+ virtual ~ReflectanceToSurfaceReflectanceImageFunctor() {}
/**
* Set/Get the spherical albedo of the atmosphere.
*/
void SetSphericalAlbedo(double albedo)
{
- m_SphericalAlbedo=albedo;
- };
+ m_SphericalAlbedo = albedo;
+ }
double GetSphericalAlbedo()
{
return m_SphericalAlbedo;
- };
+ }
/**
* Set/Get Coefficient, computed from AtmosphericRadiativeTermsPointerType datas.
@@ -72,11 +71,11 @@ public:
void SetCoefficient(double coef)
{
m_Coefficient = coef;
- };
+ }
double GetCoefficient()
{
return m_Coefficient;
- };
+ }
/**
* Set/Get Residu, computed from AtmosphericRadiativeTermsPointerType datas.
@@ -84,20 +83,20 @@ public:
void SetResidu(double res)
{
m_Residu = res;
- };
+ }
double GetResidu()
{
return m_Residu;
- };
+ }
- inline TOutput operator() (const TInput & inPixel)
+ inline TOutput operator ()(const TInput& inPixel)
{
TOutput outPixel;
- double temp, temp2;
- temp = static_cast<double>(inPixel)*m_Coefficient + m_Residu;
+ double temp, temp2;
+ temp = static_cast<double>(inPixel) * m_Coefficient + m_Residu;
temp2 = temp / (1. + m_SphericalAlbedo * temp);
- outPixel = static_cast<TOutput>( temp2 );
+ outPixel = static_cast<TOutput>(temp2);
return outPixel;
}
@@ -118,28 +117,31 @@ private:
* \ingroup ImageToReflectanceImageFilter
* \ingroup Radiometry
*/
-template <class TInputImage, class TOutputImage >
+template <class TInputImage, class TOutputImage>
class ITK_EXPORT ReflectanceToSurfaceReflectanceImageFilter :
- public UnaryImageFunctorWithVectorImageFilter< TInputImage,
- TOutputImage,
- ITK_TYPENAME Functor::ReflectanceToSurfaceReflectanceImageFunctor< ITK_TYPENAME TInputImage::InternalPixelType,
- ITK_TYPENAME TOutputImage::InternalPixelType > >
+ public UnaryImageFunctorWithVectorImageFilter<TInputImage,
+ TOutputImage,
+ ITK_TYPENAME Functor::ReflectanceToSurfaceReflectanceImageFunctor<
+ ITK_TYPENAME TInputImage::InternalPixelType,
+ ITK_TYPENAME
+ TOutputImage::InternalPixelType> >
{
public:
/** Extract input and output images dimensions.*/
- itkStaticConstMacro( InputImageDimension, unsigned int, TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
/** "typedef" to simplify the variables definition and the declaration. */
- typedef TInputImage InputImageType;
- typedef TOutputImage OutputImageType;
+ typedef TInputImage InputImageType;
+ typedef TOutputImage OutputImageType;
typedef typename Functor::ReflectanceToSurfaceReflectanceImageFunctor<ITK_TYPENAME InputImageType::InternalPixelType,
- ITK_TYPENAME OutputImageType::InternalPixelType> FunctorType;
+ ITK_TYPENAME OutputImageType::InternalPixelType>
+ FunctorType;
/** "typedef" for standard classes. */
- typedef ReflectanceToSurfaceReflectanceImageFilter Self;
- typedef UnaryImageFunctorWithVectorImageFilter< InputImageType, OutputImageType, FunctorType > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ReflectanceToSurfaceReflectanceImageFilter Self;
+ typedef UnaryImageFunctorWithVectorImageFilter<InputImageType, OutputImageType, FunctorType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** object factory method. */
itkNewMacro(Self);
@@ -148,24 +150,23 @@ public:
itkTypeMacro(ReflectanceToSurfaceReflectanceImageFilter, UnaryImageFunctorWithVectorImageFilter);
/** Supported images definition. */
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::InternalPixelType InputInternalPixelType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::InternalPixelType InputInternalPixelType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms Parameters2RadiativeTermsType;
- typedef Parameters2RadiativeTermsType::Pointer Parameters2RadiativeTermsPointerType;
- typedef AtmosphericCorrectionParameters::Pointer CorrectionParametersPointerType;
- typedef AtmosphericRadiativeTerms::Pointer AtmosphericRadiativeTermsPointerType;
+ typedef AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms Parameters2RadiativeTermsType;
+ typedef Parameters2RadiativeTermsType::Pointer Parameters2RadiativeTermsPointerType;
+ typedef AtmosphericCorrectionParameters::Pointer CorrectionParametersPointerType;
+ typedef AtmosphericRadiativeTerms::Pointer AtmosphericRadiativeTermsPointerType;
+ typedef FilterFunctionValues FilterFunctionValuesType;
+ typedef FilterFunctionValuesType::ValuesVectorType CoefVectorType;
+ typedef std::vector<CoefVectorType> FilterFunctionCoefVectorType;
- typedef FilterFunctionValues FilterFunctionValuesType;
- typedef FilterFunctionValuesType::ValuesVectorType CoefVectorType;
- typedef std::vector<CoefVectorType> FilterFunctionCoefVectorType;
-
- typedef itk::MetaDataDictionary MetaDataDictionaryType;
+ typedef itk::MetaDataDictionary MetaDataDictionaryType;
/** Get/Set Atmospheric Radiative Terms. */
void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmo)
@@ -190,14 +191,14 @@ public:
itkGetMacro(FilterFunctionValuesFileName, std::string);
/** Get/Set Filter function coef. */
- void SetFilterFunctionCoef( FilterFunctionCoefVectorType vect )
+ void SetFilterFunctionCoef(FilterFunctionCoefVectorType vect)
{
- m_FilterFunctionCoef = vect;
- this->Modified();
+ m_FilterFunctionCoef = vect;
+ this->Modified();
}
FilterFunctionCoefVectorType GetFilterFunctionCoef()
{
- return m_FilterFunctionCoef;
+ return m_FilterFunctionCoef;
}
/** Compute radiative terms if necessary and then updtae functors attibuts. */
@@ -211,12 +212,11 @@ public:
itkSetMacro(IsSetAtmosphericRadiativeTerms, bool);
itkGetMacro(IsSetAtmosphericRadiativeTerms, bool);
-
protected:
/** Constructor */
ReflectanceToSurfaceReflectanceImageFilter();
/** Destructor */
- virtual ~ReflectanceToSurfaceReflectanceImageFilter() {};
+ virtual ~ReflectanceToSurfaceReflectanceImageFilter() {}
/** Read the aeronet data and extract aerosol optical and water vapor amount. */
//void UpdateAeronetData( const MetaDataDictionaryType dict );
@@ -231,7 +231,7 @@ protected:
private:
AtmosphericRadiativeTermsPointerType m_AtmosphericRadiativeTerms;
CorrectionParametersPointerType m_CorrectionParameters;
- bool m_IsSetAtmosphericRadiativeTerms;
+ bool m_IsSetAtmosphericRadiativeTerms;
/** Path to an Aeronet data file, allows to compute aerosol optical and water vapor amounts. */
std::string m_AeronetFileName;
/** Path to an filter function values file. */
diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
index 7ebfd7cc97..c41e434a00 100644
--- a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
+++ b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
@@ -22,7 +22,6 @@
#include "otbImageMetadataInterfaceFactory.h"
#include "otbImageMetadataInterfaceBase.h"
-
namespace otb
{
@@ -30,7 +29,7 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage>
-ReflectanceToSurfaceReflectanceImageFilter<TInputImage,TOutputImage>
+ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage>
::ReflectanceToSurfaceReflectanceImageFilter()
{
m_AtmosphericRadiativeTerms = AtmosphericRadiativeTerms::New();
@@ -42,82 +41,80 @@ ReflectanceToSurfaceReflectanceImageFilter<TInputImage,TOutputImage>
m_UseGenerateParameters = true;
}
-
template <class TInputImage, class TOutputImage>
void
-ReflectanceToSurfaceReflectanceImageFilter<TInputImage,TOutputImage>
+ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage>
::UpdateAtmosphericRadiativeTerms()
{
MetaDataDictionaryType dict = this->GetInput()->GetMetaDataDictionary();
-
+
ImageMetadataInterfaceBase::Pointer imageMetadataInterface = ImageMetadataInterfaceFactory::CreateIMI(dict);
-
+
if ((m_CorrectionParameters->GetDay() == 0))
{
- m_CorrectionParameters->SetDay(imageMetadataInterface->GetDay(dict));
+ m_CorrectionParameters->SetDay(imageMetadataInterface->GetDay(dict));
}
-
+
if ((m_CorrectionParameters->GetMonth() == 0))
{
- m_CorrectionParameters->SetMonth(imageMetadataInterface->GetMonth(dict));
+ m_CorrectionParameters->SetMonth(imageMetadataInterface->GetMonth(dict));
}
-
+
if ((m_CorrectionParameters->GetSolarZenithalAngle() == 361.))
{
- m_CorrectionParameters->SetSolarZenithalAngle(90. - imageMetadataInterface->GetSunElevation(dict));
+ m_CorrectionParameters->SetSolarZenithalAngle(90. - imageMetadataInterface->GetSunElevation(dict));
}
-
+
if ((m_CorrectionParameters->GetSolarAzimutalAngle() == 361.))
{
- m_CorrectionParameters->SetSolarAzimutalAngle(imageMetadataInterface->GetSunAzimuth(dict));
+ m_CorrectionParameters->SetSolarAzimutalAngle(imageMetadataInterface->GetSunAzimuth(dict));
}
-
+
if ((m_CorrectionParameters->GetViewingZenithalAngle() == 361.))
{
- m_CorrectionParameters->SetViewingZenithalAngle(90. - imageMetadataInterface->GetSatElevation(dict));
+ m_CorrectionParameters->SetViewingZenithalAngle(90. - imageMetadataInterface->GetSatElevation(dict));
}
if ((m_CorrectionParameters->GetViewingAzimutalAngle() == 361.))
{
- m_CorrectionParameters->SetViewingAzimutalAngle(imageMetadataInterface->GetSatAzimuth(dict));
+ m_CorrectionParameters->SetViewingAzimutalAngle(imageMetadataInterface->GetSatAzimuth(dict));
}
-
- if(m_AeronetFileName != "")
- m_CorrectionParameters->UpdateAeronetData( m_AeronetFileName,
- imageMetadataInterface->GetYear(dict),
- imageMetadataInterface->GetHour(dict),
- imageMetadataInterface->GetMinute(dict) );
-
+
+ if (m_AeronetFileName != "")
+ m_CorrectionParameters->UpdateAeronetData(m_AeronetFileName,
+ imageMetadataInterface->GetYear(dict),
+ imageMetadataInterface->GetHour(dict),
+ imageMetadataInterface->GetMinute(dict));
+
// load fiter function values
- if(m_FilterFunctionValuesFileName != "")
+ if (m_FilterFunctionValuesFileName != "")
{
- m_CorrectionParameters->LoadFilterFunctionValue( m_FilterFunctionValuesFileName );
- }
+ m_CorrectionParameters->LoadFilterFunctionValue(m_FilterFunctionValuesFileName);
+ }
// the user has set the filter function values
- else if( m_CorrectionParameters->GetWavelenghtSpectralBand().size() != this->GetInput()->GetNumberOfComponentsPerPixel())
+ else if (m_CorrectionParameters->GetWavelenghtSpectralBand().size() !=
+ this->GetInput()->GetNumberOfComponentsPerPixel())
{
- bool ffvfOK = true;
- if( m_FilterFunctionCoef.size() == 0 )
- ffvfOK = false;
- else if( m_FilterFunctionCoef.size() != this->GetInput()->GetNumberOfComponentsPerPixel() )
- itkExceptionMacro(<<"Function Values and Input image size dismatch");
-
- for(unsigned int i=0; i<this->GetInput()->GetNumberOfComponentsPerPixel(); i++)
- {
- FilterFunctionValuesType::Pointer functionValues = FilterFunctionValuesType::New();
-
- if(ffvfOK)
- functionValues->SetFilterFunctionValues(m_FilterFunctionCoef[i]);
- else // if no ffvf set, compute the step to be sure that the valueswavelength are between min and max and 1 as coef
- {
- functionValues->SetMinSpectralValue(imageMetadataInterface->GetFirstWavelengths(dict)[i]);
- functionValues->SetMaxSpectralValue(imageMetadataInterface->GetLastWavelengths(dict)[i]);
- functionValues->SetUserStep( functionValues->GetMaxSpectralValue()-functionValues->GetMinSpectralValue()/2. );
- }
-
- m_CorrectionParameters->SetWavelenghtSpectralBandWithIndex(i, functionValues);
- }
-
+ bool ffvfOK = true;
+ if (m_FilterFunctionCoef.size() == 0) ffvfOK = false;
+ else if (m_FilterFunctionCoef.size() != this->GetInput()->GetNumberOfComponentsPerPixel()) itkExceptionMacro(
+ << "Function Values and Input image size dismatch");
+
+ for (unsigned int i = 0; i < this->GetInput()->GetNumberOfComponentsPerPixel(); i++)
+ {
+ FilterFunctionValuesType::Pointer functionValues = FilterFunctionValuesType::New();
+
+ if (ffvfOK) functionValues->SetFilterFunctionValues(m_FilterFunctionCoef[i]);
+ else // if no ffvf set, compute the step to be sure that the valueswavelength are between min and max and 1 as coef
+ {
+ functionValues->SetMinSpectralValue(imageMetadataInterface->GetFirstWavelengths(dict)[i]);
+ functionValues->SetMaxSpectralValue(imageMetadataInterface->GetLastWavelengths(dict)[i]);
+ functionValues->SetUserStep(functionValues->GetMaxSpectralValue() - functionValues->GetMinSpectralValue() / 2.);
+ }
+
+ m_CorrectionParameters->SetWavelenghtSpectralBandWithIndex(i, functionValues);
+ }
+
}
Parameters2RadiativeTermsPointerType param2Terms = Parameters2RadiativeTermsType::New();
@@ -126,53 +123,50 @@ ReflectanceToSurfaceReflectanceImageFilter<TInputImage,TOutputImage>
m_AtmosphericRadiativeTerms = param2Terms->GetOutput();
}
-
template <class TInputImage, class TOutputImage>
void
-ReflectanceToSurfaceReflectanceImageFilter<TInputImage,TOutputImage>
+ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
- if(m_UseGenerateParameters)
- this->GenerateParameters();
+ if (m_UseGenerateParameters) this->GenerateParameters();
}
template <class TInputImage, class TOutputImage>
void
-ReflectanceToSurfaceReflectanceImageFilter<TInputImage,TOutputImage>
+ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage>
::UpdateFunctors()
{
this->GetFunctorVector().clear();
- for (unsigned int i = 0;i<this->GetInput()->GetNumberOfComponentsPerPixel();++i)
+ for (unsigned int i = 0; i < this->GetInput()->GetNumberOfComponentsPerPixel(); ++i)
{
- double coef;
- double res;
- coef = static_cast<double>(m_AtmosphericRadiativeTerms->GetTotalGaseousTransmission(i)
- * m_AtmosphericRadiativeTerms->GetDownwardTransmittance(i)
- * m_AtmosphericRadiativeTerms->GetUpwardTransmittance(i) );
- coef = 1. / coef;
- res = -m_AtmosphericRadiativeTerms->GetIntrinsicAtmosphericReflectance(i) * coef;
- FunctorType functor;
- functor.SetCoefficient(coef);
- functor.SetResidu(res);
- functor.SetSphericalAlbedo(static_cast<double>(m_AtmosphericRadiativeTerms->GetSphericalAlbedo(i)));
-
- this->GetFunctorVector().push_back(functor);
+ double coef;
+ double res;
+ coef = static_cast<double>(m_AtmosphericRadiativeTerms->GetTotalGaseousTransmission(i)
+ * m_AtmosphericRadiativeTerms->GetDownwardTransmittance(i)
+ * m_AtmosphericRadiativeTerms->GetUpwardTransmittance(i));
+ coef = 1. / coef;
+ res = -m_AtmosphericRadiativeTerms->GetIntrinsicAtmosphericReflectance(i) * coef;
+ FunctorType functor;
+ functor.SetCoefficient(coef);
+ functor.SetResidu(res);
+ functor.SetSphericalAlbedo(static_cast<double>(m_AtmosphericRadiativeTerms->GetSphericalAlbedo(i)));
+
+ this->GetFunctorVector().push_back(functor);
}
}
-
template <class TInputImage, class TOutputImage>
void
-ReflectanceToSurfaceReflectanceImageFilter<TInputImage,TOutputImage>
+ReflectanceToSurfaceReflectanceImageFilter<TInputImage, TOutputImage>
::GenerateParameters()
{
- if(!m_IsSetAtmosphericRadiativeTerms)
+ if (!m_IsSetAtmosphericRadiativeTerms)
{
- this->UpdateAtmosphericRadiativeTerms();
+ this->UpdateAtmosphericRadiativeTerms();
}
-
+
this->UpdateFunctors();
}
diff --git a/Code/Radiometry/otbSIXSTraits.cxx b/Code/Radiometry/otbSIXSTraits.cxx
index 3c139d10fc..154284bb68 100644
--- a/Code/Radiometry/otbSIXSTraits.cxx
+++ b/Code/Radiometry/otbSIXSTraits.cxx
@@ -26,45 +26,44 @@
namespace otb
{
-
void
SIXSTraits::ComputeAtmosphericParameters(
- const double SolarZenithalAngle, /** The Solar zenithal angle */
- const double SolarAzimutalAngle, /** The Solar azimutal angle */
- const double ViewingZenithalAngle, /** The Viewing zenithal angle */
- const double ViewingAzimutalAngle, /** The Viewing azimutal angle */
- const unsigned int Month, /** The Month */
- const unsigned int Day, /** The Day (in the month) */
- const double AtmosphericPressure, /** The Atmospheric pressure */
- const double WaterVaporAmount, /** The Water vapor amount (Total water vapor content over vertical atmospheric column) */
- const double OzoneAmount, /** The Ozone amount (Stratospheric ozone layer content) */
- const AerosolModelType & AerosolModel, /** The Aerosol model */
- const double AerosolOptical, /** The Aerosol optical (radiative impact of aerosol for the reference wavelenght 550-nm) */
+ const double SolarZenithalAngle, /** The Solar zenithal angle */
+ const double SolarAzimutalAngle, /** The Solar azimutal angle */
+ const double ViewingZenithalAngle, /** The Viewing zenithal angle */
+ const double ViewingAzimutalAngle, /** The Viewing azimutal angle */
+ const unsigned int Month, /** The Month */
+ const unsigned int Day, /** The Day (in the month) */
+ const double AtmosphericPressure, /** The Atmospheric pressure */
+ const double WaterVaporAmount, /** The Water vapor amount (Total water vapor content over vertical atmospheric column) */
+ const double OzoneAmount, /** The Ozone amount (Stratospheric ozone layer content) */
+ const AerosolModelType& AerosolModel, /** The Aerosol model */
+ const double AerosolOptical, /** The Aerosol optical (radiative impact of aerosol for the reference wavelenght 550-nm) */
WavelenghtSpectralType* WavelenghtSpectralBand, /** Wavelenght for the spectral band definition */
/** Note : The Max wavelenght spectral band value must be updated ! */
- double & AtmosphericReflectance, /** Atmospheric reflectance */
- double & AtmosphericSphericalAlbedo, /** atmospheric spherical albedo */
- double & TotalGaseousTransmission, /** Total gaseous transmission */
- double & DownwardTransmittance, /** downward transmittance */
- double & UpwardTransmittance, /** upward transmittance */
- double & UpwardDiffuseTransmittance, /** upward diffuse transmittance */
- double & UpwardDirectTransmittance, /** Upward direct transmittance */
- double & UpwardDiffuseTransmittanceForRayleigh, /** upward diffuse transmittance for rayleigh */
- double & UpwardDiffuseTransmittanceForAerosol /** supward diffuse transmittance for aerosols */
-)
+ double& AtmosphericReflectance, /** Atmospheric reflectance */
+ double& AtmosphericSphericalAlbedo, /** atmospheric spherical albedo */
+ double& TotalGaseousTransmission, /** Total gaseous transmission */
+ double& DownwardTransmittance, /** downward transmittance */
+ double& UpwardTransmittance, /** upward transmittance */
+ double& UpwardDiffuseTransmittance, /** upward diffuse transmittance */
+ double& UpwardDirectTransmittance, /** Upward direct transmittance */
+ double& UpwardDiffuseTransmittanceForRayleigh, /** upward diffuse transmittance for rayleigh */
+ double& UpwardDiffuseTransmittanceForAerosol /** supward diffuse transmittance for aerosols */
+ )
{
// geometrical conditions
otb_6s_doublereal asol(static_cast<otb_6s_doublereal>(SolarZenithalAngle));
otb_6s_doublereal phi0(static_cast<otb_6s_doublereal>(SolarAzimutalAngle));
otb_6s_doublereal avis(static_cast<otb_6s_doublereal>(ViewingZenithalAngle));
otb_6s_doublereal phiv(static_cast<otb_6s_doublereal>(ViewingAzimutalAngle));
- otb_6s_integer month(static_cast<otb_6s_integer>(Month));
- otb_6s_integer jday(static_cast<otb_6s_integer>(Day));
+ otb_6s_integer month(static_cast<otb_6s_integer>(Month));
+ otb_6s_integer jday(static_cast<otb_6s_integer>(Day));
otb_6s_doublereal pressure(static_cast<otb_6s_doublereal>(AtmosphericPressure));
otb_6s_doublereal uw(static_cast<otb_6s_doublereal>(WaterVaporAmount));
otb_6s_doublereal uo3(static_cast<otb_6s_doublereal>(OzoneAmount));
// atmospheric model
- otb_6s_integer iaer(static_cast<otb_6s_integer>(AerosolModel));
+ otb_6s_integer iaer(static_cast<otb_6s_integer>(AerosolModel));
otb_6s_doublereal taer55(static_cast<otb_6s_doublereal>(AerosolOptical));
// Init output parameters
@@ -85,62 +84,64 @@ SIXSTraits::ComputeAtmosphericParameters(
// 6S official Wavelenght Spectral Band step value
const float SIXSStepOfWavelenghtSpectralBandValues = .0025;
// Generate 6s Wavelenght Spectral Band with the offcicial step value
- ComputeWavelenghtSpectralBandValuesFor6S( SIXSStepOfWavelenghtSpectralBandValues,
- WavelenghtSpectralBand // Update
- );
+ ComputeWavelenghtSpectralBandValuesFor6S(SIXSStepOfWavelenghtSpectralBandValues,
+ WavelenghtSpectralBand // Update
+ );
try
- {
+ {
// 6S official tab size Wavelenght Spectral
- const unsigned int S_6S_SIZE=1501;
+ const unsigned int S_6S_SIZE = 1501;
// Generate WavelenghtSpectralBand in 6S compatible buffer s[1501]
wlinf = static_cast<otb_6s_doublereal>(WavelenghtSpectralBand->GetMinSpectralValue());
wlsup = static_cast<otb_6s_doublereal>(WavelenghtSpectralBand->GetMaxSpectralValue());
- otb_6s_integer iinf = static_cast<otb_6s_integer>((wlinf - (float).25) / SIXSStepOfWavelenghtSpectralBandValues + (float)1.5);
- otb_6s_integer isup = static_cast<otb_6s_integer>((wlsup - (float).25) / SIXSStepOfWavelenghtSpectralBandValues + (float)1.5);
+ otb_6s_integer iinf =
+ static_cast<otb_6s_integer>((wlinf - (float) .25) / SIXSStepOfWavelenghtSpectralBandValues + (float) 1.5);
+ otb_6s_integer isup =
+ static_cast<otb_6s_integer>((wlsup - (float) .25) / SIXSStepOfWavelenghtSpectralBandValues + (float) 1.5);
- otb_6s_integer cpt=iinf-1;
+ otb_6s_integer cpt = iinf - 1;
otb_6s_doublereal * s(NULL);
s = new otb_6s_doublereal[S_6S_SIZE];
- memset( s, 0, S_6S_SIZE*sizeof(otb_6s_doublereal) );
- const ValuesVectorType & FilterFunctionValues6S = WavelenghtSpectralBand->GetFilterFunctionValues6S();
+ memset(s, 0, S_6S_SIZE * sizeof(otb_6s_doublereal));
+ const ValuesVectorType& FilterFunctionValues6S = WavelenghtSpectralBand->GetFilterFunctionValues6S();
// Set the values of FilterFunctionValues6S in s between [iinf-1;isup]
- for (unsigned int i=0; cpt<isup; ++i)
- {
+ for (unsigned int i = 0; cpt < isup; ++i)
+ {
s[cpt] = FilterFunctionValues6S[i];
cpt++;
- }
+ }
// Call 6s main function
otbMsgDevMacro(<< "Start call 6S main function ...");
- otb_6s_ssssss_otb_main_function( &asol, &phi0, &avis, &phiv, &month, &jday,
- &pressure, &uw, &uo3,
- &iaer,
- &taer55,
- &wlinf, &wlsup,
- s,
- &otb_ratm__,
- &sast,
- &tgasm,
- &sdtott,
- &sutott,
- &tdif_up,
- &tdir_up,
- &tdif_up_ray,
- &tdif_up_aer);
+ otb_6s_ssssss_otb_main_function(&asol, &phi0, &avis, &phiv, &month, &jday,
+ &pressure, &uw, &uo3,
+ &iaer,
+ &taer55,
+ &wlinf, &wlsup,
+ s,
+ &otb_ratm__,
+ &sast,
+ &tgasm,
+ &sdtott,
+ &sutott,
+ &tdif_up,
+ &tdir_up,
+ &tdif_up_ray,
+ &tdif_up_aer);
otbMsgDevMacro(<< "Done call 6S main function!");
- delete [] s;
+ delete[] s;
s = NULL;
- }
- catch ( std::bad_alloc & err )
- {
- itkGenericExceptionMacro( <<"Exception bad_alloc in SIXSTraits class: "<<(char*)err.what());
- }
+ }
+ catch (std::bad_alloc& err)
+ {
+ itkGenericExceptionMacro(<< "Exception bad_alloc in SIXSTraits class: " << (char*) err.what());
+ }
catch (...)
- {
- itkGenericExceptionMacro( <<"Unknown exception in SIXSTraits class (catch(...)");
- }
+ {
+ itkGenericExceptionMacro(<< "Unknown exception in SIXSTraits class (catch(...)");
+ }
// Set outputs parameters
AtmosphericReflectance = static_cast<double>(otb_ratm__);
@@ -154,104 +155,107 @@ SIXSTraits::ComputeAtmosphericParameters(
UpwardDiffuseTransmittanceForAerosol = static_cast<double>(tdif_up_aer);
}
-
void
SIXSTraits::ComputeWavelenghtSpectralBandValuesFor6S(
- const double SIXSStepOfWavelenghtSpectralBandValues,
+ const double SIXSStepOfWavelenghtSpectralBandValues,
WavelenghtSpectralType* WavelenghtSpectralBand
-)
+ )
{
- const double epsilon(.000001);
- const double L_min = static_cast<double>(WavelenghtSpectralBand->GetMinSpectralValue());
- const double L_max = static_cast<double>(WavelenghtSpectralBand->GetMaxSpectralValue());
- const double L_userStep = static_cast<double>(WavelenghtSpectralBand->GetUserStep());
- const ValuesVectorType & FilterFunctionValues = WavelenghtSpectralBand->GetFilterFunctionValues();
- unsigned int i = 1;
- unsigned int j = 1;
- const double invStep = static_cast<double>(1./L_userStep);
- double value(0.);
-
- if ( FilterFunctionValues.size() <= 1 )
- {
- itkGenericExceptionMacro(<<"The FilterFunctionValues vector must have more than 1 values !");
- }
- if( L_min+static_cast<double>(FilterFunctionValues.size()-1)*L_userStep < (L_max - epsilon ))
- {
- itkGenericExceptionMacro(<<"The following condition: "<<L_min<<"+("<<FilterFunctionValues.size()<<"-1)*"<<L_userStep<<" < ("<< L_max <<"-"<<epsilon<<") is not respected !");
- }
+ const double epsilon(.000001);
+ const double L_min = static_cast<double>(WavelenghtSpectralBand->GetMinSpectralValue());
+ const double L_max = static_cast<double>(WavelenghtSpectralBand->GetMaxSpectralValue());
+ const double L_userStep = static_cast<double>(WavelenghtSpectralBand->GetUserStep());
+ const ValuesVectorType& FilterFunctionValues = WavelenghtSpectralBand->GetFilterFunctionValues();
+ unsigned int i = 1;
+ unsigned int j = 1;
+ const double invStep = static_cast<double>(1. / L_userStep);
+ double value(0.);
+ if (FilterFunctionValues.size() <= 1)
+ {
+ itkGenericExceptionMacro(<< "The FilterFunctionValues vector must have more than 1 values !");
+ }
+ if (L_min + static_cast<double>(FilterFunctionValues.size() - 1) * L_userStep < (L_max - epsilon))
+ {
+ itkGenericExceptionMacro(
+ << "The following condition: " << L_min << "+(" << FilterFunctionValues.size() << "-1)*" << L_userStep <<
+ " < (" << L_max << "-" << epsilon << ") is not respected !");
+ }
// Generate WavelenghtSpectralBand if the step is not the offical 6S step value
- if ( vcl_abs(L_userStep-SIXSStepOfWavelenghtSpectralBandValues) > epsilon )
- {
+ if (vcl_abs(L_userStep - SIXSStepOfWavelenghtSpectralBandValues) > epsilon)
+ {
ValuesVectorType values(1, FilterFunctionValues[0]); //vector size 1 with the value vect[0]
// Stop the interpolation at the max spectral value.
- value = i*SIXSStepOfWavelenghtSpectralBandValues;
- while (L_min+value <= L_max )
+ value = i * SIXSStepOfWavelenghtSpectralBandValues;
+ while (L_min + value <= L_max)
{
- // Search the User interval that surround the StepOfWavelenghtSpectralBandValues current value.
-
- // removed the <= here, might be wrong
- while (j*L_userStep < value)
- {
- ++j;
- }
-
- // Check if we are not out of bound
- if (j>=FilterFunctionValues.size())
- {
- itkGenericExceptionMacro(<<"Index "<<j<<" out of bound for FilterFunctionValues vector (size: "<<FilterFunctionValues.size()<<").");
- }
-
- double valueTemp;
- valueTemp = static_cast<double>(FilterFunctionValues[j-1])
- + ((static_cast<double>(FilterFunctionValues[j])-static_cast<double>(FilterFunctionValues[j-1]))*invStep)
- *(value-L_userStep*(j-1));
- values.push_back(static_cast<WavelenghtSpectralBandType>(valueTemp));
-
- ++i;
- value = i*SIXSStepOfWavelenghtSpectralBandValues;
+ // Search the User interval that surround the StepOfWavelenghtSpectralBandValues current value.
+
+ // removed the <= here, might be wrong
+ while (j * L_userStep < value)
+ {
+ ++j;
+ }
+
+ // Check if we are not out of bound
+ if (j >= FilterFunctionValues.size())
+ {
+ itkGenericExceptionMacro(
+ << "Index " << j << " out of bound for FilterFunctionValues vector (size: " << FilterFunctionValues.size() <<
+ ").");
+ }
+
+ double valueTemp;
+ valueTemp = static_cast<double>(FilterFunctionValues[j - 1])
+ + ((static_cast<double>(FilterFunctionValues[j]) -
+ static_cast<double>(FilterFunctionValues[j - 1])) * invStep)
+ * (value - L_userStep * (j - 1));
+ values.push_back(static_cast<WavelenghtSpectralBandType>(valueTemp));
+
+ ++i;
+ value = i * SIXSStepOfWavelenghtSpectralBandValues;
}
-
- if (L_min+(i-1)*SIXSStepOfWavelenghtSpectralBandValues != L_max)
- {
+
+ if (L_min + (i - 1) * SIXSStepOfWavelenghtSpectralBandValues != L_max)
+ {
values.push_back(0);
- }
+ }
// Store this values
WavelenghtSpectralBand->SetFilterFunctionValues6S(values);
// Store the new Max MaxSpectralValue
- WavelenghtSpectralBand->SetMaxSpectralValue(static_cast<WavelenghtSpectralBandType>(L_min + i*SIXSStepOfWavelenghtSpectralBandValues));
+ WavelenghtSpectralBand->SetMaxSpectralValue(static_cast<WavelenghtSpectralBandType>(L_min + i *
+ SIXSStepOfWavelenghtSpectralBandValues));
- }
+ }
else
- {
+ {
// Init with copy of FilterFunctionValues input vector values
WavelenghtSpectralBand->SetFilterFunctionValues6S(FilterFunctionValues);
- }
+ }
}
void
SIXSTraits::ComputeEnvironmentalContribution(const double diffuseTransmittanceForRayleighScattering,
- const double diffuseTransmittanceForAerosolScattering,
- const double radiusInKilometers,
- const double altitude,
- const double cosineOfViewingAngle,
- double & rayleighEstimation,
- double & aerosolEstimation,
- double & globalEstimation)
+ const double diffuseTransmittanceForAerosolScattering,
+ const double radiusInKilometers,
+ const double altitude,
+ const double cosineOfViewingAngle,
+ double& rayleighEstimation,
+ double& aerosolEstimation,
+ double& globalEstimation)
{
otb_6s_doublereal difr(static_cast<otb_6s_doublereal>(diffuseTransmittanceForRayleighScattering));
otb_6s_doublereal difa(static_cast<otb_6s_doublereal>(diffuseTransmittanceForAerosolScattering));
otb_6s_doublereal rad(static_cast<otb_6s_doublereal>(radiusInKilometers));
otb_6s_doublereal palt(static_cast<otb_6s_doublereal>(altitude));
otb_6s_doublereal xmuv(static_cast<otb_6s_doublereal>(cosineOfViewingAngle));
- otb_6s_doublereal fra(0.),fae(0.),fr(0.);
- otb_6s_enviro_(&difr,&difa,&rad,&palt,&xmuv,&fra,&fae,&fr);
+ otb_6s_doublereal fra(0.), fae(0.), fr(0.);
+ otb_6s_enviro_(&difr, &difa, &rad, &palt, &xmuv, &fra, &fae, &fr);
rayleighEstimation = static_cast<double>(fra);
aerosolEstimation = static_cast<double>(fae);
globalEstimation = static_cast<double>(fr);
}
-
} // namespace otb
diff --git a/Code/Radiometry/otbSIXSTraits.h b/Code/Radiometry/otbSIXSTraits.h
index 8b9070c3cf..8e53c3663c 100644
--- a/Code/Radiometry/otbSIXSTraits.h
+++ b/Code/Radiometry/otbSIXSTraits.h
@@ -23,7 +23,6 @@
namespace otb
{
-
/** \class SIXSTraits
* \brief SIXSTraits operations.
*
@@ -38,38 +37,38 @@ class ITK_EXPORT SIXSTraits
public:
/** Standard class typedefs. */
- typedef SIXSTraits Self;
+ typedef SIXSTraits Self;
- typedef FilterFunctionValues WavelenghtSpectralType;
- typedef AtmosphericCorrectionParameters::AerosolModelType AerosolModelType;
+ typedef FilterFunctionValues WavelenghtSpectralType;
+ typedef AtmosphericCorrectionParameters::AerosolModelType AerosolModelType;
typedef WavelenghtSpectralType::WavelenghtSpectralBandType WavelenghtSpectralBandType;
- typedef WavelenghtSpectralType::ValuesVectorType ValuesVectorType;
+ typedef WavelenghtSpectralType::ValuesVectorType ValuesVectorType;
/** Call 6S main function */
static void ComputeAtmosphericParameters(
- const double SolarZenithalAngle, /** The Solar zenithal angle */
- const double SolarAzimutalAngle, /** The Solar azimutal angle */
- const double ViewingZenithalAngle, /** The Viewing zenithal angle */
- const double ViewingAzimutalAngle, /** The Viewing azimutal angle */
- const unsigned int Month, /** The Month */
- const unsigned int Day, /** The Day (in the month) */
- const double AtmosphericPressure, /** The Atmospheric pressure */
- const double WaterVaporAmount, /** The Water vapor amount (Total water vapor content over vertical atmospheric column) */
- const double OzoneAmount, /** The Ozone amount (Stratospheric ozone layer content) */
- const AerosolModelType & AerosolModel, /** The Aerosol model */
- const double AerosolOptical, /** The Aerosol optical (radiative impact of aerosol for the reference wavelenght 550-nm) */
+ const double SolarZenithalAngle, /** The Solar zenithal angle */
+ const double SolarAzimutalAngle, /** The Solar azimutal angle */
+ const double ViewingZenithalAngle, /** The Viewing zenithal angle */
+ const double ViewingAzimutalAngle, /** The Viewing azimutal angle */
+ const unsigned int Month, /** The Month */
+ const unsigned int Day, /** The Day (in the month) */
+ const double AtmosphericPressure, /** The Atmospheric pressure */
+ const double WaterVaporAmount, /** The Water vapor amount (Total water vapor content over vertical atmospheric column) */
+ const double OzoneAmount, /** The Ozone amount (Stratospheric ozone layer content) */
+ const AerosolModelType& AerosolModel, /** The Aerosol model */
+ const double AerosolOptical, /** The Aerosol optical (radiative impact of aerosol for the reference wavelenght 550-nm) */
WavelenghtSpectralType* WavelenghtSpectralBand, /** Wavelenght for the spectral band definition */
/** Note : The Max wavelenght spectral band value must be updated ! */
- double & AtmosphericReflectance, /** Atmospheric reflectance */
- double & AtmosphericSphericalAlbedo, /** atmospheric spherical albedo */
- double & TotalGaseousTransmission, /** Total gaseous transmission */
- double & DownwardTransmittance, /** downward transmittance */
- double & UpwardTransmittance, /** upward transmittance */
- double & UpwardDiffuseTransmittance, /** upward diffuse transmittance */
- double & UpwardDirectTransmittance, /** Upward direct transmittance */
- double & UpwardDiffuseTransmittanceForRayleigh, /** upward diffuse transmittance for rayleigh */
- double & UpwardDiffuseTransmittanceForAerosol /** upward diffuse transmittance for aerosols */
- );
+ double& AtmosphericReflectance, /** Atmospheric reflectance */
+ double& AtmosphericSphericalAlbedo, /** atmospheric spherical albedo */
+ double& TotalGaseousTransmission, /** Total gaseous transmission */
+ double& DownwardTransmittance, /** downward transmittance */
+ double& UpwardTransmittance, /** upward transmittance */
+ double& UpwardDiffuseTransmittance, /** upward diffuse transmittance */
+ double& UpwardDirectTransmittance, /** Upward direct transmittance */
+ double& UpwardDiffuseTransmittanceForRayleigh, /** upward diffuse transmittance for rayleigh */
+ double& UpwardDiffuseTransmittanceForAerosol /** upward diffuse transmittance for aerosols */
+ );
/**
* Check the correpondance between the vector value size and
@@ -80,18 +79,18 @@ public:
*
*/
static void ComputeWavelenghtSpectralBandValuesFor6S(
- const double SIXSStepOfWavelenghtSpectralBandValues,
+ const double SIXSStepOfWavelenghtSpectralBandValues,
WavelenghtSpectralType* WavelenghtSpectralBand
- );
+ );
static void ComputeEnvironmentalContribution(const double diffuseTransmittanceForRayleighScattering,
- const double diffuseTransmittanceForAerosolScattering,
- const double radiusInKilometers,
- const double altitude,
- const double cosineOfViewingAngle,
- double & rayleighEstimation,
- double & aerosolEstimation,
- double & globalEstimation);
+ const double diffuseTransmittanceForAerosolScattering,
+ const double radiusInKilometers,
+ const double altitude,
+ const double cosineOfViewingAngle,
+ double& rayleighEstimation,
+ double& aerosolEstimation,
+ double& globalEstimation);
};
} // namespace otb
diff --git a/Code/Radiometry/otbSoilIndicesFunctor.h b/Code/Radiometry/otbSoilIndicesFunctor.h
index ecd84fd080..510e6f4380 100644
--- a/Code/Radiometry/otbSoilIndicesFunctor.h
+++ b/Code/Radiometry/otbSoilIndicesFunctor.h
@@ -49,20 +49,20 @@ public:
typedef itk::VariableLengthVector<TInput1> InputVectorType;
// Operator on vector pixel type
- inline TOutput operator()(const InputVectorType & inputVector)
+ inline TOutput operator ()(const InputVectorType& inputVector)
{
- return this->Evaluate(inputVector[m_GreenIndex-1],static_cast<TInput2>(inputVector[m_RedIndex-1]));
+ return this->Evaluate(inputVector[m_GreenIndex - 1], static_cast<TInput2>(inputVector[m_RedIndex - 1]));
}
// Binary operator
- inline TOutput operator()(const TInput1 &g, const TInput2 &r)
+ inline TOutput operator ()(const TInput1& g, const TInput2& r)
{
- return this->Evaluate(g,r);
- };
+ return this->Evaluate(g, r);
+ }
/// Constructor
- GAndRIndexBase() : m_GreenIndex(1), m_RedIndex(2) {};
+ GAndRIndexBase() : m_GreenIndex(1), m_RedIndex(2) {}
/// Desctructor
- virtual ~GAndRIndexBase() {};
+ virtual ~GAndRIndexBase() {}
/// Set Green Index
void SetGreenIndex(unsigned int channel)
@@ -87,14 +87,13 @@ public:
protected:
// This method must be reimplemented in subclasses to actually
// compute the index value
- virtual TOutput Evaluate(const TInput1 & g, const TInput2 & r) const = 0;
+ virtual TOutput Evaluate(const TInput1& g, const TInput2& r) const = 0;
private:
unsigned int m_GreenIndex;
unsigned int m_RedIndex;
};
-
/**
* \class GAndRAndNirIndexBase
* \brief Base class for Green And Red And NIR channels of Spot Images
@@ -111,20 +110,22 @@ public:
typedef itk::VariableLengthVector<TInput1> InputVectorType;
// Operator on vector pixel type
- inline TOutput operator()(const InputVectorType & inputVector)
+ inline TOutput operator ()(const InputVectorType& inputVector)
{
- return this->Evaluate(static_cast<TInput1>(inputVector[m_GreenIndex-1]),static_cast<TInput2>(inputVector[m_RedIndex-1]),static_cast<TInput3>(inputVector[m_NIRIndex-1]));
+ return this->Evaluate(static_cast<TInput1>(inputVector[m_GreenIndex - 1]),
+ static_cast<TInput2>(inputVector[m_RedIndex - 1]),
+ static_cast<TInput3>(inputVector[m_NIRIndex - 1]));
}
// Binary operator
- inline TOutput operator()(const TInput1 &g, const TInput2 &r, const TInput2 &nir)
+ inline TOutput operator ()(const TInput1& g, const TInput2& r, const TInput2& nir)
{
- return this->Evaluate(g,r,nir);
- };
+ return this->Evaluate(g, r, nir);
+ }
/// Constructor
- GAndRAndNirIndexBase() : m_GreenIndex(1), m_RedIndex(2), m_NIRIndex(3) {};
+ GAndRAndNirIndexBase() : m_GreenIndex(1), m_RedIndex(2), m_NIRIndex(3) {}
/// Desctructor
- virtual ~GAndRAndNirIndexBase() {};
+ virtual ~GAndRAndNirIndexBase() {}
/// Set Green Index
void SetGreenIndex(unsigned int channel)
@@ -159,7 +160,7 @@ public:
protected:
// This method must be reimplemented in subclasses to actually
// compute the index value
- virtual TOutput Evaluate(const TInput1 & g, const TInput2 & r, const TInput2 & nir) const = 0;
+ virtual TOutput Evaluate(const TInput1& g, const TInput2& r, const TInput2& nir) const = 0;
private:
unsigned int m_GreenIndex;
@@ -167,7 +168,6 @@ private:
unsigned int m_NIRIndex;
};
-
/** \class IR
* \brief This functor computes the Red Index (IR)
*
@@ -177,25 +177,25 @@ private:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TOutput>
-class IR : public GAndRIndexBase<TInput1,TInput2,TOutput>
+class IR : public GAndRIndexBase<TInput1, TInput2, TOutput>
{
public:
/// Constructor
- IR() {};
+ IR() {}
/// Desctructor
- virtual ~IR() {};
+ virtual ~IR() {}
// Operator on r and nir single pixel values
protected:
- inline TOutput Evaluate(const TInput1 &pGreen, const TInput2 &pRed) const
+ inline TOutput Evaluate(const TInput1& pGreen, const TInput2& pRed) const
{
double dGreen = static_cast<double>(pGreen);
double dRed = static_cast<double>(pRed);
- if ( dGreen == 0 )
+ if (dGreen == 0)
{
return static_cast<TOutput>(0.);
}
- return ( static_cast<TOutput>( vcl_pow(dRed,2.)/vcl_pow(dGreen,3.) ) );
+ return (static_cast<TOutput>(vcl_pow(dRed, 2.) / vcl_pow(dGreen, 3.)));
}
};
@@ -208,25 +208,25 @@ protected:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TOutput>
-class IC : public GAndRIndexBase<TInput1,TInput2,TOutput>
+class IC : public GAndRIndexBase<TInput1, TInput2, TOutput>
{
public:
/// Constructor
- IC() {};
+ IC() {}
/// Desctructor
- virtual ~IC() {};
+ virtual ~IC() {}
// Operator on r and nir single pixel values
protected:
- inline TOutput Evaluate(const TInput1 &pGreen, const TInput2 &pRed) const
+ inline TOutput Evaluate(const TInput1& pGreen, const TInput2& pRed) const
{
double dGreen = static_cast<double>(pGreen);
double dRed = static_cast<double>(pRed);
- if ( dGreen + dRed == 0 )
+ if (dGreen + dRed == 0)
{
return static_cast<TOutput>(0.);
}
- return ( static_cast<TOutput>( (dRed - dGreen)/(dRed + dGreen) ) );
+ return (static_cast<TOutput>((dRed - dGreen) / (dRed + dGreen)));
}
};
@@ -239,21 +239,21 @@ protected:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TOutput>
-class IB : public GAndRIndexBase<TInput1,TInput2,TOutput>
+class IB : public GAndRIndexBase<TInput1, TInput2, TOutput>
{
public:
/// Constructor
- IB() {};
+ IB() {}
/// Desctructor
- virtual ~IB() {};
+ virtual ~IB() {}
// Operator on r and nir single pixel values
protected:
- inline TOutput Evaluate(const TInput1 &pGreen, const TInput2 &pRed) const
+ inline TOutput Evaluate(const TInput1& pGreen, const TInput2& pRed) const
{
double dGreen = static_cast<double>(pGreen);
double dRed = static_cast<double>(pRed);
- return ( static_cast<TOutput>( vcl_sqrt((dRed*dRed + dGreen*dGreen)/2.) ));
+ return (static_cast<TOutput>(vcl_sqrt((dRed * dRed + dGreen * dGreen) / 2.)));
}
};
@@ -266,26 +266,25 @@ protected:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TInput3, class TOutput>
-class IB2 : public GAndRAndNirIndexBase<TInput1,TInput2,TInput3,TOutput>
+class IB2 : public GAndRAndNirIndexBase<TInput1, TInput2, TInput3, TOutput>
{
public:
/// Constructor
- IB2() {};
+ IB2() {}
/// Desctructor
- virtual ~IB2() {};
+ virtual ~IB2() {}
// Operator on r and nir single pixel values
protected:
- inline TOutput Evaluate(const TInput1 &pGreen, const TInput2 &pRed, const TInput2 &pNir) const
+ inline TOutput Evaluate(const TInput1& pGreen, const TInput2& pRed, const TInput2& pNir) const
{
double dGreen = static_cast<double>(pGreen);
double dRed = static_cast<double>(pRed);
double dNir = static_cast<double>(pNir);
- return ( static_cast<TOutput>( vcl_sqrt((dRed*dRed + dGreen*dGreen + dNir*dNir)/3.) ));
+ return (static_cast<TOutput>(vcl_sqrt((dRed * dRed + dGreen * dGreen + dNir * dNir) / 3.)));
}
};
-
} // namespace Functor
} // namespace otb
diff --git a/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.h b/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.h
index 4d8fcb9fdd..26bd27aa58 100644
--- a/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.h
+++ b/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.h
@@ -46,91 +46,92 @@ template <class TNeighIter, class TOutput>
class ComputeNeighborhoodContributionFunctor
{
public:
- ComputeNeighborhoodContributionFunctor() {};
- virtual ~ComputeNeighborhoodContributionFunctor() {};
+ ComputeNeighborhoodContributionFunctor() {}
+ virtual ~ComputeNeighborhoodContributionFunctor() {}
- typedef itk::VariableSizeMatrix<double> WeightingMatrixType;
- typedef typename std::vector<WeightingMatrixType> WeightingValuesContainerType;
- typedef typename TOutput::RealValueType RealValueType;
- typedef std::vector<double> DoubleContainerType;
+ typedef itk::VariableSizeMatrix<double> WeightingMatrixType;
+ typedef typename std::vector<WeightingMatrixType> WeightingValuesContainerType;
+ typedef typename TOutput::RealValueType RealValueType;
+ typedef std::vector<double> DoubleContainerType;
- void SetWeightingValues(const WeightingValuesContainerType & cont)
+ void SetWeightingValues(const WeightingValuesContainerType& cont)
{
m_WeightingValues = cont;
- };
+ }
void SetUpwardTransmittanceRatio(DoubleContainerType upwardTransmittanceRatio)
{
m_UpwardTransmittanceRatio = upwardTransmittanceRatio;
- };
+ }
void SetDiffuseRatio(DoubleContainerType diffuseRatio)
{
m_DiffuseRatio = diffuseRatio;
- };
+ }
WeightingValuesContainerType GetWeightingValues()
{
return m_WeightingValues;
- };
+ }
DoubleContainerType GetUpwardTransmittanceRatio()
{
return m_UpwardTransmittanceRatio;
- };
+ }
DoubleContainerType GetDiffuseRatio()
{
return m_DiffuseRatio;
- };
+ }
- inline TOutput operator()(const TNeighIter & it)
+ inline TOutput operator ()(const TNeighIter& it)
{
unsigned int neighborhoodSize = it.Size();
- double contribution = 0.;
- TOutput outPixel;
+ double contribution = 0.;
+ TOutput outPixel;
outPixel.SetSize(it.GetCenterPixel().Size());
itk::OStringStream oss;
oss << std::fixed << std::setprecision(3);
// Loop over each component
- for (unsigned int j=0; j<outPixel.GetSize(); ++j)
- {
+ for (unsigned int j = 0; j < outPixel.GetSize(); ++j)
+ {
oss.str("");
contribution = 0;
// Load the current channel ponderation value matrix
WeightingMatrixType TempChannelWeighting = m_WeightingValues[j];
// Loop over the neighborhood
for (unsigned int i = 0; i < neighborhoodSize; ++i)
- {
+ {
// Current neighborhood pixel index calculation
unsigned int RowIdx = 0;
unsigned int ColIdx = 0;
- RowIdx = i/TempChannelWeighting.Cols();
+ RowIdx = i / TempChannelWeighting.Cols();
if (RowIdx != 0)
- {
- ColIdx = (i+1)-RowIdx*TempChannelWeighting.Cols()-1;
- }
+ {
+ ColIdx = (i + 1) - RowIdx*TempChannelWeighting.Cols() - 1;
+ }
else
- {
+ {
ColIdx = i;
- }
+ }
// Extract the current neighborhood pixel ponderation
double idVal = TempChannelWeighting(RowIdx, ColIdx);
// Extract the current neighborhood pixel value
TOutput tempPix = it.GetPixel(i);
- contribution += static_cast<double>( tempPix[j] )*idVal;
+ contribution += static_cast<double>(tempPix[j]) * idVal;
+
+ }
+ double temp = static_cast<double>(it.GetCenterPixel()[j]) * m_UpwardTransmittanceRatio[j] + contribution *
+ m_DiffuseRatio[j];
+ oss << temp;
+ outPixel[j] = static_cast<RealValueType>(atof(oss.str().c_str()));
- }
- double temp = static_cast<double>(it.GetCenterPixel()[j])*m_UpwardTransmittanceRatio[j] + contribution*m_DiffuseRatio[j];
- oss<<temp;
- outPixel[j] = static_cast<RealValueType>( atof(oss.str().c_str()) );
-
//outPixel[j] = static_cast<RealValueType>(it.GetCenterPixel()[j])*m_UpwardTransmittanceRatio[j] + contribution*m_DiffuseRatio[j];
- }
+ }
return outPixel;
}
private:
WeightingValuesContainerType m_WeightingValues;
- DoubleContainerType m_UpwardTransmittanceRatio;
- DoubleContainerType m_DiffuseRatio;
+ DoubleContainerType m_UpwardTransmittanceRatio;
+ DoubleContainerType m_DiffuseRatio;
};
}
@@ -147,26 +148,30 @@ private:
*/
template <class TInputImage, class TOutputImage>
class ITK_EXPORT SurfaceAdjencyEffect6SCorrectionSchemeFilter :
- public UnaryFunctorNeighborhoodImageFilter< TInputImage,
- TOutputImage,
- ITK_TYPENAME Functor::ComputeNeighborhoodContributionFunctor< itk::ConstNeighborhoodIterator<TInputImage>,
- ITK_TYPENAME TOutputImage::PixelType > >
+ public UnaryFunctorNeighborhoodImageFilter<TInputImage,
+ TOutputImage,
+ ITK_TYPENAME Functor::ComputeNeighborhoodContributionFunctor<itk::
+ ConstNeighborhoodIterator
+ <TInputImage>,
+ ITK_TYPENAME
+ TOutputImage
+ ::PixelType> >
{
public:
/** "typedef" to simplify the variables definition and the declaration. */
typedef Functor::ComputeNeighborhoodContributionFunctor<itk::ConstNeighborhoodIterator<TInputImage>,
- ITK_TYPENAME TOutputImage::PixelType> FunctorType;
+ ITK_TYPENAME TOutputImage::PixelType> FunctorType;
/** "typedef" for standard classes. */
- typedef SurfaceAdjencyEffect6SCorrectionSchemeFilter Self;
- typedef UnaryFunctorNeighborhoodImageFilter< TInputImage, TOutputImage, FunctorType > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SurfaceAdjencyEffect6SCorrectionSchemeFilter Self;
+ typedef UnaryFunctorNeighborhoodImageFilter<TInputImage, TOutputImage, FunctorType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::InputImageType InputImageType;
- typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename Superclass::InputImageType InputImageType;
+ typedef typename Superclass::OutputImageType OutputImageType;
- typedef std::vector<double> DoubleContainerType;
+ typedef std::vector<double> DoubleContainerType;
/** object factory method. */
itkNewMacro(Self);
@@ -174,17 +179,17 @@ public:
itkTypeMacro(SurfaceAdjencyEffect6SCorrectionSchemeFilter, UnaryFunctorNeighborhoodImageFilter);
/** Extract input and output images dimensions.*/
- itkStaticConstMacro( InputImageDimension, unsigned int, TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
/** Supported images definition. */
- typedef typename InputImageType::PixelType InputPixelType;
- typedef typename InputImageType::InternalPixelType InputInternalPixelType;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename OutputImageType::PixelType OutputPixelType;
- typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename InputImageType::PixelType InputPixelType;
+ typedef typename InputImageType::InternalPixelType InputInternalPixelType;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef typename OutputImageType::InternalPixelType OutputInternalPixelType;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
typedef AtmosphericRadiativeTerms AtmosphericRadiativeTermsType;
typedef typename AtmosphericRadiativeTermsType::Pointer AtmosphericRadiativeTermsPointerType;
@@ -192,18 +197,18 @@ public:
typedef AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms Parameters2RadiativeTermsType;
typedef Parameters2RadiativeTermsType::Pointer Parameters2RadiativeTermsPointerType;
- typedef FilterFunctionValues FilterFunctionValuesType;
- typedef FilterFunctionValuesType::ValuesVectorType CoefVectorType;
- typedef std::vector<CoefVectorType> FilterFunctionCoefVectorType;
-
- typedef itk::MetaDataDictionary MetaDataDictionaryType;
+ typedef FilterFunctionValues FilterFunctionValuesType;
+ typedef FilterFunctionValuesType::ValuesVectorType CoefVectorType;
+ typedef std::vector<CoefVectorType> FilterFunctionCoefVectorType;
+
+ typedef itk::MetaDataDictionary MetaDataDictionaryType;
/** Storage ponderation values types*/
- typedef itk::VariableSizeMatrix<double> WeightingMatrixType;
- typedef typename std::vector<WeightingMatrixType> WeightingValuesContainerType;
+ typedef itk::VariableSizeMatrix<double> WeightingMatrixType;
+ typedef typename std::vector<WeightingMatrixType> WeightingValuesContainerType;
/** typedef for calculation*/
- typedef typename itk::ConstNeighborhoodIterator<InputImageType> NeighborIterType;
+ typedef typename itk::ConstNeighborhoodIterator<InputImageType> NeighborIterType;
/** Set/Get the Size of the neighbor window. */
void SetWindowRadius(unsigned int rad)
@@ -215,11 +220,11 @@ public:
itkGetConstReferenceMacro(WindowRadius, unsigned int);
/** Set/Get the pixel spacing in kilometers */
- itkSetMacro(PixelSpacingInKilometers,double);
- itkGetMacro(PixelSpacingInKilometers,double);
+ itkSetMacro(PixelSpacingInKilometers, double);
+ itkGetMacro(PixelSpacingInKilometers, double);
/** Set/Get the viewing angle */
- itkSetMacro(ZenithalViewingAngle,double);
- itkGetMacro(ZenithalViewingAngle,double);
+ itkSetMacro(ZenithalViewingAngle, double);
+ itkGetMacro(ZenithalViewingAngle, double);
/** Get/Set Atmospheric Radiative Terms. */
void SetAtmosphericRadiativeTerms(AtmosphericRadiativeTermsPointerType atmo)
@@ -235,7 +240,7 @@ public:
itkSetObjectMacro(CorrectionParameters, AtmosphericCorrectionParameters);
itkGetObjectMacro(CorrectionParameters, AtmosphericCorrectionParameters);
- /** Get/Set Aeronet file name. */
+ /** Get/Set Aeronet file name. */
itkSetMacro(AeronetFileName, std::string);
itkGetMacro(AeronetFileName, std::string);
@@ -244,14 +249,14 @@ public:
itkGetMacro(FilterFunctionValuesFileName, std::string);
/** Get/Set Filter function coef. */
- void SetFilterFunctionCoef( FilterFunctionCoefVectorType vect )
+ void SetFilterFunctionCoef(FilterFunctionCoefVectorType vect)
{
- m_FilterFunctionCoef = vect;
- this->Modified();
+ m_FilterFunctionCoef = vect;
+ this->Modified();
}
FilterFunctionCoefVectorType GetFilterFunctionCoef()
{
- return m_FilterFunctionCoef;
+ return m_FilterFunctionCoef;
}
/** Compute the functor parameters */
@@ -263,7 +268,7 @@ public:
protected:
SurfaceAdjencyEffect6SCorrectionSchemeFilter();
- virtual ~SurfaceAdjencyEffect6SCorrectionSchemeFilter() {};
+ virtual ~SurfaceAdjencyEffect6SCorrectionSchemeFilter() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** GenerateOutputInformation method */
@@ -288,9 +293,9 @@ private:
double m_ZenithalViewingAngle;
/** Radiative terms object */
AtmosphericRadiativeTermsPointerType m_AtmosphericRadiativeTerms;
- bool m_IsSetAtmosphericRadiativeTerms;
+ bool m_IsSetAtmosphericRadiativeTerms;
/** Atmospheric Correction Parameters. */
- CorrectionParametersPointerType m_CorrectionParameters;
+ CorrectionParametersPointerType m_CorrectionParameters;
/** Path to an Aeronet data file, allows to compute aerosol optical and water vapor amounts. */
std::string m_AeronetFileName;
/** Path to an filter function values file. */
diff --git a/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.txx b/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.txx
index 6b940a27f1..b4e168a8e6 100644
--- a/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.txx
+++ b/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.txx
@@ -63,20 +63,18 @@ SurfaceAdjencyEffect6SCorrectionSchemeFilter<TInputImage, TOutputImage>
::GenerateOutputInformation()
{
Superclass::GenerateOutputInformation();
- typename InputImageType::Pointer inputPtr = const_cast< TInputImage * >( this->GetInput() );
- typename OutputImageType::Pointer outputPtr = const_cast< TOutputImage * >( this->GetOutput() );
+ typename InputImageType::Pointer inputPtr = const_cast<TInputImage *>(this->GetInput());
+ typename OutputImageType::Pointer outputPtr = const_cast<TOutputImage *>(this->GetOutput());
- if (!inputPtr || !outputPtr)
- return;
+ if (!inputPtr || !outputPtr) return;
outputPtr->SetNumberOfComponentsPerPixel(inputPtr->GetNumberOfComponentsPerPixel());
- if(m_UseGenerateParameters)
- this->GenerateParameters();
+ if (m_UseGenerateParameters) this->GenerateParameters();
if (!m_ParametersHaveBeenComputed)
{
- this->ComputeParameters();
- m_ParametersHaveBeenComputed = true;
+ this->ComputeParameters();
+ m_ParametersHaveBeenComputed = true;
}
}
@@ -89,99 +87,97 @@ SurfaceAdjencyEffect6SCorrectionSchemeFilter<TInputImage, TOutputImage>
m_ParametersHaveBeenComputed = false;
}
-
template <class TInputImage, class TOutputImage>
void
-SurfaceAdjencyEffect6SCorrectionSchemeFilter<TInputImage,TOutputImage>
+SurfaceAdjencyEffect6SCorrectionSchemeFilter<TInputImage, TOutputImage>
::UpdateAtmosphericRadiativeTerms()
{
MetaDataDictionaryType dict = this->GetInput()->GetMetaDataDictionary();
-
+
ImageMetadataInterfaceBase::Pointer imageMetadataInterface = ImageMetadataInterfaceFactory::CreateIMI(dict);
if ((m_CorrectionParameters->GetDay() == 0))
{
- m_CorrectionParameters->SetDay(imageMetadataInterface->GetDay(dict));
+ m_CorrectionParameters->SetDay(imageMetadataInterface->GetDay(dict));
}
-
+
if ((m_CorrectionParameters->GetMonth() == 0))
{
- m_CorrectionParameters->SetMonth(imageMetadataInterface->GetMonth(dict));
+ m_CorrectionParameters->SetMonth(imageMetadataInterface->GetMonth(dict));
}
-
+
if ((m_CorrectionParameters->GetSolarZenithalAngle() == 361.))
{
- m_CorrectionParameters->SetSolarZenithalAngle(90. - imageMetadataInterface->GetSunElevation(dict));
+ m_CorrectionParameters->SetSolarZenithalAngle(90. - imageMetadataInterface->GetSunElevation(dict));
}
if ((m_CorrectionParameters->GetSolarAzimutalAngle() == 361.))
{
- m_CorrectionParameters->SetSolarAzimutalAngle(imageMetadataInterface->GetSunAzimuth(dict));
+ m_CorrectionParameters->SetSolarAzimutalAngle(imageMetadataInterface->GetSunAzimuth(dict));
}
-
+
if ((m_CorrectionParameters->GetViewingZenithalAngle() == 361.))
{
- m_CorrectionParameters->SetViewingZenithalAngle(90. - imageMetadataInterface->GetSatElevation(dict));
+ m_CorrectionParameters->SetViewingZenithalAngle(90. - imageMetadataInterface->GetSatElevation(dict));
}
-
- if( m_ZenithalViewingAngle == 361.)
+
+ if (m_ZenithalViewingAngle == 361.)
{
- this->SetZenithalViewingAngle(90. - imageMetadataInterface->GetSatElevation(dict));
+ this->SetZenithalViewingAngle(90. - imageMetadataInterface->GetSatElevation(dict));
}
if ((m_CorrectionParameters->GetViewingAzimutalAngle() == 361.))
{
- m_CorrectionParameters->SetViewingAzimutalAngle(imageMetadataInterface->GetSatAzimuth(dict));
+ m_CorrectionParameters->SetViewingAzimutalAngle(imageMetadataInterface->GetSatAzimuth(dict));
}
-
- if(m_AeronetFileName != "")
+
+ if (m_AeronetFileName != "")
{
- m_CorrectionParameters->UpdateAeronetData( m_AeronetFileName,
- imageMetadataInterface->GetYear(dict),
- imageMetadataInterface->GetHour(dict),
- imageMetadataInterface->GetMinute(dict) );
+ m_CorrectionParameters->UpdateAeronetData(m_AeronetFileName,
+ imageMetadataInterface->GetYear(dict),
+ imageMetadataInterface->GetHour(dict),
+ imageMetadataInterface->GetMinute(dict));
}
// load fiter function values
- if(m_FilterFunctionValuesFileName != "")
+ if (m_FilterFunctionValuesFileName != "")
{
- m_CorrectionParameters->LoadFilterFunctionValue( m_FilterFunctionValuesFileName );
- }
+ m_CorrectionParameters->LoadFilterFunctionValue(m_FilterFunctionValuesFileName);
+ }
// the user has set the filter function values
else
{
- if( m_FilterFunctionCoef.size() != this->GetInput()->GetNumberOfComponentsPerPixel() )
- {
- itkExceptionMacro(<<"Filter Function and image channels mismatch.");
- }
- for(unsigned int i=0; i<this->GetInput()->GetNumberOfComponentsPerPixel(); i++)
- {
- FilterFunctionValuesType::Pointer functionValues = FilterFunctionValuesType::New();
- functionValues->SetFilterFunctionValues(m_FilterFunctionCoef[i]);
- functionValues->SetMinSpectralValue(imageMetadataInterface->GetFirstWavelengths(dict)[i]);
- functionValues->SetMaxSpectralValue(imageMetadataInterface->GetLastWavelengths(dict)[i]);
-
- m_CorrectionParameters->SetWavelenghtSpectralBandWithIndex(i, functionValues);
- }
+ if (m_FilterFunctionCoef.size() != this->GetInput()->GetNumberOfComponentsPerPixel())
+ {
+ itkExceptionMacro(<< "Filter Function and image channels mismatch.");
+ }
+ for (unsigned int i = 0; i < this->GetInput()->GetNumberOfComponentsPerPixel(); i++)
+ {
+ FilterFunctionValuesType::Pointer functionValues = FilterFunctionValuesType::New();
+ functionValues->SetFilterFunctionValues(m_FilterFunctionCoef[i]);
+ functionValues->SetMinSpectralValue(imageMetadataInterface->GetFirstWavelengths(dict)[i]);
+ functionValues->SetMaxSpectralValue(imageMetadataInterface->GetLastWavelengths(dict)[i]);
+
+ m_CorrectionParameters->SetWavelenghtSpectralBandWithIndex(i, functionValues);
+ }
}
-
+
Parameters2RadiativeTermsPointerType param2Terms = Parameters2RadiativeTermsType::New();
-
+
param2Terms->SetInput(m_CorrectionParameters);
param2Terms->Update();
m_AtmosphericRadiativeTerms = param2Terms->GetOutput();
}
-
template <class TInputImage, class TOutputImage>
void
-SurfaceAdjencyEffect6SCorrectionSchemeFilter<TInputImage,TOutputImage>
+SurfaceAdjencyEffect6SCorrectionSchemeFilter<TInputImage, TOutputImage>
::GenerateParameters()
{
- if(m_IsSetAtmosphericRadiativeTerms==false)
+ if (m_IsSetAtmosphericRadiativeTerms == false)
{
- this->UpdateAtmosphericRadiativeTerms();
+ this->UpdateAtmosphericRadiativeTerms();
}
}
@@ -191,59 +187,62 @@ SurfaceAdjencyEffect6SCorrectionSchemeFilter<TInputImage, TOutputImage>
::ComputeParameters()
{
// get pointers to the input and output
- typename InputImageType::Pointer inputPtr = const_cast< TInputImage * >( this->GetInput() );
- typename OutputImageType::Pointer outputPtr = const_cast< TOutputImage * >( this->GetOutput() );
+ typename InputImageType::Pointer inputPtr = const_cast<TInputImage *>(this->GetInput());
+ typename OutputImageType::Pointer outputPtr = const_cast<TOutputImage *>(this->GetOutput());
-
- WeightingMatrixType radiusMatrix(2*m_WindowRadius+1,2*m_WindowRadius+1);
+ WeightingMatrixType radiusMatrix(2*m_WindowRadius + 1, 2*m_WindowRadius + 1);
radiusMatrix.Fill(0.);
double center = static_cast<double>(m_WindowRadius);
- for (unsigned int i = 0; i<m_WindowRadius+1; ++i)
- {
- for (unsigned int j = 0; j<m_WindowRadius+1; ++j)
+ for (unsigned int i = 0; i < m_WindowRadius + 1; ++i)
{
+ for (unsigned int j = 0; j < m_WindowRadius + 1; ++j)
+ {
double id = static_cast<double>(i);
double jd = static_cast<double>(j);
- double currentRadius = m_PixelSpacingInKilometers*vcl_sqrt(vcl_pow(id-center,2)+vcl_pow(jd-center,2));
- radiusMatrix(i,j)=currentRadius;
- radiusMatrix(2*m_WindowRadius-i,j)=currentRadius;
- radiusMatrix(2*m_WindowRadius-i,2*m_WindowRadius-j)=currentRadius;
- radiusMatrix(i,2*m_WindowRadius-j)=currentRadius;
+ double currentRadius = m_PixelSpacingInKilometers * vcl_sqrt(vcl_pow(id - center, 2) + vcl_pow(jd - center, 2));
+ radiusMatrix(i, j) = currentRadius;
+ radiusMatrix(2 * m_WindowRadius - i, j) = currentRadius;
+ radiusMatrix(2 * m_WindowRadius - i, 2 * m_WindowRadius - j) = currentRadius;
+ radiusMatrix(i, 2 * m_WindowRadius - j) = currentRadius;
+ }
}
- }
- for (unsigned int band = 0; band<inputPtr->GetNumberOfComponentsPerPixel();++band)
- {
- WeightingMatrixType currentWeightingMatrix(2*m_WindowRadius+1,2*m_WindowRadius+1);
+ for (unsigned int band = 0; band < inputPtr->GetNumberOfComponentsPerPixel(); ++band)
+ {
+ WeightingMatrixType currentWeightingMatrix(2*m_WindowRadius + 1, 2*m_WindowRadius + 1);
double rayleigh = m_AtmosphericRadiativeTerms->GetUpwardDiffuseTransmittanceForRayleigh(band);
double aerosol = m_AtmosphericRadiativeTerms->GetUpwardDiffuseTransmittanceForAerosol(band);
currentWeightingMatrix.Fill(0.);
- for (unsigned int i = 0; i<2*m_WindowRadius+1; ++i)
- {
- for (unsigned int j = 0; j<2*m_WindowRadius+1; ++j)
+ for (unsigned int i = 0; i < 2 * m_WindowRadius + 1; ++i)
{
- double notUsed1,notUsed2;
+ for (unsigned int j = 0; j < 2 * m_WindowRadius + 1; ++j)
+ {
+ double notUsed1, notUsed2;
double factor = 1;
double palt = 1000.;
- SIXSTraits::ComputeEnvironmentalContribution(rayleigh,aerosol,radiusMatrix(i,j),palt,vcl_cos(m_ZenithalViewingAngle*CONST_PI_180),notUsed1,notUsed2,factor); //Call to 6S
- currentWeightingMatrix(i,j)=factor;
+ SIXSTraits::ComputeEnvironmentalContribution(rayleigh, aerosol,
+ radiusMatrix(i,
+ j), palt,
+ vcl_cos(m_ZenithalViewingAngle * CONST_PI_180), notUsed1, notUsed2, factor); //Call to 6S
+ currentWeightingMatrix(i, j) = factor;
+ }
}
- }
m_WeightingValues.push_back(currentWeightingMatrix);
- }
-
+ }
- DoubleContainerType upwardTransmittanceRatio,diffuseRatio;
+ DoubleContainerType upwardTransmittanceRatio, diffuseRatio;
- for (unsigned int band = 0; band<inputPtr->GetNumberOfComponentsPerPixel();++band)
- {
- upwardTransmittanceRatio.push_back(m_AtmosphericRadiativeTerms->GetUpwardTransmittance(band)/m_AtmosphericRadiativeTerms->GetUpwardDirectTransmittance(band));
- diffuseRatio .push_back(m_AtmosphericRadiativeTerms->GetUpwardDiffuseTransmittance(band)/m_AtmosphericRadiativeTerms->GetUpwardDirectTransmittance(band));
- }
+ for (unsigned int band = 0; band < inputPtr->GetNumberOfComponentsPerPixel(); ++band)
+ {
+ upwardTransmittanceRatio.push_back(m_AtmosphericRadiativeTerms->GetUpwardTransmittance(
+ band) / m_AtmosphericRadiativeTerms->GetUpwardDirectTransmittance(band));
+ diffuseRatio.push_back(m_AtmosphericRadiativeTerms->GetUpwardDiffuseTransmittance(
+ band) / m_AtmosphericRadiativeTerms->GetUpwardDirectTransmittance(band));
+ }
this->GetFunctor().SetUpwardTransmittanceRatio(upwardTransmittanceRatio);
this->GetFunctor().SetDiffuseRatio(diffuseRatio);
this->GetFunctor().SetWeightingValues(m_WeightingValues);
@@ -254,11 +253,11 @@ SurfaceAdjencyEffect6SCorrectionSchemeFilter<TInputImage, TOutputImage>
template <class TInputImage, class TOutput>
void
SurfaceAdjencyEffect6SCorrectionSchemeFilter<TInputImage, TOutput>
-::PrintSelf( std::ostream& os, itk::Indent indent) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
os << indent << "Radius : " << m_WindowRadius << std::endl;
- os << indent << "Pixel spacing in kilometers: "<<m_PixelSpacingInKilometers <<std::endl;
- os << indent << "Zenithal viewing angle in degree: "<<m_ZenithalViewingAngle<<std::endl;
+ os << indent << "Pixel spacing in kilometers: " << m_PixelSpacingInKilometers << std::endl;
+ os << indent << "Zenithal viewing angle in degree: " << m_ZenithalViewingAngle << std::endl;
}
} // end namespace otb
diff --git a/Code/Radiometry/otbTerraSarBrightnessFunctor.h b/Code/Radiometry/otbTerraSarBrightnessFunctor.h
index 6fd0f4f38f..c412061a3b 100644
--- a/Code/Radiometry/otbTerraSarBrightnessFunctor.h
+++ b/Code/Radiometry/otbTerraSarBrightnessFunctor.h
@@ -33,11 +33,11 @@ namespace Functor
/**
* \class TerraSarBrightnessFunctor
* \brief Compute beta naught coefficient.
- *
+ *
* This functor is intended to be used by the
* TerrasarBrightnessImageFilter.
- *
- * For more information on Terrasar calibration,
+ *
+ * For more information on Terrasar calibration,
* please refer to the
* documentation of this filter.
*
@@ -51,17 +51,17 @@ class TerraSarBrightnessFunctor
{
public:
TerraSarBrightnessFunctor();
- virtual ~TerraSarBrightnessFunctor() {};
-
- /** Accessors */
- void SetCalibrationFactor( double val )
- {
- m_CalibrationFactor = val;
+ virtual ~TerraSarBrightnessFunctor() {}
+
+ /** Accessors */
+ void SetCalibrationFactor(double val)
+ {
+ m_CalibrationFactor = val;
}
- double GetCalibrationFactor()
+ double GetCalibrationFactor()
{
- return m_CalibrationFactor;
+ return m_CalibrationFactor;
}
/** Set results in decibels */
@@ -75,23 +75,23 @@ public:
{
return m_ResultsInDecibels;
}
-
+
/** Set Default value for null or negative pixel beta */
void SetDefaultValue(double db)
- {
- m_DefaultValue = db;
- }
-
+ {
+ m_DefaultValue = db;
+ }
+
/** Set Default value for null or negative pixel beta */
bool GetDefaultValue()
{
return m_DefaultValue;
}
- /** We assume that the input pixel is a scalar -> modulus image */
- inline TOutput operator() (const TInput & inPix);
- /** We assume that the input pixel is a complex -> complex image */
- inline std::complex<TOutput> operator() (const std::complex<TInput> & inPix);
+ /** We assume that the input pixel is a scalar -> modulus image */
+ inline TOutput operator ()(const TInput& inPix);
+ /** We assume that the input pixel is a complex -> complex image */
+ inline std::complex<TOutput> operator ()(const std::complex<TInput>& inPix);
private:
/** Calibration Factor */
@@ -104,7 +104,7 @@ private:
double m_DefaultValue;
};
-}// end namespace functor
+} // end namespace functor
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Radiometry/otbTerraSarBrightnessFunctor.txx b/Code/Radiometry/otbTerraSarBrightnessFunctor.txx
index 7194124e5b..61094365a9 100644
--- a/Code/Radiometry/otbTerraSarBrightnessFunctor.txx
+++ b/Code/Radiometry/otbTerraSarBrightnessFunctor.txx
@@ -36,53 +36,49 @@ TerraSarBrightnessFunctor<TInput, TOutput>
m_DefaultValue = 0.00001; // Default value is 10^-5
}
-
template <class TInput, class TOutput>
TOutput
TerraSarBrightnessFunctor<TInput, TOutput>
-::operator() (const TInput & inPix)
-{
+::operator() (const TInput &inPix)
+ {
// Formula: Beta^0 = Ks * |DN|²
// First, square the input pixel
- double squareInPix = vcl_pow( static_cast<double>(inPix), 2.);
+ double squareInPix = vcl_pow(static_cast<double>(inPix), 2.);
// Then apply the calibration factor
- double beta = m_CalibrationFactor*squareInPix;
+ double beta = m_CalibrationFactor * squareInPix;
- if( beta<=0 )
- beta = m_DefaultValue;
-
+ if (beta <= 0) beta = m_DefaultValue;
// Results in decibels case
- if(m_ResultsInDecibels)
+ if (m_ResultsInDecibels)
{
- beta = 10 * vcl_log10(beta);
+ beta = 10 * vcl_log10(beta);
}
- return static_cast<TOutput>(beta);
-}
-
+ return static_cast<TOutput>(beta);
+ }
template <class TInput, class TOutput>
std::complex<TOutput>
TerraSarBrightnessFunctor<TInput, TOutput>
-::operator() (const std::complex<TInput> & inPix)
-{
+::operator() (const std::complex<TInput> &inPix)
+ {
// First, extract modulus and phase
- double modulus = vcl_sqrt(inPix.real()*inPix.real() + inPix.imag()*inPix.imag());
- double phase = vcl_atan2(inPix.imag(),inPix.real());
+ double modulus = vcl_sqrt(inPix.real() * inPix.real() + inPix.imag() * inPix.imag());
+ double phase = vcl_atan2(inPix.imag(), inPix.real());
// Then, calibrate the modulus
- double beta = this->operator()(modulus);
-
+ double beta = this->operator() (modulus);
+
// Last, put back the phase
- std::complex<TOutput> out(std::polar(beta,phase));
+ std::complex<TOutput> out(std::polar(beta, phase));
return out;
-}
+ }
-}// namespace Functor
+} // namespace Functor
} // namespace otb
#endif
diff --git a/Code/Radiometry/otbTerraSarBrightnessImageFilter.h b/Code/Radiometry/otbTerraSarBrightnessImageFilter.h
index 4940dc32c6..088b601cdb 100644
--- a/Code/Radiometry/otbTerraSarBrightnessImageFilter.h
+++ b/Code/Radiometry/otbTerraSarBrightnessImageFilter.h
@@ -39,9 +39,9 @@ namespace otb
*
* This filter computes the beta naught (\f$ \beta^{0} \f$) using the following formula:
* \f[\beta^{0} = k_{s} \cdot |DN|^{2} \f]
- *
- * Where \f$ k_{s} \f$ is the calibration factor, which is imported
- * from the input image metadata, even if one can set different values
+ *
+ * Where \f$ k_{s} \f$ is the calibration factor, which is imported
+ * from the input image metadata, even if one can set different values
* using the proper accessors.
*
* Results can be obtained either in linear or logarithmic scale
@@ -62,19 +62,19 @@ namespace otb
* \ingroup Multithreaded
* \ingroup Radiometry
*/
-template <class TInputImage, class TOutputImage >
+template <class TInputImage, class TOutputImage>
class ITK_EXPORT TerraSarBrightnessImageFilter :
public itk::UnaryFunctorImageFilter<
- TInputImage,
- TOutputImage,
- ITK_TYPENAME Functor::TerraSarBrightnessFunctor<
- ITK_TYPENAME itk::NumericTraits<ITK_TYPENAME TInputImage::InternalPixelType>::ValueType,
- ITK_TYPENAME itk::NumericTraits<ITK_TYPENAME TOutputImage::InternalPixelType>::ValueType > >
+ TInputImage,
+ TOutputImage,
+ ITK_TYPENAME Functor::TerraSarBrightnessFunctor<
+ ITK_TYPENAME itk::NumericTraits<ITK_TYPENAME TInputImage::InternalPixelType>::ValueType,
+ ITK_TYPENAME itk::NumericTraits<ITK_TYPENAME TOutputImage::InternalPixelType>::ValueType> >
{
public:
/** Extract input and output images dimensions.*/
- itkStaticConstMacro( InputImageDimension, unsigned int, TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension, unsigned int, TOutputImage::ImageDimension);
/** "typedef" to simplify the variables definition and the declaration. */
typedef TInputImage InputImageType;
@@ -84,15 +84,15 @@ public:
typedef typename itk::NumericTraits<InputInternalPixelType>::ValueType InputValueType;
typedef typename itk::NumericTraits<OutputInternalPixelType>::ValueType OutputValueType;
typedef typename Functor::TerraSarBrightnessFunctor
- < InputValueType, OutputValueType> FunctorType;
- typedef itk::MetaDataDictionary MetaDataDictionaryType;
+ <InputValueType, OutputValueType> FunctorType;
+ typedef itk::MetaDataDictionary MetaDataDictionaryType;
/** "typedef" for standard classes. */
- typedef TerraSarBrightnessImageFilter Self;
- typedef itk::UnaryFunctorImageFilter< InputImageType,
- OutputImageType, FunctorType > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef TerraSarBrightnessImageFilter Self;
+ typedef itk::UnaryFunctorImageFilter<InputImageType,
+ OutputImageType, FunctorType> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** object factory method. */
itkNewMacro(Self);
@@ -102,11 +102,11 @@ public:
/** Set the calibration factor*/
void SetCalibrationFactor(double pCalibrationFactor)
- {
- this->GetFunctor().SetCalibrationFactor( pCalibrationFactor );
- this->Modified();
- }
-
+ {
+ this->GetFunctor().SetCalibrationFactor(pCalibrationFactor);
+ this->Modified();
+ }
+
/** Get the calibration factor */
double GetCalibrationFactor()
{
@@ -128,29 +128,28 @@ public:
/** Set the default value (replacing negative beta) */
void SetDefaultValue(double value)
- {
- this->GetFunctor().SetResultsInDecibels(value);
- this->Modified();
- }
-
- double GetDefaultValue()
- {
- return this->GetFunctor().SetResultsInDecibels();
- }
+ {
+ this->GetFunctor().SetResultsInDecibels(value);
+ this->Modified();
+ }
+ double GetDefaultValue()
+ {
+ return this->GetFunctor().SetResultsInDecibels();
+ }
protected:
/** Constructor */
TerraSarBrightnessImageFilter(){};
/** Destructor */
- virtual ~TerraSarBrightnessImageFilter() {};
+ virtual ~TerraSarBrightnessImageFilter() {}
/** Initialize the functor vector */
void BeforeThreadedGenerateData();
private:
- TerraSarBrightnessImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ TerraSarBrightnessImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
diff --git a/Code/Radiometry/otbTerraSarBrightnessImageFilter.txx b/Code/Radiometry/otbTerraSarBrightnessImageFilter.txx
index 55fdb22926..8fad20f109 100644
--- a/Code/Radiometry/otbTerraSarBrightnessImageFilter.txx
+++ b/Code/Radiometry/otbTerraSarBrightnessImageFilter.txx
@@ -26,26 +26,27 @@ namespace otb
template <class TInputImage, class TOutputImage>
void
-TerraSarBrightnessImageFilter<TInputImage,TOutputImage>
+TerraSarBrightnessImageFilter<TInputImage, TOutputImage>
::BeforeThreadedGenerateData()
{
Superclass::BeforeThreadedGenerateData();
// Load metada
TerraSarImageMetadataInterface::Pointer lImageMetadata = otb::TerraSarImageMetadataInterface::New();
- bool mdIsAvailable = lImageMetadata->CanRead(this->GetInput()->GetMetaDataDictionary());
+ bool mdIsAvailable = lImageMetadata->CanRead(
+ this->GetInput()->GetMetaDataDictionary());
// If the user doesn't set it AND the metadata is available, set calFactor using image metadata
- if (this->GetCalibrationFactor() == itk::NumericTraits<double>::Zero)
+ if (this->GetCalibrationFactor() == itk::NumericTraits<double>::Zero)
{
- if (mdIsAvailable)
- {
- this->SetCalibrationFactor( lImageMetadata->GetCalibrationFactor(this->GetInput()->GetMetaDataDictionary()) );
- }
- else
- {
- itkExceptionMacro(<<"Invalid input image. Only TerraSar images are supproted");
- }
+ if (mdIsAvailable)
+ {
+ this->SetCalibrationFactor(lImageMetadata->GetCalibrationFactor(this->GetInput()->GetMetaDataDictionary()));
+ }
+ else
+ {
+ itkExceptionMacro(<< "Invalid input image. Only TerraSar images are supproted");
+ }
}
}
diff --git a/Code/Radiometry/otbTerraSarCalibrationFunctor.h b/Code/Radiometry/otbTerraSarCalibrationFunctor.h
index 5b3157a381..1ed8f2c715 100644
--- a/Code/Radiometry/otbTerraSarCalibrationFunctor.h
+++ b/Code/Radiometry/otbTerraSarCalibrationFunctor.h
@@ -39,11 +39,11 @@ namespace Functor
/**
* \class TerraSarCalibrationFunctor
* \brief Compute sigma naught coefficient.
- *
+ *
* This functor is intended to be used by the
* TerrasarCalibrationImageFilter.
- *
- * For more information on Terrasar calibration,
+ *
+ * For more information on Terrasar calibration,
* please refer to the
* documentation of this filter.
*
@@ -58,14 +58,14 @@ public:
/** Constructor */
TerraSarCalibrationFunctor();
/** Destructor */
- virtual ~TerraSarCalibrationFunctor() {};
+ virtual ~TerraSarCalibrationFunctor() {}
/** Typedef to define the noise records map */
- typedef ossimplugins::ImageNoise ImageNoiseType;
-
+ typedef ossimplugins::ImageNoise ImageNoiseType;
+
/** Typedef for image size and index */
- typedef itk::Size<2> SizeType;
- typedef itk::Index<2> IndexType;
+ typedef itk::Size<2> SizeType;
+ typedef itk::Index<2> IndexType;
/** Typedef for the brightness functor */
typedef TerraSarBrightnessFunctor<double, double> BrightnessFunctorType;
@@ -81,58 +81,58 @@ public:
/**
* Get the noise record
*/
- const ImageNoiseType & GetNoiseRecord() const
+ const ImageNoiseType& GetNoiseRecord() const
{
return m_NoiseRecord;
}
/** Set the calibration factor */
- void SetCalibrationFactor( double val )
- {
- m_CalibrationFactor = val;
- m_Brightness.SetCalibrationFactor(val);
+ void SetCalibrationFactor(double val)
+ {
+ m_CalibrationFactor = val;
+ m_Brightness.SetCalibrationFactor(val);
}
-
+
/** Get the calibration factor */
- double GetCalibrationFactor() const
- {
- return m_CalibrationFactor;
+ double GetCalibrationFactor() const
+ {
+ return m_CalibrationFactor;
}
-
+
/** Set the image size */
- void SetOriginalProductSize( SizeType size )
- {
- m_OriginalProductSize = size;
+ void SetOriginalProductSize(SizeType size)
+ {
+ m_OriginalProductSize = size;
}
-
+
/** Get the image size */
- const SizeType & GetOriginalProductSize() const
- {
- return m_OriginalProductSize;
+ const SizeType& GetOriginalProductSize() const
+ {
+ return m_OriginalProductSize;
}
-
+
/** Set the UseFastCalibration flag */
- void SetUseFastCalibration( bool b )
- {
- m_UseFastCalibration = b;
+ void SetUseFastCalibration(bool b)
+ {
+ m_UseFastCalibration = b;
}
-
+
/** Get the UseFastCalibration flag */
- bool GetUseFastCalibration() const
- {
- return m_UseFastCalibration;
+ bool GetUseFastCalibration() const
+ {
+ return m_UseFastCalibration;
}
/** Set the ResultsInDecibels flag */
- void SetResultsInDecibels( bool b )
- {
- m_ResultsInDecibels = b;
+ void SetResultsInDecibels(bool b)
+ {
+ m_ResultsInDecibels = b;
}
-
+
/** Get the ResultsInDecibelsMethod flag */
- bool GetResultsInDecibels() const
- {
- return m_ResultsInDecibels;
+ bool GetResultsInDecibels() const
+ {
+ return m_ResultsInDecibels;
}
/** Set the default value */
@@ -146,12 +146,12 @@ public:
{
return m_DefaultValue;
}
-
+
/** Perform the calibration for one pixel (scalar -> modulus image) */
- inline TOutput operator() (const TInput & inPix, const IndexType& index, double angle);
+ inline TOutput operator ()(const TInput& inPix, const IndexType& index, double angle);
/** Perform the calibration for one pixel (complex -> complex image) */
- inline std::complex<TOutput> operator() (const std::complex<TInput> & inPix, const IndexType& index, double angle);
+ inline std::complex<TOutput> operator ()(const std::complex<TInput>& inPix, const IndexType& index, double angle);
private:
/** Return the current range position */
@@ -159,9 +159,9 @@ private:
/** Return the current NEBN value */
inline double ComputeNoiseEquivalentBetaNaught(double range) const;
-
+
/** Evaluate polynom with Horner scheme*/
- inline double Horner(std::vector<double> & coefficients, const double nebn) const;
+ inline double Horner(std::vector<double>& coefficients, const double nebn) const;
/** Calibration Factor */
double m_CalibrationFactor;
@@ -187,7 +187,7 @@ private:
double m_DefaultValue;
};
-}// end namespace functor
+} // end namespace functor
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Radiometry/otbTerraSarCalibrationFunctor.txx b/Code/Radiometry/otbTerraSarCalibrationFunctor.txx
index cc24faf909..26c3495faf 100644
--- a/Code/Radiometry/otbTerraSarCalibrationFunctor.txx
+++ b/Code/Radiometry/otbTerraSarCalibrationFunctor.txx
@@ -20,7 +20,6 @@
#include "otbTerraSarCalibrationFunctor.h"
-
namespace otb
{
namespace Functor
@@ -29,7 +28,7 @@ template <class TInput, class TOutput>
TerraSarCalibrationFunctor<TInput, TOutput>
::TerraSarCalibrationFunctor()
{
- // Initialise values
+ // Initialise values
m_CalibrationFactor = itk::NumericTraits<double>::Zero;
m_OriginalProductSize.Fill(0);
m_UseFastCalibration = false;
@@ -39,14 +38,14 @@ TerraSarCalibrationFunctor<TInput, TOutput>
}
template <class TInput, class TOutput>
-double
+double
TerraSarCalibrationFunctor<TInput, TOutput>
-::ComputeRangePosition(const IndexType & index) const
+::ComputeRangePosition(const IndexType& index) const
{
// First compute the range step for the given noise record
- double rangeStep = (m_NoiseRecord.get_validityRangeMax()-m_NoiseRecord.get_validityRangeMin())
- /static_cast<double>(m_OriginalProductSize[0]);
-
+ double rangeStep = (m_NoiseRecord.get_validityRangeMax() - m_NoiseRecord.get_validityRangeMin())
+ / static_cast<double>(m_OriginalProductSize[0]);
+
// Compute the range position using the rangeStep
double position = index[0] * rangeStep + m_NoiseRecord.get_validityRangeMin();
@@ -54,7 +53,7 @@ TerraSarCalibrationFunctor<TInput, TOutput>
}
template <class TInput, class TOutput>
-double
+double
TerraSarCalibrationFunctor<TInput, TOutput>
::ComputeNoiseEquivalentBetaNaught(double range) const
{
@@ -64,13 +63,13 @@ TerraSarCalibrationFunctor<TInput, TOutput>
const double deltaTau = range - m_NoiseRecord.get_referencePoint();
// Get polynomial coefficients
- std::vector<double> coefficients = m_NoiseRecord.get_polynomialCoefficients();
+ std::vector<double> coefficients = m_NoiseRecord.get_polynomialCoefficients();
- // Evaluate
+ // Evaluate
double nebn = Horner (coefficients, deltaTau);
-
+
// Do not forget to multiply by the calibration factor
- nebn*=m_CalibrationFactor;
+ nebn *= m_CalibrationFactor;
// Return the nebn value
return nebn;
@@ -78,87 +77,87 @@ TerraSarCalibrationFunctor<TInput, TOutput>
template <class TInput, class TOutput>
double TerraSarCalibrationFunctor<TInput, TOutput>
-::Horner(std::vector<double> & coefficients, const double nebn) const
+::Horner(std::vector<double>& coefficients, const double nebn) const
{
std::vector<double>::const_reverse_iterator coefIt = coefficients.rbegin();
- double res = *(coefIt);
+ double res = *(coefIt);
++coefIt;
- while(coefIt != coefficients.rend())
+ while (coefIt != coefficients.rend())
{
// Cumulate polynomial
- res= res*nebn + (*coefIt);
+ res = res * nebn + (*coefIt);
++coefIt;
}
- return res;
+ return res;
}
template <class TInput, class TOutput>
TOutput
TerraSarCalibrationFunctor<TInput, TOutput>
-::operator()(const TInput & inPix, const IndexType& index, double angle)
-{
+::operator() (const TInput &inPix, const IndexType &index, double angle)
+ {
// Formula: sigma = (Ks.|DN|²-NEBN) * sin Theta_local
// First, compute the brightness using the brightness functor
- double beta0 = m_Brightness( static_cast<double>(inPix) );
+ double beta0 = m_Brightness(static_cast<double>(inPix));
// Initialise sigma
double sigma = 0.;
// If fast calibration is off, compute noise
- if(m_UseFastCalibration)
+ if (m_UseFastCalibration)
{
- sigma = beta0 * vcl_sin(angle);
+ sigma = beta0 * vcl_sin(angle);
}
else
{
// Compute the range position for this noise record
double currentRange = this->ComputeRangePosition(index);
-
+
// Compute the NEBN
double NEBN = this->ComputeNoiseEquivalentBetaNaught(currentRange);
-
+
// Last, apply formula
sigma = (beta0 - NEBN) * vcl_sin(angle);
// Handle negative sigma case
- if(sigma <=0)
+ if (sigma <= 0)
{
sigma = m_DefaultValue;
}
}
// If results are in dB
- if(m_ResultsInDecibels)
+ if (m_ResultsInDecibels)
{
sigma = 10 * vcl_log10(sigma);
}
// Cast and return
return static_cast<TOutput>(sigma);
-}
+ }
template <class TInput, class TOutput>
std::complex<TOutput>
TerraSarCalibrationFunctor<TInput, TOutput>
-::operator()(const std::complex<TInput> & inPix, const IndexType& index, double angle)
-{
+::operator() (const std::complex<TInput> &inPix, const IndexType &index, double angle)
+ {
// First, extract modulus and phase
- double modulus = vcl_sqrt(inPix.real()*inPix.real() + inPix.imag()*inPix.imag());
- double phase = vcl_atan2(inPix.imag(),inPix.real());
+ double modulus = vcl_sqrt(inPix.real() * inPix.real() + inPix.imag() * inPix.imag());
+ double phase = vcl_atan2(inPix.imag(), inPix.real());
// Then, calibrate the modulus
- double sigma = this->operator()(modulus,index,angle);
-
+ double sigma = this->operator() (modulus, index, angle);
+
// Last, put back the phase
- std::complex<TOutput> out(std::polar(sigma,phase));
-
+ std::complex<TOutput> out(std::polar(sigma, phase));
+
// And return the result
return out;
-}
+ }
-}// namespace Functor
+} // namespace Functor
} // namespace otb
#endif
diff --git a/Code/Radiometry/otbTerraSarCalibrationImageFilter.h b/Code/Radiometry/otbTerraSarCalibrationImageFilter.h
index 8860f845bc..9c093035b6 100644
--- a/Code/Radiometry/otbTerraSarCalibrationImageFilter.h
+++ b/Code/Radiometry/otbTerraSarCalibrationImageFilter.h
@@ -37,14 +37,14 @@ namespace otb
*
* This filter computes the sigma naught (\f$ \sigma^{0} \f$) using the following formula:
* \f[\sigma^{0} = ( k_{s} \cdot |DN|^{2} - NEBN) \cdot sin(\theta_{loc}\f]
- *
+ *
* Where \f$ k_{s} \f$ is the calibration factor, \f$NEBN\f$ is the
* Noise Equivalent Beta Naugth and \f$ \theta_{loc} \f$ is the local
* incident angle.
*
* NEBN is interpolated for each range position according to the
* polynomial coefficients from the most recent noise record.
- *
+ *
* \f$ \theta_{loc} \f$ is estimated from the incidence angles from
* the metadata following a least-square regression.
* One can also add its own incident angle records using the
@@ -59,7 +59,7 @@ namespace otb
*
* The UseFastCalibration flag alllows to derive a coarser yet faster
* calibration by neglecting the noise term.
- *
+ *
* Results can be obtained either in linear or logarithmic scale
* (decibels), using the ResultsInDecibels flag.
*
@@ -67,7 +67,7 @@ namespace otb
* may happen that \f$\sigma_{0} \f$ becomes negative. In that case
* the value is replaced by a default value, which can be tuned by the
* user.
- *
+ *
* This filter works with either real or complex image. In the case of
* the complex images (SLC products for instance), modulus and phase
* are extracted, sigma naught is computed from the modulus and the
@@ -78,30 +78,30 @@ namespace otb
*
* \sa TerraSarCalibrationFunctor
* \sa TerraSarBrightnessImageFilter
- *
+ *
* \ingroup Streamed
- * \ingroup Multithreaded
+ * \ingroup Multithreaded
* \ingroup Radiometry
*/
-template<class TInputImage, class TOutputImage >
+template<class TInputImage, class TOutputImage>
class ITK_EXPORT TerraSarCalibrationImageFilter :
- public itk::ImageToImageFilter<TInputImage,TOutputImage>
+ public itk::ImageToImageFilter<TInputImage, TOutputImage>
{
public:
/** "typedef" for standard classes. */
- typedef TerraSarCalibrationImageFilter Self;
- typedef itk::ImageToImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef TerraSarCalibrationImageFilter Self;
+ typedef itk::ImageToImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Extract input and output images dimensions.*/
- itkStaticConstMacro( InputImageDimension, unsigned int,
- TInputImage::ImageDimension);
- itkStaticConstMacro( OutputImageDimension, unsigned int,
- TOutputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int,
+ TInputImage::ImageDimension);
+ itkStaticConstMacro(OutputImageDimension, unsigned int,
+ TOutputImage::ImageDimension);
- /** "typedef" to simplify the variables definition
+ /** "typedef" to simplify the variables definition
* and the declaration. */
typedef TInputImage InputImageType;
typedef TOutputImage OutputImageType;
@@ -114,54 +114,54 @@ public:
typedef typename InputImageType::IndexType IndexType;
/** Incidence angle samples */
- typedef std::pair<IndexType,double> IncidenceAngleRecordType;
- typedef std::vector<IncidenceAngleRecordType> IncidenceAngleRecordVectorType;
+ typedef std::pair<IndexType, double> IncidenceAngleRecordType;
+ typedef std::vector<IncidenceAngleRecordType> IncidenceAngleRecordVectorType;
/** Calibration functor typedef */
- typedef typename Functor::TerraSarCalibrationFunctor<InputValueType,
- OutputValueType> CalibrationFunctorType;
+ typedef typename Functor::TerraSarCalibrationFunctor<InputValueType,
+ OutputValueType> CalibrationFunctorType;
/** typedef to access metadata */
- typedef itk::MetaDataDictionary MetaDataDictionaryType;
- typedef typename InputImageType::SizeType SizeType;
+ typedef itk::MetaDataDictionary MetaDataDictionaryType;
+ typedef typename InputImageType::SizeType SizeType;
/** Noise records typedefs */
- typedef ossimplugins::ImageNoise ImageNoiseType;
- /**
+ typedef ossimplugins::ImageNoise ImageNoiseType;
+ /**
* This is used to store the noise record along with its
- * acquisition time
+ * acquisition time
*/
- typedef std::pair<double,ImageNoiseType> NoiseRecordType;
- typedef std::vector<NoiseRecordType> NoiseRecordVectorType;
+ typedef std::pair<double, ImageNoiseType> NoiseRecordType;
+ typedef std::vector<NoiseRecordType> NoiseRecordVectorType;
/** object factory method. */
itkNewMacro(Self);
/** return class name. */
- itkTypeMacro(TerraSarCalibrationImageFilter,ImageToImageFilter);
+ itkTypeMacro(TerraSarCalibrationImageFilter, ImageToImageFilter);
/** Accessors */
/** Calibration Factor */
- itkSetMacro(CalibrationFactor,double);
- itkGetMacro(CalibrationFactor,double);
-
+ itkSetMacro(CalibrationFactor, double);
+ itkGetMacro(CalibrationFactor, double);
+
/** If fast calibration is On, noise is ignored */
- itkSetMacro(UseFastCalibration,bool);
- itkGetMacro(UseFastCalibration,bool);
+ itkSetMacro(UseFastCalibration, bool);
+ itkGetMacro(UseFastCalibration, bool);
itkBooleanMacro(UseFastCalibration);
/** Activate if you wish results in decibels */
- itkSetMacro(ResultsInDecibels,bool);
- itkGetMacro(ResultsInDecibels,bool);
+ itkSetMacro(ResultsInDecibels, bool);
+ itkGetMacro(ResultsInDecibels, bool);
itkBooleanMacro(ResultsInDecibels);
/** Pulse Repetition Frequency */
- itkSetMacro(PRF,double);
- itkGetMacro(PRF,double);
+ itkSetMacro(PRF, double);
+ itkGetMacro(PRF, double);
/** Set the default value (replacing negative sigma */
- itkSetMacro(DefaultValue,double);
- itkGetMacro(DefaultValue,double);
+ itkSetMacro(DefaultValue, double);
+ itkGetMacro(DefaultValue, double);
/** The Calibration algorithm uses the original product size to
* compute the range and azimuth location. Hence, if the input image is
@@ -169,9 +169,9 @@ public:
* If not set, the LargestPossibleRegion of the input image is
* used. Please note that this parameter has no influence on the output
* image regions. */
- itkSetMacro(OriginalProductSize,SizeType);
- itkGetConstReferenceMacro(OriginalProductSize,SizeType);
-
+ itkSetMacro(OriginalProductSize, SizeType);
+ itkGetConstReferenceMacro(OriginalProductSize, SizeType);
+
/**
* Add a new noise record for calibration.
* \param utcAcquisitionTime Noise record time
@@ -180,11 +180,11 @@ public:
void AddNoiseRecord(double utcAcquisitionTime, const ImageNoiseType& record);
/**
- * Clear all noise records
+ * Clear all noise records
*/
void ClearNoiseRecords();
- /**
+ /**
* Add an incidence angle record to estimate the local incidence.
* Angle has to be given in degrees.
*/
@@ -200,12 +200,12 @@ protected:
TerraSarCalibrationImageFilter();
/** Destructor */
virtual ~TerraSarCalibrationImageFilter();
-
+
/** Initialize the functor vector */
void BeforeThreadedGenerateData();
/** Threaded generate Data */
- virtual void ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread,int threadId);
+ virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, int threadId);
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -215,8 +215,8 @@ protected:
virtual void Modified();
private:
- TerraSarCalibrationImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ TerraSarCalibrationImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Method used to order noise records by increasing acquisition
* date */
@@ -226,7 +226,7 @@ private:
* fitted by least squares to the angular corners. More Appropriate
* methods (using DEM for instance) could be implemented later */
void EstimateAngularPlaneParameters();
-
+
/**
* Compute the incidence angle from the index
*/
@@ -249,7 +249,7 @@ private:
/** Noise record vector */
NoiseRecordVectorType m_NoiseRecords;
-
+
/** Default value (for negative sigma) */
double m_DefaultValue;
@@ -266,7 +266,6 @@ private:
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Radiometry/otbTerraSarCalibrationImageFilter.txx b/Code/Radiometry/otbTerraSarCalibrationImageFilter.txx
index 6eeccabc38..6dac518a04 100644
--- a/Code/Radiometry/otbTerraSarCalibrationImageFilter.txx
+++ b/Code/Radiometry/otbTerraSarCalibrationImageFilter.txx
@@ -38,23 +38,23 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputImage>
-TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
+TerraSarCalibrationImageFilter<TInputImage, TOutputImage>
::TerraSarCalibrationImageFilter() : m_CalibrationFactor(itk::NumericTraits<double>::Zero),
- m_PRF(1.),
- m_OriginalProductSize(),
- m_UseFastCalibration(false),
- m_ResultsInDecibels(false),
- m_NoiseRecords(),
- m_DefaultValue(0.00001),
- m_IncidenceAngleRecords(),
- m_IncidenceAngleAx(0.),
- m_IncidenceAngleAy(0.),
- m_IncidenceAngleOffset(0.),
- m_ParametersUpToDate(false)
+ m_PRF(1.),
+ m_OriginalProductSize(),
+ m_UseFastCalibration(false),
+ m_ResultsInDecibels(false),
+ m_NoiseRecords(),
+ m_DefaultValue(0.00001),
+ m_IncidenceAngleRecords(),
+ m_IncidenceAngleAx(0.),
+ m_IncidenceAngleAy(0.),
+ m_IncidenceAngleOffset(0.),
+ m_ParametersUpToDate(false)
{}
template <class TInputImage, class TOutputImage>
-TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
+TerraSarCalibrationImageFilter<TInputImage, TOutputImage>
::~TerraSarCalibrationImageFilter()
{
// Clear any noise records
@@ -63,7 +63,7 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
void
-TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
+TerraSarCalibrationImageFilter<TInputImage, TOutputImage>
::Modified()
{
// Call Superclass implementation
@@ -73,22 +73,22 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
void
-TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
+TerraSarCalibrationImageFilter<TInputImage, TOutputImage>
::AddNoiseRecord(double utcAcquisitionTime, const ImageNoiseType& record)
{
// Create the pair
- NoiseRecordType newRecord(utcAcquisitionTime,record);
-
+ NoiseRecordType newRecord(utcAcquisitionTime, record);
+
// Add it to the list
m_NoiseRecords.push_back(newRecord);
// Call modified method
this->Modified();
- }
+}
template <class TInputImage, class TOutputImage>
void
-TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
+TerraSarCalibrationImageFilter<TInputImage, TOutputImage>
::ClearNoiseRecords()
{
m_NoiseRecords.clear();
@@ -99,10 +99,10 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
void
-TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
+TerraSarCalibrationImageFilter<TInputImage, TOutputImage>
::AddIncidenceAngleRecord(const IndexType& index, double angle)
{
- IncidenceAngleRecordType record(index,angle);
+ IncidenceAngleRecordType record(index, angle);
m_IncidenceAngleRecords.push_back(record);
// Call modified method
@@ -111,7 +111,7 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
void
-TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
+TerraSarCalibrationImageFilter<TInputImage, TOutputImage>
::ClearIncidenceAngleRecords()
{
m_IncidenceAngleRecords.clear();
@@ -122,7 +122,7 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
bool
-TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
+TerraSarCalibrationImageFilter<TInputImage, TOutputImage>
::CompareNoiseRecords(const NoiseRecordType& record1, const NoiseRecordType& record2)
{
return (record1.first > record2.first);
@@ -130,11 +130,11 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
void
-TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
+TerraSarCalibrationImageFilter<TInputImage, TOutputImage>
::BeforeThreadedGenerateData()
{
// Check if we need to update parameters
- if(m_ParametersUpToDate)
+ if (m_ParametersUpToDate)
{
return;
}
@@ -144,7 +144,7 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
{
m_OriginalProductSize = this->GetInput()->GetLargestPossibleRegion().GetSize();
}
-
+
// Build the metadata interface
TerraSarImageMetadataInterface::Pointer lImageMetadata = otb::TerraSarImageMetadataInterface::New();
@@ -152,101 +152,102 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
bool mdIsAvailable = lImageMetadata->CanRead(this->GetInput()->GetMetaDataDictionary());
// If the user did not set the data AND the metadata is available, set the data
-
+
// CalibrationFactor
- if (m_CalibrationFactor == itk::NumericTraits<double>::Zero)
- {
+ if (m_CalibrationFactor == itk::NumericTraits<double>::Zero)
+ {
if (mdIsAvailable)
{
- m_CalibrationFactor = lImageMetadata->GetCalibrationFactor(this->GetInput()->GetMetaDataDictionary());
+ m_CalibrationFactor = lImageMetadata->GetCalibrationFactor(this->GetInput()->GetMetaDataDictionary());
}
else
{
- itkExceptionMacro(<<"Invalid input image. Only TerraSar images are supported");
+ itkExceptionMacro(<< "Invalid input image. Only TerraSar images are supported");
}
- }
+ }
// Noise records
- if(m_NoiseRecords.empty())
+ if (m_NoiseRecords.empty())
{
if (mdIsAvailable)
{
// Retrieve the number of noise records
unsigned int nbNoiseRecords = lImageMetadata->GetNumberOfNoiseRecords(this->GetInput()->GetMetaDataDictionary());
-
+
// Retrieve the noise records
ossimplugins::Noise * noiseRecords = lImageMetadata->GetNoise(this->GetInput()->GetMetaDataDictionary());
-
+
// Retrieve corresponding times
std::vector<double> noiseTimes = lImageMetadata->GetNoiseTimeUTCList(this->GetInput()->GetMetaDataDictionary());
- if(!m_UseFastCalibration && ( noiseTimes.empty() || nbNoiseRecords == 0))
- {
- itkExceptionMacro(<<"No noise records found. Consider using fast calibration.");
- }
-
+ if (!m_UseFastCalibration && (noiseTimes.empty() || nbNoiseRecords == 0))
+ {
+ itkExceptionMacro(<< "No noise records found. Consider using fast calibration.");
+ }
+
// For each noise record, add it
- for(unsigned int i = 0; i < nbNoiseRecords;++i)
- {
- this->AddNoiseRecord(noiseTimes[i],noiseRecords->get_imageNoise()[i]);
- }
-
+ for (unsigned int i = 0; i < nbNoiseRecords; ++i)
+ {
+ this->AddNoiseRecord(noiseTimes[i], noiseRecords->get_imageNoise()[i]);
+ }
+
// Free memory
delete noiseRecords;
}
else
{
- itkExceptionMacro(<<"Invalid input image. Only TerraSar images are supported");
+ itkExceptionMacro(<< "Invalid input image. Only TerraSar images are supported");
}
}
-
+
// PRF
- if (this->GetPRF() == 1.)
- {
- if (mdIsAvailable)
+ if (this->GetPRF() == 1.)
{
+ if (mdIsAvailable)
+ {
m_PRF = lImageMetadata->GetPRF(this->GetInput()->GetMetaDataDictionary());
- }
+ }
else
- {
- itkExceptionMacro(<<"Invalid input image. Only TerraSar images are supported");
+ {
+ itkExceptionMacro(<< "Invalid input image. Only TerraSar images are supported");
+ }
}
- }
-
+
// Incident Angle
- if (m_IncidenceAngleRecords.empty())
- {
- if (mdIsAvailable)
+ if (m_IncidenceAngleRecords.empty())
{
- // Retrieve center incidence angle
- double centerAngle = lImageMetadata->GetCenterIncidenceAngle(this->GetInput()->GetMetaDataDictionary());
- IndexType centerIndex = lImageMetadata->GetCenterIncidenceAngleIndex(this->GetInput()->GetMetaDataDictionary());
- this->AddIncidenceAngleRecord(centerIndex,centerAngle);
-
- // Retrieve corners incidence angle
- std::vector<double> cangles = lImageMetadata->GetCornersIncidenceAngles(this->GetInput()->GetMetaDataDictionary());
- std::vector<IndexType> cindex = lImageMetadata->GetCornersIncidenceAnglesIndex(
- this->GetInput()->GetMetaDataDictionary());
-
- std::vector<double>::const_iterator angIt = cangles.begin();
- typename std::vector<IndexType>::const_iterator indIt = cindex.begin();
-
- // Add each corner angle record as well
- while(angIt != cangles.end() && indIt != cindex.end())
+ if (mdIsAvailable)
{
- this->AddIncidenceAngleRecord(*indIt,*angIt);
- ++angIt;
- ++indIt;
+ // Retrieve center incidence angle
+ double centerAngle = lImageMetadata->GetCenterIncidenceAngle(this->GetInput()->GetMetaDataDictionary());
+ IndexType centerIndex = lImageMetadata->GetCenterIncidenceAngleIndex(this->GetInput()->GetMetaDataDictionary());
+ this->AddIncidenceAngleRecord(centerIndex, centerAngle);
+
+ // Retrieve corners incidence angle
+ std::vector<double> cangles = lImageMetadata->GetCornersIncidenceAngles(
+ this->GetInput()->GetMetaDataDictionary());
+ std::vector<IndexType> cindex = lImageMetadata->GetCornersIncidenceAnglesIndex(
+ this->GetInput()->GetMetaDataDictionary());
+
+ std::vector<double>::const_iterator angIt = cangles.begin();
+ typename std::vector<IndexType>::const_iterator indIt = cindex.begin();
+
+ // Add each corner angle record as well
+ while (angIt != cangles.end() && indIt != cindex.end())
+ {
+ this->AddIncidenceAngleRecord(*indIt, *angIt);
+ ++angIt;
+ ++indIt;
+ }
}
- }
else
- {
- itkExceptionMacro(<<"Invalid input image. Only TerraSar images are supported");
+ {
+ itkExceptionMacro(<< "Invalid input image. Only TerraSar images are supported");
+ }
}
- }
// Ensure that noise records are sorted by decreasing acquisition
// date
- std::sort(m_NoiseRecords.begin(),m_NoiseRecords.end(), &Self::CompareNoiseRecords);
+ std::sort(m_NoiseRecords.begin(), m_NoiseRecords.end(), &Self::CompareNoiseRecords);
// Estimate angular plane parameters
this->EstimateAngularPlaneParameters();
@@ -257,18 +258,18 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
void
-TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
+TerraSarCalibrationImageFilter<TInputImage, TOutputImage>
::EstimateAngularPlaneParameters()
{
// Check if there are any incidence angle records
- if(m_IncidenceAngleRecords.empty())
+ if (m_IncidenceAngleRecords.empty())
{
- itkExceptionMacro(<<"No incidence angle records found, can not perform calibration!");
+ itkExceptionMacro(<< "No incidence angle records found, can not perform calibration!");
}
// If we do not have enough point to do the least square regression,
- // set default value as a constant mean angle
- if(m_IncidenceAngleRecords.size() < 3)
+ // set default value as a constant mean angle
+ if (m_IncidenceAngleRecords.size() < 3)
{
m_IncidenceAngleAx = 0.;
m_IncidenceAngleAy = 0.;
@@ -276,11 +277,11 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
typename IncidenceAngleRecordVectorType::const_iterator
aIt = m_IncidenceAngleRecords.begin();
-
+
// Compute the mean incidence angle
- while(aIt != m_IncidenceAngleRecords.end())
+ while (aIt != m_IncidenceAngleRecords.end())
{
- m_IncidenceAngleOffset += aIt->second;
+ m_IncidenceAngleOffset += aIt->second;
++aIt;
}
// Set the offset to the mean angle
@@ -291,25 +292,25 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
// Perform the plane least square estimation
unsigned int nbRecords = m_IncidenceAngleRecords.size();
- vnl_sparse_matrix<double> a(nbRecords,3);
+ vnl_sparse_matrix<double> a(nbRecords, 3);
vnl_vector<double> b(nbRecords), bestParams(3);
// Fill the linear system
- for(unsigned int i = 0; i < nbRecords; ++i)
+ for (unsigned int i = 0; i < nbRecords; ++i)
{
- a(i,0) = m_IncidenceAngleRecords.at(i).first[0];
- a(i,1) = m_IncidenceAngleRecords.at(i).first[1];
- a(i,2) = 1.;
+ a(i, 0) = m_IncidenceAngleRecords.at(i).first[0];
+ a(i, 1) = m_IncidenceAngleRecords.at(i).first[1];
+ a(i, 2) = 1.;
b[i] = m_IncidenceAngleRecords.at(i).second * M_PI / 180.;
}
// Create the linear system
- vnl_sparse_matrix_linear_system<double> linearSystem(a,b);
+ vnl_sparse_matrix_linear_system<double> linearSystem(a, b);
vnl_lsqr linearSystemSolver(linearSystem);
-
+
// And solve it
linearSystemSolver.minimize(bestParams);
-
+
m_IncidenceAngleAx = bestParams[0];
m_IncidenceAngleAy = bestParams[1];
m_IncidenceAngleOffset = bestParams[2];
@@ -317,7 +318,7 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
double
-TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
+TerraSarCalibrationImageFilter<TInputImage, TOutputImage>
::ComputeIncidenceAngle(const IndexType& index) const
{
// Apply the regression
@@ -327,14 +328,14 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
template <class TInputImage, class TOutputImage>
void
-TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread,
- int threadId)
+TerraSarCalibrationImageFilter<TInputImage, TOutputImage>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
+ int threadId)
{
// Retrieve input and output pointer
typename InputImageType::ConstPointer inputPtr = this->GetInput();
typename OutputImageType::Pointer outputPtr = this->GetOutput(0);
-
+
// Define the portion of the input to walk for this thread, using
// the CallCopyOutputRegionToInputRegion method allows for the input
// and output images to be different dimensions
@@ -348,7 +349,7 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
// Initialize iterators
inputIt.GoToBegin();
outputIt.GoToBegin();
-
+
// Set up the functor
CalibrationFunctorType calibrationFunctor;
calibrationFunctor.SetCalibrationFactor(m_CalibrationFactor);
@@ -359,27 +360,26 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
// Set up progress reporting
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
-
+
assert(!m_NoiseRecords.empty());
// The acquisition time of the first line of OutputRegionForThread.
// Adapt frequency to julien day (1s <-> 1/24*60*60 = 1/86400 julienDay)
- double invPRF = (1./m_PRF*86400.);
- double currentAzimuthPosition = m_NoiseRecords.back().first + invPRF
- * (m_OriginalProductSize[1]- inputIt.GetIndex()[1] -1);
-
+ double invPRF = (1. / m_PRF * 86400.);
+ double currentAzimuthPosition = m_NoiseRecords.back().first + invPRF
+ * (m_OriginalProductSize[1] - inputIt.GetIndex()[1] - 1);
// Look for the first noise record to be used (remember we sorted
// m_NoiseRecords by decreasing time)
NoiseRecordVectorType::const_iterator currentNoiseRecordIt = m_NoiseRecords.begin();
-
+
unsigned int nrIndex = 0;
// Iterate until we find it
- while(currentNoiseRecordIt != m_NoiseRecords.end() && currentNoiseRecordIt->first > currentAzimuthPosition)
+ while (currentNoiseRecordIt != m_NoiseRecords.end() && currentNoiseRecordIt->first > currentAzimuthPosition)
{
- ++nrIndex;
- ++currentNoiseRecordIt;
+ ++nrIndex;
+ ++currentNoiseRecordIt;
}
assert(currentNoiseRecordIt != m_NoiseRecords.end());
@@ -390,46 +390,45 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
// Store current line index
typename OutputImageRegionType::IndexType::IndexValueType currentLine = inputIt.GetIndex()[1];
-
+
// Iterate on the input and output buffer
- while( !inputIt.IsAtEnd() )
+ while (!inputIt.IsAtEnd())
{
// Check if we changed line
- if(currentLine != inputIt.GetIndex()[1])
+ if (currentLine != inputIt.GetIndex()[1])
{
// If so, update the current azimuth time
currentAzimuthPosition -= invPRF;
// Update line counter
currentLine = inputIt.GetIndex()[1];
-
+
// And check if we changed of NoiseRecord
- if(currentAzimuthPosition < currentNoiseRecordAzimuthPosition)
- {
- // Update the iterator
- ++currentNoiseRecordIt;
- // If we are not at the last record
- if(currentNoiseRecordIt != m_NoiseRecords.end())
- {
- // Update the functor noise record
- currentNoiseRecordAzimuthPosition = currentNoiseRecordIt->first;
- calibrationFunctor.SetNoiseRecord(currentNoiseRecordIt->second);
- }
- }
+ if (currentAzimuthPosition < currentNoiseRecordAzimuthPosition)
+ {
+ // Update the iterator
+ ++currentNoiseRecordIt;
+ // If we are not at the last record
+ if (currentNoiseRecordIt != m_NoiseRecords.end())
+ {
+ // Update the functor noise record
+ currentNoiseRecordAzimuthPosition = currentNoiseRecordIt->first;
+ calibrationFunctor.SetNoiseRecord(currentNoiseRecordIt->second);
+ }
+ }
}
// Apply the calibration functor
- outputIt.Set( calibrationFunctor( inputIt.Get(), inputIt.GetIndex(),
- this->ComputeIncidenceAngle(inputIt.GetIndex()) ) );
+ outputIt.Set(calibrationFunctor(inputIt.Get(), inputIt.GetIndex(),
+ this->ComputeIncidenceAngle(inputIt.GetIndex())));
++inputIt;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
}
}
-
template <class TInputImage, class TOutputImage>
void
-TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
+TerraSarCalibrationImageFilter<TInputImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
@@ -439,13 +438,12 @@ TerraSarCalibrationImageFilter<TInputImage,TOutputImage>
os << indent << "Original product size: " << m_OriginalProductSize << std::endl;
os << indent << "Fast calibration: " << (m_UseFastCalibration ? "On" : "Off") << std::endl;
os << indent << "Results in decibels: " << (m_ResultsInDecibels ? "Yes" : "No") << std::endl;
- os << indent << "Number of noise records: " << m_NoiseRecords.size() <<std::endl;
+ os << indent << "Number of noise records: " << m_NoiseRecords.size() << std::endl;
os << indent << "Number of angle records: " << m_IncidenceAngleRecords.size() << std::endl;
os << indent << "Angle regression: " << m_IncidenceAngleAx
- <<"* col + "<<m_IncidenceAngleAx
- <<" * row +"<<m_IncidenceAngleOffset<<std::endl;
+ << "* col + " << m_IncidenceAngleAx
+ << " * row +" << m_IncidenceAngleOffset << std::endl;
}
-
} // namespace otb
#endif
diff --git a/Code/Radiometry/otbVegetationIndicesFunctor.h b/Code/Radiometry/otbVegetationIndicesFunctor.h
index cfad011b8e..0407f4c380 100644
--- a/Code/Radiometry/otbVegetationIndicesFunctor.h
+++ b/Code/Radiometry/otbVegetationIndicesFunctor.h
@@ -44,32 +44,32 @@ public:
/// Vector pixel type used to support both vector images and multiple
/// input images
typedef itk::VariableLengthVector<TInput1> InputVectorType;
-
- //operators !=
- bool operator!=( const RAndNIRIndexBase & ) const
- {
- return false;
- }
+
+ //operators !=
+ bool operator !=(const RAndNIRIndexBase&) const
+ {
+ return false;
+ }
//operator ==
- bool operator==( const RAndNIRIndexBase & other ) const
- {
- return !(*this != other);
- }
+ bool operator ==(const RAndNIRIndexBase& other) const
+ {
+ return !(*this != other);
+ }
// Operator on vector pixel type
- inline TOutput operator()(const InputVectorType & inputVector)
+ inline TOutput operator ()(const InputVectorType& inputVector)
{
- return this->Evaluate(inputVector[m_RedIndex-1],static_cast<TInput2>(inputVector[m_NIRIndex-1]));
+ return this->Evaluate(inputVector[m_RedIndex - 1], static_cast<TInput2>(inputVector[m_NIRIndex - 1]));
}
// Binary operator
- inline TOutput operator()(const TInput1 &r, const TInput2 &nir)
+ inline TOutput operator ()(const TInput1& r, const TInput2& nir)
{
- return this->Evaluate(r,nir);
- };
+ return this->Evaluate(r, nir);
+ }
/// Constructor
RAndNIRIndexBase() : m_EpsilonToBeConsideredAsZero(0.0000001), m_RedIndex(3), m_NIRIndex(4) {}
/// Desctructor
- virtual ~RAndNIRIndexBase() {};
+ virtual ~RAndNIRIndexBase() {}
/// Set Red Index
void SetRedIndex(unsigned int channel)
@@ -94,7 +94,7 @@ public:
protected:
// This method must be reimplemented in subclasses to actually
// compute the index value
- virtual TOutput Evaluate(const TInput1 & r, const TInput2 & nir) const = 0;
+ virtual TOutput Evaluate(const TInput1& r, const TInput2& nir) const = 0;
double m_EpsilonToBeConsideredAsZero;
private:
@@ -119,35 +119,35 @@ public:
/// Vector pixel type used to support both vector images and multiple
/// input images
typedef itk::VariableLengthVector<TInput1> InputVectorType;
-
- //operators !=
- bool operator!=( const RAndBAndNIRIndexBase& ) const
- {
- return false;
- }
-
+
+ //operators !=
+ bool operator !=(const RAndBAndNIRIndexBase&) const
+ {
+ return false;
+ }
+
//operator ==
- bool operator==( const RAndBAndNIRIndexBase& other ) const
+ bool operator ==(const RAndBAndNIRIndexBase& other) const
{
return !(*this != other);
}
-
+
// Operator on vector pixel type
- inline TOutput operator()(const InputVectorType & inputVector)
+ inline TOutput operator ()(const InputVectorType& inputVector)
{
- return this->Evaluate(inputVector[m_RedIndex-1],
- static_cast<TInput2>(inputVector[m_BlueIndex-1]),
- static_cast<TInput3>(inputVector[m_NIRIndex-1]));
+ return this->Evaluate(inputVector[m_RedIndex - 1],
+ static_cast<TInput2>(inputVector[m_BlueIndex - 1]),
+ static_cast<TInput3>(inputVector[m_NIRIndex - 1]));
}
// Binary operator
- inline TOutput operator()(const TInput1 &r, const TInput2 &b, const TInput2 &nir)
+ inline TOutput operator ()(const TInput1& r, const TInput2& b, const TInput2& nir)
{
- return this->Evaluate(r,b,nir);
- };
+ return this->Evaluate(r, b, nir);
+ }
/// Constructor
- RAndBAndNIRIndexBase() : m_EpsilonToBeConsideredAsZero(0.0000001), m_RedIndex(3), m_BlueIndex(1), m_NIRIndex(4) {};
+ RAndBAndNIRIndexBase() : m_EpsilonToBeConsideredAsZero(0.0000001), m_RedIndex(3), m_BlueIndex(1), m_NIRIndex(4) {}
/// Desctructor
- virtual ~RAndBAndNIRIndexBase() {};
+ virtual ~RAndBAndNIRIndexBase() {}
/// Set Red Index
void SetRedIndex(unsigned int channel)
@@ -183,9 +183,9 @@ public:
protected:
// This method must be reimplemented in subclasses to actually
// compute the index value
- virtual TOutput Evaluate(const TInput1 & r, const TInput2& b, const TInput3 & nir) const = 0;
+ virtual TOutput Evaluate(const TInput1& r, const TInput2& b, const TInput3& nir) const = 0;
double m_EpsilonToBeConsideredAsZero;
-
+
private:
unsigned int m_RedIndex;
unsigned int m_BlueIndex;
@@ -211,22 +211,22 @@ public:
typedef itk::VariableLengthVector<TInput1> InputVectorType;
// Operator on vector pixel type
- inline TOutput operator()(const InputVectorType & inputVector)
+ inline TOutput operator ()(const InputVectorType& inputVector)
{
- return this->Evaluate(inputVector[m_RedIndex-1],
- static_cast<TInput2>(inputVector[m_GreenIndex-1]),
- static_cast<TInput3>(inputVector[m_NIRIndex-1]));
+ return this->Evaluate(inputVector[m_RedIndex - 1],
+ static_cast<TInput2>(inputVector[m_GreenIndex - 1]),
+ static_cast<TInput3>(inputVector[m_NIRIndex - 1]));
}
// Binary operator
- inline TOutput operator()(const TInput1 &r, const TInput2 &g, const TInput2 &nir)
+ inline TOutput operator ()(const TInput1& r, const TInput2& g, const TInput2& nir)
{
- return this->Evaluate(r,g,nir);
- };
+ return this->Evaluate(r, g, nir);
+ }
/// Constructor
- RAndGAndNIRIndexBase() : m_EpsilonToBeConsideredAsZero(0.0000001), m_RedIndex(3), m_GreenIndex(2), m_NIRIndex(4) {};
+ RAndGAndNIRIndexBase() : m_EpsilonToBeConsideredAsZero(0.0000001), m_RedIndex(3), m_GreenIndex(2), m_NIRIndex(4) {}
/// Desctructor
- virtual ~RAndGAndNIRIndexBase() {};
+ virtual ~RAndGAndNIRIndexBase() {}
/// Set Red Index
void SetRedIndex(unsigned int channel)
@@ -262,7 +262,7 @@ public:
protected:
// This method must be reimplemented in subclasses to actually
// compute the index value
- virtual TOutput Evaluate(const TInput1 & r, const TInput2& g, const TInput3 & nir) const = 0;
+ virtual TOutput Evaluate(const TInput1& r, const TInput2& g, const TInput3& nir) const = 0;
const double m_EpsilonToBeConsideredAsZero;
private:
@@ -280,25 +280,25 @@ private:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TOutput>
-class NDVI : public RAndNIRIndexBase<TInput1,TInput2,TOutput>
+class NDVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
/// Constructor
- NDVI() {};
+ NDVI() {}
/// Desctructor
- virtual ~NDVI() {};
+ virtual ~NDVI() {}
// Operator on r and nir single pixel values
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const
{
double dr = static_cast<double>(r);
double dnir = static_cast<double>(nir);
- if ( vcl_abs(dnir + dr) < this->m_EpsilonToBeConsideredAsZero )
+ if (vcl_abs(dnir + dr) < this->m_EpsilonToBeConsideredAsZero)
{
return static_cast<TOutput>(0.);
}
- return ( static_cast<TOutput>((dnir-dr)/(dnir+dr)));
+ return (static_cast<TOutput>((dnir - dr) / (dnir + dr)));
}
};
@@ -314,18 +314,18 @@ template <class TInput1, class TInput2, class TOutput>
class RVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
- RVI() {};
- virtual ~RVI() {};
+ RVI() {}
+ virtual ~RVI() {}
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const
{
double dr = static_cast<double>(r);
double dnir = static_cast<double>(nir);
- if ( vcl_abs(dr) < this->m_EpsilonToBeConsideredAsZero )
+ if (vcl_abs(dr) < this->m_EpsilonToBeConsideredAsZero)
{
return static_cast<TOutput>(0.);
}
- return ( static_cast<TOutput>(dnir/dr));
+ return (static_cast<TOutput>(dnir / dr));
}
};
@@ -341,41 +341,41 @@ template <class TInput1, class TInput2, class TOutput>
class PVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
- PVI() {};
- virtual ~PVI() {};
+ PVI() {}
+ virtual ~PVI() {}
/** Set/Get A and B parameters */
void SetA(const double A)
{
m_A = A;
- m_Coeff = 1./(vcl_sqrt(m_A*m_A + 1.));
+ m_Coeff = 1. / (vcl_sqrt(m_A * m_A + 1.));
}
- double GetA(void)const
+ double GetA(void) const
{
- return ( m_A );
+ return (m_A);
}
void SetB(const double B)
{
m_B = B;
}
- double GetB(void)const
+ double GetB(void) const
{
- return ( m_B );
+ return (m_B);
}
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const
{
double dnir = static_cast<double>(nir);
double dr = static_cast<double>(r);
- return ( static_cast<TOutput>( (dnir - m_A*dr - m_B)*m_Coeff) );
+ return (static_cast<TOutput>((dnir - m_A * dr - m_B) * m_Coeff));
}
private:
/** A and B parameters */
- double m_A;
- double m_B;
+ double m_A;
+ double m_B;
/** Denominator, pre-calculed when the A variable is set */
- double m_Coeff;
+ double m_Coeff;
};
@@ -391,36 +391,36 @@ template <class TInput1, class TInput2, class TOutput>
class SAVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
- SAVI() : m_L(0.5) {};
- virtual ~SAVI() {};
+ SAVI() : m_L(0.5) {}
+ virtual ~SAVI() {}
/** Set/Get L correction */
void SetL(const double L)
{
m_L = L;
}
- double GetL(void)const
+ double GetL(void) const
{
- return ( m_L );
+ return (m_L);
}
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const
{
double dnir = static_cast<double>(nir);
double dr = static_cast<double>(r);
double denominator = dnir + dr + m_L;
- if ( vcl_abs(denominator) < this->m_EpsilonToBeConsideredAsZero )
+ if (vcl_abs(denominator) < this->m_EpsilonToBeConsideredAsZero)
{
return static_cast<TOutput>(0.);
}
- return ( static_cast<TOutput>( ((dnir-dr)*(1+m_L))/denominator ) );
+ return (static_cast<TOutput>(((dnir - dr) * (1 + m_L)) / denominator));
}
private:
/** L correction */
- double m_L;
+ double m_L;
};
@@ -436,15 +436,15 @@ template <class TInput1, class TInput2, class TOutput>
class TSAVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
- TSAVI() : m_A(0.7), m_S(0.9), m_X(0.08) {};
- virtual ~TSAVI() {};
+ TSAVI() : m_A(0.7), m_S(0.9), m_X(0.08) {}
+ virtual ~TSAVI() {}
/** Set/Get S and A parameters */
void SetS(const double S)
{
m_S = S;
}
- double GetS(void)const
+ double GetS(void) const
{
return (m_S);
}
@@ -452,7 +452,7 @@ public:
{
m_A = A;
}
- double GetA(void)const
+ double GetA(void) const
{
return (m_A);
}
@@ -461,31 +461,31 @@ public:
{
m_X = X;
}
- double GetX(void)const
+ double GetX(void) const
{
return (m_X);
}
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const
{
double dnir = static_cast<double>(nir);
double dr = static_cast<double>(r);
- double denominator = m_A*dnir + dr + m_X*(1.+m_A*m_A);
- if ( vcl_abs(denominator) < this->m_EpsilonToBeConsideredAsZero )
+ double denominator = m_A * dnir + dr + m_X * (1. + m_A * m_A);
+ if (vcl_abs(denominator) < this->m_EpsilonToBeConsideredAsZero)
{
return static_cast<TOutput>(0.);
}
- return ( static_cast<TOutput>( (m_A*(dnir - m_A*dr - m_S))/denominator ) );
+ return (static_cast<TOutput>((m_A * (dnir - m_A * dr - m_S)) / denominator));
}
private:
/** A and S parameters */
- double m_A;
- double m_S;
+ double m_A;
+ double m_S;
/** X parameter */
- double m_X;
+ double m_X;
};
@@ -501,20 +501,20 @@ template <class TInput1, class TInput2, class TOutput>
class MSAVI2 : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
- MSAVI2() {};
- virtual ~MSAVI2() {};
+ MSAVI2() {}
+ virtual ~MSAVI2() {}
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const
{
double dnir = static_cast<double>(nir);
double dr = static_cast<double>(r);
- double sqrt_value = (2*dnir+1)*(2*dnir+1) - 8*(dnir-dr);
- if ( sqrt_value < 0. )
+ double sqrt_value = (2 * dnir + 1) * (2 * dnir + 1) - 8 * (dnir - dr);
+ if (sqrt_value < 0.)
{
return static_cast<TOutput>(0.);
}
- return ( static_cast<TOutput>( (2*dnir + 1 - vcl_sqrt(sqrt_value))/2. ) );
+ return (static_cast<TOutput>((2 * dnir + 1 - vcl_sqrt(sqrt_value)) / 2.));
}
};
@@ -531,11 +531,11 @@ template <class TInput1, class TInput2, class TOutput>
class GEMI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
- GEMI() {};
- virtual ~GEMI() {};
+ GEMI() {}
+ virtual ~GEMI() {}
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const
{
double dnir = static_cast<double>(nir);
double dr = static_cast<double>(r);
@@ -543,22 +543,22 @@ protected:
double dnu;
double dnumerateur_nu;
double ddenominateur_nu = dnir + dr + 0.5;
- if ( vcl_abs(ddenominateur_nu) < this->m_EpsilonToBeConsideredAsZero )
+ if (vcl_abs(ddenominateur_nu) < this->m_EpsilonToBeConsideredAsZero)
{
- dnu = 0;
+ dnu = 0;
}
else
{
- dnumerateur_nu = 2*(dnir*dnir - dr*dr) + 1.5*dnir + 0.5*dr;
- dnu = dnumerateur_nu / ddenominateur_nu;
+ dnumerateur_nu = 2 * (dnir * dnir - dr * dr) + 1.5 * dnir + 0.5 * dr;
+ dnu = dnumerateur_nu / ddenominateur_nu;
}
double ddenominateur_GEMI = 1 - dr;
- if ( vcl_abs(ddenominateur_GEMI) < this->m_EpsilonToBeConsideredAsZero )
- {
+ if (vcl_abs(ddenominateur_GEMI) < this->m_EpsilonToBeConsideredAsZero)
+ {
return static_cast<TOutput>(0.);
- }
- return ( static_cast<TOutput>( (dnu*(1 -0.25*dnu)-(dr-0.125))/ddenominateur_GEMI ) );
+ }
+ return (static_cast<TOutput>((dnu * (1 - 0.25 * dnu) - (dr - 0.125)) / ddenominateur_GEMI));
}
};
@@ -572,34 +572,34 @@ protected:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TOutput>
-class WDVI : public RAndNIRIndexBase<TInput1,TInput2,TOutput>
+class WDVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
/// Constructor
- WDVI() : m_S(0.4) {};
+ WDVI() : m_S(0.4) {}
/// Desctructor
- virtual ~WDVI() {};
+ virtual ~WDVI() {}
// Operator on r and nir single pixel values
/** Set/Get Slop of soil line */
- void SetS( const double s)
+ void SetS(const double s)
{
m_S = s;
}
- double GetS(void)const
+ double GetS(void) const
{
return (m_S);
}
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const
{
double dr = static_cast<double>(r);
double dnir = static_cast<double>(nir);
- return (dnir -m_S*dr);
+ return (dnir - m_S * dr);
}
private:
/** Slope of soil line */
- double m_S;
+ double m_S;
};
/** \class MSAVI
@@ -619,54 +619,53 @@ public:
typedef WDVI<TInput1, TInput2, TOutput> WDVIFunctorType;
MSAVI() : m_S(0.4)
{
- m_WDVIfunctor.SetS(m_S);
- };
- virtual ~MSAVI() {};
+ m_WDVIfunctor.SetS(m_S);
+ }
+ virtual ~MSAVI() {}
/** Set/Get Slop of soil line */
- void SetS( const double s)
+ void SetS(const double s)
{
m_S = s;
- m_WDVIfunctor.SetS(m_S);
+ m_WDVIfunctor.SetS(m_S);
}
- double GetS(void)const
+ double GetS(void) const
{
return (m_S);
}
- NDVIFunctorType GetNDVI(void)const
+ NDVIFunctorType GetNDVI(void) const
{
return (m_NDVIfunctor);
}
- WDVIFunctorType GetWDVI(void)const
+ WDVIFunctorType GetWDVI(void) const
{
return (m_WDVIfunctor);
}
-
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const
{
double dnir = static_cast<double>(nir);
double dr = static_cast<double>(r);
- double dNDVI = this->GetNDVI()(r,nir);
- double dWDVI = this->GetWDVI()(r,nir);
- double dL = 1 - 2*m_S*dNDVI*dWDVI;
+ double dNDVI = this->GetNDVI() (r, nir);
+ double dWDVI = this->GetWDVI() (r, nir);
+ double dL = 1 - 2 * m_S * dNDVI * dWDVI;
double denominator = dnir + dr + dL;
- if ( vcl_abs(denominator) < this->m_EpsilonToBeConsideredAsZero )
+ if (vcl_abs(denominator) < this->m_EpsilonToBeConsideredAsZero)
{
return static_cast<TOutput>(0.);
}
- return ( static_cast<TOutput>( ((dnir-dr)*(1+dL))/denominator ) );
+ return (static_cast<TOutput>(((dnir - dr) * (1 + dL)) / denominator));
}
private:
/** Slope of soil line */
- double m_S;
+ double m_S;
const NDVIFunctorType m_NDVIfunctor;
- WDVIFunctorType m_WDVIfunctor;
+ WDVIFunctorType m_WDVIfunctor;
};
@@ -681,17 +680,17 @@ private:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TInput3, class TOutput>
-class AVI : public RAndGAndNIRIndexBase<TInput1,TInput2,TInput3,TOutput>
+class AVI : public RAndGAndNIRIndexBase<TInput1, TInput2, TInput3, TOutput>
{
public:
- AVI() : m_LambdaG(560.), m_LambdaR(660.), m_LambdaNir(830.) {};
- virtual ~AVI() {};
+ AVI() : m_LambdaG(560.), m_LambdaR(660.), m_LambdaNir(830.) {}
+ virtual ~AVI() {}
/** Set/Get Lambda red parameter*/
void SetLambdaR(const double lr)
{
m_LambdaR = lr;
}
- double GetLambdaR(void)const
+ double GetLambdaR(void) const
{
return (m_LambdaR);
}
@@ -700,7 +699,7 @@ public:
{
m_LambdaG = lg;
}
- double GetLambdaG(void)const
+ double GetLambdaG(void) const
{
return (m_LambdaG);
}
@@ -709,12 +708,12 @@ public:
{
m_LambdaNir = lnir;
}
- double GetLambdaNir(void)const
+ double GetLambdaNir(void) const
{
return (m_LambdaNir);
}
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &g, const TInput3 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& g, const TInput3& nir) const
{
double dr = static_cast<double>(r);
double dg = static_cast<double>(g);
@@ -724,37 +723,37 @@ protected:
double dfact2 = (m_LambdaR - m_LambdaG) / m_LambdaR;
double dterm1;
double dterm2;
- if( vcl_abs(dnir-dr) < this->m_EpsilonToBeConsideredAsZero )
- {
+ if (vcl_abs(dnir - dr) < this->m_EpsilonToBeConsideredAsZero)
+ {
dterm1 = 0;
- }
+ }
else
- {
- dterm1 = vcl_atan(dfact1/(dnir - dr));
- }
+ {
+ dterm1 = vcl_atan(dfact1 / (dnir - dr));
+ }
- if( vcl_abs(dg-dr) < this->m_EpsilonToBeConsideredAsZero )
- {
+ if (vcl_abs(dg - dr) < this->m_EpsilonToBeConsideredAsZero)
+ {
dterm2 = 0;
- }
+ }
else
- {
- dterm2 = vcl_atan(dfact2/(dg - dr));
- }
+ {
+ dterm2 = vcl_atan(dfact2 / (dg - dr));
+ }
- return static_cast<TOutput>( dterm1 + dterm2 );
+ return static_cast<TOutput>(dterm1 + dterm2);
}
private:
/** Central wavelength of the green channel (=Lambda1) */
- double m_LambdaG;
+ double m_LambdaG;
/** Central wavelength of the red channel (=Lambda2) */
- double m_LambdaR;
+ double m_LambdaR;
/** Central wavelength of the nir channel (=Lambda3) */
- double m_LambdaNir;
+ double m_LambdaNir;
};
/** \class ARVI
@@ -768,41 +767,41 @@ private:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TInput3, class TOutput>
-class ARVI : public RAndBAndNIRIndexBase<TInput1,TInput2,TInput3,TOutput>
+class ARVI : public RAndBAndNIRIndexBase<TInput1, TInput2, TInput3, TOutput>
{
public:
- ARVI() : m_Gamma(0.5) {};
- virtual ~ARVI() {};
+ ARVI() : m_Gamma(0.5) {}
+ virtual ~ARVI() {}
/** Set/Get Gamma parameter */
void SetGamma(const double gamma)
{
m_Gamma = gamma;
}
- double GetGamma(void)const
+ double GetGamma(void) const
{
return (m_Gamma);
}
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &b, const TInput3 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& b, const TInput3& nir) const
{
double dr = static_cast<double>(r);
double db = static_cast<double>(b);
double dnir = static_cast<double>(nir);
- double RHOrb = dr - m_Gamma*(db - dr);
+ double RHOrb = dr - m_Gamma * (db - dr);
double denominator = dnir + RHOrb;
- if ( vcl_abs(denominator) < this->m_EpsilonToBeConsideredAsZero )
+ if (vcl_abs(denominator) < this->m_EpsilonToBeConsideredAsZero)
{
return static_cast<TOutput>(0.);
}
- return ( static_cast<TOutput>( (dnir - RHOrb)/denominator ) );
+ return (static_cast<TOutput>((dnir - RHOrb) / denominator));
}
private:
/** Gamma parameter */
- double m_Gamma;
+ double m_Gamma;
};
/** \class TSARVI
@@ -814,18 +813,18 @@ private:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TInput3, class TOutput>
-class TSARVI: public RAndBAndNIRIndexBase<TInput1,TInput2,TInput3,TOutput>
+class TSARVI : public RAndBAndNIRIndexBase<TInput1, TInput2, TInput3, TOutput>
{
public:
- TSARVI() : m_X(0.08), m_Gamma(0.5) {};
- virtual ~TSARVI() {};
+ TSARVI() : m_X(0.08), m_Gamma(0.5) {}
+ virtual ~TSARVI() {}
/** Set/Get A and B parameters */
void SetA(const double A)
{
m_A = A;
}
- double GetA(void)const
+ double GetA(void) const
{
return (m_A);
}
@@ -833,7 +832,7 @@ public:
{
m_B = B;
}
- double GetB(void)const
+ double GetB(void) const
{
return (m_B);
}
@@ -842,7 +841,7 @@ public:
{
m_X = X;
}
- double GetX(void)const
+ double GetX(void) const
{
return (m_X);
}
@@ -851,35 +850,35 @@ public:
{
m_Gamma = gamma;
}
- double GetGamma(void)const
+ double GetGamma(void) const
{
return (m_Gamma);
}
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &b, const TInput3 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& b, const TInput3& nir) const
{
double dr = static_cast<double>(r);
double db = static_cast<double>(b);
double dnir = static_cast<double>(nir);
- double dRB = dr - m_Gamma*(db - dr);
- double denominator = dRB + m_A*dnir - m_A*m_B + m_X*(1.+m_A*m_A);
- if ( vcl_abs(denominator) < this->m_EpsilonToBeConsideredAsZero )
- {
+ double dRB = dr - m_Gamma * (db - dr);
+ double denominator = dRB + m_A * dnir - m_A * m_B + m_X * (1. + m_A * m_A);
+ if (vcl_abs(denominator) < this->m_EpsilonToBeConsideredAsZero)
+ {
return static_cast<TOutput>(0.);
- }
- return ( static_cast<TOutput>( (m_A*(dnir - m_A*dRB - m_B))/denominator ) );
+ }
+ return (static_cast<TOutput>((m_A * (dnir - m_A * dRB - m_B)) / denominator));
}
private:
/** A and B parameters */
- double m_A;
- double m_B;
+ double m_A;
+ double m_B;
/** X parameter */
- double m_X;
+ double m_X;
/** Gamma parameter */
- double m_Gamma;
+ double m_Gamma;
};
@@ -894,17 +893,17 @@ private:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TInput3, class TOutput>
-class EVI : public RAndBAndNIRIndexBase<TInput1,TInput2,TInput3,TOutput>
+class EVI : public RAndBAndNIRIndexBase<TInput1, TInput2, TInput3, TOutput>
{
public:
- EVI() : m_G(2.5), m_C1(6.0), m_C2(7.5), m_L(1.0) {};
- virtual ~EVI() {};
+ EVI() : m_G(2.5), m_C1(6.0), m_C2(7.5), m_L(1.0) {}
+ virtual ~EVI() {}
/** Set/Get G parameter */
void SetG(const double g)
{
m_G = g;
}
- double GetG(void)const
+ double GetG(void) const
{
return (m_G);
}
@@ -913,7 +912,7 @@ public:
{
m_C1 = c1;
}
- double GetC1(void)const
+ double GetC1(void) const
{
return (m_C1);
}
@@ -922,7 +921,7 @@ public:
{
m_C2 = c2;
}
- double GetC2(void)const
+ double GetC2(void) const
{
return (m_C2);
}
@@ -931,37 +930,37 @@ public:
{
m_L = l;
}
- double GetL(void)const
+ double GetL(void) const
{
return (m_L);
}
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &b, const TInput3 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& b, const TInput3& nir) const
{
double dr = static_cast<double>(r);
double db = static_cast<double>(b);
double dnir = static_cast<double>(nir);
- double denominator = dnir + m_C1*dr - m_C2*db + m_L;
- if ( vcl_abs(denominator) < this->m_EpsilonToBeConsideredAsZero )
+ double denominator = dnir + m_C1 * dr - m_C2 * db + m_L;
+ if (vcl_abs(denominator) < this->m_EpsilonToBeConsideredAsZero)
{
- return ( static_cast<TOutput>(0.) );
+ return (static_cast<TOutput>(0.));
}
- return ( static_cast<TOutput>( m_G * (dnir - dr)/denominator ) );
+ return (static_cast<TOutput>(m_G * (dnir - dr) / denominator));
}
private:
/** Gain factor */
- double m_G;
+ double m_G;
/** Coefficient of the aerosol resistance term */
- double m_C1;
+ double m_C1;
/** Coefficient of the aerosol resistance term */
- double m_C2;
+ double m_C2;
/** Canopy background adjustment */
- double m_L;
+ double m_L;
};
/** \class IPVI
@@ -976,22 +975,22 @@ template <class TInput1, class TInput2, class TOutput>
class IPVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
- IPVI() {};
- virtual ~IPVI() {};
+ IPVI() {}
+ virtual ~IPVI() {}
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const
{
double dr = static_cast<double>(r);
double dnir = static_cast<double>(nir);
- if (vcl_abs(dnir + dr) < this->m_EpsilonToBeConsideredAsZero )
- {
+ if (vcl_abs(dnir + dr) < this->m_EpsilonToBeConsideredAsZero)
+ {
return static_cast<TOutput>(0.);
- }
+ }
else
- {
- return ( static_cast<TOutput>( dnir/(dnir+dr) ) );
- }
+ {
+ return (static_cast<TOutput>(dnir / (dnir + dr)));
+ }
}
};
@@ -1008,26 +1007,26 @@ class TNDVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
{
public:
typedef NDVI<TInput1, TInput2, TOutput> NDVIFunctorType;
- TNDVI() {};
- virtual ~TNDVI() {};
+ TNDVI() {}
+ virtual ~TNDVI() {}
- NDVIFunctorType GetNDVI(void)const
+ NDVIFunctorType GetNDVI(void) const
{
return (m_NDVIfunctor);
}
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &nir) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& nir) const
{
- double dval = this->GetNDVI()(r,nir) + 0.5;
- if(dval<0)
- {
- return ( static_cast<TOutput>(0));
- }
+ double dval = this->GetNDVI() (r, nir) + 0.5;
+ if (dval < 0)
+ {
+ return (static_cast<TOutput>(0));
+ }
else
- {
- return ( static_cast<TOutput>(vcl_sqrt(dval)));
- }
+ {
+ return (static_cast<TOutput>(vcl_sqrt(dval)));
+ }
}
private:
const NDVIFunctorType m_NDVIfunctor;
diff --git a/Code/Radiometry/otbWaterIndicesFunctor.h b/Code/Radiometry/otbWaterIndicesFunctor.h
index fc422b8dd6..5a74f5fa56 100644
--- a/Code/Radiometry/otbWaterIndicesFunctor.h
+++ b/Code/Radiometry/otbWaterIndicesFunctor.h
@@ -47,20 +47,20 @@ public:
typedef itk::VariableLengthVector<TInput1> InputVectorType;
// Operator on vector pixel type
- inline TOutput operator()(const InputVectorType & inputVector)
+ inline TOutput operator ()(const InputVectorType& inputVector)
{
- return this->Evaluate(inputVector[m_Index1-1],static_cast<TInput2>(inputVector[m_Index2-1]));
+ return this->Evaluate(inputVector[m_Index1 - 1], static_cast<TInput2>(inputVector[m_Index2 - 1]));
}
// Binary operator
- inline TOutput operator()(const TInput1 &id1, const TInput2 &id2)
+ inline TOutput operator ()(const TInput1& id1, const TInput2& id2)
{
- return this->Evaluate(id1,id2);
- };
+ return this->Evaluate(id1, id2);
+ }
/// Constructor
- WaterIndexBase() {};
+ WaterIndexBase() {}
/// Desctructor
- virtual ~WaterIndexBase() {};
+ virtual ~WaterIndexBase() {}
/// Set Index 1
void SetIndex1(unsigned int channel)
@@ -85,14 +85,13 @@ public:
protected:
// This method must be reimplemented in subclasses to actually
// compute the index value
- virtual TOutput Evaluate(const TInput1 & id1, const TInput2 & id2) const = 0;
+ virtual TOutput Evaluate(const TInput1& id1, const TInput2& id2) const = 0;
private:
unsigned int m_Index1;
unsigned int m_Index2;
};
-
/** \class WaterIndexFunctor
* \brief This functor will be used for most of water index functors.
*
@@ -103,23 +102,22 @@ template <class TInput1, class TInput2, class TOutput>
class WaterIndexFunctor : public WaterIndexBase<TInput1, TInput2, TOutput>
{
public:
- WaterIndexFunctor() {};
- virtual ~WaterIndexFunctor() {};
+ WaterIndexFunctor() {}
+ virtual ~WaterIndexFunctor() {}
protected:
- inline TOutput Evaluate(const TInput1 &id1, const TInput2 &id2) const
+ inline TOutput Evaluate(const TInput1& id1, const TInput2& id2) const
{
double dindex1 = static_cast<double>(id1);
double dindex2 = static_cast<double>(id2);
double ddenom = dindex1 + dindex2;
- if ( ddenom == 0 )
+ if (ddenom == 0)
{
return static_cast<TOutput>(0.);
}
- return ( static_cast<TOutput>((dindex1- dindex2)/ddenom));
+ return (static_cast<TOutput>((dindex1 - dindex2) / ddenom));
}
};
-
/** \class SRWI
* \brief This functor computes the Simple Ratio Water Index (SRWI)
* \brief For MODIS bands 860 & 1240
@@ -131,22 +129,21 @@ template <class TInput1, class TInput2, class TOutput>
class SRWI : public WaterIndexBase<TInput1, TInput2, TOutput>
{
public:
- SRWI() {};
- virtual ~SRWI() {};
+ SRWI() {}
+ virtual ~SRWI() {}
protected:
- inline TOutput Evaluate(const TInput1 &rho860, const TInput2 &rho1240) const
+ inline TOutput Evaluate(const TInput1& rho860, const TInput2& rho1240) const
{
double drho860 = static_cast<double>(rho860);
double drho1240 = static_cast<double>(rho1240);
- if ( drho1240 == 0 )
+ if (drho1240 == 0)
{
return static_cast<TOutput>(0.);
}
- return ( static_cast<TOutput>(drho860/drho1240) );
+ return (static_cast<TOutput>(drho860 / drho1240));
}
};
-
/** \class NDWI
* \brief This functor computes the Normalized Difference Water Index (NDWI)
* \brief Also called :
@@ -160,15 +157,15 @@ protected:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TOutput>
-class NDWI : public WaterIndexBase<TInput1,TInput2,TOutput>
+class NDWI : public WaterIndexBase<TInput1, TInput2, TOutput>
{
public:
typedef WaterIndexFunctor<TInput1, TInput2, TOutput> WIFunctorType;
/// Constructor
- NDWI() {};
+ NDWI() {}
/// Desctructor
- virtual ~NDWI() {};
- WIFunctorType GetWIFunctor(void)const
+ virtual ~NDWI() {}
+ WIFunctorType GetWIFunctor(void) const
{
return (m_WIFunctor);
}
@@ -194,16 +191,15 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1 &nir, const TInput2 &mir) const
+ inline TOutput Evaluate(const TInput1& nir, const TInput2& mir) const
{
- return ( static_cast<TOutput>(GetWIFunctor()(nir,mir)) );
+ return (static_cast<TOutput>(GetWIFunctor() (nir, mir)));
}
private:
// Water Index Classic Functor
const WIFunctorType m_WIFunctor;
};
-
/** \class NDWI2
* \brief This functor computes the Normalized Difference Water Index (NDWI2)
*
@@ -213,15 +209,15 @@ private:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TOutput>
-class NDWI2 : public WaterIndexBase<TInput1,TInput2,TOutput>
+class NDWI2 : public WaterIndexBase<TInput1, TInput2, TOutput>
{
public:
typedef WaterIndexFunctor<TInput1, TInput2, TOutput> WIFunctorType;
/// Constructor
- NDWI2() {};
+ NDWI2() {}
/// Desctructor
- virtual ~NDWI2() {};
- WIFunctorType GetWIFunctor(void)const
+ virtual ~NDWI2() {}
+ WIFunctorType GetWIFunctor(void) const
{
return (m_WIFunctor);
}
@@ -247,9 +243,9 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1 &g, const TInput2 &nir) const
+ inline TOutput Evaluate(const TInput1& g, const TInput2& nir) const
{
- return ( static_cast<TOutput>(GetWIFunctor()(g,nir)) );
+ return (static_cast<TOutput>(GetWIFunctor() (g, nir)));
}
private:
// Water Index Classic Functor
@@ -265,15 +261,15 @@ private:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TOutput>
-class MNDWI : public WaterIndexBase<TInput1,TInput2,TOutput>
+class MNDWI : public WaterIndexBase<TInput1, TInput2, TOutput>
{
public:
typedef WaterIndexFunctor<TInput1, TInput2, TOutput> WIFunctorType;
/// Constructor
- MNDWI() {};
+ MNDWI() {}
/// Desctructor
- virtual ~MNDWI() {};
- WIFunctorType GetWIFunctor(void)const
+ virtual ~MNDWI() {}
+ WIFunctorType GetWIFunctor(void) const
{
return (m_WIFunctor);
}
@@ -299,16 +295,15 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1 &g, const TInput2 &mir) const
+ inline TOutput Evaluate(const TInput1& g, const TInput2& mir) const
{
- return ( static_cast<TOutput>(GetWIFunctor()(g,mir)) );
+ return (static_cast<TOutput>(GetWIFunctor() (g, mir)));
}
private:
// Water Index Classic Functor
const WIFunctorType m_WIFunctor;
};
-
/** \class NDPI
* \brief This functor computes the Normalized Difference Pond Index (NDPI)
*
@@ -318,15 +313,15 @@ private:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TOutput>
-class NDPI : public WaterIndexBase<TInput1,TInput2,TOutput>
+class NDPI : public WaterIndexBase<TInput1, TInput2, TOutput>
{
public:
typedef WaterIndexFunctor<TInput1, TInput2, TOutput> WIFunctorType;
/// Constructor
- NDPI() {};
+ NDPI() {}
/// Desctructor
- virtual ~NDPI() {};
- WIFunctorType GetWIFunctor(void)const
+ virtual ~NDPI() {}
+ WIFunctorType GetWIFunctor(void) const
{
return (m_WIFunctor);
}
@@ -340,7 +335,7 @@ public:
{
return this->GetIndex1();
}
- /// Set Index G
+ /// Set Index G
void SetGIndex(unsigned int channel)
{
this->SetIndex2(channel);
@@ -352,16 +347,15 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1 &mir, const TInput2 &g) const
+ inline TOutput Evaluate(const TInput1& mir, const TInput2& g) const
{
- return ( static_cast<TOutput>(GetWIFunctor()(mir,g)) );
+ return (static_cast<TOutput>(GetWIFunctor() (mir, g)));
}
private:
// Water Index Classic Functor
const WIFunctorType m_WIFunctor;
};
-
/** \class NDTI
* \brief This functor computes the Normalized Difference Turbidity Index (NDTI)
*
@@ -371,15 +365,15 @@ private:
* \ingroup Radiometry
*/
template <class TInput1, class TInput2, class TOutput>
-class NDTI : public WaterIndexBase<TInput1,TInput2,TOutput>
+class NDTI : public WaterIndexBase<TInput1, TInput2, TOutput>
{
public:
typedef WaterIndexFunctor<TInput1, TInput2, TOutput> WIFunctorType;
/// Constructor
- NDTI() {};
+ NDTI() {}
/// Desctructor
- virtual ~NDTI() {};
- WIFunctorType GetWIFunctor(void)const
+ virtual ~NDTI() {}
+ WIFunctorType GetWIFunctor(void) const
{
return (m_WIFunctor);
}
@@ -393,7 +387,7 @@ public:
{
return this->GetIndex1();
}
- /// Set Index G
+ /// Set Index G
void SetGIndex(unsigned int channel)
{
this->SetIndex2(channel);
@@ -405,16 +399,15 @@ public:
}
protected:
- inline TOutput Evaluate(const TInput1 &r, const TInput2 &g) const
+ inline TOutput Evaluate(const TInput1& r, const TInput2& g) const
{
- return ( static_cast<TOutput>(GetWIFunctor()(r,g)) );
+ return (static_cast<TOutput>(GetWIFunctor() (r, g)));
}
private:
// Water Index Classic Functor
const WIFunctorType m_WIFunctor;
};
-
/** \class WaterSqrtSpectralAngleFunctor
* \brief This functor uses a spectral angle with a particular reference pixel.
*
@@ -422,15 +415,16 @@ private:
* \ingroup Functor
* \ingroup Radiometry
*/
-template <class TInputVectorPixel,class TOutputPixel>
-class WaterSqrtSpectralAngleFunctor : public SqrtSpectralAngleFunctor<TInputVectorPixel,TOutputPixel>
+template <class TInputVectorPixel, class TOutputPixel>
+class WaterSqrtSpectralAngleFunctor : public SqrtSpectralAngleFunctor<TInputVectorPixel, TOutputPixel>
{
public:
- typedef WaterSqrtSpectralAngleFunctor Self;
- typedef SqrtSpectralAngleFunctor<TInputVectorPixel,TOutputPixel> Superclass;
- typedef TInputVectorPixel InputVectorPixelType;
- WaterSqrtSpectralAngleFunctor() {
+ typedef WaterSqrtSpectralAngleFunctor Self;
+ typedef SqrtSpectralAngleFunctor<TInputVectorPixel, TOutputPixel> Superclass;
+ typedef TInputVectorPixel InputVectorPixelType;
+ WaterSqrtSpectralAngleFunctor()
+ {
//Set the channels indices
m_BlueChannel = 0;
@@ -442,20 +436,21 @@ public:
InputVectorPixelType reference;
reference.SetSize(4);
reference[0] = 136.0; reference[1] = 132.0; reference[2] = 47.0; reference[3] = 24.0;
- this->SetReferenceWaterPixel( reference );
- };
- virtual ~WaterSqrtSpectralAngleFunctor() {};
+ this->SetReferenceWaterPixel(reference);
+ }
+ virtual ~WaterSqrtSpectralAngleFunctor() {}
/** Set Reference Pixel */
void SetReferenceWaterPixel(InputVectorPixelType ref)
{
- if(ref.GetSize() != 4)
- {
- }
+ if (ref.GetSize() != 4)
+ {
+ }
InputVectorPixelType reference;
reference.SetSize(4);
- reference[m_BlueChannel] = ref[0]; reference[m_GreenChannel] = ref[1]; reference[m_RedChannel] = ref[2]; reference[m_NIRChannel] = ref[3];
- this->SetReferencePixel( reference );
+ reference[m_BlueChannel] = ref[0]; reference[m_GreenChannel] = ref[1]; reference[m_RedChannel] = ref[2];
+ reference[m_NIRChannel] = ref[3];
+ this->SetReferencePixel(reference);
}
@@ -506,9 +501,7 @@ protected:
int m_NIRChannel;
};
-
} // namespace Functor
} // namespace otb
#endif
-
diff --git a/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h b/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h
index 4026072144..9600e11e45 100644
--- a/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h
+++ b/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h
@@ -35,39 +35,37 @@ namespace otb
* \sa SpectralAngleDistanceImageFilter
*/
-template < class TInputVectorImage, class TOutputImage,
- class TFunction = Functor::WaterSqrtSpectralAngleFunctor <
- typename TInputVectorImage::PixelType,
- typename TOutputImage::PixelType > >
+template <class TInputVectorImage, class TOutputImage,
+ class TFunction = Functor::WaterSqrtSpectralAngleFunctor <
+ typename TInputVectorImage::PixelType,
+ typename TOutputImage::PixelType> >
class ITK_EXPORT WaterSqrtSpectralAngleImageFilter :
-public itk::UnaryFunctorImageFilter< TInputVectorImage, TOutputImage, TFunction >
+ public itk::UnaryFunctorImageFilter<TInputVectorImage, TOutputImage, TFunction>
{
public:
/** Standard class typedefs. */
- typedef WaterSqrtSpectralAngleImageFilter Self;
- typedef itk::UnaryFunctorImageFilter<TInputVectorImage,TOutputImage, TFunction> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef WaterSqrtSpectralAngleImageFilter Self;
+ typedef itk::UnaryFunctorImageFilter<TInputVectorImage, TOutputImage, TFunction> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(WaterSqrtSpectralAngleImageFilter,itk::UnaryFunctorImageFilter);
+ itkTypeMacro(WaterSqrtSpectralAngleImageFilter, itk::UnaryFunctorImageFilter);
/** Some convenient typedef. */
- typedef TInputVectorImage InputVectorImageType;
+ typedef TInputVectorImage InputVectorImageType;
typedef typename InputVectorImageType::PixelType InputVectorPixelType;
- typedef TOutputImage OutputImageType;
-
+ typedef TOutputImage OutputImageType;
protected:
WaterSqrtSpectralAngleImageFilter() {};
- ~WaterSqrtSpectralAngleImageFilter() {};
-
+ ~WaterSqrtSpectralAngleImageFilter() {}
private:
- WaterSqrtSpectralAngleImageFilter(Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ WaterSqrtSpectralAngleImageFilter(Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
};
} // end namespace otb
@@ -76,4 +74,3 @@ private:
#endif
#endif
-
diff --git a/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.h b/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.h
index a3e3b83135..858a9f3a43 100644
--- a/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.h
+++ b/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.h
@@ -35,20 +35,20 @@ namespace otb
*/
template <class TInputImage, class TOutputImage,
-class TFunction = Functor::PolarimetricSynthesisFunctor<
-typename TInputImage::InternalPixelType,
-typename TInputImage::InternalPixelType,
-typename TInputImage::InternalPixelType,
-typename TInputImage::InternalPixelType,
-typename TOutputImage::PixelType> >
-class ITK_EXPORT MultiChannelsPolarimetricSynthesisFilter : public itk::InPlaceImageFilter<TInputImage,TOutputImage>
+ class TFunction = Functor::PolarimetricSynthesisFunctor<
+ typename TInputImage::InternalPixelType,
+ typename TInputImage::InternalPixelType,
+ typename TInputImage::InternalPixelType,
+ typename TInputImage::InternalPixelType,
+ typename TOutputImage::PixelType> >
+class ITK_EXPORT MultiChannelsPolarimetricSynthesisFilter : public itk::InPlaceImageFilter<TInputImage, TOutputImage>
{
public:
/** Standard class typedefs. */
- typedef MultiChannelsPolarimetricSynthesisFilter Self;
- typedef itk::InPlaceImageFilter<TInputImage,TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef MultiChannelsPolarimetricSynthesisFilter Self;
+ typedef itk::InPlaceImageFilter<TInputImage, TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -57,20 +57,19 @@ public:
itkTypeMacro(MultiChannelsPolarimetricSynthesisFilter, InPlaceImageFilter);
/** Some typedefs. */
- typedef std::complex <double> InputPixelType;
- typedef TFunction FunctorType;
- typedef TInputImage InputImageType;
- typedef typename InputImageType::ConstPointer InputImagePointer;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename OutputImageType::PixelType OutputImagePixelType;
- typedef typename std::complex <double> ComplexType;
- typedef typename itk::FixedArray<ComplexType,2> ComplexArrayType;
- typedef typename itk::FixedArray<int,4> IndexArrayType;
-
+ typedef std::complex <double> InputPixelType;
+ typedef TFunction FunctorType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::ConstPointer InputImagePointer;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename OutputImageType::PixelType OutputImagePixelType;
+ typedef typename std::complex <double> ComplexType;
+ typedef typename itk::FixedArray<ComplexType, 2> ComplexArrayType;
+ typedef typename itk::FixedArray<int, 4> IndexArrayType;
/** Get the functor object. The functor is returned by reference.
* (Functors do not have to derive from itk::LightObject, so they do
@@ -79,12 +78,11 @@ public:
FunctorType& GetFunctor()
{
return m_Functor;
- };
+ }
const FunctorType& GetFunctor() const
{
return m_Functor;
- };
-
+ }
/** Set the functor object. This replaces the current Functor with a
* copy of the specified Functor. This allows the user to specify a
@@ -95,10 +93,10 @@ public:
void SetFunctor(const FunctorType& functor)
{
if (m_Functor != functor)
- {
+ {
m_Functor = functor;
this->Modified();
- }
+ }
}
/** Set the Incident ElectroMagneticField */
void SetEi(ComplexArrayType ei)
@@ -116,40 +114,39 @@ public:
}
/** Set/Get PsiI */
- itkSetMacro(PsiI,double);
- itkGetMacro(PsiI,double);
+ itkSetMacro(PsiI, double);
+ itkGetMacro(PsiI, double);
/** Set/Get KhiI */
- itkSetMacro(KhiI,double);
- itkGetMacro(KhiI,double);
+ itkSetMacro(KhiI, double);
+ itkGetMacro(KhiI, double);
/** Set/Get PsiR */
- itkSetMacro(PsiR,double);
- itkGetMacro(PsiR,double);
+ itkSetMacro(PsiR, double);
+ itkGetMacro(PsiR, double);
/** Set/Get KhiR */
- itkSetMacro(KhiR,double);
- itkGetMacro(KhiR,double);
+ itkSetMacro(KhiR, double);
+ itkGetMacro(KhiR, double);
/** Set/Get EmissionH */
- itkSetMacro(EmissionH,bool);
- itkGetMacro(EmissionH,bool);
+ itkSetMacro(EmissionH, bool);
+ itkGetMacro(EmissionH, bool);
/** Set/Get EmissionV */
- itkSetMacro(EmissionV,bool);
- itkGetMacro(EmissionV,bool);
+ itkSetMacro(EmissionV, bool);
+ itkGetMacro(EmissionV, bool);
/** Set/Get Mode */
- itkSetMacro(Mode,int);
- itkGetMacro(Mode,int);
+ itkSetMacro(Mode, int);
+ itkGetMacro(Mode, int);
/** Set the gain */
- itkSetMacro(Gain,double);
- itkGetMacro(Gain,double);
+ itkSetMacro(Gain, double);
+ itkGetMacro(Gain, double);
/** Force the copolar mode */
void ForceCoPolar();
/** Force the crosspolar mode */
void ForceCrossPolar();
-
protected:
/** Constructor */
MultiChannelsPolarimetricSynthesisFilter();
/** Destructor */
- virtual ~MultiChannelsPolarimetricSynthesisFilter() {};
+ virtual ~MultiChannelsPolarimetricSynthesisFilter() {}
/** MultiChannelsPolarimetricSynthesisFilter can produce an image
* which is a synthesis of channels HH, HV, VH and VV.
@@ -176,7 +173,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
/** Computation of the electromagnetic fields Ei Er */
void ComputeElectromagneticFields();
@@ -188,8 +185,8 @@ protected:
void Print();
-private :
- MultiChannelsPolarimetricSynthesisFilter(const Self&); //purposely not implemented
+private:
+ MultiChannelsPolarimetricSynthesisFilter(const Self &); //purposely not implemented
/** Psi Incident */
double m_PsiI;
diff --git a/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.txx b/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.txx
index 7cefec284e..e14d501baf 100644
--- a/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.txx
+++ b/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.txx
@@ -32,11 +32,11 @@ namespace otb
/**
* Constructor
*/
-template <class TInputImage, class TOutputImage, class TFunction >
-MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
+template <class TInputImage, class TOutputImage, class TFunction>
+MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFunction>
::MultiChannelsPolarimetricSynthesisFilter()
{
- this->SetNumberOfRequiredInputs( 1 );
+ this->SetNumberOfRequiredInputs(1);
this->InPlaceOff();
SetEmissionH(false);
SetEmissionV(false);
@@ -49,36 +49,36 @@ MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
*/
template <class TInputImage, class TOutputImage, class TFunction>
void
-MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
+MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFunction>
::GenerateOutputInformation()
{
// do not call the superclass' implementation of this method since
// this filter allows the input the output to be of different dimensions
// get pointers to the input and output
- typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
- typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
+ typename Superclass::OutputImagePointer outputPtr = this->GetOutput();
+ typename Superclass::InputImageConstPointer inputPtr = this->GetInput();
- if ( !outputPtr || !inputPtr)
- {
+ if (!outputPtr || !inputPtr)
+ {
return;
- }
+ }
// Set the output image largest possible region. Use a RegionCopier
// so that the input and output images can be different dimensions.
OutputImageRegionType outputLargestPossibleRegion;
this->CallCopyInputRegionToOutputRegion(outputLargestPossibleRegion,
inputPtr->GetLargestPossibleRegion());
- outputPtr->SetLargestPossibleRegion( outputLargestPossibleRegion );
+ outputPtr->SetLargestPossibleRegion(outputLargestPossibleRegion);
// Set the output spacing and origin
const itk::ImageBase<Superclass::InputImageDimension> *phyData;
phyData
- = dynamic_cast<const itk::ImageBase<Superclass::InputImageDimension>*>(this->GetInput());
+ = dynamic_cast<const itk::ImageBase<Superclass::InputImageDimension>*>(this->GetInput());
if (phyData)
- {
+ {
// Copy what we can from the image from spacing and origin of the input
// This logic needs to be augmented with logic that select which
// dimensions to copy
@@ -90,69 +90,68 @@ MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
const typename InputImageType::DirectionType&
inputDirection = inputPtr->GetDirection();
- typename OutputImageType::SpacingType outputSpacing;
- typename OutputImageType::PointType outputOrigin;
+ typename OutputImageType::SpacingType outputSpacing;
+ typename OutputImageType::PointType outputOrigin;
typename OutputImageType::DirectionType outputDirection;
// copy the input to the output and fill the rest of the
// output with zeros.
- for (i=0; i < Superclass::InputImageDimension; ++i)
- {
+ for (i = 0; i < Superclass::InputImageDimension; ++i)
+ {
outputSpacing[i] = inputSpacing[i];
outputOrigin[i] = inputOrigin[i];
- for (j=0; j < Superclass::OutputImageDimension; ++j)
- {
- if (j < Superclass::InputImageDimension)
+ for (j = 0; j < Superclass::OutputImageDimension; ++j)
{
+ if (j < Superclass::InputImageDimension)
+ {
outputDirection[j][i] = inputDirection[j][i];
- }
+ }
else
- {
+ {
outputDirection[j][i] = 0.0;
+ }
}
}
- }
for (; i < Superclass::OutputImageDimension; ++i)
- {
+ {
outputSpacing[i] = 1.0;
outputOrigin[i] = 0.0;
- for (j=0; j < Superclass::OutputImageDimension; ++j)
- {
- if (j == i)
+ for (j = 0; j < Superclass::OutputImageDimension; ++j)
{
+ if (j == i)
+ {
outputDirection[j][i] = 1.0;
- }
+ }
else
- {
+ {
outputDirection[j][i] = 0.0;
+ }
}
}
- }
// set the spacing and origin
- outputPtr->SetSpacing( outputSpacing );
- outputPtr->SetOrigin( outputOrigin );
- outputPtr->SetDirection( outputDirection );
+ outputPtr->SetSpacing(outputSpacing);
+ outputPtr->SetOrigin(outputOrigin);
+ outputPtr->SetDirection(outputDirection);
- }
+ }
else
- {
+ {
// pointer could not be cast back down
itkExceptionMacro(<< "otb::MultiChannelsPolarimetricSynthesisFilter::GenerateOutputInformation "
<< "cannot cast input to "
- << typeid(itk::ImageBase<Superclass::InputImageDimension>*).name() );
- }
+ << typeid(itk::ImageBase<Superclass::InputImageDimension>*).name());
+ }
}
-
/**
* ThreadedGenerateData Performs the pixel-wise addition
*/
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
-MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread,
- int threadId)
+MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFunction>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
+ int threadId)
{
InputImagePointer inputPtr = this->GetInput();
@@ -177,93 +176,93 @@ MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
// Computation with 4 channels
switch (val)
- {
- case HH_HV_VH_VV :
- while ( !inputIt.IsAtEnd() )
{
- outputIt.Set( m_Gain * GetFunctor()( inputIt.Get()[0], inputIt.Get()[1],
- inputIt.Get()[2], inputIt.Get()[3] ) );
+ case HH_HV_VH_VV:
+ while (!inputIt.IsAtEnd())
+ {
+ outputIt.Set(m_Gain * GetFunctor() (inputIt.Get()[0], inputIt.Get()[1],
+ inputIt.Get()[2], inputIt.Get()[3]));
++inputIt;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
break;
- // With 3 channels : HH HV VV ou HH VH VV
- case HH_HV_VV :
- while ( !inputIt.IsAtEnd() )
- {
- outputIt.Set( m_Gain * GetFunctor()( inputIt.Get()[0], inputIt.Get()[1],
- inputIt.Get()[1], inputIt.Get()[2] ) );
+ // With 3 channels : HH HV VV ou HH VH VV
+ case HH_HV_VV:
+ while (!inputIt.IsAtEnd())
+ {
+ outputIt.Set(m_Gain * GetFunctor() (inputIt.Get()[0], inputIt.Get()[1],
+ inputIt.Get()[1], inputIt.Get()[2]));
++inputIt;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
break;
- // Only HH and HV are present
- case HH_HV :
- while ( !inputIt.IsAtEnd() )
- {
- outputIt.Set( m_Gain * GetFunctor()( inputIt.Get()[0], inputIt.Get()[1], 0, 0 ) );
+ // Only HH and HV are present
+ case HH_HV:
+ while (!inputIt.IsAtEnd())
+ {
+ outputIt.Set(m_Gain * GetFunctor() (inputIt.Get()[0], inputIt.Get()[1], 0, 0));
++inputIt;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
break;
- // Only VH and VV are present
- case VH_VV :
- while ( !inputIt.IsAtEnd() )
- {
- outputIt.Set( m_Gain * GetFunctor()( 0, 0, inputIt.Get()[2], inputIt.Get()[3] ) );
+ // Only VH and VV are present
+ case VH_VV:
+ while (!inputIt.IsAtEnd())
+ {
+ outputIt.Set(m_Gain * GetFunctor() (0, 0, inputIt.Get()[2], inputIt.Get()[3]));
++inputIt;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
break;
- default :
+ default:
itkExceptionMacro("Unknown architecture : Polarimetric synthesis is impossible !");
return;
- }
+ }
}
/**
* Computation of the electromagnetic fields Ei Er
*/
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
-MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
+MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFunction>
::ComputeElectromagneticFields()
{
ComplexArrayType AEi, AEr;
/** Conversion coefficient Degre To Radian */
- double DTOR=CONST_PI_180;
- double real,imag;
+ double DTOR = CONST_PI_180;
+ double real, imag;
- real = vcl_cos(DTOR*m_PsiI)*vcl_cos(DTOR*m_KhiI);
- imag = -vcl_sin(DTOR*m_PsiI)*vcl_sin(DTOR*m_KhiI);
- ComplexType Ei0(real,imag);
+ real = vcl_cos(DTOR * m_PsiI) * vcl_cos(DTOR * m_KhiI);
+ imag = -vcl_sin(DTOR * m_PsiI) * vcl_sin(DTOR * m_KhiI);
+ ComplexType Ei0(real, imag);
- real = vcl_sin(DTOR*m_PsiI)*vcl_cos(DTOR*m_KhiI);
- imag = vcl_cos(DTOR*m_PsiI)*vcl_sin(DTOR*m_KhiI);
- ComplexType Ei1(real,imag);
+ real = vcl_sin(DTOR * m_PsiI) * vcl_cos(DTOR * m_KhiI);
+ imag = vcl_cos(DTOR * m_PsiI) * vcl_sin(DTOR * m_KhiI);
+ ComplexType Ei1(real, imag);
- real = vcl_cos(DTOR*m_PsiR)*vcl_cos(DTOR*m_KhiR);
- imag = -vcl_sin(DTOR*m_PsiR)*vcl_sin(DTOR*m_KhiR);
- ComplexType Er0(real,imag);
+ real = vcl_cos(DTOR * m_PsiR) * vcl_cos(DTOR * m_KhiR);
+ imag = -vcl_sin(DTOR * m_PsiR) * vcl_sin(DTOR * m_KhiR);
+ ComplexType Er0(real, imag);
- real = vcl_sin(DTOR*m_PsiR)*vcl_cos(DTOR*m_KhiR);
- imag = vcl_cos(DTOR*m_PsiR)*vcl_sin(DTOR*m_KhiR);
- ComplexType Er1(real,imag);
+ real = vcl_sin(DTOR * m_PsiR) * vcl_cos(DTOR * m_KhiR);
+ imag = vcl_cos(DTOR * m_PsiR) * vcl_sin(DTOR * m_KhiR);
+ ComplexType Er1(real, imag);
- AEi[0]=Ei0;
- AEi[1]=Ei1;
- AEr[0]=Er0;
- AEr[1]=Er1;
+ AEi[0] = Ei0;
+ AEi[1] = Ei1;
+ AEr[0] = Er0;
+ AEr[1] = Er1;
this->SetEi(AEi);
this->SetEr(AEr);
@@ -273,62 +272,62 @@ MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
/**
* Verify and force the inputs, if only 2 or 3 channels are present
*/
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
-MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
+MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFunction>
::VerifyAndForceInputs()
{
ArchitectureType val = m_ArchitectureType->GetArchitectureType();
switch (val)
- {
+ {
- case HH_HV_VH_VV :
+ case HH_HV_VH_VV:
break;
- case HH_HV_VV :
+ case HH_HV_VV:
break;
- case HH_VH_VV :
+ case HH_VH_VV:
break;
- // Only HH and HV are present
- case HH_HV :
+ // Only HH and HV are present
+ case HH_HV:
// Forcing KhiI=0 PsiI=0
this->SetKhiI(0);
this->SetPsiI(0);
break;
- // Only VH and VV are present
- case VH_VV :
+ // Only VH and VV are present
+ case VH_VV:
// Forcing KhiI=0 PsiI=90
this->SetKhiI(0);
this->SetPsiI(90);
break;
- default :
+ default:
itkExceptionMacro("Unknown architecture : Polarimetric synthesis is impossible !!");
return;
- }
+ }
- if (GetMode()==1)ForceCoPolar();
- else if (GetMode()==2)ForceCrossPolar();
+ if (GetMode() == 1) ForceCoPolar();
+ else if (GetMode() == 2) ForceCrossPolar();
}
/**
* BeforeThreadedGenerateData
*/
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
-MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
+MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFunction>
::BeforeThreadedGenerateData()
{
int NumberOfImages = this->GetInput()->GetNumberOfComponentsPerPixel();
// First Part. Determine the kind of architecture of the input picture
- m_ArchitectureType->DetermineArchitecture(NumberOfImages,GetEmissionH(),GetEmissionV());
+ m_ArchitectureType->DetermineArchitecture(NumberOfImages, GetEmissionH(), GetEmissionV());
// Second Part. Verify and force the inputs
VerifyAndForceInputs();
@@ -341,9 +340,9 @@ MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
/**
* Force Copolar mode
*/
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
-MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
+MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFunction>
::ForceCoPolar()
{
SetPsiR(m_PsiI);
@@ -353,12 +352,12 @@ MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
/**
* Force Crosspolar mode
*/
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
-MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
+MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFunction>
::ForceCrossPolar()
{
- SetPsiR(m_PsiI+90);
+ SetPsiR(m_PsiI + 90);
SetKhiR(-m_KhiI);
SetMode(2);
}
@@ -366,36 +365,36 @@ MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
/**
* Printself
*/
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
-MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
+MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFunction>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- this->Superclass::PrintSelf(os,indent);
+ this->Superclass::PrintSelf(os, indent);
}
/**
* Print
*/
-template <class TInputImage, class TOutputImage, class TFunction >
+template <class TInputImage, class TOutputImage, class TFunction>
void
-MultiChannelsPolarimetricSynthesisFilter<TInputImage,TOutputImage,TFunction>
+MultiChannelsPolarimetricSynthesisFilter<TInputImage, TOutputImage, TFunction>
::Print()
{
- std::cout<<"PsiI: "<<m_PsiI<<std::endl;
- std::cout<<"KhiI: "<<m_KhiI<<std::endl;
- std::cout<<"PsiR: "<<m_PsiR<<std::endl;
- std::cout<<"KhiR: "<<m_KhiR<<std::endl;
-
- std::cout<<"Ei0 im: "<<m_Ei[0].imag()<<std::endl;
- std::cout<<"Ei0 re: "<<m_Ei[0].real()<<std::endl;
- std::cout<<"Ei1 im: "<<m_Ei[1].imag()<<std::endl;
- std::cout<<"Ei1 re: "<<m_Ei[1].real()<<std::endl;
-
- std::cout<<"Er0 im: "<<m_Er[0].imag()<<std::endl;
- std::cout<<"Er0 re: "<<m_Er[0].real()<<std::endl;
- std::cout<<"Er1 im: "<<m_Er[1].imag()<<std::endl;
- std::cout<<"Er1 re: "<<m_Er[1].real()<<std::endl;
+ std::cout << "PsiI: " << m_PsiI << std::endl;
+ std::cout << "KhiI: " << m_KhiI << std::endl;
+ std::cout << "PsiR: " << m_PsiR << std::endl;
+ std::cout << "KhiR: " << m_KhiR << std::endl;
+
+ std::cout << "Ei0 im: " << m_Ei[0].imag() << std::endl;
+ std::cout << "Ei0 re: " << m_Ei[0].real() << std::endl;
+ std::cout << "Ei1 im: " << m_Ei[1].imag() << std::endl;
+ std::cout << "Ei1 re: " << m_Ei[1].real() << std::endl;
+
+ std::cout << "Er0 im: " << m_Er[0].imag() << std::endl;
+ std::cout << "Er0 re: " << m_Er[0].real() << std::endl;
+ std::cout << "Er1 im: " << m_Er[1].imag() << std::endl;
+ std::cout << "Er1 re: " << m_Er[1].real() << std::endl;
}
} // end namespace otb
diff --git a/Code/SARPolarimetry/otbPolarimetricData.cxx b/Code/SARPolarimetry/otbPolarimetricData.cxx
index caca38e561..bbc5834714 100644
--- a/Code/SARPolarimetry/otbPolarimetricData.cxx
+++ b/Code/SARPolarimetry/otbPolarimetricData.cxx
@@ -17,7 +17,6 @@
=========================================================================*/
#include "otbPolarimetricData.h"
-
namespace otb
{
/**
@@ -35,54 +34,54 @@ PolarimetricData
{
// With all the channels
- if ( IsPresent[0] && IsPresent[1] && IsPresent[2] && IsPresent[3] )
- {
+ if (IsPresent[0] && IsPresent[1] && IsPresent[2] && IsPresent[3])
+ {
SetArchitectureType(HH_HV_VH_VV);
- }
+ }
else
- // With 3 channels : HH HV VV
- if ( IsPresent[0] && IsPresent[1] && !IsPresent[2] && IsPresent[3] )
+ // With 3 channels : HH HV VV
+ if (IsPresent[0] && IsPresent[1] && !IsPresent[2] && IsPresent[3])
{
- SetArchitectureType(HH_HV_VV);
+ SetArchitectureType(HH_HV_VV);
+ }
+ else
+ // With 3 channels : HH VH VV
+ if (IsPresent[0] && !IsPresent[1] && IsPresent[2] && IsPresent[3])
+ {
+ SetArchitectureType(HH_VH_VV);
+ }
+ else
+ // Only HH and HV are present
+ if (IsPresent[0] && IsPresent[1] && !IsPresent[2] && !IsPresent[3])
+ {
+ SetArchitectureType(HH_HV);
+ }
+ else
+ // Only VH and VV are present
+ if (!IsPresent[0] && !IsPresent[1] && IsPresent[2] && IsPresent[3])
+ {
+ SetArchitectureType(VH_VV);
+ }
+ else
+ // Only HH and VV are present
+ if (IsPresent[0] && !IsPresent[1] && !IsPresent[2] && IsPresent[3])
+ {
+ SetArchitectureType(HH_VV);
+ }
+ else
+ {
+ SetArchitectureType(UNKNOWN);
}
- else
- // With 3 channels : HH VH VV
- if ( IsPresent[0] && !IsPresent[1] && IsPresent[2] && IsPresent[3] )
- {
- SetArchitectureType(HH_VH_VV);
- }
- else
- // Only HH and HV are present
- if ( IsPresent[0] && IsPresent[1] && !IsPresent[2] && !IsPresent[3] )
- {
- SetArchitectureType(HH_HV);
- }
- else
- // Only VH and VV are present
- if ( !IsPresent[0] && !IsPresent[1] && IsPresent[2] && IsPresent[3] )
- {
- SetArchitectureType(VH_VV);
- }
- else
- // Only HH and VV are present
- if ( IsPresent[0] && !IsPresent[1] && !IsPresent[2] && IsPresent[3] )
- {
- SetArchitectureType(HH_VV);
- }
- else
- {
- SetArchitectureType(UNKNOWN);
- }
}
void
PolarimetricData
-::DetermineArchitecture(int NumberOfImages, bool EmissionH,bool EmissionV)
+::DetermineArchitecture(int NumberOfImages, bool EmissionH, bool EmissionV)
{
switch (NumberOfImages)
- {
- case 4 :
+ {
+ case 4:
SetArchitectureType(HH_HV_VH_VV);
break;
@@ -90,31 +89,30 @@ PolarimetricData
SetArchitectureType(HH_HV_VV);
break;
- case 2 :
+ case 2:
- if (EmissionH && !EmissionV )
- {
+ if (EmissionH && !EmissionV)
+ {
SetArchitectureType(HH_HV);
- }
- else if (!EmissionH && EmissionV )
- {
+ }
+ else if (!EmissionH && EmissionV)
+ {
SetArchitectureType(VH_VV);
- }
+ }
break;
default:
itkExceptionMacro("Unknown architecture !");
return;
- }
+ }
}
-
/**PrintSelf method */
void
PolarimetricData
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- os << indent << "ArchitectureType "<< m_ArchitectureType<< " : "<< std::endl;
+ os << indent << "ArchitectureType " << m_ArchitectureType << " : " << std::endl;
}
} // end namespace otb
diff --git a/Code/SARPolarimetry/otbPolarimetricData.h b/Code/SARPolarimetry/otbPolarimetricData.h
index 8cfb7b72ca..c65559b3cc 100644
--- a/Code/SARPolarimetry/otbPolarimetricData.h
+++ b/Code/SARPolarimetry/otbPolarimetricData.h
@@ -28,16 +28,15 @@ namespace otb
* This enumeration describes the different architectures we can find in polarimetry.
*/
typedef enum
-{
- HH_HV_VH_VV=0,
- HH_HV_VV=1,
- HH_VH_VV=2,
- HH_HV=3,
- VH_VV=4,
- HH_VV=5,
- UNKNOWN=6
-} ArchitectureType;
-
+ {
+ HH_HV_VH_VV = 0,
+ HH_HV_VV = 1,
+ HH_VH_VV = 2,
+ HH_HV = 3,
+ VH_VV = 4,
+ HH_VV = 5,
+ UNKNOWN = 6
+ } ArchitectureType;
/** \class PolarimetricData
* \brief This class allows to determine the type of architecture we get.
@@ -51,37 +50,36 @@ class ITK_EXPORT PolarimetricData : public itk::DataObject
public:
/** Standard typedefs */
- typedef PolarimetricData Self;
- typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PolarimetricData Self;
+ typedef itk::DataObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
- itkTypeMacro(PolarimetricData,DataObject);
+ itkTypeMacro(PolarimetricData, DataObject);
/** Creation through object factory macro */
itkNewMacro(Self);
/** Determine the kind of architecture of the input */
void DetermineArchitecture(bool *PresentInputImages);
- void DetermineArchitecture(int NumberOfImages, bool EmissionH,bool EmissionV);
+ void DetermineArchitecture(int NumberOfImages, bool EmissionH, bool EmissionV);
/** Set/Get ArchitectureType */
- itkSetMacro(ArchitectureType,ArchitectureType);
- itkGetMacro(ArchitectureType,ArchitectureType);
+ itkSetMacro(ArchitectureType, ArchitectureType);
+ itkGetMacro(ArchitectureType, ArchitectureType);
protected:
/** Constructor */
PolarimetricData();
/** Destructor */
- ~PolarimetricData() {};
+ ~PolarimetricData() {}
/**PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
-
private:
- PolarimetricData(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PolarimetricData(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Architecture Type */
ArchitectureType m_ArchitectureType;
diff --git a/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.h b/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.h
index 084b3ad7eb..dcc2816a94 100644
--- a/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.h
+++ b/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.h
@@ -56,71 +56,73 @@ namespace otb
*
*/
-template <class TInputImageHH,class TInputImageHV,class TInputImageVH,class TInputImageVV,class TOutputImage,
-class TFunction = Functor::PolarimetricSynthesisFunctor<
-typename TInputImageHH::PixelType,
-typename TInputImageHV::PixelType,
-typename TInputImageVH::PixelType,
-typename TInputImageVV::PixelType,
-typename TOutputImage::PixelType > >
-class ITK_EXPORT PolarimetricSynthesisFilter : public otb::QuaternaryFunctorImageFilter< TInputImageHH,
- TInputImageHV, TInputImageVH, TInputImageVV, TOutputImage, TFunction >
+template <class TInputImageHH, class TInputImageHV, class TInputImageVH, class TInputImageVV, class TOutputImage,
+ class TFunction = Functor::PolarimetricSynthesisFunctor<
+ typename TInputImageHH::PixelType,
+ typename TInputImageHV::PixelType,
+ typename TInputImageVH::PixelType,
+ typename TInputImageVV::PixelType,
+ typename TOutputImage::PixelType> >
+class ITK_EXPORT PolarimetricSynthesisFilter : public otb::QuaternaryFunctorImageFilter<TInputImageHH,
+ TInputImageHV, TInputImageVH,
+ TInputImageVV, TOutputImage,
+ TFunction>
{
public:
/** Standard typedefs */
- typedef PolarimetricSynthesisFilter Self;
- typedef otb::QuaternaryFunctorImageFilter< TInputImageHH, TInputImageHV,
- TInputImageVH, TInputImageVV, TOutputImage, TFunction > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PolarimetricSynthesisFilter Self;
+ typedef otb::QuaternaryFunctorImageFilter<TInputImageHH, TInputImageHV,
+ TInputImageVH, TInputImageVV, TOutputImage, TFunction> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(PolarimetricSynthesisFilter,QuaternaryFunctorImageFilter);
+ itkTypeMacro(PolarimetricSynthesisFilter, QuaternaryFunctorImageFilter);
/** Template parameters typedefs */
- typedef std::complex <double> InputPixelType;
- typedef otb::Image< InputPixelType, 2 > InputImageType;
- typedef typename Superclass::Input1ImageType HHInputImageType;
- typedef typename Superclass::Input1ImagePointer HHInputImagePointer;
- typedef typename Superclass::Input2ImageType HVInputImageType;
- typedef typename Superclass::Input2ImagePointer HVInputImagePointer;
- typedef typename Superclass::Input3ImageType VHInputImageType;
- typedef typename Superclass::Input3ImagePointer VHInputImagePointer;
- typedef typename Superclass::Input4ImageType VVInputImageType;
- typedef typename Superclass::Input4ImagePointer VVInputImagePointer;
- typedef typename Superclass::OutputImageType OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointer;
- typedef typename OutputImageType::RegionType OutputImageRegionType;
- typedef typename Superclass::FunctorType FunctorType;
- typedef typename std::complex <double> ComplexType;
- typedef typename itk::FixedArray<ComplexType,2> ComplexArrayType;
-
- void SetInputHH( const TInputImageHH * image );
- void SetInputHV( const TInputImageHV * image );
- void SetInputVH( const TInputImageVH * image );
- void SetInputVV( const TInputImageVV * image );
+ typedef std::complex <double> InputPixelType;
+ typedef otb::Image<InputPixelType, 2> InputImageType;
+ typedef typename Superclass::Input1ImageType HHInputImageType;
+ typedef typename Superclass::Input1ImagePointer HHInputImagePointer;
+ typedef typename Superclass::Input2ImageType HVInputImageType;
+ typedef typename Superclass::Input2ImagePointer HVInputImagePointer;
+ typedef typename Superclass::Input3ImageType VHInputImageType;
+ typedef typename Superclass::Input3ImagePointer VHInputImagePointer;
+ typedef typename Superclass::Input4ImageType VVInputImageType;
+ typedef typename Superclass::Input4ImagePointer VVInputImagePointer;
+ typedef typename Superclass::OutputImageType OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointer;
+ typedef typename OutputImageType::RegionType OutputImageRegionType;
+ typedef typename Superclass::FunctorType FunctorType;
+ typedef typename std::complex <double> ComplexType;
+ typedef typename itk::FixedArray<ComplexType, 2> ComplexArrayType;
+
+ void SetInputHH(const TInputImageHH * image);
+ void SetInputHV(const TInputImageHV * image);
+ void SetInputVH(const TInputImageVH * image);
+ void SetInputVV(const TInputImageVV * image);
/** Set/Get PsiI */
- itkSetMacro(PsiI,double);
- itkGetMacro(PsiI,double);
+ itkSetMacro(PsiI, double);
+ itkGetMacro(PsiI, double);
/** Set/Get KhiI */
- itkSetMacro(KhiI,double);
- itkGetMacro(KhiI,double);
+ itkSetMacro(KhiI, double);
+ itkGetMacro(KhiI, double);
/** Set/Get PsiR */
- itkSetMacro(PsiR,double);
- itkGetMacro(PsiR,double);
+ itkSetMacro(PsiR, double);
+ itkGetMacro(PsiR, double);
/** Set/Get KhiR */
- itkSetMacro(KhiR,double);
- itkGetMacro(KhiR,double);
+ itkSetMacro(KhiR, double);
+ itkGetMacro(KhiR, double);
/** Set/Get Mode */
- itkSetMacro(Mode,int);
- itkGetMacro(Mode,int);
+ itkSetMacro(Mode, int);
+ itkGetMacro(Mode, int);
/** Set the gain */
- itkSetMacro(Gain,double);
+ itkSetMacro(Gain, double);
/** Set the ElectroMagneticField Incident */
void SetEi(ComplexArrayType ei)
{
@@ -144,7 +146,7 @@ protected:
/** Constructor */
PolarimetricSynthesisFilter();
/** Destructor */
- virtual ~PolarimetricSynthesisFilter() {};
+ virtual ~PolarimetricSynthesisFilter() {}
virtual void GenerateOutputInformation();
@@ -157,7 +159,7 @@ protected:
* \sa ImageToImageFilter::ThreadedGenerateData(),
* ImageToImageFilter::GenerateData() */
virtual void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
- int threadId );
+ int threadId);
/** Computation of the electromagnetic fields Ei Er */
void ComputeElectromagneticFields();
@@ -169,8 +171,8 @@ protected:
private:
- PolarimetricSynthesisFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ PolarimetricSynthesisFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Psi Incident */
double m_PsiI;
@@ -194,7 +196,7 @@ private:
/** Architecture Type */
PolarimetricData::Pointer m_ArchitectureType;
- bool m_PresentInputImages[4];
+ bool m_PresentInputImages[4];
};
@@ -204,5 +206,4 @@ private:
#include "otbPolarimetricSynthesisFilter.txx"
#endif
-
#endif
diff --git a/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.txx b/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.txx
index db4c458f81..45bf710bae 100644
--- a/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.txx
+++ b/Code/SARPolarimetry/otbPolarimetricSynthesisFilter.txx
@@ -27,8 +27,9 @@ namespace otb
/**
* Constructor
*/
-template <class TInputImageHH,class TInputImageHV,class TInputImageVH,class TInputImageVV,class TOutputImage,class TFunction >
-PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImageVV,TOutputImage,TFunction>
+template <class TInputImageHH, class TInputImageHV, class TInputImageVH, class TInputImageVV, class TOutputImage,
+ class TFunction>
+PolarimetricSynthesisFilter<TInputImageHH, TInputImageHV, TInputImageVH, TInputImageVV, TOutputImage, TFunction>
::PolarimetricSynthesisFilter()
{
this->SetNumberOfRequiredInputs(0);
@@ -42,108 +43,115 @@ PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImag
m_ArchitectureType = PolarimetricData::New();
}
-template <class TInputImageHH,class TInputImageHV,class TInputImageVH,class TInputImageVV,class TOutputImage,class TFunction >
+template <class TInputImageHH, class TInputImageHV, class TInputImageVH, class TInputImageVV, class TOutputImage,
+ class TFunction>
void
-PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImageVV,TOutputImage,TFunction>
+PolarimetricSynthesisFilter<TInputImageHH, TInputImageHV, TInputImageVH, TInputImageVV, TOutputImage, TFunction>
::GenerateOutputInformation()
{
// if HH is set, use HH to generate output information
if (m_PresentInputImages[0])
- {
+ {
this->GetOutput()->CopyInformation(this->GetInput(0));
- }
+ }
// else, use VH
else if (m_PresentInputImages[2])
- {
+ {
this->GetOutput()->CopyInformation(this->GetInput(2));
- }
+ }
else
- {
- itkExceptionMacro(<<"Bad input polarization images: neither HH image nor VH image is set!");
- }
+ {
+ itkExceptionMacro(<< "Bad input polarization images: neither HH image nor VH image is set!");
+ }
}
/**
* Connect one of the operands for pixel-wise addition
*/
-template <class TInputImageHH,class TInputImageHV,class TInputImageVH,class TInputImageVV,class TOutputImage,class TFunction >
+template <class TInputImageHH, class TInputImageHV, class TInputImageVH, class TInputImageVV, class TOutputImage,
+ class TFunction>
void
-PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImageVV,TOutputImage,TFunction>
-::SetInputHH( const TInputImageHH * image )
+PolarimetricSynthesisFilter<TInputImageHH, TInputImageHV, TInputImageVH, TInputImageVV, TOutputImage, TFunction>
+::SetInputHH(const TInputImageHH * image)
{
// Process object is not const-correct so the const casting is required.
- SetInput1( image );
- m_PresentInputImages[0]=true;
+ SetInput1(image);
+ m_PresentInputImages[0] = true;
}
/**
* Connect one of the operands for pixel-wise addition
*/
-template <class TInputImageHH,class TInputImageHV,class TInputImageVH,class TInputImageVV,class TOutputImage,class TFunction >
+template <class TInputImageHH, class TInputImageHV, class TInputImageVH, class TInputImageVV, class TOutputImage,
+ class TFunction>
void
-PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImageVV,TOutputImage,TFunction>
-::SetInputHV( const TInputImageHV * image )
+PolarimetricSynthesisFilter<TInputImageHH, TInputImageHV, TInputImageVH, TInputImageVV, TOutputImage, TFunction>
+::SetInputHV(const TInputImageHV * image)
{
- SetInput2( image );
- m_PresentInputImages[1]=true;
+ SetInput2(image);
+ m_PresentInputImages[1] = true;
}
/**
* Connect one of the operands for pixel-wise addition
*/
-template <class TInputImageHH,class TInputImageHV,class TInputImageVH,class TInputImageVV,class TOutputImage,class TFunction >
+template <class TInputImageHH, class TInputImageHV, class TInputImageVH, class TInputImageVV, class TOutputImage,
+ class TFunction>
void
-PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImageVV,TOutputImage,TFunction>
-::SetInputVH( const TInputImageVH * image )
+PolarimetricSynthesisFilter<TInputImageHH, TInputImageHV, TInputImageVH, TInputImageVV, TOutputImage, TFunction>
+::SetInputVH(const TInputImageVH * image)
{
- SetInput3( image );
- m_PresentInputImages[2]=true;
+ SetInput3(image);
+ m_PresentInputImages[2] = true;
}
/**
* Connect one of the operands for pixel-wise addition
*/
-template <class TInputImageHH,class TInputImageHV,class TInputImageVH,class TInputImageVV,class TOutputImage,class TFunction >
+template <class TInputImageHH, class TInputImageHV, class TInputImageVH, class TInputImageVV, class TOutputImage,
+ class TFunction>
void
-PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImageVV,TOutputImage,TFunction>
-::SetInputVV( const TInputImageVV * image )
+PolarimetricSynthesisFilter<TInputImageHH, TInputImageHV, TInputImageVH, TInputImageVV, TOutputImage, TFunction>
+::SetInputVV(const TInputImageVV * image)
{
- SetInput4( image );
- m_PresentInputImages[3]=true;
+ SetInput4(image);
+ m_PresentInputImages[3] = true;
}
/**
* Printself
*/
-template <class TInputImageHH,class TInputImageHV,class TInputImageVH,class TInputImageVV,class TOutputImage,class TFunction >
+template <class TInputImageHH, class TInputImageHV, class TInputImageVH, class TInputImageVV, class TOutputImage,
+ class TFunction>
void
-PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImageVV,TOutputImage,TFunction>
+PolarimetricSynthesisFilter<TInputImageHH, TInputImageHV, TInputImageVH, TInputImageVV, TOutputImage, TFunction>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
-
- os<<"PsiI: "<<m_PsiI<<std::endl;
- os<<"KhiI: "<<m_KhiI<<std::endl;
- os<<"PsiR: "<<m_PsiR<<std::endl;
- os<<"KhiR: "<<m_KhiR<<std::endl;
-
- os<<"Ei0 im: "<<m_Ei[0].imag()<<std::endl;
- os<<"Ei0 re: "<<m_Ei[0].real()<<std::endl;
- os<<"Ei1 im: "<<m_Ei[1].imag()<<std::endl;
- os<<"Ei1 re: "<<m_Ei[1].real()<<std::endl;
-
- os<<"Er0 im: "<<m_Er[0].imag()<<std::endl;
- os<<"Er0 re: "<<m_Er[0].real()<<std::endl;
- os<<"Er1 im: "<<m_Er[1].imag()<<std::endl;
- os<<"Er1 re: "<<m_Er[1].real()<<std::endl;
+ Superclass::PrintSelf(os, indent);
+
+ os << "PsiI: " << m_PsiI << std::endl;
+ os << "KhiI: " << m_KhiI << std::endl;
+ os << "PsiR: " << m_PsiR << std::endl;
+ os << "KhiR: " << m_KhiR << std::endl;
+
+ os << "Ei0 im: " << m_Ei[0].imag() << std::endl;
+ os << "Ei0 re: " << m_Ei[0].real() << std::endl;
+ os << "Ei1 im: " << m_Ei[1].imag() << std::endl;
+ os << "Ei1 re: " << m_Ei[1].real() << std::endl;
+
+ os << "Er0 im: " << m_Er[0].imag() << std::endl;
+ os << "Er0 re: " << m_Er[0].real() << std::endl;
+ os << "Er1 im: " << m_Er[1].imag() << std::endl;
+ os << "Er1 re: " << m_Er[1].real() << std::endl;
}
/**
* Force Copolar mode
*/
-template <class TInputImageHH,class TInputImageHV,class TInputImageVH,class TInputImageVV,class TOutputImage,class TFunction >
+template <class TInputImageHH, class TInputImageHV, class TInputImageVH, class TInputImageVV, class TOutputImage,
+ class TFunction>
void
-PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImageVV,TOutputImage,TFunction>
+PolarimetricSynthesisFilter<TInputImageHH, TInputImageHV, TInputImageVH, TInputImageVV, TOutputImage, TFunction>
::ForceCoPolar()
{
SetPsiR(m_PsiI);
@@ -154,12 +162,13 @@ PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImag
/**
* Force Crosspolar mode
*/
-template <class TInputImageHH,class TInputImageHV,class TInputImageVH,class TInputImageVV,class TOutputImage,class TFunction >
+template <class TInputImageHH, class TInputImageHV, class TInputImageVH, class TInputImageVV, class TOutputImage,
+ class TFunction>
void
-PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImageVV,TOutputImage,TFunction>
+PolarimetricSynthesisFilter<TInputImageHH, TInputImageHV, TInputImageVH, TInputImageVV, TOutputImage, TFunction>
::ForceCrossPolar()
{
- SetPsiR(m_PsiI+90);
+ SetPsiR(m_PsiI + 90);
SetKhiR(-m_KhiI);
SetMode(2);
}
@@ -167,78 +176,80 @@ PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImag
/**
* Verify and force the inputs, if only 2 or 3 channels are present. Determine the kind of architecture.
*/
-template <class TInputImageHH,class TInputImageHV,class TInputImageVH,class TInputImageVV,class TOutputImage,class TFunction >
+template <class TInputImageHH, class TInputImageHV, class TInputImageVH, class TInputImageVV, class TOutputImage,
+ class TFunction>
void
-PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImageVV,TOutputImage,TFunction>
+PolarimetricSynthesisFilter<TInputImageHH, TInputImageHV, TInputImageVH, TInputImageVV, TOutputImage, TFunction>
::VerifyAndForceInputs()
{
switch (m_ArchitectureType->GetArchitectureType())
- {
- case HH_HV :
+ {
+ case HH_HV:
// Forcing KhiI=0 PsiI=0
this->SetKhiI(0);
this->SetPsiI(0);
break;
- case VH_VV :
+ case VH_VV:
// Forcing KhiI=0 PsiI=90
this->SetKhiI(0);
this->SetPsiI(90);
break;
- case HH_VV :
+ case HH_VV:
itkExceptionMacro("Only the HH and VV channels are available : Polarimetric synthesis is not supported !");
return;
- case UNKNOWN :
+ case UNKNOWN:
itkExceptionMacro("Unknown architecture : Polarimetric synthesis is impossible !");
return;
- default :
+ default:
break;
- }
+ }
- if (GetMode()==1)ForceCoPolar();
- else if (GetMode()==2)ForceCrossPolar();
+ if (GetMode() == 1) ForceCoPolar();
+ else if (GetMode() == 2) ForceCrossPolar();
}
/**
* Computation of the electromagnetic fields Ei Er
*/
-template <class TInputImageHH,class TInputImageHV,class TInputImageVH,class TInputImageVV,class TOutputImage,class TFunction >
+template <class TInputImageHH, class TInputImageHV, class TInputImageVH, class TInputImageVV, class TOutputImage,
+ class TFunction>
void
-PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImageVV,TOutputImage,TFunction>
+PolarimetricSynthesisFilter<TInputImageHH, TInputImageHV, TInputImageVH, TInputImageVV, TOutputImage, TFunction>
::ComputeElectromagneticFields()
{
ComplexArrayType AEi, AEr;
/** Conversion coefficient Degre To Radian */
- double DTOR=CONST_PI_180;
- double real,imag;
+ double DTOR = CONST_PI_180;
+ double real, imag;
- real = vcl_cos(DTOR*m_PsiI)*vcl_cos(DTOR*m_KhiI);
- imag = -vcl_sin(DTOR*m_PsiI)*vcl_sin(DTOR*m_KhiI);
- ComplexType Ei0(real,imag);
+ real = vcl_cos(DTOR * m_PsiI) * vcl_cos(DTOR * m_KhiI);
+ imag = -vcl_sin(DTOR * m_PsiI) * vcl_sin(DTOR * m_KhiI);
+ ComplexType Ei0(real, imag);
- real = vcl_sin(DTOR*m_PsiI)*vcl_cos(DTOR*m_KhiI);
- imag = vcl_cos(DTOR*m_PsiI)*vcl_sin(DTOR*m_KhiI);
- ComplexType Ei1(real,imag);
+ real = vcl_sin(DTOR * m_PsiI) * vcl_cos(DTOR * m_KhiI);
+ imag = vcl_cos(DTOR * m_PsiI) * vcl_sin(DTOR * m_KhiI);
+ ComplexType Ei1(real, imag);
- real = vcl_cos(DTOR*m_PsiR)*vcl_cos(DTOR*m_KhiR);
- imag = -vcl_sin(DTOR*m_PsiR)*vcl_sin(DTOR*m_KhiR);
- ComplexType Er0(real,imag);
+ real = vcl_cos(DTOR * m_PsiR) * vcl_cos(DTOR * m_KhiR);
+ imag = -vcl_sin(DTOR * m_PsiR) * vcl_sin(DTOR * m_KhiR);
+ ComplexType Er0(real, imag);
- real = vcl_sin(DTOR*m_PsiR)*vcl_cos(DTOR*m_KhiR);
- imag = vcl_cos(DTOR*m_PsiR)*vcl_sin(DTOR*m_KhiR);
- ComplexType Er1(real,imag);
+ real = vcl_sin(DTOR * m_PsiR) * vcl_cos(DTOR * m_KhiR);
+ imag = vcl_cos(DTOR * m_PsiR) * vcl_sin(DTOR * m_KhiR);
+ ComplexType Er1(real, imag);
- AEi[0]=Ei0;
- AEi[1]=Ei1;
- AEr[0]=Er0;
- AEr[1]=Er1;
+ AEi[0] = Ei0;
+ AEi[1] = Ei1;
+ AEr[0] = Er0;
+ AEr[1] = Er1;
this->SetEi(AEi);
this->SetEr(AEr);
@@ -248,9 +259,10 @@ PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImag
/**
* BeforeThreadedGenerateData
*/
-template <class TInputImageHH,class TInputImageHV,class TInputImageVH,class TInputImageVV,class TOutputImage,class TFunction >
+template <class TInputImageHH, class TInputImageHV, class TInputImageVH, class TInputImageVV, class TOutputImage,
+ class TFunction>
void
-PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImageVV,TOutputImage,TFunction>
+PolarimetricSynthesisFilter<TInputImageHH, TInputImageHV, TInputImageVH, TInputImageVV, TOutputImage, TFunction>
::BeforeThreadedGenerateData()
{
@@ -268,11 +280,12 @@ PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImag
/**
* ThreadedGenerateData function. Performs the pixel-wise addition
*/
-template <class TInputImageHH,class TInputImageHV,class TInputImageVH,class TInputImageVV,class TOutputImage,class TFunction >
+template <class TInputImageHH, class TInputImageHV, class TInputImageVH, class TInputImageVV, class TOutputImage,
+ class TFunction>
void
-PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImageVV,TOutputImage,TFunction>
-::ThreadedGenerateData( const OutputImageRegionType &outputRegionForThread,
- int threadId)
+PolarimetricSynthesisFilter<TInputImageHH, TInputImageHV, TInputImageVH, TInputImageVV, TOutputImage, TFunction>
+::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
+ int threadId)
{
OutputImagePointer outputPtr = this->GetOutput(0);
@@ -280,21 +293,21 @@ PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImag
outputIt.GoToBegin();
switch (m_ArchitectureType->GetArchitectureType())
- {
- // With 4 channels :
- case HH_HV_VH_VV :
- {
+ {
+ // With 4 channels :
+ case HH_HV_VH_VV:
+ {
// We use dynamic_cast since inputs are stored as DataObjects. The
// ImageToImageFilter::GetInput(int) always returns a pointer to a
// TInputImage1 so it cannot be used for the second or third input.
HHInputImagePointer inputPtrHH
- = dynamic_cast<const TInputImageHH*>((itk::ProcessObject::GetInput(0)));
+ = dynamic_cast<const TInputImageHH*>((itk::ProcessObject::GetInput(0)));
HVInputImagePointer inputPtrHV
- = dynamic_cast<const TInputImageHV*>((itk::ProcessObject::GetInput(1)));
+ = dynamic_cast<const TInputImageHV*>((itk::ProcessObject::GetInput(1)));
VHInputImagePointer inputPtrVH
- = dynamic_cast<const TInputImageVH*>((itk::ProcessObject::GetInput(2)));
+ = dynamic_cast<const TInputImageVH*>((itk::ProcessObject::GetInput(2)));
VVInputImagePointer inputPtrVV
- = dynamic_cast<const TInputImageVV*>((itk::ProcessObject::GetInput(3)));
+ = dynamic_cast<const TInputImageVV*>((itk::ProcessObject::GetInput(3)));
itk::ImageRegionConstIterator<TInputImageHH> inputItHH(inputPtrHH, outputRegionForThread);
itk::ImageRegionConstIterator<TInputImageHV> inputItHV(inputPtrHV, outputRegionForThread);
@@ -308,28 +321,28 @@ PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImag
inputItVH.GoToBegin();
inputItVV.GoToBegin();
- while ( !inputItHH.IsAtEnd() )
- {
- outputIt.Set( m_Gain * Superclass::GetFunctor()(inputItHH.Get(), inputItHV.Get(), inputItVH.Get(), inputItVV.Get()) );
+ while (!inputItHH.IsAtEnd())
+ {
+ outputIt.Set(m_Gain * Superclass::GetFunctor() (inputItHH.Get(), inputItHV.Get(), inputItVH.Get(), inputItVV.Get()));
++inputItHH;
++inputItHV;
++inputItVH;
++inputItVV;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
break;
- }
+ }
// With 3 channels : HH HV VV
- case HH_HV_VV :
+ case HH_HV_VV:
- {
+ {
HHInputImagePointer inputPtrHH
- = dynamic_cast<const TInputImageHH*>((itk::ProcessObject::GetInput(0)));
+ = dynamic_cast<const TInputImageHH*>((itk::ProcessObject::GetInput(0)));
HVInputImagePointer inputPtrHV
- = dynamic_cast<const TInputImageHV*>((itk::ProcessObject::GetInput(1)));
+ = dynamic_cast<const TInputImageHV*>((itk::ProcessObject::GetInput(1)));
VVInputImagePointer inputPtrVV
- = dynamic_cast<const TInputImageVV*>((itk::ProcessObject::GetInput(3)));
+ = dynamic_cast<const TInputImageVV*>((itk::ProcessObject::GetInput(3)));
itk::ImageRegionConstIterator<TInputImageHH> inputItHH(inputPtrHH, outputRegionForThread);
itk::ImageRegionConstIterator<TInputImageHV> inputItHV(inputPtrHV, outputRegionForThread);
@@ -342,27 +355,27 @@ PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImag
inputItHV.GoToBegin();
inputItVV.GoToBegin();
- while ( !inputItHH.IsAtEnd() )
- {
- outputIt.Set( m_Gain * Superclass::GetFunctor()(inputItHH.Get(), inputItHV.Get(), inputItHV.Get(), inputItVV.Get()) );
+ while (!inputItHH.IsAtEnd())
+ {
+ outputIt.Set(m_Gain * Superclass::GetFunctor() (inputItHH.Get(), inputItHV.Get(), inputItHV.Get(), inputItVV.Get()));
++inputItHH;
++inputItHV;
++inputItVV;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
break;
- }
+ }
// With 3 channels : HH VH VV
- case HH_VH_VV :
- {
+ case HH_VH_VV:
+ {
HHInputImagePointer inputPtrHH
- = dynamic_cast<const TInputImageHH*>((itk::ProcessObject::GetInput(0)));
+ = dynamic_cast<const TInputImageHH*>((itk::ProcessObject::GetInput(0)));
VHInputImagePointer inputPtrVH
- = dynamic_cast<const TInputImageVH*>((itk::ProcessObject::GetInput(2)));
+ = dynamic_cast<const TInputImageVH*>((itk::ProcessObject::GetInput(2)));
VVInputImagePointer inputPtrVV
- = dynamic_cast<const TInputImageVV*>((itk::ProcessObject::GetInput(3)));
+ = dynamic_cast<const TInputImageVV*>((itk::ProcessObject::GetInput(3)));
OutputImagePointer outputPtr = this->GetOutput(0);
itk::ImageRegionConstIterator<TInputImageHH> inputItHH(inputPtrHH, outputRegionForThread);
@@ -375,25 +388,25 @@ PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImag
inputItVH.GoToBegin();
inputItVV.GoToBegin();
- while ( !inputItHH.IsAtEnd() )
- {
- outputIt.Set( m_Gain * Superclass::GetFunctor()(inputItHH.Get(), inputItVH.Get(), inputItVH.Get(), inputItVV.Get()) );
+ while (!inputItHH.IsAtEnd())
+ {
+ outputIt.Set(m_Gain * Superclass::GetFunctor() (inputItHH.Get(), inputItVH.Get(), inputItVH.Get(), inputItVV.Get()));
++inputItHH;
++inputItVH;
++inputItVV;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
break;
- }
+ }
// With 2 channels : HH HV
- case HH_HV :
- {
+ case HH_HV:
+ {
HHInputImagePointer inputPtrHH
- = dynamic_cast<const TInputImageHH*>((itk::ProcessObject::GetInput(0)));
+ = dynamic_cast<const TInputImageHH*>((itk::ProcessObject::GetInput(0)));
HVInputImagePointer inputPtrHV
- = dynamic_cast<const TInputImageHV*>((itk::ProcessObject::GetInput(1)));
+ = dynamic_cast<const TInputImageHV*>((itk::ProcessObject::GetInput(1)));
itk::ImageRegionConstIterator<TInputImageHH> inputItHH(inputPtrHH, outputRegionForThread);
itk::ImageRegionConstIterator<TInputImageHV> inputItHV(inputPtrHV, outputRegionForThread);
@@ -404,23 +417,23 @@ PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImag
inputItHH.GoToBegin();
inputItHV.GoToBegin();
- while ( !inputItHH.IsAtEnd() )
- {
- outputIt.Set( m_Gain * Superclass::GetFunctor()(inputItHH.Get(), inputItHV.Get(), 0,0 ));
+ while (!inputItHH.IsAtEnd())
+ {
+ outputIt.Set(m_Gain * Superclass::GetFunctor() (inputItHH.Get(), inputItHV.Get(), 0, 0));
++inputItHH;
++inputItHV;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
break;
- }
+ }
// With 2 channels : VH VV
- case VH_VV :
- {
+ case VH_VV:
+ {
VHInputImagePointer inputPtrVH
- = dynamic_cast<const TInputImageVH*>((itk::ProcessObject::GetInput(2)));
+ = dynamic_cast<const TInputImageVH*>((itk::ProcessObject::GetInput(2)));
VVInputImagePointer inputPtrVV
- = dynamic_cast<const TInputImageVV*>((itk::ProcessObject::GetInput(3)));
+ = dynamic_cast<const TInputImageVV*>((itk::ProcessObject::GetInput(3)));
itk::ImageRegionConstIterator<TInputImageVH> inputItVH(inputPtrVH, outputRegionForThread);
itk::ImageRegionConstIterator<TInputImageVV> inputItVV(inputPtrVV, outputRegionForThread);
@@ -431,24 +444,23 @@ PolarimetricSynthesisFilter<TInputImageHH,TInputImageHV,TInputImageVH,TInputImag
inputItVH.GoToBegin();
inputItVV.GoToBegin();
- while ( !inputItVH.IsAtEnd() )
- {
- outputIt.Set( m_Gain * Superclass::GetFunctor()(0,0, inputItVH.Get(), inputItVV.Get()) );
+ while (!inputItVH.IsAtEnd())
+ {
+ outputIt.Set(m_Gain * Superclass::GetFunctor() (0, 0, inputItVH.Get(), inputItVV.Get()));
++inputItVH;
++inputItVV;
++outputIt;
progress.CompletedPixel(); // potential exception thrown here
- }
+ }
break;
- }
- default :
+ }
+ default:
itkExceptionMacro("Unknown architecture : Polarimetric synthesis is impossible !");
return;
- }
+ }
} // end namespace otb
}
#endif
-
diff --git a/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.h b/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.h
index 55bda18a0c..4698219ccd 100644
--- a/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.h
+++ b/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.h
@@ -38,17 +38,17 @@ class PolarimetricSynthesisFunctor
{
public:
/** Some typedefs. */
- typedef typename std::complex <double> ComplexType;
- typedef typename itk::FixedArray<ComplexType,2> ComplexArrayType;
+ typedef typename std::complex <double> ComplexType;
+ typedef typename itk::FixedArray<ComplexType, 2> ComplexArrayType;
/** Set the ElectroMagneticField Incident */
- void SetEi( ComplexArrayType ei )
+ void SetEi(ComplexArrayType ei)
{
m_Ei = ei;
}
/** Set the ElectroMagneticField Reflected */
- void SetEr( ComplexArrayType er )
+ void SetEr(ComplexArrayType er)
{
m_Er = er;
}
@@ -58,22 +58,22 @@ public:
{
m_Ei.Fill(1);
m_Er.Fill(1);
- };
+ }
/** Destructor */
- virtual ~PolarimetricSynthesisFunctor() {};
- inline TOutput operator()(const TInput1 &Shh, const TInput2 &Shv, const TInput3 &Svh, const TInput4 &Svv)
+ virtual ~PolarimetricSynthesisFunctor() {}
+ inline TOutput operator ()(const TInput1& Shh, const TInput2& Shv, const TInput3& Svh, const TInput4& Svv)
{
ComplexType tmp;
- double scalar;
+ double scalar;
- tmp = vcl_conj(m_Er[0])*( m_Ei[0]*Shh + m_Ei[1]*Shv ) + vcl_conj(m_Er[1])*( m_Ei[0]*Svh + m_Ei[1]*Svv );
+ tmp = vcl_conj(m_Er[0]) * (m_Ei[0] * Shh + m_Ei[1] * Shv) + vcl_conj(m_Er[1]) * (m_Ei[0] * Svh + m_Ei[1] * Svv);
- scalar=(double) ( vcl_pow( vcl_abs(tmp),2) );
+ scalar = (double) (vcl_pow(vcl_abs(tmp), 2));
- return ( static_cast<TOutput>(scalar) );
+ return (static_cast<TOutput>(scalar));
}
-private :
+private:
/** Electromagnetic Field Incident */
ComplexArrayType m_Ei;
/** Electromagnetic Field Reflected */
@@ -85,4 +85,3 @@ private :
} // namespace otb
#endif
-
diff --git a/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h b/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h
index 0db6823de8..4dff2e9418 100644
--- a/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h
+++ b/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h
@@ -28,53 +28,53 @@ namespace otb
*/
template <class TInputImage, class TOutputGraph>
class ITK_EXPORT ImageListToRCC8GraphFilter
- : public RCC8GraphSource<TOutputGraph>
+ : public RCC8GraphSource<TOutputGraph>
{
public:
/** Standard typedefs */
- typedef ImageListToRCC8GraphFilter Self;
- typedef RCC8GraphSource<TOutputGraph> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageListToRCC8GraphFilter Self;
+ typedef RCC8GraphSource<TOutputGraph> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
itkTypeMacro(ImageListToRCC8GraphFilter, RCC8GraphSource);
/** Template input parameters typedefs */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::ConstPointer InputImagePointer;
- typedef typename InputImageType::RegionType InputImageRegionType;
- typedef typename InputImageType::PixelType InputImagePixelType;
- typedef typename InputImageType::SizeType SizeType;
- typedef typename InputImageType::ValueType ValueType;
- typedef ImageList<InputImageType> InputImageListType;
- typedef typename InputImageListType::Pointer InputImageListPointerType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::ConstPointer InputImagePointer;
+ typedef typename InputImageType::RegionType InputImageRegionType;
+ typedef typename InputImageType::PixelType InputImagePixelType;
+ typedef typename InputImageType::SizeType SizeType;
+ typedef typename InputImageType::ValueType ValueType;
+ typedef ImageList<InputImageType> InputImageListType;
+ typedef typename InputImageListType::Pointer InputImageListPointerType;
typedef typename InputImageListType::ConstPointer InputImageListConstPointer;
/** Template output parameters typedefs */
- typedef TOutputGraph OutputGraphType;
+ typedef TOutputGraph OutputGraphType;
typedef typename Superclass::OutputGraphPointerType OutputGraphPointerType;
- typedef typename OutputGraphType::VertexType VertexType;
- typedef typename VertexType::Pointer VertexPointerType;
- typedef typename OutputGraphType::RCC8ValueType RCC8ValueType;
+ typedef typename OutputGraphType::VertexType VertexType;
+ typedef typename VertexType::Pointer VertexPointerType;
+ typedef typename OutputGraphType::RCC8ValueType RCC8ValueType;
/** InputImage dimension constant */
- itkStaticConstMacro(InputImageDimension, unsigned int,TInputImage::ImageDimension);
+ itkStaticConstMacro(InputImageDimension, unsigned int, TInputImage::ImageDimension);
/** Overiding the SetInput() and GetInput() methods */
- virtual void SetInput( const InputImageListType * imageList);
+ virtual void SetInput(const InputImageListType * imageList);
virtual InputImageListType * GetInput(void);
protected:
/** Constructor */
ImageListToRCC8GraphFilter();
/** Destructor */
- virtual ~ImageListToRCC8GraphFilter() {};
+ virtual ~ImageListToRCC8GraphFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageListToRCC8GraphFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageListToRCC8GraphFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbImageListToRCC8GraphFilter.txx"
#endif
diff --git a/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx b/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx
index 3c0ece316d..a70a25df56 100644
--- a/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx
+++ b/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx
@@ -26,7 +26,7 @@ namespace otb
* Constructor
*/
template <class TInputImage, class TOutputGraph>
-ImageListToRCC8GraphFilter<TInputImage,TOutputGraph>
+ImageListToRCC8GraphFilter<TInputImage, TOutputGraph>
::ImageListToRCC8GraphFilter()
{
this->SetNumberOfRequiredInputs(1);
@@ -37,37 +37,37 @@ ImageListToRCC8GraphFilter<TInputImage,TOutputGraph>
*/
template <class TInputImage, class TOutputGraph>
void
-ImageListToRCC8GraphFilter<TInputImage,TOutputGraph>
+ImageListToRCC8GraphFilter<TInputImage, TOutputGraph>
::SetInput(const InputImageListType *imageList)
{
// A single input image
- this->itk::ProcessObject::SetNthInput(0,const_cast<InputImageListType*>(imageList));
+ this->itk::ProcessObject::SetNthInput(0, const_cast<InputImageListType*>(imageList));
}
/**
* Input image retrieval
* \return The input image.
*/
template <class TInputImage, class TOutputGraph>
-typename ImageListToRCC8GraphFilter<TInputImage,TOutputGraph>::InputImageListType *
-ImageListToRCC8GraphFilter<TInputImage,TOutputGraph>
+typename ImageListToRCC8GraphFilter<TInputImage, TOutputGraph>::InputImageListType *
+ImageListToRCC8GraphFilter<TInputImage, TOutputGraph>
::GetInput(void)
{
// If there is no input
- if (this->GetNumberOfInputs()<1)
- {
+ if (this->GetNumberOfInputs() < 1)
+ {
// exit
return 0;
- }
+ }
// else return the first input
- return static_cast<InputImageListType * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<InputImageListType *>
+ (this->itk::ProcessObject::GetInput(0));
}
/**
* PrintSelf Method
*/
template <class TInputImage, class TOutputGraph>
void
-ImageListToRCC8GraphFilter<TInputImage,TOutputGraph>
+ImageListToRCC8GraphFilter<TInputImage, TOutputGraph>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os, indent);
diff --git a/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.h b/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.h
index 250cf7cd14..a5e75f811f 100644
--- a/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.h
+++ b/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.h
@@ -29,7 +29,7 @@ namespace otb
*/
template <class TInputImage, class TOutputGraph>
class ITK_EXPORT ImageMultiSegmentationToRCC8GraphFilter
- : public ImageListToRCC8GraphFilter<TInputImage,TOutputGraph>
+ : public ImageListToRCC8GraphFilter<TInputImage, TOutputGraph>
{
public:
/** Standard class typedefs. */
@@ -40,28 +40,28 @@ public:
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(ImageMultiSegmentationToRCC8GraphFilter,ImageListToRCC8GraphFilter);
+ itkTypeMacro(ImageMultiSegmentationToRCC8GraphFilter, ImageListToRCC8GraphFilter);
/** Input related typedefs */
- typedef TInputImage InputImageType;
- typedef typename InputImageType::PixelType PixelType;
- typedef typename InputImageType::Pointer InputImagePointerType;
- typedef typename Superclass::InputImageListType InputImageListType;
- typedef typename InputImageListType::Pointer InputImageListPointerType;
+ typedef TInputImage InputImageType;
+ typedef typename InputImageType::PixelType PixelType;
+ typedef typename InputImageType::Pointer InputImagePointerType;
+ typedef typename Superclass::InputImageListType InputImageListType;
+ typedef typename InputImageListType::Pointer InputImageListPointerType;
typedef typename InputImageListType::ConstIterator ConstListIteratorType;
/** Output related typedefs */
- typedef TOutputGraph OutputGraphType;
- typedef typename OutputGraphType::Pointer OutputGraphPointerType;
- typedef typename OutputGraphType::VertexType VertexType;
- typedef typename VertexType::Pointer VertexPointerType;
- typedef typename VertexType::PathType PathType;
+ typedef TOutputGraph OutputGraphType;
+ typedef typename OutputGraphType::Pointer OutputGraphPointerType;
+ typedef typename OutputGraphType::VertexType VertexType;
+ typedef typename VertexType::Pointer VertexPointerType;
+ typedef typename VertexType::PathType PathType;
typedef typename OutputGraphType::VertexDescriptorType VertexDescriptorType;
/** Knowledge enum typedef */
- typedef typename OutputGraphType::RCC8ValueType RCC8ValueType;
- typedef enum {NO_INFO,LEVEL_1,LEVEL_3,FULL} KnowledgeValueType;
- typedef std::pair<KnowledgeValueType,RCC8ValueType> KnowledgeStateType;
+ typedef typename OutputGraphType::RCC8ValueType RCC8ValueType;
+ typedef enum {NO_INFO, LEVEL_1, LEVEL_3, FULL} KnowledgeValueType;
+ typedef std::pair<KnowledgeValueType, RCC8ValueType> KnowledgeStateType;
/** Toogle optimisation flag */
itkBooleanMacro(Optimisation);
- itkSetMacro(Optimisation,bool);
+ itkSetMacro(Optimisation, bool);
/**
* Get the number of occurences of the given value
@@ -94,7 +94,7 @@ protected:
private:
/** Optimisation flag */
- bool m_Optimisation;
+ bool m_Optimisation;
unsigned int m_Accumulator[8];
};
diff --git a/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.txx b/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.txx
index 57b0d3cdf3..27aaaae219 100644
--- a/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.txx
+++ b/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.txx
@@ -37,7 +37,7 @@ template <class TInputImage, class TOutputGraph>
ImageMultiSegmentationToRCC8GraphFilter<TInputImage, TOutputGraph>
::ImageMultiSegmentationToRCC8GraphFilter()
{
- m_Optimisation=false;
+ m_Optimisation = false;
}
/**
* Destructor.
@@ -47,7 +47,6 @@ ImageMultiSegmentationToRCC8GraphFilter<TInputImage, TOutputGraph>
::~ImageMultiSegmentationToRCC8GraphFilter()
{}
-
template <class TInputImage, class TOutputGraph>
unsigned int
ImageMultiSegmentationToRCC8GraphFilter<TInputImage, TOutputGraph>
@@ -56,18 +55,17 @@ ImageMultiSegmentationToRCC8GraphFilter<TInputImage, TOutputGraph>
return m_Accumulator[val];
}
-
template <class TInputImage, class TOutputGraph>
unsigned int
ImageMultiSegmentationToRCC8GraphFilter<TInputImage, TOutputGraph>
::GetNumberOfRelations()
{
unsigned int result = 0;
- for (unsigned int i = 0;i<8;++i)
- {
- result+=m_Accumulator[i];
+ for (unsigned int i = 0; i < 8; ++i)
+ {
+ result += m_Accumulator[i];
- }
+ }
return result;
}
template <class TInputImage, class TOutputGraph>
@@ -76,53 +74,53 @@ typename ImageMultiSegmentationToRCC8GraphFilter<TInputImage, TOutputGraph>
ImageMultiSegmentationToRCC8GraphFilter<TInputImage, TOutputGraph>
::GetKnowledge(RCC8ValueType r1, RCC8ValueType r2)
{
- m_Accumulator[0]=0;
- m_Accumulator[1]=0;
- m_Accumulator[2]=0;
- m_Accumulator[3]=0;
- m_Accumulator[4]=0;
- m_Accumulator[5]=0;
- m_Accumulator[6]=0;
- m_Accumulator[7]=0;
+ m_Accumulator[0] = 0;
+ m_Accumulator[1] = 0;
+ m_Accumulator[2] = 0;
+ m_Accumulator[3] = 0;
+ m_Accumulator[4] = 0;
+ m_Accumulator[5] = 0;
+ m_Accumulator[6] = 0;
+ m_Accumulator[7] = 0;
// otbMsgDebugMacro(<<"RCC8GraphFilter: entering GetKnowledge method.");
// This is the RCC8 composition table
const int knowledge[8][8]
- =
- {
+ =
+ {
/** DC EC PO TPP TPPi NTPP i EQ */
- /** DC */ {-3, -2, -2, -2, 0, -2, 0, 0},
+ /** DC */ {-3, -2, -2, -2, 0, -2, 0, 0},
/** EC */ {-1, -3, -2, -3, -1, -3, 0, 1},
/** PO */ {-1, -1, -3, -3, -1, -3, -1, 2},
/** TPP */ { 0, -1, -2, -3, -3, 5, -1, 3},
/** TPPi*/ {-1, -1, -1, -3, -1, -3, 6, 4},
/** NTPP*/ { 0, 0, -2, 5, -2, 5, -3, 5},
- /** NTPPi*/{-1, -1, -1, -1, 6, -3, 6, 6},
+ /** NTPPi*/ {-1, -1, -1, -1, 6, -3, 6, 6},
/** EQ */ { 0, 1, 2, 3, 4, 5, 6, 7}
- };
+ };
int value = knowledge[r1][r2];
// Each negative case correspond to a level of knowledge
- if (value>=0)
- {
+ if (value >= 0)
+ {
// otbMsgDebugMacro(<<"RCC8GraphFilter: leaving GetKnowledge method: FULL");
- return KnowledgeStateType(FULL,static_cast<RCC8ValueType>(value));
- }
- else if (value==-1)
- {
+ return KnowledgeStateType(FULL, static_cast<RCC8ValueType>(value));
+ }
+ else if (value == -1)
+ {
// otbMsgDebugMacro(<<"RCC8GraphFilter: leaving GetKnowledge method: LEVEL_1");
- return KnowledgeStateType(LEVEL_1,OTB_RCC8_DC);
- }
- else if (value==-2)
- {
+ return KnowledgeStateType(LEVEL_1, OTB_RCC8_DC);
+ }
+ else if (value == -2)
+ {
// otbMsgDebugMacro(<<"RCC8GraphFilter: leaving GetKnowledge method.LEVEL_3");
- return KnowledgeStateType(LEVEL_3,OTB_RCC8_DC);
- }
+ return KnowledgeStateType(LEVEL_3, OTB_RCC8_DC);
+ }
else
- {
+ {
// otbMsgDebugMacro(<<"RCC8GraphFilter: leaving GetKnowledge method.NO_INFO");
- return KnowledgeStateType(NO_INFO,OTB_RCC8_DC);
- }
+ return KnowledgeStateType(NO_INFO, OTB_RCC8_DC);
+ }
}
/**
* Main computation method.
@@ -138,22 +136,20 @@ ImageMultiSegmentationToRCC8GraphFilter<TInputImage, TOutputGraph>
// Ouptut graph pointer
OutputGraphPointerType graph = this->GetOutput();
-
// invert value vector
- RCC8ValueType invert[8]={OTB_RCC8_DC,OTB_RCC8_EC,OTB_RCC8_PO,OTB_RCC8_TPPI,
- OTB_RCC8_TPP,OTB_RCC8_NTPPI,OTB_RCC8_NTPP,OTB_RCC8_EQ
- };
+ RCC8ValueType invert[8] = {OTB_RCC8_DC, OTB_RCC8_EC, OTB_RCC8_PO, OTB_RCC8_TPPI,
+ OTB_RCC8_TPP, OTB_RCC8_NTPPI, OTB_RCC8_NTPP, OTB_RCC8_EQ};
// Some typedefs
- typedef otb::ImageToEdgePathFilter<InputImageType,PathType> EdgeExtractionFilterType;
- typedef otb::SimplifyPathListFilter<PathType> SimplifyPathFilterType;
- typedef typename SimplifyPathFilterType::InputListType PathListType;
+ typedef otb::ImageToEdgePathFilter<InputImageType, PathType> EdgeExtractionFilterType;
+ typedef otb::SimplifyPathListFilter<PathType> SimplifyPathFilterType;
+ typedef typename SimplifyPathFilterType::InputListType PathListType;
typedef itk::MinimumMaximumImageCalculator<InputImageType> MinMaxCalculatorType;
- typedef PolygonToPolygonRCC8Calculator<PathType> RCC8CalculatorType;
- typedef RCC8VertexIterator<OutputGraphType> VertexIteratorType;
- typedef RCC8InEdgeIterator<OutputGraphType> InEdgeIteratorType;
- typedef RCC8OutEdgeIterator<OutputGraphType> OutEdgeIteratorType;
+ typedef PolygonToPolygonRCC8Calculator<PathType> RCC8CalculatorType;
+ typedef RCC8VertexIterator<OutputGraphType> VertexIteratorType;
+ typedef RCC8InEdgeIterator<OutputGraphType> InEdgeIteratorType;
+ typedef RCC8OutEdgeIterator<OutputGraphType> OutEdgeIteratorType;
// Vector of label
std::vector<PixelType> maxLabelVector;
@@ -164,20 +160,20 @@ ImageMultiSegmentationToRCC8GraphFilter<TInputImage, TOutputGraph>
unsigned int nbVertices = 0;
// For each segmentation image
- for (ConstListIteratorType it = segList->Begin();it!=segList->End();++it)
- {
+ for (ConstListIteratorType it = segList->Begin(); it != segList->End(); ++it)
+ {
// Compute the maximum label
typename MinMaxCalculatorType::Pointer minMax = MinMaxCalculatorType::New();
minMax->SetImage(it.Get());
minMax->ComputeMaximum();
maxLabelVector.push_back(minMax->GetMaximum());
- otbMsgDebugMacro(<<"Number of objects in image "<<segmentationImageIndex<<": "
- <<minMax->GetMaximum());
+ otbMsgDebugMacro(<< "Number of objects in image " << segmentationImageIndex << ": "
+ << minMax->GetMaximum());
// then for each region of the images
- for (PixelType label=1; label<=maxLabelVector.back();++label)
- {
- typename PathListType::Pointer region = PathListType::New();
+ for (PixelType label = 1; label <= maxLabelVector.back(); ++label)
+ {
+ typename PathListType::Pointer region = PathListType::New();
typename EdgeExtractionFilterType::Pointer extraction = EdgeExtractionFilterType::New();
extraction->SetInput(it.Get());
extraction->SetForegroundValue(label);
@@ -192,117 +188,117 @@ ImageMultiSegmentationToRCC8GraphFilter<TInputImage, TOutputGraph>
VertexPointerType vertex = VertexType::New();
// Set its properties
vertex->SetPath(simplifier->GetOutput()->GetNthElement(0));
- vertex->SetSegmentationLevel(segmentationImageIndex/2);
- vertex->SetSegmentationType(segmentationImageIndex%2);
+ vertex->SetSegmentationLevel(segmentationImageIndex / 2);
+ vertex->SetSegmentationType(segmentationImageIndex % 2);
// Put it in the graph
- graph->SetVertex(vertexIndex,vertex);
+ graph->SetVertex(vertexIndex, vertex);
++vertexIndex;
++nbVertices;
- }
+ }
++segmentationImageIndex;
- }
+ }
- itk::ProgressReporter progress(this,0,nbVertices*nbVertices);
+ itk::ProgressReporter progress(this, 0, nbVertices*nbVertices);
VertexIteratorType vIt1(graph);
VertexIteratorType vIt2(graph);
// For each couple of vertices
- for (vIt1.GoToBegin();!vIt1.IsAtEnd();++vIt1)
- {
- for (vIt2.GoToBegin();!vIt2.IsAtEnd();++vIt2)
+ for (vIt1.GoToBegin(); !vIt1.IsAtEnd(); ++vIt1)
{
- //We do not examine each couple because of the RCC8 symmetry
- if (vIt1.GetIndex()<vIt2.GetIndex())
+ for (vIt2.GoToBegin(); !vIt2.IsAtEnd(); ++vIt2)
{
+ //We do not examine each couple because of the RCC8 symmetry
+ if (vIt1.GetIndex() < vIt2.GetIndex())
+ {
// Compute the RCC8 relation
typename RCC8CalculatorType::Pointer calc = RCC8CalculatorType::New();
calc->SetPolygon1(vIt1.Get()->GetPath());
calc->SetPolygon2(vIt2.Get()->GetPath());
- RCC8ValueType value=OTB_RCC8_DC;
+ RCC8ValueType value = OTB_RCC8_DC;
// if the optimisations are activated
if (m_Optimisation)
- {
+ {
// otbMsgDebugMacro(<<"RCC8GraphFilter: Entering optimisation loop");
- InEdgeIteratorType inIt1(vIt1.GetIndex(),graph);
- InEdgeIteratorType inIt2(vIt2.GetIndex(),graph);
+ InEdgeIteratorType inIt1(vIt1.GetIndex(), graph);
+ InEdgeIteratorType inIt2(vIt2.GetIndex(), graph);
// otbMsgDebugMacro(<<"Optimisation loop: iterators initialised");
VertexDescriptorType betweenIndex;
- KnowledgeStateType know(NO_INFO,OTB_RCC8_DC);
+ KnowledgeStateType know(NO_INFO, OTB_RCC8_DC);
inIt1.GoToBegin();
// Iterate through the edges going to the first vertex
- while (!inIt1.IsAtEnd()&&(know.first!=FULL))
- {
+ while (!inIt1.IsAtEnd() && (know.first != FULL))
+ {
betweenIndex = inIt1.GetSourceIndex();
inIt2.GoToBegin();
bool edgeFound = false;
- while (!inIt2.IsAtEnd()&&(know.first!=FULL))
- {
+ while (!inIt2.IsAtEnd() && (know.first != FULL))
+ {
// try to find an intermediate vertex between the two ones which
// we vant to compute the relationship
- if (inIt2.GetSourceIndex()==betweenIndex)
- {
+ if (inIt2.GetSourceIndex() == betweenIndex)
+ {
// if an intermediate vertex is found
edgeFound = true;
// otbMsgDebugMacro(<<"Optimisation loop: found an intermediary vertex:" <<betweenIndex);
// See if it brings some info on the RCCC8 value
- know = GetKnowledge(invert[inIt1.GetValue()],inIt2.GetValue());
- calc->SetLevel1APrioriKnowledge(know.first==LEVEL_1);
- calc->SetLevel3APrioriKnowledge(know.first==LEVEL_3);
+ know = GetKnowledge(invert[inIt1.GetValue()], inIt2.GetValue());
+ calc->SetLevel1APrioriKnowledge(know.first == LEVEL_1);
+ calc->SetLevel3APrioriKnowledge(know.first == LEVEL_3);
// otbMsgDebugMacro(<<"Optimisation loop: knowledge: "<<know.first<<","<<know.second);
- }
+ }
++inIt2;
- }
+ }
// If no intermediate was found
if (!edgeFound)
- {
+ {
// otbMsgDebugMacro(<<"Optimisation loop: found an intermediary vertex:" <<betweenIndex);
// Try using a DC relationship
- know = GetKnowledge(invert[inIt1.GetValue()],OTB_RCC8_DC);
- calc->SetLevel1APrioriKnowledge(know.first==LEVEL_1);
- calc->SetLevel3APrioriKnowledge(know.first==LEVEL_3);
+ know = GetKnowledge(invert[inIt1.GetValue()], OTB_RCC8_DC);
+ calc->SetLevel1APrioriKnowledge(know.first == LEVEL_1);
+ calc->SetLevel3APrioriKnowledge(know.first == LEVEL_3);
// otbMsgDebugMacro(<<"Optimisation loop: knowledge: "<<know.first<<","<<know.second);
- }
+ }
++inIt1;
- }
+ }
// If the search has fully determined the RCC8
- if (know.first==FULL)
- {
+ if (know.first == FULL)
+ {
// Get the value
- value=know.second;
- }
+ value = know.second;
+ }
else
- {
+ {
// Else trigger the computation
// (which will take the optimisation phase info into account)
calc->Compute();
- value=calc->GetValue();
- }
+ value = calc->GetValue();
+ }
// otbMsgDebugMacro(<<"RCC8GraphFilter: Leaving optimisation loop");
- }
+ }
// If the optimisations are not activated
else
- {
+ {
calc->Compute();
- value=calc->GetValue();
- }
- m_Accumulator[value]+=1;
- m_Accumulator[invert[value]]+=1;
+ value = calc->GetValue();
+ }
+ m_Accumulator[value] += 1;
+ m_Accumulator[invert[value]] += 1;
// If the vertices are connected
- if (value>OTB_RCC8_DC)
- {
+ if (value > OTB_RCC8_DC)
+ {
// Add the edge to the graph.
- otbMsgDevMacro(<<"Adding edge: "<<vIt1.GetIndex()<<" -> "<<vIt2.GetIndex()<<": "<<value);
- graph->AddEdge(vIt1.GetIndex(),vIt2.GetIndex(),value);
+ otbMsgDevMacro(<< "Adding edge: " << vIt1.GetIndex() << " -> " << vIt2.GetIndex() << ": " << value);
+ graph->AddEdge(vIt1.GetIndex(), vIt2.GetIndex(), value);
+ }
}
- }
progress.CompletedPixel();
progress.CompletedPixel();
+ }
}
- }
}
template <class TInputImage, class TOutputGraph>
@@ -314,4 +310,3 @@ ImageMultiSegmentationToRCC8GraphFilter<TInputImage, TOutputGraph>
}
} // end namespace otb
#endif
-
diff --git a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.h b/Code/SpatialReasoning/otbImageToImageRCC8Calculator.h
index b056c58a82..2ef6a649eb 100644
--- a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.h
+++ b/Code/SpatialReasoning/otbImageToImageRCC8Calculator.h
@@ -47,18 +47,18 @@ namespace otb
* to the smallest set needed to determine the relation.
*/
template <class TInputImage>
-class ITK_EXPORT ImageToImageRCC8Calculator : public itk::ImageToImageFilter<TInputImage,TInputImage>
+class ITK_EXPORT ImageToImageRCC8Calculator : public itk::ImageToImageFilter<TInputImage, TInputImage>
{
public:
/** Standard class typedefs. */
- typedef ImageToImageRCC8Calculator Self;
- typedef itk::ImageToImageFilter<TInputImage,TInputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageToImageRCC8Calculator Self;
+ typedef itk::ImageToImageFilter<TInputImage, TInputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(ImageToImageRCC8Calculator,ImageToImageFilter);
+ itkTypeMacro(ImageToImageRCC8Calculator, ImageToImageFilter);
/** Types definitions for the input image. */
typedef TInputImage ImageType;
typedef typename ImageType::Pointer ImagePointerType;
@@ -67,9 +67,9 @@ public:
typedef typename ImageType::IndexType IndexType;
typedef typename ImageType::RegionType RegionType;
/** Internal bool image type */
- typedef bool BoolPixelType;
- typedef otb::Image<BoolPixelType,ImageType::ImageDimension> BoolImageType;
- typedef typename BoolImageType::Pointer BoolImagePointerType;
+ typedef bool BoolPixelType;
+ typedef otb::Image<BoolPixelType, ImageType::ImageDimension> BoolImageType;
+ typedef typename BoolImageType::Pointer BoolImagePointerType;
/** RCC8 values type */
typedef RCC8Value RCC8ValueType;
@@ -99,21 +99,21 @@ public:
*/
ImageType * GetInput2(void);
/** Set/Get the inside value of the region of image 1*/
- itkSetMacro(InsideValue1,PixelType);
- itkGetMacro(InsideValue1,PixelType);
+ itkSetMacro(InsideValue1, PixelType);
+ itkGetMacro(InsideValue1, PixelType);
/** Set/Get the inside value of the region of image 2*/
- itkSetMacro(InsideValue2,PixelType);
- itkGetMacro(InsideValue2,PixelType);
+ itkSetMacro(InsideValue2, PixelType);
+ itkGetMacro(InsideValue2, PixelType);
/** Set external knowledge to help the decision process */
- itkSetMacro(Level1APrioriKnowledge,bool);
- itkSetMacro(Level3APrioriKnowledge,bool);
- itkGetMacro(Level1APrioriKnowledge,bool);
- itkGetMacro(Level3APrioriKnowledge,bool);
+ itkSetMacro(Level1APrioriKnowledge, bool);
+ itkSetMacro(Level3APrioriKnowledge, bool);
+ itkGetMacro(Level1APrioriKnowledge, bool);
+ itkGetMacro(Level3APrioriKnowledge, bool);
protected:
/** Constructor */
ImageToImageRCC8Calculator();
/** Destructor */
- virtual ~ImageToImageRCC8Calculator() {};
+ virtual ~ImageToImageRCC8Calculator() {}
/**
* Compute the minimal image region required.
* \return The minimal region required.
diff --git a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx b/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx
index 5f8d561432..8d831f811d 100644
--- a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx
+++ b/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx
@@ -44,8 +44,8 @@ ImageToImageRCC8Calculator<TInputImage>
m_Value = OTB_RCC8_DC;
m_InsideValue1 = static_cast<PixelType>(255);
m_InsideValue2 = static_cast<PixelType>(255);
- m_Level1APrioriKnowledge=false;
- m_Level3APrioriKnowledge=false;
+ m_Level1APrioriKnowledge = false;
+ m_Level3APrioriKnowledge = false;
this->SetNumberOfRequiredInputs(2);
}
/**
@@ -57,7 +57,7 @@ void
ImageToImageRCC8Calculator<TInputImage>
::SetInput1(ImageType * image)
{
- this->SetNthInput(0,const_cast<ImageType *>(image));
+ this->SetNthInput(0, const_cast<ImageType *>(image));
}
/**
* Set the second input image.
@@ -68,7 +68,7 @@ void
ImageToImageRCC8Calculator<TInputImage>
::SetInput2(ImageType * image)
{
- this->SetNthInput(1,const_cast<ImageType *>(image));
+ this->SetNthInput(1, const_cast<ImageType *>(image));
}
/**
* Get the first input image.
@@ -117,38 +117,38 @@ ImageToImageRCC8Calculator<TInputImage>
::ComputeMinimalRegion(void)
{
// Input images pointers
- typename ImageType::Pointer image1 = this->GetInput1();
- typename ImageType::Pointer image2 = this->GetInput2();
+ typename ImageType::Pointer image1 = this->GetInput1();
+ typename ImageType::Pointer image2 = this->GetInput2();
typename ImageType::RegionType region1, region2, region;
typedef otb::BinaryImageMinimalBoundingRegionCalculator<ImageType> RegionCalculator;
- typename RegionCalculator::Pointer rc =RegionCalculator::New();
+ typename RegionCalculator::Pointer rc = RegionCalculator::New();
rc->SetInput(image1);
rc->SetPad(2);
rc->SetInsideValue(this->GetInsideValue1());
rc->Update();
- region1=rc->GetRegion();
- rc=RegionCalculator::New();
+ region1 = rc->GetRegion();
+ rc = RegionCalculator::New();
rc->SetInput(image2);
rc->SetPad(2);
rc->SetInsideValue(this->GetInsideValue2());
rc->Update();
- region2=rc->GetRegion();
+ region2 = rc->GetRegion();
// otbMsgDebugMacro(<<"RCC8Calculator->ComputeMinimalRegion() Region1: index: "<<region1.GetIndex()<<" size: "<<region1.GetSize());
// otbMsgDebugMacro(<<"RCC8Calculator->ComputeMinimalRegion() Region2: index: "<<region2.GetIndex()<<" size: "<<region2.GetSize());
//TODELETE std::cout<<"RCC8Calculator->ComputeMinimalRegion() Region1: index: "<<region1.GetIndex()<<" size: "<<region1.GetSize()<<std::endl;
//TODELETE std::cout<<"RCC8Calculator->ComputeMinimalRegion() Region2: index: "<<region2.GetIndex()<<" size: "<<region2.GetSize()<<std::endl;
- typename ImageType::SizeType size;
+ typename ImageType::SizeType size;
typename ImageType::IndexType index;
- for (int i=0;i<ImageType::ImageDimension;++i)
- {
- index[i]=std::min(region1.GetIndex()[i],region2.GetIndex()[i]);
- int potSize = std::max(region1.GetIndex()[i]+region1.GetSize()[i],
- region2.GetIndex()[i]+region2.GetSize()[i]);
- size[i]=(potSize-index[i]<0 ? 0 : potSize-index[i]);
- }
+ for (int i = 0; i < ImageType::ImageDimension; ++i)
+ {
+ index[i] = std::min(region1.GetIndex()[i], region2.GetIndex()[i]);
+ int potSize = std::max(region1.GetIndex()[i] + region1.GetSize()[i],
+ region2.GetIndex()[i] + region2.GetSize()[i]);
+ size[i] = (potSize - index[i] < 0 ? 0 : potSize - index[i]);
+ }
region.SetIndex(index);
region.SetSize(size);
region.PadByRadius(2);
@@ -172,14 +172,14 @@ ImageToImageRCC8Calculator<TInputImage>
::ConvertToBoolImage(ImagePointerType image, PixelType insideValue)
{
typedef itk::ImageRegionConstIterator<ImageType> ConstIterator;
- typedef itk::ImageRegionIterator<BoolImageType> Iterator;
- typename BoolImageType::Pointer output = BoolImageType::New();
+ typedef itk::ImageRegionIterator<BoolImageType> Iterator;
+ typename BoolImageType::Pointer output = BoolImageType::New();
typename BoolImageType::SizeType boolImageSize;
- boolImageSize[0]=m_MinimalROI.GetSize()[0]+2;
- boolImageSize[1]=m_MinimalROI.GetSize()[1]+2;
+ boolImageSize[0] = m_MinimalROI.GetSize()[0] + 2;
+ boolImageSize[1] = m_MinimalROI.GetSize()[1] + 2;
typename BoolImageType::IndexType boolImageIndex;
- boolImageIndex[0]=m_MinimalROI.GetIndex()[0]-1;
- boolImageIndex[1]=m_MinimalROI.GetIndex()[1]-1;
+ boolImageIndex[0] = m_MinimalROI.GetIndex()[0] - 1;
+ boolImageIndex[1] = m_MinimalROI.GetIndex()[1] - 1;
//otbMsgDebugMacro(<<"RCC8Calculator->ConvertToBoolImage() size: "<<boolImageSize<<" index: "<<boolImageIndex);
typename BoolImageType::RegionType boolRegion;
@@ -189,16 +189,16 @@ ImageToImageRCC8Calculator<TInputImage>
output->Allocate();
output->FillBuffer(false);
- ConstIterator inputIt(image,m_MinimalROI);
- Iterator outputIt(output,m_MinimalROI);
+ ConstIterator inputIt(image, m_MinimalROI);
+ Iterator outputIt(output, m_MinimalROI);
inputIt.GoToBegin();
outputIt.GoToBegin();
- while (!inputIt.IsAtEnd()&&!outputIt.IsAtEnd())
- {
- outputIt.Set(inputIt.Get()==insideValue);
+ while (!inputIt.IsAtEnd() && !outputIt.IsAtEnd())
+ {
+ outputIt.Set(inputIt.Get() == insideValue);
++inputIt;
++outputIt;
- }
+ }
return output;
}
@@ -213,18 +213,22 @@ ImageToImageRCC8Calculator<TInputImage>
{
/// Definition of the Filters used to compute the boolean
- typedef itk::SubtractImageFilter<BoolImageType,BoolImageType,BoolImageType> SubtractFilterType;
- typedef itk::BinaryBallStructuringElement<bool,BoolImageType::ImageDimension> BinaryBallStructuringElementType;
- typedef itk::BinaryDilateImageFilter<BoolImageType,BoolImageType,BinaryBallStructuringElementType> DilateFilterType;
- typedef itk::AndImageFilter<BoolImageType,BoolImageType,BoolImageType> AndFilterType;
+ typedef itk::SubtractImageFilter<BoolImageType, BoolImageType,
+ BoolImageType>
+ SubtractFilterType;
+ typedef itk::BinaryBallStructuringElement<bool,
+ BoolImageType::ImageDimension>
+ BinaryBallStructuringElementType;
+ typedef itk::BinaryDilateImageFilter<BoolImageType, BoolImageType, BinaryBallStructuringElementType> DilateFilterType;
+ typedef itk::AndImageFilter<BoolImageType, BoolImageType, BoolImageType> AndFilterType;
/// Declaration and instantiation
- typename DilateFilterType::Pointer dilateFilter1 = DilateFilterType::New();
- typename DilateFilterType::Pointer dilateFilter2 = DilateFilterType::New();
+ typename DilateFilterType::Pointer dilateFilter1 = DilateFilterType::New();
+ typename DilateFilterType::Pointer dilateFilter2 = DilateFilterType::New();
typename SubtractFilterType::Pointer subtractFilter1 = SubtractFilterType::New();
typename SubtractFilterType::Pointer subtractFilter2 = SubtractFilterType::New();
- typename AndFilterType::Pointer andFilter = AndFilterType::New();
+ typename AndFilterType::Pointer andFilter = AndFilterType::New();
/// Configuration of the erosion filter
- BinaryBallStructuringElementType structElement1,structElement2;
+ BinaryBallStructuringElementType structElement1, structElement2;
structElement1.SetRadius(1);
structElement2.SetRadius(1);
structElement1.CreateStructuringElement();
@@ -263,11 +267,11 @@ ImageToImageRCC8Calculator<TInputImage>
::ComputeExterInterBool(void)
{
/// Definition of the filters used
- typedef itk::InvertIntensityImageFilter<BoolImageType,BoolImageType> InvertFilterType;
- typedef itk::AndImageFilter<BoolImageType,BoolImageType,BoolImageType> AndFilterType;
+ typedef itk::InvertIntensityImageFilter<BoolImageType, BoolImageType> InvertFilterType;
+ typedef itk::AndImageFilter<BoolImageType, BoolImageType, BoolImageType> AndFilterType;
/// Declaration and instantiation
typename InvertFilterType::Pointer invert = InvertFilterType::New();
- typename AndFilterType::Pointer andFilter = AndFilterType::New();
+ typename AndFilterType::Pointer andFilter = AndFilterType::New();
/// The exterior is the inverted input image
invert->SetMaximum(true);
invert->SetInput(m_BoolImage1);
@@ -288,21 +292,21 @@ ImageToImageRCC8Calculator<TInputImage>
::ComputeInterExterBool(void)
{
/// Definition of the filters used
- typedef itk::InvertIntensityImageFilter<BoolImageType,BoolImageType> InvertFilterType;
- typedef itk::AndImageFilter<BoolImageType,BoolImageType,BoolImageType> AndFilterType;
+ typedef itk::InvertIntensityImageFilter<BoolImageType, BoolImageType> InvertFilterType;
+ typedef itk::AndImageFilter<BoolImageType, BoolImageType, BoolImageType> AndFilterType;
//TODELETE typedef otb::Image<unsigned char,2> TmpImageType;
//TODELETE typedef itk::CastImageFilter<BoolImageType,TmpImageType> CastFilterType;
//TODELETE typedef ImageFileWriter<TmpImageType> WriterType;
- /// Declaration and instantiation
+/// Declaration and instantiation
typename InvertFilterType::Pointer invert = InvertFilterType::New();
- typename AndFilterType::Pointer andFilter = AndFilterType::New();
+ typename AndFilterType::Pointer andFilter = AndFilterType::New();
/// The exterior is the inverted input image
invert->SetMaximum(true);
invert->SetInput(m_BoolImage2);
//TODELETE typename CastFilterType::Pointer caster = CastFilterType::New();
- //TODELETE caster->SetInput(invert->GetOutput());
+//TODELETE caster->SetInput(invert->GetOutput());
//TODELETE typename WriterType::Pointer writer = WriterType::New();
//TODELETE writer->SetFileName("invert.tif");
//TODELETE writer->SetInput(caster->GetOutput());
@@ -332,8 +336,8 @@ ImageToImageRCC8Calculator<TInputImage>
::ComputeInterInterBool(void)
{
/// Definition of the filters used
- typedef itk::AndImageFilter<BoolImageType,BoolImageType,BoolImageType> AndFilterType;
- typedef itk::MinimumMaximumImageCalculator<BoolImageType> MinMaxCalculatorType;
+ typedef itk::AndImageFilter<BoolImageType, BoolImageType, BoolImageType> AndFilterType;
+ typedef itk::MinimumMaximumImageCalculator<BoolImageType> MinMaxCalculatorType;
/// Declaration and instantiation
typename AndFilterType::Pointer andFilter = AndFilterType::New();
/// The exterior is the inverted input image
@@ -360,35 +364,35 @@ ImageToImageRCC8Calculator<TInputImage>
{
// otbMsgDebugMacro(<<"RCC8Calculator->ComputeRelation()");
// This decision process is based on a decision tree
- if ((!interExterBool)&&(edgeEdgeBool)&&(!exterInterBool))
- {
- m_Value=OTB_RCC8_EQ;
+ if ((!interExterBool) && (edgeEdgeBool) && (!exterInterBool))
+ {
+ m_Value = OTB_RCC8_EQ;
return true;
- }
- else if ((!interExterBool)&&(edgeEdgeBool)&&(exterInterBool))
- {
- m_Value=OTB_RCC8_TPP;
+ }
+ else if ((!interExterBool) && (edgeEdgeBool) && (exterInterBool))
+ {
+ m_Value = OTB_RCC8_TPP;
return true;
- }
- else if ((interExterBool)&&(!edgeEdgeBool)&&(!exterInterBool))
- {
- m_Value=OTB_RCC8_NTPPI;
+ }
+ else if ((interExterBool) && (!edgeEdgeBool) && (!exterInterBool))
+ {
+ m_Value = OTB_RCC8_NTPPI;
return true;
- }
- else if ((interExterBool)&&(!edgeEdgeBool)&&(exterInterBool))
- {
- m_Value=OTB_RCC8_DC;
+ }
+ else if ((interExterBool) && (!edgeEdgeBool) && (exterInterBool))
+ {
+ m_Value = OTB_RCC8_DC;
return true;
- }
- else if ((interExterBool)&&(edgeEdgeBool)&&(!exterInterBool))
- {
- m_Value=OTB_RCC8_TPPI;
+ }
+ else if ((interExterBool) && (edgeEdgeBool) && (!exterInterBool))
+ {
+ m_Value = OTB_RCC8_TPPI;
return true;
- }
+ }
else
- {
+ {
return false;
- }
+ }
}
/**
* Test if the boolean image is totally black or not. This is a based on the lazy operator
@@ -403,16 +407,16 @@ ImageToImageRCC8Calculator<TInputImage>
{
typedef itk::ImageRegionConstIterator<BoolImageType> IteratorType;
// TODO : we'll eventually need to change something.
- IteratorType it(image,image->GetLargestPossibleRegion());
+ IteratorType it(image, image->GetLargestPossibleRegion());
it.GoToBegin();
while (!it.IsAtEnd())
- {
- if (it.Get())
{
+ if (it.Get())
+ {
return true;
- }
+ }
++it;
- }
+ }
return false;
}
/**
@@ -425,24 +429,24 @@ ImageToImageRCC8Calculator<TInputImage>
{
// otbMsgDebugMacro(<<"RCC8Calculator->GenerateData()");
/// First we compute the minimal region of interest we will use for the relation computation
- m_MinimalROI=this->ComputeMinimalRegion();
+ m_MinimalROI = this->ComputeMinimalRegion();
/// If they are disjoint, the answer is trivial
- if ((m_MinimalROI.GetSize()[0]<=1)||(m_MinimalROI.GetSize()[1]<=1))
- {
+ if ((m_MinimalROI.GetSize()[0] <= 1) || (m_MinimalROI.GetSize()[1] <= 1))
+ {
/// The relation is DC
- m_Value=OTB_RCC8_DC;
+ m_Value = OTB_RCC8_DC;
// otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): Disjoint regions");
- }
+ }
else
- {
+ {
/// else each input images is cast to boolean type and reduced to
// the minimal region
- m_BoolImage1=ConvertToBoolImage(this->GetInput1(),m_InsideValue1);
- m_BoolImage2=ConvertToBoolImage(this->GetInput2(),m_InsideValue2);
+ m_BoolImage1 = ConvertToBoolImage(this->GetInput1(), m_InsideValue1);
+ m_BoolImage2 = ConvertToBoolImage(this->GetInput2(), m_InsideValue2);
// otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): Bool images computed: "<<m_BoolImage1->GetLargestPossibleRegion().GetSize());
/// Then the boolean which will be used to determine the relation
/// are declared
- bool edgeEdgeBool,interExterBool,exterInterBool,interInterBool;
+ bool edgeEdgeBool, interExterBool, exterInterBool, interInterBool;
/// The boolean edgeEdge is needed in each case, so it si computed
/// now
edgeEdgeBool = ComputeEdgeEdgeBool();
@@ -450,60 +454,60 @@ ImageToImageRCC8Calculator<TInputImage>
//TODELETE std::cout<<"RCC8Calculator->GenerateData(): edgeEdge "<<edgeEdgeBool<<std::endl;
/// Here comes the outside knowledge
if (this->GetLevel1APrioriKnowledge())
- {
+ {
/// If the Level1APrioriKnowledge is set, then the
/// interExterBool is set to true
// otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): Level1APrioriKnowledge.");
- interExterBool=true;
- }
+ interExterBool = true;
+ }
else
- {
+ {
/// Else it must be computed
interExterBool = ComputeInterExterBool();
// otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): interExter "<<interExterBool);
- }
+ }
/// At this stage we can determine if the relation is of type NTPP
//TODELETE std::cout<<"RCC8Calculator->GenerateData(): interExter "<<interExterBool<<std::endl;
- if ((!interExterBool)&&(!edgeEdgeBool))
- {
- m_Value=OTB_RCC8_NTPP;
- }
+ if ((!interExterBool) && (!edgeEdgeBool))
+ {
+ m_Value = OTB_RCC8_NTPP;
+ }
else
- {
+ {
/// If not, we must consider the intersection between exterior
if (this->GetLevel3APrioriKnowledge())
- {
+ {
/// If the Level3APRioriKnowledge flag is set, this boolean
/// can be determined from the two others
// otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): Level3APrioriKnowledge.");
- exterInterBool=true;
- }
+ exterInterBool = true;
+ }
else
- {
+ {
/// Else it must be computed
exterInterBool = ComputeExterInterBool();
// otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): ExterInter "<<exterInterBool);
- }
+ }
//TODELETE std::cout<<"RCC8Calculator->GenerateData(): ExterInter "<<exterInterBool<<std::endl;
/// If it is not sufficient to compute the relation
- if (!ComputeRelation(edgeEdgeBool,interExterBool,exterInterBool))
- {
+ if (!ComputeRelation(edgeEdgeBool, interExterBool, exterInterBool))
+ {
/// Compute the last boolean
interInterBool = ComputeInterInterBool();
//TODELETE std::cout<<"RCC8Calculator->GenerateData(): InterInter "<<interInterBool<<std::endl;
// otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): InterInter "<<interInterBool);
/// Which allow the full determination
- if ((interExterBool)&&(edgeEdgeBool)&&(exterInterBool)&&(!interInterBool))
- {
- m_Value=OTB_RCC8_EC;
- }
+ if ((interExterBool) && (edgeEdgeBool) && (exterInterBool) && (!interInterBool))
+ {
+ m_Value = OTB_RCC8_EC;
+ }
else
- {
- m_Value=OTB_RCC8_PO;
+ {
+ m_Value = OTB_RCC8_PO;
+ }
}
}
}
- }
}
/**
* PrintSelf method
@@ -511,13 +515,11 @@ ImageToImageRCC8Calculator<TInputImage>
template<class TInputImage>
void
ImageToImageRCC8Calculator<TInputImage>
-::PrintSelf( std::ostream& os,itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace itk
#endif
-
-
diff --git a/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.h b/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.h
index 3211927cd6..3a5500eed2 100644
--- a/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.h
+++ b/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.h
@@ -24,7 +24,6 @@
#include "otbRCC8InEdgeIterator.h"
#include "otbRCC8OutEdgeIterator.h"
-
namespace otb
{
/**
@@ -34,7 +33,7 @@ namespace otb
*/
template <class TPolygonList, class TOutputGraph>
class ITK_EXPORT PolygonListToRCC8GraphFilter
- : public RCC8GraphSource<TOutputGraph>
+ : public RCC8GraphSource<TOutputGraph>
{
public:
/** Standard class typedefs. */
@@ -45,7 +44,7 @@ public:
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(PolygonListToRCC8GraphFilter,RCC8GraphSource);
+ itkTypeMacro(PolygonListToRCC8GraphFilter, RCC8GraphSource);
/** Input related typedef */
typedef TPolygonList PolygonListType;
@@ -54,37 +53,37 @@ public:
typedef typename PolygonType::Pointer PolygonPointerType;
/** Output related typedefs */
- typedef TOutputGraph OutputGraphType;
- typedef typename OutputGraphType::Pointer OutputGraphPointerType;
- typedef typename OutputGraphType::VertexType VertexType;
- typedef typename VertexType::Pointer VertexPointerType;
- typedef typename VertexType::PathType PathType;
+ typedef TOutputGraph OutputGraphType;
+ typedef typename OutputGraphType::Pointer OutputGraphPointerType;
+ typedef typename OutputGraphType::VertexType VertexType;
+ typedef typename VertexType::Pointer VertexPointerType;
+ typedef typename VertexType::PathType PathType;
typedef typename OutputGraphType::VertexDescriptorType VertexDescriptorType;
/** Knowledge enum typedef */
- typedef typename OutputGraphType::RCC8ValueType RCC8ValueType;
- typedef enum {NO_INFO,LEVEL_1,LEVEL_3,FULL} KnowledgeValueType;
- typedef std::pair<KnowledgeValueType,RCC8ValueType> KnowledgeStateType;
+ typedef typename OutputGraphType::RCC8ValueType RCC8ValueType;
+ typedef enum {NO_INFO, LEVEL_1, LEVEL_3, FULL} KnowledgeValueType;
+ typedef std::pair<KnowledgeValueType, RCC8ValueType> KnowledgeStateType;
/** RCC8 calculator typedef */
typedef PolygonToPolygonRCC8Calculator<PolygonType> RCC8CalculatorType;
/** Graph iterators typedefs */
- typedef RCC8VertexIterator<OutputGraphType> VertexIteratorType;
- typedef RCC8InEdgeIterator<OutputGraphType> InEdgeIteratorType;
- typedef RCC8OutEdgeIterator<OutputGraphType> OutEdgeIteratorType;
+ typedef RCC8VertexIterator<OutputGraphType> VertexIteratorType;
+ typedef RCC8InEdgeIterator<OutputGraphType> InEdgeIteratorType;
+ typedef RCC8OutEdgeIterator<OutputGraphType> OutEdgeIteratorType;
- typedef std::pair<unsigned int, unsigned int> EdgePairType;
- typedef std::map<EdgePairType,RCC8ValueType> EdgeMapType;
- typedef std::vector<EdgeMapType> EdgeMapVectorType;
+ typedef std::pair<unsigned int, unsigned int> EdgePairType;
+ typedef std::map<EdgePairType, RCC8ValueType> EdgeMapType;
+ typedef std::vector<EdgeMapType> EdgeMapVectorType;
- typedef std::vector<unsigned int> SegmentationRangesType;
+ typedef std::vector<unsigned int> SegmentationRangesType;
/** Toogle optimisation flag */
itkBooleanMacro(Optimisation);
- itkSetMacro(Optimisation,bool);
+ itkSetMacro(Optimisation, bool);
itkBooleanMacro(UseInverted);
- itkSetMacro(UseInverted,bool);
+ itkSetMacro(UseInverted, bool);
void SetSegmentationRanges(SegmentationRangesType ranges)
{
@@ -109,7 +108,7 @@ public:
unsigned int GetNumberOfRelations(void);
/** Set the input of the filter */
- virtual void SetInput( const PolygonListType *input);
+ virtual void SetInput(const PolygonListType *input);
/** Get the input of the filter */
const PolygonListType * GetInput(void);
@@ -129,12 +128,12 @@ protected:
/** startIndex and stopIndex represent the indeces of the vertex to
examine in thread threadId */
- virtual void ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex,int threadId);
+ virtual void ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex, int threadId);
/** Static function used as a "callback" by the MultiThreader. The threading
* library will call this routine for each thread, which will delegate the
* control to ThreadedGenerateData(). */
- static ITK_THREAD_RETURN_TYPE ThreaderCallback( void *arg );
+ static ITK_THREAD_RETURN_TYPE ThreaderCallback(void *arg);
/** Internal structure used for passing image data into the threading library */
struct ThreadStruct
@@ -142,7 +141,6 @@ protected:
Pointer Filter;
};
-
/** End Multi-threading implementation */
/** PrintSelf method */
@@ -157,8 +155,8 @@ protected:
private:
/** Optimisation flag */
- bool m_Optimisation;
- unsigned int m_Accumulator[8];
+ bool m_Optimisation;
+ unsigned int m_Accumulator[8];
EdgeMapVectorType m_EdgesPerThread;
/** This array stores the indices corresponding to each segmentation */
diff --git a/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.txx b/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.txx
index 1ac78b9b38..23db77f973 100644
--- a/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.txx
+++ b/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.txx
@@ -31,8 +31,8 @@ PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
::PolygonListToRCC8GraphFilter()
{
this->SetNumberOfRequiredInputs(1);
- m_Optimisation=false;
- m_UseInverted=false;
+ m_Optimisation = false;
+ m_UseInverted = false;
}
/**
* Destructor.
@@ -49,7 +49,7 @@ PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
{
// Process object is not const-correct so the const_cast is required here
this->itk::ProcessObject::SetNthInput(0,
- const_cast< PolygonListType * >( input ) );
+ const_cast<PolygonListType *>(input));
}
template <class TPolygonList, class TOutputGraph>
@@ -58,15 +58,14 @@ PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
::GetInput(void)
{
if (this->GetNumberOfInputs() < 1)
- {
+ {
return 0;
- }
+ }
- return static_cast<const TPolygonList * >
- (this->itk::ProcessObject::GetInput(0) );
+ return static_cast<const TPolygonList *>
+ (this->itk::ProcessObject::GetInput(0));
}
-
template <class TPolygonList, class TOutputGraph>
unsigned int
PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
@@ -75,18 +74,17 @@ PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
return m_Accumulator[val];
}
-
template <class TPolygonList, class TOutputGraph>
unsigned int
PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
::GetNumberOfRelations()
{
unsigned int result = 0;
- for (unsigned int i = 0;i<8;++i)
- {
- result+=m_Accumulator[i];
+ for (unsigned int i = 0; i < 8; ++i)
+ {
+ result += m_Accumulator[i];
- }
+ }
return result;
}
template <class TPolygonList, class TOutputGraph>
@@ -95,53 +93,53 @@ typename PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
::GetKnowledge(RCC8ValueType r1, RCC8ValueType r2)
{
- m_Accumulator[0]=0;
- m_Accumulator[1]=0;
- m_Accumulator[2]=0;
- m_Accumulator[3]=0;
- m_Accumulator[4]=0;
- m_Accumulator[5]=0;
- m_Accumulator[6]=0;
- m_Accumulator[7]=0;
+ m_Accumulator[0] = 0;
+ m_Accumulator[1] = 0;
+ m_Accumulator[2] = 0;
+ m_Accumulator[3] = 0;
+ m_Accumulator[4] = 0;
+ m_Accumulator[5] = 0;
+ m_Accumulator[6] = 0;
+ m_Accumulator[7] = 0;
// otbMsgDebugMacro(<<"RCC8GraphFilter: entering GetKnowledge method.");
// This is the RCC8 composition table
const int knowledge[8][8]
- =
- {
+ =
+ {
/** DC EC PO TPP TPPi NTPP i EQ */
- /** DC */ {-3, -2, -2, -2, 0, -2, 0, 0},
+ /** DC */ {-3, -2, -2, -2, 0, -2, 0, 0},
/** EC */ {-1, -3, -2, -3, -1, -3, 0, 1},
/** PO */ {-1, -1, -3, -3, -1, -3, -1, 2},
/** TPP */ { 0, -1, -2, -3, -3, 5, -1, 3},
/** TPPi*/ {-1, -1, -1, -3, -1, -3, 6, 4},
/** NTPP*/ { 0, 0, -2, 5, -2, 5, -3, 5},
- /** NTPPi*/{-1, -1, -1, -1, 6, -3, 6, 6},
+ /** NTPPi*/ {-1, -1, -1, -1, 6, -3, 6, 6},
/** EQ */ { 0, 1, 2, 3, 4, 5, 6, 7}
- };
+ };
int value = knowledge[r1][r2];
// Each negative case correspond to a level of knowledge
- if (value>=0)
- {
+ if (value >= 0)
+ {
// otbMsgDebugMacro(<<"RCC8GraphFilter: leaving GetKnowledge method: FULL");
- return KnowledgeStateType(FULL,static_cast<RCC8ValueType>(value));
- }
- else if (value==-1)
- {
+ return KnowledgeStateType(FULL, static_cast<RCC8ValueType>(value));
+ }
+ else if (value == -1)
+ {
// otbMsgDebugMacro(<<"RCC8GraphFilter: leaving GetKnowledge method: LEVEL_1");
- return KnowledgeStateType(LEVEL_1,OTB_RCC8_DC);
- }
- else if (value==-2)
- {
+ return KnowledgeStateType(LEVEL_1, OTB_RCC8_DC);
+ }
+ else if (value == -2)
+ {
// otbMsgDebugMacro(<<"RCC8GraphFilter: leaving GetKnowledge method.LEVEL_3");
- return KnowledgeStateType(LEVEL_3,OTB_RCC8_DC);
- }
+ return KnowledgeStateType(LEVEL_3, OTB_RCC8_DC);
+ }
else
- {
+ {
// otbMsgDebugMacro(<<"RCC8GraphFilter: leaving GetKnowledge method.NO_INFO");
- return KnowledgeStateType(NO_INFO,OTB_RCC8_DC);
- }
+ return KnowledgeStateType(NO_INFO, OTB_RCC8_DC);
+ }
}
/**
* Main computation method.
@@ -162,7 +160,7 @@ PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
// // Initializing edges vectors per thread
EdgeMapType defaultEdgeMap;
- m_EdgesPerThread = EdgeMapVectorType(this->GetNumberOfThreads(),defaultEdgeMap);
+ m_EdgesPerThread = EdgeMapVectorType(this->GetNumberOfThreads(), defaultEdgeMap);
// Setting up multithreader
this->GetMultiThreader()->SetNumberOfThreads(this->GetNumberOfThreads());
@@ -176,14 +174,13 @@ PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
this->AfterThreadedGenerateData();
}
-
template <class TPolygonList, class TOutputGraph>
void
PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
::BeforeThreadedGenerateData()
{
// Ouptut graph pointer
- OutputGraphPointerType graph = this->GetOutput();
+ OutputGraphPointerType graph = this->GetOutput();
PolygonListConstPointerType inputPtr = this->GetInput();
// Initializing output graph
@@ -193,12 +190,12 @@ PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
// Vertex indexes
unsigned int nbVertices = 0;
- typedef typename PolygonListType::ConstIterator PolygonListConstIteratorType;
+ typedef typename PolygonListType::ConstIterator PolygonListConstIteratorType;
// Loads the polygons list to graph nodes
for (PolygonListConstIteratorType it = inputPtr->Begin();
- it!=inputPtr->End();++it)
- {
+ it != inputPtr->End(); ++it)
+ {
// Create a new vertex
VertexPointerType vertex = VertexType::New();
// Set its properties
@@ -208,40 +205,40 @@ PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
unsigned int segIndex = 1;
- while (segIndex < m_SegmentationRanges.size() && (nbVertices<m_SegmentationRanges[segIndex-1] || nbVertices >= m_SegmentationRanges[segIndex]))
- {
+ while (segIndex < m_SegmentationRanges.size() &&
+ (nbVertices < m_SegmentationRanges[segIndex - 1] || nbVertices >= m_SegmentationRanges[segIndex]))
+ {
++segIndex;
- }
+ }
- vertex->SetSegmentationLevel(segIndex-1);
+ vertex->SetSegmentationLevel(segIndex - 1);
// Put it in the graph
- graph->SetVertex(nbVertices,vertex);
- otbMsgDevMacro(<<"Adding vertex: " <<nbVertices);
+ graph->SetVertex(nbVertices, vertex);
+ otbMsgDevMacro(<< "Adding vertex: " << nbVertices);
++nbVertices;
- }
+ }
}
template <class TPolygonList, class TOutputGraph>
void
PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
-::ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex,int threadId)
+::ThreadedGenerateData(unsigned int startIndex, unsigned int stopIndex, int threadId)
{
//std::cout<<"Starting thread "<<threadId <<" to work on range ["<<startIndex<<", "<<stopIndex<<"]"<<std::endl;
// Ouptut graph pointer
- OutputGraphPointerType graph = this->GetOutput();
+ OutputGraphPointerType graph = this->GetOutput();
PolygonListConstPointerType inputPtr = this->GetInput();
// invert value vector
- RCC8ValueType invert[8]={OTB_RCC8_DC,OTB_RCC8_EC,OTB_RCC8_PO,OTB_RCC8_TPPI,
- OTB_RCC8_TPP,OTB_RCC8_NTPPI,OTB_RCC8_NTPP,OTB_RCC8_EQ
- };
+ RCC8ValueType invert[8] = {OTB_RCC8_DC, OTB_RCC8_EC, OTB_RCC8_PO, OTB_RCC8_TPPI,
+ OTB_RCC8_TPP, OTB_RCC8_NTPPI, OTB_RCC8_NTPP, OTB_RCC8_EQ};
unsigned int nbVertices = graph->GetNumberOfVertices();
- itk::ProgressReporter progress(this,threadId,((int)stopIndex-(int)startIndex)*nbVertices);
+ itk::ProgressReporter progress(this, threadId, ((int) stopIndex - (int) startIndex)*nbVertices);
- otbMsgDevMacro(<<"Adjacency matrix size: "<<nbVertices*nbVertices);
+ otbMsgDevMacro(<< "Adjacency matrix size: " << nbVertices * nbVertices);
VertexIteratorType vIt1(graph);
VertexIteratorType vIt2(graph);
@@ -249,126 +246,125 @@ PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
unsigned int count = 0;
// For each couple of vertices
- for (vIt1.GoToBegin();!vIt1.IsAtEnd();++vIt1)
- {
+ for (vIt1.GoToBegin(); !vIt1.IsAtEnd(); ++vIt1)
+ {
// TODO: this is not correct and should be replaced by a
// vIt1(graph, index1, index2), which does not exist for the moment
- if ((count>=startIndex) && (count<stopIndex))
- {
- for (vIt2.GoToBegin();!vIt2.IsAtEnd();++vIt2)
+ if ((count >= startIndex) && (count < stopIndex))
{
- //We do not examine each couple because of the RCC8 symmetry
- if (vIt1.GetIndex()<vIt2.GetIndex())
+ for (vIt2.GoToBegin(); !vIt2.IsAtEnd(); ++vIt2)
{
+ //We do not examine each couple because of the RCC8 symmetry
+ if (vIt1.GetIndex() < vIt2.GetIndex())
+ {
// Compute the RCC8 relation
typename RCC8CalculatorType::Pointer calc = RCC8CalculatorType::New();
calc->SetPolygon1(vIt1.Get()->GetPath());
calc->SetPolygon2(vIt2.Get()->GetPath());
- RCC8ValueType value=OTB_RCC8_DC;
+ RCC8ValueType value = OTB_RCC8_DC;
// if the optimisations are activated
if (m_Optimisation)
- {
+ {
// otbMsgDebugMacro(<<"RCC8GraphFilter: Entering optimisation loop");
- InEdgeIteratorType inIt1(vIt1.GetIndex(),graph);
- InEdgeIteratorType inIt2(vIt2.GetIndex(),graph);
+ InEdgeIteratorType inIt1(vIt1.GetIndex(), graph);
+ InEdgeIteratorType inIt2(vIt2.GetIndex(), graph);
// otbMsgDebugMacro(<<"Optimisation loop: iterators initialised");
VertexDescriptorType betweenIndex;
- KnowledgeStateType know(NO_INFO,OTB_RCC8_DC);
+ KnowledgeStateType know(NO_INFO, OTB_RCC8_DC);
inIt1.GoToBegin();
// Iterate through the edges going to the first vertex
- while (!inIt1.IsAtEnd()&&(know.first!=FULL))
- {
+ while (!inIt1.IsAtEnd() && (know.first != FULL))
+ {
betweenIndex = inIt1.GetSourceIndex();
inIt2.GoToBegin();
bool edgeFound = false;
- while (!inIt2.IsAtEnd()&&(know.first!=FULL))
- {
+ while (!inIt2.IsAtEnd() && (know.first != FULL))
+ {
// try to find an intermediate vertex between the two ones which
// we vant to compute the relationship
- if (inIt2.GetSourceIndex()==betweenIndex)
- {
+ if (inIt2.GetSourceIndex() == betweenIndex)
+ {
// if an intermediate vertex is found
edgeFound = true;
// otbMsgDebugMacro(<<"Optimisation loop: found an intermediary vertex:" <<betweenIndex);
// See if it brings some info on the RCCC8 value
- know = GetKnowledge(invert[inIt1.GetValue()],inIt2.GetValue());
- calc->SetLevel1APrioriKnowledge(know.first==LEVEL_1);
- calc->SetLevel3APrioriKnowledge(know.first==LEVEL_3);
+ know = GetKnowledge(invert[inIt1.GetValue()], inIt2.GetValue());
+ calc->SetLevel1APrioriKnowledge(know.first == LEVEL_1);
+ calc->SetLevel3APrioriKnowledge(know.first == LEVEL_3);
// otbMsgDebugMacro(<<"Optimisation loop: knowledge: "<<know.first<<","<<know.second);
- }
+ }
++inIt2;
- }
+ }
// If no intermediate was found
if (!edgeFound)
- {
+ {
// otbMsgDebugMacro(<<"Optimisation loop: found an intermediary vertex:" <<betweenIndex);
// Try using a DC relationship
- know = GetKnowledge(invert[inIt1.GetValue()],OTB_RCC8_DC);
- calc->SetLevel1APrioriKnowledge(know.first==LEVEL_1);
- calc->SetLevel3APrioriKnowledge(know.first==LEVEL_3);
+ know = GetKnowledge(invert[inIt1.GetValue()], OTB_RCC8_DC);
+ calc->SetLevel1APrioriKnowledge(know.first == LEVEL_1);
+ calc->SetLevel3APrioriKnowledge(know.first == LEVEL_3);
// otbMsgDebugMacro(<<"Optimisation loop: knowledge: "<<know.first<<","<<know.second);
- }
+ }
++inIt1;
- }
+ }
// If the search has fully determined the RCC8
- if (know.first==FULL)
- {
+ if (know.first == FULL)
+ {
// Get the value
- value=know.second;
- }
+ value = know.second;
+ }
else
- {
+ {
// Else trigger the computation
// (which will take the optimisation phase info into account)
calc->Compute();
- value=calc->GetValue();
- }
+ value = calc->GetValue();
+ }
// otbMsgDebugMacro(<<"RCC8GraphFilter: Leaving optimisation loop");
- }
+ }
// If the optimisations are not activated
else
- {
+ {
calc->Compute();
- value=calc->GetValue();
- }
- m_Accumulator[value]+=1;
- m_Accumulator[invert[value]]+=1;
+ value = calc->GetValue();
+ }
+ m_Accumulator[value] += 1;
+ m_Accumulator[invert[value]] += 1;
// If the vertices are connected
- if (value>OTB_RCC8_DC)
- {
+ if (value > OTB_RCC8_DC)
+ {
// Add the edge to the graph.
- otbMsgDevMacro(<<"Adding edge: "<<vIt1.GetIndex()<<" -> "<<vIt2.GetIndex()<<": "<<value);
- if(value==OTB_RCC8_NTPPI)
+ otbMsgDevMacro(<< "Adding edge: " << vIt1.GetIndex() << " -> " << vIt2.GetIndex() << ": " << value);
+ if (value == OTB_RCC8_NTPPI)
{
- m_EdgesPerThread[threadId][EdgePairType(vIt2.GetIndex(),vIt1.GetIndex())]=OTB_RCC8_NTPP;
+ m_EdgesPerThread[threadId][EdgePairType(vIt2.GetIndex(), vIt1.GetIndex())] = OTB_RCC8_NTPP;
}
- else if(value == OTB_RCC8_TPPI)
+ else if (value == OTB_RCC8_TPPI)
{
- m_EdgesPerThread[threadId][EdgePairType(vIt2.GetIndex(),vIt1.GetIndex())]=OTB_RCC8_TPP;
+ m_EdgesPerThread[threadId][EdgePairType(vIt2.GetIndex(), vIt1.GetIndex())] = OTB_RCC8_TPP;
}
else
{
- m_EdgesPerThread[threadId][EdgePairType(vIt1.GetIndex(),vIt2.GetIndex())]=value;
+ m_EdgesPerThread[threadId][EdgePairType(vIt1.GetIndex(), vIt2.GetIndex())] = value;
}
if (m_UseInverted)
- {
- m_EdgesPerThread[threadId][EdgePairType(vIt2.GetIndex(),vIt1.GetIndex())]=invert[value];
+ {
+ m_EdgesPerThread[threadId][EdgePairType(vIt2.GetIndex(), vIt1.GetIndex())] = invert[value];
+ }
}
}
- }
progress.CompletedPixel();
progress.CompletedPixel();
+ }
}
- }
++count;
- }
- otbMsgDebugMacro(<<"End thread "<<threadId);
+ }
+ otbMsgDebugMacro(<< "End thread " << threadId);
}
-
template <class TPolygonList, class TOutputGraph>
void
PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
@@ -379,63 +375,67 @@ PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
// order
OutputGraphPointerType graph = this->GetOutput();
- EdgeMapType globalEdgeMap;
+ EdgeMapType globalEdgeMap;
// merge all edges
for (typename EdgeMapVectorType::iterator vIt = m_EdgesPerThread.begin();
- vIt!=m_EdgesPerThread.end();++vIt)
- {
- for (typename EdgeMapType::iterator mIt = (*vIt).begin();
- mIt != (*vIt).end();++mIt)
+ vIt != m_EdgesPerThread.end(); ++vIt)
{
- globalEdgeMap[mIt->first]=mIt->second;
+ for (typename EdgeMapType::iterator mIt = (*vIt).begin();
+ mIt != (*vIt).end(); ++mIt)
+ {
+ globalEdgeMap[mIt->first] = mIt->second;
+ }
}
- }
// Report edges to the graph
for (typename EdgeMapType::iterator mIt = globalEdgeMap.begin();
- mIt != globalEdgeMap.end();++mIt)
- {
- graph->AddEdge(mIt->first.first,mIt->first.second,mIt->second);
- }
+ mIt != globalEdgeMap.end(); ++mIt)
+ {
+ graph->AddEdge(mIt->first.first, mIt->first.second, mIt->second);
+ }
}
// Callback routine used by the threading library. This routine just calls
// the ThreadedGenerateData method after setting the correct region for this
// thread.
-
template <class TPolygonList, class TOutputGraph>
ITK_THREAD_RETURN_TYPE
PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
-::ThreaderCallback( void *arg )
+::ThreaderCallback(void *arg)
{
ThreadStruct *str;
- int threadId, threadCount;
- unsigned int total,start, stop;
+ int threadId, threadCount;
+ unsigned int total, start, stop;
- threadId = ((itk::MultiThreader::ThreadInfoStruct *)(arg))->ThreadID;
- threadCount = ((itk::MultiThreader::ThreadInfoStruct *)(arg))->NumberOfThreads;
- str = (ThreadStruct *)(((itk::MultiThreader::ThreadInfoStruct *)(arg))->UserData);
+ threadId = ((itk::MultiThreader::ThreadInfoStruct *) (arg))->ThreadID;
+ threadCount = ((itk::MultiThreader::ThreadInfoStruct *) (arg))->NumberOfThreads;
+ str = (ThreadStruct *) (((itk::MultiThreader::ThreadInfoStruct *) (arg))->UserData);
total = str->Filter->GetOutput()->GetNumberOfVertices();
if (threadId < static_cast<int>(total))
- {
+ {
// Split the adjacency matrix in strip of equal dimension
- start = static_cast<unsigned int>(vcl_floor(total*vcl_sqrt(static_cast<double>(threadId)/static_cast<double>(threadCount))+0.5));
- stop = static_cast<unsigned int>(vcl_floor(total*vcl_sqrt(static_cast<double>(threadId+1)/static_cast<double>(threadCount))+0.5));
- if (stop > total)
- stop = total;
+ start =
+ static_cast<unsigned int>(vcl_floor(total *
+ vcl_sqrt(static_cast<double>(threadId) /
+ static_cast<double>(threadCount)) + 0.5));
+ stop =
+ static_cast<unsigned int>(vcl_floor(total *
+ vcl_sqrt(static_cast<double>(threadId +
+ 1) / static_cast<double>(threadCount)) + 0.5));
+ if (stop > total) stop = total;
// For very small graphs it might occur that start = stop. In this
// case the vertex at that index will be processed in the next strip.
- if (start!=stop)
- {
+ if (start != stop)
+ {
str->Filter->ThreadedGenerateData(start, stop, threadId);
+ }
}
- }
// else
// {
// otherwise don't use this thread. Sometimes the threads dont
@@ -455,4 +455,3 @@ PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
}
} // end namespace otb
#endif
-
diff --git a/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.h b/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.h
index 13f87b0725..39404ec251 100644
--- a/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.h
+++ b/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.h
@@ -50,22 +50,22 @@ class ITK_EXPORT PolygonToPolygonRCC8Calculator : public itk::Object
public:
/** Standard class typedefs. */
typedef PolygonToPolygonRCC8Calculator Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(PolygonToPolygonRCC8Calculator,Object);
+ itkTypeMacro(PolygonToPolygonRCC8Calculator, Object);
/** Types definitions for the input image. */
- typedef TInputPolygon PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
- typedef typename PolygonType::ConstPointer PolygonConstPointerType;
- typedef typename PolygonType::VertexListType VertexListType;
- typedef typename PolygonType::ContinuousIndexType ContinuousIndexType;
+ typedef TInputPolygon PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef typename PolygonType::ConstPointer PolygonConstPointerType;
+ typedef typename PolygonType::VertexListType VertexListType;
+ typedef typename PolygonType::ContinuousIndexType ContinuousIndexType;
typedef typename PolygonType::RegionType::ImageRegionType RegionType;
- typedef typename VertexListType::ConstIterator VertexListConstIteratorType;
- typedef std::vector<bool> BoolVectorType;
+ typedef typename VertexListType::ConstIterator VertexListConstIteratorType;
+ typedef std::vector<bool> BoolVectorType;
/** RCC8 values type */
typedef RCC8Value RCC8ValueType;
@@ -77,22 +77,22 @@ public:
RCC8ValueType GetValue(void);
/** Set external knowledge to help the decision process */
- itkSetMacro(Level1APrioriKnowledge,bool);
- itkSetMacro(Level3APrioriKnowledge,bool);
- itkGetMacro(Level1APrioriKnowledge,bool);
- itkGetMacro(Level3APrioriKnowledge,bool);
+ itkSetMacro(Level1APrioriKnowledge, bool);
+ itkSetMacro(Level3APrioriKnowledge, bool);
+ itkGetMacro(Level1APrioriKnowledge, bool);
+ itkGetMacro(Level3APrioriKnowledge, bool);
- itkSetObjectMacro(Polygon1,PolygonType);
- itkSetObjectMacro(Polygon2,PolygonType);
- itkGetObjectMacro(Polygon1,PolygonType);
- itkGetObjectMacro(Polygon2,PolygonType);
+ itkSetObjectMacro(Polygon1, PolygonType);
+ itkSetObjectMacro(Polygon2, PolygonType);
+ itkGetObjectMacro(Polygon1, PolygonType);
+ itkGetObjectMacro(Polygon2, PolygonType);
/** Main computation method */
void Compute(void);
virtual bool ComputeRelation(bool edgeEdgeBool, bool interExterBool, bool exterInterBool);
- virtual bool ComputeInterExter(PolygonPointerType path1,PolygonPointerType path2);
+ virtual bool ComputeInterExter(PolygonPointerType path1, PolygonPointerType path2);
virtual bool ComputeEdgeEdge(PolygonPointerType path1, PolygonPointerType path2);
@@ -104,7 +104,7 @@ protected:
/** Constructor */
PolygonToPolygonRCC8Calculator();
/** Destructor */
- virtual ~PolygonToPolygonRCC8Calculator() {};
+ virtual ~PolygonToPolygonRCC8Calculator() {}
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
diff --git a/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.txx b/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.txx
index 86bd0497f7..7b24a118ad 100644
--- a/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.txx
+++ b/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.txx
@@ -31,8 +31,8 @@ PolygonToPolygonRCC8Calculator<TInputPolygon>
::PolygonToPolygonRCC8Calculator()
{
m_Value = OTB_RCC8_DC;
- m_Level1APrioriKnowledge=false;
- m_Level3APrioriKnowledge=false;
+ m_Level1APrioriKnowledge = false;
+ m_Level3APrioriKnowledge = false;
}
/**
* Get the RCC8 relation.
@@ -57,70 +57,70 @@ PolygonToPolygonRCC8Calculator<TInputPolygon>
RegionType region2 = m_Polygon2->GetBoundingRegion().GetImageRegion();
// If intersection is not null, we have to do the computation
- if (!RegionsIntersectionIsNull(region1,region2))
- {
+ if (!RegionsIntersectionIsNull(region1, region2))
+ {
- bool edgeEdgeBool,interExterBool,exterInterBool,interInterBool;
+ bool edgeEdgeBool, interExterBool, exterInterBool, interInterBool;
/// The boolean edgeEdge is needed in each case, so it si computed
/// now
- edgeEdgeBool = ComputeEdgeEdge(m_Polygon1,m_Polygon2);
+ edgeEdgeBool = ComputeEdgeEdge(m_Polygon1, m_Polygon2);
//std::cout<<"EdgeEdge: "<<edgeEdgeBool<<std::endl;
if (this->GetLevel1APrioriKnowledge())
- {
- interExterBool=true;
- }
+ {
+ interExterBool = true;
+ }
else
- {
+ {
/// Else it must be computed
- interExterBool = ComputeInterExter(m_Polygon1,m_Polygon2);
- }
+ interExterBool = ComputeInterExter(m_Polygon1, m_Polygon2);
+ }
//std::cout<<"InterExter: "<<interExterBool<<std::endl;
/// At this stage we can determine if the relation is of type NTPP
- if ((!interExterBool)&&(!edgeEdgeBool))
- {
- m_Value=OTB_RCC8_NTPP;
- }
+ if ((!interExterBool) && (!edgeEdgeBool))
+ {
+ m_Value = OTB_RCC8_NTPP;
+ }
else
- {
+ {
/// If not, we must consider the intersection between exterior
if (this->GetLevel3APrioriKnowledge())
- {
+ {
/// If the Level3APRioriKnowledge flag is set, this boolean
/// can be determined from the two others
- exterInterBool=true;
- }
+ exterInterBool = true;
+ }
else
- {
+ {
/// Else it must be computed
- exterInterBool = ComputeInterExter(m_Polygon2,m_Polygon1);
- }
+ exterInterBool = ComputeInterExter(m_Polygon2, m_Polygon1);
+ }
//std::cout<<"ExterInter: "<<exterInterBool<<std::endl;
/// If it is not sufficient to compute the relation
- if (!ComputeRelation(edgeEdgeBool,interExterBool,exterInterBool))
- {
+ if (!ComputeRelation(edgeEdgeBool, interExterBool, exterInterBool))
+ {
/// Compute the last boolean
- interInterBool = ComputeInterInter(m_Polygon1,m_Polygon2);
+ interInterBool = ComputeInterInter(m_Polygon1, m_Polygon2);
//std::cout<<"InterInter: "<<interInterBool<<std::endl;
/// Which allow the full determination
- if ((interExterBool)&&(edgeEdgeBool)&&(exterInterBool)&&(!interInterBool))
- {
- m_Value=OTB_RCC8_EC;
- }
+ if ((interExterBool) && (edgeEdgeBool) && (exterInterBool) && (!interInterBool))
+ {
+ m_Value = OTB_RCC8_EC;
+ }
else
- {
- m_Value=OTB_RCC8_PO;
+ {
+ m_Value = OTB_RCC8_PO;
+ }
}
}
}
- }
}
template<class TInputPolygon>
@@ -128,56 +128,55 @@ bool
PolygonToPolygonRCC8Calculator<TInputPolygon>
::RegionsIntersectionIsNull(const RegionType& region1, const RegionType& region2)
{
- for (unsigned int dim = 0; dim<RegionType::ImageDimension;++dim)
- {
- if (region1.GetIndex()[dim]+static_cast<int>(region1.GetSize()[dim]) < region2.GetIndex()[dim])
+ for (unsigned int dim = 0; dim < RegionType::ImageDimension; ++dim)
{
+ if (region1.GetIndex()[dim] + static_cast<int>(region1.GetSize()[dim]) < region2.GetIndex()[dim])
+ {
return true;
- }
- else if (region2.GetIndex()[dim]+static_cast<int>(region2.GetSize()[dim]) < region1.GetIndex()[dim])
- {
+ }
+ else if (region2.GetIndex()[dim] + static_cast<int>(region2.GetSize()[dim]) < region1.GetIndex()[dim])
+ {
return true;
+ }
}
- }
return false;
}
-
template<class TInputPolygon>
bool
PolygonToPolygonRCC8Calculator<TInputPolygon>
::ComputeRelation(bool edgeEdgeBool, bool interExterBool, bool exterInterBool)
{
// This decision process is based on a decision tree
- if ((!interExterBool)&&(edgeEdgeBool)&&(!exterInterBool))
- {
- m_Value=OTB_RCC8_EQ;
+ if ((!interExterBool) && (edgeEdgeBool) && (!exterInterBool))
+ {
+ m_Value = OTB_RCC8_EQ;
return true;
- }
- else if ((!interExterBool)&&(edgeEdgeBool)&&(exterInterBool))
- {
- m_Value=OTB_RCC8_TPP;
+ }
+ else if ((!interExterBool) && (edgeEdgeBool) && (exterInterBool))
+ {
+ m_Value = OTB_RCC8_TPP;
return true;
- }
- else if ((interExterBool)&&(!edgeEdgeBool)&&(!exterInterBool))
- {
- m_Value=OTB_RCC8_NTPPI;
+ }
+ else if ((interExterBool) && (!edgeEdgeBool) && (!exterInterBool))
+ {
+ m_Value = OTB_RCC8_NTPPI;
return true;
- }
- else if ((interExterBool)&&(!edgeEdgeBool)&&(exterInterBool))
- {
- m_Value=OTB_RCC8_DC;
+ }
+ else if ((interExterBool) && (!edgeEdgeBool) && (exterInterBool))
+ {
+ m_Value = OTB_RCC8_DC;
return true;
- }
- else if ((interExterBool)&&(edgeEdgeBool)&&(!exterInterBool))
- {
- m_Value=OTB_RCC8_TPPI;
+ }
+ else if ((interExterBool) && (edgeEdgeBool) && (!exterInterBool))
+ {
+ m_Value = OTB_RCC8_TPPI;
return true;
- }
+ }
else
- {
+ {
return false;
- }
+ }
}
template<class TInputPolygon>
@@ -185,102 +184,101 @@ bool
PolygonToPolygonRCC8Calculator<TInputPolygon>
::ComputeInterExter(PolygonPointerType polygon1, PolygonPointerType polygon2)
{
- bool resp = false;
+ bool resp = false;
VertexListConstIteratorType it = polygon1->GetVertexList()->Begin();
VertexListConstIteratorType it_end = polygon1->GetVertexList()->End();
ContinuousIndexType current = it.Value();
ContinuousIndexType first = current;
- bool isInside = polygon2->IsInside(current);
- bool firstIsInside = isInside;
- bool isExterior = !isInside && !polygon2->IsOnEdge(current);
+ bool isInside = polygon2->IsInside(current);
+ bool firstIsInside = isInside;
+ bool isExterior = !isInside && !polygon2->IsOnEdge(current);
//std::cout<<current<<" is inside: "<<isInside<<std::endl;
//std::cout<<current<<" is on edge: "<<polygon2->IsOnEdge(current)<<std::endl;
unsigned int index = 0;
if (isExterior)
- {
+ {
resp = true;
- }
+ }
++it;
while (!resp && it != it_end)
- {
+ {
bool nextIsInside = polygon2->IsInside(it.Value());
if (isInside && nextIsInside)
- {
+ {
//std::cout<<current<<" is inside and "<<it.Value()<<" is inside, nb crossings: "<<polygon2->NbCrossing(current,it.Value())<<std::endl;
- resp = polygon2->NbCrossing(current,it.Value()) >0;
- }
+ resp = polygon2->NbCrossing(current, it.Value()) > 0;
+ }
current = it.Value();
isInside = nextIsInside;
isExterior = !isInside && !polygon2->IsOnEdge(current);
//std::cout<<current<<" is inside: "<<isInside<<std::endl;
//std::cout<<current<<" is on edge: "<<polygon2->IsOnEdge(current)<<std::endl;
if (isExterior)
- {
+ {
resp = true;
- }
+ }
++index;
++it;
- }
+ }
if (!resp && isInside && firstIsInside)
- {
- resp = polygon2->NbCrossing(current,first)>0;
+ {
+ resp = polygon2->NbCrossing(current, first) > 0;
//std::cout<<current<<" is inside and "<<first<<" is inside, nb crossings: "<<polygon2->NbCrossing(current,first)<<std::endl;
- }
+ }
return resp;
}
-
template<class TInputPolygon>
bool
PolygonToPolygonRCC8Calculator<TInputPolygon>
::ComputeInterInter(PolygonPointerType polygon1, PolygonPointerType polygon2)
{
- bool resp = false;
+ bool resp = false;
VertexListConstIteratorType it = polygon1->GetVertexList()->Begin();
VertexListConstIteratorType it_end = polygon1->GetVertexList()->End();
- ContinuousIndexType current = it.Value();
- ContinuousIndexType first = current;
- bool currentIsInside = polygon2->IsInside(current);
- bool firstIsInside = currentIsInside;
+ ContinuousIndexType current = it.Value();
+ ContinuousIndexType first = current;
+ bool currentIsInside = polygon2->IsInside(current);
+ bool firstIsInside = currentIsInside;
if (currentIsInside)
- {
+ {
resp = true;
- }
+ }
++it;
while (!resp && it != it_end)
- {
+ {
bool nextIsInside = polygon2->IsInside(it.Value());
if (!currentIsInside && !nextIsInside && !polygon2->IsOnEdge(current) && !polygon2->IsOnEdge(it.Value()))
- {
- unsigned int nbCrossings = polygon2->NbCrossing(current,it.Value());
+ {
+ unsigned int nbCrossings = polygon2->NbCrossing(current, it.Value());
- resp = nbCrossings>0;
- }
- currentIsInside =nextIsInside;
+ resp = nbCrossings > 0;
+ }
+ currentIsInside = nextIsInside;
current = it.Value();
if (currentIsInside)
- {
+ {
resp = true;
- }
+ }
++it;
- }
+ }
if (!resp && !currentIsInside && !firstIsInside && !polygon2->IsOnEdge(current) && !polygon2->IsOnEdge(first))
- {
- unsigned int nbCrossings = polygon2->NbCrossing(current,first);
+ {
+ unsigned int nbCrossings = polygon2->NbCrossing(current, first);
- resp = nbCrossings>0;
- }
+ resp = nbCrossings > 0;
+ }
return resp;
}
template<class TInputPolygon>
@@ -288,7 +286,7 @@ bool
PolygonToPolygonRCC8Calculator<TInputPolygon>
::ComputeEdgeEdge(PolygonPointerType polygon1, PolygonPointerType polygon2)
{
- bool resp = false;
+ bool resp = false;
VertexListConstIteratorType it = polygon1->GetVertexList()->Begin();
VertexListConstIteratorType it_end = polygon1->GetVertexList()->End();
@@ -298,37 +296,37 @@ PolygonToPolygonRCC8Calculator<TInputPolygon>
ContinuousIndexType first = current;
++it;
- while (! resp && it != it_end)
- {
- if (polygon2->NbTouching(current,it.Value())>0)
+ while (!resp && it != it_end)
{
+ if (polygon2->NbTouching(current, it.Value()) > 0)
+ {
resp = true;
//std::cout<<"NbCrossing: "<<current<<" -> "<<it.Value()<<": "<<polygon2->NbCrossing(current,it.Value())<<std::endl;
- }
- if (polygon2->NbCrossing(current,it.Value())>0)
- {
+ }
+ if (polygon2->NbCrossing(current, it.Value()) > 0)
+ {
resp = true;
//std::cout<<"NbTouching: "<<current<<" -> "<<it.Value()<<": "<<polygon2->NbTouching(current,it.Value())<<std::endl;
- }
+ }
current = it.Value();
if (polygon2->IsOnEdge(current))
- {
+ {
resp = true;
//std::cout<<"IsOnEdge: "<<current<<": "<<polygon2->IsOnEdge(current)<<std::endl;
- }
+ }
++it;
- }
- if (!resp && polygon2->NbTouching(current,first)>0)
- {
+ }
+ if (!resp && polygon2->NbTouching(current, first) > 0)
+ {
resp = true;
//std::cout<<"NbCrossing: "<<current<<" -> "<<first<<": "<<polygon2->NbCrossing(current,first)<<std::endl;
- }
- if (polygon2->NbCrossing(current,first)>0)
- {
+ }
+ if (polygon2->NbCrossing(current, first) > 0)
+ {
resp = true;
//std::cout<<"NbTouching: "<<current<<" -> "<<first<<": "<<polygon2->NbTouching(current,first)<<std::endl;
- }
+ }
return resp;
}
@@ -338,12 +336,10 @@ PolygonToPolygonRCC8Calculator<TInputPolygon>
template<class TInputPolygon>
void
PolygonToPolygonRCC8Calculator<TInputPolygon>
-::PrintSelf( std::ostream& os,itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
#endif
-
-
diff --git a/Code/SpatialReasoning/otbRCC8Edge.cxx b/Code/SpatialReasoning/otbRCC8Edge.cxx
index c9b07d859e..d1f5eefd69 100644
--- a/Code/SpatialReasoning/otbRCC8Edge.cxx
+++ b/Code/SpatialReasoning/otbRCC8Edge.cxx
@@ -31,9 +31,9 @@ RCC8Edge::RCC8Edge()
* PrintSelf method
*/
void
-RCC8Edge::PrintSelf( std::ostream& os,itk::Indent indent ) const
+RCC8Edge::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"RCC8 Value: "<<m_Value<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "RCC8 Value: " << m_Value << std::endl;
}
} // end namespace otb
diff --git a/Code/SpatialReasoning/otbRCC8Edge.h b/Code/SpatialReasoning/otbRCC8Edge.h
index 1106d6972e..fe22bea260 100644
--- a/Code/SpatialReasoning/otbRCC8Edge.h
+++ b/Code/SpatialReasoning/otbRCC8Edge.h
@@ -33,25 +33,25 @@ class ITK_EXPORT RCC8Edge : public itk::DataObject
{
public:
/** Standard class typedefs */
- typedef RCC8Edge Self;
- typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef RCC8Edge Self;
+ typedef itk::DataObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(RCC8Edge,DataObject);
+ itkTypeMacro(RCC8Edge, DataObject);
/** RCC8 values typedef */
typedef RCC8Value RCC8ValueType;
/** RCC8 relation value accessors */
- itkGetMacro(Value,RCC8ValueType);
- itkSetMacro(Value,RCC8ValueType);
+ itkGetMacro(Value, RCC8ValueType);
+ itkSetMacro(Value, RCC8ValueType);
protected:
/** Constructor */
RCC8Edge();
/** Desctructor */
- ~RCC8Edge() {};
+ ~RCC8Edge() {}
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
diff --git a/Code/SpatialReasoning/otbRCC8EdgeIterator.h b/Code/SpatialReasoning/otbRCC8EdgeIterator.h
index 597059d91a..d49e40e3ef 100644
--- a/Code/SpatialReasoning/otbRCC8EdgeIterator.h
+++ b/Code/SpatialReasoning/otbRCC8EdgeIterator.h
@@ -34,13 +34,13 @@ public:
typedef RCC8EdgeIterator Self;
/** Graph typedef */
- typedef TGraph GraphType;
- typedef typename GraphType::InternalGraphType InternalGraphType;
- typedef typename GraphType::Pointer GraphPointerType;
- typedef typename GraphType::EdgePointerType EdgePointerType;
- typedef typename GraphType::VertexPointerType VertexPointerType;
+ typedef TGraph GraphType;
+ typedef typename GraphType::InternalGraphType InternalGraphType;
+ typedef typename GraphType::Pointer GraphPointerType;
+ typedef typename GraphType::EdgePointerType EdgePointerType;
+ typedef typename GraphType::VertexPointerType VertexPointerType;
typedef typename GraphType::VertexDescriptorType VertexDescriptorType;
- typedef typename GraphType::RCC8ValueType RCC8ValueType;
+ typedef typename GraphType::RCC8ValueType RCC8ValueType;
/** typedef of the internal iterator */
typedef typename boost::graph_traits<InternalGraphType>::edge_iterator InternalIteratorType;
/** Typedef of the index map */
@@ -49,7 +49,7 @@ public:
/** Constructor */
RCC8EdgeIterator();
/** Copy constructor */
- RCC8EdgeIterator(const Self& iter);
+ RCC8EdgeIterator(const Self &iter);
/** Constructor with input graph */
RCC8EdgeIterator(TGraph * graph);
/**
@@ -90,32 +90,32 @@ public:
/**
* Increment.
*/
- Self& operator++();
+ Self& operator ++();
/**
* Decrement.
*/
- Self& operator--();
+ Self& operator --();
/**
* Add
*/
- Self& operator+(int i);
+ Self& operator +(int i);
/**
* Remove
*/
- Self& operator-(int i);
+ Self& operator -(int i);
/**
* Difference comparison operator.
*/
- bool operator!=(const Self& it);
+ bool operator !=(const Self& it);
/**
* Equality comparison operator.
*/
- bool operator==(const Self& it);
+ bool operator ==(const Self& it);
/**
* Instantiation operator.
*/
- Self& operator=(const Self& it);
+ Self& operator =(const Self& it);
private:
// End
InternalIteratorType m_End;
diff --git a/Code/SpatialReasoning/otbRCC8EdgeIterator.txx b/Code/SpatialReasoning/otbRCC8EdgeIterator.txx
index c9bb0c5d70..2a5a2a1cc7 100644
--- a/Code/SpatialReasoning/otbRCC8EdgeIterator.txx
+++ b/Code/SpatialReasoning/otbRCC8EdgeIterator.txx
@@ -28,7 +28,7 @@ RCC8EdgeIterator<TGraph>
::RCC8EdgeIterator()
{
m_Graph = GraphType::New();
- tie(m_Iter,m_End)=edges(*m_Graph->GetGraph());
+ tie(m_Iter, m_End) = edges(*m_Graph->GetGraph());
}
/**
* Copy operator.
@@ -37,9 +37,9 @@ template <class TGraph>
RCC8EdgeIterator<TGraph>
::RCC8EdgeIterator(const Self& iter)
{
- m_Iter=iter.m_Iter;
- m_Graph=iter.m_Graph;
- m_End=iter.m_End;
+ m_Iter = iter.m_Iter;
+ m_Graph = iter.m_Graph;
+ m_End = iter.m_End;
}
/**
*Constructor with input graph
@@ -48,15 +48,15 @@ template <class TGraph>
RCC8EdgeIterator<TGraph>
::RCC8EdgeIterator(TGraph * graph)
{
- m_Graph=graph;
- tie(m_Iter,m_End)=edges(*m_Graph->GetGraph());
+ m_Graph = graph;
+ tie(m_Iter, m_End) = edges(*m_Graph->GetGraph());
}
/**
* Get the current edge value.
* \return The value of the current edge pointed by the iterator.
*/
template <class TGraph>
-typename RCC8EdgeIterator<TGraph>
+typename RCC8EdgeIterator<TGraph>
::RCC8ValueType
RCC8EdgeIterator<TGraph>
::GetValue(void)
@@ -68,50 +68,50 @@ RCC8EdgeIterator<TGraph>
* \return The source edge.
*/
template <class TGraph>
-typename RCC8EdgeIterator<TGraph>
+typename RCC8EdgeIterator<TGraph>
::VertexPointerType
RCC8EdgeIterator<TGraph>
::GetSourceVertex(void)
{
- return (*m_Graph->GetGraph())[source(*m_Iter,(*m_Graph->GetGraph()))];
+ return (*m_Graph->GetGraph())[source(*m_Iter, (*m_Graph->GetGraph()))];
}
/**
* Return the target vertex of the current edge.
* \return The target vertex.
*/
template <class TGraph>
-typename RCC8EdgeIterator<TGraph>
+typename RCC8EdgeIterator<TGraph>
::VertexPointerType
RCC8EdgeIterator<TGraph>
::GetTargetVertex(void)
{
- return (*m_Graph->GetGraph())[target(*m_Iter,(*m_Graph->GetGraph()))];
+ return (*m_Graph->GetGraph())[target(*m_Iter, (*m_Graph->GetGraph()))];
}
/**
* Return the source vertex index of the current edge.
* \return The souce vertex index.
*/
template <class TGraph>
-typename RCC8EdgeIterator<TGraph>
+typename RCC8EdgeIterator<TGraph>
::VertexDescriptorType
RCC8EdgeIterator<TGraph>
::GetSourceIndex(void)
{
IndexMapType index = get(boost::vertex_index, (*m_Graph->GetGraph()));
- return index[source(*m_Iter,(*m_Graph->GetGraph()))];
+ return index[source(*m_Iter, (*m_Graph->GetGraph()))];
}
/**
* Return the target vertex index of the current edge.
* \return The target vertex index.
*/
template <class TGraph>
-typename RCC8EdgeIterator<TGraph>
+typename RCC8EdgeIterator<TGraph>
::VertexDescriptorType
RCC8EdgeIterator<TGraph>
::GetTargetIndex(void)
{
- IndexMapType index = get(boost::vertex_index,(*m_Graph->GetGraph()));
- return index[target(*m_Iter,(*m_Graph->GetGraph()))];
+ IndexMapType index = get(boost::vertex_index, (*m_Graph->GetGraph()));
+ return index[target(*m_Iter, (*m_Graph->GetGraph()))];
}
/**
* Return true if the iterator is at the end.
@@ -122,7 +122,7 @@ bool
RCC8EdgeIterator<TGraph>
::IsAtEnd(void)
{
- return (m_Iter==m_End);
+ return (m_Iter == m_End);
}
/**
* Go to the beginning.
@@ -132,7 +132,7 @@ void
RCC8EdgeIterator<TGraph>
::GoToBegin(void)
{
- tie(m_Iter,m_End)=edges(*m_Graph->GetGraph());
+ tie(m_Iter, m_End) = edges(*m_Graph->GetGraph());
}
/**
* Increment.
@@ -141,11 +141,11 @@ template <class TGraph>
typename RCC8EdgeIterator<TGraph>
::Self&
RCC8EdgeIterator<TGraph>
-::operator++()
-{
+::operator++ ()
+ {
++m_Iter;
return *this;
-}
+ }
/**
* Decrement.
*/
@@ -153,11 +153,11 @@ template <class TGraph>
typename RCC8EdgeIterator<TGraph>
::Self&
RCC8EdgeIterator<TGraph>
-::operator--()
-{
+::operator-- ()
+ {
--m_Iter;
return *this;
-}
+ }
/**
* Add
*/
@@ -165,11 +165,11 @@ template <class TGraph>
typename RCC8EdgeIterator<TGraph>
::Self&
RCC8EdgeIterator<TGraph>
-::operator+(int i)
-{
- m_Iter=m_Iter+i;
+::operator + (int i)
+ {
+ m_Iter = m_Iter + i;
return *this;
-}
+ }
/**
* Remove
*/
@@ -177,31 +177,31 @@ template <class TGraph>
typename RCC8EdgeIterator<TGraph>
::Self&
RCC8EdgeIterator<TGraph>
-::operator-(int i)
-{
- m_Iter=m_Iter-i;
+::operator - (int i)
+ {
+ m_Iter = m_Iter - i;
return *this;
-}
+ }
/**
* Difference comparison operator.
*/
template <class TGraph>
bool
RCC8EdgeIterator<TGraph>
-::operator!=(const Self& iter)
-{
+::operator != (const Self &iter)
+ {
return (m_Iter != iter.m_Iter);
-}
+ }
/**
* Equality comparison operator.
*/
template <class TGraph>
bool
RCC8EdgeIterator<TGraph>
-::operator==(const Self& iter)
-{
+::operator == (const Self &iter)
+ {
return (m_Iter == iter.m_Iter);
-}
+ }
/**
* Instantiation operator.
*/
@@ -209,10 +209,10 @@ template <class TGraph>
typename RCC8EdgeIterator<TGraph>
::Self&
RCC8EdgeIterator<TGraph>
-::operator=(const Self& iter)
-{
+::operator = (const Self &iter)
+ {
m_Iter = iter.m_Iter;
return *this;
-}
+ }
} // End namespace otb
#endif
diff --git a/Code/SpatialReasoning/otbRCC8Graph.h b/Code/SpatialReasoning/otbRCC8Graph.h
index c94d5ef4cc..d871842c16 100644
--- a/Code/SpatialReasoning/otbRCC8Graph.h
+++ b/Code/SpatialReasoning/otbRCC8Graph.h
@@ -42,36 +42,36 @@ namespace otb
*/
template <class TVertex>
class ITK_EXPORT RCC8Graph :
- public itk::DataObject
+ public itk::DataObject
{
public:
/** Standard class typedefs. */
- typedef RCC8Graph Self;
- typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef RCC8Graph Self;
+ typedef itk::DataObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(RCC8Graph,itk::DataObject);
+ itkTypeMacro(RCC8Graph, itk::DataObject);
/** Vertex typedef */
- typedef TVertex VertexType;
+ typedef TVertex VertexType;
typedef typename VertexType::Pointer VertexPointerType;
/** Edge typedef */
- typedef RCC8Edge EdgeType;
- typedef typename EdgeType::Pointer EdgePointerType;
+ typedef RCC8Edge EdgeType;
+ typedef typename EdgeType::Pointer EdgePointerType;
typedef typename EdgeType::RCC8ValueType RCC8ValueType;
/** Typedef for the boost graph representation */
typedef boost::adjacency_list
- <boost::vecS,boost::vecS,boost::bidirectionalS,
- VertexPointerType,EdgePointerType> InternalGraphType;
+ <boost::vecS, boost::vecS, boost::bidirectionalS,
+ VertexPointerType, EdgePointerType> InternalGraphType;
/** Edges and vertices descriptors typedefs (boost objects)*/
- typedef typename InternalGraphType::vertex_descriptor VertexDescriptorType;
- typedef typename InternalGraphType::edge_descriptor EdgeDescriptorType;
+ typedef typename InternalGraphType::vertex_descriptor VertexDescriptorType;
+ typedef typename InternalGraphType::edge_descriptor EdgeDescriptorType;
/** Getters and Setters for the number of vertices */
- itkSetMacro(NumberOfVertices,unsigned int);
- itkGetConstReferenceMacro(NumberOfVertices,unsigned int);
+ itkSetMacro(NumberOfVertices, unsigned int);
+ itkGetConstReferenceMacro(NumberOfVertices, unsigned int);
/**
* Return the internal boost graph object.
@@ -80,7 +80,7 @@ public:
InternalGraphType * GetGraph(void)
{
return &m_Graph;
- };
+ }
/**
* Since the number of vertices is mandatory to instantiate the
* internal boost representation, the build method has to be called
@@ -116,15 +116,14 @@ protected:
/** Constructor */
RCC8Graph();
/** Destructor */
- ~RCC8Graph() {};
+ ~RCC8Graph() {}
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/**
* Initialize a range of vertex.
* \param num The index of the last vertices to intialize.
*/
- void Initialize( unsigned int num);
-
+ void Initialize(unsigned int num);
private:
@@ -139,5 +138,4 @@ private:
#include "otbRCC8Graph.txx"
#endif
-
#endif
diff --git a/Code/SpatialReasoning/otbRCC8Graph.txx b/Code/SpatialReasoning/otbRCC8Graph.txx
index 29203ec7bd..2159ed4406 100644
--- a/Code/SpatialReasoning/otbRCC8Graph.txx
+++ b/Code/SpatialReasoning/otbRCC8Graph.txx
@@ -28,7 +28,7 @@ RCC8Graph<TVertex>
::RCC8Graph()
{
m_NumberOfVertices = 0;
-};
+}
/**
* since the number of vertices is mandatory to instantiate the
* internal boost representation, the build method has to be called
@@ -39,7 +39,7 @@ void
RCC8Graph<TVertex>
::Build(void)
{
- this->Initialize(m_NumberOfVertices-1);
+ this->Initialize(m_NumberOfVertices - 1);
}
/**
* Initialize a range of vertex.
@@ -48,14 +48,14 @@ RCC8Graph<TVertex>
template <class TVertex>
void
RCC8Graph<TVertex>
-::Initialize( unsigned int num)
+::Initialize(unsigned int num)
{
- for (unsigned int i = boost::num_vertices(m_Graph); i<=num;++i)
- {
+ for (unsigned int i = boost::num_vertices(m_Graph); i <= num; ++i)
+ {
VertexDescriptorType id = boost::add_vertex(m_Graph);
- VertexPointerType vertex = VertexType::New();
- m_Graph[id]=vertex;
- }
+ VertexPointerType vertex = VertexType::New();
+ m_Graph[id] = vertex;
+ }
}
/**
* Set a vertex.
@@ -67,13 +67,13 @@ void
RCC8Graph<TVertex>
::SetVertex(unsigned int index, VertexPointerType vertex)
{
- if (index>=m_NumberOfVertices)
- {
+ if (index >= m_NumberOfVertices)
+ {
this->Initialize(index);
- m_NumberOfVertices = index+1;
- }
+ m_NumberOfVertices = index + 1;
+ }
VertexDescriptorType v = *boost::vertices(m_Graph).first;
- m_Graph[v+index]= vertex;
+ m_Graph[v + index] = vertex;
}
/**
* Get a vertex.
@@ -87,7 +87,7 @@ RCC8Graph<TVertex>
::GetVertex(unsigned int index)
{
VertexDescriptorType v = *boost::vertices(m_Graph).first;
- return m_Graph[v+index];
+ return m_Graph[v + index];
}
/**
* Add an edge in the graph.
@@ -100,10 +100,10 @@ void
RCC8Graph<TVertex>
::AddEdge(unsigned int index1, unsigned int index2, RCC8ValueType r)
{
- EdgeDescriptorType e = boost::add_edge(index1,index2,m_Graph).first;
- EdgeType::Pointer edge = EdgeType::New();
+ EdgeDescriptorType e = boost::add_edge(index1, index2, m_Graph).first;
+ EdgeType::Pointer edge = EdgeType::New();
edge->SetValue(r);
- m_Graph[e]=edge;
+ m_Graph[e] = edge;
}
/**
* Get number of edges
@@ -122,9 +122,9 @@ RCC8Graph<TVertex>
template <class TVertex>
void
RCC8Graph<TVertex>
-::PrintSelf( std::ostream& os,itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/SpatialReasoning/otbRCC8GraphFileReader.h b/Code/SpatialReasoning/otbRCC8GraphFileReader.h
index 8ffe0302fb..a5a11e5331 100644
--- a/Code/SpatialReasoning/otbRCC8GraphFileReader.h
+++ b/Code/SpatialReasoning/otbRCC8GraphFileReader.h
@@ -27,24 +27,24 @@ namespace otb
* \brief Base exception class for IO problems during reading.
*/
class ITK_EXPORT RCC8GraphFileReaderException
- : public itk::ExceptionObject
+ : public itk::ExceptionObject
{
public:
/** Run-time information. */
- itkTypeMacro( RCC8GraphFileReaderException, ExceptionObject );
+ itkTypeMacro(RCC8GraphFileReaderException, ExceptionObject);
/** Constructor. */
RCC8GraphFileReaderException(const char *file, unsigned int line,
const char* message = "Error in IO",
- const char* loc = "Unknown" ) :
- ExceptionObject(file, line, message, loc)
- {}
+ const char* loc = "Unknown") :
+ ExceptionObject(file, line, message, loc)
+ {}
/** Constructor. */
- RCC8GraphFileReaderException(const std::string &file, unsigned int line,
+ RCC8GraphFileReaderException(const std::string & file, unsigned int line,
const char* message = "Error in IO",
- const char* loc = "Unknown" ) :
- ExceptionObject(file, line, message, loc)
- {}
+ const char* loc = "Unknown") :
+ ExceptionObject(file, line, message, loc)
+ {}
};
/**
* \class RCC8GraphFileReader
@@ -63,20 +63,20 @@ class ITK_EXPORT RCC8GraphFileReader : public RCC8GraphSource<TOutputGraph>
{
public:
/** Standards typedef */
- typedef RCC8GraphFileReader Self;
+ typedef RCC8GraphFileReader Self;
typedef RCC8GraphSource<TOutputGraph> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through the object factory */
itkNewMacro(Self);
/** Runtime type informations */
- itkTypeMacro(RCC8GraphFileReader,RCC8GraphSource);
+ itkTypeMacro(RCC8GraphFileReader, RCC8GraphSource);
/** Output related typedefs */
- typedef TOutputGraph OutputGraphType;
+ typedef TOutputGraph OutputGraphType;
typedef typename Superclass::OutputGraphPointerType OutputGraphPointerType;
- typedef typename OutputGraphType::VertexType VertexType;
- typedef typename VertexType::Pointer VertexPointerType;
- typedef typename OutputGraphType::RCC8ValueType RCC8ValueType;
+ typedef typename OutputGraphType::VertexType VertexType;
+ typedef typename VertexType::Pointer VertexPointerType;
+ typedef typename OutputGraphType::RCC8ValueType RCC8ValueType;
/** Set the filename */
itkSetStringMacro(FileName);
diff --git a/Code/SpatialReasoning/otbRCC8GraphFileReader.txx b/Code/SpatialReasoning/otbRCC8GraphFileReader.txx
index 485fdfb471..3f5be443a4 100644
--- a/Code/SpatialReasoning/otbRCC8GraphFileReader.txx
+++ b/Code/SpatialReasoning/otbRCC8GraphFileReader.txx
@@ -34,7 +34,7 @@ template <class TOutputGraph>
RCC8GraphFileReader<TOutputGraph>
::RCC8GraphFileReader()
{
- m_FileName="";
+ m_FileName = "";
}
/**
* Destructor
@@ -53,17 +53,17 @@ void
RCC8GraphFileReader<TOutputGraph>
::ParseEdge(std::string line)
{
- typename std::string::size_type pos1 = line.find_first_of(" ",0);
- typename std::string::size_type pos2 = line.find_first_of(" ",pos1+1);
- typename std::string::size_type pos3 = line.find_first_of(" ",pos2+1);
- unsigned int source = atoi(line.substr(0,pos1).c_str());
- unsigned int target = atoi(line.substr(pos2+1,pos3-pos2-1).c_str());
- typename std::string::size_type pos4 = line.find_first_of("\"",0);
- typename std::string::size_type pos5 = line.find_first_of("\" ",pos4+1);
- RCC8ValueType value =static_cast<RCC8ValueType>(atoi(line.substr(pos4+1,pos5-pos4-1).c_str()));
- otbMsgDevMacro(<<"RCC8GraphFileReader: Edge line parsed: "<<source<<" -> "
- <<target<<" "<<value);
- this->GetOutput()->AddEdge(source,target,value);
+ typename std::string::size_type pos1 = line.find_first_of(" ", 0);
+ typename std::string::size_type pos2 = line.find_first_of(" ", pos1 + 1);
+ typename std::string::size_type pos3 = line.find_first_of(" ", pos2 + 1);
+ unsigned int source = atoi(line.substr(0, pos1).c_str());
+ unsigned int target = atoi(line.substr(pos2 + 1, pos3 - pos2 - 1).c_str());
+ typename std::string::size_type pos4 = line.find_first_of("\"", 0);
+ typename std::string::size_type pos5 = line.find_first_of("\" ", pos4 + 1);
+ RCC8ValueType value = static_cast<RCC8ValueType>(atoi(line.substr(pos4 + 1, pos5 - pos4 - 1).c_str()));
+ otbMsgDevMacro(<< "RCC8GraphFileReader: Edge line parsed: " << source << " -> "
+ << target << " " << value);
+ this->GetOutput()->AddEdge(source, target, value);
}
/**
* Parse vertex informations from a given line.
@@ -75,27 +75,27 @@ RCC8GraphFileReader<TOutputGraph>
::ParseVertex(std::string line)
{
typename VertexType::AttributesMapType attr;
- typename std::string::size_type pos = line.find_first_of(" ",0);
- unsigned int index = atoi(line.substr(0,pos).c_str());
- otbMsgDevMacro(<<"RCC8GraphFileReader: Vertex index: "<<index);
+ typename std::string::size_type pos = line.find_first_of(" ", 0);
+ unsigned int index = atoi(line.substr(0, pos).c_str());
+ otbMsgDevMacro(<< "RCC8GraphFileReader: Vertex index: " << index);
typename std::string::size_type midPos, nextPos;
- midPos=line.find_first_of("\"",pos+2);
- nextPos=line.find_first_of("\"",midPos+1);
- std::string key,value;
- while ((midPos!=std::string::npos)&&(nextPos!=std::string::npos))
- {
- key = line.substr(pos+2,midPos-pos-3);
- value = line.substr(midPos+1,nextPos-midPos-1);
- attr[key]=value;
- otbMsgDevMacro(<<"RCC8GraphFileReader: Vertex attribute: "<<key<<" "<<value);
- pos=nextPos;
- midPos=line.find_first_of("\"",pos+2);
- nextPos=line.find_first_of("\"",midPos+1);
- }
+ midPos = line.find_first_of("\"", pos + 2);
+ nextPos = line.find_first_of("\"", midPos + 1);
+ std::string key, value;
+ while ((midPos != std::string::npos) && (nextPos != std::string::npos))
+ {
+ key = line.substr(pos + 2, midPos - pos - 3);
+ value = line.substr(midPos + 1, nextPos - midPos - 1);
+ attr[key] = value;
+ otbMsgDevMacro(<< "RCC8GraphFileReader: Vertex attribute: " << key << " " << value);
+ pos = nextPos;
+ midPos = line.find_first_of("\"", pos + 2);
+ nextPos = line.find_first_of("\"", midPos + 1);
+ }
typename VertexType::Pointer vertex = VertexType::New();
vertex->SetAttributesMap(attr);
- this->GetOutput()->SetVertex(index,vertex);
+ this->GetOutput()->SetVertex(index, vertex);
}
/**
@@ -107,38 +107,38 @@ RCC8GraphFileReader<TOutputGraph>
::GenerateData()
{
std::ifstream fin;
- std::string line;
+ std::string line;
// open file input stream
fin.open(m_FileName.c_str());
// Test if the file has been opened correctly
if (!fin)
- {
+ {
RCC8GraphFileReaderException e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << " Could not create IO object for file ";
- msg<<m_FileName<<"."<<std::endl;
+ msg << m_FileName << "." << std::endl;
e.SetDescription(msg.str().c_str());
throw e;
return;
- }
+ }
// if so, parse it
while (!fin.eof())
- {
- std::getline(fin,line);
- if (line.find("->")!=std::string::npos)
{
+ std::getline(fin, line);
+ if (line.find("->") != std::string::npos)
+ {
// edge line
this->ParseEdge(line);
- }
- else if (line.find("[")!=std::string::npos)
- {
+ }
+ else if (line.find("[") != std::string::npos)
+ {
// vertex line
this->ParseVertex(line);
+ }
}
- }
fin.close();
}
/**
@@ -147,9 +147,9 @@ RCC8GraphFileReader<TOutputGraph>
template <class TInputGraph>
void
RCC8GraphFileReader<TInputGraph>
-::PrintSelf( std::ostream& os,itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/SpatialReasoning/otbRCC8GraphFileWriter.h b/Code/SpatialReasoning/otbRCC8GraphFileWriter.h
index 9f4eb87720..ff28d9898e 100644
--- a/Code/SpatialReasoning/otbRCC8GraphFileWriter.h
+++ b/Code/SpatialReasoning/otbRCC8GraphFileWriter.h
@@ -28,24 +28,24 @@ namespace otb
* \brief Base exception class for IO problems during writing.
*/
class ITK_EXPORT RCC8GraphFileWriterException
- : public itk::ExceptionObject
+ : public itk::ExceptionObject
{
public:
/** Run-time information. */
- itkTypeMacro( RCC8GraphFileWriterException, ExceptionObject );
+ itkTypeMacro(RCC8GraphFileWriterException, ExceptionObject);
/** Constructor. */
RCC8GraphFileWriterException(const char *file, unsigned int line,
const char* message = "Error in IO",
- const char* loc = "Unknown" ) :
- ExceptionObject(file, line, message, loc)
- {}
+ const char* loc = "Unknown") :
+ ExceptionObject(file, line, message, loc)
+ {}
/** Constructor. */
- RCC8GraphFileWriterException(const std::string &file, unsigned int line,
+ RCC8GraphFileWriterException(const std::string & file, unsigned int line,
const char* message = "Error in IO",
- const char* loc = "Unknown" ) :
- ExceptionObject(file, line, message, loc)
- {}
+ const char* loc = "Unknown") :
+ ExceptionObject(file, line, message, loc)
+ {}
};
/**
* \class RCC8GraphFileWriter
@@ -62,26 +62,26 @@ public:
*/
template <class TInputGraph>
class ITK_EXPORT RCC8GraphFileWriter
- : public itk::ProcessObject
+ : public itk::ProcessObject
{
public:
/** Standards typedefs */
- typedef RCC8GraphFileWriter Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef RCC8GraphFileWriter Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(RCC8GraphFileWriter,ProcessObject);
+ itkTypeMacro(RCC8GraphFileWriter, ProcessObject);
/** Typedefs for the output graph type */
- typedef TInputGraph InputGraphType;
- typedef typename InputGraphType::Pointer InputGraphPointerType;
- typedef typename InputGraphType::VertexType VertexType;
- typedef typename VertexType::Pointer VertexPointerType;
+ typedef TInputGraph InputGraphType;
+ typedef typename InputGraphType::Pointer InputGraphPointerType;
+ typedef typename InputGraphType::VertexType VertexType;
+ typedef typename VertexType::Pointer VertexPointerType;
typedef typename InputGraphType::VertexDescriptorType VertexDescriptorType;
- typedef typename InputGraphType::RCC8ValueType RCC8ValueType;
- typedef typename VertexType::AttributesMapType AttributesMapType;
+ typedef typename InputGraphType::RCC8ValueType RCC8ValueType;
+ typedef typename VertexType::AttributesMapType AttributesMapType;
/** Set the filename */
itkSetStringMacro(FileName);
@@ -123,7 +123,7 @@ protected:
* \param target The index of the target vertex.
* \param value The value of the edge.
*/
- void WriteEdge(std::ofstream& of,VertexDescriptorType source,
+ void WriteEdge(std::ofstream& of, VertexDescriptorType source,
VertexDescriptorType target, RCC8ValueType value);
/**
* Write a vertex to file.
diff --git a/Code/SpatialReasoning/otbRCC8GraphFileWriter.txx b/Code/SpatialReasoning/otbRCC8GraphFileWriter.txx
index 11bfc64468..d6b27aad54 100644
--- a/Code/SpatialReasoning/otbRCC8GraphFileWriter.txx
+++ b/Code/SpatialReasoning/otbRCC8GraphFileWriter.txx
@@ -53,7 +53,7 @@ void
RCC8GraphFileWriter<TInputGraph>
::SetInput(const InputGraphType * graph)
{
- this->itk::ProcessObject::SetNthInput(0,const_cast<TInputGraph *>(graph));
+ this->itk::ProcessObject::SetNthInput(0, const_cast<TInputGraph *>(graph));
}
/**
* Get the input graph.
@@ -89,20 +89,20 @@ RCC8GraphFileWriter<TInputGraph>
{
InputGraphType * input = this->GetInput();
- itkDebugMacro( <<"Writing a RCC8Graph file" );
+ itkDebugMacro(<< "Writing a RCC8Graph file");
// Make sure input is available
- if ( input == 0 )
- {
+ if (input == 0)
+ {
itkExceptionMacro(<< "No input to writer!");
- }
+ }
// Make sure that we can write the file given the name
//
- if ( m_FileName == "" )
- {
- itkExceptionMacro(<<"No filename was specified");
- }
+ if (m_FileName == "")
+ {
+ itkExceptionMacro(<< "No filename was specified");
+ }
// Pipeline updating sequence
input->UpdateOutputInformation();
@@ -119,13 +119,13 @@ void
RCC8GraphFileWriter<TInputGraph>
::GenerateData()
{
- otbMsgDevMacro(<<"RCC8GraphFileWriter: GenerateData call");
+ otbMsgDevMacro(<< "RCC8GraphFileWriter: GenerateData call");
// input graph pointer
InputGraphPointerType input = this->GetInput();
// iterators typedefs
typedef otb::RCC8VertexIterator<InputGraphType> VertexIteratorType;
- typedef otb::RCC8EdgeIterator<InputGraphType> EdgeIteratorType;
+ typedef otb::RCC8EdgeIterator<InputGraphType> EdgeIteratorType;
// Output file stream
std::ofstream out;
@@ -135,37 +135,37 @@ RCC8GraphFileWriter<TInputGraph>
// Test if the file has been opened correctly
if (!out)
- {
+ {
RCC8GraphFileWriterException e(__FILE__, __LINE__);
itk::OStringStream msg;
msg << " Could not create IO object for file ";
- msg<<m_FileName<<"."<<std::endl;
+ msg << m_FileName << "." << std::endl;
e.SetDescription(msg.str().c_str());
throw e;
return;
- }
+ }
// Start writing the graph to file
- out<<"digraph G {"<<std::endl;
+ out << "digraph G {" << std::endl;
// For each vertex in the graph
VertexIteratorType vIt(input);
- for (vIt.GoToBegin();!vIt.IsAtEnd();++vIt)
- {
- this->WriteVertex(out,vIt.GetIndex(),vIt.Get());
- }
+ for (vIt.GoToBegin(); !vIt.IsAtEnd(); ++vIt)
+ {
+ this->WriteVertex(out, vIt.GetIndex(), vIt.Get());
+ }
// For each edge in the graph
EdgeIteratorType eIt(input);
- for (eIt.GoToBegin();!eIt.IsAtEnd();++eIt)
- {
+ for (eIt.GoToBegin(); !eIt.IsAtEnd(); ++eIt)
+ {
this->WriteEdge(out, eIt.GetSourceIndex(),
eIt.GetTargetIndex(),
eIt.GetValue());
- }
+ }
// Ends the graph writing
- out<<"}"<<std::endl;
+ out << "}" << std::endl;
// Close the file
out.close();
@@ -180,13 +180,13 @@ RCC8GraphFileWriter<TInputGraph>
template <class TInputGraph>
void
RCC8GraphFileWriter<TInputGraph>
-::WriteEdge(std::ofstream& of,VertexDescriptorType source,
+::WriteEdge(std::ofstream& of, VertexDescriptorType source,
VertexDescriptorType target, RCC8ValueType value)
{
- otbMsgDevMacro(<<"RCC8GraphFileWriter: WriteEdge call: "<<source<<" "<<target<<" "<<value);
- of<<source<<" -> "<<target<<" ";
- of<<"[Value=\""<<value<<"\"];";
- of<<std::endl;
+ otbMsgDevMacro(<< "RCC8GraphFileWriter: WriteEdge call: " << source << " " << target << " " << value);
+ of << source << " -> " << target << " ";
+ of << "[Value=\"" << value << "\"];";
+ of << std::endl;
}
/**
* Write a vertex to file.
@@ -201,25 +201,25 @@ RCC8GraphFileWriter<TInputGraph>
VertexPointerType vertex)
{
typedef typename VertexType::AttributesMapType AttributesMapType;
- typedef typename AttributesMapType::iterator IteratorType;
+ typedef typename AttributesMapType::iterator IteratorType;
AttributesMapType attr = vertex->GetAttributesMap();
- otbMsgDevMacro(<<"RCC8GraphFileWriter: WriteVertex call: "<<index);
- of<<index<<" [";
+ otbMsgDevMacro(<< "RCC8GraphFileWriter: WriteVertex call: " << index);
+ of << index << " [";
IteratorType it = attr.begin();
- while (it!=attr.end())
- {
- of<<(*it).first<<"=\"";
- of<<(*it).second<<"\"";
- ++it;
- if (it==attr.end())
+ while (it != attr.end())
{
- of<<"];"<<std::endl;
- }
+ of << (*it).first << "=\"";
+ of << (*it).second << "\"";
+ ++it;
+ if (it == attr.end())
+ {
+ of << "];" << std::endl;
+ }
else
- {
- of<<",";
+ {
+ of << ",";
+ }
}
- }
}
/**
* PrintSelf method
@@ -227,9 +227,9 @@ RCC8GraphFileWriter<TInputGraph>
template <class TInputGraph>
void
RCC8GraphFileWriter<TInputGraph>
-::PrintSelf( std::ostream& os,itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // namespace otb
#endif
diff --git a/Code/SpatialReasoning/otbRCC8GraphSource.h b/Code/SpatialReasoning/otbRCC8GraphSource.h
index 89442cc74e..3c233a6a3e 100644
--- a/Code/SpatialReasoning/otbRCC8GraphSource.h
+++ b/Code/SpatialReasoning/otbRCC8GraphSource.h
@@ -28,23 +28,23 @@ namespace otb
*/
template <class TOutputGraph>
class ITK_EXPORT RCC8GraphSource
- : public itk::ProcessObject
+ : public itk::ProcessObject
{
public:
/** Standard typedefs */
- typedef RCC8GraphSource Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef RCC8GraphSource Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(RCC8GraphSource,itk::ProcessObject);
+ itkTypeMacro(RCC8GraphSource, itk::ProcessObject);
/** Data object pointer type */
typedef itk::DataObject::Pointer DataObjectPointer;
/** Template parameter typedef*/
- typedef TOutputGraph OutputGraphType;
- typedef typename OutputGraphType::Pointer OutputGraphPointerType;
+ typedef TOutputGraph OutputGraphType;
+ typedef typename OutputGraphType::Pointer OutputGraphPointerType;
/** Overiding of the GetOutput() method */
virtual OutputGraphType * GetOutput(void);
@@ -57,8 +57,8 @@ protected:
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- RCC8GraphSource(const Self&);//purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ RCC8GraphSource(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // End namespace otb
diff --git a/Code/SpatialReasoning/otbRCC8GraphSource.txx b/Code/SpatialReasoning/otbRCC8GraphSource.txx
index dcb542b89c..6700418fc6 100644
--- a/Code/SpatialReasoning/otbRCC8GraphSource.txx
+++ b/Code/SpatialReasoning/otbRCC8GraphSource.txx
@@ -30,7 +30,7 @@ RCC8GraphSource<TOutputGraph>
::RCC8GraphSource()
{
this->Superclass::SetNumberOfRequiredOutputs(1);
- this->Superclass::SetNthOutput(0,TOutputGraph::New().GetPointer());
+ this->Superclass::SetNthOutput(0, TOutputGraph::New().GetPointer());
}
/**
* Get the output Graph
@@ -41,10 +41,10 @@ typename RCC8GraphSource<TOutputGraph>::OutputGraphType *
RCC8GraphSource<TOutputGraph>
::GetOutput(void)
{
- if (this->GetNumberOfOutputs()<1)
- {
+ if (this->GetNumberOfOutputs() < 1)
+ {
return 0;
- }
+ }
return static_cast<OutputGraphType *> (this->ProcessObject::GetOutput(0));
}
/**
@@ -55,7 +55,7 @@ void
RCC8GraphSource<TOutputGraph>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/SpatialReasoning/otbRCC8InEdgeIterator.h b/Code/SpatialReasoning/otbRCC8InEdgeIterator.h
index d97176895f..28b67b45eb 100644
--- a/Code/SpatialReasoning/otbRCC8InEdgeIterator.h
+++ b/Code/SpatialReasoning/otbRCC8InEdgeIterator.h
@@ -34,13 +34,13 @@ public:
typedef RCC8InEdgeIterator Self;
/** Graph typedef */
- typedef TGraph GraphType;
- typedef typename GraphType::InternalGraphType InternalGraphType;
- typedef typename GraphType::Pointer GraphPointerType;
- typedef typename GraphType::EdgePointerType EdgePointerType;
- typedef typename GraphType::VertexPointerType VertexPointerType;
+ typedef TGraph GraphType;
+ typedef typename GraphType::InternalGraphType InternalGraphType;
+ typedef typename GraphType::Pointer GraphPointerType;
+ typedef typename GraphType::EdgePointerType EdgePointerType;
+ typedef typename GraphType::VertexPointerType VertexPointerType;
typedef typename GraphType::VertexDescriptorType VertexDescriptorType;
- typedef typename GraphType::RCC8ValueType RCC8ValueType;
+ typedef typename GraphType::RCC8ValueType RCC8ValueType;
/** typedef of the internal iterator */
typedef typename boost::graph_traits<InternalGraphType>::in_edge_iterator InternalIteratorType;
/** Typedef of the index map */
@@ -49,9 +49,9 @@ public:
/** Constructor */
RCC8InEdgeIterator();
/** Copy constructor */
- RCC8InEdgeIterator(const Self& iter);
+ RCC8InEdgeIterator(const Self &iter);
/** Constructor with input graph */
- RCC8InEdgeIterator(VertexDescriptorType vertex,GraphType * graph);
+ RCC8InEdgeIterator(VertexDescriptorType vertex, GraphType * graph);
/**
* Get the current edge value.
* \return The value of the current edge pointed by the iterator.
@@ -79,32 +79,32 @@ public:
/**
* Increment.
*/
- Self& operator++();
+ Self& operator ++();
/**
* Decrement.
*/
- Self& operator--();
+ Self& operator --();
/**
* Add
*/
- Self& operator+(int i);
+ Self& operator +(int i);
/**
* Remove
*/
- Self& operator-(int i);
+ Self& operator -(int i);
/**
* Difference comparison operator.
*/
- bool operator!=(const Self& it);
+ bool operator !=(const Self& it);
/**
* Equality comparison operator.
*/
- bool operator==(const Self& it);
+ bool operator ==(const Self& it);
/**
* Instantiation operator.
*/
- Self& operator=(const Self& it);
+ Self& operator =(const Self& it);
private:
// End
InternalIteratorType m_End;
diff --git a/Code/SpatialReasoning/otbRCC8InEdgeIterator.txx b/Code/SpatialReasoning/otbRCC8InEdgeIterator.txx
index a6c01a659b..a98e0db2d3 100644
--- a/Code/SpatialReasoning/otbRCC8InEdgeIterator.txx
+++ b/Code/SpatialReasoning/otbRCC8InEdgeIterator.txx
@@ -28,7 +28,7 @@ RCC8InEdgeIterator<TGraph>
::RCC8InEdgeIterator()
{
m_Graph = GraphType::New();
- tie(m_Iter,m_End)=in_edges(0,*m_Graph->GetGraph());
+ tie(m_Iter, m_End) = in_edges(0, *m_Graph->GetGraph());
}
/**
* Copy operator.
@@ -37,28 +37,28 @@ template <class TGraph>
RCC8InEdgeIterator<TGraph>
::RCC8InEdgeIterator(const Self& iter)
{
- m_Iter=iter.m_Iter;
- m_Graph=iter.m_Graph;
+ m_Iter = iter.m_Iter;
+ m_Graph = iter.m_Graph;
m_VertexIndex = iter.m_VertexIndex;
- m_End=iter.m_End;
+ m_End = iter.m_End;
}
/**
*Constructor with input graph
*/
template <class TGraph>
RCC8InEdgeIterator<TGraph>
-::RCC8InEdgeIterator(VertexDescriptorType vertex,GraphType * graph)
+::RCC8InEdgeIterator(VertexDescriptorType vertex, GraphType * graph)
{
- m_Graph=graph;
- m_VertexIndex=vertex;
- tie(m_Iter,m_End)=in_edges(vertex,*m_Graph->GetGraph());
+ m_Graph = graph;
+ m_VertexIndex = vertex;
+ tie(m_Iter, m_End) = in_edges(vertex, *m_Graph->GetGraph());
}
/**
* Get the current edge value.
* \return The value of the current edge pointed by the iterator.
*/
template <class TGraph>
-typename RCC8InEdgeIterator<TGraph>
+typename RCC8InEdgeIterator<TGraph>
::RCC8ValueType
RCC8InEdgeIterator<TGraph>
::GetValue(void)
@@ -70,25 +70,25 @@ RCC8InEdgeIterator<TGraph>
* \return The source edge.
*/
template <class TGraph>
-typename RCC8InEdgeIterator<TGraph>
+typename RCC8InEdgeIterator<TGraph>
::VertexPointerType
RCC8InEdgeIterator<TGraph>
::GetSourceVertex(void)
{
- return (*m_Graph->GetGraph())[source(*m_Iter,(*m_Graph->GetGraph()))];
+ return (*m_Graph->GetGraph())[source(*m_Iter, (*m_Graph->GetGraph()))];
}
/**
* Return the source vertex index of the current edge.
* \return The souce vertex index.
*/
template <class TGraph>
-typename RCC8InEdgeIterator<TGraph>
+typename RCC8InEdgeIterator<TGraph>
::VertexDescriptorType
RCC8InEdgeIterator<TGraph>
::GetSourceIndex(void)
{
IndexMapType index = get(boost::vertex_index, (*m_Graph->GetGraph()));
- return index[source(*m_Iter,(*m_Graph->GetGraph()))];
+ return index[source(*m_Iter, (*m_Graph->GetGraph()))];
}
/**
* Return true if the iterator is at the end.
@@ -99,7 +99,7 @@ bool
RCC8InEdgeIterator<TGraph>
::IsAtEnd(void)
{
- return (m_Iter==m_End);
+ return (m_Iter == m_End);
}
/**
* Go to the beginning.
@@ -109,7 +109,7 @@ void
RCC8InEdgeIterator<TGraph>
::GoToBegin(void)
{
- tie(m_Iter,m_End)=in_edges(m_VertexIndex,*m_Graph->GetGraph());
+ tie(m_Iter, m_End) = in_edges(m_VertexIndex, *m_Graph->GetGraph());
}
/**
* Increment.
@@ -118,11 +118,11 @@ template <class TGraph>
typename RCC8InEdgeIterator<TGraph>
::Self&
RCC8InEdgeIterator<TGraph>
-::operator++()
-{
+::operator++ ()
+ {
++m_Iter;
return *this;
-}
+ }
/**
* Decrement.
*/
@@ -130,11 +130,11 @@ template <class TGraph>
typename RCC8InEdgeIterator<TGraph>
::Self&
RCC8InEdgeIterator<TGraph>
-::operator--()
-{
+::operator-- ()
+ {
--m_Iter;
return *this;
-}
+ }
/**
* Add
*/
@@ -142,11 +142,11 @@ template <class TGraph>
typename RCC8InEdgeIterator<TGraph>
::Self&
RCC8InEdgeIterator<TGraph>
-::operator+(int i)
-{
- m_Iter=m_Iter+i;
+::operator + (int i)
+ {
+ m_Iter = m_Iter + i;
return *this;
-}
+ }
/**
* Remove
*/
@@ -154,31 +154,31 @@ template <class TGraph>
typename RCC8InEdgeIterator<TGraph>
::Self&
RCC8InEdgeIterator<TGraph>
-::operator-(int i)
-{
- m_Iter=m_Iter-i;
+::operator - (int i)
+ {
+ m_Iter = m_Iter - i;
return *this;
-}
+ }
/**
* Difference comparison operator.
*/
template <class TGraph>
bool
RCC8InEdgeIterator<TGraph>
-::operator!=(const Self& iter)
-{
+::operator != (const Self &iter)
+ {
return (m_Iter != iter.m_Iter);
-}
+ }
/**
* Equality comparison operator.
*/
template <class TGraph>
bool
RCC8InEdgeIterator<TGraph>
-::operator==(const Self& iter)
-{
+::operator == (const Self &iter)
+ {
return (m_Iter == iter.m_Iter);
-}
+ }
/**
* Instantiation operator.
*/
@@ -186,10 +186,10 @@ template <class TGraph>
typename RCC8InEdgeIterator<TGraph>
::Self&
RCC8InEdgeIterator<TGraph>
-::operator=(const Self& iter)
-{
+::operator = (const Self &iter)
+ {
m_Iter = iter.m_Iter;
return *this;
-}
+ }
} // End namespace otb
#endif
diff --git a/Code/SpatialReasoning/otbRCC8OutEdgeIterator.h b/Code/SpatialReasoning/otbRCC8OutEdgeIterator.h
index 3d6b801b82..4c3d558632 100644
--- a/Code/SpatialReasoning/otbRCC8OutEdgeIterator.h
+++ b/Code/SpatialReasoning/otbRCC8OutEdgeIterator.h
@@ -34,13 +34,13 @@ public:
typedef RCC8OutEdgeIterator Self;
/** Graph typedef */
- typedef TGraph GraphType;
- typedef typename GraphType::InternalGraphType InternalGraphType;
- typedef typename GraphType::Pointer GraphPointerType;
- typedef typename GraphType::EdgePointerType EdgePointerType;
- typedef typename GraphType::VertexPointerType VertexPointerType;
+ typedef TGraph GraphType;
+ typedef typename GraphType::InternalGraphType InternalGraphType;
+ typedef typename GraphType::Pointer GraphPointerType;
+ typedef typename GraphType::EdgePointerType EdgePointerType;
+ typedef typename GraphType::VertexPointerType VertexPointerType;
typedef typename GraphType::VertexDescriptorType VertexDescriptorType;
- typedef typename GraphType::RCC8ValueType RCC8ValueType;
+ typedef typename GraphType::RCC8ValueType RCC8ValueType;
/** typedef of the internal iterator */
typedef typename boost::graph_traits<InternalGraphType>::out_edge_iterator InternalIteratorType;
/** Typedef of the index map */
@@ -49,9 +49,9 @@ public:
/** Constructor */
RCC8OutEdgeIterator();
/** Copy constructor */
- RCC8OutEdgeIterator(const Self& iter);
+ RCC8OutEdgeIterator(const Self &iter);
/** Constructor with input graph */
- RCC8OutEdgeIterator(VertexDescriptorType vertex,TGraph * graph);
+ RCC8OutEdgeIterator(VertexDescriptorType vertex, TGraph * graph);
/**
* Get the current edge value.
* \return The value of the current edge pointed by the iterator.
@@ -80,31 +80,31 @@ public:
/**
* Increment.
*/
- Self& operator++();
+ Self& operator ++();
/**
* Decrement.
*/
- Self& operator--();
+ Self& operator --();
/**
* Add
*/
- Self& operator+(int i);
+ Self& operator +(int i);
/**
* Remove
*/
- Self& operator-(int i);
+ Self& operator -(int i);
/**
* Difference comparison operator.
*/
- bool operator!=(const Self& it);
+ bool operator !=(const Self& it);
/**
* Equality comparison operator.
*/
- bool operator==(const Self& it);
+ bool operator ==(const Self& it);
/**
* Instantiation operator.
*/
- Self& operator=(const Self& it);
+ Self& operator =(const Self& it);
private:
// End
InternalIteratorType m_End;
diff --git a/Code/SpatialReasoning/otbRCC8OutEdgeIterator.txx b/Code/SpatialReasoning/otbRCC8OutEdgeIterator.txx
index 639f8139fa..423ec0cb37 100644
--- a/Code/SpatialReasoning/otbRCC8OutEdgeIterator.txx
+++ b/Code/SpatialReasoning/otbRCC8OutEdgeIterator.txx
@@ -28,7 +28,7 @@ RCC8OutEdgeIterator<TGraph>
::RCC8OutEdgeIterator()
{
m_Graph = GraphType::New();
- tie(m_Iter,m_End)=out_edges(0,*m_Graph->GetGraph());
+ tie(m_Iter, m_End) = out_edges(0, *m_Graph->GetGraph());
}
/**
* Copy operator.
@@ -37,28 +37,28 @@ template <class TGraph>
RCC8OutEdgeIterator<TGraph>
::RCC8OutEdgeIterator(const Self& iter)
{
- m_Iter=iter.m_Iter;
- m_Graph=iter.m_Graph;
+ m_Iter = iter.m_Iter;
+ m_Graph = iter.m_Graph;
m_VertexIndex = iter.m_VertexIndex;
- m_End=iter.m_End;
+ m_End = iter.m_End;
}
/**
*Constructor with input graph
*/
template <class TGraph>
RCC8OutEdgeIterator<TGraph>
-::RCC8OutEdgeIterator(VertexDescriptorType vertex,TGraph * graph)
+::RCC8OutEdgeIterator(VertexDescriptorType vertex, TGraph * graph)
{
- m_Graph=graph;
+ m_Graph = graph;
m_VertexIndex = vertex;
- tie(m_Iter,m_End)=out_edges(vertex,*m_Graph->GetGraph());
+ tie(m_Iter, m_End) = out_edges(vertex, *m_Graph->GetGraph());
}
/**
* Get the current edge value.
* \return The value of the current edge pointed by the iterator.
*/
template <class TGraph>
-typename RCC8OutEdgeIterator<TGraph>
+typename RCC8OutEdgeIterator<TGraph>
::RCC8ValueType
RCC8OutEdgeIterator<TGraph>
::GetValue(void)
@@ -70,25 +70,25 @@ RCC8OutEdgeIterator<TGraph>
* \return The target vertex.
*/
template <class TGraph>
-typename RCC8OutEdgeIterator<TGraph>
+typename RCC8OutEdgeIterator<TGraph>
::VertexPointerType
RCC8OutEdgeIterator<TGraph>
::GetTargetVertex(void)
{
- return (*m_Graph->GetGraph())[target(*m_Iter,(*m_Graph->GetGraph()))];
+ return (*m_Graph->GetGraph())[target(*m_Iter, (*m_Graph->GetGraph()))];
}
/**
* Return the target vertex index of the current edge.
* \return The target vertex index.
*/
template <class TGraph>
-typename RCC8OutEdgeIterator<TGraph>
+typename RCC8OutEdgeIterator<TGraph>
::VertexDescriptorType
RCC8OutEdgeIterator<TGraph>
::GetTargetIndex(void)
{
- IndexMapType index = get(boost::vertex_index,(*m_Graph->GetGraph()));
- return index[target(*m_Iter,(*m_Graph->GetGraph()))];
+ IndexMapType index = get(boost::vertex_index, (*m_Graph->GetGraph()));
+ return index[target(*m_Iter, (*m_Graph->GetGraph()))];
}
/**
* Return true if the iterator is at the end.
@@ -99,7 +99,7 @@ bool
RCC8OutEdgeIterator<TGraph>
::IsAtEnd(void)
{
- return (m_Iter==m_End);
+ return (m_Iter == m_End);
}
/**
* Go to the beginning.
@@ -109,7 +109,7 @@ void
RCC8OutEdgeIterator<TGraph>
::GoToBegin(void)
{
- tie(m_Iter,m_End)=out_edges(m_VertexIndex,*m_Graph->GetGraph());
+ tie(m_Iter, m_End) = out_edges(m_VertexIndex, *m_Graph->GetGraph());
}
/**
* Increment.
@@ -118,11 +118,11 @@ template <class TGraph>
typename RCC8OutEdgeIterator<TGraph>
::Self&
RCC8OutEdgeIterator<TGraph>
-::operator++()
-{
+::operator++ ()
+ {
++m_Iter;
return *this;
-}
+ }
/**
* Decrement.
*/
@@ -130,11 +130,11 @@ template <class TGraph>
typename RCC8OutEdgeIterator<TGraph>
::Self&
RCC8OutEdgeIterator<TGraph>
-::operator--()
-{
+::operator-- ()
+ {
--m_Iter;
return *this;
-}
+ }
/**
* Add
*/
@@ -142,11 +142,11 @@ template <class TGraph>
typename RCC8OutEdgeIterator<TGraph>
::Self&
RCC8OutEdgeIterator<TGraph>
-::operator+(int i)
-{
- m_Iter=m_Iter+i;
+::operator + (int i)
+ {
+ m_Iter = m_Iter + i;
return *this;
-}
+ }
/**
* Remove
*/
@@ -154,31 +154,31 @@ template <class TGraph>
typename RCC8OutEdgeIterator<TGraph>
::Self&
RCC8OutEdgeIterator<TGraph>
-::operator-(int i)
-{
- m_Iter=m_Iter-i;
+::operator - (int i)
+ {
+ m_Iter = m_Iter - i;
return *this;
-}
+ }
/**
* Difference comparison operator.
*/
template <class TGraph>
bool
RCC8OutEdgeIterator<TGraph>
-::operator!=(const Self& iter)
-{
+::operator != (const Self &iter)
+ {
return (m_Iter != iter.m_Iter);
-}
+ }
/**
* Equality comparison operator.
*/
template <class TGraph>
bool
RCC8OutEdgeIterator<TGraph>
-::operator==(const Self& iter)
-{
+::operator == (const Self &iter)
+ {
return (m_Iter == iter.m_Iter);
-}
+ }
/**
* Instantiation operator.
*/
@@ -186,10 +186,10 @@ template <class TGraph>
typename RCC8OutEdgeIterator<TGraph>
::Self&
RCC8OutEdgeIterator<TGraph>
-::operator=(const Self& iter)
-{
+::operator = (const Self &iter)
+ {
m_Iter = iter.m_Iter;
return *this;
-}
+ }
} // End namespace otb
#endif
diff --git a/Code/SpatialReasoning/otbRCC8Value.h b/Code/SpatialReasoning/otbRCC8Value.h
index 148fdf7a94..b240b3a58f 100644
--- a/Code/SpatialReasoning/otbRCC8Value.h
+++ b/Code/SpatialReasoning/otbRCC8Value.h
@@ -22,7 +22,7 @@ namespace otb
{
// Coding enum system to represent the RCC8 relation values.
typedef enum
-{
+ {
OTB_RCC8_DC,
OTB_RCC8_EC,
OTB_RCC8_PO,
@@ -31,7 +31,7 @@ typedef enum
OTB_RCC8_NTPP,
OTB_RCC8_NTPPI,
OTB_RCC8_EQ
-}
+ }
RCC8Value;
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/SpatialReasoning/otbRCC8VertexBase.h b/Code/SpatialReasoning/otbRCC8VertexBase.h
index a719e72c74..4e5f2925ce 100644
--- a/Code/SpatialReasoning/otbRCC8VertexBase.h
+++ b/Code/SpatialReasoning/otbRCC8VertexBase.h
@@ -34,34 +34,34 @@ namespace otb
*/
template <class TPath>
class ITK_EXPORT RCC8VertexBase
- : public itk::DataObject
+ : public itk::DataObject
{
public:
/** Standard class typedefs */
- typedef RCC8VertexBase Self;
- typedef itk::DataObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef RCC8VertexBase Self;
+ typedef itk::DataObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(RCC8VertexBase,DataObject);
+ itkTypeMacro(RCC8VertexBase, DataObject);
/** Input image associated typedefs*/
- typedef TPath PathType;
- typedef typename PathType::Pointer PathPointerType;
+ typedef TPath PathType;
+ typedef typename PathType::Pointer PathPointerType;
typedef typename PathType::ContinuousIndexType ContinuousIndexType;
/** char* vector attributes */
- typedef std::map<std::string,std::string> AttributesMapType;
+ typedef std::map<std::string, std::string> AttributesMapType;
/** Segmentation image index accessors */
- itkGetMacro(SegmentationLevel,unsigned int);
- itkSetMacro(SegmentationLevel,unsigned int);
- itkGetMacro(SegmentationType,bool);
- itkSetMacro(SegmentationType,bool);
+ itkGetMacro(SegmentationLevel, unsigned int);
+ itkSetMacro(SegmentationLevel, unsigned int);
+ itkGetMacro(SegmentationType, bool);
+ itkSetMacro(SegmentationType, bool);
/** Object label in image accessor */
- itkGetObjectMacro(Path,PathType);
- itkSetObjectMacro(Path,PathType);
+ itkGetObjectMacro(Path, PathType);
+ itkSetObjectMacro(Path, PathType);
/**
* Set the VertexBase attributes from the attributes vector.
* \param attributes The vector containing the parsed attributes.
@@ -77,7 +77,7 @@ protected:
/** Constructor */
RCC8VertexBase();
/** Desctructor */
- virtual ~RCC8VertexBase() {};
+ virtual ~RCC8VertexBase() {}
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -87,7 +87,7 @@ private:
/** True if bright details, false otherwise */
bool m_SegmentationType;
/** The path of the edge of the region */
- PathPointerType m_Path;
+ PathPointerType m_Path;
};
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/SpatialReasoning/otbRCC8VertexBase.txx b/Code/SpatialReasoning/otbRCC8VertexBase.txx
index 9d2456e708..12a729e628 100644
--- a/Code/SpatialReasoning/otbRCC8VertexBase.txx
+++ b/Code/SpatialReasoning/otbRCC8VertexBase.txx
@@ -29,8 +29,8 @@ template <class TPath>
RCC8VertexBase<TPath>
::RCC8VertexBase()
{
- m_SegmentationLevel=0;
- m_SegmentationType= true;
+ m_SegmentationLevel = 0;
+ m_SegmentationType = true;
m_Path = PathType::New();
m_Path->Initialize();
}
@@ -43,26 +43,26 @@ void
RCC8VertexBase<TPath>
::SetAttributesMap(AttributesMapType attributes)
{
- m_SegmentationLevel=static_cast<unsigned int>(atoi(attributes["SegmentationLevel"].c_str()));
- m_SegmentationType=static_cast<bool>(atoi(attributes["SegmentationType"].c_str()));
- unsigned int nbPoints =static_cast<unsigned int>(atoi(attributes["NumberOfPointsInPath"].c_str()));
+ m_SegmentationLevel = static_cast<unsigned int>(atoi(attributes["SegmentationLevel"].c_str()));
+ m_SegmentationType = static_cast<bool>(atoi(attributes["SegmentationType"].c_str()));
+ unsigned int nbPoints = static_cast<unsigned int>(atoi(attributes["NumberOfPointsInPath"].c_str()));
itk::OStringStream oss;
m_Path = PathType::New();
m_Path->Initialize();
- for (unsigned int i = 0;i<nbPoints;++i)
- {
+ for (unsigned int i = 0; i < nbPoints; ++i)
+ {
ContinuousIndexType newPoint;
- oss<<"P"<<i<<"x";
- newPoint[0]=atof(attributes[oss.str()].c_str());
+ oss << "P" << i << "x";
+ newPoint[0] = atof(attributes[oss.str()].c_str());
oss.str("");
- oss<<"P"<<i<<"y";
- newPoint[1]=atof(attributes[oss.str()].c_str());
+ oss << "P" << i << "y";
+ newPoint[1] = atof(attributes[oss.str()].c_str());
oss.str("");
m_Path->AddVertex(newPoint);
- }
+ }
}
/**
* Get an attributes vector representing the VertexBase attributes.
@@ -74,36 +74,36 @@ RCC8VertexBase<TPath>
::GetAttributesMap(void)
{
itk::OStringStream oss;
- AttributesMapType results;
- oss<<m_SegmentationLevel;
- results["SegmentationLevel"]=oss.str();
+ AttributesMapType results;
+ oss << m_SegmentationLevel;
+ results["SegmentationLevel"] = oss.str();
oss.str("");
- oss<<m_SegmentationType;
- results["SegmentationType"]=oss.str();
+ oss << m_SegmentationType;
+ results["SegmentationType"] = oss.str();
oss.str("");
- oss<<m_Path->GetVertexList()->Size();
- results["NumberOfPointsInPath"]=oss.str();
+ oss << m_Path->GetVertexList()->Size();
+ results["NumberOfPointsInPath"] = oss.str();
oss.str("");
typename PathType::VertexListType::ConstIterator it;
- unsigned int index = 0;
+ unsigned int index = 0;
- for (it=m_Path->GetVertexList()->Begin();it!=m_Path->GetVertexList()->End();++it,++index)
- {
+ for (it = m_Path->GetVertexList()->Begin(); it != m_Path->GetVertexList()->End(); ++it, ++index)
+ {
ContinuousIndexType point = it.Value();
- oss<<"P"<<index<<"x";
+ oss << "P" << index << "x";
std::string key = oss.str();
oss.str("");
- oss<<point[0];
- results[key]=oss.str();
+ oss << point[0];
+ results[key] = oss.str();
oss.str("");
- oss<<"P"<<index<<"y";
+ oss << "P" << index << "y";
key = oss.str();
oss.str("");
- oss<<point[1];
- results[key]=oss.str();
+ oss << point[1];
+ results[key] = oss.str();
oss.str("");
- }
+ }
return results;
}
/**
@@ -112,11 +112,11 @@ RCC8VertexBase<TPath>
template <class TPath>
void
RCC8VertexBase<TPath>
-::PrintSelf( std::ostream& os,itk::Indent indent ) const
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"SegmentationLevel: "<<m_SegmentationLevel<<std::endl;
- os<<indent<<"SegmentationType: "<<m_SegmentationType<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "SegmentationLevel: " << m_SegmentationLevel << std::endl;
+ os << indent << "SegmentationType: " << m_SegmentationType << std::endl;
}
} // end namespace otb
#endif
diff --git a/Code/SpatialReasoning/otbRCC8VertexIterator.h b/Code/SpatialReasoning/otbRCC8VertexIterator.h
index 3bd537994c..ecddb2758e 100644
--- a/Code/SpatialReasoning/otbRCC8VertexIterator.h
+++ b/Code/SpatialReasoning/otbRCC8VertexIterator.h
@@ -34,10 +34,10 @@ public:
typedef RCC8VertexIterator Self;
/** Graph typedef */
- typedef TGraph GraphType;
- typedef typename GraphType::InternalGraphType InternalGraphType;
- typedef typename GraphType::Pointer GraphPointerType;
- typedef typename GraphType::VertexPointerType VertexPointerType;
+ typedef TGraph GraphType;
+ typedef typename GraphType::InternalGraphType InternalGraphType;
+ typedef typename GraphType::Pointer GraphPointerType;
+ typedef typename GraphType::VertexPointerType VertexPointerType;
typedef typename GraphType::VertexDescriptorType VertexDescriptorType;
/** typedef of the internal iterator */
typedef typename boost::graph_traits<InternalGraphType>::vertex_iterator InternalIteratorType;
@@ -46,7 +46,7 @@ public:
/** Constructor */
RCC8VertexIterator();
/** Copy constructor */
- RCC8VertexIterator(const Self& iter);
+ RCC8VertexIterator(const Self &iter);
/** Constructor with input graph */
RCC8VertexIterator(TGraph * graph);
/**
@@ -76,32 +76,32 @@ public:
/**
* Increment.
*/
- Self& operator++();
+ Self& operator ++();
/**
* Decrement.
*/
- Self& operator--();
+ Self& operator --();
/**
* Add
*/
- Self& operator+(int i);
+ Self& operator +(int i);
/**
* Remove
*/
- Self& operator-(int i);
+ Self& operator -(int i);
/**
* Difference comparison operator.
*/
- bool operator!=(const Self& it);
+ bool operator !=(const Self& it);
/**
* Equality comparison operator.
*/
- bool operator==(const Self& it);
+ bool operator ==(const Self& it);
/**
* Instantiation operator.
*/
- Self& operator=(const Self& it);
+ Self& operator =(const Self& it);
private:
// End
InternalIteratorType m_End;
diff --git a/Code/SpatialReasoning/otbRCC8VertexIterator.txx b/Code/SpatialReasoning/otbRCC8VertexIterator.txx
index 653d460c9f..d6d9175bd1 100644
--- a/Code/SpatialReasoning/otbRCC8VertexIterator.txx
+++ b/Code/SpatialReasoning/otbRCC8VertexIterator.txx
@@ -30,7 +30,7 @@ RCC8VertexIterator<TGraph>
::RCC8VertexIterator()
{
m_Graph = GraphType::New();
- tie(m_Iter,m_End)= vertices(*(m_Graph->GetGraph()));
+ tie(m_Iter, m_End) = vertices(*(m_Graph->GetGraph()));
}
/**
* Copy operator.
@@ -39,9 +39,9 @@ template <class TGraph>
RCC8VertexIterator<TGraph>
::RCC8VertexIterator(const Self& iter)
{
- m_Iter=iter.m_Iter;
- m_Graph=iter.m_Graph;
- m_End=iter.m_End;
+ m_Iter = iter.m_Iter;
+ m_Graph = iter.m_Graph;
+ m_End = iter.m_End;
}
/**
*Constructor with input graph
@@ -50,15 +50,15 @@ template <class TGraph>
RCC8VertexIterator<TGraph>
::RCC8VertexIterator(TGraph * graph)
{
- m_Graph=graph;
- tie(m_Iter,m_End)=vertices(*(m_Graph->GetGraph()));
+ m_Graph = graph;
+ tie(m_Iter, m_End) = vertices(*(m_Graph->GetGraph()));
}
/**
* Get the current object.
* \return The current object pointed by the iterator.
*/
template <class TGraph>
-typename RCC8VertexIterator<TGraph>
+typename RCC8VertexIterator<TGraph>
::VertexPointerType
RCC8VertexIterator<TGraph>
::Get(void)
@@ -74,19 +74,19 @@ void
RCC8VertexIterator<TGraph>
::Set(VertexPointerType vertex)
{
- (*(m_Graph->GetGraph()))[*m_Iter]=vertex;
+ (*(m_Graph->GetGraph()))[*m_Iter] = vertex;
}
/**
* Get the current vertex index.
* \return The current vertex index.
*/
template <class TGraph>
-typename RCC8VertexIterator<TGraph>
+typename RCC8VertexIterator<TGraph>
::VertexDescriptorType
RCC8VertexIterator<TGraph>
::GetIndex(void)
{
- IndexMapType index = get(boost::vertex_index,(*m_Graph->GetGraph()));
+ IndexMapType index = get(boost::vertex_index, (*m_Graph->GetGraph()));
return index[*m_Iter];
}
/**
@@ -98,7 +98,7 @@ bool
RCC8VertexIterator<TGraph>
::IsAtEnd(void)
{
- return (m_Iter==m_End);
+ return (m_Iter == m_End);
}
/**
* Go to the beginning.
@@ -108,7 +108,7 @@ void
RCC8VertexIterator<TGraph>
::GoToBegin(void)
{
- tie(m_Iter,m_End)=vertices(*(m_Graph->GetGraph()));
+ tie(m_Iter, m_End) = vertices(*(m_Graph->GetGraph()));
}
/**
* Increment.
@@ -117,11 +117,11 @@ template <class TGraph>
typename RCC8VertexIterator<TGraph>
::Self&
RCC8VertexIterator<TGraph>
-::operator++()
-{
+::operator++ ()
+ {
++m_Iter;
return *this;
-}
+ }
/**
* Decrement.
*/
@@ -129,11 +129,11 @@ template <class TGraph>
typename RCC8VertexIterator<TGraph>
::Self&
RCC8VertexIterator<TGraph>
-::operator--()
-{
+::operator-- ()
+ {
--m_Iter;
return *this;
-}
+ }
/**
* Add
*/
@@ -141,11 +141,11 @@ template <class TGraph>
typename RCC8VertexIterator<TGraph>
::Self&
RCC8VertexIterator<TGraph>
-::operator+(int i)
-{
- m_Iter=m_Iter+i;
+::operator + (int i)
+ {
+ m_Iter = m_Iter + i;
return *this;
-}
+ }
/**
* Remove
*/
@@ -153,31 +153,31 @@ template <class TGraph>
typename RCC8VertexIterator<TGraph>
::Self&
RCC8VertexIterator<TGraph>
-::operator-(int i)
-{
- m_Iter=m_Iter-i;
+::operator - (int i)
+ {
+ m_Iter = m_Iter - i;
return *this;
-}
+ }
/**
* Difference comparison operator.
*/
template <class TGraph>
bool
RCC8VertexIterator<TGraph>
-::operator!=(const Self& iter)
-{
+::operator != (const Self &iter)
+ {
return (m_Iter != iter.m_Iter);
-}
+ }
/**
* Equality comparison operator.
*/
template <class TGraph>
bool
RCC8VertexIterator<TGraph>
-::operator==(const Self& iter)
-{
+::operator == (const Self &iter)
+ {
return (m_Iter == iter.m_Iter);
-}
+ }
/**
* Instantiation operator.
*/
@@ -185,10 +185,10 @@ template <class TGraph>
typename RCC8VertexIterator<TGraph>
::Self&
RCC8VertexIterator<TGraph>
-::operator=(const Self& iter)
-{
+::operator = (const Self &iter)
+ {
m_Iter = iter.m_Iter;
return *this;
-}
+ }
} // End namespace otb
#endif
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h b/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h
index 0713e0e70e..2414381c7b 100644
--- a/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h
+++ b/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h
@@ -31,28 +31,28 @@ namespace otb
*/
template <class TPath, class TPrecision = float>
class ITK_EXPORT RCC8VertexWithCompacity
- : public RCC8VertexBase<TPath>
+ : public RCC8VertexBase<TPath>
{
public:
/** Standard class typedefs */
- typedef RCC8VertexWithCompacity Self;
- typedef otb::RCC8VertexBase<TPath> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef RCC8VertexWithCompacity Self;
+ typedef otb::RCC8VertexBase<TPath> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(RCC8VertexWithCompacity,RCC8VertexBase);
+ itkTypeMacro(RCC8VertexWithCompacity, RCC8VertexBase);
/** Input image associated typedefs*/
typedef TPath PathType;
/** Precision typedef */
typedef TPrecision PrecisionType;
/** char* vector attributes */
- typedef typename Superclass::AttributesMapType AttributesMapType;
+ typedef typename Superclass::AttributesMapType AttributesMapType;
/** Segmentation image index accessors */
- itkGetMacro(Compacity,PrecisionType);
- itkSetMacro(Compacity,PrecisionType);
+ itkGetMacro(Compacity, PrecisionType);
+ itkSetMacro(Compacity, PrecisionType);
/**
* Set the VertexWithCompacity attributes from the attributes vector.
* \param attributes The vector containing the parsed attributes.
@@ -68,7 +68,7 @@ protected:
/** Constructor */
RCC8VertexWithCompacity();
/** Desctructor */
- ~RCC8VertexWithCompacity() {};
+ ~RCC8VertexWithCompacity() {}
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithCompacity.txx b/Code/SpatialReasoning/otbRCC8VertexWithCompacity.txx
index e7d412ae81..0862f90b9e 100644
--- a/Code/SpatialReasoning/otbRCC8VertexWithCompacity.txx
+++ b/Code/SpatialReasoning/otbRCC8VertexWithCompacity.txx
@@ -25,51 +25,51 @@ namespace otb
/**
* Constructor
*/
-template <class TPath,class TPrecision>
-RCC8VertexWithCompacity<TPath,TPrecision>
+template <class TPath, class TPrecision>
+RCC8VertexWithCompacity<TPath, TPrecision>
::RCC8VertexWithCompacity()
{
- m_Compacity=0.0;
+ m_Compacity = 0.0;
}
/**
* Set the VertexWithCompacity attributes from the attributes vector.
* \param attributes The vector containing the parsed attributes.
*/
-template <class TPath,class TPrecision>
+template <class TPath, class TPrecision>
void
-RCC8VertexWithCompacity<TPath,TPrecision>
+RCC8VertexWithCompacity<TPath, TPrecision>
::SetAttributesMap(AttributesMapType attributes)
{
this->Superclass::SetAttributesMap(attributes);
- m_Compacity=static_cast<TPrecision>(atof(attributes["Compacity"].c_str()));
+ m_Compacity = static_cast<TPrecision>(atof(attributes["Compacity"].c_str()));
}
/**
* Get an attributes vector representing the VertexBase attributes.
* \return The attributes vector
*/
-template <class TPath,class TPrecision>
-typename RCC8VertexWithCompacity<TPath,TPrecision>::AttributesMapType
-RCC8VertexWithCompacity<TPath,TPrecision>
+template <class TPath, class TPrecision>
+typename RCC8VertexWithCompacity<TPath, TPrecision>::AttributesMapType
+RCC8VertexWithCompacity<TPath, TPrecision>
::GetAttributesMap(void)
{
std::stringstream oss;
AttributesMapType results;
- results=this->Superclass::GetAttributesMap();
- oss<<m_Compacity;
- results["Compacity"]=oss.str();
+ results = this->Superclass::GetAttributesMap();
+ oss << m_Compacity;
+ results["Compacity"] = oss.str();
oss.str("");
return results;
}
/**
* PrintSelf method
*/
-template <class TPath,class TPrecision>
+template <class TPath, class TPrecision>
void
-RCC8VertexWithCompacity<TPath,TPrecision>
-::PrintSelf( std::ostream& os,itk::Indent indent ) const
+RCC8VertexWithCompacity<TPath, TPrecision>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"Compacity: "<<m_Compacity<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Compacity: " << m_Compacity << std::endl;
}
} // end namespace otb
#endif
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h b/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h
index 40bbb5b8d3..386c0602e7 100644
--- a/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h
+++ b/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h
@@ -31,30 +31,29 @@ namespace otb
*/
template <class TLabel, class TPrecision = float>
class ITK_EXPORT RCC8VertexWithRegionCenter
- : public RCC8VertexBase<TLabel>
+ : public RCC8VertexBase<TLabel>
{
public:
/** Standard class typedefs */
- typedef RCC8VertexWithRegionCenter Self;
- typedef otb::RCC8VertexBase<TLabel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef RCC8VertexWithRegionCenter Self;
+ typedef otb::RCC8VertexBase<TLabel> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(RCC8VertexWithRegionCenter,RCC8VertexBase);
+ itkTypeMacro(RCC8VertexWithRegionCenter, RCC8VertexBase);
/** Input image associated typedefs*/
typedef TLabel LabelType;
/** Precision typedef */
typedef TPrecision PrecisionType;
/** char* vector attributes */
- typedef typename Superclass::AttributesMapType AttributesMapType;
+ typedef typename Superclass::AttributesMapType AttributesMapType;
-
- itkGetMacro(RegionCenterXCoordinate,PrecisionType);
- itkSetMacro(RegionCenterXCoordinate,PrecisionType);
- itkGetMacro(RegionCenterYCoordinate,PrecisionType);
- itkSetMacro(RegionCenterYCoordinate,PrecisionType);
+ itkGetMacro(RegionCenterXCoordinate, PrecisionType);
+ itkSetMacro(RegionCenterXCoordinate, PrecisionType);
+ itkGetMacro(RegionCenterYCoordinate, PrecisionType);
+ itkSetMacro(RegionCenterYCoordinate, PrecisionType);
/**
* Set the VertexWithRegionCenter attributes from the attributes vector.
* \param attributes The vector containing the parsed attributes.
@@ -70,7 +69,7 @@ protected:
/** Constructor */
RCC8VertexWithRegionCenter();
/** Desctructor */
- ~RCC8VertexWithRegionCenter() {};
+ ~RCC8VertexWithRegionCenter() {}
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.txx b/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.txx
index 70e90d56b2..4a43311a98 100644
--- a/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.txx
+++ b/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.txx
@@ -25,57 +25,57 @@ namespace otb
/**
* Constructor
*/
-template <class TLabel,class TPrecision>
-RCC8VertexWithRegionCenter<TLabel,TPrecision>
+template <class TLabel, class TPrecision>
+RCC8VertexWithRegionCenter<TLabel, TPrecision>
::RCC8VertexWithRegionCenter()
{
- m_RegionCenterXCoordinate=0.0;
- m_RegionCenterYCoordinate=0.0;
+ m_RegionCenterXCoordinate = 0.0;
+ m_RegionCenterYCoordinate = 0.0;
}
/**
* Set the VertexWithRegionCenter attributes from the attributes vector.
* \param attributes The vector containing the parsed attributes.
*/
-template <class TLabel,class TPrecision>
+template <class TLabel, class TPrecision>
void
-RCC8VertexWithRegionCenter<TLabel,TPrecision>
+RCC8VertexWithRegionCenter<TLabel, TPrecision>
::SetAttributesMap(AttributesMapType attributes)
{
this->Superclass::SetAttributesMap(attributes);
- m_RegionCenterXCoordinate=static_cast<TPrecision>(atof(attributes["RegionCenterXCoordinate"].c_str()));
- m_RegionCenterYCoordinate=static_cast<TPrecision>(atof(attributes["RegionCenterYCoordinate"].c_str()));
+ m_RegionCenterXCoordinate = static_cast<TPrecision>(atof(attributes["RegionCenterXCoordinate"].c_str()));
+ m_RegionCenterYCoordinate = static_cast<TPrecision>(atof(attributes["RegionCenterYCoordinate"].c_str()));
}
/**
* Get an attributes vector representing the VertexBase attributes.
* \return The attributes vector
*/
-template <class TLabel,class TPrecision>
-typename RCC8VertexWithRegionCenter<TLabel,TPrecision>::AttributesMapType
-RCC8VertexWithRegionCenter<TLabel,TPrecision>
+template <class TLabel, class TPrecision>
+typename RCC8VertexWithRegionCenter<TLabel, TPrecision>::AttributesMapType
+RCC8VertexWithRegionCenter<TLabel, TPrecision>
::GetAttributesMap(void)
{
std::stringstream oss;
AttributesMapType results;
- results=this->Superclass::GetAttributesMap();
- oss<<m_RegionCenterXCoordinate;
- results["RegionCenterXCoordinate"]=oss.str();
+ results = this->Superclass::GetAttributesMap();
+ oss << m_RegionCenterXCoordinate;
+ results["RegionCenterXCoordinate"] = oss.str();
oss.str("");
- oss<<m_RegionCenterYCoordinate;
- results["RegionCenterYCoordinate"]=oss.str();
+ oss << m_RegionCenterYCoordinate;
+ results["RegionCenterYCoordinate"] = oss.str();
oss.str("");
return results;
}
/**
* PrintSelf method
*/
-template <class TLabel,class TPrecision>
+template <class TLabel, class TPrecision>
void
-RCC8VertexWithRegionCenter<TLabel,TPrecision>
-::PrintSelf( std::ostream& os,itk::Indent indent ) const
+RCC8VertexWithRegionCenter<TLabel, TPrecision>
+::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"RegionCenterXCoordinate: "<<m_RegionCenterXCoordinate<<std::endl;
- os<<indent<<"RegionCenterXCoordinate: "<<m_RegionCenterYCoordinate<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "RegionCenterXCoordinate: " << m_RegionCenterXCoordinate << std::endl;
+ os << indent << "RegionCenterXCoordinate: " << m_RegionCenterYCoordinate << std::endl;
}
} // end namespace otb
#endif
diff --git a/Code/Testing/otbTestDriver.cxx b/Code/Testing/otbTestDriver.cxx
index 831476f21e..c2579cc676 100644
--- a/Code/Testing/otbTestDriver.cxx
+++ b/Code/Testing/otbTestDriver.cxx
@@ -43,7 +43,9 @@ void usage()
{
std::cerr << "usage: otbTestDriver [global_options] [non_regression_commands] Execute prg [args]" << std::endl;
std::cerr << std::endl;
- std::cerr << "otbTestDriver alter the environment, run a test program and does regression testing based on capabilities provided by otbTestMain.h" << std::endl;
+ std::cerr <<
+ "otbTestDriver alter the environment, run a test program and does regression testing based on capabilities provided by otbTestMain.h"
+ << std::endl;
std::cerr << std::endl;
std::cerr << "Global pptions:" << std::endl;
std::cerr << " --add-before-libpath PATH" << std::endl;
@@ -58,136 +60,136 @@ void usage()
std::cerr << " --help" << std::endl;
std::cerr << " Display this message and exit." << std::endl;
std::cerr << std::endl;
-
+
}
/** This function parses the command line and process everything
* related to the --add-before-libpath, --add-before-env and --help.
* Every other args are added to the remainingArgs vector */
-int parseCommandLine(int ac, char * av[], std::vector<char *> & remainingArgs)
+int parseCommandLine(int ac, char * av[], std::vector<char *>& remainingArgs)
{
// parse the command line
- int i = 1;
+ int i = 1;
bool skip = false;
- while( i < ac )
+ while (i < ac)
{
- if( !skip && strcmp(av[i], "--add-before-libpath") == 0 )
+ if (!skip && strcmp(av[i], "--add-before-libpath") == 0)
{
- if( i+1 >= ac )
+ if (i + 1 >= ac)
{
usage();
return 1;
}
std::string libpath = KWSYS_SHARED_FORWARD_LDPATH;
libpath += "=";
- libpath += av[i+1];
+ libpath += av[i + 1];
char * oldenv = getenv(KWSYS_SHARED_FORWARD_LDPATH);
- if( oldenv )
+ if (oldenv)
{
libpath += KWSYS_SHARED_FORWARD_PATH_SEP;
libpath += oldenv;
}
- itksys::SystemTools::PutEnv( libpath.c_str() );
+ itksys::SystemTools::PutEnv(libpath.c_str());
// on some 64 bit systems, LD_LIBRARY_PATH_64 is used before
// LD_LIBRARY_PATH if it is set. It can lead the test to load
// the system library instead of the expected one, so this
// var must also be set
- if( std::string(KWSYS_SHARED_FORWARD_LDPATH) == "LD_LIBRARY_PATH" )
+ if (std::string(KWSYS_SHARED_FORWARD_LDPATH) == "LD_LIBRARY_PATH")
{
std::string libpath = "LD_LIBRARY_PATH_64";
libpath += "=";
- libpath += av[i+1];
+ libpath += av[i + 1];
char * oldenv = getenv("LD_LIBRARY_PATH_64");
- if( oldenv )
+ if (oldenv)
{
libpath += KWSYS_SHARED_FORWARD_PATH_SEP;
libpath += oldenv;
}
- itksys::SystemTools::PutEnv( libpath.c_str() );
+ itksys::SystemTools::PutEnv(libpath.c_str());
}
i += 2;
}
- else if( !skip && strcmp(av[i], "--add-before-env") == 0 )
+ else if (!skip && strcmp(av[i], "--add-before-env") == 0)
{
- if( i+2 >= ac )
+ if (i + 2 >= ac)
{
usage();
return 1;
}
- std::string env = av[i+1];
+ std::string env = av[i + 1];
env += "=";
- env += av[i+2];
- char * oldenv = getenv(av[i+1]);
- if( oldenv )
+ env += av[i + 2];
+ char * oldenv = getenv(av[i + 1]);
+ if (oldenv)
{
env += KWSYS_SHARED_FORWARD_PATH_SEP;
env += oldenv;
}
- itksys::SystemTools::PutEnv( env.c_str() );
+ itksys::SystemTools::PutEnv(env.c_str());
i += 3;
}
- else if( !skip && strcmp(av[i], "--help") == 0 )
+ else if (!skip && strcmp(av[i], "--help") == 0)
{
usage();
return 0;
}
- else
+ else
{
- remainingArgs.push_back( av[i] );
+ remainingArgs.push_back(av[i]);
i += 1;
}
}
return 0;
}
-int main(int ac, char* av[] )
+int main(int ac, char* av[])
{
// A vector to store remaining args
- std::vector< char* > remainingArgs;
-
+ std::vector<char*> remainingArgs;
+
// First parse the command line for system wide options
- int ret = parseCommandLine(ac,av,remainingArgs);
-
+ int ret = parseCommandLine(ac, av, remainingArgs);
+
// Check for the return code
- if(ret)
+ if (ret)
{
- std::cerr<<"Error while parsing arguments, exiting ..."<<std::endl;
+ std::cerr << "Error while parsing arguments, exiting ..." << std::endl;
return 1;
}
// Check if there are remaining args
- if( remainingArgs.empty() )
+ if (remainingArgs.empty())
{
usage();
return 1;
- }
- // a NULL is required at the end of the table
- char** argv = new char*[ remainingArgs.size() + 2 ];
- argv[0] = "dummy";
- for(int i=0; i<static_cast<int>(remainingArgs.size()); i++ )
- {
- argv[ i+1 ] = remainingArgs[ i ];
- }
- argv[ remainingArgs.size() + 1 ] = NULL;
+ }
+ // a NULL is required at the end of the table
+ char** argv = new char*[remainingArgs.size() + 2];
+ argv[0] = "dummy";
+ for (int i = 0; i < static_cast<int>(remainingArgs.size()); i++)
+ {
+ argv[i + 1] = remainingArgs[i];
+ }
+ argv[remainingArgs.size() + 1] = NULL;
+
+ /** Call to the otbTestMain */
+ return otbTestMain(remainingArgs.size(), argv);
- /** Call to the otbTestMain */
- return otbTestMain(remainingArgs.size(),argv);
-
}
// This is a dummy main to be registered as a test for the otbTestMain
int Execute(int argc, char * argv[])
{
- argc-=1;
- argv+=1;
+ argc -= 1;
+ argv += 1;
// Create the appropriate itk process
itksysProcess * process = itksysProcess_New();
- itksysProcess_SetCommand( process, argv );
- itksysProcess_SetPipeShared( process, itksysProcess_Pipe_STDOUT, true);
- itksysProcess_SetPipeShared( process, itksysProcess_Pipe_STDERR, true);
- itksysProcess_Execute( process );
- itksysProcess_WaitForExit( process, NULL );
- int retCode = itksysProcess_GetExitValue(process);;
+ itksysProcess_SetCommand(process, argv);
+ itksysProcess_SetPipeShared(process, itksysProcess_Pipe_STDOUT, true);
+ itksysProcess_SetPipeShared(process, itksysProcess_Pipe_STDERR, true);
+ itksysProcess_Execute(process);
+ itksysProcess_WaitForExit(process, NULL);
+ int retCode = itksysProcess_GetExitValue(process);
return retCode;
}
@@ -201,5 +203,3 @@ void RegisterTests()
{
REGISTER_TEST(Execute);
}
-
-
diff --git a/Code/Testing/otbTestHelper.cxx b/Code/Testing/otbTestHelper.cxx
index 08a7c6dd82..d2f9e2d711 100644
--- a/Code/Testing/otbTestHelper.cxx
+++ b/Code/Testing/otbTestHelper.cxx
@@ -39,53 +39,52 @@
#include "cpl_string.h"
#include "cpl_multiproc.h"
-#define otbPrintDiff(comment,refStr,testStr) \
- std::cout << " ---- '"<<comment<<"' checking ---------------------------"<<std::endl; \
- std::cout << " Base << "<<refStr<<std::endl; \
- std::cout << " Test >> "<<testStr<<std::endl;
-
-#define otbCheckStringValue(Comment,RefStr,TestStr, count, report) \
-{ \
- std::string strRefStr(""); if(RefStr != NULL) strRefStr = RefStr; \
- std::string strTestStr(""); if(TestStr != NULL) strTestStr = TestStr; \
- if( strRefStr != strTestStr ) \
+#define otbPrintDiff(comment, refStr, testStr) \
+ std::cout << " ---- '" << comment << "' checking ---------------------------" << std::endl; \
+ std::cout << " Base << " << refStr << std::endl; \
+ std::cout << " Test >> " << testStr << std::endl;
+
+#define otbCheckStringValue(Comment, RefStr, TestStr, count, report) \
+ { \
+ std::string strRefStr(""); if (RefStr != NULL) strRefStr = RefStr; \
+ std::string strTestStr(""); if (TestStr != NULL) strTestStr = TestStr; \
+ if (strRefStr != strTestStr) \
+ { \
+ count++; \
+ if (report) \
{ \
- count++; \
- if(report) \
- { \
- otbPrintDiff(Comment,strRefStr,strTestStr); \
- } \
+ otbPrintDiff(Comment, strRefStr, strTestStr); \
} \
-}
-#define otbCheckValue(Comment,Ref,Test, count, report) \
-{ \
- if( Ref != Test ) \
+ } \
+ }
+#define otbCheckValue(Comment, Ref, Test, count, report) \
+ { \
+ if (Ref != Test) \
+ { \
+ count++; \
+ if (report) \
{ \
- count++; \
- if(report) \
- { \
- otbPrintDiff(Comment,Ref,Test); \
- } \
+ otbPrintDiff(Comment, Ref, Test); \
} \
-}
+ } \
+ }
namespace otb
{
int TestHelper::RegressionTestAsciiFile(const char * testAsciiFileName, const char * baselineAsciiFileName,
- const double epsilon, std::vector<std::string> ignoredLines) const
+ const double epsilon, std::vector<std::string> ignoredLines) const
{
std::ifstream fluxfiletest(testAsciiFileName);
std::ifstream fluxfileref(baselineAsciiFileName);
-
std::string diffAsciiFileName(testAsciiFileName);
diffAsciiFileName += ".diff.txt";
std::ofstream fluxfilediff;
if (m_ReportErrors)
- {
+ {
fluxfilediff.open(diffAsciiFileName.c_str());
- }
+ }
std::string strfiletest;
std::string strfileref;
@@ -93,35 +92,34 @@ int TestHelper::RegressionTestAsciiFile(const char * testAsciiFileName, const ch
int nbdiff(0);
int numLine(1);
if (!fluxfiletest)
- {
- itkGenericExceptionMacro(<<"Impossible to open the test ASCII file <"<<testAsciiFileName<<">.");
- }
+ {
+ itkGenericExceptionMacro(<< "Impossible to open the test ASCII file <" << testAsciiFileName << ">.");
+ }
if (!fluxfileref)
- {
- itkGenericExceptionMacro(<< "Impossible to open the baseline ASCII file <"<<baselineAsciiFileName<<">.");
- }
-
+ {
+ itkGenericExceptionMacro(<< "Impossible to open the baseline ASCII file <" << baselineAsciiFileName << ">.");
+ }
//fill up a vector of string, in which each element is one line of the file
std::vector<std::string> listLineFileRef;
std::vector<std::string> listLineFileTest;
while (std::getline(fluxfileref, strfileref) != 0)
- {
+ {
listLineFileRef.push_back(strfileref);
- }
+ }
fluxfileref.close();
while (std::getline(fluxfiletest, strfiletest) != 0)
- {
+ {
listLineFileTest.push_back(strfiletest);
- }
+ }
fluxfiletest.close();
- if(m_IgnoreLineOrder)
- {
+ if (m_IgnoreLineOrder)
+ {
std::sort(listLineFileRef.begin(), listLineFileRef.end());
std::sort(listLineFileTest.begin(), listLineFileTest.end());
- }
+ }
//These are to save up the differences
std::vector<std::string> listStrDiffLineFileRef;
@@ -131,7 +129,7 @@ int TestHelper::RegressionTestAsciiFile(const char * testAsciiFileName, const ch
std::vector<std::string>::iterator itTest = listLineFileTest.begin();
// while (std::getline(fluxfileref, strfileref) != 0)
while ((itRef != listLineFileRef.end()) && (itTest != listLineFileTest.end()))
- {
+ {
strfileref = *itRef;
strfiletest = *itTest;
@@ -139,113 +137,112 @@ int TestHelper::RegressionTestAsciiFile(const char * testAsciiFileName, const ch
bool ignoreCurrentLineRef = false;
bool ignoreCurrentLineTest = false;
if (ignoredLines.size() > 0)
- {
+ {
for (std::vector<std::string>::iterator itIgnoredLines = ignoredLines.begin();
itIgnoredLines != ignoredLines.end(); ++itIgnoredLines)
- {
- std::string ignoredLinesAscii = (*itIgnoredLines);
+ {
+ std::string ignoredLinesAscii = (*itIgnoredLines);
std::string::size_type loc = strfileref.find(ignoredLinesAscii);
if (loc != std::string::npos)
- {
+ {
ignoreCurrentLineRef = true;
- }
+ }
loc = strfiletest.find(ignoredLinesAscii);
if (loc != std::string::npos)
- {
+ {
ignoreCurrentLineTest = true;
+ }
}
}
- }
//Compare the lines only if none is supposed to be ignored
//Note: the iterator increment will take care of moving only the
//ignored one if the order does not matter
bool differenceFoundInCurrentLine = false;
if ((!ignoreCurrentLineRef) && (!ignoreCurrentLineTest))
- {
+ {
// std::cout << "Ref line: " << strfileref << std::endl;
// std::cout << "Test line: " << strfiletest << std::endl;
- differenceFoundInCurrentLine = CompareLines(strfileref,strfiletest, nbdiff, fluxfilediff, numLine,
- listStrDiffLineFileRef, listStrDiffLineFileTest, epsilon);
- }
+ differenceFoundInCurrentLine = CompareLines(strfileref, strfiletest, nbdiff, fluxfilediff, numLine,
+ listStrDiffLineFileRef, listStrDiffLineFileTest, epsilon);
+ }
if (m_IgnoreLineOrder)
- {
+ {
if (ignoreCurrentLineRef) ++itRef;
if (ignoreCurrentLineTest) ++itTest;
if ((!ignoreCurrentLineRef) && (!ignoreCurrentLineTest))
- {
- if (differenceFoundInCurrentLine)
{
- if (*itRef > *itTest)
+ if (differenceFoundInCurrentLine)
{
+ if (*itRef > *itTest)
+ {
fluxfilediff << "Additional line in test file: " << " : " << *itTest << std::endl;
++itTest;
- }
+ }
else
- {
+ {
fluxfilediff << "Additional line in ref file: " << " : " << *itTest << std::endl;
++itRef;
+ }
}
- }
else
- {
+ {
++itRef;
++itTest;
+ }
}
}
- }
else
- {
+ {
++itRef;
++itTest;
- }
+ }
- }
+ }
//Here, the line by line comparison is finished and at least one (ref or test) is at the end
//we simply output the content of the other one
while (itRef != listLineFileRef.end())
- {
+ {
strfileref = *itRef;
otb::StringStream buffstreamRef;
- std::string strRef = "";
+ std::string strRef = "";
buffstreamRef << strfileref;
buffstreamRef >> strRef;
fluxfilediff << "Additional line in ref file: " << numLine << " : " << strRef << std::endl;
nbdiff++;
if (m_ReportErrors)
- {
+ {
listStrDiffLineFileRef.push_back(strfileref);
- }
+ }
++itRef;
- }
+ }
while (itTest != listLineFileTest.end())
- {
+ {
strfiletest = *itTest;
otb::StringStream buffstreamTest;
- std::string strTest = "";
+ std::string strTest = "";
buffstreamTest << strfiletest;
buffstreamTest >> strTest;
fluxfilediff << "Additional line in test file: " << numLine << " : " << strTest << std::endl;
nbdiff++;
if (m_ReportErrors)
- {
+ {
listStrDiffLineFileTest.push_back(strfiletest);
- }
+ }
++itTest;
- }
-
+ }
if (m_ReportErrors)
- {
+ {
fluxfilediff.close();
- }
+ }
if (nbdiff != 0 && m_ReportErrors)
- {
+ {
std::cout << "<DartMeasurement name=\"ASCIIFileError\" type=\"numeric/int\">";
std::cout << nbdiff;
std::cout << "</DartMeasurement>" << std::endl;
@@ -260,97 +257,98 @@ int TestHelper::RegressionTestAsciiFile(const char * testAsciiFileName, const ch
unsigned int numLineDiff = std::min(listStrDiffLineFileRef.size(), listStrDiffLineFileTest.size());
std::cout << "Nb lines differents : " << numLineDiff << std::endl;
for (unsigned int i = 0; i < numLineDiff; ++i)
- {
+ {
std::cout << " -------------------------------" << std::endl;
std::cout << " Base << " << listStrDiffLineFileRef[i] << std::endl;
std::cout << " Test >> " << listStrDiffLineFileTest[i] << std::endl;
- }
+ }
for (unsigned int i = numLineDiff; i < listStrDiffLineFileRef.size(); ++i)
- {
+ {
std::cout << " -------------------------------" << std::endl;
std::cout << " Base << " << listStrDiffLineFileRef[i] << std::endl;
- }
+ }
for (unsigned int i = numLineDiff; i < listStrDiffLineFileTest.size(); ++i)
- {
+ {
std::cout << " -------------------------------" << std::endl;
std::cout << " Test >> " << listStrDiffLineFileTest[i] << std::endl;
+ }
}
- }
return (nbdiff != 0) ? 1 : 0;
}
-
/******************************************/
/******************************************/
/******************************************/
int TestHelper::RegressionTestBinaryFile(const char * testBinaryFileName, const char * baselineBinaryFileName) const
{
- int nbdiff(0);
+ int nbdiff(0);
std::ifstream fluxfiletest(testBinaryFileName, std::ifstream::binary);
std::ifstream fluxfileref(baselineBinaryFileName, std::ifstream::binary);
if (fluxfiletest.fail())
- {
- itkGenericExceptionMacro(<<"Impossible to open the test binary file <" << testBinaryFileName << ">.");
- }
+ {
+ itkGenericExceptionMacro(<< "Impossible to open the test binary file <" << testBinaryFileName << ">.");
+ }
if (!fluxfileref)
- {
+ {
itkGenericExceptionMacro(<< "Impossible to open the baseline binary file <" << baselineBinaryFileName << ">.");
- }
+ }
while (fluxfiletest.good() && fluxfileref.good())
- {
- if (fluxfiletest.get() != fluxfileref.get())
{
+ if (fluxfiletest.get() != fluxfileref.get())
+ {
nbdiff++;
+ }
}
- }
fluxfiletest.close();
fluxfileref.close();
if (nbdiff != 0 && m_ReportErrors)
- {
+ {
std::cout << "<DartMeasurement name=\"BINARYFileError\" type=\"numeric/int\">";
std::cout << nbdiff;
std::cout << "</DartMeasurement>" << std::endl;
- }
+ }
return (nbdiff != 0) ? 1 : 0;
}
int TestHelper::RegressionTestImage(int cpt, const char *testImageFilename, const char *baselineImageFilename,
- const double toleranceDiffPixelImage) const
+ const double toleranceDiffPixelImage) const
{
// Use the factory mechanism to read the test and baseline files and convert them to double
- typedef otb::VectorImage<double, 2> ImageType;
+ typedef otb::VectorImage<double, 2> ImageType;
typedef otb::VectorImage<unsigned char, 2> OutputType;
typedef otb::VectorImage<unsigned char, 2> DiffOutputType;
- typedef otb::ImageFileReader<ImageType> ReaderType;
+ typedef otb::ImageFileReader<ImageType> ReaderType;
// Read the baseline file
ReaderType::Pointer baselineReader = ReaderType::New();
baselineReader->SetFileName(baselineImageFilename);
try
- {
+ {
baselineReader->UpdateLargestPossibleRegion();
- } catch (itk::ExceptionObject& e)
- {
+ }
+ catch (itk::ExceptionObject& e)
+ {
itkGenericExceptionMacro(<< "Exception detected while reading "
- << baselineImageFilename << " : " << e.GetDescription());
+ << baselineImageFilename << " : " << e.GetDescription());
return 1000;
- }
+ }
// Read the file generated by the test
ReaderType::Pointer testReader = ReaderType::New();
testReader->SetFileName(testImageFilename);
try
- {
+ {
testReader->UpdateLargestPossibleRegion();
- } catch (itk::ExceptionObject& e)
- {
+ }
+ catch (itk::ExceptionObject& e)
+ {
itkGenericExceptionMacro(<< "Exception detected while reading "
- << testImageFilename << " : " << e.GetDescription() );
+ << testImageFilename << " : " << e.GetDescription());
return 1000;
- }
+ }
// The sizes of the baseline and test image must match
ImageType::SizeType baselineSize;
@@ -359,12 +357,12 @@ int TestHelper::RegressionTestImage(int cpt, const char *testImageFilename, cons
testSize = testReader->GetOutput()->GetLargestPossibleRegion().GetSize();
if (baselineSize != testSize)
- {
+ {
std::cerr << "The size of the baseline image and Test image do not match!" << std::endl;
std::cerr << "baseline image: " << baselineImageFilename << " has size " << baselineSize << std::endl;
std::cerr << "Test image: " << testImageFilename << " has size " << testSize << std::endl;
return 1;
- }
+ }
// Now compare the two images
typedef otb::DifferenceImageFilter<ImageType, ImageType> DiffType;
@@ -375,20 +373,20 @@ int TestHelper::RegressionTestImage(int cpt, const char *testImageFilename, cons
diff->UpdateLargestPossibleRegion();
ImageType::PixelType status = diff->GetTotalDifference();
- unsigned long numberOfPixelsWithDifferences = diff->GetNumberOfPixelsWithDifferences();
+ unsigned long numberOfPixelsWithDifferences = diff->GetNumberOfPixelsWithDifferences();
//Write only one this message
if (m_ReportErrors == 0)
- {
- otbGenericMsgDebugMacro(<< "RegressionTestImage DifferenceThreshold: "<<toleranceDiffPixelImage);
+ {
+ otbGenericMsgDebugMacro(<< "RegressionTestImage DifferenceThreshold: " << toleranceDiffPixelImage);
otbGenericMsgDebugMacro(<< "Status diff->GetTotalDifference: "
- << status <<" for "<<numberOfPixelsWithDifferences<<" pixel(s)." );
- }
+ << status << " for " << numberOfPixelsWithDifferences << " pixel(s).");
+ }
// if there are discrepencies, create an diff image
if (status.GetSquaredNorm() > 0 && m_ReportErrors)
- {
+ {
typedef otb::PrintableImageFilter<ImageType> RescaleType;
- typedef RescaleType::OutputImageType OutputType;
+ typedef RescaleType::OutputImageType OutputType;
/* typedef itk::ExtractImageFilter<OutputType,DiffOutputType> ExtractType; */
typedef otb::ImageFileWriter<RescaleType::OutputImageType> WriterType;
@@ -413,27 +411,29 @@ int TestHelper::RegressionTestImage(int cpt, const char *testImageFilename, cons
::itk::OStringStream diffName;
diffName << testImageFilename << ".diff.png";
try
- {
+ {
rescale->SetInput(diff->GetOutput());
for (unsigned int i = 1; i <= min(diff->GetOutput()->GetNumberOfComponentsPerPixel(), 3U); ++i)
- {
+ {
rescale->SetChannel(i);
- }
+ }
rescale->Update();
- } catch (...)
- {
- itkGenericExceptionMacro(<< "Error during rescale of " << diffName.str() );
- }
+ }
+ catch (...)
+ {
+ itkGenericExceptionMacro(<< "Error during rescale of " << diffName.str());
+ }
writer->SetFileName(diffName.str().c_str());
try
- {
+ {
writer->Update();
- } catch (...)
- {
- itkGenericExceptionMacro(<< "Error during write of " << diffName.str() );
- }
+ }
+ catch (...)
+ {
+ itkGenericExceptionMacro(<< "Error during write of " << diffName.str());
+ }
// std::cout << "<DartMeasurementFile name=\"DifferenceImage\" type=\"image/png\">";
std::cout << "<DartMeasurementFile name=\"DifferenceImage " << cpt << "\" type=\"image/png\">";
@@ -443,21 +443,23 @@ int TestHelper::RegressionTestImage(int cpt, const char *testImageFilename, cons
::itk::OStringStream baseName;
baseName << testImageFilename << ".base.png";
try
- {
+ {
rescale->SetInput(baselineReader->GetOutput());
rescale->Update();
- } catch (...)
- {
- itkGenericExceptionMacro(<<"Error during rescale of " << baseName.str() );
- }
+ }
+ catch (...)
+ {
+ itkGenericExceptionMacro(<< "Error during rescale of " << baseName.str());
+ }
try
- {
+ {
writer->SetFileName(baseName.str().c_str());
writer->Update();
- } catch (...)
- {
- itkGenericExceptionMacro(<<"Error during write of " << baseName.str() );
- }
+ }
+ catch (...)
+ {
+ itkGenericExceptionMacro(<< "Error during write of " << baseName.str());
+ }
// std::cout << "<DartMeasurementFile name=\"baselineImage\" type=\"image/png\">";
std::cout << "<DartMeasurementFile name=\"baselineImage " << cpt << "\" type=\"image/png\">";
@@ -467,61 +469,65 @@ int TestHelper::RegressionTestImage(int cpt, const char *testImageFilename, cons
::itk::OStringStream testName;
testName << testImageFilename << ".test.png";
try
- {
+ {
rescale->SetInput(testReader->GetOutput());
rescale->Update();
- } catch (...)
- {
+ }
+ catch (...)
+ {
itkGenericExceptionMacro(<< "Error during rescale of " << testName.str());
- }
+ }
try
- {
+ {
writer->SetFileName(testName.str().c_str());
writer->Update();
- } catch (...)
- {
- itkGenericExceptionMacro(<<"Error during write of " << testName.str() );
- }
+ }
+ catch (...)
+ {
+ itkGenericExceptionMacro(<< "Error during write of " << testName.str());
+ }
// std::cout << "<DartMeasurementFile name=\"TestImage\" type=\"image/png\">";
std::cout << "<DartMeasurementFile name=\"TestImage " << cpt << "\" type=\"image/png\">";
std::cout << testName.str();
std::cout << "</DartMeasurementFile>" << std::endl;
- }
+ }
return (status.GetSquaredNorm() > 0) ? 1 : 0;
}
int TestHelper::RegressionTestMetaData(const char *testImageFilename, const char *baselineImageFilename,
- const double /*toleranceDiffPixelImage*/) const
+ const double /*toleranceDiffPixelImage*/) const
{
// Use the factory mechanism to read the test and baseline files and convert them to double
typedef otb::Image<double, ITK_TEST_DIMENSION_MAX> ImageType;
- typedef otb::ImageFileReader<ImageType> ReaderType;
+ typedef otb::ImageFileReader<ImageType> ReaderType;
// Read the baseline file
ReaderType::Pointer baselineReader = ReaderType::New();
baselineReader->SetFileName(baselineImageFilename);
try
- {
+ {
baselineReader->GenerateOutputInformation();
- } catch (itk::ExceptionObject& e)
- {
+ }
+ catch (itk::ExceptionObject& e)
+ {
itkGenericExceptionMacro(<< "Exception detected while reading "
- << baselineImageFilename << " : " << e.GetDescription());
- }
+ << baselineImageFilename << " : " << e.GetDescription());
+ }
// Read the baseline file
ReaderType::Pointer testReader = ReaderType::New();
testReader->SetFileName(testImageFilename);
try
- {
+ {
testReader->GenerateOutputInformation();
- } catch (itk::ExceptionObject& e)
- {
+ }
+ catch (itk::ExceptionObject& e)
+ {
itkGenericExceptionMacro(<< "Exception detected while reading "
- << baselineImageFilename << " : " << e.GetDescription());
- }
+ << baselineImageFilename << " : " << e.GetDescription());
+ }
unsigned int errcount = 0;
// The sizes of the baseline and test image must match
@@ -531,149 +537,155 @@ int TestHelper::RegressionTestMetaData(const char *testImageFilename, const char
testSize = testReader->GetOutput()->GetLargestPossibleRegion().GetSize();
if (baselineSize != testSize)
- {
+ {
std::cerr << "The size of the baseline image and Test image do not match!" << std::endl;
std::cerr << "baseline image: " << baselineImageFilename << " has size " << baselineSize << std::endl;
std::cerr << "Test image: " << testImageFilename << " has size " << testSize << std::endl;
errcount++;
- }
+ }
ImageType::Pointer blImPtr = baselineReader->GetOutput();
ImageType::Pointer testImPtr = testReader->GetOutput();
// test orgin
if (blImPtr->GetOrigin() != testImPtr->GetOrigin())
- {
+ {
std::cerr << "The origin of the baseline image and Test image do not match!" << std::endl;
std::cerr << "baseline image: " << baselineImageFilename << " has origin " << blImPtr->GetOrigin() << std::endl;
std::cerr << "Test image: " << testImageFilename << " has origin " << testImPtr->GetOrigin() << std::endl;
errcount++;
- }
+ }
// test spacing
if (blImPtr->GetSpacing() != testImPtr->GetSpacing())
- {
+ {
std::cerr << "The spacing of the baseline image and Test image do not match!" << std::endl;
std::cerr << "baseline image: " << baselineImageFilename << " has spacing " << blImPtr->GetSpacing() << std::endl;
std::cerr << "Test image: " << testImageFilename << " has spacing " << testImPtr->GetSpacing() << std::endl;
errcount++;
- }
+ }
// test projection reference
if (blImPtr->GetProjectionRef().compare(testImPtr->GetProjectionRef()) != 0)
- {
+ {
std::cerr << "The projection reference of the baseline image and Test image do not match!" << std::endl;
std::cerr << "baseline image: " << baselineImageFilename << " has projection reference "
- << blImPtr->GetProjectionRef() << std::endl;
+ << blImPtr->GetProjectionRef() << std::endl;
std::cerr << "Test image: " << testImageFilename << " has projection reference "
- << testImPtr->GetProjectionRef() << std::endl;
+ << testImPtr->GetProjectionRef() << std::endl;
errcount++;
- }
+ }
// test Geographic transform
if (blImPtr->GetGeoTransform() != testImPtr->GetGeoTransform())
- {
+ {
std::cerr << "The geographic transform of the baseline image and Test image do not match!" << std::endl;
std::cerr << "baseline image: " << baselineImageFilename << " has geographic transform " << VectorToString(
- blImPtr->GetGeoTransform()) << std::endl;
+ blImPtr->GetGeoTransform()) << std::endl;
std::cerr << "Test image: " << testImageFilename << " has geographic transform " << VectorToString(
- testImPtr->GetGeoTransform()) << std::endl;
+ testImPtr->GetGeoTransform()) << std::endl;
errcount++;
- }
+ }
// test upper left corner
if (blImPtr->GetUpperLeftCorner() != testImPtr->GetUpperLeftCorner())
- {
+ {
std::cerr << "The upper left corner of the baseline image and Test image do not match!" << std::endl;
std::cerr << "baseline image: " << baselineImageFilename << " has upper left corner " << VectorToString(
- blImPtr->GetUpperLeftCorner()) << std::endl;
+ blImPtr->GetUpperLeftCorner()) << std::endl;
std::cerr << "Test image: " << testImageFilename << " has upper left corner " << VectorToString(
- testImPtr->GetUpperLeftCorner()) << std::endl;
+ testImPtr->GetUpperLeftCorner()) << std::endl;
errcount++;
- }
+ }
// test upper right corner
if (blImPtr->GetUpperRightCorner() != testImPtr->GetUpperRightCorner())
- {
+ {
std::cerr << "The upper right corner of the baseline image and Test image do not match!" << std::endl;
std::cerr << "baseline image: " << baselineImageFilename << " has upper right corner " << VectorToString(
- blImPtr->GetUpperRightCorner()) << std::endl;
+ blImPtr->GetUpperRightCorner()) << std::endl;
std::cerr << "Test image: " << testImageFilename << " has upper right corner " << VectorToString(
- testImPtr->GetUpperRightCorner()) << std::endl;
+ testImPtr->GetUpperRightCorner()) << std::endl;
errcount++;
- }
+ }
// test lower left corner
if (blImPtr->GetLowerLeftCorner() != testImPtr->GetLowerLeftCorner())
- {
+ {
std::cerr << "The lower left corner of the baseline image and Test image do not match!" << std::endl;
std::cerr << "baseline image: " << baselineImageFilename << " has lower left corner " << VectorToString(
- blImPtr->GetLowerLeftCorner()) << std::endl;
+ blImPtr->GetLowerLeftCorner()) << std::endl;
std::cerr << "Test image: " << testImageFilename << " has lower left corner " << VectorToString(
- testImPtr->GetLowerLeftCorner()) << std::endl;
+ testImPtr->GetLowerLeftCorner()) << std::endl;
errcount++;
- }
+ }
// test lower right corner
if (blImPtr->GetLowerRightCorner() != testImPtr->GetLowerRightCorner())
- {
+ {
std::cerr << "The lower right of the baseline image and Test image do not match!" << std::endl;
std::cerr << "baseline image: " << baselineImageFilename << " has lower right corner " << VectorToString(
- blImPtr->GetLowerRightCorner()) << std::endl;
+ blImPtr->GetLowerRightCorner()) << std::endl;
std::cerr << "Test image: " << testImageFilename << " has lower right corner " << VectorToString(
- testImPtr->GetLowerRightCorner()) << std::endl;
+ testImPtr->GetLowerRightCorner()) << std::endl;
errcount++;
- }
+ }
// test gcp projection
if (blImPtr->GetGCPProjection().compare(testImPtr->GetGCPProjection()) != 0)
- {
+ {
std::cerr << "The gcp projection of the baseline image and Test image do not match!" << std::endl;
std::cerr << "baseline image: " << baselineImageFilename << " has gcp projection " << blImPtr->GetGCPProjection()
- << std::endl;
+ << std::endl;
std::cerr << "Test image: " << testImageFilename << " has gcp projection " << testImPtr->GetGCPProjection()
- << std::endl;
+ << std::endl;
errcount++;
- }
+ }
// test gcp count
if (blImPtr->GetGCPCount() != testImPtr->GetGCPCount())
- {
+ {
std::cerr << "The gcp count of the baseline image and Test image do not match!" << std::endl;
std::cerr << "baseline image: " << baselineImageFilename << " has gcp count " << blImPtr->GetGCPCount()
- << std::endl;
+ << std::endl;
std::cerr << "Test image: " << testImageFilename << " has gcp count " << testImPtr->GetGCPCount() << std::endl;
errcount++;
- }
+ }
else
- {
- for (unsigned int i = 0; i < blImPtr->GetGCPCount(); ++i)
{
- if ((blImPtr->GetGCPId(i).compare(testImPtr->GetGCPId(i)) != 0) || (blImPtr->GetGCPInfo(i).compare(
- testImPtr->GetGCPInfo(i)) != 0) || (blImPtr->GetGCPRow(i) != testImPtr->GetGCPRow(i)) || (blImPtr->GetGCPCol(
- i) != testImPtr->GetGCPCol(i)) || (blImPtr->GetGCPX(i) != testImPtr->GetGCPX(i)) || (blImPtr->GetGCPY(i)
- != testImPtr->GetGCPY(i)) || (blImPtr->GetGCPZ(i) != testImPtr->GetGCPZ(i)))
+ for (unsigned int i = 0; i < blImPtr->GetGCPCount(); ++i)
{
+ if ((blImPtr->GetGCPId(i).compare(testImPtr->GetGCPId(i)) != 0) || (blImPtr->GetGCPInfo(i).compare(
+ testImPtr->GetGCPInfo(i)) != 0) ||
+ (blImPtr->GetGCPRow(i) != testImPtr->GetGCPRow(i)) || (blImPtr->GetGCPCol(
+ i)
+ != testImPtr->GetGCPCol(i)) ||
+ (blImPtr->GetGCPX(i) != testImPtr->GetGCPX(i)) || (blImPtr->GetGCPY(i)
+ !=
+ testImPtr
+ ->GetGCPY(i)) ||
+ (blImPtr->GetGCPZ(i) != testImPtr->GetGCPZ(i)))
+ {
std::cerr << "The GCP number " << i << " of the baseline image and Test image do not match!" << std::endl;
std::cerr << "baseline image: " << baselineImageFilename << " has gcp number " << i << " (" << "id: "
- << blImPtr->GetGCPId(i) << ", " << "info: " << blImPtr->GetGCPInfo(i) << ", " << "row: "
- << blImPtr->GetGCPRow(i) << ", " << "col: " << blImPtr->GetGCPCol(i) << ", " << "X: "
- << blImPtr->GetGCPX(i) << ", " << "Y: " << blImPtr->GetGCPY(i) << ", " << "Z: " << blImPtr->GetGCPZ(i)
- << ")" << std::endl;
+ << blImPtr->GetGCPId(i) << ", " << "info: " << blImPtr->GetGCPInfo(i) << ", " << "row: "
+ << blImPtr->GetGCPRow(i) << ", " << "col: " << blImPtr->GetGCPCol(i) << ", " << "X: "
+ << blImPtr->GetGCPX(i) << ", " << "Y: " << blImPtr->GetGCPY(i) << ", " << "Z: " << blImPtr->GetGCPZ(i)
+ << ")" << std::endl;
std::cerr << "Test image: " << testImageFilename << " has gcp number " << i << " (" << "id: "
- << testImPtr->GetGCPId(i) << ", " << "info: " << testImPtr->GetGCPInfo(i) << ", " << "row: "
- << testImPtr->GetGCPRow(i) << ", " << "col: " << testImPtr->GetGCPCol(i) << ", " << "X: "
- << testImPtr->GetGCPX(i) << ", " << "Y: " << testImPtr->GetGCPY(i) << ", " << "Z: "
- << testImPtr->GetGCPZ(i) << ")" << std::endl;
+ << testImPtr->GetGCPId(i) << ", " << "info: " << testImPtr->GetGCPInfo(i) << ", " << "row: "
+ << testImPtr->GetGCPRow(i) << ", " << "col: " << testImPtr->GetGCPCol(i) << ", " << "X: "
+ << testImPtr->GetGCPX(i) << ", " << "Y: " << testImPtr->GetGCPY(i) << ", " << "Z: "
+ << testImPtr->GetGCPZ(i) << ")" << std::endl;
errcount++;
+ }
}
}
- }
if (errcount > 0)
- {
+ {
std::cout << "<DartMeasurement name=\"MetadataError\" type=\"numeric/int\">";
std::cout << errcount;
std::cout << "</DartMeasurement>" << std::endl;
- }
+ }
return errcount;
}
@@ -693,170 +705,173 @@ std::map<std::string, int> TestHelper::RegressionTestbaselines(char *baselineFil
std::string originalBaseline(baselineFilename);
- int x = 0;
+ int x = 0;
std::string::size_type suffixPos = originalBaseline.rfind(".");
- std::string suffix;
+ std::string suffix;
if (suffixPos != std::string::npos)
- {
+ {
suffix = originalBaseline.substr(suffixPos, originalBaseline.length());
originalBaseline.erase(suffixPos, originalBaseline.length());
- }
+ }
while (++x)
- {
+ {
::itk::OStringStream filename;
filename << originalBaseline << "." << x << suffix;
std::ifstream filestream(filename.str().c_str());
if (!filestream)
- {
+ {
break;
- }
+ }
baselines[filename.str()] = 0;
filestream.close();
- }
+ }
return baselines;
}
int TestHelper::RegressionTestOgrFile(const char *testOgrFilename, const char *baselineOgrFilename,
- const double toleranceDiffValue) const
+ const double toleranceDiffValue) const
{
const char *ref_pszDataSource = baselineOgrFilename;
const char *test_pszDataSource = testOgrFilename;
const char *ref_pszWHERE = NULL;
const char *test_pszWHERE = NULL;
- int bReadOnly = FALSE;
- int nbdiff(0);
+ int bReadOnly = FALSE;
+ int nbdiff(0);
/* -------------------------------------------------------------------- */
/* Open data source. */
/* -------------------------------------------------------------------- */
OGRDataSource *ref_poDS = NULL;
- OGRSFDriver *ref_poDriver = NULL;
- OGRGeometry *ref_poSpatialFilter = NULL;
+ OGRSFDriver * ref_poDriver = NULL;
+ OGRGeometry * ref_poSpatialFilter = NULL;
OGRDataSource *test_poDS = NULL;
- OGRSFDriver *test_poDriver = NULL;
- OGRGeometry *test_poSpatialFilter = NULL;
+ OGRSFDriver * test_poDriver = NULL;
+ OGRGeometry * test_poSpatialFilter = NULL;
OGRRegisterAll();
ref_poDS = OGRSFDriverRegistrar::Open(ref_pszDataSource, !bReadOnly, &ref_poDriver);
if (ref_poDS == NULL && !bReadOnly)
- {
+ {
ref_poDS = OGRSFDriverRegistrar::Open(ref_pszDataSource, FALSE, &ref_poDriver);
if (ref_poDS != NULL && m_ReportErrors)
- {
+ {
std::cout << "Had to open REF data source read-only.\n";
bReadOnly = TRUE;
+ }
}
- }
test_poDS = OGRSFDriverRegistrar::Open(test_pszDataSource, !bReadOnly, &test_poDriver);
if (test_poDS == NULL && !bReadOnly)
- {
+ {
test_poDS = OGRSFDriverRegistrar::Open(test_pszDataSource, FALSE, &test_poDriver);
if (test_poDS != NULL && m_ReportErrors)
- {
+ {
std::cout << "Had to open REF data source read-only.\n";
bReadOnly = TRUE;
+ }
}
- }
/* -------------------------------------------------------------------- */
/* Report failure */
/* -------------------------------------------------------------------- */
if (ref_poDS == NULL)
- {
+ {
OGRSFDriverRegistrar *ref_poR = OGRSFDriverRegistrar::GetRegistrar();
if (m_ReportErrors)
std::cout << "FAILURE:\n"
- "Unable to open REF datasource `" << ref_pszDataSource << "' with the following drivers." << std::endl;
+ "Unable to open REF datasource `" << ref_pszDataSource << "' with the following drivers." << std::endl;
for (int iDriver = 0; iDriver < ref_poR->GetDriverCount(); ++iDriver)
- {
+ {
std::cout << " -> " << ref_poR->GetDriver(iDriver)->GetName() << std::endl;
- }
+ }
return (1);
- } CPLAssert( ref_poDriver != NULL);
+ }
+ CPLAssert(ref_poDriver != NULL);
if (test_poDS == NULL)
- {
+ {
OGRSFDriverRegistrar *test_poR = OGRSFDriverRegistrar::GetRegistrar();
if (m_ReportErrors)
std::cout << "FAILURE:\n"
- "Unable to open TEST datasource `" << test_pszDataSource << "' with the following drivers." << std::endl;
+ "Unable to open TEST datasource `" << test_pszDataSource << "' with the following drivers." << std::endl;
for (int iDriver = 0; iDriver < test_poR->GetDriverCount(); ++iDriver)
- {
+ {
std::cout << " -> " << test_poR->GetDriver(iDriver)->GetName() << std::endl;
- }
+ }
return (1);
- } CPLAssert( test_poDriver != NULL);
+ }
+ CPLAssert(test_poDriver != NULL);
/* -------------------------------------------------------------------- */
/* Some information messages. */
/* -------------------------------------------------------------------- */
- otbCheckStringValue("INFO: using driver", ref_poDriver->GetName(),test_poDriver->GetName(),nbdiff,m_ReportErrors );
+ otbCheckStringValue("INFO: using driver", ref_poDriver->GetName(), test_poDriver->GetName(), nbdiff, m_ReportErrors);
// otbCheckStringValue("INFO: Internal data source name", ref_poDS->GetName(),test_poDS->GetName(),nbdiff,m_ReportErrors );
std::string strRefName(ref_poDS->GetName());
std::string strTestName(test_poDS->GetName());
if (strRefName != strTestName)
- {
- if (!m_ReportErrors)
- otbPrintDiff("WARNING: INFO: Internal data source name poDS->GetName() were different",strRefName,strTestName);
- }
+ {
+ if (!m_ReportErrors) otbPrintDiff("WARNING: INFO: Internal data source name poDS->GetName() were different",
+ strRefName,
+ strTestName);
+ }
/* -------------------------------------------------------------------- */
/* Process each data source layer. */
/* -------------------------------------------------------------------- */
- otbCheckValue("GetLayerCount()", ref_poDS->GetLayerCount(),test_poDS->GetLayerCount(),nbdiff,m_ReportErrors );
+ otbCheckValue("GetLayerCount()", ref_poDS->GetLayerCount(), test_poDS->GetLayerCount(), nbdiff, m_ReportErrors);
for (int iLayer = 0; iLayer < ref_poDS->GetLayerCount(); ++iLayer)
- {
+ {
OGRLayer *ref_poLayer = ref_poDS->GetLayer(iLayer);
OGRLayer *test_poLayer = test_poDS->GetLayer(iLayer);
if (ref_poLayer == NULL)
- {
- if (m_ReportErrors)
- std::cout << "FAILURE: Couldn't fetch advertised layer " << iLayer << " for REF data source" << std::endl;
+ {
+ if (m_ReportErrors) std::cout << "FAILURE: Couldn't fetch advertised layer " << iLayer <<
+ " for REF data source" << std::endl;
return (1);
- }
+ }
if (test_poLayer == NULL)
- {
- if (m_ReportErrors)
- std::cout << "FAILURE: Couldn't fetch advertised layer " << iLayer << " for REF data source" << std::endl;
+ {
+ if (m_ReportErrors) std::cout << "FAILURE: Couldn't fetch advertised layer " << iLayer <<
+ " for REF data source" << std::endl;
return (1);
- }
+ }
//Check Layer inforamtion
ogrReportOnLayer(ref_poLayer, ref_pszWHERE, ref_poSpatialFilter, test_poLayer, test_pszWHERE, test_poSpatialFilter,
- nbdiff);
+ nbdiff);
//If no difference, check the feature
if (nbdiff == 0)
- {
- OGRFeature *ref_poFeature = NULL;
- OGRFeature *test_poFeature = NULL;
- std::string basefilename(test_pszDataSource);
- int nbFeature(0);
+ {
+ OGRFeature * ref_poFeature = NULL;
+ OGRFeature * test_poFeature = NULL;
+ std::string basefilename(test_pszDataSource);
+ int nbFeature(0);
otb::StringStream oss2;
oss2.str("");
oss2 << iLayer;
while ((ref_poFeature = ref_poLayer->GetNextFeature()) != NULL)
- {
+ {
test_poFeature = test_poLayer->GetNextFeature();
otb::StringStream oss;
oss.str("");
oss << nbFeature;
std::string ref_filename = basefilename + "_temporary_layer_" + oss2.str() + "_feature_" + oss.str()
- + "_ref.txt";
+ + "_ref.txt";
std::string test_filename = basefilename + "_temporary_layer_" + oss2.str() + "_feature_" + oss.str()
- + "_test.txt";
+ + "_test.txt";
FILE *ref_f(NULL);
ref_f = fopen(ref_filename.c_str(), "w");
if (ref_f == NULL)
- {
- itkGenericExceptionMacro(<<"Impossible to create ASCII file <"<<ref_filename<<">.");
- }
+ {
+ itkGenericExceptionMacro(<< "Impossible to create ASCII file <" << ref_filename << ">.");
+ }
ref_poFeature->DumpReadable(ref_f);
delete ref_poFeature;
fclose(ref_f);
@@ -864,9 +879,9 @@ int TestHelper::RegressionTestOgrFile(const char *testOgrFilename, const char *b
FILE *test_f(NULL);
test_f = fopen(test_filename.c_str(), "w");
if (test_f == NULL)
- {
- itkGenericExceptionMacro(<<"Impossible to create ASCII file <"<<test_filename<<">.");
- }
+ {
+ itkGenericExceptionMacro(<< "Impossible to create ASCII file <" << test_filename << ">.");
+ }
test_poFeature->DumpReadable(test_f);
delete test_poFeature;
fclose(test_f);
@@ -875,16 +890,15 @@ int TestHelper::RegressionTestOgrFile(const char *testOgrFilename, const char *b
std::vector<std::string> ignoredLines;
ignoredLines.clear();
nbdiff = RegressionTestAsciiFile(test_filename.c_str(), ref_filename.c_str(), toleranceDiffValue,
- ignoredLines);
+ ignoredLines);
nbFeature++;
- }
+ }
// If no verbose and an diff was found, exit checking. The full checking will be executed in verbose mode
- if ((!m_ReportErrors) && (nbdiff != 0))
- return (1);
- } //if(nbdiff == 0)
+ if ((!m_ReportErrors) && (nbdiff != 0)) return (1);
+ } //if(nbdiff == 0)
- }
+ }
/* -------------------------------------------------------------------- */
/* Close down. */
@@ -893,11 +907,9 @@ int TestHelper::RegressionTestOgrFile(const char *testOgrFilename, const char *b
CSLDestroy( papszLayers );
CSLDestroy( papszOptions );*/
delete ref_poDS;
- if (ref_poSpatialFilter)
- delete ref_poSpatialFilter;
+ if (ref_poSpatialFilter) delete ref_poSpatialFilter;
delete test_poDS;
- if (test_poSpatialFilter)
- delete test_poSpatialFilter;
+ if (test_poSpatialFilter) delete test_poSpatialFilter;
delete OGRSFDriverRegistrar::GetRegistrar();
@@ -935,27 +947,24 @@ bool TestHelper::isMinusSign(int i) const
bool TestHelper::isNumeric(std::string str) const
{
- int nbOfPoints = 0;
- int nbOfNumbers = 0;
- int number;
+ int nbOfPoints = 0;
+ int nbOfNumbers = 0;
+ int number;
unsigned int i = 0;
- bool result = true;
+ bool result = true;
while ((i < str.size()) && (result == true))
- {
+ {
number = str[i];
- if (isPoint(number))
- ++nbOfPoints;
- if (isNumber(number))
- ++nbOfNumbers;
- if ((!isNumber(number) && !isPoint(number) && !isMinusSign(number)) || (isMinusSign(number) && (i != 0)))
- result = false;
+ if (isPoint(number)) ++nbOfPoints;
+ if (isNumber(number)) ++nbOfNumbers;
+ if ((!isNumber(number) && !isPoint(number) &&
+ !isMinusSign(number)) || (isMinusSign(number) && (i != 0))) result = false;
++i;
- }
- if ((str.size() == 0) || (nbOfPoints > 1)/*||(nbOfNumbers==0)*/)
- result = false;
+ }
+ if ((str.size() == 0) || (nbOfPoints > 1) /*||(nbOfNumbers==0)*/) result = false;
return result;
}
@@ -971,45 +980,40 @@ bool TestHelper::isScientificNumeric(std::string str) const
// Analyse first character (+, -, 0...9)
unsigned int cpt(0);
- if ((str[0] != '+') && (str[0] != '-') && (!isNumber(number)))
- return false;
+ if ((str[0] != '+') && (str[0] != '-') && (!isNumber(number))) return false;
if ((str[0] == '+') || (str[0] == '-'))
- {
+ {
cpt++;
signDetected = true;
- }
+ }
while (cpt < str.size())
- {
- if (str[cpt] == '.')
{
+ if (str[cpt] == '.')
+ {
// Exit false if two points or if e already detected
- if ((pointDetected == true) || (eDetected == true))
- return false;
+ if ((pointDetected == true) || (eDetected == true)) return false;
pointDetected = true;
- }
+ }
else if ((str[cpt] == 'e') || (str[cpt] == 'E'))
- {
+ {
// Exit false if two e
- if (eDetected == true)
- return false;
+ if (eDetected == true) return false;
eDetected = true;
- }
+ }
else if ((str[cpt] == '-') || (str[cpt] == '+'))
- {
+ {
// Exit false if already sign with no E detected
- if ((signDetected == true) && (eDetected == false))
- return false;
+ if ((signDetected == true) && (eDetected == false)) return false;
signDetected = true;
- }
+ }
else
- {
+ {
number = str[cpt];
- if (!isNumber(number))
- return false;
- }
+ if (!isNumber(number)) return false;
+ }
cpt++;
- }
+ }
return true;
}
@@ -1017,42 +1021,47 @@ bool TestHelper::isScientificNumeric(std::string str) const
bool TestHelper::isHexaPointerAddress(std::string str) const
{
unsigned int size(0);
- bool result(false);
+ bool result(false);
unsigned int start(0);
//If (0xadresss)
if ((str[0] == 40) && (str[str.size() - 1] == 41) && (str[1] == 48) && (str[2] == 120))
- {
+ {
result = true;
start = 3;
size = str.size() - 1;
- }
+ }
//If 0xadresss
else if ((str[0] == 48) && (str[1] == 120))
- {
+ {
result = true;
start = 2;
size = str.size();
- }
+ }
// if 01adress
else if ((str[0] == 48) && (str[1] == 49))
- {
+ {
result = true;
start = 2;
size = str.size();
- }
+ }
unsigned int i(start);
while (result && (i < size))
- {
+ {
result = result && isHexaNumber(str[i]);
++i;
- }
+ }
return result;
}
-bool TestHelper::CompareLines(std::string strfileref, std::string strfiletest, int& nbdiff, std::ofstream& fluxfilediff, int& numLine,
- std::vector<std::string>& listStrDiffLineFileRef, std::vector<std::string>& listStrDiffLineFileTest,
- double epsilon) const
+bool TestHelper::CompareLines(std::string strfileref,
+ std::string strfiletest,
+ int& nbdiff,
+ std::ofstream& fluxfilediff,
+ int& numLine,
+ std::vector<std::string>& listStrDiffLineFileRef,
+ std::vector<std::string>& listStrDiffLineFileTest,
+ double epsilon) const
{
otb::StringStream buffstreamRef, buffstreamTest;
buffstreamRef << strfileref;
@@ -1061,15 +1070,14 @@ bool TestHelper::CompareLines(std::string strfileref, std::string strfiletest, i
bool differenceFoundInCurrentLine = false;
enum TypeEtat
- {
+ {
ETAT_NUM, ETAT_CHAR
- };
+ };
TypeEtat etatPrec(ETAT_NUM), etatCour(ETAT_NUM);
-
while (buffstreamRef.peek() != EOF)
- {
+ {
std::string strRef = "";
std::string strTest = "";
@@ -1081,173 +1089,172 @@ bool TestHelper::CompareLines(std::string strfileref, std::string strfiletest, i
buffstreamRef >> strRef;
buffstreamTest >> strTest;
- bool chgt = false;
+ bool chgt = false;
std::string charTmpRef = "";
std::string charTmpTest = "";
-
if (!isHexaPointerAddress(strRef))
- {
+ {
//Analyse if strRef contains scientific value (ex: "-142.124e-012")
if (isScientificNumeric(strRef))
- {
- if (!isScientificNumeric(strTest))
{
- if (m_ReportErrors)
+ if (!isScientificNumeric(strTest))
{
+ if (m_ReportErrors)
+ {
fluxfilediff << "Diff at line " << numLine << " : compare numeric value with no numeric value ("
- << strRef << strRef << " != " << strTest << ")" << std::endl;
+ << strRef << strRef << " != " << strTest << ")" << std::endl;
differenceFoundInCurrentLine = true;
- }
+ }
nbdiff++;
- }
+ }
else if ((strRef != strTest)
- && (vcl_abs(atof(strRef.c_str())) > m_EpsilonBoundaryChecking)
- && (vcl_abs(
- atof(strRef.c_str()) - atof(strTest.c_str())) > epsilon * vcl_abs(atof(strRef.c_str()))))//epsilon as relative error
- {
- if (m_ReportErrors)
+ && (vcl_abs(atof(strRef.c_str())) > m_EpsilonBoundaryChecking)
+ && (vcl_abs(
+ atof(strRef.c_str()) - atof(strTest.c_str())) > epsilon * vcl_abs(atof(strRef.c_str())))) //epsilon as relative error
{
+ if (m_ReportErrors)
+ {
fluxfilediff << "Diff at line " << numLine << " : vcl_abs ( (" << strRef << ") - (" << strTest
- << ") ) > " << epsilon << std::endl;
+ << ") ) > " << epsilon << std::endl;
differenceFoundInCurrentLine = true;
- }
+ }
nbdiff++;
+ }
}
- }
else
- {
+ {
unsigned int i = 0;
while (i < strRef.size())
- {
+ {
charTmpRef = strRef[i];
if (i < strTest.size())
- {
+ {
charTmpTest = strTest[i];
- }
+ }
- if (isNumeric(charTmpRef))
- etatCour = ETAT_NUM;
- else
- etatCour = ETAT_CHAR;
+ if (isNumeric(charTmpRef)) etatCour = ETAT_NUM;
+ else etatCour = ETAT_CHAR;
// "reference" state initialization.
- if (i == 0)
- etatPrec = etatCour;
+ if (i == 0) etatPrec = etatCour;
// Case where there's a number after characteres.
if ((etatCour == ETAT_NUM) && (etatPrec == ETAT_CHAR))
- {
- if (strCharRef != strCharTest)
{
- if (m_ReportErrors)
+ if (strCharRef != strCharTest)
{
+ if (m_ReportErrors)
+ {
fluxfilediff << "Diff at line " << numLine << " : " << strCharRef << " != " << strCharTest
- << std::endl;
+ << std::endl;
differenceFoundInCurrentLine = true;
- }
+ }
nbdiff++;
- }
+ }
strCharRef = "";
strCharTest = "";
strNumRef = charTmpRef;
strNumTest = charTmpTest;
chgt = true;
- }
+ }
// Case where there's a character after numbers.
else if ((etatCour == ETAT_CHAR) && (etatPrec == ETAT_NUM))
- {
+ {
if ((strNumRef != strNumTest) && (vcl_abs(atof(strNumRef.c_str())) > m_EpsilonBoundaryChecking)
&& (vcl_abs(atof(strNumRef.c_str()) - atof(strNumTest.c_str())) > epsilon * vcl_abs(atof(
- strNumRef.c_str())))) //epsilon as relative error
- {
- if (m_ReportErrors)
+ strNumRef.c_str())))) //epsilon as relative error
{
+ if (m_ReportErrors)
+ {
fluxfilediff << "Diff at line " << numLine << " : vcl_abs ( (" << strNumRef << ") - ("
- << strNumTest << ") ) > " << epsilon << std::endl;
+ << strNumTest << ") ) > " << epsilon << std::endl;
differenceFoundInCurrentLine = true;
- }
+ }
nbdiff++;
- }
+ }
strNumRef = "";
strNumTest = "";
strCharRef = charTmpRef;
strCharTest = charTmpTest;
chgt = true;
- }
+ }
else if (etatCour == etatPrec)
- {
- if (etatCour == ETAT_CHAR)
{
+ if (etatCour == ETAT_CHAR)
+ {
strCharRef += charTmpRef;
strCharTest += charTmpTest;
- }
+ }
else
- {
+ {
strNumRef += charTmpRef;
strNumTest += charTmpTest;
+ }
}
- }
etatPrec = etatCour;
++i;
- }
+ }
// Simpliest case : string characters or numeric value between 2 separators
if (!chgt)
- {
- if (isNumeric(strRef))
{
+ if (isNumeric(strRef))
+ {
if ((strRef != strTest) && (vcl_abs(atof(strRef.c_str())) > m_EpsilonBoundaryChecking) && (vcl_abs(
- atof(strRef.c_str()) - atof(strTest.c_str())) > epsilon * vcl_abs(atof(strRef.c_str())))) //epsilon as relative error
- {
- if (m_ReportErrors)
+ atof(strRef.
+ c_str())
+ - atof(strTest
+ .c_str())) > epsilon * vcl_abs(atof(strRef.c_str())))) //epsilon as relative error
{
+ if (m_ReportErrors)
+ {
fluxfilediff << "Diff at line " << numLine << " : vcl_abs( (" << strRef << ") - (" << strTest
- << ") ) > " << epsilon << std::endl;
+ << ") ) > " << epsilon << std::endl;
differenceFoundInCurrentLine = true;
- }
+ }
nbdiff++;
+ }
}
- }
else
- {
- if (strRef != strTest)
{
- if (m_ReportErrors)
+ if (strRef != strTest)
{
+ if (m_ReportErrors)
+ {
fluxfilediff << "Diff at line " << numLine << " : " << strRef << " != " << strTest << std::endl;
differenceFoundInCurrentLine = true;
- }
+ }
nbdiff++;
+ }
}
}
- }
- } // else
- } // if(!isHexaPointerAddress(strRef))
+ } // else
+ } // if(!isHexaPointerAddress(strRef))
else
- {
- if (m_ReportErrors)
{
+ if (m_ReportErrors)
+ {
fluxfilediff << "Pointer address found at line " << numLine << " : " << strRef
- << " -> comparison skipped." << std::endl;
+ << " -> comparison skipped." << std::endl;
+ }
}
}
- }
numLine++;
//Store alls differences lines
if (differenceFoundInCurrentLine && m_ReportErrors)
- {
+ {
listStrDiffLineFileRef.push_back(strfileref);
listStrDiffLineFileTest.push_back(strfiletest);
- }
+ }
return differenceFoundInCurrentLine;
}
@@ -1259,19 +1266,19 @@ std::string TestHelper::VectorToString(otb::MetaDataKey::VectorType vector) cons
otb::MetaDataKey::VectorType::iterator it = vector.begin();
oss << "[";
while (it != vector.end())
- {
+ {
oss << (*it);
++it;
if (it == vector.end())
- {
+ {
oss << "]";
break;
- }
+ }
else
- {
+ {
oss << ", ";
+ }
}
- }
return oss.str();
}
@@ -1279,8 +1286,13 @@ std::string TestHelper::VectorToString(otb::MetaDataKey::VectorType vector) cons
/* ReportOnLayer() */
/************************************************************************/
-void TestHelper::ogrReportOnLayer(OGRLayer * ref_poLayer, const char *ref_pszWHERE, OGRGeometry *ref_poSpatialFilter,
- OGRLayer * test_poLayer, const char *test_pszWHERE, OGRGeometry *test_poSpatialFilter, int & nbdiff) const
+void TestHelper::ogrReportOnLayer(OGRLayer * ref_poLayer,
+ const char *ref_pszWHERE,
+ OGRGeometry *ref_poSpatialFilter,
+ OGRLayer * test_poLayer,
+ const char *test_pszWHERE,
+ OGRGeometry *test_poSpatialFilter,
+ int& nbdiff) const
{
OGRFeatureDefn *ref_poDefn = ref_poLayer->GetLayerDefn();
@@ -1289,81 +1301,84 @@ void TestHelper::ogrReportOnLayer(OGRLayer * ref_poLayer, const char *ref_pszWHE
/* -------------------------------------------------------------------- */
/* Set filters if provided. */
/* -------------------------------------------------------------------- */
- otbCheckStringValue("pszWHERE",ref_pszWHERE,test_pszWHERE,nbdiff,m_ReportErrors);
+ otbCheckStringValue("pszWHERE", ref_pszWHERE, test_pszWHERE, nbdiff, m_ReportErrors);
- if (ref_pszWHERE != NULL)
- ref_poLayer->SetAttributeFilter(ref_pszWHERE);
+ if (ref_pszWHERE != NULL) ref_poLayer->SetAttributeFilter(ref_pszWHERE);
- if (ref_poSpatialFilter != NULL)
- ref_poLayer->SetSpatialFilter(ref_poSpatialFilter);
+ if (ref_poSpatialFilter != NULL) ref_poLayer->SetSpatialFilter(ref_poSpatialFilter);
- if (test_pszWHERE != NULL)
- test_poLayer->SetAttributeFilter(test_pszWHERE);
+ if (test_pszWHERE != NULL) test_poLayer->SetAttributeFilter(test_pszWHERE);
- if (test_poSpatialFilter != NULL)
- test_poLayer->SetSpatialFilter(test_poSpatialFilter);
+ if (test_poSpatialFilter != NULL) test_poLayer->SetSpatialFilter(test_poSpatialFilter);
/* -------------------------------------------------------------------- */
/* Report various overall information. */
/* -------------------------------------------------------------------- */
printf("\n");
- otbCheckStringValue("Layer name", ref_poDefn->GetName() ,test_poDefn->GetName() ,nbdiff,m_ReportErrors);
+ otbCheckStringValue("Layer name", ref_poDefn->GetName(), test_poDefn->GetName(), nbdiff, m_ReportErrors);
- otbCheckStringValue( "Geometry", OGRGeometryTypeToName( ref_poDefn->GetGeomType() ), OGRGeometryTypeToName( test_poDefn->GetGeomType() ),nbdiff, m_ReportErrors );
+ otbCheckStringValue("Geometry", OGRGeometryTypeToName(ref_poDefn->GetGeomType()),
+ OGRGeometryTypeToName(test_poDefn->GetGeomType()), nbdiff, m_ReportErrors);
- otbCheckValue("Feature Count", ref_poLayer->GetFeatureCount(),test_poLayer->GetFeatureCount(),nbdiff ,m_ReportErrors);
+ otbCheckValue("Feature Count", ref_poLayer->GetFeatureCount(),
+ test_poLayer->GetFeatureCount(), nbdiff, m_ReportErrors);
OGREnvelope ref_oExt;
OGREnvelope test_oExt;
- otbCheckValue("GetExtent",ref_poLayer->GetExtent(&ref_oExt, TRUE),test_poLayer->GetExtent(&test_oExt, TRUE), nbdiff, m_ReportErrors);
+ otbCheckValue("GetExtent", ref_poLayer->GetExtent(&ref_oExt, TRUE), test_poLayer->GetExtent(&test_oExt,
+ TRUE), nbdiff,
+ m_ReportErrors);
if (ref_poLayer->GetExtent(&ref_oExt, TRUE) == OGRERR_NONE)
- {
- otbCheckValue("Extent: MinX",ref_oExt.MinX,test_oExt.MinX,nbdiff,m_ReportErrors);
- otbCheckValue("Extent: MinY",ref_oExt.MinY,test_oExt.MinY,nbdiff,m_ReportErrors);
- otbCheckValue("Extent: MaxX",ref_oExt.MaxX,test_oExt.MaxX,nbdiff,m_ReportErrors);
- otbCheckValue("Extent: MaxY",ref_oExt.MaxY,test_oExt.MaxY,nbdiff,m_ReportErrors);
- }
+ {
+ otbCheckValue("Extent: MinX", ref_oExt.MinX, test_oExt.MinX, nbdiff, m_ReportErrors);
+ otbCheckValue("Extent: MinY", ref_oExt.MinY, test_oExt.MinY, nbdiff, m_ReportErrors);
+ otbCheckValue("Extent: MaxX", ref_oExt.MaxX, test_oExt.MaxX, nbdiff, m_ReportErrors);
+ otbCheckValue("Extent: MaxY", ref_oExt.MaxY, test_oExt.MaxY, nbdiff, m_ReportErrors);
+ }
char *ref_pszWKT;
char *test_pszWKT;
- if (ref_poLayer->GetSpatialRef() == NULL)
- ref_pszWKT = CPLStrdup("(unknown)");
+ if (ref_poLayer->GetSpatialRef() == NULL) ref_pszWKT = CPLStrdup("(unknown)");
else
- {
+ {
ref_poLayer->GetSpatialRef()->exportToPrettyWkt(&ref_pszWKT);
- }
- if (test_poLayer->GetSpatialRef() == NULL)
- test_pszWKT = CPLStrdup("(unknown)");
+ }
+ if (test_poLayer->GetSpatialRef() == NULL) test_pszWKT = CPLStrdup("(unknown)");
else
- {
+ {
test_poLayer->GetSpatialRef()->exportToPrettyWkt(&test_pszWKT);
- }
+ }
- otbCheckStringValue( "Layer SRS WKT", ref_pszWKT,test_pszWKT ,nbdiff,m_ReportErrors);
+ otbCheckStringValue("Layer SRS WKT", ref_pszWKT, test_pszWKT, nbdiff, m_ReportErrors);
CPLFree(ref_pszWKT);
CPLFree(test_pszWKT);
- otbCheckStringValue( "FID Column", ref_poLayer->GetFIDColumn(),test_poLayer->GetFIDColumn() ,nbdiff,m_ReportErrors);
- otbCheckStringValue( "Geometry Column", ref_poLayer->GetGeometryColumn(),test_poLayer->GetGeometryColumn() ,nbdiff,m_ReportErrors);
- otbCheckValue("GetFieldCount",ref_poDefn->GetFieldCount(),test_poDefn->GetFieldCount(),nbdiff,m_ReportErrors);
+ otbCheckStringValue("FID Column", ref_poLayer->GetFIDColumn(), test_poLayer->GetFIDColumn(), nbdiff, m_ReportErrors);
+ otbCheckStringValue("Geometry Column", ref_poLayer->GetGeometryColumn(),
+ test_poLayer->GetGeometryColumn(), nbdiff, m_ReportErrors);
+ otbCheckValue("GetFieldCount", ref_poDefn->GetFieldCount(), test_poDefn->GetFieldCount(), nbdiff, m_ReportErrors);
if (ref_poDefn->GetFieldCount() == test_poDefn->GetFieldCount())
- {
- for (int iAttr = 0; iAttr < ref_poDefn->GetFieldCount(); ++iAttr)
{
+ for (int iAttr = 0; iAttr < ref_poDefn->GetFieldCount(); ++iAttr)
+ {
OGRFieldDefn *ref_poField = ref_poDefn->GetFieldDefn(iAttr);
OGRFieldDefn *test_poField = test_poDefn->GetFieldDefn(iAttr);
- otbCheckStringValue( "Field GetName",ref_poField->GetNameRef(),test_poField->GetNameRef(),nbdiff,m_ReportErrors);
- otbCheckStringValue( "Field GetFieldTypeName",ref_poField->GetFieldTypeName( ref_poField->GetType() ),test_poField->GetFieldTypeName( test_poField->GetType() ),nbdiff,m_ReportErrors);
- otbCheckValue( "Field GetWidth",ref_poField->GetWidth(),test_poField->GetWidth(),nbdiff,m_ReportErrors);
- otbCheckValue( "Field GetPrecision",ref_poField->GetPrecision(),test_poField->GetPrecision(),nbdiff,m_ReportErrors);
+ otbCheckStringValue("Field GetName", ref_poField->GetNameRef(),
+ test_poField->GetNameRef(), nbdiff, m_ReportErrors);
+ otbCheckStringValue("Field GetFieldTypeName", ref_poField->GetFieldTypeName(
+ ref_poField->GetType()), test_poField->GetFieldTypeName(
+ test_poField->GetType()), nbdiff, m_ReportErrors);
+ otbCheckValue("Field GetWidth", ref_poField->GetWidth(), test_poField->GetWidth(), nbdiff, m_ReportErrors);
+ otbCheckValue("Field GetPrecision", ref_poField->GetPrecision(),
+ test_poField->GetPrecision(), nbdiff, m_ReportErrors);
+ }
}
- }
/* -------------------------------------------------------------------- */
/* Read, and dump features. */
@@ -1374,4 +1389,3 @@ void TestHelper::ogrReportOnLayer(OGRLayer * ref_poLayer, const char *ref_pszWHE
}
}
-
diff --git a/Code/Testing/otbTestHelper.h b/Code/Testing/otbTestHelper.h
index 6765ab8642..ec81ca9399 100644
--- a/Code/Testing/otbTestHelper.h
+++ b/Code/Testing/otbTestHelper.h
@@ -31,7 +31,7 @@
namespace otb
{
-class /*ITK_EXPORT*/TestHelper
+class /*ITK_EXPORT*/ TestHelper
{
public:
TestHelper() :
@@ -45,35 +45,35 @@ public:
std::map<std::string, int> RegressionTestbaselines(char *baselineFilename) const;
int RegressionTestImage(int cpt, const char *testImageFilename, const char *baselineImageFilename,
- const double toleranceDiffPixelImage) const;
+ const double toleranceDiffPixelImage) const;
int RegressionTestOgrFile(const char *testOgrFilename, const char *baselineOgrFilename,
- const double toleranceDiffValue) const;
+ const double toleranceDiffValue) const;
int RegressionTestBinaryFile(const char * testBinaryFileName, const char * baselineBinaryFileName) const;
int RegressionTestAsciiFile(const char * testAsciiFileName, const char * baselineAsciiFileName,
- const double epsilon, std::vector<std::string> ignoredLines) const;
+ const double epsilon, std::vector<std::string> ignoredLines) const;
int RegressionTestMetaData(const char *testImageFilename, const char *baselineImageFilename,
- const double toleranceDiffPixelImage) const;
+ const double toleranceDiffPixelImage) const;
void ReportErrorsOn()
{
- m_ReportErrors=true;
+ m_ReportErrors = true;
}
void ReportErrorsOff()
{
- m_ReportErrors=false;
+ m_ReportErrors = false;
}
void IgnoreLineOrderOn()
{
- m_IgnoreLineOrder=true;
+ m_IgnoreLineOrder = true;
}
void IgnoreLineOrderOff()
{
- m_IgnoreLineOrder=false;
+ m_IgnoreLineOrder = false;
}
void SetEpsilonBoundaryChecking(double epsilonBoundary)
@@ -91,17 +91,23 @@ private:
bool isHexaPointerAddress(std::string str) const;
std::string VectorToString(otb::MetaDataKey::VectorType vector) const;
//FIXME parameters have to be cleaned up later (this is the first step of refactoring)
- bool CompareLines(std::string strfileref, std::string strfiletest, int& nbdiff, std::ofstream& fluxfilediff, int& numLine,
- std::vector<std::string>& listStrDiffLineFileRef, std::vector<std::string>& listStrDiffLineFileTest,
- double epsilon) const;
+ bool CompareLines(std::string strfileref,
+ std::string strfiletest,
+ int& nbdiff,
+ std::ofstream& fluxfilediff,
+ int& numLine,
+ std::vector<std::string>& listStrDiffLineFileRef,
+ std::vector<std::string>& listStrDiffLineFileTest,
+ double epsilon) const;
void
- ogrReportOnLayer(OGRLayer * ref_poLayer, const char *ref_pszWHERE, OGRGeometry *ref_poSpatialFilter,
- OGRLayer * test_poLayer, const char *test_pszWHERE, OGRGeometry *test_poSpatialFilter, int & nbdiff) const;
+ ogrReportOnLayer(OGRLayer * ref_poLayer, const char *ref_pszWHERE, OGRGeometry *ref_poSpatialFilter,
+ OGRLayer * test_poLayer, const char *test_pszWHERE, OGRGeometry *test_poSpatialFilter,
+ int& nbdiff) const;
double m_EpsilonBoundaryChecking;
- bool m_ReportErrors;
- bool m_IgnoreLineOrder;
+ bool m_ReportErrors;
+ bool m_IgnoreLineOrder;
};
}
diff --git a/Code/Testing/otbTestMain.h b/Code/Testing/otbTestMain.h
index 58142c81c4..d00fd3346b 100644
--- a/Code/Testing/otbTestMain.h
+++ b/Code/Testing/otbTestMain.h
@@ -28,35 +28,33 @@
#include "otbTestHelper.h"
-
-typedef int (*MainFuncPointer)(int , char* [] );
+typedef int (*MainFuncPointer)(int, char*[]);
std::map<std::string, MainFuncPointer> StringToTestFunctionMap;
#define REGISTER_TEST(test) \
-extern int test(int, char* [] ); \
-StringToTestFunctionMap[#test] = test
-
+ extern int test(int, char*[]); \
+ StringToTestFunctionMap[# test] = test
void RegisterTests();
void PrintAvailableTests()
{
std::cout << "Tests available:\n";
std::map<std::string, MainFuncPointer>::iterator j = StringToTestFunctionMap.begin();
- int i = 0;
+ int i = 0;
while (j != StringToTestFunctionMap.end())
- {
+ {
std::cout << i << ". " << j->first << "\n";
++i;
++j;
- }
+ }
}
-int main(int ac, char* av[] )
+int main(int ac, char* av[])
{
- bool lFlagRegression(false);
+ bool lFlagRegression(false);
double lToleranceDiffValue(0);
double lEpsilon(0);
- bool lIgnoreOrder(false);
+ bool lIgnoreOrder(false);
double epsilonBoundary(0.0);
std::vector<std::string> baselineFilenamesBinary;
@@ -83,82 +81,82 @@ int main(int ac, char* av[] )
RegisterTests();
std::string testToRun;
if (ac < 2)
- {
+ {
PrintAvailableTests();
std::cout << "To launch a test, enter its number: ";
int testNum = 0;
std::cin >> testNum;
std::map<std::string, MainFuncPointer>::iterator j = StringToTestFunctionMap.begin();
- int i = 0;
+ int i = 0;
while (j != StringToTestFunctionMap.end() && i < testNum)
- {
+ {
++i;
++j;
- }
+ }
if (j == StringToTestFunctionMap.end())
- {
+ {
std::cerr << testNum << " is not a valid test number\n";
return -1;
- }
+ }
testToRun = j->first;
- }
+ }
else
- {
- if (strcmp(av[1], "--with-threads") == 0)
{
+ if (strcmp(av[1], "--with-threads") == 0)
+ {
int numThreads = atoi(av[2]);
itk::MultiThreader::SetGlobalDefaultNumberOfThreads(numThreads);
av += 2;
ac -= 2;
- }
+ }
else if (strcmp(av[1], "--without-threads") == 0)
- {
+ {
itk::MultiThreader::SetGlobalDefaultNumberOfThreads(1);
av += 1;
ac -= 1;
- }
+ }
if (strcmp(av[1], "--ignore-order") == 0)
- {
+ {
lIgnoreOrder = true;
av += 1;
ac -= 1;
- }
+ }
if (strcmp(av[1], "--epsilon-boundary") == 0)
- {
+ {
epsilonBoundary = atof(av[2]);
av += 2;
ac -= 2;
- }
+ }
if (strcmp(av[1], "--compare-image") == 0)
- {
+ {
lFlagRegression = true;
- lToleranceDiffValue = (double)(::atof(av[2]));
+ lToleranceDiffValue = (double) (::atof(av[2]));
baselineFilenamesImage.reserve(1);
testFilenamesImage.reserve(1);
baselineFilenamesImage.push_back(av[3]);
testFilenamesImage.push_back(av[4]);
av += 4;
ac -= 4;
- }
+ }
else if (strcmp(av[1], "--compare-n-images") == 0)
- {
+ {
lFlagRegression = true;
- lToleranceDiffValue = (double)(::atof(av[2]));
+ lToleranceDiffValue = (double) (::atof(av[2]));
// Number of comparisons to do
- unsigned int nbComparisons=(unsigned int)(::atoi(av[3]));
+ unsigned int nbComparisons = (unsigned int) (::atoi(av[3]));
baselineFilenamesImage.reserve(nbComparisons);
testFilenamesImage.reserve(nbComparisons);
// Retrieve all the file names
- for (unsigned int i = 0; i<nbComparisons;++i)
- {
- baselineFilenamesImage.push_back(av[4+2*i]);
- testFilenamesImage.push_back(av[5+2*i]);
+ for (unsigned int i = 0; i < nbComparisons; ++i)
+ {
+ baselineFilenamesImage.push_back(av[4 + 2 * i]);
+ testFilenamesImage.push_back(av[5 + 2 * i]);
+ }
+ av += 3 + 2 * nbComparisons;
+ ac -= 3 + 2 * nbComparisons;
}
- av+=3+2*nbComparisons;
- ac-=3+2*nbComparisons;
- }
else if (strcmp(av[1], "--compare-binary") == 0)
- {
+ {
lFlagRegression = true;
baselineFilenamesBinary.reserve(1);
testFilenamesBinary.reserve(1);
@@ -166,26 +164,26 @@ int main(int ac, char* av[] )
testFilenamesBinary.push_back(av[3]);
av += 3;
ac -= 3;
- }
+ }
else if (strcmp(av[1], "--compare-n-binary") == 0)
- {
+ {
lFlagRegression = true;
- unsigned int nbComparisons=(unsigned int)(::atoi(av[2]));
+ unsigned int nbComparisons = (unsigned int) (::atoi(av[2]));
baselineFilenamesBinary.reserve(nbComparisons);
testFilenamesBinary.reserve(nbComparisons);
// Retrieve all the file names
- for (unsigned int i = 0; i<nbComparisons;++i)
- {
- baselineFilenamesBinary.push_back(av[3+2*i]);
- testFilenamesBinary.push_back(av[4+2*i]);
+ for (unsigned int i = 0; i < nbComparisons; ++i)
+ {
+ baselineFilenamesBinary.push_back(av[3 + 2 * i]);
+ testFilenamesBinary.push_back(av[4 + 2 * i]);
+ }
+ av += 2 + 2 * nbComparisons;
+ ac -= 2 + 2 * nbComparisons;
}
- av+=2+2*nbComparisons;
- ac-=2+2*nbComparisons;
- }
else if (strcmp(av[1], "--compare-ascii") == 0)
- {
+ {
lFlagRegression = true;
- lEpsilon = (double)(::atof(av[2]));
+ lEpsilon = (double) (::atof(av[2]));
baselineFilenamesAscii.reserve(1);
testFilenamesAscii.reserve(1);
baselineFilenamesAscii.push_back(av[3]);
@@ -193,237 +191,240 @@ int main(int ac, char* av[] )
av += 4;
ac -= 4;
- if ( ac > 1 )
- {
- if (strcmp(av[1], "--ignore-lines-with") == 0)
+ if (ac > 1)
{
- unsigned int nbIgnoredLines=(unsigned int)(::atoi(av[2]));
- for (unsigned int i=0; i<nbIgnoredLines; ++i )
+ if (strcmp(av[1], "--ignore-lines-with") == 0)
{
- ignoredLines.push_back(av[3+i]);
+ unsigned int nbIgnoredLines = (unsigned int) (::atoi(av[2]));
+ for (unsigned int i = 0; i < nbIgnoredLines; ++i)
+ {
+ ignoredLines.push_back(av[3 + i]);
+ }
+ av += 2 + nbIgnoredLines;
+ ac -= 2 + nbIgnoredLines;
}
- av += 2+nbIgnoredLines;
- ac -= 2+nbIgnoredLines;
}
}
- }
else if (strcmp(av[1], "--compare-n-ascii") == 0)
- {
+ {
lFlagRegression = true;
- lEpsilon = (double)(::atof(av[2]));
+ lEpsilon = (double) (::atof(av[2]));
// Number of comparisons to do
- unsigned int nbComparisons=(unsigned int)(::atoi(av[3]));
+ unsigned int nbComparisons = (unsigned int) (::atoi(av[3]));
baselineFilenamesAscii.reserve(nbComparisons);
testFilenamesAscii.reserve(nbComparisons);
// Retrieve all the file names
- for (unsigned int i = 0; i<nbComparisons;++i)
- {
- baselineFilenamesAscii.push_back(av[4+2*i]);
- testFilenamesAscii.push_back(av[5+2*i]);
- }
- av+=3+2*nbComparisons;
- ac-=3+2*nbComparisons;
+ for (unsigned int i = 0; i < nbComparisons; ++i)
+ {
+ baselineFilenamesAscii.push_back(av[4 + 2 * i]);
+ testFilenamesAscii.push_back(av[5 + 2 * i]);
+ }
+ av += 3 + 2 * nbComparisons;
+ ac -= 3 + 2 * nbComparisons;
- if ( ac > 1 )
- {
- if (strcmp(av[1], "--ignore-lines-with") == 0)
+ if (ac > 1)
{
- unsigned int nbIgnoredLines=(unsigned int)(::atoi(av[2]));
- for (unsigned int i=0; i<nbIgnoredLines; ++i )
+ if (strcmp(av[1], "--ignore-lines-with") == 0)
{
- ignoredLines.push_back(av[3+i]);
+ unsigned int nbIgnoredLines = (unsigned int) (::atoi(av[2]));
+ for (unsigned int i = 0; i < nbIgnoredLines; ++i)
+ {
+ ignoredLines.push_back(av[3 + i]);
+ }
+ av += 2 + nbIgnoredLines;
+ ac -= 2 + nbIgnoredLines;
}
- av += 2+nbIgnoredLines;
- ac -= 2+nbIgnoredLines;
}
- }
- }
+ }
else if (strcmp(av[1], "--compare-metadata") == 0)
- {
+ {
lFlagRegression = true;
- lToleranceDiffValue = (double)(::atof(av[2]));
+ lToleranceDiffValue = (double) (::atof(av[2]));
baselineFilenamesMetaData.reserve(1);
testFilenamesMetaData.reserve(1);
baselineFilenamesMetaData.push_back(av[3]);
testFilenamesMetaData.push_back(av[4]);
av += 4;
ac -= 4;
- }
+ }
else if (strcmp(av[1], "--compare-ogr") == 0)
- {
+ {
lFlagRegression = true;
- lToleranceDiffValue = (double)(::atof(av[2]));
+ lToleranceDiffValue = (double) (::atof(av[2]));
baselineFilenamesOgr.reserve(1);
testFilenamesOgr.reserve(1);
baselineFilenamesOgr.push_back(av[3]);
testFilenamesOgr.push_back(av[4]);
av += 4;
ac -= 4;
- }
+ }
testToRun = av[1];
- }
+ }
std::map<std::string, MainFuncPointer>::iterator j = StringToTestFunctionMap.find(testToRun);
if (j != StringToTestFunctionMap.end())
- {
+ {
MainFuncPointer f = j->second;
- int result, multiResult;
+ int result, multiResult;
try
- {
- // Invoke the test's "main" function.
- result = (*f)(ac-1, av+1);
- if (result!=EXIT_SUCCESS)
{
- std::cout << "-> Test EXIT FAILURE ("<<result<<")."<<std::endl;
- itkGenericExceptionMacro(<<"Function returns EXIT_FAILURE (no regression test)");
+ // Invoke the test's "main" function.
+ result = (*f)(ac - 1, av + 1);
+ if (result != EXIT_SUCCESS)
+ {
+ std::cout << "-> Test EXIT FAILURE (" << result << ")." << std::endl;
+ itkGenericExceptionMacro(<< "Function returns EXIT_FAILURE (no regression test)");
+ }
}
- }
- catch ( itk::ExceptionObject & e )
- {
- std::cerr << "otbTestMain '"<<testToRun<<"': ITK Exception thrown:" << std::endl;
- std::cerr << e.GetFile() << ":" << e.GetLine() << ":"<< std::endl;
+ catch (itk::ExceptionObject& e)
+ {
+ std::cerr << "otbTestMain '" << testToRun << "': ITK Exception thrown:" << std::endl;
+ std::cerr << e.GetFile() << ":" << e.GetLine() << ":" << std::endl;
std::cerr << e.GetDescription() << std::endl;
result = EXIT_FAILURE;
- }
- catch ( std::bad_alloc & err )
- {
- std::cerr << "otbTestMain '"<<testToRun<<"': Exception bad_alloc thrown: "<< std::endl;
- std::cerr <<(char*)err.what()<< std::endl;
+ }
+ catch (std::bad_alloc& err)
+ {
+ std::cerr << "otbTestMain '" << testToRun << "': Exception bad_alloc thrown: " << std::endl;
+ std::cerr << (char*) err.what() << std::endl;
result = EXIT_FAILURE;
- }
+ }
catch (const std::exception& e)
- {
- std::cerr << "otbTestMain '"<<testToRun<<"': std::exception thrown:"<< std::endl;
+ {
+ std::cerr << "otbTestMain '" << testToRun << "': std::exception thrown:" << std::endl;
std::cerr << e.what() << std::endl;
result = EXIT_FAILURE;
- }
- catch ( ... )
- {
- std::cerr << "otbTestMain '"<<testToRun<<"': Unknown exception thrown !" << std::endl;
+ }
+ catch (...)
+ {
+ std::cerr << "otbTestMain '" << testToRun << "': Unknown exception thrown !" << std::endl;
result = EXIT_FAILURE;
- }
+ }
- if (result==EXIT_SUCCESS)
- {
- result = 0;
- std::cout << " -> Test EXIT SUCCESS."<<std::endl;
- if ( lFlagRegression == false )
+ if (result == EXIT_SUCCESS)
{
- std::cout << "------------- No control baseline tests -------------"<<std::endl;
- }
+ result = 0;
+ std::cout << " -> Test EXIT SUCCESS." << std::endl;
+ if (lFlagRegression == false)
+ {
+ std::cout << "------------- No control baseline tests -------------" << std::endl;
+ }
else
- {
- try
{
- std::cout << "------------- Start control baseline tests -------------"<<std::endl;
+ try
+ {
+ std::cout << "------------- Start control baseline tests -------------" << std::endl;
// Make a list of possible baselines
if (lIgnoreOrder)
- {
+ {
testHelper.IgnoreLineOrderOn();
- }
+ }
else
- {
+ {
testHelper.IgnoreLineOrderOff();
- }
+ }
if (epsilonBoundary != 0.0)
- {
+ {
testHelper.SetEpsilonBoundaryChecking(epsilonBoundary);
- }
+ }
// Non regression test for images
- if ((baselineFilenamesImage.size()>0) && (testFilenamesImage.size()>0))
- {
+ if ((baselineFilenamesImage.size() > 0) && (testFilenamesImage.size() > 0))
+ {
// Creates iterators on baseline filenames vector and test filenames vector
std::vector<std::string>::iterator itbaselineFilenames = baselineFilenamesImage.begin();
std::vector<std::string>::iterator itTestFilenames = testFilenamesImage.begin();
- int cpt(1);
+ int cpt(1);
// For each couple of baseline and test file, do the comparison
- for (;(itbaselineFilenames != baselineFilenamesImage.end())
- &&(itTestFilenames != testFilenamesImage.end());
- ++itbaselineFilenames,++itTestFilenames)
- {
+ for (; (itbaselineFilenames != baselineFilenamesImage.end())
+ && (itTestFilenames != testFilenamesImage.end());
+ ++itbaselineFilenames, ++itTestFilenames)
+ {
std::string baselineFilenameImage = (*itbaselineFilenames);
std::string testFilenameImage = (*itTestFilenames);
-
- std::map<std::string,int> baselines = testHelper.RegressionTestbaselines(const_cast<char*>(baselineFilenameImage.c_str()));
- std::map<std::string,int>::reverse_iterator baseline = baselines.rbegin();
+ std::map<std::string,
+ int> baselines =
+ testHelper.RegressionTestbaselines(const_cast<char*>(baselineFilenameImage.c_str()));
+ std::map<std::string, int>::reverse_iterator baseline = baselines.rbegin();
multiResult = 1;
- std::cout<<"Number of baseline images: "<<baselines.size()<<std::endl;
- while (baseline!=baselines.rend() && (multiResult!=0))
- {
- std::cout<<"Testing non-regression on image: "<<(baseline->first).c_str()<<std::endl;
+ std::cout << "Number of baseline images: " << baselines.size() << std::endl;
+ while (baseline != baselines.rend() && (multiResult != 0))
+ {
+ std::cout << "Testing non-regression on image: " << (baseline->first).c_str() << std::endl;
testHelper.ReportErrorsOff();
- baseline->second = testHelper.RegressionTestImage(cpt,testFilenameImage.c_str(),
- (baseline->first).c_str(),
- lToleranceDiffValue);
+ baseline->second = testHelper.RegressionTestImage(cpt, testFilenameImage.c_str(),
+ (baseline->first).c_str(),
+ lToleranceDiffValue);
multiResult = baseline->second;
++baseline;
- }
+ }
if (multiResult != 0)
- {
+ {
baseline = baselines.rbegin();
testHelper.ReportErrorsOn();
baseline->second
- = testHelper.RegressionTestImage(cpt,testFilenameImage.c_str(),
- (baseline->first).c_str(),
- lToleranceDiffValue);
- }
+ = testHelper.RegressionTestImage(cpt, testFilenameImage.c_str(),
+ (baseline->first).c_str(),
+ lToleranceDiffValue);
+ }
cpt++;
result += multiResult;
- }
+ }
- }
+ }
// Non-regression test for metadata.
- if ((baselineFilenamesMetaData.size()>0) && (testFilenamesMetaData.size()>0))
- {
+ if ((baselineFilenamesMetaData.size() > 0) && (testFilenamesMetaData.size() > 0))
+ {
// Creates iterators on baseline filenames vector and test filenames vector
std::vector<std::string>::iterator itbaselineFilenames = baselineFilenamesMetaData.begin();
std::vector<std::string>::iterator itTestFilenames = testFilenamesMetaData.begin();
// For each couple of baseline and test file, do the comparison
- for (;(itbaselineFilenames != baselineFilenamesMetaData.end())
- &&(itTestFilenames != testFilenamesMetaData.end());
- ++itbaselineFilenames,++itTestFilenames)
- {
+ for (; (itbaselineFilenames != baselineFilenamesMetaData.end())
+ && (itTestFilenames != testFilenamesMetaData.end());
+ ++itbaselineFilenames, ++itTestFilenames)
+ {
std::string baselineFilenameImage = (*itbaselineFilenames);
std::string testFilenameImage = (*itTestFilenames);
- std::map<std::string,int> baselines = testHelper.RegressionTestbaselines(const_cast<char*>(baselineFilenameImage.c_str()));
- std::map<std::string,int>::reverse_iterator baseline = baselines.rbegin();
+ std::map<std::string,
+ int> baselines =
+ testHelper.RegressionTestbaselines(const_cast<char*>(baselineFilenameImage.c_str()));
+ std::map<std::string, int>::reverse_iterator baseline = baselines.rbegin();
multiResult = 1;
- std::cout<<"Number of baseline images: "<<baselines.size()<<std::endl;
- while (baseline!=baselines.rend() && (multiResult!=0))
- {
- std::cout<<"Testing non-regression on image: "<<(baseline->first).c_str()<<std::endl;
+ std::cout << "Number of baseline images: " << baselines.size() << std::endl;
+ while (baseline != baselines.rend() && (multiResult != 0))
+ {
+ std::cout << "Testing non-regression on image: " << (baseline->first).c_str() << std::endl;
testHelper.ReportErrorsOff();
baseline->second = testHelper.RegressionTestMetaData(testFilenameImage.c_str(),
- (baseline->first).c_str(),
- lToleranceDiffValue);
+ (baseline->first).c_str(),
+ lToleranceDiffValue);
multiResult = baseline->second;
++baseline;
- }
+ }
if (multiResult != 0)
- {
+ {
baseline = baselines.rbegin();
testHelper.ReportErrorsOn();
baseline->second
- = testHelper.RegressionTestMetaData(testFilenameImage.c_str(),
- (baseline->first).c_str(),
- lToleranceDiffValue);
- }
+ = testHelper.RegressionTestMetaData(testFilenameImage.c_str(),
+ (baseline->first).c_str(),
+ lToleranceDiffValue);
+ }
result += multiResult;
+ }
}
- }
// Non regression test for ascii files
- if ((baselineFilenamesAscii.size()>0) && (testFilenamesAscii.size()>0))
- {
+ if ((baselineFilenamesAscii.size() > 0) && (testFilenamesAscii.size() > 0))
+ {
// Creates iterators on baseline filenames vector and test filenames vector
std::vector<std::string>::iterator itbaselineFilenames = baselineFilenamesAscii.begin();
@@ -431,172 +432,177 @@ int main(int ac, char* av[] )
std::vector<std::string>::iterator itIgnoredLines = ignoredLines.begin();
// Warning message
- if (ignoredLines.size() > 0 )
- {
- std::cout << "The lines containing the expressions ";
- for (;itIgnoredLines!=ignoredLines.end();++itIgnoredLines)
+ if (ignoredLines.size() > 0)
{
- std::cout << (*itIgnoredLines) <<" ";
+ std::cout << "The lines containing the expressions ";
+ for (; itIgnoredLines != ignoredLines.end(); ++itIgnoredLines)
+ {
+ std::cout << (*itIgnoredLines) << " ";
+ }
+ std::cout << "are not considered" << std::endl;
}
- std::cout << "are not considered"<< std::endl;
- }
// For each couple of baseline and test file, do the comparison
- for (;(itbaselineFilenames != baselineFilenamesAscii.end())
- &&(itTestFilenames != testFilenamesAscii.end());
- ++itbaselineFilenames,++itTestFilenames)
- {
+ for (; (itbaselineFilenames != baselineFilenamesAscii.end())
+ && (itTestFilenames != testFilenamesAscii.end());
+ ++itbaselineFilenames, ++itTestFilenames)
+ {
std::string baselineFilenameAscii = (*itbaselineFilenames);
std::string testFilenameAscii = (*itTestFilenames);
- std::map<std::string,int> baselines = testHelper.RegressionTestbaselines(const_cast<char*>(baselineFilenameAscii.c_str()));
- std::map<std::string,int>::reverse_iterator baseline = baselines.rbegin();
+ std::map<std::string,
+ int> baselines =
+ testHelper.RegressionTestbaselines(const_cast<char*>(baselineFilenameAscii.c_str()));
+ std::map<std::string, int>::reverse_iterator baseline = baselines.rbegin();
multiResult = 1;
- std::cout<<"Number of baseline files: "<<baselines.size()<<std::endl;
- while (baseline!=baselines.rend() && (multiResult!=0))
- {
- std::cout<<"Testing non-regression on file: "<<(baseline->first).c_str()<<std::endl;
+ std::cout << "Number of baseline files: " << baselines.size() << std::endl;
+ while (baseline != baselines.rend() && (multiResult != 0))
+ {
+ std::cout << "Testing non-regression on file: " << (baseline->first).c_str() << std::endl;
testHelper.ReportErrorsOff();
baseline->second = testHelper.RegressionTestAsciiFile(testFilenameAscii.c_str(),
- (baseline->first).c_str(),
- lEpsilon,
- ignoredLines);
+ (baseline->first).c_str(),
+ lEpsilon,
+ ignoredLines);
multiResult = baseline->second;
++baseline;
- }
+ }
if (multiResult != 0)
- {
+ {
baseline = baselines.rbegin();
testHelper.ReportErrorsOn();
baseline->second
- = testHelper.RegressionTestAsciiFile(testFilenameAscii.c_str(),
- (baseline->first).c_str(),
- lEpsilon,
- ignoredLines);
- }
+ = testHelper.RegressionTestAsciiFile(testFilenameAscii.c_str(),
+ (baseline->first).c_str(),
+ lEpsilon,
+ ignoredLines);
+ }
result += multiResult;
+ }
}
- }
/******************************************/
/******************************************/
/******************************************/
// Non regression test for binary files
- if ((baselineFilenamesBinary.size()>0) && (testFilenamesBinary.size()>0))
- {
+ if ((baselineFilenamesBinary.size() > 0) && (testFilenamesBinary.size() > 0))
+ {
// Creates iterators on baseline filenames vector and test filenames vector
std::vector<std::string>::iterator itbaselineFilenames = baselineFilenamesBinary.begin();
std::vector<std::string>::iterator itTestFilenames = testFilenamesBinary.begin();
// For each couple of baseline and test file, do the comparison
- for (;(itbaselineFilenames != baselineFilenamesBinary.end())
- &&(itTestFilenames != testFilenamesBinary.end());
- ++itbaselineFilenames,++itTestFilenames)
- {
+ for (; (itbaselineFilenames != baselineFilenamesBinary.end())
+ && (itTestFilenames != testFilenamesBinary.end());
+ ++itbaselineFilenames, ++itTestFilenames)
+ {
std::string baselineFilenameBinary = (*itbaselineFilenames);
std::string testFilenameBinary = (*itTestFilenames);
- std::map<std::string,int> baselines = testHelper.RegressionTestbaselines(const_cast<char*>(baselineFilenameBinary.c_str()));
- std::map<std::string,int>::reverse_iterator baseline = baselines.rbegin();
+ std::map<std::string,
+ int> baselines =
+ testHelper.RegressionTestbaselines(const_cast<char*>(baselineFilenameBinary.c_str()));
+ std::map<std::string, int>::reverse_iterator baseline = baselines.rbegin();
multiResult = 1;
- std::cout<<"Number of baseline files: "<<baselines.size()<<std::endl;
- while (baseline!=baselines.rend() && (multiResult!=0))
- {
- std::cout<<"Testing non-regression on file: "<<(baseline->first).c_str()<<std::endl;
+ std::cout << "Number of baseline files: " << baselines.size() << std::endl;
+ while (baseline != baselines.rend() && (multiResult != 0))
+ {
+ std::cout << "Testing non-regression on file: " << (baseline->first).c_str() << std::endl;
testHelper.ReportErrorsOff();
baseline->second = testHelper.RegressionTestBinaryFile(testFilenameBinary.c_str(),
- (baseline->first).c_str());
+ (baseline->first).c_str());
multiResult = baseline->second;
++baseline;
- }
+ }
if (multiResult != 0)
- {
+ {
baseline = baselines.rbegin();
testHelper.ReportErrorsOn();
baseline->second
- = testHelper.RegressionTestBinaryFile(testFilenameBinary.c_str(),
- (baseline->first).c_str());
- }
+ = testHelper.RegressionTestBinaryFile(testFilenameBinary.c_str(),
+ (baseline->first).c_str());
+ }
result += multiResult;
+ }
}
- }
// Non regression test for OGR files
- if ((baselineFilenamesOgr.size()>0) && (testFilenamesOgr.size()>0))
- {
+ if ((baselineFilenamesOgr.size() > 0) && (testFilenamesOgr.size() > 0))
+ {
// Creates iterators on baseline filenames vector and test filenames vector
std::vector<std::string>::iterator itbaselineFilenames = baselineFilenamesOgr.begin();
std::vector<std::string>::iterator itTestFilenames = testFilenamesOgr.begin();
// For each couple of baseline and test file, do the comparison
- for (;(itbaselineFilenames != baselineFilenamesOgr.end())
- &&(itTestFilenames != testFilenamesOgr.end());
- ++itbaselineFilenames,++itTestFilenames)
- {
+ for (; (itbaselineFilenames != baselineFilenamesOgr.end())
+ && (itTestFilenames != testFilenamesOgr.end());
+ ++itbaselineFilenames, ++itTestFilenames)
+ {
std::string baselineFilenameOgr = (*itbaselineFilenames);
std::string testFilenameOgr = (*itTestFilenames);
- std::map<std::string,int> baselines = testHelper.RegressionTestbaselines(const_cast<char*>(baselineFilenameOgr.c_str()));
- std::map<std::string,int>::reverse_iterator baseline = baselines.rbegin();
+ std::map<std::string,
+ int> baselines =
+ testHelper.RegressionTestbaselines(const_cast<char*>(baselineFilenameOgr.c_str()));
+ std::map<std::string, int>::reverse_iterator baseline = baselines.rbegin();
multiResult = 1;
- std::cout<<"Number of baseline OGR files: "<<baselines.size()<<std::endl;
- while (baseline!=baselines.rend() && (multiResult!=0))
- {
- std::cout<<"Testing non-regression on OGR file: "<<(baseline->first).c_str()<<std::endl;
+ std::cout << "Number of baseline OGR files: " << baselines.size() << std::endl;
+ while (baseline != baselines.rend() && (multiResult != 0))
+ {
+ std::cout << "Testing non-regression on OGR file: " << (baseline->first).c_str() << std::endl;
testHelper.ReportErrorsOff();
baseline->second = testHelper.RegressionTestOgrFile(testFilenameOgr.c_str(),
- (baseline->first).c_str(),
- lToleranceDiffValue);
+ (baseline->first).c_str(),
+ lToleranceDiffValue);
multiResult = baseline->second;
++baseline;
- }
+ }
if (multiResult != 0)
- {
+ {
baseline = baselines.rbegin();
testHelper.ReportErrorsOn();
baseline->second
- = testHelper.RegressionTestOgrFile(testFilenameOgr.c_str(),
- (baseline->first).c_str(),
- lToleranceDiffValue);
- }
+ = testHelper.RegressionTestOgrFile(testFilenameOgr.c_str(),
+ (baseline->first).c_str(),
+ lToleranceDiffValue);
+ }
result += multiResult;
+ }
}
- }
- }
- catch ( itk::ExceptionObject & e )
- {
+ }
+ catch (itk::ExceptionObject& e)
+ {
std::cerr << "otbTestMain 'control baseline test': ITK Exception thrown:" << std::endl;
- std::cerr << e.GetFile() << ":" << e.GetLine() << ":"<< std::endl;
+ std::cerr << e.GetFile() << ":" << e.GetLine() << ":" << std::endl;
std::cerr << e.GetDescription() << std::endl;
return -1;
- }
- catch ( std::bad_alloc & err )
- {
- std::cerr << "otbTestMain 'control baseline test': Exception bad_alloc thrown: "<< std::endl;
- std::cerr <<(char*)err.what()<< std::endl;
+ }
+ catch (std::bad_alloc& err)
+ {
+ std::cerr << "otbTestMain 'control baseline test': Exception bad_alloc thrown: " << std::endl;
+ std::cerr << (char*) err.what() << std::endl;
return -1;
- }
+ }
catch (const std::exception& e)
- {
- std::cerr << "otbTestMain 'control baseline test': std::exception thrown:"<< std::endl;
+ {
+ std::cerr << "otbTestMain 'control baseline test': std::exception thrown:" << std::endl;
std::cerr << e.what() << std::endl;
return -1;
- }
- catch ( ... )
- {
+ }
+ catch (...)
+ {
std::cerr << "otbTestMain 'control baseline test': Unknown exception thrown !" << std::endl;
return -1;
- }
- std::cout << "------------- End control baseline tests -------------"<<std::endl;
- } // Fin else de if( lFlagRegression == false )
- } // if (result==EXIT_SUCCESS)
+ }
+ std::cout << "------------- End control baseline tests -------------" << std::endl;
+ } // Fin else de if( lFlagRegression == false )
+ } // if (result==EXIT_SUCCESS)
return result;
- }
+ }
PrintAvailableTests();
std::cerr << "Failure: " << testToRun << ": no test identified " << testToRun << "\n";
return -1;
}
#endif
-
diff --git a/Code/Visu/otbFixedSizeFullImageWidget.h b/Code/Visu/otbFixedSizeFullImageWidget.h
index e02a87ecde..0b3ae5b6a2 100644
--- a/Code/Visu/otbFixedSizeFullImageWidget.h
+++ b/Code/Visu/otbFixedSizeFullImageWidget.h
@@ -31,28 +31,28 @@ namespace otb
*/
template <class TPixel>
class FixedSizeFullImageWidget
- : public ImageWidgetBase<TPixel>
+ : public ImageWidgetBase<TPixel>
{
public:
/** Standard class typedefs */
- typedef FixedSizeFullImageWidget Self;
- typedef ImageWidgetBase<TPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef FixedSizeFullImageWidget Self;
+ typedef ImageWidgetBase<TPixel> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(FixedSizeFullImageWidget,ImageWidgetBase);
+ itkTypeMacro(FixedSizeFullImageWidget, ImageWidgetBase);
/** Superclass typedefs */
- typedef typename Superclass::SizeType SizeType;
- typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::IndexType IndexType;
typedef typename Superclass::RegionType RegionType;
- itkSetMacro(WindowSize,SizeType);
- itkGetMacro(WindowSize,SizeType);
+ itkSetMacro(WindowSize, SizeType);
+ itkGetMacro(WindowSize, SizeType);
/** Unlarge OpenGlBuffer */
virtual void UpdateOpenGlBufferedRegion(void);
@@ -74,35 +74,35 @@ protected:
{
if (this->GetViewedRegion().GetSize()[0] / static_cast<float>(this->GetViewedRegion().GetSize()[1])
> this->w() / static_cast<float>(this->h()))
- {
+ {
return this->w();
- }
+ }
else
- {
- return this->h()*this->GetViewedRegion().GetSize()[0] / this->GetViewedRegion().GetSize()[1];
- }
+ {
+ return this->h() * this->GetViewedRegion().GetSize()[0] / this->GetViewedRegion().GetSize()[1];
+ }
}
int hDisplayed()
{
if (this->GetViewedRegion().GetSize()[0] / static_cast<float>(this->GetViewedRegion().GetSize()[1])
> this->w() / static_cast<float>(this->h()))
- {
- return this->w()*this->GetViewedRegion().GetSize()[1] / this->GetViewedRegion().GetSize()[0];
- }
+ {
+ return this->w() * this->GetViewedRegion().GetSize()[1] / this->GetViewedRegion().GetSize()[0];
+ }
else
- {
+ {
return this->h();
- }
+ }
}
private:
- FixedSizeFullImageWidget(const Self&);// purposely not implemented
- void operator=(const Self&);// purposely not implemented
+ FixedSizeFullImageWidget(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
SizeType m_WindowSize;
- bool m_ImageLoaded;
- bool m_ImageOverlayLoaded;
+ bool m_ImageLoaded;
+ bool m_ImageOverlayLoaded;
};
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Visu/otbFixedSizeFullImageWidget.txx b/Code/Visu/otbFixedSizeFullImageWidget.txx
index b36c57e0b3..8b9b508362 100644
--- a/Code/Visu/otbFixedSizeFullImageWidget.txx
+++ b/Code/Visu/otbFixedSizeFullImageWidget.txx
@@ -38,8 +38,8 @@ FixedSizeFullImageWidget<TPixel>
region.SetIndex(index);
region.SetSize(m_WindowSize);
this->SetViewedRegion(region);
- m_ImageLoaded=false;
- m_ImageOverlayLoaded=false;
+ m_ImageLoaded = false;
+ m_ImageOverlayLoaded = false;
}
/**
@@ -57,19 +57,19 @@ void
FixedSizeFullImageWidget<TPixel>
::Init(int x, int y, int w, int h, const char * l)
{
- m_ImageLoaded=false;
- m_ImageOverlayLoaded=false;
+ m_ImageLoaded = false;
+ m_ImageOverlayLoaded = false;
if (!this->GetInput())
- {
+ {
itkExceptionMacro("No input image!");
- }
+ }
else
- {
- Superclass::Init(x,y,w,h,l);
+ {
+ Superclass::Init(x, y, w, h, l);
this->SetViewedRegion(this->GetInput()->GetLargestPossibleRegion());
this->label(l);
this->resize(x, y, w, h);
- }
+ }
}
/**
@@ -81,17 +81,17 @@ FixedSizeFullImageWidget<TPixel>
::resize(int x, int y, int w, int h)
{
//otbMsgDebugMacro(<<"resize: "<<x<<" "<<y<<" "<<w<<" "<<h);
- m_WindowSize[0]=w;
- m_WindowSize[1]=h;
+ m_WindowSize[0] = w;
+ m_WindowSize[1] = h;
SizeType viewedSize = this->GetViewedRegion().GetSize();
- double zoom1 = (double)w/(double)viewedSize[0];
- double zoom2 = (double)h/(double)viewedSize[1];
+ double zoom1 = (double) w / (double) viewedSize[0];
+ double zoom2 = (double) h / (double) viewedSize[1];
this->SetOpenGlIsotropicZoom(zoom1 < zoom2 ? zoom1 : zoom2);
- this->Fl_Gl_Window::resize(x,y,w,h);
+ this->Fl_Gl_Window::resize(x, y, w, h);
this->redraw();
}
/**
@@ -102,15 +102,15 @@ bool
FixedSizeFullImageWidget<TPixel>
::UpdateOpenGlBufferedRegionRequested(void)
{
- if (m_ImageLoaded && this->GetBufferedRegion().GetNumberOfPixels()!=0)
- {
+ if (m_ImageLoaded && this->GetBufferedRegion().GetNumberOfPixels() != 0)
+ {
return false;
- }
+ }
else
- {
- m_ImageLoaded=true;
+ {
+ m_ImageLoaded = true;
return true;
- }
+ }
}
/**
* Update OpenGlBuffer.
diff --git a/Code/Visu/otbFullResolutionImageWidget.h b/Code/Visu/otbFullResolutionImageWidget.h
index 0e0c55621f..f54df8df4c 100644
--- a/Code/Visu/otbFullResolutionImageWidget.h
+++ b/Code/Visu/otbFullResolutionImageWidget.h
@@ -31,24 +31,24 @@ namespace otb
*/
template <class TPixel>
class FullResolutionImageWidget
- : public ImageWidgetBase<TPixel>
+ : public ImageWidgetBase<TPixel>
{
public:
/** Standard class typedefs */
- typedef FullResolutionImageWidget Self;
- typedef ImageWidgetBase<TPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef FullResolutionImageWidget Self;
+ typedef ImageWidgetBase<TPixel> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(FullResolutionImageWidget,ImageWidgetBase);
+ itkTypeMacro(FullResolutionImageWidget, ImageWidgetBase);
/** Superclass typedefs */
- typedef typename Superclass::SizeType SizeType;
- typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::IndexType IndexType;
typedef typename Superclass::RegionType RegionType;
//typedef typename Superclass::ImageType ImageType;
@@ -66,7 +66,7 @@ public:
* \param index the upper left corner index.
*/
virtual void SetUpperLeftCorner(IndexType index);
- itkGetMacro(UpperLeftCorner,IndexType);
+ itkGetMacro(UpperLeftCorner, IndexType);
protected:
/** Constructor. */
@@ -75,8 +75,8 @@ protected:
virtual ~FullResolutionImageWidget();
private:
- FullResolutionImageWidget(const Self&);// purposely not implemented
- void operator=(const Self&);// purposely not implemented
+ FullResolutionImageWidget(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
IndexType m_UpperLeftCorner;
};
diff --git a/Code/Visu/otbFullResolutionImageWidget.txx b/Code/Visu/otbFullResolutionImageWidget.txx
index c3ed569ece..cd7932814a 100644
--- a/Code/Visu/otbFullResolutionImageWidget.txx
+++ b/Code/Visu/otbFullResolutionImageWidget.txx
@@ -57,22 +57,22 @@ FullResolutionImageWidget<TPixel>
{
if (!this->GetInput())
- {
+ {
itkExceptionMacro("No input image!");
- }
+ }
else
- {
- Superclass::Init(x,y,w,h,l);
- if (this->GetImageOverlayVisible())
{
- if (!this->GetInputOverlay())
+ Superclass::Init(x, y, w, h, l);
+ if (this->GetImageOverlayVisible())
{
+ if (!this->GetInputOverlay())
+ {
itkExceptionMacro("No input image overlay!");
+ }
}
- }
this->label(l);
this->resize(x, y, w, h);
- }
+ }
}
/**
* Resize the widget.
@@ -85,8 +85,8 @@ FullResolutionImageWidget<TPixel>
//otbMsgDebugMacro(<<"resize: "<<x<<" "<<y<<" "<<w<<" "<<h);
// IndexType index;
SizeType size;
- size[0]=w;
- size[1]=h;
+ size[0] = w;
+ size[1] = h;
RegionType region;
region.SetSize(size);
region.SetIndex(m_UpperLeftCorner);
@@ -109,14 +109,14 @@ FullResolutionImageWidget<TPixel>
{
RegionType viewed = this->GetViewedRegion();
RegionType buffered = this->GetBufferedRegion();
- IndexType viewedULCorner = viewed.GetIndex();
- IndexType bufferedULCorner = buffered.GetIndex();
- IndexType viewedRDCorner = viewed.GetIndex()+viewed.GetSize();
- IndexType bufferedRDCorner = buffered.GetIndex()+buffered.GetSize();
- return ( viewedULCorner[0]<bufferedULCorner[0]
- ||viewedULCorner[1]<bufferedULCorner[1]
- ||viewedRDCorner[0]>bufferedRDCorner[0]
- ||viewedRDCorner[1]>bufferedRDCorner[1]);
+ IndexType viewedULCorner = viewed.GetIndex();
+ IndexType bufferedULCorner = buffered.GetIndex();
+ IndexType viewedRDCorner = viewed.GetIndex() + viewed.GetSize();
+ IndexType bufferedRDCorner = buffered.GetIndex() + buffered.GetSize();
+ return (viewedULCorner[0] < bufferedULCorner[0]
+ || viewedULCorner[1] < bufferedULCorner[1]
+ || viewedRDCorner[0] > bufferedRDCorner[0]
+ || viewedRDCorner[1] > bufferedRDCorner[1]);
}
/**
@@ -139,7 +139,7 @@ void
FullResolutionImageWidget<TPixel>
::SetUpperLeftCorner(IndexType index)
{
- m_UpperLeftCorner=index;
+ m_UpperLeftCorner = index;
RegionType region = this->GetViewedRegion();
region.SetIndex(index);
region.Crop(this->GetInput()->GetLargestPossibleRegion());
diff --git a/Code/Visu/otbGluPolygonDrawingHelper.cxx b/Code/Visu/otbGluPolygonDrawingHelper.cxx
index 54ecc29364..6702761f53 100644
--- a/Code/Visu/otbGluPolygonDrawingHelper.cxx
+++ b/Code/Visu/otbGluPolygonDrawingHelper.cxx
@@ -35,36 +35,36 @@
extern "C"
{
- typedef GLvoid (CALLBACK * FunctionPointerType)();
-
- void CALLBACK CombineCallback(GLdouble coords[3],GLdouble * /*data*/[4], GLfloat /*weights*/[4],GLdouble **dataOut)
- {
- GLdouble * vertex = new GLdouble[3];
- vertex[0] = coords[0];
- vertex[1] = coords[1];
- vertex[2] = coords[2];
- *dataOut = vertex;
- }
-
- void CALLBACK ErrorCallback(GLenum errorCode)
- {
- const GLubyte * estring = gluErrorString(errorCode);
- std::cout<<"Glu Tesselation error: "<<estring<<std::endl;
- }
-
- void CALLBACK BeginCallback(GLenum prim)
- {
- glBegin(prim);
- }
- void CALLBACK EndCallback()
- {
- glEnd();
- }
-
- void CALLBACK VertexCallback(void * data)
- {
- glVertex3dv((GLdouble*)data);
- }
+typedef GLvoid (CALLBACK * FunctionPointerType)();
+
+void CALLBACK CombineCallback(GLdouble coords[3], GLdouble * /*data*/[4], GLfloat /*weights*/[4], GLdouble **dataOut)
+{
+ GLdouble * vertex = new GLdouble[3];
+ vertex[0] = coords[0];
+ vertex[1] = coords[1];
+ vertex[2] = coords[2];
+ *dataOut = vertex;
+}
+
+void CALLBACK ErrorCallback(GLenum errorCode)
+{
+ const GLubyte * estring = gluErrorString(errorCode);
+ std::cout << "Glu Tesselation error: " << estring << std::endl;
+}
+
+void CALLBACK BeginCallback(GLenum prim)
+{
+ glBegin(prim);
+}
+void CALLBACK EndCallback()
+{
+ glEnd();
+}
+
+void CALLBACK VertexCallback(void * data)
+{
+ glVertex3dv((GLdouble*) data);
+}
} // end extern C
@@ -78,17 +78,17 @@ GluPolygonDrawingHelper::GluPolygonDrawingHelper()
m_GluTesselator = gluNewTess();
// Color
- m_Color[0]=0;
- m_Color[1]=0;
- m_Color[2]=0;
- m_Color[3]=0;
+ m_Color[0] = 0;
+ m_Color[1] = 0;
+ m_Color[2] = 0;
+ m_Color[3] = 0;
// Setting up the tesselator callbacks
- gluTessCallback(m_GluTesselator,GLU_TESS_BEGIN,(FunctionPointerType)BeginCallback);
- gluTessCallback(m_GluTesselator,GLU_TESS_END,(FunctionPointerType)EndCallback);
- gluTessCallback(m_GluTesselator,GLU_TESS_ERROR,(FunctionPointerType)ErrorCallback);
- gluTessCallback(m_GluTesselator,GLU_TESS_VERTEX,(FunctionPointerType)VertexCallback);
- gluTessCallback(m_GluTesselator,GLU_TESS_COMBINE,(FunctionPointerType)CombineCallback);
+ gluTessCallback(m_GluTesselator, GLU_TESS_BEGIN, (FunctionPointerType) BeginCallback);
+ gluTessCallback(m_GluTesselator, GLU_TESS_END, (FunctionPointerType) EndCallback);
+ gluTessCallback(m_GluTesselator, GLU_TESS_ERROR, (FunctionPointerType) ErrorCallback);
+ gluTessCallback(m_GluTesselator, GLU_TESS_VERTEX, (FunctionPointerType) VertexCallback);
+ gluTessCallback(m_GluTesselator, GLU_TESS_COMBINE, (FunctionPointerType) CombineCallback);
}
GluPolygonDrawingHelper::~GluPolygonDrawingHelper()
@@ -96,38 +96,38 @@ GluPolygonDrawingHelper::~GluPolygonDrawingHelper()
gluDeleteTess(m_GluTesselator);
}
-void GluPolygonDrawingHelper::SetWindingRule(GLdouble windingRule)
+void GluPolygonDrawingHelper::SetWindingRule(GLdouble windingRule)
{
- gluTessProperty(m_GluTesselator,GLU_TESS_WINDING_RULE,windingRule);
+ gluTessProperty(m_GluTesselator, GLU_TESS_WINDING_RULE, windingRule);
}
void GluPolygonDrawingHelper::SetBoundaryOnly(GLdouble boundaryOnly)
{
- gluTessProperty(m_GluTesselator,GLU_TESS_BOUNDARY_ONLY,boundaryOnly);
+ gluTessProperty(m_GluTesselator, GLU_TESS_BOUNDARY_ONLY, boundaryOnly);
}
void GluPolygonDrawingHelper::Color3d(double r, double g, double b)
{
- m_Color[0]=r;
- m_Color[1]=g;
- m_Color[2]=b;
- m_Color[3]=1.;
+ m_Color[0] = r;
+ m_Color[1] = g;
+ m_Color[2] = b;
+ m_Color[3] = 1.;
}
void GluPolygonDrawingHelper::Color4d(double r, double g, double b, double alpha)
{
- m_Color[0]=r;
- m_Color[1]=g;
- m_Color[2]=b;
- m_Color[3]=alpha;
+ m_Color[0] = r;
+ m_Color[1] = g;
+ m_Color[2] = b;
+ m_Color[3] = alpha;
}
void GluPolygonDrawingHelper::Vertex2d(double x, double y)
{
PointType p;
- p[0]=x;
- p[1]=y;
- p[2]=0;
+ p[0] = x;
+ p[1] = y;
+ p[2] = 0;
m_PointVector.push_back(p);
}
@@ -135,42 +135,42 @@ void GluPolygonDrawingHelper::Vertex2d(double x, double y)
void GluPolygonDrawingHelper::Vertex3d(double x, double y, double z)
{
PointType p;
- p[0]=x;
- p[1]=y;
- p[2]=z;
+ p[0] = x;
+ p[1] = y;
+ p[2] = z;
m_PointVector.push_back(p);
}
void GluPolygonDrawingHelper::RenderPolygon()
{
// Set up a malloced space for the polygon data.
- GLdouble ** data = new GLdouble*[m_PointVector.size()];
- unsigned int i = 0;
+ GLdouble ** data = new GLdouble *[m_PointVector.size()];
+ unsigned int i = 0;
PointVectorType::iterator it;
- for (it = m_PointVector.begin();it!=m_PointVector.end();++i,++it)
- {
- data[i]= new GLdouble[3];
- data[i][0]=(*it)[0];
- data[i][1]=(*it)[1];
- data[i][2]=(*it)[2];
- }
+ for (it = m_PointVector.begin(); it != m_PointVector.end(); ++i, ++it)
+ {
+ data[i] = new GLdouble[3];
+ data[i][0] = (*it)[0];
+ data[i][1] = (*it)[1];
+ data[i][2] = (*it)[2];
+ }
// Set the color
- glColor4d(m_Color[0],m_Color[1],m_Color[2],m_Color[3]);
+ glColor4d(m_Color[0], m_Color[1], m_Color[2], m_Color[3]);
gluTessBeginPolygon(m_GluTesselator, NULL);
gluTessBeginContour(m_GluTesselator);
- for (i=0;i<m_PointVector.size();++i)
- {
- gluTessVertex(m_GluTesselator,data[i],data[i]);
- }
+ for (i = 0; i < m_PointVector.size(); ++i)
+ {
+ gluTessVertex(m_GluTesselator, data[i], data[i]);
+ }
gluTessEndContour(m_GluTesselator);
gluTessEndPolygon(m_GluTesselator);
- for (i=0;i<m_PointVector.size();++i)
- {
- delete []data[i];
- }
- delete []data;
+ for (i = 0; i < m_PointVector.size(); ++i)
+ {
+ delete[] data[i];
+ }
+ delete[] data;
m_PointVector.clear();
}
diff --git a/Code/Visu/otbGluPolygonDrawingHelper.h b/Code/Visu/otbGluPolygonDrawingHelper.h
index 2eff10f65a..f8811ce44d 100644
--- a/Code/Visu/otbGluPolygonDrawingHelper.h
+++ b/Code/Visu/otbGluPolygonDrawingHelper.h
@@ -42,22 +42,21 @@ namespace otb
*
*/
class ITK_EXPORT GluPolygonDrawingHelper
- : public itk::Object
+ : public itk::Object
{
public:
- typedef GluPolygonDrawingHelper Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef GluPolygonDrawingHelper Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
- typedef itk::Point<double,3> PointType;
- typedef std::vector<PointType> PointVectorType;
+ typedef itk::Point<double, 3> PointType;
+ typedef std::vector<PointType> PointVectorType;
- itkTypeMacro(GluPolygonDrawingHelper,Object);
+ itkTypeMacro(GluPolygonDrawingHelper, Object);
itkNewMacro(Self);
-
/**
* Set the current color.
* \param r red component
@@ -88,7 +87,7 @@ public:
* \param x position
* \param y position
*/
- void Vertex2d(double x,double y);
+ void Vertex2d(double x, double y);
/**
* Set the the winding rule for the tesselator.
@@ -119,9 +118,8 @@ protected:
*/
~GluPolygonDrawingHelper();
- GluPolygonDrawingHelper(const Self&);// purposely not implemented
- void operator=(const Self&);// purposely not implemented
-
+ GluPolygonDrawingHelper(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
private:
/** Store the point of the polygon */
diff --git a/Code/Visu/otbHistogramAndTransferFunctionWidget.h b/Code/Visu/otbHistogramAndTransferFunctionWidget.h
index 33b965e2f7..971fbf82bf 100644
--- a/Code/Visu/otbHistogramAndTransferFunctionWidget.h
+++ b/Code/Visu/otbHistogramAndTransferFunctionWidget.h
@@ -24,7 +24,6 @@
#include "FL/Fl_Gl_Window.H"
#include "otbMacro.h"
-
namespace otb
{
/** \class HistogramAndTransferFunctionWidget
@@ -36,38 +35,37 @@ namespace otb
*/
template <class THistogram, class TPixel>
class ITK_EXPORT HistogramAndTransferFunctionWidget
- : public Fl_Gl_Window, public itk::ProcessObject
+ : public Fl_Gl_Window, public itk::ProcessObject
{
public:
/** Standard typedefs */
typedef HistogramAndTransferFunctionWidget Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(HistogramAndTransferFunctionWidget,ProcessObject);
+ itkTypeMacro(HistogramAndTransferFunctionWidget, ProcessObject);
/** Template parameters typedefs */
- typedef TPixel PixelType;
- typedef THistogram HistogramType;
- typedef typename HistogramType::ValueType HistogramValueType;
+ typedef TPixel PixelType;
+ typedef THistogram HistogramType;
+ typedef typename HistogramType::ValueType HistogramValueType;
typedef typename HistogramValueType::ValueType ValueType;
- typedef typename HistogramType::ConstPointer HistogramConstPointerType;
- typedef typename HistogramType::ConstIterator HistogramIteratorType;
- typedef itk::FixedArray<double,3> ColorType;
+ typedef typename HistogramType::ConstPointer HistogramConstPointerType;
+ typedef typename HistogramType::ConstIterator HistogramIteratorType;
+ typedef itk::FixedArray<double, 3> ColorType;
- typedef otb::ImageWidgetTransferFunction<PixelType> TransferFunctionType;
- typedef typename TransferFunctionType::Pointer TransferFunctionPointerType;
+ typedef otb::ImageWidgetTransferFunction<PixelType> TransferFunctionType;
+ typedef typename TransferFunctionType::Pointer TransferFunctionPointerType;
typedef otb::ImageWidgetAffineTransferFunction<PixelType> AffineTransferFunctionType;
-
- itkSetMacro(Histogram,HistogramConstPointerType);
- itkGetMacro(Histogram,HistogramConstPointerType);
- itkGetMacro(TransferFunction,TransferFunctionPointerType);
+ itkSetMacro(Histogram, HistogramConstPointerType);
+ itkGetMacro(Histogram, HistogramConstPointerType);
+ itkGetMacro(TransferFunction, TransferFunctionPointerType);
virtual void SetTransferFunction(TransferFunctionType * function)
{
@@ -75,39 +73,39 @@ public:
this->Modified();
}
- itkSetMacro(HistogramColor,ColorType);
- itkGetMacro(HistogramColor,ColorType);
- itkSetMacro(BackgroundColor,ColorType);
- itkGetMacro(BackgroundColor,ColorType);
- itkSetMacro(AxisColor,ColorType);
- itkGetMacro(AxisColor,ColorType);
- itkSetMacro(TextColor,ColorType);
- itkGetMacro(TextColor,ColorType);
- itkSetMacro(TransferFunctionColor,ColorType);
- itkGetMacro(TransferFunctionColor,ColorType);
-
- itkSetMacro(Label,std::string);
- itkGetMacro(Label,std::string);
- itkSetMacro(TransferFunctionLabel,std::string);
- itkGetMacro(TransferFunctionLabel,std::string);
-
- itkSetMacro(MarginX,double);
- itkGetMacro(MarginX,double);
- itkSetMacro(MarginY,double);
- itkGetMacro(MarginY,double);
- itkSetMacro(OutputHistogramMargin,double);
- itkGetMacro(OutputHistogramMargin,double);
-
- itkSetMacro(GridSizeX,unsigned int);
- itkGetMacro(GridSizeX,unsigned int);
- itkSetMacro(GridSizeY,unsigned int);
- itkGetMacro(GridSizeY,unsigned int);
+ itkSetMacro(HistogramColor, ColorType);
+ itkGetMacro(HistogramColor, ColorType);
+ itkSetMacro(BackgroundColor, ColorType);
+ itkGetMacro(BackgroundColor, ColorType);
+ itkSetMacro(AxisColor, ColorType);
+ itkGetMacro(AxisColor, ColorType);
+ itkSetMacro(TextColor, ColorType);
+ itkGetMacro(TextColor, ColorType);
+ itkSetMacro(TransferFunctionColor, ColorType);
+ itkGetMacro(TransferFunctionColor, ColorType);
+
+ itkSetMacro(Label, std::string);
+ itkGetMacro(Label, std::string);
+ itkSetMacro(TransferFunctionLabel, std::string);
+ itkGetMacro(TransferFunctionLabel, std::string);
+
+ itkSetMacro(MarginX, double);
+ itkGetMacro(MarginX, double);
+ itkSetMacro(MarginY, double);
+ itkGetMacro(MarginY, double);
+ itkSetMacro(OutputHistogramMargin, double);
+ itkGetMacro(OutputHistogramMargin, double);
+
+ itkSetMacro(GridSizeX, unsigned int);
+ itkGetMacro(GridSizeX, unsigned int);
+ itkSetMacro(GridSizeY, unsigned int);
+ itkGetMacro(GridSizeY, unsigned int);
protected:
/** Constructor */
HistogramAndTransferFunctionWidget();
/** Destructor */
- virtual ~HistogramAndTransferFunctionWidget() {};
+ virtual ~HistogramAndTransferFunctionWidget() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
@@ -133,8 +131,8 @@ protected:
virtual void TransferFunctionLabelRendering(void);
private:
- HistogramAndTransferFunctionWidget(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ HistogramAndTransferFunctionWidget(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** The histogram to draw */
HistogramConstPointerType m_Histogram;
@@ -158,7 +156,7 @@ private:
unsigned int m_GridSizeX;
unsigned int m_GridSizeY;
/** Percentage of the max frequency beeing thresholded */
- double m_HistogramClamping;
+ double m_HistogramClamping;
/** Updating flag */
bool m_Updating;
/** Label of the histogram */
@@ -167,7 +165,7 @@ private:
std::string m_TransferFunctionLabel;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbHistogramAndTransferFunctionWidget.txx"
#endif
diff --git a/Code/Visu/otbHistogramAndTransferFunctionWidget.txx b/Code/Visu/otbHistogramAndTransferFunctionWidget.txx
index 54c409a518..0643952049 100644
--- a/Code/Visu/otbHistogramAndTransferFunctionWidget.txx
+++ b/Code/Visu/otbHistogramAndTransferFunctionWidget.txx
@@ -26,60 +26,59 @@ namespace otb
{
template <class THistogram, class TPixel>
-HistogramAndTransferFunctionWidget<THistogram,TPixel>
+HistogramAndTransferFunctionWidget<THistogram, TPixel>
::HistogramAndTransferFunctionWidget()
- : Fl_Gl_Window(0,0,0,0,0)
+ : Fl_Gl_Window(0, 0, 0, 0, 0)
{
m_Label = "Default label";
m_TransferFunctionLabel = "Function label";
- m_HistogramColor[0]=0.5;
- m_HistogramColor[1]=0.5;
- m_HistogramColor[2]=0.5;
- m_BackgroundColor[0]=1;
- m_BackgroundColor[1]=1;
- m_BackgroundColor[2]=1;
- m_AxisColor[0]=0;
- m_AxisColor[1]=0;
- m_AxisColor[2]=0;
- m_TextColor[0]=0;
- m_TextColor[1]=0;
- m_TextColor[2]=0;
- m_GridColor[0]=0.75;
- m_GridColor[1]=0.75;
- m_GridColor[2]=0.75;
- m_TransferFunctionColor[0]=1;
- m_TransferFunctionColor[1]=0;
- m_TransferFunctionColor[2]=0;
- m_BoundColor[0]=0;
- m_BoundColor[1]=1;
- m_BoundColor[2]=0;
+ m_HistogramColor[0] = 0.5;
+ m_HistogramColor[1] = 0.5;
+ m_HistogramColor[2] = 0.5;
+ m_BackgroundColor[0] = 1;
+ m_BackgroundColor[1] = 1;
+ m_BackgroundColor[2] = 1;
+ m_AxisColor[0] = 0;
+ m_AxisColor[1] = 0;
+ m_AxisColor[2] = 0;
+ m_TextColor[0] = 0;
+ m_TextColor[1] = 0;
+ m_TextColor[2] = 0;
+ m_GridColor[0] = 0.75;
+ m_GridColor[1] = 0.75;
+ m_GridColor[2] = 0.75;
+ m_TransferFunctionColor[0] = 1;
+ m_TransferFunctionColor[1] = 0;
+ m_TransferFunctionColor[2] = 0;
+ m_BoundColor[0] = 0;
+ m_BoundColor[1] = 1;
+ m_BoundColor[2] = 0;
m_TransferFunction = NULL;
m_Histogram = NULL;
m_MarginX = 30;
m_MarginY = 30;
- m_GridSizeX=5;
- m_GridSizeY=5;
+ m_GridSizeX = 5;
+ m_GridSizeY = 5;
m_OutputHistogramMargin = 0.2;
m_HistogramClamping = 1;
m_Updating = false;
}
-
template <class THistogram, class TPixel>
void
-HistogramAndTransferFunctionWidget<THistogram,TPixel>
+HistogramAndTransferFunctionWidget<THistogram, TPixel>
::OpenGlSetup()
{
if (!this->valid())
- {
+ {
valid(1);
glLoadIdentity();
- glViewport(0,0,w(),h());
+ glViewport(0, 0, w(), h());
glClearColor(m_BackgroundColor[0],
m_BackgroundColor[1],
m_BackgroundColor[2],
1);
- }
+ }
glShadeModel(GL_FLAT);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glClear(GL_COLOR_BUFFER_BIT); //this clears and paints to black
@@ -92,301 +91,314 @@ HistogramAndTransferFunctionWidget<THistogram,TPixel>
template <class THistogram, class TPixel>
void
-HistogramAndTransferFunctionWidget<THistogram,TPixel>
+HistogramAndTransferFunctionWidget<THistogram, TPixel>
::GridRendering(double gridXSpacing, double gridYSpacing)
{
- double x,y;
+ double x, y;
// Rendering grid
glBegin(GL_LINES);
- glColor3d(m_GridColor[0],m_GridColor[1],m_GridColor[2]);
- for (unsigned int i=1;i<m_GridSizeX;++i)
- {
- x=static_cast<double>(i)*gridXSpacing+m_MarginX;
- y=m_MarginY;
- glVertex2d(x,y);
- y = static_cast<double>(this->h())-m_MarginY;
- glVertex2d(x,y);
- }
-
- for (unsigned int i=1;i<m_GridSizeY;++i)
- {
- y=static_cast<double>(i)*gridYSpacing+m_MarginY;
- x=m_MarginX;
- glVertex2d(x,y);
- x = static_cast<double>(this->w())-m_MarginX-m_OutputHistogramMargin*static_cast<double>(this->w());
- glVertex2d(x,y);
- }
+ glColor3d(m_GridColor[0], m_GridColor[1], m_GridColor[2]);
+ for (unsigned int i = 1; i < m_GridSizeX; ++i)
+ {
+ x = static_cast<double>(i) * gridXSpacing + m_MarginX;
+ y = m_MarginY;
+ glVertex2d(x, y);
+ y = static_cast<double>(this->h()) - m_MarginY;
+ glVertex2d(x, y);
+ }
+
+ for (unsigned int i = 1; i < m_GridSizeY; ++i)
+ {
+ y = static_cast<double>(i) * gridYSpacing + m_MarginY;
+ x = m_MarginX;
+ glVertex2d(x, y);
+ x = static_cast<double>(this->w()) - m_MarginX - m_OutputHistogramMargin*static_cast<double>(this->w());
+ glVertex2d(x, y);
+ }
glEnd();
}
template <class THistogram, class TPixel>
void
-HistogramAndTransferFunctionWidget<THistogram,TPixel>
+HistogramAndTransferFunctionWidget<THistogram, TPixel>
::AxisRendering(void)
{
glBegin(GL_LINES);
- glColor3d(m_AxisColor[0],m_AxisColor[1],m_AxisColor[2]);
- glVertex2d(m_MarginX,m_MarginY);
- glVertex2d(m_MarginX,static_cast<double>(this->h())-m_MarginY/2);
- glVertex2d(m_MarginX,m_MarginY);
- glVertex2d(static_cast<double>(this->w())-m_MarginX/2-m_OutputHistogramMargin*static_cast<double>(this->w()),m_MarginY);
+ glColor3d(m_AxisColor[0], m_AxisColor[1], m_AxisColor[2]);
+ glVertex2d(m_MarginX, m_MarginY);
+ glVertex2d(m_MarginX, static_cast<double>(this->h()) - m_MarginY / 2);
+ glVertex2d(m_MarginX, m_MarginY);
+ glVertex2d(static_cast<double>(this->w()) - m_MarginX / 2 - m_OutputHistogramMargin * static_cast<double>(
+ this->w()), m_MarginY);
glEnd();
}
template <class THistogram, class TPixel>
void
-HistogramAndTransferFunctionWidget<THistogram,TPixel>
+HistogramAndTransferFunctionWidget<THistogram, TPixel>
::HistogramRendering(double binWidth, double binHeightRatio, double maxFrequency)
{
HistogramIteratorType it;
- double startx = m_MarginX;
+ double startx = m_MarginX;
// Temporary vertex coordinates
- double x,y;
+ double x, y;
// Rendering histogram
- for (it=m_Histogram->Begin();it!=m_Histogram->End();++it,startx+=binWidth)
- {
+ for (it = m_Histogram->Begin(); it != m_Histogram->End(); ++it, startx += binWidth)
+ {
glBegin(GL_POLYGON);
- glColor3d(m_HistogramColor[0],m_HistogramColor[1],m_HistogramColor[2]);
+ glColor3d(m_HistogramColor[0], m_HistogramColor[1], m_HistogramColor[2]);
- x =startx;
+ x = startx;
y = m_MarginY;
- glVertex2d(x,y);
- y += binHeightRatio*static_cast<double>((it.GetFrequency()>maxFrequency/m_HistogramClamping ? maxFrequency/m_HistogramClamping : it.GetFrequency()));
- glVertex2d(x,y);
+ glVertex2d(x, y);
+ y += binHeightRatio *
+ static_cast<double>((it.GetFrequency() > maxFrequency / m_HistogramClamping ? maxFrequency /
+ m_HistogramClamping : it.GetFrequency()));
+ glVertex2d(x, y);
x += binWidth;
- glVertex2d(x,y);
- y=m_MarginY;
- glVertex2d(x,y);
+ glVertex2d(x, y);
+ y = m_MarginY;
+ glVertex2d(x, y);
glEnd();
- }
+ }
}
template <class THistogram, class TPixel>
void
-HistogramAndTransferFunctionWidget<THistogram,TPixel>
+HistogramAndTransferFunctionWidget<THistogram, TPixel>
::BoundRendering(void)
{
- double x,y;
+ double x, y;
// Rendering bounds
- glColor3d(m_BoundColor[0],m_BoundColor[1],m_BoundColor[2]);
+ glColor3d(m_BoundColor[0], m_BoundColor[1], m_BoundColor[2]);
glBegin(GL_LINES);
- double factor = (m_Histogram->Quantile(0,1.)-m_Histogram->Quantile(0,0.))
- /(static_cast<double>(this->w())-2*m_MarginX-m_OutputHistogramMargin*static_cast<double>(this->w()));
+ double factor = (m_Histogram->Quantile(0, 1.) - m_Histogram->Quantile(0, 0.))
+ / (static_cast<double>(this->w()) - 2 * m_MarginX - m_OutputHistogramMargin *
+ static_cast<double>(this->w()));
- x = m_MarginX + static_cast<double>(m_TransferFunction->GetLowerBound()-m_Histogram->Quantile(0,0.))/factor;
+ x = m_MarginX + static_cast<double>(m_TransferFunction->GetLowerBound() - m_Histogram->Quantile(0, 0.)) / factor;
y = m_MarginY;
- glVertex2d(x,y);
- y = static_cast<double>(this->h())-m_MarginY;
- glVertex2d(x,y);
- x = m_MarginX + static_cast<double>(m_TransferFunction->GetUpperBound()-m_Histogram->Quantile(0,0.))/factor;
- glVertex2d(x,y);
- y= m_MarginY;
- glVertex2d(x,y);
+ glVertex2d(x, y);
+ y = static_cast<double>(this->h()) - m_MarginY;
+ glVertex2d(x, y);
+ x = m_MarginX + static_cast<double>(m_TransferFunction->GetUpperBound() - m_Histogram->Quantile(0, 0.)) / factor;
+ glVertex2d(x, y);
+ y = m_MarginY;
+ glVertex2d(x, y);
glEnd();
}
-
template <class THistogram, class TPixel>
void
-HistogramAndTransferFunctionWidget<THistogram,TPixel>
+HistogramAndTransferFunctionWidget<THistogram, TPixel>
::LegendRendering(double gridXSpacing, double gridYSpacing, double maxFrequency)
{
- double x,y;
+ double x, y;
// rendering axis values
itk::OStringStream oss;
- glColor3d(m_TextColor[0],m_TextColor[1],m_TextColor[2]);
- gl_font(FL_COURIER_BOLD,10);
- double step = (m_Histogram->Quantile(0,1.)-m_Histogram->Quantile(0,0.))
- /static_cast<double>(m_GridSizeX);
- for (unsigned int i=0;i<m_GridSizeX;++i)
- {
- ValueType value = static_cast<ValueType>(m_Histogram->Quantile(0,0.)
- +static_cast<double>(i)*step);
+ glColor3d(m_TextColor[0], m_TextColor[1], m_TextColor[2]);
+ gl_font(FL_COURIER_BOLD, 10);
+ double step = (m_Histogram->Quantile(0, 1.) - m_Histogram->Quantile(0, 0.))
+ / static_cast<double>(m_GridSizeX);
+ for (unsigned int i = 0; i < m_GridSizeX; ++i)
+ {
+ ValueType value = static_cast<ValueType>(m_Histogram->Quantile(0, 0.)
+ + static_cast<double>(i) * step);
// oss<<(int)value;
- oss<<value;
- x=static_cast<double>(i)*gridXSpacing+m_MarginX;
- y=m_MarginY/2;
- gl_draw(oss.str().c_str(),(float)x,(float)y);
+ oss << value;
+ x = static_cast<double>(i) * gridXSpacing + m_MarginX;
+ y = m_MarginY / 2;
+ gl_draw(oss.str().c_str(), (float) x, (float) y);
oss.str("");
- }
- for (unsigned int i=0;i<m_GridSizeY;++i)
- {
+ }
+ for (unsigned int i = 0; i < m_GridSizeY; ++i)
+ {
unsigned int value = static_cast<unsigned int>(i
- *maxFrequency/(m_HistogramClamping*static_cast<double>(m_GridSizeY)));
- oss<<value;
- y=static_cast<double>(i)*gridYSpacing+m_MarginY;
- x=0;
- gl_draw(oss.str().c_str(),(float)x,(float)y);
+ * maxFrequency /
+ (m_HistogramClamping * static_cast<double>(m_GridSizeY)));
+ oss << value;
+ y = static_cast<double>(i) * gridYSpacing + m_MarginY;
+ x = 0;
+ gl_draw(oss.str().c_str(), (float) x, (float) y);
oss.str("");
- }
+ }
//rendering label
- gl_font(FL_COURIER_BOLD,12);
- gl_draw(m_Label.c_str(),static_cast<float>(3*this->w())/8,static_cast<float>(static_cast<double>(this->h())-m_MarginY/2));
+ gl_font(FL_COURIER_BOLD, 12);
+ gl_draw(m_Label.c_str(), static_cast<float>(3 * this->w()) / 8,
+ static_cast<float>(static_cast<double>(this->h()) - m_MarginY / 2));
}
template <class THistogram, class TPixel>
void
-HistogramAndTransferFunctionWidget<THistogram,TPixel>
+HistogramAndTransferFunctionWidget<THistogram, TPixel>
::TransferFunctionRendering()
{
- glColor3d(m_TransferFunctionColor[0],m_TransferFunctionColor[1],m_TransferFunctionColor[2]);
+ glColor3d(m_TransferFunctionColor[0], m_TransferFunctionColor[1], m_TransferFunctionColor[2]);
glBegin(GL_LINE_STRIP);
- double x,y;
- double step = (m_Histogram->Quantile(0,1.)-m_Histogram->Quantile(0,0.))
- /static_cast<double>(m_Histogram->GetSize()[0]);
- double xscale = (static_cast<double>(this->w())-2*m_MarginX-m_OutputHistogramMargin*static_cast<double>(this->w()))/static_cast<double>(m_Histogram->GetSize()[0]);
- double yscale = (static_cast<double>(this->h())-2*m_MarginY)/255.;
- for (unsigned int i=0;i<m_Histogram->Size()+1;++i)
- {
- PixelType value = static_cast<PixelType>(m_Histogram->Quantile(0,0.)
- +static_cast<double>(i)*step);
-
- x = m_MarginX + static_cast<double>(i)*xscale;
+ double x, y;
+ double step = (m_Histogram->Quantile(0, 1.) - m_Histogram->Quantile(0, 0.))
+ / static_cast<double>(m_Histogram->GetSize()[0]);
+ double xscale =
+ (static_cast<double>(this->w()) - 2 * m_MarginX - m_OutputHistogramMargin *
+ static_cast<double>(this->w())) / static_cast<double>(m_Histogram->GetSize()[0]);
+ double yscale = (static_cast<double>(this->h()) - 2 * m_MarginY) / 255.;
+ for (unsigned int i = 0; i < m_Histogram->Size() + 1; ++i)
+ {
+ PixelType value = static_cast<PixelType>(m_Histogram->Quantile(0, 0.)
+ + static_cast<double>(i) * step);
+
+ x = m_MarginX + static_cast<double>(i) * xscale;
y = m_MarginY + yscale * static_cast<double>(m_TransferFunction->Map(value));
- glVertex2d(x,y);
- }
+ glVertex2d(x, y);
+ }
glEnd();
}
template <class THistogram, class TPixel>
void
-HistogramAndTransferFunctionWidget<THistogram,TPixel>
+HistogramAndTransferFunctionWidget<THistogram, TPixel>
::OutputHistogramRendering()
{
- std::vector<unsigned int> outputHistogram(256,0);
+ std::vector<unsigned int> outputHistogram(256, 0);
HistogramIteratorType it;
- for (it=m_Histogram->Begin();it!=m_Histogram->End();++it)
- {
- outputHistogram[m_TransferFunction->Map(static_cast<PixelType>(it.GetMeasurementVector()[0]))]+=static_cast<unsigned int>(it.GetFrequency());
- }
+ for (it = m_Histogram->Begin(); it != m_Histogram->End(); ++it)
+ {
+ outputHistogram[m_TransferFunction->Map(static_cast < PixelType >
+ (it.GetMeasurementVector()[0]))] += static_cast<unsigned int>(
+ it.GetFrequency());
+ }
// Setting the extremity to 0 to avoid sides effect
- outputHistogram[0]=0;
- outputHistogram[255]=0;
+ outputHistogram[0] = 0;
+ outputHistogram[255] = 0;
std::vector<unsigned int>::iterator vit;
- unsigned int maxFrequency = 0;
- for (vit=outputHistogram.begin();vit!=outputHistogram.end();++vit)
- {
- if (maxFrequency<(*vit))
+ unsigned int maxFrequency = 0;
+ for (vit = outputHistogram.begin(); vit != outputHistogram.end(); ++vit)
{
- maxFrequency=(*vit);
+ if (maxFrequency < (*vit))
+ {
+ maxFrequency = (*vit);
+ }
}
- }
// Temporary vertex coordinates
- double x,y;
- if (maxFrequency>0)
- {
- double binWidth = (static_cast<double>(this->h())-2*m_MarginY)/255.;
- double binLengthRatio = m_HistogramClamping*m_OutputHistogramMargin*static_cast<double>(this->w())/static_cast<double>(maxFrequency);
+ double x, y;
+ if (maxFrequency > 0)
+ {
+ double binWidth = (static_cast<double>(this->h()) - 2 * m_MarginY) / 255.;
+ double binLengthRatio = m_HistogramClamping * m_OutputHistogramMargin * static_cast<double>(this->w()) /
+ static_cast<double>(maxFrequency);
double starty = m_MarginY;
-
// Rendering histogram
- for (vit=outputHistogram.begin();vit!=outputHistogram.end();++vit,starty+=binWidth)
- {
+ for (vit = outputHistogram.begin(); vit != outputHistogram.end(); ++vit, starty += binWidth)
+ {
glBegin(GL_POLYGON);
- glColor3d(m_TransferFunctionColor[0],m_TransferFunctionColor[1],m_TransferFunctionColor[2]);
+ glColor3d(m_TransferFunctionColor[0], m_TransferFunctionColor[1], m_TransferFunctionColor[2]);
- x =static_cast<double>(this->w())-m_OutputHistogramMargin*static_cast<double>(this->w())-m_MarginX/2;
+ x = static_cast<double>(this->w()) - m_OutputHistogramMargin*static_cast<double>(this->w()) - m_MarginX / 2;
y = starty;
- glVertex2d(x,y);
- x += binLengthRatio*static_cast<double>((*vit)> maxFrequency/m_HistogramClamping ? maxFrequency/m_HistogramClamping : (*vit));
- glVertex2d(x,y);
+ glVertex2d(x, y);
+ x += binLengthRatio * static_cast<double>(
+ (*vit) > maxFrequency / m_HistogramClamping ? maxFrequency / m_HistogramClamping : (*vit));
+ glVertex2d(x, y);
y += binWidth;
- glVertex2d(x,y);
- x =static_cast<double>(this->w())-m_OutputHistogramMargin*static_cast<double>(this->w())-m_MarginX/2;
- glVertex2d(x,y);
+ glVertex2d(x, y);
+ x = static_cast<double>(this->w()) - m_OutputHistogramMargin*static_cast<double>(this->w()) - m_MarginX / 2;
+ glVertex2d(x, y);
glEnd();
+ }
}
- }
glBegin(GL_LINE_LOOP);
- x = static_cast<double>(this->w())-m_OutputHistogramMargin*static_cast<double>(this->w())-m_MarginX/2;
+ x = static_cast<double>(this->w()) - m_OutputHistogramMargin*static_cast<double>(this->w()) - m_MarginX / 2;
y = m_MarginY;
- glVertex2d(x,y);
- x+=m_OutputHistogramMargin*static_cast<double>(this->w());
- glVertex2d(x,y);
- y = static_cast<double>(this->h())-m_MarginY;
- glVertex2d(x,y);
- x = static_cast<double>(this->w())-m_OutputHistogramMargin*static_cast<double>(this->w())-m_MarginX/2;
- glVertex2d(x,y);
+ glVertex2d(x, y);
+ x += m_OutputHistogramMargin * static_cast<double>(this->w());
+ glVertex2d(x, y);
+ y = static_cast<double>(this->h()) - m_MarginY;
+ glVertex2d(x, y);
+ x = static_cast<double>(this->w()) - m_OutputHistogramMargin*static_cast<double>(this->w()) - m_MarginX / 2;
+ glVertex2d(x, y);
glEnd();
}
-
template <class THistogram, class TPixel>
void
-HistogramAndTransferFunctionWidget<THistogram,TPixel>
+HistogramAndTransferFunctionWidget<THistogram, TPixel>
::TransferFunctionLabelRendering(void)
{
//rendering label
- gl_font(FL_COURIER_BOLD,12);
- gl_draw(m_TransferFunctionLabel.c_str(),static_cast<float>(this->w()-m_MarginX/2-m_OutputHistogramMargin*static_cast<double>(this->w())),static_cast<float>(m_MarginY/2));
+ gl_font(FL_COURIER_BOLD, 12);
+ gl_draw(m_TransferFunctionLabel.c_str(),
+ static_cast<float>(this->w() - m_MarginX / 2 - m_OutputHistogramMargin * static_cast<double>(
+ this->w())), static_cast<float>(m_MarginY / 2));
}
-
template <class THistogram, class TPixel>
void
-HistogramAndTransferFunctionWidget<THistogram,TPixel>
+HistogramAndTransferFunctionWidget<THistogram, TPixel>
::draw()
{
if (!m_Histogram)
- {
+ {
return;
- }
+ }
- if (m_Updating)
- return;
+ if (m_Updating) return;
m_Updating = true;
- double maxFrequency = 0;
+ double maxFrequency = 0;
HistogramIteratorType it;
// Computing histogram max frequency
- for (it=m_Histogram->Begin();it!=m_Histogram->End();++it)
- {
- if (it.GetFrequency()>maxFrequency)
+ for (it = m_Histogram->Begin(); it != m_Histogram->End(); ++it)
{
+ if (it.GetFrequency() > maxFrequency)
+ {
maxFrequency = it.GetFrequency();
+ }
}
- }
- double binWidth = static_cast<double>(this->w()-2*m_MarginX-m_OutputHistogramMargin*static_cast<double>(this->w()))/static_cast<double>(m_Histogram->GetSize()[0]);
- double binHeightRatio = m_HistogramClamping*static_cast<double>(this->h()-2*m_MarginY)/static_cast<double>(maxFrequency);
- double gridXSpacing = (static_cast<double>(this->w())-2*m_MarginX-m_OutputHistogramMargin*static_cast<double>(this->w()))/static_cast<double>(m_GridSizeX);
- double gridYSpacing = (static_cast<double>(this->h())-2*m_MarginY)/static_cast<double>(m_GridSizeY);
+ double binWidth =
+ static_cast<double>(this->w() - 2 * m_MarginX - m_OutputHistogramMargin *
+ static_cast<double>(this->w())) / static_cast<double>(m_Histogram->GetSize()[0]);
+ double binHeightRatio = m_HistogramClamping * static_cast<double>(this->h() - 2 * m_MarginY) / static_cast<double>(
+ maxFrequency);
+ double gridXSpacing =
+ (static_cast<double>(this->w()) - 2 * m_MarginX - m_OutputHistogramMargin *
+ static_cast<double>(this->w())) / static_cast<double>(m_GridSizeX);
+ double gridYSpacing = (static_cast<double>(this->h()) - 2 * m_MarginY) / static_cast<double>(m_GridSizeY);
OpenGlSetup();
- GridRendering(gridXSpacing,gridYSpacing);
+ GridRendering(gridXSpacing, gridYSpacing);
AxisRendering();
- HistogramRendering(binWidth,binHeightRatio,maxFrequency);
- LegendRendering(gridXSpacing,gridYSpacing,maxFrequency);
-
+ HistogramRendering(binWidth, binHeightRatio, maxFrequency);
+ LegendRendering(gridXSpacing, gridYSpacing, maxFrequency);
if (m_TransferFunction)
- {
+ {
BoundRendering();
TransferFunctionRendering();
OutputHistogramRendering();
TransferFunctionLabelRendering();
- }
+ }
m_Updating = false;
}
template <class THistogram, class TPixel>
void
-HistogramAndTransferFunctionWidget<THistogram,TPixel>
+HistogramAndTransferFunctionWidget<THistogram, TPixel>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
}
#endif
diff --git a/Code/Visu/otbImageAlternateViewer.h b/Code/Visu/otbImageAlternateViewer.h
index c644e93d0a..377ee83a90 100644
--- a/Code/Visu/otbImageAlternateViewer.h
+++ b/Code/Visu/otbImageAlternateViewer.h
@@ -30,7 +30,6 @@
#include <FL/gl.h>
#include "itkImageRegionSplitter.h"
-
namespace otb
{
/** \class ImageAlternateViewer
@@ -42,82 +41,81 @@ namespace otb
*/
template <class TPixel>
class ITK_EXPORT ImageAlternateViewer
- : public Fl_Gl_Window, public itk::Object
+ : public Fl_Gl_Window, public itk::Object
{
public:
/** Standard typedefs */
- typedef ImageAlternateViewer Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageAlternateViewer Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(ImageAlternateViewer,Object);
+ itkTypeMacro(ImageAlternateViewer, Object);
/** Template related typedef */
- typedef TPixel PixelType;
- typedef otb::VectorImage<PixelType,2> ImageType;
- typedef otb::Image<PixelType,2> SingleImageType;
- typedef typename ImageType::PixelType VectorPixelType;
- typedef typename ImageType::Pointer ImagePointerType;
- typedef typename ImageType::SizeType SizeType;
- typedef typename ImageType::IndexType IndexType;
- typedef typename ImageType::RegionType RegionType;
+ typedef TPixel PixelType;
+ typedef otb::VectorImage<PixelType, 2> ImageType;
+ typedef otb::Image<PixelType, 2> SingleImageType;
+ typedef typename ImageType::PixelType VectorPixelType;
+ typedef typename ImageType::Pointer ImagePointerType;
+ typedef typename ImageType::SizeType SizeType;
+ typedef typename ImageType::IndexType IndexType;
+ typedef typename ImageType::RegionType RegionType;
typedef typename ImageType::SpacingType SpacingType;
- typedef typename ImageType::PointType PointType;
+ typedef typename ImageType::PointType PointType;
- typedef otb::ImageList<SingleImageType> ImageListType;
- typedef otb::VectorImageToImageListFilter<ImageType,ImageListType> VectorImageDecompositionFilterType;
- typedef typename VectorImageDecompositionFilterType::Pointer VectorImageDecompositionFilterPointerType;
+ typedef otb::ImageList<SingleImageType> ImageListType;
+ typedef otb::VectorImageToImageListFilter<ImageType, ImageListType> VectorImageDecompositionFilterType;
+ typedef typename VectorImageDecompositionFilterType::Pointer VectorImageDecompositionFilterPointerType;
- typedef itk::InterpolateImageFunction<SingleImageType,double> InterpolatorType;
- typedef typename InterpolatorType::Pointer InterpolatorPointerType;
- typedef itk::LinearInterpolateImageFunction<SingleImageType,double> DefaultInterpolatorType;
+ typedef itk::InterpolateImageFunction<SingleImageType, double> InterpolatorType;
+ typedef typename InterpolatorType::Pointer InterpolatorPointerType;
+ typedef itk::LinearInterpolateImageFunction<SingleImageType, double> DefaultInterpolatorType;
- typedef itk::ImageRegionSplitter<2> SplitterType;
+ typedef itk::ImageRegionSplitter<2> SplitterType;
typedef typename SplitterType::Pointer SplitterPointerType;
- itkSetMacro(RedChannelIndex,unsigned int);
- itkGetMacro(RedChannelIndex,unsigned int);
-
- itkSetMacro(GreenChannelIndex,unsigned int);
- itkGetMacro(GreenChannelIndex,unsigned int);
+ itkSetMacro(RedChannelIndex, unsigned int);
+ itkGetMacro(RedChannelIndex, unsigned int);
- itkSetMacro(BlueChannelIndex,unsigned int);
- itkGetMacro(BlueChannelIndex,unsigned int);
+ itkSetMacro(GreenChannelIndex, unsigned int);
+ itkGetMacro(GreenChannelIndex, unsigned int);
- itkSetMacro(MaxComponentValues,VectorPixelType);
- itkGetMacro(MaxComponentValues,VectorPixelType);
+ itkSetMacro(BlueChannelIndex, unsigned int);
+ itkGetMacro(BlueChannelIndex, unsigned int);
- itkSetMacro(MinComponentValues,VectorPixelType);
- itkGetMacro(MinComponentValues,VectorPixelType);
+ itkSetMacro(MaxComponentValues, VectorPixelType);
+ itkGetMacro(MaxComponentValues, VectorPixelType);
- itkSetMacro(SpacingZoomFactor,double);
- itkGetMacro(SpacingZoomFactor,double);
+ itkSetMacro(MinComponentValues, VectorPixelType);
+ itkGetMacro(MinComponentValues, VectorPixelType);
- itkSetMacro(OpenGlIsotropicZoom,double);
- itkGetMacro(OpenGlIsotropicZoom,double);
+ itkSetMacro(SpacingZoomFactor, double);
+ itkGetMacro(SpacingZoomFactor, double);
- void SetViewedRegionCenter(const IndexType & index);
- itkGetMacro(ViewedRegionCenter,IndexType);
+ itkSetMacro(OpenGlIsotropicZoom, double);
+ itkGetMacro(OpenGlIsotropicZoom, double);
- itkSetObjectMacro(Image,ImageType);
- itkGetObjectMacro(Image,ImageType);
+ void SetViewedRegionCenter(const IndexType& index);
+ itkGetMacro(ViewedRegionCenter, IndexType);
- itkSetObjectMacro(SecondImage,ImageType);
- itkGetObjectMacro(SecondImage,ImageType);
+ itkSetObjectMacro(Image, ImageType);
+ itkGetObjectMacro(Image, ImageType);
+ itkSetObjectMacro(SecondImage, ImageType);
+ itkGetObjectMacro(SecondImage, ImageType);
- itkSetMacro(DisplayExtent,RegionType);
- itkGetMacro(DisplayExtent,RegionType);
+ itkSetMacro(DisplayExtent, RegionType);
+ itkGetMacro(DisplayExtent, RegionType);
- itkGetObjectMacro(ZoomInInterpolator,InterpolatorType);
- itkSetObjectMacro(ZoomInInterpolator,InterpolatorType);
- itkGetObjectMacro(ZoomOutInterpolator,InterpolatorType);
- itkSetObjectMacro(ZoomOutInterpolator,InterpolatorType);
+ itkGetObjectMacro(ZoomInInterpolator, InterpolatorType);
+ itkSetObjectMacro(ZoomInInterpolator, InterpolatorType);
+ itkGetObjectMacro(ZoomOutInterpolator, InterpolatorType);
+ itkSetObjectMacro(ZoomOutInterpolator, InterpolatorType);
/**
* Set view mode to RGB.
@@ -161,7 +159,7 @@ protected:
virtual void draw(void);
/** Partial draw routine */
- virtual void Draw(unsigned char * buffer,RegionType& region);
+ virtual void Draw(unsigned char * buffer, RegionType& region);
/** Reset opengl context */
virtual void ResetOpenGlContext(void);
@@ -172,12 +170,11 @@ protected:
/* /\** Rebuild opengl buffer *\/ */
/* virtual void RebuildOpenGlBuffer(void); */
-
virtual void IncrementalOpenGlBufferUpdate(void);
RegionType GetAdditionalBufferRegion(unsigned int i);
- unsigned char * CreateAdditionalBuffer(RegionType region,ImagePointerType image,bool rgb);
+ unsigned char * CreateAdditionalBuffer(RegionType region, ImagePointerType image, bool rgb);
virtual void MergeBuffersAndFreeMemory(std::vector<unsigned char *> bufferList,
std::vector<RegionType> bufferRegionList);
@@ -190,13 +187,13 @@ protected:
virtual long IndexInOldGrid(PointType point, PointType oldUpperLeft, SpacingType spacing, SizeType size);
- RegionType ComputeRequestedRegion(RegionType ®ion);
+ RegionType ComputeRequestedRegion(RegionType& region);
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
- ImageAlternateViewer(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageAlternateViewer(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Pointer to the viewed image */
ImagePointerType m_Image;
@@ -251,7 +248,7 @@ private:
RegionType m_OldBufferedRegion;
std::vector<unsigned char *> m_BufferList;
- std::vector<RegionType> m_BufferRegionList;
+ std::vector<RegionType> m_BufferRegionList;
/** Prevent messing around with simultaneous update */
bool m_Updating;
@@ -274,7 +271,7 @@ private:
bool m_SubWindowMove;
};
-}// End namespace otb
+} // End namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbImageAlternateViewer.txx"
#endif
diff --git a/Code/Visu/otbImageAlternateViewer.txx b/Code/Visu/otbImageAlternateViewer.txx
index dad87d27bd..32e9d7f545 100644
--- a/Code/Visu/otbImageAlternateViewer.txx
+++ b/Code/Visu/otbImageAlternateViewer.txx
@@ -33,13 +33,13 @@ namespace otb
template <class TPixel>
ImageAlternateViewer<TPixel>
::ImageAlternateViewer()
- : Fl_Gl_Window(0,0,0,0,0)
+ : Fl_Gl_Window(0, 0, 0, 0, 0)
{
m_Image = NULL;
m_OpenGlIsotropicZoom = 1.0;
m_OpenGlBuffer = NULL;
- m_ViewModelIsRGB=true;
- m_InsightViewModelIsRGB =true;
+ m_ViewModelIsRGB = true;
+ m_InsightViewModelIsRGB = true;
m_RedChannelIndex = 0;
m_GreenChannelIndex = 1;
m_BlueChannelIndex = 2;
@@ -52,10 +52,10 @@ ImageAlternateViewer<TPixel>
m_DecompositionFilter = VectorImageDecompositionFilterType::New();
typename DefaultInterpolatorType::Pointer defaultInterpolator = DefaultInterpolatorType::New();
- m_ZoomInInterpolator=defaultInterpolator;
+ m_ZoomInInterpolator = defaultInterpolator;
m_ZoomOutInterpolator = defaultInterpolator;
- m_SpacingZoomFactor=1;
+ m_SpacingZoomFactor = 1;
m_Updating = false;
m_Drag = false;
m_DragEventCounter = 0;
@@ -72,15 +72,15 @@ ImageAlternateViewer<TPixel>
::~ImageAlternateViewer()
{
if (m_OpenGlBuffer != NULL)
- {
- delete [] m_OpenGlBuffer;
- }
+ {
+ delete[] m_OpenGlBuffer;
+ }
}
template <class TPixel>
void
ImageAlternateViewer<TPixel>
-::SetViewedRegionCenter(const IndexType & index)
+::SetViewedRegionCenter(const IndexType& index)
{
m_OldViewedRegionCenter = m_ViewedRegionCenter;
m_ViewedRegionCenter = index;
@@ -95,39 +95,38 @@ ImageAlternateViewer<TPixel>
::Reset(void)
{
const char * label = this->label();
- Init(this->x(),this->y(),this->w(),this->h(),label);
+ Init(this->x(), this->y(), this->w(), this->h(), label);
}
-
template <class TPixel>
void
ImageAlternateViewer<TPixel>
::Init(int x, int y, int w, int h, const char * l)
{
IndexType index;
- SizeType size;
+ SizeType size;
- index[0]=0;
- index[1]=0;
- size[0]=w;
- size[1]=h;
+ index[0] = 0;
+ index[1] = 0;
+ size[0] = w;
+ size[1] = h;
SizeType nullSize;
nullSize.Fill(0);
m_RequestedRegion.SetSize(nullSize);
m_RequestedRegion.SetIndex(index);
- m_BufferedRegion=m_RequestedRegion;
- m_OldBufferedRegion=m_BufferedRegion;
+ m_BufferedRegion = m_RequestedRegion;
+ m_OldBufferedRegion = m_BufferedRegion;
RegionType newRegion;
m_DisplayExtent.SetIndex(index);
m_DisplayExtent.SetSize(size);
- m_OldDisplayExtent=m_DisplayExtent;
+ m_OldDisplayExtent = m_DisplayExtent;
- m_OldSpacingZoomFactor=m_SpacingZoomFactor;
+ m_OldSpacingZoomFactor = m_SpacingZoomFactor;
- m_Splitter=SplitterType::New();
+ m_Splitter = SplitterType::New();
m_SubWindowRegion.SetIndex(index);
m_SubWindowRegion.SetSize(nullSize);
@@ -141,16 +140,16 @@ ImageAlternateViewer<TPixel>
bandList->GetNthElement(m_RedChannelIndex)->SetRequestedRegion(m_RequestedRegion);
if (m_ViewModelIsRGB)
- {
+ {
bandList->GetNthElement(m_GreenChannelIndex)->SetRequestedRegion(m_RequestedRegion);
bandList->GetNthElement(m_BlueChannelIndex)->SetRequestedRegion(m_RequestedRegion);
- }
+ }
bandList->PropagateRequestedRegion();
if (!this->GetImage())
- {
+ {
itkExceptionMacro("No input image!");
- }
+ }
this->label(l);
this->resize(x,
y,
@@ -162,26 +161,23 @@ void
ImageAlternateViewer<TPixel>
::resize(int x, int y, int w, int h)
{
- if (m_Updating)
- return;
+ if (m_Updating) return;
// avoid odd sizes
- if (w%2==1)
- w+=1;
- if (h%2==1)
- h+=1;
+ if (w % 2 == 1) w += 1;
+ if (h % 2 == 1) h += 1;
IndexType index;
- SizeType size;
- m_OldDisplayExtent=m_DisplayExtent;
- index[0]=0;
- index[1]=0;
- size[0]=w;
- size[1]=h;
+ SizeType size;
+ m_OldDisplayExtent = m_DisplayExtent;
+ index[0] = 0;
+ index[1] = 0;
+ size[0] = w;
+ size[1] = h;
m_DisplayExtent.SetIndex(index);
m_DisplayExtent.SetSize(size);
- this->Fl_Gl_Window::resize(x,y,w,h);
+ this->Fl_Gl_Window::resize(x, y, w, h);
this->redraw();
}
/**
@@ -192,7 +188,7 @@ void
ImageAlternateViewer<TPixel>
::SetViewModelToRGB(void)
{
- m_ViewModelIsRGB=true;
+ m_ViewModelIsRGB = true;
}
/**
* Set view mode to Grayscale.
@@ -202,7 +198,7 @@ void
ImageAlternateViewer<TPixel>
::SetViewModelToGrayscale(void)
{
- m_ViewModelIsRGB=false;
+ m_ViewModelIsRGB = false;
}
/**
@@ -213,7 +209,7 @@ void
ImageAlternateViewer<TPixel>
::SetInsightViewModelToRGB(void)
{
- m_InsightViewModelIsRGB=true;
+ m_InsightViewModelIsRGB = true;
}
/**
* Set view mode to Grayscale.
@@ -223,7 +219,7 @@ void
ImageAlternateViewer<TPixel>
::SetInsightViewModelToGrayscale(void)
{
- m_InsightViewModelIsRGB=false;
+ m_InsightViewModelIsRGB = false;
}
/**
@@ -235,14 +231,14 @@ ImageAlternateViewer<TPixel>
::Show(void)
{
if (!m_Image)
- {
- itkExceptionMacro(<<"No input image !");
- }
+ {
+ itkExceptionMacro(<< "No input image !");
+ }
else
- {
+ {
this->show();
this->redraw();
- }
+ }
}
/**
@@ -254,61 +250,59 @@ ImageAlternateViewer<TPixel>
::draw(void)
{
if (!m_Updating)
- {
+ {
m_Updating = true;
IncrementalOpenGlBufferUpdate();
ResetOpenGlContext();
- this->Draw(m_OpenGlBuffer,m_BufferedRegion);
+ this->Draw(m_OpenGlBuffer, m_BufferedRegion);
if (!m_Drag)
- {
+ {
AdditionalRedraw();
- }
+ }
m_Updating = false;
- }
+ }
}
-
template <class TPixel>
void
ImageAlternateViewer<TPixel>
::AdditionalRedraw(void)
{
std::vector<unsigned char *> bufferList;
- std::vector<RegionType> bufferRegionList;
+ std::vector<RegionType> bufferRegionList;
- if (m_BufferedRegion!=m_DisplayExtent)
- {
- for (unsigned int i = 0;i<8;++i)
+ if (m_BufferedRegion != m_DisplayExtent)
{
- RegionType additionalBufferRegion = GetAdditionalBufferRegion(i);
- unsigned char * additionalBuffer = CreateAdditionalBuffer(additionalBufferRegion,m_Image,m_ViewModelIsRGB);
- this->Draw(additionalBuffer,additionalBufferRegion);
+ for (unsigned int i = 0; i < 8; ++i)
+ {
+ RegionType additionalBufferRegion = GetAdditionalBufferRegion(i);
+ unsigned char * additionalBuffer = CreateAdditionalBuffer(additionalBufferRegion, m_Image, m_ViewModelIsRGB);
+ this->Draw(additionalBuffer, additionalBufferRegion);
bufferList.push_back(additionalBuffer);
bufferRegionList.push_back(additionalBufferRegion);
- }
+ }
DecorationRedraw();
- MergeBuffersAndFreeMemory(bufferList,bufferRegionList);
- }
+ MergeBuffersAndFreeMemory(bufferList, bufferRegionList);
+ }
if (m_SubWindowMode)
- {
- unsigned char * subWindowBuffer = CreateAdditionalBuffer(m_SubWindowRegion,m_SecondImage,m_InsightViewModelIsRGB);
- this->Draw(subWindowBuffer,m_SubWindowRegion);
- delete [] subWindowBuffer;
- }
+ {
+ unsigned char * subWindowBuffer = CreateAdditionalBuffer(m_SubWindowRegion, m_SecondImage, m_InsightViewModelIsRGB);
+ this->Draw(subWindowBuffer, m_SubWindowRegion);
+ delete[] subWindowBuffer;
+ }
DecorationRedraw();
}
-
template <class TPixel>
void
ImageAlternateViewer<TPixel>
::DecorationRedraw(void)
{
if (m_SubWindowMode)
- {
+ {
this->DrawRegionBoundary(m_SubWindowRegion);
- }
+ }
swap_buffers();
glFlush();
}
@@ -318,210 +312,217 @@ long
ImageAlternateViewer<TPixel>
::IndexInOldGrid(PointType point, PointType oldUpperLeft, SpacingType spacing, SizeType size)
{
- long resp;
- double x = (point[0]-oldUpperLeft[0])/spacing[0];
- double y = (point[1]-oldUpperLeft[1])/spacing[1];
-
- if ((vcl_floor(x)!=x)||(vcl_floor(y)!=y))
- {
- resp=-1;
- }
- else if (x<0||x>size[0]||y<0||y>size[1])
- {
+ long resp;
+ double x = (point[0] - oldUpperLeft[0]) / spacing[0];
+ double y = (point[1] - oldUpperLeft[1]) / spacing[1];
+
+ if ((vcl_floor(x) != x) || (vcl_floor(y) != y))
+ {
resp = -1;
- }
+ }
+ else if (x < 0 || x > size[0] || y<0 || y> size[1])
+ {
+ resp = -1;
+ }
else
- {
- resp = 3*(static_cast<long>(y)*size[0]+static_cast<long>(x));
- }
+ {
+ resp = 3 * (static_cast<long>(y) * size[0] + static_cast<long>(x));
+ }
return resp;
}
-
template <class TPixel>
void
ImageAlternateViewer<TPixel>
::IncrementalOpenGlBufferUpdate()
{
IndexType focusOffset;
- focusOffset[0]=static_cast<long>(static_cast<double>(m_ViewedRegionCenter[0]-m_OldViewedRegionCenter[0])/m_SpacingZoomFactor);
- focusOffset[1]=static_cast<long>(static_cast<double>(m_ViewedRegionCenter[1]-m_OldViewedRegionCenter[1])/m_SpacingZoomFactor);
+ focusOffset[0] = static_cast<long>(static_cast<double>(
+ m_ViewedRegionCenter[0] - m_OldViewedRegionCenter[0]) / m_SpacingZoomFactor);
+ focusOffset[1] = static_cast<long>(static_cast<double>(
+ m_ViewedRegionCenter[1] - m_OldViewedRegionCenter[1]) / m_SpacingZoomFactor);
IndexType newBufferedRegionIndex;
SizeType newBufferedRegionSize;
- newBufferedRegionSize[0]=static_cast<unsigned long>(static_cast<double>((m_BufferedRegion.GetSize()[0])*m_OldSpacingZoomFactor/m_SpacingZoomFactor));
- newBufferedRegionSize[1]=static_cast<unsigned long>(static_cast<double>((m_BufferedRegion.GetSize()[1])*m_OldSpacingZoomFactor/m_SpacingZoomFactor));
+ newBufferedRegionSize[0] =
+ static_cast<unsigned long>(static_cast<double>((m_BufferedRegion.GetSize()[0]) * m_OldSpacingZoomFactor /
+ m_SpacingZoomFactor));
+ newBufferedRegionSize[1] =
+ static_cast<unsigned long>(static_cast<double>((m_BufferedRegion.GetSize()[1]) * m_OldSpacingZoomFactor /
+ m_SpacingZoomFactor));
m_OldBufferedRegion = m_BufferedRegion;
m_BufferedRegion.SetSize(newBufferedRegionSize);
- newBufferedRegionIndex[0]=(static_cast<long>(m_DisplayExtent.GetSize()[0])
- -static_cast<long>(m_BufferedRegion.GetSize()[0]))/2;
- newBufferedRegionIndex[1]=(static_cast<long>(m_DisplayExtent.GetSize()[1])
- -static_cast<long>(m_BufferedRegion.GetSize()[1]))/2;
- newBufferedRegionIndex[0]-=focusOffset[0];
- newBufferedRegionIndex[1]-=focusOffset[1];
+ newBufferedRegionIndex[0] = (static_cast<long>(m_DisplayExtent.GetSize()[0])
+ - static_cast<long>(m_BufferedRegion.GetSize()[0])) / 2;
+ newBufferedRegionIndex[1] = (static_cast<long>(m_DisplayExtent.GetSize()[1])
+ - static_cast<long>(m_BufferedRegion.GetSize()[1])) / 2;
+ newBufferedRegionIndex[0] -= focusOffset[0];
+ newBufferedRegionIndex[1] -= focusOffset[1];
m_BufferedRegion.SetIndex(newBufferedRegionIndex);
PointType center;
- m_Image->TransformIndexToPhysicalPoint(m_ViewedRegionCenter,center);
+ m_Image->TransformIndexToPhysicalPoint(m_ViewedRegionCenter, center);
if (m_SpacingZoomFactor != m_OldSpacingZoomFactor)
- {
+ {
m_BufferedRegion.Crop(m_DisplayExtent);
- SpacingType spacing = m_Image->GetSpacing()*m_SpacingZoomFactor;
- SpacingType oldSpacing = m_Image->GetSpacing()*m_OldSpacingZoomFactor;
+ SpacingType spacing = m_Image->GetSpacing() * m_SpacingZoomFactor;
+ SpacingType oldSpacing = m_Image->GetSpacing() * m_OldSpacingZoomFactor;
PointType origin;
- origin[0]=center[0]-(static_cast<double>(this->m_DisplayExtent.GetSize()[0])/2-1)*spacing[0];
- origin[1]=center[1]-(static_cast<double>(this->m_DisplayExtent.GetSize()[1])/2-1)*spacing[1];
+ origin[0] = center[0] - (static_cast<double>(this->m_DisplayExtent.GetSize()[0]) / 2 - 1) * spacing[0];
+ origin[1] = center[1] - (static_cast<double>(this->m_DisplayExtent.GetSize()[1]) / 2 - 1) * spacing[1];
PointType oldOrigin;
- oldOrigin[0]=center[0]-(static_cast<double>(this->m_DisplayExtent.GetSize()[0])/2-1)*oldSpacing[0];
- oldOrigin[1]=center[1]-(static_cast<double>(this->m_DisplayExtent.GetSize()[1])/2-1)*oldSpacing[1];
+ oldOrigin[0] = center[0] - (static_cast<double>(this->m_DisplayExtent.GetSize()[0]) / 2 - 1) * oldSpacing[0];
+ oldOrigin[1] = center[1] - (static_cast<double>(this->m_DisplayExtent.GetSize()[1]) / 2 - 1) * oldSpacing[1];
PointType oldBufferedUpperLeft;
- oldBufferedUpperLeft[0]=oldOrigin[0]+static_cast<double>(m_OldBufferedRegion.GetIndex()[0])*oldSpacing[0];
- oldBufferedUpperLeft[1]=oldOrigin[1]+static_cast<double>(m_OldBufferedRegion.GetIndex()[1])*oldSpacing[1];
+ oldBufferedUpperLeft[0] = oldOrigin[0] + static_cast<double>(m_OldBufferedRegion.GetIndex()[0]) * oldSpacing[0];
+ oldBufferedUpperLeft[1] = oldOrigin[1] + static_cast<double>(m_OldBufferedRegion.GetIndex()[1]) * oldSpacing[1];
PointType bufferedUpperLeft;
- bufferedUpperLeft[0]=origin[0]+static_cast<double>(m_BufferedRegion.GetIndex()[0])*spacing[0];
- bufferedUpperLeft[1]=origin[1]+static_cast<double>(m_BufferedRegion.GetIndex()[1])*spacing[1];
+ bufferedUpperLeft[0] = origin[0] + static_cast<double>(m_BufferedRegion.GetIndex()[0]) * spacing[0];
+ bufferedUpperLeft[1] = origin[1] + static_cast<double>(m_BufferedRegion.GetIndex()[1]) * spacing[1];
- unsigned char * newBuffer = NULL;
- unsigned int bufferLenght = 3*m_BufferedRegion.GetSize()[0]*m_BufferedRegion.GetSize()[1];
+ unsigned char * newBuffer = NULL;
+ unsigned int bufferLenght = 3 * m_BufferedRegion.GetSize()[0] * m_BufferedRegion.GetSize()[1];
newBuffer = new unsigned char[bufferLenght];
typename ImageListType::Pointer bandList;
- unsigned int index = 0;
- PixelType interpolatedValue = 0;
- PointType interpolatedPos;
+ unsigned int index = 0;
+ PixelType interpolatedValue = 0;
+ PointType interpolatedPos;
interpolatedPos.Fill(0);
- unsigned int numberOfSplits=1;
+ unsigned int numberOfSplits = 1;
- unsigned int optiCount = 0;
+ unsigned int optiCount = 0;
InterpolatorPointerType interpolator;
- if (m_SpacingZoomFactor>1)
- {
- numberOfSplits=max((static_cast<unsigned int>(m_SpacingZoomFactor))*(static_cast<unsigned int>(m_SpacingZoomFactor)),1U);
+ if (m_SpacingZoomFactor > 1)
+ {
+ numberOfSplits =
+ max((static_cast<unsigned int>(m_SpacingZoomFactor)) * (static_cast<unsigned int>(m_SpacingZoomFactor)), 1U);
interpolator = m_ZoomOutInterpolator;
- }
+ }
else
- {
+ {
interpolator = m_ZoomInInterpolator;
- }
+ }
- unsigned int splitterNumberOfSplits = m_Splitter->GetNumberOfSplits(m_BufferedRegion,numberOfSplits);
+ unsigned int splitterNumberOfSplits = m_Splitter->GetNumberOfSplits(m_BufferedRegion, numberOfSplits);
- for (unsigned int splitIndex = 0;splitIndex<splitterNumberOfSplits;++splitIndex)
- {
- RegionType splitRegion = m_Splitter->GetSplit(splitIndex,splitterNumberOfSplits,m_BufferedRegion);
- m_RequestedRegion = ComputeRequestedRegion(splitRegion);
- if (! m_RequestedRegion.Crop(m_Image->GetLargestPossibleRegion()))
+ for (unsigned int splitIndex = 0; splitIndex < splitterNumberOfSplits; ++splitIndex)
{
+ RegionType splitRegion = m_Splitter->GetSplit(splitIndex, splitterNumberOfSplits, m_BufferedRegion);
+ m_RequestedRegion = ComputeRequestedRegion(splitRegion);
+ if (!m_RequestedRegion.Crop(m_Image->GetLargestPossibleRegion()))
+ {
SizeType nullSize;
nullSize.Fill(0);
IndexType nullIndex;
nullIndex.Fill(0);
m_RequestedRegion.SetSize(nullSize);
m_RequestedRegion.SetIndex(nullIndex);
- }
+ }
m_DecompositionFilter = VectorImageDecompositionFilterType::New();
m_DecompositionFilter->SetInput(m_Image);
bandList = m_DecompositionFilter->GetOutput();
bandList->UpdateOutputInformation();
bandList->GetNthElement(m_RedChannelIndex)->SetRequestedRegion(m_RequestedRegion);
if (m_ViewModelIsRGB)
- {
+ {
bandList->GetNthElement(m_GreenChannelIndex)->SetRequestedRegion(m_RequestedRegion);
bandList->GetNthElement(m_BlueChannelIndex)->SetRequestedRegion(m_RequestedRegion);
- }
+ }
bandList->PropagateRequestedRegion();
bandList->UpdateOutputData();
-
PointType upperLeft;
- upperLeft[0]=origin[0]+static_cast<double>(splitRegion.GetIndex()[0])*spacing[0];
- upperLeft[1]=origin[1]+static_cast<double>(splitRegion.GetIndex()[1])*spacing[1];
-
+ upperLeft[0] = origin[0] + static_cast<double>(splitRegion.GetIndex()[0]) * spacing[0];
+ upperLeft[1] = origin[1] + static_cast<double>(splitRegion.GetIndex()[1]) * spacing[1];
- interpolatedPos[1]=upperLeft[1];
- for (unsigned int j = 0;j<splitRegion.GetSize()[1];++j)
- {
- interpolatedPos[0]=upperLeft[0];
- for (unsigned int i = 0;i<splitRegion.GetSize()[0];++i)
+ interpolatedPos[1] = upperLeft[1];
+ for (unsigned int j = 0; j < splitRegion.GetSize()[1]; ++j)
{
-
- long indexInOldBuffer = IndexInOldGrid(interpolatedPos,oldBufferedUpperLeft,oldSpacing,m_OldBufferedRegion.GetSize());
- if (indexInOldBuffer>0)
+ interpolatedPos[0] = upperLeft[0];
+ for (unsigned int i = 0; i < splitRegion.GetSize()[0]; ++i)
{
+
+ long indexInOldBuffer = IndexInOldGrid(interpolatedPos,
+ oldBufferedUpperLeft,
+ oldSpacing,
+ m_OldBufferedRegion.GetSize());
+ if (indexInOldBuffer > 0)
+ {
newBuffer[index] = m_OpenGlBuffer[indexInOldBuffer];
- newBuffer[index+1] = m_OpenGlBuffer[indexInOldBuffer+1];
- newBuffer[index+2] = m_OpenGlBuffer[indexInOldBuffer+2];
- index+=3;
+ newBuffer[index + 1] = m_OpenGlBuffer[indexInOldBuffer + 1];
+ newBuffer[index + 2] = m_OpenGlBuffer[indexInOldBuffer + 2];
+ index += 3;
optiCount++;
- }
+ }
else
- {
+ {
interpolator->SetInputImage(bandList->GetNthElement(m_RedChannelIndex));
if (interpolator->IsInsideBuffer(interpolatedPos))
- {
+ {
interpolatedValue = static_cast<PixelType>(m_ZoomInInterpolator->Evaluate(interpolatedPos));
- }
+ }
else
- {
+ {
interpolatedValue = 0;
- }
- newBuffer[index] = Normalize(interpolatedValue,m_RedChannelIndex);
+ }
+ newBuffer[index] = Normalize(interpolatedValue, m_RedChannelIndex);
if (m_ViewModelIsRGB)
- {
- m_ZoomInInterpolator->SetInputImage(bandList->GetNthElement(m_GreenChannelIndex));
- if ( m_ZoomInInterpolator->IsInsideBuffer(interpolatedPos))
{
+ m_ZoomInInterpolator->SetInputImage(bandList->GetNthElement(m_GreenChannelIndex));
+ if (m_ZoomInInterpolator->IsInsideBuffer(interpolatedPos))
+ {
interpolatedValue = static_cast<PixelType>(interpolator->Evaluate(interpolatedPos));
- }
+ }
else
- {
+ {
interpolatedValue = 0;
- }
- newBuffer[index+1] = Normalize(interpolatedValue,m_GreenChannelIndex);
+ }
+ newBuffer[index + 1] = Normalize(interpolatedValue, m_GreenChannelIndex);
interpolator->SetInputImage(bandList->GetNthElement(m_BlueChannelIndex));
- if ( interpolator->IsInsideBuffer(interpolatedPos))
- {
+ if (interpolator->IsInsideBuffer(interpolatedPos))
+ {
interpolatedValue = static_cast<PixelType>(interpolator->Evaluate(interpolatedPos));
- }
+ }
else
- {
+ {
interpolatedValue = 0;
+ }
+ newBuffer[index + 2] = Normalize(interpolatedValue, m_BlueChannelIndex);
+ index += 3;
}
- newBuffer[index+2] = Normalize(interpolatedValue,m_BlueChannelIndex);
- index+=3;
- }
else
- {
- newBuffer[index+1] = Normalize(interpolatedValue,m_RedChannelIndex);
- newBuffer[index+2] = Normalize(interpolatedValue,m_RedChannelIndex);
- index+=3;
+ {
+ newBuffer[index + 1] = Normalize(interpolatedValue, m_RedChannelIndex);
+ newBuffer[index + 2] = Normalize(interpolatedValue, m_RedChannelIndex);
+ index += 3;
+ }
}
+ interpolatedPos[0] += spacing[0];
}
- interpolatedPos[0] +=spacing[0];
+ interpolatedPos[1] += spacing[1];
}
- interpolatedPos[1] +=spacing[1];
}
- }
- if (m_OpenGlBuffer!=NULL)
- {
- delete [] m_OpenGlBuffer;
- }
+ if (m_OpenGlBuffer != NULL)
+ {
+ delete[] m_OpenGlBuffer;
+ }
m_OpenGlBuffer = newBuffer;
m_OldSpacingZoomFactor = m_SpacingZoomFactor;
- }
+ }
}
template <class TPixel>
@@ -531,80 +532,80 @@ ImageAlternateViewer<TPixel>
::GetAdditionalBufferRegion(unsigned int part)
{
RegionType region;
- SizeType size;
- IndexType index;
+ SizeType size;
+ IndexType index;
size.Fill(0);
index.Fill(0);
- SizeType deSize = m_DisplayExtent.GetSize();
- IndexType deUL =m_DisplayExtent.GetIndex();
+ SizeType deSize = m_DisplayExtent.GetSize();
+ IndexType deUL = m_DisplayExtent.GetIndex();
IndexType deLR;
deLR[0] = deSize[0] + deUL[0];
deLR[1] = deSize[1] + deUL[1];
- SizeType bufSize = m_BufferedRegion.GetSize();
+ SizeType bufSize = m_BufferedRegion.GetSize();
IndexType bufUL = m_BufferedRegion.GetIndex();
IndexType bufLR;
bufLR[0] = bufUL[0] + bufSize[0];
bufLR[1] = bufUL[1] + bufSize[1];
switch (part)
- {
+ {
case 0:
index = deUL;
- size[0] = max(bufUL[0]-deUL[0],0L);
- size[1] = max(bufUL[1]-deUL[1],0L);
+ size[0] = max(bufUL[0] - deUL[0], 0L);
+ size[1] = max(bufUL[1] - deUL[1], 0L);
break;
case 1:
- index[0] = max(deUL[0],bufUL[0]);
+ index[0] = max(deUL[0], bufUL[0]);
index[1] = deUL[1];
- size[0] = min(bufLR[0]-max(bufUL[0],0L),deLR[0]-index[0]);
- size[1] = max(bufUL[1]-deUL[1],0L);
+ size[0] = min(bufLR[0] - max(bufUL[0], 0L), deLR[0] - index[0]);
+ size[1] = max(bufUL[1] - deUL[1], 0L);
break;
case 2:
- index[0] = min(bufLR[0],deLR[0]);
+ index[0] = min(bufLR[0], deLR[0]);
index[1] = deUL[1];
- size[0] = max(deLR[0]-bufLR[0],0L);
- size[1] = max(bufUL[1]-deUL[1],0L);
+ size[0] = max(deLR[0] - bufLR[0], 0L);
+ size[1] = max(bufUL[1] - deUL[1], 0L);
break;
case 3:
index[0] = deUL[0];
- index[1] = max(bufUL[1],0L);
- size[0] = max(bufUL[0]-deUL[0],0L);
- size[1] = min(bufLR[1]-max(bufUL[1],0L),deLR[1]-index[1]);
+ index[1] = max(bufUL[1], 0L);
+ size[0] = max(bufUL[0] - deUL[0], 0L);
+ size[1] = min(bufLR[1] - max(bufUL[1], 0L), deLR[1] - index[1]);
break;
case 4:
- index[0] = min(bufLR[0],deLR[0]);
- index[1] = max(bufUL[1],deUL[0]);
- size[0] = max(deLR[0]-bufLR[0],0L);
- size[1] = min(bufLR[1]-max(bufUL[1],0L),deLR[1]-index[1]);
+ index[0] = min(bufLR[0], deLR[0]);
+ index[1] = max(bufUL[1], deUL[0]);
+ size[0] = max(deLR[0] - bufLR[0], 0L);
+ size[1] = min(bufLR[1] - max(bufUL[1], 0L), deLR[1] - index[1]);
break;
case 5:
index[0] = deUL[0];
- index[1] = min(deLR[1],bufLR[1]);
- size[0] = max(bufUL[0]-deUL[0],0L);
- size[1] = max(deLR[1]-bufLR[1],0L);
+ index[1] = min(deLR[1], bufLR[1]);
+ size[0] = max(bufUL[0] - deUL[0], 0L);
+ size[1] = max(deLR[1] - bufLR[1], 0L);
break;
case 6:
- index[0] = max(deUL[0],bufUL[0]);
- index[1] = min(deLR[1],bufLR[1]);
- size[0] = min(bufLR[0]-max(bufUL[0],0L),deLR[0]-index[0]);
- size[1] = max(deLR[1]-bufLR[1],0L);
+ index[0] = max(deUL[0], bufUL[0]);
+ index[1] = min(deLR[1], bufLR[1]);
+ size[0] = min(bufLR[0] - max(bufUL[0], 0L), deLR[0] - index[0]);
+ size[1] = max(deLR[1] - bufLR[1], 0L);
break;
case 7:
- index[0] = min(bufLR[0],deLR[0]);
- index[1] = min(deLR[1],bufLR[1]);
- size[0] = max(deLR[0]-bufLR[0],0L);
- size[1] = max(deLR[1]-bufLR[1],0L);
- }
+ index[0] = min(bufLR[0], deLR[0]);
+ index[1] = min(deLR[1], bufLR[1]);
+ size[0] = max(deLR[0] - bufLR[0], 0L);
+ size[1] = max(deLR[1] - bufLR[1], 0L);
+ }
region.SetSize(size);
region.SetIndex(index);
return region;
@@ -614,46 +615,45 @@ template <class TPixel>
typename ImageAlternateViewer<TPixel>
::RegionType
ImageAlternateViewer<TPixel>
-::ComputeRequestedRegion(RegionType ®ion)
+::ComputeRequestedRegion(RegionType& region)
{
RegionType outputRegion;
- SpacingType spacing = m_Image->GetSpacing()*m_SpacingZoomFactor;
+ SpacingType spacing = m_Image->GetSpacing() * m_SpacingZoomFactor;
PointType center;
- m_Image->TransformIndexToPhysicalPoint(m_ViewedRegionCenter,center);
+ m_Image->TransformIndexToPhysicalPoint(m_ViewedRegionCenter, center);
PointType origin;
- origin[0]=center[0]-(static_cast<double>(this->m_DisplayExtent.GetSize()[0])/2-1)*spacing[0];
- origin[1]=center[1]-(static_cast<double>(this->m_DisplayExtent.GetSize()[1])/2-1)*spacing[1];
+ origin[0] = center[0] - (static_cast<double>(this->m_DisplayExtent.GetSize()[0]) / 2 - 1) * spacing[0];
+ origin[1] = center[1] - (static_cast<double>(this->m_DisplayExtent.GetSize()[1]) / 2 - 1) * spacing[1];
PointType oldOrigin;
- oldOrigin[0]=center[0]-(static_cast<double>(this->m_OldDisplayExtent.GetSize()[0])/2-1)*spacing[0];
- oldOrigin[1]=center[1]-(static_cast<double>(this->m_OldDisplayExtent.GetSize()[1])/2-1)*spacing[1];
+ oldOrigin[0] = center[0] - (static_cast<double>(this->m_OldDisplayExtent.GetSize()[0]) / 2 - 1) * spacing[0];
+ oldOrigin[1] = center[1] - (static_cast<double>(this->m_OldDisplayExtent.GetSize()[1]) / 2 - 1) * spacing[1];
PointType upperLeft;
- upperLeft[0]=origin[0]+(static_cast<double>(region.GetIndex()[0]))*spacing[0];
- upperLeft[1]=origin[1]+(static_cast<double>(region.GetIndex()[1]))*spacing[1];
+ upperLeft[0] = origin[0] + (static_cast<double>(region.GetIndex()[0])) * spacing[0];
+ upperLeft[1] = origin[1] + (static_cast<double>(region.GetIndex()[1])) * spacing[1];
PointType lowerRight;
- lowerRight[0]=upperLeft[0]+(static_cast<double>(region.GetSize()[0])-1)*spacing[0];
- lowerRight[1]=upperLeft[1]+(static_cast<double>(region.GetSize()[1])-1)*spacing[1];
-
+ lowerRight[0] = upperLeft[0] + (static_cast<double>(region.GetSize()[0]) - 1) * spacing[0];
+ lowerRight[1] = upperLeft[1] + (static_cast<double>(region.GetSize()[1]) - 1) * spacing[1];
PointType bufferedUpperLeft;
- bufferedUpperLeft[0]=origin[0]+static_cast<double>(m_BufferedRegion.GetIndex()[0])*spacing[0];
- bufferedUpperLeft[1]=origin[1]+static_cast<double>(m_BufferedRegion.GetIndex()[1])*spacing[1];
+ bufferedUpperLeft[0] = origin[0] + static_cast<double>(m_BufferedRegion.GetIndex()[0]) * spacing[0];
+ bufferedUpperLeft[1] = origin[1] + static_cast<double>(m_BufferedRegion.GetIndex()[1]) * spacing[1];
PointType bufferedLowerRight;
- bufferedLowerRight[0]=bufferedUpperLeft[0]+static_cast<double>(m_BufferedRegion.GetSize()[0]-1)*spacing[0];
- bufferedLowerRight[1]=bufferedUpperLeft[1]+static_cast<double>(m_BufferedRegion.GetSize()[1]-1)*spacing[1];
+ bufferedLowerRight[0] = bufferedUpperLeft[0] + static_cast<double>(m_BufferedRegion.GetSize()[0] - 1) * spacing[0];
+ bufferedLowerRight[1] = bufferedUpperLeft[1] + static_cast<double>(m_BufferedRegion.GetSize()[1] - 1) * spacing[1];
IndexType lowerRightIndex;
IndexType requestedIndex;
- SizeType requestedSize;
- m_Image->TransformPhysicalPointToIndex(upperLeft,requestedIndex);
- m_Image->TransformPhysicalPointToIndex(lowerRight,lowerRightIndex);
- requestedSize[0]=lowerRightIndex[0]-requestedIndex[0]+1;
- requestedSize[1]=lowerRightIndex[1]-requestedIndex[1]+1;
+ SizeType requestedSize;
+ m_Image->TransformPhysicalPointToIndex(upperLeft, requestedIndex);
+ m_Image->TransformPhysicalPointToIndex(lowerRight, lowerRightIndex);
+ requestedSize[0] = lowerRightIndex[0] - requestedIndex[0] + 1;
+ requestedSize[1] = lowerRightIndex[1] - requestedIndex[1] + 1;
outputRegion.SetIndex(requestedIndex);
outputRegion.SetSize(requestedSize);
@@ -663,22 +663,21 @@ ImageAlternateViewer<TPixel>
}
-
template <class TPixel>
unsigned char *
ImageAlternateViewer<TPixel>
-::CreateAdditionalBuffer(RegionType region,ImagePointerType image, bool rgb)
+::CreateAdditionalBuffer(RegionType region, ImagePointerType image, bool rgb)
{
- itk::TimeProbe total,filter,interpolation;
+ itk::TimeProbe total, filter, interpolation;
total.Start();
- unsigned char * result = NULL;
+ unsigned char * result = NULL;
- unsigned int bufferLenght = 3*region.GetSize()[0]*region.GetSize()[1];
+ unsigned int bufferLenght = 3 * region.GetSize()[0] * region.GetSize()[1];
if (bufferLenght == 0)
- {
+ {
return result;
- }
+ }
result = new unsigned char[bufferLenght];
@@ -687,49 +686,50 @@ ImageAlternateViewer<TPixel>
bandList->UpdateOutputInformation();
unsigned int index = 0;
- PixelType interpolatedValue = 0;
- PointType interpolatedPos;
+ PixelType interpolatedValue = 0;
+ PointType interpolatedPos;
interpolatedPos.Fill(0);
- unsigned int numberOfSplits=1;
+ unsigned int numberOfSplits = 1;
InterpolatorPointerType interpolator;
- if (m_SpacingZoomFactor>1)
- {
- numberOfSplits=max((static_cast<unsigned int>(m_SpacingZoomFactor))*(static_cast<unsigned int>(m_SpacingZoomFactor)),1U);
+ if (m_SpacingZoomFactor > 1)
+ {
+ numberOfSplits =
+ max((static_cast<unsigned int>(m_SpacingZoomFactor)) * (static_cast<unsigned int>(m_SpacingZoomFactor)), 1U);
interpolator = m_ZoomOutInterpolator;
- }
+ }
else
- {
+ {
interpolator = m_ZoomInInterpolator;
- }
+ }
- unsigned int splitterNumberOfSplits = m_Splitter->GetNumberOfSplits(region,numberOfSplits);
+ unsigned int splitterNumberOfSplits = m_Splitter->GetNumberOfSplits(region, numberOfSplits);
- SpacingType spacing = image->GetSpacing()*m_SpacingZoomFactor;
+ SpacingType spacing = image->GetSpacing() * m_SpacingZoomFactor;
PointType center;
- image->TransformIndexToPhysicalPoint(m_ViewedRegionCenter,center);
+ image->TransformIndexToPhysicalPoint(m_ViewedRegionCenter, center);
PointType origin;
- origin[0]=center[0]-(static_cast<double>(this->m_DisplayExtent.GetSize()[0])/2-1)*spacing[0];
- origin[1]=center[1]-(static_cast<double>(this->m_DisplayExtent.GetSize()[1])/2-1)*spacing[1];
+ origin[0] = center[0] - (static_cast<double>(this->m_DisplayExtent.GetSize()[0]) / 2 - 1) * spacing[0];
+ origin[1] = center[1] - (static_cast<double>(this->m_DisplayExtent.GetSize()[1]) / 2 - 1) * spacing[1];
- for (unsigned int splitIndex = 0;splitIndex<splitterNumberOfSplits;++splitIndex)
- {
- RegionType splitRegion = m_Splitter->GetSplit(splitIndex,splitterNumberOfSplits,region);
+ for (unsigned int splitIndex = 0; splitIndex < splitterNumberOfSplits; ++splitIndex)
+ {
+ RegionType splitRegion = m_Splitter->GetSplit(splitIndex, splitterNumberOfSplits, region);
PointType upperLeft;
- upperLeft[0]=origin[0]+(static_cast<double>(splitRegion.GetIndex()[0]))*spacing[0];
- upperLeft[1]=origin[1]+(static_cast<double>(splitRegion.GetIndex()[1]))*spacing[1];
+ upperLeft[0] = origin[0] + (static_cast<double>(splitRegion.GetIndex()[0])) * spacing[0];
+ upperLeft[1] = origin[1] + (static_cast<double>(splitRegion.GetIndex()[1])) * spacing[1];
m_RequestedRegion = ComputeRequestedRegion(splitRegion);
if (!m_RequestedRegion.Crop(image->GetLargestPossibleRegion()))
- {
+ {
SizeType nullSize;
nullSize.Fill(0);
IndexType nullIndex;
nullIndex.Fill(0);
m_RequestedRegion.SetSize(nullSize);
m_RequestedRegion.SetIndex(nullIndex);
- }
+ }
m_DecompositionFilter = VectorImageDecompositionFilterType::New();
m_DecompositionFilter->SetInput(image);
bandList = m_DecompositionFilter->GetOutput();
@@ -737,68 +737,67 @@ ImageAlternateViewer<TPixel>
bandList->UpdateOutputInformation();
bandList->GetNthElement(m_RedChannelIndex)->SetRequestedRegion(m_RequestedRegion);
if (rgb)
- {
+ {
bandList->GetNthElement(m_GreenChannelIndex)->SetRequestedRegion(m_RequestedRegion);
bandList->GetNthElement(m_BlueChannelIndex)->SetRequestedRegion(m_RequestedRegion);
- }
+ }
bandList->PropagateRequestedRegion();
bandList->UpdateOutputData();
filter.Stop();
interpolation.Start();
- interpolatedPos[1]=upperLeft[1];
- for (unsigned int j = 0;j<splitRegion.GetSize()[1];++j)
- {
- interpolatedPos[0]=upperLeft[0];
- for (unsigned int i = 0;i<splitRegion.GetSize()[0];++i)
+ interpolatedPos[1] = upperLeft[1];
+ for (unsigned int j = 0; j < splitRegion.GetSize()[1]; ++j)
{
- interpolator->SetInputImage(bandList->GetNthElement(m_RedChannelIndex));
- if ( interpolator->IsInsideBuffer(interpolatedPos))
+ interpolatedPos[0] = upperLeft[0];
+ for (unsigned int i = 0; i < splitRegion.GetSize()[0]; ++i)
{
+ interpolator->SetInputImage(bandList->GetNthElement(m_RedChannelIndex));
+ if (interpolator->IsInsideBuffer(interpolatedPos))
+ {
interpolatedValue = static_cast<PixelType>(interpolator->Evaluate(interpolatedPos));
- }
+ }
else
- {
+ {
interpolatedValue = 0;
- }
- result[index] = Normalize(interpolatedValue,m_RedChannelIndex);
+ }
+ result[index] = Normalize(interpolatedValue, m_RedChannelIndex);
if (rgb)
- {
- interpolator->SetInputImage(bandList->GetNthElement(m_GreenChannelIndex));
- if ( interpolator->IsInsideBuffer(interpolatedPos))
{
- interpolatedValue = static_cast<PixelType>( interpolator->Evaluate(interpolatedPos));
- }
+ interpolator->SetInputImage(bandList->GetNthElement(m_GreenChannelIndex));
+ if (interpolator->IsInsideBuffer(interpolatedPos))
+ {
+ interpolatedValue = static_cast<PixelType>(interpolator->Evaluate(interpolatedPos));
+ }
else
- {
+ {
interpolatedValue = 0;
- }
- result[index+1] = Normalize(interpolatedValue,m_GreenChannelIndex);
+ }
+ result[index + 1] = Normalize(interpolatedValue, m_GreenChannelIndex);
interpolator->SetInputImage(bandList->GetNthElement(m_BlueChannelIndex));
- if ( interpolator->IsInsideBuffer(interpolatedPos))
- {
+ if (interpolator->IsInsideBuffer(interpolatedPos))
+ {
interpolatedValue = static_cast<PixelType>(interpolator->Evaluate(interpolatedPos));
- }
+ }
else
- {
+ {
interpolatedValue = 0;
+ }
+ result[index + 2] = Normalize(interpolatedValue, m_BlueChannelIndex);
+ index += 3;
}
- result[index+2] = Normalize(interpolatedValue,m_BlueChannelIndex);
- index+=3;
- }
else
- {
- result[index+1] = Normalize(interpolatedValue,m_RedChannelIndex);
- result[index+2] = Normalize(interpolatedValue,m_RedChannelIndex);
- index+=3;
+ {
+ result[index + 1] = Normalize(interpolatedValue, m_RedChannelIndex);
+ result[index + 2] = Normalize(interpolatedValue, m_RedChannelIndex);
+ index += 3;
+ }
+ interpolatedPos[0] += spacing[0];
}
- interpolatedPos[0] +=spacing[0];
+ interpolatedPos[1] += spacing[1];
}
- interpolatedPos[1] +=spacing[1];
}
- }
-
interpolation.Stop();
total.Stop();
@@ -810,113 +809,123 @@ int
ImageAlternateViewer<TPixel>
::handle(int event)
{
- if (m_Updating)
- return 0;
+ if (m_Updating) return 0;
switch (event)
- {
+ {
case FL_PUSH:
- {
- if (!m_Drag)
{
- m_OldMousePos[0]= static_cast<long int>(static_cast<double>(m_DisplayExtent.GetSize()[0]/2)
- +(static_cast<double>(Fl::event_x())-static_cast<double>(m_DisplayExtent.GetSize()[0]/2))/m_OpenGlIsotropicZoom);
- m_OldMousePos[1]= static_cast<long int>(static_cast<double>(m_DisplayExtent.GetSize()[1]/2)
- +(static_cast<double>(Fl::event_y())-static_cast<double>(m_DisplayExtent.GetSize()[1]/2))/m_OpenGlIsotropicZoom);
- m_Drag=true;
- m_DragEventCounter=0;
+ if (!m_Drag)
+ {
+ m_OldMousePos[0] = static_cast<long int>(static_cast<double>(m_DisplayExtent.GetSize()[0] / 2)
+ + (static_cast<double>(Fl::event_x()) -
+ static_cast<double>(
+ m_DisplayExtent.GetSize()[0] / 2)) / m_OpenGlIsotropicZoom);
+ m_OldMousePos[1] = static_cast<long int>(static_cast<double>(m_DisplayExtent.GetSize()[1] / 2)
+ + (static_cast<double>(Fl::event_y()) -
+ static_cast<double>(
+ m_DisplayExtent.GetSize()[1] / 2)) / m_OpenGlIsotropicZoom);
+ m_Drag = true;
+ m_DragEventCounter = 0;
if (m_SubWindowRegion.IsInside(m_OldMousePos))
- {
+ {
m_SubWindowMove = true;
- }
+ }
else
- {
+ {
m_OldViewedRegionCenter = m_ViewedRegionCenter;
+ }
}
- }
return 1;
- }
+ }
case FL_DRAG:
- {
- m_Drag=true;
-
- int x =static_cast<int>(static_cast<double>(m_DisplayExtent.GetSize()[0]/2)
- +(Fl::event_x()-static_cast<double>(m_DisplayExtent.GetSize()[0]/2))/m_OpenGlIsotropicZoom);
- int y = static_cast<long int>(static_cast<double>(m_DisplayExtent.GetSize()[1]/2)
- +(Fl::event_y()-static_cast<double>(m_DisplayExtent.GetSize()[1]/2))/m_OpenGlIsotropicZoom);
- if (Fl::event_button()==FL_MIDDLE_MOUSE)
{
- if (!m_SubWindowMode)
- m_SubWindowMode = true;
+ m_Drag = true;
+
+ int x = static_cast<int>(static_cast<double>(m_DisplayExtent.GetSize()[0] / 2)
+ + (Fl::event_x() - static_cast<double>(
+ m_DisplayExtent.GetSize()[0] / 2)) / m_OpenGlIsotropicZoom);
+ int y = static_cast<long int>(static_cast<double>(m_DisplayExtent.GetSize()[1] / 2)
+ + (Fl::event_y() - static_cast<double>(
+ m_DisplayExtent.GetSize()[1] / 2)) / m_OpenGlIsotropicZoom);
+ if (Fl::event_button() == FL_MIDDLE_MOUSE)
+ {
+ if (!m_SubWindowMode) m_SubWindowMode = true;
IndexType newIndex;
- SizeType newSize;
+ SizeType newSize;
- newIndex[0]=(x>m_OldMousePos[0] ? m_OldMousePos[0] : x);
- newIndex[1]=(y>m_OldMousePos[1] ? m_OldMousePos[1] : y);
- newSize[0]=vcl_abs(x-m_OldMousePos[0]);
- newSize[1]=vcl_abs(y-m_OldMousePos[1]);
+ newIndex[0] = (x > m_OldMousePos[0] ? m_OldMousePos[0] : x);
+ newIndex[1] = (y > m_OldMousePos[1] ? m_OldMousePos[1] : y);
+ newSize[0] = vcl_abs(x - m_OldMousePos[0]);
+ newSize[1] = vcl_abs(y - m_OldMousePos[1]);
m_SubWindowRegion.SetIndex(newIndex);
m_SubWindowRegion.SetSize(newSize);
this->redraw();
++m_DragEventCounter;
- }
+ }
else if (m_SubWindowMove)
- {
+ {
IndexType index = m_SubWindowRegion.GetIndex();
- index[0]+=(x-m_OldMousePos[0]);
- index[1]+=(y-m_OldMousePos[1]);
+ index[0] += (x - m_OldMousePos[0]);
+ index[1] += (y - m_OldMousePos[1]);
m_SubWindowRegion.SetIndex(index);
- m_OldMousePos[0]=x;
- m_OldMousePos[1]=y;
+ m_OldMousePos[0] = x;
+ m_OldMousePos[1] = y;
this->redraw();
++m_DragEventCounter;
- }
+ }
else
- {
- SpacingType spacing = m_Image->GetSpacing()*m_SpacingZoomFactor;
- PointType origin;
- origin[0]=static_cast<double>(m_OldViewedRegionCenter[0])-static_cast<double>(this->m_DisplayExtent.GetSize()[0]/2)*spacing[0];
- origin[1]=static_cast<double>(m_OldViewedRegionCenter[1])-static_cast<double>(this->m_DisplayExtent.GetSize()[1]/2)*spacing[1];
+ {
+ SpacingType spacing = m_Image->GetSpacing() * m_SpacingZoomFactor;
+ PointType origin;
+ origin[0] = static_cast<double>(m_OldViewedRegionCenter[0]) - static_cast<double>(
+ this->m_DisplayExtent.GetSize()[0] / 2) * spacing[0];
+ origin[1] = static_cast<double>(m_OldViewedRegionCenter[1]) - static_cast<double>(
+ this->m_DisplayExtent.GetSize()[1] / 2) * spacing[1];
PointType newCenter;
- newCenter[0]=origin[0]+static_cast<double>(m_OldMousePos[0]-x+static_cast<long>(this->m_DisplayExtent.GetSize()[0])/2)*spacing[0];
- newCenter[1]=origin[1]+static_cast<double>(m_OldMousePos[1]-y+static_cast<long>(this->m_DisplayExtent.GetSize()[1])/2)*spacing[1];
- m_Image->TransformPhysicalPointToIndex(newCenter,m_ViewedRegionCenter);
+ newCenter[0] = origin[0] +
+ static_cast<double>(m_OldMousePos[0] - x + static_cast<long>(this->m_DisplayExtent.GetSize()[0]) /
+ 2) * spacing[0];
+ newCenter[1] = origin[1] +
+ static_cast<double>(m_OldMousePos[1] - y + static_cast<long>(this->m_DisplayExtent.GetSize()[1]) /
+ 2) * spacing[1];
+ m_Image->TransformPhysicalPointToIndex(newCenter, m_ViewedRegionCenter);
this->redraw();
++m_DragEventCounter;
- }
+ }
DecorationRedraw();
return 1;
- }
+ }
case FL_RELEASE:
- {
+ {
m_OldViewedRegionCenter = m_ViewedRegionCenter;
- m_Drag=false;
+ m_Drag = false;
AdditionalRedraw();
m_SubWindowMove = false;
return 1;
- }
+ }
case FL_FOCUS:
- {
+ {
return 1;
- }
+ }
case FL_UNFOCUS:
- {
+ {
return 1;
- }
+ }
case FL_KEYDOWN:
- {
- if (Fl::event_key()==116) // T key
{
+ if (Fl::event_key() == 116) // T key
+ {
m_SubWindowMode = !m_SubWindowMode;
this->redraw();
- }
+ }
return 1;
- }
- }
+ }
+ }
return 0;
}
@@ -925,204 +934,200 @@ void
ImageAlternateViewer<TPixel>
::MergeBuffersAndFreeMemory(std::vector<unsigned char *> bufferList, std::vector<RegionType> bufferRegionList)
{
- if (bufferList.size()!=8 || bufferRegionList.size()!=8)
- {
+ if (bufferList.size() != 8 || bufferRegionList.size() != 8)
+ {
itkExceptionMacro("Invalid number of additionnal buffers");
- }
-
- if (bufferRegionList[0].GetNumberOfPixels()==0
- &&bufferRegionList[1].GetNumberOfPixels()==0
- &&bufferRegionList[2].GetNumberOfPixels()==0
- &&bufferRegionList[3].GetNumberOfPixels()==0
- &&bufferRegionList[4].GetNumberOfPixels()==0
- &&bufferRegionList[5].GetNumberOfPixels()==0
- &&bufferRegionList[6].GetNumberOfPixels()==0
- &&bufferRegionList[7].GetNumberOfPixels()==0)
- {
- return;
- }
+ }
+ if (bufferRegionList[0].GetNumberOfPixels() == 0
+ && bufferRegionList[1].GetNumberOfPixels() == 0
+ && bufferRegionList[2].GetNumberOfPixels() == 0
+ && bufferRegionList[3].GetNumberOfPixels() == 0
+ && bufferRegionList[4].GetNumberOfPixels() == 0
+ && bufferRegionList[5].GetNumberOfPixels() == 0
+ && bufferRegionList[6].GetNumberOfPixels() == 0
+ && bufferRegionList[7].GetNumberOfPixels() == 0)
+ {
+ return;
+ }
// malloc new buffer
- unsigned char * newBuffer = new unsigned char[3*m_DisplayExtent.GetNumberOfPixels()];
+ unsigned char * newBuffer = new unsigned char[3 * m_DisplayExtent.GetNumberOfPixels()];
// fill the new buffer
unsigned int indexInNewBuffer = 0;
-
- unsigned int indexInBuffer1=0;
- unsigned int indexInBuffer2=0;
- unsigned int indexInBuffer3=0;
- unsigned int indexInBuffer4=0;
- unsigned int indexInBuffer5=0;
- unsigned int indexInBuffer6=0;
- unsigned int indexInBuffer7=0;
- unsigned int indexInBuffer8=0;
+ unsigned int indexInBuffer1 = 0;
+ unsigned int indexInBuffer2 = 0;
+ unsigned int indexInBuffer3 = 0;
+ unsigned int indexInBuffer4 = 0;
+ unsigned int indexInBuffer5 = 0;
+ unsigned int indexInBuffer6 = 0;
+ unsigned int indexInBuffer7 = 0;
+ unsigned int indexInBuffer8 = 0;
unsigned int indexInCentralBuffer = 0;
- if (bufferRegionList[0].GetSize()[1]!=bufferRegionList[1].GetSize()[1]
- ||bufferRegionList[2].GetSize()[1]!=bufferRegionList[1].GetSize()[1]
- ||bufferRegionList[2].GetSize()[1]!=bufferRegionList[0].GetSize()[1]
- ||bufferRegionList[0].GetIndex()[1]!=bufferRegionList[1].GetIndex()[1]
- ||bufferRegionList[2].GetIndex()[1]!=bufferRegionList[1].GetIndex()[1]
- ||bufferRegionList[2].GetIndex()[1]!=bufferRegionList[0].GetIndex()[1]
- )
- {
+ if (bufferRegionList[0].GetSize()[1] != bufferRegionList[1].GetSize()[1]
+ || bufferRegionList[2].GetSize()[1] != bufferRegionList[1].GetSize()[1]
+ || bufferRegionList[2].GetSize()[1] != bufferRegionList[0].GetSize()[1]
+ || bufferRegionList[0].GetIndex()[1] != bufferRegionList[1].GetIndex()[1]
+ || bufferRegionList[2].GetIndex()[1] != bufferRegionList[1].GetIndex()[1]
+ || bufferRegionList[2].GetIndex()[1] != bufferRegionList[0].GetIndex()[1]
+ )
+ {
itkExceptionMacro("Additional buffers misaligned.");
- }
-
+ }
// Fill region 1
- for (unsigned int j = 0;j<bufferRegionList[0].GetSize()[1];++j)
- {
- if (bufferList[0]!=NULL)
+ for (unsigned int j = 0; j < bufferRegionList[0].GetSize()[1]; ++j)
{
- for (unsigned int i = 0; i<3*bufferRegionList[0].GetSize()[0];++i)
+ if (bufferList[0] != NULL)
{
- newBuffer[indexInNewBuffer]=bufferList[0][indexInBuffer1];
+ for (unsigned int i = 0; i < 3 * bufferRegionList[0].GetSize()[0]; ++i)
+ {
+ newBuffer[indexInNewBuffer] = bufferList[0][indexInBuffer1];
++indexInNewBuffer;
++indexInBuffer1;
+ }
}
- }
// Fill region 2
- if (bufferList[1]!=NULL)
- {
- for (unsigned int i = 0; i<3*bufferRegionList[1].GetSize()[0];++i)
+ if (bufferList[1] != NULL)
{
- newBuffer[indexInNewBuffer]=bufferList[1][indexInBuffer2];
+ for (unsigned int i = 0; i < 3 * bufferRegionList[1].GetSize()[0]; ++i)
+ {
+ newBuffer[indexInNewBuffer] = bufferList[1][indexInBuffer2];
++indexInNewBuffer;
++indexInBuffer2;
+ }
}
- }
// Fill region 3
- if (bufferList[2]!=NULL)
- {
- for (unsigned int i = 0; i<3*bufferRegionList[2].GetSize()[0];++i)
+ if (bufferList[2] != NULL)
{
- newBuffer[indexInNewBuffer]=bufferList[2][indexInBuffer3];
+ for (unsigned int i = 0; i < 3 * bufferRegionList[2].GetSize()[0]; ++i)
+ {
+ newBuffer[indexInNewBuffer] = bufferList[2][indexInBuffer3];
++indexInNewBuffer;
++indexInBuffer3;
+ }
}
}
- }
- unsigned int lineOffset = static_cast<unsigned int>(-min(0L,m_BufferedRegion.GetIndex()[0]));
- unsigned int lineOffsetEnd = static_cast<unsigned int>(-min(0L,static_cast<long>(m_DisplayExtent.GetSize()[0])-m_BufferedRegion.GetIndex()[0]-static_cast<long>(m_BufferedRegion.GetSize()[0])));
- unsigned int columnOffset = static_cast<unsigned int>(-min(0L,m_BufferedRegion.GetIndex()[1]));
- unsigned int offsety= columnOffset*(static_cast<int>(m_BufferedRegion.GetSize()[0]))*3;
- unsigned int offsetx = lineOffset*3;
+ unsigned int lineOffset = static_cast<unsigned int>(-min(0L, m_BufferedRegion.GetIndex()[0]));
+ unsigned int lineOffsetEnd =
+ static_cast<unsigned int>(-min(0L, static_cast<long>(m_DisplayExtent.GetSize()[0]) -
+ m_BufferedRegion.GetIndex()[0] - static_cast<long>(m_BufferedRegion.GetSize()[0])));
+ unsigned int columnOffset = static_cast<unsigned int>(-min(0L, m_BufferedRegion.GetIndex()[1]));
+ unsigned int offsety = columnOffset * (static_cast<int>(m_BufferedRegion.GetSize()[0])) * 3;
+ unsigned int offsetx = lineOffset * 3;
- indexInCentralBuffer+=offsety;
+ indexInCentralBuffer += offsety;
// For each line
- for (unsigned int j = 0;j<bufferRegionList[3].GetSize()[1];++j)
- {
- //Fill line from region 4
- if (bufferList[3]!=NULL)
+ for (unsigned int j = 0; j < bufferRegionList[3].GetSize()[1]; ++j)
{
- for (unsigned int i = 0;i<3*bufferRegionList[3].GetSize()[0];++i)
+ //Fill line from region 4
+ if (bufferList[3] != NULL)
{
- newBuffer[indexInNewBuffer]=bufferList[3][indexInBuffer4];
+ for (unsigned int i = 0; i < 3 * bufferRegionList[3].GetSize()[0]; ++i)
+ {
+ newBuffer[indexInNewBuffer] = bufferList[3][indexInBuffer4];
++indexInNewBuffer;
++indexInBuffer4;
+ }
}
- }
// Fill line from central region
- if (m_OpenGlBuffer!=NULL)
- {
-
- indexInCentralBuffer+=offsetx;
- for (unsigned int i = 0;i<3*bufferRegionList[1].GetSize()[0];++i)
+ if (m_OpenGlBuffer != NULL)
{
- newBuffer[indexInNewBuffer]=m_OpenGlBuffer[indexInCentralBuffer];
+
+ indexInCentralBuffer += offsetx;
+ for (unsigned int i = 0; i < 3 * bufferRegionList[1].GetSize()[0]; ++i)
+ {
+ newBuffer[indexInNewBuffer] = m_OpenGlBuffer[indexInCentralBuffer];
++indexInNewBuffer;
++indexInCentralBuffer;
+ }
+ indexInCentralBuffer += lineOffsetEnd * 3;
}
- indexInCentralBuffer+=lineOffsetEnd*3;
- }
// Fill line from region 5
- if (bufferList[4]!=NULL)
- {
- for (unsigned int i = 0;i<3*bufferRegionList[4].GetSize()[0];++i)
+ if (bufferList[4] != NULL)
{
- newBuffer[indexInNewBuffer]=bufferList[4][indexInBuffer5];
+ for (unsigned int i = 0; i < 3 * bufferRegionList[4].GetSize()[0]; ++i)
+ {
+ newBuffer[indexInNewBuffer] = bufferList[4][indexInBuffer5];
++indexInNewBuffer;
++indexInBuffer5;
+ }
}
}
- }
-
- if (bufferRegionList[5].GetSize()[1]!=bufferRegionList[6].GetSize()[1]
- ||bufferRegionList[6].GetSize()[1]!=bufferRegionList[7].GetSize()[1]
- ||bufferRegionList[7].GetSize()[1]!=bufferRegionList[5].GetSize()[1]
- ||bufferRegionList[5].GetIndex()[1]!=bufferRegionList[6].GetIndex()[1]
- ||bufferRegionList[6].GetIndex()[1]!=bufferRegionList[7].GetIndex()[1]
- ||bufferRegionList[7].GetIndex()[1]!=bufferRegionList[5].GetIndex()[1]
- )
- {
+ if (bufferRegionList[5].GetSize()[1] != bufferRegionList[6].GetSize()[1]
+ || bufferRegionList[6].GetSize()[1] != bufferRegionList[7].GetSize()[1]
+ || bufferRegionList[7].GetSize()[1] != bufferRegionList[5].GetSize()[1]
+ || bufferRegionList[5].GetIndex()[1] != bufferRegionList[6].GetIndex()[1]
+ || bufferRegionList[6].GetIndex()[1] != bufferRegionList[7].GetIndex()[1]
+ || bufferRegionList[7].GetIndex()[1] != bufferRegionList[5].GetIndex()[1]
+ )
+ {
itkExceptionMacro("Additional buffers misaligned.");
- }
-
+ }
// Fill region 6
- for (unsigned int j = 0;j<bufferRegionList[5].GetSize()[1];++j)
- {
- if (bufferList[5]!=NULL)
+ for (unsigned int j = 0; j < bufferRegionList[5].GetSize()[1]; ++j)
{
- for (unsigned int i = 0; i<3*bufferRegionList[5].GetSize()[0];++i)
+ if (bufferList[5] != NULL)
{
- newBuffer[indexInNewBuffer]=bufferList[5][indexInBuffer6];
+ for (unsigned int i = 0; i < 3 * bufferRegionList[5].GetSize()[0]; ++i)
+ {
+ newBuffer[indexInNewBuffer] = bufferList[5][indexInBuffer6];
++indexInNewBuffer;
++indexInBuffer6;
+ }
}
- }
// Fill region 2
- if (bufferList[6]!=NULL)
- {
- for (unsigned int i = 0; i<3*bufferRegionList[6].GetSize()[0];++i)
+ if (bufferList[6] != NULL)
{
- newBuffer[indexInNewBuffer]=bufferList[6][indexInBuffer7];
+ for (unsigned int i = 0; i < 3 * bufferRegionList[6].GetSize()[0]; ++i)
+ {
+ newBuffer[indexInNewBuffer] = bufferList[6][indexInBuffer7];
++indexInNewBuffer;
++indexInBuffer7;
+ }
}
- }
// Fill region 3
- if (bufferList[7]!=NULL)
- {
- for (unsigned int i = 0; i<3*bufferRegionList[7].GetSize()[0];++i)
+ if (bufferList[7] != NULL)
{
- newBuffer[indexInNewBuffer]=bufferList[7][indexInBuffer8];
+ for (unsigned int i = 0; i < 3 * bufferRegionList[7].GetSize()[0]; ++i)
+ {
+ newBuffer[indexInNewBuffer] = bufferList[7][indexInBuffer8];
++indexInNewBuffer;
++indexInBuffer8;
+ }
}
}
- }
// Free all intermediate buffers
typename std::vector<unsigned char *>::iterator it;
- for (it=bufferList.begin();it!=bufferList.end();++it)
- {
- if ((*it)!=NULL)
+ for (it = bufferList.begin(); it != bufferList.end(); ++it)
{
- delete [] (*it);
- };
- }
+ if ((*it) != NULL)
+ {
+ delete[] (*it);
+ }
+ }
// update buffered region
m_OldBufferedRegion = m_BufferedRegion;
- m_BufferedRegion=m_DisplayExtent;
+ m_BufferedRegion = m_DisplayExtent;
// delete previous buffer
- if (m_OpenGlBuffer!=NULL)
- {
- delete [] m_OpenGlBuffer;
- }
+ if (m_OpenGlBuffer != NULL)
+ {
+ delete[] m_OpenGlBuffer;
+ }
// replace by current buffer
m_OpenGlBuffer = newBuffer;
-
//std::cout<<"Buffers merged and freed"<<std::endl;
}
@@ -1133,22 +1138,28 @@ ImageAlternateViewer<TPixel>
{
itk::TimeProbe total;
total.Start();
- if (buffer!=NULL)
- {
+ if (buffer != NULL)
+ {
// This enable negative raster pos
- glRasterPos3d(0,0,0);
+ glRasterPos3d(0, 0, 0);
double zoomOffsetX = 0;
double zoomOffsetY = 0;
- zoomOffsetX = (1-m_OpenGlIsotropicZoom)*(static_cast<double>(m_DisplayExtent.GetSize()[0]/2)-static_cast<double>(region.GetIndex()[0]));
- zoomOffsetY = (1-m_OpenGlIsotropicZoom)*( static_cast<double>(m_DisplayExtent.GetSize()[1]/2)-static_cast<double>(region.GetIndex()[1]));
-
- double movex = static_cast<double>(region.GetIndex()[0])+zoomOffsetX;
- double movey = static_cast<double>(m_DisplayExtent.GetSize()[1])-static_cast<double>(region.GetIndex()[1])-zoomOffsetY;
- glBitmap(0,0,0,0,movex,movey,NULL);
- glPixelZoom(m_OpenGlIsotropicZoom,-m_OpenGlIsotropicZoom);
-
+ zoomOffsetX =
+ (1 -
+ m_OpenGlIsotropicZoom) *
+ (static_cast<double>(m_DisplayExtent.GetSize()[0] / 2) - static_cast<double>(region.GetIndex()[0]));
+ zoomOffsetY =
+ (1 -
+ m_OpenGlIsotropicZoom) *
+ (static_cast<double>(m_DisplayExtent.GetSize()[1] / 2) - static_cast<double>(region.GetIndex()[1]));
+
+ double movex = static_cast<double>(region.GetIndex()[0]) + zoomOffsetX;
+ double movey = static_cast<double>(m_DisplayExtent.GetSize()[1]) - static_cast<double>(region.GetIndex()[1]) -
+ zoomOffsetY;
+ glBitmap(0, 0, 0, 0, movex, movey, NULL);
+ glPixelZoom(m_OpenGlIsotropicZoom, -m_OpenGlIsotropicZoom);
// display the image
glDrawPixels(region.GetSize()[0],
@@ -1159,11 +1170,10 @@ ImageAlternateViewer<TPixel>
glEnd();
swap_buffers();
glFlush();
- }
+ }
total.Stop();
}
-
template <class TPixel>
void
ImageAlternateViewer<TPixel>
@@ -1172,23 +1182,30 @@ ImageAlternateViewer<TPixel>
double zoomOffsetX = 0;
double zoomOffsetY = 0;
- zoomOffsetX = (1-m_OpenGlIsotropicZoom)*(static_cast<double>(m_DisplayExtent.GetSize()[0]/2)-static_cast<double>(region.GetIndex()[0]));
- zoomOffsetY = (1-m_OpenGlIsotropicZoom)*( static_cast<double>(m_DisplayExtent.GetSize()[1]/2)-static_cast<double>(region.GetIndex()[1]));
- double minx,maxx,miny,maxy;
-
- minx = static_cast<double>(region.GetIndex()[0])/**m_OpenGlIsotropicZoom*/+zoomOffsetX;
- maxx = minx + static_cast<double>(region.GetSize()[0])*m_OpenGlIsotropicZoom;
- miny = static_cast<double>(m_DisplayExtent.GetSize()[1])-static_cast<double>(region.GetIndex()[1])/**m_OpenGlIsotropicZoom*/-zoomOffsetY;
- maxy = miny-static_cast<double>(region.GetSize()[1])*m_OpenGlIsotropicZoom;
+ zoomOffsetX =
+ (1 -
+ m_OpenGlIsotropicZoom) *
+ (static_cast<double>(m_DisplayExtent.GetSize()[0] / 2) - static_cast<double>(region.GetIndex()[0]));
+ zoomOffsetY =
+ (1 -
+ m_OpenGlIsotropicZoom) *
+ (static_cast<double>(m_DisplayExtent.GetSize()[1] / 2) - static_cast<double>(region.GetIndex()[1]));
+ double minx, maxx, miny, maxy;
+
+ minx = static_cast<double>(region.GetIndex()[0]) /**m_OpenGlIsotropicZoom*/ + zoomOffsetX;
+ maxx = minx + static_cast<double>(region.GetSize()[0]) * m_OpenGlIsotropicZoom;
+ miny = static_cast<double>(m_DisplayExtent.GetSize()[1]) -
+ static_cast<double>(region.GetIndex()[1]) /**m_OpenGlIsotropicZoom*/ - zoomOffsetY;
+ maxy = miny - static_cast<double>(region.GetSize()[1]) * m_OpenGlIsotropicZoom;
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor3f(1,0,0);
+ glColor3f(1, 0, 0);
glBegin(GL_LINE_LOOP);
- glVertex2f(minx,miny);
- glVertex2f(minx,maxy);
- glVertex2f(maxx,maxy);
- glVertex2f(maxx,miny);
+ glVertex2f(minx, miny);
+ glVertex2f(minx, maxy);
+ glVertex2f(maxx, maxy);
+ glVertex2f(maxx, miny);
glEnd();
glDisable(GL_BLEND);
@@ -1199,14 +1216,14 @@ ImageAlternateViewer<TPixel>
::ResetOpenGlContext(void)
{
if (!this->valid())
- {
+ {
valid(1);
glLoadIdentity();
- glViewport(0,0,m_DisplayExtent.GetSize()[0],m_DisplayExtent.GetSize()[1]);
- glClearColor((float)0.0, (float)0.0, (float)0.0, (float)0.0);
+ glViewport(0, 0, m_DisplayExtent.GetSize()[0], m_DisplayExtent.GetSize()[1]);
+ glClearColor((float) 0.0, (float) 0.0, (float) 0.0, (float) 0.0);
glShadeModel(GL_SMOOTH);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- }
+ }
glClear(GL_COLOR_BUFFER_BIT); //this clears and paints to black
glMatrixMode(GL_PROJECTION);
@@ -1218,7 +1235,6 @@ ImageAlternateViewer<TPixel>
glShadeModel(GL_SMOOTH);
}
-
template <class TPixel>
unsigned char
ImageAlternateViewer<TPixel>
@@ -1226,28 +1242,28 @@ ImageAlternateViewer<TPixel>
{
PixelType max = 255;
PixelType min = 0;
- if (channelIndex<m_MaxComponentValues.GetSize())
- {
+ if (channelIndex < m_MaxComponentValues.GetSize())
+ {
max = m_MaxComponentValues[channelIndex];
- }
- if (channelIndex<m_MinComponentValues.GetSize())
- {
+ }
+ if (channelIndex < m_MinComponentValues.GetSize())
+ {
min = m_MinComponentValues[channelIndex];
- }
- if (value>=max)
- {
+ }
+ if (value >= max)
+ {
return 255;
- }
+ }
- else if (value<=min)
- {
+ else if (value <= min)
+ {
return 0;
- }
+ }
else
- {
- return static_cast<unsigned char>(255.*static_cast<double>(value-min)
- /static_cast<double>(max-min));
- }
+ {
+ return static_cast<unsigned char>(255. * static_cast<double>(value - min)
+ / static_cast<double>(max - min));
+ }
}
/**
* PrintSelf Method
diff --git a/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h b/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h
index ce3dc5b8b6..4d34a3912b 100644
--- a/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h
+++ b/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h
@@ -35,22 +35,21 @@ namespace Functor
* \sa StandardImageViewer
*
*/
-template <class TInputPixel1,class TInputPixel2,class TOutputPixel>
+template <class TInputPixel1, class TInputPixel2, class TOutputPixel>
class GrayscaleAnaglyphFunctor
{
public:
/// Constructor
- GrayscaleAnaglyphFunctor() {};
+ GrayscaleAnaglyphFunctor() {}
/// Destructor
- virtual ~GrayscaleAnaglyphFunctor() {};
+ virtual ~GrayscaleAnaglyphFunctor() {}
-
- inline TOutputPixel operator()(const TInputPixel1& pixel1, const TInputPixel2& pixel2)
+ inline TOutputPixel operator ()(const TInputPixel1& pixel1, const TInputPixel2& pixel2)
{
TOutputPixel result(3);
- result[0]=static_cast<typename TOutputPixel::ValueType>(pixel1);
- result[1]=static_cast<typename TOutputPixel::ValueType>(pixel2);
- result[2]=static_cast<typename TOutputPixel::ValueType>(pixel2);
+ result[0] = static_cast<typename TOutputPixel::ValueType>(pixel1);
+ result[1] = static_cast<typename TOutputPixel::ValueType>(pixel2);
+ result[2] = static_cast<typename TOutputPixel::ValueType>(pixel2);
return result;
}
};
@@ -64,27 +63,27 @@ public:
*/
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT ImageToGrayscaleAnaglyphImageFilter
- : public itk::BinaryFunctorImageFilter
- < TInputImage1,TInputImage2,TOutputImage,
- Functor::GrayscaleAnaglyphFunctor<
- typename TInputImage1::PixelType,
- typename TInputImage2::PixelType,
- typename TOutputImage::PixelType
- > >
+ : public itk::BinaryFunctorImageFilter
+ <TInputImage1, TInputImage2, TOutputImage,
+ Functor::GrayscaleAnaglyphFunctor<
+ typename TInputImage1::PixelType,
+ typename TInputImage2::PixelType,
+ typename TOutputImage::PixelType
+ > >
{
public:
/** Standard typedefs */
- typedef ImageToGrayscaleAnaglyphImageFilter Self;
+ typedef ImageToGrayscaleAnaglyphImageFilter Self;
typedef itk::BinaryFunctorImageFilter
- < TInputImage1,TInputImage2,TOutputImage,
- Functor::GrayscaleAnaglyphFunctor<
- typename TInputImage1::PixelType,
- typename TInputImage2::PixelType,
- typename TOutputImage::PixelType
- > > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ <TInputImage1, TInputImage2, TOutputImage,
+ Functor::GrayscaleAnaglyphFunctor<
+ typename TInputImage1::PixelType,
+ typename TInputImage2::PixelType,
+ typename TOutputImage::PixelType
+ > > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -101,16 +100,16 @@ protected:
/** Constructor */
ImageToGrayscaleAnaglyphImageFilter() {};
/** Destructor */
- virtual ~ImageToGrayscaleAnaglyphImageFilter() {};
+ virtual ~ImageToGrayscaleAnaglyphImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- };
+ Superclass::PrintSelf(os, indent);
+ }
private:
- ImageToGrayscaleAnaglyphImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageToGrayscaleAnaglyphImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/Visu/otbImageViewer.h b/Code/Visu/otbImageViewer.h
index bff205b2e8..57981bd3b9 100644
--- a/Code/Visu/otbImageViewer.h
+++ b/Code/Visu/otbImageViewer.h
@@ -53,21 +53,21 @@ namespace otb
*/
template <class TPixel, class TLabel = double>
class ITK_EXPORT ImageViewer
- : public ImageViewerBase<TPixel,TLabel>
+ : public ImageViewerBase<TPixel, TLabel>
{
public:
/** Standard class typedefs */
- typedef ImageViewer Self;
- typedef ImageViewerBase<TPixel,TLabel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageViewer Self;
+ typedef ImageViewerBase<TPixel, TLabel> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
typedef typename Superclass::ViewModelType ViewModelType;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(ImageViewer,ImageViewerBase);
+ itkTypeMacro(ImageViewer, ImageViewerBase);
/** Show the viewer */
virtual void Show(void);
@@ -85,15 +85,15 @@ protected:
virtual ~ImageViewer();
private:
- ImageViewer(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageViewer(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/// Fltk surrounding windows
- Fl_Window * m_FullWindow;
- Fl_Window * m_ScrollWindow;
- Fl_Window * m_ZoomWindow;
- Fl_Window * m_PixLocWindow;
- Fl_Window * m_HistogramWindow;
+ Fl_Window * m_FullWindow;
+ Fl_Window * m_ScrollWindow;
+ Fl_Window * m_ZoomWindow;
+ Fl_Window * m_PixLocWindow;
+ Fl_Window * m_HistogramWindow;
Fl_Multiline_Output * m_PixLocOutput;
};
} // end namespace otb
diff --git a/Code/Visu/otbImageViewer.txx b/Code/Visu/otbImageViewer.txx
index 7ca4b4f8ad..5b75be8c10 100644
--- a/Code/Visu/otbImageViewer.txx
+++ b/Code/Visu/otbImageViewer.txx
@@ -23,69 +23,69 @@ namespace otb
{
/// Constructor
template <class TPixel, class TLabel>
-ImageViewer<TPixel,TLabel>
+ImageViewer<TPixel, TLabel>
::ImageViewer()
{
- m_FullWindow=NULL;
- m_ZoomWindow=NULL;
- m_ScrollWindow=NULL;
- m_HistogramWindow=NULL;
- m_PixLocWindow=NULL;
- m_PixLocOutput=NULL;
+ m_FullWindow = NULL;
+ m_ZoomWindow = NULL;
+ m_ScrollWindow = NULL;
+ m_HistogramWindow = NULL;
+ m_PixLocWindow = NULL;
+ m_PixLocOutput = NULL;
}
/// Destructor
template <class TPixel, class TLabel>
-ImageViewer<TPixel,TLabel>
+ImageViewer<TPixel, TLabel>
::~ImageViewer()
{
- if (m_HistogramWindow!=NULL)
- {
+ if (m_HistogramWindow != NULL)
+ {
m_HistogramWindow->remove(this->GetRedHistogramWidget());
if (this->GetFullWidget()->GetViewModel() == Superclass::ScrollWidgetType::RGB)
- {
+ {
m_HistogramWindow->remove(this->GetGreenHistogramWidget());
m_HistogramWindow->remove(this->GetBlueHistogramWidget());
- }
+ }
delete m_HistogramWindow;
m_HistogramWindow = NULL;
- }
+ }
- if (m_FullWindow!=NULL)
- {
+ if (m_FullWindow != NULL)
+ {
m_FullWindow->remove(this->GetFullWidget());
delete m_FullWindow;
m_FullWindow = NULL;
- }
- if (m_ZoomWindow!=NULL)
- {
+ }
+ if (m_ZoomWindow != NULL)
+ {
m_ZoomWindow->remove(this->GetZoomWidget());
delete m_ZoomWindow;
m_ZoomWindow = NULL;
- }
- if (m_ScrollWindow!=NULL)
- {
+ }
+ if (m_ScrollWindow != NULL)
+ {
m_ScrollWindow->remove(this->GetScrollWidget());
delete m_ScrollWindow;
m_ScrollWindow = NULL;
- }
+ }
- if (m_PixLocWindow!=NULL)
- {
+ if (m_PixLocWindow != NULL)
+ {
m_PixLocWindow->remove(m_PixLocOutput);
delete m_PixLocWindow;
m_PixLocWindow = NULL;
- }
- if (m_PixLocOutput!=NULL)
- {
+ }
+ if (m_PixLocOutput != NULL)
+ {
delete m_PixLocOutput;
m_PixLocOutput = NULL;
- }
+ }
}
/// Build the HMI
template <class TPixel, class TLabel>
void
-ImageViewer<TPixel,TLabel>
+ImageViewer<TPixel, TLabel>
::Build(void)
{
Superclass::Build();
@@ -95,19 +95,18 @@ ImageViewer<TPixel,TLabel>
int hfull = this->GetFullWidget()->h();
oss.str("");
- oss<<this->GetLabel()<<" - Full Window";
- m_FullWindow = new Fl_Window(0,0,wfull,hfull,"");
+ oss << this->GetLabel() << " - Full Window";
+ m_FullWindow = new Fl_Window(0, 0, wfull, hfull, "");
m_FullWindow->copy_label(oss.str().c_str());
m_FullWindow->add(this->GetFullWidget());
m_FullWindow->resizable(this->GetFullWidget());
m_FullWindow->end();
-
oss.str("");
- oss<<this->GetLabel()<<" - Histograms and transfer functions";
+ oss << this->GetLabel() << " - Histograms and transfer functions";
if (this->GetViewModel() == Superclass::ScrollWidgetType::RGB)
- {
- m_HistogramWindow = new Fl_Window(0,hfull,3*this->GetRedHistogramWidget()->w(),this->GetRedHistogramWidget()->h());
+ {
+ m_HistogramWindow = new Fl_Window(0, hfull, 3*this->GetRedHistogramWidget()->w(), this->GetRedHistogramWidget()->h());
m_HistogramWindow->add(this->GetRedHistogramWidget());
m_HistogramWindow->add(this->GetGreenHistogramWidget());
m_HistogramWindow->add(this->GetBlueHistogramWidget());
@@ -115,60 +114,60 @@ ImageViewer<TPixel,TLabel>
0,
this->GetGreenHistogramWidget()->w(),
this->GetGreenHistogramWidget()->h());
- this->GetBlueHistogramWidget()->resize(2*this->GetRedHistogramWidget()->w(),
+ this->GetBlueHistogramWidget()->resize(2 * this->GetRedHistogramWidget()->w(),
0,
this->GetBlueHistogramWidget()->w(),
this->GetBlueHistogramWidget()->h());
m_HistogramWindow->resizable(m_HistogramWindow);
m_HistogramWindow->end();
- }
+ }
else
- {
- m_HistogramWindow = new Fl_Window(0,hfull,this->GetRedHistogramWidget()->w(),this->GetRedHistogramWidget()->h());
+ {
+ m_HistogramWindow = new Fl_Window(0, hfull, this->GetRedHistogramWidget()->w(), this->GetRedHistogramWidget()->h());
m_HistogramWindow->add(this->GetRedHistogramWidget());
m_HistogramWindow->resizable(this->GetRedHistogramWidget());
m_HistogramWindow->end();
- }
+ }
m_HistogramWindow->copy_label(oss.str().c_str());
-
int hscroll = 0;
int wscroll = 0;
if (this->GetUseScroll())
- {
+ {
// Create the scroll windows
wscroll = this->GetScrollWidget()->w();
hscroll = this->GetScrollWidget()->h();
oss.str("");
- oss<<this->GetLabel()<<" - Scroll Window";
- m_ScrollWindow = new Fl_Window(wfull+15,0,wscroll,hscroll,"");
+ oss << this->GetLabel() << " - Scroll Window";
+ m_ScrollWindow = new Fl_Window(wfull + 15, 0, wscroll, hscroll, "");
m_ScrollWindow->copy_label(oss.str().c_str());
m_ScrollWindow->add(this->GetScrollWidget());
m_ScrollWindow->resizable(this->GetScrollWidget());
m_ScrollWindow->end();
- }
+ }
// Create the zoom window
- std::string zoomLabel=this->GetLabel();
+ std::string zoomLabel = this->GetLabel();
zoomLabel.append(" - Zoom Window (X4)");
- m_ZoomWindow = new Fl_Window(wfull+15,hscroll+110,this->GetZoomMaxInitialSize(),this->GetZoomMaxInitialSize(),"");
+ m_ZoomWindow = new Fl_Window(wfull + 15, hscroll + 110, this->GetZoomMaxInitialSize(),
+ this->GetZoomMaxInitialSize(), "");
m_ZoomWindow->copy_label(zoomLabel.c_str());
m_ZoomWindow->add(this->GetZoomWidget());
m_ZoomWindow->resizable(this->GetZoomWidget());
m_ZoomWindow->end();
- std::string pixLocLabel=this->GetLabel();
+ std::string pixLocLabel = this->GetLabel();
pixLocLabel.append("Pixel location & values");
- m_PixLocWindow= new Fl_Window(wfull+15,hscroll+50,(wscroll<100 ? 100 : wscroll),40,"");
- m_PixLocOutput = new Fl_Multiline_Output(0,0,(wscroll<100 ? 100 : wscroll),40,"");
+ m_PixLocWindow = new Fl_Window(wfull + 15, hscroll + 50, (wscroll < 100 ? 100 : wscroll), 40, "");
+ m_PixLocOutput = new Fl_Multiline_Output(0, 0, (wscroll < 100 ? 100 : wscroll), 40, "");
m_PixLocWindow->copy_label(pixLocLabel.c_str());
m_PixLocWindow->resizable(m_PixLocOutput);
m_PixLocOutput->textsize(10);
- m_PixLocOutput->box(FL_EMBOSSED_BOX );
+ m_PixLocOutput->box(FL_EMBOSSED_BOX);
m_PixLocWindow->end();
this->SetPixLocOutput(m_PixLocOutput);
}
@@ -176,17 +175,17 @@ ImageViewer<TPixel,TLabel>
/// Show the app
template <class TPixel, class TLabel>
void
-ImageViewer<TPixel,TLabel>
+ImageViewer<TPixel, TLabel>
::Show(void)
{
if (!this->GetBuilt())
- {
+ {
this->Build();
- }
+ }
if (this->GetUseScroll())
- {
+ {
m_ScrollWindow->show();
- }
+ }
m_FullWindow->show();
m_ZoomWindow->show();
m_PixLocWindow->show();
@@ -199,14 +198,14 @@ ImageViewer<TPixel,TLabel>
/// Hide the app
template <class TPixel, class TLabel>
void
-ImageViewer<TPixel,TLabel>
+ImageViewer<TPixel, TLabel>
::Hide(void)
{
Superclass::Hide();
if (this->GetUseScroll())
- {
+ {
m_ScrollWindow->hide();
- }
+ }
m_FullWindow->hide();
m_ZoomWindow->hide();
m_PixLocWindow->hide();
@@ -217,15 +216,15 @@ ImageViewer<TPixel,TLabel>
template <class TPixel, class TLabel>
void
-ImageViewer<TPixel,TLabel>
+ImageViewer<TPixel, TLabel>
::Update(void)
{
itk::OStringStream oss;
- oss<<this->GetLabel()<<" - Zoom Window (X"<<this->GetZoomWidget()->GetOpenGlIsotropicZoom()<<")";
+ oss << this->GetLabel() << " - Zoom Window (X" << this->GetZoomWidget()->GetOpenGlIsotropicZoom() << ")";
if (oss.good())
- {
+ {
m_ZoomWindow->copy_label(oss.str().c_str());
- }
+ }
m_ZoomWindow->redraw();
Superclass::Update();
}
diff --git a/Code/Visu/otbImageViewerBase.h b/Code/Visu/otbImageViewerBase.h
index 0b98c39ca3..78c3e9c64a 100644
--- a/Code/Visu/otbImageViewerBase.h
+++ b/Code/Visu/otbImageViewerBase.h
@@ -70,82 +70,87 @@ namespace otb
*/
template <class TPixel, class TLabel = double>
class ITK_EXPORT ImageViewerBase
- : public itk::ProcessObject
+ : public itk::ProcessObject
{
public:
/** Standard class typedefs */
- typedef ImageViewerBase Self;
- typedef itk::ProcessObject Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageViewerBase Self;
+ typedef itk::ProcessObject Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
/** Run-time type information (and related methods). */
- itkTypeMacro(ImageViewerBase,itk::ProcessObject);
+ itkTypeMacro(ImageViewerBase, itk::ProcessObject);
/// Template pixel type
- typedef TPixel InputPixelType;
- typedef TLabel LabelType;
- typedef otb::ImageViewerScrollWidget<InputPixelType,LabelType> ScrollWidgetType;
- typedef otb::ImageViewerZoomWidget<InputPixelType,LabelType> ZoomWidgetType;
- typedef otb::ImageViewerFullWidget<InputPixelType,LabelType> FullWidgetType;
- typedef Fl_Output * FlOutputPointerType;
-
- typedef typename ScrollWidgetType::ImageType ImageType;
- typedef typename ScrollWidgetType::OverlayImageType OverlayImageType;
- typedef typename ScrollWidgetType::TransferFunctionListType TransferFunctionListType;
- typedef typename TransferFunctionListType::Pointer TransferFunctionListPointerType;
+ typedef TPixel InputPixelType;
+ typedef TLabel LabelType;
+ typedef otb::ImageViewerScrollWidget<InputPixelType, LabelType> ScrollWidgetType;
+ typedef otb::ImageViewerZoomWidget<InputPixelType, LabelType> ZoomWidgetType;
+ typedef otb::ImageViewerFullWidget<InputPixelType, LabelType> FullWidgetType;
+ typedef Fl_Output * FlOutputPointerType;
+
+ typedef typename ScrollWidgetType::ImageType ImageType;
+ typedef typename ScrollWidgetType::OverlayImageType OverlayImageType;
+ typedef typename ScrollWidgetType::TransferFunctionListType TransferFunctionListType;
+ typedef typename TransferFunctionListType::Pointer TransferFunctionListPointerType;
typedef typename ScrollWidgetType::AffineTransferFunctionType AffineTransferFunctionType;
- typedef typename ImageType::Pointer ImagePointerType;
- typedef typename OverlayImageType::Pointer OverlayImagePointerType;
- typedef typename ImageType::IndexType IndexType;
- typedef typename ImageType::PointType PointType;
- typedef typename ImageType::SizeType SizeType;
- typedef typename ImageType::PixelType PixelType;
- typedef typename ImageType::RegionType RegionType;
- typedef typename ImageType::OffsetType OffsetType;
- typedef typename ScrollWidgetType::VectorPixelType VectorPixelType;
- typedef typename ScrollWidgetType::ViewModelType ViewModelType;
- typedef typename ScrollWidgetType::Pointer ScrollWidgetPointerType;
- typedef typename ZoomWidgetType::Pointer ZoomWidgetPointerType;
- typedef typename FullWidgetType::Pointer FullWidgetPointerType;
- itkStaticConstMacro(ImageDimension,unsigned int,ImageType::ImageDimension);
-
-
- typedef itk::ImageRegionConstIterator< ImageType > InputIteratorType;
- typedef itk::Vector<typename itk::NumericTraits<InputPixelType>::RealType,1> MeasurementVectorType;
- typedef itk::Statistics::ListSample<MeasurementVectorType> ListSampleType;
- typedef float HistogramMeasurementType;
- typedef itk::Statistics::ListSampleToHistogramGenerator<ListSampleType,HistogramMeasurementType,
- itk::Statistics::DenseFrequencyContainer,1> HistogramGeneratorType;
- typedef otb::ObjectList<ListSampleType> ListSampleListType;
- typedef otb::ObjectList<HistogramGeneratorType> HistogramGeneratorListType;
- typedef typename HistogramGeneratorListType::Pointer HistogramGeneratorListPointerType;
+ typedef typename ImageType::Pointer ImagePointerType;
+ typedef typename OverlayImageType::Pointer OverlayImagePointerType;
+ typedef typename ImageType::IndexType IndexType;
+ typedef typename ImageType::PointType PointType;
+ typedef typename ImageType::SizeType SizeType;
+ typedef typename ImageType::PixelType PixelType;
+ typedef typename ImageType::RegionType RegionType;
+ typedef typename ImageType::OffsetType OffsetType;
+ typedef typename ScrollWidgetType::VectorPixelType VectorPixelType;
+ typedef typename ScrollWidgetType::ViewModelType ViewModelType;
+ typedef typename ScrollWidgetType::Pointer ScrollWidgetPointerType;
+ typedef typename ZoomWidgetType::Pointer ZoomWidgetPointerType;
+ typedef typename FullWidgetType::Pointer FullWidgetPointerType;
+ itkStaticConstMacro(ImageDimension, unsigned int, ImageType::ImageDimension);
+
+ typedef itk::ImageRegionConstIterator<ImageType> InputIteratorType;
+ typedef itk::Vector<typename itk::NumericTraits<InputPixelType>::RealType, 1> MeasurementVectorType;
+ typedef itk::Statistics::ListSample<MeasurementVectorType> ListSampleType;
+ typedef float HistogramMeasurementType;
+ typedef itk::Statistics::ListSampleToHistogramGenerator<ListSampleType, HistogramMeasurementType,
+ itk::Statistics::DenseFrequencyContainer,
+ 1> HistogramGeneratorType;
+ typedef otb::ObjectList<ListSampleType>
+ ListSampleListType;
+ typedef otb::ObjectList<HistogramGeneratorType>
+ HistogramGeneratorListType;
+ typedef typename HistogramGeneratorListType::Pointer
+ HistogramGeneratorListPointerType;
typedef typename HistogramGeneratorType::HistogramType HistogramType;
- typedef otb::ImageViewerHistogramAndTransferFunctionWidget<HistogramType,InputPixelType,LabelType> HistogramWidgetType;
- typedef typename HistogramWidgetType::Pointer HistogramWidgetPointerType;
+ typedef otb::ImageViewerHistogramAndTransferFunctionWidget<HistogramType, InputPixelType,
+ LabelType> HistogramWidgetType;
+ typedef typename HistogramWidgetType::Pointer
+ HistogramWidgetPointerType;
/// Support for conversion from otb::Image to otb::VectorImage
- typedef typename PixelType::ValueType ValueType;
- typedef otb::Image<ValueType,ImageDimension> SingleImageType;
- typedef typename SingleImageType::Pointer SingleImagePointerType;
- typedef otb::ImageToVectorImageCastFilter<SingleImageType,ImageType> VectorCastFilterType;
- typedef typename VectorCastFilterType::Pointer VectorCastFilterPointerType;
+ typedef typename PixelType::ValueType ValueType;
+ typedef otb::Image<ValueType, ImageDimension> SingleImageType;
+ typedef typename SingleImageType::Pointer SingleImagePointerType;
+ typedef otb::ImageToVectorImageCastFilter<SingleImageType, ImageType> VectorCastFilterType;
+ typedef typename VectorCastFilterType::Pointer VectorCastFilterPointerType;
/// Definition of streaming shrink image filter
- typedef otb::StreamingShrinkImageFilter<ImageType,ImageType> ShrinkFilterType;
- typedef typename ShrinkFilterType::Pointer ShrinkFilterPointerType;
- typedef otb::StreamingShrinkImageFilter<OverlayImageType,OverlayImageType> OverlayShrinkFilterType;
- typedef typename OverlayShrinkFilterType::Pointer OverlayShrinkFilterPointerType;
+ typedef otb::StreamingShrinkImageFilter<ImageType, ImageType> ShrinkFilterType;
+ typedef typename ShrinkFilterType::Pointer ShrinkFilterPointerType;
+ typedef otb::StreamingShrinkImageFilter<OverlayImageType, OverlayImageType> OverlayShrinkFilterType;
+ typedef typename OverlayShrinkFilterType::Pointer OverlayShrinkFilterPointerType;
/// Definition of box form to represent displayed regions.
- typedef otb::ImageWidgetBoxForm BoxType;
+ typedef otb::ImageWidgetBoxForm BoxType;
typedef typename BoxType::Pointer BoxPointerType;
/// List of linked viewer typedef
- typedef otb::ObjectList<Self> ViewerListType;
+ typedef otb::ObjectList<Self> ViewerListType;
typedef typename ViewerListType::Pointer ViewerListPointerType;
/// Linked viewer offset list
@@ -153,94 +158,94 @@ public:
/// Type for the overlay list
typedef typename FullWidgetType::FormListType FormListType;
- typedef typename FormListType::Pointer FormListPointerType;
- typedef typename FormListType::Iterator FormListIteratorType;
+ typedef typename FormListType::Pointer FormListPointerType;
+ typedef typename FormListType::Iterator FormListIteratorType;
/// type for the list of the polygon ROI
- typedef otb::Polygon<LabelType> PolygonType;
+ typedef otb::Polygon<LabelType> PolygonType;
typedef typename PolygonType::VertexListConstIteratorType PolygonIteratorType;
- typedef otb::ObjectList<PolygonType> PolygonListType;
- typedef typename PolygonListType::Pointer PolygonListPointerType;
- typedef typename PolygonListType::Iterator PolygonListIteratorType;
- typedef ImageWidgetPolygonForm<LabelType> ImageWidgetPolygonFormType;
- typedef typename ImageWidgetPolygonFormType::Pointer ImageWidgetPolygonFormPointerType;
- typedef typename ImageWidgetPolygonFormType::ColorType ColorType;
- typedef ImageWidgetCircleForm ImageWidgetCircleFormType;
- typedef typename ImageWidgetCircleFormType::Pointer ImageWidgetCircleFormPointerType;
- typedef std::map<LabelType,ColorType> ROIColorMapType;
-
- typedef otb::PolyLineParametricPathWithValue<double,2> PathType;
- typedef typename PathType::VertexListConstIteratorType PathIteratorType;
- typedef otb::ObjectList<PathType> PathListType;
- typedef typename PathListType::Pointer PathListPointerType;
- typedef typename PathListType::Iterator PathListIteratorType;
- typedef ImageWidgetPolylineForm<double> ImageWidgetPolylineFormType;
- typedef typename ImageWidgetPolylineFormType::Pointer ImageWidgetPolylineFormPointerType;
+ typedef otb::ObjectList<PolygonType> PolygonListType;
+ typedef typename PolygonListType::Pointer PolygonListPointerType;
+ typedef typename PolygonListType::Iterator PolygonListIteratorType;
+ typedef ImageWidgetPolygonForm<LabelType> ImageWidgetPolygonFormType;
+ typedef typename ImageWidgetPolygonFormType::Pointer ImageWidgetPolygonFormPointerType;
+ typedef typename ImageWidgetPolygonFormType::ColorType ColorType;
+ typedef ImageWidgetCircleForm ImageWidgetCircleFormType;
+ typedef typename ImageWidgetCircleFormType::Pointer ImageWidgetCircleFormPointerType;
+ typedef std::map<LabelType, ColorType> ROIColorMapType;
+
+ typedef otb::PolyLineParametricPathWithValue<double, 2> PathType;
+ typedef typename PathType::VertexListConstIteratorType PathIteratorType;
+ typedef otb::ObjectList<PathType> PathListType;
+ typedef typename PathListType::Pointer PathListPointerType;
+ typedef typename PathListType::Iterator PathListIteratorType;
+ typedef ImageWidgetPolylineForm<double> ImageWidgetPolylineFormType;
+ typedef typename ImageWidgetPolylineFormType::Pointer ImageWidgetPolylineFormPointerType;
/// Accessors
- itkGetMacro(Built,bool);
- itkGetMacro(ShrinkFactor,unsigned int);
- itkSetMacro(RedChannelIndex,unsigned int);
- itkGetMacro(RedChannelIndex,unsigned int);
- itkSetMacro(GreenChannelIndex,unsigned int);
- itkGetMacro(GreenChannelIndex,unsigned int);
- itkSetMacro(BlueChannelIndex,unsigned int);
- itkGetMacro(BlueChannelIndex,unsigned int);
- itkSetMacro(Label,std::string);
- itkGetMacro(Label,std::string);
- itkSetMacro(QuicklookRatioCoef,double);
- itkGetMacro(QuicklookRatioCoef,double);
- itkSetMacro(NormalizationFactor,double);
- itkGetMacro(NormalizationFactor,double);
- itkGetMacro(Updating,bool);
- itkGetMacro(UseScroll,bool);
+ itkGetMacro(Built, bool);
+ itkGetMacro(ShrinkFactor, unsigned int);
+ itkSetMacro(RedChannelIndex, unsigned int);
+ itkGetMacro(RedChannelIndex, unsigned int);
+ itkSetMacro(GreenChannelIndex, unsigned int);
+ itkGetMacro(GreenChannelIndex, unsigned int);
+ itkSetMacro(BlueChannelIndex, unsigned int);
+ itkGetMacro(BlueChannelIndex, unsigned int);
+ itkSetMacro(Label, std::string);
+ itkGetMacro(Label, std::string);
+ itkSetMacro(QuicklookRatioCoef, double);
+ itkGetMacro(QuicklookRatioCoef, double);
+ itkSetMacro(NormalizationFactor, double);
+ itkGetMacro(NormalizationFactor, double);
+ itkGetMacro(Updating, bool);
+ itkGetMacro(UseScroll, bool);
itkGetObjectMacro(PolygonROIList, PolygonListType);
itkSetObjectMacro(PolygonROIList, PolygonListType);
itkGetObjectMacro(PathList, PathListType);
itkSetObjectMacro(PathList, PathListType);
- itkGetObjectMacro(InterfaceBoxesList,FormListType);
- itkSetObjectMacro(InterfaceBoxesList,FormListType);
- itkSetMacro(InterfaceBoxesColor,ColorType);
- itkGetMacro(InterfaceBoxesColor,ColorType);
- itkSetMacro(DefaultROIColor,ColorType);
- itkGetMacro(DefaultROIColor,ColorType);
- itkSetMacro(NextROILabel,LabelType);
- itkGetMacro(NextROILabel,LabelType);
- itkGetMacro(FullWidget,FullWidgetPointerType);
- itkGetMacro(ScrollWidget,ScrollWidgetPointerType);
- itkGetMacro(ZoomWidget,ZoomWidgetPointerType);
- itkGetMacro(RedHistogramWidget,HistogramWidgetPointerType);
- itkGetMacro(GreenHistogramWidget,HistogramWidgetPointerType);
- itkGetMacro(BlueHistogramWidget,HistogramWidgetPointerType);
- itkGetMacro(ZoomMaxInitialSize,unsigned int);
- itkSetMacro(ZoomMaxInitialSize,unsigned int);
- itkGetMacro(ScrollMaxInitialSize,unsigned int);
- itkSetMacro(ScrollMaxInitialSize,unsigned int);
- itkGetMacro(FullMaxInitialSize,unsigned int);
- itkSetMacro(FullMaxInitialSize,unsigned int);
- itkSetMacro(ScrollLimitSize,unsigned int);
- itkGetMacro(ScrollLimitSize,unsigned int);
- itkGetMacro(PixLocOutput,FlOutputPointerType);
- itkSetMacro(PixLocOutput,FlOutputPointerType);
- itkSetMacro(RectangularROISelectionMode,bool);
- itkGetMacro(RectangularROISelectionMode,bool);
- itkSetMacro(PolygonalROISelectionMode,bool);
- itkGetMacro(PolygonalROISelectionMode,bool);
- itkGetObjectMacro(InputImage,ImageType);
- itkGetMacro(ImageGeometry,double);
- itkSetMacro(ShowZoomWidget,bool);
- itkGetMacro(ShowZoomWidget,bool);
- itkSetMacro(ShowFullWidget,bool);
- itkGetMacro(ShowFullWidget,bool);
- itkSetMacro(ShowScrollWidget,bool);
- itkGetMacro(ShowScrollWidget,bool);
- itkSetMacro(UseImageOverlay,bool);
- itkGetMacro(UseImageOverlay,bool);
- itkSetMacro(ShowHistograms,bool);
- itkGetMacro(ShowHistograms,bool);
- itkGetObjectMacro(TransferFunctionList,TransferFunctionListType);
- itkSetMacro(LineWidth,double);
- itkGetMacro(LineWidth,double);
+ itkGetObjectMacro(InterfaceBoxesList, FormListType);
+ itkSetObjectMacro(InterfaceBoxesList, FormListType);
+ itkSetMacro(InterfaceBoxesColor, ColorType);
+ itkGetMacro(InterfaceBoxesColor, ColorType);
+ itkSetMacro(DefaultROIColor, ColorType);
+ itkGetMacro(DefaultROIColor, ColorType);
+ itkSetMacro(NextROILabel, LabelType);
+ itkGetMacro(NextROILabel, LabelType);
+ itkGetMacro(FullWidget, FullWidgetPointerType);
+ itkGetMacro(ScrollWidget, ScrollWidgetPointerType);
+ itkGetMacro(ZoomWidget, ZoomWidgetPointerType);
+ itkGetMacro(RedHistogramWidget, HistogramWidgetPointerType);
+ itkGetMacro(GreenHistogramWidget, HistogramWidgetPointerType);
+ itkGetMacro(BlueHistogramWidget, HistogramWidgetPointerType);
+ itkGetMacro(ZoomMaxInitialSize, unsigned int);
+ itkSetMacro(ZoomMaxInitialSize, unsigned int);
+ itkGetMacro(ScrollMaxInitialSize, unsigned int);
+ itkSetMacro(ScrollMaxInitialSize, unsigned int);
+ itkGetMacro(FullMaxInitialSize, unsigned int);
+ itkSetMacro(FullMaxInitialSize, unsigned int);
+ itkSetMacro(ScrollLimitSize, unsigned int);
+ itkGetMacro(ScrollLimitSize, unsigned int);
+ itkGetMacro(PixLocOutput, FlOutputPointerType);
+ itkSetMacro(PixLocOutput, FlOutputPointerType);
+ itkSetMacro(RectangularROISelectionMode, bool);
+ itkGetMacro(RectangularROISelectionMode, bool);
+ itkSetMacro(PolygonalROISelectionMode, bool);
+ itkGetMacro(PolygonalROISelectionMode, bool);
+ itkGetObjectMacro(InputImage, ImageType);
+ itkGetMacro(ImageGeometry, double);
+ itkSetMacro(ShowZoomWidget, bool);
+ itkGetMacro(ShowZoomWidget, bool);
+ itkSetMacro(ShowFullWidget, bool);
+ itkGetMacro(ShowFullWidget, bool);
+ itkSetMacro(ShowScrollWidget, bool);
+ itkGetMacro(ShowScrollWidget, bool);
+ itkSetMacro(UseImageOverlay, bool);
+ itkGetMacro(UseImageOverlay, bool);
+ itkSetMacro(ShowHistograms, bool);
+ itkGetMacro(ShowHistograms, bool);
+ itkGetObjectMacro(TransferFunctionList, TransferFunctionListType);
+ itkSetMacro(LineWidth, double);
+ itkGetMacro(LineWidth, double);
/** Set the input image (VectorImage version) */
virtual void SetImage(ImageType * img);
@@ -371,15 +376,14 @@ public:
* \param label The label
* \param color the color to associate the label with
*/
- virtual void AddROIColorMapEntry(const LabelType &label, const ColorType &color);
-
+ virtual void AddROIColorMapEntry(const LabelType& label, const ColorType& color);
/**
* Remove a new color-label combination in the ROI color map. If the label
* is not present, does nothing.
* \param label The label
*/
- virtual void RemoveROIColorMapEntry(const LabelType &label);
+ virtual void RemoveROIColorMapEntry(const LabelType& label);
/**
* Fill the color parameter with the color entry associated with the label. Returns
@@ -388,22 +392,19 @@ public:
* \param color The color
* \return true if the label was found.
*/
- virtual bool GetROIColorMapEntry(const LabelType &label, ColorType &color);
-
+ virtual bool GetROIColorMapEntry(const LabelType& label, ColorType& color);
/**
* Clear the ROI color map.
*/
virtual void ClearROIColorMap(void);
-
/**
* Set the image overlay opacity of all widgets
* \param opacity
*/
virtual void SetImageOverlayOpacity(unsigned char opacity);
-
protected:
/**
@@ -419,7 +420,7 @@ protected:
* \param viewer The viewer to link with.
* \param backwardLinkFlag Link back to this viewer.
*/
- virtual void Unlink(Self * viewer,bool backwardLinkFlag);
+ virtual void Unlink(Self * viewer, bool backwardLinkFlag);
// Constructor and destructor
ImageViewerBase();
@@ -429,8 +430,8 @@ protected:
double m_LineWidth;
private:
- ImageViewerBase(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageViewerBase(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/// Label
std::string m_Label;
@@ -462,10 +463,10 @@ private:
/// Image geomerty ratio
double m_ImageGeometry;
/// Limit size for the scroll view
- unsigned int m_ScrollLimitSize;
+ unsigned int m_ScrollLimitSize;
FlOutputPointerType m_PixLocOutput;
/// Pointer to the shrink filters
- ShrinkFilterPointerType m_Shrink;
+ ShrinkFilterPointerType m_Shrink;
OverlayShrinkFilterPointerType m_ShrinkOverlay;
/// The shrink factor
@@ -477,9 +478,9 @@ private:
unsigned int m_GreenChannelIndex;
unsigned int m_BlueChannelIndex;
/// Quicklook quality factor
- double m_QuicklookRatioCoef;
+ double m_QuicklookRatioCoef;
/// Normalization quality factor
- double m_NormalizationFactor;
+ double m_NormalizationFactor;
/// Converter from otb::Image to otb::VectorImage
VectorCastFilterPointerType m_VectorCastFilter;
VectorCastFilterPointerType m_VectorCastFilterOverlay;
@@ -521,7 +522,6 @@ private:
};
-
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
diff --git a/Code/Visu/otbImageViewerBase.txx b/Code/Visu/otbImageViewerBase.txx
index 2b68425878..6b1f97fa2d 100644
--- a/Code/Visu/otbImageViewerBase.txx
+++ b/Code/Visu/otbImageViewerBase.txx
@@ -29,7 +29,7 @@ namespace otb
{
/// Constructor
template <class TPixel, class TLabel>
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::ImageViewerBase()
{
m_UseScroll = false;
@@ -38,22 +38,22 @@ ImageViewerBase<TPixel,TLabel>
m_ZoomMaxInitialSize = 200;
m_ImageGeometry = 1.0;
m_ScrollLimitSize = 600;
- m_InterfaceBoxesColor[0]=1.0;
- m_InterfaceBoxesColor[1]=0;
- m_InterfaceBoxesColor[2]=0;
- m_DefaultROIColor[0]=0;
- m_InterfaceBoxesColor[3]=1.0;
- m_DefaultROIColor[1]=0;
- m_DefaultROIColor[2]=1.0;
- m_DefaultROIColor[3]=0.5;
+ m_InterfaceBoxesColor[0] = 1.0;
+ m_InterfaceBoxesColor[1] = 0;
+ m_InterfaceBoxesColor[2] = 0;
+ m_DefaultROIColor[0] = 0;
+ m_InterfaceBoxesColor[3] = 1.0;
+ m_DefaultROIColor[1] = 0;
+ m_DefaultROIColor[2] = 1.0;
+ m_DefaultROIColor[3] = 0.5;
m_NextROILabel = 0;
- m_ShrinkFactor=1;
+ m_ShrinkFactor = 1;
m_RedChannelIndex = 0;
m_GreenChannelIndex = 1;
m_BlueChannelIndex = 2;
- m_Built=false;
+ m_Built = false;
m_Shrink = ShrinkFilterType::New();
- m_PixLocOutput=NULL;
+ m_PixLocOutput = NULL;
m_NormalizationFactor = 0.02;
m_QuicklookRatioCoef = 2;
m_VectorCastFilter = NULL;
@@ -69,7 +69,7 @@ ImageViewerBase<TPixel,TLabel>
m_RectangularROISelectionMode = false;
m_PolygonalROISelectionMode = false;
m_UseImageOverlay = false;
- m_HistogramGeneratorList=HistogramGeneratorListType::New();
+ m_HistogramGeneratorList = HistogramGeneratorListType::New();
m_TransferFunctionList = TransferFunctionListType::New();
m_RedHistogramWidget = HistogramWidgetType::New();
m_GreenHistogramWidget = HistogramWidgetType::New();
@@ -79,14 +79,14 @@ ImageViewerBase<TPixel,TLabel>
/// Destructor
template <class TPixel, class TLabel>
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::~ImageViewerBase()
{}
/// Compute the normalization factor
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::ComputeNormalizationFactors(void)
{
@@ -94,70 +94,70 @@ ImageViewerBase<TPixel,TLabel>
sl->Reserve(m_InputImage->GetNumberOfComponentsPerPixel());
-
InputIteratorType it;
// if scroll is activated, compute the factors from the quicklook
if (m_UseScroll)
- {
- it = InputIteratorType(m_Shrink->GetOutput(),m_Shrink->GetOutput()->GetLargestPossibleRegion());
+ {
+ it = InputIteratorType(m_Shrink->GetOutput(), m_Shrink->GetOutput()->GetLargestPossibleRegion());
it.GoToBegin();
- }
+ }
// else, compute the factors from the full viewed region
else
- {
+ {
m_InputImage->SetRequestedRegion(m_FullWidget->GetViewedRegion());
m_InputImage->PropagateRequestedRegion();
m_InputImage->UpdateOutputData();
- it = InputIteratorType(m_InputImage,m_InputImage->GetRequestedRegion());
+ it = InputIteratorType(m_InputImage, m_InputImage->GetRequestedRegion());
it.GoToBegin();
- }
+ }
if (this->GetViewModel() == ScrollWidgetType::COMPLEX_MODULUS)
- {
- sl->PushBack(ListSampleType::New());
- while ( !it.IsAtEnd() )
{
+ sl->PushBack(ListSampleType::New());
+ while (!it.IsAtEnd())
+ {
PixelType pixel = it.Get();
- double re = static_cast<double>(pixel[m_RedChannelIndex]);
- double im = static_cast<double>(pixel[m_GreenChannelIndex]);
- sl->GetNthElement(0)->PushBack(vcl_sqrt(static_cast<double>(re*re+im*im)));
+ double re = static_cast<double>(pixel[m_RedChannelIndex]);
+ double im = static_cast<double>(pixel[m_GreenChannelIndex]);
+ sl->GetNthElement(0)->PushBack(vcl_sqrt(static_cast<double>(re * re + im * im)));
++it;
+ }
}
- }
else if (this->GetViewModel() == ScrollWidgetType::COMPLEX_PHASE)
- {
- sl->PushBack(ListSampleType::New());
- while ( !it.IsAtEnd() )
{
+ sl->PushBack(ListSampleType::New());
+ while (!it.IsAtEnd())
+ {
PixelType pixel = it.Get();
- sl->GetNthElement(0)->PushBack(vcl_atan2(static_cast<double>(pixel[m_GreenChannelIndex]),static_cast<double>(pixel[m_RedChannelIndex])));
+ sl->GetNthElement(0)->PushBack(vcl_atan2(static_cast<double>(pixel[m_GreenChannelIndex]),
+ static_cast<double>(pixel[m_RedChannelIndex])));
++it;
- }
+ }
- }
+ }
else
- {
- for (unsigned int i = 0;i<m_InputImage->GetNumberOfComponentsPerPixel();++i)
{
+ for (unsigned int i = 0; i < m_InputImage->GetNumberOfComponentsPerPixel(); ++i)
+ {
sl->PushBack(ListSampleType::New());
- }
- while ( !it.IsAtEnd() )
- {
- PixelType pixel = it.Get();
- for (unsigned int i = 0;i<m_InputImage->GetNumberOfComponentsPerPixel();++i)
+ }
+ while (!it.IsAtEnd())
{
+ PixelType pixel = it.Get();
+ for (unsigned int i = 0; i < m_InputImage->GetNumberOfComponentsPerPixel(); ++i)
+ {
sl->GetNthElement(i)->PushBack(pixel[i]);
- }
+ }
++it;
+ }
}
- }
m_HistogramGeneratorList->Clear();
m_TransferFunctionList->Clear();
- otbMsgDebugMacro(<<"Nb bands: "<<m_InputImage->GetNumberOfComponentsPerPixel());
+ otbMsgDebugMacro(<< "Nb bands: " << m_InputImage->GetNumberOfComponentsPerPixel());
- for (unsigned int i = 0;i<sl->Size();++i)
- {
+ for (unsigned int i = 0; i < sl->Size(); ++i)
+ {
typename HistogramGeneratorType::Pointer generator = HistogramGeneratorType::New();
generator->SetListSample(sl->GetNthElement(i));
typename HistogramGeneratorType::HistogramType::SizeType size;
@@ -167,16 +167,16 @@ ImageViewerBase<TPixel,TLabel>
generator->Update();
m_HistogramGeneratorList->PushBack(generator);
m_TransferFunctionList->PushBack(AffineTransferFunctionType::New());
- double min = generator->GetOutput()->Quantile(0,m_NormalizationFactor);
- double max = generator->GetOutput()->Quantile(0,1-m_NormalizationFactor);
+ double min = generator->GetOutput()->Quantile(0, m_NormalizationFactor);
+ double max = generator->GetOutput()->Quantile(0, 1 - m_NormalizationFactor);
m_TransferFunctionList->Back()->SetLowerBound(static_cast<InputPixelType>(min));
m_TransferFunctionList->Back()->SetUpperBound(static_cast<InputPixelType>(max));
- }
+ }
if (m_UseScroll)
- {
+ {
m_ScrollWidget->SetTransferFunctionList(m_TransferFunctionList);
- }
+ }
m_ZoomWidget->SetTransferFunctionList(m_TransferFunctionList);
m_FullWidget->SetTransferFunctionList(m_TransferFunctionList);
}
@@ -184,88 +184,90 @@ ImageViewerBase<TPixel,TLabel>
/// Build the HMI
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::Build(void)
{
- otbMsgDebugMacro(<<"Entering build method");
+ otbMsgDebugMacro(<< "Entering build method");
if (!m_InputImage)
- {
- itkExceptionMacro(<<"No input image !");
- }
+ {
+ itkExceptionMacro(<< "No input image !");
+ }
if (m_UseImageOverlay && !m_InputImageOverlay)
- {
- itkExceptionMacro(<<"UseImageOverlay option toggled, but no image overlay specified !");
- }
+ {
+ itkExceptionMacro(<< "UseImageOverlay option toggled, but no image overlay specified !");
+ }
if (m_UseImageOverlay
- &&m_InputImage->GetLargestPossibleRegion().GetSize()
+ && m_InputImage->GetLargestPossibleRegion().GetSize()
!= m_InputImageOverlay->GetLargestPossibleRegion().GetSize())
- {
- itkExceptionMacro(<<"Input image and input image overlay do not have the same size !");
- }
+ {
+ itkExceptionMacro(<< "Input image and input image overlay do not have the same size !");
+ }
itk::OStringStream oss;
// Get the image dimension
typename ImageType::SizeType size = m_InputImage->GetLargestPossibleRegion().GetSize();
- m_ImageGeometry = static_cast<double>(size[0])/static_cast<double>(size[1]);
+ m_ImageGeometry = static_cast<double>(size[0]) / static_cast<double>(size[1]);
// initiate windows dimensions
- int wscroll=200;
- int hscroll=0;
- int wfull = (size[0]<m_FullMaxInitialSize ? size[0] : m_FullMaxInitialSize);
- int hfull = (size[1]<m_FullMaxInitialSize ? size[1] : m_FullMaxInitialSize);
+ int wscroll = 200;
+ int hscroll = 0;
+ int wfull = (size[0] < m_FullMaxInitialSize ? size[0] : m_FullMaxInitialSize);
+ int hfull = (size[1] < m_FullMaxInitialSize ? size[1] : m_FullMaxInitialSize);
// decide wether to use scroll view or not
- if (size[0]<m_ScrollLimitSize&&size[1]<m_ScrollLimitSize)
- {
- m_UseScroll=false;
- }
+ if (size[0] < m_ScrollLimitSize && size[1] < m_ScrollLimitSize)
+ {
+ m_UseScroll = false;
+ }
else
- {
- m_UseScroll=true;
- // Compute scroll size :
- if (m_ImageGeometry<1)
{
+ m_UseScroll = true;
+ // Compute scroll size :
+ if (m_ImageGeometry < 1)
+ {
hscroll = m_ScrollMaxInitialSize;
- wscroll = static_cast<int>(static_cast<double>(m_ScrollMaxInitialSize)*m_ImageGeometry);
- }
+ wscroll = static_cast<int>(static_cast<double>(m_ScrollMaxInitialSize) * m_ImageGeometry);
+ }
else
- {
+ {
wscroll = m_ScrollMaxInitialSize;
- hscroll = static_cast<int>(static_cast<double>(m_ScrollMaxInitialSize)/m_ImageGeometry);
- }
+ hscroll = static_cast<int>(static_cast<double>(m_ScrollMaxInitialSize) / m_ImageGeometry);
+ }
// Create the quicklook
m_Shrink->SetInput(m_InputImage);
- if (size[0]/hscroll < size[1]/wscroll)
- {
- m_ShrinkFactor = static_cast<unsigned int>(vcl_ceil((static_cast<double>(size[0])/static_cast<double>(wscroll))/m_QuicklookRatioCoef));
- }
+ if (size[0] / hscroll < size[1] / wscroll)
+ {
+ m_ShrinkFactor =
+ static_cast<unsigned int>(vcl_ceil((static_cast<double>(size[0]) /
+ static_cast<double>(wscroll)) / m_QuicklookRatioCoef));
+ }
else
- {
- m_ShrinkFactor = static_cast<unsigned int>(vcl_ceil((static_cast<double>(size[1])/static_cast<double>(hscroll))/m_QuicklookRatioCoef));
- }
-
+ {
+ m_ShrinkFactor =
+ static_cast<unsigned int>(vcl_ceil((static_cast<double>(size[1]) /
+ static_cast<double>(hscroll)) / m_QuicklookRatioCoef));
+ }
- otbMsgDebugMacro(<<"Shrink factor: "<<m_ShrinkFactor);
+ otbMsgDebugMacro(<< "Shrink factor: " << m_ShrinkFactor);
m_Shrink->SetShrinkFactor(m_ShrinkFactor);
typedef otb::FltkFilterWatcher WatcherType;
- WatcherType watcher(m_Shrink,wfull-200,hfull/2,200,20, "Generating Quicklook ...");
+ WatcherType watcher(m_Shrink, wfull - 200, hfull / 2, 200, 20, "Generating Quicklook ...");
m_Shrink->Update();
- }
-
+ }
// Create full windows
m_FullWidget = FullWidgetType::New();
m_FullWidget->SetParent(this);
m_FullWidget->SetInput(m_InputImage);
if (m_UseImageOverlay)
- {
+ {
m_FullWidget->SetInputOverlay(m_InputImageOverlay);
m_FullWidget->SetImageOverlayVisible(true);
- }
- m_FullWidget->Init(0,0,wfull,hfull,"");
- m_FullWidget->box( FL_EMBOSSED_BOX );
+ }
+ m_FullWidget->Init(0, 0, wfull, hfull, "");
+ m_FullWidget->box(FL_EMBOSSED_BOX);
m_FullWidget->SetFormOverlayVisible(true);
// Create the zoom window
@@ -274,67 +276,67 @@ ImageViewerBase<TPixel,TLabel>
m_ZoomWidget->SetZoomFactor(4.0);
m_ZoomWidget->SetInput(m_InputImage);
if (m_UseImageOverlay)
- {
+ {
m_ZoomWidget->SetInputOverlay(m_InputImageOverlay);
m_ZoomWidget->SetImageOverlayVisible(true);
- }
- m_ZoomWidget->Init(0,0,m_ZoomMaxInitialSize,m_ZoomMaxInitialSize,"");
- m_ZoomWidget->box( FL_EMBOSSED_BOX );
+ }
+ m_ZoomWidget->Init(0, 0, m_ZoomMaxInitialSize, m_ZoomMaxInitialSize, "");
+ m_ZoomWidget->box(FL_EMBOSSED_BOX);
m_ZoomWidget->SetFormOverlayVisible(true);
// Create the zoom selection mode
if (m_ShowZoomWidget)
- {
+ {
BoxPointerType zoomBox = BoxType::New();
- SizeType zoomBoxSize;
- IndexType zoomBoxIndex;
- zoomBoxSize[0]=(m_ZoomWidget->GetViewedRegion().GetSize()[0]+2);
- zoomBoxSize[1]=(m_ZoomWidget->GetViewedRegion().GetSize()[1]+2);
- zoomBoxIndex[0]=(m_ZoomWidget->GetViewedRegion().GetIndex()[0]-1);
- zoomBoxIndex[1]=(m_ZoomWidget->GetViewedRegion().GetIndex()[1]-1);
+ SizeType zoomBoxSize;
+ IndexType zoomBoxIndex;
+ zoomBoxSize[0] = (m_ZoomWidget->GetViewedRegion().GetSize()[0] + 2);
+ zoomBoxSize[1] = (m_ZoomWidget->GetViewedRegion().GetSize()[1] + 2);
+ zoomBoxIndex[0] = (m_ZoomWidget->GetViewedRegion().GetIndex()[0] - 1);
+ zoomBoxIndex[1] = (m_ZoomWidget->GetViewedRegion().GetIndex()[1] - 1);
zoomBox->SetIndex(zoomBoxIndex);
zoomBox->SetSize(zoomBoxSize);
zoomBox->SetColor(m_InterfaceBoxesColor);
m_InterfaceBoxesList->PushBack(zoomBox);
- }
+ }
if (m_UseScroll)
- {
+ {
// Create the scroll window
m_ScrollWidget = ScrollWidgetType::New();
m_ScrollWidget->SetInput(m_Shrink->GetOutput());
m_ScrollWidget->SetParent(this);
- m_ScrollWidget->Init(0,0,wscroll,hscroll,oss.str().c_str());
- m_ScrollWidget->box( FL_EMBOSSED_BOX );
+ m_ScrollWidget->Init(0, 0, wscroll, hscroll, oss.str().c_str());
+ m_ScrollWidget->box(FL_EMBOSSED_BOX);
m_ScrollWidget->SetFormOverlayVisible(true);
m_ScrollWidget->SetSubSamplingRate(m_ShrinkFactor);
if (m_UseImageOverlay)
- {
+ {
m_ShrinkOverlay = OverlayShrinkFilterType::New();
m_ShrinkOverlay->SetInput(m_InputImageOverlay);
m_ShrinkOverlay->SetShrinkFactor(m_ShrinkFactor);
typedef otb::FltkFilterWatcher WatcherType;
- WatcherType watcher(m_ShrinkOverlay,wfull-200,hfull/2,200,20, "Generating Overlay Quicklook ...");
+ WatcherType watcher(m_ShrinkOverlay, wfull - 200, hfull / 2, 200, 20, "Generating Overlay Quicklook ...");
m_ShrinkOverlay->Update();
m_ScrollWidget->SetInputOverlay(m_ShrinkOverlay->GetOutput());
m_ScrollWidget->SetImageOverlayVisible(true);
- }
+ }
// Create the scroll selection box
BoxPointerType box = BoxType::New();
- SizeType scrollBoxSize;
- IndexType scrollBoxIndex;
- scrollBoxSize[0]=(m_FullWidget->GetViewedRegion().GetSize()[0]+2);
- scrollBoxSize[1]=(m_FullWidget->GetViewedRegion().GetSize()[1]+2);
- scrollBoxIndex[0]=(m_FullWidget->GetViewedRegion().GetIndex()[0]-1);
- scrollBoxIndex[1]=(m_FullWidget->GetViewedRegion().GetIndex()[1]-1);
- otbMsgDebugMacro(<<"Scroll box: "<<scrollBoxIndex<<" "<<scrollBoxSize);
+ SizeType scrollBoxSize;
+ IndexType scrollBoxIndex;
+ scrollBoxSize[0] = (m_FullWidget->GetViewedRegion().GetSize()[0] + 2);
+ scrollBoxSize[1] = (m_FullWidget->GetViewedRegion().GetSize()[1] + 2);
+ scrollBoxIndex[0] = (m_FullWidget->GetViewedRegion().GetIndex()[0] - 1);
+ scrollBoxIndex[1] = (m_FullWidget->GetViewedRegion().GetIndex()[1] - 1);
+ otbMsgDebugMacro(<< "Scroll box: " << scrollBoxIndex << " " << scrollBoxSize);
box->SetSize(scrollBoxSize);
box->SetIndex(scrollBoxIndex);
box->SetColor(m_InterfaceBoxesColor);
m_InterfaceBoxesList->PushBack(box);
- }
+ }
InitializeViewModel();
@@ -345,51 +347,50 @@ ImageViewerBase<TPixel,TLabel>
m_BlueHistogramWidget->SetParent(this);
m_GreenHistogramWidget->SetParent(this);
- m_RedHistogramWidget->resize(0,0,m_FullMaxInitialSize/2,m_ZoomMaxInitialSize);
- m_BlueHistogramWidget->resize(0,0,m_FullMaxInitialSize/2,m_ZoomMaxInitialSize);
- m_GreenHistogramWidget->resize(0,0,m_FullMaxInitialSize/2,m_ZoomMaxInitialSize);
+ m_RedHistogramWidget->resize(0, 0, m_FullMaxInitialSize / 2, m_ZoomMaxInitialSize);
+ m_BlueHistogramWidget->resize(0, 0, m_FullMaxInitialSize / 2, m_ZoomMaxInitialSize);
+ m_GreenHistogramWidget->resize(0, 0, m_FullMaxInitialSize / 2, m_ZoomMaxInitialSize);
GenerateOverlayList();
- m_Built=true;
+ m_Built = true;
}
/// Set the image (VectorImage version)
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::SetImage(ImageType * img)
{
- m_InputImage = dynamic_cast<ImageType *>( img );
+ m_InputImage = dynamic_cast<ImageType *>(img);
}
/// Set the image overlay (VectorImage version)
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::SetImageOverlay(OverlayImageType * img)
{
- m_InputImageOverlay = dynamic_cast<OverlayImageType *>( img );
+ m_InputImageOverlay = dynamic_cast<OverlayImageType *>(img);
}
-
template <class TPixel, class TLabel>
-typename ImageViewerBase<TPixel,TLabel>
+typename ImageViewerBase<TPixel, TLabel>
::ImageType *
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::GetShrinkedImage(void)
{
if (m_UseScroll)
- {
+ {
return m_Shrink->GetOutput();
- }
+ }
else
- {
+ {
return m_InputImage;
- }
+ }
}
/// Set the image (Image version)
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::SetImage(SingleImageType * img)
{
m_VectorCastFilter = VectorCastFilterType::New();
@@ -401,39 +402,39 @@ ImageViewerBase<TPixel,TLabel>
/// Show the app
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::Show(void)
{
//comment: std::cout<<"Entering show method"<<std::endl;
if (!m_Built)
- {
+ {
this->Build();
- }
+ }
Fl::check();
if (m_UseScroll && m_ShowScrollWidget)
- {
+ {
m_ScrollWidget->Show();
- }
+ }
if (m_ShowFullWidget)
- {
+ {
m_FullWidget->Show();
- }
+ }
if (m_ShowZoomWidget)
- {
+ {
m_ZoomWidget->Show();
- }
+ }
if (m_ShowHistograms)
- {
+ {
m_RedHistogramWidget->show();
- if (this->GetViewModel()== ScrollWidgetType::RGB)
- {
+ if (this->GetViewModel() == ScrollWidgetType::RGB)
+ {
m_GreenHistogramWidget->show();
m_BlueHistogramWidget->show();
+ }
}
- }
Fl::check();
//comment: std::cout<<"Leaving show method"<<std::endl;
@@ -442,36 +443,34 @@ ImageViewerBase<TPixel,TLabel>
the use of the class for example in wrappings.*/
template <class TPixel, class TLabel>
int
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::FlRun(void)
{
this->Show();
return Fl::run();
}
-
/// Hide the app
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::Hide(void)
{
Fl::check();
if (m_UseScroll)
- {
+ {
m_ScrollWidget->hide();
- }
+ }
m_FullWidget->hide();
m_ZoomWidget->hide();
m_RedHistogramWidget->hide();
- if (this->GetViewModel()==ScrollWidgetType::RGB)
- {
+ if (this->GetViewModel() == ScrollWidgetType::RGB)
+ {
m_GreenHistogramWidget->hide();
m_BlueHistogramWidget->hide();
- }
-
+ }
Fl::check();
@@ -479,75 +478,75 @@ ImageViewerBase<TPixel,TLabel>
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::GenerateOverlayList(void)
{
FormListPointerType new_list = FormListType::New();
if (m_ShowZoomWidget)
- {
+ {
BoxPointerType zoomBox = BoxType::New();
- SizeType zoomBoxSize;
- IndexType zoomBoxIndex;
- zoomBoxSize[0]=(m_ZoomWidget->GetViewedRegion().GetSize()[0]+2);
- zoomBoxSize[1]=(m_ZoomWidget->GetViewedRegion().GetSize()[1]+2);
- zoomBoxIndex[0]=(m_ZoomWidget->GetViewedRegion().GetIndex()[0]-1);
- zoomBoxIndex[1]=(m_ZoomWidget->GetViewedRegion().GetIndex()[1]-1);
+ SizeType zoomBoxSize;
+ IndexType zoomBoxIndex;
+ zoomBoxSize[0] = (m_ZoomWidget->GetViewedRegion().GetSize()[0] + 2);
+ zoomBoxSize[1] = (m_ZoomWidget->GetViewedRegion().GetSize()[1] + 2);
+ zoomBoxIndex[0] = (m_ZoomWidget->GetViewedRegion().GetIndex()[0] - 1);
+ zoomBoxIndex[1] = (m_ZoomWidget->GetViewedRegion().GetIndex()[1] - 1);
zoomBox->SetIndex(zoomBoxIndex);
zoomBox->SetSize(zoomBoxSize);
zoomBox->SetColor(m_InterfaceBoxesColor);
- m_InterfaceBoxesList->SetNthElement(0,zoomBox);
- }
+ m_InterfaceBoxesList->SetNthElement(0, zoomBox);
+ }
if (m_UseScroll)
- {
+ {
BoxPointerType box = BoxType::New();
- SizeType scrollBoxSize;
- IndexType scrollBoxIndex;
- scrollBoxSize[0]=(m_FullWidget->GetViewedRegion().GetSize()[0]+2);
- scrollBoxSize[1]=(m_FullWidget->GetViewedRegion().GetSize()[1]+2);
- scrollBoxIndex[0]=(m_FullWidget->GetViewedRegion().GetIndex()[0]-1);
- scrollBoxIndex[1]=(m_FullWidget->GetViewedRegion().GetIndex()[1]-1);
+ SizeType scrollBoxSize;
+ IndexType scrollBoxIndex;
+ scrollBoxSize[0] = (m_FullWidget->GetViewedRegion().GetSize()[0] + 2);
+ scrollBoxSize[1] = (m_FullWidget->GetViewedRegion().GetSize()[1] + 2);
+ scrollBoxIndex[0] = (m_FullWidget->GetViewedRegion().GetIndex()[0] - 1);
+ scrollBoxIndex[1] = (m_FullWidget->GetViewedRegion().GetIndex()[1] - 1);
box->SetSize(scrollBoxSize);
box->SetIndex(scrollBoxIndex);
box->SetColor(m_InterfaceBoxesColor);
int idx;
if (m_ShowZoomWidget)
- {
+ {
idx = 1;
- }
+ }
else
- {
+ {
idx = 0;
+ }
+ m_InterfaceBoxesList->SetNthElement(idx, box);
}
- m_InterfaceBoxesList->SetNthElement(idx,box);
- }
for (FormListIteratorType it1 = m_InterfaceBoxesList->Begin();
- it1!=m_InterfaceBoxesList->End();++it1)
- {
+ it1 != m_InterfaceBoxesList->End(); ++it1)
+ {
new_list->PushBack(it1.Get());
- }
+ }
for (PolygonListIteratorType it2 = m_PolygonROIList->Begin();
- it2!=m_PolygonROIList->End();++it2)
- {
+ it2 != m_PolygonROIList->End(); ++it2)
+ {
ImageWidgetPolygonFormPointerType new_poly = ImageWidgetPolygonFormType::New();
new_poly->SetPolygon(it2.Get());
ColorType color;
- if (this->GetROIColorMapEntry(it2.Get()->GetValue(),color))
- {
+ if (this->GetROIColorMapEntry(it2.Get()->GetValue(), color))
+ {
new_poly->SetColor(color);
- }
+ }
else
- {
+ {
new_poly->SetColor(m_DefaultROIColor);
- }
+ }
for (PolygonIteratorType pIt = it2.Get()->GetVertexList()->Begin();
- pIt != it2.Get()->GetVertexList()->End();++pIt)
- {
+ pIt != it2.Get()->GetVertexList()->End(); ++pIt)
+ {
ImageWidgetCircleFormPointerType new_circle = ImageWidgetCircleFormType::New();
new_circle->SetCenter(pIt.Value());
@@ -556,13 +555,13 @@ ImageViewerBase<TPixel,TLabel>
new_circle->SetColor(m_InterfaceBoxesColor);
new_list->PushBack(new_circle);
- }
+ }
new_list->PushBack(new_poly);
- }
+ }
for (PathListIteratorType it2 = m_PathList->Begin();
- it2!=m_PathList->End();++it2)
- {
+ it2 != m_PathList->End(); ++it2)
+ {
ImageWidgetPolylineFormPointerType new_line = ImageWidgetPolylineFormType::New();
new_line->SetPolyline(it2.Get());
// new_line->SetInternalValueToAlphaChannel(true);
@@ -571,23 +570,21 @@ ImageViewerBase<TPixel,TLabel>
new_line->SetLineWidth(m_LineWidth);
new_list->PushBack(new_line);
- }
-
+ }
if (m_UseScroll)
- {
+ {
m_ScrollWidget->SetFormListOverlay(new_list);
- }
+ }
m_FullWidget->SetFormListOverlay(new_list);
m_ZoomWidget->SetFormListOverlay(new_list);
}
-
/// Update the display
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::Update(void)
{
m_Updating = true;
@@ -602,26 +599,25 @@ ImageViewerBase<TPixel,TLabel>
m_RedHistogramWidget->redraw();
- if (this->GetViewModel()==ScrollWidgetType::RGB)
- {
+ if (this->GetViewModel() == ScrollWidgetType::RGB)
+ {
m_GreenHistogramWidget->redraw();
m_BlueHistogramWidget->redraw();
- }
-
+ }
// update the linked viewer
typename ViewerListType::Iterator linkedIt = m_LinkedViewerList->Begin();
typename OffsetListType::iterator offIt = m_LinkedViewerOffsetList.begin();
- while (linkedIt!=m_LinkedViewerList->End()&&offIt!=m_LinkedViewerOffsetList.end())
- {
- if (!linkedIt.Get()->GetUpdating() && linkedIt.Get()->GetBuilt())
+ while (linkedIt != m_LinkedViewerList->End() && offIt != m_LinkedViewerOffsetList.end())
{
+ if (!linkedIt.Get()->GetUpdating() && linkedIt.Get()->GetBuilt())
+ {
linkedIt.Get()->Update();
- }
+ }
++linkedIt;
++offIt;
- }
+ }
Fl::check();
//comment: std::cout<<"Update: "<<m_Label<<" Updating flag off"<<std::endl;
m_Updating = false;
@@ -629,106 +625,106 @@ ImageViewerBase<TPixel,TLabel>
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::ReportPixel(IndexType index)
{
//comment: std::cout<<"Entering report pixel: "<<m_Label<<std::endl;
if (m_PixLocOutput == NULL)
- {
+ {
//comment: std::cout<<"PixLocOutput == NULL, returning ..."<<std::endl;
return;
- }
+ }
itk::OStringStream oss;
- oss<<index<<" (image position)"<<std::endl;
+ oss << index << " (image position)" << std::endl;
PointType point;
- m_InputImage->TransformIndexToPhysicalPoint(index,point);
- oss << std::setprecision(15) << point<<" (physical coordinates)"<<std::endl;
+ m_InputImage->TransformIndexToPhysicalPoint(index, point);
+ oss << std::setprecision(15) << point << " (physical coordinates)" << std::endl;
if (m_InputImage->GetBufferedRegion().IsInside(index))
- {
+ {
//comment: std::cout<<"Index: "<<index<<std::endl;
typename ImageType::PixelType newPixel = m_InputImage->GetPixel(index);
if (this->GetViewModel() == ScrollWidgetType::RGB || this->GetViewModel() == ScrollWidgetType::GRAYSCALE)
- {
- oss<<newPixel<<" ("<<m_Label<<" pixel values)"<<std::endl;
- }
+ {
+ oss << newPixel << " (" << m_Label << " pixel values)" << std::endl;
+ }
else if (this->GetViewModel() == ScrollWidgetType::COMPLEX_MODULUS)
- {
+ {
double re = static_cast<double>(newPixel[m_RedChannelIndex]);
double im = static_cast<double>(newPixel[m_GreenChannelIndex]);
- double modulus = vcl_sqrt(re*re+im*im);
- oss<<modulus<<std::setprecision(3)<<" ("<<m_Label<<" modulus value)" <<std::endl;
+ double modulus = vcl_sqrt(re * re + im * im);
+ oss << modulus << std::setprecision(3) << " (" << m_Label << " modulus value)" << std::endl;
- }
+ }
else if (this->GetViewModel() == ScrollWidgetType::COMPLEX_PHASE)
- {
+ {
double re = static_cast<double>(newPixel[m_RedChannelIndex]);
double im = static_cast<double>(newPixel[m_GreenChannelIndex]);
- double phase = vcl_atan2(im,re);
- oss<<phase<<std::setprecision(3)<<" ("<<m_Label<<" phase value)"<<std::endl;
+ double phase = vcl_atan2(im, re);
+ oss << phase << std::setprecision(3) << " (" << m_Label << " phase value)" << std::endl;
+ }
}
- }
else
- {
+ {
IndexType shrinkIndex;
- shrinkIndex[0]=index[0]/m_ShrinkFactor;
- shrinkIndex[1]=index[1]/m_ShrinkFactor;
+ shrinkIndex[0] = index[0] / m_ShrinkFactor;
+ shrinkIndex[1] = index[1] / m_ShrinkFactor;
if (m_Shrink->GetOutput()->GetBufferedRegion().IsInside(shrinkIndex))
- {
+ {
typename ImageType::PixelType newPixel = m_Shrink->GetOutput()->GetPixel(shrinkIndex);
- oss<<newPixel<<" ("<<m_Label<<" pixel values)"<<std::endl;
+ oss << newPixel << " (" << m_Label << " pixel values)" << std::endl;
+ }
}
- }
typename ViewerListType::Iterator linkedIt = m_LinkedViewerList->Begin();
typename OffsetListType::iterator offIt = m_LinkedViewerOffsetList.begin();
- while (linkedIt!=m_LinkedViewerList->End()&&offIt!=m_LinkedViewerOffsetList.end())
- {
+ while (linkedIt != m_LinkedViewerList->End() && offIt != m_LinkedViewerOffsetList.end())
+ {
IndexType currentIndex = index + (*offIt);
//comment: std::cout<<"CurrentIndex: "<<currentIndex<<std::endl;
if (linkedIt.Get()->GetInputImage()->GetBufferedRegion().IsInside(currentIndex))
- {
+ {
typename ImageType::PixelType newPixel = linkedIt.Get()->GetInputImage()->GetPixel(currentIndex);
- oss<<newPixel<<" ("<<linkedIt.Get()->GetLabel()<<" pixel values)"<<std::endl;
- }
+ oss << newPixel << " (" << linkedIt.Get()->GetLabel() << " pixel values)" << std::endl;
+ }
else
- {
+ {
IndexType shrinkIndex;
- shrinkIndex[0]=currentIndex[0]/m_ShrinkFactor;
- shrinkIndex[1]=currentIndex[1]/m_ShrinkFactor;
+ shrinkIndex[0] = currentIndex[0] / m_ShrinkFactor;
+ shrinkIndex[1] = currentIndex[1] / m_ShrinkFactor;
if (linkedIt.Get()->GetShrinkedImage()->GetBufferedRegion().IsInside(shrinkIndex))
- {
+ {
typename ImageType::PixelType newPixel = linkedIt.Get()->GetShrinkedImage()->GetPixel(shrinkIndex);
- oss<<newPixel<<" ("<<linkedIt.Get()->GetLabel()<<" pixel values)"<<std::endl;
+ oss << newPixel << " (" << linkedIt.Get()->GetLabel() << " pixel values)" << std::endl;
+ }
}
- }
++linkedIt;
++offIt;
- }
+ }
if (oss.good())
- {
+ {
m_PixLocOutput->value(oss.str().c_str());
m_PixLocOutput->redraw();
Fl::check();
- }
+ }
//comment: std::cout<<"Leaving report pixel: "<<m_Label<<std::endl;
}
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::ClearPixLocVal(void)
{
if (m_PixLocOutput == NULL)
- {
+ {
//comment: std::cout<<"PixLocOutput == NULL, returning ..."<<std::endl;
return;
- }
+ }
m_PixLocOutput->value("");
m_PixLocOutput->redraw();
Fl::check();
@@ -736,24 +732,24 @@ ImageViewerBase<TPixel,TLabel>
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::SetImageOverlayOpacity(unsigned char opacity)
{
if (m_UseImageOverlay)
- {
+ {
m_FullWidget->SetImageOverlayOpacity(opacity);
m_ZoomWidget->SetImageOverlayOpacity(opacity);
if (m_UseScroll)
- {
+ {
m_ScrollWidget->SetImageOverlayOpacity(opacity);
+ }
}
- }
}
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::UpdateZoomWidget(void)
{
m_ZoomWidget->redraw();
@@ -761,7 +757,7 @@ ImageViewerBase<TPixel,TLabel>
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::UpdateFullWidget(void)
{
m_FullWidget->redraw();
@@ -769,307 +765,305 @@ ImageViewerBase<TPixel,TLabel>
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::UpdateScrollWidget(void)
{
if (m_UseScroll)
- {
+ {
m_ScrollWidget->redraw();
- }
+ }
}
template <class TPixel, class TLabel>
-typename ImageViewerBase<TPixel,TLabel>
+typename ImageViewerBase<TPixel, TLabel>
::RegionType
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::ComputeConstrainedRegion(RegionType smallRegion, RegionType bigRegion)
{
// This function assumes that smallRegion is inside huge region
- if (smallRegion.GetSize()[0]>bigRegion.GetSize()[0]
- ||smallRegion.GetSize()[1]>bigRegion.GetSize()[1])
- {
+ if (smallRegion.GetSize()[0] > bigRegion.GetSize()[0]
+ || smallRegion.GetSize()[1] > bigRegion.GetSize()[1])
+ {
itkExceptionMacro("Small region not inside big region !");
- }
+ }
else
- {
+ {
RegionType resp;
- IndexType index = smallRegion.GetIndex();
- SizeType size = smallRegion.GetSize();
+ IndexType index = smallRegion.GetIndex();
+ SizeType size = smallRegion.GetSize();
- if (smallRegion.GetIndex()[0]<bigRegion.GetIndex()[0])
- {
- index[0]=bigRegion.GetIndex()[0];
- }
- if (smallRegion.GetIndex()[1]<bigRegion.GetIndex()[1])
- {
- index[1]=bigRegion.GetIndex()[1];
- }
- if (index[0]+size[0]>=bigRegion.GetIndex()[0]+bigRegion.GetSize()[0])
- {
- index[0]=bigRegion.GetIndex()[0]+bigRegion.GetSize()[0]-size[0];
- }
- if (index[1]+size[1]>=bigRegion.GetIndex()[1]+bigRegion.GetSize()[1])
- {
- index[1]=bigRegion.GetIndex()[1]+bigRegion.GetSize()[1]-size[1];
- }
+ if (smallRegion.GetIndex()[0] < bigRegion.GetIndex()[0])
+ {
+ index[0] = bigRegion.GetIndex()[0];
+ }
+ if (smallRegion.GetIndex()[1] < bigRegion.GetIndex()[1])
+ {
+ index[1] = bigRegion.GetIndex()[1];
+ }
+ if (index[0] + size[0] >= bigRegion.GetIndex()[0] + bigRegion.GetSize()[0])
+ {
+ index[0] = bigRegion.GetIndex()[0] + bigRegion.GetSize()[0] - size[0];
+ }
+ if (index[1] + size[1] >= bigRegion.GetIndex()[1] + bigRegion.GetSize()[1])
+ {
+ index[1] = bigRegion.GetIndex()[1] + bigRegion.GetSize()[1] - size[1];
+ }
resp.SetSize(size);
resp.SetIndex(index);
return resp;
- }
+ }
}
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::ChangeFullViewedRegion(IndexType clickedIndex)
{
m_Updating = true;
//comment: std::cout<<"ChangeFullViewedRegion: "<<m_Label<<" Updating flag on"<<std::endl;
RegionType region = m_FullWidget->GetViewedRegion();
- IndexType newIndex;
- newIndex[0]=clickedIndex[0]-region.GetSize()[0]/2;
- newIndex[1]=clickedIndex[1]-region.GetSize()[1]/2;
+ IndexType newIndex;
+ newIndex[0] = clickedIndex[0] - region.GetSize()[0] / 2;
+ newIndex[1] = clickedIndex[1] - region.GetSize()[1] / 2;
region.SetIndex(newIndex);
- RegionType newRegion = ComputeConstrainedRegion(region,m_InputImage->GetLargestPossibleRegion());
+ RegionType newRegion = ComputeConstrainedRegion(region, m_InputImage->GetLargestPossibleRegion());
m_FullWidget->SetUpperLeftCorner(newRegion.GetIndex());
typename ViewerListType::Iterator linkedIt = m_LinkedViewerList->Begin();
typename OffsetListType::iterator offIt = m_LinkedViewerOffsetList.begin();
- while (linkedIt!=m_LinkedViewerList->End()&&offIt!=m_LinkedViewerOffsetList.end())
- {
- if (!linkedIt.Get()->GetUpdating())
+ while (linkedIt != m_LinkedViewerList->End() && offIt != m_LinkedViewerOffsetList.end())
{
+ if (!linkedIt.Get()->GetUpdating())
+ {
IndexType linkedIndex;
- linkedIndex[0] = clickedIndex[0]+(*offIt)[0];
- linkedIndex[1] = clickedIndex[1]+(*offIt)[1];
+ linkedIndex[0] = clickedIndex[0] + (*offIt)[0];
+ linkedIndex[1] = clickedIndex[1] + (*offIt)[1];
linkedIt.Get()->ChangeFullViewedRegion(linkedIndex);
- }
+ }
++offIt;
++linkedIt;
- }
+ }
//comment: std::cout<<"ChangeFullViewedRegion: "<<m_Label<<" Updating flag off"<<std::endl;
m_Updating = false;
}
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::ChangeZoomViewedRegion(IndexType clickedIndex)
{
m_Updating = true;
//comment: std::cout<<"ChangeZoomViewedRegion: "<<m_Label<<" Updating flag on"<<std::endl;
if (m_ShowZoomWidget)
- {
+ {
RegionType region = m_ZoomWidget->GetViewedRegion();
- IndexType newIndex;
- newIndex[0]=clickedIndex[0]-region.GetSize()[0]/2;
- newIndex[1]=clickedIndex[1]-region.GetSize()[1]/2;
+ IndexType newIndex;
+ newIndex[0] = clickedIndex[0] - region.GetSize()[0] / 2;
+ newIndex[1] = clickedIndex[1] - region.GetSize()[1] / 2;
region.SetIndex(newIndex);
- RegionType newRegion = ComputeConstrainedRegion(region,m_FullWidget->GetViewedRegion());
+ RegionType newRegion = ComputeConstrainedRegion(region, m_FullWidget->GetViewedRegion());
m_ZoomWidget->SetZoomUpperLeftCorner(newRegion.GetIndex());
typename ViewerListType::Iterator linkedIt = m_LinkedViewerList->Begin();
typename OffsetListType::iterator offIt = m_LinkedViewerOffsetList.begin();
- while (linkedIt!=m_LinkedViewerList->End()&&offIt!=m_LinkedViewerOffsetList.end())
- {
- if (!linkedIt.Get()->GetUpdating())
+ while (linkedIt != m_LinkedViewerList->End() && offIt != m_LinkedViewerOffsetList.end())
{
+ if (!linkedIt.Get()->GetUpdating())
+ {
IndexType linkedIndex;
- linkedIndex[0] = clickedIndex[0]+(*offIt)[0];
- linkedIndex[1] = clickedIndex[1]+(*offIt)[1];
+ linkedIndex[0] = clickedIndex[0] + (*offIt)[0];
+ linkedIndex[1] = clickedIndex[1] + (*offIt)[1];
linkedIt.Get()->ChangeZoomViewedRegion(linkedIndex);
- }
+ }
++offIt;
++linkedIt;
+ }
}
- }
//comment: std::cout<<"ChangeZoomViewedRegion: "<<m_Label<<" Updating flag off"<<std::endl;
m_Updating = false;
}
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::Link(Self * viewer, OffsetType offset, bool backwardLinkFlag)
{
//comment: std::cout<<"Entering link: "<<viewer->GetLabel()<<" flag: "<<backwardLinkFlag<<std::endl;
// Search if this viewer is already linked
typename ViewerListType::Iterator it = m_LinkedViewerList->Begin();
- while (it!=m_LinkedViewerList->End())
- {
- if (it.Get()==viewer)
+ while (it != m_LinkedViewerList->End())
{
- otbMsgDebugMacro(<<"This viewer is already linked !");
+ if (it.Get() == viewer)
+ {
+ otbMsgDebugMacro(<< "This viewer is already linked !");
return;
- }
+ }
++it;
- }
+ }
// If not, add it with its offset
m_LinkedViewerList->PushBack(viewer);
m_LinkedViewerOffsetList.push_back(offset);
// If backward link flag is set, add the backward link
if (backwardLinkFlag)
- {
+ {
OffsetType invertOffset;
- invertOffset[0]=-offset[0];
- invertOffset[1]=-offset[1];
- viewer->Link(this,invertOffset,false);
- }
+ invertOffset[0] = -offset[0];
+ invertOffset[1] = -offset[1];
+ viewer->Link(this, invertOffset, false);
+ }
//comment: std::cout<<"Leaving link: "<<viewer->GetLabel()<<" flag: "<<backwardLinkFlag<<std::endl;
}
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::Link(Self * viewer, OffsetType offset)
{
- this->Link(viewer,offset,true);
+ this->Link(viewer, offset, true);
}
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::Link(Self * viewer)
{
OffsetType offset;
offset.Fill(0);
- this->Link(viewer,offset,true);
+ this->Link(viewer, offset, true);
}
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
-::Unlink(Self * viewer,bool backwardLinkFlag)
+ImageViewerBase<TPixel, TLabel>
+::Unlink(Self * viewer, bool backwardLinkFlag)
{
unsigned int counter = 0;
- bool found = false;
+ bool found = false;
// Search the given viewer in the linked list
typename ViewerListType::Iterator it = m_LinkedViewerList->Begin();
- while (!found&&it!=m_LinkedViewerList->End())
- {
- if (it.Get()==viewer)
+ while (!found && it != m_LinkedViewerList->End())
{
+ if (it.Get() == viewer)
+ {
found = true;
- }
+ }
else
- {
+ {
++counter;
- }
+ }
++it;
- }
+ }
// If found, erase
m_LinkedViewerList->Erase(counter);
- m_LinkedViewerOffsetList.erase(m_LinkedViewerOffsetList.begin()+counter);
+ m_LinkedViewerOffsetList.erase(m_LinkedViewerOffsetList.begin() + counter);
// If backward link flag is set, remove the backward link
if (backwardLinkFlag)
- {
- viewer->Unlink(this,false);
- }
+ {
+ viewer->Unlink(this, false);
+ }
}
template <class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::Unlink(Self * viewer)
{
- this->Unlink(viewer,true);
+ this->Unlink(viewer, true);
}
-
template <class TPixel, class TLabel>
int
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::IsLinkedTo(Self * viewer)
{
- int counter = 0;
+ int counter = 0;
typename ViewerListType::Iterator it = m_LinkedViewerList->Begin();
- while (it!=m_LinkedViewerList->End())
- {
- if (it.Get()==viewer)
+ while (it != m_LinkedViewerList->End())
{
+ if (it.Get() == viewer)
+ {
return counter;
- }
+ }
++counter;
++it;
- }
+ }
return -1;
}
template<class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::ClearLinks(void)
{
typename ViewerListType::Iterator it = m_LinkedViewerList->Begin();
- while (it!=m_LinkedViewerList->End())
- {
- it.Get()->Unlink(this,false);
+ while (it != m_LinkedViewerList->End())
+ {
+ it.Get()->Unlink(this, false);
++it;
- }
+ }
m_LinkedViewerList->Clear();
m_LinkedViewerOffsetList.clear();
}
template<class TPixel, class TLabel>
-typename ImageViewerBase<TPixel,TLabel>
+typename ImageViewerBase<TPixel, TLabel>
::OffsetType
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::GetOffset(int index)
{
return m_LinkedViewerOffsetList[index];
}
template<class TPixel, class TLabel>
-typename ImageViewerBase<TPixel,TLabel>
+typename ImageViewerBase<TPixel, TLabel>
::ViewModelType
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::GetViewModel()
{
return m_FullWidget->GetViewModel();
}
-
template<class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::SetViewModel(ViewModelType viewModel)
{
- // Channel indices outofbound check
- if(m_RedChannelIndex >= m_InputImage->GetNumberOfComponentsPerPixel())
+ // Channel indices outofbound check
+ if (m_RedChannelIndex >= m_InputImage->GetNumberOfComponentsPerPixel())
{
- itkExceptionMacro(<<"Red channel index out of bound.");
+ itkExceptionMacro(<< "Red channel index out of bound.");
}
- if(viewModel != ScrollWidgetType::GRAYSCALE && m_GreenChannelIndex >= m_InputImage->GetNumberOfComponentsPerPixel())
+ if (viewModel != ScrollWidgetType::GRAYSCALE && m_GreenChannelIndex >= m_InputImage->GetNumberOfComponentsPerPixel())
{
- itkExceptionMacro(<<"Green channel index out of bound.");
+ itkExceptionMacro(<< "Green channel index out of bound.");
}
- if(viewModel == ScrollWidgetType::RGB && m_BlueChannelIndex >= m_InputImage->GetNumberOfComponentsPerPixel())
+ if (viewModel == ScrollWidgetType::RGB && m_BlueChannelIndex >= m_InputImage->GetNumberOfComponentsPerPixel())
{
- itkExceptionMacro(<<"Blue channel index out of bound.");
+ itkExceptionMacro(<< "Blue channel index out of bound.");
}
switch (viewModel)
- {
+ {
case ScrollWidgetType::RGB:
- {
+ {
// if(m_InputImage->GetNumberOfComponentsPerPixel()>2)
// { //NOTE: No reason to prevent a 2 bands image to be displayed in RGB
// and the image is not necessarily loaded at that time.
if (m_UseScroll)
- {
+ {
m_ScrollWidget->SetViewModel(viewModel);
m_ScrollWidget->SetRedChannelIndex(m_RedChannelIndex);
m_ScrollWidget->SetGreenChannelIndex(m_GreenChannelIndex);
m_ScrollWidget->SetBlueChannelIndex(m_BlueChannelIndex);
- }
+ }
m_FullWidget->SetViewModel(viewModel);
m_ZoomWidget->SetViewModel(viewModel);
m_ZoomWidget->SetRedChannelIndex(m_RedChannelIndex);
@@ -1081,19 +1075,19 @@ ImageViewerBase<TPixel,TLabel>
ComputeNormalizationFactors();
- typename HistogramWidgetType::ColorType blue,red,green;
+ typename HistogramWidgetType::ColorType blue, red, green;
- red[0]=0.5;
- red[1]=0;
- red[2]=0;
+ red[0] = 0.5;
+ red[1] = 0;
+ red[2] = 0;
- green[0]=0;
- green[1]=0.5;
- green[2]=0;
+ green[0] = 0;
+ green[1] = 0.5;
+ green[2] = 0;
- blue[0]=0;
- blue[1]=0;
- blue[2]=0.5;
+ blue[0] = 0;
+ blue[1] = 0;
+ blue[2] = 0.5;
m_RedHistogramWidget->SetHistogram(m_HistogramGeneratorList->GetNthElement(m_RedChannelIndex)->GetOutput());
m_RedHistogramWidget->SetTransferFunction(m_TransferFunctionList->GetNthElement(m_RedChannelIndex));
@@ -1116,14 +1110,14 @@ ImageViewerBase<TPixel,TLabel>
m_GreenHistogramWidget->SetTextColor(green);
break;
// }
- }
+ }
case ScrollWidgetType::GRAYSCALE:
- {
- if (m_UseScroll)
{
+ if (m_UseScroll)
+ {
m_ScrollWidget->SetViewModel(viewModel);
m_ScrollWidget->SetRedChannelIndex(m_RedChannelIndex);
- }
+ }
m_FullWidget->SetViewModel(viewModel);
m_ZoomWidget->SetViewModel(viewModel);
m_ZoomWidget->SetRedChannelIndex(m_RedChannelIndex);
@@ -1141,15 +1135,15 @@ ImageViewerBase<TPixel,TLabel>
m_RedHistogramWidget->SetHistogramColor(gray);
m_RedHistogramWidget->SetTextColor(gray);
break;
- }
+ }
case ScrollWidgetType::COMPLEX_MODULUS:
- {
- if (m_UseScroll)
{
+ if (m_UseScroll)
+ {
m_ScrollWidget->SetViewModel(viewModel);
m_ScrollWidget->SetRedChannelIndex(m_RedChannelIndex);
m_ScrollWidget->SetGreenChannelIndex(m_GreenChannelIndex);
- }
+ }
m_FullWidget->SetViewModel(viewModel);
m_ZoomWidget->SetViewModel(viewModel);
m_ZoomWidget->SetRedChannelIndex(m_RedChannelIndex);
@@ -1169,15 +1163,15 @@ ImageViewerBase<TPixel,TLabel>
m_RedHistogramWidget->SetHistogramColor(gray);
m_RedHistogramWidget->SetTextColor(gray);
break;
- }
+ }
case ScrollWidgetType::COMPLEX_PHASE:
- {
- if (m_UseScroll)
{
+ if (m_UseScroll)
+ {
m_ScrollWidget->SetViewModel(viewModel);
m_ScrollWidget->SetRedChannelIndex(m_RedChannelIndex);
m_ScrollWidget->SetGreenChannelIndex(m_GreenChannelIndex);
- }
+ }
m_FullWidget->SetViewModel(viewModel);
m_ZoomWidget->SetViewModel(viewModel);
m_ZoomWidget->SetRedChannelIndex(m_RedChannelIndex);
@@ -1197,100 +1191,97 @@ ImageViewerBase<TPixel,TLabel>
m_RedHistogramWidget->SetHistogramColor(gray);
m_RedHistogramWidget->SetTextColor(gray);
break;
- }
- }
+ }
+ }
}
template<class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::InitializeViewModel(void)
{
- if (m_InputImage->GetNumberOfComponentsPerPixel()>2)
- {
+ if (m_InputImage->GetNumberOfComponentsPerPixel() > 2)
+ {
this->SetViewModel(ScrollWidgetType::RGB);
- }
+ }
else
- {
+ {
this->SetViewModel(ScrollWidgetType::GRAYSCALE);
- }
+ }
}
template<class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::Reset(void)
{
m_FullWidget->Reset();
m_ZoomWidget->Reset();
if (m_UseScroll)
- {
+ {
m_ScrollWidget->Reset();
- }
+ }
}
-
template<class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::ChangeTransferFunctions(void)
{
m_TransferFunctionList->SetNthElement(m_RedChannelIndex, m_RedHistogramWidget->GetTransferFunction());
- if (m_FullWidget->GetViewModel()==ScrollWidgetType::RGB)
- {
+ if (m_FullWidget->GetViewModel() == ScrollWidgetType::RGB)
+ {
m_TransferFunctionList->SetNthElement(m_BlueChannelIndex, m_BlueHistogramWidget->GetTransferFunction());
m_TransferFunctionList->SetNthElement(m_GreenChannelIndex, m_GreenHistogramWidget->GetTransferFunction());
- }
+ }
m_FullWidget->ClearBufferedRegion();
m_ZoomWidget->ClearBufferedRegion();
if (m_UseScroll)
- {
+ {
m_ScrollWidget->ClearBufferedRegion();
- }
+ }
}
template<class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
-::AddROIColorMapEntry(const LabelType &label, const ColorType &color)
+ImageViewerBase<TPixel, TLabel>
+::AddROIColorMapEntry(const LabelType& label, const ColorType& color)
{
- m_ROIColorMap[label]=color;
+ m_ROIColorMap[label] = color;
}
template<class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
-::RemoveROIColorMapEntry(const LabelType &label)
+ImageViewerBase<TPixel, TLabel>
+::RemoveROIColorMapEntry(const LabelType& label)
{
m_ROIColorMap.erase(label);
}
template<class TPixel, class TLabel>
bool
-ImageViewerBase<TPixel,TLabel>
-::GetROIColorMapEntry(const LabelType &label, ColorType &color)
+ImageViewerBase<TPixel, TLabel>
+::GetROIColorMapEntry(const LabelType& label, ColorType& color)
{
typename ROIColorMapType::iterator it = m_ROIColorMap.find(label);
- bool resp = false;
+ bool resp = false;
- if (it!=m_ROIColorMap.end())
- {
+ if (it != m_ROIColorMap.end())
+ {
color = it->second;
resp = true;
- }
+ }
return resp;
}
template<class TPixel, class TLabel>
void
-ImageViewerBase<TPixel,TLabel>
+ImageViewerBase<TPixel, TLabel>
::ClearROIColorMap(void)
{
m_ROIColorMap.clear();
}
-
} // end namespace otb
#endif
-
diff --git a/Code/Visu/otbImageViewerFullResolutionEventsInterface.h b/Code/Visu/otbImageViewerFullResolutionEventsInterface.h
index 74db67fe1d..6fd04f2d27 100644
--- a/Code/Visu/otbImageViewerFullResolutionEventsInterface.h
+++ b/Code/Visu/otbImageViewerFullResolutionEventsInterface.h
@@ -24,37 +24,37 @@
namespace otb
{
- /**
- *\class ImageViewerFullResolutionEventsInterface
- * \brief <b>DEPRECATED</b>
- *
- * \deprecated use the new Visualization framework instead.
- * \sa StandardImageViewer
- *
- */
+/**
+ *\class ImageViewerFullResolutionEventsInterface
+ * \brief <b>DEPRECATED</b>
+ *
+ * \deprecated use the new Visualization framework instead.
+ * \sa StandardImageViewer
+ *
+ */
class ImageViewerFullResolutionEventsInterface
- : public itk::Object
+ : public itk::Object
{
public:
/** Standard class typedefs */
typedef ImageViewerFullResolutionEventsInterface Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Standard type macros */
- itkTypeMacro(ImageViewerFullResolutionEventsInterface,Superclass);
+ itkTypeMacro(ImageViewerFullResolutionEventsInterface, Superclass);
- typedef itk::ImageRegion<2> RegionType;
+ typedef itk::ImageRegion<2> RegionType;
typedef RegionType::IndexType IndexType;
- itkSetMacro(ForwardEvents,bool);
- itkGetMacro(ForwardEvents,bool);
+ itkSetMacro(ForwardEvents, bool);
+ itkGetMacro(ForwardEvents, bool);
/** Users actions */
- virtual void RegionSelected(const RegionType & ) {};
- virtual void ViewedRegionChanged() {};
- virtual void PixelClicked(const IndexType& ) {};
+ virtual void RegionSelected(const RegionType&) {}
+ virtual void ViewedRegionChanged() {}
+ virtual void PixelClicked(const IndexType&) {}
protected:
/** Constructor */
@@ -67,7 +67,7 @@ protected:
private:
ImageViewerFullResolutionEventsInterface(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
bool m_ForwardEvents;
};
diff --git a/Code/Visu/otbImageViewerFullWidget.h b/Code/Visu/otbImageViewerFullWidget.h
index 1967204abd..1bca9eed84 100644
--- a/Code/Visu/otbImageViewerFullWidget.h
+++ b/Code/Visu/otbImageViewerFullWidget.h
@@ -43,14 +43,14 @@ template <class TPixel, class TLabel> class ImageViewerBase;
*/
template <class TPixel, class TLabel = double>
class ITK_EXPORT ImageViewerFullWidget
- : public FullResolutionImageWidget<TPixel>
+ : public FullResolutionImageWidget<TPixel>
{
public:
/** Standard class typedefs */
- typedef ImageViewerFullWidget Self;
- typedef FullResolutionImageWidget<TPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageViewerFullWidget Self;
+ typedef FullResolutionImageWidget<TPixel> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -62,238 +62,235 @@ public:
typedef ImageViewerFullResolutionEventsInterface EventsInterfaceType;
typedef EventsInterfaceType::Pointer EventsInterfacePointerType;
-
- typedef TPixel PixelType;
- typedef TLabel LabelType;
- typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::SizeType SizeType;
- typedef typename Superclass::ImageType ImageType;
- typedef typename Superclass::RegionType RegionType;
+ typedef TPixel PixelType;
+ typedef TLabel LabelType;
+ typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::ImageType ImageType;
+ typedef typename Superclass::RegionType RegionType;
typedef typename Superclass::OverlayImageType OverlayImageType;
- typedef ImageViewerBase<PixelType, LabelType> ParentType;
- typedef ParentType* ParentPointerType;
+ typedef ImageViewerBase<PixelType, LabelType> ParentType;
+ typedef ParentType* ParentPointerType;
- typedef ImageWidgetBoxForm BoxType;
- typedef ImageWidgetRectangleForm RectangleType;
- typedef RectangleType::ColorType ColorType;
- typedef ImageWidgetPointForm PointType;
- typedef Polygon<LabelType> PolygonType;
- typedef typename PolygonType::ContinuousIndexType ContinuousIndexType;
+ typedef ImageWidgetBoxForm BoxType;
+ typedef ImageWidgetRectangleForm RectangleType;
+ typedef RectangleType::ColorType ColorType;
+ typedef ImageWidgetPointForm PointType;
+ typedef Polygon<LabelType> PolygonType;
+ typedef typename PolygonType::ContinuousIndexType ContinuousIndexType;
typedef typename PolygonType::Superclass::VertexListPointer VertexListPointerType;
- typedef typename PolygonType::Superclass::VertexListType VertexListType;
+ typedef typename PolygonType::Superclass::VertexListType VertexListType;
- itkSetMacro(Parent,ParentPointerType);
- itkGetMacro(Parent,ParentPointerType);
- itkGetObjectMacro(EventsInterface,EventsInterfaceType);
- itkSetObjectMacro(EventsInterface,EventsInterfaceType);
+ itkSetMacro(Parent, ParentPointerType);
+ itkGetMacro(Parent, ParentPointerType);
+ itkGetObjectMacro(EventsInterface, EventsInterfaceType);
+ itkSetObjectMacro(EventsInterface, EventsInterfaceType);
virtual void SetUpperLeftCorner(IndexType index)
{
Superclass::SetUpperLeftCorner(index);
if (m_EventsInterface.IsNotNull())
- {
+ {
m_EventsInterface->ViewedRegionChanged();
- }
+ }
}
/** Handle method */
-
/** Default mode handling, without ROI selection */
virtual int DefaultHandle(int event)
{
switch (event)
- {
+ {
case FL_PUSH:
- {
+ {
// in case of mouse click, change the point of view
- int x = Fl::event_x();
- int y = Fl::event_y();
+ int x = Fl::event_x();
+ int y = Fl::event_y();
IndexType clickedIndex;
- clickedIndex[0]=x;
- clickedIndex[1]=y;
- clickedIndex=this->WindowToImageCoordinates(clickedIndex);
+ clickedIndex[0] = x;
+ clickedIndex[1] = y;
+ clickedIndex = this->WindowToImageCoordinates(clickedIndex);
if (m_EventsInterface.IsNotNull())
- {
+ {
m_EventsInterface->PixelClicked(clickedIndex);
- }
+ }
if (m_EventsInterface.IsNull() || m_EventsInterface->GetForwardEvents())
- {
+ {
m_Parent->ChangeZoomViewedRegion(clickedIndex);
m_Parent->Update();
- }
+ }
return 1;
- }
+ }
case FL_KEYDOWN:
- {
+ {
IndexType newIndex = m_Parent->GetZoomWidget()->GetViewedRegion().GetIndex();
- SizeType newSize = m_Parent->GetZoomWidget()->GetViewedRegion().GetSize();
- bool moved = false;
+ SizeType newSize = m_Parent->GetZoomWidget()->GetViewedRegion().GetSize();
+ bool moved = false;
switch (Fl::event_key())
- {
+ {
case FL_Down:
- {
- newIndex[1] += static_cast<long int>(newSize[1]/2)+newSize[1]/2;
- newIndex[0] += newSize[0]/2;
+ {
+ newIndex[1] += static_cast<long int>(newSize[1] / 2) + newSize[1] / 2;
+ newIndex[0] += newSize[0] / 2;
moved = true;
break;
- }
+ }
case FL_Up:
- {
- newIndex[1] += -static_cast<long int>(newSize[1]/2)
- +newSize[1]/2;
- newIndex[0] += newSize[0]/2;
+ {
+ newIndex[1] += -static_cast<long int>(newSize[1] / 2)
+ + newSize[1] / 2;
+ newIndex[0] += newSize[0] / 2;
moved = true;
break;
- }
+ }
case FL_Left:
- {
- newIndex[0] += -static_cast<long int>(newSize[0]/2)
- + newSize[0]/2;
- newIndex[1] += newSize[1]/2;
+ {
+ newIndex[0] += -static_cast<long int>(newSize[0] / 2)
+ + newSize[0] / 2;
+ newIndex[1] += newSize[1] / 2;
moved = true;
break;
- }
+ }
case FL_Right:
- {
- newIndex[0] += static_cast<long int>(newSize[0]/2)
- + newSize[0]/2;
- newIndex[1] += newSize[1]/2;
+ {
+ newIndex[0] += static_cast<long int>(newSize[0] / 2)
+ + newSize[0] / 2;
+ newIndex[1] += newSize[1] / 2;
moved = true;
break;
- }
- // if the view center was moved:
- if (moved)
- {
- m_Parent->ChangeFullViewedRegion(newIndex);
- m_Parent->ChangeZoomViewedRegion(newIndex);
- m_Parent->Update();
+ }
+ // if the view center was moved:
+ if (moved)
+ {
+ m_Parent->ChangeFullViewedRegion(newIndex);
+ m_Parent->ChangeZoomViewedRegion(newIndex);
+ m_Parent->Update();
+ }
+ }
+ return 1;
}
}
- return 1;
- }
- }
return 0;
}
-
virtual int RectangleROISelectionHandle(int event)
{
switch (event)
- {
+ {
case FL_PUSH:
- {
- int x = Fl::event_x();
- int y = Fl::event_y();
+ {
+ int x = Fl::event_x();
+ int y = Fl::event_y();
IndexType clickedIndex;
- clickedIndex[0]=x;
- clickedIndex[1]=y;
+ clickedIndex[0] = x;
+ clickedIndex[1] = y;
if (!m_Drag)
- {
- m_LastIndex=this->WindowToImageCoordinates(clickedIndex);
- }
+ {
+ m_LastIndex = this->WindowToImageCoordinates(clickedIndex);
+ }
return 1;
- }
+ }
case FL_DRAG:
- {
- int x = Fl::event_x();
- int y = Fl::event_y();
+ {
+ int x = Fl::event_x();
+ int y = Fl::event_y();
IndexType index;
- index[0]=x;
- index[1]=y;
- IndexType clickedIndex=this->WindowToImageCoordinates(index);
+ index[0] = x;
+ index[1] = y;
+ IndexType clickedIndex = this->WindowToImageCoordinates(index);
typename BoxType::Pointer box = BoxType::New();
box->SetColor(m_Parent->GetInterfaceBoxesColor());
IndexType boxIndex;
- SizeType boxSize;
+ SizeType boxSize;
// compute the size of the selection box
- if (clickedIndex[0]>m_LastIndex[0])
- {
- boxIndex[0]=m_LastIndex[0];
- boxSize[0]=clickedIndex[0]-m_LastIndex[0];
- }
+ if (clickedIndex[0] > m_LastIndex[0])
+ {
+ boxIndex[0] = m_LastIndex[0];
+ boxSize[0] = clickedIndex[0] - m_LastIndex[0];
+ }
else
- {
- boxIndex[0]=clickedIndex[0];
- boxSize[0]=m_LastIndex[0]-clickedIndex[0];
- }
- if (clickedIndex[1]>m_LastIndex[1])
- {
- boxIndex[1]=m_LastIndex[1];
- boxSize[1]=clickedIndex[1]-m_LastIndex[1];
- }
+ {
+ boxIndex[0] = clickedIndex[0];
+ boxSize[0] = m_LastIndex[0] - clickedIndex[0];
+ }
+ if (clickedIndex[1] > m_LastIndex[1])
+ {
+ boxIndex[1] = m_LastIndex[1];
+ boxSize[1] = clickedIndex[1] - m_LastIndex[1];
+ }
else
- {
- boxIndex[1]=clickedIndex[1];
- boxSize[1]=m_LastIndex[1]-clickedIndex[1];
- }
+ {
+ boxIndex[1] = clickedIndex[1];
+ boxSize[1] = m_LastIndex[1] - clickedIndex[1];
+ }
box->SetIndex(boxIndex);
box->SetSize(boxSize);
if (m_Drag)
- {
+ {
m_Parent->GetInterfaceBoxesList()->PopBack();
- }
+ }
m_Parent->GetInterfaceBoxesList()->PushBack(box);
- m_Drag=true;
+ m_Drag = true;
m_Parent->Update();
return 1;
- }
+ }
case FL_RELEASE:
- {
- int x = Fl::event_x();
- int y = Fl::event_y();
+ {
+ int x = Fl::event_x();
+ int y = Fl::event_y();
IndexType clickedIndex;
- clickedIndex[0]=x;
- clickedIndex[1]=y;
- clickedIndex=this->WindowToImageCoordinates(clickedIndex);
+ clickedIndex[0] = x;
+ clickedIndex[1] = y;
+ clickedIndex = this->WindowToImageCoordinates(clickedIndex);
if (m_Drag)
- {
+ {
m_Parent->GetInterfaceBoxesList()->PopBack();
- }
+ }
if (m_EventsInterface.IsNull() || m_EventsInterface->GetForwardEvents())
- {
- if (m_Parent->GetPolygonROIList()->Size()==0)
{
+ if (m_Parent->GetPolygonROIList()->Size() == 0)
+ {
m_Parent->GetPolygonROIList()->PushBack(PolygonType::New());
m_Parent->GetPolygonROIList()->Back()->SetValue(m_Parent->GetNextROILabel());
+ }
}
- }
IndexType boxIndex;
- SizeType boxSize;
- if (clickedIndex[0]>m_LastIndex[0])
- {
- boxIndex[0]=m_LastIndex[0];
- boxSize[0]=clickedIndex[0]-m_LastIndex[0];
- }
+ SizeType boxSize;
+ if (clickedIndex[0] > m_LastIndex[0])
+ {
+ boxIndex[0] = m_LastIndex[0];
+ boxSize[0] = clickedIndex[0] - m_LastIndex[0];
+ }
else
- {
- boxIndex[0]=clickedIndex[0];
- boxSize[0]=m_LastIndex[0]-clickedIndex[0];
- }
- if (clickedIndex[1]>m_LastIndex[1])
- {
- boxIndex[1]=m_LastIndex[1];
- boxSize[1]=clickedIndex[1]-m_LastIndex[1];
- }
+ {
+ boxIndex[0] = clickedIndex[0];
+ boxSize[0] = m_LastIndex[0] - clickedIndex[0];
+ }
+ if (clickedIndex[1] > m_LastIndex[1])
+ {
+ boxIndex[1] = m_LastIndex[1];
+ boxSize[1] = clickedIndex[1] - m_LastIndex[1];
+ }
else
- {
- boxIndex[1]=clickedIndex[1];
- boxSize[1]=m_LastIndex[1]-clickedIndex[1];
- }
+ {
+ boxIndex[1] = clickedIndex[1];
+ boxSize[1] = m_LastIndex[1] - clickedIndex[1];
+ }
if (m_EventsInterface.IsNotNull())
- {
+ {
RegionType selectedRegion;
selectedRegion.SetIndex(boxIndex);
selectedRegion.SetSize(boxSize);
m_EventsInterface->RegionSelected(selectedRegion);
- }
+ }
if (m_EventsInterface.IsNull() || m_EventsInterface->GetForwardEvents())
- {
+ {
ContinuousIndexType newVertex;
// Up Left corner
newVertex[0] = boxIndex[0];
@@ -306,72 +303,73 @@ public:
newVertex[1] += boxSize[1];
m_Parent->GetPolygonROIList()->Back()->AddVertex(newVertex);
// Down Left corner
- newVertex[0]= boxIndex[0];
+ newVertex[0] = boxIndex[0];
m_Parent->GetPolygonROIList()->Back()->AddVertex(newVertex);
m_Parent->GetPolygonROIList()->PushBack(PolygonType::New());
m_Parent->GetPolygonROIList()->Back()->SetValue(m_Parent->GetNextROILabel());
m_Parent->Update();
- }
- m_Drag=false;
+ }
+ m_Drag = false;
return 1;
- }
- }
+ }
+ }
return 0;
}
virtual int PolygonROISelectionHandle(int event)
{
switch (event)
- {
+ {
case FL_PUSH:
- {
- int x = Fl::event_x();
- int y = Fl::event_y();
+ {
+ int x = Fl::event_x();
+ int y = Fl::event_y();
IndexType clickedIndex;
- clickedIndex[0]=x;
- clickedIndex[1]=y;
- clickedIndex=this->WindowToImageCoordinates(clickedIndex);
+ clickedIndex[0] = x;
+ clickedIndex[1] = y;
+ clickedIndex = this->WindowToImageCoordinates(clickedIndex);
// If left mouse click
- if (Fl::event_button()==FL_LEFT_MOUSE)
- {
- // If not already editing a polygon, start a new one.
- if (m_Parent->GetPolygonROIList()->Size()==0)
+ if (Fl::event_button() == FL_LEFT_MOUSE)
{
+ // If not already editing a polygon, start a new one.
+ if (m_Parent->GetPolygonROIList()->Size() == 0)
+ {
m_Parent->GetPolygonROIList()->PushBack(PolygonType::New());
m_Parent->GetPolygonROIList()->Back()->SetValue(m_Parent->GetNextROILabel());
- }
+ }
m_Parent->GetPolygonROIList()->Back()->AddVertex(clickedIndex);
m_Parent->Update();
- }
- else if (Fl::event_button()==FL_RIGHT_MOUSE)
- {
+ }
+ else if (Fl::event_button() == FL_RIGHT_MOUSE)
+ {
m_Parent->GetPolygonROIList()->PushBack(PolygonType::New());
m_Parent->GetPolygonROIList()->Back()->SetValue(m_Parent->GetNextROILabel());
- }
+ }
return 1;
- }
+ }
case FL_KEYDOWN:
- {
- // erase the last vertex of the current polygon
- if (Fl::event_key()==FL_Page_Down)
{
- if (m_Parent->GetPolygonROIList()->Size()>0)
+ // erase the last vertex of the current polygon
+ if (Fl::event_key() == FL_Page_Down)
{
- unsigned int sizeOfThePolygon = m_Parent->GetPolygonROIList()->Back()->GetVertexList()->Size();
- if (sizeOfThePolygon>0)
+ if (m_Parent->GetPolygonROIList()->Size() > 0)
{
+ unsigned int sizeOfThePolygon = m_Parent->GetPolygonROIList()->Back()->GetVertexList()->Size();
+ if (sizeOfThePolygon > 0)
+ {
// itk::PolylineParametricPath does not provide a RemoveVertex() method, and the access to the vertex list is const, so we have no other choice to remove a vertex.
- VertexListPointerType list = const_cast<VertexListType *>(m_Parent->GetPolygonROIList()->Back()->GetVertexList());
+ VertexListPointerType list =
+ const_cast<VertexListType *>(m_Parent->GetPolygonROIList()->Back()->GetVertexList());
list->pop_back();
m_Parent->Update();
+ }
}
}
- }
return 1;
- }
- }
+ }
+ }
return 0;
}
@@ -379,13 +377,13 @@ public:
{
// Handle the mode selection to call the specific handle methods */
if (event == FL_KEYDOWN)
- {
- // Erase the last ROI
- if (Fl::event_key()==FL_Delete && m_Parent->GetPolygonROIList()->Size() > 0)
{
- m_Parent->GetPolygonROIList()->Erase(m_Parent->GetPolygonROIList()->Size()-1);
+ // Erase the last ROI
+ if (Fl::event_key() == FL_Delete && m_Parent->GetPolygonROIList()->Size() > 0)
+ {
+ m_Parent->GetPolygonROIList()->Erase(m_Parent->GetPolygonROIList()->Size() - 1);
m_Parent->Update();
- }
+ }
// else if(Fl::event_key()==FL_Control_L)
// {
// m_ShortCutRectangle = !m_ShortCutRectangle;
@@ -415,72 +413,71 @@ public:
// std::cout<<"Polygon ROI selection mode OFF"<<std::endl;
// }
// }
- }
+ }
// handle the pixel value reporting
switch (event)
- {
+ {
case FL_ENTER:
- {
+ {
m_MouseIn = true;
return 1;
- }
+ }
case FL_LEAVE:
- {
+ {
m_MouseIn = false;
m_Parent->ClearPixLocVal();
return 1;
- }
+ }
case FL_MOVE:
- {
- // If we move inside the point of view, then report the pixel location and value.
- m_MouseIn=true;
- if (m_MouseMoveCount%m_ValueUpdateFrequency==0)
{
- m_MousePos[0]=Fl::event_x();
- m_MousePos[1]=Fl::event_y();
+ // If we move inside the point of view, then report the pixel location and value.
+ m_MouseIn = true;
+ if (m_MouseMoveCount % m_ValueUpdateFrequency == 0)
+ {
+ m_MousePos[0] = Fl::event_x();
+ m_MousePos[1] = Fl::event_y();
IndexType newIndex = this->WindowToImageCoordinates(m_MousePos);
m_Parent->ReportPixel(newIndex);
- m_MouseMoveCount=0;
- }
+ m_MouseMoveCount = 0;
+ }
m_MouseMoveCount++;
return 1;
- }
+ }
case FL_FOCUS:
- {
+ {
return 1;
- }
+ }
case FL_UNFOCUS:
- {
+ {
return 1;
- }
+ }
case FL_HIDE:
- {
+ {
m_Parent->Hide();
return 0;
- }
- }
+ }
+ }
// If the current mode is rectangle selection, call the right handle method
if (m_Parent->GetRectangularROISelectionMode())
- {
+ {
return RectangleROISelectionHandle(event);
- }
+ }
// If the current mode is polygon selection, call the right handle method
else if (m_Parent->GetPolygonalROISelectionMode())
- {
+ {
return PolygonROISelectionHandle(event);
- }
+ }
// else call the default handle method
else
- {
+ {
return DefaultHandle(event);
- }
+ }
}
- virtual void resize(int x,int y, int w, int h)
+ virtual void resize(int x, int y, int w, int h)
{
- Superclass::resize(x,y,w,h);
- if (m_Parent->GetBuilt())
- m_Parent->Update();
+ Superclass::resize(x, y, w, h);
+ if (m_Parent->GetBuilt()) m_Parent->Update();
}
protected:
@@ -488,7 +485,7 @@ protected:
* Constructor.
*/
ImageViewerFullWidget()
- {
+ {
m_MouseIn = false;
m_MousePos.Fill(0);
m_MouseMoveCount = 0;
@@ -498,25 +495,25 @@ protected:
m_Drag = false;
m_ValueUpdateFrequency = 5;
- };
+ };
/**
* Destructor.
*/
virtual ~ImageViewerFullWidget()
- {
+ {
m_Parent = NULL;
- }
+ }
private:
- ParentPointerType m_Parent;
- IndexType m_MousePos;
- bool m_MouseIn;
- unsigned int m_MouseMoveCount;
- unsigned int m_ValueUpdateFrequency;
- IndexType m_LastIndex;
- bool m_ShortCutRectangle;
- bool m_ShortCutPolygon;
- bool m_Drag;
+ ParentPointerType m_Parent;
+ IndexType m_MousePos;
+ bool m_MouseIn;
+ unsigned int m_MouseMoveCount;
+ unsigned int m_ValueUpdateFrequency;
+ IndexType m_LastIndex;
+ bool m_ShortCutRectangle;
+ bool m_ShortCutPolygon;
+ bool m_Drag;
EventsInterfacePointerType m_EventsInterface;
};
diff --git a/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h b/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h
index 1ad3c53163..b347887cfe 100644
--- a/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h
+++ b/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h
@@ -39,108 +39,121 @@ template <class TPixel, class TLabel> class ImageViewerBase;
*/
template <class THistogram, class TPixel, class TLabel>
class ITK_EXPORT ImageViewerHistogramAndTransferFunctionWidget
- : public HistogramAndTransferFunctionWidget<THistogram,TPixel>
+ : public HistogramAndTransferFunctionWidget<THistogram, TPixel>
{
public:
/** Standard typedefs */
- typedef ImageViewerHistogramAndTransferFunctionWidget Self;
- typedef HistogramAndTransferFunctionWidget<THistogram,TPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageViewerHistogramAndTransferFunctionWidget Self;
+ typedef HistogramAndTransferFunctionWidget<THistogram, TPixel> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(ImageViewerHistogramAndTransferFunctionWidget,HistogramAndTransferFunctionWidget);
+ itkTypeMacro(ImageViewerHistogramAndTransferFunctionWidget, HistogramAndTransferFunctionWidget);
/** Parent app typedefs */
- typedef TPixel PixelType;
- typedef TLabel LabelType;
+ typedef TPixel PixelType;
+ typedef TLabel LabelType;
typedef ImageViewerBase<PixelType, LabelType> ParentType;
- typedef ParentType* ParentPointerType;
-
- typedef typename Superclass::TransferFunctionPointerType TransferFunctionPointerType;
- typedef ImageWidgetAffineTransferFunction<PixelType> AffineTransferFunctionType;
- typedef typename AffineTransferFunctionType::Pointer AffineTransferFunctionPointerType;
- typedef ImageWidgetSquareRootTransferFunction<PixelType> SquareRootTransferFunctionType;
- typedef typename SquareRootTransferFunctionType::Pointer SquareRootTransferFunctionPointerType;
- typedef ImageWidgetLogTransferFunction<PixelType> LogTransferFunctionType;
- typedef typename LogTransferFunctionType::Pointer LogTransferFunctionPointerType;
- typedef ImageWidgetSquareTransferFunction<PixelType> SquareonentialTransferFunctionType;
+ typedef ParentType* ParentPointerType;
+
+ typedef typename Superclass::TransferFunctionPointerType TransferFunctionPointerType;
+ typedef ImageWidgetAffineTransferFunction<PixelType> AffineTransferFunctionType;
+ typedef typename AffineTransferFunctionType::Pointer AffineTransferFunctionPointerType;
+ typedef ImageWidgetSquareRootTransferFunction<PixelType> SquareRootTransferFunctionType;
+ typedef typename SquareRootTransferFunctionType::Pointer SquareRootTransferFunctionPointerType;
+ typedef ImageWidgetLogTransferFunction<PixelType> LogTransferFunctionType;
+ typedef typename LogTransferFunctionType::Pointer LogTransferFunctionPointerType;
+ typedef ImageWidgetSquareTransferFunction<PixelType> SquareonentialTransferFunctionType;
typedef typename SquareonentialTransferFunctionType::Pointer SquareonentialTransferFunctionPointerType;
/** Set the parent application */
- itkSetMacro(Parent,ParentPointerType);
- itkGetMacro(Parent,ParentPointerType);
+ itkSetMacro(Parent, ParentPointerType);
+ itkGetMacro(Parent, ParentPointerType);
protected:
// event handling
virtual int handle(int event)
{
- double factor = (this->GetHistogram()->Quantile(0,1.)-this->GetHistogram()->Quantile(0,0.))
- /(static_cast<double>(this->w())-2*this->GetMarginX()-this->GetOutputHistogramMargin()*static_cast<double>(this->w()));
- double xupper = this->GetMarginX() + static_cast<double>(this->GetTransferFunction()->GetUpperBound()-this->GetHistogram()->Quantile(0,0.))/factor;
- double xlower = this->GetMarginX() + static_cast<double>(this->GetTransferFunction()->GetLowerBound()-this->GetHistogram()->Quantile(0,0.))/factor;
+ double factor = (this->GetHistogram()->Quantile(0, 1.) - this->GetHistogram()->Quantile(0, 0.))
+ / (static_cast<double>(this->w()) - 2 * this->GetMarginX() - this->GetOutputHistogramMargin() *
+ static_cast<double>(this->w()));
+ double xupper = this->GetMarginX() +
+ static_cast<double>(this->GetTransferFunction()->GetUpperBound() -
+ this->GetHistogram()->Quantile(0, 0.)) / factor;
+ double xlower = this->GetMarginX() +
+ static_cast<double>(this->GetTransferFunction()->GetLowerBound() -
+ this->GetHistogram()->Quantile(0, 0.)) / factor;
switch (event)
- {
+ {
case FL_PUSH:
- {
- double x = Fl::event_x();
- if ((vcl_abs(x-xlower)<50) || (vcl_abs(x-xupper)<50))
{
- if (vcl_abs(x-xlower)<vcl_abs(x-xupper))
+ double x = Fl::event_x();
+ if ((vcl_abs(x - xlower) < 50) || (vcl_abs(x - xupper) < 50))
{
+ if (vcl_abs(x - xlower) < vcl_abs(x - xupper))
+ {
m_ModifyLower = true;
- }
+ }
else
- {
+ {
m_ModifyUpper = true;
+ }
}
- }
return 1;
- }
+ }
case FL_RELEASE:
- {
+ {
m_ModifyLower = false;
m_ModifyUpper = false;
m_Parent->ChangeTransferFunctions();
m_Parent->Update();
return 1;
- }
+ }
case FL_DRAG:
- {
+ {
double x = Fl::event_x();
- if (m_ModifyLower && (x>this->GetMarginX()) && (x<static_cast<double>(this->w())-this->GetMarginX()-this->GetOutputHistogramMargin()*static_cast<double>(this->w())))
- {
- x = (x>xupper ? xupper : x);
- this->GetTransferFunction()->SetLowerBound(static_cast<PixelType>(this->GetHistogram()->Quantile(0,0.)+(x-this->GetMarginX())*factor));
+ if (m_ModifyLower && (x > this->GetMarginX()) &&
+ (x < static_cast<double>(this->w()) - this->GetMarginX() - this->GetOutputHistogramMargin() *
+ static_cast<double>(this->w())))
+ {
+ x = (x > xupper ? xupper : x);
+ this->GetTransferFunction()->SetLowerBound(static_cast<PixelType>(this->GetHistogram()->Quantile(0,
+ 0.) +
+ (x - this->GetMarginX()) * factor));
this->redraw();
- }
- else if (m_ModifyUpper && (x<static_cast<double>(this->w())-this->GetMarginX()-this->GetOutputHistogramMargin()*static_cast<double>(this->w())))
- {
- x = (x<xlower ? xlower : x);
- this->GetTransferFunction()->SetUpperBound(static_cast<PixelType>(this->GetHistogram()->Quantile(0,0.)+(x-this->GetMarginX())*factor));
+ }
+ else if (m_ModifyUpper &&
+ (x < static_cast<double>(this->w()) - this->GetMarginX() - this->GetOutputHistogramMargin() *
+ static_cast<double>(this->w())))
+ {
+ x = (x < xlower ? xlower : x);
+ this->GetTransferFunction()->SetUpperBound(static_cast<PixelType>(this->GetHistogram()->Quantile(0,
+ 0.) +
+ (x - this->GetMarginX()) * factor));
this->redraw();
- }
+ }
return 1;
- }
+ }
case FL_MOUSEWHEEL:
- {
- int dy = Fl::event_dy();
- if (dy>0)
{
+ int dy = Fl::event_dy();
+ if (dy > 0)
+ {
m_TransferFunctionCode++;
- }
+ }
else
- {
+ {
m_TransferFunctionCode--;
- }
- m_TransferFunctionCode = vcl_abs(m_TransferFunctionCode%4);
+ }
+ m_TransferFunctionCode = vcl_abs(m_TransferFunctionCode % 4);
TransferFunctionPointerType newFunction;
switch (m_TransferFunctionCode)
- {
+ {
case 0:
newFunction = AffineTransferFunctionType::New();
this->SetTransferFunctionLabel("Affine");
@@ -157,7 +170,7 @@ protected:
newFunction = SquareonentialTransferFunctionType::New();
this->SetTransferFunctionLabel("Square");
break;
- }
+ }
newFunction->SetLowerBound(this->GetTransferFunction()->GetLowerBound());
newFunction->SetUpperBound(this->GetTransferFunction()->GetUpperBound());
this->SetTransferFunction(newFunction);
@@ -165,34 +178,34 @@ protected:
m_Parent->Update();
return 1;
- }
- }
+ }
+ }
return 0;
}
/** Constructor */
ImageViewerHistogramAndTransferFunctionWidget()
- {
+ {
m_ModifyLower = false;
m_ModifyUpper = false;
m_TransferFunctionCode = 0;
- }
+ }
/** Destructor */
virtual ~ImageViewerHistogramAndTransferFunctionWidget()
- {
+ {
m_Parent = NULL;
- }
+ }
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
- ImageViewerHistogramAndTransferFunctionWidget(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageViewerHistogramAndTransferFunctionWidget(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Modify lower/upper threshold flag */
- bool m_ModifyLower;
- bool m_ModifyUpper;
- int m_TransferFunctionCode;
+ bool m_ModifyLower;
+ bool m_ModifyUpper;
+ int m_TransferFunctionCode;
ParentPointerType m_Parent;
};
diff --git a/Code/Visu/otbImageViewerScrollWidget.h b/Code/Visu/otbImageViewerScrollWidget.h
index 8105452d3a..e5906cbfb8 100644
--- a/Code/Visu/otbImageViewerScrollWidget.h
+++ b/Code/Visu/otbImageViewerScrollWidget.h
@@ -41,14 +41,14 @@ template <class TPixel, class TLabel> class ImageViewerBase;
*/
template <class TPixel, class TLabel>
class ITK_EXPORT ImageViewerScrollWidget
- : public FixedSizeFullImageWidget<TPixel>
+ : public FixedSizeFullImageWidget<TPixel>
{
public:
/** Standard class typedefs */
- typedef ImageViewerScrollWidget Self;
- typedef FixedSizeFullImageWidget<TPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageViewerScrollWidget Self;
+ typedef FixedSizeFullImageWidget<TPixel> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -56,76 +56,76 @@ public:
/** Run-time type information (and related methods). */
itkTypeMacro(ImageViewerScrollWidget, FixedSizeFullImageWidget);
- typedef TPixel PixelType;
- typedef TLabel LabelType;
+ typedef TPixel PixelType;
+ typedef TLabel LabelType;
typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::SizeType SizeType;
typedef ImageViewerBase<PixelType, LabelType> ParentType;
- typedef ParentType* ParentPointerType;
+ typedef ParentType* ParentPointerType;
typedef otb::ImageWidgetBoxForm BoxType;
- typedef BoxType::ColorType ColorType;
+ typedef BoxType::ColorType ColorType;
- itkSetMacro(Parent,ParentPointerType);
- itkGetMacro(Parent,ParentPointerType);
+ itkSetMacro(Parent, ParentPointerType);
+ itkGetMacro(Parent, ParentPointerType);
/** Handle method */
virtual int handle(int event)
{
switch (event)
- {
+ {
case FL_PUSH:
- {
- int x = Fl::event_x();
- int y = Fl::event_y();
+ {
+ int x = Fl::event_x();
+ int y = Fl::event_y();
IndexType clickedIndex;
- clickedIndex[0]=x;
- clickedIndex[1]=y;
- clickedIndex=this->WindowToImageCoordinates(clickedIndex);
- clickedIndex[0]=clickedIndex[0]*m_Parent->GetShrinkFactor();
- clickedIndex[1]=clickedIndex[1]*m_Parent->GetShrinkFactor();
+ clickedIndex[0] = x;
+ clickedIndex[1] = y;
+ clickedIndex = this->WindowToImageCoordinates(clickedIndex);
+ clickedIndex[0] = clickedIndex[0] * m_Parent->GetShrinkFactor();
+ clickedIndex[1] = clickedIndex[1] * m_Parent->GetShrinkFactor();
//std::cout<<"Scroll widget: "<<m_Parent->GetLabel()<<" before parent update"<<std::endl;
m_Parent->ChangeFullViewedRegion(clickedIndex);
m_Parent->ChangeZoomViewedRegion(clickedIndex);
m_Parent->Update();
//std::cout<<"Scroll widget: "<<m_Parent->GetLabel()<<" after parent update"<<std::endl;
return 1;
- }
+ }
case FL_ENTER:
- {
+ {
m_MouseIn = true;
return 1;
- }
+ }
case FL_LEAVE:
- {
+ {
m_MouseIn = false;
m_Parent->ClearPixLocVal();
return 1;
- }
+ }
case FL_MOVE:
- {
- m_MouseIn=true;
- if (m_MouseMoveCount%m_ValueUpdateFrequency==0)
{
- m_MousePos[0]=Fl::event_x();
- m_MousePos[1]=Fl::event_y();
+ m_MouseIn = true;
+ if (m_MouseMoveCount % m_ValueUpdateFrequency == 0)
+ {
+ m_MousePos[0] = Fl::event_x();
+ m_MousePos[1] = Fl::event_y();
IndexType newIndex = this->WindowToImageCoordinates(m_MousePos);
IndexType realIndex;
- realIndex[0]=newIndex[0]*m_Parent->GetShrinkFactor();
- realIndex[1]=newIndex[1]*m_Parent->GetShrinkFactor();
+ realIndex[0] = newIndex[0] * m_Parent->GetShrinkFactor();
+ realIndex[1] = newIndex[1] * m_Parent->GetShrinkFactor();
m_Parent->ReportPixel(realIndex);
- m_MouseMoveCount=0;
- }
+ m_MouseMoveCount = 0;
+ }
m_MouseMoveCount++;
return 1;
- }
+ }
case FL_HIDE:
- {
+ {
m_Parent->Hide();
return 0;
- }
- }
+ }
+ }
return 0;
}
@@ -134,26 +134,26 @@ protected:
* Constructor.
*/
ImageViewerScrollWidget()
- {
+ {
m_MouseIn = false;
m_MousePos.Fill(0);
m_MouseMoveCount = 0;
m_ValueUpdateFrequency = 5;
- };
+ };
/**
* Destructor.
*/
virtual ~ImageViewerScrollWidget()
- {
+ {
m_Parent = NULL;
- }
+ }
private:
ParentPointerType m_Parent;
- IndexType m_MousePos;
- bool m_MouseIn;
- unsigned int m_MouseMoveCount;
- unsigned int m_ValueUpdateFrequency;
+ IndexType m_MousePos;
+ bool m_MouseIn;
+ unsigned int m_MouseMoveCount;
+ unsigned int m_ValueUpdateFrequency;
};
} // end namespace otb
diff --git a/Code/Visu/otbImageViewerZoomWidget.h b/Code/Visu/otbImageViewerZoomWidget.h
index a832a02ee4..3dccf57fa4 100644
--- a/Code/Visu/otbImageViewerZoomWidget.h
+++ b/Code/Visu/otbImageViewerZoomWidget.h
@@ -42,14 +42,14 @@ template <class TPixel, class TLabel> class ImageViewerBase;
*/
template <class TPixel, class TLabel>
class ITK_EXPORT ImageViewerZoomWidget
- : public ZoomableImageWidget<TPixel>
+ : public ZoomableImageWidget<TPixel>
{
public:
/** Standard class typedefs */
- typedef ImageViewerZoomWidget Self;
+ typedef ImageViewerZoomWidget Self;
typedef ZoomableImageWidget<TPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory. */
itkNewMacro(Self);
@@ -57,148 +57,145 @@ public:
/** Run-time type information (and related methods). */
itkTypeMacro(ImageViewerZoomWidget, FullResolutionImageWidget);
- typedef TPixel PixelType;
- typedef TLabel LabelType;
+ typedef TPixel PixelType;
+ typedef TLabel LabelType;
typedef typename Superclass::IndexType IndexType;
- typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::SizeType SizeType;
typedef ImageViewerBase<PixelType, LabelType> ParentType;
- typedef ParentType* ParentPointerType;
+ typedef ParentType* ParentPointerType;
- itkSetMacro(Parent,ParentPointerType);
- itkGetMacro(Parent,ParentPointerType);
+ itkSetMacro(Parent, ParentPointerType);
+ itkGetMacro(Parent, ParentPointerType);
/** Handle method */
virtual int handle(int event)
{
switch (event)
- {
+ {
case FL_ENTER:
- {
+ {
m_MouseIn = true;
return 1;
- }
+ }
case FL_LEAVE:
- {
+ {
m_MouseIn = false;
m_Parent->UpdateZoomWidget();
m_Parent->ClearPixLocVal();
return 1;
- }
+ }
case FL_MOVE:
- {
- m_MouseIn=true;
- if (m_MouseMoveCount%m_ValueUpdateFrequency==0)
{
- m_MousePos[0]=Fl::event_x();
- m_MousePos[1]=Fl::event_y();
+ m_MouseIn = true;
+ if (m_MouseMoveCount % m_ValueUpdateFrequency == 0)
+ {
+ m_MousePos[0] = Fl::event_x();
+ m_MousePos[1] = Fl::event_y();
IndexType newIndex = this->WindowToImageCoordinates(m_MousePos);
m_Parent->ReportPixel(newIndex);
- m_MouseMoveCount=0;
- }
+ m_MouseMoveCount = 0;
+ }
m_MouseMoveCount++;
return 1;
- }
- case FL_MOUSEWHEEL:
- {
- int dy = Fl::event_dy();
- if (dy<0)
- {
- this->SetZoomFactor(this->GetOpenGlIsotropicZoom()+m_ZoomStep);
}
- else
+ case FL_MOUSEWHEEL:
{
- if (this->GetOpenGlIsotropicZoom()-m_ZoomStep>=1)
+ int dy = Fl::event_dy();
+ if (dy < 0)
{
- this->SetZoomFactor(this->GetOpenGlIsotropicZoom()-m_ZoomStep);
+ this->SetZoomFactor(this->GetOpenGlIsotropicZoom() + m_ZoomStep);
}
- else
+ else
{
+ if (this->GetOpenGlIsotropicZoom() - m_ZoomStep >= 1)
+ {
+ this->SetZoomFactor(this->GetOpenGlIsotropicZoom() - m_ZoomStep);
+ }
+ else
+ {
this->SetZoomFactor(1.0);
+ }
}
- }
m_Parent->Update();
return 1;
- }
+ }
case FL_FOCUS:
- {
+ {
return 1;
- }
+ }
case FL_UNFOCUS:
- {
+ {
return 1;
- }
+ }
case FL_KEYDOWN:
- {
+ {
IndexType newIndex = this->GetViewedRegion().GetIndex();
- SizeType newSize = this->GetViewedRegion().GetSize();
- newIndex[0]=newIndex[0]+newSize[0]/2;
- newIndex[1] = newIndex[1] + newSize[1]/2;
+ SizeType newSize = this->GetViewedRegion().GetSize();
+ newIndex[0] = newIndex[0] + newSize[0] / 2;
+ newIndex[1] = newIndex[1] + newSize[1] / 2;
switch (Fl::event_key())
- {
+ {
case FL_Down:
- {
- newIndex[1] = newIndex[1]+newSize[1]/8;
+ {
+ newIndex[1] = newIndex[1] + newSize[1] / 8;
break;
- }
+ }
case FL_Up:
- {
- newIndex[1] = newIndex[1]-newSize[1]/8;
+ {
+ newIndex[1] = newIndex[1] - newSize[1] / 8;
break;
- }
+ }
case FL_Left:
- {
- newIndex[0] = newIndex[0]-newSize[0]/8;
+ {
+ newIndex[0] = newIndex[0] - newSize[0] / 8;
break;
- }
+ }
case FL_Right:
- {
- newIndex[0] = newIndex[0]+newSize[0]/8;
+ {
+ newIndex[0] = newIndex[0] + newSize[0] / 8;
break;
- }
- }
+ }
+ }
m_Parent->ChangeZoomViewedRegion(newIndex);
return 1;
- }
- }
+ }
+ }
return 0;
}
-
- virtual void resize(int x,int y, int w, int h)
+ virtual void resize(int x, int y, int w, int h)
{
- Superclass::resize(x,y,w,h);
- if (m_Parent->GetBuilt())
- m_Parent->Update();
+ Superclass::resize(x, y, w, h);
+ if (m_Parent->GetBuilt()) m_Parent->Update();
}
-
protected:
/**
* Constructor.
*/
ImageViewerZoomWidget()
- {
+ {
m_ZoomStep = 0.2;
m_MouseIn = false;
m_MousePos.Fill(0);
m_MouseMoveCount = 0;
m_ValueUpdateFrequency = 5;
- };
+ };
/**
* Destructor.
*/
virtual ~ImageViewerZoomWidget()
- {
+ {
m_Parent = NULL;
- }
+ }
private:
ParentPointerType m_Parent;
- double m_ZoomStep;
- IndexType m_MousePos;
- bool m_MouseIn;
- unsigned int m_MouseMoveCount;
- unsigned int m_ValueUpdateFrequency;
+ double m_ZoomStep;
+ IndexType m_MousePos;
+ bool m_MouseIn;
+ unsigned int m_MouseMoveCount;
+ unsigned int m_ValueUpdateFrequency;
};
diff --git a/Code/Visu/otbImageWidgetBase.h b/Code/Visu/otbImageWidgetBase.h
index 4a2597ab65..3a5baebfc6 100644
--- a/Code/Visu/otbImageWidgetBase.h
+++ b/Code/Visu/otbImageWidgetBase.h
@@ -37,87 +37,87 @@ namespace otb
*/
template <class TPixel>
class ImageWidgetBase
- : public Fl_Gl_Window, public itk::Object
+ : public Fl_Gl_Window, public itk::Object
{
public:
/** Standard class typedefs */
- typedef ImageWidgetBase Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef ImageWidgetBase Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(ImageWidgetBase,Object);
+ itkTypeMacro(ImageWidgetBase, Object);
/** Template related typedef */
- typedef TPixel PixelType;
- typedef otb::VectorImage<PixelType,2> ImageType;
- typedef typename ImageType::PixelType VectorPixelType;
- typedef typename ImageType::Pointer ImagePointerType;
- typedef typename ImageType::SizeType SizeType;
- typedef typename ImageType::IndexType IndexType;
+ typedef TPixel PixelType;
+ typedef otb::VectorImage<PixelType, 2> ImageType;
+ typedef typename ImageType::PixelType VectorPixelType;
+ typedef typename ImageType::Pointer ImagePointerType;
+ typedef typename ImageType::SizeType SizeType;
+ typedef typename ImageType::IndexType IndexType;
typedef typename ImageType::RegionType RegionType;
/// TODO: the type of this image should be templated
- typedef otb::VectorImage<unsigned char,2> OverlayImageType;
+ typedef otb::VectorImage<unsigned char, 2> OverlayImageType;
typedef typename OverlayImageType::Pointer OverlayImagePointerType;
/** View model */
- enum ViewModelType {GRAYSCALE,COMPLEX_MODULUS,COMPLEX_PHASE,RGB};
+ enum ViewModelType {GRAYSCALE, COMPLEX_MODULUS, COMPLEX_PHASE, RGB};
/** Form overlay typedef */
- typedef ImageWidgetFormBase FormType;
- typedef FormType::Pointer FormPointerType;
- typedef ObjectList<FormType> FormListType;
- typedef typename FormListType::Pointer FormListPointerType;
+ typedef ImageWidgetFormBase FormType;
+ typedef FormType::Pointer FormPointerType;
+ typedef ObjectList<FormType> FormListType;
+ typedef typename FormListType::Pointer FormListPointerType;
typedef typename FormListType::ReverseIterator ReverseIteratorType;
- typedef typename FormListType::Iterator IteratorType;
+ typedef typename FormListType::Iterator IteratorType;
- typedef otb::ImageWidgetTransferFunction<PixelType> TransferFunctionType;
+ typedef otb::ImageWidgetTransferFunction<PixelType> TransferFunctionType;
typedef otb::ImageWidgetAffineTransferFunction<PixelType> AffineTransferFunctionType;
- typedef ObjectList<TransferFunctionType> TransferFunctionListType;
- typedef typename TransferFunctionListType::Pointer TransferFunctionListPointerType;
+ typedef ObjectList<TransferFunctionType> TransferFunctionListType;
+ typedef typename TransferFunctionListType::Pointer TransferFunctionListPointerType;
- itkSetMacro(BufferedRegion,RegionType);
- itkGetMacro(BufferedRegion,RegionType);
+ itkSetMacro(BufferedRegion, RegionType);
+ itkGetMacro(BufferedRegion, RegionType);
- itkSetMacro(ViewedRegion,RegionType);
- itkGetMacro(ViewedRegion,RegionType);
+ itkSetMacro(ViewedRegion, RegionType);
+ itkGetMacro(ViewedRegion, RegionType);
- itkSetMacro(RedChannelIndex,unsigned int);
- itkGetMacro(RedChannelIndex,unsigned int);
+ itkSetMacro(RedChannelIndex, unsigned int);
+ itkGetMacro(RedChannelIndex, unsigned int);
- itkSetMacro(GreenChannelIndex,unsigned int);
- itkGetMacro(GreenChannelIndex,unsigned int);
+ itkSetMacro(GreenChannelIndex, unsigned int);
+ itkGetMacro(GreenChannelIndex, unsigned int);
- itkSetMacro(BlueChannelIndex,unsigned int);
- itkGetMacro(BlueChannelIndex,unsigned int);
+ itkSetMacro(BlueChannelIndex, unsigned int);
+ itkGetMacro(BlueChannelIndex, unsigned int);
- itkSetMacro(FormOverlayVisible,bool);
- itkGetMacro(FormOverlayVisible,bool);
+ itkSetMacro(FormOverlayVisible, bool);
+ itkGetMacro(FormOverlayVisible, bool);
- itkSetMacro(ImageOverlayVisible,bool);
- itkGetMacro(ImageOverlayVisible,bool);
+ itkSetMacro(ImageOverlayVisible, bool);
+ itkGetMacro(ImageOverlayVisible, bool);
- itkSetMacro(BlackTransparency,bool);
- itkGetMacro(BlackTransparency,bool);
+ itkSetMacro(BlackTransparency, bool);
+ itkGetMacro(BlackTransparency, bool);
itkGetMacro(SubSamplingRate, unsigned int);
itkSetMacro(SubSamplingRate, unsigned int);
- itkSetMacro(ViewModel,ViewModelType);
- itkGetMacro(ViewModel,ViewModelType);
+ itkSetMacro(ViewModel, ViewModelType);
+ itkGetMacro(ViewModel, ViewModelType);
- itkGetMacro(ImageOverlayOpacity,unsigned char);
- itkSetMacro(ImageOverlayOpacity,unsigned char);
+ itkGetMacro(ImageOverlayOpacity, unsigned char);
+ itkSetMacro(ImageOverlayOpacity, unsigned char);
- itkGetObjectMacro(FormList,FormListType);
- itkGetObjectMacro(TransferFunctionList,TransferFunctionListType);
+ itkGetObjectMacro(FormList, FormListType);
+ itkGetObjectMacro(TransferFunctionList, TransferFunctionListType);
- itkGetMacro(OpenGlIsotropicZoom,double);
+ itkGetMacro(OpenGlIsotropicZoom, double);
/** Set the input image.
* \param image The image to view.
@@ -167,14 +167,15 @@ public:
/** Get the buffer index from the iterator position and the buffered region */
inline unsigned int GetBufferIndex(const IndexType& iteratorIndex)
{
- return (iteratorIndex[1]-m_BufferedRegion.GetIndex()[1])*4*m_BufferedRegion.GetSize()[0]
- + 4*(iteratorIndex[0]-m_BufferedRegion.GetIndex()[0]);
+ return (iteratorIndex[1] - m_BufferedRegion.GetIndex()[1]) * 4 * m_BufferedRegion.GetSize()[0]
+ + 4 * (iteratorIndex[0] - m_BufferedRegion.GetIndex()[0]);
}
inline unsigned int GetRevertedBufferIndex(const IndexType& iteratorIndex)
{
- return (m_BufferedRegion.GetSize()[1]-1+m_BufferedRegion.GetIndex()[1]-iteratorIndex[1])*4*m_BufferedRegion.GetSize()[0]
- + 4*(iteratorIndex[0]-m_BufferedRegion.GetIndex()[0]);
+ return (m_BufferedRegion.GetSize()[1] - 1 + m_BufferedRegion.GetIndex()[1] -
+ iteratorIndex[1]) * 4 * m_BufferedRegion.GetSize()[0]
+ + 4 * (iteratorIndex[0] - m_BufferedRegion.GetIndex()[0]);
}
protected:
/** Constructor */
@@ -206,24 +207,23 @@ protected:
// PURE VIRTUAL METHODS
// User is not supposed to be allowed to move the zoom in the generic implementation
- itkSetMacro(OpenGlIsotropicZoom,double);
-
+ itkSetMacro(OpenGlIsotropicZoom, double);
/** Unlarge OpenGlBuffer */
- virtual void UpdateOpenGlBufferedRegion(void) {};
+ virtual void UpdateOpenGlBufferedRegion(void) {}
/** Test if the buffer has to be enlarged */
virtual bool UpdateOpenGlBufferedRegionRequested(void)
{
return 1;
- };
+ }
/** Resize the widget */
- virtual void resize(int /*x*/, int /*y*/, int /*w*/, int /*h*/) {};
+ virtual void resize(int /*x*/, int /*y*/, int /*w*/, int /*h*/) {}
// END PURE VIRTUAL METHODS
private:
ImageWidgetBase(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** Pointer to the viewed image */
ImagePointerType m_Image;
@@ -252,7 +252,7 @@ private:
/** Set black to transparent*/
bool m_BlackTransparency;
/** The image Overlay opacity */
- unsigned char m_ImageOverlayOpacity;
+ unsigned char m_ImageOverlayOpacity;
/** Pointer to the overlay image */
OverlayImagePointerType m_ImageOverlay;
/** OpenGl image overlay buffer */
diff --git a/Code/Visu/otbImageWidgetBase.txx b/Code/Visu/otbImageWidgetBase.txx
index 9a8535a04e..171bcb792b 100644
--- a/Code/Visu/otbImageWidgetBase.txx
+++ b/Code/Visu/otbImageWidgetBase.txx
@@ -31,7 +31,7 @@ namespace otb
template <class TPixel>
ImageWidgetBase<TPixel>
::ImageWidgetBase()
- : Fl_Gl_Window(0,0,0,0,0)
+ : Fl_Gl_Window(0, 0, 0, 0, 0)
{
m_Image = NULL;
m_OpenGlIsotropicZoom = 1.0;
@@ -44,7 +44,7 @@ ImageWidgetBase<TPixel>
region.SetIndex(index);
m_BufferedRegion = region;
m_ViewedRegion = region;
- m_ViewModel=RGB;
+ m_ViewModel = RGB;
m_RedChannelIndex = 0;
m_GreenChannelIndex = 1;
m_BlueChannelIndex = 2;
@@ -68,13 +68,13 @@ ImageWidgetBase<TPixel>
::~ImageWidgetBase()
{
if (m_OpenGlBuffer != NULL)
- {
- delete [] m_OpenGlBuffer;
- }
+ {
+ delete[] m_OpenGlBuffer;
+ }
if (m_OpenGlImageOverlayBuffer != NULL)
- {
- delete [] m_OpenGlImageOverlayBuffer;
- }
+ {
+ delete[] m_OpenGlImageOverlayBuffer;
+ }
}
/**
* Reset the widget.
@@ -84,13 +84,13 @@ void
ImageWidgetBase<TPixel>
::Reset(void)
{
- int x = this->x();
- int y = this->y();
- int w = this->w();
- int h = this->h();
+ int x = this->x();
+ int y = this->y();
+ int w = this->w();
+ int h = this->h();
const char * label = this->label();
ClearBufferedRegion();
- Init(x,y,w,h,label);
+ Init(x, y, w, h, label);
}
template <class TPixel>
@@ -103,24 +103,23 @@ ImageWidgetBase<TPixel>
m_BufferedRegion.SetSize(size);
}
-
template <class TPixel>
void
ImageWidgetBase<TPixel>
::Init(int /*x*/, int /*y*/, int /*w*/, int /*h*/, const char * /*l*/)
{
#ifdef OTB_GL_USE_ACCEL
- otbMsgDevMacro(<<"Using OTB_GL_USE_ACCEL: ON");
+ otbMsgDevMacro(<< "Using OTB_GL_USE_ACCEL: ON");
#else
- otbMsgDevMacro(<<"Using OTB_GL_USE_ACCEL: OFF");
+ otbMsgDevMacro(<< "Using OTB_GL_USE_ACCEL: OFF");
#endif
- for (unsigned int i = 0; i<m_Image->GetNumberOfComponentsPerPixel();++i)
- {
- if (i>=m_TransferFunctionList->Size())
+ for (unsigned int i = 0; i < m_Image->GetNumberOfComponentsPerPixel(); ++i)
{
+ if (i >= m_TransferFunctionList->Size())
+ {
m_TransferFunctionList->PushBack(AffineTransferFunctionType::New());
+ }
}
- }
}
@@ -135,43 +134,43 @@ typename ImageWidgetBase<TPixel>
ImageWidgetBase<TPixel>
::WindowToImageCoordinates(IndexType index)
{
- double x,y;
+ double x, y;
IndexType resp;
IndexType origin = this->GetViewedRegion().GetIndex();
- x = static_cast<double>(index[0])/m_OpenGlIsotropicZoom
- +static_cast<double>(origin[0]);
+ x = static_cast<double>(index[0]) / m_OpenGlIsotropicZoom
+ + static_cast<double>(origin[0]);
y = static_cast<double>(origin[1])
- +static_cast<double>(index[1])/m_OpenGlIsotropicZoom;
+ + static_cast<double>(index[1]) / m_OpenGlIsotropicZoom;
- SizeType maxSize = this->GetInput()->GetLargestPossibleRegion().GetSize();
+ SizeType maxSize = this->GetInput()->GetLargestPossibleRegion().GetSize();
IndexType maxIndex = this->GetInput()->GetLargestPossibleRegion().GetIndex();
- if (x<maxIndex[0])
- {
- resp[0]=maxIndex[0];
- }
- else if (x>maxIndex[0]+maxSize[0])
- {
- resp[0] = maxIndex[0]+maxSize[0];
- }
+ if (x < maxIndex[0])
+ {
+ resp[0] = maxIndex[0];
+ }
+ else if (x > maxIndex[0] + maxSize[0])
+ {
+ resp[0] = maxIndex[0] + maxSize[0];
+ }
else
- {
- resp[0]=static_cast<int>(x);
- }
-
- if (y<maxIndex[1])
- {
- resp[1]=maxIndex[1];
-
- }
- else if (y>maxIndex[1]+maxSize[1])
- {
- resp[1] = maxIndex[1]+maxSize[1];
- }
+ {
+ resp[0] = static_cast<int>(x);
+ }
+
+ if (y < maxIndex[1])
+ {
+ resp[1] = maxIndex[1];
+
+ }
+ else if (y > maxIndex[1] + maxSize[1])
+ {
+ resp[1] = maxIndex[1] + maxSize[1];
+ }
else
- {
- resp[1]=static_cast<int>(y);
- }
+ {
+ resp[1] = static_cast<int>(y);
+ }
return resp;
}
@@ -183,14 +182,14 @@ void
ImageWidgetBase<TPixel>
::SetInput(ImageType * image)
{
- m_Image=image;
+ m_Image = image;
m_Image->UpdateOutputInformation();
SizeType size;
size.Fill(0);
m_BufferedRegion.SetSize(size);
SizeType displaySize;
- displaySize[0]=this->w();
- displaySize[1]=this->h();
+ displaySize[0] = this->w();
+ displaySize[1] = this->h();
m_ViewedRegion.SetSize(displaySize);
m_ViewedRegion.Crop(m_Image->GetLargestPossibleRegion());
}
@@ -214,7 +213,7 @@ void
ImageWidgetBase<TPixel>
::SetInputOverlay(OverlayImageType * image)
{
- m_ImageOverlay=image;
+ m_ImageOverlay = image;
}
/** Set the input overlay form list.
@@ -260,17 +259,17 @@ ImageWidgetBase<TPixel>
::Show(void)
{
if (!m_Image)
- {
- itkExceptionMacro(<<"No input image !");
- }
+ {
+ itkExceptionMacro(<< "No input image !");
+ }
else
- {
+ {
//otbMsgDebugMacro(<<"Zoomable widget Show");
this->show();
//otbMsgDebugMacro(<<"Before redraw.");
this->redraw();
//otbMsgDebugMacro(<<"After redraw.");
- }
+ }
}
template <class TPixel>
@@ -293,34 +292,34 @@ ImageWidgetBase<TPixel>
// otbMsgDebugMacro(<<"Draw");
if (this->UpdateOpenGlBufferedRegionRequested())
- {
+ {
UpdateOpenGlBufferedRegion();
m_Image->SetRequestedRegion(m_BufferedRegion);
m_Image->PropagateRequestedRegion();
m_Image->UpdateOutputData();
RebuildOpenGlBuffer();
if (m_ImageOverlayVisible)
- {
+ {
m_ImageOverlay->SetRequestedRegion(m_BufferedRegion);
m_ImageOverlay->PropagateRequestedRegion();
m_ImageOverlay->UpdateOutputData();
+ }
}
- }
if (m_ImageOverlayVisible)
- {
+ {
RebuildOpenGlImageOverlayBuffer();
- }
+ }
if (!this->valid())
- {
+ {
valid(1);
glLoadIdentity();
- glViewport(0,0,w(),h());
- glClearColor((float)0.0, (float)0.0, (float)0.0, (float)0.0);
+ glViewport(0, 0, w(), h());
+ glClearColor((float) 0.0, (float) 0.0, (float) 0.0, (float) 0.0);
glShadeModel(GL_FLAT);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- }
+ }
glClear(GL_COLOR_BUFFER_BIT); //this clears and paints to black
glMatrixMode(GL_MODELVIEW); //clear previous 3D draw params
@@ -329,16 +328,15 @@ ImageWidgetBase<TPixel>
this->ortho();
glDisable(GL_BLEND);
-
#ifndef OTB_GL_USE_ACCEL
// To be consistent with old method
- int displayHeight = static_cast<int>(vcl_ceil(m_BufferedRegion.GetSize()[1]*m_OpenGlIsotropicZoom));
+ int displayHeight = static_cast<int>(vcl_ceil(m_BufferedRegion.GetSize()[1] * m_OpenGlIsotropicZoom));
int viewPortOffset = 0;
- viewPortOffset = h()-displayHeight;
- glRasterPos2i(0,viewPortOffset);
+ viewPortOffset = h() - displayHeight;
+ glRasterPos2i(0, viewPortOffset);
- glPixelZoom(m_OpenGlIsotropicZoom,m_OpenGlIsotropicZoom);
+ glPixelZoom(m_OpenGlIsotropicZoom, m_OpenGlIsotropicZoom);
// display the image
glDrawPixels(m_BufferedRegion.GetSize()[0],
@@ -348,13 +346,14 @@ ImageWidgetBase<TPixel>
m_OpenGlBuffer);
#else
glEnable(GL_TEXTURE_2D);
- glColor4f(1.0,1.0,1.0,0.0);
+ glColor4f(1.0, 1.0, 1.0, 0.0);
GLuint texture;
glGenTextures(1, &texture);
glBindTexture(GL_TEXTURE_2D, texture);
- glTexImage2D(GL_TEXTURE_2D, 0, 3, m_BufferedRegion.GetSize()[0], m_BufferedRegion.GetSize()[1], 0, GL_RGBA, GL_UNSIGNED_BYTE, m_OpenGlBuffer);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST); // Nearest Filtering
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST); // Nearest Filtering
+ glTexImage2D(GL_TEXTURE_2D, 0, 3, m_BufferedRegion.GetSize()[0],
+ m_BufferedRegion.GetSize()[1], 0, GL_RGBA, GL_UNSIGNED_BYTE, m_OpenGlBuffer);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); // Nearest Filtering
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); // Nearest Filtering
// glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR); // Linear Filtering
// glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); // Linear Filtering
@@ -362,13 +361,13 @@ ImageWidgetBase<TPixel>
glBegin (GL_QUADS);
int hOffset = this->h() - this->hDisplayed();
glTexCoord2f (0.0, 1.0);
- glVertex3f (0.0, 0.0+hOffset, 0.0);
+ glVertex3f (0.0, 0.0 + hOffset, 0.0);
glTexCoord2f (1.0, 1.0);
- glVertex3f (this->wDisplayed(), 0.0+hOffset, 0.0);
+ glVertex3f (this->wDisplayed(), 0.0 + hOffset, 0.0);
glTexCoord2f (1.0, 0.0);
- glVertex3f (this->wDisplayed(), this->hDisplayed()+hOffset, 0.0);
+ glVertex3f (this->wDisplayed(), this->hDisplayed() + hOffset, 0.0);
glTexCoord2f (0.0, 0.0);
- glVertex3f (0.0, this->hDisplayed()+hOffset, 0.0);
+ glVertex3f (0.0, this->hDisplayed() + hOffset, 0.0);
glEnd ();
glDisable(GL_TEXTURE_2D);
@@ -376,10 +375,10 @@ ImageWidgetBase<TPixel>
// if image overlay is activated, display image overlay
if (m_ImageOverlayVisible)
- {
+ {
#ifndef OTB_GL_USE_ACCEL
glEnable(GL_BLEND);
- glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glDrawPixels(m_BufferedRegion.GetSize()[0],
m_BufferedRegion.GetSize()[1],
GL_RGBA,
@@ -392,44 +391,45 @@ ImageWidgetBase<TPixel>
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_TEXTURE_2D);
- glColor4f(1.0,1.0,1.0,1.0);
+ glColor4f(1.0, 1.0, 1.0, 1.0);
GLuint textureOverlay;
glGenTextures(1, &textureOverlay);
glBindTexture(GL_TEXTURE_2D, textureOverlay);
- glTexImage2D(GL_TEXTURE_2D, 0, 4, m_BufferedRegion.GetSize()[0], m_BufferedRegion.GetSize()[1], 0, GL_RGBA, GL_UNSIGNED_BYTE, m_OpenGlImageOverlayBuffer);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST); // Nearest Filtering
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST); // Nearest Filtering
+ glTexImage2D(GL_TEXTURE_2D, 0, 4, m_BufferedRegion.GetSize()[0],
+ m_BufferedRegion.GetSize()[1], 0, GL_RGBA, GL_UNSIGNED_BYTE, m_OpenGlImageOverlayBuffer);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); // Nearest Filtering
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); // Nearest Filtering
glBindTexture (GL_TEXTURE_2D, textureOverlay);
glBegin (GL_QUADS);
int hOffset = this->h() - this->hDisplayed();
glTexCoord2f (0.0, 1.0);
- glVertex3f (0.0, 0.0+hOffset, 1.0);
+ glVertex3f (0.0, 0.0 + hOffset, 1.0);
glTexCoord2f (1.0, 1.0);
- glVertex3f (this->wDisplayed(), 0.0+hOffset, 1.0);
+ glVertex3f (this->wDisplayed(), 0.0 + hOffset, 1.0);
glTexCoord2f (1.0, 0.0);
- glVertex3f (this->wDisplayed(), this->hDisplayed()+hOffset, 1.0);
+ glVertex3f (this->wDisplayed(), this->hDisplayed() + hOffset, 1.0);
glTexCoord2f (0.0, 0.0);
- glVertex3f (0.0, this->hDisplayed()+hOffset, 1.0);
+ glVertex3f (0.0, this->hDisplayed() + hOffset, 1.0);
glEnd ();
glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
#endif
- }
+ }
if (m_FormOverlayVisible)
- {
+ {
ReverseIteratorType it = m_FormList->ReverseBegin();
//otbMsgDebugMacro(<<"Formlist size: "<<m_FormList->Size());
- for (;it!=m_FormList->ReverseEnd();++it)
- {
+ for (; it != m_FormList->ReverseEnd(); ++it)
+ {
it.Get()->Draw(m_OpenGlIsotropicZoom,
m_ViewedRegion.GetIndex()[0],
m_ViewedRegion.GetIndex()[1],
this->h(), m_SubSamplingRate);
+ }
}
- }
}
@@ -442,84 +442,85 @@ ImageWidgetBase<TPixel>
::RebuildOpenGlBuffer(void)
{
// Channel indices outofbound check
- if(m_RedChannelIndex >= m_Image->GetNumberOfComponentsPerPixel())
+ if (m_RedChannelIndex >= m_Image->GetNumberOfComponentsPerPixel())
{
- itkExceptionMacro(<<"Red channel index out of bound.");
+ itkExceptionMacro(<< "Red channel index out of bound.");
}
- if(m_ViewModel != GRAYSCALE && m_GreenChannelIndex >= m_Image->GetNumberOfComponentsPerPixel())
+ if (m_ViewModel != GRAYSCALE && m_GreenChannelIndex >= m_Image->GetNumberOfComponentsPerPixel())
{
- itkExceptionMacro(<<"Green channel index out of bound.");
+ itkExceptionMacro(<< "Green channel index out of bound.");
}
- if(m_ViewModel == RGB && m_BlueChannelIndex >= m_Image->GetNumberOfComponentsPerPixel())
+ if (m_ViewModel == RGB && m_BlueChannelIndex >= m_Image->GetNumberOfComponentsPerPixel())
{
- itkExceptionMacro(<<"Blue channel index out of bound.");
+ itkExceptionMacro(<< "Blue channel index out of bound.");
}
-
//otbMsgDebugMacro(<<"RebuildOpenGlBuffer");
if (m_OpenGlBuffer != NULL)
- {
+ {
//otbMsgDebugMacro(<<"Deleting previous buffer ...");
- delete [] m_OpenGlBuffer;
- }
+ delete[] m_OpenGlBuffer;
+ }
//otbMsgDebugMacro(<<"Buffered region: "<<m_BufferedRegion);
- unsigned int bufferLenght = 4*m_BufferedRegion.GetNumberOfPixels();
+ unsigned int bufferLenght = 4 * m_BufferedRegion.GetNumberOfPixels();
//otbMsgDebugMacro(<<"New buffer lenght: "<<bufferLenght);
m_OpenGlBuffer = new unsigned char[bufferLenght];
typedef itk::ImageRegionConstIteratorWithIndex<ImageType> IteratorType;
- IteratorType it(m_Image,m_BufferedRegion);
+ IteratorType it(m_Image, m_BufferedRegion);
unsigned int index = 0;
- for (it.GoToBegin();!it.IsAtEnd();++it)
- {
+ for (it.GoToBegin(); !it.IsAtEnd(); ++it)
+ {
#ifdef OTB_GL_USE_ACCEL
index = GetBufferIndex(it.GetIndex());
#else
index = GetRevertedBufferIndex(it.GetIndex());
#endif
switch (m_ViewModel)
- {
+ {
case RGB:
- {
- m_OpenGlBuffer[index] = Normalize(it.Get()[m_RedChannelIndex],m_RedChannelIndex);
- m_OpenGlBuffer[index+1] = Normalize(it.Get()[m_GreenChannelIndex],m_GreenChannelIndex);
- m_OpenGlBuffer[index+2] = Normalize(it.Get()[m_BlueChannelIndex],m_BlueChannelIndex);
- m_OpenGlBuffer[index+3] = 255;
+ {
+ m_OpenGlBuffer[index] = Normalize(it.Get()[m_RedChannelIndex], m_RedChannelIndex);
+ m_OpenGlBuffer[index + 1] = Normalize(it.Get()[m_GreenChannelIndex], m_GreenChannelIndex);
+ m_OpenGlBuffer[index + 2] = Normalize(it.Get()[m_BlueChannelIndex], m_BlueChannelIndex);
+ m_OpenGlBuffer[index + 3] = 255;
break;
- }
+ }
case GRAYSCALE:
- {
- unsigned char gray = Normalize(it.Get()[m_RedChannelIndex],m_RedChannelIndex);
+ {
+ unsigned char gray = Normalize(it.Get()[m_RedChannelIndex], m_RedChannelIndex);
m_OpenGlBuffer[index] = gray;
- m_OpenGlBuffer[index+1] = gray;
- m_OpenGlBuffer[index+2] = gray;
- m_OpenGlBuffer[index+3] = 255;
+ m_OpenGlBuffer[index + 1] = gray;
+ m_OpenGlBuffer[index + 2] = gray;
+ m_OpenGlBuffer[index + 3] = 255;
break;
- }
+ }
case COMPLEX_MODULUS:
- {
+ {
double re = static_cast<double>(it.Get()[m_RedChannelIndex]);
double im = static_cast<double>(it.Get()[m_GreenChannelIndex]);
// std::cout << " *** " << m_RedChannelIndex << " " << m_GreenChannelIndex << std::endl;
- unsigned char modulus = Normalize(static_cast<PixelType>(vcl_sqrt(static_cast<double>(im*im+re*re))),0);
+ unsigned char modulus = Normalize(static_cast<PixelType>(vcl_sqrt(static_cast<double>(im * im + re * re))), 0);
// std::cout << " ** " << im << " " << re << " -> " << static_cast<int>(modulus) << std::endl;
m_OpenGlBuffer[index] = modulus;
- m_OpenGlBuffer[index+1] = modulus;
- m_OpenGlBuffer[index+2] = modulus;
- m_OpenGlBuffer[index+3] = 255;
+ m_OpenGlBuffer[index + 1] = modulus;
+ m_OpenGlBuffer[index + 2] = modulus;
+ m_OpenGlBuffer[index + 3] = 255;
break;
- }
+ }
case COMPLEX_PHASE:
- {
- unsigned char phase = Normalize(static_cast<PixelType>(vcl_atan2(static_cast<double>(it.Get()[m_GreenChannelIndex]),static_cast<double>(it.Get()[m_RedChannelIndex]))),0);
+ {
+ unsigned char phase =
+ Normalize(static_cast<PixelType>(vcl_atan2(static_cast<double>(it.Get()[m_GreenChannelIndex]),
+ static_cast<double>(it.Get()[m_RedChannelIndex]))), 0);
m_OpenGlBuffer[index] = phase;
- m_OpenGlBuffer[index+1] = phase;
- m_OpenGlBuffer[index+2] = phase;
- m_OpenGlBuffer[index+3] = 255;
+ m_OpenGlBuffer[index + 1] = phase;
+ m_OpenGlBuffer[index + 2] = phase;
+ m_OpenGlBuffer[index + 3] = 255;
break;
+ }
+ }
}
- }
- }
}
/**
* Rebuild opengl image overlay buffer.
@@ -529,65 +530,65 @@ void
ImageWidgetBase<TPixel>
::RebuildOpenGlImageOverlayBuffer(void)
{
- if (m_ImageOverlay->GetNumberOfComponentsPerPixel()<3)
- {
- itkExceptionMacro(<<"Image overlay should have at least 3 channels.");
- }
+ if (m_ImageOverlay->GetNumberOfComponentsPerPixel() < 3)
+ {
+ itkExceptionMacro(<< "Image overlay should have at least 3 channels.");
+ }
//otbMsgDebugMacro(<<"RebuildOpenGlImageOverlayBuffer");
if (m_OpenGlImageOverlayBuffer != NULL)
- {
+ {
//otbMsgDebugMacro(<<"Deleting previous buffer ...");
- delete [] m_OpenGlImageOverlayBuffer;
- }
+ delete[] m_OpenGlImageOverlayBuffer;
+ }
//otbMsgDebugMacro(<<"Buffered region: "<<m_BufferedRegion);
- unsigned int bufferLenght = 4*m_BufferedRegion.GetNumberOfPixels();
+ unsigned int bufferLenght = 4 * m_BufferedRegion.GetNumberOfPixels();
//otbMsgDebugMacro(<<"New buffer lenght: "<<bufferLenght);
m_OpenGlImageOverlayBuffer = new unsigned char[bufferLenght];
typedef itk::ImageRegionConstIteratorWithIndex<OverlayImageType> IteratorType;
- IteratorType it(m_ImageOverlay,m_BufferedRegion);
+ IteratorType it(m_ImageOverlay, m_BufferedRegion);
unsigned int index = 0;
if (m_BlackTransparency)
- {
- for (it.GoToBegin();!it.IsAtEnd();++it)
{
+ for (it.GoToBegin(); !it.IsAtEnd(); ++it)
+ {
#ifdef OTB_GL_USE_ACCEL
index = GetBufferIndex(it.GetIndex());
#else
index = GetRevertedBufferIndex(it.GetIndex());
#endif
- if ((it.Get()[0]==0)&&(it.Get()[1]==0)&&(it.Get()[2]==0))
- {
+ if ((it.Get()[0] == 0) && (it.Get()[1] == 0) && (it.Get()[2] == 0))
+ {
m_OpenGlImageOverlayBuffer[index] = 0;
- m_OpenGlImageOverlayBuffer[index+1] = 0;
- m_OpenGlImageOverlayBuffer[index+2] =0;
- m_OpenGlImageOverlayBuffer[index+3] = 0;
- }
+ m_OpenGlImageOverlayBuffer[index + 1] = 0;
+ m_OpenGlImageOverlayBuffer[index + 2] = 0;
+ m_OpenGlImageOverlayBuffer[index + 3] = 0;
+ }
else
- {
+ {
m_OpenGlImageOverlayBuffer[index] = static_cast<unsigned char>(it.Get()[0]);
- m_OpenGlImageOverlayBuffer[index+1] = static_cast<unsigned char>( it.Get()[1]);
- m_OpenGlImageOverlayBuffer[index+2] = static_cast<unsigned char>(it.Get()[2]);
- m_OpenGlImageOverlayBuffer[index+3] = m_ImageOverlayOpacity;
+ m_OpenGlImageOverlayBuffer[index + 1] = static_cast<unsigned char>(it.Get()[1]);
+ m_OpenGlImageOverlayBuffer[index + 2] = static_cast<unsigned char>(it.Get()[2]);
+ m_OpenGlImageOverlayBuffer[index + 3] = m_ImageOverlayOpacity;
+ }
}
}
- }
else
- {
- for (it.GoToBegin();!it.IsAtEnd();++it)
{
+ for (it.GoToBegin(); !it.IsAtEnd(); ++it)
+ {
#ifdef OTB_GL_USE_ACCEL
index = GetBufferIndex(it.GetIndex());
#else
index = GetRevertedBufferIndex(it.GetIndex());
#endif
m_OpenGlImageOverlayBuffer[index] = static_cast<unsigned char>(it.Get()[0]);
- m_OpenGlImageOverlayBuffer[index+1] =static_cast<unsigned char>(it.Get()[1]);
- m_OpenGlImageOverlayBuffer[index+2] =static_cast<unsigned char>(it.Get()[2]);
- m_OpenGlImageOverlayBuffer[index+3] =m_ImageOverlayOpacity;
+ m_OpenGlImageOverlayBuffer[index + 1] = static_cast<unsigned char>(it.Get()[1]);
+ m_OpenGlImageOverlayBuffer[index + 2] = static_cast<unsigned char>(it.Get()[2]);
+ m_OpenGlImageOverlayBuffer[index + 3] = m_ImageOverlayOpacity;
+ }
}
- }
}
-}// end namespace otb
+} // end namespace otb
#endif
diff --git a/Code/Visu/otbImageWidgetBoxForm.h b/Code/Visu/otbImageWidgetBoxForm.h
index 1226881de8..402ce9a878 100644
--- a/Code/Visu/otbImageWidgetBoxForm.h
+++ b/Code/Visu/otbImageWidgetBoxForm.h
@@ -32,13 +32,13 @@ namespace otb
*
*/
class ImageWidgetBoxForm
- : public ImageWidgetFormBase
+ : public ImageWidgetFormBase
{
public:
/** Standard class typedefs */
- typedef ImageWidgetBoxForm Self;
- typedef ImageWidgetFormBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef ImageWidgetBoxForm Self;
+ typedef ImageWidgetFormBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
@@ -47,57 +47,67 @@ public:
/** Runtime information */
itkTypeMacro(ImageWidgetBoxForm, ImageWidgetFormBase);
- typedef itk::Size<2> SizeType;
+ typedef itk::Size<2> SizeType;
typedef itk::Index<2> IndexType;
- itkSetMacro(Size,SizeType);
- itkGetMacro(Size,SizeType);
+ itkSetMacro(Size, SizeType);
+ itkGetMacro(Size, SizeType);
- itkSetMacro(Index,IndexType);
- itkGetMacro(Index,IndexType);
+ itkSetMacro(Index, IndexType);
+ itkGetMacro(Index, IndexType);
void Draw(double openGlZoom, unsigned int originx, unsigned int originy, unsigned int windowh, unsigned int ss_rate)
{
if (this->GetVisible())
- {
- double xul = static_cast<double>((static_cast<double>(m_Index[0])-static_cast<double>(originx))*openGlZoom*(1/static_cast<double>(ss_rate)));
- double xlr = static_cast<double>((static_cast<double>(m_Index[0]+m_Size[0])-static_cast<double>(originx))*openGlZoom*(1/static_cast<double>(ss_rate)));
-
- double yul = static_cast<double>(static_cast<double>(windowh)+(static_cast<double>(originy)-static_cast<double>(m_Index[1]))*openGlZoom*(1/static_cast<double>(ss_rate)));
-
- double ylr = static_cast<double>(static_cast<double>(windowh)+(static_cast<double>(originy)-static_cast<double>(m_Size[1]+m_Index[1]))*openGlZoom*(1/static_cast<double>(ss_rate)));
-
+ {
+ double xul =
+ static_cast<double>((static_cast<double>(m_Index[0]) -
+ static_cast<double>(originx)) * openGlZoom * (1 / static_cast<double>(ss_rate)));
+ double xlr =
+ static_cast<double>((static_cast<double>(m_Index[0] +
+ m_Size[0]) -
+ static_cast<double>(originx)) * openGlZoom * (1 / static_cast<double>(ss_rate)));
+
+ double yul =
+ static_cast<double>(static_cast<double>(windowh) +
+ (static_cast<double>(originy) -
+ static_cast<double>(m_Index[1])) * openGlZoom * (1 / static_cast<double>(ss_rate)));
+
+ double ylr =
+ static_cast<double>(static_cast<double>(windowh) +
+ (static_cast<double>(originy) -
+ static_cast<double>(m_Size[1] +
+ m_Index[1])) * openGlZoom * (1 / static_cast<double>(ss_rate)));
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4f(m_Color[0],m_Color[1],m_Color[2],m_Color[3]);
+ glColor4f(m_Color[0], m_Color[1], m_Color[2], m_Color[3]);
glBegin(GL_LINE_LOOP);
- glVertex2d(xul,yul);
- glVertex2d(xul,ylr);
- glVertex2d(xlr,ylr);
- glVertex2d(xlr,yul);
+ glVertex2d(xul, yul);
+ glVertex2d(xul, ylr);
+ glVertex2d(xlr, ylr);
+ glVertex2d(xlr, yul);
glEnd();
glDisable(GL_BLEND);
- }
- };
+ }
+ }
protected:
/** Constructor. */
ImageWidgetBoxForm()
{
m_Index.Fill(0);
m_Size.Fill(0);
- };
+ }
/** Destructor. */
- ~ImageWidgetBoxForm() {};
+ ~ImageWidgetBoxForm() {}
private:
- ImageWidgetBoxForm(const Self&);// purposely not implemented
- void operator=(const Self&);// purposely not implemented
+ ImageWidgetBoxForm(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
IndexType m_Index;
- SizeType m_Size;
+ SizeType m_Size;
};
} // end namespace otb
#endif
-
diff --git a/Code/Visu/otbImageWidgetCircleForm.cxx b/Code/Visu/otbImageWidgetCircleForm.cxx
index 2ff7ebda94..11eedea138 100644
--- a/Code/Visu/otbImageWidgetCircleForm.cxx
+++ b/Code/Visu/otbImageWidgetCircleForm.cxx
@@ -18,7 +18,6 @@
#include "otbImageWidgetCircleForm.h"
#include "otbMath.h"
-
namespace otb
{
ImageWidgetCircleForm
@@ -36,31 +35,31 @@ ImageWidgetCircleForm
}
void
ImageWidgetCircleForm
-::Draw(double openGlZoom, unsigned int originx, unsigned int originy, unsigned int windowh,unsigned ss_rate)
+::Draw(double openGlZoom, unsigned int originx, unsigned int originy, unsigned int windowh, unsigned ss_rate)
{
if (this->GetVisible())
- {
+ {
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4f(m_Color[0],m_Color[1],m_Color[2],m_Color[3]);
- }
+ glColor4f(m_Color[0], m_Color[1], m_Color[2], m_Color[3]);
+ }
if (m_Solid)
- {
+ {
glBegin(GL_POLYGON);
- }
+ }
else
- {
+ {
glBegin(GL_LINE_LOOP);
- }
- for (double angle = 0;angle <= CONST_2PI;angle+=0.01/static_cast<double>(m_Radius))
- {
- double xi = m_Center[0]+static_cast<double>(m_Radius)*vcl_sin(angle);
- double yi = m_Center[1]+static_cast<double>(m_Radius)*vcl_cos(angle);
+ }
+ for (double angle = 0; angle <= CONST_2PI; angle += 0.01 / static_cast<double>(m_Radius))
+ {
+ double xi = m_Center[0] + static_cast<double>(m_Radius) * vcl_sin(angle);
+ double yi = m_Center[1] + static_cast<double>(m_Radius) * vcl_cos(angle);
- double xd = (xi-originx)*openGlZoom*(1/static_cast<double>(ss_rate));
- double yd = windowh+(originy-yi)*openGlZoom*(1/static_cast<double>(ss_rate));
- glVertex2d(xd,yd);
- }
+ double xd = (xi - originx) * openGlZoom * (1 / static_cast<double>(ss_rate));
+ double yd = windowh + (originy - yi) * openGlZoom * (1 / static_cast<double>(ss_rate));
+ glVertex2d(xd, yd);
+ }
glEnd();
glDisable(GL_BLEND);
}
diff --git a/Code/Visu/otbImageWidgetCircleForm.h b/Code/Visu/otbImageWidgetCircleForm.h
index efab051815..345276f68d 100644
--- a/Code/Visu/otbImageWidgetCircleForm.h
+++ b/Code/Visu/otbImageWidgetCircleForm.h
@@ -32,11 +32,11 @@ namespace otb
*
*/
class ITK_EXPORT ImageWidgetCircleForm
- : public ImageWidgetFormBase
+ : public ImageWidgetFormBase
{
public:
/** Standard class typedefs */
- typedef ImageWidgetCircleForm Self;
+ typedef ImageWidgetCircleForm Self;
typedef ImageWidgetFormBase Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -48,21 +48,19 @@ public:
itkTypeMacro(ImageWidgetCircleForm, ImageWidgetFormBase);
/** Usefull typedef. */
- typedef itk::ContinuousIndex<double,2> ContinuousIndexType;
+ typedef itk::ContinuousIndex<double, 2> ContinuousIndexType;
/** Accessors */
- itkSetMacro(Solid,bool);
- itkGetMacro(Solid,bool);
- itkSetMacro(Radius,double);
- itkGetMacro(Radius,double);
- itkSetMacro(Center,ContinuousIndexType);
- itkGetMacro(Center,ContinuousIndexType);
-
+ itkSetMacro(Solid, bool);
+ itkGetMacro(Solid, bool);
+ itkSetMacro(Radius, double);
+ itkGetMacro(Radius, double);
+ itkSetMacro(Center, ContinuousIndexType);
+ itkGetMacro(Center, ContinuousIndexType);
/** Actually draw the polygon */
void Draw(double openGlZoom, unsigned int originx, unsigned int originy, unsigned int windowh, unsigned int ss_rate);
-
protected:
/** Constructor. */
ImageWidgetCircleForm();
@@ -70,8 +68,8 @@ protected:
~ImageWidgetCircleForm();
private:
- ImageWidgetCircleForm(const Self&);// purposely not implemented
- void operator=(const Self&);// purposely not implemented
+ ImageWidgetCircleForm(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/// true if needed to draw a solid polygon
bool m_Solid;
diff --git a/Code/Visu/otbImageWidgetFormBase.h b/Code/Visu/otbImageWidgetFormBase.h
index 956570ac7d..75aaa5c1cf 100644
--- a/Code/Visu/otbImageWidgetFormBase.h
+++ b/Code/Visu/otbImageWidgetFormBase.h
@@ -35,7 +35,7 @@ namespace otb
*
*/
class ITK_EXPORT ImageWidgetFormBase
- : public itk::DataObject
+ : public itk::DataObject
{
public:
/** Standard class typedefs */
@@ -45,19 +45,18 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** Runtime information */
- itkTypeMacro(ImageWidgetFormBase,DataObject);
+ itkTypeMacro(ImageWidgetFormBase, DataObject);
/** Method for creation through the object factory */
itkNewMacro(Self);
+ typedef itk::FixedArray<float, 4> ColorType;
+ typedef itk::ImageRegion<2> RegionType;
- typedef itk::FixedArray<float,4> ColorType;
- typedef itk::ImageRegion<2> RegionType;
-
- itkSetMacro(Visible,bool);
- itkGetMacro(Visible,bool);
- itkSetMacro(Color,ColorType);
- itkGetMacro(Color,ColorType);
+ itkSetMacro(Visible, bool);
+ itkGetMacro(Visible, bool);
+ itkSetMacro(Color, ColorType);
+ itkGetMacro(Color, ColorType);
/**
* Set the form color.
@@ -68,10 +67,10 @@ public:
*/
virtual void SetColor(float r, float g, float b, float a)
{
- m_Color[0]=r;
- m_Color[1]=g;
- m_Color[2]=b;
- m_Color[3]=a;
+ m_Color[0] = r;
+ m_Color[1] = g;
+ m_Color[2] = b;
+ m_Color[3] = a;
}
/**
* Draw the form in opengl context.
@@ -81,38 +80,40 @@ public:
* \param windowh The window height,
* \param ss_rate The subsampling rate.
*/
- virtual void Draw(double /*openGlZoom*/, unsigned int /*originx*/, unsigned int /*originy*/, unsigned int /*windowh*/, unsigned int /*ss_rate*/) {};
+ virtual void Draw(double /*openGlZoom*/,
+ unsigned int /*originx*/,
+ unsigned int /*originy*/,
+ unsigned int /*windowh*/,
+ unsigned int /*ss_rate*/) {}
virtual RegionType GetRegion(void)
{
itkExceptionMacro("Method must be implemented in subclasses!");
- };
+ }
protected:
/** Constructor. */
ImageWidgetFormBase()
- {
- m_Visible=true;
- m_Color[0]=1;
- m_Color[1]=0;
- m_Color[2]=0;
- m_Color[3]=1;
- };
+ {
+ m_Visible = true;
+ m_Color[0] = 1;
+ m_Color[1] = 0;
+ m_Color[2] = 0;
+ m_Color[3] = 1;
+ };
/** Destructor. */
virtual ~ImageWidgetFormBase()
- {};
+ {}
ColorType m_Color;
private:
- ImageWidgetFormBase(const Self&);// purposely not implemented
- void operator=(const Self&);// purposely not implemented
-
+ ImageWidgetFormBase(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
bool m_Visible;
};
} // end namespace otb
#endif
-
diff --git a/Code/Visu/otbImageWidgetPointForm.h b/Code/Visu/otbImageWidgetPointForm.h
index fac12e9473..6854bcd9fe 100644
--- a/Code/Visu/otbImageWidgetPointForm.h
+++ b/Code/Visu/otbImageWidgetPointForm.h
@@ -31,50 +31,49 @@ namespace otb
*
*/
class ImageWidgetPointForm
- : public ImageWidgetFormBase
+ : public ImageWidgetFormBase
{
public:
/** Standard class typedefs */
- typedef ImageWidgetPointForm Self;
- typedef ImageWidgetFormBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef ImageWidgetPointForm Self;
+ typedef ImageWidgetFormBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(ImageWidgetPointForm,ImageWidgetFormBase);
+ itkTypeMacro(ImageWidgetPointForm, ImageWidgetFormBase);
typedef Superclass::RegionType RegionType;
- typedef RegionType::SizeType SizeType;
- typedef RegionType::IndexType IndexType;
+ typedef RegionType::SizeType SizeType;
+ typedef RegionType::IndexType IndexType;
-
- itkSetMacro(Index,IndexType);
- itkGetMacro(Index,IndexType);
+ itkSetMacro(Index, IndexType);
+ itkGetMacro(Index, IndexType);
void Draw(double openGlZoom, unsigned int originx, unsigned int originy, unsigned int windowh, unsigned int ss_rate)
{
if (this->GetVisible())
- {
- unsigned int x,y;
- x = static_cast<unsigned int>((m_Index[0]-originx)*openGlZoom*ss_rate);
- y = static_cast<unsigned int>(windowh-(m_Index[1]-originy)*openGlZoom*ss_rate);
+ {
+ unsigned int x, y;
+ x = static_cast<unsigned int>((m_Index[0] - originx) * openGlZoom * ss_rate);
+ y = static_cast<unsigned int>(windowh - (m_Index[1] - originy) * openGlZoom * ss_rate);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4f(m_Color[0],m_Color[1],m_Color[2],m_Color[3]);
+ glColor4f(m_Color[0], m_Color[1], m_Color[2], m_Color[3]);
glBegin(GL_POINTS);
- glVertex2f(x,y);
+ glVertex2f(x, y);
glEnd();
- }
+ }
}
RegionType GetRegion(void)
{
RegionType resp;
- SizeType size;
+ SizeType size;
size.Fill(1);
resp.SetSize(size);
resp.SetIndex(m_Index);
@@ -89,15 +88,14 @@ protected:
}
/** Destructor. */
- ~ImageWidgetPointForm() {};
+ ~ImageWidgetPointForm() {}
private:
- ImageWidgetPointForm(const Self&);// purposely not implemented
- void operator=(const Self&);// purposely not implemented
+ ImageWidgetPointForm(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
IndexType m_Index;
};
} // end namespace otb
#endif
-
diff --git a/Code/Visu/otbImageWidgetPolygonForm.h b/Code/Visu/otbImageWidgetPolygonForm.h
index 11cb799183..557537ae53 100644
--- a/Code/Visu/otbImageWidgetPolygonForm.h
+++ b/Code/Visu/otbImageWidgetPolygonForm.h
@@ -39,7 +39,7 @@ namespace otb
*/
template<class TValue = double>
class ITK_EXPORT ImageWidgetPolygonForm
- : public ImageWidgetFormBase
+ : public ImageWidgetFormBase
{
public:
/** Standard class typedefs */
@@ -56,27 +56,26 @@ public:
itkTypeMacro(ImageWidgetPolygonForm, ImageWidgetFormBase);
/** Usefull typedef. */
- typedef itk::Size<2> SizeType;
- typedef itk::Index<2> IndexType;
- typedef Polygon<ValueType> PolygonType;
- typedef typename PolygonType::Pointer PolygonPointerType;
- typedef typename PolygonType::VertexType VertexType;
- typedef typename PolygonType::VertexListType VertexListType;
- typedef typename VertexListType::ConstIterator VertexListConstIteratorType;
- typedef typename PolygonType::ContinuousIndexType ContinuousIndexType;
+ typedef itk::Size<2> SizeType;
+ typedef itk::Index<2> IndexType;
+ typedef Polygon<ValueType> PolygonType;
+ typedef typename PolygonType::Pointer PolygonPointerType;
+ typedef typename PolygonType::VertexType VertexType;
+ typedef typename PolygonType::VertexListType VertexListType;
+ typedef typename VertexListType::ConstIterator VertexListConstIteratorType;
+ typedef typename PolygonType::ContinuousIndexType ContinuousIndexType;
/** Accessors */
itkSetMacro(Polygon, PolygonPointerType);
itkGetMacro(Polygon, PolygonPointerType);
- itkSetMacro(Solid,bool);
- itkGetMacro(Solid,bool);
- itkSetMacro(InternalValueToAlphaChannel,bool);
- itkGetMacro(InternalValueToAlphaChannel,bool);
+ itkSetMacro(Solid, bool);
+ itkGetMacro(Solid, bool);
+ itkSetMacro(InternalValueToAlphaChannel, bool);
+ itkGetMacro(InternalValueToAlphaChannel, bool);
/** Actually draw the polygon */
void Draw(double openGlZoom, unsigned int originx, unsigned int originy, unsigned int windowh, unsigned int ss_rate);
-
protected:
/** Constructor. */
ImageWidgetPolygonForm();
@@ -84,8 +83,8 @@ protected:
~ImageWidgetPolygonForm();
private:
- ImageWidgetPolygonForm(const Self&);// purposely not implemented
- void operator=(const Self&);// purposely not implemented
+ ImageWidgetPolygonForm(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** Internal pointer to the otb::Polygon data structure */
PolygonPointerType m_Polygon;
diff --git a/Code/Visu/otbImageWidgetPolygonForm.txx b/Code/Visu/otbImageWidgetPolygonForm.txx
index 2af158d546..c5ffef1f0c 100644
--- a/Code/Visu/otbImageWidgetPolygonForm.txx
+++ b/Code/Visu/otbImageWidgetPolygonForm.txx
@@ -40,39 +40,38 @@ ImageWidgetPolygonForm<TValue>
template<class TValue>
void
ImageWidgetPolygonForm<TValue>
-::Draw(double openGlZoom, unsigned int originx, unsigned int originy, unsigned int windowh,unsigned ss_rate)
+::Draw(double openGlZoom, unsigned int originx, unsigned int originy, unsigned int windowh, unsigned ss_rate)
{
if (this->GetVisible())
- {
+ {
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
GluPolygonDrawingHelper::Pointer polygonDrawer = GluPolygonDrawingHelper::New();
-
if (m_InternalValueToAlphaChannel)
- {
- polygonDrawer->Color4d(m_Color[0],m_Color[1],m_Color[2],m_Polygon->GetValue());
- }
+ {
+ polygonDrawer->Color4d(m_Color[0], m_Color[1], m_Color[2], m_Polygon->GetValue());
+ }
else
- {
- polygonDrawer->Color4d(m_Color[0],m_Color[1],m_Color[2],m_Color[3]);
- }
+ {
+ polygonDrawer->Color4d(m_Color[0], m_Color[1], m_Color[2], m_Color[3]);
+ }
polygonDrawer->SetBoundaryOnly(!m_Solid);
VertexListConstIteratorType it = this->GetPolygon()->GetVertexList()->Begin();
while (it != this->GetPolygon()->GetVertexList()->End())
- {
+ {
double x1 = it.Value()[0];
double y1 = it.Value()[1];
- x1 = static_cast<int>((x1-originx)*openGlZoom*(1/static_cast<double>(ss_rate)));
- y1 = static_cast<int>(windowh+(originy-y1)*openGlZoom*(1/static_cast<double>(ss_rate)));
- polygonDrawer->Vertex2d(x1,y1);
+ x1 = static_cast<int>((x1 - originx) * openGlZoom * (1 / static_cast<double>(ss_rate)));
+ y1 = static_cast<int>(windowh + (originy - y1) * openGlZoom * (1 / static_cast<double>(ss_rate)));
+ polygonDrawer->Vertex2d(x1, y1);
++it;
- }
+ }
polygonDrawer->RenderPolygon();
glDisable(GL_BLEND);
- }
+ }
}
} // end namespace otb
diff --git a/Code/Visu/otbImageWidgetPolylineForm.h b/Code/Visu/otbImageWidgetPolylineForm.h
index f96919979e..2f2c57ca08 100644
--- a/Code/Visu/otbImageWidgetPolylineForm.h
+++ b/Code/Visu/otbImageWidgetPolylineForm.h
@@ -34,11 +34,11 @@ namespace otb
*/
template<class TValue = double>
class ITK_EXPORT ImageWidgetPolylineForm
- : public ImageWidgetFormBase
+ : public ImageWidgetFormBase
{
public:
/** Standard class typedefs */
- typedef ImageWidgetPolylineForm Self;
+ typedef ImageWidgetPolylineForm Self;
typedef ImageWidgetFormBase Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -51,26 +51,25 @@ public:
itkTypeMacro(ImageWidgetPolylineForm, ImageWidgetFormBase);
/** Usefull typedef. */
- typedef itk::Size<2> SizeType;
- typedef itk::Index<2> IndexType;
- typedef PolyLineParametricPathWithValue<ValueType,2> PolylineType;
- typedef typename PolylineType::Pointer PolylinePointerType;
- typedef typename PolylineType::VertexType VertexType;
- typedef typename PolylineType::VertexListType VertexListType;
- typedef typename VertexListType::ConstIterator VertexListConstIteratorType;
- typedef typename PolylineType::ContinuousIndexType ContinuousIndexType;
+ typedef itk::Size<2> SizeType;
+ typedef itk::Index<2> IndexType;
+ typedef PolyLineParametricPathWithValue<ValueType, 2> PolylineType;
+ typedef typename PolylineType::Pointer PolylinePointerType;
+ typedef typename PolylineType::VertexType VertexType;
+ typedef typename PolylineType::VertexListType VertexListType;
+ typedef typename VertexListType::ConstIterator VertexListConstIteratorType;
+ typedef typename PolylineType::ContinuousIndexType ContinuousIndexType;
/** Accessors */
itkSetMacro(Polyline, PolylinePointerType);
itkGetMacro(Polyline, PolylinePointerType);
- itkSetMacro(InternalValueToAlphaChannel,bool);
- itkGetMacro(InternalValueToAlphaChannel,bool);
- itkSetMacro(LineWidth,double);
- itkGetMacro(LineWidth,double);
+ itkSetMacro(InternalValueToAlphaChannel, bool);
+ itkGetMacro(InternalValueToAlphaChannel, bool);
+ itkSetMacro(LineWidth, double);
+ itkGetMacro(LineWidth, double);
/** Actually draw the polyline */
void Draw(double openGlZoom, unsigned int originx, unsigned int originy, unsigned int windowh, unsigned int ss_rate);
-
protected:
/** Constructor. */
ImageWidgetPolylineForm();
@@ -81,8 +80,8 @@ protected:
double m_LineWidth;
private:
- ImageWidgetPolylineForm(const Self&);// purposely not implemented
- void operator=(const Self&);// purposely not implemented
+ ImageWidgetPolylineForm(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** Internal pointer to the otb::Polyline data structure */
PolylinePointerType m_Polyline;
diff --git a/Code/Visu/otbImageWidgetPolylineForm.txx b/Code/Visu/otbImageWidgetPolylineForm.txx
index 94c28f574a..7a8dbe73b8 100644
--- a/Code/Visu/otbImageWidgetPolylineForm.txx
+++ b/Code/Visu/otbImageWidgetPolylineForm.txx
@@ -20,7 +20,6 @@
#include "otbImageWidgetPolylineForm.h"
-
namespace otb
{
template<class TValue>
@@ -40,41 +39,41 @@ ImageWidgetPolylineForm<TValue>
template<class TValue>
void
ImageWidgetPolylineForm<TValue>
-::Draw(double openGlZoom, unsigned int originx, unsigned int originy, unsigned int windowh,unsigned ss_rate)
+::Draw(double openGlZoom, unsigned int originx, unsigned int originy, unsigned int windowh, unsigned ss_rate)
{
if (this->GetVisible())
- {
+ {
// Set the point size
glLineWidth(m_LineWidth);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
if (m_InternalValueToAlphaChannel)
- {
- glColor4f(m_Color[0],m_Color[1],m_Color[2],m_Polyline->GetValue());
- }
+ {
+ glColor4f(m_Color[0], m_Color[1], m_Color[2], m_Polyline->GetValue());
+ }
else
- {
- glColor4f(m_Color[0],m_Color[1],m_Color[2],m_Color[3]);
- }
+ {
+ glColor4f(m_Color[0], m_Color[1], m_Color[2], m_Color[3]);
+ }
glBegin(GL_LINE_STRIP);
VertexListConstIteratorType it = this->GetPolyline()->GetVertexList()->Begin();
while (it != this->GetPolyline()->GetVertexList()->End())
- {
+ {
double x1 = it.Value()[0];
double y1 = it.Value()[1];
- x1 = static_cast<int>((x1-originx)*openGlZoom*(1/static_cast<double>(ss_rate)));
- y1 = static_cast<int>(windowh+(originy-y1)*openGlZoom*(1/static_cast<double>(ss_rate)));
+ x1 = static_cast<int>((x1 - originx) * openGlZoom * (1 / static_cast<double>(ss_rate)));
+ y1 = static_cast<int>(windowh + (originy - y1) * openGlZoom * (1 / static_cast<double>(ss_rate)));
- glVertex2f(x1,y1);
+ glVertex2f(x1, y1);
++it;
- }
+ }
glEnd();
glDisable(GL_BLEND);
glLineWidth(1.0);
- }
+ }
}
} // end namespace otb
diff --git a/Code/Visu/otbImageWidgetRectangleForm.h b/Code/Visu/otbImageWidgetRectangleForm.h
index 64f6de01af..41c0e461bf 100644
--- a/Code/Visu/otbImageWidgetRectangleForm.h
+++ b/Code/Visu/otbImageWidgetRectangleForm.h
@@ -31,52 +31,63 @@ namespace otb
*
*/
class ImageWidgetRectangleForm
- : public ImageWidgetFormBase
+ : public ImageWidgetFormBase
{
public:
/** Standard class typedefs */
- typedef ImageWidgetRectangleForm Self;
- typedef ImageWidgetFormBase Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef ImageWidgetRectangleForm Self;
+ typedef ImageWidgetFormBase Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(ImageWidgetRectangleForm,ImageWidgetFormBase);
+ itkTypeMacro(ImageWidgetRectangleForm, ImageWidgetFormBase);
typedef Superclass::RegionType RegionType;
- typedef RegionType::SizeType SizeType;
- typedef RegionType::IndexType IndexType;
+ typedef RegionType::SizeType SizeType;
+ typedef RegionType::IndexType IndexType;
- itkSetMacro(Size,SizeType);
- itkGetMacro(Size,SizeType);
+ itkSetMacro(Size, SizeType);
+ itkGetMacro(Size, SizeType);
- itkSetMacro(Index,IndexType);
- itkGetMacro(Index,IndexType);
+ itkSetMacro(Index, IndexType);
+ itkGetMacro(Index, IndexType);
- void Draw(double openGlZoom, unsigned int originx, unsigned int originy, unsigned int windowh,unsigned int ss_rate)
+ void Draw(double openGlZoom, unsigned int originx, unsigned int originy, unsigned int windowh, unsigned int ss_rate)
{
if (this->GetVisible())
- {
+ {
//otbMsgDebugMacro(<<"Drawing a rectangle.");
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4f(m_Color[0],m_Color[1],m_Color[2],m_Color[3]);
+ glColor4f(m_Color[0], m_Color[1], m_Color[2], m_Color[3]);
glBegin(GL_QUADS);
- int xul = static_cast<int>((static_cast<int>(m_Index[0])-static_cast<int>(originx))*openGlZoom*(1/static_cast<double>(ss_rate)));
- int xlr = static_cast<int>((static_cast<int>(m_Index[0]+m_Size[0])-static_cast<int>(originx))*openGlZoom*(1/static_cast<double>(ss_rate)));
-
- int yul = static_cast<int>(static_cast<int>(windowh)+(static_cast<int>(originy)-static_cast<int>(m_Index[1]))*openGlZoom*(1/static_cast<double>(ss_rate)));
-
- int ylr = static_cast<int>(static_cast<int>(windowh)+(static_cast<int>(originy)-static_cast<int>(m_Size[1]+m_Index[1]))*openGlZoom*(1/static_cast<double>(ss_rate)));
-
- gl_rect(xul,yul,xlr,ylr);
+ int xul =
+ static_cast<int>((static_cast<int>(m_Index[0]) -
+ static_cast<int>(originx)) * openGlZoom * (1 / static_cast<double>(ss_rate)));
+ int xlr =
+ static_cast<int>((static_cast<int>(m_Index[0] +
+ m_Size[0]) -
+ static_cast<int>(originx)) * openGlZoom * (1 / static_cast<double>(ss_rate)));
+
+ int yul =
+ static_cast<int>(static_cast<int>(windowh) +
+ (static_cast<int>(originy) -
+ static_cast<int>(m_Index[1])) * openGlZoom * (1 / static_cast<double>(ss_rate)));
+
+ int ylr =
+ static_cast<int>(static_cast<int>(windowh) +
+ (static_cast<int>(originy) -
+ static_cast<int>(m_Size[1] + m_Index[1])) * openGlZoom * (1 / static_cast<double>(ss_rate)));
+
+ gl_rect(xul, yul, xlr, ylr);
glEnd();
glDisable(GL_BLEND);
- }
+ }
}
RegionType GetRegion(void)
@@ -99,13 +110,12 @@ protected:
~ImageWidgetRectangleForm() {}
private:
- ImageWidgetRectangleForm(const Self&);// purposely not implemented
- void operator=(const Self&);// purposely not implemented
+ ImageWidgetRectangleForm(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
IndexType m_Index;
- SizeType m_Size;
+ SizeType m_Size;
};
} // end namespace otb
#endif
-
diff --git a/Code/Visu/otbImageWidgetTransferFunction.h b/Code/Visu/otbImageWidgetTransferFunction.h
index 0cceb42396..7c2fe6f477 100644
--- a/Code/Visu/otbImageWidgetTransferFunction.h
+++ b/Code/Visu/otbImageWidgetTransferFunction.h
@@ -33,26 +33,26 @@ namespace otb
*/
template <class TPixel>
class ITK_EXPORT ImageWidgetTransferFunction
- : public itk::Object
+ : public itk::Object
{
public:
/** Standard typedefs */
- typedef ImageWidgetTransferFunction Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageWidgetTransferFunction Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through object factory macro */
- itkTypeMacro(ImageWidgetTransferFunction,Object);
+ itkTypeMacro(ImageWidgetTransferFunction, Object);
/** Template parameters typedefs */
typedef TPixel PixelType;
/** Set/Get the lower and upper bounds */
- itkSetMacro(LowerBound,PixelType);
- itkGetMacro(LowerBound,PixelType);
- itkSetMacro(UpperBound,PixelType);
- itkGetMacro(UpperBound,PixelType);
+ itkSetMacro(LowerBound, PixelType);
+ itkGetMacro(LowerBound, PixelType);
+ itkSetMacro(UpperBound, PixelType);
+ itkGetMacro(UpperBound, PixelType);
/**
* Map the input value to screen printable value.
@@ -60,31 +60,31 @@ public:
* \param value the value to map
* \return the screen printable value
*/
- virtual unsigned char Map(PixelType )
+ virtual unsigned char Map(PixelType)
{
return 0;
- };
+ }
protected:
/** Constructor */
ImageWidgetTransferFunction()
- {
+ {
m_LowerBound = 0;
m_UpperBound = 255;
- }
+ }
/** Destructor */
virtual ~ImageWidgetTransferFunction() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"Lower bound: "<<m_LowerBound<<std::endl;
- os<<indent<<"Upper bound: "<<m_UpperBound<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Lower bound: " << m_LowerBound << std::endl;
+ os << indent << "Upper bound: " << m_UpperBound << std::endl;
}
private:
- ImageWidgetTransferFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageWidgetTransferFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/// lower bound (set to 0)
PixelType m_LowerBound;
@@ -97,38 +97,41 @@ private:
*/
template <class TPixel>
class ITK_EXPORT ImageWidgetAffineTransferFunction
- : public ImageWidgetTransferFunction<TPixel>
+ : public ImageWidgetTransferFunction<TPixel>
{
public:
/** Standard typedefs */
typedef ImageWidgetAffineTransferFunction Self;
typedef ImageWidgetTransferFunction<TPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(ImageWidgetAffineTransferFunction,ImageWidgetTransferFunction);
+ itkTypeMacro(ImageWidgetAffineTransferFunction, ImageWidgetTransferFunction);
/** Template parameters typedefs */
typedef TPixel PixelType;
virtual unsigned char Map(PixelType value)
{
- if (value<this->GetLowerBound())
- {
+ if (value < this->GetLowerBound())
+ {
return 0;
- }
- else if (value>this->GetUpperBound())
- {
+ }
+ else if (value > this->GetUpperBound())
+ {
return 255;
- }
+ }
else
- {
- return static_cast<unsigned char>(vcl_floor(255.*(value-this->GetLowerBound())/(this->GetUpperBound()-this->GetLowerBound())+0.5));
- }
+ {
+ return static_cast<unsigned char>(vcl_floor(255. *
+ (value -
+ this->GetLowerBound()) /
+ (this->GetUpperBound() - this->GetLowerBound()) + 0.5));
+ }
}
protected:
@@ -136,50 +139,49 @@ protected:
ImageWidgetAffineTransferFunction() {}
virtual ~ImageWidgetAffineTransferFunction() {}
private:
- ImageWidgetAffineTransferFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageWidgetAffineTransferFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
/** \class ImageWidgetSquareRootTransferFunction
* \brief SquareRoot transfer function.
*/
template <class TPixel>
class ITK_EXPORT ImageWidgetSquareRootTransferFunction
- : public ImageWidgetTransferFunction<TPixel>
+ : public ImageWidgetTransferFunction<TPixel>
{
public:
/** Standard typedefs */
typedef ImageWidgetSquareRootTransferFunction Self;
typedef ImageWidgetTransferFunction<TPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(ImageWidgetSquareRootTransferFunction,ImageWidgetTransferFunction);
+ itkTypeMacro(ImageWidgetSquareRootTransferFunction, ImageWidgetTransferFunction);
/** Template parameters typedefs */
typedef TPixel PixelType;
virtual unsigned char Map(PixelType value)
{
- if (value<this->GetLowerBound())
- {
+ if (value < this->GetLowerBound())
+ {
return 0;
- }
- else if (value>this->GetUpperBound())
- {
+ }
+ else if (value > this->GetUpperBound())
+ {
return 255;
- }
+ }
else
- {
+ {
double b = vcl_sqrt(static_cast<double>(this->GetLowerBound()));
- double a = 255. /(vcl_sqrt(static_cast<double>(this->GetUpperBound()))-b);
- return static_cast<unsigned char>(vcl_floor(a * (vcl_sqrt(static_cast<double>(value))-b)+0.5));
- }
+ double a = 255. / (vcl_sqrt(static_cast<double>(this->GetUpperBound())) - b);
+ return static_cast<unsigned char>(vcl_floor(a * (vcl_sqrt(static_cast<double>(value)) - b) + 0.5));
+ }
}
protected:
@@ -187,50 +189,49 @@ protected:
ImageWidgetSquareRootTransferFunction() {}
virtual ~ImageWidgetSquareRootTransferFunction() {}
private:
- ImageWidgetSquareRootTransferFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageWidgetSquareRootTransferFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-
/** \class ImageWidgetLogTransferFunction
* \brief Log transfer function.
*/
template <class TPixel>
class ITK_EXPORT ImageWidgetLogTransferFunction
- : public ImageWidgetTransferFunction<TPixel>
+ : public ImageWidgetTransferFunction<TPixel>
{
public:
/** Standard typedefs */
typedef ImageWidgetLogTransferFunction Self;
typedef ImageWidgetTransferFunction<TPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(ImageWidgetLogTransferFunction,ImageWidgetTransferFunction);
+ itkTypeMacro(ImageWidgetLogTransferFunction, ImageWidgetTransferFunction);
/** Template parameters typedefs */
typedef TPixel PixelType;
virtual unsigned char Map(PixelType value)
{
- if (value<this->GetLowerBound())
- {
+ if (value < this->GetLowerBound())
+ {
return 0;
- }
- else if (value>this->GetUpperBound())
- {
+ }
+ else if (value > this->GetUpperBound())
+ {
return 255;
- }
+ }
else
- {
- double b = vcl_log(1.+static_cast<double>(this->GetLowerBound()));
- double a = 255. /(vcl_log(1.+static_cast<double>(this->GetUpperBound()))-b);
- return static_cast<unsigned char>(vcl_floor(a * (vcl_log(1.+static_cast<double>(value))-b)+0.5));
- }
+ {
+ double b = vcl_log(1. + static_cast<double>(this->GetLowerBound()));
+ double a = 255. / (vcl_log(1. + static_cast<double>(this->GetUpperBound())) - b);
+ return static_cast<unsigned char>(vcl_floor(a * (vcl_log(1. + static_cast<double>(value)) - b) + 0.5));
+ }
}
protected:
@@ -238,8 +239,8 @@ protected:
ImageWidgetLogTransferFunction() {}
virtual ~ImageWidgetLogTransferFunction() {}
private:
- ImageWidgetLogTransferFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageWidgetLogTransferFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
/** \class ImageWidgetSquareTransferFunction
@@ -247,41 +248,40 @@ private:
*/
template <class TPixel>
class ITK_EXPORT ImageWidgetSquareTransferFunction
- : public ImageWidgetTransferFunction<TPixel>
+ : public ImageWidgetTransferFunction<TPixel>
{
public:
/** Standard typedefs */
- typedef ImageWidgetSquareTransferFunction Self;
+ typedef ImageWidgetSquareTransferFunction Self;
typedef ImageWidgetTransferFunction<TPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(ImageWidgetSquareTransferFunction,ImageWidgetTransferFunction);
+ itkTypeMacro(ImageWidgetSquareTransferFunction, ImageWidgetTransferFunction);
/** Template parameters typedefs */
typedef TPixel PixelType;
-
virtual unsigned char Map(PixelType value)
{
- if (value<this->GetLowerBound())
- {
+ if (value < this->GetLowerBound())
+ {
return 0;
- }
- else if (value>this->GetUpperBound())
- {
+ }
+ else if (value > this->GetUpperBound())
+ {
return 255;
- }
+ }
else
- {
- double b = vcl_pow(static_cast<double>(this->GetLowerBound()),2);
- double a = 255. /(vcl_pow(static_cast<double>(this->GetUpperBound()),2)-b);
- return static_cast<unsigned char>(vcl_floor(a * (vcl_pow(static_cast<double>(value),2)-b)+0.5));
- }
+ {
+ double b = vcl_pow(static_cast<double>(this->GetLowerBound()), 2);
+ double a = 255. / (vcl_pow(static_cast<double>(this->GetUpperBound()), 2) - b);
+ return static_cast<unsigned char>(vcl_floor(a * (vcl_pow(static_cast<double>(value), 2) - b) + 0.5));
+ }
}
protected:
@@ -289,9 +289,9 @@ protected:
ImageWidgetSquareTransferFunction() {}
virtual ~ImageWidgetSquareTransferFunction() {}
private:
- ImageWidgetSquareTransferFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ ImageWidgetSquareTransferFunction(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h b/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h
index 8b5381012b..c68f4ca4c8 100644
--- a/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h
+++ b/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h
@@ -39,7 +39,7 @@ namespace Functor
* \sa StandardImageViewer
*
*/
-template <class TInputPixel1,class TInputPixel2,class TOutputPixel>
+template <class TInputPixel1, class TInputPixel2, class TOutputPixel>
class ColorAnaglyphFunctor
{
public:
@@ -49,16 +49,16 @@ public:
m_RedChannelIndex = 0;
m_GreenChannelIndex = 1;
m_BlueChannelIndex = 2;
- };
+ }
/// Destructor
- virtual ~ColorAnaglyphFunctor() {};
+ virtual ~ColorAnaglyphFunctor() {}
- inline TOutputPixel operator()(const TInputPixel1& pixel1, const TInputPixel2& pixel2)
+ inline TOutputPixel operator ()(const TInputPixel1& pixel1, const TInputPixel2& pixel2)
{
TOutputPixel result(3);
- result[0]=static_cast<typename TOutputPixel::ValueType>(pixel1[m_RedChannelIndex]);
- result[1]=static_cast<typename TOutputPixel::ValueType>(pixel2[m_GreenChannelIndex]);
- result[2]=static_cast<typename TOutputPixel::ValueType>(pixel2[m_BlueChannelIndex]);
+ result[0] = static_cast<typename TOutputPixel::ValueType>(pixel1[m_RedChannelIndex]);
+ result[1] = static_cast<typename TOutputPixel::ValueType>(pixel2[m_GreenChannelIndex]);
+ result[2] = static_cast<typename TOutputPixel::ValueType>(pixel2[m_BlueChannelIndex]);
return result;
}
@@ -107,27 +107,27 @@ private:
*/
template <class TInputImage1, class TInputImage2, class TOutputImage>
class ITK_EXPORT VectorImageToColorAnaglyphVectorImageFilter
- : public itk::BinaryFunctorImageFilter
- < TInputImage1,TInputImage2,TOutputImage,
- Functor::ColorAnaglyphFunctor<
- typename TInputImage1::PixelType,
- typename TInputImage2::PixelType,
- typename TOutputImage::PixelType
- > >
+ : public itk::BinaryFunctorImageFilter
+ <TInputImage1, TInputImage2, TOutputImage,
+ Functor::ColorAnaglyphFunctor<
+ typename TInputImage1::PixelType,
+ typename TInputImage2::PixelType,
+ typename TOutputImage::PixelType
+ > >
{
public:
/** Standard typedefs */
- typedef VectorImageToColorAnaglyphVectorImageFilter Self;
+ typedef VectorImageToColorAnaglyphVectorImageFilter Self;
typedef itk::BinaryFunctorImageFilter
- < TInputImage1,TInputImage2,TOutputImage,
- Functor::ColorAnaglyphFunctor<
- typename TInputImage1::PixelType,
- typename TInputImage2::PixelType,
- typename TOutputImage::PixelType
- > > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ <TInputImage1, TInputImage2, TOutputImage,
+ Functor::ColorAnaglyphFunctor<
+ typename TInputImage1::PixelType,
+ typename TInputImage2::PixelType,
+ typename TOutputImage::PixelType
+ > > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
@@ -141,45 +141,45 @@ public:
this->GetOutput()->SetNumberOfComponentsPerPixel(3);
}
- itkSetMacro(RedChannelIndex,unsigned int);
- itkGetMacro(RedChannelIndex,unsigned int);
- itkSetMacro(GreenChannelIndex,unsigned int);
- itkGetMacro(GreenChannelIndex,unsigned int);
- itkSetMacro(BlueChannelIndex,unsigned int);
- itkGetMacro(BlueChannelIndex,unsigned int);
+ itkSetMacro(RedChannelIndex, unsigned int);
+ itkGetMacro(RedChannelIndex, unsigned int);
+ itkSetMacro(GreenChannelIndex, unsigned int);
+ itkGetMacro(GreenChannelIndex, unsigned int);
+ itkSetMacro(BlueChannelIndex, unsigned int);
+ itkGetMacro(BlueChannelIndex, unsigned int);
protected:
/** Constructor */
VectorImageToColorAnaglyphVectorImageFilter()
- {
+ {
m_RedChannelIndex = 0;
m_GreenChannelIndex = 1;
m_BlueChannelIndex = 2;
- };
+ };
virtual void BeforeThreadedGenerateData(void)
{
this->GetFunctor().SetRedChannelIndex(m_RedChannelIndex);
this->GetFunctor().SetGreenChannelIndex(m_GreenChannelIndex);
this->GetFunctor().SetBlueChannelIndex(m_BlueChannelIndex);
- };
+ }
/** Destructor */
- virtual ~VectorImageToColorAnaglyphVectorImageFilter() {};
+ virtual ~VectorImageToColorAnaglyphVectorImageFilter() {}
/**PrintSelf method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- };
+ Superclass::PrintSelf(os, indent);
+ }
private:
- VectorImageToColorAnaglyphVectorImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ VectorImageToColorAnaglyphVectorImageFilter(const Self &); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/// Color composition channels indices
unsigned int m_RedChannelIndex;
unsigned int m_GreenChannelIndex;
unsigned int m_BlueChannelIndex;
};
-}// End namespace otb
+} // End namespace otb
#endif
diff --git a/Code/Visu/otbZoomableImageWidget.h b/Code/Visu/otbZoomableImageWidget.h
index d06f1e57f9..afe8761b9f 100644
--- a/Code/Visu/otbZoomableImageWidget.h
+++ b/Code/Visu/otbZoomableImageWidget.h
@@ -31,24 +31,24 @@ namespace otb
*/
template <class TPixel>
class ZoomableImageWidget
- : public ImageWidgetBase<TPixel>
+ : public ImageWidgetBase<TPixel>
{
public:
/** Standard class typedefs */
- typedef ZoomableImageWidget Self;
- typedef ImageWidgetBase<TPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef ZoomableImageWidget Self;
+ typedef ImageWidgetBase<TPixel> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(ZoomableImageWidget,ImageWidgetBase);
+ itkTypeMacro(ZoomableImageWidget, ImageWidgetBase);
/** Superclass typedefs */
- typedef typename Superclass::SizeType SizeType;
- typedef typename Superclass::IndexType IndexType;
+ typedef typename Superclass::SizeType SizeType;
+ typedef typename Superclass::IndexType IndexType;
typedef typename Superclass::RegionType RegionType;
/** Unlarge OpenGlBuffer */
@@ -71,7 +71,7 @@ public:
* \param index The upper left corner of the viewed region.
*/
void SetZoomUpperLeftCorner(IndexType index);
- itkGetMacro(ZoomUpperLeftCorner,IndexType);
+ itkGetMacro(ZoomUpperLeftCorner, IndexType);
protected:
/** Constructor. */
@@ -80,8 +80,8 @@ protected:
virtual ~ZoomableImageWidget();
private:
- ZoomableImageWidget(const Self&);// purposely not implemented
- void operator=(const Self&);// purposely not implemented
+ ZoomableImageWidget(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
IndexType m_ZoomUpperLeftCorner;
};
diff --git a/Code/Visu/otbZoomableImageWidget.txx b/Code/Visu/otbZoomableImageWidget.txx
index bbc0bf1b44..104ef19339 100644
--- a/Code/Visu/otbZoomableImageWidget.txx
+++ b/Code/Visu/otbZoomableImageWidget.txx
@@ -50,19 +50,19 @@ ZoomableImageWidget<TPixel>
::Init(int x, int y, int w, int h, const char * l)
{
if (!this->GetInput())
- {
+ {
itkExceptionMacro("No input image!");
- }
+ }
else
- {
- Superclass::Init(x,y,w,h,l);
+ {
+ Superclass::Init(x, y, w, h, l);
// if(this->GetImageOverlayVisible())
// {
// this->GetInputOverlay()->Update();
// }
this->label(l);
this->resize(x, y, w, h);
- }
+ }
}
/**
* Resize the widget.
@@ -74,14 +74,14 @@ ZoomableImageWidget<TPixel>
{
//otbMsgDebugMacro(<<"resize: "<<x<<" "<<y<<" "<<w<<" "<<h);
SizeType size;
- size[0]=static_cast<unsigned int>((double)w/this->GetOpenGlIsotropicZoom())+1;
- size[1]=static_cast<unsigned int>((double)h/this->GetOpenGlIsotropicZoom())+1;
+ size[0] = static_cast<unsigned int>((double) w / this->GetOpenGlIsotropicZoom()) + 1;
+ size[1] = static_cast<unsigned int>((double) h / this->GetOpenGlIsotropicZoom()) + 1;
RegionType region;
region.SetSize(size);
region.SetIndex(m_ZoomUpperLeftCorner);
region.Crop(this->GetInput()->GetLargestPossibleRegion());
this->SetViewedRegion(region);
- this->Fl_Gl_Window::resize(x,y,w,h);
+ this->Fl_Gl_Window::resize(x, y, w, h);
this->redraw();
}
/**
@@ -94,10 +94,10 @@ ZoomableImageWidget<TPixel>
{
RegionType viewed = this->GetViewedRegion();
RegionType buffered = this->GetBufferedRegion();
- IndexType viewedULCorner = viewed.GetIndex();
- IndexType bufferedULCorner = buffered.GetIndex();
- IndexType viewedRDCorner = viewed.GetIndex()+viewed.GetSize();
- IndexType bufferedRDCorner = buffered.GetIndex()+buffered.GetSize();
+ IndexType viewedULCorner = viewed.GetIndex();
+ IndexType bufferedULCorner = buffered.GetIndex();
+ IndexType viewedRDCorner = viewed.GetIndex() + viewed.GetSize();
+ IndexType bufferedRDCorner = buffered.GetIndex() + buffered.GetSize();
// return ( viewedULCorner[0]<bufferedULCorner[0]
// ||viewedULCorner[1]<bufferedULCorner[1]
// ||viewedRDCorner[0]>bufferedRDCorner[0]
@@ -125,25 +125,24 @@ void
ZoomableImageWidget<TPixel>
::SetZoomFactor(double zoomFactor)
{
- if (zoomFactor<1)
- itkExceptionMacro(<<"Zoom factor must be >1 !");
+ if (zoomFactor < 1) itkExceptionMacro(<< "Zoom factor must be >1 !");
RegionType region = this->GetViewedRegion();
- SizeType newSize;
+ SizeType newSize;
RegionType newRegion;
- newSize[0] = static_cast<unsigned int>((double)this->w()/zoomFactor);
- newSize[1] = static_cast<unsigned int>((double)this->h()/zoomFactor);
+ newSize[0] = static_cast<unsigned int>((double) this->w() / zoomFactor);
+ newSize[1] = static_cast<unsigned int>((double) this->h() / zoomFactor);
// otbMsgDebugMacro(<<"SetZoomFactor: newSize ->"<<newSize);
newRegion.SetIndex(m_ZoomUpperLeftCorner);
newRegion.SetSize(newSize);
/// Bug correction, segfault zooming out too much
if (this->GetInput() && this->GetInput()->GetLargestPossibleRegion().IsInside(newRegion))
- {
+ {
this->SetViewedRegion(newRegion);
this->SetOpenGlIsotropicZoom(zoomFactor);
- }
+ }
}
/**
* Set the zoom upper-left corner.
@@ -154,7 +153,7 @@ void
ZoomableImageWidget<TPixel>
::SetZoomUpperLeftCorner(IndexType index)
{
- SizeType size;
+ SizeType size;
RegionType newRegion;
size = this->GetViewedRegion().GetSize();
@@ -167,6 +166,5 @@ ZoomableImageWidget<TPixel>
m_ZoomUpperLeftCorner = index;
}
-
} // end namespace otb
#endif
diff --git a/Code/Visualization/otbAlphaBlendingFunction.h b/Code/Visualization/otbAlphaBlendingFunction.h
index 4dc841de6a..38eb7cf9e4 100644
--- a/Code/Visualization/otbAlphaBlendingFunction.h
+++ b/Code/Visualization/otbAlphaBlendingFunction.h
@@ -40,54 +40,54 @@ namespace Function
*/
template <class TInputRGBPixel1, class TInputRGBPixel2, class TOutputRGBPixel = TInputRGBPixel1>
class AlphaBlendingFunction
- : public BlendingFunction<TInputRGBPixel1,TInputRGBPixel2,TOutputRGBPixel>
+ : public BlendingFunction<TInputRGBPixel1, TInputRGBPixel2, TOutputRGBPixel>
{
public:
/** Standard class typedefs */
- typedef AlphaBlendingFunction Self;
+ typedef AlphaBlendingFunction Self;
typedef BlendingFunction<TInputRGBPixel1,
TInputRGBPixel2,
TOutputRGBPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** type macro */
- itkTypeMacro(AlphaBlendingFunction,BlendingFunction);
+ itkTypeMacro(AlphaBlendingFunction, BlendingFunction);
/** new macro */
itkNewMacro(Self);
/** PixelType macros */
- typedef TInputRGBPixel1 InputPixel1Type;
+ typedef TInputRGBPixel1 InputPixel1Type;
typedef TInputRGBPixel2 InputPixel2Type;
typedef TOutputRGBPixel OutputRGBPixelType;
typedef typename OutputRGBPixelType::ValueType OutputValueType;
/** Evaluate method */
- inline virtual const OutputRGBPixelType Evaluate(const InputPixel1Type& input1, const InputPixel2Type & input2)
+ inline virtual const OutputRGBPixelType Evaluate(const InputPixel1Type& input1, const InputPixel2Type& input2)
{
OutputRGBPixelType resp;
resp.Fill(itk::NumericTraits<OutputValueType>::max());
- double alpha = static_cast<double>(input2.GetAlpha())/255.0 * m_Alpha;
-
- resp.SetRed( static_cast<OutputValueType>(vcl_floor(0.5+
- (1.0-alpha) * static_cast<double>(input1.GetRed())
- + alpha * static_cast<double>(input2.GetRed())
- )));
- resp.SetGreen(static_cast<OutputValueType>(vcl_floor(0.5+
- (1.0-alpha) * static_cast<double>(input1.GetGreen())
- + alpha * static_cast<double>(input2.GetGreen())
- )));
- resp.SetBlue( static_cast<OutputValueType>(vcl_floor(0.5+
- (1.0-alpha) * static_cast<double>(input1.GetBlue())
- + alpha * static_cast<double>(input2.GetBlue())
+ double alpha = static_cast<double>(input2.GetAlpha()) / 255.0 * m_Alpha;
+
+ resp.SetRed(static_cast<OutputValueType>(vcl_floor(0.5 +
+ (1.0 - alpha) * static_cast<double>(input1.GetRed())
+ + alpha * static_cast<double>(input2.GetRed())
+ )));
+ resp.SetGreen(static_cast<OutputValueType>(vcl_floor(0.5 +
+ (1.0 - alpha) * static_cast<double>(input1.GetGreen())
+ + alpha * static_cast<double>(input2.GetGreen())
+ )));
+ resp.SetBlue(static_cast<OutputValueType>(vcl_floor(0.5 +
+ (1.0 - alpha) * static_cast<double>(input1.GetBlue())
+ + alpha * static_cast<double>(input2.GetBlue())
)));
return resp;
}
/** Set/Get the alpha value */
- itkSetClampMacro(Alpha,double,0.,1.);
- itkGetMacro(Alpha,double);
+ itkSetClampMacro(Alpha, double, 0., 1.);
+ itkGetMacro(Alpha, double);
protected:
/** Constructor */
@@ -96,7 +96,7 @@ protected:
virtual ~AlphaBlendingFunction() {}
private:
AlphaBlendingFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Alpha value for blending (should be in the range [0,1] */
double m_Alpha;
@@ -106,5 +106,3 @@ private:
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbAmplitudeFunctor.h b/Code/Visualization/otbAmplitudeFunctor.h
index 5a0734e4e7..0537973180 100644
--- a/Code/Visualization/otbAmplitudeFunctor.h
+++ b/Code/Visualization/otbAmplitudeFunctor.h
@@ -22,111 +22,110 @@
namespace otb
{
- namespace Function
+namespace Function
+{
+/** \class AmplitudeFunctor
+* \brief Compute the module from the selected channel in the input
+*
+* \ingroup Visualization
+*
+* \sa PhaseFunctor ChannelSelectorFunctor
+*/
+template <class TInputPixel>
+class AmplitudeFunctor : public ChannelSelectorFunctor<TInputPixel>
+{
+public:
+ /** Standard class typedefs */
+ typedef AmplitudeFunctor Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ /** Method for creation through the object factory */
+ itkNewMacro(Self);
+
+ /** Runtime information */
+ itkTypeMacro(AmplitudeFunctor, itk::Object);
+
+ typedef TInputPixel PixelType;
+ typedef typename itk::NumericTraits<PixelType>::ValueType ScalarType;
+ typedef itk::VariableLengthVector<ScalarType> VectorPixelType;
+ typedef itk::RGBPixel<ScalarType> RGBPixelType;
+ typedef itk::RGBAPixel<ScalarType> RGBAPixelType;
+
+ typedef VectorPixelType OutputPixelType;
+
+ /** Constructor */
+ AmplitudeFunctor()
{
- /** \class AmplitudeFunctor
- * \brief Compute the module from the selected channel in the input
- *
- * \ingroup Visualization
- *
- * \sa PhaseFunctor ChannelSelectorFunctor
- */
- template <class TInputPixel>
- class AmplitudeFunctor: public ChannelSelectorFunctor<TInputPixel>
- {
- public:
- /** Standard class typedefs */
- typedef AmplitudeFunctor Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- /** Method for creation through the object factory */
- itkNewMacro(Self);
-
- /** Runtime information */
- itkTypeMacro(AmplitudeFunctor,itk::Object);
-
- typedef TInputPixel PixelType;
- typedef typename itk::NumericTraits<PixelType>::ValueType ScalarType;
- typedef itk::VariableLengthVector<ScalarType> VectorPixelType;
- typedef itk::RGBPixel<ScalarType> RGBPixelType;
- typedef itk::RGBAPixel<ScalarType> RGBAPixelType;
-
- typedef VectorPixelType OutputPixelType;
-
-
- /** Constructor */
- AmplitudeFunctor()
- {
- std::vector<unsigned int> channels;
- channels.push_back(0);
- channels.push_back(1);
- this->SetChannelList(channels);
- }
-
- /** Destructor */
- virtual ~AmplitudeFunctor() {}
-
- const char *GetDescription() const
- {return "Amplitude";}
-
- virtual unsigned int GetOutputSize() const
- {
- return 1;
- }
-
- virtual OutputPixelType operator()(const VectorPixelType & inPixel) const
- {
- OutputPixelType outPixel;
- outPixel.SetSize(1);
- assert( (this->GetChannelList()).size() == 2);
- assert((this->GetChannelList())[0] < inPixel.Size());
- assert((this->GetChannelList())[1] < inPixel.Size());
- outPixel[0] = ComputeAmplitude(inPixel[(this->GetChannelList())[0]], inPixel[(this->GetChannelList())[1]]);
- return outPixel;
- }
-
- virtual OutputPixelType operator()(ScalarType ) const
- {
- //FIXME we don't handle the std::complex<> yet
- itkExceptionMacro(<<"Can't compute amplitude from a scalar value");
- }
-
- virtual OutputPixelType operator()(const RGBPixelType & inPixel) const
- {
- OutputPixelType outPixel;
- outPixel.SetSize(1);
-
- assert( (this->GetChannelList()).size() == 2);
- assert((this->GetChannelList())[0] < 3);
- assert((this->GetChannelList())[1] < 3);
-
- outPixel[0] = ComputeAmplitude(inPixel[(this->GetChannelList())[0]], inPixel[(this->GetChannelList())[1]]);
- return outPixel;
- }
-
- virtual OutputPixelType operator()(const RGBAPixelType & inPixel) const
- {
- OutputPixelType outPixel;
- outPixel.SetSize(1);
-
- assert( (this->GetChannelList()).size() == 2);
- assert((this->GetChannelList())[0] < 4);
- assert((this->GetChannelList())[1] < 4);
-
- outPixel[0] = ComputeAmplitude(inPixel[(this->GetChannelList())[0]], inPixel[(this->GetChannelList())[1]]);
- return outPixel;
- }
-
- private:
- inline ScalarType ComputeAmplitude(ScalarType a, ScalarType b) const
- {
- return vcl_sqrt(a*a + b*b);
- }
-
- };
+ std::vector<unsigned int> channels;
+ channels.push_back(0);
+ channels.push_back(1);
+ this->SetChannelList(channels);
}
+
+ /** Destructor */
+ virtual ~AmplitudeFunctor() {}
+
+ const char *GetDescription() const
+ {return "Amplitude"; }
+
+ virtual unsigned int GetOutputSize() const
+ {
+ return 1;
+ }
+
+ virtual OutputPixelType operator ()(const VectorPixelType& inPixel) const
+ {
+ OutputPixelType outPixel;
+ outPixel.SetSize(1);
+ assert((this->GetChannelList()).size() == 2);
+ assert((this->GetChannelList())[0] < inPixel.Size());
+ assert((this->GetChannelList())[1] < inPixel.Size());
+ outPixel[0] = ComputeAmplitude(inPixel[(this->GetChannelList())[0]], inPixel[(this->GetChannelList())[1]]);
+ return outPixel;
+ }
+
+ virtual OutputPixelType operator ()(ScalarType) const
+ {
+ //FIXME we don't handle the std::complex<> yet
+ itkExceptionMacro(<< "Can't compute amplitude from a scalar value");
+ }
+
+ virtual OutputPixelType operator ()(const RGBPixelType& inPixel) const
+ {
+ OutputPixelType outPixel;
+ outPixel.SetSize(1);
+
+ assert((this->GetChannelList()).size() == 2);
+ assert((this->GetChannelList())[0] < 3);
+ assert((this->GetChannelList())[1] < 3);
+
+ outPixel[0] = ComputeAmplitude(inPixel[(this->GetChannelList())[0]], inPixel[(this->GetChannelList())[1]]);
+ return outPixel;
+ }
+
+ virtual OutputPixelType operator ()(const RGBAPixelType& inPixel) const
+ {
+ OutputPixelType outPixel;
+ outPixel.SetSize(1);
+
+ assert((this->GetChannelList()).size() == 2);
+ assert((this->GetChannelList())[0] < 4);
+ assert((this->GetChannelList())[1] < 4);
+
+ outPixel[0] = ComputeAmplitude(inPixel[(this->GetChannelList())[0]], inPixel[(this->GetChannelList())[1]]);
+ return outPixel;
+ }
+
+private:
+ inline ScalarType ComputeAmplitude(ScalarType a, ScalarType b) const
+ {
+ return vcl_sqrt(a * a + b * b);
+ }
+
+};
+}
}
#endif
diff --git a/Code/Visualization/otbArrowKeyMoveActionHandler.h b/Code/Visualization/otbArrowKeyMoveActionHandler.h
index 6450be988a..4748f4321b 100644
--- a/Code/Visualization/otbArrowKeyMoveActionHandler.h
+++ b/Code/Visualization/otbArrowKeyMoveActionHandler.h
@@ -31,217 +31,215 @@ namespace otb
*/
template <class TModel, class TView>
- class ArrowKeyMoveActionHandler
-: public ImageWidgetActionHandler
+class ArrowKeyMoveActionHandler
+ : public ImageWidgetActionHandler
{
- public:
- /** Standard class typedefs */
- typedef ArrowKeyMoveActionHandler Self;
- typedef ImageWidgetActionHandler Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- /** Method for creation through the object factory */
- itkNewMacro(Self);
-
- /** Runtime information */
- itkTypeMacro(ArrowKeyMoveActionHandler,ImageWidgetActionHandler);
-
- /** Model typedefs */
- typedef TModel ModelType;
- typedef typename ModelType::Pointer ModelPointerType;
- typedef typename ModelType::IndexType IndexType;
-
- /** View typedef */
- typedef TView ViewType;
- typedef typename ViewType::Pointer ViewPointerType;
- typedef typename ViewType::ImageWidgetPointerType WidgetPointerType;
-
- /** Handle widget event
- */
- virtual bool HandleWidgetEvent(std::string widgetId, int event)
- {
- if(m_Model.IsNotNull() && m_View.IsNotNull() && this->GetIsActive())
+public:
+ /** Standard class typedefs */
+ typedef ArrowKeyMoveActionHandler Self;
+ typedef ImageWidgetActionHandler Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ /** Method for creation through the object factory */
+ itkNewMacro(Self);
+
+ /** Runtime information */
+ itkTypeMacro(ArrowKeyMoveActionHandler, ImageWidgetActionHandler);
+
+ /** Model typedefs */
+ typedef TModel ModelType;
+ typedef typename ModelType::Pointer ModelPointerType;
+ typedef typename ModelType::IndexType IndexType;
+
+ /** View typedef */
+ typedef TView ViewType;
+ typedef typename ViewType::Pointer ViewPointerType;
+ typedef typename ViewType::ImageWidgetPointerType WidgetPointerType;
+
+ /** Handle widget event
+ */
+ virtual bool HandleWidgetEvent(std::string widgetId, int event)
+ {
+ if (m_Model.IsNotNull() && m_View.IsNotNull() && this->GetIsActive())
{
- // Find the source widget
- WidgetPointerType sourceWidget;
- bool handle = false;
- if(widgetId == m_View->GetScrollWidget()->GetIdentifier() )
+ // Find the source widget
+ WidgetPointerType sourceWidget;
+ bool handle = false;
+ if (widgetId == m_View->GetScrollWidget()->GetIdentifier())
{
- sourceWidget = m_View->GetScrollWidget();
- handle = true;
+ sourceWidget = m_View->GetScrollWidget();
+ handle = true;
}
- else if(widgetId == m_View->GetFullWidget()->GetIdentifier() )
+ else if (widgetId == m_View->GetFullWidget()->GetIdentifier())
{
- sourceWidget = m_View->GetFullWidget();
- handle = true;
+ sourceWidget = m_View->GetFullWidget();
+ handle = true;
}
- else if(widgetId == m_View->GetZoomWidget()->GetIdentifier() )
+ else if (widgetId == m_View->GetZoomWidget()->GetIdentifier())
{
- sourceWidget = m_View->GetZoomWidget();
- handle = true;
+ sourceWidget = m_View->GetZoomWidget();
+ handle = true;
}
- if ((handle)
- && ((event == FL_KEYBOARD) || (event == FL_SHORTCUT)))
+ if ((handle)
+ && ((event == FL_KEYBOARD) || (event == FL_SHORTCUT)))
{
- switch(Fl::event_key())
+ switch (Fl::event_key())
{
- case FL_Up:
- {
- typename ViewType::SizeType size;
- size = m_View->GetFullWidget()->GetExtent().GetSize();
-
- // Get the current position
- typename ViewType::ImageWidgetType::PointType screenPoint, imagePoint;
- screenPoint[0] = size[0]/2;
- screenPoint[1] = size[1]/2;
-
- // Transform to image point
- imagePoint = m_View->GetFullWidget()->GetScreenToImageTransform()->TransformPoint(screenPoint);
-
- // Transform to index
- typename ViewType::IndexType index;
- index[0]=static_cast<int>(imagePoint[0]);
- index[1]=static_cast<int>(imagePoint[1]);
-
- // Move
- index[1] -= size[1];
-
- // Change scaled extract region center
- m_Model->SetExtractRegionCenter(index);
- // Update model
- m_Model->Update();
- return true;
- break;
- }
- case FL_Down:
- {
- typename ViewType::SizeType size;
- size = m_View->GetFullWidget()->GetExtent().GetSize();
-
- // Get the current position
- typename ViewType::ImageWidgetType::PointType screenPoint, imagePoint;
- screenPoint[0] = size[0]/2;
- screenPoint[1] = size[1]/2;
-
- // Transform to image point
- imagePoint = m_View->GetFullWidget()->GetScreenToImageTransform()->TransformPoint(screenPoint);
-
- // Transform to index
- typename ViewType::IndexType index;
- index[0]=static_cast<int>(imagePoint[0]);
- index[1]=static_cast<int>(imagePoint[1]);
-
- // Move
- index[1] += size[1];
-
- // Change scaled extract region center
- m_Model->SetExtractRegionCenter(index);
- // Update model
- m_Model->Update();
- return true;
- break;
- }
- case FL_Left:
- {
- typename ViewType::SizeType size;
- size = m_View->GetFullWidget()->GetExtent().GetSize();
-
- // Get the current position
- typename ViewType::ImageWidgetType::PointType screenPoint, imagePoint;
- screenPoint[0] = size[0]/2;
- screenPoint[1] = size[1]/2;
-
- // Transform to image point
- imagePoint = m_View->GetFullWidget()->GetScreenToImageTransform()->TransformPoint(screenPoint);
-
- // Transform to index
- typename ViewType::IndexType index;
- index[0]=static_cast<int>(imagePoint[0]);
- index[1]=static_cast<int>(imagePoint[1]);
-
- // Move
- index[0] -= size[0];
-
- // Change scaled extract region center
- m_Model->SetExtractRegionCenter(index);
- // Update model
- m_Model->Update();
- return true;
- break;
- }
- case FL_Right:
- {
- typename ViewType::SizeType size;
- size = m_View->GetFullWidget()->GetExtent().GetSize();
-
- // Get the current position
- typename ViewType::ImageWidgetType::PointType screenPoint, imagePoint;
- screenPoint[0] = size[0]/2;
- screenPoint[1] = size[1]/2;
-
- // Transform to image point
- imagePoint = m_View->GetFullWidget()->GetScreenToImageTransform()->TransformPoint(screenPoint);
-
- // Transform to index
- typename ViewType::IndexType index;
- index[0]=static_cast<int>(imagePoint[0]);
- index[1]=static_cast<int>(imagePoint[1]);
-
- // Move
- index[0] += size[0];
-
- // Change scaled extract region center
- m_Model->SetExtractRegionCenter(index);
- // Update model
- m_Model->Update();
- return true;
- break;
- }
- default:
- {
- return false;
- break;
- }
+ case FL_Up:
+ {
+ typename ViewType::SizeType size;
+ size = m_View->GetFullWidget()->GetExtent().GetSize();
+
+ // Get the current position
+ typename ViewType::ImageWidgetType::PointType screenPoint, imagePoint;
+ screenPoint[0] = size[0] / 2;
+ screenPoint[1] = size[1] / 2;
+
+ // Transform to image point
+ imagePoint = m_View->GetFullWidget()->GetScreenToImageTransform()->TransformPoint(screenPoint);
+
+ // Transform to index
+ typename ViewType::IndexType index;
+ index[0] = static_cast<int>(imagePoint[0]);
+ index[1] = static_cast<int>(imagePoint[1]);
+
+ // Move
+ index[1] -= size[1];
+
+ // Change scaled extract region center
+ m_Model->SetExtractRegionCenter(index);
+ // Update model
+ m_Model->Update();
+ return true;
+ break;
+ }
+ case FL_Down:
+ {
+ typename ViewType::SizeType size;
+ size = m_View->GetFullWidget()->GetExtent().GetSize();
+
+ // Get the current position
+ typename ViewType::ImageWidgetType::PointType screenPoint, imagePoint;
+ screenPoint[0] = size[0] / 2;
+ screenPoint[1] = size[1] / 2;
+
+ // Transform to image point
+ imagePoint = m_View->GetFullWidget()->GetScreenToImageTransform()->TransformPoint(screenPoint);
+
+ // Transform to index
+ typename ViewType::IndexType index;
+ index[0] = static_cast<int>(imagePoint[0]);
+ index[1] = static_cast<int>(imagePoint[1]);
+
+ // Move
+ index[1] += size[1];
+
+ // Change scaled extract region center
+ m_Model->SetExtractRegionCenter(index);
+ // Update model
+ m_Model->Update();
+ return true;
+ break;
+ }
+ case FL_Left:
+ {
+ typename ViewType::SizeType size;
+ size = m_View->GetFullWidget()->GetExtent().GetSize();
+
+ // Get the current position
+ typename ViewType::ImageWidgetType::PointType screenPoint, imagePoint;
+ screenPoint[0] = size[0] / 2;
+ screenPoint[1] = size[1] / 2;
+
+ // Transform to image point
+ imagePoint = m_View->GetFullWidget()->GetScreenToImageTransform()->TransformPoint(screenPoint);
+
+ // Transform to index
+ typename ViewType::IndexType index;
+ index[0] = static_cast<int>(imagePoint[0]);
+ index[1] = static_cast<int>(imagePoint[1]);
+
+ // Move
+ index[0] -= size[0];
+
+ // Change scaled extract region center
+ m_Model->SetExtractRegionCenter(index);
+ // Update model
+ m_Model->Update();
+ return true;
+ break;
+ }
+ case FL_Right:
+ {
+ typename ViewType::SizeType size;
+ size = m_View->GetFullWidget()->GetExtent().GetSize();
+
+ // Get the current position
+ typename ViewType::ImageWidgetType::PointType screenPoint, imagePoint;
+ screenPoint[0] = size[0] / 2;
+ screenPoint[1] = size[1] / 2;
+
+ // Transform to image point
+ imagePoint = m_View->GetFullWidget()->GetScreenToImageTransform()->TransformPoint(screenPoint);
+
+ // Transform to index
+ typename ViewType::IndexType index;
+ index[0] = static_cast<int>(imagePoint[0]);
+ index[1] = static_cast<int>(imagePoint[1]);
+
+ // Move
+ index[0] += size[0];
+
+ // Change scaled extract region center
+ m_Model->SetExtractRegionCenter(index);
+ // Update model
+ m_Model->Update();
+ return true;
+ break;
+ }
+ default:
+ {
+ return false;
+ break;
+ }
}
}
}
- return false;
- }
+ return false;
+ }
- /** Set/Get the pointer to the model */
- itkSetObjectMacro(Model,ModelType);
- itkGetObjectMacro(Model,ModelType);
+ /** Set/Get the pointer to the model */
+ itkSetObjectMacro(Model, ModelType);
+ itkGetObjectMacro(Model, ModelType);
- /** Set/Get the pointer to the view */
- itkSetObjectMacro(View,ViewType);
- itkGetObjectMacro(View,ViewType);
+ /** Set/Get the pointer to the view */
+ itkSetObjectMacro(View, ViewType);
+ itkGetObjectMacro(View, ViewType);
- protected:
- /** Constructor */
- ArrowKeyMoveActionHandler() : m_View(), m_Model()
- {}
+protected:
+ /** Constructor */
+ ArrowKeyMoveActionHandler() : m_View(), m_Model()
+ {}
- /** Destructor */
- virtual ~ArrowKeyMoveActionHandler(){}
- /** Printself method */
- void PrintSelf(std::ostream& os, itk::Indent indent) const
- {
- Superclass::PrintSelf(os,indent);
- }
+ /** Destructor */
+ virtual ~ArrowKeyMoveActionHandler(){}
+ /** Printself method */
+ void PrintSelf(std::ostream& os, itk::Indent indent) const
+ {
+ Superclass::PrintSelf(os, indent);
+ }
- private:
- ArrowKeyMoveActionHandler(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+private:
+ ArrowKeyMoveActionHandler(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
- // Pointer to the view
- ViewPointerType m_View;
+ // Pointer to the view
+ ViewPointerType m_View;
- // Pointer to the model
- ModelPointerType m_Model;
+ // Pointer to the model
+ ModelPointerType m_Model;
}; // end class
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbBlendingFunction.h b/Code/Visualization/otbBlendingFunction.h
index a78c56591c..74ea707653 100644
--- a/Code/Visualization/otbBlendingFunction.h
+++ b/Code/Visualization/otbBlendingFunction.h
@@ -43,15 +43,15 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** type macro */
- itkTypeMacro(BlendingFunction,Object);
+ itkTypeMacro(BlendingFunction, Object);
/** PixelType macros */
- typedef TInputRGBPixel1 InputPixel1Type;
- typedef TInputRGBPixel2 InputPixel2Type;
- typedef TOutputRGBPixel OutputRGBPixelType;
+ typedef TInputRGBPixel1 InputPixel1Type;
+ typedef TInputRGBPixel2 InputPixel2Type;
+ typedef TOutputRGBPixel OutputRGBPixelType;
/** Evaluate method */
- virtual const OutputRGBPixelType Evaluate(const InputPixel1Type& input1, const InputPixel2Type & input2) = 0;
+ virtual const OutputRGBPixelType Evaluate(const InputPixel1Type& input1, const InputPixel2Type& input2) = 0;
protected:
/** Constructor */
@@ -61,11 +61,9 @@ protected:
private:
BlendingFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace Function
} // end namepsace otb
#endif
-
-
diff --git a/Code/Visualization/otbBlendingImageFilter.h b/Code/Visualization/otbBlendingImageFilter.h
index c53ab0a911..35b521619b 100644
--- a/Code/Visualization/otbBlendingImageFilter.h
+++ b/Code/Visualization/otbBlendingImageFilter.h
@@ -41,17 +41,17 @@ class BlendingFunctor
public:
/** Blending function typedef */
typedef otb::Function::BlendingFunction<TInputPixel1,
- TInputPixel2,TOutputPixel> BlendingFunctionType;
+ TInputPixel2, TOutputPixel> BlendingFunctionType;
/** Blending function pointer typedef */
- typedef typename BlendingFunctionType::Pointer BlendingFunctionPointerType;
+ typedef typename BlendingFunctionType::Pointer BlendingFunctionPointerType;
/** Default rendering function typedef */
typedef otb::Function::UniformAlphaBlendingFunction<TInputPixel1,
- TInputPixel2,TOutputPixel> DefaultBlendingFunctionType;
+ TInputPixel2, TOutputPixel> DefaultBlendingFunctionType;
/** Scalar pixel operator */
- inline TOutputPixel operator()(const TInputPixel1 & input1, const TInputPixel2 & input2)
+ inline TOutputPixel operator ()(const TInputPixel1& input1, const TInputPixel2& input2)
{
- return m_Function->Evaluate(input1,input2);
+ return m_Function->Evaluate(input1, input2);
}
/** Constructor */
@@ -97,34 +97,34 @@ private:
*/
template <class TInputImage1, class TInputImage2 = TInputImage1, class TOutputImage = TInputImage1>
class BlendingImageFilter
- : public itk::BinaryFunctorImageFilter<TInputImage1,TInputImage2,TOutputImage,
- Functor::BlendingFunctor
- < typename TInputImage1::PixelType,
+ : public itk::BinaryFunctorImageFilter<TInputImage1, TInputImage2, TOutputImage,
+ Functor::BlendingFunctor
+ <typename TInputImage1::PixelType,
typename TInputImage2::PixelType,
- typename TOutputImage::PixelType > >
+ typename TOutputImage::PixelType> >
{
public:
/** Standard typedefs */
- typedef BlendingImageFilter Self;
+ typedef BlendingImageFilter Self;
typedef itk::BinaryFunctorImageFilter
- <TInputImage1,TInputImage2,TOutputImage, Functor::BlendingFunctor
- < typename TInputImage1::PixelType,
- typename TInputImage2::PixelType,
- typename TOutputImage::PixelType > > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ <TInputImage1, TInputImage2, TOutputImage, Functor::BlendingFunctor
+ <typename TInputImage1::PixelType,
+ typename TInputImage2::PixelType,
+ typename TOutputImage::PixelType> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(BlendingImageFilter,itk::BinaryFunctorImageFilter);
+ itkTypeMacro(BlendingImageFilter, itk::BinaryFunctorImageFilter);
/** Blending function typedef */
typedef Functor::BlendingFunctor
- < typename TInputImage1::PixelType,
- typename TInputImage2::PixelType,
- typename TOutputImage::PixelType > BlendingFunctorType;
+ <typename TInputImage1::PixelType,
+ typename TInputImage2::PixelType,
+ typename TOutputImage::PixelType> BlendingFunctorType;
typedef typename BlendingFunctorType::BlendingFunctionType BlendingFunctionType;
/**
@@ -133,7 +133,7 @@ public:
*/
void SetBlendingFunction(BlendingFunctionType * function)
{
- if(function != this->GetFunctor().GetFunction())
+ if (function != this->GetFunctor().GetFunction())
{
this->GetFunctor().SetFunction(function);
this->Modified();
@@ -149,7 +149,7 @@ public:
return this->GetFunctor().GetFunction();
}
- protected:
+protected:
/** Constructor */
BlendingImageFilter() {}
/** Destructor */
@@ -157,10 +157,8 @@ public:
private:
BlendingImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbChangeExtractRegionActionHandler.h b/Code/Visualization/otbChangeExtractRegionActionHandler.h
index f9d5348a3c..e3c6b42d8d 100644
--- a/Code/Visualization/otbChangeExtractRegionActionHandler.h
+++ b/Code/Visualization/otbChangeExtractRegionActionHandler.h
@@ -37,15 +37,15 @@ class ChangeExtractRegionActionHandler
public:
/** Standard class typedefs */
typedef ChangeExtractRegionActionHandler Self;
- typedef ImageWidgetActionHandler Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageWidgetActionHandler Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(ChangeExtractRegionActionHandler,ImageWidgetActionHandler);
+ itkTypeMacro(ChangeExtractRegionActionHandler, ImageWidgetActionHandler);
/** Model typedefs */
typedef TModel ModelType;
@@ -53,10 +53,9 @@ public:
typedef typename ModelType::RegionType RegionType;
/** View typedefs */
- typedef TView ViewType;
- typedef typename ViewType::Pointer ViewPointerType;
- typedef typename ViewType::OffsetType OffsetType;
-
+ typedef TView ViewType;
+ typedef typename ViewType::Pointer ViewPointerType;
+ typedef typename ViewType::OffsetType OffsetType;
/** Handle widget event
* \param widgetId The id of the moved widget
@@ -65,12 +64,13 @@ public:
*/
virtual bool HandleWidgetEvent(std::string widgetId, int event)
{
- if( m_View.IsNotNull() && m_Model.IsNotNull() && this->GetIsActive() )
+ if (m_View.IsNotNull() && m_Model.IsNotNull() && this->GetIsActive())
{
- if(widgetId == m_View->GetScrollWidget()->GetIdentifier()
- && event == FL_PUSH && Fl::event_button() == m_MouseButton)
+ if (widgetId == m_View->GetScrollWidget()->GetIdentifier()
+ && event == FL_PUSH && Fl::event_button() == m_MouseButton)
{
- otbMsgDevMacro(<<"ChangeExtractRegionActionHandler::HandleWidgetEvent(): handling ("<<widgetId<<", "<<event<<")");
+ otbMsgDevMacro(
+ << "ChangeExtractRegionActionHandler::HandleWidgetEvent(): handling (" << widgetId << ", " << event << ")");
// Get the clicked index
typename ViewType::ImageWidgetType::PointType screenPoint, imagePoint;
@@ -81,8 +81,8 @@ public:
// Transform to index
typename ViewType::IndexType index;
- index[0]=static_cast<int>(imagePoint[0]);
- index[1]=static_cast<int>(imagePoint[1]);
+ index[0] = static_cast<int>(imagePoint[0]);
+ index[1] = static_cast<int>(imagePoint[1]);
//Add Offset
index += m_Offset;
@@ -98,19 +98,19 @@ public:
}
/** Set/Get the pointer to the view */
- itkSetObjectMacro(View,ViewType);
- itkGetObjectMacro(View,ViewType);
+ itkSetObjectMacro(View, ViewType);
+ itkGetObjectMacro(View, ViewType);
/** Set/Get the pointer to the model */
- itkSetObjectMacro(Model,ModelType);
- itkGetObjectMacro(Model,ModelType);
+ itkSetObjectMacro(Model, ModelType);
+ itkGetObjectMacro(Model, ModelType);
/** Set/Get Offset */
- itkSetMacro(Offset,OffsetType);
- itkGetMacro(Offset,OffsetType);
+ itkSetMacro(Offset, OffsetType);
+ itkGetMacro(Offset, OffsetType);
/** Set the mouse button used */
- itkSetClampMacro(MouseButton, int,1,3);
+ itkSetClampMacro(MouseButton, int, 1, 3);
itkGetMacro(MouseButton, int);
protected:
@@ -125,15 +125,15 @@ protected:
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
ChangeExtractRegionActionHandler(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
//Offset
- OffsetType m_Offset;
+ OffsetType m_Offset;
// Pointer to the view
ViewPointerType m_View;
@@ -147,5 +147,3 @@ private:
}; // end class
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbChangeScaleActionHandler.h b/Code/Visualization/otbChangeScaleActionHandler.h
index 9f48ff1d64..04bdcf4f01 100644
--- a/Code/Visualization/otbChangeScaleActionHandler.h
+++ b/Code/Visualization/otbChangeScaleActionHandler.h
@@ -36,16 +36,16 @@ class ChangeScaleActionHandler
{
public:
/** Standard class typedefs */
- typedef ChangeScaleActionHandler Self;
- typedef ImageWidgetActionHandler Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ChangeScaleActionHandler Self;
+ typedef ImageWidgetActionHandler Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(ChangeScaleActionHandler,ImageWidgetActionHandler);
+ itkTypeMacro(ChangeScaleActionHandler, ImageWidgetActionHandler);
/** Model typedefs */
typedef TModel ModelType;
@@ -53,9 +53,8 @@ public:
typedef typename ModelType::RegionType RegionType;
/** View typedefs */
- typedef TView ViewType;
- typedef typename ViewType::Pointer ViewPointerType;
-
+ typedef TView ViewType;
+ typedef typename ViewType::Pointer ViewPointerType;
/** Handle widget event
* \param widgetId The id of the moved widget
@@ -64,28 +63,29 @@ public:
*/
virtual bool HandleWidgetEvent(std::string widgetId, int event)
{
- if( m_View.IsNotNull() && m_Model.IsNotNull() && this->GetIsActive() )
+ if (m_View.IsNotNull() && m_Model.IsNotNull() && this->GetIsActive())
{
- if(widgetId == m_View->GetZoomWidget()->GetIdentifier()
- && event == FL_MOUSEWHEEL)
+ if (widgetId == m_View->GetZoomWidget()->GetIdentifier()
+ && event == FL_MOUSEWHEEL)
{
- otbMsgDevMacro(<<"ChangeScaleActionHandler::HandleWidgetEvent(): handling ("<<widgetId<<", "<<event<<")");
+ otbMsgDevMacro(
+ << "ChangeScaleActionHandler::HandleWidgetEvent(): handling (" << widgetId << ", " << event << ")");
// Get the mousewhell offset
int dy = Fl::event_dy();
// Compute new scale
- double newScale = m_View->GetZoomWidget()->GetIsotropicZoom() * vcl_pow(m_ScaleRatio,-dy);
- if(newScale>=1.0)
+ double newScale = m_View->GetZoomWidget()->GetIsotropicZoom() * vcl_pow(m_ScaleRatio, -dy);
+ if (newScale >= 1.0)
{
m_View->GetZoomWidget()->SetIsotropicZoom(newScale);
RegionType region = m_Model->GetScaledExtractRegion();
typename RegionType::IndexType index = region.GetIndex();
typename RegionType::SizeType size = region.GetSize();
- index[0]+=size[0]/2;
- index[1]+=size[1]/2;
- size[0] = static_cast<unsigned int>(m_View->GetZoomWidget()->w()/m_View->GetZoomWidget()->GetIsotropicZoom());
- size[1] = static_cast<unsigned int>(m_View->GetZoomWidget()->h()/m_View->GetZoomWidget()->GetIsotropicZoom());
+ index[0] += size[0] / 2;
+ index[1] += size[1] / 2;
+ size[0] = static_cast<unsigned int>(m_View->GetZoomWidget()->w() / m_View->GetZoomWidget()->GetIsotropicZoom());
+ size[1] = static_cast<unsigned int>(m_View->GetZoomWidget()->h() / m_View->GetZoomWidget()->GetIsotropicZoom());
region.SetSize(size);
m_Model->SetScaledExtractRegion(region);
m_Model->SetScaledExtractRegionCenter(index);
@@ -99,16 +99,16 @@ public:
}
/** Set/Get the pointer to the view */
- itkSetObjectMacro(View,ViewType);
- itkGetObjectMacro(View,ViewType);
+ itkSetObjectMacro(View, ViewType);
+ itkGetObjectMacro(View, ViewType);
/** Set/Get the pointer to the model */
- itkSetObjectMacro(Model,ModelType);
- itkGetObjectMacro(Model,ModelType);
+ itkSetObjectMacro(Model, ModelType);
+ itkGetObjectMacro(Model, ModelType);
/** Set/Get scale ratio */
- itkSetMacro(ScaleRatio,double);
- itkGetMacro(ScaleRatio,double);
+ itkSetMacro(ScaleRatio, double);
+ itkGetMacro(ScaleRatio, double);
protected:
/** Constructor */
@@ -120,12 +120,12 @@ protected:
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
ChangeScaleActionHandler(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
// Pointer to the view
ViewPointerType m_View;
@@ -139,5 +139,3 @@ private:
}; // end class
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbChangeScaledExtractRegionActionHandler.h b/Code/Visualization/otbChangeScaledExtractRegionActionHandler.h
index a442dd47e9..4f6bbb53a9 100644
--- a/Code/Visualization/otbChangeScaledExtractRegionActionHandler.h
+++ b/Code/Visualization/otbChangeScaledExtractRegionActionHandler.h
@@ -45,7 +45,7 @@ public:
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(ChangeScaledExtractRegionActionHandler,ImageWidgetActionHandler);
+ itkTypeMacro(ChangeScaledExtractRegionActionHandler, ImageWidgetActionHandler);
/** Model typedefs */
typedef TModel ModelType;
@@ -53,9 +53,9 @@ public:
typedef typename ModelType::RegionType RegionType;
/** View typedefs */
- typedef TView ViewType;
- typedef typename ViewType::Pointer ViewPointerType;
- typedef typename ViewType::OffsetType OffsetType;
+ typedef TView ViewType;
+ typedef typename ViewType::Pointer ViewPointerType;
+ typedef typename ViewType::OffsetType OffsetType;
/** Handle widget event
* \param widgetId The id of the moved widget
@@ -64,12 +64,14 @@ public:
*/
virtual bool HandleWidgetEvent(std::string widgetId, int event)
{
- if( m_View.IsNotNull() && m_Model.IsNotNull() && this->GetIsActive() )
+ if (m_View.IsNotNull() && m_Model.IsNotNull() && this->GetIsActive())
{
- if(widgetId == m_View->GetFullWidget()->GetIdentifier()
- && event == FL_PUSH && Fl::event_button() == m_MouseButton)
+ if (widgetId == m_View->GetFullWidget()->GetIdentifier()
+ && event == FL_PUSH && Fl::event_button() == m_MouseButton)
{
- otbMsgDevMacro(<<"ChangeScaledExtractRegionActionHandler::HandleWidgetEvent(): handling ("<<widgetId<<", "<<event<<")");
+ otbMsgDevMacro(
+ << "ChangeScaledExtractRegionActionHandler::HandleWidgetEvent(): handling (" << widgetId << ", " << event <<
+ ")");
// Get the clicked index
typename ViewType::ImageWidgetType::PointType screenPoint, imagePoint;
screenPoint = m_View->GetFullWidget()->GetMousePosition();
@@ -79,8 +81,8 @@ public:
// Transform to index
typename ViewType::IndexType index;
- index[0]=static_cast<int>(imagePoint[0]);
- index[1]=static_cast<int>(imagePoint[1]);
+ index[0] = static_cast<int>(imagePoint[0]);
+ index[1] = static_cast<int>(imagePoint[1]);
//Add an offset if any
index += m_Offset;
@@ -96,19 +98,19 @@ public:
}
/** Set/Get the pointer to the view */
- itkSetObjectMacro(View,ViewType);
- itkGetObjectMacro(View,ViewType);
+ itkSetObjectMacro(View, ViewType);
+ itkGetObjectMacro(View, ViewType);
/** Set/Get the pointer to the model */
- itkSetObjectMacro(Model,ModelType);
- itkGetObjectMacro(Model,ModelType);
+ itkSetObjectMacro(Model, ModelType);
+ itkGetObjectMacro(Model, ModelType);
/** Set/Get Offset */
- itkSetMacro(Offset,OffsetType);
- itkGetMacro(Offset,OffsetType);
+ itkSetMacro(Offset, OffsetType);
+ itkGetMacro(Offset, OffsetType);
/** Set the mouse button used */
- itkSetClampMacro(MouseButton,int,1,3);
+ itkSetClampMacro(MouseButton, int, 1, 3);
itkGetMacro(MouseButton, int);
protected:
@@ -123,15 +125,15 @@ protected:
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
ChangeScaledExtractRegionActionHandler(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
//Offset
- OffsetType m_Offset;
+ OffsetType m_Offset;
// Pointer to the view
ViewPointerType m_View;
@@ -145,5 +147,3 @@ private:
}; // end class
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbChannelSelectorFunctor.h b/Code/Visualization/otbChannelSelectorFunctor.h
index f01fea2d1a..c60e4b9c55 100644
--- a/Code/Visualization/otbChannelSelectorFunctor.h
+++ b/Code/Visualization/otbChannelSelectorFunctor.h
@@ -28,230 +28,230 @@
namespace otb
{
- namespace Function
+namespace Function
+{
+/** \class ChannelSelectorFunctor
+* \brief Base class for pixel representation functions.
+*
+* \ingroup Visualization
+*
+* \sa AmplitudeFunctor PhaseFunctor
+*/
+template <class TInputPixel>
+class ChannelSelectorFunctor : public itk::Object
+{
+public:
+ /** Standard class typedefs */
+ typedef ChannelSelectorFunctor Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ /** Method for creation through the object factory */
+ itkNewMacro(Self);
+
+ /** Runtime information */
+ itkTypeMacro(ChannelSelectorFunctor, itk::Object);
+
+ typedef TInputPixel PixelType;
+ typedef typename itk::NumericTraits<PixelType>::ValueType ScalarType;
+ typedef itk::VariableLengthVector<ScalarType> VectorPixelType;
+ typedef itk::RGBPixel<ScalarType> RGBPixelType;
+ typedef itk::RGBAPixel<ScalarType> RGBAPixelType;
+
+ typedef VectorPixelType OutputPixelType;
+
+ typedef std::vector<unsigned int> ChannelListType;
+
+ /** Constructor */
+ ChannelSelectorFunctor() :
+ usingDefaultParameters(true)
+ {
+ if (std::string(typeid(PixelType).name()).find("RGBAPixel") != std::string::npos)
+ {
+ m_ChannelList.push_back(0);
+ m_ChannelList.push_back(1);
+ m_ChannelList.push_back(2);
+ m_ChannelList.push_back(3);
+ }
+ else if (std::string(typeid(PixelType).name()).find("RGBPixel") != std::string::npos)
+ {
+ m_ChannelList.push_back(0);
+ m_ChannelList.push_back(1);
+ m_ChannelList.push_back(2);
+ }
+ else if (std::string(typeid(PixelType).name()).find("VariableLengthVector") != std::string::npos)
+ {
+ m_ChannelList.push_back(0);
+ }
+ else
+ {
+ m_ChannelList.push_back(0);
+ }
+ }
+
+ /** Destructor */
+ virtual ~ChannelSelectorFunctor() {}
+
+ const char *GetDescription() const
+ {return "Channel Selection"; }
+
+ virtual OutputPixelType operator ()(const VectorPixelType& inPixel) const
{
- /** \class ChannelSelectorFunctor
- * \brief Base class for pixel representation functions.
- *
- * \ingroup Visualization
- *
- * \sa AmplitudeFunctor PhaseFunctor
- */
- template <class TInputPixel>
- class ChannelSelectorFunctor: public itk::Object
- {
- public:
- /** Standard class typedefs */
- typedef ChannelSelectorFunctor Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- /** Method for creation through the object factory */
- itkNewMacro(Self);
-
- /** Runtime information */
- itkTypeMacro(ChannelSelectorFunctor,itk::Object);
-
- typedef TInputPixel PixelType;
- typedef typename itk::NumericTraits<PixelType>::ValueType ScalarType;
- typedef itk::VariableLengthVector<ScalarType> VectorPixelType;
- typedef itk::RGBPixel<ScalarType> RGBPixelType;
- typedef itk::RGBAPixel<ScalarType> RGBAPixelType;
-
- typedef VectorPixelType OutputPixelType;
-
- typedef std::vector<unsigned int> ChannelListType;
-
- /** Constructor */
- ChannelSelectorFunctor() :
- usingDefaultParameters(true)
- {
- if ( std::string(typeid(PixelType).name()).find("RGBAPixel") !=std::string::npos )
- {
- m_ChannelList.push_back(0);
- m_ChannelList.push_back(1);
- m_ChannelList.push_back(2);
- m_ChannelList.push_back(3);
- }
- else if ( std::string(typeid(PixelType).name()).find("RGBPixel") !=std::string::npos )
- {
- m_ChannelList.push_back(0);
- m_ChannelList.push_back(1);
- m_ChannelList.push_back(2);
- }
- else if ( std::string(typeid(PixelType).name()).find("VariableLengthVector") !=std::string::npos )
- {
- m_ChannelList.push_back(0);
- }
- else
- {
- m_ChannelList.push_back(0);
- }
- }
-
- /** Destructor */
- virtual ~ChannelSelectorFunctor() {}
-
- const char *GetDescription() const
- {return "Channel Selection";}
-
-
- virtual OutputPixelType operator()(const VectorPixelType & inPixel) const
- {
// otbMsgDevMacro(<<"Channel list "<< m_ChannelList[0]);
- OutputPixelType outPixel;
- outPixel.SetSize(m_ChannelList.size());
- for (unsigned int i=0; i<m_ChannelList.size(); ++i)
- {
- // assert as the verification should be done outside and only
- // once for the image, not for every pixel, when we reach this point
- // the m_ChannelList MUST be valid
- assert(m_ChannelList[i] < inPixel.Size());
- outPixel[i] = inPixel[m_ChannelList[i]];
- }
- return outPixel;
- }
-
- virtual OutputPixelType operator()(ScalarType inPixel) const
- {
- OutputPixelType outPixel;
- outPixel.SetSize(1);
- for (unsigned int i=0; i<m_ChannelList.size(); ++i)
- {
- assert(m_ChannelList[i] < 1);
- outPixel[0] = inPixel;
- }
- return outPixel;
- }
-
- virtual OutputPixelType operator()(const RGBPixelType & inPixel) const
- {
- OutputPixelType outPixel;
- outPixel.SetSize(m_ChannelList.size());
- for (unsigned int i=0; i<m_ChannelList.size(); ++i)
- {
- assert(m_ChannelList[i] < 3);
- outPixel[i] = inPixel[m_ChannelList[i]];
- }
- return outPixel;
- }
-
- virtual OutputPixelType operator()(const RGBAPixelType & inPixel) const
- {
- OutputPixelType outPixel;
- outPixel.SetSize(m_ChannelList.size());
- for (unsigned int i=0; i<m_ChannelList.size(); ++i)
- {
- assert(m_ChannelList[i] < 4);
- outPixel[i] = inPixel[m_ChannelList[i]];
- }
- return outPixel;
- }
-
- virtual unsigned int GetOutputSize() const
- {
- return m_ChannelList.size();
- }
-
- virtual std::vector<unsigned int> GetChannelList() const
- {
- return m_ChannelList;
- }
-
- virtual void SetChannelList(std::vector<unsigned int> channels)
- {
- m_ChannelList = channels;
- usingDefaultParameters = false;
- }
-
- virtual void SetChannelIndex(unsigned int channelPosition, unsigned int channel)
- {
- if (m_ChannelList.size() < channelPosition+1)
- {
- m_ChannelList.resize(channelPosition+1,0);
- }
- m_ChannelList[channelPosition] = channel;
- usingDefaultParameters = false;
- }
-
- virtual unsigned int GetChannelIndex(unsigned int channelPosition) const
- {
- if (channelPosition >= m_ChannelList.size())
- {
- itkExceptionMacro(<<"Can't get channel " << channelPosition << ", there is only " << m_ChannelList.size() << " element in the list");
- }
- return m_ChannelList[channelPosition];
-
- }
-
- /** Only for backward compatibility but should not be used*/
- virtual void SetAllChannels(unsigned int channel)
- {
- if (m_ChannelList.size() <3)
- {
- m_ChannelList.resize(3,0);
- }
- m_ChannelList[0]=channel;
- m_ChannelList[1]=channel;
- m_ChannelList[2]=channel;
- usingDefaultParameters = false;
- }
- virtual void SetRedChannelIndex(unsigned int channel)
- {
- if (m_ChannelList.size() <1)
- {
- m_ChannelList.resize(3,0);
- }
- m_ChannelList[0] = channel;
- usingDefaultParameters = false;
- }
-
- virtual void SetGreenChannelIndex(unsigned int channel)
- {
- if (m_ChannelList.size() <2)
- {
- m_ChannelList.resize(3,0);
- }
- m_ChannelList[1] = channel;
- usingDefaultParameters = false;
- }
-
- virtual void SetBlueChannelIndex(unsigned int channel)
- {
- if (m_ChannelList.size() <3)
- {
- m_ChannelList.resize(3,0);
- }
- m_ChannelList[2] = channel;
- usingDefaultParameters = false;
- }
-
- virtual unsigned int GetRedChannelIndex() const
- {
- return m_ChannelList[0];
- }
- virtual unsigned int GetGreenChannelIndex() const
- {
- return m_ChannelList[1];
- }
- virtual unsigned int GetBlueChannelIndex() const
- {
- return m_ChannelList[2];
- }
-
- virtual bool IsUsingDefaultParameters()
- {
- return usingDefaultParameters;
- }
- private:
-
- ChannelListType m_ChannelList;
- bool usingDefaultParameters;
-
- };
+ OutputPixelType outPixel;
+ outPixel.SetSize(m_ChannelList.size());
+ for (unsigned int i = 0; i < m_ChannelList.size(); ++i)
+ {
+ // assert as the verification should be done outside and only
+ // once for the image, not for every pixel, when we reach this point
+ // the m_ChannelList MUST be valid
+ assert(m_ChannelList[i] < inPixel.Size());
+ outPixel[i] = inPixel[m_ChannelList[i]];
+ }
+ return outPixel;
+ }
+
+ virtual OutputPixelType operator ()(ScalarType inPixel) const
+ {
+ OutputPixelType outPixel;
+ outPixel.SetSize(1);
+ for (unsigned int i = 0; i < m_ChannelList.size(); ++i)
+ {
+ assert(m_ChannelList[i] < 1);
+ outPixel[0] = inPixel;
+ }
+ return outPixel;
+ }
+
+ virtual OutputPixelType operator ()(const RGBPixelType& inPixel) const
+ {
+ OutputPixelType outPixel;
+ outPixel.SetSize(m_ChannelList.size());
+ for (unsigned int i = 0; i < m_ChannelList.size(); ++i)
+ {
+ assert(m_ChannelList[i] < 3);
+ outPixel[i] = inPixel[m_ChannelList[i]];
+ }
+ return outPixel;
+ }
+ virtual OutputPixelType operator ()(const RGBAPixelType& inPixel) const
+ {
+ OutputPixelType outPixel;
+ outPixel.SetSize(m_ChannelList.size());
+ for (unsigned int i = 0; i < m_ChannelList.size(); ++i)
+ {
+ assert(m_ChannelList[i] < 4);
+ outPixel[i] = inPixel[m_ChannelList[i]];
+ }
+ return outPixel;
+ }
+
+ virtual unsigned int GetOutputSize() const
+ {
+ return m_ChannelList.size();
+ }
+
+ virtual std::vector<unsigned int> GetChannelList() const
+ {
+ return m_ChannelList;
+ }
+ virtual void SetChannelList(std::vector<unsigned int> channels)
+ {
+ m_ChannelList = channels;
+ usingDefaultParameters = false;
}
+
+ virtual void SetChannelIndex(unsigned int channelPosition, unsigned int channel)
+ {
+ if (m_ChannelList.size() < channelPosition + 1)
+ {
+ m_ChannelList.resize(channelPosition + 1, 0);
+ }
+ m_ChannelList[channelPosition] = channel;
+ usingDefaultParameters = false;
+ }
+
+ virtual unsigned int GetChannelIndex(unsigned int channelPosition) const
+ {
+ if (channelPosition >= m_ChannelList.size())
+ {
+ itkExceptionMacro(
+ << "Can't get channel " << channelPosition << ", there is only " << m_ChannelList.size() <<
+ " element in the list");
+ }
+ return m_ChannelList[channelPosition];
+
+ }
+
+ /** Only for backward compatibility but should not be used*/
+ virtual void SetAllChannels(unsigned int channel)
+ {
+ if (m_ChannelList.size() < 3)
+ {
+ m_ChannelList.resize(3, 0);
+ }
+ m_ChannelList[0] = channel;
+ m_ChannelList[1] = channel;
+ m_ChannelList[2] = channel;
+ usingDefaultParameters = false;
+ }
+ virtual void SetRedChannelIndex(unsigned int channel)
+ {
+ if (m_ChannelList.size() < 1)
+ {
+ m_ChannelList.resize(3, 0);
+ }
+ m_ChannelList[0] = channel;
+ usingDefaultParameters = false;
+ }
+
+ virtual void SetGreenChannelIndex(unsigned int channel)
+ {
+ if (m_ChannelList.size() < 2)
+ {
+ m_ChannelList.resize(3, 0);
+ }
+ m_ChannelList[1] = channel;
+ usingDefaultParameters = false;
+ }
+
+ virtual void SetBlueChannelIndex(unsigned int channel)
+ {
+ if (m_ChannelList.size() < 3)
+ {
+ m_ChannelList.resize(3, 0);
+ }
+ m_ChannelList[2] = channel;
+ usingDefaultParameters = false;
+ }
+
+ virtual unsigned int GetRedChannelIndex() const
+ {
+ return m_ChannelList[0];
+ }
+ virtual unsigned int GetGreenChannelIndex() const
+ {
+ return m_ChannelList[1];
+ }
+ virtual unsigned int GetBlueChannelIndex() const
+ {
+ return m_ChannelList[2];
+ }
+
+ virtual bool IsUsingDefaultParameters()
+ {
+ return usingDefaultParameters;
+ }
+private:
+
+ ChannelListType m_ChannelList;
+ bool usingDefaultParameters;
+
+};
+
+}
}
#endif
diff --git a/Code/Visualization/otbCircleGlComponent.cxx b/Code/Visualization/otbCircleGlComponent.cxx
index c3bcee8c27..46b759b5ed 100644
--- a/Code/Visualization/otbCircleGlComponent.cxx
+++ b/Code/Visualization/otbCircleGlComponent.cxx
@@ -17,18 +17,16 @@
=========================================================================*/
#include "otbCircleGlComponent.h"
-
namespace otb
{
CircleGlComponent
-::CircleGlComponent() : m_IndexList(),m_Spacing(), m_Origin(), m_GluTesselator(),
- m_ColorList(), m_LineWidth(1.5), m_Radius(2), m_RedColor()
+::CircleGlComponent() : m_IndexList(), m_Spacing(), m_Origin(), m_GluTesselator(),
+ m_ColorList(), m_LineWidth(1.5), m_Radius(2), m_RedColor()
{
// Default color is red
m_RedColor.Fill(0);
- m_RedColor[0]=1.;
- m_RedColor[3]=0.5;
-
+ m_RedColor[0] = 1.;
+ m_RedColor[3] = 0.5;
// Intialize origin and spacing
m_Origin.Fill(0.);
@@ -47,25 +45,24 @@ CircleGlComponent
gluDeleteTess(m_GluTesselator);
}
-
void
CircleGlComponent
-::Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform)
+::Render(const RegionType& extent, const AffineTransformType * space2ScreenTransform)
{
- if(m_IndexList.size() == 0)
+ if (m_IndexList.size() == 0)
{
// nothing to render, return
return;
}
-
+
// Set up blending and color
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4d(m_RedColor[0],m_RedColor[1],m_RedColor[2],m_RedColor[3]);
-
+ glColor4d(m_RedColor[0], m_RedColor[1], m_RedColor[2], m_RedColor[3]);
+
// Set up line width
double previousWidth = 0.;
- glGetDoublev(GL_LINE_WIDTH,&previousWidth);
+ glGetDoublev(GL_LINE_WIDTH, &previousWidth);
// convert line width to screen line width
VectorType imageLineWidth;
@@ -73,33 +70,32 @@ CircleGlComponent
VectorType screenLineWidth = space2ScreenTransform->TransformVector(imageLineWidth);
glLineWidth(screenLineWidth[0]);
// Do we need to render boundaries only (for polygons)
- gluTessProperty(m_GluTesselator,GLU_TESS_BOUNDARY_ONLY,false);
+ gluTessProperty(m_GluTesselator, GLU_TESS_BOUNDARY_ONLY, false);
// Enabling line antialiasing
glEnable(GL_POINT_SMOOTH);
-
- for(unsigned int i=0; i<m_IndexList.size(); i++)
- {
- this->Render(i,extent,space2ScreenTransform);
- }
+
+ for (unsigned int i = 0; i < m_IndexList.size(); i++)
+ {
+ this->Render(i, extent, space2ScreenTransform);
+ }
glDisable(GL_POINT_SMOOTH);
glDisable(GL_BLEND);
//glLineWidth(previousWidth);
}
-
-
+
void
CircleGlComponent
-::Render(unsigned int id, const RegionType & /*extent*/, const AffineTransformType * space2ScreenTransform)
+::Render(unsigned int id, const RegionType& /*extent*/, const AffineTransformType * space2ScreenTransform)
{
- glColor4d(m_ColorList[id][0],m_ColorList[id][1],m_ColorList[id][2],m_ColorList[id][3]);
+ glColor4d(m_ColorList[id][0], m_ColorList[id][1], m_ColorList[id][2], m_ColorList[id][3]);
// Take into account pixel spacing and origin
//PointType spacePoint = dataNode->GetPoint();
PointType spacePoint;
- spacePoint[0]*= m_Spacing[0];
- spacePoint[1]*= m_Spacing[1];
+ spacePoint[0] *= m_Spacing[0];
+ spacePoint[1] *= m_Spacing[1];
spacePoint[0] = m_IndexList[id][0] + m_Origin[0];
spacePoint[1] = m_IndexList[id][1] + m_Origin[1];
@@ -110,30 +106,30 @@ CircleGlComponent
glEnable(GL_BLEND);
glPointSize(m_Radius);
glBegin(GL_POINTS);
- glVertex2d(screenPoint[0],screenPoint[1]);
+ glVertex2d(screenPoint[0], screenPoint[1]);
glEnd();
// Draw the center
//glColor4d(m_ColorList[id][0],m_ColorList[id][1],m_ColorList[id][2],1)
- if( m_CenterRepresentation == CIRCLE && m_Radius>4 )
+ if (m_CenterRepresentation == CIRCLE && m_Radius > 4)
{
- glColor4d(0, 0, 0, 1);
- glEnable(GL_BLEND);
- glPointSize(2);
- glBegin(GL_POINTS);
- glVertex2d(screenPoint[0],screenPoint[1]);
- glEnd();
+ glColor4d(0, 0, 0, 1);
+ glEnable(GL_BLEND);
+ glPointSize(2);
+ glBegin(GL_POINTS);
+ glVertex2d(screenPoint[0], screenPoint[1]);
+ glEnd();
}
- else if( m_CenterRepresentation == CROSS )
+ else if (m_CenterRepresentation == CROSS)
{
- glColor4d(0, 0, 0, 1);
- glBegin(GL_LINES);
- // Draw a cross
- glVertex2d(screenPoint[0]-m_Radius,screenPoint[1]);
- glVertex2d(screenPoint[0]+m_Radius,screenPoint[1]);
- glVertex2d(screenPoint[0],screenPoint[1]-m_Radius);
- glVertex2d(screenPoint[0],screenPoint[1]+m_Radius);
- glEnd();
+ glColor4d(0, 0, 0, 1);
+ glBegin(GL_LINES);
+ // Draw a cross
+ glVertex2d(screenPoint[0] - m_Radius, screenPoint[1]);
+ glVertex2d(screenPoint[0] + m_Radius, screenPoint[1]);
+ glVertex2d(screenPoint[0], screenPoint[1] - m_Radius);
+ glVertex2d(screenPoint[0], screenPoint[1] + m_Radius);
+ glEnd();
}
}
diff --git a/Code/Visualization/otbCircleGlComponent.h b/Code/Visualization/otbCircleGlComponent.h
index 88c6700e80..2a03e7fa3e 100644
--- a/Code/Visualization/otbCircleGlComponent.h
+++ b/Code/Visualization/otbCircleGlComponent.h
@@ -37,13 +37,12 @@
#endif
#endif
-
namespace otb
{
/** \class CircleGlComponent
* \brief This Gl Component to render a circle.
* No checking is done upon the adequation between the circle
-* projection and the underlying image projection. Gie possibility
+* projection and the underlying image projection. Gie possibility
* to represnts the circle center (by a point or a cross)
*
* Origin and Spacing allows to fit to the image axis.
@@ -61,10 +60,10 @@ public:
typedef Superclass::RegionType RegionType;
// affine transform
- typedef Superclass::AffineTransformType AffineTransformType;
- typedef AffineTransformType::InputPointType PointType;
- typedef AffineTransformType::InputVectorType VectorType;
- typedef Superclass::ColorType ColorType;
+ typedef Superclass::AffineTransformType AffineTransformType;
+ typedef AffineTransformType::InputPointType PointType;
+ typedef AffineTransformType::InputVectorType VectorType;
+ typedef Superclass::ColorType ColorType;
typedef itk::Index<> IndexType;
typedef std::vector<IndexType> IndexListType;
@@ -73,21 +72,21 @@ public:
typedef enum { NO, CIRCLE, CROSS } CenterRepresentationEnumType;
/** Runtime information */
- itkTypeMacro(CircleGlComponent,GlComponent);
+ itkTypeMacro(CircleGlComponent, GlComponent);
/** New macro */
itkNewMacro(Self);
/// Render the vector data
- virtual void Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform);
+ virtual void Render(const RegionType& extent, const AffineTransformType * space2ScreenTransform);
/** Set/Get the grid spacing */
- itkSetMacro(Spacing,VectorType);
- itkGetConstReferenceMacro(Spacing,VectorType);
+ itkSetMacro(Spacing, VectorType);
+ itkGetConstReferenceMacro(Spacing, VectorType);
/** Set/Get the grid origin */
- itkSetMacro(Origin,PointType);
- itkGetConstReferenceMacro(Origin,PointType);
+ itkSetMacro(Origin, PointType);
+ itkGetConstReferenceMacro(Origin, PointType);
/** Set/Get the index to render */
void SetIndexList(IndexListType idList) { m_IndexList = idList; }
@@ -95,28 +94,25 @@ public:
void AddIndex(IndexType id) { m_IndexList.push_back(id); m_ColorList.push_back(m_RedColor); }
void RemoveIndex(unsigned int id)
{
- if( id >= m_IndexList.size() )
- itkExceptionMacro(<<"Index out of size ");
+ if (id >= m_IndexList.size()) itkExceptionMacro(<< "Index out of size ");
- m_IndexList.erase(m_IndexList.begin()+id);
+ m_IndexList.erase(m_IndexList.begin() + id);
}
-
+
/** Set/Get the color */
void SetColorList(ColorListType colorList) { m_ColorList = colorList; }
ColorListType GetColorList() { return m_ColorList; }
void ChangeColor(ColorType color, unsigned int id)
{
- if( id >= m_ColorList.size() )
- itkExceptionMacro(<<"Index out of size ");
+ if (id >= m_ColorList.size()) itkExceptionMacro(<< "Index out of size ");
m_ColorList[id] = color;
}
void RemoveColor(unsigned int id)
{
- if( id >= m_ColorList.size() )
- itkExceptionMacro(<<"Index out of size ");
+ if (id >= m_ColorList.size()) itkExceptionMacro(<< "Index out of size ");
- m_ColorList.erase(m_ColorList.begin()+id);
+ m_ColorList.erase(m_ColorList.begin() + id);
}
/** Clear all*/
@@ -128,16 +124,16 @@ public:
}
/** Set/Get the line width */
- itkSetMacro(LineWidth,double);
- itkGetMacro(LineWidth,double);
+ itkSetMacro(LineWidth, double);
+ itkGetMacro(LineWidth, double);
/** Set/Get the circle radius. */
- itkSetMacro(Radius,double);
- itkGetMacro(Radius,double);
+ itkSetMacro(Radius, double);
+ itkGetMacro(Radius, double);
/** Set/Get the center circle radius. */
- itkSetMacro(CenterRepresentation,CenterRepresentationEnumType);
- itkGetMacro(CenterRepresentation,CenterRepresentationEnumType);
+ itkSetMacro(CenterRepresentation, CenterRepresentationEnumType);
+ itkGetMacro(CenterRepresentation, CenterRepresentationEnumType);
protected:
/** Constructor */
@@ -147,16 +143,15 @@ protected:
/** Printself method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
// Recursive rendering method
- virtual void Render(unsigned int id, const RegionType & extent, const AffineTransformType * space2ScreenTransform);
-
+ virtual void Render(unsigned int id, const RegionType& extent, const AffineTransformType * space2ScreenTransform);
private:
CircleGlComponent(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/// Index point to render
IndexListType m_IndexList;
@@ -165,7 +160,7 @@ private:
VectorType m_Spacing;
/// Origin of the image
- PointType m_Origin;
+ PointType m_Origin;
/// The GluTesselator object to render complex polygons
GLUtesselator * m_GluTesselator;
@@ -178,7 +173,7 @@ private:
/** The circle radius */
double m_Radius;
-
+
/** Default color : red*/
ColorType m_RedColor;
diff --git a/Code/Visualization/otbCrossGlComponent.cxx b/Code/Visualization/otbCrossGlComponent.cxx
index dbd0a845b3..1998a30d17 100644
--- a/Code/Visualization/otbCrossGlComponent.cxx
+++ b/Code/Visualization/otbCrossGlComponent.cxx
@@ -17,23 +17,21 @@
=========================================================================*/
#include "otbCrossGlComponent.h"
-
namespace otb
{
CrossGlComponent
-::CrossGlComponent() : m_IndexList(),m_Spacing(), m_Origin(), m_GluTesselator(),
- m_ColorList(), m_LineWidth(1.5),m_CrossWidth(10), m_RedColor()
+::CrossGlComponent() : m_IndexList(), m_Spacing(), m_Origin(), m_GluTesselator(),
+ m_ColorList(), m_LineWidth(1.5), m_CrossWidth(10), m_RedColor()
{
// Default color is red
m_RedColor.Fill(0);
- m_RedColor[0]=1.;
- m_RedColor[3]=0.75;
-
+ m_RedColor[0] = 1.;
+ m_RedColor[3] = 0.75;
// Intialize origin and spacing
m_Origin.Fill(0.);
m_Spacing.Fill(1.);
-
+
// Create the tesselator
m_GluTesselator = gluNewTess();
}
@@ -45,25 +43,24 @@ CrossGlComponent
gluDeleteTess(m_GluTesselator);
}
-
void
CrossGlComponent
-::Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform)
+::Render(const RegionType& extent, const AffineTransformType * space2ScreenTransform)
{
- if(m_IndexList.size() == 0)
+ if (m_IndexList.size() == 0)
{
// nothing to render, return
return;
}
-
+
// Set up blending and color
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4d(m_RedColor[0],m_RedColor[1],m_RedColor[2],m_RedColor[3]);
-
+ glColor4d(m_RedColor[0], m_RedColor[1], m_RedColor[2], m_RedColor[3]);
+
// Set up line width
double previousWidth = 0.;
- glGetDoublev(GL_LINE_WIDTH,&previousWidth);
+ glGetDoublev(GL_LINE_WIDTH, &previousWidth);
// convert line width to screen line width
VectorType imageLineWidth;
@@ -71,45 +68,44 @@ CrossGlComponent
VectorType screenLineWidth = space2ScreenTransform->TransformVector(imageLineWidth);
glLineWidth(screenLineWidth[0]);
// Do we need to render boundaries only (for polygons)
- gluTessProperty(m_GluTesselator,GLU_TESS_BOUNDARY_ONLY,false);//m_RenderPolygonBoundariesOnly);
+ gluTessProperty(m_GluTesselator, GLU_TESS_BOUNDARY_ONLY, false); //m_RenderPolygonBoundariesOnly);
// Enabling line antialiasing
glEnable(GL_LINE_SMOOTH);
-
- for(unsigned int i=0; i<m_IndexList.size(); i++)
- {
- this->Render(i,extent,space2ScreenTransform);
- }
+
+ for (unsigned int i = 0; i < m_IndexList.size(); i++)
+ {
+ this->Render(i, extent, space2ScreenTransform);
+ }
glDisable(GL_LINE_SMOOTH);
glDisable(GL_BLEND);
glLineWidth(previousWidth);
}
-
-
+
void
CrossGlComponent
-::Render(unsigned int id, const RegionType & /*extent*/, const AffineTransformType * space2ScreenTransform)
+::Render(unsigned int id, const RegionType& /*extent*/, const AffineTransformType * space2ScreenTransform)
{
- glColor4d(m_ColorList[id][0],m_ColorList[id][1],m_ColorList[id][2],m_ColorList[id][3]);
+ glColor4d(m_ColorList[id][0], m_ColorList[id][1], m_ColorList[id][2], m_ColorList[id][3]);
// Take into account pixel spacing and origin
//PointType spacePoint = dataNode->GetPoint();
PointType spacePoint;
- spacePoint[0]*= m_Spacing[0];
- spacePoint[1]*= m_Spacing[1];
+ spacePoint[0] *= m_Spacing[0];
+ spacePoint[1] *= m_Spacing[1];
spacePoint[0] = m_IndexList[id][0] + m_Origin[0];
spacePoint[1] = m_IndexList[id][1] + m_Origin[1];
// Transform to a screen point
PointType screenPoint = space2ScreenTransform->TransformPoint(spacePoint);
-
+
glBegin(GL_LINES);
// Draw a cross
- glVertex2d(screenPoint[0]-m_CrossWidth,screenPoint[1]);
- glVertex2d(screenPoint[0]+m_CrossWidth,screenPoint[1]);
- glVertex2d(screenPoint[0],screenPoint[1]-m_CrossWidth);
- glVertex2d(screenPoint[0],screenPoint[1]+m_CrossWidth);
+ glVertex2d(screenPoint[0] - m_CrossWidth, screenPoint[1]);
+ glVertex2d(screenPoint[0] + m_CrossWidth, screenPoint[1]);
+ glVertex2d(screenPoint[0], screenPoint[1] - m_CrossWidth);
+ glVertex2d(screenPoint[0], screenPoint[1] + m_CrossWidth);
glEnd();
}
diff --git a/Code/Visualization/otbCrossGlComponent.h b/Code/Visualization/otbCrossGlComponent.h
index 6fba1924a9..7522d2ebdc 100644
--- a/Code/Visualization/otbCrossGlComponent.h
+++ b/Code/Visualization/otbCrossGlComponent.h
@@ -37,7 +37,6 @@
#endif
#endif
-
namespace otb
{
/** \class CrossGlComponent
@@ -60,77 +59,74 @@ public:
typedef Superclass::RegionType RegionType;
// affine transform
- typedef Superclass::AffineTransformType AffineTransformType;
- typedef AffineTransformType::InputPointType PointType;
- typedef AffineTransformType::InputVectorType VectorType;
- typedef Superclass::ColorType ColorType;
+ typedef Superclass::AffineTransformType AffineTransformType;
+ typedef AffineTransformType::InputPointType PointType;
+ typedef AffineTransformType::InputVectorType VectorType;
+ typedef Superclass::ColorType ColorType;
- typedef itk::Index<> IndexType;
+ typedef itk::Index<> IndexType;
typedef std::vector<IndexType> IndexListType;
typedef std::vector<ColorType> ColorListType;
/** Runtime information */
- itkTypeMacro(CrossGlComponent,GlComponent);
+ itkTypeMacro(CrossGlComponent, GlComponent);
/** New macro */
itkNewMacro(Self);
/// Render the vector data
- virtual void Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform);
+ virtual void Render(const RegionType& extent, const AffineTransformType * space2ScreenTransform);
/** Set/Get the grid spacing */
- itkSetMacro(Spacing,VectorType);
- itkGetConstReferenceMacro(Spacing,VectorType);
+ itkSetMacro(Spacing, VectorType);
+ itkGetConstReferenceMacro(Spacing, VectorType);
/** Set/Get the grid origin */
- itkSetMacro(Origin,PointType);
- itkGetConstReferenceMacro(Origin,PointType);
+ itkSetMacro(Origin, PointType);
+ itkGetConstReferenceMacro(Origin, PointType);
/** Set/Get the index to render */
- void SetIndexList(IndexListType idList) { m_IndexList = idList; };
- IndexListType GetIndexList() { return m_IndexList; };
- void AddIndex(IndexType id) { m_IndexList.push_back(id); m_ColorList.push_back(m_RedColor); };
+ void SetIndexList(IndexListType idList) { m_IndexList = idList; }
+ IndexListType GetIndexList() { return m_IndexList; }
+ void AddIndex(IndexType id) { m_IndexList.push_back(id); m_ColorList.push_back(m_RedColor); }
void RemoveIndex(unsigned int id)
{
- if( id >= m_IndexList.size() )
- itkExceptionMacro(<<"Index out of size ");
+ if (id >= m_IndexList.size()) itkExceptionMacro(<< "Index out of size ");
+
+ m_IndexList.erase(m_IndexList.begin() + id);
+ }
- m_IndexList.erase(m_IndexList.begin()+id);
- };
-
/** Set/Get the color */
- void SetColorList(ColorListType colorList) { m_ColorList = colorList; };
- ColorListType GetColorList() { return m_ColorList; };
+ void SetColorList(ColorListType colorList) { m_ColorList = colorList; }
+ ColorListType GetColorList() { return m_ColorList; }
void ChangeColor(ColorType color, unsigned int id)
{
- if( id >= m_ColorList.size() )
- itkExceptionMacro(<<"Index out of size ");
+ if (id >= m_ColorList.size()) itkExceptionMacro(<< "Index out of size ");
m_ColorList[id] = color;
- };
+ }
void RemoveColor(unsigned int id)
{
- if( id >= m_ColorList.size() )
- itkExceptionMacro(<<"Index out of size ");
+ if (id >= m_ColorList.size()) itkExceptionMacro(<< "Index out of size ");
- m_ColorList.erase(m_ColorList.begin()+id);
- };
+ m_ColorList.erase(m_ColorList.begin() + id);
+ }
/** Clear all*/
- void Clear() { m_IndexList.clear(); m_ColorList.clear(); };
+ void Clear() { m_IndexList.clear(); m_ColorList.clear(); }
void ClearIndex(unsigned int id)
{
this->RemoveIndex(id);
this->RemoveColor(id);
- };
+ }
/** Set/Get the line width */
- itkSetMacro(LineWidth,double);
- itkGetMacro(LineWidth,double);
+ itkSetMacro(LineWidth, double);
+ itkGetMacro(LineWidth, double);
/** Set/Get the cross width */
- itkSetMacro(CrossWidth,double);
- itkGetMacro(CrossWidth,double);
+ itkSetMacro(CrossWidth, double);
+ itkGetMacro(CrossWidth, double);
protected:
/** Constructor */
@@ -140,16 +136,15 @@ protected:
/** Printself method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
// Recursive rendering method
- virtual void Render(unsigned int id, const RegionType & extent, const AffineTransformType * space2ScreenTransform);
-
+ virtual void Render(unsigned int id, const RegionType& extent, const AffineTransformType * space2ScreenTransform);
private:
CrossGlComponent(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/// Index point to render
IndexListType m_IndexList;
@@ -158,7 +153,7 @@ private:
VectorType m_Spacing;
/// Origin of the image
- PointType m_Origin;
+ PointType m_Origin;
/// The GluTesselator object to render complex polygons
GLUtesselator * m_GluTesselator;
@@ -171,7 +166,7 @@ private:
/** The cross width for points */
double m_CrossWidth;
-
+
/** Default color : red*/
ColorType m_RedColor;
@@ -179,5 +174,3 @@ private:
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbCurve2D.h b/Code/Visualization/otbCurve2D.h
index a18a7f704a..92e13e31f7 100644
--- a/Code/Visualization/otbCurve2D.h
+++ b/Code/Visualization/otbCurve2D.h
@@ -34,27 +34,27 @@ namespace otb
*/
class Curve2D
- : public GlComponent
+ : public GlComponent
{
public:
/** Standard class typedefs */
- typedef Curve2D Self;
- typedef GlComponent Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef itk::ImageRegion<2> RegionType;
+ typedef Curve2D Self;
+ typedef GlComponent Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::ImageRegion<2> RegionType;
// affine transform
- typedef Superclass::AffineTransformType AffineTransformType;
- typedef Superclass::PointType PointType;
- typedef Superclass::VectorType VectorType;
- typedef Superclass::ColorType ColorType;
+ typedef Superclass::AffineTransformType AffineTransformType;
+ typedef Superclass::PointType PointType;
+ typedef Superclass::VectorType VectorType;
+ typedef Superclass::ColorType ColorType;
/** Runtime information */
- itkTypeMacro(Curve2D,GlComponent);
+ itkTypeMacro(Curve2D, GlComponent);
/// This method is provided to do some computation before rendering
- virtual void BeforeRendering() {};
+ virtual void BeforeRendering() {}
/// Get the min for each axis from the data available
virtual PointType GetMinimum() = 0;
@@ -67,8 +67,8 @@ public:
itkSetStringMacro(Label);
/// Get/set the label color
- itkSetMacro(LabelColor,ColorType);
- itkGetConstReferenceMacro(LabelColor,ColorType);
+ itkSetMacro(LabelColor, ColorType);
+ itkGetConstReferenceMacro(LabelColor, ColorType);
protected:
/** Constructor */
@@ -82,22 +82,20 @@ protected:
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
Curve2D(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/// The curve label
std::string m_Label;
/// The curve label color
- ColorType m_LabelColor;
+ ColorType m_LabelColor;
}; // end class
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbCurves2DWidget.cxx b/Code/Visualization/otbCurves2DWidget.cxx
index 668ee4988c..7bb32e46b8 100644
--- a/Code/Visualization/otbCurves2DWidget.cxx
+++ b/Code/Visualization/otbCurves2DWidget.cxx
@@ -20,13 +20,13 @@
namespace otb
{
Curves2DWidget::Curves2DWidget() : m_Curves(), m_XAxisLabel("X axis"), m_YAxisLabel("Y axis"), m_Margins(),
- m_Extent(), m_AxisOrigin(), m_AxisLength(),
- m_GridOrigin(), m_GridSpacing(), m_ZeroCrossingAxis(true),
- m_AutoScale(true),m_AxisColor(), m_GridColor(), m_SpaceToScreenTransform()
+ m_Extent(), m_AxisOrigin(), m_AxisLength(),
+ m_GridOrigin(), m_GridSpacing(), m_ZeroCrossingAxis(true),
+ m_AutoScale(true), m_AxisColor(), m_GridColor(), m_SpaceToScreenTransform()
{
// Build the curves list
m_Curves = CurveListType::New();
-
+
// Prefer a white background
ColorType white;
white.Fill(1);
@@ -76,7 +76,6 @@ unsigned int Curves2DWidget::GetNumberOfCurves()
return m_Curves->Size();
}
-
void Curves2DWidget::draw()
{
// Call superclass implementation for gl init
@@ -84,12 +83,12 @@ void Curves2DWidget::draw()
// Call the before rendering method for each curve
CurveListType::Iterator it = m_Curves->Begin();
- while(it != m_Curves->End())
+ while (it != m_Curves->End())
{
it.Get()->BeforeRendering();
++it;
}
- if(m_AutoScale)
+ if (m_AutoScale)
{
this->AutoScale();
}
@@ -108,7 +107,7 @@ void Curves2DWidget::draw()
void Curves2DWidget::AutoScale()
{
- if(m_Curves->Size()<1)
+ if (m_Curves->Size() < 1)
{
// No curves available, retrun
return;
@@ -121,44 +120,39 @@ void Curves2DWidget::AutoScale()
max = it.Get()->GetMaximum();
// Get the absolute min/max
- while(it != m_Curves->End())
+ while (it != m_Curves->End())
{
newMin = it.Get()->GetMinimum();
newMax = it.Get()->GetMaximum();
- if(newMin[0]< min[0])
- min[0]=newMin[0];
- if(newMin[1]< min[1])
- min[1]=newMin[1];
- if(newMax[0]> max[0])
- max[0]=newMax[0];
- if(newMax[1]> max[1])
- max[1]=newMax[1];
+ if (newMin[0] < min[0]) min[0] = newMin[0];
+ if (newMin[1] < min[1]) min[1] = newMin[1];
+ if (newMax[0] > max[0]) max[0] = newMax[0];
+ if (newMax[1] > max[1]) max[1] = newMax[1];
++it;
}
// Autoscale
m_AxisOrigin = min;
- m_AxisLength = max-min;
- m_GridSpacing = m_AxisLength/10;
+ m_AxisLength = max - min;
+ m_GridSpacing = m_AxisLength / 10;
m_GridOrigin = min;
}
-
void Curves2DWidget::UpdateSpaceToScreenTransform()
{
// Update Extent
RegionType::IndexType extentIndex;
- RegionType::SizeType extentSize;
-
+ RegionType::SizeType extentSize;
+
// Extent index
- extentIndex[0]=m_Margins[0];
- extentIndex[1]=m_Margins[1];
+ extentIndex[0] = m_Margins[0];
+ extentIndex[1] = m_Margins[1];
// Extent size
- extentSize[0] = this->w()-2*m_Margins[0];
- extentSize[1] = this->h()-2*m_Margins[1];
+ extentSize[0] = this->w() - 2 * m_Margins[0];
+ extentSize[1] = this->h() - 2 * m_Margins[1];
// Set the display extent
m_Extent.SetIndex(extentIndex);
@@ -167,14 +161,14 @@ void Curves2DWidget::UpdateSpaceToScreenTransform()
// Set the matrix
AffineTransformType::MatrixType matrix;
matrix.Fill(0);
- matrix(0,0)=(static_cast<double>(m_Extent.GetSize()[0]))/m_AxisLength[0];
- matrix(1,1)=(static_cast<double>(m_Extent.GetSize()[1]))/m_AxisLength[1];
+ matrix(0, 0) = (static_cast<double>(m_Extent.GetSize()[0])) / m_AxisLength[0];
+ matrix(1, 1) = (static_cast<double>(m_Extent.GetSize()[1])) / m_AxisLength[1];
m_SpaceToScreenTransform->SetMatrix(matrix);
-
+
// Set the translation
AffineTransformType::OutputVectorType translation;
- translation[0]=m_Extent.GetIndex()[0]-m_AxisOrigin[0];
- translation[1]=m_Extent.GetIndex()[1]-m_AxisOrigin[1];
+ translation[0] = m_Extent.GetIndex()[0] - m_AxisOrigin[0];
+ translation[1] = m_Extent.GetIndex()[1] - m_AxisOrigin[1];
m_SpaceToScreenTransform->SetTranslation(translation);
// Set the center
@@ -193,37 +187,37 @@ void Curves2DWidget::RenderAxis()
PointType screenCenter = m_SpaceToScreenTransform->TransformPoint(spaceCenter);
// Update zero crossing coords
- if(m_ZeroCrossingAxis)
+ if (m_ZeroCrossingAxis)
{
- if(m_AxisOrigin[0] < 0 && m_AxisOrigin[0]+m_AxisLength[0] > 0)
+ if (m_AxisOrigin[0] < 0 && m_AxisOrigin[0] + m_AxisLength[0] > 0)
{
yAxisXPos = screenCenter[0];
}
- if(m_AxisOrigin[1] < 0 && m_AxisOrigin[1]+m_AxisLength[1] > 0)
+ if (m_AxisOrigin[1] < 0 && m_AxisOrigin[1] + m_AxisLength[1] > 0)
{
xAxisYPos = screenCenter[1];
}
}
glBegin(GL_LINES);
- glColor4d(m_AxisColor[0],m_AxisColor[1],m_AxisColor[2],m_AxisColor[3]);
- glVertex2d(m_Margins[0],yAxisXPos);
- glVertex2d(this->w()-m_Margins[0],yAxisXPos);
- glVertex2d(xAxisYPos,m_Margins[1]);
- glVertex2d(xAxisYPos,this->h()-m_Margins[1]);
+ glColor4d(m_AxisColor[0], m_AxisColor[1], m_AxisColor[2], m_AxisColor[3]);
+ glVertex2d(m_Margins[0], yAxisXPos);
+ glVertex2d(this->w() - m_Margins[0], yAxisXPos);
+ glVertex2d(xAxisYPos, m_Margins[1]);
+ glVertex2d(xAxisYPos, this->h() - m_Margins[1]);
glEnd();
- gl_font(FL_COURIER_BOLD,10);
+ gl_font(FL_COURIER_BOLD, 10);
//Draw the y axis legend
PointType screenLabelPosition;
- screenLabelPosition[0]=yAxisXPos+10;
- screenLabelPosition[1]=this->h()-m_Margins[1]-10;
- gl_draw(m_YAxisLabel.c_str(),(float)screenLabelPosition[0],(float)screenLabelPosition[1]);
+ screenLabelPosition[0] = yAxisXPos + 10;
+ screenLabelPosition[1] = this->h() - m_Margins[1] - 10;
+ gl_draw(m_YAxisLabel.c_str(), (float) screenLabelPosition[0], (float) screenLabelPosition[1]);
//Draw the x axis legend
- screenLabelPosition[0]=this->w()-m_Margins[0] - 5*m_XAxisLabel.size();
- screenLabelPosition[1]=xAxisYPos - 10;
- gl_draw(m_XAxisLabel.c_str(),(float)screenLabelPosition[0],(float)screenLabelPosition[1]);
+ screenLabelPosition[0] = this->w() - m_Margins[0] - 5 * m_XAxisLabel.size();
+ screenLabelPosition[1] = xAxisYPos - 10;
+ gl_draw(m_XAxisLabel.c_str(), (float) screenLabelPosition[0], (float) screenLabelPosition[1]);
}
void Curves2DWidget::RenderGrid()
@@ -232,25 +226,25 @@ void Curves2DWidget::RenderGrid()
PointType screenGridOrigin = m_SpaceToScreenTransform->TransformPoint(m_GridOrigin);
// Get the grid screen spacing
VectorType screenGridSpacing = m_SpaceToScreenTransform->TransformVector(m_GridSpacing);
-
+
// Render the grid
glBegin(GL_LINES);
- glColor4d(m_GridColor[0],m_GridColor[1],m_GridColor[2],m_GridColor[3]);
+ glColor4d(m_GridColor[0], m_GridColor[1], m_GridColor[2], m_GridColor[3]);
double pos = screenGridOrigin[0];
- while(pos <= this->w()-m_Margins[0])
+ while (pos <= this->w() - m_Margins[0])
{
- glVertex2d(pos,m_Margins[1]);
- glVertex2d(pos,this->h()-m_Margins[1]);
- pos+=screenGridSpacing[0];
+ glVertex2d(pos, m_Margins[1]);
+ glVertex2d(pos, this->h() - m_Margins[1]);
+ pos += screenGridSpacing[0];
}
pos = screenGridOrigin[1];
- while(pos <= this->h()-m_Margins[1])
+ while (pos <= this->h() - m_Margins[1])
{
- glVertex2d(m_Margins[0],pos);
- glVertex2d(this->w()-m_Margins[0],pos);
- pos+=screenGridSpacing[1];
+ glVertex2d(m_Margins[0], pos);
+ glVertex2d(this->w() - m_Margins[0], pos);
+ pos += screenGridSpacing[1];
}
glEnd();
@@ -258,19 +252,18 @@ void Curves2DWidget::RenderGrid()
void Curves2DWidget::RenderCurves()
{
- for(CurveListType::Iterator it = m_Curves->Begin();
- it!=m_Curves->End(); ++it)
+ for (CurveListType::Iterator it = m_Curves->Begin();
+ it != m_Curves->End(); ++it)
{
- if(it.Get()->GetVisible())
+ if (it.Get()->GetVisible())
{
- it.Get()->Render(m_Extent,m_SpaceToScreenTransform);
+ it.Get()->Render(m_Extent, m_SpaceToScreenTransform);
}
}
}
void Curves2DWidget::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
-
diff --git a/Code/Visualization/otbCurves2DWidget.h b/Code/Visualization/otbCurves2DWidget.h
index f601bb7a75..797904336c 100644
--- a/Code/Visualization/otbCurves2DWidget.h
+++ b/Code/Visualization/otbCurves2DWidget.h
@@ -36,20 +36,20 @@ class Curves2DWidget
{
public:
/** Standard class typedefs */
- typedef Curves2DWidget Self;
- typedef GlWidget Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef Curves2DWidget Self;
+ typedef GlWidget Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Curve typedef */
- typedef Curve2D CurveType;
- typedef Curve2D::Pointer CurvePointerType;
+ typedef Curve2D CurveType;
+ typedef Curve2D::Pointer CurvePointerType;
/** Curve list typedef */
- typedef ObjectList<CurveType> CurveListType;
- typedef CurveListType::Pointer CurveListPointerType;
+ typedef ObjectList<CurveType> CurveListType;
+ typedef CurveListType::Pointer CurveListPointerType;
/** Color typedef */
typedef CurveType::ColorType ColorType;
@@ -69,41 +69,41 @@ public:
itkGetStringMacro(YAxisLabel);
/// Set/Get the widget margins
- itkSetMacro(Margins,SizeType);
- itkGetConstReferenceMacro(Margins,SizeType);
+ itkSetMacro(Margins, SizeType);
+ itkGetConstReferenceMacro(Margins, SizeType);
/// Set/Get the axis origin
- itkSetMacro(AxisOrigin,PointType);
- itkGetConstReferenceMacro(AxisOrigin,PointType);
+ itkSetMacro(AxisOrigin, PointType);
+ itkGetConstReferenceMacro(AxisOrigin, PointType);
/// Set§get the axis length
- itkSetMacro(AxisLength,VectorType);
- itkGetConstReferenceMacro(AxisLength,VectorType);
+ itkSetMacro(AxisLength, VectorType);
+ itkGetConstReferenceMacro(AxisLength, VectorType);
/// Set/Get the grid origin
- itkSetMacro(GridOrigin,PointType);
- itkGetConstReferenceMacro(GridOrigin,PointType);
+ itkSetMacro(GridOrigin, PointType);
+ itkGetConstReferenceMacro(GridOrigin, PointType);
/// Set/Get the grid spacing
- itkSetMacro(GridSpacing,VectorType);
- itkGetConstReferenceMacro(GridSpacing,VectorType);
+ itkSetMacro(GridSpacing, VectorType);
+ itkGetConstReferenceMacro(GridSpacing, VectorType);
/// Set/Get the axis color
- itkSetMacro(AxisColor,ColorType);
- itkGetConstReferenceMacro(AxisColor,ColorType);
+ itkSetMacro(AxisColor, ColorType);
+ itkGetConstReferenceMacro(AxisColor, ColorType);
/// Set/Get the grid color
- itkSetMacro(GridColor,ColorType);
- itkGetConstReferenceMacro(GridColor,ColorType);
+ itkSetMacro(GridColor, ColorType);
+ itkGetConstReferenceMacro(GridColor, ColorType);
/// Should axis cross at zero or at their origin ?
- itkSetMacro(ZeroCrossingAxis,bool);
- itkGetMacro(ZeroCrossingAxis,bool);
+ itkSetMacro(ZeroCrossingAxis, bool);
+ itkGetMacro(ZeroCrossingAxis, bool);
itkBooleanMacro(ZeroCrossingAxis);
// Should axis auto scale to best fit the curves ?
- itkSetMacro(AutoScale,bool);
- itkGetMacro(AutoScale,bool);
+ itkSetMacro(AutoScale, bool);
+ itkGetMacro(AutoScale, bool);
itkBooleanMacro(AutoScale);
/** Add a new curve to the widget
@@ -118,13 +118,13 @@ public:
void ClearAllCurves();
/** Get the number of curves */
- unsigned int GetNumberOfCurves();
+ unsigned int GetNumberOfCurves();
- /** TransformPoint */
- PointType TransformPoint(PointType spacePoint)
- {
- return m_SpaceToScreenTransform->TransformPoint(spacePoint);
- }
+ /** TransformPoint */
+ PointType TransformPoint(PointType spacePoint)
+ {
+ return m_SpaceToScreenTransform->TransformPoint(spacePoint);
+ }
protected:
/** Constructor */
@@ -156,18 +156,18 @@ protected:
private:
Curves2DWidget(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** List of the curves */
- CurveListPointerType m_Curves;
+ CurveListPointerType m_Curves;
// X axis label
- std::string m_XAxisLabel;
+ std::string m_XAxisLabel;
// Y axis label
- std::string m_YAxisLabel;
+ std::string m_YAxisLabel;
// Margins around graph
- SizeType m_Margins;
+ SizeType m_Margins;
// The extent of the display where curves are drawn
- RegionType m_Extent;
+ RegionType m_Extent;
// Axis range start
PointType m_AxisOrigin;
// Axis range length
@@ -178,12 +178,12 @@ private:
VectorType m_GridSpacing;
// If true, axis will cross in their zeros
// Else they will be sticked left and lower
- bool m_ZeroCrossingAxis;
+ bool m_ZeroCrossingAxis;
// Automatic axis scaling
- bool m_AutoScale;
+ bool m_AutoScale;
// Colors
- ColorType m_AxisColor;
- ColorType m_GridColor;
+ ColorType m_AxisColor;
+ ColorType m_GridColor;
// Space to screen transform
AffineTransformPointerType m_SpaceToScreenTransform;
@@ -192,5 +192,3 @@ private:
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbGlComponent.h b/Code/Visualization/otbGlComponent.h
index d203ebcbed..b94533c67a 100644
--- a/Code/Visualization/otbGlComponent.h
+++ b/Code/Visualization/otbGlComponent.h
@@ -39,27 +39,27 @@ class GlComponent
{
public:
/** Standard class typedefs */
- typedef GlComponent Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef itk::ImageRegion<2> RegionType;
+ typedef GlComponent Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::ImageRegion<2> RegionType;
// affine transform
- typedef itk::AffineTransform<double,2> AffineTransformType;
+ typedef itk::AffineTransform<double, 2> AffineTransformType;
typedef AffineTransformType::InputPointType PointType;
typedef AffineTransformType::InputVectorType VectorType;
- typedef itk::FixedArray<double,4> ColorType;
+ typedef itk::FixedArray<double, 4> ColorType;
/** Runtime information */
- itkTypeMacro(GlComponent,Object);
+ itkTypeMacro(GlComponent, Object);
/// Render the curve according to display extent and axis characteristics
- virtual void Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform) = 0;
+ virtual void Render(const RegionType& extent, const AffineTransformType * space2ScreenTransform) = 0;
/** Set/Get the visible status */
- itkSetMacro(Visible,bool);
- itkGetMacro(Visible,bool);
+ itkSetMacro(Visible, bool);
+ itkGetMacro(Visible, bool);
itkBooleanMacro(Visible);
protected:
@@ -71,12 +71,12 @@ protected:
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
GlComponent(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/// Is the component visible ?
bool m_Visible;
@@ -85,5 +85,3 @@ private:
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbGlWidget.cxx b/Code/Visualization/otbGlWidget.cxx
index 555162aa58..40bc7180e6 100644
--- a/Code/Visualization/otbGlWidget.cxx
+++ b/Code/Visualization/otbGlWidget.cxx
@@ -21,8 +21,8 @@ namespace otb
{
GlWidget
-::GlWidget() : Fl_Gl_Window(0,0,0,0), m_Identifier(), m_UseGlAcceleration(false),
- m_BackgroundColor()
+::GlWidget() : Fl_Gl_Window(0, 0, 0, 0), m_Identifier(), m_UseGlAcceleration(false),
+ m_BackgroundColor()
{
m_Identifier = "Default";
@@ -42,19 +42,19 @@ GlWidget::~GlWidget()
void GlWidget::PrintSelf(std::ostream& os, itk::Indent indent) const
{
// Call the superclass implementation
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
// Display information about the widget
- os<<indent<<"Widget "<<m_Identifier<<": "<<std::endl;
+ os << indent << "Widget " << m_Identifier << ": " << std::endl;
#ifndef OTB_GL_USE_ACCEL
- os<<indent<<indent<<"OpenGl acceleration is not allowed."<<std::endl;
+ os << indent << indent << "OpenGl acceleration is not allowed." << std::endl;
#else
- if(m_UseGlAcceleration)
+ if (m_UseGlAcceleration)
{
- os<<indent<<indent<<"OpenGl acceleration is allowed and enabled."<<std::endl;
+ os << indent << indent << "OpenGl acceleration is allowed and enabled." << std::endl;
}
else
{
- os<<indent<<indent<<"OpenGl acceleration is allowed but disabled."<<std::endl;
+ os << indent << indent << "OpenGl acceleration is allowed but disabled." << std::endl;
}
#endif
}
@@ -63,23 +63,25 @@ void GlWidget::draw()
{
// Check if Gl acceleration mode is correct
#ifndef OTB_GL_USE_ACCEL
- if(m_UseGlAcceleration)
+ if (m_UseGlAcceleration)
{
- itkWarningMacro(<<"Gl acceleration enabled but not allowed. Consider rebuilding with OTB_USE_GL_ACCEL to ON. For now, disabling Gl acceleration.");
- m_UseGlAcceleration=false;
+ itkWarningMacro(
+ <<
+ "Gl acceleration enabled but not allowed. Consider rebuilding with OTB_USE_GL_ACCEL to ON. For now, disabling Gl acceleration.");
+ m_UseGlAcceleration = false;
}
#endif
// Set up Gl environement
if (!this->valid())
- {
+ {
valid(1);
glLoadIdentity();
- glViewport(0,0,w(),h());
- glClearColor(m_BackgroundColor[0],m_BackgroundColor[1], m_BackgroundColor[2],m_BackgroundColor[3]);
+ glViewport(0, 0, w(), h());
+ glClearColor(m_BackgroundColor[0], m_BackgroundColor[1], m_BackgroundColor[2], m_BackgroundColor[3]);
glShadeModel(GL_FLAT);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- }
+ }
glClear(GL_COLOR_BUFFER_BIT); //this clears and paints to black
glMatrixMode(GL_MODELVIEW); //clear previous 3D draw params
glLoadIdentity();
@@ -95,28 +97,28 @@ void GlWidget::resize(int x, int y, int w, int h)
// so we'd rather avoid event flooding here)
bool reportMove = false;
bool reportResize = false;
- if(this->x() != x || this->y() != y)
+ if (this->x() != x || this->y() != y)
{
reportMove = true;
}
- if(this->w() != w || this->h() != h)
+ if (this->w() != w || this->h() != h)
{
reportResize = true;
}
// First call the superclass implementation
- Fl_Gl_Window::resize(x,y,w,h);
+ Fl_Gl_Window::resize(x, y, w, h);
// If There is a controller
- if(m_Controller.IsNotNull())
+ if (m_Controller.IsNotNull())
{
- if(reportMove)
+ if (reportMove)
{
- m_Controller->HandleWidgetMove(m_Identifier,x,y);
+ m_Controller->HandleWidgetMove(m_Identifier, x, y);
}
- if(reportResize)
+ if (reportResize)
{
- m_Controller->HandleWidgetResize(m_Identifier,w,h);
+ m_Controller->HandleWidgetResize(m_Identifier, w, h);
}
}
}
@@ -125,13 +127,13 @@ int GlWidget::handle(int event)
{
// Call superclass implementation
int resp = Fl_Widget::handle(event);
-
+
// Check if there is a controller
// Avoid processing hide events, since it causes segfault (the
// destructor of the Fl class generates hide events).
- if(m_Controller.IsNotNull() && event != FL_HIDE)
+ if (m_Controller.IsNotNull() && event != FL_HIDE)
{
- resp = m_Controller->HandleWidgetEvent(m_Identifier,event);
+ resp = m_Controller->HandleWidgetEvent(m_Identifier, event);
}
return resp;
}
@@ -143,7 +145,7 @@ GlWidget::PointType GlWidget::GetMousePosition()
index[0] = Fl::event_x();
index[1] = Fl::event_y();
// Flip the y axis
- index[1]= this->h()-index[1];
+ index[1] = this->h() - index[1];
return index;
}
}
diff --git a/Code/Visualization/otbGlWidget.h b/Code/Visualization/otbGlWidget.h
index 47c637d442..5a49d7c2f0 100644
--- a/Code/Visualization/otbGlWidget.h
+++ b/Code/Visualization/otbGlWidget.h
@@ -51,50 +51,48 @@ class GlWidget
{
public:
/** Standard class typedefs */
- typedef GlWidget Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef GlWidget Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(GlWidget,Object);
+ itkTypeMacro(GlWidget, Object);
/** Controller typedef */
- typedef otb::ImageWidgetController ControllerType;
- typedef ControllerType::Pointer ControllerPointerType;
+ typedef otb::ImageWidgetController ControllerType;
+ typedef ControllerType::Pointer ControllerPointerType;
/** Index typedef */
- typedef itk::Point<double,2> PointType;
+ typedef itk::Point<double, 2> PointType;
/** Color typedef (used to draw the rectangle, 4th channel is alpha) */
- typedef itk::FixedArray<float,4> ColorType;
+ typedef itk::FixedArray<float, 4> ColorType;
/** Set/Get the Controller */
- itkSetObjectMacro(Controller,ControllerType);
- itkGetObjectMacro(Controller,ControllerType);
+ itkSetObjectMacro(Controller, ControllerType);
+ itkGetObjectMacro(Controller, ControllerType);
/** Handle resizing event. This method is used by FLTK routines and
* should not be called on its own.
*/
virtual void resize(int x, int y, int w, int h);
-
/** Enable/disable Gl acceleration */
- itkSetMacro(UseGlAcceleration,bool);
- itkGetMacro(UseGlAcceleration,bool);
+ itkSetMacro(UseGlAcceleration, bool);
+ itkGetMacro(UseGlAcceleration, bool);
itkBooleanMacro(UseGlAcceleration);
- /** Set/Get the identifier */
+ /** Set/Get the identifier */
itkSetStringMacro(Identifier);
itkGetStringMacro(Identifier);
/** Set/Get the background color */
- itkSetMacro(BackgroundColor,ColorType);
- itkGetMacro(BackgroundColor,ColorType);
-
+ itkSetMacro(BackgroundColor, ColorType);
+ itkGetMacro(BackgroundColor, ColorType);
/** Fltk y axis is flipped, therefore we use this function to get
* the cursor position using gl axis */
@@ -116,9 +114,9 @@ protected:
*/
virtual int handle(int event);
- private:
+private:
GlWidget(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** Widget identifier */
std::string m_Identifier;
@@ -136,5 +134,3 @@ protected:
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbHistogramActionHandler.h b/Code/Visualization/otbHistogramActionHandler.h
index b017d9c33f..777a605ba3 100644
--- a/Code/Visualization/otbHistogramActionHandler.h
+++ b/Code/Visualization/otbHistogramActionHandler.h
@@ -21,7 +21,6 @@
#include "otbCurves2DWidget.h"
#include "otbVerticalAsymptoteCurve.h"
-
namespace otb
{
/** \class HistogramActionHandler
@@ -32,22 +31,22 @@ namespace otb
* \ingroup Visualization
*/
-template <class TModel, class TView,class TRenderingFunction>
+template <class TModel, class TView, class TRenderingFunction>
class ITK_EXPORT HistogramActionHandler
: public ImageWidgetActionHandler
{
public:
/** Standard class typedefs */
- typedef HistogramActionHandler Self;
- typedef ImageWidgetActionHandler Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef HistogramActionHandler Self;
+ typedef ImageWidgetActionHandler Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(HistogramActionHandler,ImageWidgetActionHandler);
+ itkTypeMacro(HistogramActionHandler, ImageWidgetActionHandler);
/** Model typedefs */
typedef TModel ModelType;
@@ -55,140 +54,138 @@ public:
typedef typename ModelType::RegionType RegionType;
/** View typedefs */
- typedef TView ViewType;
- typedef typename ViewType::Pointer ViewPointerType;
- typedef typename ViewType::ImageWidgetType::PointType PointType;
+ typedef TView ViewType;
+ typedef typename ViewType::Pointer ViewPointerType;
+ typedef typename ViewType::ImageWidgetType::PointType PointType;
/** Curve Widget*/
- typedef Curves2DWidget CurveWidgetType;
- typedef typename CurveWidgetType::Pointer CurveWidgetPointerType;
+ typedef Curves2DWidget CurveWidgetType;
+ typedef typename CurveWidgetType::Pointer CurveWidgetPointerType;
/** Rendering Function Type */
- typedef TRenderingFunction RenderingFunctionType;
- typedef typename RenderingFunctionType::Pointer RenderingFunctionPointerType;
- typedef typename RenderingFunctionType::ParametersType ParametersType;
-
- /** */
- typedef VerticalAsymptoteCurve VerticalAsymptoteType;
- typedef typename VerticalAsymptoteType::Pointer VerticalAsymptotePointerType;
+ typedef TRenderingFunction RenderingFunctionType;
+ typedef typename RenderingFunctionType::Pointer RenderingFunctionPointerType;
+ typedef typename RenderingFunctionType::ParametersType ParametersType;
-
+ /** */
+ typedef VerticalAsymptoteCurve VerticalAsymptoteType;
+ typedef typename VerticalAsymptoteType::Pointer VerticalAsymptotePointerType;
/** Handle vertical asymptotes translation
* \param widgetId The id of the handled Curve widget
* \param event kind of event ot handle : FL_DRAG , FL_PUSH, FL_RELEASE
*/
-virtual bool HandleWidgetEvent(std::string widgetId, int event)
+ virtual bool HandleWidgetEvent(std::string widgetId, int event)
{
// Variable declaration
- PointType spacePoint;
+ PointType spacePoint;
spacePoint.Fill(0);
-
+
// Left screen abcisse
spacePoint[0] = m_LeftAsymptote->GetAbcisse();
- double abcisseL = m_Curve->TransformPoint(spacePoint)[0];
-
+ double abcisseL = m_Curve->TransformPoint(spacePoint)[0];
+
// Right screen abcisse
spacePoint[0] = m_RightAsymptote->GetAbcisse();
- double abcisseR = m_Curve->TransformPoint(spacePoint)[0];
-
- if(widgetId == m_Curve->GetIdentifier())
+ double abcisseR = m_Curve->TransformPoint(spacePoint)[0];
+
+ if (widgetId == m_Curve->GetIdentifier())
{
- switch (event)
- {
- case FL_PUSH:
- {
- // Position Clicked
- double x = Fl::event_x();
-
- if ((vcl_abs(x-abcisseL)<50) || (vcl_abs(x-abcisseR)<50))
- {
- if (vcl_abs(x-abcisseL)<vcl_abs(x-abcisseR))
- {
- m_ModifyLeft = true;
- }
- else
- {
- m_ModifyRight = true;
- }
- }
- return true;
- }
- case FL_RELEASE:
- {
- if(m_ModifyLeft || m_ModifyRight)
- {
- m_Model->Update();
- }
-
- m_ModifyLeft = false;
- m_ModifyRight = false;
- return true;
- }
- case FL_DRAG:
- {
- double x = Fl::event_x();
-
- if(m_ModifyLeft)
- {
- double tx = x - abcisseL;
- m_LeftAsymptote->SetAbcisse(m_LeftAsymptote->GetAbcisse() + tx);
- m_Curve->redraw();
-
- // Update The Rendering Function min and max
- ParametersType param = m_RenderingFunction->GetParameters();
- param.SetElement(2*m_Channel, m_LeftAsymptote->GetAbcisse() + tx);
- param.SetElement(2*m_Channel+1, m_RightAsymptote->GetAbcisse());
- m_RenderingFunction->SetParameters(param);
- }
-
- if(m_ModifyRight)
- {
- double tx = x - abcisseR;
- m_RightAsymptote->SetAbcisse(m_RightAsymptote->GetAbcisse() + tx);
- m_Curve->redraw();
-
- // Update The Rendering Function min and max
- ParametersType param = m_RenderingFunction->GetParameters();
- param.SetElement(2*m_Channel, m_LeftAsymptote->GetAbcisse());
- param.SetElement(2*m_Channel+1, m_RightAsymptote->GetAbcisse()+tx);
- m_RenderingFunction->SetParameters(param);
- }
- return true;
- }
- }
+ switch (event)
+ {
+ case FL_PUSH:
+ {
+ // Position Clicked
+ double x = Fl::event_x();
+
+ if ((vcl_abs(x - abcisseL) < 50) || (vcl_abs(x - abcisseR) < 50))
+ {
+ if (vcl_abs(x - abcisseL) < vcl_abs(x - abcisseR))
+ {
+ m_ModifyLeft = true;
+ }
+ else
+ {
+ m_ModifyRight = true;
+ }
+ }
+ return true;
+ }
+ case FL_RELEASE:
+ {
+ if (m_ModifyLeft || m_ModifyRight)
+ {
+ m_Model->Update();
+ }
+
+ m_ModifyLeft = false;
+ m_ModifyRight = false;
+ return true;
+ }
+ case FL_DRAG:
+ {
+ double x = Fl::event_x();
+
+ if (m_ModifyLeft)
+ {
+ double tx = x - abcisseL;
+ m_LeftAsymptote->SetAbcisse(m_LeftAsymptote->GetAbcisse() + tx);
+ m_Curve->redraw();
+
+ // Update The Rendering Function min and max
+ ParametersType param = m_RenderingFunction->GetParameters();
+ param.SetElement(2 * m_Channel, m_LeftAsymptote->GetAbcisse() + tx);
+ param.SetElement(2 * m_Channel + 1, m_RightAsymptote->GetAbcisse());
+ m_RenderingFunction->SetParameters(param);
+ }
+
+ if (m_ModifyRight)
+ {
+ double tx = x - abcisseR;
+ m_RightAsymptote->SetAbcisse(m_RightAsymptote->GetAbcisse() + tx);
+ m_Curve->redraw();
+
+ // Update The Rendering Function min and max
+ ParametersType param = m_RenderingFunction->GetParameters();
+ param.SetElement(2 * m_Channel, m_LeftAsymptote->GetAbcisse());
+ param.SetElement(2 * m_Channel + 1, m_RightAsymptote->GetAbcisse() + tx);
+ m_RenderingFunction->SetParameters(param);
+ }
+ return true;
+ }
+ }
}
return false;
}
/** Set/Get the pointer to the view */
- itkSetObjectMacro(View,ViewType);
- itkGetObjectMacro(View,ViewType);
+ itkSetObjectMacro(View, ViewType);
+ itkGetObjectMacro(View, ViewType);
/** Set/Get the pointer to the model */
- itkSetObjectMacro(Model,ModelType);
- itkGetObjectMacro(Model,ModelType);
+ itkSetObjectMacro(Model, ModelType);
+ itkGetObjectMacro(Model, ModelType);
/** Set/Get the CurveWidget*/
- itkSetObjectMacro(Curve,CurveWidgetType);
+ itkSetObjectMacro(Curve, CurveWidgetType);
/** Get The left asymptote*/
- itkSetObjectMacro(LeftAsymptote,VerticalAsymptoteType);
- itkSetObjectMacro(RightAsymptote,VerticalAsymptoteType);
-
+ itkSetObjectMacro(LeftAsymptote, VerticalAsymptoteType);
+ itkSetObjectMacro(RightAsymptote, VerticalAsymptoteType);
+
/** Set/Get the rendering Function */
- itkSetObjectMacro(RenderingFunction , RenderingFunctionType);
+ itkSetObjectMacro(RenderingFunction, RenderingFunctionType);
/** Set/Get the channel dealed with in the image*/
- itkSetMacro(Channel,unsigned int);
+ itkSetMacro(Channel, unsigned int);
protected:
/** Constructor */
HistogramActionHandler() : m_View(), m_Model(), m_RenderingFunction()
{
- m_Channel = 0;
- m_ModifyLeft = false;
- m_ModifyRight = false;
+ m_Channel = 0;
+ m_ModifyLeft = false;
+ m_ModifyRight = false;
}
/** Destructor */
@@ -196,12 +193,12 @@ protected:
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
- HistogramActionHandler(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ HistogramActionHandler(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
// Pointer to the view
ViewPointerType m_View;
@@ -213,21 +210,19 @@ private:
CurveWidgetPointerType m_Curve;
// StandardRenderingFunction
- RenderingFunctionPointerType m_RenderingFunction;
+ RenderingFunctionPointerType m_RenderingFunction;
// Left And Rigth Asymptote
- VerticalAsymptotePointerType m_LeftAsymptote;
- VerticalAsymptotePointerType m_RightAsymptote;
-
+ VerticalAsymptotePointerType m_LeftAsymptote;
+ VerticalAsymptotePointerType m_RightAsymptote;
+
// Flags
bool m_ModifyLeft;
bool m_ModifyRight;
-
+
//Channel we're dealing handling
unsigned int m_Channel;
-
+
}; // end class
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbHistogramCurve.h b/Code/Visualization/otbHistogramCurve.h
index 6da7b2a4af..e87e116d60 100644
--- a/Code/Visualization/otbHistogramCurve.h
+++ b/Code/Visualization/otbHistogramCurve.h
@@ -36,14 +36,14 @@ class HistogramCurve
{
public:
/** Standard class typedefs */
- typedef HistogramCurve Self;
- typedef Curve2D Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef HistogramCurve Self;
+ typedef Curve2D Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
// Standard class macros
itkNewMacro(Self);
- itkTypeMacro(HistogramCurve,Curve2D);
+ itkTypeMacro(HistogramCurve, Curve2D);
/// Superclass typedefs
typedef typename Superclass::AffineTransformType AffineTransformType;
@@ -51,15 +51,15 @@ public:
typedef typename Superclass::PointType PointType;
typedef typename Superclass::VectorType VectorType;
typedef typename Superclass::ColorType ColorType;
- typedef itk::ContinuousIndex<double,2> ContinuousIndexType;
+ typedef itk::ContinuousIndex<double, 2> ContinuousIndexType;
/// Histogram typedef
- typedef THistogram HistogramType;
- typedef typename HistogramType::Pointer HistogramPointerType;
- typedef typename HistogramType::Iterator HistogramIteratorType;
+ typedef THistogram HistogramType;
+ typedef typename HistogramType::Pointer HistogramPointerType;
+ typedef typename HistogramType::Iterator HistogramIteratorType;
/// Render the curve according to display extent and axis characteristics
- virtual void Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform);
+ virtual void Render(const RegionType& extent, const AffineTransformType * space2ScreenTransform);
/// Pre-computation
virtual void BeforeRendering();
@@ -71,12 +71,12 @@ public:
virtual PointType GetMaximum();
/** Set/Get the histogram */
- itkSetObjectMacro(Histogram,HistogramType);
- itkGetObjectMacro(Histogram,HistogramType);
+ itkSetObjectMacro(Histogram, HistogramType);
+ itkGetObjectMacro(Histogram, HistogramType);
/** Set/Get the histogram color */
- itkSetMacro(HistogramColor,ColorType);
- itkGetMacro(HistogramColor,ColorType);
+ itkSetMacro(HistogramColor, ColorType);
+ itkGetMacro(HistogramColor, ColorType);
protected:
/** Constructor */
@@ -86,22 +86,22 @@ protected:
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
HistogramCurve(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
// The histogram to render
HistogramPointerType m_Histogram;
// The histogram color
- ColorType m_HistogramColor;
+ ColorType m_HistogramColor;
- PointType m_Minimum;
- PointType m_Maximum;
- double m_BinWidth;
+ PointType m_Minimum;
+ PointType m_Maximum;
+ double m_BinWidth;
}; // end class
} // end namespace otb
@@ -111,5 +111,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Visualization/otbHistogramCurve.txx b/Code/Visualization/otbHistogramCurve.txx
index 507ed1c424..33394cfb44 100644
--- a/Code/Visualization/otbHistogramCurve.txx
+++ b/Code/Visualization/otbHistogramCurve.txx
@@ -39,7 +39,7 @@ HistogramCurve<THistogram>
template <class THistogram>
void
HistogramCurve<THistogram>
-::Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform)
+::Render(const RegionType& extent, const AffineTransformType * space2ScreenTransform)
{
// Iterate on the histogram
HistogramIteratorType it = m_Histogram->Begin();
@@ -51,33 +51,31 @@ HistogramCurve<THistogram>
VectorType screenBinWidth = space2ScreenTransform->TransformVector(binWidth);
// Temporary variables
- PointType spacePoint, screenPoint;
+ PointType spacePoint, screenPoint;
ContinuousIndexType cindex;
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4d(m_HistogramColor[0],m_HistogramColor[1],m_HistogramColor[2],m_HistogramColor[3]);
-
-
+ glColor4d(m_HistogramColor[0], m_HistogramColor[1], m_HistogramColor[2], m_HistogramColor[3]);
// Render the first bin
- spacePoint[0] = it.GetMeasurementVector()[0];
- spacePoint[1] = it.GetFrequency();
- // Transform to screen
- screenPoint = space2ScreenTransform->TransformPoint(spacePoint);
+ spacePoint[0] = it.GetMeasurementVector()[0];
+ spacePoint[1] = it.GetFrequency();
+ // Transform to screen
+ screenPoint = space2ScreenTransform->TransformPoint(spacePoint);
- // Ensure propre clamping
- if(screenPoint[1] > extent.GetIndex()[1]+ extent.GetSize()[1]-1)
- {
- screenPoint[1] = extent.GetIndex()[1]+ extent.GetSize()[1]-1;
- }
+ // Ensure propre clamping
+ if (screenPoint[1] > extent.GetIndex()[1] + extent.GetSize()[1] - 1)
+ {
+ screenPoint[1] = extent.GetIndex()[1] + extent.GetSize()[1] - 1;
+ }
- // keep the initial x value
- double previousX = screenPoint[0]-screenBinWidth[0]/2.;
+ // keep the initial x value
+ double previousX = screenPoint[0] - screenBinWidth[0] / 2.;
glBegin(GL_QUADS);
- while(it!= m_Histogram->End())
+ while (it != m_Histogram->End())
{
// Render each bin
spacePoint[0] = it.GetMeasurementVector()[0];
@@ -86,24 +84,24 @@ HistogramCurve<THistogram>
screenPoint = space2ScreenTransform->TransformPoint(spacePoint);
// Ensure propre clamping
- if(screenPoint[1] > extent.GetIndex()[1]+ extent.GetSize()[1]-1)
+ if (screenPoint[1] > extent.GetIndex()[1] + extent.GetSize()[1] - 1)
{
- screenPoint[1] = extent.GetIndex()[1]+ extent.GetSize()[1]-1;
+ screenPoint[1] = extent.GetIndex()[1] + extent.GetSize()[1] - 1;
}
// Convert to check IsIsinde
- cindex[0]=screenPoint[0];
- cindex[1]=screenPoint[1];
+ cindex[0] = screenPoint[0];
+ cindex[1] = screenPoint[1];
- if(extent.IsInside(cindex))
+ if (extent.IsInside(cindex))
{
// Draw LR and UR
- glVertex2d(previousX,extent.GetIndex()[1]);
- glVertex2d(previousX,screenPoint[1]);
- previousX = screenPoint[0]+screenBinWidth[0]/2.;
+ glVertex2d(previousX, extent.GetIndex()[1]);
+ glVertex2d(previousX, screenPoint[1]);
+ previousX = screenPoint[0] + screenBinWidth[0] / 2.;
// Draw UL and LL
- glVertex2d(previousX,screenPoint[1]);
- glVertex2d(previousX,extent.GetIndex()[1]);
+ glVertex2d(previousX, screenPoint[1]);
+ glVertex2d(previousX, extent.GetIndex()[1]);
}
++it;
}
@@ -118,47 +116,46 @@ HistogramCurve<THistogram>
{
// Iterate on the histogram
HistogramIteratorType it = m_Histogram->Begin();
-
+
// Initialize
m_Minimum[0] = it.GetMeasurementVector()[0];
m_Minimum[1] = it.GetFrequency();
m_Maximum = m_Minimum;
-
- double mean= it.GetFrequency();
- double squaremean = it.GetFrequency()*it.GetFrequency();
+
+ double mean = it.GetFrequency();
+ double squaremean = it.GetFrequency() * it.GetFrequency();
unsigned int nbSamples = 1;
- double first = it.GetMeasurementVector()[0];
- double last = 0;
+ double first = it.GetMeasurementVector()[0];
+ double last = 0;
++it;
- while(it!= m_Histogram->End())
+ while (it != m_Histogram->End())
{
- if(m_Minimum[0] > it.GetMeasurementVector()[0])
+ if (m_Minimum[0] > it.GetMeasurementVector()[0])
{
m_Minimum[0] = it.GetMeasurementVector()[0];
}
-
- if(m_Minimum[1] > it.GetFrequency())
+
+ if (m_Minimum[1] > it.GetFrequency())
{
m_Minimum[1] = it.GetFrequency();
}
- if(m_Maximum[0] < it.GetMeasurementVector()[0])
+ if (m_Maximum[0] < it.GetMeasurementVector()[0])
{
m_Maximum[0] = it.GetMeasurementVector()[0];
}
mean += it.GetFrequency();
- squaremean += it.GetFrequency()*it.GetFrequency();
+ squaremean += it.GetFrequency() * it.GetFrequency();
last = it.GetMeasurementVector()[0];
++nbSamples;
++it;
}
- mean/=nbSamples;
- squaremean/=nbSamples;
- m_Maximum[1] = mean + 6*vcl_sqrt(squaremean - mean*mean);
- m_BinWidth = (last-first)/(nbSamples);
+ mean /= nbSamples;
+ squaremean /= nbSamples;
+ m_Maximum[1] = mean + 6 * vcl_sqrt(squaremean - mean * mean);
+ m_BinWidth = (last - first) / (nbSamples);
}
-
template <class THistogram>
typename HistogramCurve<THistogram>
::PointType
@@ -177,8 +174,5 @@ HistogramCurve<THistogram>
return m_Maximum;
}
-
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbImageLayer.h b/Code/Visualization/otbImageLayer.h
index 36400589d7..0d81af2c2d 100644
--- a/Code/Visualization/otbImageLayer.h
+++ b/Code/Visualization/otbImageLayer.h
@@ -48,83 +48,81 @@ class ImageLayer
{
public:
/** Standard class typedefs */
- typedef ImageLayer Self;
- typedef ImageLayerBase<TOutputImage> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageLayer Self;
+ typedef ImageLayerBase<TOutputImage> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(ImageLayer,ImageLayerBase);
+ itkTypeMacro(ImageLayer, ImageLayerBase);
/** Image typedef */
- typedef TImage ImageType;
- typedef typename ImageType::Pointer ImagePointerType;
- typedef typename ImageType::PixelType PixelType;
- typedef typename itk::NumericTraits<PixelType>::ValueType ScalarType;
- typedef itk::VariableLengthVector<ScalarType> VectorPixelType;
- typedef itk::RGBPixel<ScalarType> RGBPixelType;
- typedef itk::RGBAPixel<ScalarType> RGBAPixelType;
- typedef typename ImageType::RegionType RegionType;
- typedef typename ImageType::IndexType IndexType;
- typedef typename IndexType::IndexValueType IndexValueType;
-
-
- typedef itk::Point<double,2> PointType;
- typedef otb::GenericRSTransform<double> TransformType;
+ typedef TImage ImageType;
+ typedef typename ImageType::Pointer ImagePointerType;
+ typedef typename ImageType::PixelType PixelType;
+ typedef typename itk::NumericTraits<PixelType>::ValueType ScalarType;
+ typedef itk::VariableLengthVector<ScalarType> VectorPixelType;
+ typedef itk::RGBPixel<ScalarType> RGBPixelType;
+ typedef itk::RGBAPixel<ScalarType> RGBAPixelType;
+ typedef typename ImageType::RegionType RegionType;
+ typedef typename ImageType::IndexType IndexType;
+ typedef typename IndexType::IndexValueType IndexValueType;
+
+ typedef itk::Point<double, 2> PointType;
+ typedef otb::GenericRSTransform<double> TransformType;
/** Output image typedef */
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::PixelType OutputPixelType;
-
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
/** Histogram typedef */
- typedef itk::VariableLengthVector<ScalarType> SampleType;
- typedef itk::Statistics::ListSample<SampleType> ListSampleType;
- typedef typename ListSampleType::Pointer ListSamplePointerType;
+ typedef itk::VariableLengthVector<ScalarType> SampleType;
+ typedef itk::Statistics::ListSample<SampleType> ListSampleType;
+ typedef typename ListSampleType::Pointer ListSamplePointerType;
- typedef itk::Statistics::DenseFrequencyContainer DFContainerType;
+ typedef itk::Statistics::DenseFrequencyContainer DFContainerType;
typedef itk::Statistics::Histogram<
- typename itk::NumericTraits<ScalarType>::RealType,1,
- DFContainerType> HistogramType;
- typedef typename HistogramType::Pointer HistogramPointerType;
- typedef ObjectList<HistogramType> HistogramListType;
- typedef typename HistogramListType::Pointer HistogramListPointerType;
+ typename itk::NumericTraits<ScalarType>::RealType, 1,
+ DFContainerType> HistogramType;
+ typedef typename HistogramType::Pointer HistogramPointerType;
+ typedef ObjectList<HistogramType> HistogramListType;
+ typedef typename HistogramListType::Pointer HistogramListPointerType;
/** Rendering part */
- typedef RenderingImageFilter<TImage,TOutputImage> RenderingFilterType;
- typedef typename RenderingFilterType::Pointer RenderingFilterPointerType;
- typedef typename RenderingFilterType::RenderingFunctionType RenderingFunctionType;
- typedef typename RenderingFunctionType::Pointer RenderingFunctionPointerType;
- typedef itk::ExtractImageFilter<ImageType,ImageType> ExtractFilterType;
- typedef typename ExtractFilterType::Pointer ExtractFilterPointerType;
+ typedef RenderingImageFilter<TImage, TOutputImage> RenderingFilterType;
+ typedef typename RenderingFilterType::Pointer RenderingFilterPointerType;
+ typedef typename RenderingFilterType::RenderingFunctionType RenderingFunctionType;
+ typedef typename RenderingFunctionType::Pointer RenderingFunctionPointerType;
+ typedef itk::ExtractImageFilter<ImageType, ImageType> ExtractFilterType;
+ typedef typename ExtractFilterType::Pointer ExtractFilterPointerType;
/** Set/Get the image */
virtual void SetImage(ImageType * img)
{
- if(this->m_Image != img)
+ if (this->m_Image != img)
{
- this-> m_Image = img;
+ this->m_Image = img;
this->m_ExtractFilter->SetInput(m_Image);
this->m_ScaledExtractFilter->SetInput(m_Image);
}
}
- itkGetObjectMacro(Image,ImageType);
+ itkGetObjectMacro(Image, ImageType);
/** Set/Get the quicklook */
virtual void SetQuicklook(ImageType * ql)
{
- if(this->m_Quicklook != ql)
+ if (this->m_Quicklook != ql)
{
this->m_Quicklook = ql;
this->m_QuicklookRenderingFilter->SetInput(m_Quicklook);
}
}
- itkGetObjectMacro(Quicklook,ImageType);
+ itkGetObjectMacro(Quicklook, ImageType);
/** Get the histogram list */
virtual HistogramListPointerType GetHistogramList()
@@ -142,32 +140,32 @@ public:
m_ExtractRenderingFilter->SetRenderingFunction(m_RenderingFunction);
m_ScaledExtractRenderingFilter->SetRenderingFunction(m_RenderingFunction);
}
- itkGetObjectMacro(RenderingFunction,RenderingFunctionType);
+ itkGetObjectMacro(RenderingFunction, RenderingFunctionType);
/** Reimplemented to pass the parameter to the extract filter */
- virtual void SetExtractRegion(const RegionType & region)
+ virtual void SetExtractRegion(const RegionType& region)
{
// This check should be done in the itk::ExtractImageFilter
- if(this->GetExtractRegion() != region)
+ if (this->GetExtractRegion() != region)
{
Superclass::SetExtractRegion(region);
// SetExtractionRegion throws an exception in case of empty region
- if(region.GetNumberOfPixels() > 0)
+ if (region.GetNumberOfPixels() > 0)
{
m_ExtractFilter->SetExtractionRegion(region);
}
}
}
- /** Reimplemented to pass the parameter to the extract filter */
- virtual void SetScaledExtractRegion(const RegionType & region)
+ /** Reimplemented to pass the parameter to the extract filter */
+ virtual void SetScaledExtractRegion(const RegionType& region)
{
// This check should be done in the itk::ExtractImageFilter
- if(this->GetScaledExtractRegion() != region)
+ if (this->GetScaledExtractRegion() != region)
{
Superclass::SetScaledExtractRegion(region);
// SetExtractionRegion throws an exception in case of empty region
- if(region.GetNumberOfPixels() > 0)
+ if (region.GetNumberOfPixels() > 0)
{
m_ScaledExtractFilter->SetExtractionRegion(region);
}
@@ -178,10 +176,10 @@ public:
virtual void Render();
/** Get the pixel description */
- virtual std::string GetPixelDescription(const IndexType & index);
+ virtual std::string GetPixelDescription(const IndexType& index);
/** Get the pixel location */
- virtual PointType GetPixelLocation(const IndexType & index);
+ virtual PointType GetPixelLocation(const IndexType& index);
/** Get the list sample used by the rendering function */
virtual ListSamplePointerType GetListSample()
@@ -198,7 +196,6 @@ public:
m_RenderingFunction->SetListSample(m_ListSample);
}
-
protected:
/** Constructor */
ImageLayer();
@@ -223,37 +220,37 @@ protected:
private:
ImageLayer(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** Pointer to the quicklook */
- ImagePointerType m_Quicklook;
+ ImagePointerType m_Quicklook;
/** Pointer to the image */
- ImagePointerType m_Image;
+ ImagePointerType m_Image;
/** List sample used to compute the histogram by the rendering function*/
ListSamplePointerType m_ListSample;
- bool m_ListSampleProvided;//To remember if the list sample was provided manually by the user
+ bool m_ListSampleProvided; //To remember if the list sample was provided manually by the user
/** Rendering function */
RenderingFunctionPointerType m_RenderingFunction;
/** Rendering filters */
- RenderingFilterPointerType m_QuicklookRenderingFilter;
- RenderingFilterPointerType m_ExtractRenderingFilter;
- RenderingFilterPointerType m_ScaledExtractRenderingFilter;
+ RenderingFilterPointerType m_QuicklookRenderingFilter;
+ RenderingFilterPointerType m_ExtractRenderingFilter;
+ RenderingFilterPointerType m_ScaledExtractRenderingFilter;
/** Extract filters */
- ExtractFilterPointerType m_ExtractFilter;
- ExtractFilterPointerType m_ScaledExtractFilter;
+ ExtractFilterPointerType m_ExtractFilter;
+ ExtractFilterPointerType m_ScaledExtractFilter;
/** Coordinate transform */
TransformType::Pointer m_Transform;
CoordinateToName::Pointer m_CoordinateToName;
/** General info about the image*/
- std::string m_PlaceName;//FIXME the call should be done by a more general method outside of the layer
- std::string m_CountryName;//which would also handle the dependance to curl
+ std::string m_PlaceName; //FIXME the call should be done by a more general method outside of the layer
+ std::string m_CountryName; //which would also handle the dependance to curl
}; // end class
} // end namespace otb
diff --git a/Code/Visualization/otbImageLayer.txx b/Code/Visualization/otbImageLayer.txx
index d639aaf948..945f141425 100644
--- a/Code/Visualization/otbImageLayer.txx
+++ b/Code/Visualization/otbImageLayer.txx
@@ -33,12 +33,12 @@ namespace otb
{
template <class TImage, class TOutputImage>
-ImageLayer<TImage,TOutputImage>
+ImageLayer<TImage, TOutputImage>
::ImageLayer() : m_Quicklook(), m_Image(), m_ListSample(), m_ListSampleProvided(false), m_RenderingFunction(),
- m_QuicklookRenderingFilter(), m_ExtractRenderingFilter(), m_ScaledExtractRenderingFilter(),
- m_ExtractFilter(), m_ScaledExtractFilter()
+ m_QuicklookRenderingFilter(), m_ExtractRenderingFilter(), m_ScaledExtractRenderingFilter(),
+ m_ExtractFilter(), m_ScaledExtractFilter()
{
- // Rendering filters
+ // Rendering filters
m_QuicklookRenderingFilter = RenderingFilterType::New();
m_ExtractRenderingFilter = RenderingFilterType::New();
m_ScaledExtractRenderingFilter = RenderingFilterType::New();
@@ -47,7 +47,7 @@ ImageLayer<TImage,TOutputImage>
// Default rendering function
typedef Function::StandardRenderingFunction<PixelType,
- typename TOutputImage::PixelType> DefaultRenderingFunctionType;
+ typename TOutputImage::PixelType> DefaultRenderingFunctionType;
m_RenderingFunction = DefaultRenderingFunctionType::New();
m_QuicklookRenderingFilter->SetRenderingFunction(m_RenderingFunction);
m_ExtractRenderingFilter->SetRenderingFunction(m_RenderingFunction);
@@ -69,22 +69,21 @@ ImageLayer<TImage,TOutputImage>
}
template <class TImage, class TOutputImage>
-ImageLayer<TImage,TOutputImage>
+ImageLayer<TImage, TOutputImage>
::~ImageLayer()
{}
-
template <class TImage, class TOutputImage>
void
-ImageLayer<TImage,TOutputImage>
+ImageLayer<TImage, TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
template <class TImage, class TOutputImage>
void
-ImageLayer<TImage,TOutputImage>
+ImageLayer<TImage, TOutputImage>
::Render()
{
// Render the histogram
@@ -99,23 +98,22 @@ ImageLayer<TImage,TOutputImage>
template <class TImage, class TOutputImage>
void
-ImageLayer<TImage,TOutputImage>
+ImageLayer<TImage, TOutputImage>
::RenderImages()
{
// if (m_ListSample.IsNull()) //FIXME make sure that it is not necessary
// {
// this->UpdateListSample();
// }
- // Render quicklook
-
+// Render quicklook
- if(this->GetHasQuicklook())
+ if (this->GetHasQuicklook())
{
itk::TimeProbe probe;
probe.Start();
// Impacting modified on the the rendering function
- if(m_RenderingFunction->GetMTime() > m_QuicklookRenderingFilter->GetOutput()->GetUpdateMTime())
+ if (m_RenderingFunction->GetMTime() > m_QuicklookRenderingFilter->GetOutput()->GetUpdateMTime())
{
m_QuicklookRenderingFilter->Modified();
}
@@ -123,17 +121,17 @@ ImageLayer<TImage,TOutputImage>
m_QuicklookRenderingFilter->Update();
this->SetRenderedQuicklook(m_QuicklookRenderingFilter->GetOutput());
probe.Stop();
- otbMsgDevMacro(<<"ImageLayer::RenderImages():"<<" ("<<this->GetName()<<")"
- << " quicklook regenerated ("<<probe.GetMeanTime()<<" s.)");
+ otbMsgDevMacro(<< "ImageLayer::RenderImages():" << " (" << this->GetName() << ")"
+ << " quicklook regenerated (" << probe.GetMeanTime() << " s.)");
}
// If there are pixels to render
- if(this->GetExtractRegion().GetNumberOfPixels() > 0)
+ if (this->GetExtractRegion().GetNumberOfPixels() > 0)
{
itk::TimeProbe probe;
probe.Start();
// Impacting modified on the the rendering function
- if(m_RenderingFunction->GetMTime() > m_ExtractRenderingFilter->GetOutput()->GetUpdateMTime())
+ if (m_RenderingFunction->GetMTime() > m_ExtractRenderingFilter->GetOutput()->GetUpdateMTime())
{
m_ExtractRenderingFilter->Modified();
}
@@ -142,8 +140,8 @@ ImageLayer<TImage,TOutputImage>
m_ExtractRenderingFilter->Update();
this->SetRenderedExtract(m_ExtractRenderingFilter->GetOutput());
probe.Stop();
- otbMsgDevMacro(<<"ImageLayer::RenderImages():"<<" ("<<this->GetName()<<")"
- << " extract regenerated ("<<probe.GetMeanTime()<<" s.)");
+ otbMsgDevMacro(<< "ImageLayer::RenderImages():" << " (" << this->GetName() << ")"
+ << " extract regenerated (" << probe.GetMeanTime() << " s.)");
this->SetHasExtract(true);
}
else
@@ -152,24 +150,24 @@ ImageLayer<TImage,TOutputImage>
}
// Render scaled extract
// If there are pixels to render
- if(this->GetScaledExtractRegion().GetNumberOfPixels() > 0)
- {
- itk::TimeProbe probe;
- probe.Start();
+ if (this->GetScaledExtractRegion().GetNumberOfPixels() > 0)
+ {
+ itk::TimeProbe probe;
+ probe.Start();
// Impacting modified on the the rendering function
- if(m_RenderingFunction->GetMTime() > m_ScaledExtractRenderingFilter->GetOutput()->GetUpdateMTime())
+ if (m_RenderingFunction->GetMTime() > m_ScaledExtractRenderingFilter->GetOutput()->GetUpdateMTime())
{
m_ScaledExtractRenderingFilter->Modified();
}
- m_ScaledExtractRenderingFilter->GetOutput()->SetRequestedRegion(this->GetScaledExtractRegion());
- m_ScaledExtractRenderingFilter->Update();
- this->SetRenderedScaledExtract(m_ScaledExtractRenderingFilter->GetOutput());
- this->SetHasScaledExtract(true);
- probe.Stop();
- otbMsgDevMacro(<<"ImageLayer::RenderImages():"<<" ("<<this->GetName()<<")"
- << " scaled extract regenerated ("<<probe.GetMeanTime()<<" s.)");
- }
+ m_ScaledExtractRenderingFilter->GetOutput()->SetRequestedRegion(this->GetScaledExtractRegion());
+ m_ScaledExtractRenderingFilter->Update();
+ this->SetRenderedScaledExtract(m_ScaledExtractRenderingFilter->GetOutput());
+ this->SetHasScaledExtract(true);
+ probe.Stop();
+ otbMsgDevMacro(<< "ImageLayer::RenderImages():" << " (" << this->GetName() << ")"
+ << " scaled extract regenerated (" << probe.GetMeanTime() << " s.)");
+ }
else
{
this->SetHasScaledExtract(false);
@@ -178,17 +176,17 @@ ImageLayer<TImage,TOutputImage>
template <class TImage, class TOutputImage>
void
-ImageLayer<TImage,TOutputImage>
+ImageLayer<TImage, TOutputImage>
::UpdateListSample()
{
- if(!m_ListSampleProvided)
- {
- // otbMsgDevMacro(<<"ImageLayer::UpdateListSample():"<<" ("<<this->GetName()<<")"<< " Entering method");
+ if (!m_ListSampleProvided)
+ {
+ // otbMsgDevMacro(<<"ImageLayer::UpdateListSample():"<<" ("<<this->GetName()<<")"<< " Entering method");
// Declare the source of the histogram
ImagePointerType histogramSource;
// if there is a quicklook, use it for histogram generation
- if(m_Quicklook.IsNotNull())
+ if (m_Quicklook.IsNotNull())
{
histogramSource = m_Quicklook;
}
@@ -204,16 +202,17 @@ ImageLayer<TImage,TOutputImage>
}
// Check if we need to generate the histogram again
- if( m_ListSample.IsNull() || m_ListSample->Size() == 0 || (histogramSource->GetUpdateMTime() < histogramSource->GetPipelineMTime()) )
+ if (m_ListSample.IsNull() || m_ListSample->Size() == 0 ||
+ (histogramSource->GetUpdateMTime() < histogramSource->GetPipelineMTime()))
{
- otbMsgDevMacro(<<"ImageLayer::UpdateListSample():"<<" ("<<this->GetName()<<")"
- << " Regenerating histogram due to pippeline update.");
+ otbMsgDevMacro(<< "ImageLayer::UpdateListSample():" << " (" << this->GetName() << ")"
+ << " Regenerating histogram due to pippeline update.");
// Update the histogram source
histogramSource->Update();
// Iterate on the image
- itk::ImageRegionConstIterator<ImageType> it(histogramSource,histogramSource->GetBufferedRegion());
+ itk::ImageRegionConstIterator<ImageType> it(histogramSource, histogramSource->GetBufferedRegion());
// declare a list to store the samples
m_ListSample->Clear();
@@ -223,119 +222,124 @@ ImageLayer<TImage,TOutputImage>
// Fill the samples list
it.GoToBegin();
- while(!it.IsAtEnd())
- {
+ while (!it.IsAtEnd())
+ {
SampleType sample(sampleSize);
- VisualizationPixelTraits::Convert( it.Get(), sample );
+ VisualizationPixelTraits::Convert(it.Get(), sample);
m_ListSample->PushBack(sample);
++it;
- }
- otbMsgDevMacro(<<"ImageLayer::UpdateListSample()"<<" ("<<this->GetName()<<")"
- << " Sample list generated ("<<m_ListSample->Size()<<" samples, "<< sampleSize <<" bands)");
+ }
+ otbMsgDevMacro(<< "ImageLayer::UpdateListSample()" << " (" << this->GetName() << ")"
+ << " Sample list generated (" << m_ListSample->Size() << " samples, " << sampleSize << " bands)");
m_RenderingFunction->SetListSample(m_ListSample);
}
- }
+ }
}
-
template <class TImage, class TOutputImage>
std::string
-ImageLayer<TImage,TOutputImage>
-::GetPixelDescription(const IndexType & index)
+ImageLayer<TImage, TOutputImage>
+::GetPixelDescription(const IndexType& index)
{
//FIXME only if necessary
- this->UpdateListSample();
+ this->UpdateListSample();
// Ensure rendering function intialization
m_RenderingFunction->Initialize(); //FIXME check, but the call must be done in the generator. To be moved to the layer?
// The ouptut stringstream
itk::OStringStream oss;
- oss<< otbGetTextMacro("Layer") << ": "<<this->GetName();
- oss<<std::endl<< otbGetTextMacro("Image size") << ": " <<m_Image->GetLargestPossibleRegion().GetSize();
+ oss << otbGetTextMacro("Layer") << ": " << this->GetName();
+ oss << std::endl << otbGetTextMacro("Image size") << ": " << m_Image->GetLargestPossibleRegion().GetSize();
// If we are inside the buffered region
- if(m_Image->GetBufferedRegion().IsInside(index))
+ if (m_Image->GetBufferedRegion().IsInside(index))
{
- oss<<std::endl<<m_RenderingFunction->Describe(m_Image->GetPixel(index));
+ oss << std::endl << m_RenderingFunction->Describe(m_Image->GetPixel(index));
}
- else if(m_Quicklook.IsNotNull())
- // Else we extrapolate the value from the quicklook
+ else if (m_Quicklook.IsNotNull())
+ // Else we extrapolate the value from the quicklook
{
IndexType ssindex = index;
ssindex[0] /= this->GetQuicklookSubsamplingRate();
ssindex[1] /= this->GetQuicklookSubsamplingRate();
- if(m_Quicklook->GetBufferedRegion().IsInside(ssindex))
+ if (m_Quicklook->GetBufferedRegion().IsInside(ssindex))
{
- oss<<" (ql)"<<std::endl<<m_RenderingFunction->Describe(m_Quicklook->GetPixel(ssindex));
+ oss << " (ql)" << std::endl << m_RenderingFunction->Describe(m_Quicklook->GetPixel(ssindex));
}
}
//here, we consider that if the transform is not ready (call to InitTransform)
//the user of the class don't want to use it
if (m_Transform->IsUpToDate())
- {
- if (m_Transform->GetTransformAccuracy() != Projection::UNKNOWN)
{
+ if (m_Transform->GetTransformAccuracy() != Projection::UNKNOWN)
+ {
PointType point = this->GetPixelLocation(index);
- // add the x and y spacing
+ // add the x and y spacing
//Get the PIxel location of the first pixel
- IndexType indexSrcX,indexSrcY;
- indexSrcX[0] = static_cast<IndexValueType>(vcl_fabs(static_cast<double>(m_Image->GetLargestPossibleRegion().GetSize()[0] - index[0]))); // x position
+ IndexType indexSrcX, indexSrcY;
+ indexSrcX[0] =
+ static_cast<IndexValueType>(vcl_fabs(static_cast<double>(m_Image->GetLargestPossibleRegion().GetSize()[0] -
+ index[0]))); // x position
indexSrcX[1] = index[1]; // y position
indexSrcY[0] = index[0]; // x position
- indexSrcY[1] = static_cast<IndexValueType>(vcl_fabs(static_cast<double>(m_Image->GetLargestPossibleRegion().GetSize()[1] - index[1]))); // y position
-
+ indexSrcY[1] =
+ static_cast<IndexValueType>(vcl_fabs(static_cast<double>(m_Image->GetLargestPossibleRegion().GetSize()[1] -
+ index[1]))); // y position
+
PointType pointSrcX = this->GetPixelLocation(indexSrcX);
PointType pointSrcY = this->GetPixelLocation(indexSrcY);
-
+
double R = 6371000; // m
- double deg2radCoef = CONST_PI/180;
-
- double dX = (vcl_acos(vcl_sin(point[1]*deg2radCoef)*vcl_sin(pointSrcX[1]*deg2radCoef) +
- vcl_cos(point[1]*deg2radCoef)*vcl_cos(pointSrcX[1]*deg2radCoef) *
- vcl_cos((pointSrcX[0]-point[0])*deg2radCoef)) * R );
- double dY = (vcl_acos(vcl_sin(point[1]*deg2radCoef)*vcl_sin(pointSrcY[1]*deg2radCoef) +
- vcl_cos(point[1]*deg2radCoef)*vcl_cos(pointSrcY[1]*deg2radCoef) *
- vcl_cos((pointSrcY[0]-point[0])*deg2radCoef)) * R );
+ double deg2radCoef = CONST_PI / 180;
+
+ double dX = (vcl_acos(vcl_sin(point[1] * deg2radCoef) * vcl_sin(pointSrcX[1] * deg2radCoef) +
+ vcl_cos(point[1] * deg2radCoef) * vcl_cos(pointSrcX[1] * deg2radCoef) *
+ vcl_cos((pointSrcX[0] - point[0]) * deg2radCoef)) * R);
+ double dY = (vcl_acos(vcl_sin(point[1] * deg2radCoef) * vcl_sin(pointSrcY[1] * deg2radCoef) +
+ vcl_cos(point[1] * deg2radCoef) * vcl_cos(pointSrcY[1] * deg2radCoef) *
+ vcl_cos((pointSrcY[0] - point[0]) * deg2radCoef)) * R);
// Get now the x and y spacing
- oss<< setiosflags(ios::fixed) << setprecision(2) << "x spacing (in meter): " << dX / (vcl_fabs(static_cast<double>(indexSrcX[0] - index[0]))) << std::endl;
- oss<< setiosflags(ios::fixed) << setprecision(2) << "y spacing (in meter): " << dY / (vcl_fabs(static_cast<double>(indexSrcY[1] - index[1]))) << std::endl;
-
- oss<< setiosflags(ios::fixed) << setprecision(6) << "Lon: " << point[0] << " Lat: "<< point[1] << std::endl;
-
- if (m_Transform->GetTransformAccuracy() == Projection::PRECISE) oss<< "(precise location)" << std::endl;
- if (m_Transform->GetTransformAccuracy() == Projection::ESTIMATE) oss<< "(estimated location)" << std::endl;
+ oss << setiosflags(ios::fixed) << setprecision(2) << "x spacing (in meter): " << dX /
+ (vcl_fabs(static_cast<double>(indexSrcX[0] - index[0]))) << std::endl;
+ oss << setiosflags(ios::fixed) << setprecision(2) << "y spacing (in meter): " << dY /
+ (vcl_fabs(static_cast<double>(indexSrcY[1] - index[1]))) << std::endl;
+
+ oss << setiosflags(ios::fixed) << setprecision(6) << "Lon: " << point[0] << " Lat: " << point[1] << std::endl;
+
+ if (m_Transform->GetTransformAccuracy() == Projection::PRECISE) oss << "(precise location)" << std::endl;
+ if (m_Transform->GetTransformAccuracy() == Projection::ESTIMATE) oss << "(estimated location)" << std::endl;
// We do not want to refresh the location if we are pointing in the scroll view
if (m_Image->GetBufferedRegion().IsInside(index))
- {
- if (m_CoordinateToName->SetLonLat(point))
{
+ if (m_CoordinateToName->SetLonLat(point))
+ {
m_CoordinateToName->Evaluate();
+ }
}
- }
m_PlaceName = m_CoordinateToName->GetPlaceName();
m_CountryName = m_CoordinateToName->GetCountryName();
if (m_PlaceName != "") oss << otbGetTextMacro("Near") << " " << m_PlaceName << std::endl;
if (m_CountryName != "") oss << " " << otbGetTextMacro("in") << " " << m_CountryName << std::endl;
- }
+ }
else
- {
+ {
oss << otbGetTextMacro("Location unknown") << std::endl;
+ }
}
- }
-
+
return oss.str();
}
template <class TImage, class TOutputImage>
-typename ImageLayer<TImage,TOutputImage>::PointType
-ImageLayer<TImage,TOutputImage>
-::GetPixelLocation(const IndexType & index)
+typename ImageLayer<TImage, TOutputImage>::PointType
+ImageLayer<TImage, TOutputImage>
+::GetPixelLocation(const IndexType& index)
{
PointType inputPoint;
inputPoint[0] = index[0];
@@ -343,13 +347,12 @@ ImageLayer<TImage,TOutputImage>
return m_Transform->TransformPoint(inputPoint);
}
-
template <class TImage, class TOutputImage>
void
-ImageLayer<TImage,TOutputImage>
+ImageLayer<TImage, TOutputImage>
::InitTransform()
{
- const itk::MetaDataDictionary & inputDict = m_Image->GetMetaDataDictionary();
+ const itk::MetaDataDictionary& inputDict = m_Image->GetMetaDataDictionary();
m_Transform->SetInputDictionary(inputDict);
m_Transform->SetInputOrigin(m_Image->GetOrigin());
m_Transform->SetInputSpacing(m_Image->GetSpacing());
diff --git a/Code/Visualization/otbImageLayerBase.h b/Code/Visualization/otbImageLayerBase.h
index d43a2f2725..e5287c5e5f 100644
--- a/Code/Visualization/otbImageLayerBase.h
+++ b/Code/Visualization/otbImageLayerBase.h
@@ -34,96 +34,96 @@ namespace otb
* \ingroup Visualization
*/
-template <class TOutputImage = Image<itk::RGBAPixel<unsigned char>, 2 > >
+template <class TOutputImage = Image<itk::RGBAPixel<unsigned char>, 2> >
class ImageLayerBase
: public itk::Object
{
public:
/** Standard class typedefs */
- typedef ImageLayerBase Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageLayerBase Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Runtime information */
- itkTypeMacro(ImageLayerBase,Object);
+ itkTypeMacro(ImageLayerBase, Object);
/** Output image typedef */
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
- typedef typename OutputImageType::RegionType RegionType;
- typedef typename RegionType::SizeType SizeType;
- typedef typename RegionType::IndexType IndexType;
- typedef typename OutputImageType::PixelType OutputPixelType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef typename OutputImageType::RegionType RegionType;
+ typedef typename RegionType::SizeType SizeType;
+ typedef typename RegionType::IndexType IndexType;
+ typedef typename OutputImageType::PixelType OutputPixelType;
/** Blending function typedef */
- typedef Function::BlendingFunction<OutputPixelType> BlendingFunctionType;
- typedef typename BlendingFunctionType::Pointer BlendingFunctionPointerType;
+ typedef Function::BlendingFunction<OutputPixelType> BlendingFunctionType;
+ typedef typename BlendingFunctionType::Pointer BlendingFunctionPointerType;
/** Actually render the layer */
virtual void Render() = 0;
/** Get the pixel description */
- virtual std::string GetPixelDescription(const IndexType & index) = 0;
+ virtual std::string GetPixelDescription(const IndexType& index) = 0;
itkGetObjectMacro(RenderedQuicklook, OutputImageType);
itkGetObjectMacro(RenderedExtract, OutputImageType);
itkGetObjectMacro(RenderedScaledExtract, OutputImageType);
- itkSetMacro(HasQuicklook,bool);
- itkGetMacro(HasQuicklook,bool);
+ itkSetMacro(HasQuicklook, bool);
+ itkGetMacro(HasQuicklook, bool);
itkBooleanMacro(HasQuicklook);
- itkSetMacro(HasExtract,bool);
- itkGetMacro(HasExtract,bool);
+ itkSetMacro(HasExtract, bool);
+ itkGetMacro(HasExtract, bool);
itkBooleanMacro(HasExtract);
- itkSetMacro(HasScaledExtract,bool);
- itkGetMacro(HasScaledExtract,bool);
+ itkSetMacro(HasScaledExtract, bool);
+ itkGetMacro(HasScaledExtract, bool);
itkBooleanMacro(HasScaledExtract);
- itkSetMacro(Visible,bool);
- itkGetMacro(Visible,bool);
+ itkSetMacro(Visible, bool);
+ itkGetMacro(Visible, bool);
itkBooleanMacro(Visible);
itkSetStringMacro(Name);
itkGetStringMacro(Name);
- itkSetMacro(QuicklookSize,SizeType);
- itkGetConstReferenceMacro(QuicklookSize,SizeType);
+ itkSetMacro(QuicklookSize, SizeType);
+ itkGetConstReferenceMacro(QuicklookSize, SizeType);
- itkSetMacro(Extent,RegionType);
- itkGetConstReferenceMacro(Extent,RegionType);
+ itkSetMacro(Extent, RegionType);
+ itkGetConstReferenceMacro(Extent, RegionType);
/** This parameters should be reported to the appropriate filters in
implementations. Therefore this method is marked as virtual. */
- virtual void SetExtractRegion(const RegionType & region)
+ virtual void SetExtractRegion(const RegionType& region)
{
m_ExtractRegion = region;
}
- itkGetConstReferenceMacro(ExtractRegion,RegionType);
+ itkGetConstReferenceMacro(ExtractRegion, RegionType);
/** This parameters should be reported to the appropriate filters in
implementations. Therefore this method is marked as virtual. */
- virtual void SetScaledExtractRegion(const RegionType & region)
+ virtual void SetScaledExtractRegion(const RegionType& region)
{
m_ScaledExtractRegion = region;
}
- itkGetConstReferenceMacro(ScaledExtractRegion,RegionType);
+ itkGetConstReferenceMacro(ScaledExtractRegion, RegionType);
- itkSetMacro(QuicklookSubsamplingRate,unsigned int);
- itkGetMacro(QuicklookSubsamplingRate,unsigned int);
+ itkSetMacro(QuicklookSubsamplingRate, unsigned int);
+ itkGetMacro(QuicklookSubsamplingRate, unsigned int);
- itkSetObjectMacro(BlendingFunction,BlendingFunctionType);
- itkGetObjectMacro(BlendingFunction,BlendingFunctionType);
+ itkSetObjectMacro(BlendingFunction, BlendingFunctionType);
+ itkGetObjectMacro(BlendingFunction, BlendingFunctionType);
protected:
/** Constructor */
ImageLayerBase() : m_Name("Default"), m_Visible(false), m_Extent(),
- m_RenderedQuicklook(), m_HasQuicklook(false), m_QuicklookSize(), m_QuicklookSubsamplingRate(1),
- m_RenderedExtract(), m_HasExtract(false), m_ExtractRegion(),
- m_RenderedScaledExtract(), m_HasScaledExtract(false), m_ScaledExtractRegion(),
- m_BlendingFunction()
+ m_RenderedQuicklook(), m_HasQuicklook(false), m_QuicklookSize(), m_QuicklookSubsamplingRate(1),
+ m_RenderedExtract(), m_HasExtract(false), m_ExtractRegion(),
+ m_RenderedScaledExtract(), m_HasScaledExtract(false), m_ScaledExtractRegion(),
+ m_BlendingFunction()
{
// Default blending function
m_BlendingFunction = Function::UniformAlphaBlendingFunction<OutputPixelType>::New();
@@ -133,11 +133,11 @@ protected:
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"ImageLayerBase "<<m_Name<<":"<<std::endl;
- os<<indent<<indent<<"Has a quicklook: " <<(m_HasQuicklook ? "true" : "false") << std::endl;
- os<<indent<<indent<<"Has an extract: " <<(m_HasExtract ? "true" : "false") << std::endl;
- os<<indent<<indent<<"Has a scaled extract: "<<(m_HasScaledExtract ? "true" : "false") << std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "ImageLayerBase " << m_Name << ":" << std::endl;
+ os << indent << indent << "Has a quicklook: " << (m_HasQuicklook ? "true" : "false") << std::endl;
+ os << indent << indent << "Has an extract: " << (m_HasExtract ? "true" : "false") << std::endl;
+ os << indent << indent << "Has a scaled extract: " << (m_HasScaledExtract ? "true" : "false") << std::endl;
}
// These are protected to prevent from unwanted usage
@@ -147,16 +147,16 @@ protected:
private:
ImageLayerBase(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** The layer name */
- std::string m_Name;
+ std::string m_Name;
/** Is the layer visible ? */
- bool m_Visible;
+ bool m_Visible;
/** Data extent */
- RegionType m_Extent;
+ RegionType m_Extent;
/** Rendered quicklook */
OutputImagePointerType m_RenderedQuicklook;
@@ -181,5 +181,3 @@ private:
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbImageLayerGenerator.h b/Code/Visualization/otbImageLayerGenerator.h
index d169b9e2e6..10d9c170f4 100644
--- a/Code/Visualization/otbImageLayerGenerator.h
+++ b/Code/Visualization/otbImageLayerGenerator.h
@@ -45,34 +45,34 @@ namespace otb
* \sa ImageLayer
* \ingroup Visualization
*/
-template < class TImageLayer >
+template <class TImageLayer>
class ImageLayerGenerator
: public itk::Object
{
public:
/** Standard class typedefs */
- typedef ImageLayerGenerator Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageLayerGenerator Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(ImageLayerGenerator,Object);
+ itkTypeMacro(ImageLayerGenerator, Object);
/** Image layer typedef */
- typedef TImageLayer ImageLayerType;
- typedef typename ImageLayerType::Pointer ImageLayerPointerType;
+ typedef TImageLayer ImageLayerType;
+ typedef typename ImageLayerType::Pointer ImageLayerPointerType;
/** Image typedef */
- typedef typename ImageLayerType::ImageType ImageType;
- typedef typename ImageType::Pointer ImagePointerType;
+ typedef typename ImageLayerType::ImageType ImageType;
+ typedef typename ImageType::Pointer ImagePointerType;
/** Resampler typedef */
typedef otb::StreamingShrinkImageFilter
- <ImageType,ImageType> ResampleFilterType;
+ <ImageType, ImageType> ResampleFilterType;
typedef typename ResampleFilterType::Pointer ResampleFilterPointerType;
/** Rendering function typedef */
@@ -81,18 +81,18 @@ public:
typedef typename RenderingFunctionType::Pointer RenderingFunctionPointerType;
/** Blending function typedef */
- typedef typename ImageLayerType::OutputPixelType OutputPixelType;
- typedef typename ImageLayerType::BlendingFunctionType BlendingFunctionType;
- typedef typename BlendingFunctionType::Pointer BlendingFunctionPointerType;
+ typedef typename ImageLayerType::OutputPixelType OutputPixelType;
+ typedef typename ImageLayerType::BlendingFunctionType BlendingFunctionType;
+ typedef typename BlendingFunctionType::Pointer BlendingFunctionPointerType;
/** PixelType typedef */
- typedef typename ImageLayerType::ScalarType ScalarType;
- typedef typename ImageLayerType::VectorPixelType VectorPixelType;
- typedef typename ImageLayerType::RGBPixelType RGBPixelType;
- typedef typename ImageLayerType::RGBAPixelType RGBAPixelType;
+ typedef typename ImageLayerType::ScalarType ScalarType;
+ typedef typename ImageLayerType::VectorPixelType VectorPixelType;
+ typedef typename ImageLayerType::RGBPixelType RGBPixelType;
+ typedef typename ImageLayerType::RGBAPixelType RGBAPixelType;
/** Get the generated layer */
- itkGetObjectMacro(Layer,ImageLayerType);
+ itkGetObjectMacro(Layer, ImageLayerType);
/**
* Trigger layer generation.
@@ -106,78 +106,77 @@ public:
virtual unsigned int GetOptimalSubSamplingRate();
/** Set/Get the image */
- itkSetObjectMacro(Image,ImageType);
- itkGetObjectMacro(Image,ImageType);
+ itkSetObjectMacro(Image, ImageType);
+ itkGetObjectMacro(Image, ImageType);
/** Set/Get the quicklook (in case GenerateQuicklook is off) */
- itkSetObjectMacro(Quicklook,ImageType);
- itkGetObjectMacro(Quicklook,ImageType);
+ itkSetObjectMacro(Quicklook, ImageType);
+ itkGetObjectMacro(Quicklook, ImageType);
/** Set/Get the subsampling rate (in case GenerateQuicklook is off) */
- itkSetMacro(SubsamplingRate,unsigned int);
- itkGetMacro(SubsamplingRate,unsigned int);
+ itkSetMacro(SubsamplingRate, unsigned int);
+ itkGetMacro(SubsamplingRate, unsigned int);
/** Activate/deactivate quicklook generation */
- itkSetMacro(GenerateQuicklook,bool);
+ itkSetMacro(GenerateQuicklook, bool);
itkBooleanMacro(GenerateQuicklook);
/** Set/Get the screen ratio */
- itkSetMacro(ScreenRatio,double);
- itkGetMacro(ScreenRatio,double);
+ itkSetMacro(ScreenRatio, double);
+ itkGetMacro(ScreenRatio, double);
/** Get the generated default rendering function */
// itkSetObjectMacro(RenderingFunction,RenderingFunctionType);
// itkGetObjectMacro(RenderingFunction,RenderingFunctionType);
virtual void SetRenderingFunction(RenderingFunctionType* func)
{
- if(this->m_Layer.IsNull())
- {
- itkExceptionMacro(<<"Layer is not set");
- }
+ if (this->m_Layer.IsNull())
+ {
+ itkExceptionMacro(<< "Layer is not set");
+ }
if (this->m_Layer->GetRenderingFunction() != func)
- {
+ {
this->m_Layer->SetRenderingFunction(func);
this->Modified();
- }
+ }
}
- virtual RenderingFunctionType * GetRenderingFunction ()
+ virtual RenderingFunctionType * GetRenderingFunction()
{
- if(this->m_Layer.IsNull())
- {
- itkExceptionMacro(<<"Layer is not set");
- }
+ if (this->m_Layer.IsNull())
+ {
+ itkExceptionMacro(<< "Layer is not set");
+ }
return this->m_Layer->GetRenderingFunction();
}
-
/** Set/Get the blending function */
// itkSetObjectMacro(BlendingFunction,BlendingFunctionType);
// itkGetObjectMacro(BlendingFunction,BlendingFunctionType);
virtual void SetBlendingFunction(BlendingFunctionType* func)
{
- if(this->m_Layer.IsNull())
- {
- itkExceptionMacro(<<"Layer is not set");
- }
+ if (this->m_Layer.IsNull())
+ {
+ itkExceptionMacro(<< "Layer is not set");
+ }
if (this->m_Layer->GetBlendingFunction() != func)
- {
+ {
this->m_Layer->SetBlendingFunction(func);
this->Modified();
- }
+ }
}
- virtual BlendingFunctionType * GetBlendingFunction ()
+ virtual BlendingFunctionType * GetBlendingFunction()
{
- if(this->m_Layer.IsNull())
- {
- itkExceptionMacro(<<"Layer is not set");
- }
+ if (this->m_Layer.IsNull())
+ {
+ itkExceptionMacro(<< "Layer is not set");
+ }
return this->m_Layer->GetBlendingFunction();
}
/** Get a hook on the resample filter to report progress */
- itkGetObjectMacro(Resampler,ResampleFilterType);
+ itkGetObjectMacro(Resampler, ResampleFilterType);
protected:
/** Constructor */
@@ -203,7 +202,7 @@ protected:
private:
ImageLayerGenerator(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** The generated image layer */
ImageLayerPointerType m_Layer;
@@ -215,18 +214,18 @@ private:
// BlendingFunctionPointerType m_BlendingFunction;
/** The input image */
- ImagePointerType m_Image;
+ ImagePointerType m_Image;
/** The quicklook (Will be overriden if GenerateQuicklook is on) */
- ImagePointerType m_Quicklook;
+ ImagePointerType m_Quicklook;
/** The quicklook subsampling rate (Will be overriden if
* GenerateQuicklook is on)
*/
- unsigned int m_SubsamplingRate;
+ unsigned int m_SubsamplingRate;
/** if true, the generator will also generate the quicklook */
- bool m_GenerateQuicklook;
+ bool m_GenerateQuicklook;
/** Streaming resample filter */
ResampleFilterPointerType m_Resampler;
@@ -242,5 +241,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Visualization/otbImageLayerGenerator.txx b/Code/Visualization/otbImageLayerGenerator.txx
index b132d9a8b2..679201aefd 100644
--- a/Code/Visualization/otbImageLayerGenerator.txx
+++ b/Code/Visualization/otbImageLayerGenerator.txx
@@ -24,11 +24,11 @@
namespace otb
{
-template < class TImageLayer >
+template <class TImageLayer>
ImageLayerGenerator<TImageLayer>
::ImageLayerGenerator() : m_Layer(), m_Image(), m_Quicklook(),
- m_SubsamplingRate(1), m_GenerateQuicklook(true),
- m_Resampler(), m_ScreenRatio(0.25)
+ m_SubsamplingRate(1), m_GenerateQuicklook(true),
+ m_Resampler(), m_ScreenRatio(0.25)
{
// Intialize output layer
m_Layer = ImageLayerType::New();
@@ -37,18 +37,18 @@ ImageLayerGenerator<TImageLayer>
}
-template < class TImageLayer >
+template <class TImageLayer>
ImageLayerGenerator<TImageLayer>
::~ImageLayerGenerator()
{}
-template < class TImageLayer >
+template <class TImageLayer>
void
ImageLayerGenerator<TImageLayer>
::GenerateLayer()
{
// Check if there is an input image
- if(m_Image.IsNull())
+ if (m_Image.IsNull())
{
return;
}
@@ -62,13 +62,13 @@ ImageLayerGenerator<TImageLayer>
this->GenerateQuicklook();
}
-template < class TImageLayer >
+template <class TImageLayer>
unsigned int
ImageLayerGenerator<TImageLayer>
::GetOptimalSubSamplingRate()
{
// Check if there is an input image
- if(m_Image.IsNull())
+ if (m_Image.IsNull())
{
return 1;
}
@@ -85,25 +85,25 @@ ImageLayerGenerator<TImageLayer>
typename ImageType::RegionType largestRegion = m_Image->GetLargestPossibleRegion();
// Shannon (finer generation could be added later)
- unsigned int wrequested = static_cast<unsigned int>(1.5 * wscreen*m_ScreenRatio);
- unsigned int hrequested = static_cast<unsigned int>(1.5 * hscreen*m_ScreenRatio);
+ unsigned int wrequested = static_cast<unsigned int>(1.5 * wscreen * m_ScreenRatio);
+ unsigned int hrequested = static_cast<unsigned int>(1.5 * hscreen * m_ScreenRatio);
// Compute ratio in both directions
- unsigned int wratio = m_Image->GetLargestPossibleRegion().GetSize()[0]/wrequested;
- unsigned int hratio = m_Image->GetLargestPossibleRegion().GetSize()[1]/hrequested;
+ unsigned int wratio = m_Image->GetLargestPossibleRegion().GetSize()[0] / wrequested;
+ unsigned int hratio = m_Image->GetLargestPossibleRegion().GetSize()[1] / hrequested;
// find max ratio
- unsigned int ratio = std::max(wratio,hratio);
+ unsigned int ratio = std::max(wratio, hratio);
// Ensure a non null ratio
- if(ratio == 0)
+ if (ratio == 0)
{
ratio = 1;
}
// return the ratio
return ratio;
}
-template < class TImageLayer >
+template <class TImageLayer>
void
ImageLayerGenerator<TImageLayer>
::GenerateLayerInformation()
@@ -120,20 +120,21 @@ ImageLayerGenerator<TImageLayer>
}
-template < class TImageLayer >
+template <class TImageLayer>
void
ImageLayerGenerator<TImageLayer>
::GenerateQuicklook()
{
- if(m_GenerateQuicklook)
+ if (m_GenerateQuicklook)
{
// Compute optimal subsampling rate
unsigned int ssrate = this->GetOptimalSubSamplingRate();
// If no subsampling is needed
- if(ssrate == 1)
+ if (ssrate == 1)
{
- otbMsgDevMacro(<<"ImageLayerGenerator::GenerateQuicklook(): subsampling rate is 1, Image itself is used as quicklook");
+ otbMsgDevMacro(
+ << "ImageLayerGenerator::GenerateQuicklook(): subsampling rate is 1, Image itself is used as quicklook");
m_Layer->SetHasQuicklook(true);
m_Layer->SetQuicklookSubsamplingRate(1);
m_Image->Update();
@@ -146,7 +147,9 @@ ImageLayerGenerator<TImageLayer>
m_Resampler->SetInput(m_Image);
m_Resampler->SetShrinkFactor(ssrate);
m_Resampler->Update();
- otbMsgDevMacro(<<"ImageLayerGenerator::GenerateQuicklook(): Quicklook generated (ssrate= "<<ssrate<<", size= "<<m_Resampler->GetOutput()->GetLargestPossibleRegion().GetSize()<<")");
+ otbMsgDevMacro(
+ << "ImageLayerGenerator::GenerateQuicklook(): Quicklook generated (ssrate= " << ssrate << ", size= " <<
+ m_Resampler->GetOutput()->GetLargestPossibleRegion().GetSize() << ")");
// Set the quicklook to the layer
m_Layer->SetQuicklook(m_Resampler->GetOutput());
@@ -158,7 +161,7 @@ ImageLayerGenerator<TImageLayer>
else
{
// If there is a quicklook
- if(m_Quicklook.IsNotNull())
+ if (m_Quicklook.IsNotNull())
{
// Set it to the layer
m_Layer->SetQuicklook(m_Quicklook);
@@ -173,16 +176,14 @@ ImageLayerGenerator<TImageLayer>
}
}
-template < class TImageLayer >
+template <class TImageLayer>
void
ImageLayerGenerator<TImageLayer>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbImageLayerRenderingModel.h b/Code/Visualization/otbImageLayerRenderingModel.h
index ba0160b4ad..1639843529 100644
--- a/Code/Visualization/otbImageLayerRenderingModel.h
+++ b/Code/Visualization/otbImageLayerRenderingModel.h
@@ -42,32 +42,32 @@ namespace otb
*/
template <class TOutputImage,
- class TLayer = otb::ImageLayerBase<TOutputImage> >
+ class TLayer = otb::ImageLayerBase<TOutputImage> >
class ImageLayerRenderingModel
- : public MVCModel<ListenerBase>, public LayerBasedModel< TLayer >
+ : public MVCModel<ListenerBase>, public LayerBasedModel<TLayer>
{
public:
/** Standard class typedefs */
- typedef ImageLayerRenderingModel Self;
- typedef LayerBasedModel<TLayer> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageLayerRenderingModel Self;
+ typedef LayerBasedModel<TLayer> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Runtime information */
- itkTypeMacro(ImageLayerRenderingModel,LayerBasedModel);
+ itkTypeMacro(ImageLayerRenderingModel, LayerBasedModel);
/** New macro */
itkNewMacro(Self);
/** Output image typedef */
- typedef TOutputImage OutputImageType;
- typedef typename OutputImageType::Pointer OutputImagePointerType;
+ typedef TOutputImage OutputImageType;
+ typedef typename OutputImageType::Pointer OutputImagePointerType;
/** Layer typedef */
- typedef typename Superclass::LayerType LayerType;
- typedef typename LayerType::RegionType RegionType;
- typedef typename RegionType::IndexType IndexType;
- typedef typename RegionType::SizeType SizeType;
+ typedef typename Superclass::LayerType LayerType;
+ typedef typename LayerType::RegionType RegionType;
+ typedef typename RegionType::IndexType IndexType;
+ typedef typename RegionType::SizeType SizeType;
/** Layer list typedef */
typedef typename Superclass::LayerListType LayerListType;
@@ -75,7 +75,7 @@ public:
typedef typename LayerListType::ConstIterator LayerIteratorType;
/** Listener typedef */
- typedef ListenerBase ListenerType;
+ typedef ListenerBase ListenerType;
/** Blending filter typedef */
typedef otb::BlendingImageFilter<OutputImageType> BlendingFilterType;
@@ -90,23 +90,22 @@ public:
itkSetStringMacro(Name);
/** Get the rasterized views */
- itkGetObjectMacro(RasterizedQuicklook,OutputImageType);
- itkGetObjectMacro(RasterizedExtract,OutputImageType);
- itkGetObjectMacro(RasterizedScaledExtract,OutputImageType);
-
+ itkGetObjectMacro(RasterizedQuicklook, OutputImageType);
+ itkGetObjectMacro(RasterizedExtract, OutputImageType);
+ itkGetObjectMacro(RasterizedScaledExtract, OutputImageType);
/** Set/Get the Extract Region */
- itkSetMacro(ExtractRegion,RegionType);
- itkGetConstReferenceMacro(ExtractRegion,RegionType);
+ itkSetMacro(ExtractRegion, RegionType);
+ itkGetConstReferenceMacro(ExtractRegion, RegionType);
/** Set/Get the Scaled Extract Region */
- itkSetMacro(ScaledExtractRegion,RegionType);
- itkGetConstReferenceMacro(ScaledExtractRegion,RegionType);
+ itkSetMacro(ScaledExtractRegion, RegionType);
+ itkGetConstReferenceMacro(ScaledExtractRegion, RegionType);
/** Get the state of each view */
- itkGetMacro(HasQuicklook,bool);
- itkGetMacro(HasExtract,bool);
- itkGetMacro(HasScaledExtract,bool);
+ itkGetMacro(HasQuicklook, bool);
+ itkGetMacro(HasExtract, bool);
+ itkGetMacro(HasScaledExtract, bool);
/** Update will render all visible layers, rasterize all visible
* layers and notify all listeners. */
@@ -114,15 +113,15 @@ public:
/** Change the Scaled extract region by giving the center of the
* region */
- virtual void SetScaledExtractRegionCenter(const IndexType & index);
+ virtual void SetScaledExtractRegionCenter(const IndexType& index);
/** Change the extract region by giving the center of the
* region */
- virtual void SetExtractRegionCenter(const IndexType & index);
+ virtual void SetExtractRegionCenter(const IndexType& index);
/** Change the extract region by giving the 2 points of the
* region */
- virtual void SetExtractRegionByIndex(const IndexType & startIndex, const IndexType & stopIndex );
+ virtual void SetExtractRegionByIndex(const IndexType& startIndex, const IndexType& stopIndex);
/** Get the sumbsampling rate */
virtual unsigned int GetSubsamplingRate();
@@ -146,14 +145,14 @@ protected:
virtual void RasterizeVisibleLayers(void);
/** Notify a registered listener */
- virtual void NotifyListener(ListenerType * listener);
+ virtual void NotifyListener(ListenerType * listener);
/** Constrains the given region to the largest possible one. */
- virtual RegionType ConstrainRegion(const RegionType & region, const RegionType & largest);
+ virtual RegionType ConstrainRegion(const RegionType& region, const RegionType& largest);
private:
ImageLayerRenderingModel(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** Viewer name */
std::string m_Name;
@@ -172,9 +171,8 @@ private:
bool m_HasScaledExtract;
RegionType m_ScaledExtractRegion;
-
/** Wether the model is currently updating or not */
- bool m_Updating;
+ bool m_Updating;
/** Lists of the active blending filters */
BlendingFilterListPointerType m_QuicklookBlendingFilterList;
@@ -189,5 +187,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Visualization/otbImageLayerRenderingModel.txx b/Code/Visualization/otbImageLayerRenderingModel.txx
index f03dee85ce..34294c0527 100644
--- a/Code/Visualization/otbImageLayerRenderingModel.txx
+++ b/Code/Visualization/otbImageLayerRenderingModel.txx
@@ -28,10 +28,10 @@ namespace otb
template <class TOutputImage, class TLayer>
ImageLayerRenderingModel<TOutputImage, TLayer>
::ImageLayerRenderingModel() : m_Name("Default"), m_RasterizedQuicklook(),
- m_HasQuicklook(false),m_RasterizedExtract(),m_HasExtract(false),
- m_ExtractRegion(), m_RasterizedScaledExtract(), m_HasScaledExtract(false),
- m_ScaledExtractRegion(), m_Updating(false), m_QuicklookBlendingFilterList(),
- m_ExtractBlendingFilterList(), m_ScaledExtractBlendingFilterList()
+ m_HasQuicklook(false), m_RasterizedExtract(), m_HasExtract(false),
+ m_ExtractRegion(), m_RasterizedScaledExtract(), m_HasScaledExtract(false),
+ m_ScaledExtractRegion(), m_Updating(false), m_QuicklookBlendingFilterList(),
+ m_ExtractBlendingFilterList(), m_ScaledExtractBlendingFilterList()
{
// Initalize the blending filter list
@@ -51,7 +51,7 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
::Update()
{
// Multiple concurrent update guards
- if(!m_Updating)
+ if (!m_Updating)
{
m_Updating = true;
// Render all visible layers
@@ -64,7 +64,6 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
}
}
-
template <class TOutputImage, class TLayer>
void
ImageLayerRenderingModel<TOutputImage, TLayer>
@@ -78,27 +77,29 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
m_RasterizedScaledExtract = OutputImageType::New();
}
-
template <class TOutputImage, class TLayer>
void
ImageLayerRenderingModel<TOutputImage, TLayer>
::RenderVisibleLayers()
{
// Render all visible layers
- for(LayerIteratorType it = this->GetLayers()->Begin();
- it != this->GetLayers()->End(); ++it)
+ for (LayerIteratorType it = this->GetLayers()->Begin();
+ it != this->GetLayers()->End(); ++it)
{
// If the layer is visible
- if(it.Get()->GetVisible())
+ if (it.Get()->GetVisible())
{
// Set the extracted region
- m_ExtractRegion = this->ConstrainRegion(m_ExtractRegion,it.Get()->GetExtent());
+ m_ExtractRegion = this->ConstrainRegion(m_ExtractRegion, it.Get()->GetExtent());
it.Get()->SetExtractRegion(m_ExtractRegion);
// Set the scaled extracted region
- m_ScaledExtractRegion = this->ConstrainRegion(m_ScaledExtractRegion,m_ExtractRegion);
+ m_ScaledExtractRegion = this->ConstrainRegion(m_ScaledExtractRegion, m_ExtractRegion);
it.Get()->SetScaledExtractRegion(m_ScaledExtractRegion);
// Render it
- otbMsgDevMacro(<<"ImageLayerRenderingModel::RenderVisibleLayers(): Rendering layer "<<it.Get()->GetName()<<" with regions ("<<m_ExtractRegion.GetIndex()<<" "<<m_ExtractRegion.GetSize()<<") ("<<m_ScaledExtractRegion.GetIndex()<<" "<<m_ScaledExtractRegion.GetSize()<<")");
+ otbMsgDevMacro(
+ << "ImageLayerRenderingModel::RenderVisibleLayers(): Rendering layer " << it.Get()->GetName() <<
+ " with regions (" << m_ExtractRegion.GetIndex() << " " << m_ExtractRegion.GetSize() << ") (" <<
+ m_ScaledExtractRegion.GetIndex() << " " << m_ScaledExtractRegion.GetSize() << ")");
it.Get()->Render();
}
}
@@ -110,7 +111,7 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
::RasterizeVisibleLayers()
{
// If there are no layer to render
- if(this->GetNumberOfLayers() == 0)
+ if (this->GetNumberOfLayers() == 0)
{
// Ensure nothing is available
m_HasQuicklook = false;
@@ -119,44 +120,44 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
// and return without doing anything
return;
}
-
+
// Get the lowest layer
LayerIteratorType it = this->GetLayers()->Begin();
bool visible = false;
- while(!visible && it != this->GetLayers()->End())
+ while (!visible && it != this->GetLayers()->End())
{
visible = it.Get()->GetVisible();
++it;
}
- if(!visible)
+ if (!visible)
{
// no visible layers, returning
return;
}
--it;
-
+
// base layer
typename LayerType::Pointer baseLayer = it.Get();
- otbMsgDevMacro(<<"ImageLayerRenderingModel::RasterizeVisibleLayers(): Found base layer named "<<it.Get()->GetName());
-
+ otbMsgDevMacro(<< "ImageLayerRenderingModel::RasterizeVisibleLayers(): Found base layer named " << it.Get()->GetName());
+
// Configure base layer rasterization
- if(baseLayer->GetHasQuicklook())
+ if (baseLayer->GetHasQuicklook())
{
m_HasQuicklook = true;
m_RasterizedQuicklook = baseLayer->GetRenderedQuicklook();
}
- if(baseLayer->GetHasExtract())
+ if (baseLayer->GetHasExtract())
{
m_HasExtract = true;
m_RasterizedExtract = baseLayer->GetRenderedExtract();
}
- if(baseLayer->GetHasScaledExtract())
+ if (baseLayer->GetHasScaledExtract())
{
m_HasScaledExtract = true;
m_RasterizedScaledExtract = baseLayer->GetRenderedScaledExtract();
@@ -164,28 +165,28 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
// Move to the next layer
++it;
-
+
m_QuicklookBlendingFilterList->Clear();
m_ExtractBlendingFilterList->Clear();
m_ScaledExtractBlendingFilterList->Clear();
unsigned int count = 0;
// Walk the remaining layers
- while(it!=this->GetLayers()->End())
+ while (it != this->GetLayers()->End())
{
// Populate Blending filter list if needed
-
+
m_QuicklookBlendingFilterList->PushBack(BlendingFilterType::New());
m_ExtractBlendingFilterList->PushBack(BlendingFilterType::New());
m_ScaledExtractBlendingFilterList->PushBack(BlendingFilterType::New());
// If a layer is visible
- if(it.Get()->GetVisible())
+ if (it.Get()->GetVisible())
{
itk::TimeProbe probe;
probe.Start();
// If quicklook is activated and available for this layer
- if(m_HasQuicklook && it.Get()->GetHasQuicklook())
+ if (m_HasQuicklook && it.Get()->GetHasQuicklook())
{
// Blend it with the current rasterized quicklook
typename BlendingFilterType::Pointer blender = m_QuicklookBlendingFilterList->GetNthElement(count);
@@ -197,9 +198,9 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
// Store the result as being the current rasterized quicklook
m_RasterizedQuicklook = blender->GetOutput();
}
-
+
// If extract is activated and available for this layer
- if(m_HasExtract && it.Get()->GetHasExtract())
+ if (m_HasExtract && it.Get()->GetHasExtract())
{
// Blend it with the current rasterized extract
typename BlendingFilterType::Pointer blender = m_ExtractBlendingFilterList->GetNthElement(count);
@@ -214,7 +215,7 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
}
// If scaledExtract is activated and available for this layer
- if(m_HasScaledExtract && it.Get()->GetHasScaledExtract())
+ if (m_HasScaledExtract && it.Get()->GetHasScaledExtract())
{
// Blend it with the current rasterized scaledExtract
typename BlendingFilterType::Pointer blender = m_ScaledExtractBlendingFilterList->GetNthElement(count);
@@ -228,7 +229,10 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
m_RasterizedScaledExtract = blender->GetOutput();
}
probe.Stop();
- otbMsgDevMacro("ImageLayerRenderingModel::RasterizeVisibleLayers(): Previous layer rasterized with layer "<<it.Get()->GetName()<<" ( "<<probe.GetMeanTime()<<" s.)");
+ otbMsgDevMacro(
+ "ImageLayerRenderingModel::RasterizeVisibleLayers(): Previous layer rasterized with layer " <<
+ it.Get()->GetName(
+ ) << " ( " << probe.GetMeanTime() << " s.)");
}
++it;
++count;
@@ -241,27 +245,26 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
::NotifyListener(ListenerType * listener)
{
// Notify the listener
- otbMsgDevMacro(<<"ImageLayerRenderingModel::Notify(): Notifying listener");
+ otbMsgDevMacro(<< "ImageLayerRenderingModel::Notify(): Notifying listener");
listener->Notify();
}
-
template <class TOutputImage, class TLayer>
void
ImageLayerRenderingModel<TOutputImage, TLayer>
-::SetScaledExtractRegionCenter(const IndexType & index)
+::SetScaledExtractRegionCenter(const IndexType& index)
{
// Set the center of the scaled extract region
IndexType newIndex = index;
- newIndex[0]-=m_ScaledExtractRegion.GetSize()[0]/2;
- newIndex[1]-=m_ScaledExtractRegion.GetSize()[1]/2;
+ newIndex[0] -= m_ScaledExtractRegion.GetSize()[0] / 2;
+ newIndex[1] -= m_ScaledExtractRegion.GetSize()[1] / 2;
m_ScaledExtractRegion.SetIndex(newIndex);
}
template <class TOutputImage, class TLayer>
void
ImageLayerRenderingModel<TOutputImage, TLayer>
-::SetExtractRegionCenter(const IndexType & index)
+::SetExtractRegionCenter(const IndexType& index)
{
// Set the center of the extract region
IndexType newIndex = index;
@@ -270,33 +273,32 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
this->SetScaledExtractRegionCenter(newIndex);
// Update extract region
- newIndex[0]-=m_ExtractRegion.GetSize()[0]/2;
- newIndex[1]-=m_ExtractRegion.GetSize()[1]/2;
+ newIndex[0] -= m_ExtractRegion.GetSize()[0] / 2;
+ newIndex[1] -= m_ExtractRegion.GetSize()[1] / 2;
m_ExtractRegion.SetIndex(newIndex);
}
-
template <class TOutputImage, class TLayer>
void
ImageLayerRenderingModel<TOutputImage, TLayer>
-::SetExtractRegionByIndex( const IndexType & startIndex, const IndexType & stopIndex )
+::SetExtractRegionByIndex(const IndexType& startIndex, const IndexType& stopIndex)
{
RegionType lImageRegion;
lImageRegion = this->GetLayer(0)->GetExtent();
SizeType lSize;
- lSize[0] = vcl_abs(stopIndex[0]-startIndex[0]);
- lSize[1] = vcl_abs(stopIndex[1]-startIndex[1]);
+ lSize[0] = vcl_abs(stopIndex[0] - startIndex[0]);
+ lSize[1] = vcl_abs(stopIndex[1] - startIndex[1]);
IndexType lIndex;
- lIndex[0] = std::min(startIndex[0],stopIndex[0]);
- lIndex[1] = std::min(startIndex[1],stopIndex[1]);
+ lIndex[0] = std::min(startIndex[0], stopIndex[0]);
+ lIndex[1] = std::min(startIndex[1], stopIndex[1]);
RegionType lRegion;
lRegion.SetIndex(lIndex);
lRegion.SetSize(lSize);
- if(lRegion.Crop(lImageRegion))
+ if (lRegion.Crop(lImageRegion))
{
m_ExtractRegion = lRegion;
}
@@ -307,7 +309,7 @@ unsigned int
ImageLayerRenderingModel<TOutputImage, TLayer>
::GetSubsamplingRate()
{
- if(this->GetNumberOfLayers() < 1)
+ if (this->GetNumberOfLayers() < 1)
{
return 1;
}
@@ -322,37 +324,37 @@ template <class TOutputImage, class TLayer>
typename ImageLayerRenderingModel<TOutputImage, TLayer>
::RegionType
ImageLayerRenderingModel<TOutputImage, TLayer>
-::ConstrainRegion(const RegionType & region, const RegionType & largest)
+::ConstrainRegion(const RegionType& region, const RegionType& largest)
{
RegionType resp = region;
// Else we can constrain it
- IndexType index = resp.GetIndex();
+ IndexType index = resp.GetIndex();
typename RegionType::SizeType size = resp.GetSize();
// If region is larger than big, then crop
- if (region.GetSize()[0]>largest.GetSize()[0])
+ if (region.GetSize()[0] > largest.GetSize()[0])
{
size[0] = largest.GetSize()[0];
}
- if (region.GetSize()[1]>largest.GetSize()[1])
+ if (region.GetSize()[1] > largest.GetSize()[1])
{
size[1] = largest.GetSize()[1];
}
// Else we can constrain it
// For each dimension
- for(unsigned int dim = 0; dim < RegionType::ImageDimension; ++dim)
+ for (unsigned int dim = 0; dim < RegionType::ImageDimension; ++dim)
{
// push left if necessary
- if (region.GetIndex()[dim]<largest.GetIndex()[dim])
+ if (region.GetIndex()[dim] < largest.GetIndex()[dim])
{
- index[dim]=largest.GetIndex()[dim];
+ index[dim] = largest.GetIndex()[dim];
}
// push right if necessary
- if (index[dim]+size[dim]>=largest.GetIndex()[dim]+largest.GetSize()[dim])
+ if (index[dim] + size[dim] >= largest.GetIndex()[dim] + largest.GetSize()[dim])
{
- index[dim]=largest.GetIndex()[dim]+largest.GetSize()[dim]-size[dim];
+ index[dim] = largest.GetIndex()[dim] + largest.GetSize()[dim] - size[dim];
}
}
resp.SetSize(size);
@@ -366,12 +368,12 @@ ImageLayerRenderingModel<TOutputImage, TLayer>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
// Call superclass implementation
- Superclass::PrintSelf(os,indent);
- os<<indent<<"Viewer "<<m_Name<<": "<<std::endl;
- for(LayerIteratorType it = this->GetLayers()->Begin();
- it != this->GetLayers()->End(); ++it)
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Viewer " << m_Name << ": " << std::endl;
+ for (LayerIteratorType it = this->GetLayers()->Begin();
+ it != this->GetLayers()->End(); ++it)
{
- os<<indent<<it.Get()<<std::endl;
+ os << indent << it.Get() << std::endl;
}
}
diff --git a/Code/Visualization/otbImageLayerRenderingModelListener.h b/Code/Visualization/otbImageLayerRenderingModelListener.h
index 41e5e5dee7..4b386e2bd6 100644
--- a/Code/Visualization/otbImageLayerRenderingModelListener.h
+++ b/Code/Visualization/otbImageLayerRenderingModelListener.h
@@ -39,13 +39,13 @@ public:
protected:
/** Constructor */
- ImageLayerRenderingModelListener() {};
+ ImageLayerRenderingModelListener() {}
/** Destructor */
- virtual ~ImageLayerRenderingModelListener() {};
+ virtual ~ImageLayerRenderingModelListener() {}
private:
ImageLayerRenderingModelListener(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
diff --git a/Code/Visualization/otbImageView.h b/Code/Visualization/otbImageView.h
index 6431554a0b..a3bf5a3a08 100644
--- a/Code/Visualization/otbImageView.h
+++ b/Code/Visualization/otbImageView.h
@@ -33,46 +33,45 @@ namespace otb
* \ingroup Visualization
*/
-template <class TViewerModel >
+template <class TViewerModel>
class ImageView
: public ListenerBase, public itk::Object
{
public:
/** Standard class typedefs */
- typedef ImageView Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageView Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(ImageView,itk::Object);
+ itkTypeMacro(ImageView, itk::Object);
/** Model typedef */
- typedef TViewerModel ModelType;
- typedef typename ModelType::Pointer ModelPointerType;
- typedef typename ModelType::OutputImageType ImageType;
+ typedef TViewerModel ModelType;
+ typedef typename ModelType::Pointer ModelPointerType;
+ typedef typename ModelType::OutputImageType ImageType;
/** Controller typedef */
- typedef ImageWidgetController ControllerType;
- typedef typename ControllerType::Pointer ControllerPointerType;
+ typedef ImageWidgetController ControllerType;
+ typedef typename ControllerType::Pointer ControllerPointerType;
- /** Image region typedef */
- typedef typename ImageType::RegionType RegionType;
+ /** Image region typedef */
+ typedef typename ImageType::RegionType RegionType;
/** Region size & index typedef */
- typedef typename RegionType::SizeType SizeType;
- typedef typename RegionType::IndexType IndexType;
+ typedef typename RegionType::SizeType SizeType;
+ typedef typename RegionType::IndexType IndexType;
/** Offset typedef */
- typedef typename ImageType::OffsetType OffsetType;
-
+ typedef typename ImageType::OffsetType OffsetType;
/** Image widget */
- typedef otb::ImageWidget<ImageType> ImageWidgetType;
- typedef typename ImageWidgetType::Pointer ImageWidgetPointerType;
+ typedef otb::ImageWidget<ImageType> ImageWidgetType;
+ typedef typename ImageWidgetType::Pointer ImageWidgetPointerType;
/** Region gl component typedef */
typedef RegionGlComponent RegionGlComponentType;
@@ -95,16 +94,16 @@ public:
void Update();
/** Get pointers the widgets */
- itkGetObjectMacro(ScrollWidget,ImageWidgetType);
- itkGetObjectMacro(FullWidget,ImageWidgetType);
- itkGetObjectMacro(ZoomWidget,ImageWidgetType);
- itkGetObjectMacro(ExtractRegionGlComponent,RegionGlComponentType);
- itkGetObjectMacro(Model,ModelType);
+ itkGetObjectMacro(ScrollWidget, ImageWidgetType);
+ itkGetObjectMacro(FullWidget, ImageWidgetType);
+ itkGetObjectMacro(ZoomWidget, ImageWidgetType);
+ itkGetObjectMacro(ExtractRegionGlComponent, RegionGlComponentType);
+ itkGetObjectMacro(Model, ModelType);
/** Clear the widgets buffers */
void ClearBuffer();
- protected:
+protected:
/** Constructor */
ImageView();
/** Destructor */
@@ -126,7 +125,7 @@ public:
private:
ImageView(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** The three classical widgets */
ImageWidgetPointerType m_ScrollWidget;
@@ -134,16 +133,15 @@ private:
ImageWidgetPointerType m_ZoomWidget;
/** Model pointer */
- ModelPointerType m_Model;
+ ModelPointerType m_Model;
/** Controller pointer */
- ControllerPointerType m_Controller;
+ ControllerPointerType m_Controller;
/** Viewed region gl components */
RegionGlComponentPointerType m_ExtractRegionGlComponent;
RegionGlComponentPointerType m_ScaledExtractRegionGlComponent;
-
}; // end class
} // end namespace otb
@@ -152,5 +150,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Visualization/otbImageView.txx b/Code/Visualization/otbImageView.txx
index 80b28ed503..671003f7c6 100644
--- a/Code/Visualization/otbImageView.txx
+++ b/Code/Visualization/otbImageView.txx
@@ -22,10 +22,10 @@
namespace otb
{
-template < class TViewerModel >
+template <class TViewerModel>
ImageView<TViewerModel>
::ImageView() : m_ScrollWidget(), m_FullWidget(), m_ZoomWidget(),
- m_Model(), m_Controller(), m_ExtractRegionGlComponent(), m_ScaledExtractRegionGlComponent()
+ m_Model(), m_Controller(), m_ExtractRegionGlComponent(), m_ScaledExtractRegionGlComponent()
{
// Initializing the widgets
m_ScrollWidget = ImageWidgetType::New();
@@ -46,30 +46,30 @@ ImageView<TViewerModel>
m_ZoomWidget->SetIdentifier("Zoom");
}
-template < class TViewerModel >
+template <class TViewerModel>
ImageView<TViewerModel>
::~ImageView()
{
-
+
}
-template < class TViewerModel >
+template <class TViewerModel>
void
ImageView<TViewerModel>
::SetModel(ModelType * model)
{
// Unregister from previous model if nay
- if(m_Model.IsNotNull())
+ if (m_Model.IsNotNull())
{
m_Model->UnRegisterListener(this);
}
-
+
// Set and register with new model
m_Model = model;
m_Model->RegisterListener(this);
}
-template < class TViewerModel >
+template <class TViewerModel>
void
ImageView<TViewerModel>
::SetController(ControllerType * controller)
@@ -80,17 +80,16 @@ ImageView<TViewerModel>
m_ZoomWidget->SetController(m_Controller);
}
-template < class TViewerModel>
+template <class TViewerModel>
void
ImageView<TViewerModel>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
// Call the superclass implementation
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
-template < class TViewerModel >
+template <class TViewerModel>
void
ImageView<TViewerModel>
::Notify()
@@ -98,7 +97,7 @@ ImageView<TViewerModel>
this->Update();
}
-template < class TViewerModel >
+template <class TViewerModel>
void
ImageView<TViewerModel>
::Update()
@@ -108,36 +107,36 @@ ImageView<TViewerModel>
this->UpdateZoomWidget();
}
-template < class TViewerModel >
+template <class TViewerModel>
void
ImageView<TViewerModel>
::UpdateScrollWidget()
{
// If the model has a quicklook
- if(m_Model->GetHasQuicklook())
+ if (m_Model->GetHasQuicklook())
{
- otbMsgDevMacro(<<"ImageView::UpdateScrollWidget(): redrawing scroll widget");
+ otbMsgDevMacro(<< "ImageView::UpdateScrollWidget(): redrawing scroll widget");
// Read the buffer
const RegionType qlRegion = m_Model->GetRasterizedQuicklook()
- ->GetLargestPossibleRegion();
- m_ScrollWidget->ReadBuffer(m_Model->GetRasterizedQuicklook(),qlRegion);
+ ->GetLargestPossibleRegion();
+ m_ScrollWidget->ReadBuffer(m_Model->GetRasterizedQuicklook(), qlRegion);
// Compute the appropriate scale
- const double wratio = static_cast<double>(m_ScrollWidget->w())/static_cast<double>(qlRegion.GetSize()[0]);
- const double hratio = static_cast<double>(m_ScrollWidget->h())/static_cast<double>(qlRegion.GetSize()[1]);
- const double scale = std::min(wratio,hratio);
+ const double wratio = static_cast<double>(m_ScrollWidget->w()) / static_cast<double>(qlRegion.GetSize()[0]);
+ const double hratio = static_cast<double>(m_ScrollWidget->h()) / static_cast<double>(qlRegion.GetSize()[1]);
+ const double scale = std::min(wratio, hratio);
m_ScrollWidget->SetIsotropicZoom(scale);
m_ScrollWidget->SetSubsamplingRate(m_Model->GetSubsamplingRate());
// Setting widget label
std::string label = m_ScrollWidget->GetIdentifier();
- label+=(" - ");
- label+=m_Model->GetName();
+ label += (" - ");
+ label += m_Model->GetName();
m_ScrollWidget->label(label.c_str());
// display the zoom rectangle if necessary
- if(m_Model->GetHasExtract())
+ if (m_Model->GetHasExtract())
{
m_ExtractRegionGlComponent->SetVisible(true);
m_ExtractRegionGlComponent->SetRegion(m_Model->GetExtractRegion());
@@ -153,31 +152,30 @@ ImageView<TViewerModel>
// Ensure to reset buffer
m_ScrollWidget->ClearBuffer();
}
-
- // Redraw
- m_ScrollWidget->redraw();
-}
+ // Redraw
+ m_ScrollWidget->redraw();
+}
-template < class TViewerModel >
+template <class TViewerModel>
void
ImageView<TViewerModel>
::UpdateFullWidget()
{
- if(m_Model->GetHasExtract())
+ if (m_Model->GetHasExtract())
{
- otbMsgDevMacro(<<"ImageView::UpdateFullWidget(): redrawing full widget");
- m_FullWidget->ReadBuffer(m_Model->GetRasterizedExtract(),m_Model->GetRasterizedExtract()
+ otbMsgDevMacro(<< "ImageView::UpdateFullWidget(): redrawing full widget");
+ m_FullWidget->ReadBuffer(m_Model->GetRasterizedExtract(), m_Model->GetRasterizedExtract()
->GetLargestPossibleRegion());
- // Setting widget label
+ // Setting widget label
std::string label = m_FullWidget->GetIdentifier();
- label+=(" - ");
- label+=m_Model->GetName();
+ label += (" - ");
+ label += m_Model->GetName();
m_FullWidget->label(label.c_str());
// display the zoom rectangle if necessary
- if(m_Model->GetHasScaledExtract())
+ if (m_Model->GetHasScaledExtract())
{
m_ScaledExtractRegionGlComponent->SetVisible(true);
m_ScaledExtractRegionGlComponent->SetRegion(m_Model->GetScaledExtractRegion());
@@ -195,24 +193,24 @@ ImageView<TViewerModel>
}
// redraw the widget
- m_FullWidget->redraw();
- }
+ m_FullWidget->redraw();
+}
-template < class TViewerModel >
+template <class TViewerModel>
void
ImageView<TViewerModel>
::UpdateZoomWidget()
{
- if(m_Model->GetHasScaledExtract())
+ if (m_Model->GetHasScaledExtract())
{
- otbMsgDevMacro(<<"ImageView::UpdateZoomWidget(): redrawing zoom widget");
- m_ZoomWidget->ReadBuffer(m_Model->GetRasterizedScaledExtract(),m_Model->GetRasterizedScaledExtract()
+ otbMsgDevMacro(<< "ImageView::UpdateZoomWidget(): redrawing zoom widget");
+ m_ZoomWidget->ReadBuffer(m_Model->GetRasterizedScaledExtract(), m_Model->GetRasterizedScaledExtract()
->GetLargestPossibleRegion());
// Setting widget label
std::string label = m_ZoomWidget->GetIdentifier();
- label+=(" - ");
- label+=m_Model->GetName();
+ label += (" - ");
+ label += m_Model->GetName();
m_ZoomWidget->label(label.c_str());
}
else
@@ -221,7 +219,7 @@ ImageView<TViewerModel>
// Ensure to reset buffer
m_ZoomWidget->ClearBuffer();
}
-
+
m_ZoomWidget->redraw();
}
diff --git a/Code/Visualization/otbImageWidget.h b/Code/Visualization/otbImageWidget.h
index 97d7e3396c..92b9425338 100644
--- a/Code/Visualization/otbImageWidget.h
+++ b/Code/Visualization/otbImageWidget.h
@@ -39,29 +39,29 @@ namespace otb
* \ingroup Visualization
*/
-template <class TInputImage=otb::Image<itk::RGBAPixel<unsigned char>,2 > >
+template <class TInputImage = otb::Image<itk::RGBAPixel<unsigned char>, 2> >
class ImageWidget
: public GlWidget
{
public:
/** Standard class typedefs */
- typedef ImageWidget Self;
- typedef GlWidget Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageWidget Self;
+ typedef GlWidget Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(ImageWidget,GlWidget);
+ itkTypeMacro(ImageWidget, GlWidget);
/** Input image typedef */
- typedef TInputImage InputImageType;
+ typedef TInputImage InputImageType;
/** Image region typedef */
typedef typename InputImageType::RegionType RegionType;
/** Region size & index typedef */
- typedef typename RegionType::SizeType SizeType;
- typedef typename RegionType::IndexType IndexType;
+ typedef typename RegionType::SizeType SizeType;
+ typedef typename RegionType::IndexType IndexType;
/** GlComponent typedef */
typedef GlComponent GlComponentType;
@@ -83,14 +83,14 @@ public:
* This method fills the m_OpenGl buffer according to the region
* size. Buffer in flipped over X axis if OTB_USE_GL_ACCEL is OFF.
*/
- virtual void ReadBuffer(const InputImageType * image, const RegionType & region);
+ virtual void ReadBuffer(const InputImageType * image, const RegionType& region);
/** Clear the OpenGl buffer */
void ClearBuffer();
/** Set/Get the Isotropic zoom */
- itkSetMacro(IsotropicZoom,double);
- itkGetMacro(IsotropicZoom,double);
+ itkSetMacro(IsotropicZoom, double);
+ itkGetMacro(IsotropicZoom, double);
/** Linear interpolation on or off*/
void LinearInterpolationOn()
@@ -106,25 +106,24 @@ public:
}
/** Set/Get the subsampling rate */
- itkSetMacro(SubsamplingRate,unsigned int);
- itkGetMacro(SubsamplingRate,unsigned int);
+ itkSetMacro(SubsamplingRate, unsigned int);
+ itkGetMacro(SubsamplingRate, unsigned int);
/** Get the image to screen transform */
- itkGetObjectMacro(ImageToScreenTransform,AffineTransformType);
- itkGetObjectMacro(ScreenToImageTransform,AffineTransformType);
+ itkGetObjectMacro(ImageToScreenTransform, AffineTransformType);
+ itkGetObjectMacro(ScreenToImageTransform, AffineTransformType);
- /** Get The GlBuffered Region*/
+ /** Get The GlBuffered Region*/
itkGetMacro(OpenGlBufferedRegion, RegionType);
/** Get the Extent region */
itkGetMacro(Extent, RegionType);
-
/** Add a GlComponent */
unsigned int AddGlComponent(GlComponent * glComponent)
{
m_GlComponents->PushBack(glComponent);
- return m_GlComponents->Size()-1;
+ return m_GlComponents->Size() - 1;
}
/** Get the nth GlComponent */
@@ -168,14 +167,14 @@ protected:
virtual void draw(void);
- /** Compute the linear buffer index according to the 2D region and
- * its 2D index.This method is used when OTB_GL_USE_ACCEL is ON.
- * \param index 2D index
- * \param region 2D region
- */
- static inline unsigned int ComputeBufferIndex(const IndexType& index, const RegionType & region)
+ /** Compute the linear buffer index according to the 2D region and
+ * its 2D index.This method is used when OTB_GL_USE_ACCEL is ON.
+ * \param index 2D index
+ * \param region 2D region
+ */
+ static inline unsigned int ComputeBufferIndex(const IndexType& index, const RegionType& region)
{
- return (index[1]-region.GetIndex()[1])*3*region.GetSize()[0]+3*(index[0]-region.GetIndex()[0]);
+ return (index[1] - region.GetIndex()[1]) * 3 * region.GetSize()[0] + 3 * (index[0] - region.GetIndex()[0]);
}
/** Compute the linear buffer index according to the 2D region and
@@ -184,14 +183,15 @@ protected:
* \param index 2D index
* \param region 2D region
*/
- static inline unsigned int ComputeXAxisFlippedBufferIndex(const IndexType& index,const RegionType & region)
+ static inline unsigned int ComputeXAxisFlippedBufferIndex(const IndexType& index, const RegionType& region)
{
- return (region.GetSize()[1]-1+region.GetIndex()[1]-index[1])*3*region.GetSize()[0]+3*(index[0]-region.GetIndex()[0]);
+ return (region.GetSize()[1] - 1 + region.GetIndex()[1] -
+ index[1]) * 3 * region.GetSize()[0] + 3 * (index[0] - region.GetIndex()[0]);
}
private:
ImageWidget(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** OpenGl zoom factor */
double m_IsotropicZoom;
@@ -227,5 +227,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Visualization/otbImageWidget.txx b/Code/Visualization/otbImageWidget.txx
index 37f332f111..13e1eb45e0 100644
--- a/Code/Visualization/otbImageWidget.txx
+++ b/Code/Visualization/otbImageWidget.txx
@@ -25,10 +25,10 @@ namespace otb
{
template <class TInputImage>
ImageWidget<TInputImage>
- ::ImageWidget() : m_IsotropicZoom(1.0), m_InterpolationMethod(GL_LINEAR),
- m_OpenGlBuffer(NULL), m_OpenGlBufferedRegion(),
- m_Extent(), m_SubsamplingRate(1), m_ImageToScreenTransform(),
- m_ScreenToImageTransform(), m_GlComponents()
+::ImageWidget() : m_IsotropicZoom(1.0), m_InterpolationMethod(GL_LINEAR),
+ m_OpenGlBuffer(NULL), m_OpenGlBufferedRegion(),
+ m_Extent(), m_SubsamplingRate(1), m_ImageToScreenTransform(),
+ m_ScreenToImageTransform(), m_GlComponents()
{
// Initialize space to screen transform and inverse
m_ImageToScreenTransform = AffineTransformType::New();
@@ -51,63 +51,63 @@ ImageWidget<TInputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
// Call the superclass implementation
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
- if(m_OpenGlBuffer == NULL)
+ if (m_OpenGlBuffer == NULL)
{
- os<<indent<<indent<<"OpenGl buffer is not allocated."<<std::endl;
+ os << indent << indent << "OpenGl buffer is not allocated." << std::endl;
}
else
{
- os<<indent<<indent<<"OpenGl buffer is allocated with size "<<m_OpenGlBufferedRegion.GetSize()<<"."<<std::endl;
+ os << indent << indent << "OpenGl buffer is allocated with size " << m_OpenGlBufferedRegion.GetSize() << "." <<
+ std::endl;
}
- os<<indent<<indent<<"OpenGl isotropic zoom is "<<m_IsotropicZoom<<"."<<std::endl;
+ os << indent << indent << "OpenGl isotropic zoom is " << m_IsotropicZoom << "." << std::endl;
}
-
template <class TInputImage>
void
ImageWidget<TInputImage>
-::ReadBuffer(const InputImageType * image, const RegionType & region)
+::ReadBuffer(const InputImageType * image, const RegionType& region)
{
// Before doing anything, check if region is inside the buffered
// region of image
- if(!image->GetBufferedRegion().IsInside(region))
+ if (!image->GetBufferedRegion().IsInside(region))
{
- itkExceptionMacro(<<"Region to read is oustside of the buffered region.");
+ itkExceptionMacro(<< "Region to read is oustside of the buffered region.");
}
// Delete previous buffer if needed
this->ClearBuffer();
// Allocate new memory
- m_OpenGlBuffer = new unsigned char[3*region.GetNumberOfPixels()];
+ m_OpenGlBuffer = new unsigned char[3 * region.GetNumberOfPixels()];
// Declare the iterator
- itk::ImageRegionConstIteratorWithIndex<InputImageType> it(image,region);
+ itk::ImageRegionConstIteratorWithIndex<InputImageType> it(image, region);
// Go to begin
it.GoToBegin();
- while(!it.IsAtEnd())
+ while (!it.IsAtEnd())
{
// Fill the buffer
unsigned int index = 0;
- if(!this->GetUseGlAcceleration())
+ if (!this->GetUseGlAcceleration())
{
// compute the linear index (buffer is flipped around X axis
// when gl acceleration is disabled
- index = ComputeXAxisFlippedBufferIndex(it.GetIndex(),region);
+ index = ComputeXAxisFlippedBufferIndex(it.GetIndex(), region);
}
else
{
// Conpute the linear index
- index = ComputeBufferIndex(it.GetIndex(),region);
+ index = ComputeBufferIndex(it.GetIndex(), region);
}
// Fill the buffer
- m_OpenGlBuffer[index] =it.Get()[0];
- m_OpenGlBuffer[index+1]=it.Get()[1];
- m_OpenGlBuffer[index+2]=it.Get()[2];
+ m_OpenGlBuffer[index] = it.Get()[0];
+ m_OpenGlBuffer[index + 1] = it.Get()[1];
+ m_OpenGlBuffer[index + 2] = it.Get()[2];
++it;
}
// Last, updating buffer size
@@ -120,13 +120,13 @@ ImageWidget<TInputImage>
::ClearBuffer()
{
// Delete previous buffer if needed
- if(m_OpenGlBuffer != NULL)
+ if (m_OpenGlBuffer != NULL)
{
- delete [] m_OpenGlBuffer;
+ delete[] m_OpenGlBuffer;
m_OpenGlBuffer = NULL;
}
- RegionType region;
+ RegionType region;
typename RegionType::IndexType index;
typename RegionType::SizeType size;
size.Fill(0);
@@ -144,41 +144,43 @@ void
ImageWidget<TInputImage>
::UpdateTransforms()
{
- if(m_IsotropicZoom<=0)
- {
- itkExceptionMacro(<<"Internal error: Isotropic zoom should be non null positive.");
- }
+ if (m_IsotropicZoom <= 0)
+ {
+ itkExceptionMacro(<< "Internal error: Isotropic zoom should be non null positive.");
+ }
typename RegionType::IndexType index;
typename RegionType::SizeType size;
// Update image extent
- size[0]= static_cast<unsigned int>(m_IsotropicZoom*static_cast<double>(m_OpenGlBufferedRegion.GetSize()[0]));
- size[1]= static_cast<unsigned int>(m_IsotropicZoom*static_cast<double>(m_OpenGlBufferedRegion.GetSize()[1]));
- index[0] = (this->w()-size[0])/2;
- index[1] = (this->h()-size[1])/2;
+ size[0] = static_cast<unsigned int>(m_IsotropicZoom * static_cast<double>(m_OpenGlBufferedRegion.GetSize()[0]));
+ size[1] = static_cast<unsigned int>(m_IsotropicZoom * static_cast<double>(m_OpenGlBufferedRegion.GetSize()[1]));
+ index[0] = (this->w() - size[0]) / 2;
+ index[1] = (this->h() - size[1]) / 2;
m_Extent.SetIndex(index);
m_Extent.SetSize(size);
// Image to screen matrix
typename AffineTransformType::MatrixType s2iMatrix;
s2iMatrix.Fill(0);
- const double s2iSpacing =(m_SubsamplingRate)/m_IsotropicZoom;
- s2iMatrix(0,0)=s2iSpacing;
- s2iMatrix(1,1)=-s2iSpacing;
+ const double s2iSpacing = (m_SubsamplingRate) / m_IsotropicZoom;
+ s2iMatrix(0, 0) = s2iSpacing;
+ s2iMatrix(1, 1) = -s2iSpacing;
m_ScreenToImageTransform->SetMatrix(s2iMatrix);
// Image to screen translation
typename AffineTransformType::OutputVectorType translation;
- translation[0]= m_SubsamplingRate * (m_OpenGlBufferedRegion.GetIndex()[0]-m_Extent.GetIndex()[0]/m_IsotropicZoom);
- translation[1]= m_SubsamplingRate * (((m_Extent.GetIndex()[1]+m_Extent.GetSize()[1])/m_IsotropicZoom) + m_OpenGlBufferedRegion.GetIndex()[1]);
+ translation[0] = m_SubsamplingRate * (m_OpenGlBufferedRegion.GetIndex()[0] - m_Extent.GetIndex()[0] / m_IsotropicZoom);
+ translation[1] = m_SubsamplingRate *
+ (((m_Extent.GetIndex()[1] +
+ m_Extent.GetSize()[1]) / m_IsotropicZoom) + m_OpenGlBufferedRegion.GetIndex()[1]);
m_ScreenToImageTransform->SetTranslation(translation);
// Compute the inverse transform
bool couldInvert = m_ScreenToImageTransform->GetInverse(m_ImageToScreenTransform);
- if( couldInvert == false)
- {
- itkExceptionMacro(<<"Internal error: Could not invert ScreenToImageTransform.");
- }
+ if (couldInvert == false)
+ {
+ itkExceptionMacro(<< "Internal error: Could not invert ScreenToImageTransform.");
+ }
}
template <class TInputImage>
@@ -191,60 +193,61 @@ ImageWidget<TInputImage>
glDisable(GL_BLEND);
// Check if there is somthing to draw
- if(m_OpenGlBuffer == NULL)
- {
+ if (m_OpenGlBuffer == NULL)
+ {
return;
- }
+ }
// Update transforms
this->UpdateTransforms();
- if(!this->GetUseGlAcceleration())
- {
+ if (!this->GetUseGlAcceleration())
+ {
// Set the pixel Zoom
- glRasterPos2f(m_Extent.GetIndex()[0],m_Extent.GetIndex()[1]);
- glPixelZoom(m_IsotropicZoom,m_IsotropicZoom);
+ glRasterPos2f(m_Extent.GetIndex()[0], m_Extent.GetIndex()[1]);
+ glPixelZoom(m_IsotropicZoom, m_IsotropicZoom);
// display the image
glDrawPixels(m_OpenGlBufferedRegion.GetSize()[0],
m_OpenGlBufferedRegion.GetSize()[1],
- GL_RGB,
- GL_UNSIGNED_BYTE,
- m_OpenGlBuffer);
- }
+ GL_RGB,
+ GL_UNSIGNED_BYTE,
+ m_OpenGlBuffer);
+ }
else
- {
+ {
glEnable(GL_TEXTURE_2D);
- glColor4f(1.0,1.0,1.0,0.0);
+ glColor4f(1.0, 1.0, 1.0, 0.0);
GLuint texture;
glGenTextures(1, &texture);
glBindTexture(GL_TEXTURE_2D, texture);
- glTexImage2D(GL_TEXTURE_2D, 0, 3, m_OpenGlBufferedRegion.GetSize()[0], m_OpenGlBufferedRegion.GetSize()[1], 0, GL_RGB, GL_UNSIGNED_BYTE, m_OpenGlBuffer);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,m_InterpolationMethod);
- glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,m_InterpolationMethod);
+ glTexImage2D(GL_TEXTURE_2D, 0, 3, m_OpenGlBufferedRegion.GetSize()[0],
+ m_OpenGlBufferedRegion.GetSize()[1], 0, GL_RGB, GL_UNSIGNED_BYTE, m_OpenGlBuffer);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, m_InterpolationMethod);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, m_InterpolationMethod);
glBindTexture (GL_TEXTURE_2D, texture);
glBegin (GL_QUADS);
glTexCoord2f (0.0, 1.0);
- glVertex3f (m_Extent.GetIndex()[0],m_Extent.GetIndex()[1], 0.0);
+ glVertex3f (m_Extent.GetIndex()[0], m_Extent.GetIndex()[1], 0.0);
glTexCoord2f (1.0, 1.0);
- glVertex3f (m_Extent.GetIndex()[0]+m_Extent.GetSize()[0], m_Extent.GetIndex()[1], 0.0);
+ glVertex3f (m_Extent.GetIndex()[0] + m_Extent.GetSize()[0], m_Extent.GetIndex()[1], 0.0);
glTexCoord2f (1.0, 0.0);
- glVertex3f (m_Extent.GetIndex()[0]+m_Extent.GetSize()[0],m_Extent.GetIndex()[1]+m_Extent.GetSize()[1], 0.0);
+ glVertex3f (m_Extent.GetIndex()[0] + m_Extent.GetSize()[0], m_Extent.GetIndex()[1] + m_Extent.GetSize()[1], 0.0);
glTexCoord2f (0.0, 0.0);
- glVertex3f (m_Extent.GetIndex()[0],m_Extent.GetIndex()[1]+m_Extent.GetSize()[1], 0.0);
+ glVertex3f (m_Extent.GetIndex()[0], m_Extent.GetIndex()[1] + m_Extent.GetSize()[1], 0.0);
glEnd ();
glDisable(GL_TEXTURE_2D);
- }
+ }
// Render additionnal GlComponents
- for(GlComponentIteratorType it = m_GlComponents->ReverseBegin();
- it!=m_GlComponents->ReverseEnd();++it)
- {
- if(it.Get()->GetVisible())
+ for (GlComponentIteratorType it = m_GlComponents->ReverseBegin();
+ it != m_GlComponents->ReverseEnd(); ++it)
{
- it.Get()->Render(m_Extent,m_ImageToScreenTransform);
+ if (it.Get()->GetVisible())
+ {
+ it.Get()->Render(m_Extent, m_ImageToScreenTransform);
+ }
}
- }
}
}
#endif
diff --git a/Code/Visualization/otbImageWidgetActionHandler.h b/Code/Visualization/otbImageWidgetActionHandler.h
index b11f7b9c74..eae3b28211 100644
--- a/Code/Visualization/otbImageWidgetActionHandler.h
+++ b/Code/Visualization/otbImageWidgetActionHandler.h
@@ -40,16 +40,16 @@ class ImageWidgetActionHandler
{
public:
/** Standard class typedefs */
- typedef ImageWidgetActionHandler Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageWidgetActionHandler Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(ImageWidgetActionHandler,Object);
+ itkTypeMacro(ImageWidgetActionHandler, Object);
/** Handle widget event
* \param widgetId The id of the moved widget
@@ -67,41 +67,41 @@ public:
* \param y new y location
* \return true if the event is handled
*/
- virtual bool HandleWidgetMove(std::string /*widgetId*/,int /*x*/,int /*y*/)
+ virtual bool HandleWidgetMove(std::string /*widgetId*/, int /*x*/, int /*y*/)
{
return false;
}
- /** Handle widget resize
- * \param widgetId The id of the resized widget
- * \param w new width
- * \param h new height
- * \return true if the event is handled
- */
- virtual bool HandleWidgetResize(std::string /*widgetId*/,int /*w*/, int /*h*/)
+ /** Handle widget resize
+ * \param widgetId The id of the resized widget
+ * \param w new width
+ * \param h new height
+ * \return true if the event is handled
+ */
+ virtual bool HandleWidgetResize(std::string /*widgetId*/, int /*w*/, int /*h*/)
{
return false;
}
/** IsActive Accessors */
- itkSetMacro(IsActive,bool);
- itkGetMacro(IsActive,bool);
+ itkSetMacro(IsActive, bool);
+ itkGetMacro(IsActive, bool);
itkBooleanMacro(IsActive);
protected:
/** Constructor */
- ImageWidgetActionHandler(){m_IsActive = true;}
+ ImageWidgetActionHandler(){m_IsActive = true; }
/** Destructor */
virtual ~ImageWidgetActionHandler(){}
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
ImageWidgetActionHandler(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** The handler is active or not */
bool m_IsActive;
@@ -109,5 +109,3 @@ private:
}; // end class
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbImageWidgetController.cxx b/Code/Visualization/otbImageWidgetController.cxx
index 259b422b72..9a6429db01 100644
--- a/Code/Visualization/otbImageWidgetController.cxx
+++ b/Code/Visualization/otbImageWidgetController.cxx
@@ -58,17 +58,17 @@ int ImageWidgetController::HandleWidgetEvent(std::string widgetId, int event)
// The action handler found
ActionHandlerType * handler;
- while(it!=m_ActionHandlersList->End())
+ while (it != m_ActionHandlersList->End())
{
// Get the current handler
handler = it.Get();
// Check if it listens to (widget,event)
- bool newFound = handler->HandleWidgetEvent(widgetId,event);
+ bool newFound = handler->HandleWidgetEvent(widgetId, event);
found = found || newFound;
++it;
}
// If an handler was found, use it
- if(found)
+ if (found)
{
return 1;
}
@@ -83,49 +83,48 @@ void ImageWidgetController::HandleWidgetResize(std::string widgetId, int w, int
// Define an iterator on the action handlers list
ActionHandlerListType::Iterator it = m_ActionHandlersList->Begin();
- // The action handler found
+ // The action handler found
ActionHandlerType * handler;
- while(it!=m_ActionHandlersList->End())
+ while (it != m_ActionHandlersList->End())
{
// Get the current handler
handler = it.Get();
// try to handle the event with the current handler
- handler->HandleWidgetResize(widgetId,w,h);
+ handler->HandleWidgetResize(widgetId, w, h);
++it;
}
}
void ImageWidgetController::HandleWidgetMove(std::string widgetId, int x, int y)
{
- otbMsgDevMacro(<<"ImageWidgetController::HandleWidgetMove(): ("<<widgetId<<", "<<x<<", "<<y<<")");
+ otbMsgDevMacro(<< "ImageWidgetController::HandleWidgetMove(): (" << widgetId << ", " << x << ", " << y << ")");
// Define an iterator on the action handlers list
ActionHandlerListType::Iterator it = m_ActionHandlersList->Begin();
// The action handler found
ActionHandlerType * handler;
- while(it!=m_ActionHandlersList->End())
+ while (it != m_ActionHandlersList->End())
{
// Get the current handler
handler = it.Get();
// Check if it listens to (widget,event)
- handler->HandleWidgetMove(widgetId,x,y);
+ handler->HandleWidgetMove(widgetId, x, y);
++it;
}
}
-
void ImageWidgetController::ActivateActionHandlers()
{
// otbMsgDevMacro(<<"ImageWidgetController::DectivateActionHandler(): ("<<widgetId<<")");
- // Define an iterator on the action handlers list
+// Define an iterator on the action handlers list
ActionHandlerListType::Iterator it = m_ActionHandlersList->Begin();
// The action handler found
ActionHandlerType * handler;
- while(it!=m_ActionHandlersList->End())
+ while (it != m_ActionHandlersList->End())
{
// Get the current handler
handler = it.Get();
@@ -138,13 +137,13 @@ void ImageWidgetController::ActivateActionHandlers()
void ImageWidgetController::DeactivateActionHandlers()
{
// otbMsgDevMacro(<<"ImageWidgetController::DectivateActionHandler(): ("<<widgetId<<")");
- // Define an iterator on the action handlers list
+// Define an iterator on the action handlers list
ActionHandlerListType::Iterator it = m_ActionHandlersList->Begin();
// The action handler found
ActionHandlerType * handler;
- while(it!=m_ActionHandlersList->End())
+ while (it != m_ActionHandlersList->End())
{
// Get the current handler
handler = it.Get();
@@ -154,12 +153,10 @@ void ImageWidgetController::DeactivateActionHandlers()
}
}
-
void ImageWidgetController::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
- os<<indent<<"Number of action handlers: "<<m_ActionHandlersList->Size()<<std::endl;
+ Superclass::PrintSelf(os, indent);
+ os << indent << "Number of action handlers: " << m_ActionHandlersList->Size() << std::endl;
}
-
} // end namespace otb
diff --git a/Code/Visualization/otbImageWidgetController.h b/Code/Visualization/otbImageWidgetController.h
index 9d3e9bb634..d941b1de53 100644
--- a/Code/Visualization/otbImageWidgetController.h
+++ b/Code/Visualization/otbImageWidgetController.h
@@ -39,16 +39,16 @@ class ImageWidgetController
{
public:
/** Standard class typedefs */
- typedef ImageWidgetController Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef ImageWidgetController Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(ImageWidgetController,Object);
+ itkTypeMacro(ImageWidgetController, Object);
/** Handler typedef */
typedef otb::ImageWidgetActionHandler ActionHandlerType;
@@ -82,21 +82,19 @@ public:
*/
void HandleWidgetResize(std::string widgetId, int w, int h);
- /** Handle widget move
- * \param widgetId The id of the resized widget
- * \param x new x location
- * \param y new y location
- */
+ /** Handle widget move
+ * \param widgetId The id of the resized widget
+ * \param x new x location
+ * \param y new y location
+ */
void HandleWidgetMove(std::string widgetId, int x, int y);
/** Activate action all the handlers */
void ActivateActionHandlers();
-
+
/** Deactivate action all the handlers */
void DeactivateActionHandlers();
-
-
protected:
/** Constructor */
ImageWidgetController();
@@ -107,7 +105,7 @@ protected:
private:
ImageWidgetController(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** Action handlers list */
ActionHandlerListPointerType m_ActionHandlersList;
@@ -115,5 +113,3 @@ private:
}; // end class
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbLayerBasedModel.h b/Code/Visualization/otbLayerBasedModel.h
index 4e5eabf499..5782f829bb 100644
--- a/Code/Visualization/otbLayerBasedModel.h
+++ b/Code/Visualization/otbLayerBasedModel.h
@@ -32,25 +32,25 @@ namespace otb
* \ingroup Visualization
*/
-template <class TLayer >
+template <class TLayer>
class LayerBasedModel
: public itk::Object
{
public:
/** Standard class typedefs */
- typedef LayerBasedModel Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef LayerBasedModel Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Runtime information */
- itkTypeMacro(LayerBasedModel,Object);
+ itkTypeMacro(LayerBasedModel, Object);
/** New macro */
itkNewMacro(Self);
/** Layer typedef */
- typedef TLayer LayerType;
+ typedef TLayer LayerType;
/** Layer list typedef */
typedef otb::ObjectList<LayerType> LayerListType;
@@ -97,9 +97,8 @@ public:
virtual unsigned int GetNumberOfLayers(void);
/** Set/Get the layers stack */
- itkSetObjectMacro(Layers,LayerListType);
- itkGetObjectMacro(Layers,LayerListType);
-
+ itkSetObjectMacro(Layers, LayerListType);
+ itkGetObjectMacro(Layers, LayerListType);
protected:
/** Constructor */
@@ -111,14 +110,14 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Get the layer list (Convenience for subclasses) */
- itkGetConstObjectMacro(Layers,LayerListType);
+ itkGetConstObjectMacro(Layers, LayerListType);
private:
LayerBasedModel(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** Layer list */
- LayerListPointerType m_Layers;
+ LayerListPointerType m_Layers;
}; // end class
} // end namespace otb
@@ -128,5 +127,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Visualization/otbLayerBasedModel.txx b/Code/Visualization/otbLayerBasedModel.txx
index deab971ca6..32e6f78bbb 100644
--- a/Code/Visualization/otbLayerBasedModel.txx
+++ b/Code/Visualization/otbLayerBasedModel.txx
@@ -48,7 +48,7 @@ LayerBasedModel<TLayer>
m_Layers->PushBack(layer);
// Return the layer index
- return m_Layers->Size()-1;
+ return m_Layers->Size() - 1;
}
template <class TLayer>
@@ -58,7 +58,7 @@ LayerBasedModel<TLayer>
::GetLayer(unsigned int index)
{
// Check if not out of bound and return the ith element
- if(index >= m_Layers->Size())
+ if (index >= m_Layers->Size())
{
return NULL;
}
@@ -73,7 +73,7 @@ LayerBasedModel<TLayer>
::DeleteLayer(unsigned int index)
{
// Check if not out of bound and delete the ith element
- if(index >= m_Layers->Size())
+ if (index >= m_Layers->Size())
{
return false;
}
@@ -90,14 +90,14 @@ typename LayerBasedModel<TLayer>
LayerBasedModel<TLayer>
::GetLayerByName(std::string name)
{
- LayerType * resp = NULL;
+ LayerType * resp = NULL;
LayerIteratorType it = m_Layers->Begin();
- bool found = false;
+ bool found = false;
// Look for the layer named after name
- while(it!=m_Layers->End() && !found)
+ while (it != m_Layers->End() && !found)
{
- if(it.Get()->GetName() == name)
+ if (it.Get()->GetName() == name)
{
resp = it.Get();
found = true;
@@ -113,23 +113,23 @@ LayerBasedModel<TLayer>
::DeleteLayerByName(std::string name)
{
LayerIteratorType it = m_Layers->Begin();
- bool found = false;
- unsigned int index = 0;
+ bool found = false;
+ unsigned int index = 0;
// Look for the layer named after name
- while(it!=m_Layers->End() && !found)
+ while (it != m_Layers->End() && !found)
{
- if(it.Get()->GetName() == name)
+ if (it.Get()->GetName() == name)
{
found = true;
}
++index;
++it;
}
-
- if(found)
+
+ if (found)
{
- m_Layers->Erase(index-1);
+ m_Layers->Erase(index - 1);
}
return found;
}
@@ -158,7 +158,7 @@ LayerBasedModel<TLayer>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
// Call superclass implementation
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
} // end namespace otb
diff --git a/Code/Visualization/otbListenerBase.h b/Code/Visualization/otbListenerBase.h
index 778a34a3f6..f90ed481da 100644
--- a/Code/Visualization/otbListenerBase.h
+++ b/Code/Visualization/otbListenerBase.h
@@ -39,13 +39,13 @@ public:
protected:
/** Constructor */
- ListenerBase() {};
+ ListenerBase() {}
/** Destructor */
- virtual ~ListenerBase() {};
+ virtual ~ListenerBase() {}
private:
ListenerBase(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
diff --git a/Code/Visualization/otbMVCModel.h b/Code/Visualization/otbMVCModel.h
index 860cc4e848..052bd34dc8 100644
--- a/Code/Visualization/otbMVCModel.h
+++ b/Code/Visualization/otbMVCModel.h
@@ -35,9 +35,9 @@ class MVCModel
{
public:
/** Standard class typedefs */
- typedef MVCModel Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef MVCModel Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
// Define the listener type
@@ -49,7 +49,7 @@ public:
/** Register a new listener */
virtual bool RegisterListener(ListenerType * listener)
{
- return(m_RegisteredListeners.insert(listener).second);
+ return (m_RegisteredListeners.insert(listener).second);
}
/** Unregister a listener */
@@ -67,18 +67,18 @@ public:
virtual void NotifyAll()
{
for (typename ListenersSetType::iterator it = m_RegisteredListeners.begin();
- it!=m_RegisteredListeners.end();
+ it != m_RegisteredListeners.end();
++it)
- {
+ {
this->NotifyListener(*it);
- }
+ }
}
/** Notify changes to a given listerner */
virtual void NotifyListener(ListenerType * listener)
{
- listener->Notify();
- };
+ listener->Notify();
+ }
protected:
/** Constructor */
@@ -88,8 +88,7 @@ protected:
private:
MVCModel(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
+ void operator =(const Self&); //purposely not implemented
/** Registered liteners */
ListenersSetType m_RegisteredListeners;
diff --git a/Code/Visualization/otbMouseClickActionHandler.h b/Code/Visualization/otbMouseClickActionHandler.h
index e523be30c8..46a4961b0d 100644
--- a/Code/Visualization/otbMouseClickActionHandler.h
+++ b/Code/Visualization/otbMouseClickActionHandler.h
@@ -30,30 +30,30 @@ namespace otb
* \sa ImageWidgetActionHandler
*/
-template <class TModel,class TView>
+template <class TModel, class TView>
class MouseClickActionHandler
: public ImageWidgetActionHandler
{
public:
/** Standard class typedefs */
- typedef MouseClickActionHandler Self;
- typedef ImageWidgetActionHandler Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
+ typedef MouseClickActionHandler Self;
+ typedef ImageWidgetActionHandler Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
/** Method for creation through the object factory */
itkNewMacro(Self);
-
+
/** Runtime information */
- itkTypeMacro(MouseClickActionHandler,ImageWidgetActionHandler);
+ itkTypeMacro(MouseClickActionHandler, ImageWidgetActionHandler);
/** Model typedefs */
- typedef TModel ModelType;
- typedef typename ModelType::Pointer ModelPointerType;
+ typedef TModel ModelType;
+ typedef typename ModelType::Pointer ModelPointerType;
/** View typedefs */
- typedef TView ViewType;
- typedef typename ViewType::Pointer ViewPointerType;
+ typedef TView ViewType;
+ typedef typename ViewType::Pointer ViewPointerType;
/** Handle widget event
* \param widgetId The id of the moved widget
@@ -62,37 +62,37 @@ public:
*/
virtual bool HandleWidgetEvent(std::string widgetId, int event)
{
- if( m_View.IsNotNull() && m_Model.IsNotNull() && this->GetIsActive() )
+ if (m_View.IsNotNull() && m_Model.IsNotNull() && this->GetIsActive())
{
typename ViewType::ImageWidgetType::Pointer source;
- if(m_ActiveOnScrollWidget && widgetId == m_View->GetScrollWidget()->GetIdentifier() )
+ if (m_ActiveOnScrollWidget && widgetId == m_View->GetScrollWidget()->GetIdentifier())
{
source = m_View->GetScrollWidget();
}
- else if(m_ActiveOnFullWidget && widgetId == m_View->GetFullWidget()->GetIdentifier() )
+ else if (m_ActiveOnFullWidget && widgetId == m_View->GetFullWidget()->GetIdentifier())
{
source = m_View->GetFullWidget();
}
- else if(m_ActiveOnZoomWidget && widgetId == m_View->GetZoomWidget()->GetIdentifier() )
- {
- source = m_View->GetZoomWidget();
- }
+ else if (m_ActiveOnZoomWidget && widgetId == m_View->GetZoomWidget()->GetIdentifier())
+ {
+ source = m_View->GetZoomWidget();
+ }
- if(source.IsNotNull() && event == FL_PUSH && Fl::event_button() == m_MouseButton)
+ if (source.IsNotNull() && event == FL_PUSH && Fl::event_button() == m_MouseButton)
{
// Get the clicked index
typename ViewType::ImageWidgetType::PointType screenPoint, imagePoint;
screenPoint = source->GetMousePosition();
-
+
// Transform to image point
imagePoint = source->GetScreenToImageTransform()->TransformPoint(screenPoint);
// Transform to index
typename ViewType::IndexType index;
- index[0]=static_cast<int>(imagePoint[0]);
- index[1]=static_cast<int>(imagePoint[1]);
-
+ index[0] = static_cast<int>(imagePoint[0]);
+ index[1] = static_cast<int>(imagePoint[1]);
+
// Change scaled extract region center
m_Model->IndexClicked(index);
return true;
@@ -100,34 +100,35 @@ public:
}
return false;
}
-
+
/** Set/Get the pointer to the model */
- itkSetObjectMacro(Model,ModelType);
- itkGetObjectMacro(Model,ModelType);
+ itkSetObjectMacro(Model, ModelType);
+ itkGetObjectMacro(Model, ModelType);
/** Set/Get the pointer to the view */
- itkSetObjectMacro(View,ViewType);
- itkGetObjectMacro(View,ViewType);
+ itkSetObjectMacro(View, ViewType);
+ itkGetObjectMacro(View, ViewType);
/** Set the mouse button used (1 = left, 2 = center, 3 = right) */
- itkSetClampMacro(MouseButton,int,1,3);
- itkGetMacro(MouseButton,int);
+ itkSetClampMacro(MouseButton, int, 1, 3);
+ itkGetMacro(MouseButton, int);
- itkSetMacro(ActiveOnScrollWidget,bool);
- itkGetMacro(ActiveOnScrollWidget,bool);
+ itkSetMacro(ActiveOnScrollWidget, bool);
+ itkGetMacro(ActiveOnScrollWidget, bool);
itkBooleanMacro(ActiveOnScrollWidget);
- itkSetMacro(ActiveOnFullWidget,bool);
- itkGetMacro(ActiveOnFullWidget,bool);
+ itkSetMacro(ActiveOnFullWidget, bool);
+ itkGetMacro(ActiveOnFullWidget, bool);
itkBooleanMacro(ActiveOnFullWidget);
- itkSetMacro(ActiveOnZoomWidget,bool);
- itkGetMacro(ActiveOnZoomWidget,bool);
+ itkSetMacro(ActiveOnZoomWidget, bool);
+ itkGetMacro(ActiveOnZoomWidget, bool);
itkBooleanMacro(ActiveOnZoomWidget);
protected:
/** Constructor */
- MouseClickActionHandler() : m_View(), m_Model(), m_ActiveOnScrollWidget(true), m_ActiveOnFullWidget(true), m_ActiveOnZoomWidget(true), m_MouseButton(1)
+ MouseClickActionHandler() : m_View(), m_Model(), m_ActiveOnScrollWidget(true), m_ActiveOnFullWidget(true),
+ m_ActiveOnZoomWidget(true), m_MouseButton(1)
{
}
@@ -136,16 +137,16 @@ protected:
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
+
private:
MouseClickActionHandler(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
-
+ void operator =(const Self&); // purposely not implemented
+
// Pointer to the view
ViewPointerType m_View;
-
+
// Pointer to the model
ModelPointerType m_Model;
@@ -159,5 +160,3 @@ private:
}; // end class
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbMultiplyBlendingFunction.h b/Code/Visualization/otbMultiplyBlendingFunction.h
index 8771e4bef1..82b02f3fc2 100644
--- a/Code/Visualization/otbMultiplyBlendingFunction.h
+++ b/Code/Visualization/otbMultiplyBlendingFunction.h
@@ -32,64 +32,61 @@ namespace Function
* \f[ P_{o} = P_{i1} * P_{i2} / 255 \f]
* \ingroup Visualization
*/
- template <class TInputRGBPixel1, class TInputRGBPixel2 = TInputRGBPixel1, class TOutputRGBPixel = TInputRGBPixel1>
- class MultiplyBlendingFunction
- : public BlendingFunction<TInputRGBPixel1,TInputRGBPixel2,TOutputRGBPixel>
+template <class TInputRGBPixel1, class TInputRGBPixel2 = TInputRGBPixel1, class TOutputRGBPixel = TInputRGBPixel1>
+class MultiplyBlendingFunction
+ : public BlendingFunction<TInputRGBPixel1, TInputRGBPixel2, TOutputRGBPixel>
+{
+public:
+ /** Standard class typedefs */
+ typedef MultiplyBlendingFunction Self;
+ typedef BlendingFunction<TInputRGBPixel1,
+ TInputRGBPixel2,
+ TOutputRGBPixel> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ /** type macro */
+ itkTypeMacro(MultiplyBlendingFunction, BlendingFunction);
+
+ /** new macro */
+ itkNewMacro(Self);
+
+ /** PixelType macros */
+ typedef TInputRGBPixel1 InputPixel1Type;
+ typedef TInputRGBPixel2 InputPixel2Type;
+ typedef TOutputRGBPixel OutputRGBPixelType;
+ typedef typename OutputRGBPixelType::ValueType OutputValueType;
+
+ /** Evaluate method */
+ virtual const OutputRGBPixelType Evaluate(const InputPixel1Type& input1, const InputPixel2Type& input2)
{
- public:
- /** Standard class typedefs */
- typedef MultiplyBlendingFunction Self;
- typedef BlendingFunction<TInputRGBPixel1,
- TInputRGBPixel2,
- TOutputRGBPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- /** type macro */
- itkTypeMacro(MultiplyBlendingFunction,BlendingFunction);
-
- /** new macro */
- itkNewMacro(Self);
-
- /** PixelType macros */
- typedef TInputRGBPixel1 InputPixel1Type;
- typedef TInputRGBPixel2 InputPixel2Type;
- typedef TOutputRGBPixel OutputRGBPixelType;
- typedef typename OutputRGBPixelType::ValueType OutputValueType;
-
- /** Evaluate method */
- virtual const OutputRGBPixelType Evaluate(const InputPixel1Type& input1, const InputPixel2Type & input2)
- {
- OutputRGBPixelType resp;
- resp.SetRed( static_cast<OutputValueType>(
- vcl_floor( static_cast<double>(input1.GetRed())
- * static_cast<double>(input2.GetRed())/255 +0.5)
- ));
- resp.SetGreen(static_cast<OutputValueType>(
- vcl_floor( static_cast<double>(input1.GetGreen())
- * static_cast<double>(input2.GetGreen())/255+0.5)
- ));
- resp.SetBlue( static_cast<OutputValueType>(
- vcl_floor( static_cast<double>(input1.GetBlue())
- * static_cast<double>(input2.GetBlue())/255 +0.5)
- ));
- return resp;
- }
-
- protected:
- /** Constructor */
- MultiplyBlendingFunction() {}
- /** Destructor */
- virtual ~MultiplyBlendingFunction() {}
- private:
- MultiplyBlendingFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
-
-
- };
+ OutputRGBPixelType resp;
+ resp.SetRed(static_cast<OutputValueType>(
+ vcl_floor(static_cast<double>(input1.GetRed())
+ * static_cast<double>(input2.GetRed()) / 255 + 0.5)
+ ));
+ resp.SetGreen(static_cast<OutputValueType>(
+ vcl_floor(static_cast<double>(input1.GetGreen())
+ * static_cast<double>(input2.GetGreen()) / 255 + 0.5)
+ ));
+ resp.SetBlue(static_cast<OutputValueType>(
+ vcl_floor(static_cast<double>(input1.GetBlue())
+ * static_cast<double>(input2.GetBlue()) / 255 + 0.5)
+ ));
+ return resp;
+ }
+
+protected:
+ /** Constructor */
+ MultiplyBlendingFunction() {}
+ /** Destructor */
+ virtual ~MultiplyBlendingFunction() {}
+private:
+ MultiplyBlendingFunction(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
+
+};
} // end namespace Functor
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbPackedWidgetManager.cxx b/Code/Visualization/otbPackedWidgetManager.cxx
index 4d05b642fa..d5debd2a9a 100644
--- a/Code/Visualization/otbPackedWidgetManager.cxx
+++ b/Code/Visualization/otbPackedWidgetManager.cxx
@@ -32,7 +32,6 @@ PackedWidgetManager
delete m_PackedWidget;
}
-
void
PackedWidgetManager
::RegisterFullWidget(WidgetType* fullWidget)
@@ -40,11 +39,10 @@ PackedWidgetManager
m_InternalFullWidget = fullWidget;
m_PackedWidget->m_FullGroup->add(fullWidget);
m_PackedWidget->m_FullGroup->resizable(fullWidget);
- fullWidget->resize(m_PackedWidget->m_FullGroup->x(),m_PackedWidget->m_FullGroup->y(),
- m_PackedWidget->m_FullGroup->w(),m_PackedWidget->m_FullGroup->h());
+ fullWidget->resize(m_PackedWidget->m_FullGroup->x(), m_PackedWidget->m_FullGroup->y(),
+ m_PackedWidget->m_FullGroup->w(), m_PackedWidget->m_FullGroup->h());
}
-
void
PackedWidgetManager
::RegisterScrollWidget(WidgetType* scrollWidget)
@@ -52,8 +50,8 @@ PackedWidgetManager
m_InternalScrollWidget = scrollWidget;
m_PackedWidget->m_QuicklookGroup->add(scrollWidget);
m_PackedWidget->m_QuicklookGroup->resizable(scrollWidget);
- scrollWidget->resize(m_PackedWidget->m_QuicklookGroup->x(),m_PackedWidget->m_QuicklookGroup->y(),
- m_PackedWidget->m_QuicklookGroup->w(),m_PackedWidget->m_QuicklookGroup->h());
+ scrollWidget->resize(m_PackedWidget->m_QuicklookGroup->x(), m_PackedWidget->m_QuicklookGroup->y(),
+ m_PackedWidget->m_QuicklookGroup->w(), m_PackedWidget->m_QuicklookGroup->h());
}
@@ -64,8 +62,8 @@ PackedWidgetManager
m_InternalZoomWidget = zoomWidget;
m_PackedWidget->m_ZoomGroup->add(zoomWidget);
m_PackedWidget->m_ZoomGroup->resizable(zoomWidget);
- zoomWidget->resize(m_PackedWidget->m_ZoomGroup->x(),m_PackedWidget->m_ZoomGroup->y(),
- m_PackedWidget->m_ZoomGroup->w(),m_PackedWidget->m_ZoomGroup->h());
+ zoomWidget->resize(m_PackedWidget->m_ZoomGroup->x(), m_PackedWidget->m_ZoomGroup->y(),
+ m_PackedWidget->m_ZoomGroup->w(), m_PackedWidget->m_ZoomGroup->h());
}
void
PackedWidgetManager
@@ -74,8 +72,8 @@ PackedWidgetManager
m_IntenalPixelWidget = pixelWidget;
m_PackedWidget->m_PixelDescriptionGroup->add(pixelWidget);
m_PackedWidget->m_PixelDescriptionGroup->resizable(pixelWidget);
- pixelWidget->resize(m_PackedWidget->m_PixelDescriptionGroup->x(),m_PackedWidget->m_PixelDescriptionGroup->y(),
- m_PackedWidget->m_PixelDescriptionGroup->w(),m_PackedWidget->m_PixelDescriptionGroup->h());
+ pixelWidget->resize(m_PackedWidget->m_PixelDescriptionGroup->x(), m_PackedWidget->m_PixelDescriptionGroup->y(),
+ m_PackedWidget->m_PixelDescriptionGroup->w(), m_PackedWidget->m_PixelDescriptionGroup->h());
}
@@ -86,9 +84,9 @@ PackedWidgetManager
m_InternalCurveWidget = curveWidget;
m_PackedWidget->m_HistogramsGroup->add(curveWidget);
m_PackedWidget->m_HistogramsGroup->resizable(curveWidget);
- curveWidget->resize(m_PackedWidget->m_HistogramsGroup->x(),m_PackedWidget->m_HistogramsGroup->y(),
- m_PackedWidget->m_HistogramsGroup->w(),m_PackedWidget->m_HistogramsGroup->h());
- }
+ curveWidget->resize(m_PackedWidget->m_HistogramsGroup->x(), m_PackedWidget->m_HistogramsGroup->y(),
+ m_PackedWidget->m_HistogramsGroup->w(), m_PackedWidget->m_HistogramsGroup->h());
+}
void
PackedWidgetManager
@@ -100,7 +98,7 @@ PackedWidgetManager
m_InternalFullWidget->show();
m_InternalScrollWidget->show();
m_InternalZoomWidget->show();
- }
+}
void
PackedWidgetManager
@@ -113,11 +111,11 @@ void
PackedWidgetManager
::Refresh()
{
- m_InternalScrollWidget ->redraw();
- m_InternalFullWidget ->redraw();
- m_InternalZoomWidget->redraw();
- m_IntenalPixelWidget->redraw();
- m_InternalCurveWidget->redraw();
+ m_InternalScrollWidget->redraw();
+ m_InternalFullWidget->redraw();
+ m_InternalZoomWidget->redraw();
+ m_IntenalPixelWidget->redraw();
+ m_InternalCurveWidget->redraw();
}
void
diff --git a/Code/Visualization/otbPackedWidgetManager.h b/Code/Visualization/otbPackedWidgetManager.h
index 26197efd1e..84a5963cbc 100644
--- a/Code/Visualization/otbPackedWidgetManager.h
+++ b/Code/Visualization/otbPackedWidgetManager.h
@@ -23,32 +23,31 @@
#include <FL/Fl_Double_Window.H>
-
namespace otb
{
- /** \class PackedWidgetManager
- * \brief todo
- *
- * \ingroup Visualization
- */
-class PackedWidgetManager
- : public WidgetManager
+/** \class PackedWidgetManager
+ * \brief todo
+ *
+ * \ingroup Visualization
+ */
+class PackedWidgetManager
+ : public WidgetManager
{
- public:
+public:
/** Standard class typedefs */
- typedef PackedWidgetManager Self;
- typedef WidgetManager Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PackedWidgetManager Self;
+ typedef WidgetManager Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(PackedWidgetManager,WidgetManager);
+ itkTypeMacro(PackedWidgetManager, WidgetManager);
/** typedef of the fltk file defining all the widget needed*/
- typedef ImageWidgetPackedManager ImageWidgetPackedManagerType;
+ typedef ImageWidgetPackedManager ImageWidgetPackedManagerType;
/** Register Wigets*/
virtual void RegisterFullWidget(WidgetType* fullWidget);
@@ -62,7 +61,7 @@ class PackedWidgetManager
virtual void SetLabel(const char * label);
virtual void UnRegisterAll();
- protected:
+protected:
/** Constructor */
PackedWidgetManager();
@@ -71,15 +70,14 @@ class PackedWidgetManager
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
- private:
+private:
PackedWidgetManager(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
- ImageWidgetPackedManagerType* m_PackedWidget;
+ ImageWidgetPackedManagerType* m_PackedWidget;
};
}
diff --git a/Code/Visualization/otbPhaseFunctor.h b/Code/Visualization/otbPhaseFunctor.h
index 44c0cdd194..c6b9c273d7 100644
--- a/Code/Visualization/otbPhaseFunctor.h
+++ b/Code/Visualization/otbPhaseFunctor.h
@@ -22,109 +22,108 @@
namespace otb
{
- namespace Function
+namespace Function
+{
+/** \class PhaseFunctor
+* \brief Compute the module from the selected channel in the input
+*
+* \ingroup Visualization
+*
+* \sa AmplitudeFunctor ChannelSelectorFunctor
+*/
+template <class TInputPixel>
+class PhaseFunctor : public ChannelSelectorFunctor<TInputPixel>
+{
+public:
+ /** Standard class typedefs */
+ typedef PhaseFunctor Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+
+ /** Method for creation through the object factory */
+ itkNewMacro(Self);
+
+ /** Runtime information */
+ itkTypeMacro(PhaseFunctor, itk::Object);
+
+ typedef TInputPixel PixelType;
+ typedef typename itk::NumericTraits<PixelType>::ValueType ScalarType;
+ typedef itk::VariableLengthVector<ScalarType> VectorPixelType;
+ typedef itk::RGBPixel<ScalarType> RGBPixelType;
+ typedef itk::RGBAPixel<ScalarType> RGBAPixelType;
+
+ typedef VectorPixelType OutputPixelType;
+
+ /** Constructor */
+ PhaseFunctor()
{
- /** \class PhaseFunctor
- * \brief Compute the module from the selected channel in the input
- *
- * \ingroup Visualization
- *
- * \sa AmplitudeFunctor ChannelSelectorFunctor
- */
- template <class TInputPixel>
- class PhaseFunctor: public ChannelSelectorFunctor<TInputPixel>
- {
- public:
- /** Standard class typedefs */
- typedef PhaseFunctor Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
-
- /** Method for creation through the object factory */
- itkNewMacro(Self);
-
- /** Runtime information */
- itkTypeMacro(PhaseFunctor,itk::Object);
-
- typedef TInputPixel PixelType;
- typedef typename itk::NumericTraits<PixelType>::ValueType ScalarType;
- typedef itk::VariableLengthVector<ScalarType> VectorPixelType;
- typedef itk::RGBPixel<ScalarType> RGBPixelType;
- typedef itk::RGBAPixel<ScalarType> RGBAPixelType;
-
- typedef VectorPixelType OutputPixelType;
-
-
- /** Constructor */
- PhaseFunctor()
- {
- std::vector<unsigned int> channels;
- channels.push_back(0);
- channels.push_back(1);
- this->SetChannelList(channels);
- }
-
- /** Destructor */
- virtual ~PhaseFunctor() {}
-
- const char *GetDescription() const
- {return "Phase";}
-
- virtual unsigned int GetOutputSize() const
- {
- return 1;
- }
-
- virtual OutputPixelType operator()(const VectorPixelType & inPixel) const
- {
- OutputPixelType outPixel;
- outPixel.SetSize(1);
- assert( (this->GetChannelList()).size() == 2);
- assert((this->GetChannelList())[0] < inPixel.Size());
- assert((this->GetChannelList())[1] < inPixel.Size());
- outPixel[0] = ComputePhase(inPixel[(this->GetChannelList())[0]], inPixel[(this->GetChannelList())[1]]);
- return outPixel;
- }
-
- virtual OutputPixelType operator()(ScalarType /*inPixel*/) const
- {
- //FIXME we don't handle the std::complex<> yet
- itkExceptionMacro(<<"Can't compute amplitude from a scalar value");
- }
-
- virtual OutputPixelType operator()(const RGBPixelType & inPixel) const
- {
- OutputPixelType outPixel;
- outPixel.SetSize(1);
-
- assert((this->GetChannelList())[0] < 3);
- assert((this->GetChannelList())[1] < 3);
-
- outPixel[0] = ComputePhase(inPixel[(this->GetChannelList())[0]], inPixel[(this->GetChannelList())[1]]);
- return outPixel;
- }
-
- virtual OutputPixelType operator()(const RGBAPixelType & inPixel) const
- {
- OutputPixelType outPixel;
- outPixel.SetSize(1);
-
- assert((this->GetChannelList())[0] < 4);
- assert((this->GetChannelList())[1] < 4);
-
- outPixel[0] = ComputePhase(inPixel[(this->GetChannelList())[0]], inPixel[(this->GetChannelList())[1]]);
- return outPixel;
- }
-
- private:
- inline ScalarType ComputePhase(ScalarType a, ScalarType b) const
- {
- return vcl_atan2(b,a);
- }
-
- };
+ std::vector<unsigned int> channels;
+ channels.push_back(0);
+ channels.push_back(1);
+ this->SetChannelList(channels);
}
+
+ /** Destructor */
+ virtual ~PhaseFunctor() {}
+
+ const char *GetDescription() const
+ {return "Phase"; }
+
+ virtual unsigned int GetOutputSize() const
+ {
+ return 1;
+ }
+
+ virtual OutputPixelType operator ()(const VectorPixelType& inPixel) const
+ {
+ OutputPixelType outPixel;
+ outPixel.SetSize(1);
+ assert((this->GetChannelList()).size() == 2);
+ assert((this->GetChannelList())[0] < inPixel.Size());
+ assert((this->GetChannelList())[1] < inPixel.Size());
+ outPixel[0] = ComputePhase(inPixel[(this->GetChannelList())[0]], inPixel[(this->GetChannelList())[1]]);
+ return outPixel;
+ }
+
+ virtual OutputPixelType operator ()(ScalarType /*inPixel*/) const
+ {
+ //FIXME we don't handle the std::complex<> yet
+ itkExceptionMacro(<< "Can't compute amplitude from a scalar value");
+ }
+
+ virtual OutputPixelType operator ()(const RGBPixelType& inPixel) const
+ {
+ OutputPixelType outPixel;
+ outPixel.SetSize(1);
+
+ assert((this->GetChannelList())[0] < 3);
+ assert((this->GetChannelList())[1] < 3);
+
+ outPixel[0] = ComputePhase(inPixel[(this->GetChannelList())[0]], inPixel[(this->GetChannelList())[1]]);
+ return outPixel;
+ }
+
+ virtual OutputPixelType operator ()(const RGBAPixelType& inPixel) const
+ {
+ OutputPixelType outPixel;
+ outPixel.SetSize(1);
+
+ assert((this->GetChannelList())[0] < 4);
+ assert((this->GetChannelList())[1] < 4);
+
+ outPixel[0] = ComputePhase(inPixel[(this->GetChannelList())[0]], inPixel[(this->GetChannelList())[1]]);
+ return outPixel;
+ }
+
+private:
+ inline ScalarType ComputePhase(ScalarType a, ScalarType b) const
+ {
+ return vcl_atan2(b, a);
+ }
+
+};
+}
}
#endif
diff --git a/Code/Visualization/otbPixelDescriptionActionHandler.h b/Code/Visualization/otbPixelDescriptionActionHandler.h
index 96f870806f..5a8bf1eb34 100644
--- a/Code/Visualization/otbPixelDescriptionActionHandler.h
+++ b/Code/Visualization/otbPixelDescriptionActionHandler.h
@@ -36,21 +36,21 @@ class PixelDescriptionActionHandler
{
public:
/** Standard class typedefs */
- typedef PixelDescriptionActionHandler Self;
- typedef ImageWidgetActionHandler Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PixelDescriptionActionHandler Self;
+ typedef ImageWidgetActionHandler Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(PixelDescriptionActionHandler,ImageWidgetActionHandler);
+ itkTypeMacro(PixelDescriptionActionHandler, ImageWidgetActionHandler);
/** Model typedefs */
- typedef TModel ModelType;
- typedef typename ModelType::Pointer ModelPointerType;
- typedef typename ModelType::IndexType IndexType;
+ typedef TModel ModelType;
+ typedef typename ModelType::Pointer ModelPointerType;
+ typedef typename ModelType::IndexType IndexType;
/** View typedef */
typedef TView ViewType;
@@ -58,45 +58,45 @@ public:
typedef typename ViewType::OffsetType OffsetType;
typedef typename ViewType::ImageWidgetPointerType WidgetPointerType;
- /** Handle widget event
- */
+ /** Handle widget event
+ */
virtual bool HandleWidgetEvent(std::string widgetId, int event)
{
- if(m_Model.IsNotNull() && m_View.IsNotNull() && this->GetIsActive())
+ if (m_Model.IsNotNull() && m_View.IsNotNull() && this->GetIsActive())
{
// Find the source widget
WidgetPointerType sourceWidget;
- bool handle = false;
- if(widgetId == m_View->GetScrollWidget()->GetIdentifier() )
+ bool handle = false;
+ if (widgetId == m_View->GetScrollWidget()->GetIdentifier())
{
sourceWidget = m_View->GetScrollWidget();
handle = true;
}
- else if(widgetId == m_View->GetFullWidget()->GetIdentifier() )
+ else if (widgetId == m_View->GetFullWidget()->GetIdentifier())
{
sourceWidget = m_View->GetFullWidget();
handle = true;
}
- else if(widgetId == m_View->GetZoomWidget()->GetIdentifier() )
+ else if (widgetId == m_View->GetZoomWidget()->GetIdentifier())
{
sourceWidget = m_View->GetZoomWidget();
handle = true;
}
- if(handle)
+ if (handle)
{
- switch(event)
+ switch (event)
{
- case FL_ENTER:
+ case FL_ENTER:
{
return true;
break;
}
- case FL_LEAVE:
+ case FL_LEAVE:
{
return true;
break;
}
- case FL_MOVE:
+ case FL_MOVE:
{
// Get the clicked index
typename ViewType::ImageWidgetType::PointType screenPoint, imagePoint;
@@ -107,8 +107,8 @@ public:
// Transform to index
typename ViewType::IndexType index;
- index[0]=static_cast<int>(imagePoint[0]);
- index[1]=static_cast<int>(imagePoint[1]);
+ index[0] = static_cast<int>(imagePoint[0]);
+ index[1] = static_cast<int>(imagePoint[1]);
//Add the offset
index += m_Offset;
@@ -119,7 +119,7 @@ public:
return true;
break;
}
- default:
+ default:
{
break;
}
@@ -130,16 +130,16 @@ public:
}
/** Set/Get the pointer to the model */
- itkSetObjectMacro(Model,ModelType);
- itkGetObjectMacro(Model,ModelType);
+ itkSetObjectMacro(Model, ModelType);
+ itkGetObjectMacro(Model, ModelType);
- /** Set/Get the pointer to the view */
- itkSetObjectMacro(View,ViewType);
- itkGetObjectMacro(View,ViewType);
+ /** Set/Get the pointer to the view */
+ itkSetObjectMacro(View, ViewType);
+ itkGetObjectMacro(View, ViewType);
/** Set/Get Offset */
- itkSetMacro(Offset,OffsetType);
- itkGetMacro(Offset,OffsetType);
+ itkSetMacro(Offset, OffsetType);
+ itkGetMacro(Offset, OffsetType);
protected:
/** Constructor */
@@ -153,15 +153,15 @@ protected:
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
PixelDescriptionActionHandler(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
//Offset
- OffsetType m_Offset;
+ OffsetType m_Offset;
// Pointer to the view
ViewPointerType m_View;
@@ -172,5 +172,3 @@ private:
}; // end class
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbPixelDescriptionModel.h b/Code/Visualization/otbPixelDescriptionModel.h
index 8a38103d90..c3fb195248 100644
--- a/Code/Visualization/otbPixelDescriptionModel.h
+++ b/Code/Visualization/otbPixelDescriptionModel.h
@@ -33,31 +33,31 @@ namespace otb
* \ingroup Visualization
*/
-template <class TOutputImage >
+template <class TOutputImage>
class PixelDescriptionModel
- : public MVCModel<PixelDescriptionModelListener>, public LayerBasedModel< ImageLayerBase< TOutputImage > >
+ : public MVCModel<PixelDescriptionModelListener>, public LayerBasedModel<ImageLayerBase<TOutputImage> >
{
public:
/** Standard class typedefs */
- typedef PixelDescriptionModel Self;
- typedef LayerBasedModel< ImageLayerBase<TOutputImage > > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PixelDescriptionModel Self;
+ typedef LayerBasedModel<ImageLayerBase<TOutputImage> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Runtime information */
- itkTypeMacro(PixelDescriptionModel,LayerBasedModel);
+ itkTypeMacro(PixelDescriptionModel, LayerBasedModel);
/** New macro */
itkNewMacro(Self);
- /** Layer typedef */
+ /** Layer typedef */
typedef typename Superclass::LayerType LayerType;
/** We assume that TLayer is has an IndexType definition */
- typedef typename LayerType::IndexType IndexType;
+ typedef typename LayerType::IndexType IndexType;
- /** Listener typedef */
- typedef PixelDescriptionModelListener ListenerType;
+ /** Listener typedef */
+ typedef PixelDescriptionModelListener ListenerType;
/** Get/Set the viewer name */
itkGetStringMacro(PixelDescription);
@@ -66,7 +66,7 @@ public:
void ClearPixelDescription();
/** Update the pixel description */
- void UpdatePixelDescription(const IndexType & index);
+ void UpdatePixelDescription(const IndexType& index);
protected:
/** Constructor */
@@ -78,11 +78,11 @@ protected:
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Notify a registered listener */
- void NotifyListener(ListenerType * listener);
+ void NotifyListener(ListenerType * listener);
private:
PixelDescriptionModel(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** The pixel description */
std::string m_PixelDescription;
@@ -95,5 +95,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Visualization/otbPixelDescriptionModel.txx b/Code/Visualization/otbPixelDescriptionModel.txx
index f40d94c5da..f666eed9a6 100644
--- a/Code/Visualization/otbPixelDescriptionModel.txx
+++ b/Code/Visualization/otbPixelDescriptionModel.txx
@@ -47,20 +47,20 @@ PixelDescriptionModel<TOutputImage>
template <class TOutputImage>
void
PixelDescriptionModel<TOutputImage>
-::UpdatePixelDescription(const IndexType & index)
+::UpdatePixelDescription(const IndexType& index)
{
// The output stringstream
itk::OStringStream oss;
- oss<< otbGetTextMacro("Index") << ": "<<index<<std::endl;
+ oss << otbGetTextMacro("Index") << ": " << index << std::endl;
// Report pixel info for each visible layer
- for(typename Superclass::LayerIteratorType it = this->GetLayers()->Begin();
- it != this->GetLayers()->End(); ++it)
+ for (typename Superclass::LayerIteratorType it = this->GetLayers()->Begin();
+ it != this->GetLayers()->End(); ++it)
{
// If the layer is visible
- if(it.Get()->GetVisible())
+ if (it.Get()->GetVisible())
{
// Get the pixel description
- oss<<it.Get()->GetPixelDescription(index)<<std::endl;
+ oss << it.Get()->GetPixelDescription(index) << std::endl;
}
}
m_PixelDescription = oss.str();
@@ -74,7 +74,7 @@ void
PixelDescriptionModel<TOutputImage>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
template <class TOutputImage>
diff --git a/Code/Visualization/otbPixelDescriptionModelListener.h b/Code/Visualization/otbPixelDescriptionModelListener.h
index 138e0db1d6..f3b35f9bc8 100644
--- a/Code/Visualization/otbPixelDescriptionModelListener.h
+++ b/Code/Visualization/otbPixelDescriptionModelListener.h
@@ -38,13 +38,13 @@ public:
protected:
/** Constructor */
- PixelDescriptionModelListener() {};
+ PixelDescriptionModelListener() {}
/** Destructor */
- virtual ~PixelDescriptionModelListener() {};
+ virtual ~PixelDescriptionModelListener() {}
private:
PixelDescriptionModelListener(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
diff --git a/Code/Visualization/otbPixelDescriptionView.h b/Code/Visualization/otbPixelDescriptionView.h
index db7b1b1e45..6cfa81c84e 100644
--- a/Code/Visualization/otbPixelDescriptionView.h
+++ b/Code/Visualization/otbPixelDescriptionView.h
@@ -33,29 +33,29 @@ namespace otb
* \ingroup Visualization
*/
-template <class TModel >
+template <class TModel>
class PixelDescriptionView
: public PixelDescriptionModelListener, public itk::Object
{
public:
/** Standard class typedefs */
- typedef PixelDescriptionView Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef PixelDescriptionView Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(PixelDescriptionView,itk::Object);
+ itkTypeMacro(PixelDescriptionView, itk::Object);
/** Model typedef */
- typedef TModel ModelType;
- typedef typename ModelType::Pointer ModelPointerType;
+ typedef TModel ModelType;
+ typedef typename ModelType::Pointer ModelPointerType;
/** Pixel description widget typedef */
- typedef Fl_Multiline_Output PixelDescriptionWidgetType;
+ typedef Fl_Multiline_Output PixelDescriptionWidgetType;
/**
* This method unregister with previous model if any, and
@@ -74,7 +74,7 @@ public:
return m_PixelDescriptionWidget;
}
- protected:
+protected:
/** Constructor */
PixelDescriptionView();
/** Destructor */
@@ -85,13 +85,13 @@ public:
private:
PixelDescriptionView(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** The description widget */
PixelDescriptionWidgetType * m_PixelDescriptionWidget;
/** Model pointer */
- ModelPointerType m_Model;
+ ModelPointerType m_Model;
}; // end class
} // end namespace otb
@@ -101,5 +101,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Visualization/otbPixelDescriptionView.txx b/Code/Visualization/otbPixelDescriptionView.txx
index b0cafba845..7b5e328c43 100644
--- a/Code/Visualization/otbPixelDescriptionView.txx
+++ b/Code/Visualization/otbPixelDescriptionView.txx
@@ -22,35 +22,35 @@
namespace otb
{
-template < class TInputPixelDescription >
+template <class TInputPixelDescription>
PixelDescriptionView<TInputPixelDescription>
::PixelDescriptionView() : m_PixelDescriptionWidget(NULL), m_Model()
{
// build a widget with a default size
- m_PixelDescriptionWidget = new Fl_Multiline_Output(0,0,200,40);
+ m_PixelDescriptionWidget = new Fl_Multiline_Output(0, 0, 200, 40);
m_PixelDescriptionWidget->textsize(10);
m_PixelDescriptionWidget->textfont(FL_SCREEN);
m_PixelDescriptionWidget->deactivate();
}
-template < class TInputPixelDescription >
+template <class TInputPixelDescription>
PixelDescriptionView<TInputPixelDescription>
::~PixelDescriptionView()
{
- if(m_PixelDescriptionWidget != NULL)
+ if (m_PixelDescriptionWidget != NULL)
{
// delete m_PixelDescriptionWidget;//FIXME
- //NOTE segfault with the previous line, why?
+ //NOTE segfault with the previous line, why?
}
}
-template < class TInputPixelDescription >
+template <class TInputPixelDescription>
void
PixelDescriptionView<TInputPixelDescription>
::SetModel(ModelType * model)
{
// Unregister from previous model if nay
- if(m_Model.IsNotNull())
+ if (m_Model.IsNotNull())
{
m_Model->UnRegisterListener(this);
}
@@ -60,8 +60,7 @@ PixelDescriptionView<TInputPixelDescription>
m_Model->RegisterListener(this);
}
-
-template < class TInputPixelDescription >
+template <class TInputPixelDescription>
void
PixelDescriptionView<TInputPixelDescription>
::Notify()
@@ -69,7 +68,7 @@ PixelDescriptionView<TInputPixelDescription>
this->Update();
}
-template < class TInputPixelDescription >
+template <class TInputPixelDescription>
void
PixelDescriptionView<TInputPixelDescription>
::Update()
diff --git a/Code/Visualization/otbRegionGlComponent.h b/Code/Visualization/otbRegionGlComponent.h
index 0e8e8e2153..f322232967 100644
--- a/Code/Visualization/otbRegionGlComponent.h
+++ b/Code/Visualization/otbRegionGlComponent.h
@@ -33,11 +33,11 @@ class RegionGlComponent
{
public:
/** Standard class typedefs */
- typedef RegionGlComponent Self;
- typedef GlComponent Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef itk::ImageRegion<2> RegionType;
+ typedef RegionGlComponent Self;
+ typedef GlComponent Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::ImageRegion<2> RegionType;
// affine transform
typedef Superclass::AffineTransformType AffineTransformType;
@@ -46,21 +46,21 @@ public:
typedef Superclass::ColorType ColorType;
/** Runtime information */
- itkTypeMacro(RegionGlComponent,GlComponent);
+ itkTypeMacro(RegionGlComponent, GlComponent);
/** New macro */
itkNewMacro(Self);
/// Render the curve according to display extent and axis characteristics
- virtual void Render(const RegionType& /*extent*/,const AffineTransformType * space2ScreenTransform)
+ virtual void Render(const RegionType& /*extent*/, const AffineTransformType * space2ScreenTransform)
{
- PointType ip1, ip2, sp1,sp2;
+ PointType ip1, ip2, sp1, sp2;
// Get the input region points
- ip1[0]=m_Region.GetIndex()[0]+1;
- ip1[1]=m_Region.GetIndex()[1]+1;
- ip2[0]=m_Region.GetIndex()[0] + m_Region.GetSize()[0]-1;
- ip2[1]=m_Region.GetIndex()[1] + m_Region.GetSize()[1]-1;
+ ip1[0] = m_Region.GetIndex()[0] + 1;
+ ip1[1] = m_Region.GetIndex()[1] + 1;
+ ip2[0] = m_Region.GetIndex()[0] + m_Region.GetSize()[0] - 1;
+ ip2[1] = m_Region.GetIndex()[1] + m_Region.GetSize()[1] - 1;
// Convert to screen points
sp1 = space2ScreenTransform->TransformPoint(ip1);
@@ -69,25 +69,25 @@ public:
// draw the box
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4d(m_Color[0],m_Color[1],m_Color[2],m_Color[3]);
+ glColor4d(m_Color[0], m_Color[1], m_Color[2], m_Color[3]);
glBegin(GL_LINE_LOOP);
- glVertex2d(sp1[0],sp1[1]);
- glVertex2d(sp1[0],sp2[1]);
- glVertex2d(sp2[0],sp2[1]);
- glVertex2d(sp2[0],sp1[1]);
+ glVertex2d(sp1[0], sp1[1]);
+ glVertex2d(sp1[0], sp2[1]);
+ glVertex2d(sp2[0], sp2[1]);
+ glVertex2d(sp2[0], sp1[1]);
glEnd();
glDisable(GL_BLEND);
}
/** Set/Get the region to render */
- itkSetMacro(Region,RegionType);
- itkGetConstReferenceMacro(Region,RegionType);
+ itkSetMacro(Region, RegionType);
+ itkGetConstReferenceMacro(Region, RegionType);
/** Set/Get the color of the region to render */
- itkSetMacro(Color,ColorType);
- itkGetConstReferenceMacro(Color,ColorType);
+ itkSetMacro(Color, ColorType);
+ itkGetConstReferenceMacro(Color, ColorType);
protected:
/** Constructor */
@@ -96,28 +96,26 @@ protected:
m_Color.Fill(0);
m_Color[0] = 1.;
m_Color[3] = 1.;
-}
+ }
/** Destructor */
virtual ~RegionGlComponent(){}
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
RegionGlComponent(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
// The region to render
RegionType m_Region;
// The color of the region to render
- ColorType m_Color;
+ ColorType m_Color;
}; // end class
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbRenderingFunction.h b/Code/Visualization/otbRenderingFunction.h
index 568cba31b3..2ce84299d3 100644
--- a/Code/Visualization/otbRenderingFunction.h
+++ b/Code/Visualization/otbRenderingFunction.h
@@ -44,7 +44,7 @@ namespace Function
* subclassed.
* \ingroup Visualization
*/
-template <class TPixel, class TRGBPixel >
+template <class TPixel, class TRGBPixel>
class RenderingFunction
: public itk::Object
{
@@ -56,7 +56,7 @@ public:
typedef itk::SmartPointer<const Self> ConstPointer;
/** type macro */
- itkTypeMacro(RenderingFunction,Object);
+ itkTypeMacro(RenderingFunction, Object);
/** PixelType macros */
typedef TRGBPixel OutputPixelType;
@@ -68,69 +68,66 @@ public:
typedef typename itk::NumericTraits<ScalarType>::RealType RealScalarType;
typedef itk::VariableLengthVector<RealScalarType> InternalPixelType;
+ typedef itk::VariableLengthVector<ScalarType> SampleType;
+ typedef itk::Statistics::ListSample<SampleType> ListSampleType;
+ typedef typename ListSampleType::Pointer ListSamplePointerType;
- typedef itk::VariableLengthVector<ScalarType> SampleType;
- typedef itk::Statistics::ListSample<SampleType> ListSampleType;
- typedef typename ListSampleType::Pointer ListSamplePointerType;
-
- typedef itk::Statistics::DenseFrequencyContainer DFContainerType;
+ typedef itk::Statistics::DenseFrequencyContainer DFContainerType;
typedef otb::ListSampleToHistogramListGenerator
- <ListSampleType,ScalarType,DFContainerType> HistogramFilterType;
+ <ListSampleType, ScalarType, DFContainerType> HistogramFilterType;
typedef itk::Statistics::Histogram<
- RealScalarType,1,DFContainerType> HistogramType;
- typedef typename HistogramType::Pointer HistogramPointerType;
- typedef ObjectList<HistogramType> HistogramListType;
- typedef typename HistogramListType::Pointer HistogramListPointerType;
+ RealScalarType, 1, DFContainerType> HistogramType;
+ typedef typename HistogramType::Pointer HistogramPointerType;
+ typedef ObjectList<HistogramType> HistogramListType;
+ typedef typename HistogramListType::Pointer HistogramListPointerType;
itkConceptMacro(SameTypeCheck,
- (itk::Concept::SameType<typename HistogramFilterType::HistogramType, HistogramType>));
-
-
- typedef itk::Array< double > ParametersType;
+ (itk::Concept::SameType<typename HistogramFilterType::HistogramType, HistogramType>));
+ typedef itk::Array<double> ParametersType;
/** Evaluate method: required interface */
- virtual OutputPixelType Evaluate(const PixelType & spixel) const
+ virtual OutputPixelType Evaluate(const PixelType& spixel) const
{
return EvaluateTransferFunction(EvaluatePixelRepresentation(spixel));
}
/** Get a string description of a pixel: required interface */
- virtual const std::string Describe(const PixelType & spixel) const = 0;
+ virtual const std::string Describe(const PixelType& spixel) const = 0;
/** Evaluate pixel representation: required interface */
- virtual InternalPixelType EvaluatePixelRepresentation(const PixelType & spixel) const = 0;//FIXME pure virtual or exception?
+ virtual InternalPixelType EvaluatePixelRepresentation(const PixelType& spixel) const = 0; //FIXME pure virtual or exception?
/** Return the Pixel representation size: required interface*/
- virtual unsigned int GetPixelRepresentationSize() const = 0;//FIXME pure virtual or exception?
+ virtual unsigned int GetPixelRepresentationSize() const = 0; //FIXME pure virtual or exception?
/** Evaluate transfer function: this is part of the required interface */
- virtual OutputPixelType EvaluateTransferFunction(const InternalPixelType & spixel) const = 0;//FIXME pure virtual or exception?
+ virtual OutputPixelType EvaluateTransferFunction(const InternalPixelType& spixel) const = 0; //FIXME pure virtual or exception?
/** Set the Rendering function parameters: optional interface */
- virtual void SetParameters( const ParametersType & )
+ virtual void SetParameters(const ParametersType&)
{
- itkExceptionMacro(<<"Subclasses should override this method");
+ itkExceptionMacro(<< "Subclasses should override this method");
}
virtual ParametersType GetParameters() const
{
- itkExceptionMacro(<<"Subclasses should override this method");
+ itkExceptionMacro(<< "Subclasses should override this method");
}
virtual void SetChannelList(std::vector<unsigned int>& /*channels*/)
{
- itkExceptionMacro(<<"Subclasses should override this method");
+ itkExceptionMacro(<< "Subclasses should override this method");
}
virtual std::vector<unsigned int> GetChannelList()
{
- itkExceptionMacro(<<"Subclasses should override this method");
+ itkExceptionMacro(<< "Subclasses should override this method");
}
virtual void SetAutoMinMax(bool /*autoMinMax*/)
{
- itkExceptionMacro(<<"Subclasses should override this method");
+ itkExceptionMacro(<< "Subclasses should override this method");
}
/** Get the histogram of the pixel representation generated from the sample list */
@@ -143,22 +140,20 @@ public:
/** Set the sample list */
virtual void SetListSample(ListSamplePointerType listSample)
{
- if ( this->m_ListSample != listSample)
- {
+ if (this->m_ListSample != listSample)
+ {
m_ListSample = listSample;
this->Modified();
- }
+ }
}
-
/** This method is available to allow implementation of
* preprocessing.
*/
// REVIEW: I agree, we should not be calling intialize ourselve, it
// would better be seamless
- virtual void Initialize(){};//FIXME should disappear and be
- //automatic (IsModified())
-
+ virtual void Initialize(){} //FIXME should disappear and be
+ //automatic (IsModified())
protected:
/** Constructor */
@@ -172,22 +167,21 @@ protected:
virtual void RenderHistogram()
{
- int m_NumberOfHistogramBins=255;//FIXME is it to be accessed from outside?
- if(m_ListSample.IsNull())
- {
- itkExceptionMacro(<<"No listSample provided to render histogram");
- }
- // Create the histogram generation filter
+ int m_NumberOfHistogramBins = 255; //FIXME is it to be accessed from outside?
+ if (m_ListSample.IsNull())
+ {
+ itkExceptionMacro(<< "No listSample provided to render histogram");
+ }
+ // Create the histogram generation filter
ListSamplePointerType pixelRepresentationListSample = ListSampleType::New();
for (typename ListSampleType::ConstIterator it = m_ListSample->Begin(); it != m_ListSample->End(); ++it)
- {
+ {
PixelType sample;
VisualizationPixelTraits::Convert(it.GetMeasurementVector(), sample);
SampleType sampleVector;
VisualizationPixelTraits::Convert(this->EvaluatePixelRepresentation(sample), sampleVector);
pixelRepresentationListSample->PushBack(sampleVector);
- }
-
+ }
typename HistogramFilterType::Pointer histogramFilter = HistogramFilterType::New();
histogramFilter->SetListSample(pixelRepresentationListSample);
@@ -196,27 +190,24 @@ protected:
// Generate
histogramFilter->Update();
- otbMsgDevMacro(<<"ImageRenderingFunction::RenderHistogram(): Histogram has been updated");
+ otbMsgDevMacro(<< "ImageRenderingFunction::RenderHistogram(): Histogram has been updated");
// Retrieve the histogram
m_HistogramList = histogramFilter->GetOutput();
}
-
- ListSamplePointerType GetListSample()
- {
- return m_ListSample;
- }
+ ListSamplePointerType GetListSample()
+ {
+ return m_ListSample;
+ }
private:
RenderingFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
HistogramListPointerType m_HistogramList;
- ListSamplePointerType m_ListSample;
+ ListSamplePointerType m_ListSample;
};
} // end namespace Function
} // end namepsace otb
#endif
-
-
diff --git a/Code/Visualization/otbRenderingImageFilter.h b/Code/Visualization/otbRenderingImageFilter.h
index 5671e15d0c..7aa7f767a6 100644
--- a/Code/Visualization/otbRenderingImageFilter.h
+++ b/Code/Visualization/otbRenderingImageFilter.h
@@ -50,18 +50,18 @@ class RenderingFunctor
{
public:
/** Rendering function typedef */
- typedef otb::Function::RenderingFunction<TPixel,TRGBPixel> RenderingFunctionType;
+ typedef otb::Function::RenderingFunction<TPixel, TRGBPixel> RenderingFunctionType;
/** Rendering function pointer typedef */
- typedef typename RenderingFunctionType::Pointer RenderingFunctionPointerType;
+ typedef typename RenderingFunctionType::Pointer RenderingFunctionPointerType;
/** Default rendering function typedef */
- typedef TPixel PixelType;
- typedef typename itk::NumericTraits<PixelType>::ValueType ScalarPixelType;
- typedef itk::VariableLengthVector<ScalarPixelType> VectorPixelType;
- typedef itk::RGBPixel<ScalarPixelType> RGBPixelType;
- typedef itk::RGBAPixel<ScalarPixelType> RGBAPixelType;
+ typedef TPixel PixelType;
+ typedef typename itk::NumericTraits<PixelType>::ValueType ScalarPixelType;
+ typedef itk::VariableLengthVector<ScalarPixelType> VectorPixelType;
+ typedef itk::RGBPixel<ScalarPixelType> RGBPixelType;
+ typedef itk::RGBAPixel<ScalarPixelType> RGBAPixelType;
/** Pixel operator */
- inline TRGBPixel operator()(const PixelType & pixel) const
+ inline TRGBPixel operator ()(const PixelType& pixel) const
{
return m_Function->Evaluate(pixel);
}
@@ -115,33 +115,33 @@ private:
* \sa RenderingFunction
*
*/
-template <class TInputImage, class TOutputImage = Image<itk::RGBAPixel<unsigned char>, 2 > >
+template <class TInputImage, class TOutputImage = Image<itk::RGBAPixel<unsigned char>, 2> >
class RenderingImageFilter
- : public itk::UnaryFunctorImageFilter<TInputImage,TOutputImage,
+ : public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage,
Functor::RenderingFunctor
- < typename TInputImage ::PixelType,
- typename TOutputImage::PixelType > >
+ <typename TInputImage::PixelType,
+ typename TOutputImage::PixelType> >
{
public:
/** Standard typedefs */
- typedef RenderingImageFilter Self;
+ typedef RenderingImageFilter Self;
typedef itk::UnaryFunctorImageFilter
- <TInputImage,TOutputImage, Functor::RenderingFunctor
- < typename TInputImage ::PixelType,
- typename TOutputImage::PixelType > > Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ <TInputImage, TOutputImage, Functor::RenderingFunctor
+ <typename TInputImage::PixelType,
+ typename TOutputImage::PixelType> > Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Type macro */
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(RenderingImageFilter,itk::UnaryFunctorImageFilter);
+ itkTypeMacro(RenderingImageFilter, itk::UnaryFunctorImageFilter);
/** Rendering function typedef */
typedef Functor::RenderingFunctor
- < typename TInputImage ::PixelType,
- typename TOutputImage::PixelType > RenderingFunctorType;
+ <typename TInputImage::PixelType,
+ typename TOutputImage::PixelType> RenderingFunctorType;
typedef typename RenderingFunctorType::RenderingFunctionType RenderingFunctionType;
/**
@@ -154,7 +154,6 @@ public:
this->Modified();
}
-
/**
* Get the rendering function
* \return The rendering function.
@@ -162,9 +161,9 @@ public:
RenderingFunctionType * GetRenderingFunction(void)
{
if (this->GetFunctor().GetFunction() == NULL)
- {
+ {
this->SetDefaultRenderingFunction();
- }
+ }
return this->GetFunctor().GetFunction();
}
@@ -177,55 +176,55 @@ public:
Superclass::BeforeThreadedGenerateData();
if (this->GetFunctor().GetFunction() == NULL)
- {
- otbMsgDevMacro(<<"RenderingFunction set to default");
+ {
+ otbMsgDevMacro(<< "RenderingFunction set to default");
this->SetDefaultRenderingFunction();
- }
+ }
// Initialize the rendering function
this->GetFunctor().InitializeFunction();
- otbMsgDevMacro(<<"RenderingImageFilter::BeforeThreadedGenerateData():");
+ otbMsgDevMacro(<< "RenderingImageFilter::BeforeThreadedGenerateData():");
otbMsgDevMacro(<< " - Output functor size "
- << (this->GetFunctor().GetFunction())->GetPixelRepresentationSize());
- otbMsgDevMacro(<<"Rendering Funtion:" << this->GetFunctor().GetFunction());
+ << (this->GetFunctor().GetFunction())->GetPixelRepresentationSize());
+ otbMsgDevMacro(<< "Rendering Funtion:" << this->GetFunctor().GetFunction());
//Check if the rendering function channels are compatible with the image
//might want to be more generic here one day.
// unsigned int numberOfInputChannels = this->GetInput()->GetNumberOfComponentsPerPixel();
- itk::ImageRegionConstIterator<TInputImage> it(this->GetInput(),this->GetInput()->GetBufferedRegion());
- unsigned int numberOfInputChannels = VisualizationPixelTraits::PixelSize(it.Get());
- std::vector<unsigned int> channels = (this->GetFunctor().GetFunction())->GetChannelList();
- for (unsigned int i=0; i<channels.size(); ++i)
- {
- if(channels[i] >= numberOfInputChannels)
+ itk::ImageRegionConstIterator<TInputImage> it(this->GetInput(), this->GetInput()->GetBufferedRegion());
+ unsigned int numberOfInputChannels = VisualizationPixelTraits::PixelSize(it.Get());
+ std::vector<unsigned int> channels = (this->GetFunctor().GetFunction())->GetChannelList();
+ for (unsigned int i = 0; i < channels.size(); ++i)
{
- itkExceptionMacro(<<"Channels specified as input (" << channels[i] << ") is not compatible "
- << "with the size of the image: " << numberOfInputChannels);
+ if (channels[i] >= numberOfInputChannels)
+ {
+ itkExceptionMacro(<< "Channels specified as input (" << channels[i] << ") is not compatible "
+ << "with the size of the image: " << numberOfInputChannels);
+ }
}
- }
}
- protected:
+protected:
/** Constructor */
RenderingImageFilter() {}
/** Destructor */
virtual ~RenderingImageFilter() {}
typedef Function::StandardRenderingFunction<
- typename TInputImage::PixelType,
- typename TOutputImage::PixelType> DefaultRenderingFunctionType;
+ typename TInputImage::PixelType,
+ typename TOutputImage::PixelType> DefaultRenderingFunctionType;
void SetDefaultRenderingFunction()
{
- otbMsgDevMacro(<<"WARNING: using the default rendering function");
+ otbMsgDevMacro(<< "WARNING: using the default rendering function");
- this->GetFunctor().SetFunction(DefaultRenderingFunctionType::New() );
+ this->GetFunctor().SetFunction(DefaultRenderingFunctionType::New());
}
private:
RenderingImageFilter(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
};
} // end namespace otb
diff --git a/Code/Visualization/otbSelectAreaActionHandler.h b/Code/Visualization/otbSelectAreaActionHandler.h
index e588915c23..37f77aa30c 100644
--- a/Code/Visualization/otbSelectAreaActionHandler.h
+++ b/Code/Visualization/otbSelectAreaActionHandler.h
@@ -37,32 +37,31 @@ class SelectAreaActionHandler
{
public:
/** Standard class typedefs */
- typedef SelectAreaActionHandler Self;
- typedef ImageWidgetActionHandler Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SelectAreaActionHandler Self;
+ typedef ImageWidgetActionHandler Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(SelectAreaActionHandler,ImageWidgetActionHandler);
+ itkTypeMacro(SelectAreaActionHandler, ImageWidgetActionHandler);
/** Model typedefs */
- typedef TModel ModelType;
- typedef typename ModelType::Pointer ModelPointerType;
- typedef typename ModelType::RegionType RegionType;
+ typedef TModel ModelType;
+ typedef typename ModelType::Pointer ModelPointerType;
+ typedef typename ModelType::RegionType RegionType;
/** View typedefs */
- typedef TWidget WidgetType;
- typedef typename WidgetType::Pointer WidgetPointerType;
- typedef typename WidgetType::IndexType IndexType;
+ typedef TWidget WidgetType;
+ typedef typename WidgetType::Pointer WidgetPointerType;
+ typedef typename WidgetType::IndexType IndexType;
/** RegionGlComponent View */
typedef RegionGlComponent RegionGlComponentType;
typedef typename RegionGlComponentType::Pointer RegionGlComponentPointerType;
-
/** Handle widget event
* \param widgetId The id of the moved widget
* \param event The event
@@ -71,79 +70,79 @@ public:
virtual bool HandleWidgetEvent(std::string widgetId, int event)
{
// if left mouse button pressed
- if ( Fl::event_button() != FL_LEFT_MOUSE)
+ if (Fl::event_button() != FL_LEFT_MOUSE)
{
- return true;
+ return true;
}
- if( m_Model.IsNotNull() && this->GetIsActive() )
+ if (m_Model.IsNotNull() && this->GetIsActive())
{
- if(widgetId == m_Widget->GetIdentifier() )
+ if (widgetId == m_Widget->GetIdentifier())
+ {
+ // Get the clicked index
+ typename WidgetType::PointType screenPoint, imagePoint; /*, lScreenSizePoint, lImageSizePoint;*/
+ screenPoint = m_Widget->GetMousePosition();
+
+ // Transform to image point
+ imagePoint = m_Widget->GetScreenToImageTransform()->TransformPoint(screenPoint);
+
+ // Transform to index
+ IndexType lIndex;
+ lIndex[0] = static_cast<long int>(imagePoint[0]);
+ lIndex[1] = static_cast<long int>(imagePoint[1]);
+
+ switch (event)
+ {
+ case FL_PUSH:
{
- // Get the clicked index
- typename WidgetType::PointType screenPoint, imagePoint;/*, lScreenSizePoint, lImageSizePoint;*/
- screenPoint = m_Widget->GetMousePosition();
-
- // Transform to image point
- imagePoint = m_Widget->GetScreenToImageTransform()->TransformPoint(screenPoint);
-
- // Transform to index
- IndexType lIndex;
- lIndex[0]=static_cast<long int>(imagePoint[0]);
- lIndex[1]=static_cast<long int>(imagePoint[1]);
-
- switch (event)
- {
- case FL_PUSH:
- {
- m_FirstPush = false;
- m_StartIndex = lIndex;
+ m_FirstPush = false;
+ m_StartIndex = lIndex;
// ImageView.txx hide the GlComponent when Update
m_RegionGlComponent->SetVisible(true);
- break;
- }
- case FL_RELEASE:
- {
- if(m_StartIndex[0] != lIndex[0] && m_StartIndex[1] != lIndex[1])
+ break;
+ }
+ case FL_RELEASE:
+ {
+ if (m_StartIndex[0] != lIndex[0] && m_StartIndex[1] != lIndex[1])
+ {
+ m_FirstPush = true;
+ m_StopIndex = lIndex;
+ m_Model->SetExtractRegionByIndex(m_StartIndex, m_StopIndex);
+ m_Model->Update();
+ }
+ break;
+ }
+ case FL_DRAG:
+ {
+ // only redraw the red box in the widget
+ m_StopIndex = lIndex;
+ m_Model->SetExtractRegionByIndex(m_StartIndex, m_StopIndex);
+ m_RegionGlComponent->SetRegion(m_Model->GetExtractRegion());
+ m_Widget->redraw();
+ break;
+ }
+ default:
{
- m_FirstPush = true;
- m_StopIndex = lIndex;
- m_Model->SetExtractRegionByIndex(m_StartIndex,m_StopIndex);
- m_Model->Update();
}
- break;
- }
- case FL_DRAG:
- {
- // only redraw the red box in the widget
- m_StopIndex = lIndex;
- m_Model->SetExtractRegionByIndex(m_StartIndex,m_StopIndex);
- m_RegionGlComponent->SetRegion(m_Model->GetExtractRegion());
- m_Widget->redraw();
- break;
- }
- default:
- {
- }
- }
- return true;
}
+ return true;
+ }
}
return false;
}
/** Set/Get the pointer to the view */
- itkSetObjectMacro(Widget,WidgetType);
- itkGetObjectMacro(Widget,WidgetType);
+ itkSetObjectMacro(Widget, WidgetType);
+ itkGetObjectMacro(Widget, WidgetType);
/** Set/Get the pointer to the model */
- itkSetObjectMacro(Model,ModelType);
- itkGetObjectMacro(Model,ModelType);
+ itkSetObjectMacro(Model, ModelType);
+ itkGetObjectMacro(Model, ModelType);
/** Set/Get the pointer to the component */
- itkSetObjectMacro(RegionGlComponent,RegionGlComponentType);
- itkGetObjectMacro(RegionGlComponent,RegionGlComponentType);
+ itkSetObjectMacro(RegionGlComponent, RegionGlComponentType);
+ itkGetObjectMacro(RegionGlComponent, RegionGlComponentType);
protected:
/** Constructor */
@@ -159,12 +158,12 @@ protected:
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
SelectAreaActionHandler(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
// Pointer to the widget
WidgetPointerType m_Widget;
@@ -182,5 +181,3 @@ private:
}; // end class
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbSplittedWidgetManager.cxx b/Code/Visualization/otbSplittedWidgetManager.cxx
index 8e0438fa13..e691cc3343 100644
--- a/Code/Visualization/otbSplittedWidgetManager.cxx
+++ b/Code/Visualization/otbSplittedWidgetManager.cxx
@@ -32,7 +32,6 @@ SplittedWidgetManager
delete m_SplittedWidget;
}
-
void
SplittedWidgetManager
::RegisterFullWidget(WidgetType* fullWidget)
@@ -40,10 +39,9 @@ SplittedWidgetManager
m_InternalFullWidget = fullWidget;
m_SplittedWidget->m_FullGroup->add(fullWidget);
m_SplittedWidget->m_FullGroup->resizable(fullWidget);
- fullWidget->resize(0,0, m_SplittedWidget->m_FullGroup->w(),m_SplittedWidget->m_FullGroup->h());
+ fullWidget->resize(0, 0, m_SplittedWidget->m_FullGroup->w(), m_SplittedWidget->m_FullGroup->h());
}
-
void
SplittedWidgetManager
::RegisterScrollWidget(WidgetType* scrollWidget)
@@ -51,7 +49,7 @@ SplittedWidgetManager
m_InternalScrollWidget = scrollWidget;
m_SplittedWidget->m_QuicklookGroup->add(scrollWidget);
m_SplittedWidget->m_QuicklookGroup->resizable(scrollWidget);
- scrollWidget->resize(0,0, m_SplittedWidget->m_QuicklookGroup->w(),m_SplittedWidget->m_QuicklookGroup->h());
+ scrollWidget->resize(0, 0, m_SplittedWidget->m_QuicklookGroup->w(), m_SplittedWidget->m_QuicklookGroup->h());
}
@@ -62,7 +60,7 @@ SplittedWidgetManager
m_InternalZoomWidget = zoomWidget;
m_SplittedWidget->m_ZoomGroup->add(zoomWidget);
m_SplittedWidget->m_ZoomGroup->resizable(zoomWidget);
- zoomWidget->resize(0,0,m_SplittedWidget->m_ZoomGroup->w(),m_SplittedWidget->m_ZoomGroup->h());
+ zoomWidget->resize(0, 0, m_SplittedWidget->m_ZoomGroup->w(), m_SplittedWidget->m_ZoomGroup->h());
}
void
SplittedWidgetManager
@@ -71,7 +69,8 @@ SplittedWidgetManager
m_IntenalPixelWidget = pixelWidget;
m_SplittedWidget->m_PixelDescriptionGroup->add(pixelWidget);
m_SplittedWidget->m_PixelDescriptionGroup->resizable(pixelWidget);
- pixelWidget->resize(0,0, m_SplittedWidget->m_PixelDescriptionGroup->w(),m_SplittedWidget->m_PixelDescriptionGroup->h());
+ pixelWidget->resize(0, 0,
+ m_SplittedWidget->m_PixelDescriptionGroup->w(), m_SplittedWidget->m_PixelDescriptionGroup->h());
}
@@ -82,8 +81,8 @@ SplittedWidgetManager
m_InternalCurveWidget = curveWidget;
m_SplittedWidget->m_HistogramsGroup->add(curveWidget);
m_SplittedWidget->m_HistogramsGroup->resizable(curveWidget);
- curveWidget->resize(0,0,m_SplittedWidget->m_HistogramsGroup->w(),m_SplittedWidget->m_HistogramsGroup->h());
- }
+ curveWidget->resize(0, 0, m_SplittedWidget->m_HistogramsGroup->w(), m_SplittedWidget->m_HistogramsGroup->h());
+}
void
SplittedWidgetManager
@@ -94,7 +93,7 @@ SplittedWidgetManager
m_SplittedWidget->m_PixelDescriptionGroup->show();
m_SplittedWidget->m_QuicklookGroup->show();
m_SplittedWidget->m_HistogramsGroup->show();
-
+
m_InternalCurveWidget->show();
m_IntenalPixelWidget->show();
m_InternalFullWidget->show();
@@ -117,11 +116,11 @@ void
SplittedWidgetManager
::Refresh()
{
- m_InternalFullWidget ->redraw();
- m_InternalScrollWidget ->redraw();
- m_InternalZoomWidget->redraw();
- m_IntenalPixelWidget->redraw();
- m_InternalCurveWidget->redraw();
+ m_InternalFullWidget->redraw();
+ m_InternalScrollWidget->redraw();
+ m_InternalZoomWidget->redraw();
+ m_IntenalPixelWidget->redraw();
+ m_InternalCurveWidget->redraw();
}
void
@@ -130,27 +129,27 @@ SplittedWidgetManager
{
itk::OStringStream oss1;
oss1.str("");
- oss1 << "Full Widget - "<< label;
+ oss1 << "Full Widget - " << label;
m_SplittedWidget->m_FullGroup->copy_label(oss1.str().c_str());
-
+
itk::OStringStream oss2;
oss2.str("");
oss2 << "Zoom Widget - " << label;
m_SplittedWidget->m_ZoomGroup->copy_label(oss2.str().c_str());
-
+
itk::OStringStream oss3;
oss3.str("");
- oss3 << "Pixel Information Widget - "<< label;
+ oss3 << "Pixel Information Widget - " << label;
m_SplittedWidget->m_PixelDescriptionGroup->copy_label(oss3.str().c_str());
itk::OStringStream oss4;
oss4.str("");
- oss4 << "Scroll Widget - "<< label;
+ oss4 << "Scroll Widget - " << label;
m_SplittedWidget->m_QuicklookGroup->copy_label(oss4.str().c_str());
-
+
itk::OStringStream oss5;
oss5.str("");
- oss5 << "Histogram Widget - "<< label;
+ oss5 << "Histogram Widget - " << label;
m_SplittedWidget->m_HistogramsGroup->copy_label(oss5.str().c_str());
}
diff --git a/Code/Visualization/otbSplittedWidgetManager.h b/Code/Visualization/otbSplittedWidgetManager.h
index b0ca086238..c7dfe3629b 100644
--- a/Code/Visualization/otbSplittedWidgetManager.h
+++ b/Code/Visualization/otbSplittedWidgetManager.h
@@ -21,32 +21,31 @@
#include "otbWidgetManager.h"
#include "otbImageWidgetSplittedManager.h"
-
namespace otb
{
- /** \class SplittedWidgetManager
- * \brief todo
- *
- * \ingroup Visualization
- */
-class SplittedWidgetManager
- : public WidgetManager
+/** \class SplittedWidgetManager
+* \brief todo
+*
+* \ingroup Visualization
+ */
+class SplittedWidgetManager
+ : public WidgetManager
{
- public:
+public:
/** Standard class typedefs */
- typedef SplittedWidgetManager Self;
- typedef WidgetManager Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef SplittedWidgetManager Self;
+ typedef WidgetManager Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(SplittedWidgetManager,WidgetManager);
+ itkTypeMacro(SplittedWidgetManager, WidgetManager);
/** typedef of the fltk file defining all the widget needed*/
- typedef ImageWidgetSplittedManager ImageWidgetSplittedManagerType;
+ typedef ImageWidgetSplittedManager ImageWidgetSplittedManagerType;
/** Register Wigets*/
virtual void RegisterFullWidget(WidgetType* fullWidget);
@@ -60,8 +59,7 @@ class SplittedWidgetManager
virtual void SetLabel(const char * label);
virtual void UnRegisterAll();
-
- protected:
+protected:
/** Constructor */
SplittedWidgetManager();
@@ -70,15 +68,14 @@ class SplittedWidgetManager
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
-
- private:
+private:
SplittedWidgetManager(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
- ImageWidgetSplittedManagerType* m_SplittedWidget;
+ ImageWidgetSplittedManagerType* m_SplittedWidget;
};
}
diff --git a/Code/Visualization/otbStandardImageViewer.h b/Code/Visualization/otbStandardImageViewer.h
index b073522631..7467eaaeca 100644
--- a/Code/Visualization/otbStandardImageViewer.h
+++ b/Code/Visualization/otbStandardImageViewer.h
@@ -56,48 +56,47 @@ namespace otb
* \example Tutorials/SimpleViewer.cxx
*/
-template <class TImage, class TVectorData = VectorData<double> , class TWidgetManager = otb::PackedWidgetManager>
+template <class TImage, class TVectorData = VectorData<double>, class TWidgetManager = otb::PackedWidgetManager>
class StandardImageViewer
: public itk::Object
{
public:
/** Standard class typedefs */
- typedef StandardImageViewer Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef StandardImageViewer Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(StandardImageViewer,Object);
+ itkTypeMacro(StandardImageViewer, Object);
/** Input image type */
- typedef TImage ImageType;
- typedef typename ImageType::Pointer ImagePointerType;
- typedef typename ImageType::PixelType PixelType;
- typedef typename ImageType::InternalPixelType InternalPixelType;
+ typedef TImage ImageType;
+ typedef typename ImageType::Pointer ImagePointerType;
+ typedef typename ImageType::PixelType PixelType;
+ typedef typename ImageType::InternalPixelType InternalPixelType;
typedef typename itk::NumericTraits<PixelType>
- ::ValueType ScalarType;
-
+ ::ValueType ScalarType;
/** VectorData typedef */
- typedef TVectorData VectorDataType;
- typedef typename VectorDataType::Pointer VectorDataPointerType;
+ typedef TVectorData VectorDataType;
+ typedef typename VectorDataType::Pointer VectorDataPointerType;
/** PackedWidgetManager */
- typedef TWidgetManager WidgetManagerType;
- typedef typename WidgetManagerType::Pointer WidgetManagerPointerType;
+ typedef TWidgetManager WidgetManagerType;
+ typedef typename WidgetManagerType::Pointer WidgetManagerPointerType;
/** Output image type */
- typedef itk::RGBAPixel<unsigned char> RGBPixelType;
- typedef Image<RGBPixelType,2> OutputImageType;
+ typedef itk::RGBAPixel<unsigned char> RGBPixelType;
+ typedef Image<RGBPixelType, 2> OutputImageType;
/** Image layer type */
- typedef ImageLayer<ImageType, OutputImageType> ImageLayerType;
- typedef typename ImageLayerType::Pointer ImageLayerPointerType;
- typedef typename ImageLayerType::HistogramType HistogramType;
+ typedef ImageLayer<ImageType, OutputImageType> ImageLayerType;
+ typedef typename ImageLayerType::Pointer ImageLayerPointerType;
+ typedef typename ImageLayerType::HistogramType HistogramType;
/** Image layer generator type */
typedef ImageLayerGenerator<ImageLayerType> ImageLayerGeneratorType;
@@ -108,59 +107,59 @@ public:
typedef typename RenderingModelType::Pointer RenderingModelPointerType;
/** View type */
- typedef ImageView<RenderingModelType> ViewType;
- typedef typename ViewType::Pointer ViewPointerType;
+ typedef ImageView<RenderingModelType> ViewType;
+ typedef typename ViewType::Pointer ViewPointerType;
/** Widget controller */
- typedef ImageWidgetController WidgetControllerType;
- typedef typename WidgetControllerType::Pointer WidgetControllerPointerType;
+ typedef ImageWidgetController WidgetControllerType;
+ typedef typename WidgetControllerType::Pointer WidgetControllerPointerType;
/** Curves 2D widget */
- typedef Curves2DWidget CurvesWidgetType;
- typedef typename CurvesWidgetType::Pointer CurvesWidgetPointerType;
- typedef HistogramCurve<HistogramType> HistogramCurveType;
- typedef typename HistogramCurveType::Pointer HistogramCurvePointerType;
+ typedef Curves2DWidget CurvesWidgetType;
+ typedef typename CurvesWidgetType::Pointer CurvesWidgetPointerType;
+ typedef HistogramCurve<HistogramType> HistogramCurveType;
+ typedef typename HistogramCurveType::Pointer HistogramCurvePointerType;
/** Standard action handlers */
typedef otb::WidgetResizingActionHandler
- <RenderingModelType,ViewType> ResizingHandlerType;
+ <RenderingModelType, ViewType> ResizingHandlerType;
typedef otb::ChangeScaledExtractRegionActionHandler
- <RenderingModelType,ViewType> ChangeScaledRegionHandlerType;
+ <RenderingModelType, ViewType> ChangeScaledRegionHandlerType;
typedef otb::ChangeExtractRegionActionHandler
- <RenderingModelType,ViewType> ChangeRegionHandlerType;
+ <RenderingModelType, ViewType> ChangeRegionHandlerType;
typedef otb::ChangeScaleActionHandler
- <RenderingModelType,ViewType> ChangeScaleHandlerType;
+ <RenderingModelType, ViewType> ChangeScaleHandlerType;
typedef otb::ArrowKeyMoveActionHandler
- <RenderingModelType,ViewType> ArrowKeyMoveActionHandlerType;
+ <RenderingModelType, ViewType> ArrowKeyMoveActionHandlerType;
/** Rendering function */
typedef typename ImageLayerGeneratorType::RenderingFunctionType StandardRenderingFunctionType;
- typedef typename StandardRenderingFunctionType::Pointer StandardRenderingFunctionPointerType;
+ typedef typename StandardRenderingFunctionType::Pointer StandardRenderingFunctionPointerType;
/** Pixel description */
- typedef PixelDescriptionModel<OutputImageType> PixelDescriptionModelType;
+ typedef PixelDescriptionModel<OutputImageType> PixelDescriptionModelType;
typedef typename PixelDescriptionModelType::Pointer PixelDescriptionModelPointerType;
typedef PixelDescriptionActionHandler
- < PixelDescriptionModelType, ViewType> PixelDescriptionActionHandlerType;
+ <PixelDescriptionModelType, ViewType> PixelDescriptionActionHandlerType;
typedef otb::PixelDescriptionView
- < PixelDescriptionModelType > PixelDescriptionViewType;
+ <PixelDescriptionModelType> PixelDescriptionViewType;
typedef typename PixelDescriptionViewType::Pointer PixelDescriptionViewPointerType;
/** VectorData overlay */
typedef VectorDataProjectionFilter
- <VectorDataType,VectorDataType> VectorDataProjectionFilterType;
- typedef VectorDataExtractROI<VectorDataType> VectorDataExtractROIType;
+ <VectorDataType, VectorDataType> VectorDataProjectionFilterType;
+ typedef VectorDataExtractROI<VectorDataType> VectorDataExtractROIType;
typedef typename VectorDataExtractROIType::RegionType RemoteSensingRegionType;
- typedef VectorDataGlComponent<VectorDataType> VectorDataGlComponentType;
- typedef VectorDataFileReader<VectorDataType> VectorDataFileReaderType;
+ typedef VectorDataGlComponent<VectorDataType> VectorDataGlComponentType;
+ typedef VectorDataFileReader<VectorDataType> VectorDataFileReaderType;
/** Set/Get the image to render */
- itkSetObjectMacro(Image,ImageType);
- itkGetObjectMacro(Image,ImageType);
+ itkSetObjectMacro(Image, ImageType);
+ itkGetObjectMacro(Image, ImageType);
/** Set/Get the VectorData to render */
- itkSetObjectMacro(VectorData,VectorDataType);
- itkGetObjectMacro(VectorData,VectorDataType);
+ itkSetObjectMacro(VectorData, VectorDataType);
+ itkGetObjectMacro(VectorData, VectorDataType);
/** Set/Get the DEM directory */
itkSetStringMacro(DEMDirectory);
@@ -180,38 +179,38 @@ protected:
/** Destructor */
~StandardImageViewer();
/** Printself method */
- void PrintSelf(std::ostream& , itk::Indent ) const {};
+ void PrintSelf(std::ostream&, itk::Indent) const {}
private:
StandardImageViewer(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
/** Label of the viewer */
std::string m_Label;
/** Pointer to the image */
- ImagePointerType m_Image;
+ ImagePointerType m_Image;
/** Pointer to the VectorData */
- VectorDataPointerType m_VectorData;
+ VectorDataPointerType m_VectorData;
/** The image layer */
- ImageLayerPointerType m_ImageLayer;
+ ImageLayerPointerType m_ImageLayer;
/** The rendering model */
- RenderingModelPointerType m_RenderingModel;
+ RenderingModelPointerType m_RenderingModel;
/** The pixel description model */
PixelDescriptionModelPointerType m_PixelDescriptionModel;
/** The view */
- ViewPointerType m_View;
+ ViewPointerType m_View;
/** The pixel description view */
PixelDescriptionViewPointerType m_PixelDescriptionView;
/** Curve widget */
- CurvesWidgetPointerType m_CurveWidget;
+ CurvesWidgetPointerType m_CurveWidget;
/** The widget controller */
WidgetControllerPointerType m_Controller;
@@ -223,7 +222,7 @@ private:
std::string m_DEMDirectory;
/** */
- WidgetManagerPointerType m_DisplayWindow;
+ WidgetManagerPointerType m_DisplayWindow;
}; // end class
} // end namespace otb
diff --git a/Code/Visualization/otbStandardImageViewer.txx b/Code/Visualization/otbStandardImageViewer.txx
index 3434264196..147b0b5dad 100644
--- a/Code/Visualization/otbStandardImageViewer.txx
+++ b/Code/Visualization/otbStandardImageViewer.txx
@@ -25,12 +25,12 @@
namespace otb
{
-template <class TImage,class TVectorData,class TWidgetManager>
-StandardImageViewer<TImage,TVectorData,TWidgetManager>
+template <class TImage, class TVectorData, class TWidgetManager>
+StandardImageViewer<TImage, TVectorData, TWidgetManager>
::StandardImageViewer() : m_Label("Default label"), m_Image(), m_VectorData(),
- m_ImageLayer(), m_RenderingModel(),m_PixelDescriptionModel(),
- m_View(), m_PixelDescriptionView(), m_CurveWidget(),
- m_Controller(), m_RenderingFunction(), m_DisplayWindow()
+ m_ImageLayer(), m_RenderingModel(), m_PixelDescriptionModel(),
+ m_View(), m_PixelDescriptionView(), m_CurveWidget(),
+ m_Controller(), m_RenderingFunction(), m_DisplayWindow()
{
// Build a new rendering model
m_RenderingModel = RenderingModelType::New();
@@ -59,19 +59,19 @@ StandardImageViewer<TImage,TVectorData,TWidgetManager>
m_Controller->AddActionHandler(resizingHandler);
// Add the change scaled region handler
- ChangeScaledRegionHandlerType::Pointer changeScaledHandler =ChangeScaledRegionHandlerType::New();
+ ChangeScaledRegionHandlerType::Pointer changeScaledHandler = ChangeScaledRegionHandlerType::New();
changeScaledHandler->SetModel(m_RenderingModel);
changeScaledHandler->SetView(m_View);
m_Controller->AddActionHandler(changeScaledHandler);
// Add the change extract region handler
- ChangeRegionHandlerType::Pointer changeHandler =ChangeRegionHandlerType::New();
+ ChangeRegionHandlerType::Pointer changeHandler = ChangeRegionHandlerType::New();
changeHandler->SetModel(m_RenderingModel);
changeHandler->SetView(m_View);
m_Controller->AddActionHandler(changeHandler);
// Add the change scaled handler
- ChangeScaleHandlerType::Pointer changeScaleHandler =ChangeScaleHandlerType::New();
+ ChangeScaleHandlerType::Pointer changeScaleHandler = ChangeScaleHandlerType::New();
changeScaleHandler->SetModel(m_RenderingModel);
changeScaleHandler->SetView(m_View);
m_Controller->AddActionHandler(changeScaleHandler);
@@ -97,48 +97,47 @@ StandardImageViewer<TImage,TVectorData,TWidgetManager>
m_DisplayWindow->RegisterHistogramWidget(m_CurveWidget);
}
-template <class TImage,class TVectorData,class TWidgetManager>
-StandardImageViewer<TImage,TVectorData,TWidgetManager>
+template <class TImage, class TVectorData, class TWidgetManager>
+StandardImageViewer<TImage, TVectorData, TWidgetManager>
::~StandardImageViewer()
{}
-template <class TImage,class TVectorData,class TWidgetManager>
+template <class TImage, class TVectorData, class TWidgetManager>
void
-StandardImageViewer<TImage,TVectorData,TWidgetManager>
+StandardImageViewer<TImage, TVectorData, TWidgetManager>
::Update()
{
// First check if there is actually an input image
- if(m_Image.IsNull())
+ if (m_Image.IsNull())
{
- itkExceptionMacro(<<"The image pointer is null, there is nothing to display. You probably forget to set the image.");
+ itkExceptionMacro(
+ << "The image pointer is null, there is nothing to display. You probably forget to set the image.");
}
// Update image info for further use
m_Image->UpdateOutputInformation();
-
typename VectorDataProjectionFilterType::Pointer vproj;
- typename VectorDataExtractROIType::Pointer vdextract;
+ typename VectorDataExtractROIType::Pointer vdextract;
// Colors
- typename HistogramCurveType::ColorType red,green,blue,gray;
+ typename HistogramCurveType::ColorType red, green, blue, gray;
red.Fill(0);
- red[0]=1.;
- red[3]=0.5;
+ red[0] = 1.;
+ red[3] = 0.5;
green.Fill(0);
- green[1]=1.;
- green[3]=0.5;
+ green[1] = 1.;
+ green[3] = 0.5;
blue.Fill(0);
- blue[2]=1.;
- blue[3]=0.5;
+ blue[2] = 1.;
+ blue[3] = 0.5;
gray.Fill(0.6);
-
// If there is a VectorData
- if(m_VectorData.IsNotNull())
+ if (m_VectorData.IsNotNull())
{
// Extract The part of the VectorData that actually overlaps with
// the image extent
@@ -149,30 +148,30 @@ StandardImageViewer<TImage,TVectorData,TWidgetManager>
// Ge the index of the corner of the image
typename ImageType::IndexType ul, ur, ll, lr;
- typename ImageType::PointType pul,pur,pll,plr;
+ typename ImageType::PointType pul, pur, pll, plr;
ul = m_Image->GetLargestPossibleRegion().GetIndex();
ur = ul;
ll = ul;
lr = ul;
- ur[0]+=m_Image->GetLargestPossibleRegion().GetSize()[0];
- lr[0]+=m_Image->GetLargestPossibleRegion().GetSize()[0];
- lr[1]+=m_Image->GetLargestPossibleRegion().GetSize()[1];
- ll[1]+=m_Image->GetLargestPossibleRegion().GetSize()[1];
+ ur[0] += m_Image->GetLargestPossibleRegion().GetSize()[0];
+ lr[0] += m_Image->GetLargestPossibleRegion().GetSize()[0];
+ lr[1] += m_Image->GetLargestPossibleRegion().GetSize()[1];
+ ll[1] += m_Image->GetLargestPossibleRegion().GetSize()[1];
// Transform to physical point
- m_Image->TransformIndexToPhysicalPoint(ul,pul);
- m_Image->TransformIndexToPhysicalPoint(ur,pur);
- m_Image->TransformIndexToPhysicalPoint(ll,pll);
- m_Image->TransformIndexToPhysicalPoint(lr,plr);
+ m_Image->TransformIndexToPhysicalPoint(ul, pul);
+ m_Image->TransformIndexToPhysicalPoint(ur, pur);
+ m_Image->TransformIndexToPhysicalPoint(ll, pll);
+ m_Image->TransformIndexToPhysicalPoint(lr, plr);
// Build the cartographic region
- RemoteSensingRegionType rsRegion;
+ RemoteSensingRegionType rsRegion;
typename RemoteSensingRegionType::IndexType rsOrigin;
typename RemoteSensingRegionType::SizeType rsSize;
- rsOrigin[0]= min(pul[0],plr[0]);
- rsOrigin[1]= min(pul[1],plr[1]);
- rsSize[0]=vcl_abs(pul[0]-plr[0]);
- rsSize[1]=vcl_abs(pul[1]-plr[1]);
+ rsOrigin[0] = min(pul[0], plr[0]);
+ rsOrigin[1] = min(pul[1], plr[1]);
+ rsSize[0] = vcl_abs(pul[0] - plr[0]);
+ rsSize[1] = vcl_abs(pul[1] - plr[1]);
rsRegion.SetOrigin(rsOrigin);
rsRegion.SetSize(rsSize);
@@ -194,20 +193,20 @@ StandardImageViewer<TImage,TVectorData,TWidgetManager>
vproj->SetDEMDirectory(m_DEMDirectory);
vproj->Update();
- // Create a VectorData gl component
- typename VectorDataGlComponentType::Pointer vgl = VectorDataGlComponentType::New();
- vgl->SetVectorData(vproj->GetOutput());
- vgl->SetColor(blue);
- // Add it to the image view
- m_View->GetScrollWidget()->AddGlComponent(vgl);
- m_View->GetFullWidget()->AddGlComponent(vgl);
- m_View->GetZoomWidget()->AddGlComponent(vgl);
+ // Create a VectorData gl component
+ typename VectorDataGlComponentType::Pointer vgl = VectorDataGlComponentType::New();
+ vgl->SetVectorData(vproj->GetOutput());
+ vgl->SetColor(blue);
+ // Add it to the image view
+ m_View->GetScrollWidget()->AddGlComponent(vgl);
+ m_View->GetFullWidget()->AddGlComponent(vgl);
+ m_View->GetZoomWidget()->AddGlComponent(vgl);
}
// Generate the layer
ImageLayerGeneratorPointerType generator = ImageLayerGeneratorType::New();
generator->SetImage(m_Image);
- FltkFilterWatcher qlwatcher(generator->GetResampler(),0,0,200,20,"Generating QuickLook ...");
+ FltkFilterWatcher qlwatcher(generator->GetResampler(), 0, 0, 200, 20, "Generating QuickLook ...");
generator->GenerateLayer();
m_ImageLayer = generator->GetLayer();
m_RenderingFunction = generator->GetRenderingFunction();
@@ -228,40 +227,40 @@ StandardImageViewer<TImage,TVectorData,TWidgetManager>
// adding histograms rendering
unsigned int listSize = m_ImageLayer->GetHistogramList()->Size();
- if(listSize>0)
+ if (listSize > 0)
{
- if(listSize==1)
- {
- typename HistogramCurveType::Pointer grayhistogram = HistogramCurveType::New();
- grayhistogram->SetHistogram(m_ImageLayer->GetHistogramList()->GetNthElement(0));
- grayhistogram->SetHistogramColor(gray);
- grayhistogram->SetLabelColor(gray);
- m_CurveWidget->AddCurve(grayhistogram);
- }
- else
- {
- typename HistogramCurveType::Pointer rhistogram = HistogramCurveType::New();
- rhistogram->SetHistogram(m_ImageLayer->GetHistogramList()->GetNthElement(0));
- rhistogram->SetHistogramColor(red);
- rhistogram->SetLabelColor(red);
- m_CurveWidget->AddCurve(rhistogram);
- }
- if(listSize>1)
- {
- typename HistogramCurveType::Pointer ghistogram = HistogramCurveType::New();
- ghistogram->SetHistogram(m_ImageLayer->GetHistogramList()->GetNthElement(1));
- ghistogram->SetHistogramColor(green);
- ghistogram->SetLabelColor(green);
- m_CurveWidget->AddCurve(ghistogram);
- }
- if(listSize>2)
- {
- typename HistogramCurveType::Pointer bhistogram = HistogramCurveType::New();
- bhistogram->SetHistogram(m_ImageLayer->GetHistogramList()->GetNthElement(2));
- bhistogram->SetHistogramColor(blue);
- bhistogram->SetLabelColor(blue);
- m_CurveWidget->AddCurve(bhistogram);
- }
+ if (listSize == 1)
+ {
+ typename HistogramCurveType::Pointer grayhistogram = HistogramCurveType::New();
+ grayhistogram->SetHistogram(m_ImageLayer->GetHistogramList()->GetNthElement(0));
+ grayhistogram->SetHistogramColor(gray);
+ grayhistogram->SetLabelColor(gray);
+ m_CurveWidget->AddCurve(grayhistogram);
+ }
+ else
+ {
+ typename HistogramCurveType::Pointer rhistogram = HistogramCurveType::New();
+ rhistogram->SetHistogram(m_ImageLayer->GetHistogramList()->GetNthElement(0));
+ rhistogram->SetHistogramColor(red);
+ rhistogram->SetLabelColor(red);
+ m_CurveWidget->AddCurve(rhistogram);
+ }
+ if (listSize > 1)
+ {
+ typename HistogramCurveType::Pointer ghistogram = HistogramCurveType::New();
+ ghistogram->SetHistogram(m_ImageLayer->GetHistogramList()->GetNthElement(1));
+ ghistogram->SetHistogramColor(green);
+ ghistogram->SetLabelColor(green);
+ m_CurveWidget->AddCurve(ghistogram);
+ }
+ if (listSize > 2)
+ {
+ typename HistogramCurveType::Pointer bhistogram = HistogramCurveType::New();
+ bhistogram->SetHistogram(m_ImageLayer->GetHistogramList()->GetNthElement(2));
+ bhistogram->SetHistogramColor(blue);
+ bhistogram->SetLabelColor(blue);
+ m_CurveWidget->AddCurve(bhistogram);
+ }
}
m_CurveWidget->SetXAxisLabel("Pixels");
diff --git a/Code/Visualization/otbStandardRenderingFunction.h b/Code/Visualization/otbStandardRenderingFunction.h
index a0d3530c09..8b3496eb24 100644
--- a/Code/Visualization/otbStandardRenderingFunction.h
+++ b/Code/Visualization/otbStandardRenderingFunction.h
@@ -41,18 +41,18 @@ template <class TInputPixel, class TOutputPixel>
class Identity
{
public:
- Identity(){};
- virtual ~Identity(){};
- bool operator !=(const Identity &) const
+ Identity(){}
+ virtual ~Identity(){}
+ bool operator !=(const Identity&) const
{
return false;
}
- bool operator ==(const Identity & other) const
+ bool operator ==(const Identity& other) const
{
return !(*this != other);
}
- inline TOutputPixel operator()(const TInputPixel & A) const
+ inline TOutputPixel operator ()(const TInputPixel& A) const
{
return static_cast<TOutputPixel>(A);
}
@@ -74,39 +74,38 @@ public:
* \ingroup Visualization
*/
template <class TPixel, class TRGBPixel,
- class TPixelRepresentationFunction = ChannelSelectorFunctor<TPixel>,
- class TTransferFunction = Identity<
- typename itk::NumericTraits<typename itk::NumericTraits<TPixel>::ValueType>::RealType,
- typename itk::NumericTraits<typename itk::NumericTraits<TPixel>::ValueType>::RealType
- > >
+ class TPixelRepresentationFunction = ChannelSelectorFunctor<TPixel>,
+ class TTransferFunction = Identity<
+ typename itk::NumericTraits<typename itk::NumericTraits<TPixel>::ValueType>::RealType,
+ typename itk::NumericTraits<typename itk::NumericTraits<TPixel>::ValueType>::RealType
+ > >
class StandardRenderingFunction
: public RenderingFunction<TPixel, TRGBPixel>
{
public:
/** Standard class typedefs */
- typedef StandardRenderingFunction Self;
- typedef RenderingFunction<TPixel,TRGBPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef StandardRenderingFunction Self;
+ typedef RenderingFunction<TPixel, TRGBPixel> Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** type macro */
- itkTypeMacro(StandardRenderingFunction,RenderingFunction);
+ itkTypeMacro(StandardRenderingFunction, RenderingFunction);
/** new macro */
itkNewMacro(Self);
/** PixelType macros */
- typedef TRGBPixel OutputPixelType;
- typedef typename OutputPixelType::ValueType OutputValueType;
- typedef TPixel PixelType;
- typedef typename itk::NumericTraits<PixelType>::ValueType ScalarType;
- typedef itk::VariableLengthVector<ScalarType> VectorPixelType;
- typedef itk::RGBPixel<ScalarType> RGBPixelType;
- typedef itk::RGBAPixel<ScalarType> RGBAPixelType;
- typedef typename itk::NumericTraits<ScalarType>::RealType RealScalarType;
- typedef itk::VariableLengthVector<RealScalarType> InternalPixelType;
- typedef typename Superclass::ParametersType ParametersType;
-
+ typedef TRGBPixel OutputPixelType;
+ typedef typename OutputPixelType::ValueType OutputValueType;
+ typedef TPixel PixelType;
+ typedef typename itk::NumericTraits<PixelType>::ValueType ScalarType;
+ typedef itk::VariableLengthVector<ScalarType> VectorPixelType;
+ typedef itk::RGBPixel<ScalarType> RGBPixelType;
+ typedef itk::RGBAPixel<ScalarType> RGBAPixelType;
+ typedef typename itk::NumericTraits<ScalarType>::RealType RealScalarType;
+ typedef itk::VariableLengthVector<RealScalarType> InternalPixelType;
+ typedef typename Superclass::ParametersType ParametersType;
/** Extrema vector */
typedef std::vector<RealScalarType> ExtremaVectorType;
@@ -117,7 +116,7 @@ public:
/** Convert the input pixel to a pixel representation that can be displayed on
* RGB. For example, channel selection, modulus computation, etc.
*/
- virtual InternalPixelType EvaluatePixelRepresentation(const PixelType & spixel) const
+ virtual InternalPixelType EvaluatePixelRepresentation(const PixelType& spixel) const
{
return m_PixelRepresentationFunction(spixel);
}
@@ -129,46 +128,46 @@ public:
* If it gives 3 bands, it is interpreted as Red, Green and Blue
* If there is a fourth band, it is considered as the alpha channel and is not scaled.
*/
- virtual OutputPixelType EvaluateTransferFunction(const InternalPixelType & spixel) const
+ virtual OutputPixelType EvaluateTransferFunction(const InternalPixelType& spixel) const
{
- if ((spixel.Size() != 1) && (spixel.Size() != 3) && (spixel.Size() != 2)&& (spixel.Size() != 4))
- {
- itkExceptionMacro( << "the PixelRepresentation function should give an output of "
- << "size 1, 3 or 4 otherwise I don't know how to make an RGB of it !" );
- }
+ if ((spixel.Size() != 1) && (spixel.Size() != 3) && (spixel.Size() != 2) && (spixel.Size() != 4))
+ {
+ itkExceptionMacro(<< "the PixelRepresentation function should give an output of "
+ << "size 1, 3 or 4 otherwise I don't know how to make an RGB of it !");
+ }
if (spixel.Size() != m_TransferedMinimum.size())
- {
- itkExceptionMacro( << " m_TransferedMinimum and pixel size do not correspond"
- << " spixel.Size(): " << spixel.Size()
- << " m_TransferedMinimum.size(): " << m_TransferedMinimum.size());
- }
+ {
+ itkExceptionMacro(<< " m_TransferedMinimum and pixel size do not correspond"
+ << " spixel.Size(): " << spixel.Size()
+ << " m_TransferedMinimum.size(): " << m_TransferedMinimum.size());
+ }
OutputPixelType output(255);
-
// otbMsgDevMacro(<<"StandardRenderingFunction::EvaluateTransferFunction "
// << "m_TransferFunction(spixel[0])" << m_TransferFunction(spixel[0])
// << ", m_TransferedMinimum[0] " << m_TransferedMinimum[0]
// << ", m_TransferedMaximum[0] " << m_TransferedMaximum[0])
if (spixel.Size() == 1)
- {
- OutputValueType value = ClampRescale(m_TransferFunction(spixel[0]),m_TransferedMinimum[0],m_TransferedMaximum[0]);
+ {
+ OutputValueType value = ClampRescale(m_TransferFunction(
+ spixel[0]), m_TransferedMinimum[0], m_TransferedMaximum[0]);
output[0] = value;
output[1] = value;
output[2] = value;
- }
+ }
else
- {
- output[0] = ClampRescale(m_TransferFunction(spixel[0]),m_TransferedMinimum[0],m_TransferedMaximum[0]);
- output[1] = ClampRescale(m_TransferFunction(spixel[1]),m_TransferedMinimum[1],m_TransferedMaximum[1]);
- output[2] = ClampRescale(m_TransferFunction(spixel[2]),m_TransferedMinimum[2],m_TransferedMaximum[2]);
- }
+ {
+ output[0] = ClampRescale(m_TransferFunction(spixel[0]), m_TransferedMinimum[0], m_TransferedMaximum[0]);
+ output[1] = ClampRescale(m_TransferFunction(spixel[1]), m_TransferedMinimum[1], m_TransferedMaximum[1]);
+ output[2] = ClampRescale(m_TransferFunction(spixel[2]), m_TransferedMinimum[2], m_TransferedMaximum[2]);
+ }
if ((spixel.Size() == 4) && (output.Size() == 4))
- {
- assert((spixel[3] >= 0) && (spixel[3] <=255));
- output[3] = static_cast<OutputValueType>(spixel[3]);//just copy the alpha channel
- }
+ {
+ assert((spixel[3] >= 0) && (spixel[3] <= 255));
+ output[3] = static_cast<OutputValueType>(spixel[3]); //just copy the alpha channel
+ }
return output;
}
@@ -178,7 +177,7 @@ public:
return m_PixelRepresentationFunction.GetOutputSize();
}
- virtual void Initialize()//FIXME should disappear and be automatic (IsModified())
+ virtual void Initialize() //FIXME should disappear and be automatic (IsModified())
{
if ((this->GetMTime() > m_UTime) || (this->GetPixelRepresentationFunction().GetMTime() > m_UTime))
//NOTE: we assume that Transfer function have no parameters
@@ -212,7 +211,8 @@ public:
{
//FIXME check what happen if the m_PixelRepresentationFunction is modified AFTER the Initialize.
- otbMsgDevMacro(<<"Initialize(): "<<nbComps<<" components, quantile= "<<100*m_AutoMinMaxQuantile<<" %");
+ otbMsgDevMacro(
+ << "Initialize(): " << nbComps << " components, quantile= " << 100 * m_AutoMinMaxQuantile << " %");
// For each components, use the histogram to compute min and max
m_Minimum.clear();
m_Maximum.clear();
@@ -229,16 +229,16 @@ public:
{
// Compute quantiles
m_Minimum.push_back(
- static_cast<ScalarType> (this->GetHistogramList()->GetNthElement(comp)->Quantile(0,
- m_AutoMinMaxQuantile)));
+ static_cast<ScalarType> (this->GetHistogramList()->GetNthElement(comp)->Quantile(0,
+ m_AutoMinMaxQuantile)));
m_Maximum.push_back(static_cast<ScalarType> (this->GetHistogramList()->GetNthElement(comp)->Quantile(0, 1
- - m_AutoMinMaxQuantile)));
- otbMsgDevMacro(<<"Initialize():"<< " component "<<comp
- <<", min= "<< static_cast< typename itk::NumericTraits<ScalarType >::PrintType>(m_Minimum.back())
- <<", max= "<<static_cast< typename itk::NumericTraits<ScalarType >::PrintType>(m_Maximum.back()));
+ -
+ m_AutoMinMaxQuantile)));
+ otbMsgDevMacro(<< "Initialize():" << " component " << comp
+ << ", min= " << static_cast<typename itk::NumericTraits<ScalarType>::PrintType>(m_Minimum.back())
+ << ", max= " << static_cast<typename itk::NumericTraits<ScalarType>::PrintType>(m_Maximum.back()));
}
-
//Check if the rescaling should be applied
//if all data are already coded on unsigned char
//and at least one band has enough dynamic
@@ -247,7 +247,7 @@ public:
bool enoughDynamic = false;
for (unsigned int comp = 0; comp < nbComps; ++comp)
{
- if (m_Minimum[comp] < -1) allMinMaxWithinDynamic = false; //take margin for rounding errors
+ if (m_Minimum[comp] < -1) allMinMaxWithinDynamic = false; //take margin for rounding errors
if (m_Maximum[comp] > 256) allMinMaxWithinDynamic = false;
if (((m_Maximum[comp] - m_Minimum[comp]) > 1) || (m_Maximum[comp] == m_Minimum[comp])) enoughDynamic = true;
}
@@ -291,7 +291,7 @@ public:
}
}
- const std::string Describe(const PixelType & spixel) const
+ const std::string Describe(const PixelType& spixel) const
{
itk::OStringStream oss;
oss << m_PixelRepresentationFunction.GetDescription() << ": ";
@@ -299,89 +299,89 @@ public:
channels = m_PixelRepresentationFunction.GetChannelList();
for (unsigned int i = 0; i < channels.size(); ++i)
- {
+ {
oss << channels[i] << " ";
- }
+ }
oss << std::endl;
// unsigned int inputChannels = VisualizationPixelTraits::PixelSize(spixel);
InternalPixelType spixelRepresentation = this->EvaluatePixelRepresentation(spixel);
- OutputPixelType spixelDisplay = this->EvaluateTransferFunction(spixelRepresentation);
+ OutputPixelType spixelDisplay = this->EvaluateTransferFunction(spixelRepresentation);
oss << otbGetTextMacro("Pixel value") << ": "
- << static_cast<typename itk::NumericTraits<PixelType>::PrintType>(spixel) << std::endl;
+ << static_cast<typename itk::NumericTraits<PixelType>::PrintType>(spixel) << std::endl;
oss << otbGetTextMacro("Value computed") << ": "
- << static_cast<typename itk::NumericTraits<InternalPixelType>::PrintType>(spixelRepresentation) << std::endl;
+ << static_cast<typename itk::NumericTraits<InternalPixelType>::PrintType>(spixelRepresentation) << std::endl;
oss << otbGetTextMacro("Value displayed") << ": " << std::endl;
oss << otbGetTextMacro("R") << " " << std::setw(3)
- << static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[0]) << ", ";
+ << static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[0]) << ", ";
oss << otbGetTextMacro("G") << " " << std::setw(3)
- << static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[1]) << ", ";
+ << static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[1]) << ", ";
oss << otbGetTextMacro("B") << " " << std::setw(3)
- << static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[2]);
+ << static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[2]);
if (spixelDisplay.Size() == 4)
- {
+ {
oss << ", ";
oss << otbGetTextMacro("A") << " " << std::setw(3)
- << static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[3]);
- }
+ << static_cast<typename itk::NumericTraits<OutputValueType>::PrintType>(spixelDisplay[3]);
+ }
oss << std::endl;
return oss.str();
}
- /** Set the minimum and maximum for the different bands.
- * Has to be provided as [minBand0, maxBand0, minBand1, maxBand1,...]
- */
- virtual void SetParameters( const ParametersType & parameters)
- {
- //Clear the min and max vectors
- m_Minimum.clear();
- m_Maximum.clear();
-
- if (parameters.Size() % 2 != 0)
- {
- itkExceptionMacro( << "Min And Max should be provided for every band to display" );
- }
-
- for (unsigned int i=0; i< parameters.Size(); ++i)
- {
- m_Minimum.push_back(parameters[i]);
- ++i;
- m_Maximum.push_back(parameters[i]);
- }
- m_AutoMinMax = false;
- UpdateTransferedMinMax();
- otbMsgDevMacro(<< "StandardRenderingFunction::SetParameters: " << m_Minimum.size() << "; " << m_Maximum.size());
- this->Modified();
- }
+ /** Set the minimum and maximum for the different bands.
+ * Has to be provided as [minBand0, maxBand0, minBand1, maxBand1,...]
+ */
+ virtual void SetParameters(const ParametersType& parameters)
+ {
+ //Clear the min and max vectors
+ m_Minimum.clear();
+ m_Maximum.clear();
+
+ if (parameters.Size() % 2 != 0)
+ {
+ itkExceptionMacro(<< "Min And Max should be provided for every band to display");
+ }
+
+ for (unsigned int i = 0; i < parameters.Size(); ++i)
+ {
+ m_Minimum.push_back(parameters[i]);
+ ++i;
+ m_Maximum.push_back(parameters[i]);
+ }
+ m_AutoMinMax = false;
+ UpdateTransferedMinMax();
+ otbMsgDevMacro(<< "StandardRenderingFunction::SetParameters: " << m_Minimum.size() << "; " << m_Maximum.size());
+ this->Modified();
+ }
/**
* Get Parameters Min and and max for each band
*/
- virtual ParametersType GetParameters() const
- {
- unsigned int nbBands = m_PixelRepresentationFunction.GetOutputSize();
- ParametersType param;
- param.SetSize(2*nbBands);
-
- // Edit the parameters as [minBand0, maxBand0, minBand1, maxBand1,...]
- for(unsigned int i = 0; i< nbBands; ++i)
- {
- // Min Band
- param.SetElement(2*i,/*TransferedMinimum*/m_Minimum[i]);
- // Max Band
- param.SetElement(2*i+1,/*TransferedMaximum*/m_Maximum[i]);
- }
- return param;
- }
+ virtual ParametersType GetParameters() const
+ {
+ unsigned int nbBands = m_PixelRepresentationFunction.GetOutputSize();
+ ParametersType param;
+ param.SetSize(2 * nbBands);
+
+ // Edit the parameters as [minBand0, maxBand0, minBand1, maxBand1,...]
+ for (unsigned int i = 0; i < nbBands; ++i)
+ {
+ // Min Band
+ param.SetElement(2 * i, /*TransferedMinimum*/ m_Minimum[i]);
+ // Max Band
+ param.SetElement(2 * i + 1, /*TransferedMaximum*/ m_Maximum[i]);
+ }
+ return param;
+ }
virtual void SetChannelList(std::vector<unsigned int>& channels)
{
if (m_PixelRepresentationFunction.GetChannelList() != channels)
- {
+ {
m_PixelRepresentationFunction.SetChannelList(channels);
this->Modified();
- }
+ }
}
virtual std::vector<unsigned int> GetChannelList()
@@ -400,21 +400,20 @@ public:
return m_PixelRepresentationFunction;
}
- /** Set/Get the AutoMinMax mode */
+ /** Set/Get the AutoMinMax mode */
virtual void SetAutoMinMax(bool val)
{
- m_AutoMinMax = val;
- this->Modified();
+ m_AutoMinMax = val;
+ this->Modified();
}
- itkGetMacro(AutoMinMax,bool);
+ itkGetMacro(AutoMinMax, bool);
itkBooleanMacro(AutoMinMax);
-
protected:
/** Constructor */
StandardRenderingFunction() : m_TransferedMinimum(), m_TransferedMaximum(), m_UTime(),
- m_RedChannelIndex(0), m_GreenChannelIndex(1), m_BlueChannelIndex(2), m_AutoMinMax(true),
- m_AutoMinMaxQuantile(0.02), m_DefaultChannelsAreSet(false)
+ m_RedChannelIndex(0), m_GreenChannelIndex(1), m_BlueChannelIndex(2), m_AutoMinMax(true),
+ m_AutoMinMaxQuantile(0.02), m_DefaultChannelsAreSet(false)
{}
/** Destructor */
virtual ~StandardRenderingFunction() {}
@@ -435,9 +434,9 @@ protected:
else
{
return static_cast<OutputValueType> (vcl_floor(
- 255. * (static_cast<double> (input) - static_cast<double> (min))
- / (static_cast<double> (max) - static_cast<double> (min))
- + 0.5));
+ 255. * (static_cast<double> (input) - static_cast<double> (min))
+ / (static_cast<double> (max) - static_cast<double> (min))
+ + 0.5));
}
}
@@ -445,29 +444,29 @@ protected:
void UpdateTransferedMinMax()
{
if (m_Minimum.size() != m_Maximum.size())
- {
- itkExceptionMacro( << "m_Minimum and m_Maximum should have the same size" );
- }
+ {
+ itkExceptionMacro(<< "m_Minimum and m_Maximum should have the same size");
+ }
m_TransferedMinimum.clear();
m_TransferedMaximum.clear();
- for (unsigned int i=0; i<m_Minimum.size(); ++i)
- {
+ for (unsigned int i = 0; i < m_Minimum.size(); ++i)
+ {
m_TransferedMinimum.push_back(m_TransferFunction(m_Minimum[i]));
m_TransferedMaximum.push_back(m_TransferFunction(m_Maximum[i]));
- }
+ }
}
- /** Transfered min and max */
+ /** Transfered min and max */
ExtremaVectorType m_TransferedMinimum;
ExtremaVectorType m_TransferedMaximum;
- /** Transfer function
- * \note This member is declared mutable because some functors that
- * can be used as a transfer function but are not const correct.
- * Since a const reference is passed to the functor anyway, it is
- * not harmful to do so and preserves const correctness of the
- * Evaluate() methods.
- */
+ /** Transfer function
+ * \note This member is declared mutable because some functors that
+ * can be used as a transfer function but are not const correct.
+ * Since a const reference is passed to the functor anyway, it is
+ * not harmful to do so and preserves const correctness of the
+ * Evaluate() methods.
+ */
mutable TransferFunctionType m_TransferFunction;
PixelRepresentationFunctionType m_PixelRepresentationFunction;
@@ -475,10 +474,9 @@ protected:
/** Update time */
itk::TimeStamp m_UTime;
-
private:
StandardRenderingFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Min and max (after pixel representation)*/
ExtremaVectorType m_Minimum;
diff --git a/Code/Visualization/otbUniformAlphaBlendingFunction.h b/Code/Visualization/otbUniformAlphaBlendingFunction.h
index 44493a031a..13e798537f 100644
--- a/Code/Visualization/otbUniformAlphaBlendingFunction.h
+++ b/Code/Visualization/otbUniformAlphaBlendingFunction.h
@@ -35,19 +35,19 @@ namespace Function
*/
template <class TInputRGBPixel1, class TInputRGBPixel2 = TInputRGBPixel1, class TOutputRGBPixel = TInputRGBPixel1>
class UniformAlphaBlendingFunction
- : public BlendingFunction<TInputRGBPixel1,TInputRGBPixel2,TOutputRGBPixel>
+ : public BlendingFunction<TInputRGBPixel1, TInputRGBPixel2, TOutputRGBPixel>
{
public:
/** Standard class typedefs */
- typedef UniformAlphaBlendingFunction Self;
+ typedef UniformAlphaBlendingFunction Self;
typedef BlendingFunction<TInputRGBPixel1,
TInputRGBPixel2,
TOutputRGBPixel> Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** type macro */
- itkTypeMacro(UniformAlphaBlendingFunction,BlendingFunction);
+ itkTypeMacro(UniformAlphaBlendingFunction, BlendingFunction);
/** new macro */
itkNewMacro(Self);
@@ -59,19 +59,22 @@ public:
typedef typename OutputRGBPixelType::ValueType OutputValueType;
/** Evaluate method */
- inline virtual const OutputRGBPixelType Evaluate(const InputPixel1Type& input1, const InputPixel2Type & input2)
+ inline virtual const OutputRGBPixelType Evaluate(const InputPixel1Type& input1, const InputPixel2Type& input2)
{
OutputRGBPixelType resp;
resp.Fill(itk::NumericTraits<OutputValueType>::max());
- resp.SetRed( static_cast<OutputValueType>(vcl_floor(m_Alpha * static_cast<double>(input1.GetRed()) +(1-m_Alpha)*static_cast<double>(input2.GetRed()) +0.5)));
- resp.SetGreen(static_cast<OutputValueType>(vcl_floor(m_Alpha * static_cast<double>(input1.GetGreen()) +(1-m_Alpha)*static_cast<double>(input2.GetGreen())+0.5)));
- resp.SetBlue( static_cast<OutputValueType>(vcl_floor(m_Alpha * static_cast<double>(input1.GetBlue()) +(1-m_Alpha)*static_cast<double>(input2.GetBlue()) +0.5)));
+ resp.SetRed(static_cast<OutputValueType>(vcl_floor(m_Alpha * static_cast<double>(input1.GetRed()) +
+ (1 - m_Alpha) * static_cast<double>(input2.GetRed()) + 0.5)));
+ resp.SetGreen(static_cast<OutputValueType>(vcl_floor(m_Alpha * static_cast<double>(input1.GetGreen()) +
+ (1 - m_Alpha) * static_cast<double>(input2.GetGreen()) + 0.5)));
+ resp.SetBlue(static_cast<OutputValueType>(vcl_floor(m_Alpha * static_cast<double>(input1.GetBlue()) +
+ (1 - m_Alpha) * static_cast<double>(input2.GetBlue()) + 0.5)));
return resp;
}
/** Set/Get the alpha value */
- itkSetClampMacro(Alpha,double,0.,1.);
- itkGetMacro(Alpha,double);
+ itkSetClampMacro(Alpha, double, 0., 1.);
+ itkGetMacro(Alpha, double);
protected:
/** Constructor */
@@ -80,7 +83,7 @@ protected:
virtual ~UniformAlphaBlendingFunction() {}
private:
UniformAlphaBlendingFunction(const Self&); //purposely not implemented
- void operator=(const Self&); //purposely not implemented
+ void operator =(const Self&); //purposely not implemented
/** Alpha value for blending (should be in the range [0,1] */
double m_Alpha;
@@ -90,5 +93,3 @@ private:
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbVectorDataActionHandler.h b/Code/Visualization/otbVectorDataActionHandler.h
index 39e42a9265..fae212f5e5 100644
--- a/Code/Visualization/otbVectorDataActionHandler.h
+++ b/Code/Visualization/otbVectorDataActionHandler.h
@@ -30,31 +30,31 @@ namespace otb
*
*/
template<class TModel, class TView>
-class VectorDataActionHandler: public ImageWidgetActionHandler
+class VectorDataActionHandler : public ImageWidgetActionHandler
{
public:
/** Standard class typedefs */
- typedef VectorDataActionHandler Self;
- typedef ImageWidgetActionHandler Superclass;
- typedef itk::SmartPointer<Self> Pointer;
+ typedef VectorDataActionHandler Self;
+ typedef ImageWidgetActionHandler Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self)
-;
+ ;
/** Runtime information */
- itkTypeMacro(VectorDataActionHandler,ImageWidgetActionHandler)
-;
+ itkTypeMacro(VectorDataActionHandler, ImageWidgetActionHandler)
+ ;
/** Model typedefs */
- typedef TModel ModelType;
+ typedef TModel ModelType;
typedef typename ModelType::Pointer ModelPointerType;
/** View typedefs */
- typedef TView ViewType;
- typedef typename ViewType::Pointer ViewPointerType;
- typedef typename ViewType::OffsetType OffsetType;
+ typedef TView ViewType;
+ typedef typename ViewType::Pointer ViewPointerType;
+ typedef typename ViewType::OffsetType OffsetType;
/** Handle widget event
* \param widgetId The id of the moved widget
@@ -64,12 +64,13 @@ public:
virtual bool HandleWidgetEvent(std::string widgetId, int event)
{
if (m_View.IsNotNull() && m_Model.IsNotNull() && this->GetIsActive())
- {
+ {
//Left click
if (widgetId == m_View->GetFullWidget()->GetIdentifier() && event
== FL_PUSH && Fl::event_button() == 1)
- {
- otbMsgDevMacro(<<"VectorDataActionHandler::HandleWidgetEvent(): left click handling ("<<widgetId<<", "<<event<<")");
+ {
+ otbMsgDevMacro(
+ << "VectorDataActionHandler::HandleWidgetEvent(): left click handling (" << widgetId << ", " << event << ")");
// Get the clicked index
typename ViewType::ImageWidgetType::PointType screenPoint, imagePoint;
@@ -79,8 +80,8 @@ public:
// Transform to image point
imagePoint
- = m_View->GetFullWidget()->GetScreenToImageTransform()->TransformPoint(
- screenPoint);
+ = m_View->GetFullWidget()->GetScreenToImageTransform()->TransformPoint(
+ screenPoint);
// Transform to index
typename ModelType::VertexType index;
@@ -96,49 +97,50 @@ public:
// Update model
m_Model->Update();
return true;
- }
+ }
//Right click
if (widgetId == m_View->GetFullWidget()->GetIdentifier() && event
== FL_PUSH && Fl::event_button() == 3)
- {
- otbMsgDevMacro(<<"VectorDataActionHandler::HandleWidgetEvent(): right click handling ("<<widgetId<<", "<<event<<")");
+ {
+ otbMsgDevMacro(
+ << "VectorDataActionHandler::HandleWidgetEvent(): right click handling (" << widgetId << ", " << event << ")");
m_Model->EndGeometry();
// Update model
m_Model->Update();
return true;
- }
+ }
//Delete key pressed
if ((event == FL_KEYBOARD) || (event == FL_SHORTCUT))
- {
- switch(Fl::event_key())
{
+ switch (Fl::event_key())
+ {
case FL_Delete:
- {
+ {
m_Model->DeleteGeometry();
// Update model
m_Model->Update();
return true;
break;
+ }
+ }
}
- }
- }
- }
+ }
return false;
}
/** Set/Get the pointer to the view */
- itkSetObjectMacro(View,ViewType);
- itkGetObjectMacro(View,ViewType);
+ itkSetObjectMacro(View, ViewType);
+ itkGetObjectMacro(View, ViewType);
/** Set/Get the pointer to the model */
- itkSetObjectMacro(Model,ModelType);
- itkGetObjectMacro(Model,ModelType);
+ itkSetObjectMacro(Model, ModelType);
+ itkGetObjectMacro(Model, ModelType);
/** Set/Get Offset */
- itkSetMacro(Offset,OffsetType);
- itkGetMacro(Offset,OffsetType);
+ itkSetMacro(Offset, OffsetType);
+ itkGetMacro(Offset, OffsetType);
protected:
/** Constructor */
@@ -159,10 +161,10 @@ protected:
private:
VectorDataActionHandler(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
//Offset
- OffsetType m_Offset;
+ OffsetType m_Offset;
// Pointer to the view
ViewPointerType m_View;
diff --git a/Code/Visualization/otbVectorDataGlComponent.h b/Code/Visualization/otbVectorDataGlComponent.h
index 0b1b214e9f..6053a83bd4 100644
--- a/Code/Visualization/otbVectorDataGlComponent.h
+++ b/Code/Visualization/otbVectorDataGlComponent.h
@@ -37,7 +37,6 @@
#endif
#endif
-
namespace otb
{
/** \class VectorDataGlComponent
@@ -55,67 +54,67 @@ class VectorDataGlComponent
{
public:
/** Standard class typedefs */
- typedef VectorDataGlComponent Self;
- typedef GlComponent Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
- typedef typename Superclass::RegionType RegionType;
+ typedef VectorDataGlComponent Self;
+ typedef GlComponent Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef typename Superclass::RegionType RegionType;
// affine transform
- typedef Superclass::AffineTransformType AffineTransformType;
- typedef AffineTransformType::InputPointType PointType;
- typedef AffineTransformType::InputVectorType VectorType;
- typedef Superclass::ColorType ColorType;
+ typedef Superclass::AffineTransformType AffineTransformType;
+ typedef AffineTransformType::InputPointType PointType;
+ typedef AffineTransformType::InputVectorType VectorType;
+ typedef Superclass::ColorType ColorType;
/** VectorData typedef */
- typedef TVectorData VectorDataType;
- typedef typename VectorDataType::Pointer VectorDataPointerType;
- typedef typename VectorDataType::DataNodeType DataNodeType;
- typedef typename DataNodeType::Pointer DataNodePointerType;
- typedef typename DataNodeType::ConstPointer DataNodeConstPointerType;
- typedef typename VectorDataType::DataTreeType DataTreeType;
- typedef typename DataNodeType::LineType LineType;
- typedef typename DataNodeType::PolygonType PolygonType;
- typedef typename DataNodeType::PolygonListType PolygonListType;
- typedef typename DataTreeType::TreeNodeType InternalTreeNodeType;
+ typedef TVectorData VectorDataType;
+ typedef typename VectorDataType::Pointer VectorDataPointerType;
+ typedef typename VectorDataType::DataNodeType DataNodeType;
+ typedef typename DataNodeType::Pointer DataNodePointerType;
+ typedef typename DataNodeType::ConstPointer DataNodeConstPointerType;
+ typedef typename VectorDataType::DataTreeType DataTreeType;
+ typedef typename DataNodeType::LineType LineType;
+ typedef typename DataNodeType::PolygonType PolygonType;
+ typedef typename DataNodeType::PolygonListType PolygonListType;
+ typedef typename DataTreeType::TreeNodeType InternalTreeNodeType;
typedef typename InternalTreeNodeType::ChildrenListType ChildrenListType;
/** Runtime information */
- itkTypeMacro(VectorDataGlComponent,GlComponent);
+ itkTypeMacro(VectorDataGlComponent, GlComponent);
/** New macro */
itkNewMacro(Self);
/// Render the vector data
- virtual void Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform);
+ virtual void Render(const RegionType& extent, const AffineTransformType * space2ScreenTransform);
/** Set/Get the grid spacing */
- itkSetMacro(Spacing,VectorType);
- itkGetConstReferenceMacro(Spacing,VectorType);
+ itkSetMacro(Spacing, VectorType);
+ itkGetConstReferenceMacro(Spacing, VectorType);
/** Set/Get the grid origin */
- itkSetMacro(Origin,PointType);
- itkGetConstReferenceMacro(Origin,PointType);
+ itkSetMacro(Origin, PointType);
+ itkGetConstReferenceMacro(Origin, PointType);
/** Set/Get the VectorData to render */
- itkSetObjectMacro(VectorData,VectorDataType);
- itkGetObjectMacro(VectorData,VectorDataType);
+ itkSetObjectMacro(VectorData, VectorDataType);
+ itkGetObjectMacro(VectorData, VectorDataType);
/** Set/Get the color */
- itkSetMacro(Color,ColorType);
- itkGetConstReferenceMacro(Color,ColorType);
+ itkSetMacro(Color, ColorType);
+ itkGetConstReferenceMacro(Color, ColorType);
/** Set/Get the line width */
- itkSetMacro(LineWidth,double);
- itkGetMacro(LineWidth,double);
+ itkSetMacro(LineWidth, double);
+ itkGetMacro(LineWidth, double);
/** Set/Get the cross width */
- itkSetMacro(CrossWidth,double);
- itkGetMacro(CrossWidth,double);
+ itkSetMacro(CrossWidth, double);
+ itkGetMacro(CrossWidth, double);
/** Should we render only polygons boundaries ? */
- itkSetMacro(RenderPolygonBoundariesOnly,bool);
- itkGetMacro(RenderPolygonBoundariesOnly,bool);
+ itkSetMacro(RenderPolygonBoundariesOnly, bool);
+ itkGetMacro(RenderPolygonBoundariesOnly, bool);
itkBooleanMacro(RenderPolygonBoundariesOnly);
protected:
@@ -126,18 +125,24 @@ protected:
/** Printself method */
virtual void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
/// Render a point
- virtual void RenderPoint(DataNodePointerType dataNode, const RegionType & extent, const AffineTransformType * transform);
+ virtual void RenderPoint(DataNodePointerType dataNode,
+ const RegionType& extent,
+ const AffineTransformType * transform);
/// Render a polyline
- virtual void RenderLine(DataNodePointerType dataNode, const RegionType & extent, const AffineTransformType * transform);
+ virtual void RenderLine(DataNodePointerType dataNode, const RegionType& extent, const AffineTransformType * transform);
// Render a complex polygon (with holes)
- virtual void RenderPolygon(DataNodePointerType dataNode, const RegionType & extent, const AffineTransformType * transform);
+ virtual void RenderPolygon(DataNodePointerType dataNode,
+ const RegionType& extent,
+ const AffineTransformType * transform);
// Recursive rendering method
- virtual void Render(InternalTreeNodeType * node, const RegionType & extent, const AffineTransformType * space2ScreenTransform);
+ virtual void Render(InternalTreeNodeType * node,
+ const RegionType& extent,
+ const AffineTransformType * space2ScreenTransform);
/// Frame a given point using the frame width and color (point
/// should be in gl screen coordinates)
@@ -145,13 +150,16 @@ protected:
private:
VectorDataGlComponent(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
// Function pointer typedef
typedef GLvoid (CALLBACK * FunctionPointerType)();
// Static Combine callback for tesselation
- static void CALLBACK TesselationCombineCallback(GLdouble coords[3],GLdouble * /*data*/[4], GLfloat /*weights*/[4],GLdouble **dataOut)
+ static void CALLBACK TesselationCombineCallback(GLdouble coords[3],
+ GLdouble * /*data*/[4],
+ GLfloat /*weights*/[4],
+ GLdouble **dataOut)
{
GLdouble * vertex = new GLdouble[3];
vertex[0] = coords[0];
@@ -164,15 +172,15 @@ private:
static void CALLBACK TesselationErrorCallback(GLenum errorCode)
{
const GLubyte * estring = gluErrorString(errorCode);
- itkGenericExceptionMacro(<<"Glu Tesselation error: "<<estring);
+ itkGenericExceptionMacro(<< "Glu Tesselation error: " << estring);
}
-
+
// Static begin callback for tesselation
static void CALLBACK BeginCallback(GLenum prim)
{
glBegin(prim);
}
-
+
// Static end callback for tesselation
static void CALLBACK EndCallback()
{
@@ -182,10 +190,9 @@ private:
// static vertex callback for tesselation
static void CALLBACK VertexCallback(void * data)
{
- glVertex3dv((GLdouble*)data);
+ glVertex3dv((GLdouble*) data);
}
-
/// Pointer to the vector data to render
VectorDataPointerType m_VectorData;
@@ -193,7 +200,7 @@ private:
VectorType m_Spacing;
/// Origin of the image
- PointType m_Origin;
+ PointType m_Origin;
/// The GluTesselator object to render complex polygons
GLUtesselator * m_GluTesselator;
@@ -218,5 +225,3 @@ private:
#endif
#endif
-
-
diff --git a/Code/Visualization/otbVectorDataGlComponent.txx b/Code/Visualization/otbVectorDataGlComponent.txx
index 3e0f2c62c8..1970342362 100644
--- a/Code/Visualization/otbVectorDataGlComponent.txx
+++ b/Code/Visualization/otbVectorDataGlComponent.txx
@@ -28,27 +28,27 @@ namespace otb
{
template <class TVectorData>
VectorDataGlComponent<TVectorData>
-::VectorDataGlComponent() : m_VectorData(),m_Spacing(), m_Origin(), m_GluTesselator(),
- m_Color(), m_LineWidth(1.5),m_CrossWidth(10),m_RenderPolygonBoundariesOnly(false)
+::VectorDataGlComponent() : m_VectorData(), m_Spacing(), m_Origin(), m_GluTesselator(),
+ m_Color(), m_LineWidth(1.5), m_CrossWidth(10), m_RenderPolygonBoundariesOnly(false)
{
// Default color is red
m_Color.Fill(0);
- m_Color[0]=1.;
- m_Color[3]=0.75;
+ m_Color[0] = 1.;
+ m_Color[3] = 0.75;
// Intialize origin and spacing
m_Origin.Fill(0.);
m_Spacing.Fill(1.);
-
+
// Create the tesselator
m_GluTesselator = gluNewTess();
// Setting up the tesselator callbacks
- gluTessCallback(m_GluTesselator,GLU_TESS_BEGIN, (FunctionPointerType) BeginCallback);
- gluTessCallback(m_GluTesselator,GLU_TESS_END, (FunctionPointerType) EndCallback);
- gluTessCallback(m_GluTesselator,GLU_TESS_ERROR, (FunctionPointerType) TesselationErrorCallback);
- gluTessCallback(m_GluTesselator,GLU_TESS_VERTEX, (FunctionPointerType) VertexCallback);
- gluTessCallback(m_GluTesselator,GLU_TESS_COMBINE,(FunctionPointerType) TesselationCombineCallback);
+ gluTessCallback(m_GluTesselator, GLU_TESS_BEGIN, (FunctionPointerType) BeginCallback);
+ gluTessCallback(m_GluTesselator, GLU_TESS_END, (FunctionPointerType) EndCallback);
+ gluTessCallback(m_GluTesselator, GLU_TESS_ERROR, (FunctionPointerType) TesselationErrorCallback);
+ gluTessCallback(m_GluTesselator, GLU_TESS_VERTEX, (FunctionPointerType) VertexCallback);
+ gluTessCallback(m_GluTesselator, GLU_TESS_COMBINE, (FunctionPointerType) TesselationCombineCallback);
}
template <class TVectorData>
@@ -62,22 +62,22 @@ VectorDataGlComponent<TVectorData>
template <class TVectorData>
void
VectorDataGlComponent<TVectorData>
-::Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform)
+::Render(const RegionType& extent, const AffineTransformType * space2ScreenTransform)
{
- if(m_VectorData.IsNull())
+ if (m_VectorData.IsNull())
{
// nothing to render, return
return;
}
-
+
// Set up blending and color
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4d(m_Color[0],m_Color[1],m_Color[2],m_Color[3]);
-
+ glColor4d(m_Color[0], m_Color[1], m_Color[2], m_Color[3]);
+
// Set up line width
double previousWidth = 0.;
- glGetDoublev(GL_LINE_WIDTH,&previousWidth);
+ glGetDoublev(GL_LINE_WIDTH, &previousWidth);
// convert line width to screen line width
VectorType imageLineWidth;
@@ -85,73 +85,72 @@ VectorDataGlComponent<TVectorData>
VectorType screenLineWidth = space2ScreenTransform->TransformVector(imageLineWidth);
glLineWidth(screenLineWidth[0]);
// Do we need to render boundaries only (for polygons)
- gluTessProperty(m_GluTesselator,GLU_TESS_BOUNDARY_ONLY,m_RenderPolygonBoundariesOnly);
-
+ gluTessProperty(m_GluTesselator, GLU_TESS_BOUNDARY_ONLY, m_RenderPolygonBoundariesOnly);
// Enabling line antialiasing
glEnable(GL_LINE_SMOOTH);
// Trigger recursive rendering
InternalTreeNodeType * inputRoot = const_cast<InternalTreeNodeType *>(m_VectorData->GetDataTree()->GetRoot());
-
+
itk::TimeProbe chrono;
chrono.Start();
- this->Render(inputRoot,extent,space2ScreenTransform);
+ this->Render(inputRoot, extent, space2ScreenTransform);
chrono.Stop();
- otbMsgDevMacro(<<"VectorData component rendered in "<<chrono.GetMeanTime()<<" s.");
+ otbMsgDevMacro(<< "VectorData component rendered in " << chrono.GetMeanTime() << " s.");
glDisable(GL_LINE_SMOOTH);
glDisable(GL_BLEND);
glLineWidth(previousWidth);
}
- template <class TVectorData>
+template <class TVectorData>
void
VectorDataGlComponent<TVectorData>
-::RenderPoint(DataNodePointerType dataNode, const RegionType & /*extent*/, const AffineTransformType * transform)
+::RenderPoint(DataNodePointerType dataNode, const RegionType& /*extent*/, const AffineTransformType * transform)
{
// Take into account pixel spacing and origin
PointType spacePoint = dataNode->GetPoint();
- spacePoint[0]*= m_Spacing[0];
- spacePoint[1]*= m_Spacing[1];
- spacePoint[0]+= m_Origin[0];
- spacePoint[1]+=m_Origin[1];
+ spacePoint[0] *= m_Spacing[0];
+ spacePoint[1] *= m_Spacing[1];
+ spacePoint[0] += m_Origin[0];
+ spacePoint[1] += m_Origin[1];
// Transform to a screen point
PointType screenPoint = transform->TransformPoint(spacePoint);
-
+
glBegin(GL_LINES);
// Draw a cross
- glVertex2d(screenPoint[0]-m_CrossWidth,screenPoint[1]);
- glVertex2d(screenPoint[0]+m_CrossWidth,screenPoint[1]);
- glVertex2d(screenPoint[0],screenPoint[1]-m_CrossWidth);
- glVertex2d(screenPoint[0],screenPoint[1]+m_CrossWidth);
+ glVertex2d(screenPoint[0] - m_CrossWidth, screenPoint[1]);
+ glVertex2d(screenPoint[0] + m_CrossWidth, screenPoint[1]);
+ glVertex2d(screenPoint[0], screenPoint[1] - m_CrossWidth);
+ glVertex2d(screenPoint[0], screenPoint[1] + m_CrossWidth);
glEnd();
}
template <class TVectorData>
void
VectorDataGlComponent<TVectorData>
-::RenderLine(DataNodePointerType dataNode, const RegionType & /*extent*/, const AffineTransformType * transform)
+::RenderLine(DataNodePointerType dataNode, const RegionType& /*extent*/, const AffineTransformType * transform)
{
const LineType * l = dataNode->GetLine();
// Iterate on the line
typename LineType::VertexListType::ConstIterator vIt = l->GetVertexList()->Begin();
glBegin(GL_LINE_STRIP);
-
- while(vIt != l->GetVertexList()->End())
+
+ while (vIt != l->GetVertexList()->End())
{
// Take into account pixel spacing and origin
PointType spacePoint = vIt.Value();
- spacePoint[0]*= m_Spacing[0];
- spacePoint[1]*= m_Spacing[1];
- spacePoint[0]+= m_Origin[0];
- spacePoint[1]+= m_Origin[1];
-
+ spacePoint[0] *= m_Spacing[0];
+ spacePoint[1] *= m_Spacing[1];
+ spacePoint[0] += m_Origin[0];
+ spacePoint[1] += m_Origin[1];
+
// Transform to a screen point
PointType screenPoint = transform->TransformPoint(spacePoint);
-
+
// Add a point to the rendered line
- glVertex2d(screenPoint[0],screenPoint[1]);
+ glVertex2d(screenPoint[0], screenPoint[1]);
++vIt;
}
glEnd();
@@ -160,45 +159,45 @@ VectorDataGlComponent<TVectorData>
template <class TVectorData>
void
VectorDataGlComponent<TVectorData>
-::RenderPolygon(DataNodePointerType dataNode, const RegionType & /*extent*/, const AffineTransformType * transform)
+::RenderPolygon(DataNodePointerType dataNode, const RegionType& /*extent*/, const AffineTransformType * transform)
{
- const PolygonType * extRing = dataNode->GetPolygonExteriorRing();
+ const PolygonType * extRing = dataNode->GetPolygonExteriorRing();
const PolygonListType * intRings = dataNode->GetPolygonInteriorRings();
- typedef std::vector<GLdouble * > VertexVectorType;
+ typedef std::vector<GLdouble *> VertexVectorType;
// A buffer to hold vertex until they are rendered
VertexVectorType vertexBuffer;
// Begin a new polygon
- gluTessBeginPolygon(m_GluTesselator,NULL);
+ gluTessBeginPolygon(m_GluTesselator, NULL);
// Render the outer boundary
gluTessBeginContour(m_GluTesselator);
- // Iterate on the polygon
+ // Iterate on the polygon
typename PolygonType::VertexListType::ConstIterator vIt = extRing->GetVertexList()->Begin();
- while(vIt!= extRing->GetVertexList()->End())
+ while (vIt != extRing->GetVertexList()->End())
{
// Take into account pixel spacing and origin
PointType spacePoint = vIt.Value();
- spacePoint[0]*= m_Spacing[0];
- spacePoint[1]*= m_Spacing[1];
- spacePoint[0]+= m_Origin[0];
- spacePoint[1]+= m_Origin[1];
-
+ spacePoint[0] *= m_Spacing[0];
+ spacePoint[1] *= m_Spacing[1];
+ spacePoint[0] += m_Origin[0];
+ spacePoint[1] += m_Origin[1];
+
// Transform to a screen point
PointType screenPoint = transform->TransformPoint(spacePoint);
-
+
// Convert to double array
GLdouble * glp = new GLdouble[3];
- glp[0]=screenPoint[0];
- glp[1]=screenPoint[1];
- glp[2]=0.;
+ glp[0] = screenPoint[0];
+ glp[1] = screenPoint[1];
+ glp[2] = 0.;
vertexBuffer.push_back(glp);
// Add a point to the outer boundary
- gluTessVertex(m_GluTesselator,glp,glp);
+ gluTessVertex(m_GluTesselator, glp, glp);
++vIt;
}
@@ -209,40 +208,40 @@ VectorDataGlComponent<TVectorData>
typename PolygonListType::ConstIterator pIt = intRings->Begin();
// For each inner boundary
- while(pIt != intRings->End())
+ while (pIt != intRings->End())
{
vIt = pIt.Get()->GetVertexList()->Begin();
-
+
// Begin a new contour
- gluTessBeginContour(m_GluTesselator);
+ gluTessBeginContour(m_GluTesselator);
// Render each of its vertex
- while(vIt!= pIt.Get()->GetVertexList()->End())
- {
- // Take into account pixel spacing and origin
- PointType spacePoint = vIt.Value();
- spacePoint[0]*= m_Spacing[0];
- spacePoint[1]*= m_Spacing[1];
- spacePoint[0]+= m_Origin[0];
- spacePoint[1]+= m_Origin[1];
-
- // Transform to a screen point
- PointType screenPoint = transform->TransformPoint(spacePoint);
-
- // Convert to double array
- GLdouble * glp = new GLdouble[3];
- glp[0]=screenPoint[0];
- glp[1]=screenPoint[1];
- glp[2]=0.;
- vertexBuffer.push_back(glp);
-
- // Add a point to the outer boundary
- gluTessVertex(m_GluTesselator,glp,glp);
- ++vIt;
- }
-
- // End the contour
- gluTessEndContour(m_GluTesselator);
+ while (vIt != pIt.Get()->GetVertexList()->End())
+ {
+ // Take into account pixel spacing and origin
+ PointType spacePoint = vIt.Value();
+ spacePoint[0] *= m_Spacing[0];
+ spacePoint[1] *= m_Spacing[1];
+ spacePoint[0] += m_Origin[0];
+ spacePoint[1] += m_Origin[1];
+
+ // Transform to a screen point
+ PointType screenPoint = transform->TransformPoint(spacePoint);
+
+ // Convert to double array
+ GLdouble * glp = new GLdouble[3];
+ glp[0] = screenPoint[0];
+ glp[1] = screenPoint[1];
+ glp[2] = 0.;
+ vertexBuffer.push_back(glp);
+
+ // Add a point to the outer boundary
+ gluTessVertex(m_GluTesselator, glp, glp);
+ ++vIt;
+ }
+
+ // End the contour
+ gluTessEndContour(m_GluTesselator);
++pIt;
}
@@ -250,39 +249,39 @@ VectorDataGlComponent<TVectorData>
gluTessEndPolygon(m_GluTesselator);
// // Do not forget to free all the vertex
- for(typename VertexVectorType::iterator it = vertexBuffer.begin();
- it!=vertexBuffer.end();++it)
+ for (typename VertexVectorType::iterator it = vertexBuffer.begin();
+ it != vertexBuffer.end(); ++it)
{
- delete [] (*it);
+ delete[] (*it);
}
}
template <class TVectorData>
void
VectorDataGlComponent<TVectorData>
-::Render(InternalTreeNodeType * node, const RegionType & extent, const AffineTransformType * space2ScreenTransform)
+::Render(InternalTreeNodeType * node, const RegionType& extent, const AffineTransformType * space2ScreenTransform)
{
// Render the current node
- switch(node->Get()->GetNodeType())
+ switch (node->Get()->GetNodeType())
{
- case FEATURE_POINT:
+ case FEATURE_POINT:
{
// this->RenderPoint(node->Get()->GetPoint(),extent,space2ScreenTransform);
this->RenderPoint(node->Get(), extent, space2ScreenTransform);
break;
-
+
}
- case FEATURE_LINE:
+ case FEATURE_LINE:
{
this->RenderLine(node->Get(), extent, space2ScreenTransform);
break;
}
- case FEATURE_POLYGON:
+ case FEATURE_POLYGON:
{
this->RenderPolygon(node->Get(), extent, space2ScreenTransform);
break;
}
- default:
+ default:
{
// discard
break;
@@ -291,9 +290,9 @@ VectorDataGlComponent<TVectorData>
// Get the children list from the input node
ChildrenListType children = node->GetChildrenList();
-
+
// Render each child
- for(typename ChildrenListType::iterator it = children.begin(); it!=children.end();++it)
+ for (typename ChildrenListType::iterator it = children.begin(); it != children.end(); ++it)
{
this->Render(*it, extent, space2ScreenTransform);
}
@@ -301,5 +300,3 @@ VectorDataGlComponent<TVectorData>
}
#endif
-
-
diff --git a/Code/Visualization/otbVectorDataModel.cxx b/Code/Visualization/otbVectorDataModel.cxx
index f31d4ff128..03fa6f31a0 100644
--- a/Code/Visualization/otbVectorDataModel.cxx
+++ b/Code/Visualization/otbVectorDataModel.cxx
@@ -22,15 +22,15 @@ namespace otb
VectorDataModel::VectorDataModel() :
m_VectorData(), m_CurrentNodeType(FEATURE_POLYGON), m_CurrentRootNode(),
- m_CurrentGeometry()//, m_UpperModel()
+ m_CurrentGeometry() //, m_UpperModel()
{
m_VectorData = VectorDataType::New();
m_CurrentRootNode = DataNodeType::New();
m_CurrentRootNode->SetNodeId("DOCUMENT");
m_CurrentRootNode->SetNodeType(DOCUMENT);
m_VectorData->GetDataTree()->Add(
- m_CurrentRootNode,
- m_VectorData->GetDataTree()->GetRoot()->Get());
+ m_CurrentRootNode,
+ m_VectorData->GetDataTree()->GetRoot()->Get());
}
@@ -42,10 +42,10 @@ void VectorDataModel::Update(void)
void VectorDataModel::AddPointToGeometry(VertexType& vertex)
{
if (m_CurrentNodeType == FEATURE_POINT)
- {
+ {
otbMsgDevMacro(<< "VectorDataModel::AddPointToGeometry: Creating and adding new point");
if (m_CurrentGeometry.IsNull())
- {
+ {
m_CurrentGeometry = DataNodeType::New();
m_CurrentGeometry->SetNodeId("FEATURE_POINT");
m_CurrentGeometry->SetNodeType(FEATURE_POINT);
@@ -53,16 +53,16 @@ void VectorDataModel::AddPointToGeometry(VertexType& vertex)
m_VectorData->GetDataTree()->Add(m_CurrentGeometry, m_CurrentRootNode);
m_CurrentGeometry = NULL;
this->Modified();
- }
+ }
else
- {
- itkExceptionMacro(<<"No partially created geometry should be up when adding FEATURE_POINT");
+ {
+ itkExceptionMacro(<< "No partially created geometry should be up when adding FEATURE_POINT");
+ }
}
- }
else if (m_CurrentNodeType == FEATURE_POLYGON)
- {
- if (m_CurrentGeometry.IsNull())
{
+ if (m_CurrentGeometry.IsNull())
+ {
otbMsgDevMacro(<< "VectorDataModel::AddPointToGeometry: Creating new polygon");
m_CurrentGeometry = DataNodeType::New();
m_CurrentGeometry->SetNodeId("FEATURE_POLYGON");
@@ -70,38 +70,38 @@ void VectorDataModel::AddPointToGeometry(VertexType& vertex)
PolygonType::Pointer exteriorRing = PolygonType::New();
m_CurrentGeometry->SetPolygonExteriorRing(exteriorRing);
m_VectorData->GetDataTree()->Add(m_CurrentGeometry, m_CurrentRootNode);
- }
+ }
otbMsgDevMacro(<< "VectorDataModel::AddPoint: Adding point " << vertex);
m_CurrentGeometry->GetPolygonExteriorRing()->AddVertex(vertex);
- }
+ }
else
- {
- itkExceptionMacro(<<"Node type not (yet) supported: " << m_CurrentNodeType);
- }
+ {
+ itkExceptionMacro(<< "Node type not (yet) supported: " << m_CurrentNodeType);
+ }
this->Update();
}
void VectorDataModel::EndGeometry(void)
{
if (m_CurrentNodeType == FEATURE_POINT)
- {
+ {
otbMsgDevMacro(<< "VectorDataModel::EndGeometry: Point don't need the geometry to be ended");
- }
+ }
else if (m_CurrentNodeType == FEATURE_POLYGON)
- {
+ {
if (m_CurrentGeometry->GetPolygonExteriorRing()->GetVertexList()->Size()
<= 2)
- {
- itkExceptionMacro(<<"Polygon must have at least 3 points");
- }
+ {
+ itkExceptionMacro(<< "Polygon must have at least 3 points");
+ }
otbMsgDevMacro(<< "VectorDataModel::EndGeometry: Ending polygon and adding to vector data");
m_CurrentGeometry = NULL;
- }
+ }
else
- {
- itkExceptionMacro(<<"Node type not (yet) supported: " << m_CurrentNodeType);
- }
+ {
+ itkExceptionMacro(<< "Node type not (yet) supported: " << m_CurrentNodeType);
+ }
this->Modified();
this->Update();
}
@@ -110,38 +110,39 @@ void VectorDataModel::DeleteGeometry(void)
{
//delete selected geometry if there is one
if (m_SelectedGeometry.IsNotNull())
- {
- VectorDataType::DataTreeType::PreOrderIteratorType it(m_VectorData->GetDataTree(), m_VectorData->GetDataTree()->GetRoot());
- it.GoToBegin();
- while ( !it.IsAtEnd() || ((it.GetNode())->Get() != m_SelectedGeometry))
{
+ VectorDataType::DataTreeType::PreOrderIteratorType it(m_VectorData->GetDataTree(),
+ m_VectorData->GetDataTree()->GetRoot());
+ it.GoToBegin();
+ while (!it.IsAtEnd() || ((it.GetNode())->Get() != m_SelectedGeometry))
+ {
++it;
- }
+ }
if (it.IsAtEnd())
- {
- itkExceptionMacro(<<"The selected geometry is not in the tree (and it should)");
- }
+ {
+ itkExceptionMacro(<< "The selected geometry is not in the tree (and it should)");
+ }
it.Remove();
- m_SelectedGeometry=NULL;
- }
+ m_SelectedGeometry = NULL;
+ }
else
- {
+ {
//No selected geometry found, delete the last one
otbMsgDevMacro(<< "VectorDataModel::DeleteGeometry: Removing last geometry");
//FIXME in need of a cleaner interface for the vector data
VectorDataType::DataTreeType::TreeNodeType
- * currentRootNode =
- const_cast<VectorDataType::DataTreeType::TreeNodeType*> (m_VectorData->GetDataTree()->GetNode(
- m_CurrentRootNode));
+ * currentRootNode =
+ const_cast<VectorDataType::DataTreeType::TreeNodeType*> (m_VectorData->GetDataTree()->GetNode(
+ m_CurrentRootNode));
if (currentRootNode->GetChildrenList().size() > 0)
- {
+ {
otbMsgDevMacro(<< "Current number of elements (before deletion)" << currentRootNode->GetChildrenList().size());
currentRootNode->GetChildrenList().pop_back();
+ }
}
- }
this->Modified();
this->Update();
@@ -149,32 +150,34 @@ void VectorDataModel::DeleteGeometry(void)
VectorDataModel::DataNodeType::Pointer VectorDataModel::GetNthDataNode(int n)
{
- VectorDataType::DataTreeType::PreOrderIteratorType it(m_VectorData->GetDataTree(), m_VectorData->GetDataTree()->GetRoot());
+ VectorDataType::DataTreeType::PreOrderIteratorType it(m_VectorData->GetDataTree(),
+ m_VectorData->GetDataTree()->GetRoot());
it.GoToBegin();
- int i=0;
+ int i = 0;
while (!it.IsAtEnd() &&
- !(
- ( (it.GetNode())->Get()->IsPointFeature())
- || (it.GetNode())->Get()->IsLineFeature()
- || (it.GetNode())->Get()->IsPolygonFeature()
- ))
- {
+ !(
+ ((it.GetNode())->Get()->IsPointFeature())
+ || (it.GetNode())->Get()->IsLineFeature()
+ || (it.GetNode())->Get()->IsPolygonFeature()
+ ))
+ {
++it;
- }
- while (i<n && !it.IsAtEnd())
- {
- if ((it.GetNode())->Get()->IsPointFeature() || (it.GetNode())->Get()->IsLineFeature() || (it.GetNode())->Get()->IsPolygonFeature())
+ }
+ while (i < n && !it.IsAtEnd())
{
+ if ((it.GetNode())->Get()->IsPointFeature() || (it.GetNode())->Get()->IsLineFeature() ||
+ (it.GetNode())->Get()->IsPolygonFeature())
+ {
++i;
- }
+ }
++it;
- }
+ }
if (it.IsAtEnd())
- {
+ {
// itkExceptionMacro(<<"VectorDataModel::GetNthDataNode: requesting for inaccessible node: " << n);
- otbMsgDevMacro(<<"VectorDataModel::GetNthDataNode: requesting for inaccessible node: " << n);
+ otbMsgDevMacro(<< "VectorDataModel::GetNthDataNode: requesting for inaccessible node: " << n);
return NULL;
- }
+ }
return (it.GetNode())->Get();
}
@@ -184,4 +187,3 @@ void VectorDataModel::SetSelectedGeometry(int n)
}
}
-
diff --git a/Code/Visualization/otbVectorDataModel.h b/Code/Visualization/otbVectorDataModel.h
index c3cb7b98f8..9d5a92a2a6 100644
--- a/Code/Visualization/otbVectorDataModel.h
+++ b/Code/Visualization/otbVectorDataModel.h
@@ -39,18 +39,18 @@ class ITK_EXPORT VectorDataModel
{
public:
/** Standard class typedefs */
- typedef VectorDataModel Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef VectorDataModel Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
- typedef otb::VectorData<double,2> VectorDataType;
+ typedef otb::VectorData<double, 2> VectorDataType;
typedef VectorDataType::DataNodeType DataNodeType;
- typedef VectorDataType::PolygonType PolygonType;
- typedef PolygonType::VertexType VertexType;
+ typedef VectorDataType::PolygonType PolygonType;
+ typedef PolygonType::VertexType VertexType;
/** Runtime information */
- itkTypeMacro(VectorDataModel,Object);
+ itkTypeMacro(VectorDataModel, Object);
/** New macro */
itkNewMacro(Self);
@@ -59,8 +59,8 @@ public:
void Update(void);
/** Set/Get the node type used */
- itkSetMacro(CurrentNodeType,NodeType);
- itkGetMacro(CurrentNodeType,NodeType);
+ itkSetMacro(CurrentNodeType, NodeType);
+ itkGetMacro(CurrentNodeType, NodeType);
/** Return a pointer to the vector data */
itkGetObjectMacro(VectorData, VectorDataType);
@@ -79,15 +79,14 @@ protected:
VectorDataModel();
/** Destructor */
- virtual ~VectorDataModel(){};
-
+ virtual ~VectorDataModel(){}
private:
- VectorDataModel(const Self&);
- void operator=(const Self&);
+ VectorDataModel(const Self &);
+ void operator =(const Self&);
VectorDataType::Pointer m_VectorData;
- NodeType m_CurrentNodeType;
+ NodeType m_CurrentNodeType;
/** Node where the next geometry should be attached */
DataNodeType::Pointer m_CurrentRootNode;
diff --git a/Code/Visualization/otbVerticalAsymptoteCurve.cxx b/Code/Visualization/otbVerticalAsymptoteCurve.cxx
index 586398934f..03d0a68859 100644
--- a/Code/Visualization/otbVerticalAsymptoteCurve.cxx
+++ b/Code/Visualization/otbVerticalAsymptoteCurve.cxx
@@ -26,49 +26,48 @@ VerticalAsymptoteCurve::VerticalAsymptoteCurve()
m_VerticalAsymptoteColor.Fill(0.5);
m_Abcisse = 0.;
}
-
+
// VerticalAsymptoteCurve::~VerticalAsymptoteCurve()
// {}
-
-void VerticalAsymptoteCurve::Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform)
+
+void VerticalAsymptoteCurve::Render(const RegionType& extent, const AffineTransformType * space2ScreenTransform)
{
PointType spacePoint, screenPoint;
-
+
// Rendering bounds
- glColor3d(m_VerticalAsymptoteColor[0],m_VerticalAsymptoteColor[1],m_VerticalAsymptoteColor[2]);
+ glColor3d(m_VerticalAsymptoteColor[0], m_VerticalAsymptoteColor[1], m_VerticalAsymptoteColor[2]);
glBegin(GL_LINES);
// UL
spacePoint[0] = m_Abcisse;
spacePoint[1] = extent.GetIndex()[1];
screenPoint = space2ScreenTransform->TransformPoint(spacePoint);
- glVertex2d(screenPoint[0],spacePoint[1]);
+ glVertex2d(screenPoint[0], spacePoint[1]);
// LL
- spacePoint[1] = extent.GetIndex()[1]+ extent.GetSize()[1];
+ spacePoint[1] = extent.GetIndex()[1] + extent.GetSize()[1];
screenPoint = space2ScreenTransform->TransformPoint(spacePoint);
- glVertex2d(screenPoint[0],spacePoint[1]);
+ glVertex2d(screenPoint[0], spacePoint[1]);
glEnd();
}
-
+
void
VerticalAsymptoteCurve::BeforeRendering()
{
// Initialize
m_Minimum[0] = 100;
m_Minimum[1] = 100;
-
+
m_Maximum[1] = -10;
m_Maximum[0] = -10;
}
-
VerticalAsymptoteCurve::PointType
VerticalAsymptoteCurve
::GetMinimum()
{
return m_Minimum;
}
-
+
VerticalAsymptoteCurve::PointType
VerticalAsymptoteCurve
::GetMaximum()
@@ -76,5 +75,4 @@ VerticalAsymptoteCurve
return m_Maximum;
}
-
} // end namespace otb
diff --git a/Code/Visualization/otbVerticalAsymptoteCurve.h b/Code/Visualization/otbVerticalAsymptoteCurve.h
index 2191993cd8..0528482ea2 100644
--- a/Code/Visualization/otbVerticalAsymptoteCurve.h
+++ b/Code/Visualization/otbVerticalAsymptoteCurve.h
@@ -31,19 +31,19 @@ namespace otb
* \ingroup Visualization
*/
-class ITK_EXPORT VerticalAsymptoteCurve
+class ITK_EXPORT VerticalAsymptoteCurve
: public Curve2D
{
public:
/** Standard class typedefs */
- typedef VerticalAsymptoteCurve Self;
- typedef Curve2D Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef VerticalAsymptoteCurve Self;
+ typedef Curve2D Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
// Standard class macros
itkNewMacro(Self);
- itkTypeMacro(VerticalAsymptoteCurve,Curve2D);
+ itkTypeMacro(VerticalAsymptoteCurve, Curve2D);
/// Superclass typedefs
typedef Superclass::AffineTransformType AffineTransformType;
@@ -51,14 +51,14 @@ public:
typedef Superclass::PointType PointType;
typedef Superclass::VectorType VectorType;
typedef Superclass::ColorType ColorType;
- typedef itk::ContinuousIndex<double,2> ContinuousIndexType;
+ typedef itk::ContinuousIndex<double, 2> ContinuousIndexType;
/// Render the curve according to display extent and axis characteristics
- virtual void Render(const RegionType& extent,const AffineTransformType * space2ScreenTransform);
+ virtual void Render(const RegionType& extent, const AffineTransformType * space2ScreenTransform);
/// Pre-computation
virtual void BeforeRendering();
-
+
/// Get the min for each axis from the data available
virtual PointType GetMinimum();
@@ -66,41 +66,38 @@ public:
virtual PointType GetMaximum();
/// Set/Get the Asymptote color
- itkSetMacro(VerticalAsymptoteColor,ColorType);
- itkGetMacro(VerticalAsymptoteColor,ColorType);
+ itkSetMacro(VerticalAsymptoteColor, ColorType);
+ itkGetMacro(VerticalAsymptoteColor, ColorType);
/// Set the abcisse
- itkSetMacro(Abcisse,double);
- itkGetMacro(Abcisse,double);
-
+ itkSetMacro(Abcisse, double);
+ itkGetMacro(Abcisse, double);
+
protected:
/** Constructor */
VerticalAsymptoteCurve();
/** Destructor */
- virtual ~VerticalAsymptoteCurve(){};
+ virtual ~VerticalAsymptoteCurve(){}
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
- VerticalAsymptoteCurve(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ VerticalAsymptoteCurve(const Self &); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
// The histogram color
- ColorType m_VerticalAsymptoteColor;
+ ColorType m_VerticalAsymptoteColor;
+
+ PointType m_Minimum;
+ PointType m_Maximum;
- PointType m_Minimum;
- PointType m_Maximum;
+ double m_Abcisse;
+ double m_SpaceAbcisse;
- double m_Abcisse;
- double m_SpaceAbcisse;
-
}; // end class
} // end namespace otb
-
#endif
-
-
diff --git a/Code/Visualization/otbVisualizationPixelTraits.h b/Code/Visualization/otbVisualizationPixelTraits.h
index b0dab3aae2..88a11365bc 100644
--- a/Code/Visualization/otbVisualizationPixelTraits.h
+++ b/Code/Visualization/otbVisualizationPixelTraits.h
@@ -34,87 +34,87 @@ class VisualizationPixelTraits {
public:
/** Conversion methods from and to VariableLengthVector*/
- template< class TScalarTypeInput, class TScalarTypeOutput >
+ template<class TScalarTypeInput, class TScalarTypeOutput>
static void Convert(const itk::VariableLengthVector<TScalarTypeInput>& in, TScalarTypeOutput& out)
{
- out = in[0];
+ out = in[0];
}
- template< class TScalarTypeInput, class TScalarTypeOutput >
- static void Convert(TScalarTypeInput in, itk::VariableLengthVector<TScalarTypeOutput> &out)
+ template<class TScalarTypeInput, class TScalarTypeOutput>
+ static void Convert(TScalarTypeInput in, itk::VariableLengthVector<TScalarTypeOutput>& out)
{
out.SetSize(1);
- out[0]=in;
+ out[0] = in;
}
- template< class TScalarTypeInput, class TScalarTypeOutput >
- static void Convert(const itk::VariableLengthVector<TScalarTypeInput>& in, itk::VariableLengthVector<TScalarTypeOutput>& out)
+ template<class TScalarTypeInput, class TScalarTypeOutput>
+ static void Convert(const itk::VariableLengthVector<TScalarTypeInput>& in,
+ itk::VariableLengthVector<TScalarTypeOutput>& out)
{
out = in;
}
- template< class TScalarTypeInput, class TScalarTypeOutput >
+ template<class TScalarTypeInput, class TScalarTypeOutput>
static void Convert(const itk::VariableLengthVector<TScalarTypeInput>& in, itk::RGBPixel<TScalarTypeOutput>& out)
{
- out[0] = in[0];
- if(in.Size() >= 2) out[1] = in[1]; else out[1] = 0;
- if(in.Size() >= 3) out[2] = in[2]; else out[2] = 0;
+ out[0] = in[0];
+ if (in.Size() >= 2) out[1] = in[1]; else out[1] = 0;
+ if (in.Size() >= 3) out[2] = in[2]; else out[2] = 0;
}
- template< class TScalarTypeInput, class TScalarTypeOutput >
- static void Convert(itk::RGBPixel<TScalarTypeInput> in, itk::VariableLengthVector<TScalarTypeOutput> &out)
+ template<class TScalarTypeInput, class TScalarTypeOutput>
+ static void Convert(itk::RGBPixel<TScalarTypeInput> in, itk::VariableLengthVector<TScalarTypeOutput>& out)
{
out.SetSize(3);
- out[0]=in[0];
- out[1]=in[1];
- out[2]=in[2];
+ out[0] = in[0];
+ out[1] = in[1];
+ out[2] = in[2];
}
- template< class TScalarTypeInput, class TScalarTypeOutput >
+ template<class TScalarTypeInput, class TScalarTypeOutput>
static void Convert(const itk::VariableLengthVector<TScalarTypeInput>& in, itk::RGBAPixel<TScalarTypeOutput>& out)
{
- out[0] = in[0];
- if(in.Size() >= 2) out[1] = in[1]; else out[1] = 0;
- if(in.Size() >= 3) out[2] = in[2]; else out[2] = 0;
+ out[0] = in[0];
+ if (in.Size() >= 2) out[1] = in[1]; else out[1] = 0;
+ if (in.Size() >= 3) out[2] = in[2]; else out[2] = 0;
}
- template< class TScalarTypeInput, class TScalarTypeOutput >
- static void Convert(itk::RGBAPixel<TScalarTypeInput> in, itk::VariableLengthVector<TScalarTypeOutput> &out)
+ template<class TScalarTypeInput, class TScalarTypeOutput>
+ static void Convert(itk::RGBAPixel<TScalarTypeInput> in, itk::VariableLengthVector<TScalarTypeOutput>& out)
{
out.SetSize(3);
- out[0]=in[0];
- out[1]=in[1];
- out[2]=in[2];
+ out[0] = in[0];
+ out[1] = in[1];
+ out[2] = in[2];
}
/** PixelSize method which return the size of a pixel (portion to be displayed) */
- template< class TScalarTypeInput >
+ template<class TScalarTypeInput>
static unsigned int PixelSize(const itk::VariableLengthVector<TScalarTypeInput>& in)
{
return in.Size();
}
- template< class TScalarTypeInput >
- static unsigned int PixelSize(const itk::RGBPixel<TScalarTypeInput>& )
+ template<class TScalarTypeInput>
+ static unsigned int PixelSize(const itk::RGBPixel<TScalarTypeInput>&)
{
return 3;
}
- template< class TScalarTypeInput >
- static unsigned int PixelSize(const itk::RGBAPixel<TScalarTypeInput>& )
+ template<class TScalarTypeInput>
+ static unsigned int PixelSize(const itk::RGBAPixel<TScalarTypeInput>&)
{
return 4;
}
- template< class TScalarTypeInput >
- static unsigned int PixelSize(const TScalarTypeInput )
+ template<class TScalarTypeInput>
+ static unsigned int PixelSize(const TScalarTypeInput)
{
return 1;
}
-
//To be continued
};
diff --git a/Code/Visualization/otbWidgetManager.h b/Code/Visualization/otbWidgetManager.h
index a15bf9b49a..3b0205a1a3 100644
--- a/Code/Visualization/otbWidgetManager.h
+++ b/Code/Visualization/otbWidgetManager.h
@@ -23,7 +23,6 @@
#include "otbGlWidget.h"
#include <FL/Fl_Output.H>
-
namespace otb
{
/** \class WidgetManager
@@ -32,23 +31,22 @@ namespace otb
* \ingroup Visualization
*/
-class WidgetManager
+class WidgetManager
: public itk::Object
{
public:
/** Standard class typedefs */
- typedef WidgetManager Self;
- typedef itk::Object Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef WidgetManager Self;
+ typedef itk::Object Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Runtime information */
- itkTypeMacro(WidgetManager,Object);
-
+ itkTypeMacro(WidgetManager, Object);
/** Image widget */
- typedef otb::GlWidget WidgetType;
- typedef WidgetType::Pointer WidgetPointerType;
+ typedef otb::GlWidget WidgetType;
+ typedef WidgetType::Pointer WidgetPointerType;
/** Register Wigets*/
virtual void RegisterFullWidget(WidgetType* fullWidget) = 0;
@@ -62,32 +60,28 @@ public:
virtual void SetLabel(const char * label) = 0;
virtual void UnRegisterAll() = 0;
-
protected:
/** Constructor */
- WidgetManager() {};
+ WidgetManager() {}
/** Destructor */
- virtual ~WidgetManager(){};
+ virtual ~WidgetManager(){}
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
- WidgetType* m_InternalFullWidget;
- WidgetType* m_InternalScrollWidget;
- WidgetType* m_InternalZoomWidget;
- WidgetType* m_InternalCurveWidget;
- Fl_Output * m_IntenalPixelWidget;
+ WidgetType* m_InternalFullWidget;
+ WidgetType* m_InternalScrollWidget;
+ WidgetType* m_InternalZoomWidget;
+ WidgetType* m_InternalCurveWidget;
+ Fl_Output * m_IntenalPixelWidget;
private:
WidgetManager(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
-
+ void operator =(const Self&); // purposely not implemented
}; // end class
} // end namespace otb
#endif
-
-
diff --git a/Code/Visualization/otbWidgetResizingActionHandler.h b/Code/Visualization/otbWidgetResizingActionHandler.h
index 73e0e67b81..2e63a6dfe1 100644
--- a/Code/Visualization/otbWidgetResizingActionHandler.h
+++ b/Code/Visualization/otbWidgetResizingActionHandler.h
@@ -36,16 +36,16 @@ class WidgetResizingActionHandler
{
public:
/** Standard class typedefs */
- typedef WidgetResizingActionHandler Self;
- typedef ImageWidgetActionHandler Superclass;
- typedef itk::SmartPointer<Self> Pointer;
- typedef itk::SmartPointer<const Self> ConstPointer;
+ typedef WidgetResizingActionHandler Self;
+ typedef ImageWidgetActionHandler Superclass;
+ typedef itk::SmartPointer<Self> Pointer;
+ typedef itk::SmartPointer<const Self> ConstPointer;
/** Method for creation through the object factory */
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(WidgetResizingActionHandler,ImageWidgetActionHandler);
+ itkTypeMacro(WidgetResizingActionHandler, ImageWidgetActionHandler);
/** Model typedefs */
typedef TModel ModelType;
@@ -53,31 +53,35 @@ public:
typedef typename ModelType::RegionType RegionType;
/** View typedefs */
- typedef TView ViewType;
- typedef typename ViewType::Pointer ViewPointerType;
-
- /** Handle widget resizing
- * \param widgetId The id of the resized widget
- * \param x new x location
- * \param y new y location
- * \param w new width
- * \param h new height
- */
+ typedef TView ViewType;
+ typedef typename ViewType::Pointer ViewPointerType;
+
+ /** Handle widget resizing
+ * \param widgetId The id of the resized widget
+ * \param x new x location
+ * \param y new y location
+ * \param w new width
+ * \param h new height
+ */
virtual bool HandleWidgetResize(std::string widgetId, int w, int h)
{
- if(m_Model.IsNotNull() && m_View.IsNotNull() && this->GetIsActive())
+ if (m_Model.IsNotNull() && m_View.IsNotNull() && this->GetIsActive())
{
// If resizing the scroll widget, nothing has to be done.
- if(widgetId == m_View->GetScrollWidget()->GetIdentifier() )
+ if (widgetId == m_View->GetScrollWidget()->GetIdentifier())
{
- otbMsgDevMacro(<<"WidgetResizingActionHandler::HandleWidgetResize(): handling ("<<widgetId<<", "<<w<<", "<<h<<") ");
+ otbMsgDevMacro(
+ << "WidgetResizingActionHandler::HandleWidgetResize(): handling (" << widgetId << ", " << w << ", " << h <<
+ ") ");
// Nothing has to be acted to the model, juste update the view
m_View->Update();
return true;
}
- else if(widgetId == m_View->GetFullWidget()->GetIdentifier() )
+ else if (widgetId == m_View->GetFullWidget()->GetIdentifier())
{
- otbMsgDevMacro(<<"WidgetResizingActionHandler::HandleWidgetResize(): handling ("<<widgetId<<", "<<w<<", "<<h<<")");
+ otbMsgDevMacro(
+ << "WidgetResizingActionHandler::HandleWidgetResize(): handling (" << widgetId << ", " << w << ", " << h <<
+ ")");
// Enlarge the model extract region
RegionType region = m_Model->GetExtractRegion();
typename RegionType::SizeType size = region.GetSize();
@@ -89,14 +93,16 @@ public:
m_Model->Update();
return true;
}
- else if(widgetId ==m_View->GetZoomWidget()->GetIdentifier() )
+ else if (widgetId == m_View->GetZoomWidget()->GetIdentifier())
{
- otbMsgDevMacro(<<"WidgetResizingActionHandler::HandleWidgetResize(): handling ("<<widgetId<<", "<<w<<", "<<h<<")");
+ otbMsgDevMacro(
+ << "WidgetResizingActionHandler::HandleWidgetResize(): handling (" << widgetId << ", " << w << ", " << h <<
+ ")");
// Enlarge the model scaled extract region
RegionType region = m_Model->GetScaledExtractRegion();
typename RegionType::SizeType size = region.GetSize();
- size[0] = static_cast<unsigned int>(static_cast<double>(w)/m_View->GetZoomWidget()->GetIsotropicZoom());
- size[1] = static_cast<unsigned int>(static_cast<double>(h)/m_View->GetZoomWidget()->GetIsotropicZoom());
+ size[0] = static_cast<unsigned int>(static_cast<double>(w) / m_View->GetZoomWidget()->GetIsotropicZoom());
+ size[1] = static_cast<unsigned int>(static_cast<double>(h) / m_View->GetZoomWidget()->GetIsotropicZoom());
region.SetSize(size);
m_Model->SetScaledExtractRegion(region);
// Update the model
@@ -108,12 +114,12 @@ public:
}
/** Set/Get the pointer to the view */
- itkSetObjectMacro(View,ViewType);
- itkGetObjectMacro(View,ViewType);
+ itkSetObjectMacro(View, ViewType);
+ itkGetObjectMacro(View, ViewType);
/** Set/Get the pointer to the model */
- itkSetObjectMacro(Model,ModelType);
- itkGetObjectMacro(Model,ModelType);
+ itkSetObjectMacro(Model, ModelType);
+ itkGetObjectMacro(Model, ModelType);
protected:
/** Constructor */
@@ -125,12 +131,12 @@ protected:
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
WidgetResizingActionHandler(const Self&); // purposely not implemented
- void operator=(const Self&); // purposely not implemented
+ void operator =(const Self&); // purposely not implemented
// Pointer to the view
ViewPointerType m_View;
@@ -141,5 +147,3 @@ private:
}; // end class
} // end namespace otb
#endif
-
-
--
GitLab