diff --git a/Modules/QtWidgets/resource/Qmitk.qrc b/Modules/QtWidgets/resource/Qmitk.qrc
index 377d75c396..e2c136c4b7 100644
--- a/Modules/QtWidgets/resource/Qmitk.qrc
+++ b/Modules/QtWidgets/resource/Qmitk.qrc
@@ -1,34 +1,35 @@
<RCC>
<qresource prefix="/Qmitk">
<file>Binaerbilder_48.png</file>
<file>Images_48.png</file>
<file>PointSet_48.png</file>
<file>Segmentation_48.png</file>
<file>Surface_48.png</file>
<file>mm_pointer.png</file>
<file>mm_scroll.png</file>
<file>mm_zoom.png</file>
<file>mm_contrast.png</file>
<file>mm_pan.png</file>
<file>LabelSetImage_48.png</file>
<file>mwLayout.png</file>
<file>mwSynchronized.png</file>
<file>mwDesynchronized.png</file>
<file>mwMITK.png</file>
<file>mwPACS.png</file>
<file>star-solid.svg</file>
<file>history-solid.svg</file>
<file>tree_inspector.svg</file>
<file>list-solid.svg</file>
<file>favorite_add.svg</file>
<file>favorite_remove.svg</file>
<file>hourglass-half-solid.svg</file>
<file>times.svg</file>
<file>reset.svg</file>
<file>lock.svg</file>
<file>unlock.svg</file>
<file>invisible.svg</file>
<file>visible.svg</file>
<file>SegmentationTaskListIcon.svg</file>
+ <file>ROIIcon.svg</file>
</qresource>
</RCC>
diff --git a/Modules/QtWidgets/resource/ROIIcon.svg b/Modules/QtWidgets/resource/ROIIcon.svg
new file mode 100644
index 0000000000..dc1421047b
--- /dev/null
+++ b/Modules/QtWidgets/resource/ROIIcon.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="32" version="1.1" viewBox="0 0 8.4667 8.4667" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g fill="none" stroke-linecap="round" stroke-linejoin="round">
+<rect x=".39687" y=".39687" width="7.6729" height="7.6729" rx=".52917" ry=".52917" stroke="#00ff00" stroke-width=".26458"/>
+<rect x="2.249" y="2.7781" width="3.9688" height="2.9104" rx=".52917" ry=".52917" stroke="#ff00ff" stroke-width=".39688"/>
+</g>
+</svg>
diff --git a/Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp b/Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp
index bd279a298a..8e6fbaa887 100644
--- a/Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp
+++ b/Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp
@@ -1,175 +1,179 @@
/*============================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center (DKFZ)
All rights reserved.
Use of this source code is governed by a 3-clause BSD license that can be
found in the LICENSE file.
============================================================================*/
#include "QmitkNodeDescriptorManager.h"
#include <memory>
#include <mitkNodePredicateAnd.h>
#include <mitkNodePredicateDataType.h>
#include <mitkNodePredicateNot.h>
#include <mitkNodePredicateProperty.h>
#include <mitkProperties.h>
#include <QmitkStyleManager.h>
#include <QList>
#include <QSet>
QmitkNodeDescriptorManager* QmitkNodeDescriptorManager::GetInstance()
{
static QmitkNodeDescriptorManager instance;
return &instance;
}
void QmitkNodeDescriptorManager::Initialize()
{
auto isImage = mitk::NodePredicateDataType::New("Image");
AddDescriptor(new QmitkNodeDescriptor(tr("Image"), QString(":/Qmitk/Images_48.png"), isImage, this));
auto isMultiComponentImage = mitk::NodePredicateAnd::New(isImage, mitk::NodePredicateProperty::New("Image.Displayed Component"));
AddDescriptor(new QmitkNodeDescriptor(tr("MultiComponentImage"), QString(": / Qmitk / Images_48.png"), isMultiComponentImage, this));
auto isBinary = mitk::NodePredicateProperty::New("binary", mitk::BoolProperty::New(true));
auto isBinaryImage = mitk::NodePredicateAnd::New(isBinary, isImage);
AddDescriptor(new QmitkNodeDescriptor(tr("ImageMask"), QString(":/Qmitk/Binaerbilder_48.png"), isBinaryImage, this));
auto isLabelSetImage = mitk::NodePredicateDataType::New("LabelSetImage");
AddDescriptor(new QmitkNodeDescriptor(tr("LabelSetImage"), QString(":/Qmitk/LabelSetImage_48.png"), isLabelSetImage, this));
auto segmentationTaskListIcon = QmitkStyleManager::ThemeIcon(QStringLiteral(":/Qmitk/SegmentationTaskListIcon.svg"));
auto isSegmentationTaskList = mitk::NodePredicateDataType::New("SegmentationTaskList");
AddDescriptor(new QmitkNodeDescriptor("SegmentationTaskList", segmentationTaskListIcon, isSegmentationTaskList, this));
+ auto roiIcon = QmitkStyleManager::ThemeIcon(QStringLiteral(":/Qmitk/ROIIcon.svg"));
+ auto isROI = mitk::NodePredicateDataType::New("ROI");
+ AddDescriptor(new QmitkNodeDescriptor("ROI", roiIcon, isROI, this));
+
auto isPointSet = mitk::NodePredicateDataType::New("PointSet");
AddDescriptor(new QmitkNodeDescriptor(tr("PointSet"), QString(":/Qmitk/PointSet_48.png"), isPointSet, this));
auto isSurface = mitk::NodePredicateDataType::New("Surface");
AddDescriptor(new QmitkNodeDescriptor(tr("Surface"), QString(":/Qmitk/Surface_48.png"), isSurface, this));
auto isNotBinary = mitk::NodePredicateNot::New(isBinary);
auto isNoneBinaryImage = mitk::NodePredicateAnd::New(isImage, isNotBinary);
AddDescriptor(new QmitkNodeDescriptor(tr("NoneBinaryImage"), QString(":/Qmitk/Images_48.png"), isNoneBinaryImage, this));
}
void QmitkNodeDescriptorManager::AddDescriptor(QmitkNodeDescriptor* descriptor)
{
descriptor->setParent(this);
m_NodeDescriptors.push_back(descriptor);
}
void QmitkNodeDescriptorManager::RemoveDescriptor(QmitkNodeDescriptor* descriptor)
{
int index = m_NodeDescriptors.indexOf(descriptor);
if (index != -1)
{
m_NodeDescriptors.removeAt(index);
descriptor->setParent(nullptr);
delete descriptor;
}
}
QmitkNodeDescriptor* QmitkNodeDescriptorManager::GetDescriptor(const mitk::DataNode* node) const
{
QmitkNodeDescriptor* descriptor = m_UnknownDataNodeDescriptor;
for (QList<QmitkNodeDescriptor *>::const_iterator it = m_NodeDescriptors.begin(); it != m_NodeDescriptors.end(); ++it)
{
if ((*it)->CheckNode(node))
descriptor = *it;
}
return descriptor;
}
QmitkNodeDescriptor* QmitkNodeDescriptorManager::GetDescriptor(const QString& className) const
{
QmitkNodeDescriptor* descriptor = nullptr;
if (className == "Unknown")
{
return m_UnknownDataNodeDescriptor;
}
else
{
for (QList<QmitkNodeDescriptor *>::const_iterator it = m_NodeDescriptors.begin(); it != m_NodeDescriptors.end(); ++it)
{
if ((*it)->GetNameOfClass() == className)
descriptor = *it;
}
}
return descriptor;
}
QList<QAction*> QmitkNodeDescriptorManager::GetActions(const mitk::DataNode* node) const
{
QList<QAction*> actions = m_UnknownDataNodeDescriptor->GetBatchActions();
actions.append(m_UnknownDataNodeDescriptor->GetActions());
QmitkNodeDescriptor* lastDescriptor = m_UnknownDataNodeDescriptor;
for (QList<QmitkNodeDescriptor *>::const_iterator it = m_NodeDescriptors.begin(); it != m_NodeDescriptors.end(); ++it)
{
if ((*it)->CheckNode(node))
{
actions.append(lastDescriptor->GetSeparator());
lastDescriptor = *it;
actions.append(lastDescriptor->GetBatchActions());
actions.append(lastDescriptor->GetActions());
}
}
return actions;
}
QList<QAction*> QmitkNodeDescriptorManager::GetActions(const QList<mitk::DataNode::Pointer>& nodes) const
{
QList<QAction*> actions = m_UnknownDataNodeDescriptor->GetBatchActions();
QmitkNodeDescriptor* lastDescriptor = m_UnknownDataNodeDescriptor;
// find all descriptors for the nodes (unique)
QSet<QmitkNodeDescriptor*> nodeDescriptors;
for (const auto& node : nodes)
{
for (QList<QmitkNodeDescriptor*>::const_iterator it = m_NodeDescriptors.begin(); it != m_NodeDescriptors.end(); ++it)
{
if ((*it)->CheckNode(node))
{
nodeDescriptors.insert(*it);
}
}
}
// add all actions for the found descriptors
for (const auto& nodeDescriptor : nodeDescriptors)
{
actions.append(lastDescriptor->GetSeparator());
lastDescriptor = nodeDescriptor;
actions.append(lastDescriptor->GetBatchActions());
}
return actions;
}
QmitkNodeDescriptorManager::QmitkNodeDescriptorManager()
: m_UnknownDataNodeDescriptor(new QmitkNodeDescriptor("Unknown", QString(":/Qmitk/DataTypeUnknown_48.png"), nullptr, this))
{
Initialize();
}
QmitkNodeDescriptorManager::~QmitkNodeDescriptorManager()
{
// delete m_UnknownDataNodeDescriptor;
// qDeleteAll(m_NodeDescriptors);
}
QmitkNodeDescriptor *QmitkNodeDescriptorManager::GetUnknownDataNodeDescriptor() const
{
return m_UnknownDataNodeDescriptor;
}