diff --git a/Modules/Bundles/CMakeLists.txt b/Modules/Bundles/CMakeLists.txt index af31859ec0..bca0f79b7d 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.videoplayer ) 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..f93b6e6782 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.videoplayer:OFF ) diff --git a/Modules/Bundles/org.mitk.gui.qt.videoplayer/CMakeLists.txt b/Modules/Bundles/org.mitk.gui.qt.videoplayer/CMakeLists.txt index 38b6a7f9a4..fbd4e708d2 100755 --- a/Modules/Bundles/org.mitk.gui.qt.videoplayer/CMakeLists.txt +++ b/Modules/Bundles/org.mitk.gui.qt.videoplayer/CMakeLists.txt @@ -1,3 +1,9 @@ -IF(MITK_USE_OpenCV) -MACRO_CREATE_MITK_PLUGIN(mitkOpenCVVideoSupportUI) -ENDIF(MITK_USE_OpenCV) +# The project name must correspond to the directory name of your plug-in +# and must not contain periods. +PROJECT(org_mitk_gui_qt_videoplayer) + +MACRO_CREATE_MITK_CTK_PLUGIN( + EXPORT_DIRECTIVE VIDEOPLAYER_EXPORTS + EXPORTED_INCLUDE_SUFFIXES src + MODULE_DEPENDENCIES mitkOpenCVVideoSupportUI +) \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.videoplayer/META-INF/MANIFEST.MF b/Modules/Bundles/org.mitk.gui.qt.videoplayer/META-INF/MANIFEST.MF deleted file mode 100755 index 926ae0c9a2..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.videoplayer/META-INF/MANIFEST.MF +++ /dev/null @@ -1,6 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Name: Video Player -Bundle-SymbolicName: org.mitk.gui.qt.videoplayer -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.videoplayer/files.cmake b/Modules/Bundles/org.mitk.gui.qt.videoplayer/files.cmake index 06ec953cd9..90b9d51e33 100755 --- a/Modules/Bundles/org.mitk.gui.qt.videoplayer/files.cmake +++ b/Modules/Bundles/org.mitk.gui.qt.videoplayer/files.cmake @@ -1,28 +1,29 @@ SET(SRC_CPP_FILES ) SET(INTERNAL_CPP_FILES QmitkVideoPlayer.cpp + mitkPluginActivator.cpp ) SET(MOC_H_FILES + src/internal/mitkPluginActivator.h + src/internal/QmitkVideoPlayer.h ) -SET(RESOURCE_FILES +SET(CACHED_RESOURCE_FILES resources/videoplayer.gif + plugin.xml ) -SET(RES_FILES +SET(QRC_FILES ) - -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.videoplayer/manifest.cpp b/Modules/Bundles/org.mitk.gui.qt.videoplayer/manifest.cpp deleted file mode 100755 index bee0e8e4e2..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.videoplayer/manifest.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/*========================================================================= - -Program: Medical Imaging & Interaction Toolkit -Language: C++ -Date: $Date: 2009-02-17 20:07:18 +0100 (Tue, 17 Feb 2009) $ -Version: $Revision: 14645 $ - -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/QmitkVideoPlayer.h" - - -POCO_BEGIN_NAMED_MANIFEST(berryIViewPart, berry::IViewPart) - POCO_EXPORT_CLASS(QmitkVideoPlayer) -POCO_END_MANIFEST diff --git a/Modules/Bundles/org.mitk.gui.qt.videoplayer/manifest_headers.cmake b/Modules/Bundles/org.mitk.gui.qt.videoplayer/manifest_headers.cmake new file mode 100644 index 0000000000..87961e64a4 --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.videoplayer/manifest_headers.cmake @@ -0,0 +1,5 @@ +set(Plugin-Name "MITK Video Player") +set(Plugin-Version "1.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.videoplayer/src/VideoPlayerDll.h b/Modules/Bundles/org.mitk.gui.qt.videoplayer/src/VideoPlayerDll.h deleted file mode 100755 index d5260342b7..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.videoplayer/src/VideoPlayerDll.h +++ /dev/null @@ -1,42 +0,0 @@ -/*========================================================================= - -Program: Medical Imaging & Interaction Toolkit -Language: C++ -Date: $Date: 2009-02-10 14:14:32 +0100 (Tue, 10 Feb 2009) $ -Version: $Revision: 14620 $ - -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 _VIDEOPLAYER_EXPORTS_DLL_H_ -#define _VIDEOPLAYER_EXPORTS_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_simpleexample_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_simpleexample_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_simpleexample_EXPORTS) - #define VIDEOPLAYER_EXPORTS __declspec(dllexport) - #else - #define VIDEOPLAYER_EXPORTS __declspec(dllimport) - #endif -#endif - - -#if !defined(VIDEOPLAYER_EXPORTS) - #define VIDEOPLAYER_EXPORTS -#endif - -#endif /*_VIDEOPLAYER_EXPORTS_DLL_H_*/ diff --git a/Modules/Bundles/org.mitk.gui.qt.videoplayer/src/internal/QmitkVideoPlayer.h b/Modules/Bundles/org.mitk.gui.qt.videoplayer/src/internal/QmitkVideoPlayer.h index d1195fa68d..3cc38deb63 100755 --- a/Modules/Bundles/org.mitk.gui.qt.videoplayer/src/internal/QmitkVideoPlayer.h +++ b/Modules/Bundles/org.mitk.gui.qt.videoplayer/src/internal/QmitkVideoPlayer.h @@ -1,45 +1,53 @@ /*========================================================================= Program: Medical Imaging & Interaction Toolkit Language: C++ Date: $Date: 2009-03-21 14:46:24 +0100 (Sat, 21 Mar 2009) $ Version: $Revision: 15412 $ 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(QmitkVideoPlayer_h) #define QmitkVideoPlayer_h #include #include class QmitkVideoBackground; class QmitkOpenCVVideoControls; /*! \brief Allows to play videos with OpenCV */ class QmitkVideoPlayer: public QmitkFunctionality { + Q_OBJECT + public: QmitkVideoPlayer(); + QmitkVideoPlayer(const QmitkVideoPlayer& other) + { + Q_UNUSED(other) + throw std::runtime_error("Copy constructor not implemented"); + } + virtual ~QmitkVideoPlayer(); virtual bool IsExclusiveFunctionality() const; virtual void StdMultiWidgetAvailable(QmitkStdMultiWidget& stdMultiWidget); protected: // Pseudo Ctor void CreateQtPartControl(QWidget* parent); protected: mitk::OpenCVVideoSource::Pointer m_VideoSource; QmitkVideoBackground* m_VideoBackground; QmitkOpenCVVideoControls* m_OpenCVVideoControls; }; #endif // !defined(QmitkVideoPlayer_h) diff --git a/Modules/Bundles/org.mitk.gui.qt.videoplayer/src/internal/mitkPluginActivator.cpp b/Modules/Bundles/org.mitk.gui.qt.videoplayer/src/internal/mitkPluginActivator.cpp new file mode 100644 index 0000000000..525a9a55bb --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.videoplayer/src/internal/mitkPluginActivator.cpp @@ -0,0 +1,21 @@ +#include "mitkPluginActivator.h" + +#include "QmitkVideoPlayer.h" + +#include + +namespace mitk { + + void PluginActivator::start(ctkPluginContext* context) + { + BERRY_REGISTER_EXTENSION_CLASS(QmitkVideoPlayer, context) + } + + void PluginActivator::stop(ctkPluginContext* context) + { + Q_UNUSED(context) + } + +} + +Q_EXPORT_PLUGIN2(org_mitk_gui_qt_videoplayer, mitk::PluginActivator) \ No newline at end of file diff --git a/Modules/Bundles/org.mitk.gui.qt.videoplayer/src/internal/mitkPluginActivator.h b/Modules/Bundles/org.mitk.gui.qt.videoplayer/src/internal/mitkPluginActivator.h new file mode 100644 index 0000000000..0f2c61ef1b --- /dev/null +++ b/Modules/Bundles/org.mitk.gui.qt.videoplayer/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