From df6a8089cb10200eb0741a6a9e463ca7a95edafe Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@c-s.fr>
Date: Fri, 1 Dec 2006 10:01:08 +0000
Subject: [PATCH] Correction du calcul des minimal Bounding Regions, correction
du calcul du RCC8.
---
...ryImageMinimalBoundingRegionCalculator.txx | 4 ++--
.../otbImageToImageRCC8Calculator.txx | 20 +++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx b/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
index c4b239b7b0..46916ee001 100644
--- a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
+++ b/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
@@ -162,8 +162,8 @@ BinaryImageMinimalBoundingRegionCalculator<TInputImage>
index[i]=min[i];
}
}
- otbMsgDebugMacro(<<"BinaryImageMinimalBoundingBoxCalculator: index "<<index);
- otbMsgDebugMacro(<<"BinaryImageMinimalBoundingBoxCalculator: size "<<size);
+ // otbMsgDebugMacro(<<"BinaryImageMinimalBoundingBoxCalculator: index "<<index);
+ // otbMsgDebugMacro(<<"BinaryImageMinimalBoundingBoxCalculator: size "<<size);
// Set the size and index of the output region
m_Region.SetIndex(index);
m_Region.SetSize(size);
diff --git a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx b/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx
index e62f40cfd8..1abe83089c 100644
--- a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx
+++ b/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx
@@ -142,7 +142,7 @@ namespace otb
}
region.SetIndex(index);
region.SetSize(size);
- otbMsgDebugMacro(<<"RCC8Calculator->ComputeMinimalRegion(): index: "<<index<<" size: "<<size);
+ // otbMsgDebugMacro(<<"RCC8Calculator->ComputeMinimalRegion(): index: "<<index<<" size: "<<size);
return region;
}
/**
@@ -183,7 +183,7 @@ ImageToImageRCC8Calculator<TInputImage>
++inputIt;
++outputIt;
}
- otbMsgDebugMacro(<<"RCC8Calculator->ConvertToBoolImage() size: "<<output->GetLargestPossibleRegion().GetSize());
+ // otbMsgDebugMacro(<<"RCC8Calculator->ConvertToBoolImage() size: "<<output->GetLargestPossibleRegion().GetSize());
return output;
}
/**
@@ -320,7 +320,7 @@ ImageToImageRCC8Calculator<TInputImage>
ImageToImageRCC8Calculator<TInputImage>
::ComputeRelation(bool edgeEdgeBool, bool interExterBool, bool exterInterBool)
{
- otbMsgDebugMacro(<<"RCC8Calculator->ComputeRelation()");
+ // otbMsgDebugMacro(<<"RCC8Calculator->ComputeRelation()");
// This decision process is based on a decision tree
if ((!interExterBool)&&(edgeEdgeBool)&&(!exterInterBool))
{
@@ -385,7 +385,7 @@ ImageToImageRCC8Calculator<TInputImage>
ImageToImageRCC8Calculator<TInputImage>
::GenerateData(void)
{
- otbMsgDebugMacro(<<"RCC8Calculator->GenerateData()");
+ // otbMsgDebugMacro(<<"RCC8Calculator->GenerateData()");
/// First we compute the minimal region of interest we will use for the relation computation
m_MinimalROI=this->ComputeMinimalRegion();
/// If they are disjoint, the answer is trivial
@@ -393,7 +393,7 @@ ImageToImageRCC8Calculator<TInputImage>
{
/// The relation is DC
m_Value=OTB_RCC8_DC;
- otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): Disjoint regions");
+ // otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): Disjoint regions");
}
else
{
@@ -401,14 +401,14 @@ ImageToImageRCC8Calculator<TInputImage>
// the minimal region
m_BoolImage1=ConvertToBoolImage(this->GetInput1());
m_BoolImage2=ConvertToBoolImage(this->GetInput2());
- otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): Bool images computed: "<<m_BoolImage1->GetLargestPossibleRegion().GetSize());
+ // 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;
/// The boolean edgeEdge is needed in each case, so it si computed
/// now
edgeEdgeBool = ComputeEdgeEdgeBool();
- otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): edgeEdge "<<edgeEdgeBool);
+ // otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): edgeEdge "<<edgeEdgeBool);
/// Here comes the outside knowledge
if(this->GetLevel1APrioriKnowledge())
{
@@ -420,7 +420,7 @@ ImageToImageRCC8Calculator<TInputImage>
{
/// Else it must be computed
interExterBool = ComputeInterExterBool();
- otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): interExter "<<interExterBool);
+ // otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): interExter "<<interExterBool);
}
/// At this stage we can determine if the relation is of type NTPP
if((!interExterBool)&&(!edgeEdgeBool))
@@ -440,14 +440,14 @@ ImageToImageRCC8Calculator<TInputImage>
{
/// Else it must be computed
exterInterBool = ComputeExterInterBool();
- otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): ExterInter "<<exterInterBool);
+ // otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): ExterInter "<<exterInterBool);
}
/// If it is not sufficient to compute the relation
if(!ComputeRelation(edgeEdgeBool,interExterBool,exterInterBool))
{
/// Compute the last boolean
interInterBool = ComputeInterInterBool();
- otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): InterInter "<<interInterBool);
+ // otbMsgDebugMacro(<<"RCC8Calculator->GenerateData(): InterInter "<<interInterBool);
/// Which allow the full determination
if ((interExterBool)&&(edgeEdgeBool)&&(exterInterBool)&&(!interInterBool))
{
--
GitLab