#ifndef __fpa__Image__SkeletonFilter__hxx__
#define __fpa__Image__SkeletonFilter__hxx__
+#include <queue>
+#include <itkImageRegionConstIteratorWithIndex.h>
+
// -------------------------------------------------------------------------
-#define __fpa__Image__SkeletonFilter__InputMacro( input_name, input_type, input_id ) \
+#define fpa_Image_SkeletonFilter_InputMacro( i_n, i_t, i_i ) \
template< class _TDistanceMap, class _TCostMap > \
typename fpa::Image::SkeletonFilter< _TDistanceMap, _TCostMap >:: \
- input_type* fpa::Image::SkeletonFilter< _TDistanceMap, _TCostMap >:: \
- Get##input_name( ) \
+ i_t* fpa::Image::SkeletonFilter< _TDistanceMap, _TCostMap >:: \
+ Get##i_n( ) \
{ \
return( \
- dynamic_cast< input_type* >( \
- this->Superclass::GetInput( input_id ) \
- ) \
+ dynamic_cast< i_t* >( this->Superclass::GetInput( i_i ) ) \
); \
} \
template< class _TDistanceMap, class _TCostMap > \
const \
typename fpa::Image::SkeletonFilter< _TDistanceMap, _TCostMap >:: \
- input_type* \
- fpa::Image::SkeletonFilter< _TDistanceMap, _TCostMap >:: \
- Get##input_name( ) const \
+ i_t* fpa::Image::SkeletonFilter< _TDistanceMap, _TCostMap >:: \
+ Get##i_n( ) const \
{ \
return( \
- dynamic_cast< const input_type* >( \
- this->Superclass::GetInput( input_id ) \
- ) \
+ dynamic_cast< const i_t* >( this->Superclass::GetInput( i_i ) ) \
); \
} \
template< class _TDistanceMap, class _TCostMap > \
void fpa::Image::SkeletonFilter< _TDistanceMap, _TCostMap >:: \
- Set##input_name( input_type* input ) \
+ Set##i_n( i_t* input ) \
{ \
- this->Superclass::SetInput( input_id, input ); \
+ this->Superclass::SetNthInput( i_i, input ); \
}
-__fpa__Image__SkeletonFilter__InputMacro( DistanceMap, TDistanceMap, 0 );
-__fpa__Image__SkeletonFilter__InputMacro( CostMap, TCostMap, 1 );
-__fpa__Image__SkeletonFilter__InputMacro( MinimumSpanningTree, TMST, 2 );
+fpa_Image_SkeletonFilter_InputMacro( DistanceMap, TDistanceMap, 0 );
+fpa_Image_SkeletonFilter_InputMacro( CostMap, TCostMap, 1 );
+fpa_Image_SkeletonFilter_InputMacro( MinimumSpanningTree, TMST, 2 );
// -------------------------------------------------------------------------
-#define __fpa__Image__SkeletonFilter__OutputMacro( output_name, output_type, output_id ) \
+#define fpa_Image_SkeletonFilter_OutputMacro( o_n, o_t, o_i ) \
template< class _TDistanceMap, class _TCostMap > \
typename fpa::Image::SkeletonFilter< _TDistanceMap, _TCostMap >:: \
- output_type* fpa::Image::SkeletonFilter< _TDistanceMap, _TCostMap >:: \
- Get##output_name( ) \
+ o_t* fpa::Image::SkeletonFilter< _TDistanceMap, _TCostMap >:: \
+ Get##o_n( ) \
{ \
return( \
- dynamic_cast< output_type* >( \
- this->Superclass::GetOutput( output_id ) \
- ) \
+ dynamic_cast< o_t* >( this->Superclass::GetOutput( o_i ) ) \
); \
} \
template< class _TDistanceMap, class _TCostMap > \
const typename \
fpa::Image::SkeletonFilter< _TDistanceMap, _TCostMap >:: \
- output_type* fpa::Image::SkeletonFilter< _TDistanceMap, _TCostMap >:: \
- Get##output_name( ) const \
+ o_t* fpa::Image::SkeletonFilter< _TDistanceMap, _TCostMap >:: \
+ Get##o_n( ) const \
{ \
return( \
- dynamic_cast< const output_type* >( \
- this->Superclass::GetOutput( output_id ) \
- ) \
+ dynamic_cast< const o_t* >( this->Superclass::GetOutput( o_i ) ) \
); \
}
-__fpa__Image__SkeletonFilter__OutputMacro( Skeleton, TSkeleton, 0 );
-__fpa__Image__SkeletonFilter__OutputMacro( EndPoints, TIndices, 1 );
-__fpa__Image__SkeletonFilter__OutputMacro( Bifurcations, TIndices, 2 );
+fpa_Image_SkeletonFilter_OutputMacro( Skeleton, TSkeleton, 0 );
+fpa_Image_SkeletonFilter_OutputMacro( EndPoints, TIndices, 1 );
+fpa_Image_SkeletonFilter_OutputMacro( Bifurcations, TIndices, 2 );
+fpa_Image_SkeletonFilter_OutputMacro( Marks, TMarks, 3 );
// -------------------------------------------------------------------------
template< class _TDistanceMap, class _TCostMap >
SkeletonFilter( )
: Superclass( )
{
- this->SetNumbeOfRequiredInputs( 3 );
- this->SetNumbeOfRequiredOutputs( 3 );
+ this->SetNumberOfRequiredInputs( 3 );
+ this->SetNumberOfRequiredOutputs( 3 );
typename TIndices::Pointer end_points = TIndices::New( );
typename TIndices::Pointer bifurcations = TIndices::New( );
typename TSkeleton::Pointer skeleton = TSkeleton::New( );
- this->SetNthOutput( 0, skeleton );
- this->SetNthOutput( 1, end_points );
- this->SetNthOutput( 2, bifurcations );
+ typename TMarks::Pointer marks = TMarks::New( );
+ this->SetNthOutput( 0, skeleton.GetPointer( ) );
+ this->SetNthOutput( 1, end_points.GetPointer( ) );
+ this->SetNthOutput( 2, bifurcations.GetPointer( ) );
+ this->SetNthOutput( 3, marks.GetPointer( ) );
}
// -------------------------------------------------------------------------
const TDistanceMap* dmap = this->GetDistanceMap( );
const TCostMap* cmap = this->GetCostMap( );
const TMST* mst = this->GetMinimumSpanningTree( );
- TIndices* end_points = this->GetEndPoints( );
- TIndices* bifurcations = this->GetBifurcations( );
- TSkeleton* skeleton = this->GetSkeleton( );
+ TIndices* ep = this->GetEndPoints( );
+ TIndices* bi = this->GetBifurcations( );
+ TSkeleton* sk = this->GetSkeleton( );
// 1. Check input correspondance
// TODO
// 2. Detect end-points
- this->_EndPoints( dmap, cmap, mst, end_points );
+ this->_EndPoints( dmap, cmap, mst, ep->Get( ) );
// 3. Build skeleton and keep track of bifurcations
- this->_Skeleton( dmap, cmap, mst, end_points, bifurcations, skeleton );
+ this->_Skeleton( dmap, cmap, mst, ep->Get( ), bi->Get( ), sk );
}
// -------------------------------------------------------------------------
const TDistanceMap* dmap,
const TCostMap* cmap,
const TMST* mst,
- TIndices* end_points
+ TIndicesData& end_points
)
{
typedef itk::ImageRegionConstIteratorWithIndex< _TDistanceMap > _TDistMapIt;
typedef itk::Image< unsigned char, _TCostMap::ImageDimension > _TMarks;
// Some values
- typename _TMarks::Pointer marks = _TMarks::New( );
+ // typename _TMarks::Pointer marks = _TMarks::New( );
+ auto marks = this->GetMarks( );
marks->SetLargestPossibleRegion( dmap->GetLargestPossibleRegion( ) );
marks->SetRequestedRegion( dmap->GetRequestedRegion( ) );
marks->SetBufferedRegion( dmap->GetBufferedRegion( ) );
} // rof
// BFS from maximum queue
+ auto region = dmap->GetRequestedRegion( );
+ double init_v = queue.begin( )->first;
while( queue.size( ) > 0 )
{
// Get node
queue.erase( nIt );
unsigned char m = marks->GetPixel( n.second );
- if( ( m & 0x01 ) == 0x01 )
+ // if( ( m & 0x01 ) == 0x01 )
+ if( m != 0 || ( n.first / init_v ) < double( 1e-1 ) )
continue;
+ std::cout << n.second << " " << n.first << " " << dmap->GetPixel( n.second ) << std::endl;
+
// Mark it and update end-points
m |= 0x01;
marks->SetPixel( n.second, m );
- end_points->Get( ).insert( n.second );
+ end_points.insert( n.second );
// Get path
typename TMST::TPath::Pointer path;
mst->GetPath( path, n.second );
for( unsigned long i = 0; i < path->GetSize( ); ++i )
{
- TIndex idx = path->GetVertex( path->GetSize( ) - 1 - i );
+ TIndex idx = path->GetVertex( i );
typename _TCostMap::PointType cnt;
cmap->TransformIndexToPhysicalPoint( idx, cnt );
- double d = double( dmap->GetPixel( idx ) );
- d *= double( 2 );
+ double d = double( 2 ) * double( dmap->GetPixel( idx ) );
// Mark sphere
std::queue< TIndex > q;
unsigned char m = marks->GetPixel( v );
if( ( m & 0x02 ) == 0x02 )
continue;
- m |= 0x03;
+ m |= 0x02;
marks->SetPixel( v, m );
for( unsigned int x = 0; x < _TCostMap::ImageDimension; ++x )
const TDistanceMap* dmap,
const TCostMap* cmap,
const TMST* mst,
- TIndices* end_points
- TIndices* bifurcations,
+ const TIndicesData& end_points,
+ TIndicesData& bifurcations,
TSkeleton* skeleton
)
{
+ typedef typename TMST::TPath _TPath;
+
+ for( auto eIt = end_points.begin( ); eIt != end_points.end( ); ++eIt )
+ {
+ typename _TPath::Pointer path;
+ mst->GetPath( path, *eIt );
+ skeleton->AddBranch( path );
+
+ } // rof
}
#endif // __fpa__Image__SkeletonFilter__hxx__
git://git.creatis.insa-lyon.fr / FrontAlgorithms.git / blobdiff