...

[FrontAlgorithms.git] / appli / CTBronchi / MoriLabelling.hxx

diff --git a/appli/CTBronchi/MoriLabelling.hxx b/appli/CTBronchi/MoriLabelling.hxx
index 69e968bc1c377861f3012deb59156b2d1a6dc3b3..e654b09278e67537e2ac0b25e3e633d7c29237e1 100644 (file)
--- a/appli/CTBronchi/MoriLabelling.hxx
+++ b/appli/CTBronchi/MoriLabelling.hxx
@@ -6,54 +6,13 @@
 #ifndef __CTBronchi__MoriLabelling__hxx__
 #define __CTBronchi__MoriLabelling__hxx__
 
-#include <itkImageRegionConstIteratorWithIndex.h>
-
-// -------------------------------------------------------------------------
-template< class _TInputImage, class _TLabelImage >
-const typename CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
-TLabelImage* CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
-GetInputLabelImage( ) const
-{
-  return( this->GetLabels( ) );
-}
-
-// -------------------------------------------------------------------------
-template< class _TInputImage, class _TLabelImage >
-void CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
-SetInputLabelImage( TLabelImage* image )
-{
-  this->SetLabels( image );
-}
-
-// -------------------------------------------------------------------------
-template< class _TInputImage, class _TLabelImage >
-const typename CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
-TInputImage* CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
-GetInputRawImage( ) const
-{
-  return( this->GetInput( ) );
-}
-
-// -------------------------------------------------------------------------
-template< class _TInputImage, class _TLabelImage >
-void CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
-SetInputRawImage( TInputImage* image )
-{
-  this->SetInput( image );
-}
-
 // -------------------------------------------------------------------------
 template< class _TInputImage, class _TLabelImage >
 typename CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
 TInputValue CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
 GetUpperThreshold( ) const
 {
-  const TThresholdFunction* func =
-    dynamic_cast< const TThresholdFunction* >( this->GetValuePredicate( ) );
-  if( func != NULL )
-    return( func->GetUpper( ) );
-  else
-    return( TInputValue( 0 ) );
+  return( this->m_LabelFunctor->GetUpperThreshold( ) );
 }
 
 // -------------------------------------------------------------------------
@@ -61,38 +20,17 @@ template< class _TInputImage, class _TLabelImage >
 void CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
 SetUpperThreshold( TInputValue t )
 {
-  TThresholdFunction* func =
-    dynamic_cast< TThresholdFunction* >( this->GetValuePredicate( ) );
-  if( func != NULL )
-    func->SetUpper( t );
-}
-
-// -------------------------------------------------------------------------
-template< class _TInputImage, class _TLabelImage >
-typename CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
-TOutputValue CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
-GetOutsideValue( ) const
-{
-  return( this->GetInitValue( ) );
-}
-
-// -------------------------------------------------------------------------
-template< class _TInputImage, class _TLabelImage >
-void CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
-SetOutsideLabel( TOutputValue o )
-{
-  this->SetInitValue( o );
+  this->m_LabelFunctor->SetUpperThreshold( t );
 }
 
 // -------------------------------------------------------------------------
 template< class _TInputImage, class _TLabelImage >
 CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
 MoriLabelling( )
-  : Superclass( ),
-    m_InsideLabel( TOutputValue( 0 ) )
+  : Superclass( )
 {
-  typename TThresholdFunction::Pointer func = TThresholdFunction::New( );
-  this->SetPredicate( func );
+  this->m_LabelFunctor = TLabelFunctor::New( );
+  this->SetPredicate( this->m_LabelFunctor );
 }
 
 // -------------------------------------------------------------------------
@@ -102,91 +40,22 @@ CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
 {
 }
 
-// -------------------------------------------------------------------------
-template< class _TInputImage, class _TLabelImage >
-typename CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
-TNodes CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
-_UnifySeeds( )
-{
-  this->m_Seeds.clear( );
-  const TLabelImage* lbl = this->GetLabels( );
-  if( lbl == NULL )
-  {
-    std::ostringstream msg;
-    msg << "itk::ERROR: CTBronchi::MoriLabelling (" << this
-        << "): Labelled image not defined.";
-    ::itk::ExceptionObject e(
-      __FILE__, __LINE__, msg.str( ).c_str( ), ITK_LOCATION
-      );
-    throw e;
-
-  } // fi
-
-  // Iterate over labels
-  typename TLabelImage::RegionType reg = lbl->GetRequestedRegion( );
-  itk::ImageRegionConstIteratorWithIndex< TLabelImage > lIt( lbl, reg );
-  for( lIt.GoToBegin( ); !lIt.IsAtEnd( ); ++lIt )
-  {
-    if( lIt.Get( ) > 0 )
-    {
-      bool is_seed = false;
-      for( unsigned int d = 0; d < TLabelImage::ImageDimension; ++d )
-      {
-        for( int s = -1; s <= 1; s += 2 )
-        {
-          TVertex neigh = lIt.GetIndex( );
-          neigh[ d ] += s;
-          if( reg.IsInside( neigh ) )
-            is_seed |= ( lbl->GetPixel( neigh ) == 0 );
-
-        } // rof
-
-      } // rof
-
-      if( !is_seed )
-      {
-        typename TSeedsInterface::TNode node;
-        node.Vertex = lIt.GetIndex( );
-        node.Parent = lIt.GetIndex( );
-        node.FrontId = lIt.Get( );
-        node.Value = this->m_InsideLabel;
-        this->_Mark( node.Vertex, node.FrontId );
-        this->_UpdateOutputValue( node );
-      }
-      else
-      {
-        typename TSeedsInterface::TSeed seed;
-        seed.Vertex = lIt.GetIndex( );
-        seed.IsPoint = false;
-        seed.FrontId = lIt.Get( );
-        this->m_Seeds.push_back( seed );
-
-      } // fi
-
-    } // fi
-
-  } // rof
-
-  // Ok, finish initialization
-  return( this->Superclass::_UnifySeeds( ) );
-}
-
 // -------------------------------------------------------------------------
 template< class _TInputImage, class _TLabelImage >
 void CTBronchi::MoriLabelling< _TInputImage, _TLabelImage >::
 _UpdateOutputValue( TNode& n )
 {
-  const TLabelImage* input_labels = this->GetInputLabelImage( );
-
   this->Superclass::_UpdateOutputValue( n );
   if( n.FrontId != 0 )
   {
+    const TLabelImage* input_labels = this->GetInputLabels( );
     if( input_labels->GetPixel( n.Vertex ) == this->GetInsideValue( ) )
-      n.Value = this->GetInsideLabel( );
+      n.Value = TOutputValue( 1 ); // this->GetInsideLabel( );
     else
       n.Value = TOutputValue( 0 );
-    this->TAlgorithm::_UpdateOutputValue( n );
-
+    /* TODO
+       if( input_labels->GetPixel( n.Vertex ) == this->GetInsideValue( ) )
+    */
   } // fi
 }