Removed generation of obsolete gen_converterregistration.h file through CMake...

Removed generation of obsolete gen_converterregistration.h file through CMake since converter registration now entirely relies on explicit template specialization.

CMakeLists.txt

@@ -10,7 +10,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
 # Global Build Options
 #
 
-OPTION(BUILD_SHARED_LIBS            "Build shared libraries?"                                       ON)
+OPTION(BUILD_SHARED_LIBS            "Build shared libraries (strongly recommended!)"                ON)
 #OPTION(CAMPVIS_PRECOMPILED_HEADER   "Use pre-compiled headers?"                                     ON)
 OPTION(CAMPVIS_DEBUG                "Activate debug code?"                                          ON)
 OPTION(CAMPVIS_BUILD_APPLICATION    "Build CAMPVis Application"                                     ON)

cmake/macros.cmake

-MACRO(WRITE_CONVERTER_REGISTRATION FileName)
-    MESSAGE(STATUS "* Generating converter registration header: ${FileName}")
-    SET(ConverterRegistrationSource "// WARNING: This file is automatically generated by CMake, do not modify!\n\n" )
-
-    LIST(APPEND ConverterRegistrationSource "// Include Converter Headers:\n" )
-    FOREACH(IncludeFile ${ConverterRegistrationIncludeFiles})
-        LIST(APPEND ConverterRegistrationSource "#include \"${IncludeFile}\"\n" )
-    ENDFOREACH()
-
-    FILE(WRITE ${FileName} ${ConverterRegistrationSource})
-ENDMACRO(WRITE_CONVERTER_REGISTRATION)
-
-MACRO(PARSE_HEADER_FOR_CONVERTER FileName)
-    FILE(READ ${FileName} content)
-
-    # Find all class definitions inheriting from a Pipeline
-    STRING(REGEX MATCHALL "template class ConversionFunctionRegistrar<" matches ${content})
-    
-    LIST(LENGTH matches NumMatches)
-    IF(${NumMatches} GREATER 0)
-        MESSAGE(STATUS "Found ${NumMatches} converters in ${FileName}")
-        LIST(APPEND ConverterRegistrationIncludeFiles ${FileName})
-    ENDIF()
-ENDMACRO(PARSE_HEADER_FOR_CONVERTER)
-
 MACRO(ADD_PIPELINE_REGISTRATION IncludeFile ClassName)
     LIST(APPEND PipelineRegistrationIncludeFiles ${IncludeFile})
     LIST(APPEND PipelineRegistrationClassNames ${ClassName})

core/CMakeLists.txt

@@ -43,11 +43,6 @@ FOREACH(CampvisModulesCoreHeader ${CampvisModulesCoreHeaders})
     LIST(APPEND CampvisCoreHeaders ${ModHeaderFile})
 ENDFOREACH()
 
-FOREACH(HeaderFile ${CampvisCoreHeaders})
-    PARSE_HEADER_FOR_CONVERTER(${HeaderFile})
-ENDFOREACH()
-WRITE_CONVERTER_REGISTRATION("gen_converterregistration.h")
-
 ADD_LIBRARY(campvis-core 
     ${CampvisCoreSources} ${CampvisCoreHeaders} 
 )

core/datastructures/imagerepresentationconversioncore.cpp

@@ -25,7 +25,6 @@
 #include "imagerepresentationconversioncore.h"
 
 #include "cgt/assert.h"
-#include "cgt/logmanager.h"
 
 namespace campvis {
 

core/datastructures/imagerepresentationconversioncore.h

@@ -25,10 +25,10 @@
 #ifndef IMAGEREPRESENTATIONCONVERSIONCORE_H__
 #define IMAGEREPRESENTATIONCONVERSIONCORE_H__
 
+#include "cgt/logmanager.h"
 #include "cgt/opengljobprocessor.h"
 
 #include "core/coreapi.h"
-
 #include "core/datastructures/imagerepresentationconverter.h"
 #include "core/datastructures/imagerepresentationdisk.h"
 #include "core/datastructures/imagerepresentationlocal.h"
@@ -73,7 +73,7 @@ namespace campvis {
         INSTANTIATE_TEMPLATE_N(2);
         INSTANTIATE_TEMPLATE_N(3);
         INSTANTIATE_TEMPLATE_N(4);
-		INSTANTIATE_TEMPLATE_N(6);
+        INSTANTIATE_TEMPLATE_N(6);
 
 
 // = Template definition ==========================================================================

core/datastructures/imagerepresentationconverter.cpp

@@ -24,11 +24,6 @@
 
 #include "imagerepresentationconverter.h"
 
-#include <functional>
-
-#include "core/properties/abstractproperty.h"
-#include "core/gen_converterregistration.h"
-
 namespace campvis {
 
     tbb::atomic<ImageRepresentationConverter*> ImageRepresentationConverter::_singleton;

core/datastructures/imagerepresentationconverter.h

@@ -25,9 +25,6 @@
 #ifndef IMAGEREPRESENTATIONCONVERTER_H__
 #define IMAGEREPRESENTATIONCONVERTER_H__
 
-#include "cgt/logmanager.h"
-#include "cgt/singleton.h"
-
 #include <tbb/atomic.h>
 #include <tbb/spin_mutex.h>
 
@@ -35,12 +32,8 @@
 #include "core/datastructures/abstractimagerepresentation.h"
 
 #include <map>
-#include <string>
 #include <typeindex>
 #include <typeinfo>
-#include <vector>
-
-class QWidget;
 
 namespace campvis {
     /**

modules/itk/core/imagerepresentationconversionitk.cpp

@@ -25,7 +25,6 @@
 #include "imagerepresentationconversionitk.h"
 
 #include "cgt/assert.h"
-#include "cgt/logmanager.h"
 #include "cgt/opengljobprocessor.h"
 
 namespace campvis {

modules/itk/core/imagerepresentationconversionitk.h

@@ -25,8 +25,9 @@
 #ifndef IMAGEREPRESENTATIONCONVERSIONITK_H__
 #define IMAGEREPRESENTATIONCONVERSIONITK_H__
 
-#include "core/coreapi.h"
+#include "cgt/logmanager.h"
 
+#include "core/coreapi.h"
 #include "core/datastructures/imagerepresentationconversioncore.h"
 #include "core/datastructures/imagerepresentationdisk.h"
 #include "core/datastructures/imagerepresentationlocal.h"