X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FPlugins%2FBasicFilters%2FMacheteFilter.cxx;h=6a077f500c2106a25309010fb18a9d21ed175628;hb=b6c7e73ebcce23619daced67f85d9e1364b33f30;hp=71b3af481495376306fb099683b047d7897e9858;hpb=7caa01f9eacc4861ba7d5d9ed16872d60328088f;p=cpPlugins.git

diff --git a/lib/cpPlugins/Plugins/BasicFilters/MacheteFilter.cxx b/lib/cpPlugins/Plugins/BasicFilters/MacheteFilter.cxx
index 71b3af4..6a077f5 100644
--- a/lib/cpPlugins/Plugins/BasicFilters/MacheteFilter.cxx
+++ b/lib/cpPlugins/Plugins/BasicFilters/MacheteFilter.cxx
@@ -130,8 +130,7 @@ ExecConfigurationDialog( QWidget* parent )
   
   // Get bounding box
   double bbox[ 6 ];
-  cpPlugins::Interface::Image* image =
-    this->GetInput< cpPlugins::Interface::Image >( "Input" );
+  auto image = this->GetInputData( "Input" );
   bool input_found = false;
   if( image != NULL )
   {
@@ -139,8 +138,7 @@ ExecConfigurationDialog( QWidget* parent )
     input_found = true;
 
   } // fi
-  cpPlugins::Interface::Mesh* mesh =
-    this->GetInput< cpPlugins::Interface::Mesh >( "Input" );
+  auto mesh = this->GetInputData( "Input" );
   if( mesh != NULL )
   {
     mesh->GetVTK< vtkPolyData >( )->GetBounds( bbox );
@@ -218,12 +216,10 @@ cpPlugins::BasicFilters::MacheteFilter::
 std::string cpPlugins::BasicFilters::MacheteFilter::
 _GenerateData( )
 {
-  cpPlugins::Interface::Image* image =
-    this->GetInput< cpPlugins::Interface::Image >( "Input" );
+  auto image = this->GetInputData( "Input" );
   if( image != NULL )
     return( this->_FromImage( image ) );
-  cpPlugins::Interface::Mesh* mesh =
-    this->GetInput< cpPlugins::Interface::Mesh >( "Input" );
+  auto mesh = this->GetInputData( "Input" );
   if( mesh == NULL )
     return( this->_FromMesh( mesh ) );
   return( "MacheteFilter: No valid input." );
@@ -231,7 +227,7 @@ _GenerateData( )
 
 // -------------------------------------------------------------------------
 std::string cpPlugins::BasicFilters::MacheteFilter::
-_FromImage( cpPlugins::Interface::Image* image )
+_FromImage( cpPlugins::Interface::DataObject* image )
 {
   itk::DataObject* itk_image = NULL;
   std::string r = "";
@@ -243,7 +239,7 @@ _FromImage( cpPlugins::Interface::Image* image )
 
 // -------------------------------------------------------------------------
 std::string cpPlugins::BasicFilters::MacheteFilter::
-_FromMesh( cpPlugins::Interface::Mesh* mesh )
+_FromMesh( cpPlugins::Interface::DataObject* mesh )
 {
   return( "" );
 }
@@ -289,31 +285,25 @@ _RealImage( itk::DataObject* dobj )
   filter->SetOutsideValue( _TPixel( 0 ) );
   filter->Update( );
 
-  // Get output names
-  auto pos_name = this->GetOutput< _TObj >( "PositiveOutput" )->GetName( );
-  auto neg_name = this->GetOutput< _TObj >( "NegativeOutput" )->GetName( );
-
   // Connect outputs (and correct their types and names)
-  _TImage* pos_out = this->GetOutput< _TImage >( "PositiveOutput" );
+  _TObj* pos_out = this->GetOutputData( "PositiveOutput" );
   if( pos_out == NULL )
   {
     this->_AddOutput< _TImage >( "PositiveOutput" );
-    pos_out = this->GetOutput< _TImage >( "PositiveOutput" );
-    pos_out->SetName( pos_name );
+    pos_out = this->GetOutputData( "PositiveOutput" );
 
   } // fi
-  _TImage* neg_out = this->GetOutput< _TImage >( "NegativeOutput" );
+  _TObj* neg_out = this->GetOutputData( "NegativeOutput" );
   if( neg_out == NULL )
   {
     this->_AddOutput< _TImage >( "NegativeOutput" );
-    neg_out = this->GetOutput< _TImage >( "NegativeOutput" );
-    neg_out->SetName( neg_name );
+    neg_out = this->GetOutputData( "NegativeOutput" );
 
   } // fi
 
   // Assign outputs
-  pos_out->SetITK< I >( filter->GetPositiveOutput( ) );
-  neg_out->SetITK< I >( filter->GetNegativeOutput( ) );
+  pos_out->SetITK( filter->GetPositiveOutput( ) );
+  neg_out->SetITK( filter->GetNegativeOutput( ) );
   return( "" );
 }