Commit a0d63082 authored by Floris Berendsen's avatar Floris Berendsen
Browse files

BUG: Applications is now using the lean SuperElastixFilter library (with

default components)
parent cb002374
...@@ -23,9 +23,6 @@ ...@@ -23,9 +23,6 @@
#include "selxAnyFileReader.h" #include "selxAnyFileReader.h"
#include "selxAnyFileWriter.h" #include "selxAnyFileWriter.h"
#include "selxDefaultComponents.h"
#include "selxTypeList.h"
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
...@@ -56,17 +53,8 @@ main( int ac, char * av[] ) ...@@ -56,17 +53,8 @@ main( int ac, char * av[] )
{ {
typedef std::vector< std::string > VectorOfStringsType; typedef std::vector< std::string > VectorOfStringsType;
using Elastix3DComponents = selx::TypeList< // instantiate a SuperElastixFilter that is loaded with default components
selx::MonolithicElastixComponent< 3, float >, selx::SuperElastixFilter::Pointer superElastixFilter = selx::SuperElastixFilter::New();
selx::MonolithicTransformixComponent< 3, float >,
selx::ItkImageSourceFixedComponent< 3, float >,
selx::ItkImageSourceMovingComponent< 3, float >,
selx::ItkImageSinkComponent< 3, float >,
selx::ItkImageRegistrationMethodv4Component< 3, float, float >
>;
using RegisterComponents = selx::list_append< selx::DefaultComponents, Elastix3DComponents >::type;
selx::SuperElastixFilter< RegisterComponents >::Pointer superElastixFilter = selx::SuperElastixFilter< RegisterComponents >::New();
fs::path configurationPath; fs::path configurationPath;
VectorOfStringsType inputPairs; VectorOfStringsType inputPairs;
...@@ -119,7 +107,7 @@ main( int ac, char * av[] ) ...@@ -119,7 +107,7 @@ main( int ac, char * av[] )
} }
//turn the blueprint into an itkObject to connect to the superElastix itkFilter //turn the blueprint into an itkObject to connect to the superElastix itkFilter
selx::SuperElastixFilter< RegisterComponents >::BlueprintPointer itkBluePrint = selx::SuperElastixFilter< RegisterComponents >::BlueprintType::New(); selx::SuperElastixFilter::BlueprintPointer itkBluePrint = selx::SuperElastixFilter::BlueprintType::New();
itkBluePrint->Set(blueprint); itkBluePrint->Set(blueprint);
superElastixFilter->SetBlueprint(itkBluePrint); superElastixFilter->SetBlueprint(itkBluePrint);
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "selxSuperElastixComponent.h" #include "selxSuperElastixComponent.h"
//#include "selxItkRegistrationMethodv4Interfaces.h" #include "selxItkRegistrationMethodv4Interfaces.h"
#include "selxSinksAndSourcesInterfaces.h" #include "selxSinksAndSourcesInterfaces.h"
#include "selxItkObjectInterfaces.h" #include "selxItkObjectInterfaces.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment