Commit 7de700fc authored by Floris Berendsen's avatar Floris Berendsen
Browse files

ENH: reorganized files and includes around SuperElastixComponent

parent c9123918
......@@ -20,7 +20,7 @@
#ifndef selxRegistrationController_h
#define selxRegistrationController_h
#include "selxComponentBase.h"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include <string.h>
#include "selxMacro.h"
......
......@@ -20,7 +20,7 @@
#ifndef selxElastixComponent_h
#define selxElastixComponent_h
#include "selxComponentBase.h"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include "itkImageSource.h"
......
......@@ -20,7 +20,7 @@
#ifndef selxMonolithicElastixComponent_h
#define selxMonolithicElastixComponent_h
#include "selxComponentBase.h"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include "itkImageSource.h"
......
......@@ -20,7 +20,7 @@
#ifndef selxMonolithicTransformixComponent_h
#define selxMonolithicTransformixComponent_h
#include "selxComponentBase.h"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include "itkImageSource.h"
......
......@@ -20,7 +20,7 @@
#ifndef GDOptimizer3rdPartyComponent_h
#define GDOptimizer3rdPartyComponent_h
#include "selxComponentBase.h"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include "selxExample3rdPartyCode.h"
#include "selxMetric3rdPartyWrapper.h"
......
......@@ -20,8 +20,8 @@
#ifndef GDOptimizer4thPartyComponent_h
#define GDOptimizer4thPartyComponent_h
#include "selxComponentBase.h"
#include "selxInterfaces.hxx"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include "selxExample4thPartyCode.h"
#include "selxMetric4thPartyWrapper.h"
......
......@@ -21,7 +21,7 @@
#define Metric3rdPartyWrapper_h
#include "selxExample3rdPartyCode.h"
#include "selxInterfaces.hxx"
#include "selxInterfaces.h"
namespace selx
{
// An Optimizer3rdParty expects that Metric3rdParty will be set as input. All accepted interfaces by the Optimizer3rdPartyCompoment will be delegated to the Metric3rdPartyWrapper object.
......
......@@ -21,7 +21,7 @@
#define Metric4thPartyWrapper_h
#include "selxExample4thPartyCode.h"
#include "selxInterfaces.hxx"
#include "selxInterfaces.h"
namespace selx
{
// An Optimizer4thParty expects that Metric4thParty will be set as input. All accepted interfaces by the Optimizer4thPartyCompoment will be delegated to the Metric4thPartyWrapper object.
......
......@@ -20,8 +20,9 @@
#ifndef itkMetricComponent1_h
#define itkMetricComponent1_h
#include "selxComponentBase.h"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include "selxMacro.h"
namespace selx
{
......@@ -39,6 +40,7 @@ public:
typedef itk::SmartPointer< const Self > ConstPointer;
/** New macro for creation of through the object factory. */
//selxNewMacro(Self, ComponentBase);
itkNewMacro(Self);
/** Run-time type information (and related methods). */
......
......@@ -20,8 +20,8 @@
#ifndef SSDMetric3rdPartyComponent_h
#define SSDMetric3rdPartyComponent_h
#include "selxComponentBase.h"
#include "selxInterfaces.hxx"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include "selxExample3rdPartyCode.h"
namespace selx
......
......@@ -21,7 +21,8 @@
#define SSDMetric4thPartyComponent_h
#include "selxComponentBase.h"
#include "selxInterfaces.hxx"
#include "selxInterfaces.h"
#include "selxSuperElastixComponent.h"
#include "selxExample4thPartyCode.h"
namespace selx
......
......@@ -20,8 +20,9 @@
#ifndef itkTransformComponent1_h
#define itkTransformComponent1_h
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include "selxComponentBase.h"
#include "selxMacro.h"
namespace selx
{
......@@ -39,6 +40,7 @@ public:
typedef itk::SmartPointer< const Self > ConstPointer;
/** New macro for creation of through the object factory. */
//selxNewMacro(Self, ComponentBase);
itkNewMacro(Self);
/** Run-time type information (and related methods). */
......
......@@ -20,7 +20,7 @@
#ifndef selxItkSmoothingRecursiveGaussianImageFilterComponent_h
#define selxItkSmoothingRecursiveGaussianImageFilterComponent_h
#include "selxComponentBase.h"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include "itkSmoothingRecursiveGaussianImageFilter.h"
#include "itkImageSource.h"
......
......@@ -20,7 +20,7 @@
#ifndef selxDisplacementFieldItkImageFilterSink_h
#define selxDisplacementFieldItkImageFilterSink_h
#include "selxComponentBase.h"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include <string.h>
#include "selxMacro.h"
......
......@@ -20,7 +20,7 @@
#ifndef selxItkImageSink_h
#define selxItkImageSink_h
#include "selxComponentBase.h"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include <string.h>
#include "selxMacro.h"
......
......@@ -20,7 +20,7 @@
#ifndef selxItkImageSource_h
#define selxItkImageSource_h
#include "selxComponentBase.h"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include <string.h>
#include "selxMacro.h"
......
......@@ -20,7 +20,7 @@
#ifndef selxItkImageSourceFixed_h
#define selxItkImageSourceFixed_h
#include "selxComponentBase.h"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include <string.h>
#include "selxMacro.h"
......
......@@ -20,7 +20,7 @@
#ifndef selxItkImageSourceMoving_h
#define selxItkImageSourceMoving_h
#include "selxComponentBase.h"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include <string.h>
#include "selxMacro.h"
......
......@@ -20,7 +20,7 @@
#ifndef selxItkMeshSink_h
#define selxItkMeshSink_h
#include "selxComponentBase.h"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include <string.h>
#include "selxMacro.h"
......
......@@ -20,7 +20,7 @@
#ifndef selxItkMeshSource_h
#define selxItkMeshSource_h
#include "selxComponentBase.h"
#include "selxSuperElastixComponent.h"
#include "selxInterfaces.h"
#include <string.h>
#include "selxMacro.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