Skip to content
GitLab
Commit 0116ff35 authored by Floris Berendsen's avatar Floris Berendsen
Browse files

ENH: removed deprecated classes as part of SuperElastix/SuperElastix#25

parent 16aac6aa
Hide whitespace changes
Inline Side-by-side
Modules/Core/ComponentInterface/include/selxComponentFactory.h deleted 100644 → 0
View file @ 16aac6aa
/*=========================================================================
*
* Copyright Leiden University Medical Center, Erasmus University Medical
* Center and contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0.txt
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*=========================================================================*/
#ifndef ComponentFactory_h
#define ComponentFactory_h
#include "selxComponentSelector.h"
#include "selxComponentBase.h"
namespace selx
{
template< class ComponentT >
class ComponentFactory : public itk::ObjectFactoryBase
{
public:
/** Standard class typedefs. */
typedef ComponentFactory Self;
typedef itk::ObjectFactoryBase Superclass;
typedef itk::SmartPointer< Self > Pointer;
typedef itk::SmartPointer< const Self > ConstPointer;
/** Class methods used to interface with the registered factories. */
virtual const char * GetITKSourceVersion() const ITK_OVERRIDE;
virtual const char * GetDescription() const ITK_OVERRIDE;
/** Method for class instantiation. */
itkFactorylessNewMacro( Self );
/** Run-time type information (and related methods). */
itkTypeMacro( ComponentFactory, ObjectFactoryBase );
/** Register one factory of this type */
static void RegisterOneFactory()
{
Pointer thisFactory = Self::New();
ObjectFactoryBase::RegisterFactory( thisFactory );
}
protected:
ComponentFactory();
~ComponentFactory() {}
private:
ComponentFactory( const Self & ); //purposely not implemented
void operator=( const Self & ); //purposely not implemented
};
} // end namespace selx
#ifndef ITK_MANUAL_INSTANTIATION
#include "selxComponentFactory.hxx"
#endif
#endif
Modules/Core/ComponentInterface/include/selxComponentFactory.hxx deleted 100644 → 0
View file @ 16aac6aa
/*=========================================================================
*
* Copyright Leiden University Medical Center, Erasmus University Medical
* Center and contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0.txt
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*=========================================================================*/
#include "selxComponentFactory.h"
#include "itkVersion.h"
#include <typeinfo>
namespace selx
{
template< class ComponentT >
ComponentFactory< ComponentT >::ComponentFactory()
{
this->RegisterOverride( "ComponentBase",
typeid( ComponentT ).name(), //(&ComponentT)->GetNameOfClass(), //
ComponentT::GetDescription(),
1,
itk::CreateObjectFunction< ComponentT >::New() );
}
template< class ComponentT >
const char *
ComponentFactory< ComponentT >::GetITKSourceVersion() const
{
return ITK_SOURCE_VERSION;
}
template< class ComponentT >
const char *
ComponentFactory< ComponentT >::GetDescription() const
{
return ComponentT::GetDescription(); //TODO should this be the description of the factory instead of the component?
}
} // end namespace selx
Modules/Core/ComponentInterface/include/selxInterfaces.h.orig deleted 100644 → 0
View file @ 16aac6aa
/*=========================================================================
*
* Copyright Leiden University Medical Center, Erasmus University Medical
* Center and contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0.txt
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*=========================================================================*/
#ifndef selxInterfaces_h
#define selxInterfaces_h
#include <typeinfo>
#include <string>
#include "itkProcessObject.h"
#include "itkImageToImageFilter.h"
#include "itkImageToImageMetricv4.h"
#include "itkObjectToObjectOptimizerBase.h"
#include "itkTransformParametersAdaptorBase.h"
#include "itkGaussianExponentialDiffeomorphicTransformParametersAdaptor.h"
<<<<<<< 723e29248ac8d7d6faa0942b959f2e6c7f2f4e71
#include "itkGaussianExponentialDiffeomorphicTransform.h"
=======
#include "itkTransform.h"
>>>>>>> WIP: ItkGaussianExponentialDiffeomorphicTransformParametersAdaptorComponent
#include "itkImage.h"
#include "itkMesh.h"
#include "selxAnyFileReader.h"
#include "selxAnyFileWriter.h"
#include "elxElastixFilter.h"
namespace selx
{
// Define the providing interfaces abstractly
class MetricDerivativeInterface
{
public:
virtual int GetDerivative() = 0;
};
class MetricValueInterface
{
public:
virtual int GetValue() = 0;
};
class OptimizerUpdateInterface
{
public:
virtual int Update() = 0;
};
class TransformedImageInterface
{
public:
virtual int GetTransformedImage() = 0;
};
class ConflictinUpdateInterface
{
public:
// "error" : member function templates cannot be virtual
// template <class ConflictinUpdateInterface> virtual int Update() = 0;
//TODO http://en.cppreference.com/w/cpp/language/member_template
//TODO solution: http://stackoverflow.com/questions/2004820/inherit-interfaces-which-share-a-method-name
//TODO better?: http://stackoverflow.com/questions/18398409/c-inherit-from-multiple-base-classes-with-the-same-virtual-function-name
virtual int Update( ConflictinUpdateInterface * ) = 0;
};
template< int Dimensionality, class TPixel >
class itkImageInterface
{
// An interface that passes the pointer of an output image
public:
typedef typename itk::Image< TPixel, Dimensionality > ItkImageType;
virtual typename ItkImageType::Pointer GetItkImage() = 0;
};
template< int Dimensionality, class TPixel >
class itkImageFixedInterface
{
// An interface that passes the pointer of an output image
public:
typedef typename itk::Image< TPixel, Dimensionality > ItkImageType;
virtual typename ItkImageType::Pointer GetItkImageFixed() = 0;
};
template< int Dimensionality >
class itkImageDomainFixedInterface
{
// An interface that passes the pointer of an output image
public:
typedef typename itk::ImageBase< Dimensionality > ItkImageDomainType;
virtual typename ItkImageDomainType::Pointer GetItkImageDomainFixed() = 0;
};
template< int Dimensionality, class TPixel >
class itkImageMovingInterface
{
// An interface that passes the pointer of an output image
public:
typedef typename itk::Image< TPixel, Dimensionality > ItkImageType;
virtual typename ItkImageType::Pointer GetItkImageMoving() = 0;
};
template< int Dimensionality, class TPixel >
class DisplacementFieldItkImageSourceInterface
{
// An interface that passes the pointer of an output image
public:
typedef typename itk::Image< itk::Vector< TPixel, Dimensionality >, Dimensionality > ItkImageType;
virtual typename ItkImageType::Pointer GetDisplacementFieldItkImage() = 0;
};
template< int Dimensionality, class TPixel >
class itkMeshInterface
{
// An interface that passes the pointer of an output mesh
public:
virtual typename itk::Mesh< TPixel, Dimensionality >::Pointer GetItkMesh() = 0;
};
class SourceInterface
{
// A special interface: the NetworkBuilder checks components for this type of interface.
// By this interface only Source Components can to talk to the NetworkBuilder.
// How specific Source Components connect to the graph is up to them, i.e. they might adapt the passed Object to other types.
public:
virtual void SetMiniPipelineInput( itk::DataObject::Pointer ) = 0;
virtual AnyFileReader::Pointer GetInputFileReader( void ) = 0;
};
class SinkInterface
{
// A special interface: the NetworkBuilder checks components for this type of interface.
// By this interface only Sink Components can to talk to the NetworkBuilder
// How specific Sink Components connect to the graph is up to them, i.e. they might adapt the passed Object to other types.
public:
typedef itk::DataObject::Pointer DataObjectPointer;
virtual void SetMiniPipelineOutput( DataObjectPointer ) = 0;
virtual DataObjectPointer GetMiniPipelineOutput( void ) = 0;
virtual AnyFileWriter::Pointer GetOutputFileWriter( void ) = 0;
virtual DataObjectPointer GetInitializedOutput( void ) = 0;
};
class RegistrationControllerStartInterface
{
// A special interface: the NetworkBuilder checks components for this type of interface.
// This interface is to control the execution of the network
public:
virtual void RegistrationControllerStart() = 0;
};
class RunRegistrationInterface
{
// This interface is to control the execution of the network
public:
virtual void RunRegistration() = 0;
};
class AfterRegistrationInterface
{
// This interface is to control the execution of the network
public:
virtual void AfterRegistration() = 0;
};
class RunResolutionInterface
{
// This interface is to control the execution of the network
public:
virtual bool RunResolution() = 0;
};
class ReconnectTransformInterface
{
// This interface is to control the execution of the network
public:
virtual void ReconnectTransform() = 0;
};
template< int Dimensionality, class TPixel >
class itkMetricv4Interface
{
public:
typedef typename itk::Image< TPixel, Dimensionality > FixedImageType;
typedef typename itk::Image< TPixel, Dimensionality > MovingImageType;
typedef typename itk::ImageToImageMetricv4< FixedImageType, MovingImageType > ImageToImageMetricv4Type;
virtual typename ImageToImageMetricv4Type::Pointer GetItkMetricv4() = 0;
};
template< class TInternalComputationValueType >
class itkOptimizerv4Interface
{
public:
/** Type of the optimizer. */
typedef TInternalComputationValueType InternalComputationValueType;
typedef itk::ObjectToObjectOptimizerBaseTemplate< InternalComputationValueType > OptimizerType;
typedef typename OptimizerType::Pointer Optimizerv4Pointer;
virtual Optimizerv4Pointer GetItkOptimizerv4() = 0;
};
template< class TInternalComputationValueType, int Dimensionality >
class itkTransformInterface
{
public:
typedef TInternalComputationValueType InternalComputationValueType;
typedef typename itk::Transform< TInternalComputationValueType, Dimensionality, Dimensionality > TransformType;
typedef typename TransformType::Pointer TransformPointer;
virtual TransformPointer GetItkTransform() = 0;
};
template< class TransformInternalComputationValueType, int Dimensionality >
class itkTransformParametersAdaptorsContainerInterface
{
public:
// TransformBaseType acts as a container of the types: TParametersValueType, NInputDimensions, NOutputDimensions
using TransformBaseType = itk::Transform< TransformInternalComputationValueType, Dimensionality, Dimensionality >;
using TransformParametersAdaptorBaseType = itk::TransformParametersAdaptorBase< TransformBaseType >;
using TransformParametersAdaptorsContainerType = std::vector< typename TransformParametersAdaptorBaseType::Pointer >;
virtual TransformParametersAdaptorsContainerType GetItkTransformParametersAdaptorsContainer() = 0;
};
template< class TransformInternalComputationValueType, int Dimensionality >
class itkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainerInterface
{
public:
using TransformBaseType = itk::Transform< TransformInternalComputationValueType, Dimensionality, Dimensionality >;
using TransformParametersAdaptorBaseType = itk::TransformParametersAdaptorBase< TransformBaseType >;
using GaussianExponentialDiffeomorphicTransformType
= itk::GaussianExponentialDiffeomorphicTransform< TransformInternalComputationValueType, Dimensionality >;
using TransformParametersAdaptorType
= itk::GaussianExponentialDiffeomorphicTransformParametersAdaptor<
GaussianExponentialDiffeomorphicTransformType >;
using TransformParametersAdaptorPointer = typename TransformParametersAdaptorType::Pointer;
//using TransformParametersAdaptorsContainerType = std::vector<TransformParametersAdaptorPointer>;
using TransformParametersAdaptorsContainerType = std::vector< typename TransformParametersAdaptorBaseType::Pointer >;
//using TransformParametersAdaptorsContainerType = typename TransformParametersAdaptorType::TransformParametersAdaptorsContainerType;
virtual TransformParametersAdaptorsContainerType GetItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainer() = 0;
};
template< class TransformInternalComputationValueType, int Dimensionality >
class itkGaussianExponentialDiffeomorphicTransformParametersAdaptorInterface
{
public:
// BaseTransformType acts as a container of the types: TParametersValueType, NInputDimensions, NOutputDimensions
typedef itk::Transform< TransformInternalComputationValueType, Dimensionality, Dimensionality > BaseTransformType;
typedef itk::GaussianExponentialDiffeomorphicTransformParametersAdaptor< BaseTransformType > TransformParametersAdaptorType;
typedef typename TransformParametersAdaptorType::TransformParametersAdaptorsContainerType TransformParametersAdaptorsContainerType;
typedef typename TransformParametersAdaptorsContainerType::Pointer TransformParametersAdaptorsContainerPointer;
virtual TransformParametersAdaptorsContainerPointer GetItkGaussianExponentialDiffeomorphicTransformParametersAdaptorsContainer() = 0;
};
template< typename TFixedImage, typename TMovingImage >
class elastixTransformParameterObjectInterface
{
public:
typedef typename elastix::ElastixFilter< TFixedImage, TMovingImage >::ParameterObjectType elastixTransformParameterObject;
virtual elastixTransformParameterObject * GetTransformParameterObject() = 0;
};
} // end namespace selx
#endif // #define selxInterfaces_h
Modules/Core/ComponentInterface/test/selxNetworkBuilderTest.cxx
View file @ 0116ff35
......@@ -27,8 +27,6 @@
#include "selxSSDMetric3rdPartyComponent.h"
#include "selxSSDMetric4thPartyComponent.h"
#include "selxRegisterComponentFactoriesByTypeList.h"
#include "selxDefaultComponents.h"
#include "gtest/gtest.h"
......
Modules/Core/ComponentRegistration/include/selxRegisterComponentFactoriesByTypeList.h deleted 100644 → 0
View file @ 16aac6aa
/*=========================================================================
*
* Copyright Leiden University Medical Center, Erasmus University Medical
* Center and contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0.txt
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*=========================================================================*/
#ifndef RegisterByTypeList_h
#define RegisterByTypeList_h
#include "selxTypeList.h"
#include "selxComponentFactory.h"
namespace selx
{
template< typename >
struct RegisterFactoriesByTypeList;
template< typename ... ComponentTypes >
struct RegisterFactoriesByTypeList< TypeList< ComponentTypes ... > >
{
static void Register()
{
}
};
template< typename ComponentType, typename ... Rest >
struct RegisterFactoriesByTypeList< TypeList< ComponentType, Rest ... > >
{
static void Register()
{
ComponentFactory< ComponentType >::RegisterOneFactory();
RegisterFactoriesByTypeList< TypeList< Rest ... > >::Register();
}
};
}
#endif // RegisterByTypeList_h
Modules/Core/Filter/include/selxSuperElastixFilterCustomComponents.hxx
View file @ 0116ff35
......@@ -21,7 +21,6 @@
#define selxSuperElastixFilterCustomComponents_hxx
#include "selxSuperElastixFilterCustomComponents.h"
#include "selxRegisterComponentFactoriesByTypeList.h"
#include "selxNetworkBuilder.h"
......
Modules/Core/Filter/src/selxSuperElastixFilter.cxx
View file @ 0116ff35
......@@ -22,8 +22,6 @@
#include "selxSuperElastixFilter.h"
#include "selxNetworkBuilder.h"
#include "selxRegisterComponentFactoriesByTypeList.h"
#include "selxDefaultComponents.h"
namespace selx
......
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