-#include <plugins/ImageBooleanFilters/OrImageFilter.h>
+#include <ImageBooleanFilters/OrImageFilter.h>
#include <cpPlugins/DataObjects/Image.h>
+#include <cpPlugins/DataObjects/Image_Demanglers.h>
#include <itkOrImageFilter.h>
-#include <itkBinaryFunctorImageFilter.hxx>
// -------------------------------------------------------------------------
cpPluginsImageBooleanFilters::OrImageFilter::
OrImageFilter( )
: Superclass( )
{
- this->_ConfigureInput< cpPlugins::DataObjects::Image >( "Input0", true, false );
- this->_ConfigureInput< cpPlugins::DataObjects::Image >( "Input1", true, false );
- this->_ConfigureOutput< cpPlugins::DataObjects::Image >( "Output" );
+ typedef cpPlugins::DataObjects::Image _TImage;
+
+ this->_ConfigureInput< _TImage >( "Input1", true, false );
+ this->_ConfigureInput< _TImage >( "Input2", true, false );
+ this->_ConfigureOutput< _TImage >( "Output" );
}
// -------------------------------------------------------------------------
void cpPluginsImageBooleanFilters::OrImageFilter::
_GenerateData( )
{
- auto o = this->GetInputData( "Input0" );
- cpPlugins_Demangle_ImageIntegers_Dims( o, _GD0 );
- else this->_Error( "Invalid input image." );
+ auto o = this->GetInputData( "Input1" );
+ cpPlugins_Demangle_Image_IntPixels_AllDims_1( o, _GD0 )
+ this->_Error( "Invalid input image." );
}
// -------------------------------------------------------------------------
template< class _TImage >
void cpPluginsImageBooleanFilters::OrImageFilter::
-_GD0( _TImage* image0 )
+_GD0( _TImage* image1 )
{
typedef itk::OrImageFilter< _TImage, _TImage > _TFilter;
- auto image1 = this->GetInputData< _TImage >( "Input1" );
- if( image1 == NULL )
+ auto image2 = this->GetInputData< _TImage >( "Input2" );
+ if( image2 == NULL )
this->_Error( "Incompatible second input image." );
// Configure filter
auto filter = this->_CreateITK< _TFilter >( );
- filter->SetInput( 0, image0 );
- filter->SetInput( 1, image1 );
+ filter->SetInput1( image1 );
+ filter->SetInput2( image2 );
filter->Update( );
// Connect output