diff --git a/Plugins/PluginList.cmake b/Plugins/PluginList.cmake
index eeed58f1f1..e65de37a76 100644
--- a/Plugins/PluginList.cmake
+++ b/Plugins/PluginList.cmake
@@ -1,100 +1,101 @@
# Plug-ins must be ordered according to their dependencies
set(MITK_PLUGINS
org.blueberry.core.runtime:ON
org.blueberry.core.expressions:OFF
org.blueberry.core.commands:OFF
org.blueberry.core.jobs:OFF
org.blueberry.ui.qt:OFF
org.blueberry.ui.qt.help:ON
org.blueberry.ui.qt.log:ON
org.blueberry.ui.qt.objectinspector:OFF
#org.blueberry.test:ON
#org.blueberry.uitest:ON
#Testing/org.blueberry.core.runtime.tests:ON
#Testing/org.blueberry.osgi.tests:ON
org.mitk.core.services:ON
org.mitk.gui.common:ON
org.mitk.planarfigure:ON
org.mitk.core.ext:OFF
org.mitk.core.jobs:OFF
org.mitk.gui.qt.application:ON
org.mitk.gui.qt.coreapplication:OFF
org.mitk.gui.qt.ext:OFF
org.mitk.gui.qt.extapplication:OFF
org.mitk.gui.qt.common:ON
org.mitk.gui.qt.stdmultiwidgeteditor:ON
org.mitk.gui.qt.common.legacy:OFF
org.mitk.gui.qt.cmdlinemodules:OFF
org.mitk.gui.qt.diffusionimagingapp:OFF
org.mitk.gui.qt.datamanager:ON
org.mitk.gui.qt.datamanagerlight:OFF
+ org.mitk.gui.qt.datastorageviewertest:OFF
org.mitk.gui.qt.properties:ON
org.mitk.gui.qt.basicimageprocessing:OFF
org.mitk.gui.qt.dicom:OFF
org.mitk.gui.qt.dicominspector:OFF
org.mitk.gui.qt.diffusionimaging:OFF
org.mitk.gui.qt.diffusionimaging.connectomics:OFF
org.mitk.gui.qt.diffusionimaging.denoising:OFF
org.mitk.gui.qt.diffusionimaging.fiberfox:OFF
org.mitk.gui.qt.diffusionimaging.fiberprocessing:OFF
org.mitk.gui.qt.diffusionimaging.ivim:OFF
org.mitk.gui.qt.diffusionimaging.odfpeaks:OFF
org.mitk.gui.qt.diffusionimaging.partialvolume:OFF
org.mitk.gui.qt.diffusionimaging.preprocessing:OFF
org.mitk.gui.qt.diffusionimaging.reconstruction:OFF
org.mitk.gui.qt.diffusionimaging.registration:OFF
org.mitk.gui.qt.diffusionimaging.tbss:OFF
org.mitk.gui.qt.diffusionimaging.tractography:OFF
org.mitk.gui.qt.dosevisualization:OFF
org.mitk.gui.qt.geometrytools:OFF
org.mitk.gui.qt.igtexamples:OFF
org.mitk.gui.qt.igttracking:OFF
org.mitk.gui.qt.lasercontrol:OFF
org.mitk.gui.qt.openigtlink:OFF
org.mitk.gui.qt.imagecropper:OFF
org.mitk.gui.qt.imagenavigator:ON
org.mitk.gui.qt.viewnavigator:OFF
org.mitk.gui.qt.materialeditor:OFF
org.mitk.gui.qt.measurementtoolbox:OFF
org.mitk.gui.qt.moviemaker:OFF
org.mitk.gui.qt.pointsetinteraction:OFF
org.mitk.gui.qt.pointsetinteractionmultispectrum:OFF
org.mitk.gui.qt.python:OFF
org.mitk.gui.qt.remeshing:OFF
org.mitk.gui.qt.segmentation:OFF
org.mitk.gui.qt.aicpregistration:OFF
org.mitk.gui.qt.renderwindowmanager:OFF
org.mitk.gui.qt.toftutorial:OFF
org.mitk.gui.qt.tofutil:OFF
org.mitk.gui.qt.tubegraph:OFF
org.mitk.gui.qt.ugvisualization:OFF
org.mitk.gui.qt.photoacoustics.pausviewer:OFF
org.mitk.gui.qt.photoacoustics.imageprocessing:OFF
org.mitk.gui.qt.photoacoustics.simulation:OFF
org.mitk.gui.qt.ultrasound:OFF
org.mitk.gui.qt.volumevisualization:OFF
org.mitk.gui.qt.eventrecorder:OFF
org.mitk.gui.qt.xnat:OFF
org.mitk.gui.qt.igt.app.echotrack:OFF
org.mitk.gui.qt.spectrocamrecorder:OFF
org.mitk.gui.qt.classificationsegmentation:OFF
org.mitk.gui.qt.overlaymanager:OFF
org.mitk.gui.qt.igt.app.hummelprotocolmeasurements:OFF
org.mitk.gui.qt.multilabelsegmentation:OFF
org.mitk.matchpoint.core.helper:OFF
org.mitk.gui.qt.matchpoint.algorithm.browser:OFF
org.mitk.gui.qt.matchpoint.algorithm.control:OFF
org.mitk.gui.qt.matchpoint.algorithm.batch:OFF
org.mitk.gui.qt.matchpoint.mapper:OFF
org.mitk.gui.qt.matchpoint.framereg:OFF
org.mitk.gui.qt.matchpoint.visualizer:OFF
org.mitk.gui.qt.matchpoint.evaluator:OFF
org.mitk.gui.qt.matchpoint.manipulator:OFF
org.mitk.gui.qt.cest:OFF
)
diff --git a/Plugins/org.mitk.gui.qt.datastorageviewertest/CMakeLists.txt b/Plugins/org.mitk.gui.qt.datastorageviewertest/CMakeLists.txt
new file mode 100644
index 0000000000..add23310bd
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.datastorageviewertest/CMakeLists.txt
@@ -0,0 +1,7 @@
+project(org_mitk_gui_qt_datastorageviewertest)
+
+mitk_create_plugin(
+ EXPORT_DIRECTIVE DATASTORAGEVIEWERTEST_EXPORT
+ EXPORTED_INCLUDE_SUFFIXES src
+ MODULE_DEPENDS MitkQtWidgets
+)
diff --git a/Plugins/org.mitk.gui.qt.datastorageviewertest/files.cmake b/Plugins/org.mitk.gui.qt.datastorageviewertest/files.cmake
new file mode 100644
index 0000000000..e66ab72940
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.datastorageviewertest/files.cmake
@@ -0,0 +1,32 @@
+set(SRC_CPP_FILES
+)
+
+set(INTERNAL_CPP_FILES
+ mitkPluginActivator.cpp
+ QmitkDataStorageViewerTestView.cpp
+)
+
+set(UI_FILES
+ src/internal/QmitkDataStorageViewerTestControls.ui
+)
+
+set(MOC_H_FILES
+ src/internal/mitkPluginActivator.h
+ src/internal/QmitkDataStorageViewerTestView.h
+)
+
+set(CACHED_RESOURCE_FILES
+ resources/DataStorageViewer_48.png
+ plugin.xml
+)
+
+set(QRC_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/Plugins/org.mitk.gui.qt.datastorageviewertest/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.datastorageviewertest/manifest_headers.cmake
new file mode 100644
index 0000000000..3189816295
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.datastorageviewertest/manifest_headers.cmake
@@ -0,0 +1,5 @@
+set(Plugin-Name "MITK Data storage viewer test")
+set(Plugin-Version "0.1")
+set(Plugin-Vendor "DKFZ")
+set(Plugin-ContactAddress "http://www.mitk.org")
+set(Require-Plugin org.mitk.gui.qt.common)
diff --git a/Plugins/org.mitk.gui.qt.datastorageviewertest/plugin.xml b/Plugins/org.mitk.gui.qt.datastorageviewertest/plugin.xml
new file mode 100644
index 0000000000..9b1f6fd52c
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.datastorageviewertest/plugin.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
diff --git a/Plugins/org.mitk.gui.qt.datastorageviewertest/resources/DataStorageViewer_48.png b/Plugins/org.mitk.gui.qt.datastorageviewertest/resources/DataStorageViewer_48.png
new file mode 100644
index 0000000000..d297828a0d
Binary files /dev/null and b/Plugins/org.mitk.gui.qt.datastorageviewertest/resources/DataStorageViewer_48.png differ
diff --git a/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/QmitkDataStorageViewerTestControls.ui b/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/QmitkDataStorageViewerTestControls.ui
new file mode 100644
index 0000000000..dc0ada0f0e
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/QmitkDataStorageViewerTestControls.ui
@@ -0,0 +1,57 @@
+
+
+ QmitkDataStorageViewerTestControls
+
+
+
+ 0
+ 0
+ 386
+ 572
+
+
+
+
+ 0
+ 0
+
+
+
+ Data storage viewer test
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ Set as selection provider
+
+
+
+ -
+
+
+ Set as selection provider
+
+
+
+
+
+
+
+ QmitkDataStorageDefaultView
+ QWidget
+ QmitkDataStorageDefaultView.h
+
+
+
+ QmitkDataStorageDefaultView.h
+
+
+
+
diff --git a/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/QmitkDataStorageViewerTestView.cpp b/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/QmitkDataStorageViewerTestView.cpp
new file mode 100644
index 0000000000..73ec7a4eba
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/QmitkDataStorageViewerTestView.cpp
@@ -0,0 +1,72 @@
+/*===================================================================
+
+The Medical Imaging Interaction Toolkit (MITK)
+
+Copyright (c) German Cancer Research Center,
+Division of Medical Image Computing.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+// data storage viewer test plugin
+#include "QmitkDataStorageViewerTestView.h"
+
+// berry
+#include
+
+// qt
+#include
+
+const std::string QmitkDataStorageViewerTestView::VIEW_ID = "org.mitk.views.datastorageviewertest";
+
+void QmitkDataStorageViewerTestView::SetFocus()
+{
+ // nothing here
+}
+
+void QmitkDataStorageViewerTestView::CreateQtPartControl(QWidget* parent)
+{
+ // create GUI widgets
+ m_Controls.setupUi(parent);
+
+ m_Controls.dataStorageDefaultView->SetDataStorage(GetDataStorage());
+ m_DataStorageSelectionConnector = std::make_unique(m_Controls.dataStorageDefaultView);
+ m_DataStorageSelectionConnector->AddPostSelectionListener(GetSite()->GetWorkbenchWindow()->GetSelectionService());
+
+ m_Controls.dataStorageDefaultView2->SetDataStorage(GetDataStorage());
+ m_DataStorageSelectionConnector2 = std::make_unique(m_Controls.dataStorageDefaultView2);
+ m_DataStorageSelectionConnector2->AddPostSelectionListener(GetSite()->GetWorkbenchWindow()->GetSelectionService());
+
+ connect(m_Controls.selectionProviderCheckBox, SIGNAL(toggled(bool)), this, SLOT(SetAsSelectionProvider1(bool)));
+ connect(m_Controls.selectionProviderCheckBox2, SIGNAL(toggled(bool)), this, SLOT(SetAsSelectionProvider2(bool)));
+}
+
+void QmitkDataStorageViewerTestView::SetAsSelectionProvider1(bool checked)
+{
+ if (checked)
+ {
+ m_DataStorageSelectionConnector->SetAsSelectionProvider(GetSite()->GetSelectionProvider().Cast().GetPointer());
+ }
+ else
+ {
+ m_DataStorageSelectionConnector->RemoveAsSelectionProvider();
+ }
+}
+
+void QmitkDataStorageViewerTestView::SetAsSelectionProvider2(bool checked)
+{
+ if (checked)
+ {
+ m_DataStorageSelectionConnector2->SetAsSelectionProvider(GetSite()->GetSelectionProvider().Cast().GetPointer());
+ }
+ else
+ {
+ m_DataStorageSelectionConnector2->RemoveAsSelectionProvider();
+ }
+}
diff --git a/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/QmitkDataStorageViewerTestView.h b/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/QmitkDataStorageViewerTestView.h
new file mode 100644
index 0000000000..d2bd0bb84b
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/QmitkDataStorageViewerTestView.h
@@ -0,0 +1,61 @@
+/*===================================================================
+
+The Medical Imaging Interaction Toolkit (MITK)
+
+Copyright (c) German Cancer Research Center,
+Division of Medical Image Computing.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef QMITKDATASTORAGEVIEWERTESTVIEW_H
+#define QMITKDATASTORAGEVIEWERTESTVIEW_H
+
+// mitk gui qt common plugin
+#include
+#include "QmitkDataStorageSelectionConnector.h"
+
+// data storage viewer test plugin
+
+#include "ui_QmitkDataStorageViewerTestControls.h"
+
+// qt widgets module
+#include "QmitkDataStorageDefaultView.h"
+
+/**
+* @brief DataStorageViewerTestView
+*/
+class QmitkDataStorageViewerTestView : public QmitkAbstractView
+{
+ Q_OBJECT
+
+public:
+
+ static const std::string VIEW_ID;
+
+protected:
+
+ virtual void SetFocus() override;
+
+ virtual void CreateQtPartControl(QWidget* parent) override;
+
+private Q_SLOTS:
+
+ void SetAsSelectionProvider1(bool checked);
+ void SetAsSelectionProvider2(bool checked);
+
+private:
+
+ Ui::QmitkDataStorageViewerTestControls m_Controls;
+
+ std::unique_ptr m_DataStorageSelectionConnector;
+ std::unique_ptr m_DataStorageSelectionConnector2;
+};
+
+#endif // QMITKDATASTORAGEVIEWERTESTVIEW_H
diff --git a/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/mitkPluginActivator.cpp
new file mode 100644
index 0000000000..deb5df0dc0
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/mitkPluginActivator.cpp
@@ -0,0 +1,28 @@
+/*===================================================================
+
+The Medical Imaging Interaction Toolkit (MITK)
+
+Copyright (c) German Cancer Research Center,
+Division of Medical Image Computing.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#include "mitkPluginActivator.h"
+#include "QmitkDataStorageViewerTestView.h"
+
+namespace mitk
+{
+ void DataStorageViewerTestActivator::start(ctkPluginContext *context)
+ {
+ BERRY_REGISTER_EXTENSION_CLASS(QmitkDataStorageViewerTestView, context)
+ }
+
+ void DataStorageViewerTestActivator::stop(ctkPluginContext *context) { Q_UNUSED(context) }
+}
diff --git a/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/mitkPluginActivator.h
new file mode 100644
index 0000000000..080450ba33
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.datastorageviewertest/src/internal/mitkPluginActivator.h
@@ -0,0 +1,37 @@
+/*===================================================================
+
+The Medical Imaging Interaction Toolkit (MITK)
+
+Copyright (c) German Cancer Research Center,
+Division of Medical Image Computing.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+#ifndef MITKPLUGINACTIVATOR_H
+#define MITKPLUGINACTIVATOR_H
+
+#include
+
+namespace mitk
+{
+ class DataStorageViewerTestActivator : public QObject, public ctkPluginActivator
+ {
+ Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org_mitk_gui_qt_datastorageviewertest")
+ Q_INTERFACES(ctkPluginActivator)
+
+ public:
+ void start(ctkPluginContext* context) override;
+ void stop(ctkPluginContext* context) override;
+
+ };
+}
+
+#endif // MITKPLUGINACTIVATOR_H