diff --git a/Modules/MatchPointRegistration/CMakeLists.txt b/Modules/MatchPointRegistration/CMakeLists.txt index d0054fd882..887d76b625 100644 --- a/Modules/MatchPointRegistration/CMakeLists.txt +++ b/Modules/MatchPointRegistration/CMakeLists.txt @@ -1,9 +1,12 @@ MITK_CREATE_MODULE( INCLUDE_DIRS Rendering IO Helper DEPENDS MitkCore MitkSceneSerializationBase PACKAGE_DEPENDS PRIVATE ITK VTK PUBLIC MatchPoint ) -ADD_SUBDIRECTORY(Testing) \ No newline at end of file +ADD_SUBDIRECTORY(autoload/IO) +if(BUILD_TESTING) + ADD_SUBDIRECTORY(Testing) +endif(BUILD_TESTING diff --git a/Modules/MatchPointRegistration/autoload/IO/CMakeLists.txt b/Modules/MatchPointRegistration/autoload/IO/CMakeLists.txt new file mode 100644 index 0000000000..0881f2493b --- /dev/null +++ b/Modules/MatchPointRegistration/autoload/IO/CMakeLists.txt @@ -0,0 +1,7 @@ +MITK_CREATE_MODULE(MatchPointRegistrationIO + DEPENDS + PUBLIC MitkMatchPointRegistration MitkSceneSerializationBase + PACKAGE_DEPENDS + PRIVATE ITK MatchPoint + AUTOLOAD_WITH MitkCore +) diff --git a/Modules/MatchPointRegistration/autoload/IO/files.cmake b/Modules/MatchPointRegistration/autoload/IO/files.cmake new file mode 100644 index 0000000000..e56b5a7dfe --- /dev/null +++ b/Modules/MatchPointRegistration/autoload/IO/files.cmake @@ -0,0 +1,16 @@ +set(CPP_FILES + mitkMatchPointActivator.cpp + mitkMAPRegistrationWrapperIO.cpp + mitkMAPRegistrationWrapperSerializer.cpp +) + +set(H_FILES + mitkMAPRegistrationWrapperIO.h + mitkMAPRegistrationWrapperSerializer.h +) + +set(TPP_FILES +) + +set(MOC_H_FILES +) diff --git a/Modules/MatchPointRegistration/IO/mitkMAPRegistrationWrapperIO.cpp b/Modules/MatchPointRegistration/autoload/IO/mitkMAPRegistrationWrapperIO.cpp similarity index 100% rename from Modules/MatchPointRegistration/IO/mitkMAPRegistrationWrapperIO.cpp rename to Modules/MatchPointRegistration/autoload/IO/mitkMAPRegistrationWrapperIO.cpp diff --git a/Modules/MatchPointRegistration/IO/mitkMAPRegistrationWrapperIO.h b/Modules/MatchPointRegistration/autoload/IO/mitkMAPRegistrationWrapperIO.h similarity index 100% rename from Modules/MatchPointRegistration/IO/mitkMAPRegistrationWrapperIO.h rename to Modules/MatchPointRegistration/autoload/IO/mitkMAPRegistrationWrapperIO.h diff --git a/Modules/MatchPointRegistration/IO/mitkMAPRegistrationWrapperSerializer.cpp b/Modules/MatchPointRegistration/autoload/IO/mitkMAPRegistrationWrapperSerializer.cpp similarity index 99% rename from Modules/MatchPointRegistration/IO/mitkMAPRegistrationWrapperSerializer.cpp rename to Modules/MatchPointRegistration/autoload/IO/mitkMAPRegistrationWrapperSerializer.cpp index c8707fa420..6c26c4096a 100644 --- a/Modules/MatchPointRegistration/IO/mitkMAPRegistrationWrapperSerializer.cpp +++ b/Modules/MatchPointRegistration/autoload/IO/mitkMAPRegistrationWrapperSerializer.cpp @@ -1,76 +1,75 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "mitkMAPRegistrationWrapperSerializer.h" #include "mitkMAPRegistrationWrapperIO.h" #include "mitkMAPRegistrationWrapper.h" #include MITK_REGISTER_SERIALIZER(MAPRegistrationWrapperSerializer) mitk::MAPRegistrationWrapperSerializer::MAPRegistrationWrapperSerializer() { } mitk::MAPRegistrationWrapperSerializer::~MAPRegistrationWrapperSerializer() { } std::string mitk::MAPRegistrationWrapperSerializer::Serialize() { const mitk::MAPRegistrationWrapper* wrapper = dynamic_cast( m_Data.GetPointer() ); if (wrapper == NULL) { MITK_ERROR << " Object at " << (const void*) this->m_Data << " is not an mitk::MAPRegistrationWrapper. Cannot serialize as MAPRegistrationWrapper for MatchPoint registration objects."; return ""; } std::string filename( this->GetUniqueFilenameInWorkingDirectory() ); filename += "_"; filename += m_FilenameHint; filename += ".mapr"; std::string fullname(m_WorkingDirectory); fullname += "/"; fullname += itksys::SystemTools::ConvertToOutputPath(filename.c_str()); try { MAPRegistrationWrapperIO writer; writer.SetOutputLocation(fullname); writer.AbstractFileWriter::SetInput( const_cast( wrapper ) ); writer.Write(); } catch (std::exception& e) { MITK_ERROR << " Error serializing object at " << (const void*) this->m_Data << " to " << fullname << ": " << e.what(); return ""; } return filename; } - diff --git a/Modules/MatchPointRegistration/IO/mitkMAPRegistrationWrapperSerializer.h b/Modules/MatchPointRegistration/autoload/IO/mitkMAPRegistrationWrapperSerializer.h similarity index 87% rename from Modules/MatchPointRegistration/IO/mitkMAPRegistrationWrapperSerializer.h rename to Modules/MatchPointRegistration/autoload/IO/mitkMAPRegistrationWrapperSerializer.h index 05c8ce2d49..5fe8e41bb1 100644 --- a/Modules/MatchPointRegistration/IO/mitkMAPRegistrationWrapperSerializer.h +++ b/Modules/MatchPointRegistration/autoload/IO/mitkMAPRegistrationWrapperSerializer.h @@ -1,43 +1,42 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef __mitkMAPRegistrationWrapperSerializer_h #define __mitkMAPRegistrationWrapperSerializer_h -#include "MitkMatchPointRegistrationExports.h" #include namespace mitk { /** \brief Serializes mitk::MAPRegistrationWrapper for mitk::SceneIO */ -class MITKMATCHPOINTREGISTRATION_EXPORT MAPRegistrationWrapperSerializer : public BaseDataSerializer +class MAPRegistrationWrapperSerializer : public BaseDataSerializer { public: mitkClassMacro( MAPRegistrationWrapperSerializer, BaseDataSerializer ); itkFactorylessNewMacro(Self); itkCloneMacro(Self); virtual std::string Serialize(); protected: MAPRegistrationWrapperSerializer(); virtual ~MAPRegistrationWrapperSerializer(); }; } // namespace #endif diff --git a/Modules/MatchPointRegistration/mitkMatchPointActivator.cpp b/Modules/MatchPointRegistration/autoload/IO/mitkMatchPointActivator.cpp similarity index 95% rename from Modules/MatchPointRegistration/mitkMatchPointActivator.cpp rename to Modules/MatchPointRegistration/autoload/IO/mitkMatchPointActivator.cpp index 1bd7c3882c..90b3841279 100644 --- a/Modules/MatchPointRegistration/mitkMatchPointActivator.cpp +++ b/Modules/MatchPointRegistration/autoload/IO/mitkMatchPointActivator.cpp @@ -1,48 +1,48 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "mitkMAPRegistrationWrapperIO.h" #include #include namespace mitk { /* * This is the module activator for the "MatchPoint" module. */ class MatchPointActivator : public us::ModuleActivator { public: void Load(us::ModuleContext* context) { m_MAPRegistrationWrapperIO = new MAPRegistrationWrapperIO(); } void Unload(us::ModuleContext* ) { delete m_MAPRegistrationWrapperIO; } private: mitk::MAPRegistrationWrapperIO* m_MAPRegistrationWrapperIO; }; } -US_EXPORT_MODULE_ACTIVATOR(mitk::MatchPointActivator) \ No newline at end of file +US_EXPORT_MODULE_ACTIVATOR(mitk::MatchPointActivator) diff --git a/Modules/MatchPointRegistration/files.cmake b/Modules/MatchPointRegistration/files.cmake index 2b5e38a3b3..d38d4a6dd3 100644 --- a/Modules/MatchPointRegistration/files.cmake +++ b/Modules/MatchPointRegistration/files.cmake @@ -1,63 +1,58 @@ set(CPP_FILES - mitkMatchPointActivator.cpp mitkMAPRegistrationWrapper.cpp mitkMAPRegistrationWrapperObjectFactory.cpp mitkRegEvaluationObjectFactory.cpp mitkRegEvaluationObject.cpp Helper/mitkUIDHelper.cpp Helper/mitkAlgorithmHelper.cpp Helper/mitkMaskedAlgorithmHelper.cpp Helper/mitkRegistrationHelper.cpp Helper/mitkImageMappingHelper.cpp Helper/mitkPointSetMappingHelper.cpp Helper/mitkResultNodeGenerationHelper.cpp Helper/mitkTimeFramesRegistrationHelper.cpp - IO/mitkMAPRegistrationWrapperIO.cpp - IO/mitkMAPRegistrationWrapperSerializer.cpp Rendering/mitkRegistrationWrapperMapper2D.cpp Rendering/mitkRegistrationWrapperMapper3D.cpp Rendering/mitkRegistrationWrapperMapperBase.cpp Rendering/mitkRegEvaluationMapper2D.cpp Rendering/mitkRegVisStyleProperty.cpp Rendering/mitkRegVisDirectionProperty.cpp Rendering/mitkRegVisColorStyleProperty.cpp Rendering/mitkRegVisPropertyTags.cpp Rendering/mitkRegVisHelper.cpp Rendering/mitkRegEvalStyleProperty.cpp Rendering/mitkRegEvalWipeStyleProperty.cpp ) set(H_FILES mitkMatchPointPropertyTags.h mitkMAPRegistrationWrapper.h mitkMAPRegistrationWrapperObjectFactory.h mitkRegEvaluationObjectFactory.h mitkRegEvaluationObject.h Helper/mitkUIDHelper.h Helper/mitkAlgorithmHelper.h Helper/mitkMaskedAlgorithmHelper.h Helper/mitkRegistrationHelper.h Helper/mitkImageMappingHelper.h Helper/mitkPointSetMappingHelper.h Helper/mitkResultNodeGenerationHelper.h Helper/mitkTimeFramesRegistrationHelper.h - IO/mitkMAPRegistrationWrapperIO.h - IO/mitkMAPRegistrationWrapperSerializer.h Rendering/mitkRegistrationWrapperMapper2D.h Rendering/mitkRegistrationWrapperMapper3D.h Rendering/mitkRegistrationWrapperMapperBase.h Rendering/mitkRegVisStyleProperty.h Rendering/mitkRegVisDirectionProperty.h Rendering/mitkRegVisColorStyleProperty.h Rendering/mitkRegVisPropertyTags.h Rendering/mitkRegVisHelper.h Rendering/mitkRegEvaluationMapper2D.h Rendering/mitkRegEvalStyleProperty.h Rendering/mitkRegEvalWipeStyleProperty.h ) set(TPP_FILES ) set(MOC_H_FILES )