diff --git a/Modules/Bundles/CMakeLists.txt b/Modules/Bundles/CMakeLists.txt index af31859ec0..66511e5994 100644 --- a/Modules/Bundles/CMakeLists.txt +++ b/Modules/Bundles/CMakeLists.txt @@ -1,66 +1,67 @@ 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.viewinitialization org.mitk.gui.qt.volumevisualization + org.mitk.gui.qt.pointsetinteraction ) 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 4d76c3e25f..7a23daf758 100644 --- a/Modules/Bundles/PluginList.cmake +++ b/Modules/Bundles/PluginList.cmake @@ -1,37 +1,38 @@ 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:ON 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:OFF org.mitk.gui.qt.viewinitialization:OFF org.mitk.gui.qt.volumevisualization:OFF + org.mitk.gui.qt.pointsetinteraction:OFF ) diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/CMakeLists.txt b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/CMakeLists.txt index d1fae30ab7..bdf0247903 100644 --- a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/CMakeLists.txt +++ b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/CMakeLists.txt @@ -1 +1,9 @@ -MACRO_CREATE_MITK_PLUGIN(QmitkExt) +# The project name must correspond to the directory name of your plug-in +# and must not contain periods. +PROJECT(org_mitk_gui_qt_pointsetinteraction) + +MACRO_CREATE_MITK_CTK_PLUGIN( + EXPORT_DIRECTIVE POINTSETINTERACTION_EXPORT + EXPORTED_INCLUDE_SUFFIXES src + MODULE_DEPENDENCIES QmitkExt +) \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/META-INF/MANIFEST.MF b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/META-INF/MANIFEST.MF deleted file mode 100644 index d16182ada3..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/META-INF/MANIFEST.MF +++ /dev/null @@ -1,7 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Name: Point Set Interaction -Bundle-SymbolicName: org.mitk.gui.qt.pointsetinteraction -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.pointsetinteraction/files.cmake b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/files.cmake index ef116c15b3..2bf6295eee 100644 --- a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/files.cmake +++ b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/files.cmake @@ -1,35 +1,35 @@ SET(SRC_CPP_FILES ) SET(INTERNAL_CPP_FILES QmitkPointSetInteractionView.cpp - + mitkPluginActivator.cpp ) SET(UI_FILES src/internal/QmitkPointSetInteractionViewControls.ui ) SET(MOC_H_FILES + src/internal/mitkPluginActivator.h src/internal/QmitkPointSetInteractionView.h ) -SET(RESOURCE_FILES +SET(CACHED_RESOURCE_FILES resources/pointset_interaction.png + plugin.xml ) -SET(RES_FILES +SET(QRC_FILES resources/QmitkPointSetInteractionView.qrc ) -SET(CPP_FILES manifest.cpp) - 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.pointsetinteraction/manifest.cpp b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/manifest.cpp deleted file mode 100644 index ba8960b454..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/manifest.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/*========================================================================= - -Program: Medical Imaging & Interaction Toolkit -Language: C++ -Date: $Date: 2009-05-05 11:31:02 +0200 (Di, 05 Mai 2009) $ -Version: $Revision: 16719 $ - -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/QmitkPointSetInteractionView.h" - - -POCO_BEGIN_NAMED_MANIFEST(berryIViewPart, berry::IViewPart) - POCO_EXPORT_CLASS(::QmitkPointSetInteractionView) -POCO_END_MANIFEST diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/manifest_headers.cmake b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/manifest_headers.cmake new file mode 100644 index 0000000000..12c8ebbc7c --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/manifest_headers.cmake @@ -0,0 +1,5 @@ +set(Plugin-Name "MITK Pointset Interaction") +set(Plugin-Version "0.9") +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.pointsetinteraction/plugin.xml b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/plugin.xml index 1daa5952b0..abd1ee41bd 100644 --- a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/plugin.xml +++ b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/plugin.xml @@ -1,11 +1,12 @@ + diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/PointSetInteractionDll.h b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/PointSetInteractionDll.h deleted file mode 100644 index d2a8a08fa7..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/PointSetInteractionDll.h +++ /dev/null @@ -1,43 +0,0 @@ -/*========================================================================= - -Program: Medical Imaging & Interaction Toolkit -Language: C++ -Date: $Date: 2009-05-28 20:08:26 +0200 (Do, 28 Mai 2009) $ -Version: $Revision: 16719 $ - -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 _POINTSETINTERACTION_EXPORT_DLL_H_ -#define _POINTSETINTERACTION_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_pointsetinteraction_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_pointsetinteraction_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_pointsetinteraction_EXPORTS) - #define POINTSETINTERACTION_EXPORT __declspec(dllexport) - #else - #define POINTSETINTERACTION_EXPORT __declspec(dllimport) - #endif -#endif - - -#if !defined(POINTSETINTERACTION_EXPORT) - #define POINTSETINTERACTION_EXPORT -#endif - -#endif /*_POINTSETINTERACTION_EXPORT_DLL_H_*/ diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.h b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.h index e45f9f989d..f7dd04f989 100755 --- a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.h +++ b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.h @@ -1,57 +1,65 @@ /*========================================================================= 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. =========================================================================*/ #if !defined(QmitkPointSetInteraction_H__INCLUDED) #define QmitkPointSetInteraction_H__INCLUDED #include #include #include #include #include namespace Ui { class QmitkPointSetInteractionControls; }; /*! \brief QmitkPointSetInteractionView */ class QmitkPointSetInteractionView : public QmitkFunctionality { Q_OBJECT public: QmitkPointSetInteractionView(QObject *parent=0); + QmitkPointSetInteractionView(const QmitkPointSetInteractionView& other) + { + Q_UNUSED(other) + throw std::runtime_error("Copy constructor not implemented"); + } + virtual ~QmitkPointSetInteractionView(); + + virtual void CreateQtPartControl(QWidget *parent); void OnSelectionChanged(std::vector nodes); void Activated(); void Deactivated(); void NodeChanged(const mitk::DataNode* node); bool IsExclusiveFunctionality() const; virtual void StdMultiWidgetAvailable(QmitkStdMultiWidget& stdMultiWidget); virtual void StdMultiWidgetClosed(QmitkStdMultiWidget& stdMultiWidget); protected slots: void OnAddPointSetClicked(); protected: Ui::QmitkPointSetInteractionControls * m_Controls; mitk::WeakPointer m_SelectedPointSetNode; mitk::WeakPointer m_SelectedPointSetInteractor; }; #endif // !defined(QmitkPointSetInteraction_H__INCLUDED) diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/mitkPluginActivator.cpp b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/mitkPluginActivator.cpp new file mode 100644 index 0000000000..a1701869e5 --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/mitkPluginActivator.cpp @@ -0,0 +1,21 @@ +#include "mitkPluginActivator.h" + +#include "QmitkPointSetInteractionView.h" + +#include + +namespace mitk { + + void PluginActivator::start(ctkPluginContext* context) + { + BERRY_REGISTER_EXTENSION_CLASS(QmitkPointSetInteractionView, context) + } + + void PluginActivator::stop(ctkPluginContext* context) + { + Q_UNUSED(context) + } + +} + +Q_EXPORT_PLUGIN2(org_mitk_gui_qt_pointsetinteraction, mitk::PluginActivator) \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/mitkPluginActivator.h b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/mitkPluginActivator.h new file mode 100644 index 0000000000..0f2c61ef1b --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/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