Commit b99d9638 authored by Floris Berendsen's avatar Floris Berendsen
Browse files

COMP: integrated in SuperElastix with initial google tests

parent cd260ce2
...@@ -10,8 +10,8 @@ namespace elx ...@@ -10,8 +10,8 @@ namespace elx
class ComponentBase { class ComponentBase {
public: public:
virtual interfaceStatus ConnectFrom(const char *, ComponentBase*) = 0; virtual interfaceStatus ConnectFrom(const char *, ComponentBase*) = 0;
protected: //protected:
virtual ~ComponentBase(){}; virtual ~ComponentBase() {};
}; };
} // end namespace elx } // end namespace elx
#endif // #define ComponentBase_h #endif // #define ComponentBase_h
\ No newline at end of file
...@@ -18,7 +18,7 @@ namespace elx ...@@ -18,7 +18,7 @@ namespace elx
{ {
public: public:
GDOptimizer3rdPartyComponent(); GDOptimizer3rdPartyComponent();
~GDOptimizer3rdPartyComponent(); virtual ~GDOptimizer3rdPartyComponent();
Example3rdParty::GDOptimizer3rdParty* theImplementation; Example3rdParty::GDOptimizer3rdParty* theImplementation;
Metric3rdPartyWrapper* MetricObject; Metric3rdPartyWrapper* MetricObject;
//virtual int ConnectFrom(const char *, ComponentBase*); //virtual int ConnectFrom(const char *, ComponentBase*);
......
...@@ -18,7 +18,7 @@ namespace elx ...@@ -18,7 +18,7 @@ namespace elx
{ {
public: public:
GDOptimizer4thPartyComponent(); GDOptimizer4thPartyComponent();
~GDOptimizer4thPartyComponent(); virtual ~GDOptimizer4thPartyComponent();
Example4thParty::GDOptimizer4thParty* theImplementation; Example4thParty::GDOptimizer4thParty* theImplementation;
Metric4thPartyWrapper* MetricObject; Metric4thPartyWrapper* MetricObject;
//virtual int ConnectFrom(const char *, ComponentBase*); //virtual int ConnectFrom(const char *, ComponentBase*);
......
...@@ -16,7 +16,7 @@ namespace elx ...@@ -16,7 +16,7 @@ namespace elx
{ {
public: public:
SSDMetric3rdPartyComponent(); SSDMetric3rdPartyComponent();
~SSDMetric3rdPartyComponent(); virtual ~SSDMetric3rdPartyComponent();
Example3rdParty::SSDMetric3rdParty* theImplementation; Example3rdParty::SSDMetric3rdParty* theImplementation;
int GetValue(); int GetValue();
int GetDerivative(); int GetDerivative();
......
...@@ -16,7 +16,7 @@ namespace elx ...@@ -16,7 +16,7 @@ namespace elx
{ {
public: public:
SSDMetric4thPartyComponent(); SSDMetric4thPartyComponent();
~SSDMetric4thPartyComponent(); virtual ~SSDMetric4thPartyComponent();
Example4thParty::SSDMetric4thParty* theImplementation; Example4thParty::SSDMetric4thParty* theImplementation;
int GetValue(); int GetValue();
}; };
......
...@@ -4,6 +4,7 @@ set( MODULE elxModuleCore ) ...@@ -4,6 +4,7 @@ set( MODULE elxModuleCore )
set( ${MODULE}_INCLUDE_DIRS set( ${MODULE}_INCLUDE_DIRS
${${MODULE}_SOURCE_DIR}/Common/include ${${MODULE}_SOURCE_DIR}/Common/include
${${MODULE}_SOURCE_DIR}/Blueprints/include ${${MODULE}_SOURCE_DIR}/Blueprints/include
${${MODULE}_SOURCE_DIR}/ComponentInterface/include
) )
# Export libraries # Export libraries
...@@ -14,8 +15,18 @@ set( ${MODULE}_LIBRARIES ...@@ -14,8 +15,18 @@ set( ${MODULE}_LIBRARIES
# Module source files # Module source files
set( ${MODULE}_SOURCE_FILES set( ${MODULE}_SOURCE_FILES
${${MODULE}_SOURCE_DIR}/Blueprints/src/elxBlueprint.cxx ${${MODULE}_SOURCE_DIR}/Blueprints/src/elxBlueprint.cxx
${${MODULE}_SOURCE_DIR}/ComponentInterface/src/Example3rdPartyCode.cxx
${${MODULE}_SOURCE_DIR}/ComponentInterface/src/Example4thPartyCode.cxx
${${MODULE}_SOURCE_DIR}/ComponentInterface/src/GDOptimizer3rdPartyComponent.cxx
${${MODULE}_SOURCE_DIR}/ComponentInterface/src/GDOptimizer4thPartyComponent.cxx
${${MODULE}_SOURCE_DIR}/ComponentInterface/src/Metric3rdPartyWrapper.cxx
${${MODULE}_SOURCE_DIR}/ComponentInterface/src/Metric4thPartyWrapper.cxx
${${MODULE}_SOURCE_DIR}/ComponentInterface/src/SSDMetric3rdPartyComponent.cxx
${${MODULE}_SOURCE_DIR}/ComponentInterface/src/SSDMetric4thPartyComponent.cxx
${${MODULE}_SOURCE_DIR}/ComponentInterface/src/componenthandshake.cxx
) )
# Compile library # Compile library
add_library( ${MODULE} STATIC "${${MODULE}_SOURCE_FILES}" ) add_library( ${MODULE} STATIC "${${MODULE}_SOURCE_FILES}" )
......
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