From 915fb31735360caba6cc4c59d19cabeb090705b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leonardo=20Fl=C3=B3rez-Valencia?= Date: Tue, 7 Feb 2017 09:03:01 -0500 Subject: [PATCH] ... --- plugins/CMakeLists.txt | 6 +++++- plugins/ImageAlgorithms/MoriRegionGrow.cxx | 13 ++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 3f7acfe..9c2c3db 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -31,7 +31,11 @@ IF(USE_cpPlugins) ${fpa_AllInstances} ) ENDFOREACH(_d) - TARGET_LINK_LIBRARIES(fpaPluginsImageAlgorithms fpaPluginsDijkstraFunctors) + TARGET_LINK_LIBRARIES( + fpaPluginsImageAlgorithms + fpaPluginsRegionGrowFunctors + fpaPluginsDijkstraFunctors + ) ENDIF(USE_cpPlugins) diff --git a/plugins/ImageAlgorithms/MoriRegionGrow.cxx b/plugins/ImageAlgorithms/MoriRegionGrow.cxx index c12e855..1a49979 100644 --- a/plugins/ImageAlgorithms/MoriRegionGrow.cxx +++ b/plugins/ImageAlgorithms/MoriRegionGrow.cxx @@ -13,9 +13,10 @@ MoriRegionGrow( ) this->_ConfigureInput< _TData >( "GrowFunction", true, false ); this->m_Parameters.ConfigureAsInt( "InsideValue", 1 ); this->m_Parameters.ConfigureAsInt( "OutsideValue", 0 ); - this->m_Parameters.ConfigureAsInt( "Step", 1 ); - this->m_Parameters.ConfigureAsReal( "LowerThreshold", 1 ); - this->m_Parameters.ConfigureAsReal( "UpperThreshold", 1 ); + this->m_Parameters.ConfigureAsReal( "Step", 1 ); + this->m_Parameters.ConfigureAsReal( "Lower", 0 ); + this->m_Parameters.ConfigureAsReal( "Upper", 1 ); + this->m_Parameters.ConfigureAsReal( "Sensitivity", 1 ); this->m_Parameters.ConfigureAsIntTypesChoices( "ResultType" ); } @@ -60,13 +61,15 @@ _GD1( _TInputImage* image ) itk::Image< _TOutputPixel, _TInputImage::ImageDimension > _TOutputImage; typedef fpa::Image::MoriRegionGrow< _TInputImage, _TOutputImage > _TFilter; - typedef typename _TFilter::TGrowFunction _TGrow; auto filter = this->_CreateITK< _TFilter >( ); this->_ConfigureFilter( filter, image ); - filter->SetGrowFunction( this->GetInputData< _TGrow >( "GrowFunction" ) ); filter->SetInsideValue( this->m_Parameters.GetInt( "InsideValue" ) ); filter->SetOutsideValue( this->m_Parameters.GetInt( "OutsideValue" ) ); + filter->SetStep( this->m_Parameters.GetReal( "Step" ) ); + filter->SetLower( this->m_Parameters.GetReal( "Lower" ) ); + filter->SetUpper( this->m_Parameters.GetReal( "Upper" ) ); + filter->SetSensitivity( this->m_Parameters.GetReal( "Sensitivity" ) ); filter->Update( ); this->GetOutput( "Output" )->SetITK( filter->GetOutput( ) ); } -- 2.47.1