diff --git a/Modules/Bundles/CMakeLists.txt b/Modules/Bundles/CMakeLists.txt index 1a2eb6b147..62fe91b190 100644 --- a/Modules/Bundles/CMakeLists.txt +++ b/Modules/Bundles/CMakeLists.txt @@ -1,53 +1,54 @@ IF(MITK_USE_BLUEBERRY) SET(MITK_DEFAULT_SUBPROJECTS MITK-Plugins) 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.gui.qt.regiongrowing org.mitk.gui.qt.segmentation org.mitk.planarfigure org.mitk.gui.qt.igtnavigationtoolmanager org.mitk.gui.qt.igttrackingtoolbox org.mitk.gui.qt.igttoolpairnavigation org.mitk.gui.qt.basicimageprocessing org.mitk.gui.qt.colourimageprocessing org.mitk.gui.qt.navigationdataplayer org.mitk.gui.qt.tofutil + org.mitk.gui.qt.toftutorial org.mitk.gui.qt.imagenavigator org.mitk.gui.qt.moviemaker org.mitk.gui.qt.deformableregistration org.mitk.gui.qt.rigidregistration ) 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" CMAKE_CACHE_PREFIX "MITK" PLUGIN_DEFAULT_ON ${_mitk_bundles_default} PLUGIN_EXCLUDES ${PLUGIN_EXCLUDE_LIST} ${MITK_BUILD_ALL_PLUGINS_OPTION}) ENDIF(MITK_USE_BLUEBERRY) diff --git a/Modules/Bundles/PluginList.cmake b/Modules/Bundles/PluginList.cmake index 6ac1c79c8e..a0a4842254 100644 --- a/Modules/Bundles/PluginList.cmake +++ b/Modules/Bundles/PluginList.cmake @@ -1,23 +1,24 @@ 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.gui.qt.segmentation:OFF org.mitk.planarfigure:ON org.mitk.gui.qt.datamanager:ON org.mitk.gui.qt.igtnavigationtoolmanager:OFF org.mitk.gui.qt.igttoolpairnavigation:ON org.mitk.gui.qt.igttrackingtoolbox:OFF org.mitk.gui.qt.regiongrowing:OFF org.mitk.gui.qt.navigationdataplayer:ON org.mitk.gui.qt.basicimageprocessing:OFF org.mitk.gui.qt.colourimageprocessing:OFF org.mitk.gui.qt.tofutil:OFF + org.mitk.gui.qt.toftutorial:OFF org.mitk.gui.qt.imagenavigator:ON org.mitk.gui.qt.moviemaker:ON org.mitk.gui.qt.deformableregistration:ON org.mitk.gui.qt.rigidregistration:ON ) diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/CMakeLists.txt b/Modules/Bundles/org.mitk.gui.qt.toftutorial/CMakeLists.txt index 219c8cd734..8bf27d4bc3 100644 --- a/Modules/Bundles/org.mitk.gui.qt.toftutorial/CMakeLists.txt +++ b/Modules/Bundles/org.mitk.gui.qt.toftutorial/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_toftutorial) -MACRO_CREATE_MITK_PLUGIN(QmitkExt mitkToFHardware mitkToFProcessing) +MACRO_CREATE_MITK_CTK_PLUGIN( + EXPORT_DIRECTIVE TOFTUTORIAL_EXPORT + EXPORTED_INCLUDE_SUFFIXES src + MODULE_DEPENDENCIES QmitkExt mitkToFHardware mitkToFProcessing +) \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/META-INF/MANIFEST.MF b/Modules/Bundles/org.mitk.gui.qt.toftutorial/META-INF/MANIFEST.MF deleted file mode 100644 index 4d06c5b2e8..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.toftutorial/META-INF/MANIFEST.MF +++ /dev/null @@ -1,7 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Name: ToFTutorial -Bundle-SymbolicName: org.mitk.gui.qt.toftutorial -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.toftutorial/files.cmake b/Modules/Bundles/org.mitk.gui.qt.toftutorial/files.cmake index cb8a9ddf11..aa5533022d 100644 --- a/Modules/Bundles/org.mitk.gui.qt.toftutorial/files.cmake +++ b/Modules/Bundles/org.mitk.gui.qt.toftutorial/files.cmake @@ -1,35 +1,37 @@ SET(SRC_CPP_FILES ) SET(INTERNAL_CPP_FILES QmitkToFTutorialView.cpp - + mitkPluginActivator.cpp ) SET(UI_FILES src/internal/QmitkToFTutorialViewControls.ui ) SET(MOC_H_FILES src/internal/QmitkToFTutorialView.h + src/internal/mitkPluginActivator.h ) -SET(RESOURCE_FILES +SET(CACHED_RESOURCE_FILES + plugin.xml resources/icon.xpm ) -SET(RES_FILES +SET(QRC_FILES resources/QmitkToFTutorialView.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}) diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/manifest.cpp b/Modules/Bundles/org.mitk.gui.qt.toftutorial/manifest.cpp deleted file mode 100644 index 21bae0fdf4..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.toftutorial/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/QmitkToFTutorialView.h" - -POCO_BEGIN_NAMED_MANIFEST(berryIViewPart, berry::IViewPart) - POCO_EXPORT_CLASS(::QmitkToFTutorialView) -POCO_END_MANIFEST diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/manifest_headers.cmake b/Modules/Bundles/org.mitk.gui.qt.toftutorial/manifest_headers.cmake new file mode 100644 index 0000000000..9575f0b08e --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.toftutorial/manifest_headers.cmake @@ -0,0 +1,5 @@ +set(Plugin-Name "ToFTutorial") +set(Plugin-Version "0.1") +set(Plugin-Vendor "DKFZ, Medical and Biological Informatics") +set(Plugin-ContactAddress "www.mitk.org/wiki/MITK-ToF") +set(Require-Plugin org.mitk.gui.qt.common) \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/plugin.xml b/Modules/Bundles/org.mitk.gui.qt.toftutorial/plugin.xml index 95cbd234de..c5cbee4781 100644 --- a/Modules/Bundles/org.mitk.gui.qt.toftutorial/plugin.xml +++ b/Modules/Bundles/org.mitk.gui.qt.toftutorial/plugin.xml @@ -1,12 +1,12 @@ diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/src/ToftutorialDll.h b/Modules/Bundles/org.mitk.gui.qt.toftutorial/src/ToftutorialDll.h deleted file mode 100644 index 6559202be2..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.toftutorial/src/ToftutorialDll.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 _TOFTUTORIAL_EXPORT_DLL_H_ -#define _TOFTUTORIAL_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_toftutorial_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_toftutorial_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_toftutorial_EXPORTS) - #define TOFTUTORIAL_EXPORT __declspec(dllexport) - #else - #define TOFTUTORIAL_EXPORT __declspec(dllimport) - #endif -#endif - - -#if !defined(TOFTUTORIAL_EXPORT) - #define TOFTUTORIAL_EXPORT -#endif - -#endif /*_TOFTUTORIAL_EXPORT_DLL_H_*/ diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/mitkPluginActivator.cpp b/Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/mitkPluginActivator.cpp new file mode 100644 index 0000000000..eccdae58c3 --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/mitkPluginActivator.cpp @@ -0,0 +1,20 @@ +#include "mitkPluginActivator.h" + +#include +#include "QmitkToFTutorialView.h" + +namespace mitk { + +void PluginActivator::start(ctkPluginContext* context) +{ + BERRY_REGISTER_EXTENSION_CLASS(QmitkToFTutorialView, context) +} + +void PluginActivator::stop(ctkPluginContext* context) +{ + Q_UNUSED(context) +} + +} + +Q_EXPORT_PLUGIN2(org_mitk_gui_qt_toftutorial, mitk::PluginActivator) \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/mitkPluginActivator.h b/Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/mitkPluginActivator.h new file mode 100644 index 0000000000..70c968b98e --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.toftutorial/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