diff --git a/Modules/DiffusionImaging/DiffusionIO/files.cmake b/Modules/DiffusionImaging/DiffusionIO/files.cmake index 8031712b17..1422e03ba4 100644 --- a/Modules/DiffusionImaging/DiffusionIO/files.cmake +++ b/Modules/DiffusionImaging/DiffusionIO/files.cmake @@ -1,40 +1,41 @@ set(CPP_FILES + mitkDiffusionModuleActivator.cpp mitkNrrdTbssImageWriterFactory.cpp - mitkFiberBundleXIOFactory.cpp + #mitkFiberBundleXIOFactory.cpp mitkConnectomicsNetworkIOFactory.cpp mitkConnectomicsNetworkReader.cpp mitkConnectomicsNetworkWriter.cpp mitkConnectomicsNetworkSerializer.cpp mitkConnectomicsNetworkDefinitions.cpp mitkNrrdTbssRoiImageIOFactory.cpp - mitkFiberBundleXWriterFactory.cpp + #mitkFiberBundleXWriterFactory.cpp mitkConnectomicsNetworkWriterFactory.cpp mitkNrrdTbssRoiImageWriterFactory.cpp mitkNrrdTensorImageReader.cpp mitkNrrdTensorImageWriter.cpp mitkNrrdTensorImageIOFactory.cpp mitkNrrdTensorImageWriterFactory.cpp mitkTensorImageSerializer.cpp mitkTensorImageSource.cpp mitkFiberTrackingObjectFactory.cpp mitkConnectomicsObjectFactory.cpp mitkQuantificationObjectFactory.cpp mitkNrrdTbssImageIOFactory.cpp mitkDiffusionCoreObjectFactory.cpp mitkNrrdDiffusionImageReader.cpp mitkNrrdDiffusionImageIOFactory.cpp mitkNrrdDiffusionImageWriterFactory.cpp mitkDiffusionImageSerializer.cpp mitkNrrdQBallImageReader.cpp mitkNrrdQBallImageWriter.cpp mitkNrrdQBallImageIOFactory.cpp mitkNrrdQBallImageWriterFactory.cpp mitkQBallImageSerializer.cpp mitkFiberBundleXMapper2D.cpp mitkFiberBundleXMapper3D.cpp mitkCompositeMapper.cpp ) diff --git a/Modules/DiffusionImaging/DiffusionIO/mitkDiffusionModuleActivator.cpp b/Modules/DiffusionImaging/DiffusionIO/mitkDiffusionModuleActivator.cpp new file mode 100644 index 0000000000..a2b3f7c1a9 --- /dev/null +++ b/Modules/DiffusionImaging/DiffusionIO/mitkDiffusionModuleActivator.cpp @@ -0,0 +1,54 @@ +/*=================================================================== + +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 +#include +#include +#include + +#include +#include + +namespace mitk +{ + /** + \brief Registers services for segmentation module. + */ + class DiffusionModuleActivator : public us::ModuleActivator + { + public: + + void Load(us::ModuleContext* /*context*/) + { + m_FiberBundleXReader = new FiberBundleXReader(); + m_FiberBundleXWriter = new FiberBundleXWriter(); + } + + void Unload(us::ModuleContext*) + { + delete m_FiberBundleXReader; + delete m_FiberBundleXWriter; + } + + private: + + FiberBundleXReader * m_FiberBundleXReader; + FiberBundleXWriter * m_FiberBundleXWriter; + + }; +} + +US_EXPORT_MODULE_ACTIVATOR(mitk::DiffusionModuleActivator) diff --git a/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXIOFactory.cpp b/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXIOFactory.cpp deleted file mode 100644 index 7ee1d84e0b..0000000000 --- a/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXIOFactory.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/*=================================================================== - -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 "mitkFiberBundleXIOFactory.h" -#include "mitkIOAdapter.h" -#include "mitkFiberBundleXReader.h" - -#include "itkVersion.h" - -//NOTE>umbenennen in FBReaderType - - -namespace mitk -{ - -FiberBundleXIOFactory::FiberBundleXIOFactory() -{ - typedef FiberBundleXReader FiberBundleXReaderType; - this->RegisterOverride("mitkIOAdapter", //beibehalten - "mitkFiberBundleXReader", //umbenennen - "Fiber Bundle IO", //angezeigter name - 1, - itk::CreateObjectFunction >::New()); -} - -FiberBundleXIOFactory::~FiberBundleXIOFactory() -{ -} - -const char* FiberBundleXIOFactory::GetITKSourceVersion() const -{ - return ITK_SOURCE_VERSION; -} - -const char* FiberBundleXIOFactory::GetDescription() const -{ - return "FibreBundleIOFactory, allows the loading of FibreBundles"; -} - -} // end namespace mitk diff --git a/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXIOFactory.h b/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXIOFactory.h deleted file mode 100644 index d8b7acff21..0000000000 --- a/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXIOFactory.h +++ /dev/null @@ -1,66 +0,0 @@ -/*=================================================================== - -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 __MITK_FIBER_BUNDLEX_IO_FACTORY_H_HEADER__ -#define __MITK_FIBER_BUNDLEX_IO_FACTORY_H_HEADER__ - -#ifdef _MSC_VER -#pragma warning ( disable : 4786 ) -#endif - -#include "itkObjectFactoryBase.h" -#include "mitkBaseData.h" - -//NOTE>umbenennen in internal FiberBundleIOFactory - - -namespace mitk -{ -//##Documentation -//## @brief Create instances of NrrdQBallImageReader objects using an object factory. -//## -class FiberBundleXIOFactory : public itk::ObjectFactoryBase -{ -public: - /** Standard class typedefs. */ - typedef FiberBundleXIOFactory Self; - typedef itk::ObjectFactoryBase Superclass; - typedef itk::SmartPointer Pointer; - typedef itk::SmartPointer ConstPointer; - - /** Class methods used to interface with the registered factories. */ - virtual const char* GetITKSourceVersion(void) const; - virtual const char* GetDescription(void) const; - - /** Method for class instantiation. */ - itkFactorylessNewMacro(Self); - static FiberBundleXIOFactory* FactoryNew() { return new FiberBundleXIOFactory;} - /** Run-time type information (and related methods). */ - itkTypeMacro(FiberBundleXIOFactory, ObjectFactoryBase); - -protected: - FiberBundleXIOFactory(); - ~FiberBundleXIOFactory(); - -private: - FiberBundleXIOFactory(const Self&); //purposely not implemented - void operator=(const Self&); //purposely not implemented - -}; - - -} // end namespace mitk - -#endif // __MITK_FIBER_BUNDLE_IO_FACTORY_H_HEADER__ diff --git a/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXWriterFactory.cpp b/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXWriterFactory.cpp deleted file mode 100644 index 6bf582bb75..0000000000 --- a/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXWriterFactory.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/*=================================================================== - -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 "mitkFiberBundleXWriterFactory.h" - -#include "itkCreateObjectFunction.h" -#include "itkVersion.h" - -#include "mitkFiberBundleXWriter.h" - -namespace mitk -{ - -template -class CreateFiberBundleXWriter : public itk::CreateObjectFunctionBase -{ -public: - - /** Standard class typedefs. */ - typedef CreateFiberBundleXWriter Self; - typedef itk::SmartPointer Pointer; - - /** Methods from itk:LightObject. */ - itkFactorylessNewMacro(Self); - LightObject::Pointer CreateObject() { typename T::Pointer p = T::New(); - p->Register(); - return p.GetPointer(); - } - -protected: - CreateFiberBundleXWriter() {} - ~CreateFiberBundleXWriter() {} - -private: - CreateFiberBundleXWriter(const Self&); //purposely not implemented - void operator=(const Self&); //purposely not implemented -}; - -FiberBundleXWriterFactory::FiberBundleXWriterFactory() -{ - this->RegisterOverride("IOWriter", - "FiberBundleXWriter", - "FiberBundleX Writer", - 1, - mitk::CreateFiberBundleXWriter< mitk::FiberBundleXWriter >::New()); -} - -FiberBundleXWriterFactory::~FiberBundleXWriterFactory() -{ -} - -const char* FiberBundleXWriterFactory::GetITKSourceVersion() const -{ - return ITK_SOURCE_VERSION; -} - -const char* FiberBundleXWriterFactory::GetDescription() const -{ - return "FiberBundleXWriterFactory"; -} - -} // end namespace mitk diff --git a/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXWriterFactory.h b/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXWriterFactory.h deleted file mode 100644 index a6f9408af1..0000000000 --- a/Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXWriterFactory.h +++ /dev/null @@ -1,54 +0,0 @@ -/*=================================================================== - -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 FIBERBUNDLEX_WRITERFACTORY_H_HEADER_INCLUDED -#define FIBERBUNDLEX_WRITERFACTORY_H_HEADER_INCLUDED - -#include "itkObjectFactoryBase.h" -#include "mitkBaseData.h" - -namespace mitk -{ - -class FiberBundleXWriterFactory : public itk::ObjectFactoryBase -{ -public: - - mitkClassMacro( mitk::FiberBundleXWriterFactory, itk::ObjectFactoryBase ) - - /** Class methods used to interface with the registered factories. */ - virtual const char* GetITKSourceVersion(void) const; - virtual const char* GetDescription(void) const; - - /** Method for class instantiation. */ - itkFactorylessNewMacro(Self); - -protected: - FiberBundleXWriterFactory(); - ~FiberBundleXWriterFactory(); - -private: - FiberBundleXWriterFactory(const Self&); //purposely not implemented - void operator=(const Self&); //purposely not implemented - -}; - -} // end namespace mitk - -#endif // FiberBundleX_WRITERFACTORY_H_HEADER_INCLUDED - - -