diff --git a/app/GenericRegionMerging.cxx b/app/GenericRegionMerging.cxx index ca7cc4413c38e0bce586759d37534a2c872169bf..20799af23c2086ed93c0a6e2b4cc6c8d6b1c4f9a 100644 --- a/app/GenericRegionMerging.cxx +++ b/app/GenericRegionMerging.cxx @@ -127,7 +127,7 @@ namespace otb segmenter.Update(); labelImage = segmenter.GetLabeledClusteredOutput(); -// rvbLabelImage = segmenter.GetClusteredImageOutput(); + //SetParameterOutputImage("out", segmenter.GetLabeledClusteredOutput()); } else if(selectedCriterion == "ed") { @@ -143,7 +143,7 @@ namespace otb segmenter.Update(); labelImage = segmenter.GetLabeledClusteredOutput(); -// rvbLabelImage = segmenter.GetClusteredImageOutput(); + //SetParameterOutputImage("out", segmenter.GetLabeledClusteredOutput()); } else if(selectedCriterion == "fls") { @@ -159,21 +159,14 @@ namespace otb segmenter.Update(); labelImage = segmenter.GetLabeledClusteredOutput(); - rvbLabelImage = segmenter.GetClusteredImageOutput(); + //SetParameterOutputImage("out", segmenter.GetLabeledClusteredOutput()); } - + // Set output image projection, origin and spacing for labelImage labelImage->SetProjectionRef(image->GetProjectionRef()); labelImage->SetOrigin(image->GetOrigin()); labelImage->SetSpacing(image->GetSpacing()); SetParameterOutputImage("out", labelImage); - -// // Set output image projection, origin and spacing for RVB labelImage -// rvbLabelImage->SetProjectionRef(image->GetProjectionRef()); -// rvbLabelImage->SetOrigin(image->GetOrigin()); -// rvbLabelImage->SetSpacing(image->GetSpacing()); -// SetParameterOutputImage("outrvb", rvbLabelImage); - } }; } // end of namespace Wrapper diff --git a/include/grmBaatzSegmenter.h b/include/grmBaatzSegmenter.h index eaf29f60584ff8ac132e0a070a7a20622e5c1d72..2395f5758edff683c1c24290f4a97c348f888a43 100644 --- a/include/grmBaatzSegmenter.h +++ b/include/grmBaatzSegmenter.h @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __GRM_BAATZ_SEGMENTER_H -#define __GRM_BAATZ_SEGMENTER_H +#ifndef GRM_BAATZ_SEGMENTER_H +#define GRM_BAATZ_SEGMENTER_H #include "grmSegmenter.h" namespace grm @@ -57,7 +57,4 @@ namespace grm }; } // end of namespace grm #include "grmBaatzSegmenter.txx" -#endif - - - +#endif \ No newline at end of file diff --git a/include/grmBaatzSegmenter.txx b/include/grmBaatzSegmenter.txx index 1d904432dec9ada21267e5e499522c2b35fb0bd4..bc1aca82de1e517b37fe4a77802fe1e7c26f4bcf 100644 --- a/include/grmBaatzSegmenter.txx +++ b/include/grmBaatzSegmenter.txx @@ -15,10 +15,11 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __GRM_BAATZ_SEGMENTER_TXX -#define __GRM_BAATZ_SEGMENTER_TXX +#ifndef GRM_BAATZ_SEGMENTER_TXX +#define GRM_BAATZ_SEGMENTER_TXX #include #include +#include "grmBaatzSegmenter.h" namespace grm { @@ -69,7 +70,7 @@ namespace grm std = std::sqrt((square_mean - 2*mean*sum + a_sum * mean* mean) / a_sum); spect_cost += (a_sum * std - a1 * n1->m_Std[b] - a2 * n2->m_Std[b]); } - spect_cost *= this->m_Param.m_ShapeWeight; + spect_cost *= this->m_Param.m_SpectralWeight; if(spect_cost < this->m_Threshold) { @@ -91,7 +92,7 @@ namespace grm shape_cost = this->m_Param.m_ShapeWeight * compact_f + (1-this->m_Param.m_ShapeWeight) * smooth_f; - return (spect_cost + (1-this->m_Param.m_ShapeWeight)*shape_cost); + return (spect_cost + (1-this->m_Param.m_SpectralWeight)*shape_cost); } else return spect_cost; @@ -116,11 +117,4 @@ namespace grm } } // end of namespace grm -#endif - - - - - - - +#endif \ No newline at end of file diff --git a/include/grmDataStructures.h b/include/grmDataStructures.h index 90222baae382bed7f5f16190971fd240e3e7e84d..bb0ebb8a09fee34c0b36e67617003aad5eff0236 100644 --- a/include/grmDataStructures.h +++ b/include/grmDataStructures.h @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __GRM_DATA_STRUCTURES_H -#define __GRM_DATA_STRUCTURES_H +#ifndef GRM_DATA_STRUCTURES_H +#define GRM_DATA_STRUCTURES_H #include #include #include diff --git a/include/grmFullLambdaScheduleSegmenter.h b/include/grmFullLambdaScheduleSegmenter.h index edf66dc364bc092df24f889f02a5df6074cf6a40..183e2864451eea5c4475facd71aa5ec0d7aa90b7 100644 --- a/include/grmFullLambdaScheduleSegmenter.h +++ b/include/grmFullLambdaScheduleSegmenter.h @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __GRM_FULL_LAMBDA_SCHEDULE_SEGMENTER_H -#define __GRM_FULL_LAMBDA_SCHEDULE_SEGMENTER_H +#ifndef GRM_FULL_LAMBDA_SCHEDULE_SEGMENTER_H +#define GRM_FULL_LAMBDA_SCHEDULE_SEGMENTER_H #include "grmSegmenter.h" namespace grm @@ -46,5 +46,4 @@ namespace grm }; } // end of namespace grm #include "grmFullLambdaScheduleSegmenter.txx" -#endif - +#endif \ No newline at end of file diff --git a/include/grmFullLambdaScheduleSegmenter.txx b/include/grmFullLambdaScheduleSegmenter.txx index 50e3c9003885d905e39a9d93617faf316a8f9161..88f8aae6e517d2e9cbc784ed0e3ba673bd1cc90d 100644 --- a/include/grmFullLambdaScheduleSegmenter.txx +++ b/include/grmFullLambdaScheduleSegmenter.txx @@ -15,8 +15,10 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __GRM_FULL_LAMBDA_SCHEDULE_SEGMENTER_TXX -#define __GRM_FULL_LAMBDA_SCHEDULE_SEGMENTER_TXX +#ifndef GRM_FULL_LAMBDA_SCHEDULE_SEGMENTER_TXX +#define GRM_FULL_LAMBDA_SCHEDULE_SEGMENTER_TXX + +#include "grmFullLambdaScheduleSegmenter.h" namespace grm { diff --git a/include/grmGraph.h b/include/grmGraph.h index a7e91d69c05bffaac62a09b76ca24c7eedd6f92e..2f9734899b9722ba475baf36ad2ef06754424053 100644 --- a/include/grmGraph.h +++ b/include/grmGraph.h @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __GRM_GRAPH_H -#define __GRM_GRAPH_H +#ifndef GRM_GRAPH_H +#define GRM_GRAPH_H #include "grmDataStructures.h" #include "lpContour.h" @@ -103,6 +103,4 @@ namespace grm }; } // end of namespace grm -#endif - - +#endif \ No newline at end of file diff --git a/include/grmGraphOperations.h b/include/grmGraphOperations.h index 8e4cc428d6498dc1230f85638b0fc6b647f721c5..13f2bbd20bfe43e95d1207db59227b1b07d66d70 100644 --- a/include/grmGraphOperations.h +++ b/include/grmGraphOperations.h @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __GRM_GRAPH_OPERATIONS_H -#define __GRM_GRAPH_OPERATIONS_H +#ifndef GRM_GRAPH_OPERATIONS_H +#define GRM_GRAPH_OPERATIONS_H #include "grmGraph.h" #include "grmNeighborhood.h" #include @@ -203,8 +203,4 @@ namespace grm } // end of namespace lsrm #include "grmGraphOperations.txx" -#endif - - - - +#endif \ No newline at end of file diff --git a/include/grmGraphOperations.txx b/include/grmGraphOperations.txx index 5429f4aa0c8b623d2bb3099911b1ba0125c5a292..bd394eb2de0d2150e90fcae0678e436a8f760ef5 100644 --- a/include/grmGraphOperations.txx +++ b/include/grmGraphOperations.txx @@ -15,9 +15,10 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __GRM_GRAPH_OPERATIONS_TXX -#define __GRM_GRAPH_OPERATIONS_TXX +#ifndef GRM_GRAPH_OPERATIONS_TXX +#define GRM_GRAPH_OPERATIONS_TXX #include +#include "grmGraphOperations.h" namespace grm { @@ -546,12 +547,4 @@ namespace grm } } // end of namespace grm -#endif - - - - - - - - +#endif \ No newline at end of file diff --git a/include/grmGraphToOtbImage.h b/include/grmGraphToOtbImage.h index c388022f9b8117dda39070e4858a2a0e162ccb21..395d3594c8afee95f83940a18adcd893f5c3b6a6 100644 --- a/include/grmGraphToOtbImage.h +++ b/include/grmGraphToOtbImage.h @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __GRM_GRAPH_TO_OTBIMAGE_H -#define __GRM_GRAPH_TO_OTBIMAGE_H +#ifndef GRM_GRAPH_TO_OTBIMAGE_H +#define GRM_GRAPH_TO_OTBIMAGE_H #include #include #include diff --git a/include/grmGraphToOtbImage.txx b/include/grmGraphToOtbImage.txx index 7303b195a7bf0679593cd0cf1bf198ce828c110f..ccb8281dae3e39d61aaf681c74a2fc2a2b321797 100644 --- a/include/grmGraphToOtbImage.txx +++ b/include/grmGraphToOtbImage.txx @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __GRM_GRAPH_TO_OTBIMAGE_TXX -#define __GRM_GRAPH_TO_OTBIMAGE_TXX +#ifndef GRM_GRAPH_TO_OTBIMAGE_TXX +#define GRM_GRAPH_TO_OTBIMAGE_TXX #include "grmGraphToOtbImage.h" #include "itkImageRegionIterator.h" #include "itkGrayscaleFillholeImageFilter.h" diff --git a/include/grmMacroGenerator.h b/include/grmMacroGenerator.h index a254eceac553570c8fdd0b65d52a3897a4a4e97d..17ff2aab8a8fa8e04ae919ec207ea23c30c7fca6 100644 --- a/include/grmMacroGenerator.h +++ b/include/grmMacroGenerator.h @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __MG_H -#define __MG_H +#ifndef MG_H +#define MG_H // Generate automatically get/set methods #define GRMGetMacro(type, name) \ diff --git a/include/grmNeighborhood.h b/include/grmNeighborhood.h index 51d5cec775d2a45cc53f0a26d7817fe43d8b5f29..c0b2090e299765f46d053637cc62cba76ae64f5c 100644 --- a/include/grmNeighborhood.h +++ b/include/grmNeighborhood.h @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __GRM_NEIGHBORHOOD_H -#define __GRM_NEIGHBORHOOD_H +#ifndef GRM_NEIGHBORHOOD_H +#define GRM_NEIGHBORHOOD_H enum CONNECTIVITY{FOUR = 0, EIGHT}; diff --git a/include/grmSegmenter.h b/include/grmSegmenter.h index 088584ee07393e66ce3fe402f08e2260a1231af0..607478dab938e179d253d1eeaabcd86f9b3a6962 100644 --- a/include/grmSegmenter.h +++ b/include/grmSegmenter.h @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __GRM_SEGMENTER_H -#define __GRM_SEGMENTER_H +#ifndef GRM_SEGMENTER_H +#define GRM_SEGMENTER_H #include "grmMacroGenerator.h" #include "grmGraphOperations.h" #include "grmGraphToOtbImage.h" @@ -170,8 +170,4 @@ namespace grm }; } // end of namespace grm -#endif - - - - +#endif \ No newline at end of file diff --git a/include/grmSpringSegmenter.h b/include/grmSpringSegmenter.h index 4d0295c4b756366a9c554813cbe2f7ffd2ed82c0..240f4be5b1f53dce59d053f9835ef4c9a603a8a9 100644 --- a/include/grmSpringSegmenter.h +++ b/include/grmSpringSegmenter.h @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __GRM_SPRING_SEGMENTER_H -#define __GRM_SPRING_SEGMENTER_H +#ifndef GRM_SPRING_SEGMENTER_H +#define GRM_SPRING_SEGMENTER_H #include "grmSegmenter.h" namespace grm diff --git a/include/grmSpringSegmenter.txx b/include/grmSpringSegmenter.txx index 75be80c8c150f4175a131cd5bb622ce1663d1f91..b817a2cb2896241ae568d0b778b500642b3ceddd 100644 --- a/include/grmSpringSegmenter.txx +++ b/include/grmSpringSegmenter.txx @@ -15,10 +15,11 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __GRM_SPRING_SEGMENTER_TXX -#define __GRM_SPRING_SEGMENTER_TXX +#ifndef GRM_SPRING_SEGMENTER_TXX +#define GRM_SPRING_SEGMENTER_TXX #include #include +#include "grmSpringSegmenter.h" namespace grm { diff --git a/include/lpContour.h b/include/lpContour.h index 81a5afaa8ef0a6667ffeccb82e717dfecb9feb2c..f0aaeac9dc1270eadeaceb98bf9f350997b0e60c 100644 --- a/include/lpContour.h +++ b/include/lpContour.h @@ -15,8 +15,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ -#ifndef __LP_CONTOUR_H -#define __LP_CONTOUR_H +#ifndef LP_CONTOUR_H +#define LP_CONTOUR_H #include #include #include @@ -111,13 +111,4 @@ namespace lp const std::size_t gridSizeX); }; } // end of namespace lp -#endif - - - - - - - - - +#endif \ No newline at end of file