diff --git a/Plugins/org.mitk.gui.qt.multilabelsegmentation/files.cmake b/Plugins/org.mitk.gui.qt.multilabelsegmentation/files.cmake
index 84c2868566..579592252f 100644
--- a/Plugins/org.mitk.gui.qt.multilabelsegmentation/files.cmake
+++ b/Plugins/org.mitk.gui.qt.multilabelsegmentation/files.cmake
@@ -1,100 +1,98 @@
set(SRC_CPP_FILES
- QmitkMultiLabelSegmentationPreferencePage.cpp
)
set(INTERNAL_CPP_FILES
mitkPluginActivator.cpp
QmitkMultiLabelSegmentationView.cpp
QmitkThresholdAction.cpp
QmitkConvertSurfaceToLabelAction.cpp
QmitkConvertMaskToLabelAction.cpp
QmitkConvertToMultiLabelSegmentationAction.cpp
QmitkCreateMultiLabelSegmentationAction.cpp
Common/QmitkDataSelectionWidget.cpp
SegmentationUtilities/QmitkMultiLabelSegmentationUtilitiesView.cpp
SegmentationUtilities/QmitkSegmentationUtilityWidget.cpp
SegmentationUtilities/BooleanOperations/QmitkBooleanOperationsWidget.cpp
SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidget.cpp
SegmentationUtilities/MorphologicalOperations/QmitkMorphologicalOperationsWidget.cpp
SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidget.cpp
SegmentationUtilities/ImageMasking/QmitkImageMaskingWidget.cpp
SegmentationUtilities/ConvertToMl/QmitkConvertToMlWidget.cpp
)
set(UI_FILES
src/internal/QmitkMultiLabelSegmentationControls.ui
src/internal/Common/QmitkDataSelectionWidgetControls.ui
src/internal/SegmentationUtilities/QmitkMultiLabelSegmentationUtilitiesViewControls.ui
src/internal/SegmentationUtilities/BooleanOperations/QmitkBooleanOperationsWidgetControls.ui
src/internal/SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidgetControls.ui
src/internal/SegmentationUtilities/MorphologicalOperations/QmitkMorphologicalOperationsWidgetControls.ui
src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidgetControls.ui
src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidgetControls.ui
src/internal/SegmentationUtilities/ConvertToMl/QmitkConvertToMlWidgetControls.ui
)
set(MOC_H_FILES
- src/QmitkMultiLabelSegmentationPreferencePage.h
src/internal/mitkPluginActivator.h
src/internal/QmitkMultiLabelSegmentationView.h
src/internal/QmitkThresholdAction.h
src/internal/QmitkConvertSurfaceToLabelAction.h
src/internal/QmitkConvertMaskToLabelAction.h
src/internal/QmitkConvertToMultiLabelSegmentationAction.h
src/internal/QmitkCreateMultiLabelSegmentationAction.h
src/internal/Common/QmitkDataSelectionWidget.h
src/internal/SegmentationUtilities/QmitkMultiLabelSegmentationUtilitiesView.h
src/internal/SegmentationUtilities/QmitkSegmentationUtilityWidget.h
src/internal/SegmentationUtilities/BooleanOperations/QmitkBooleanOperationsWidget.h
src/internal/SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidget.h
src/internal/SegmentationUtilities/MorphologicalOperations/QmitkMorphologicalOperationsWidget.h
src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidget.h
src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidget.h
src/internal/SegmentationUtilities/ConvertToMl/QmitkConvertToMlWidget.h
)
set(CACHED_RESOURCE_FILES
resources/BooleanDifference_48x48.png
resources/BooleanIntersection_48x48.png
resources/BooleanOperations_48x48.png
resources/BooleanUnion_48x48.png
resources/Closing_48x48.png
resources/CTKWidgets_48x48.png
resources/deformablePlane.png
resources/Dilate_48x48.png
resources/Erode_48x48.png
resources/FillHoles_48x48.png
resources/Icons.svg
resources/ImageMasking_48x48.png
resources/MorphologicalOperations_48x48.png
resources/multilabelsegmentation.svg
resources/multilabelsegmentation_utilities.svg
resources/Opening_48x48.png
resources/SurfaceToImage_48x48.png
plugin.xml
)
set(QRC_FILES
resources/multilabelsegmentation.qrc
resources/MultiLabelSegmentationUtilities.qrc
resources/MorphologicalOperationsWidget.qrc
resources/BooleanOperationsWidget.qrc
)
set(CPP_FILES)
foreach(file ${SRC_CPP_FILES})
set(CPP_FILES ${CPP_FILES} src/${file})
endforeach(file ${SRC_CPP_FILES})
#usFunctionEmbedResources(
#CPP_FILES
# LIBRARY_NAME "liborg_mitk_gui_qt_multilabelsegmentation"
#ROOT_DIR resources
#FILES Interactions/SegmentationInteraction.xml
# Interactions/ConfigSegmentation.xml
#)
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.multilabelsegmentation/plugin.xml b/Plugins/org.mitk.gui.qt.multilabelsegmentation/plugin.xml
index b0c2b62a22..4d14231628 100644
--- a/Plugins/org.mitk.gui.qt.multilabelsegmentation/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.multilabelsegmentation/plugin.xml
@@ -1,38 +1,28 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/QmitkMultiLabelSegmentationPreferencePage.cpp b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/QmitkMultiLabelSegmentationPreferencePage.cpp
deleted file mode 100644
index e384407c7c..0000000000
--- a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/QmitkMultiLabelSegmentationPreferencePage.cpp
+++ /dev/null
@@ -1,156 +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 "QmitkMultiLabelSegmentationPreferencePage.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-
-QmitkMultiLabelSegmentationPreferencePage::QmitkMultiLabelSegmentationPreferencePage()
- : m_MainControl(nullptr),
- m_SlimViewCheckBox(nullptr),
- m_RadioOutline(nullptr),
- m_RadioOverlay(nullptr),
- m_SelectionModeCheckBox(nullptr),
- m_SmoothingSpinBox(nullptr),
- m_DecimationSpinBox(nullptr),
- m_Initializing(false)
-{
-
-}
-
-QmitkMultiLabelSegmentationPreferencePage::~QmitkMultiLabelSegmentationPreferencePage()
-{
-
-}
-
-void QmitkMultiLabelSegmentationPreferencePage::Init(berry::IWorkbench::Pointer )
-{
-
-}
-
-void QmitkMultiLabelSegmentationPreferencePage::CreateQtControl(QWidget* parent)
-{
- m_Initializing = true;
- berry::IPreferencesService* prefService = berry::Platform::GetPreferencesService();
-
- m_SegmentationPreferencesNode = prefService->GetSystemPreferences()->Node("/org.mitk.views.multilabelsegmentation");
-
- m_MainControl = new QWidget(parent);
-
- QFormLayout *formLayout = new QFormLayout;
- formLayout->setHorizontalSpacing(8);
- formLayout->setVerticalSpacing(24);
-
- m_SlimViewCheckBox = new QCheckBox("Hide tool button texts and increase icon size", m_MainControl);
- formLayout->addRow("Slim view", m_SlimViewCheckBox);
-
- QVBoxLayout* displayOptionsLayout = new QVBoxLayout;
- m_RadioOutline = new QRadioButton( "Draw as outline", m_MainControl);
- displayOptionsLayout->addWidget( m_RadioOutline );
- m_RadioOverlay = new QRadioButton( "Draw as transparent overlay", m_MainControl);
- displayOptionsLayout->addWidget( m_RadioOverlay );
- formLayout->addRow( "2D display", displayOptionsLayout );
-
- m_SelectionModeCheckBox = new QCheckBox("Enable auto-selection mode", m_MainControl);
- m_SelectionModeCheckBox->setToolTip("If checked the segmentation plugin ensures that only one segmentation and the according greyvalue image are visible at one time.");
- formLayout->addRow("Data node selection mode", m_SelectionModeCheckBox);
-
- QFormLayout* surfaceLayout = new QFormLayout;
- surfaceLayout->setSpacing(8);
-
- m_SmoothingSpinBox = new QDoubleSpinBox(m_MainControl);
- m_SmoothingSpinBox->setMinimum(0.0);
- m_SmoothingSpinBox->setSingleStep(0.5);
- m_SmoothingSpinBox->setValue(0.1);
- m_SmoothingSpinBox->setToolTip("The Smoothing value is used as Sigma for a gaussian blur.");
- surfaceLayout->addRow("Smoothing value (mm)", m_SmoothingSpinBox);
-
- m_DecimationSpinBox = new QDoubleSpinBox(m_MainControl);
- m_DecimationSpinBox->setMinimum(0.0);
- m_DecimationSpinBox->setMaximum(0.99);
- m_DecimationSpinBox->setSingleStep(0.1);
- m_DecimationSpinBox->setValue(0.5);
- m_DecimationSpinBox->setToolTip("Valid range is [0, 1). High values increase decimation, especially when very close to 1. A value of 0 disables decimation.");
- surfaceLayout->addRow("Decimation rate", m_DecimationSpinBox);
-
- formLayout->addRow("Smoothed surface creation", surfaceLayout);
-
- m_MainControl->setLayout(formLayout);
- this->Update();
- m_Initializing = false;
-}
-
-QWidget* QmitkMultiLabelSegmentationPreferencePage::GetQtControl() const
-{
- return m_MainControl;
-}
-
-bool QmitkMultiLabelSegmentationPreferencePage::PerformOk()
-{
- m_SegmentationPreferencesNode->PutBool("slim view", m_SlimViewCheckBox->isChecked());
- m_SegmentationPreferencesNode->PutBool("draw outline", m_RadioOutline->isChecked());
- m_SegmentationPreferencesNode->PutDouble("smoothing value", m_SmoothingSpinBox->value());
- m_SegmentationPreferencesNode->PutDouble("decimation rate", m_DecimationSpinBox->value());
- m_SegmentationPreferencesNode->PutBool("auto selection", m_SelectionModeCheckBox->isChecked());
- return true;
-}
-
-void QmitkMultiLabelSegmentationPreferencePage::PerformCancel()
-{
-
-}
-
-void QmitkMultiLabelSegmentationPreferencePage::Update()
-{
- m_SlimViewCheckBox->setChecked(m_SegmentationPreferencesNode->GetBool("slim view", false));
-
- if (m_SegmentationPreferencesNode->GetBool("draw outline", true) )
- {
- m_RadioOutline->setChecked(true);
- }
- else
- {
- m_RadioOverlay->setChecked(true);
- }
-
- m_SelectionModeCheckBox->setChecked(m_SegmentationPreferencesNode->GetBool("auto selection", false));
-
- if (m_SegmentationPreferencesNode->GetBool("smoothing hint", true))
- {
- m_SmoothingSpinBox->setDisabled(true);
- }
- else
- {
- m_SmoothingSpinBox->setEnabled(true);
- }
-
- m_SmoothingSpinBox->setValue(m_SegmentationPreferencesNode->GetDouble("smoothing value", 0.1));
- m_DecimationSpinBox->setValue(m_SegmentationPreferencesNode->GetDouble("decimation rate", 0.5));
-}
-
-void QmitkMultiLabelSegmentationPreferencePage::OnSmoothingCheckboxChecked(int state)
-{
- if (state != Qt::Unchecked)
- m_SmoothingSpinBox->setDisabled(true);
- else
- m_SmoothingSpinBox->setEnabled(true);
-}
diff --git a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/QmitkMultiLabelSegmentationPreferencePage.h b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/QmitkMultiLabelSegmentationPreferencePage.h
deleted file mode 100644
index ef52b83c76..0000000000
--- a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/QmitkMultiLabelSegmentationPreferencePage.h
+++ /dev/null
@@ -1,67 +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 QmitkMultiLabelSegmentationPreferencePage_h_included
-#define QmitkMultiLabelSegmentationPreferencePage_h_included
-
-#include "berryIQtPreferencePage.h"
-#include "org_mitk_gui_qt_multilabelsegmentation_Export.h"
-#include
-
-class QWidget;
-class QCheckBox;
-class QRadioButton;
-class QDoubleSpinBox;
-
-class MITK_QT_SEGMENTATION QmitkMultiLabelSegmentationPreferencePage : public QObject, public berry::IQtPreferencePage
-{
- Q_OBJECT
- Q_INTERFACES(berry::IPreferencePage)
-
-public:
-
- QmitkMultiLabelSegmentationPreferencePage();
- ~QmitkMultiLabelSegmentationPreferencePage() override;
-
- void Init(berry::IWorkbench::Pointer workbench) override;
-
- void CreateQtControl(QWidget* widget) override;
-
- QWidget* GetQtControl() const override;
-
- bool PerformOk() override;
-
- void PerformCancel() override;
-
- void Update() override;
-
-protected slots:
-
- void OnSmoothingCheckboxChecked(int);
-
-protected:
-
- QWidget* m_MainControl;
- QCheckBox* m_SlimViewCheckBox;
- QRadioButton* m_RadioOutline;
- QRadioButton* m_RadioOverlay;
- QCheckBox* m_SelectionModeCheckBox;
- QDoubleSpinBox* m_SmoothingSpinBox;
- QDoubleSpinBox* m_DecimationSpinBox;
-
- bool m_Initializing;
-
- berry::IPreferences::Pointer m_SegmentationPreferencesNode;
-};
-
-#endif /* QMITKDATAMANAGERPREFERENCEPAGE_H_ */
diff --git a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/mitkPluginActivator.cpp
index f38f072b70..b70f7094c5 100644
--- a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/mitkPluginActivator.cpp
+++ b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/mitkPluginActivator.cpp
@@ -1,52 +1,51 @@
/*============================================================================
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 "mitkPluginActivator.h"
#include "QmitkMultiLabelSegmentationView.h"
#include "QmitkThresholdAction.h"
#include "QmitkConvertSurfaceToLabelAction.h"
#include "QmitkConvertMaskToLabelAction.h"
#include "QmitkConvertToMultiLabelSegmentationAction.h"
#include "QmitkCreateMultiLabelSegmentationAction.h"
-#include "QmitkMultiLabelSegmentationPreferencePage.h"
+
#include "SegmentationUtilities/QmitkMultiLabelSegmentationUtilitiesView.h"
#include
ctkPluginContext* mitk::PluginActivator::m_Context = nullptr;
//MLI TODO
US_INITIALIZE_MODULE //("MultiLabelSegmentation", "liborg_mitk_gui_qt_multilabelsegmentation")
void mitk::PluginActivator::start(ctkPluginContext *context)
{
BERRY_REGISTER_EXTENSION_CLASS(QmitkMultiLabelSegmentationView, context)
BERRY_REGISTER_EXTENSION_CLASS(QmitkThresholdAction, context)
BERRY_REGISTER_EXTENSION_CLASS(QmitkConvertSurfaceToLabelAction, context)
BERRY_REGISTER_EXTENSION_CLASS(QmitkConvertMaskToLabelAction, context)
BERRY_REGISTER_EXTENSION_CLASS(QmitkConvertToMultiLabelSegmentationAction, context)
BERRY_REGISTER_EXTENSION_CLASS(QmitkCreateMultiLabelSegmentationAction, context)
- BERRY_REGISTER_EXTENSION_CLASS(QmitkMultiLabelSegmentationPreferencePage, context)
BERRY_REGISTER_EXTENSION_CLASS(QmitkMultiLabelSegmentationUtilitiesView, context)
m_Context = context;
}
void mitk::PluginActivator::stop(ctkPluginContext*)
{
}
ctkPluginContext* mitk::PluginActivator::getContext()
{
return m_Context;
}