diff --git a/Modules/Bundles/CMakeLists.txt b/Modules/Bundles/CMakeLists.txt index 901d64463c..63153010db 100644 --- a/Modules/Bundles/CMakeLists.txt +++ b/Modules/Bundles/CMakeLists.txt @@ -1,61 +1,62 @@ 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.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 ) 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 74a441d50a..f7d26759c2 100644 --- a/Modules/Bundles/PluginList.cmake +++ b/Modules/Bundles/PluginList.cmake @@ -1,32 +1,33 @@ 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.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 ) diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/CMakeLists.txt b/Modules/Bundles/org.mitk.gui.qt.imagecropper/CMakeLists.txt index d1fae30ab7..3116697747 100644 --- a/Modules/Bundles/org.mitk.gui.qt.imagecropper/CMakeLists.txt +++ b/Modules/Bundles/org.mitk.gui.qt.imagecropper/CMakeLists.txt @@ -1 +1,12 @@ -MACRO_CREATE_MITK_PLUGIN(QmitkExt) +PROJECT(org_mitk_gui_qt_imagecropper) + +MACRO_CREATE_MITK_CTK_PLUGIN( + EXPORT_DIRECTIVE MITK_QT_IMAGECROPPER + EXPORTED_INCLUDE_SUFFIXES src + MODULE_DEPENDENCIES QmitkExt +) + + + + +#MACRO_CREATE_MITK_PLUGIN(QmitkExt) diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/META-INF/MANIFEST.MF b/Modules/Bundles/org.mitk.gui.qt.imagecropper/META-INF/MANIFEST.MF deleted file mode 100644 index 6948e2f65e..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.imagecropper/META-INF/MANIFEST.MF +++ /dev/null @@ -1,6 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Name: The Image Cropper Module -Bundle-SymbolicName: org.mitk.gui.qt.imagecropper -Bundle-Version: 1.0.0 -Bundle-Vendor: DKFZ, Medical and Biological Informatics -Require-Bundle: org.mitk.gui.qt.common \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/files.cmake b/Modules/Bundles/org.mitk.gui.qt.imagecropper/files.cmake index cdba01226e..8435af7118 100644 --- a/Modules/Bundles/org.mitk.gui.qt.imagecropper/files.cmake +++ b/Modules/Bundles/org.mitk.gui.qt.imagecropper/files.cmake @@ -1,34 +1,37 @@ SET(SRC_CPP_FILES ) SET(INTERNAL_CPP_FILES + mitkImageCropperPluginActivator.cpp QmitkImageCropper.cpp mitkImageCropperEventInterface.cpp ) SET(UI_FILES src/internal/QmitkImageCropperControls.ui ) SET(MOC_H_FILES + src/internal/mitkImageCropperPluginActivator.h src/internal/QmitkImageCropper.h ) -SET(RESOURCE_FILES +SET(CACHED_RESOURCE_FILES resources/icon.xpm + plugin.xml ) -SET(RES_FILES +SET(QRC_FILES resources/imagecropper.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.imagecropper/manifest.cpp b/Modules/Bundles/org.mitk.gui.qt.imagecropper/manifest.cpp deleted file mode 100644 index e89c48b593..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.imagecropper/manifest.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/*========================================================================= - -Program: Medical Imaging & Interaction Toolkit -Language: C++ -Date: $Date$ -Version: $Revision: 18127 $ - -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/QmitkImageCropper.h" - -POCO_BEGIN_NAMED_MANIFEST(berryIViewPart, berry::IViewPart) - POCO_EXPORT_CLASS(QmitkImageCropper) -POCO_END_MANIFEST diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/manifest_headers.cmake b/Modules/Bundles/org.mitk.gui.qt.imagecropper/manifest_headers.cmake new file mode 100644 index 0000000000..d84781834d --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.imagecropper/manifest_headers.cmake @@ -0,0 +1,5 @@ +set(Plugin-Name "The Image Cropper Module") +set(Plugin-Version "1.0.0") +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.imagecropper/plugin.xml b/Modules/Bundles/org.mitk.gui.qt.imagecropper/plugin.xml index 7db6fcd6a5..38c0158df5 100644 --- a/Modules/Bundles/org.mitk.gui.qt.imagecropper/plugin.xml +++ b/Modules/Bundles/org.mitk.gui.qt.imagecropper/plugin.xml @@ -1,17 +1,18 @@ + diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/QmitkImageCropperDll.h b/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/QmitkImageCropperDll.h deleted file mode 100644 index 1ae6e3ee67..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/QmitkImageCropperDll.h +++ /dev/null @@ -1,41 +0,0 @@ -/*========================================================================= - -Program: Medical Imaging & Interaction Toolkit -Language: C++ -Date: $Date$ -Version: $Revision: 18127 $ - -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 QMITKIMAGECROPPERDLL_H_ -#define QMITKIMAGECROPPERDLL_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_application_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 -// MITK_QT_APP functions as being imported from a DLL, wheras this DLL sees symbols -// defined with this macro as being exported. -// -#if defined(_WIN32) && !defined(BERRY_STATIC) - #if defined(org_mitk_gui_qt_imagecropper_EXPORTS) - #define MITK_QT_IMAGECROPPER __declspec(dllexport) - #else - #define MITK_QT_IMAGECROPPER __declspec(dllimport) - #endif -#endif - -#if !defined(MITK_QT_IMAGECROPPER) - #define MITK_QT_IMAGECROPPER -#endif - -#endif /*QMITKIMAGECROPPERDLL_H_*/ diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.cpp b/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.cpp new file mode 100644 index 0000000000..b880d903f1 --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.cpp @@ -0,0 +1,20 @@ +#include "mitkImageCropperPluginActivator.h" +#include "QmitkImageCropper.h" + +#include + +namespace mitk { + +void ImageCropperPluginActivator::start(ctkPluginContext* context) +{ + BERRY_REGISTER_EXTENSION_CLASS( QmitkImageCropper, context ) +} + +void ImageCropperPluginActivator::stop(ctkPluginContext* context) +{ + Q_UNUSED(context) +} + +} + +Q_EXPORT_PLUGIN2(org_mitk_gui_qt_imagecropper, mitk::ImageCropperPluginActivator) \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.h b/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.h new file mode 100644 index 0000000000..d1b1bc334f --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.h @@ -0,0 +1,23 @@ +#ifndef MITKPLUGINACTIVATOR_H +#define MITKPLUGINACTIVATOR_H + +#include + +namespace mitk { + +class ImageCropperPluginActivator : + 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