diff --git a/CMake/BuildConfigurations/Default.cmake b/CMake/BuildConfigurations/Default.cmake
index 08e48e4bfd..7ec36d8732 100644
--- a/CMake/BuildConfigurations/Default.cmake
+++ b/CMake/BuildConfigurations/Default.cmake
@@ -1,25 +1,24 @@
set(MITK_CONFIG_PACKAGES
ACVD
Qt5
BLUEBERRY
)
set(MITK_CONFIG_PLUGINS
org.mitk.gui.qt.mitkworkbench.intro
org.mitk.gui.qt.datamanager
org.mitk.gui.qt.stdmultiwidgeteditor
org.mitk.gui.qt.mxnmultiwidgeteditor
org.mitk.gui.qt.dicombrowser
org.mitk.gui.qt.imagenavigator
org.mitk.gui.qt.measurementtoolbox
org.mitk.gui.qt.properties
org.mitk.gui.qt.segmentation
org.mitk.gui.qt.volumevisualization
- org.mitk.planarfigure
org.mitk.gui.qt.moviemaker
org.mitk.gui.qt.pointsetinteraction
org.mitk.gui.qt.remeshing
org.mitk.gui.qt.viewnavigator
org.mitk.gui.qt.imagecropper
org.mitk.gui.qt.pixelvalue
)
diff --git a/CMake/BuildConfigurations/mitkNavigationModules.cmake b/CMake/BuildConfigurations/mitkNavigationModules.cmake
index d6881034ab..a5eb033617 100644
--- a/CMake/BuildConfigurations/mitkNavigationModules.cmake
+++ b/CMake/BuildConfigurations/mitkNavigationModules.cmake
@@ -1,35 +1,34 @@
message(STATUS "Configuring MITK Navigation Modules Build")
set(MITK_CONFIG_PACKAGES
ACVD
Qt5
BLUEBERRY
)
# Enable open cv and open igt link, which is a necessary configuration
set(MITK_USE_OpenCV ON CACHE BOOL "MITK Use OpenCV Library" FORCE)
set(MITK_USE_OpenIGTLink ON CACHE BOOL "MITK Use OpenIGTLink Library" FORCE)
# Enable default plugins and the navigation modules
set(MITK_CONFIG_PLUGINS
org.mitk.gui.qt.datamanager
org.mitk.gui.qt.stdmultiwidgeteditor
org.mitk.gui.qt.dicombrowser
org.mitk.gui.qt.imagenavigator
org.mitk.gui.qt.measurementtoolbox
org.mitk.gui.qt.properties
org.mitk.gui.qt.segmentation
org.mitk.gui.qt.volumevisualization
- org.mitk.planarfigure
org.mitk.gui.qt.moviemaker
org.mitk.gui.qt.pointsetinteraction
org.mitk.gui.qt.registration
org.mitk.gui.qt.remeshing
org.mitk.gui.qt.viewnavigator
org.mitk.gui.qt.imagecropper
org.mitk.gui.qt.igttracking
org.mitk.gui.qt.openigtlink
org.mitk.gui.qt.ultrasound
org.mitk.gui.qt.tofutil
)
diff --git a/CMake/Whitelists/FlowBenchSegmentation.cmake b/CMake/Whitelists/FlowBenchSegmentation.cmake
index c0eedb2dfb..7c7a9ea489 100644
--- a/CMake/Whitelists/FlowBenchSegmentation.cmake
+++ b/CMake/Whitelists/FlowBenchSegmentation.cmake
@@ -1,54 +1,53 @@
set(enabled_modules
Core
CppMicroServices
DICOM
DICOMPM
DataTypesExt
AlgorithmsExt
DICOMQI
Multilabel
SceneSerializationBase
DICOMPMIO
DICOMImageIO
ContourModel
DICOMSegIO
LegacyGL
MapperExt
SceneSerialization
LegacyIO
IOExt
MultilabelIO
AppUtil
QtWidgets
QtWidgetsExt
Segmentation
SegmentationUI
PlanarFigure
Annotation
SurfaceInterpolation
GraphAlgorithms
ImageExtraction
ImageStatistics
)
set(enabled_plugins
org.blueberry.core.commands
org.blueberry.core.expressions
org.blueberry.core.runtime
org.blueberry.ui.qt
org.blueberry.ui.qt.help
org.blueberry.ui.qt.log
org.mitk.core.services
org.mitk.gui.common
org.mitk.gui.qt.application
org.mitk.gui.qt.common
org.mitk.gui.qt.datamanager
org.mitk.gui.qt.ext
org.mitk.gui.qt.flow.segmentation
org.mitk.gui.qt.flowapplication
org.mitk.gui.qt.imagenavigator
org.mitk.gui.qt.properties
org.mitk.gui.qt.segmentation
org.mitk.gui.qt.stdmultiwidgeteditor
-org.mitk.planarfigure
)
diff --git a/Modules/QtWidgetsExt/resource/PlanarAngle_48.png b/Modules/QtWidgets/resource/PlanarAngle_48.png
similarity index 100%
rename from Modules/QtWidgetsExt/resource/PlanarAngle_48.png
rename to Modules/QtWidgets/resource/PlanarAngle_48.png
diff --git a/Modules/QtWidgetsExt/resource/PlanarBezierCurve_48.png b/Modules/QtWidgets/resource/PlanarBezierCurve_48.png
similarity index 100%
rename from Modules/QtWidgetsExt/resource/PlanarBezierCurve_48.png
rename to Modules/QtWidgets/resource/PlanarBezierCurve_48.png
diff --git a/Modules/QtWidgetsExt/resource/PlanarCircle_48.png b/Modules/QtWidgets/resource/PlanarCircle_48.png
similarity index 100%
rename from Modules/QtWidgetsExt/resource/PlanarCircle_48.png
rename to Modules/QtWidgets/resource/PlanarCircle_48.png
diff --git a/Modules/QtWidgetsExt/resource/PlanarDoubleEllipse_48.png b/Modules/QtWidgets/resource/PlanarDoubleEllipse_48.png
similarity index 100%
rename from Modules/QtWidgetsExt/resource/PlanarDoubleEllipse_48.png
rename to Modules/QtWidgets/resource/PlanarDoubleEllipse_48.png
diff --git a/Modules/QtWidgetsExt/resource/PlanarEllipse_48.png b/Modules/QtWidgets/resource/PlanarEllipse_48.png
similarity index 100%
rename from Modules/QtWidgetsExt/resource/PlanarEllipse_48.png
rename to Modules/QtWidgets/resource/PlanarEllipse_48.png
diff --git a/Modules/QtWidgetsExt/resource/PlanarFourPointAngle_48.png b/Modules/QtWidgets/resource/PlanarFourPointAngle_48.png
similarity index 100%
rename from Modules/QtWidgetsExt/resource/PlanarFourPointAngle_48.png
rename to Modules/QtWidgets/resource/PlanarFourPointAngle_48.png
diff --git a/Modules/QtWidgetsExt/resource/PlanarLine_48.png b/Modules/QtWidgets/resource/PlanarLine_48.png
similarity index 100%
rename from Modules/QtWidgetsExt/resource/PlanarLine_48.png
rename to Modules/QtWidgets/resource/PlanarLine_48.png
diff --git a/Modules/QtWidgetsExt/resource/PlanarPath_48.png b/Modules/QtWidgets/resource/PlanarPath_48.png
similarity index 100%
rename from Modules/QtWidgetsExt/resource/PlanarPath_48.png
rename to Modules/QtWidgets/resource/PlanarPath_48.png
diff --git a/Modules/QtWidgetsExt/resource/PlanarPolygon_48.png b/Modules/QtWidgets/resource/PlanarPolygon_48.png
similarity index 100%
rename from Modules/QtWidgetsExt/resource/PlanarPolygon_48.png
rename to Modules/QtWidgets/resource/PlanarPolygon_48.png
diff --git a/Modules/QtWidgetsExt/resource/PlanarRectangle_48.png b/Modules/QtWidgets/resource/PlanarRectangle_48.png
similarity index 100%
rename from Modules/QtWidgetsExt/resource/PlanarRectangle_48.png
rename to Modules/QtWidgets/resource/PlanarRectangle_48.png
diff --git a/Modules/QtWidgetsExt/resource/PlanarSubdivisionPolygon_48.png b/Modules/QtWidgets/resource/PlanarSubdivisionPolygon_48.png
similarity index 100%
rename from Modules/QtWidgetsExt/resource/PlanarSubdivisionPolygon_48.png
rename to Modules/QtWidgets/resource/PlanarSubdivisionPolygon_48.png
diff --git a/Modules/QtWidgets/resource/Qmitk.qrc b/Modules/QtWidgets/resource/Qmitk.qrc
index f284857d3e..81f4df1b5e 100644
--- a/Modules/QtWidgets/resource/Qmitk.qrc
+++ b/Modules/QtWidgets/resource/Qmitk.qrc
@@ -1,36 +1,47 @@
<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>
<file>GeometryDataIcon.svg</file>
+ <file>PlanarAngle_48.png</file>
+ <file>PlanarBezierCurve_48.png</file>
+ <file>PlanarCircle_48.png</file>
+ <file>PlanarDoubleEllipse_48.png</file>
+ <file>PlanarEllipse_48.png</file>
+ <file>PlanarFourPointAngle_48.png</file>
+ <file>PlanarLine_48.png</file>
+ <file>PlanarPath_48.png</file>
+ <file>PlanarPolygon_48.png</file>
+ <file>PlanarRectangle_48.png</file>
+ <file>PlanarSubdivisionPolygon_48.png</file>
</qresource>
</RCC>
diff --git a/Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp b/Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp
index ab142499b0..3e3fa82538 100644
--- a/Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp
+++ b/Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp
@@ -1,183 +1,218 @@
/*============================================================================
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>
+#include <QResource>
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));
+ AddDescriptor(new QmitkNodeDescriptor("Image", ":/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));
+ AddDescriptor(new QmitkNodeDescriptor("MultiComponentImage", ":/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));
+ AddDescriptor(new QmitkNodeDescriptor("ImageMask", ":/Qmitk/Binaerbilder_48.png", isBinaryImage, this));
auto isLabelSetImage = mitk::NodePredicateDataType::New("LabelSetImage");
- AddDescriptor(new QmitkNodeDescriptor(tr("LabelSetImage"), QString(":/Qmitk/LabelSetImage_48.png"), isLabelSetImage, this));
+ AddDescriptor(new QmitkNodeDescriptor("LabelSetImage", ":/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 geometryDataIcon = QmitkStyleManager::ThemeIcon(QStringLiteral(":/Qmitk/GeometryDataIcon.svg"));
auto isGeometryData = mitk::NodePredicateDataType::New("GeometryData");
AddDescriptor(new QmitkNodeDescriptor("GeometryData", geometryDataIcon, isGeometryData, this));
auto isPointSet = mitk::NodePredicateDataType::New("PointSet");
- AddDescriptor(new QmitkNodeDescriptor(tr("PointSet"), QString(":/Qmitk/PointSet_48.png"), isPointSet, this));
+ AddDescriptor(new QmitkNodeDescriptor("PointSet", ":/Qmitk/PointSet_48.png", isPointSet, this));
auto isSurface = mitk::NodePredicateDataType::New("Surface");
- AddDescriptor(new QmitkNodeDescriptor(tr("Surface"), QString(":/Qmitk/Surface_48.png"), isSurface, this));
+ AddDescriptor(new QmitkNodeDescriptor("Surface", ":/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));
+ AddDescriptor(new QmitkNodeDescriptor("NoneBinaryImage", ":/Qmitk/Images_48.png", isNoneBinaryImage, this));
+
+ auto isPlanarLine = mitk::NodePredicateDataType::New("PlanarLine");
+ AddDescriptor(new QmitkNodeDescriptor("PlanarLine", ":/Qmitk/PlanarLine_48.png", isPlanarLine, this));
+
+ auto isPlanarCircle = mitk::NodePredicateDataType::New("PlanarCircle");
+ AddDescriptor(new QmitkNodeDescriptor("PlanarCircle", ":/Qmitk/PlanarCircle_48.png", isPlanarCircle, this));
+
+ auto isPlanarEllipse = mitk::NodePredicateDataType::New("PlanarEllipse");
+ AddDescriptor(new QmitkNodeDescriptor("PlanarEllipse", ":/Qmitk/PlanarEllipse_48.png", isPlanarEllipse, this));
+
+ auto isPlanarAngle = mitk::NodePredicateDataType::New("PlanarAngle");
+ AddDescriptor(new QmitkNodeDescriptor("PlanarAngle", ":/Qmitk/PlanarAngle_48.png", isPlanarAngle, this));
+
+ auto isPlanarFourPointAngle = mitk::NodePredicateDataType::New("PlanarFourPointAngle");
+ AddDescriptor(new QmitkNodeDescriptor("PlanarFourPointAngle", ":/Qmitk/PlanarFourPointAngle_48.png", isPlanarFourPointAngle, this));
+
+ auto isPlanarRectangle = mitk::NodePredicateDataType::New("PlanarRectangle");
+ AddDescriptor(new QmitkNodeDescriptor("PlanarRectangle", ":/Qmitk/PlanarRectangle_48.png", isPlanarRectangle, this));
+
+ auto isPlanarPolygon = mitk::NodePredicateDataType::New("PlanarPolygon");
+ AddDescriptor(new QmitkNodeDescriptor("PlanarPolygon", ":/Qmitk/PlanarPolygon_48.png", isPlanarPolygon, this));
+
+ auto isNotClosedPolygon = mitk::NodePredicateProperty::New("ClosedPlanarPolygon", mitk::BoolProperty::New(false));
+ auto isPlanarPath = mitk::NodePredicateAnd::New(isNotClosedPolygon, isPlanarPolygon);
+ AddDescriptor(new QmitkNodeDescriptor("PlanarPath", ":/Qmitk/PlanarPath_48.png", isPlanarPath, this));
+
+ auto isPlanarDoubleEllipse = mitk::NodePredicateDataType::New("PlanarDoubleEllipse");
+ AddDescriptor(new QmitkNodeDescriptor("PlanarDoubleEllipse", ":/Qmitk/PlanarDoubleEllipse_48.png", isPlanarDoubleEllipse, this));
+
+ auto isPlanarBezierCurve = mitk::NodePredicateDataType::New("PlanarBezierCurve");
+ AddDescriptor(new QmitkNodeDescriptor("PlanarBezierCurve", ":/Qmitk/PlanarBezierCurve_48.png", isPlanarBezierCurve, this));
+
+ auto isPlanarSubdivisionPolygon = mitk::NodePredicateDataType::New("PlanarSubdivisionPolygon");
+ AddDescriptor(new QmitkNodeDescriptor("PlanarSubdivisionPolygon", ":/Qmitk/PlanarSubdivisionPolygon_48.png", isPlanarSubdivisionPolygon, 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
+QmitkNodeDescriptor *QmitkNodeDescriptorManager::GetUnknownDataNodeDescriptor()
{
return m_UnknownDataNodeDescriptor;
}
diff --git a/Modules/QtWidgetsExt/resource/QtWidgetsExt.qrc b/Modules/QtWidgetsExt/resource/QtWidgetsExt.qrc
index 2e92201b32..32f836a0e5 100644
--- a/Modules/QtWidgetsExt/resource/QtWidgetsExt.qrc
+++ b/Modules/QtWidgetsExt/resource/QtWidgetsExt.qrc
@@ -1,41 +1,30 @@
<RCC>
<qresource prefix="/QtWidgetsExt">
<file>btnAddPointSet.png</file>
<file>eraser.svg</file>
<file>btnCube.xpm</file>
<file>btnCylinder.xpm</file>
<file>arrow-down.svg</file>
<file>btnEllipsoid.xpm</file>
<file>folder-open.svg</file>
<file>btnMoveDown.png</file>
<file>btnMoveUp.png</file>
<file>btnPyramid.xpm</file>
<file>btnRemovePoint.png</file>
<file>save.svg</file>
<file>btnSetPoints.png</file>
<file>plus.svg</file>
<file>plus-xyz.svg</file>
<file>btnSetSeedPoint.xpm</file>
<file>btnSwapSets.png</file>
<file>arrow-up.svg</file>
<file>cross.png</file>
<file>icon_seedpoint.png</file>
<file>defaultWatermarkSmall.png</file>
<file>logo_mint-medical.png</file>
<file>ModuleView.png</file>
<file>QmitkStandardViewsDialogBar.xpm</file>
- <file>PlanarAngle_48.png</file>
- <file>PlanarBezierCurve_48.png</file>
- <file>PlanarCircle_48.png</file>
- <file>PlanarDoubleEllipse_48.png</file>
- <file>PlanarEllipse_48.png</file>
- <file>PlanarFourPointAngle_48.png</file>
- <file>PlanarLine_48.png</file>
- <file>PlanarPath_48.png</file>
- <file>PlanarPolygon_48.png</file>
- <file>PlanarRectangle_48.png</file>
- <file>PlanarSubdivisionPolygon_48.png</file>
<file>play.xpm</file>
<file>stop.xpm</file>
</qresource>
</RCC>
diff --git a/Plugins/org.mitk.planarfigure/CMakeLists.txt b/Plugins/org.mitk.planarfigure/CMakeLists.txt
deleted file mode 100644
index ca29acd698..0000000000
--- a/Plugins/org.mitk.planarfigure/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-project(org_mitk_planarfigure)
-
-mitk_create_plugin(
- EXPORT_DIRECTIVE ORG_MITK_PLANARFIGURE_EXPORT
- EXPORTED_INCLUDE_SUFFIXES src
- MODULE_DEPENDS MitkPlanarFigure MitkQtWidgets
- )
diff --git a/Plugins/org.mitk.planarfigure/documentation/doxygen/modules.dox b/Plugins/org.mitk.planarfigure/documentation/doxygen/modules.dox
deleted file mode 100644
index 36087c2397..0000000000
--- a/Plugins/org.mitk.planarfigure/documentation/doxygen/modules.dox
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- \defgroup org_mitk_planarfigure org.mitk.planarfigure
- \ingroup MITKPlugins
-
- \brief This small plug-in is responsible for initializing the PlanarFigure module.
-
- It is started with an "eager" Bundle-ActivationPolicy, such that the plug-ins
- activator is executed before any other (non-eager) plug-ins.
-
-*/
-
-/**
- \defgroup org_mitk_planarfigure_internal Internal
- \ingroup org_mitk_planarfigure
-
- \brief This subcategory includes the internal classes of the org.mitk.planarfigure plugin. Other
- plugins must not rely on these classes. They contain implementation details and their interface
- may change at any time. We mean it.
-*/
diff --git a/Plugins/org.mitk.planarfigure/files.cmake b/Plugins/org.mitk.planarfigure/files.cmake
deleted file mode 100644
index 044498f143..0000000000
--- a/Plugins/org.mitk.planarfigure/files.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-set(MOC_H_FILES
- src/internal/mitkPlanarFigureActivator.h
-)
-
-set(SRC_CPP_FILES
-
-)
-
-set(INTERNAL_CPP_FILES
- mitkPlanarFigureActivator.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/Plugins/org.mitk.planarfigure/manifest_headers.cmake b/Plugins/org.mitk.planarfigure/manifest_headers.cmake
deleted file mode 100644
index 1d6c61fc2f..0000000000
--- a/Plugins/org.mitk.planarfigure/manifest_headers.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-set(Plugin-Name "MITK PlanarFigure")
-set(Plugin-Version "0.1")
-set(Plugin-Vendor "German Cancer Research Center (DKFZ)")
-set(Plugin-ContactAddress "https://www.mitk.org")
-set(Require-Plugin org.mitk.gui.common)
-set(Plugin-ActivationPolicy eager)
diff --git a/Plugins/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.cpp b/Plugins/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.cpp
deleted file mode 100644
index 904a0e918f..0000000000
--- a/Plugins/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*============================================================================
-
-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 "mitkPlanarFigureActivator.h"
-#include "mitkPlanarFigureObjectFactory.h"
-
-#include "QmitkNodeDescriptorManager.h"
-#include "mitkNodePredicateDataType.h"
-#include "mitkNodePredicateProperty.h"
-#include "mitkNodePredicateAnd.h"
-
-void
-mitk::PlanarFigureActivator::start(ctkPluginContext* /*context*/)
-{
- QmitkNodeDescriptorManager* descriptorManager = QmitkNodeDescriptorManager::GetInstance();
-
- // Adding "PlanarLine"
- mitk::NodePredicateDataType::Pointer isPlanarLine = mitk::NodePredicateDataType::New("PlanarLine");
- descriptorManager->AddDescriptor(new QmitkNodeDescriptor(QObject::tr("PlanarLine"), QString(":/QtWidgetsExt/PlanarLine_48.png"), isPlanarLine, descriptorManager));
-
- // Adding "PlanarCircle"
- mitk::NodePredicateDataType::Pointer isPlanarCircle = mitk::NodePredicateDataType::New("PlanarCircle");
- descriptorManager->AddDescriptor(new QmitkNodeDescriptor(QObject::tr("PlanarCircle"), QString(":/QtWidgetsExt/PlanarCircle_48.png"), isPlanarCircle, descriptorManager));
-
- // Adding "PlanarEllipse"
- mitk::NodePredicateDataType::Pointer isPlanarEllipse = mitk::NodePredicateDataType::New("PlanarEllipse");
- descriptorManager->AddDescriptor(new QmitkNodeDescriptor(QObject::tr("PlanarEllipse"), QString(":/QtWidgetsExt/PlanarEllipse_48.png"), isPlanarEllipse, descriptorManager));
-
- // Adding "PlanarAngle"
- mitk::NodePredicateDataType::Pointer isPlanarAngle = mitk::NodePredicateDataType::New("PlanarAngle");
- descriptorManager->AddDescriptor(new QmitkNodeDescriptor(QObject::tr("PlanarAngle"), QString(":/QtWidgetsExt/PlanarAngle_48.png"), isPlanarAngle, descriptorManager));
-
- // Adding "PlanarFourPointAngle"
- mitk::NodePredicateDataType::Pointer isPlanarFourPointAngle = mitk::NodePredicateDataType::New("PlanarFourPointAngle");
- descriptorManager->AddDescriptor(new QmitkNodeDescriptor(QObject::tr("PlanarFourPointAngle"), QString(":/QtWidgetsExt/PlanarFourPointAngle_48.png"), isPlanarFourPointAngle, descriptorManager));
-
- // Adding "PlanarRectangle"
- mitk::NodePredicateDataType::Pointer isPlanarRectangle = mitk::NodePredicateDataType::New("PlanarRectangle");
- descriptorManager->AddDescriptor(new QmitkNodeDescriptor(QObject::tr("PlanarRectangle"), QString(":/QtWidgetsExt/PlanarRectangle_48.png"), isPlanarRectangle, descriptorManager));
-
- // Adding "PlanarPolygon"
- mitk::NodePredicateDataType::Pointer isPlanarPolygon = mitk::NodePredicateDataType::New("PlanarPolygon");
- descriptorManager->AddDescriptor(new QmitkNodeDescriptor(QObject::tr("PlanarPolygon"), QString(":/QtWidgetsExt/PlanarPolygon_48.png"), isPlanarPolygon, descriptorManager));
-
- // Adding "PlanarPath"
- mitk::NodePredicateProperty::Pointer isNotClosedPolygon = mitk::NodePredicateProperty::New("ClosedPlanarPolygon", mitk::BoolProperty::New(false));
- mitk::NodePredicateAnd::Pointer isPlanarPath = mitk::NodePredicateAnd::New(isNotClosedPolygon, isPlanarPolygon);
- descriptorManager->AddDescriptor(new QmitkNodeDescriptor(QObject::tr("PlanarPath"), QString(":/QtWidgetsExt/PlanarPath_48.png"), isPlanarPath, descriptorManager));
-
- // Adding "PlanarDoubleEllipse"
- mitk::NodePredicateDataType::Pointer isPlanarDoubleEllipse = mitk::NodePredicateDataType::New("PlanarDoubleEllipse");
- descriptorManager->AddDescriptor(new QmitkNodeDescriptor("PlanarDoubleEllipse", ":/QtWidgetsExt/PlanarDoubleEllipse_48.png", isPlanarDoubleEllipse, descriptorManager));
-
- // Adding "PlanarBezierCurve"
- mitk::NodePredicateDataType::Pointer isPlanarBezierCurve = mitk::NodePredicateDataType::New("PlanarBezierCurve");
- descriptorManager->AddDescriptor(new QmitkNodeDescriptor("PlanarBezierCurve", ":/QtWidgetsExt/PlanarBezierCurve_48.png", isPlanarBezierCurve, descriptorManager));
-
- // Adding "PlanarSubdivisionPolygon"
- mitk::NodePredicateDataType::Pointer isPlanarSubdivisionPolygon = mitk::NodePredicateDataType::New("PlanarSubdivisionPolygon");
- descriptorManager->AddDescriptor(new QmitkNodeDescriptor("PlanarSubdivisionPolygon", ":/QtWidgetsExt/PlanarSubdivisionPolygon_48.png", isPlanarSubdivisionPolygon, descriptorManager));
-}
-
-void
-mitk::PlanarFigureActivator::stop(ctkPluginContext* /*context*/)
-{
-}
diff --git a/Plugins/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.h b/Plugins/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.h
deleted file mode 100644
index d2c6c05575..0000000000
--- a/Plugins/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*============================================================================
-
-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.
-
-============================================================================*/
-
-
-#ifndef mitkPlanarFigureActivator_h
-#define mitkPlanarFigureActivator_h
-
-#include <ctkPluginActivator.h>
-
-
-namespace mitk
-{
-
-/**
- * \ingroup org_mitk_planarfigure_internal
- *
- * \brief The plug-in activator for the planar figure module
- *
- * When the plug-in is started by the framework, it initializes planar figure specific things.
- */
-class PlanarFigureActivator :
- public QObject, public ctkPluginActivator
-{
-
- Q_OBJECT
- Q_PLUGIN_METADATA(IID "org_mitk_planarfigure")
- Q_INTERFACES(ctkPluginActivator)
-
-public:
-
- /**
- * Registers sandbox core object factories.
- */
- void start(ctkPluginContext* context) override;
- void stop(ctkPluginContext* context) override;
-
-};
-
-}
-#endif