Commit 715e53be authored by Floris Berendsen's avatar Floris Berendsen
Browse files

STYLE: uncrustify

parent 9c85d908
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include "selxDefaultComponents.h" #include "selxDefaultComponents.h"
#include "selxTypeList.h" #include "selxTypeList.h"
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
...@@ -57,17 +56,16 @@ main( int ac, char * av[] ) ...@@ -57,17 +56,16 @@ main( int ac, char * av[] )
{ {
typedef std::vector< std::string > VectorOfStringsType; typedef std::vector< std::string > VectorOfStringsType;
using Elastix3DComponents = selx::TypeList < using Elastix3DComponents = selx::TypeList<
selx::MonolithicElastixComponent< 3, float >, selx::MonolithicElastixComponent< 3, float >,
selx::MonolithicTransformixComponent< 3, float >, selx::MonolithicTransformixComponent< 3, float >,
selx::ItkImageSourceFixedComponent< 3, float >, selx::ItkImageSourceFixedComponent< 3, float >,
selx::ItkImageSourceMovingComponent< 3, float >, selx::ItkImageSourceMovingComponent< 3, float >,
selx::ItkImageSinkComponent< 3, float >, selx::ItkImageSinkComponent< 3, float >,
selx::ItkImageRegistrationMethodv4Component< 3, float, float> selx::ItkImageRegistrationMethodv4Component< 3, float, float >
>; >;
using RegisterComponents = selx::list_append<selx::DefaultComponents, Elastix3DComponents>::type; using RegisterComponents = selx::list_append< selx::DefaultComponents, Elastix3DComponents >::type;
selx::SuperElastixFilter< RegisterComponents >::Pointer superElastixFilter = selx::SuperElastixFilter< RegisterComponents >::New(); selx::SuperElastixFilter< RegisterComponents >::Pointer superElastixFilter = selx::SuperElastixFilter< RegisterComponents >::New();
fs::path configurationPath; fs::path configurationPath;
......
...@@ -97,12 +97,11 @@ private: ...@@ -97,12 +97,11 @@ private:
protected: protected:
// return the class name and the template arguments to uniquely identify this component. // return the class name and the template arguments to uniquely identify this component.
static inline const std::map<std::string, std::string> TemplateProperties() static inline const std::map< std::string, std::string > TemplateProperties()
{ {
return{ { keys::NameOfClass, "ElastixComponent" }, { keys::PixelType, PodString<TPixel>::Get() }, { keys::Dimensionality, std::to_string(Dimensionality) } }; return { { keys::NameOfClass, "ElastixComponent" }, { keys::PixelType, PodString< TPixel >::Get() }, { keys::Dimensionality, std::to_string( Dimensionality ) } };
} }
}; };
} //end namespace selx } //end namespace selx
#ifndef ITK_MANUAL_INSTANTIATION #ifndef ITK_MANUAL_INSTANTIATION
#include "selxElastixComponent.hxx" #include "selxElastixComponent.hxx"
......
...@@ -114,14 +114,14 @@ bool ...@@ -114,14 +114,14 @@ bool
ElastixComponent< Dimensionality, TPixel > ElastixComponent< Dimensionality, TPixel >
::MeetsCriterion( const CriterionType & criterion ) ::MeetsCriterion( const CriterionType & criterion )
{ {
bool hasUndefinedCriteria(false); bool hasUndefinedCriteria( false );
bool meetsCriteria(false); bool meetsCriteria( false );
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion); auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if (status == CriterionStatus::Satisfied) if( status == CriterionStatus::Satisfied )
{ {
return true; return true;
} }
else if (status == CriterionStatus::Failed) else if( status == CriterionStatus::Failed )
{ {
return false; return false;
} // else: CriterionStatus::Unknown } // else: CriterionStatus::Unknown
......
...@@ -97,12 +97,11 @@ private: ...@@ -97,12 +97,11 @@ private:
protected: protected:
// return the class name and the template arguments to uniquely identify this component. // return the class name and the template arguments to uniquely identify this component.
static inline const std::map<std::string, std::string> TemplateProperties() static inline const std::map< std::string, std::string > TemplateProperties()
{ {
return{ { keys::NameOfClass, "MonolithicElastixComponent" }, { keys::PixelType, PodString<TPixel>::Get() }, { keys::Dimensionality, std::to_string(Dimensionality) } }; return { { keys::NameOfClass, "MonolithicElastixComponent" }, { keys::PixelType, PodString< TPixel >::Get() }, { keys::Dimensionality, std::to_string( Dimensionality ) } };
} }
}; };
} //end namespace selx } //end namespace selx
#ifndef ITK_MANUAL_INSTANTIATION #ifndef ITK_MANUAL_INSTANTIATION
#include "selxMonolithicElastix.hxx" #include "selxMonolithicElastix.hxx"
......
...@@ -94,19 +94,19 @@ bool ...@@ -94,19 +94,19 @@ bool
MonolithicElastixComponent< Dimensionality, TPixel > MonolithicElastixComponent< Dimensionality, TPixel >
::MeetsCriterion( const CriterionType & criterion ) ::MeetsCriterion( const CriterionType & criterion )
{ {
bool hasUndefinedCriteria(false); bool hasUndefinedCriteria( false );
bool meetsCriteria(false); bool meetsCriteria( false );
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion); auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if (status == CriterionStatus::Satisfied) if( status == CriterionStatus::Satisfied )
{ {
return true; return true;
} }
else if (status == CriterionStatus::Failed) else if( status == CriterionStatus::Failed )
{ {
return false; return false;
} // else: CriterionStatus::Unknown } // else: CriterionStatus::Unknown
else if (criterion.first == "RegistrationPreset") //Supports this? else if( criterion.first == "RegistrationPreset" ) //Supports this?
{ {
// Temporary solution: RegistrationPreset: rigid, nonrigid, etc overwrite the current selxparameterObject. // Temporary solution: RegistrationPreset: rigid, nonrigid, etc overwrite the current selxparameterObject.
// Warning: the order of Criteria matters, since selxparameterObject may be overwritten // Warning: the order of Criteria matters, since selxparameterObject may be overwritten
......
...@@ -93,12 +93,11 @@ private: ...@@ -93,12 +93,11 @@ private:
protected: protected:
// return the class name and the template arguments to uniquely identify this component. // return the class name and the template arguments to uniquely identify this component.
static inline const std::map<std::string, std::string> TemplateProperties() static inline const std::map< std::string, std::string > TemplateProperties()
{ {
return{ { keys::NameOfClass, "MonolithicTransformixComponent" }, { keys::PixelType, PodString<TPixel>::Get() }, { keys::Dimensionality, std::to_string(Dimensionality) } }; return { { keys::NameOfClass, "MonolithicTransformixComponent" }, { keys::PixelType, PodString< TPixel >::Get() }, { keys::Dimensionality, std::to_string( Dimensionality ) } };
} }
}; };
} //end namespace selx } //end namespace selx
#ifndef ITK_MANUAL_INSTANTIATION #ifndef ITK_MANUAL_INSTANTIATION
#include "selxMonolithicTransformix.hxx" #include "selxMonolithicTransformix.hxx"
......
...@@ -151,14 +151,14 @@ bool ...@@ -151,14 +151,14 @@ bool
MonolithicTransformixComponent< Dimensionality, TPixel > MonolithicTransformixComponent< Dimensionality, TPixel >
::MeetsCriterion( const CriterionType & criterion ) ::MeetsCriterion( const CriterionType & criterion )
{ {
bool hasUndefinedCriteria(false); bool hasUndefinedCriteria( false );
bool meetsCriteria(false); bool meetsCriteria( false );
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion); auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if (status == CriterionStatus::Satisfied) if( status == CriterionStatus::Satisfied )
{ {
return true; return true;
} }
else if (status == CriterionStatus::Failed) else if( status == CriterionStatus::Failed )
{ {
return false; return false;
} // else: CriterionStatus::Unknown } // else: CriterionStatus::Unknown
......
...@@ -77,13 +77,11 @@ private: ...@@ -77,13 +77,11 @@ private:
protected: protected:
// return the class name and the template arguments to uniquely identify this component. // return the class name and the template arguments to uniquely identify this component.
static inline const std::map<std::string, std::string> TemplateProperties() static inline const std::map< std::string, std::string > TemplateProperties()
{ {
return{ { keys::NameOfClass, "DisplacementFieldItkImageFilterSinkComponent" }, { keys::PixelType, PodString<TPixel>::Get() }, { keys::Dimensionality, std::to_string(Dimensionality) } }; return { { keys::NameOfClass, "DisplacementFieldItkImageFilterSinkComponent" }, { keys::PixelType, PodString< TPixel >::Get() }, { keys::Dimensionality, std::to_string( Dimensionality ) } };
} }
}; };
} //end namespace selx } //end namespace selx
#ifndef ITK_MANUAL_INSTANTIATION #ifndef ITK_MANUAL_INSTANTIATION
#include "selxDisplacementFieldItkImageFilterSink.hxx" #include "selxDisplacementFieldItkImageFilterSink.hxx"
......
...@@ -98,12 +98,12 @@ DisplacementFieldItkImageFilterSinkComponent< Dimensionality, TPixel >::MeetsCri ...@@ -98,12 +98,12 @@ DisplacementFieldItkImageFilterSinkComponent< Dimensionality, TPixel >::MeetsCri
{ {
bool hasUndefinedCriteria( false ); bool hasUndefinedCriteria( false );
bool meetsCriteria( false ); bool meetsCriteria( false );
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion); auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if (status == CriterionStatus::Satisfied) if( status == CriterionStatus::Satisfied )
{ {
return true; return true;
} }
else if (status == CriterionStatus::Failed) else if( status == CriterionStatus::Failed )
{ {
return false; return false;
} // else: CriterionStatus::Unknown } // else: CriterionStatus::Unknown
......
...@@ -74,13 +74,11 @@ private: ...@@ -74,13 +74,11 @@ private:
protected: protected:
// return the class name and the template arguments to uniquely identify this component. // return the class name and the template arguments to uniquely identify this component.
static inline const std::map<std::string, std::string> TemplateProperties() static inline const std::map< std::string, std::string > TemplateProperties()
{ {
return{ { keys::NameOfClass, "ItkImageSinkComponent" }, { keys::PixelType, PodString<TPixel>::Get() }, { keys::Dimensionality, std::to_string(Dimensionality) } }; return { { keys::NameOfClass, "ItkImageSinkComponent" }, { keys::PixelType, PodString< TPixel >::Get() }, { keys::Dimensionality, std::to_string( Dimensionality ) } };
} }
}; };
} //end namespace selx } //end namespace selx
#ifndef ITK_MANUAL_INSTANTIATION #ifndef ITK_MANUAL_INSTANTIATION
#include "selxItkImageSink.hxx" #include "selxItkImageSink.hxx"
......
...@@ -97,14 +97,14 @@ template< int Dimensionality, class TPixel > ...@@ -97,14 +97,14 @@ template< int Dimensionality, class TPixel >
bool bool
ItkImageSinkComponent< Dimensionality, TPixel >::MeetsCriterion( const ComponentBase::CriterionType & criterion ) ItkImageSinkComponent< Dimensionality, TPixel >::MeetsCriterion( const ComponentBase::CriterionType & criterion )
{ {
bool hasUndefinedCriteria(false); bool hasUndefinedCriteria( false );
bool meetsCriteria(false); bool meetsCriteria( false );
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion); auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if (status == CriterionStatus::Satisfied) if( status == CriterionStatus::Satisfied )
{ {
return true; return true;
} }
else if (status == CriterionStatus::Failed) else if( status == CriterionStatus::Failed )
{ {
return false; return false;
} // else: CriterionStatus::Unknown } // else: CriterionStatus::Unknown
......
...@@ -62,13 +62,13 @@ private: ...@@ -62,13 +62,13 @@ private:
typename ItkImageType::Pointer m_Image; typename ItkImageType::Pointer m_Image;
protected: protected:
// return the class name and the template arguments to uniquely identify this component. // return the class name and the template arguments to uniquely identify this component.
static inline const std::map<std::string, std::string> TemplateProperties() static inline const std::map< std::string, std::string > TemplateProperties()
{ {
return{ { keys::NameOfClass, "ItkImageSourceComponent" }, { keys::PixelType, PodString<TPixel>::Get() }, { keys::Dimensionality, std::to_string(Dimensionality) } }; return { { keys::NameOfClass, "ItkImageSourceComponent" }, { keys::PixelType, PodString< TPixel >::Get() }, { keys::Dimensionality, std::to_string( Dimensionality ) } };
} }
}; };
} //end namespace selx } //end namespace selx
#ifndef ITK_MANUAL_INSTANTIATION #ifndef ITK_MANUAL_INSTANTIATION
#include "selxItkImageSource.hxx" #include "selxItkImageSource.hxx"
......
...@@ -76,14 +76,14 @@ bool ...@@ -76,14 +76,14 @@ bool
ItkImageSourceComponent< Dimensionality, TPixel > ItkImageSourceComponent< Dimensionality, TPixel >
::MeetsCriterion( const ComponentBase::CriterionType & criterion ) ::MeetsCriterion( const ComponentBase::CriterionType & criterion )
{ {
bool hasUndefinedCriteria(false); bool hasUndefinedCriteria( false );
bool meetsCriteria(false); bool meetsCriteria( false );
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion); auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if (status == CriterionStatus::Satisfied) if( status == CriterionStatus::Satisfied )
{ {
return true; return true;
} }
else if (status == CriterionStatus::Failed) else if( status == CriterionStatus::Failed )
{ {
return false; return false;
} // else: CriterionStatus::Unknown } // else: CriterionStatus::Unknown
......
...@@ -70,10 +70,11 @@ private: ...@@ -70,10 +70,11 @@ private:
typename ItkImageType::Pointer m_Image; typename ItkImageType::Pointer m_Image;
protected: protected:
// return the class name and the template arguments to uniquely identify this component. // return the class name and the template arguments to uniquely identify this component.
static inline const std::map<std::string, std::string> TemplateProperties() static inline const std::map< std::string, std::string > TemplateProperties()
{ {
return{ { keys::NameOfClass, "ItkImageSourceFixedComponent" }, { keys::PixelType, PodString<TPixel>::Get() }, { keys::Dimensionality, std::to_string(Dimensionality) } }; return { { keys::NameOfClass, "ItkImageSourceFixedComponent" }, { keys::PixelType, PodString< TPixel >::Get() }, { keys::Dimensionality, std::to_string( Dimensionality ) } };
} }
}; };
} //end namespace selx } //end namespace selx
......
...@@ -89,14 +89,14 @@ bool ...@@ -89,14 +89,14 @@ bool
ItkImageSourceFixedComponent< Dimensionality, TPixel > ItkImageSourceFixedComponent< Dimensionality, TPixel >
::MeetsCriterion( const ComponentBase::CriterionType & criterion ) ::MeetsCriterion( const ComponentBase::CriterionType & criterion )
{ {
bool hasUndefinedCriteria(false); bool hasUndefinedCriteria( false );
bool meetsCriteria(false); bool meetsCriteria( false );
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion); auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if (status == CriterionStatus::Satisfied) if( status == CriterionStatus::Satisfied )
{ {
return true; return true;
} }
else if (status == CriterionStatus::Failed) else if( status == CriterionStatus::Failed )
{ {
return false; return false;
} // else: CriterionStatus::Unknown } // else: CriterionStatus::Unknown
......
...@@ -65,12 +65,11 @@ private: ...@@ -65,12 +65,11 @@ private:
protected: protected:
// return the class name and the template arguments to uniquely identify this component. // return the class name and the template arguments to uniquely identify this component.
static inline const std::map<std::string, std::string> TemplateProperties() static inline const std::map< std::string, std::string > TemplateProperties()
{ {
return{ { keys::NameOfClass, "ItkImageSourceMovingComponent" }, { keys::PixelType, PodString<TPixel>::Get() }, { keys::Dimensionality, std::to_string(Dimensionality) } }; return { { keys::NameOfClass, "ItkImageSourceMovingComponent" }, { keys::PixelType, PodString< TPixel >::Get() }, { keys::Dimensionality, std::to_string( Dimensionality ) } };
} }
}; };
} //end namespace selx } //end namespace selx
#ifndef ITK_MANUAL_INSTANTIATION #ifndef ITK_MANUAL_INSTANTIATION
#include "selxItkImageSourceMoving.hxx" #include "selxItkImageSourceMoving.hxx"
......
...@@ -76,14 +76,14 @@ bool ...@@ -76,14 +76,14 @@ bool
ItkImageSourceMovingComponent< Dimensionality, TPixel > ItkImageSourceMovingComponent< Dimensionality, TPixel >
::MeetsCriterion( const ComponentBase::CriterionType & criterion ) ::MeetsCriterion( const ComponentBase::CriterionType & criterion )
{ {
bool hasUndefinedCriteria(false); bool hasUndefinedCriteria( false );
bool meetsCriteria(false); bool meetsCriteria( false );
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion); auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if (status == CriterionStatus::Satisfied) if( status == CriterionStatus::Satisfied )
{ {
return true; return true;
} }
else if (status == CriterionStatus::Failed) else if( status == CriterionStatus::Failed )
{ {
return false; return false;
} // else: CriterionStatus::Unknown } // else: CriterionStatus::Unknown
......
...@@ -75,12 +75,11 @@ private: ...@@ -75,12 +75,11 @@ private:
protected: protected:
// return the class name and the template arguments to uniquely identify this component. // return the class name and the template arguments to uniquely identify this component.
static inline const std::map<std::string, std::string> TemplateProperties() static inline const std::map< std::string, std::string > TemplateProperties()
{ {
return{ { keys::NameOfClass, "ItkMeshSinkComponent" }, { keys::PixelType, PodString<TPixel>::Get() }, { keys::Dimensionality, std::to_string(Dimensionality) } }; return { { keys::NameOfClass, "ItkMeshSinkComponent" }, { keys::PixelType, PodString< TPixel >::Get() }, { keys::Dimensionality, std::to_string( Dimensionality ) } };
} }
}; };
} //end namespace selx } //end namespace selx
#ifndef ITK_MANUAL_INSTANTIATION #ifndef ITK_MANUAL_INSTANTIATION
#include "selxItkMeshSink.hxx" #include "selxItkMeshSink.hxx"
......
...@@ -111,14 +111,14 @@ template< int Dimensionality, class TPixel > ...@@ -111,14 +111,14 @@ template< int Dimensionality, class TPixel >
bool bool
ItkMeshSinkComponent< Dimensionality, TPixel >::MeetsCriterion( const ComponentBase::CriterionType & criterion ) ItkMeshSinkComponent< Dimensionality, TPixel >::MeetsCriterion( const ComponentBase::CriterionType & criterion )
{ {
bool hasUndefinedCriteria(false); bool hasUndefinedCriteria( false );
bool meetsCriteria(false); bool meetsCriteria( false );
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion); auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if (status == CriterionStatus::Satisfied) if( status == CriterionStatus::Satisfied )
{ {
return true; return true;
} }
else if (status == CriterionStatus::Failed) else if( status == CriterionStatus::Failed )
{ {
return false; return false;
} // else: CriterionStatus::Unknown } // else: CriterionStatus::Unknown
......
...@@ -64,12 +64,11 @@ private: ...@@ -64,12 +64,11 @@ private:
protected: protected:
// return the class name and the template arguments to uniquely identify this component. // return the class name and the template arguments to uniquely identify this component.
static inline const std::map<std::string, std::string> TemplateProperties() static inline const std::map< std::string, std::string > TemplateProperties()
{ {
return{ { keys::NameOfClass, "ItkMeshSourceComponent" }, { keys::PixelType, PodString<TPixel>::Get() }, { keys::Dimensionality, std::to_string(Dimensionality) } }; return { { keys::NameOfClass, "ItkMeshSourceComponent" }, { keys::PixelType, PodString< TPixel >::Get() }, { keys::Dimensionality, std::to_string( Dimensionality ) } };
} }
}; };
} //end namespace selx } //end namespace selx
#ifndef ITK_MANUAL_INSTANTIATION #ifndef ITK_MANUAL_INSTANTIATION
#include "selxItkMeshSource.hxx" #include "selxItkMeshSource.hxx"
......
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