...

[FrontAlgorithms.git] / lib / fpa / Common / SliceBySliceRandomWalker.hxx

diff --git a/lib/fpa/Common/SliceBySliceRandomWalker.hxx b/lib/fpa/Common/SliceBySliceRandomWalker.hxx
index 1cad2a110938e9705b4f8f6498c91ac1b584a797..c0bc3ff516e51fe83c2f85239b7ea14cbce3d1f9 100644 (file)
--- a/lib/fpa/Common/SliceBySliceRandomWalker.hxx
+++ b/lib/fpa/Common/SliceBySliceRandomWalker.hxx
@@ -10,6 +10,7 @@
 #include <itkImageRegionConstIterator.h>
 #include <itkImageRegionIterator.h>
 #include <itkJoinSeriesImageFilter.h>
+#include <itkMaximumImageFilter.h>
 #include <itkMinimumMaximumImageCalculator.h>
 #include <fpa/Common/RandomWalker.h>
 #include <fpa/Functors/Dijkstra/Image/Gaussian.h>
@@ -18,7 +19,10 @@
 template< class _TImage, class _TLabels, class _TScalarImage >
 fpa::Common::SliceBySliceRandomWalker< _TImage, _TLabels, _TScalarImage >::
 SliceBySliceRandomWalker( )
-  : Superclass( )
+  : Superclass( ),
+    m_Epsilon( TScalar( 1e-5 ) ),
+    m_Beta( TScalar( 1 ) ),
+    m_VesselnessThreshold( TScalar( 5 ) )
 {
   ivqITKInputConfigureMacro( InputLabels, TLabels );
   ivqITKInputConfigureMacro( InputVesselness, TScalarImage );
@@ -47,18 +51,25 @@ GenerateData( )
   const TScalarImage* vesselness = this->GetInputVesselness( );
   this->AllocateOutputs( );
 
+  // Get vesselness range
+  typedef itk::MinimumMaximumImageCalculator< TScalarImage > _TMinMax;
+  typename _TMinMax::Pointer vMinMax = _TMinMax::New( );
+  vMinMax->SetImage( vesselness );
+  vMinMax->Compute( );
+  TScalar vMax = vMinMax->GetMaximum( );
+
   // Some values
   typename TImage::RegionType region = input->GetRequestedRegion( );
-  typename TImage::SizeType regionIndex = region.GetIndex( );
+  typename TImage::IndexType regionIndex = region.GetIndex( );
   typename TImage::SizeType sliceSize = region.GetSize( );
   int numSlices = sliceSize[ 2 ];
   sliceSize[ 2 ] = 0;
-  this->m_VesselnessValue =
-    this->m_VesselnessThreshold * this->m_VesselnessMax / TScalar( 100 );
+  this->m_VesselnessValue  = TScalar( 0.01 );
+  this->m_VesselnessValue *= this->m_VesselnessThreshold * vMax;
 
   // Composite image
   typename TScalarImage::Pointer composite;
-  this->_Composite( composite, labels, vesselness );
+  this->_Composite( composite, labels, vesselness, vMax );
 
   // Extract slices
   std::vector< typename _TSliceImage::Pointer > data3D( numSlices );
@@ -77,7 +88,7 @@ GenerateData( )
     typename _TSliceScalarImage::Pointer composite_slice;
     this->_Slice( input_slice, input, sliceRegion );
     this->_Slice( labels_slice, labels, sliceRegion );
-    this->_Slice( composite_slice, composite, sliceRegion );
+    this->_Slice( composite_slice, composite.GetPointer( ), sliceRegion );
 
     // Update vectors with each image
     data3D[ i ] = input_slice;
@@ -91,7 +102,7 @@ GenerateData( )
   this->_RandomWalker( binaryTree, data3D, fusion, false );
 
   // Join results
-  typedef itk::JoinSeriesImageFilter< _TSliceImage, TImage > _TJoin;
+  typedef itk::JoinSeriesImageFilter< _TSliceLabels, TLabels > _TJoin;
   typename _TJoin::Pointer join = _TJoin::New( );
   for( int i = 0; i < numSlices; ++i )
     join->SetInput( i, binaryTree[ i ] );
@@ -106,15 +117,11 @@ fpa::Common::SliceBySliceRandomWalker< _TImage, _TLabels, _TScalarImage >::
 _Composite(
   typename TScalarImage::Pointer& composite,
   const TLabels* labels,
-  const TScalarImage* vesselness
+  const TScalarImage* vesselness,
+  const TScalar& maxVess
   )
 {
-  // Min-Max vesselness values
-  typedef itk::MinimumMaximumImageCalculator< TScalarImage > _TMinMax;
-  typename _TMinMax::Pointer minMax = _TMinMax::New( );
-  minMax->SetImage( vesselness );
-  minMax->Compute( );
-  TScalar maxVess = minMax->GetMaximum( );
+  // Some values
   typename TScalarImage::RegionType region = labels->GetRequestedRegion( );
 
   // Composite image
@@ -143,7 +150,7 @@ _Slice(
   typename _TInput::RegionType region
   )
 {
-  typedef typename _TSlicePTr::ObjectType _TSlice;
+  typedef typename _TSlicePtr::ObjectType _TSlice;
   typedef itk::ExtractImageFilter< _TInput, _TSlice > _TExtract;
 
   typename _TExtract::Pointer extract = _TExtract::New( );
@@ -231,9 +238,9 @@ _RandomWalker(
 
     // Random walker function
     typedef fpa::Functors::Dijkstra::Image::Gaussian< _TSliceData3D, _TSliceScalar > _TFunction;
-    typename TFunction::Pointer edge = TFunction::New( );
+    typename _TFunction::Pointer edge = _TFunction::New( );
     edge->SetBeta( this->m_Beta );
-    edge->SetEpsilon( this->m_Eps );
+    edge->SetEpsilon( this->m_Epsilon );
     edge->TreatAsWeightOff( );
 
     // Real random walker
@@ -245,7 +252,7 @@ _RandomWalker(
 
     // Keep maximum
     typedef itk::MaximumImageFilter< _TSliceBinary > _TMax;
-    _TMax::Pointer max = _TMax::New();
+    typename _TMax::Pointer max = _TMax::New();
     max->SetInput( 0, rw->GetOutput( ) );
     max->SetInput( 1, next );
     max->Update( );