X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Ffpa%2FBase%2FAlgorithm.hxx;fp=lib%2Ffpa%2FBase%2FAlgorithm.hxx;h=888dc3801711dbc290299fedea9bc45cf10b5a79;hb=c9542e420b94b0bfc1f285599f7816eab1191519;hp=68296bebba6393585839f81f02b9cfd2e4546548;hpb=5bf766068f54d061d3816f4950a076c3cf3a4d8b;p=FrontAlgorithms.git

diff --git a/lib/fpa/Base/Algorithm.hxx b/lib/fpa/Base/Algorithm.hxx
index 68296be..888dc38 100644
--- a/lib/fpa/Base/Algorithm.hxx
+++ b/lib/fpa/Base/Algorithm.hxx
@@ -7,58 +7,8 @@
 #define __fpa__Base__Algorithm__hxx__
 
 // -------------------------------------------------------------------------
-template< class _TTraits >
-fpa::Base::Algorithm< _TTraits >::TEvent::
-TEvent( )
-  : Superclass( )
-{
-}
-
-// -------------------------------------------------------------------------
-template< class _TTraits >
-fpa::Base::Algorithm< _TTraits >::TEvent::
-TEvent( const TVertex& v, unsigned long fid, bool intoq )
-  : Superclass( ),
-    Vertex( v ),
-    FrontId( fid ),
-    IntoQueue( intoq )
-{
-}
-
-// -------------------------------------------------------------------------
-template< class _TTraits >
-fpa::Base::Algorithm< _TTraits >::TEvent::
-~TEvent( )
-{
-}
-
-// -------------------------------------------------------------------------
-template< class _TTraits >
-const char* fpa::Base::Algorithm< _TTraits >::TEvent::
-GetEventName( ) const
-{
-  return( "fpa::Base::Algorithm< _TTraits >::TEvent" );
-}
-
-// -------------------------------------------------------------------------
-template< class _TTraits >
-bool fpa::Base::Algorithm< _TTraits >::TEvent::
-CheckEvent( const itk::EventObject* e ) const
-{
-  return( dynamic_cast< const Self* >( e ) != NULL );
-}
-
-// -------------------------------------------------------------------------
-template< class _TTraits >
-itk::EventObject* fpa::Base::Algorithm< _TTraits >::TEvent::
-MakeObject( ) const
-{
-  return( new Self );
-}
-
-// -------------------------------------------------------------------------
-template< class _TTraits >
-void fpa::Base::Algorithm< _TTraits >::
+template< class _TFilter, class _TMarks, class _TSeeds >
+void fpa::Base::Algorithm< _TFilter, _TMarks, _TSeeds >::
 InvokeEvent( const itk::EventObject& e )
 {
   TEvent a;
@@ -72,8 +22,8 @@ InvokeEvent( const itk::EventObject& e )
 }
 
 // -------------------------------------------------------------------------
-template< class _TTraits >
-void fpa::Base::Algorithm< _TTraits >::
+template< class _TFilter, class _TMarks, class _TSeeds >
+void fpa::Base::Algorithm< _TFilter, _TMarks, _TSeeds >::
 InvokeEvent( const itk::EventObject& e ) const
 {
   TEvent a;
@@ -87,26 +37,26 @@ InvokeEvent( const itk::EventObject& e ) const
 }
 
 // -------------------------------------------------------------------------
-template< class _TTraits >
-fpa::Base::Algorithm< _TTraits >::
+template< class _TFilter, class _TMarks, class _TSeeds >
+fpa::Base::Algorithm< _TFilter, _TMarks, _TSeeds >::
 Algorithm( )
-  : Superclass( ),
-    TMarksInterface( this ),
-    TSeedsInterface( this ),
+  : _TFilter( ),
+    _TMarks( this ),
+    _TSeeds( this ),
     m_VisualDebug( false )
 {
 }
 
 // -------------------------------------------------------------------------
-template< class _TTraits >
-fpa::Base::Algorithm< _TTraits >::
+template< class _TFilter, class _TMarks, class _TSeeds >
+fpa::Base::Algorithm< _TFilter, _TMarks, _TSeeds >::
 ~Algorithm( )
 {
 }
 
 // -------------------------------------------------------------------------
-template< class _TTraits >
-void fpa::Base::Algorithm< _TTraits >::
+template< class _TFilter, class _TMarks, class _TSeeds >
+void fpa::Base::Algorithm< _TFilter, _TMarks, _TSeeds >::
 GenerateData( )
 {
   this->InvokeEvent( itk::StartEvent( ) );
@@ -187,29 +137,29 @@ GenerateData( )
 }
 
 // -------------------------------------------------------------------------
-template< class _TTraits >
-void fpa::Base::Algorithm< _TTraits >::
+template< class _TFilter, class _TMarks, class _TSeeds >
+void fpa::Base::Algorithm< _TFilter, _TMarks, _TSeeds >::
 _BeforeGenerateData( )
 {
 }
 
 // -------------------------------------------------------------------------
-template< class _TTraits >
-void fpa::Base::Algorithm< _TTraits >::
+template< class _TFilter, class _TMarks, class _TSeeds >
+void fpa::Base::Algorithm< _TFilter, _TMarks, _TSeeds >::
 _AfterGenerateData( )
 {
 }
 
 // -------------------------------------------------------------------------
-template< class _TTraits >
-void fpa::Base::Algorithm< _TTraits >::
+template< class _TFilter, class _TMarks, class _TSeeds >
+void fpa::Base::Algorithm< _TFilter, _TMarks, _TSeeds >::
 _FinishOneLoop( )
 {
 }
 
 // -------------------------------------------------------------------------
-template< class _TTraits >
-void fpa::Base::Algorithm< _TTraits >::
+template< class _TFilter, class _TMarks, class _TSeeds >
+void fpa::Base::Algorithm< _TFilter, _TMarks, _TSeeds >::
 _QueueInit( )
 {
   this->_QueueClear( );