diff --git a/Modules/ToFHardware/Kinect/mitkKinectActivator.cpp b/Modules/ToFHardware/Kinect/mitkKinectActivator.cpp index e54028356a..f5b210fb8a 100644 --- a/Modules/ToFHardware/Kinect/mitkKinectActivator.cpp +++ b/Modules/ToFHardware/Kinect/mitkKinectActivator.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. ===================================================================*/ #ifndef __mitkKinectActivator_h #define __mitkKinectActivator_h // Microservices #include #include -#include "mitkModuleContext.h" +#include -#include #include "mitkIToFDeviceFactory.h" #include "mitkToFConfig.h" #include "mitkKinectDeviceFactory.h" #include "mitkAbstractToFDeviceFactory.h" /* * This is the module activator for the "mitkKinectModule" module. It registers services * like the IToFDeviceFactory. */ namespace mitk { -class KinectActivator : public ModuleActivator { +class KinectActivator : public us::ModuleActivator { public: - void Load(mitk::ModuleContext* context) + void Load(us::ModuleContext* context) { //Implementing KinectDeviceFactory KinectDeviceFactory* kinectFactory = new KinectDeviceFactory(); - ServiceProperties kinectFactoryProps; + us::ServiceProperties kinectFactoryProps; kinectFactoryProps["ToFFactoryName"] =kinectFactory->GetFactoryName(); context->RegisterService(kinectFactory, kinectFactoryProps); kinectFactory->ConnectToFDevice(); m_Factories.push_back( kinectFactory ); } - void Unload(mitk::ModuleContext* ) + void Unload(us::ModuleContext* ) { } ~KinectActivator() { if(m_Factories.size() > 0) { for(std::list< IToFDeviceFactory* >::iterator it = m_Factories.begin(); it != m_Factories.end(); ++it) { delete (*it); } } } private: std::list< IToFDeviceFactory* > m_Factories; }; } US_EXPORT_MODULE_ACTIVATOR(mitkKinectModule, mitk::KinectActivator) #endif diff --git a/Modules/ToFHardware/Kinect/mitkKinectDeviceFactory.h b/Modules/ToFHardware/Kinect/mitkKinectDeviceFactory.h index 87d607bfc2..20da0ecf9d 100644 --- a/Modules/ToFHardware/Kinect/mitkKinectDeviceFactory.h +++ b/Modules/ToFHardware/Kinect/mitkKinectDeviceFactory.h @@ -1,99 +1,99 @@ /*=================================================================== 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 __mitkKinectDeviceFactory_h #define __mitkKinectDeviceFactory_h #include "mitkKinectModuleExports.h" #include "mitkKinectDevice.h" #include "mitkAbstractToFDeviceFactory.h" #include #include // Microservices #include -#include +#include #include -#include -#include -#include +#include +#include +#include namespace mitk { /** * \brief KinectDeviceFactory is an implementation of the factory pattern to generate Microsoft Kinect devices. * KinectDeviceFactory inherits from AbstractToFDeviceFactory which is a MicroService interface. * This offers users the oppertunity to generate new KinectDevices via a global instance of this factory. * @ingroup ToFHardware */ class MITK_KINECTMODULE_EXPORT KinectDeviceFactory : public itk::LightObject, public AbstractToFDeviceFactory { public: KinectDeviceFactory() { this->m_DeviceNumber = 1; } /*! \brief Defining the Factorie´s Name, here for the Kinect. */ std::string GetFactoryName() { return std::string("Kinect Factory"); } //Interating the Device name on calling the Factory std::string GetCurrentDeviceName() { std::stringstream name; if (m_DeviceNumber>1) { name << "Kinect " << m_DeviceNumber; } else { name << "Kinect "; } m_DeviceNumber++; return name.str(); } private: /*! \brief Create an instance of a KinectDevice. */ ToFCameraDevice::Pointer CreateToFCameraDevice() { KinectDevice::Pointer device = KinectDevice::New(); device->SetBoolProperty("HasRGBImage", true); device->SetBoolProperty("HasAmplitudeImage", false); device->SetBoolProperty("HasIntensityImage", false); device->SetBoolProperty("KinectReconstructionMode", true); return device.GetPointer(); } - ModuleResource GetIntrinsicsResource() + us::ModuleResource GetIntrinsicsResource() { - Module* module = GetModuleContext()->GetModule(); + us::Module* module = us::GetModuleContext()->GetModule(); return module->GetResource("CalibrationFiles/Kinect_RGB_camera.xml"); } //Member variable as variable for our DeviceNumber int m_DeviceNumber; }; } #endif diff --git a/Modules/ToFHardware/MesaSR4000/mitkToDCameraMESASR4000ModuleActivator.cpp b/Modules/ToFHardware/MesaSR4000/mitkToDCameraMESASR4000ModuleActivator.cpp index 058bcb6578..8a0d916902 100644 --- a/Modules/ToFHardware/MesaSR4000/mitkToDCameraMESASR4000ModuleActivator.cpp +++ b/Modules/ToFHardware/MesaSR4000/mitkToDCameraMESASR4000ModuleActivator.cpp @@ -1,77 +1,74 @@ /*=================================================================== 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 __mitkMESASR4000Activator_h #define __mitkMESASR4000Activator_h // Microservices #include #include -#include "mitkModuleContext.h" +#include "usModuleContext.h" +#include -#include #include "mitkIToFDeviceFactory.h" - #include "mitkToFConfig.h" #include "mitkToFCameraMESASR4000DeviceFactory.h" - - /* - * This is the module activator for the "mitkPMDCamCubeModule" module. It registers services + * This is the module activator for the "MESASR4000Module" module. It registers services * like the IToFDeviceFactory. */ namespace mitk { -class MESASR4000ModuleActivator : public mitk::ModuleActivator { +class MESASR4000ModuleActivator : public us::ModuleActivator { public: - void Load(mitk::ModuleContext* context) + void Load(us::ModuleContext* context) { //Implementing MESASR4000DeviceFactory ToFCameraMESASR4000DeviceFactory* toFCameraMESASR4000DeviceFactory = new ToFCameraMESASR4000DeviceFactory(); - ServiceProperties mitkMESASR4000FactoryProps; + us::ServiceProperties mitkMESASR4000FactoryProps; mitkMESASR4000FactoryProps["ToFFactoryName"] = toFCameraMESASR4000DeviceFactory->GetFactoryName(); context->RegisterService(toFCameraMESASR4000DeviceFactory, mitkMESASR4000FactoryProps); toFCameraMESASR4000DeviceFactory->ConnectToFDevice(); m_Factories.push_back(toFCameraMESASR4000DeviceFactory); } - void Unload(mitk::ModuleContext* ) + void Unload(us::ModuleContext* ) { } ~MESASR4000ModuleActivator() { if(m_Factories.size() > 0) { for(std::list< IToFDeviceFactory* >::iterator it = m_Factories.begin(); it != m_Factories.end(); ++it) { delete (*it); } } } private: std::list< IToFDeviceFactory* > m_Factories; }; } US_EXPORT_MODULE_ACTIVATOR(mitkMESASR4000Module, mitk::MESASR4000ModuleActivator) #endif diff --git a/Modules/ToFHardware/MesaSR4000/mitkToFCameraMESASR4000DeviceFactory.h b/Modules/ToFHardware/MesaSR4000/mitkToFCameraMESASR4000DeviceFactory.h index 56796f6b6b..b43774132d 100644 --- a/Modules/ToFHardware/MesaSR4000/mitkToFCameraMESASR4000DeviceFactory.h +++ b/Modules/ToFHardware/MesaSR4000/mitkToFCameraMESASR4000DeviceFactory.h @@ -1,89 +1,89 @@ /*=================================================================== 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 __mitkToFCameraMESASR4000DeviceFactory_h #define __mitkToFCameraMESASR4000DeviceFactory_h #include "mitkMESASR4000ModuleExports.h" #include "mitkToFCameraMESASR4000Device.h" #include "mitkAbstractToFDeviceFactory.h" #include #include #include namespace mitk { /** - * \brief ToFPMDRawPlayerDeviceFactory is an implementation of the factory pattern to generate MESASR4000Devices. + * \brief ToFCameraMESASR4000DeviceFactory is an implementation of the factory pattern to generate MESASR4000Devices. * ToFCameraMESASR4000DeviceFactory inherits from AbstractToFDeviceFactory which is a MicroService interface. * This offers users the oppertunity to generate new Raw Player Devices via a global instance of this factory. * @ingroup ToFHardware */ class MITK_MESASR4000MODULE_EXPORT ToFCameraMESASR4000DeviceFactory : public itk::LightObject, public AbstractToFDeviceFactory { public: ToFCameraMESASR4000DeviceFactory() { this->m_DeviceNumber = 1; } /*! \brief Defining the Factorie´s Name, here for the MESASR4000DeviceFactory */ std::string GetFactoryName() { return std::string("MESA SR4000 Factory"); } std::string GetCurrentDeviceName() { std::stringstream name; if(m_DeviceNumber>1) { name << "MESA SR4000 "<< m_DeviceNumber; } else { name << "MESA SR4000"; } m_DeviceNumber++; return name.str(); } private: /*! - \brief Create an instance of a ToFPMDRawDataDevice. + \brief Create an instance of a ToFCameraMESASR4000Device. */ - ToFCameraDevice::Pointer createToFCameraDevice() + ToFCameraDevice::Pointer CreateToFCameraDevice() { ToFCameraMESASR4000Device::Pointer device = ToFCameraMESASR4000Device::New(); //Set default camera intrinsics for the Mesa-SR4000-camera. mitk::CameraIntrinsics::Pointer cameraIntrinsics = mitk::CameraIntrinsics::New(); std::string pathToDefaulCalibrationFile(MITK_TOF_DATA_DIR); pathToDefaulCalibrationFile.append("/CalibrationFiles/Mesa-SR4000_Camera.xml"); cameraIntrinsics->FromXMLFile(pathToDefaulCalibrationFile); device->SetProperty("CameraIntrinsics", mitk::CameraIntrinsicsProperty::New(cameraIntrinsics)); device->SetBoolProperty("HasRGBImage", false); device->SetBoolProperty("HasAmplitudeImage", true); device->SetBoolProperty("HasIntensityImage", true); return device.GetPointer(); } int m_DeviceNumber; }; } #endif diff --git a/Modules/ToFHardware/PMD/mitkToFCameraPMDCamBoardDeviceFactory.h b/Modules/ToFHardware/PMD/mitkToFCameraPMDCamBoardDeviceFactory.h index 1c5a4b63af..d0b06194e5 100644 --- a/Modules/ToFHardware/PMD/mitkToFCameraPMDCamBoardDeviceFactory.h +++ b/Modules/ToFHardware/PMD/mitkToFCameraPMDCamBoardDeviceFactory.h @@ -1,99 +1,99 @@ /*=================================================================== 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 __mitkToFCameraPMDCamBoardDeviceFactory_h #define __mitkToFCameraPMDCamBoardDeviceFactory_h #include "mitkPMDModuleExports.h" #include "mitkToFCameraPMDCamBoardDevice.h" #include "mitkAbstractToFDeviceFactory.h" #include #include #include // Microservices #include -#include +#include #include -#include -#include -#include +#include +#include +#include namespace mitk { /** * \brief ToFPMDCamBoardDeviceFactory is an implementation of the factory pattern to generate CamBoard devices. * ToFPMDCamBoardDeviceFactory inherits from AbstractToFDeviceFactory which is a MicroService interface. * This offers users the oppertunity to generate new CamBoard Devices via a global instance of this factory. * @ingroup ToFHardware */ class MITK_PMDMODULE_EXPORT ToFCameraPMDCamBoardDeviceFactory : public itk::LightObject, public AbstractToFDeviceFactory { public: ToFCameraPMDCamBoardDeviceFactory() { this->m_DeviceNumber=1; } /*! \brief Defining the Factorie´s Name, here for the ToFPMDCamBoard. */ std::string GetFactoryName() { return std::string("PMD CamBoard Factory "); } std::string GetCurrentDeviceName() { std::stringstream name; if(m_DeviceNumber>1) { name << "PMD CamBoard "<< m_DeviceNumber; } else { name << "PMD CamBoard"; } m_DeviceNumber++; return name.str(); } private: /*! \brief Create an instance of a ToFPMDCamBoardDevice. */ - ToFCameraDevice::Pointer createToFCameraDevice() + ToFCameraDevice::Pointer CreateToFCameraDevice() { ToFCameraPMDCamBoardDevice::Pointer device = ToFCameraPMDCamBoardDevice::New(); device->SetBoolProperty("HasRGBImage", false); device->SetBoolProperty("HasAmplitudeImage", true); device->SetBoolProperty("HasIntensityImage", true); return device.GetPointer(); } - ModuleResource GetIntrinsicsResource() + us::ModuleResource GetIntrinsicsResource() { - Module* module = GetModuleContext()->GetModule(); + us::Module* module = us::GetModuleContext()->GetModule(); return module->GetResource("CalibrationFiles/PMDCamBoard_camera.xml"); } int m_DeviceNumber; }; } #endif diff --git a/Modules/ToFHardware/PMD/mitkToFCameraPMDRawDataCamBoardDeviceFactory.h b/Modules/ToFHardware/PMD/mitkToFCameraPMDRawDataCamBoardDeviceFactory.h index 22d5f84bc2..5a16ff4206 100644 --- a/Modules/ToFHardware/PMD/mitkToFCameraPMDRawDataCamBoardDeviceFactory.h +++ b/Modules/ToFHardware/PMD/mitkToFCameraPMDRawDataCamBoardDeviceFactory.h @@ -1,87 +1,87 @@ /*=================================================================== 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 __mitkToFCameraPMDRawDataCamBoardDeviceFactory_h #define __mitkToFCameraPMDRawDataCamBoardDeviceFactory_h #include "mitkPMDModuleExports.h" #include "mitkToFCameraPMDRawDataCamBoardDevice.h" #include "mitkAbstractToFDeviceFactory.h" #include #include #include // Microservices #include -#include +#include #include -#include -#include -#include +#include +#include +#include namespace mitk { /** * \brief ToFPMDRawPlayerDeviceFactory is an implementation of the factory pattern to generate Raw Player Devices. * ToFPMDRawPlayerDeviceFactory inherits from AbstractToFDeviceFactory which is a MicroService interface. * This offers users the oppertunity to generate new Raw Player Devices via a global instance of this factory. * @ingroup ToFHardware */ class MITK_PMDMODULE_EXPORT ToFCameraPMDRawDataCamBoardDeviceFactory : public itk::LightObject, public AbstractToFDeviceFactory { public: ToFCameraPMDRawDataCamBoardDeviceFactory() { this->m_DeviceNumber=0; } /*! \brief Defining the Factorie´s Name, here for the RawDataCamBoardDeviceFactory. */ std::string GetFactoryName() { return std::string("PMD Raw Data CamBoard Factory "); } std::string GetCurrentDeviceName() { std::stringstream name; name<<"PMD Raw Data CamBoard Device " << m_DeviceNumber++; return name.str (); } private: /*! \brief Create an instance of a RawDataCamBoardDeviceFactory. */ - ToFCameraDevice::Pointer createToFCameraDevice() + ToFCameraDevice::Pointer CreateToFCameraDevice() { ToFCameraPMDRawDataCamBoardDevice::Pointer device = ToFCameraPMDRawDataCamBoardDevice::New(); return device.GetPointer(); } - ModuleResource GetIntrinsicsResource() + us::ModuleResource GetIntrinsicsResource() { - Module* module = GetModuleContext()->GetModule(); + us::Module* module = us::GetModuleContext()->GetModule(); return module->GetResource("CalibrationFiles/PMDCamBoard_camera.xml"); } int m_DeviceNumber; }; } #endif