...

diff --git a/lib/fpaPlugins/AllPixelsImageGrowFunctionSource.cxx b/lib/fpaPlugins/AllPixelsImageGrowFunctionSource.cxx
index 9d3b41c1e039abf30ea856ff2aa86e28014ad113..89a683c99adbe90dc482b4e58551f4a2c2bbc4d2 100644 (file)
--- a/lib/fpaPlugins/AllPixelsImageGrowFunctionSource.cxx
+++ b/lib/fpaPlugins/AllPixelsImageGrowFunctionSource.cxx
@@ -24,8 +24,8 @@ fpaPlugins::AllPixelsImageGrowFunctionSource::
 std::string fpaPlugins::AllPixelsImageGrowFunctionSource::
 _GenerateData( )
 {
-  cpPlugins::Interface::Image* image =
-    this->GetInput< cpPlugins::Interface::Image >( "ReferenceImage" );
+  auto image =
+    this->GetInputData< cpPlugins::Interface::Image >( "ReferenceImage" );
   if( image == NULL )
     return( "fpaPlugins::AllPixelsImageGrowFunctionSource: No input reference image." );
 
@@ -47,7 +47,7 @@ _GD0( itk::DataObject* data )
   typename _F::Pointer functor = _F::New( );
 
   // Connect output
-  GrowFunction* out = this->GetOutput< GrowFunction >( "Output" );
+  auto out = this->GetOutputData< GrowFunction >( "Output" );
   if( out != NULL )
   {
     out->SetITK< _F >( functor );

diff --git a/lib/fpaPlugins/AllPixelsImageGrowFunctionSource.h b/lib/fpaPlugins/AllPixelsImageGrowFunctionSource.h
index 51761a28b4f8cf698efb73069e33421d1e9f2a20..de2b56f20d9b6aad94ac1f6d704611df48b378e6 100644 (file)
--- a/lib/fpaPlugins/AllPixelsImageGrowFunctionSource.h
+++ b/lib/fpaPlugins/AllPixelsImageGrowFunctionSource.h
@@ -41,9 +41,6 @@ namespace fpaPlugins
     Self& operator=( const Self& other );
   };
 
-  // ---------------------------------------------------------------------
-  CPPLUGINS_INHERIT_PROVIDER( AllPixelsImageGrowFunctionSource );
-
 } // ecapseman
 
 #endif // __FPAPLUGINS__ALLPIXELSIMAGEGROWFUNCTIONSOURCE__H__

diff --git a/lib/fpaPlugins/BaseImageFilter.h b/lib/fpaPlugins/BaseImageFilter.h
index 23e93e0417cce7fd33ff4991d4b12dfa11f281ec..9a3a8ee06fb5eddfb9653b49a4e19e12a6f52344 100644 (file)
--- a/lib/fpaPlugins/BaseImageFilter.h
+++ b/lib/fpaPlugins/BaseImageFilter.h
@@ -44,11 +44,6 @@ namespace fpaPlugins
     std::set< unsigned long > m_Observers;
   };
 
-  // -----------------------------------------------------------------------
-  /*
-    CPPLUGINS_INHERIT_PROVIDER( BaseImageFilter );
-  */
-
 } // ecapseman
 
 // -------------------------------------------------------------------------

diff --git a/lib/fpaPlugins/ImageDijkstra.cxx b/lib/fpaPlugins/ImageDijkstra.cxx
index 5f614e11ef16994da98a9370efa6f28e30cc769a..185859eca95c6e33ae8996386837e1b425543c4b 100644 (file)
--- a/lib/fpaPlugins/ImageDijkstra.cxx
+++ b/lib/fpaPlugins/ImageDijkstra.cxx
@@ -44,8 +44,8 @@ fpaPlugins::ImageDijkstra::
 std::string fpaPlugins::ImageDijkstra::
 _GenerateData( )
 {
-  cpPlugins::Interface::Image* input =
-    this->GetInput< cpPlugins::Interface::Image >( "Input" );
+  auto input =
+    this->GetInputData< cpPlugins::Interface::Image >( "Input" );
   if( input == NULL )
     return( "fpaPlugins::ImageDijkstra: No input image." );
 
@@ -70,8 +70,8 @@ _GD0( itk::DataObject* data )
   typedef typename I::PointType                             _TPoint;
   typedef typename _TFilter::TMinimumSpanningTree           _TMST;
 
-  cpPlugins::Interface::PointList* seeds =
-    this->GetInput< cpPlugins::Interface::PointList >( "Seeds" );
+  auto seeds =
+    this->GetInputData< cpPlugins::Interface::PointList >( "Seeds" );
   if( seeds == NULL )
     return( "fpaPlugins::ImageRegionGrow: No given seeds." );
   I* image = dynamic_cast< I* >( data );
@@ -107,10 +107,10 @@ _GD0( itk::DataObject* data )
   this->_DeconfigureDebugger( filter );
 
   // Connect output
-  cpPlugins::Interface::Image* out =
-    this->GetOutput< cpPlugins::Interface::Image >( "Output" );
-  fpaPlugins::MinimumSpanningTree* mst =
-    this->GetOutput< fpaPlugins::MinimumSpanningTree >( "MinimumSpanningTree" );
+  auto out =
+    this->GetOutputData< cpPlugins::Interface::Image >( "Output" );
+  auto mst =
+    this->GetOutputData< fpaPlugins::MinimumSpanningTree >( "MinimumSpanningTree" );
   if( out != NULL )
     out->SetITK< _TOut >( filter->GetOutput( ) );
   else

diff --git a/lib/fpaPlugins/ImageDijkstra.h b/lib/fpaPlugins/ImageDijkstra.h
index 615d4da4018fb2f084352e82832c345181abe61a..845b8f4cfb46a77afc106ffad9b9b5ce4a5e2388 100644 (file)
--- a/lib/fpaPlugins/ImageDijkstra.h
+++ b/lib/fpaPlugins/ImageDijkstra.h
@@ -38,9 +38,6 @@ namespace fpaPlugins
     Self& operator=( const Self& other );
   };
 
-  // ---------------------------------------------------------------------
-  CPPLUGINS_INHERIT_PROVIDER( ImageDijkstra );
-
 } // ecapseman
 
 #endif // __FPAPLUGINS__IMAGEDIJKSTRA__H__

diff --git a/lib/fpaPlugins/ImageRegionGrow.cxx b/lib/fpaPlugins/ImageRegionGrow.cxx
index 1f42de56722608af41e25f905af6a64aaf9f27b3..19eba80f431eb1565f36a3acf1b2f7110ab2f9aa 100644 (file)
--- a/lib/fpaPlugins/ImageRegionGrow.cxx
+++ b/lib/fpaPlugins/ImageRegionGrow.cxx
@@ -48,8 +48,8 @@ fpaPlugins::ImageRegionGrow::
 std::string fpaPlugins::ImageRegionGrow::
 _GenerateData( )
 {
-  cpPlugins::Interface::Image* input =
-    this->GetInput< cpPlugins::Interface::Image >( "Input" );
+  auto input =
+    this->GetInputData< cpPlugins::Interface::Image >( "Input" );
   if( input == NULL )
     return( "fpaPlugins::ImageRegionGrow: No input image." );
 
@@ -72,8 +72,8 @@ _GD0( itk::DataObject* data )
   typedef typename _TFilter::TGrowingFunction         _TFunctor;
   typedef typename I::PointType                       _TPoint;
 
-  cpPlugins::Interface::PointList* seeds =
-    this->GetInput< cpPlugins::Interface::PointList >( "Seeds" );
+  auto seeds =
+    this->GetInputData< cpPlugins::Interface::PointList >( "Seeds" );
   if( seeds == NULL )
     return( "fpaPlugins::ImageRegionGrow: No given seeds." );
   I* image = dynamic_cast< I* >( data );
@@ -84,8 +84,8 @@ _GD0( itk::DataObject* data )
 
   // Connect grow functor (or create a tautology)
   typename _TFunctor::Pointer functor;
-  cpPlugins::Interface::DataObject* functor_wrapper =
-    this->GetInput< cpPlugins::Interface::DataObject >( "GrowFunction" );
+  auto functor_wrapper =
+    this->GetInputData< cpPlugins::Interface::DataObject >( "GrowFunction" );
   if( functor_wrapper != NULL )
     functor = functor_wrapper->GetITK< _TFunctor >( );
   if( functor.IsNull( ) )
@@ -118,8 +118,8 @@ _GD0( itk::DataObject* data )
   this->_DeconfigureDebugger( filter );
 
   // Connect output
-  cpPlugins::Interface::Image* out =
-    this->GetOutput< cpPlugins::Interface::Image >( "Output" );
+  auto out =
+    this->GetOutputData< cpPlugins::Interface::Image >( "Output" );
   if( out != NULL )
   {
     out->SetITK< _TOut >( filter->GetOutput( ) );

diff --git a/lib/fpaPlugins/ImageRegionGrow.h b/lib/fpaPlugins/ImageRegionGrow.h
index 6e966a1f245a9f98312955696e9a9a1772b4506f..46fa592328eec7aab2eac8f1581e42e6e20a8d4a 100644 (file)
--- a/lib/fpaPlugins/ImageRegionGrow.h
+++ b/lib/fpaPlugins/ImageRegionGrow.h
@@ -38,9 +38,6 @@ namespace fpaPlugins
     Self& operator=( const Self& other );
   };
 
-  // ---------------------------------------------------------------------
-  CPPLUGINS_INHERIT_PROVIDER( ImageRegionGrow );
-
 } // ecapseman
 
 #endif // __FPAPLUGINS__IMAGEREGIONGROW__H__

diff --git a/lib/fpaPlugins/MinimumSpanningTreeToMesh.cxx b/lib/fpaPlugins/MinimumSpanningTreeToMesh.cxx
index 9079a1ce8e25ddb5d5b70b030f3532083944b57d..36d61c248c8f736132dbbccb66f2c28af4b341a5 100644 (file)
--- a/lib/fpaPlugins/MinimumSpanningTreeToMesh.cxx
+++ b/lib/fpaPlugins/MinimumSpanningTreeToMesh.cxx
@@ -37,8 +37,8 @@ _GenerateData( )
   typedef itk::ImageBase< 2 > _2D;
   typedef itk::ImageBase< 3 > _3D;
 
-  cpPlugins::Interface::Image* input =
-    this->GetInput< cpPlugins::Interface::Image >( "ReferenceImage" );
+  auto input =
+    this->GetInputData< cpPlugins::Interface::Image >( "ReferenceImage" );
 
   if( input == NULL )
     return( "fpaPlugins::MinimumSpanningTreeToMesh: No reference image." );
@@ -64,23 +64,23 @@ _GD0( I* image )
   typedef fpa::Base::MinimumSpanningTree< _V, _VC >                    _MST;
 
   // Get inputs
-  fpaPlugins::MinimumSpanningTree* mst_wrapper =
-    this->GetInput< fpaPlugins::MinimumSpanningTree >( "Input" );
+  auto mst_wrapper =
+    this->GetInputData< fpaPlugins::MinimumSpanningTree >( "Input" );
   if( mst_wrapper == NULL )
     return( "fpaPlugins::MinimumSpanningTreeToMesh: No input MST" );
   _MST* mst = mst_wrapper->GetITK< _MST >( );
   if( mst == NULL )
     return( "fpaPlugins::MinimumSpanningTreeToMesh: Input MST type not supported." );
-  cpPlugins::Interface::PointList* seeds =
-    this->GetInput< cpPlugins::Interface::PointList >( "Seeds" );
+  auto seeds =
+    this->GetInputData< cpPlugins::Interface::PointList >( "Seeds" );
   if( seeds == NULL )
     return( "fpaPlugins::MinimumSpanningTreeToMesh: No given seeds." );
   if( seeds->GetNumberOfPoints( ) < 2 )
     return( "fpaPlugins::MinimumSpanningTreeToMesh: Not enough seeds (<2)." );
 
   // Get output
-  cpPlugins::Interface::Mesh* out =
-    this->GetOutput< cpPlugins::Interface::Mesh >( "Output" );
+  auto out =
+    this->GetOutputData< cpPlugins::Interface::Mesh >( "Output" );
   vtkSmartPointer< vtkPolyData > pd = out->GetVTK< vtkPolyData >( );
   if( pd.GetPointer( ) == NULL )
   {

diff --git a/lib/fpaPlugins/MinimumSpanningTreeToMesh.h b/lib/fpaPlugins/MinimumSpanningTreeToMesh.h
index 15ed2ed5f6c03f3927f638813b2af3433ff70846..28ed24e39a3bba4fcd8ced8fd99192baeeedde76 100644 (file)
--- a/lib/fpaPlugins/MinimumSpanningTreeToMesh.h
+++ b/lib/fpaPlugins/MinimumSpanningTreeToMesh.h
@@ -41,9 +41,6 @@ namespace fpaPlugins
     Self& operator=( const Self& other );
   };
 
-  // ---------------------------------------------------------------------
-  CPPLUGINS_INHERIT_PROVIDER( MinimumSpanningTreeToMesh );
-
 } // ecapseman
 
 #endif // __FPAPLUGINS__MINIMUMSPANNINGTREETOMESH__H__

diff --git a/lib/fpaPlugins/ThresholdImageGrowFunctionSource.cxx b/lib/fpaPlugins/ThresholdImageGrowFunctionSource.cxx
index 99bac98e9db274f313a8ccb71744f3928c7a39de..eabd396be9dcb5dc20679952fbb1f576f37f4d45 100644 (file)
--- a/lib/fpaPlugins/ThresholdImageGrowFunctionSource.cxx
+++ b/lib/fpaPlugins/ThresholdImageGrowFunctionSource.cxx
@@ -30,8 +30,8 @@ fpaPlugins::ThresholdImageGrowFunctionSource::
 std::string fpaPlugins::ThresholdImageGrowFunctionSource::
 _GenerateData( )
 {
-  cpPlugins::Interface::Image* image =
-    this->GetInput< cpPlugins::Interface::Image >( "ReferenceImage" );
+  auto image =
+    this->GetInputData< cpPlugins::Interface::Image >( "ReferenceImage" );
   if( image == NULL )
     return( "fpaPlugins::ThresholdImageGrowFunctionSource: No input reference image." );
 
@@ -55,7 +55,7 @@ _GD0( itk::DataObject* data )
   f->SetUpperThreshold( this->m_Parameters->GetReal( "UpperThreshold" ) );
 
   // Connect output
-  GrowFunction* out = this->GetOutput< GrowFunction >( "Output" );
+  auto out = this->GetOutputData< GrowFunction >( "Output" );
   if( out != NULL )
   {
     out->SetITK< _F >( f );

diff --git a/lib/fpaPlugins/ThresholdImageGrowFunctionSource.h b/lib/fpaPlugins/ThresholdImageGrowFunctionSource.h
index acd978bc3b2a5092db6d7dac59b1a17e1be77dd5..5874127c9aa471146471a451b67f6f0487b5b364 100644 (file)
--- a/lib/fpaPlugins/ThresholdImageGrowFunctionSource.h
+++ b/lib/fpaPlugins/ThresholdImageGrowFunctionSource.h
@@ -41,9 +41,6 @@ namespace fpaPlugins
     Self& operator=( const Self& other );
   };
 
-  // ---------------------------------------------------------------------
-  CPPLUGINS_INHERIT_PROVIDER( ThresholdImageGrowFunctionSource );
-
 } // ecapseman
 
 #endif // __FPAPLUGINS__THRESHOLDIMAGEGROWFUNCTIONSOURCE__H__