ENH: reorganized files and includes around SuperElastixComponent

Modules/Components/Controller/include/selxRegistrationController.h

@@ -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"

Modules/Components/Elastix/include/selxElastixComponent.h

@@ -20,7 +20,7 @@
 #ifndef selxElastixComponent_h
 #define selxElastixComponent_h
 
-#include "selxComponentBase.h"
+#include "selxSuperElastixComponent.h"
 #include "selxInterfaces.h"
 #include "itkImageSource.h"
 

Modules/Components/Elastix/include/selxMonolithicElastix.h

@@ -20,7 +20,7 @@
 #ifndef selxMonolithicElastixComponent_h
 #define selxMonolithicElastixComponent_h
 
-#include "selxComponentBase.h"
+#include "selxSuperElastixComponent.h"
 #include "selxInterfaces.h"
 #include "itkImageSource.h"
 

Modules/Components/Elastix/include/selxMonolithicTransformix.h

@@ -20,7 +20,7 @@
 #ifndef selxMonolithicTransformixComponent_h
 #define selxMonolithicTransformixComponent_h
 
-#include "selxComponentBase.h"
+#include "selxSuperElastixComponent.h"
 #include "selxInterfaces.h"
 #include "itkImageSource.h"
 

Modules/Components/Examples/include/selxGDOptimizer3rdPartyComponent.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"

Modules/Components/Examples/include/selxGDOptimizer4thPartyComponent.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"
 

Modules/Components/Examples/include/selxMetric3rdPartyWrapper.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.

Modules/Components/Examples/include/selxMetric4thPartyWrapper.h

@@ -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.

Modules/Components/Examples/include/selxMetricComponent1.h

@@ -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). */

Modules/Components/Examples/include/selxSSDMetric3rdPartyComponent.h

@@ -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

Modules/Components/Examples/include/selxSSDMetric4thPartyComponent.h

@@ -21,7 +21,8 @@
 #define SSDMetric4thPartyComponent_h
 
 #include "selxComponentBase.h"
-#include "selxInterfaces.hxx"
+#include "selxInterfaces.h"
+#include "selxSuperElastixComponent.h"
 #include "selxExample4thPartyCode.h"
 
 namespace selx

Modules/Components/Examples/include/selxTransformComponent1.h

@@ -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). */

Modules/Components/ItkSmoothingRecursiveGaussianImageFilter/include/selxItkSmoothingRecursiveGaussianImageFilterComponent.h

@@ -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"

Modules/Components/SinksAndSources/include/selxDisplacementFieldItkImageFilterSink.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"

Modules/Components/SinksAndSources/include/selxItkImageSink.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"

Modules/Components/SinksAndSources/include/selxItkImageSource.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"

Modules/Components/SinksAndSources/include/selxItkImageSourceFixed.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"

Modules/Components/SinksAndSources/include/selxItkImageSourceMoving.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"

Modules/Components/SinksAndSources/include/selxItkMeshSink.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"

Modules/Components/SinksAndSources/include/selxItkMeshSource.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"