diff --git a/Modules/Bundles/CMakeLists.txt b/Modules/Bundles/CMakeLists.txt index b6e59863a0..e6175405a0 100644 --- a/Modules/Bundles/CMakeLists.txt +++ b/Modules/Bundles/CMakeLists.txt @@ -1,41 +1,42 @@ IF(MITK_USE_BLUEBERRY) - + SET(MITK_DEFAULT_SUBPROJECTS MITK-Plugins) - - SET(_mitk_bundles_default + + SET(_mitk_bundles_default ) - + IF(QT4_FOUND) LIST(APPEND _mitk_bundles_default "org.mitk.gui.qt.imagenavigator") # BlueBerry depends on CTK which depends on Qt, so we # need the Qt include direcotries INCLUDE(${QT_USE_FILE}) ENDIF() - + SET(PLUGIN_EXCLUDE_LIST org.mitk.core.ext org.mitk.gui.qt.volumetry org.mitk.core.jobs org.mitk.diffusionimaging org.mitk.gui.qt.diffusionimaging org.mitk.gui.qt.ext org.mitk.gui.qt.extapplication org.mitk.gui.qt.datamanager org.mitk.planarfigure org.mitk.gui.qt.igtnavigationtoolmanager + org.mitk.gui.qt.igttrackingtoolbox ) MACRO_COLLECT_PLUGINS(OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ExtBundles CACHE_PLUGIN_SOURCE_DIRS MITK_MODULES_PLUGIN_SOURCE_DIRS CACHE_PLUGIN_OUTPUT_DIRS MITK_MODULES_PLUGIN_OUTPUT_DIRS CACHE_PLUGIN_TARGETS MITK_MODULES_ENABLED_PLUGINS - BUNDLE_LIST_PATH "${MITK_BINARY_DIR}/Bundles/MITKModulesBundleList.cmake" + BUNDLE_LIST_PATH "${MITK_BINARY_DIR}/Bundles/MITKModulesBundleList.cmake" CMAKE_CACHE_PREFIX "MITK" PLUGIN_DEFAULT_ON ${_mitk_bundles_default} PLUGIN_EXCLUDES ${PLUGIN_EXCLUDE_LIST} ${MITK_BUILD_ALL_PLUGINS_OPTION}) - -ENDIF(MITK_USE_BLUEBERRY) + +ENDIF(MITK_USE_BLUEBERRY) \ No newline at end of file diff --git a/Modules/Bundles/PluginList.cmake b/Modules/Bundles/PluginList.cmake index 4a0a71eee8..b4ee031cac 100644 --- a/Modules/Bundles/PluginList.cmake +++ b/Modules/Bundles/PluginList.cmake @@ -1,11 +1,12 @@ SET(MITK_EXT_PLUGINS org.mitk.core.ext:ON org.mitk.core.jobs:OFF org.mitk.diffusionimaging:OFF org.mitk.gui.qt.diffusionimaging:OFF org.mitk.gui.qt.ext:ON org.mitk.gui.qt.extapplication:ON org.mitk.planarfigure:ON org.mitk.gui.qt.datamanager:ON org.mitk.gui.qt.igtnavigationtoolmanager:OFF + org.mitk.gui.qt.igttrackingtoolbox:OFF ) \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/CMakeLists.txt b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/CMakeLists.txt index 617e1dfcab..d8673e5566 100644 --- a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/CMakeLists.txt +++ b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/CMakeLists.txt @@ -1,2 +1,9 @@ +# The project name must correspond to the directory name of your plug-in +# and must not contain periods. +PROJECT(org_mitk_gui_qt_igttrackingtoolbox) -MACRO_CREATE_MITK_PLUGIN(QmitkExt MitkIGT MitkIGTUI) +MACRO_CREATE_MITK_CTK_PLUGIN( + EXPORT_DIRECTIVE IGTTRACKINGTOOLBOX + EXPORTED_INCLUDE_SUFFIXES src + MODULE_DEPENDENCIES QmitkExt MitkIGT MitkIGTUI +) diff --git a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/META-INF/MANIFEST.MF b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/META-INF/MANIFEST.MF deleted file mode 100644 index fd19c39942..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/META-INF/MANIFEST.MF +++ /dev/null @@ -1,7 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Name: MITK-IGT Tracking Toolbox -Bundle-SymbolicName: org.mitk.gui.qt.igttrackingtoolbox -Bundle-Version: 0.1 -Bundle-Vendor: DKFZ, Medical and Biological Informatics -Require-Bundle: org.mitk.gui.qt.common -Bundle-Activator: diff --git a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/files.cmake b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/files.cmake index 9a96cf3453..d5e1e7aaf8 100644 --- a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/files.cmake +++ b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/files.cmake @@ -1,35 +1,38 @@ SET(SRC_CPP_FILES - + ) SET(INTERNAL_CPP_FILES QmitkMITKIGTTrackingToolboxView.cpp - + mitkPluginActivator.cpp ) SET(UI_FILES src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui ) SET(MOC_H_FILES src/internal/QmitkMITKIGTTrackingToolboxView.h + src/internal/mitkPluginActivator.h ) -SET(RESOURCE_FILES +SET(CACHED_RESOURCE_FILES resources/icon.xpm + plugin.xml ) -SET(RES_FILES +SET(QRC_FILES resources/QmitkMITKIGTTrackingToolboxView.qrc ) -SET(CPP_FILES manifest.cpp) +SET(CPP_FILES + +) foreach(file ${SRC_CPP_FILES}) SET(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) SET(CPP_FILES ${CPP_FILES} src/internal/${file}) -endforeach(file ${INTERNAL_CPP_FILES}) - +endforeach(file ${INTERNAL_CPP_FILES}) \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/manifest.cpp b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/manifest.cpp deleted file mode 100644 index b0868ec6d1..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/manifest.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/*========================================================================= - -Program: Medical Imaging & Interaction Toolkit -Language: C++ -Date: $Date$ -Version: $Revision$ - -Copyright (c) German Cancer Research Center, Division of Medical and -Biological Informatics. All rights reserved. -See MITKCopyright.txt or http://www.mitk.org/copyright.html for details. - -This software is distributed WITHOUT ANY WARRANTY; without even -the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -PURPOSE. See the above copyright notices for more information. - -=========================================================================*/ - -#include - - - -#include "src/internal/QmitkMITKIGTTrackingToolboxView.h" - -POCO_BEGIN_NAMED_MANIFEST(berryIViewPart, berry::IViewPart) - POCO_EXPORT_CLASS(::QmitkMITKIGTTrackingToolboxView) -POCO_END_MANIFEST diff --git a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/manifest_headers.cmake b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/manifest_headers.cmake new file mode 100644 index 0000000000..f3f1d441c8 --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/manifest_headers.cmake @@ -0,0 +1,5 @@ +set(Plugin-Name "MITK-IGT Tracking Toolbox") +set(Plugin-Version "0.1") +set(Plugin-Vendor "DKFZ, Medical and Biological Informatics") +set(Plugin-ContactAddress "http://www.mitk.org") +set(Require-Plugin org.mitk.gui.qt.common) \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/plugin.xml b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/plugin.xml index db2771fb3e..bbaa373f3b 100644 --- a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/plugin.xml +++ b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/plugin.xml @@ -1,12 +1,12 @@ - + - + \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/IgttrackingtoolboxDll.h b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/IgttrackingtoolboxDll.h deleted file mode 100644 index aa65826bdc..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/IgttrackingtoolboxDll.h +++ /dev/null @@ -1,43 +0,0 @@ -/*========================================================================= - -Program: Medical Imaging & Interaction Toolkit -Language: C++ -Date: $Date$ -Version: $Revision$ - -Copyright (c) German Cancer Research Center, Division of Medical and -Biological Informatics. All rights reserved. -See MITKCopyright.txt or http://www.mitk.org/copyright.html for details. - -This software is distributed WITHOUT ANY WARRANTY; without even -the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -PURPOSE. See the above copyright notices for more information. - -=========================================================================*/ - -#ifndef _IGTTRACKINGTOOLBOX_EXPORT_DLL_H_ -#define _IGTTRACKINGTOOLBOX_EXPORT_DLL_H_ - - -// -// The following block is the standard way of creating macros which make exporting -// from a DLL simpler. All files within this DLL are compiled with the org_mitk_gui_qt_igttrackingtoolbox_EXPORTS -// symbol defined on the command line. this symbol should not be defined on any project -// that uses this DLL. This way any other project whose source files include this file see -// org_mitk_gui_qt_igttrackingtoolbox_EXPORTS functions as being imported from a DLL, wheras this DLL sees symbols -// defined with this macro as being exported. -// -#if defined(_WIN32) && !defined(MITK_STATIC) - #if defined(org_mitk_gui_qt_igttrackingtoolbox_EXPORTS) - #define IGTTRACKINGTOOLBOX_EXPORT __declspec(dllexport) - #else - #define IGTTRACKINGTOOLBOX_EXPORT __declspec(dllimport) - #endif -#endif - - -#if !defined(IGTTRACKINGTOOLBOX_EXPORT) - #define IGTTRACKINGTOOLBOX_EXPORT -#endif - -#endif /*_IGTTRACKINGTOOLBOX_EXPORT_DLL_H_*/ diff --git a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/internal/QmitkMITKIGTTrackingToolboxView.h b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/internal/QmitkMITKIGTTrackingToolboxView.h index 079abc800e..3c704bc3f1 100644 --- a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/internal/QmitkMITKIGTTrackingToolboxView.h +++ b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/internal/QmitkMITKIGTTrackingToolboxView.h @@ -1,117 +1,121 @@ /*========================================================================= Program: Medical Imaging & Interaction Toolkit Language: C++ Date: $Date$ -Version: $Revision$ - +Version: $Revision$ + Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. See MITKCopyright.txt or http://www.mitk.org/copyright.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ #ifndef QmitkMITKIGTTrackingToolboxView_h #define QmitkMITKIGTTrackingToolboxView_h #include #include #include "ui_QmitkMITKIGTTrackingToolboxViewControls.h" //mitk headers #include #include #include #include //QT headers #include /*! - \brief QmitkMITKIGTTrackingToolboxView + \brief QmitkMITKIGTTrackingToolboxView \warning This application module is not yet documented. Use "svn blame/praise/annotate" and ask the author to provide basic documentation. \sa QmitkFunctionality \ingroup Functionalities */ class QmitkMITKIGTTrackingToolboxView : public QmitkFunctionality -{ +{ // this is needed for all Qt objects that should have a Qt meta-object // (everything that derives from QObject and wants to have signal/slots) Q_OBJECT - - public: + + public: static const std::string VIEW_ID; QmitkMITKIGTTrackingToolboxView(); + QmitkMITKIGTTrackingToolboxView(const QmitkMITKIGTTrackingToolboxView& other) + { + Q_UNUSED(other) + throw std::runtime_error("Copy constructor not implemented"); + } virtual ~QmitkMITKIGTTrackingToolboxView(); virtual void CreateQtPartControl(QWidget *parent); virtual void StdMultiWidgetAvailable (QmitkStdMultiWidget &stdMultiWidget); virtual void StdMultiWidgetNotAvailable(); protected slots: void OnLoadTools(); void OnStartTracking(); void OnStopTracking(); void OnChooseFileClicked(); - + void StartLogging(); void StopLogging(); void OnTrackingDeviceChanged(); void OnAutoDetectTools(); /** @brief Slot for tracking timer */ void UpdateTrackingTimer(); - - + + protected: Ui::QmitkMITKIGTTrackingToolboxViewControls* m_Controls; QmitkStdMultiWidget* m_MultiWidget; bool m_tracking; void MessageBox(std::string s); bool m_logging; int m_loggedFrames; mitk::DataNode::Pointer m_TrackingVolumeNode; void GlobalReinit(); //stores the loaded tools mitk::NavigationToolStorage::Pointer m_toolStorage; //members for the filter pipeline mitk::TrackingDeviceSource::Pointer m_TrackingDeviceSource; mitk::NavigationDataObjectVisualizationFilter::Pointer m_ToolVisualizationFilter; mitk::NavigationDataRecorder::Pointer m_loggingFilter; QTimer* m_TrackingTimer; - + }; #endif // _QMITKMITKIGTTRACKINGTOOLBOXVIEW_H_INCLUDED - diff --git a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/internal/mitkPluginActivator.cpp b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/internal/mitkPluginActivator.cpp new file mode 100644 index 0000000000..c35cf521a0 --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/internal/mitkPluginActivator.cpp @@ -0,0 +1,20 @@ +#include "mitkPluginActivator.h" +#include "QmitkMITKIGTTrackingToolboxView.h" + +#include + +namespace mitk { + +void PluginActivator::start(ctkPluginContext* context) +{ + BERRY_REGISTER_EXTENSION_CLASS(QmitkMITKIGTTrackingToolboxView, context) +} + +void PluginActivator::stop(ctkPluginContext* context) +{ + Q_UNUSED(context) +} + +} + +Q_EXPORT_PLUGIN2(org_mitk_gui_qt_igttrackingtoolbox, mitk::PluginActivator) \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/internal/mitkPluginActivator.h b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/internal/mitkPluginActivator.h new file mode 100644 index 0000000000..70c968b98e --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.igttrackingtoolbox/src/internal/mitkPluginActivator.h @@ -0,0 +1,23 @@ +#ifndef MITKPLUGINACTIVATOR_H +#define MITKPLUGINACTIVATOR_H + +#include + +namespace mitk { + +class PluginActivator : + public QObject, public ctkPluginActivator +{ + Q_OBJECT + Q_INTERFACES(ctkPluginActivator) + +public: + + void start(ctkPluginContext* context); + void stop(ctkPluginContext* context); + +}; // PluginActivator + +} + +#endif // MITKPLUGINACTIVATOR_H \ No newline at end of file