diff --git a/Modules/Bundles/CMakeLists.txt b/Modules/Bundles/CMakeLists.txt index 6b0ca6eaae..0f7374e6fe 100644 --- a/Modules/Bundles/CMakeLists.txt +++ b/Modules/Bundles/CMakeLists.txt @@ -1,64 +1,65 @@ 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.diffusionimagingapp 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.igttutorial 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 org.mitk.gui.qt.imagestatistics org.mitk.gui.qt.materialeditor org.mitk.gui.qt.simpleexample org.mitk.gui.qt.ugvisualization org.mitk.gui.qt.measurement org.mitk.gui.qt.simplemeasurement org.mitk.gui.qt.imagecropper - org.mitk.gui.qt.pointbasedregistration + org.mitk.gui.qt.pointbasedregistration + org.mitk.gui.qt.viewinitialization ) 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 75059c9933..bb3ca34035 100644 --- a/Modules/Bundles/PluginList.cmake +++ b/Modules/Bundles/PluginList.cmake @@ -1,35 +1,36 @@ SET(MITK_EXT_PLUGINS org.mitk.core.ext:ON org.mitk.core.jobs:OFF org.mitk.planarfigure:ON org.mitk.diffusionimaging:OFF org.mitk.gui.qt.ext:ON org.mitk.gui.qt.extapplication:ON org.mitk.gui.qt.datamanager:ON org.mitk.gui.qt.segmentation:OFF org.mitk.gui.qt.diffusionimaging:OFF org.mitk.gui.qt.diffusionimagingapp:OFF org.mitk.gui.qt.igtnavigationtoolmanager:OFF org.mitk.gui.qt.igttoolpairnavigation:OFF org.mitk.gui.qt.igttrackingtoolbox:OFF org.mitk.gui.qt.regiongrowing:OFF org.mitk.gui.qt.navigationdataplayer:OFF org.mitk.gui.qt.basicimageprocessing:OFF org.mitk.gui.qt.igttutorial:OFF org.mitk.gui.qt.colourimageprocessing:OFF org.mitk.gui.qt.tofutil:OFF org.mitk.gui.qt.toftutorial:OFF org.mitk.gui.qt.imagenavigator:OFF org.mitk.gui.qt.moviemaker:OFF org.mitk.gui.qt.deformableregistration:OFF org.mitk.gui.qt.rigidregistration:OFF org.mitk.gui.qt.imagestatistics:OFF org.mitk.gui.qt.volumetry:OFF org.mitk.gui.qt.materialeditor:OFF org.mitk.gui.qt.simpleexample:OFF org.mitk.gui.qt.ugvisualization:OFF org.mitk.gui.qt.measurement:OFF org.mitk.gui.qt.simplemeasurement:OFF org.mitk.gui.qt.imagecropper:OFF - org.mitk.gui.qt.pointbasedregistration:ON + org.mitk.gui.qt.pointbasedregistration:OFF + org.mitk.gui.qt.viewinitialization:OFF ) diff --git a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/CMakeLists.txt b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/CMakeLists.txt index fba82a3726..e4dca6478a 100644 --- a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/CMakeLists.txt +++ b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/CMakeLists.txt @@ -1,2 +1,7 @@ +PROJECT(org_mitk_gui_qt_viewinitialization) -MACRO_CREATE_MITK_PLUGIN(QmitkExt) +MACRO_CREATE_MITK_CTK_PLUGIN( + EXPORT_DIRECTIVE VIEWINITIALIZATION_EXPORT + EXPORTED_INCLUDE_SUFFIXES src + MODULE_DEPENDENCIES QmitkExt +) diff --git a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/META-INF/MANIFEST.MF b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/META-INF/MANIFEST.MF deleted file mode 100644 index 916c5f333c..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/META-INF/MANIFEST.MF +++ /dev/null @@ -1,7 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Name: View Initialization -Bundle-SymbolicName: org.mitk.gui.qt.viewinitialization -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.viewinitialization/files.cmake b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/files.cmake index 5e67afae29..00dfc15ee1 100644 --- a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/files.cmake +++ b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/files.cmake @@ -1,35 +1,37 @@ SET(SRC_CPP_FILES ) SET(INTERNAL_CPP_FILES + mitkPluginActivator.cpp QmitkViewInitializationView.cpp - ) SET(UI_FILES src/internal/QmitkViewInitializationViewControls.ui ) SET(MOC_H_FILES + src/internal/mitkPluginActivator.h src/internal/QmitkViewInitializationView.h ) -SET(RESOURCE_FILES +SET(CACHED_RESOURCE_FILES + plugin.xml resources/viewInitializationIcon.xpm ) -SET(RES_FILES - resources/QmitkViewInitializationView.qrc +SET(QRC_FILES + ) -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.viewinitialization/manifest.cpp b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/manifest.cpp deleted file mode 100644 index 45bd182e0d..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/manifest.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/*========================================================================= - -Program: Medical Imaging & Interaction Toolkit -Language: C++ -Date: $Date: 2009-05-28 17:19:30 +0200 (Do, 28 Mai 2009) $ -Version: $Revision: 17495 $ - -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 -#include "src/internal/QmitkViewInitializationView.h" - - -POCO_BEGIN_NAMED_MANIFEST(berryIViewPart, berry::IViewPart) - POCO_EXPORT_CLASS(::QmitkViewInitializationView) -POCO_END_MANIFEST diff --git a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/manifest_headers.cmake b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/manifest_headers.cmake new file mode 100644 index 0000000000..d92f2e88bc --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/manifest_headers.cmake @@ -0,0 +1,5 @@ +set(Plugin-Name "View Initialization") +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) diff --git a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/plugin.xml b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/plugin.xml index 67f7dfb23e..dc0d401d10 100644 --- a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/plugin.xml +++ b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/plugin.xml @@ -1,12 +1,12 @@ diff --git a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/resources/QmitkViewInitializationView.qrc b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/resources/QmitkViewInitializationView.qrc deleted file mode 100644 index 0e83e38af6..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/resources/QmitkViewInitializationView.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - viewInitializationIcon.xpm - - diff --git a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/src/ViewinitializationDll.h b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/src/ViewinitializationDll.h deleted file mode 100644 index 425757ef30..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/src/ViewinitializationDll.h +++ /dev/null @@ -1,43 +0,0 @@ -/*========================================================================= - -Program: Medical Imaging & Interaction Toolkit -Language: C++ -Date: $Date: 2009-05-28 17:19:30 +0200 (Do, 28 Mai 2009) $ -Version: $Revision: 17495 $ - -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 _VIEWINITIALIZATION_EXPORT_DLL_H_ -#define _VIEWINITIALIZATION_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_viewinitialization_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_viewinitialization_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_viewinitialization_EXPORTS) - #define VIEWINITIALIZATION_EXPORT __declspec(dllexport) - #else - #define VIEWINITIALIZATION_EXPORT __declspec(dllimport) - #endif -#endif - - -#if !defined(VIEWINITIALIZATION_EXPORT) - #define VIEWINITIALIZATION_EXPORT -#endif - -#endif /*_VIEWINITIALIZATION_EXPORT_DLL_H_*/ diff --git a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/src/internal/mitkPluginActivator.cpp b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/src/internal/mitkPluginActivator.cpp new file mode 100644 index 0000000000..da7081f965 --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/src/internal/mitkPluginActivator.cpp @@ -0,0 +1,21 @@ +#include "mitkPluginActivator.h" + +#include + +#include "QmitkViewInitializationView.h" + +namespace mitk { + +void PluginActivator::start(ctkPluginContext* context) +{ + BERRY_REGISTER_EXTENSION_CLASS(QmitkViewInitializationView, context) +} + +void PluginActivator::stop(ctkPluginContext* context) +{ + Q_UNUSED(context) +} + +} + +Q_EXPORT_PLUGIN2(org_mitk_gui_qt_viewinitialization, mitk::PluginActivator) diff --git a/Modules/Bundles/org.mitk.gui.qt.viewinitialization/src/internal/mitkPluginActivator.h b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/src/internal/mitkPluginActivator.h new file mode 100644 index 0000000000..a34be34be4 --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.viewinitialization/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