// @author Leonardo Florez Valencia
// @email florez-l@javeriana.edu.co
// =========================================================================
-
#ifndef __CTBronchi__MoriLabelling__h__
#define __CTBronchi__MoriLabelling__h__
+#include <fpa/Filters/BaseMarksInterface.h>
+#include <fpa/Filters/Image/SeedsFromLabelsInterface.h>
#include <fpa/Filters/Image/DefaultTraits.h>
-#include <fpa/Filters/MarksInterface.h>
-#include <fpa/Filters/Image/LabelsSeedFilter.h>
-#include <fpa/Filters/Image/LabelsSeedInterface.h>
#include <fpa/Filters/Image/RegionGrow.h>
#include <fpa/Functors/RegionGrow/BinaryThreshold.h>
-/* TODO
- #include <fpa/Base/RegionGrow.h>
- #include <fpa/Base/MarksInterface.h>
- #include <fpa/Base/Functors/RegionGrow/BinaryThreshold.h>
- #include <fpa/Image/Algorithm.h>
- #include <fpa/Image/DefaultTraits.h>
- #include <fpa/Image/LabelledSeedsInterface.h>
-*/
-
namespace CTBronchi
{
/**
*/
- template< class _TInputImage, class _TLabelImage >
+ template< class _TImage, class _TLabels >
class MoriLabellingTraits
- : public fpa::Filters::Image::DefaultTraits< _TInputImage, _TLabelImage, typename _TLabelImage::PixelType >
+ : public fpa::Filters::Image::DefaultTraits< _TImage, _TLabels, typename _TLabels::PixelType >
{
public:
- typedef _TInputImage TInputImage;
- typedef _TLabelImage TLabelImage;
- typedef fpa::Filters::Image::DefaultTraits< TInputImage, TLabelImage, typename TLabelImage::PixelType > Superclass;
-
- typedef typename Superclass::TInternalTraits TInternalTraits;
- typedef typename Superclass::TFilter TFilter;
- typedef fpa::Filters::MarksInterface< TInternalTraits > TMarksInterface;
- typedef fpa::Filters::Image::LabelsSeedInterface< TInternalTraits > TSeedsInterface;
+ typedef fpa::Filters::Image::DefaultTraits< _TImage, _TLabels, typename _TLabels::PixelType > Superclass;
+ typedef typename Superclass::TInternalTraits TInternalTraits;
+ typedef typename Superclass::TMarksImage TMarksImage;
+ typedef typename Superclass::TFilterInterface TFilterInterface;
+
+ typedef fpa::Filters::BaseMarksInterface< TInternalTraits > TMarksInterface;
+ typedef fpa::Filters::Image::SeedsFromLabelsInterface< TInternalTraits > TSeedsInterface;
};
/**
*/
- template< class _TInputImage, class _TLabelImage >
+ template< class _TImage, class _TLabels, class _TScalarImage >
class MoriLabelling
- : public fpa::Filters::Image::LabelsSeedFilter< fpa::Filters::Image::Algorithm< fpa::Filters::RegionGrow< CTBronchi::MoriLabellingTraits< _TInputImage, _TLabelImage > > >, _TLabelImage >
+ : public fpa::Filters::Image::RegionGrow< _TImage, _TLabels, typename _TLabels::PixelType, CTBronchi::MoriLabellingTraits< _TImage, _TLabels > >
{
public:
- typedef _TInputImage TInputImage;
- typedef _TLabelImage TLabelImage;
- typedef CTBronchi::MoriLabellingTraits< TInputImage, TLabelImage > TTraits;
- fpaTraitsMacro( typename, TTraits );
+ typedef CTBronchi::MoriLabellingTraits< _TImage, _TLabels > TTraits;
+ fpaTraitsMacro( typename TTraits );
- typedef fpa::Filters::Image::Algorithm< fpa::Filters::RegionGrow< TTraits > > TAlgorithm;
- typedef fpa::Filters::Image::LabelsSeedFilter< TAlgorithm, _TLabelImage > Superclass;
+ typedef fpa::Filters::Image::RegionGrow< _TImage, _TLabels, TMark, TTraits > Superclass;
typedef MoriLabelling Self;
- typedef itk::SmartPointer< Self > Pointer;
- typedef itk::SmartPointer< const Self > ConstPointer;
+ typedef itk::SmartPointer< Self > Pointer;
+ typedef itk::SmartPointer< const Self > ConstPointer;
- typedef fpa::Functors::RegionGrow::BinaryThreshold< TInputValue > TLabelFunctor;
+ typedef fpa::Functors::RegionGrow::BinaryThreshold< TInputValue > TFunctor;
public:
itkNewMacro( Self );
- itkTypeMacro( CTBronchi::MoriLabelling, fpa::Filters::Image::RegionGrow );
+ itkTypeMacro( MoriLabelling, fpa::Filters::Image::RegionGrow );
- public:
- TInputValue GetUpperThreshold( ) const;
- void SetUpperThreshold( TInputValue t );
+ itkGetConstMacro( VesselnessThreshold, double );
+ itkSetMacro( VesselnessThreshold, double );
- protected:
- MoriLabelling( );
- virtual ~MoriLabelling( );
+ itkGetConstMacro( UpperThreshold, TInputValue );
+ itkSetMacro( UpperThreshold, TInputValue );
+
+ ivqITKInputMacro( InputLabels, _TLabels );
+ ivqITKInputMacro( InputVesselness, _TScalarImage );
- virtual void _UpdateOutputValue( TNode& n ) override;
+ protected:
+ MoriLabelling( )
+ : Superclass( ),
+ m_VesselnessThreshold( 0.05 ),
+ m_UpperThreshold( -650 )
+ {
+ ivqITKInputConfigureMacro( InputLabels, _TLabels );
+ ivqITKInputConfigureMacro( InputVesselness, _TScalarImage );
+ this->m_Functor = TFunctor::New( );
+ this->SetPredicate( this->m_Functor );
+ }
+
+ virtual ~MoriLabelling( )
+ {
+ }
private:
// Purposely not implemented.
Self& operator=( const Self& other );
protected:
- typename TLabelFunctor::Pointer m_LabelFunctor;
+ typename TFunctor::Pointer m_Functor;
+ double m_VesselnessThreshold;
+ TInputValue m_UpperThreshold;
};
} // ecapseman
-#ifndef ITK_MANUAL_INSTANTIATION
-# include <CTBronchi/MoriLabelling.hxx>
-#endif // ITK_MANUAL_INSTANTIATION
-
-#endif // __CTBronchi__MoriLabelling__h__
+#endif // __CTBronchi__Functions__h__
// eof - $RCSfile$