From: Leonardo Florez-Valencia Date: Mon, 18 Apr 2016 01:51:07 +0000 (-0500) Subject: ... X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ee47805904ac406cd2433cd9a9a9eeec68d1fc6e;p=FrontAlgorithms.git ... --- diff --git a/appli/TempAirwaysAppli/TempAirwaysAppli.cxx b/appli/TempAirwaysAppli/TempAirwaysAppli.cxx index 160d26f..2664f78 100644 --- a/appli/TempAirwaysAppli/TempAirwaysAppli.cxx +++ b/appli/TempAirwaysAppli/TempAirwaysAppli.cxx @@ -23,8 +23,6 @@ namespace typedef std::vector< AirwaysTree > AirwaysVector; -#include - // Auxiliar struct to save info for execution. typedef void* TImagePointer; struct TreeInfo{ @@ -43,13 +41,19 @@ struct TreeInfo{ void CastImage( ) { - auto image = this->myWorkspace->GetFilter( "reader" )->GetOutputData( "Output" )->GetITK< itk::Image< unsigned char, 3 > >( ); - typedef itk::CastImageFilter< itk::Image< unsigned char, 3 >, TInputImage > _TCast; - _TCast::Pointer cast = _TCast::New( ); - cast->SetInput( image ); - cast->Update( ); - this->Image = cast->GetOutput( ); - this->Image->DisconnectPipeline( ); + try + { + this->myWorkspace->Execute( "cast" ); + } + catch( itk::ExceptionObject& err ) + { + std::cerr << "Error: " << err << std::endl; + std::exit( 1 ); + + } // yrt + this->Image = + this->myWorkspace->GetFilter( "cast" )->GetOutputData( "Output" )-> + GetITK< TInputImage >( ); } TInputImage::Pointer Image; diff --git a/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.hxx b/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.hxx index 789d392..cdc34fb 100644 --- a/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.hxx +++ b/lib/fpa/Image/ExtractEndPointsAndBifurcationsFromMinimumSpanningTree.hxx @@ -144,7 +144,7 @@ _MarkSphere( const unsigned long& l ) { - double rr = r * double( 1.5 ); + double rr = r * double( 1.1 ); // Get marking region auto rreg = this->m_MarkImage->GetRequestedRegion( );