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

STYLE: uncrustify

parent 9c85d908
......@@ -26,7 +26,6 @@
#include "selxDefaultComponents.h"
#include "selxTypeList.h"
#include <boost/algorithm/string.hpp>
#include <boost/filesystem.hpp>
......@@ -57,17 +56,16 @@ main( int ac, char * av[] )
{
typedef std::vector< std::string > VectorOfStringsType;
using Elastix3DComponents = selx::TypeList <
using Elastix3DComponents = selx::TypeList<
selx::MonolithicElastixComponent< 3, float >,
selx::MonolithicTransformixComponent< 3, float >,
selx::ItkImageSourceFixedComponent< 3, float >,
selx::ItkImageSourceMovingComponent< 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();
fs::path configurationPath;
......
......@@ -97,12 +97,11 @@ private:
protected:
// 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
#ifndef ITK_MANUAL_INSTANTIATION
#include "selxElastixComponent.hxx"
......
......@@ -114,14 +114,14 @@ bool
ElastixComponent< Dimensionality, TPixel >
::MeetsCriterion( const CriterionType & criterion )
{
bool hasUndefinedCriteria(false);
bool meetsCriteria(false);
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion);
if (status == CriterionStatus::Satisfied)
bool hasUndefinedCriteria( false );
bool meetsCriteria( false );
auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if( status == CriterionStatus::Satisfied )
{
return true;
}
else if (status == CriterionStatus::Failed)
else if( status == CriterionStatus::Failed )
{
return false;
} // else: CriterionStatus::Unknown
......
......@@ -97,12 +97,11 @@ private:
protected:
// 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
#ifndef ITK_MANUAL_INSTANTIATION
#include "selxMonolithicElastix.hxx"
......
......@@ -94,19 +94,19 @@ bool
MonolithicElastixComponent< Dimensionality, TPixel >
::MeetsCriterion( const CriterionType & criterion )
{
bool hasUndefinedCriteria(false);
bool meetsCriteria(false);
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion);
if (status == CriterionStatus::Satisfied)
bool hasUndefinedCriteria( false );
bool meetsCriteria( false );
auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if( status == CriterionStatus::Satisfied )
{
return true;
}
else if (status == CriterionStatus::Failed)
else if( status == CriterionStatus::Failed )
{
return false;
} // 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.
// Warning: the order of Criteria matters, since selxparameterObject may be overwritten
......
......@@ -93,12 +93,11 @@ private:
protected:
// 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
#ifndef ITK_MANUAL_INSTANTIATION
#include "selxMonolithicTransformix.hxx"
......
......@@ -151,14 +151,14 @@ bool
MonolithicTransformixComponent< Dimensionality, TPixel >
::MeetsCriterion( const CriterionType & criterion )
{
bool hasUndefinedCriteria(false);
bool meetsCriteria(false);
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion);
if (status == CriterionStatus::Satisfied)
bool hasUndefinedCriteria( false );
bool meetsCriteria( false );
auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if( status == CriterionStatus::Satisfied )
{
return true;
}
else if (status == CriterionStatus::Failed)
else if( status == CriterionStatus::Failed )
{
return false;
} // else: CriterionStatus::Unknown
......
......@@ -77,13 +77,11 @@ private:
protected:
// 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
#ifndef ITK_MANUAL_INSTANTIATION
#include "selxDisplacementFieldItkImageFilterSink.hxx"
......
......@@ -98,12 +98,12 @@ DisplacementFieldItkImageFilterSinkComponent< Dimensionality, TPixel >::MeetsCri
{
bool hasUndefinedCriteria( false );
bool meetsCriteria( false );
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion);
if (status == CriterionStatus::Satisfied)
auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if( status == CriterionStatus::Satisfied )
{
return true;
}
else if (status == CriterionStatus::Failed)
else if( status == CriterionStatus::Failed )
{
return false;
} // else: CriterionStatus::Unknown
......
......@@ -74,13 +74,11 @@ private:
protected:
// 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
#ifndef ITK_MANUAL_INSTANTIATION
#include "selxItkImageSink.hxx"
......
......@@ -97,14 +97,14 @@ template< int Dimensionality, class TPixel >
bool
ItkImageSinkComponent< Dimensionality, TPixel >::MeetsCriterion( const ComponentBase::CriterionType & criterion )
{
bool hasUndefinedCriteria(false);
bool meetsCriteria(false);
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion);
if (status == CriterionStatus::Satisfied)
bool hasUndefinedCriteria( false );
bool meetsCriteria( false );
auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if( status == CriterionStatus::Satisfied )
{
return true;
}
else if (status == CriterionStatus::Failed)
else if( status == CriterionStatus::Failed )
{
return false;
} // else: CriterionStatus::Unknown
......
......@@ -62,13 +62,13 @@ private:
typename ItkImageType::Pointer m_Image;
protected:
// 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
#ifndef ITK_MANUAL_INSTANTIATION
#include "selxItkImageSource.hxx"
......
......@@ -76,14 +76,14 @@ bool
ItkImageSourceComponent< Dimensionality, TPixel >
::MeetsCriterion( const ComponentBase::CriterionType & criterion )
{
bool hasUndefinedCriteria(false);
bool meetsCriteria(false);
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion);
if (status == CriterionStatus::Satisfied)
bool hasUndefinedCriteria( false );
bool meetsCriteria( false );
auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if( status == CriterionStatus::Satisfied )
{
return true;
}
else if (status == CriterionStatus::Failed)
else if( status == CriterionStatus::Failed )
{
return false;
} // else: CriterionStatus::Unknown
......
......@@ -70,10 +70,11 @@ private:
typename ItkImageType::Pointer m_Image;
protected:
// 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
......
......@@ -89,14 +89,14 @@ bool
ItkImageSourceFixedComponent< Dimensionality, TPixel >
::MeetsCriterion( const ComponentBase::CriterionType & criterion )
{
bool hasUndefinedCriteria(false);
bool meetsCriteria(false);
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion);
if (status == CriterionStatus::Satisfied)
bool hasUndefinedCriteria( false );
bool meetsCriteria( false );
auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if( status == CriterionStatus::Satisfied )
{
return true;
}
else if (status == CriterionStatus::Failed)
else if( status == CriterionStatus::Failed )
{
return false;
} // else: CriterionStatus::Unknown
......
......@@ -65,12 +65,11 @@ private:
protected:
// 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
#ifndef ITK_MANUAL_INSTANTIATION
#include "selxItkImageSourceMoving.hxx"
......
......@@ -76,14 +76,14 @@ bool
ItkImageSourceMovingComponent< Dimensionality, TPixel >
::MeetsCriterion( const ComponentBase::CriterionType & criterion )
{
bool hasUndefinedCriteria(false);
bool meetsCriteria(false);
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion);
if (status == CriterionStatus::Satisfied)
bool hasUndefinedCriteria( false );
bool meetsCriteria( false );
auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if( status == CriterionStatus::Satisfied )
{
return true;
}
else if (status == CriterionStatus::Failed)
else if( status == CriterionStatus::Failed )
{
return false;
} // else: CriterionStatus::Unknown
......
......@@ -75,12 +75,11 @@ private:
protected:
// 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
#ifndef ITK_MANUAL_INSTANTIATION
#include "selxItkMeshSink.hxx"
......
......@@ -111,14 +111,14 @@ template< int Dimensionality, class TPixel >
bool
ItkMeshSinkComponent< Dimensionality, TPixel >::MeetsCriterion( const ComponentBase::CriterionType & criterion )
{
bool hasUndefinedCriteria(false);
bool meetsCriteria(false);
auto status = CheckTemplateProperties(this->TemplateProperties(), criterion);
if (status == CriterionStatus::Satisfied)
bool hasUndefinedCriteria( false );
bool meetsCriteria( false );
auto status = CheckTemplateProperties( this->TemplateProperties(), criterion );
if( status == CriterionStatus::Satisfied )
{
return true;
}
else if (status == CriterionStatus::Failed)
else if( status == CriterionStatus::Failed )
{
return false;
} // else: CriterionStatus::Unknown
......
......@@ -64,12 +64,11 @@ private:
protected:
// 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
#ifndef ITK_MANUAL_INSTANTIATION
#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