Commit 830c8e12 authored by Floris Berendsen's avatar Floris Berendsen
Browse files

BUG COMP: Pimple refactoring JIRA-144 applied to CommandlineProgram

parent ba3d5f36
......@@ -97,7 +97,7 @@ main( int ac, char * av[] )
return 0;
}
selx::Blueprint::Pointer blueprint;
selx::ConfigurationReader::BlueprintPointerType blueprint;
if( configurationPath.extension() == ".xml" )
{
// TODO: open file here and pass a stream to the ConfigurationReader
......@@ -115,10 +115,13 @@ main( int ac, char * av[] )
if( vm.count( "graphout" ) )
{
blueprint->WriteBlueprint( vm[ "graphout" ].as< fs::path >().string() );
blueprint->Write( vm[ "graphout" ].as< fs::path >().string() );
}
superElastixFilter->SetBlueprint( blueprint );
//turn the blueprint into an itkObject to connect to the superElastix itkFilter
selx::SuperElastixFilter< RegisterComponents >::BlueprintPointer itkBluePrint = selx::SuperElastixFilter< RegisterComponents >::BlueprintType::New();
itkBluePrint->Set(blueprint);
superElastixFilter->SetBlueprint(itkBluePrint);
if( vm.count( "in" ) )
{
......
......@@ -193,12 +193,12 @@ SuperElastixFilter< ComponentTypeList >
{
//TODO: Before we can get the reader the Blueprint needs to set and applied in the overlord.
// This is not like the itk pipeline philosophy
if( !this->m_Blueprint )
if (!this->m_Overlord)
{
itkExceptionMacro( << "Setting a Blueprint is required first." )
}
this->m_Overlord->SetBlueprint( this->m_Blueprint );
this->m_Overlord->Configure();
this->m_Overlord = OverlordPointer(new Overlord(this->m_Blueprint->Get()));
bool allUniqueComponents = this->m_Overlord->Configure();
return this->m_Overlord->GetInputFileReader( inputName );
}
......@@ -211,13 +211,13 @@ SuperElastixFilter< ComponentTypeList >
{
//TODO: Before we can get the reader the Blueprint needs to set and applied in the overlord.
// This is not like the itk pipeline philosophy
if( !this->m_Blueprint )
if (!this->m_Overlord)
{
itkExceptionMacro( << "Setting a Blueprint is required first." )
}
this->m_Overlord->SetBlueprint( this->m_Blueprint );
this->m_Overlord->Configure();
this->m_Overlord = OverlordPointer(new Overlord(this->m_Blueprint->Get()));
bool allUniqueComponents = this->m_Overlord->Configure();
return this->m_Overlord->GetOutputFileWriter( outputName );
}
......
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