diff --git a/Plugins/org.blueberry.ui.qt/resources/darkstyle.qss b/Plugins/org.blueberry.ui.qt/resources/darkstyle.qss
index 0401c21c32..b00162dff5 100644
--- a/Plugins/org.blueberry.ui.qt/resources/darkstyle.qss
+++ b/Plugins/org.blueberry.ui.qt/resources/darkstyle.qss
@@ -1,576 +1,596 @@
/*===================================================================
BlueBerry Platform
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
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.
===================================================================*/
/*
iconColor = #c7c7c7 <- This line is parsed by MITK
iconAccentColor = #d4821e <- This line is parsed by MITK
*/
QWidget {
background-color: #2d2d30;
border: none;
color: #f1f1f1;
}
QWidget:disabled {
background-color: #2d2d30;
border-color: #434346;
color: #656565;
}
+QStackedWidget {
+ background-color: transparent;
+}
+
QAbstractButton:hover, QComboBox:hover, QLineEdit:hover, QAbstractSpinBox:hover {
background-color: #3f3f46;
}
QAbstractButton:pressed, QAbstractButton:checked {
background-color: #434346;
}
QPushButton {
border: 1px solid #3f3f46;
padding: 4px 8px;
}
QPushButton:pressed {
border: 1px solid #434346;
}
QPushButton:checked, QToolButton:checked {
border: 1px solid #007acc;
}
QToolButton {
padding: 2px;
}
QToolBar QToolButton {
padding: 4px;
}
QToolButton#qt_toolbar_ext_button {
background-color: transparent;
border: none;
min-width: 12px;
padding: 0;
qproperty-icon: url(:/org.blueberry.ui.qt/dark/tight-right-arrow-textcolor.svg);
}
+QToolBox::tab {
+ border: 1px solid #3f3f46;
+}
+
+QToolBox::tab:hover {
+ background-color: #434346;
+}
+
+QToolBox::tab:selected {
+ background-color: #1c97ea;
+ border: 1px solid #1c97ea;
+}
+
QAbstractItemView {
alternate-background-color: #1b1b1c;
background-color: #252526;
}
+QAbstractItemView::item {
+ color: #f1f1f1;
+}
+
QHeaderView::section {
background-color: #2d2d30;
border: 1px solid transparent;
}
QHeaderView::section:horizontal {
border-right: 1px solid #3f3f46;
}
QHeaderView::section:vertical {
border-bottom: 1px solid #3f3f46;
}
QHeaderView::section:vertical:checked {
background-color: #1c97ea;
}
QHeaderView::section:vertical:pressed {
background-color: #1c97ea;
font-weight: bold;
}
QHeaderView::down-arrow {
image: url(:/org.blueberry.ui.qt/dark/down-arrow.svg);
height: 16px;
width: 16px;
}
QHeaderView::down-arrow:hover {
image: url(:/org.blueberry.ui.qt/dark/down-arrow-hover.svg);
}
QHeaderView::down-arrow:pressed {
image: url(:/org.blueberry.ui.qt/dark/down-arrow-pressed.svg);
}
QHeaderView::up-arrow {
image: url(:/org.blueberry.ui.qt/dark/up-arrow.svg);
height: 16px;
width: 16px;
}
QHeaderView::up-arrow:hover {
image: url(:/org.blueberry.ui.qt/dark/up-arrow-hover.svg);
}
QHeaderView::up-arrow:pressed {
image: url(:/org.blueberry.ui.qt/dark/up-arrow-pressed.svg);
}
QGroupBox {
border: 1px solid #434346;
margin-top: 8px;
padding-top: 8px;
}
QGroupBox, QGroupBox:disabled {
background-color: #252526;
}
QGroupBox::title {
padding: 0 4px;
subcontrol-origin: margin;
subcontrol-position: top center;
}
QComboBox, QLineEdit, QAbstractSpinBox {
background-color: #333337;
border: 1px solid #434346;
}
QComboBox QAbstractItemView {
border: 1px solid #333337;
selection-background-color: #3f3f46;
}
QComboBox::drop-down {
image: url(:/org.blueberry.ui.qt/dark/down-arrow.svg);
subcontrol-origin: margin;
subcontrol-position: right;
width: 12px;
}
QComboBox::drop-down:hover {
background-color: #1f1f20;
border-left: 1px solid #007acc;
image: url(:/org.blueberry.ui.qt/dark/down-arrow-pressed.svg);
}
QAbstractSpinBox::up-button, QAbstractSpinBox::down-button {
background-color: transparent;
border: none;
height: 9px;
}
QAbstractSpinBox::up-button:hover, QAbstractSpinBox::down-button:hover {
background-color: #1f1f20;
}
QAbstractSpinBox::up-arrow {
image: url(:/org.blueberry.ui.qt/dark/tight-up-arrow.svg);
}
QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off {
image: url(:/org.blueberry.ui.qt/dark/tight-up-arrow-disabled.svg);
}
QAbstractSpinBox::up-arrow:hover {
image: url(:/org.blueberry.ui.qt/dark/tight-up-arrow-hover.svg);
}
QAbstractSpinBox::up-arrow:pressed {
image: url(:/org.blueberry.ui.qt/dark/tight-up-arrow-pressed.svg);
}
QAbstractSpinBox::down-arrow {
image: url(:/org.blueberry.ui.qt/dark/tight-down-arrow.svg);
}
QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off {
image: url(:/org.blueberry.ui.qt/dark/tight-down-arrow-disabled.svg);
}
QAbstractSpinBox::down-arrow:hover {
image: url(:/org.blueberry.ui.qt/dark/tight-down-arrow-hover.svg);
}
QAbstractSpinBox::down-arrow:pressed {
image: url(:/org.blueberry.ui.qt/dark/tight-down-arrow-pressed.svg);
}
QCheckBox, QCheckBox:hover, QCheckBox:disabled, QCheckBox:checked, QRadioButton, QRadioButton:hover, QRadioButton:disabled, QRadioButton:checked {
background-color: none;
}
QCheckBox::indicator, QRadioButton::indicator {
height: 13px;
width: 13px;
}
QCheckBox::indicator:unchecked {
image: url(:/org.blueberry.ui.qt/dark/checkbox-unchecked.svg);
}
QCheckBox::indicator:unchecked:hover {
image: url(:/org.blueberry.ui.qt/dark/checkbox-unchecked-hover.svg);
}
QCheckBox::indicator:unchecked:disabled {
image: url(:/org.blueberry.ui.qt/dark/checkbox-unchecked-disabled.svg);
}
QCheckBox::indicator:checked {
image: url(:/org.blueberry.ui.qt/dark/checkbox-checked.svg);
}
QCheckBox::indicator:checked:hover {
image: url(:/org.blueberry.ui.qt/dark/checkbox-checked-hover.svg);
}
QCheckBox::indicator:checked:disabled {
image: url(:/org.blueberry.ui.qt/dark/checkbox-checked-disabled.svg);
}
QRadioButton::indicator:unchecked {
image: url(:/org.blueberry.ui.qt/dark/radiobutton-unchecked.svg);
}
QRadioButton::indicator:unchecked:hover {
image: url(:/org.blueberry.ui.qt/dark/radiobutton-unchecked-hover.svg);
}
QRadioButton::indicator:unchecked:disabled {
image: url(:/org.blueberry.ui.qt/dark/radiobutton-unchecked-disabled.svg);
}
QRadioButton::indicator:checked {
image: url(:/org.blueberry.ui.qt/dark/radiobutton-checked.svg);
}
QRadioButton::indicator:checked:hover {
image: url(:/org.blueberry.ui.qt/dark/radiobutton-checked-hover.svg);
}
QRadioButton::indicator:checked:disabled {
image: url(:/org.blueberry.ui.qt/dark/radiobutton-checked-disabled.svg);
}
QSlider::groove {
background-color: #686868;
}
QSlider::groove:hover {
background-color: #9e9e9e;
}
QSlider::groove:horizontal {
height: 3px;
}
QSlider::groove:vertical {
width: 3px;
}
QSlider::handle {
background-color: #686868;
}
QSlider::handle:hover {
background-color: #1c97ea;
}
QSlider::handle:pressed {
background-color: #007acc;
}
QSlider::handle:horizontal {
margin: -8px 0;
width: 8px;
}
QSlider::handle::vertical {
margin: 0 -8px;
height: 8px;
}
QLineEdit:hover {
border: 1px solid #2b7de1;
}
QLabel, QLabel:disabled {
background-color: none;
}
QMenu {
border: 1px solid #3e3e40;
}
QMenu QWidget {
background-color: #1b1b1c;
}
QMenu::item {
background-color: #1b1b1c;
}
QMenu::item:selected {
background-color: #333334;
}
QMenu::separator {
height: 1px;
background-color: #3e3e40;
}
QMenuBar::item:selected {
background-color: #3e3e40;
}
QScrollBar {
background-color: #3e3e42;
}
QScrollBar:horizontal {
height: 18px;
margin: 0 18px 0 18px;
}
QScrollBar:vertical {
width: 18px;
margin: 18px 0 18px 0;
}
QScrollBar::handle {
background-color: #686868;
}
QScrollBar::handle:hover {
background-color: #9e9e9e;
}
QScrollBar::handle:pressed {
background-color: #efebef;
}
QScrollBar::handle:horizontal {
min-width: 18px;
margin: 4px 0 5px 0;
}
QScrollBar::handle:vertical {
min-height: 18px;
margin: 0 5px 0 4px;
}
QScrollBar::add-page, QScrollBar::sub-page {
background-color: none;
}
QScrollBar::add-line, QScrollBar::sub-line {
background-color: #3e3e42;
subcontrol-origin: margin;
}
QScrollBar::add-line:horizontal {
subcontrol-position: right;
width: 18px;
}
QScrollBar::sub-line:horizontal {
subcontrol-position: left;
width: 18px;
}
QScrollBar::add-line:vertical {
subcontrol-position: bottom;
height: 18px;
}
QScrollBar::sub-line:vertical {
subcontrol-position: top;
height: 18px;
}
QScrollBar::up-arrow, QScrollBar::right-arrow, QScrollBar:down-arrow, QScrollBar:left-arrow {
width: 18px;
height: 18px;
}
QScrollBar::down-arrow {
image: url(:/org.blueberry.ui.qt/dark/down-arrow.svg);
}
QScrollBar::down-arrow:disabled {
image: url(:/org.blueberry.ui.qt/dark/down-arrow-disabled.svg);
}
QScrollBar::down-arrow:hover {
image: url(:/org.blueberry.ui.qt/dark/down-arrow-hover.svg);
}
QScrollBar::down-arrow:pressed {
image: url(:/org.blueberry.ui.qt/dark/down-arrow-pressed.svg);
}
QScrollBar::left-arrow {
image: url(:/org.blueberry.ui.qt/dark/left-arrow.svg);
}
QScrollBar::left-arrow:disabled {
image: url(:/org.blueberry.ui.qt/dark/left-arrow-disabled.svg);
}
QScrollBar::left-arrow:hover {
image: url(:/org.blueberry.ui.qt/dark/left-arrow-hover.svg);
}
QScrollBar::left-arrow:pressed {
image: url(:/org.blueberry.ui.qt/dark/left-arrow-pressed.svg);
}
QScrollBar::right-arrow {
image: url(:/org.blueberry.ui.qt/dark/right-arrow.svg);
}
QScrollBar::right-arrow:disabled {
image: url(:/org.blueberry.ui.qt/dark/right-arrow-disabled.svg);
}
QScrollBar::right-arrow:hover {
image: url(:/org.blueberry.ui.qt/dark/right-arrow-hover.svg);
}
QScrollBar::right-arrow:pressed {
image: url(:/org.blueberry.ui.qt/dark/right-arrow-pressed.svg);
}
QScrollBar::up-arrow {
image: url(:/org.blueberry.ui.qt/dark/up-arrow.svg);
}
QScrollBar::up-arrow:disabled {
image: url(:/org.blueberry.ui.qt/dark/up-arrow-disabled.svg);
}
QScrollBar::up-arrow:hover {
image: url(:/org.blueberry.ui.qt/dark/up-arrow-hover.svg);
}
QScrollBar::up-arrow:pressed {
image: url(:/org.blueberry.ui.qt/dark/up-arrow-pressed.svg);
}
QTabWidget::pane {
border: 1px solid #434346;
}
QTabBar::tab {
background-color: #434346;
border: 1px solid #434346;
border-bottom: none;
padding: 4px;
}
QTabBar::tab:middle {
border-left: none;
}
QTabBar::tab:last {
border-left: none;
}
QTabBar::tab:next-selected {
border-right: none;
}
QTabBar::tab:selected {
border: 1px solid #434346;
border-bottom: none;
}
QTabBar::tab:!selected {
background-color: #2d2d30;
- margin-top: 4px;
}
QTabBar::tab:!selected:hover {
background-color: #434346;
}
#TabCloseButton {
background-color: none;
}
QTabBar QToolButton::left-arrow {
image: url(:/org.blueberry.ui.qt/dark/tight-left-arrow.svg);
}
QTabBar QToolButton::left-arrow:hover {
image: url(:/org.blueberry.ui.qt/dark/tight-left-arrow-hover.svg);
}
QTabBar QToolButton::left-arrow:pressed {
image: url(:/org.blueberry.ui.qt/dark/tight-left-arrow-pressed.svg);
}
QTabBar QToolButton::left-arrow:disabled {
image: url(:/org.blueberry.ui.qt/dark/tight-left-arrow-disabled.svg);
}
QTabBar QToolButton::right-arrow {
image: url(:/org.blueberry.ui.qt/dark/tight-right-arrow.svg);
}
QTabBar QToolButton::right-arrow:hover {
image: url(:/org.blueberry.ui.qt/dark/tight-right-arrow-hover.svg);
}
QTabBar QToolButton::right-arrow:pressed {
image: url(:/org.blueberry.ui.qt/dark/tight-right-arrow-pressed.svg);
}
QTabBar QToolButton::right-arrow:disabled {
image: url(:/org.blueberry.ui.qt/dark/tight-right-arrow-disabled.svg);
}
QTreeView::branch:closed:has-children:has-siblings,
QTreeView::branch:closed:has-children:!has-siblings {
image: url(:/org.blueberry.ui.qt/dark/right-arrow.svg);
}
QTreeView::branch:closed:has-children:has-siblings:hover,
QTreeView::branch:closed:has-children:!has-siblings:hover {
image: url(:/org.blueberry.ui.qt/dark/right-arrow-hover.svg);
}
QTreeView::branch:open:has-children:has-siblings,
QTreeView::branch:open:has-children:!has-siblings {
image: url(:/org.blueberry.ui.qt/dark/down-arrow.svg);
}
QTreeView::branch:open:has-children:has-siblings:hover,
QTreeView::branch:open:has-children:!has-siblings:hover {
image: url(:/org.blueberry.ui.qt/dark/down-arrow-hover.svg);
}
QTreeView::indicator:unchecked {
image: url(:/org.blueberry.ui.qt/dark/checkbox-unchecked.svg);
}
QTreeView::indicator:unchecked:selected {
image: url(:/org.blueberry.ui.qt/dark/checkbox-unchecked-hover.svg);
}
QTreeView::indicator:checked, QTreeView::indicator:indeterminate {
image: url(:/org.blueberry.ui.qt/dark/checkbox-checked.svg);
}
QTreeView::indicator:checked:selected, QTreeView::indicator:indeterminate:selected {
image: url(:/org.blueberry.ui.qt/dark/checkbox-checked-hover.svg);
}
diff --git a/Plugins/org.mitk.gui.qt.segmentation/files.cmake b/Plugins/org.mitk.gui.qt.segmentation/files.cmake
index f1c7d5d6dc..69bc5eadc3 100644
--- a/Plugins/org.mitk.gui.qt.segmentation/files.cmake
+++ b/Plugins/org.mitk.gui.qt.segmentation/files.cmake
@@ -1,81 +1,79 @@
set(SRC_CPP_FILES
QmitkSegmentationPreferencePage.cpp
)
set(INTERNAL_CPP_FILES
mitkPluginActivator.cpp
QmitkSegmentationView.cpp
QmitkThresholdAction.cpp
QmitkCreatePolygonModelAction.cpp
#QmitkStatisticsAction.cpp
QmitkAutocropAction.cpp
QmitkDeformableClippingPlaneView.cpp
Common/QmitkDataSelectionWidget.cpp
SegmentationUtilities/QmitkSegmentationUtilitiesView.cpp
SegmentationUtilities/QmitkSegmentationUtilityWidget.cpp
SegmentationUtilities/BooleanOperations/QmitkBooleanOperationsWidget.cpp
SegmentationUtilities/ImageMasking/QmitkImageMaskingWidget.cpp
SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidget.cpp
SegmentationUtilities/MorphologicalOperations/QmitkMorphologicalOperationsWidget.cpp
SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidget.cpp
- SegmentationUtilities/CTKWidgets/QmitkCTKWidgetsWidget.cpp
)
set(UI_FILES
src/internal/QmitkSegmentationControls.ui
src/internal/QmitkDeformableClippingPlaneViewControls.ui
src/internal/Common/QmitkDataSelectionWidgetControls.ui
src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesViewControls.ui
src/internal/SegmentationUtilities/BooleanOperations/QmitkBooleanOperationsWidgetControls.ui
src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidgetControls.ui
src/internal/SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidgetControls.ui
src/internal/SegmentationUtilities/MorphologicalOperations/QmitkMorphologicalOperationsWidgetControls.ui
src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidgetControls.ui
)
set(MOC_H_FILES
src/QmitkSegmentationPreferencePage.h
src/internal/mitkPluginActivator.h
src/internal/QmitkSegmentationView.h
src/internal/QmitkThresholdAction.h
src/internal/QmitkCreatePolygonModelAction.h
#src/internal/QmitkStatisticsAction.h
src/internal/QmitkAutocropAction.h
src/internal/QmitkDeformableClippingPlaneView.h
src/internal/Common/QmitkDataSelectionWidget.h
src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesView.h
src/internal/SegmentationUtilities/QmitkSegmentationUtilityWidget.h
src/internal/SegmentationUtilities/BooleanOperations/QmitkBooleanOperationsWidget.h
src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidget.h
src/internal/SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidget.h
src/internal/SegmentationUtilities/MorphologicalOperations/QmitkMorphologicalOperationsWidget.h
src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidget.h
- src/internal/SegmentationUtilities/CTKWidgets/QmitkCTKWidgetsWidget.h
)
set(CACHED_RESOURCE_FILES
resources/segmentation.svg
resources/deformablePlane.png
resources/clipping_plane_translate_48x48.png
resources/clipping_plane_rotate48x48.png
resources/clipping_plane_deform48x48.png
resources/segmentation_utilities.svg
plugin.xml
)
set(QRC_FILES
resources/segmentation.qrc
resources/SegmentationUtilities.qrc
resources/BooleanOperationsWidget.qrc
resources/MorphologicalOperationsWidget.qrc
)
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.gui.qt.segmentation/resources/CTKWidgets_48x48.png b/Plugins/org.mitk.gui.qt.segmentation/resources/CTKWidgets_48x48.png
deleted file mode 100644
index 34faebcdef..0000000000
Binary files a/Plugins/org.mitk.gui.qt.segmentation/resources/CTKWidgets_48x48.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.segmentation/resources/SegmentationUtilities.qrc b/Plugins/org.mitk.gui.qt.segmentation/resources/SegmentationUtilities.qrc
index 7bf9be6d2f..61e2804c10 100644
--- a/Plugins/org.mitk.gui.qt.segmentation/resources/SegmentationUtilities.qrc
+++ b/Plugins/org.mitk.gui.qt.segmentation/resources/SegmentationUtilities.qrc
@@ -1,13 +1,12 @@
BooleanOperations_48x48.png
ContourModelSetToImage_48x48.png
ImageMasking_48x48.png
MorphologicalOperations_48x48.png
SurfaceToImage_48x48.png
segmentation_utilities.svg
- CTKWidgets_48x48.png
BooleanLabelA_32x32.png
BooleanLabelB_32x32.png
diff --git a/Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/CTKWidgets/QmitkCTKWidgetsWidget.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/CTKWidgets/QmitkCTKWidgetsWidget.cpp
deleted file mode 100644
index 027aca0c47..0000000000
--- a/Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/CTKWidgets/QmitkCTKWidgetsWidget.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*===================================================================
-
-The Medical Imaging Interaction Toolkit (MITK)
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-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 "QmitkCTKWidgetsWidget.h"
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-QmitkCTKWidgetsWidget::QmitkCTKWidgetsWidget(mitk::SliceNavigationController* timeNavigationController, QWidget* parent)
- : QmitkSegmentationUtilityWidget(timeNavigationController, parent)
-{
- auto layout = new QVBoxLayout(this);
- this->setLayout(layout);
-
- layout->addWidget(new QLabel("ctkDoubleSlider", this));
- layout->addWidget(new ctkDoubleSlider(Qt::Horizontal, this));
-
- layout->addWidget(new QLabel("ctkDoubleRangeSlider", this));
- layout->addWidget(new ctkDoubleRangeSlider(Qt::Horizontal, this));
-
- layout->addWidget(new QLabel("ctkRangeWidget", this));
- layout->addWidget(new ctkRangeWidget(this));
-
- QIcon icon(":/SegmentationUtilities/CTKWidgets_48x48.png");
-
- auto menu = new QMenu(this);
- menu->addAction(icon, "Axial");
- menu->addAction(icon, "Sagittal");
- menu->addAction(icon, "Coronal");
-
- ctkMenuButton* menuButton = new ctkMenuButton("Apply", this);
- menuButton->setMenu(menu);
- layout->addWidget(new QLabel("ctkMenuButton", this));
- layout->addWidget(menuButton);
-
- layout->addStretch();
-}
-
-QmitkCTKWidgetsWidget::~QmitkCTKWidgetsWidget()
-{
-}
diff --git a/Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/CTKWidgets/QmitkCTKWidgetsWidget.h b/Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/CTKWidgets/QmitkCTKWidgetsWidget.h
deleted file mode 100644
index a0bc226b2c..0000000000
--- a/Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/CTKWidgets/QmitkCTKWidgetsWidget.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*===================================================================
-
-The Medical Imaging Interaction Toolkit (MITK)
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-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 QmitkCTKWidgetsWidget_h
-#define QmitkCTKWidgetsWidget_h
-
-#include "../QmitkSegmentationUtilityWidget.h"
-
-class QmitkCTKWidgetsWidget : public QmitkSegmentationUtilityWidget
-{
- Q_OBJECT
-
-public:
- explicit QmitkCTKWidgetsWidget(mitk::SliceNavigationController* timeNavigationController, QWidget* parent = nullptr);
- ~QmitkCTKWidgetsWidget();
-};
-
-#endif
diff --git a/Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesView.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesView.cpp
index c065165cff..6f23a8e237 100644
--- a/Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesView.cpp
+++ b/Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesView.cpp
@@ -1,105 +1,88 @@
/*===================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
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.
===================================================================*/
-// #define ENABLE_CTK_WIDGETS_WIDGET
-
#include "QmitkSegmentationUtilitiesView.h"
#include "BooleanOperations/QmitkBooleanOperationsWidget.h"
#include "ContourModelToImage/QmitkContourModelToImageWidget.h"
#include "ImageMasking/QmitkImageMaskingWidget.h"
#include "MorphologicalOperations/QmitkMorphologicalOperationsWidget.h"
#include "SurfaceToImage/QmitkSurfaceToImageWidget.h"
-#include "CTKWidgets/QmitkCTKWidgetsWidget.h"
QmitkSegmentationUtilitiesView::QmitkSegmentationUtilitiesView()
: m_BooleanOperationsWidget(nullptr),
m_ContourModelToImageWidget(nullptr),
m_ImageMaskingWidget(nullptr),
m_MorphologicalOperationsWidget(nullptr),
- m_SurfaceToImageWidget(nullptr),
- m_CTKWidgetsWidget(nullptr)
+ m_SurfaceToImageWidget(nullptr)
{
}
QmitkSegmentationUtilitiesView::~QmitkSegmentationUtilitiesView()
{
}
void QmitkSegmentationUtilitiesView::CreateQtPartControl(QWidget* parent)
{
m_Controls.setupUi(parent);
mitk::IRenderWindowPart* renderWindowPart = this->GetRenderWindowPart();
mitk::SliceNavigationController* timeNavigationController = renderWindowPart != nullptr
? renderWindowPart->GetTimeNavigationController()
: nullptr;
m_BooleanOperationsWidget = new QmitkBooleanOperationsWidget(timeNavigationController, parent);
m_ContourModelToImageWidget = new QmitkContourModelToImageWidget(timeNavigationController, parent);
m_ImageMaskingWidget = new QmitkImageMaskingWidget(timeNavigationController, parent);
m_MorphologicalOperationsWidget = new QmitkMorphologicalOperationsWidget(timeNavigationController, parent);
m_SurfaceToImageWidget = new QmitkSurfaceToImageWidget(timeNavigationController, parent);
this->AddUtilityWidget(m_BooleanOperationsWidget, QIcon(":/SegmentationUtilities/BooleanOperations_48x48.png"), "Boolean Operations");
this->AddUtilityWidget(m_ContourModelToImageWidget, QIcon(":/SegmentationUtilities/ContourModelSetToImage_48x48.png"), "Contour To Image");
this->AddUtilityWidget(m_ImageMaskingWidget, QIcon(":/SegmentationUtilities/ImageMasking_48x48.png"), "Image Masking");
this->AddUtilityWidget(m_MorphologicalOperationsWidget, QIcon(":/SegmentationUtilities/MorphologicalOperations_48x48.png"), "Morphological Operations");
this->AddUtilityWidget(m_SurfaceToImageWidget, QIcon(":/SegmentationUtilities/SurfaceToImage_48x48.png"), "Surface To Image");
-
-#ifdef ENABLE_CTK_WIDGETS_WIDGET
- m_CTKWidgetsWidget = new QmitkCTKWidgetsWidget(timeNavigationController, parent);
- this->AddUtilityWidget(m_CTKWidgetsWidget, QIcon(":/SegmentationUtilities/CTKWidgets_48x48.png"), "CTK Widgets");
-#endif
}
void QmitkSegmentationUtilitiesView::AddUtilityWidget(QWidget* widget, const QIcon& icon, const QString& text)
{
m_Controls.toolBox->addItem(widget, icon, text);
}
void QmitkSegmentationUtilitiesView::SetFocus()
{
m_Controls.toolBox->setFocus();
}
void QmitkSegmentationUtilitiesView::RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart)
{
mitk::SliceNavigationController* timeNavigationController = renderWindowPart->GetTimeNavigationController();
m_BooleanOperationsWidget->SetTimeNavigationController(timeNavigationController);
m_ContourModelToImageWidget->SetTimeNavigationController(timeNavigationController);
m_ImageMaskingWidget->SetTimeNavigationController(timeNavigationController);
m_MorphologicalOperationsWidget->SetTimeNavigationController(timeNavigationController);
m_SurfaceToImageWidget->SetTimeNavigationController(timeNavigationController);
-
-#ifdef ENABLE_CTK_WIDGETS_WIDGET
- m_CTKWidgetsWidget->SetTimeNavigationController(timeNavigationController);
-#endif
}
void QmitkSegmentationUtilitiesView::RenderWindowPartDeactivated(mitk::IRenderWindowPart*)
{
m_BooleanOperationsWidget->SetTimeNavigationController(nullptr);
m_ContourModelToImageWidget->SetTimeNavigationController(nullptr);
m_ImageMaskingWidget->SetTimeNavigationController(nullptr);
m_MorphologicalOperationsWidget->SetTimeNavigationController(nullptr);
m_SurfaceToImageWidget->SetTimeNavigationController(nullptr);
-
-#ifdef ENABLE_CTK_WIDGETS_WIDGET
- m_CTKWidgetsWidget->SetTimeNavigationController(nullptr);
-#endif
}
diff --git a/Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesView.h b/Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesView.h
index aa48ab7c0b..20fdeb6070 100644
--- a/Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesView.h
+++ b/Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesView.h
@@ -1,57 +1,55 @@
/*===================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
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 QmitkSegmentationUtilitiesView_h
#define QmitkSegmentationUtilitiesView_h
#include
#include
#include
class QmitkBooleanOperationsWidget;
class QmitkContourModelToImageWidget;
class QmitkImageMaskingWidget;
class QmitkMorphologicalOperationsWidget;
class QmitkSurfaceToImageWidget;
-class QmitkCTKWidgetsWidget;
class QmitkSegmentationUtilitiesView : public QmitkAbstractView, public mitk::IRenderWindowPartListener
{
Q_OBJECT
public:
QmitkSegmentationUtilitiesView();
~QmitkSegmentationUtilitiesView();
void CreateQtPartControl(QWidget* parent) override;
void SetFocus() override;
void RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart) override;
void RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderWindowPart) override;
private:
void AddUtilityWidget(QWidget* widget, const QIcon& icon, const QString& text);
Ui::QmitkSegmentationUtilitiesViewControls m_Controls;
QmitkBooleanOperationsWidget* m_BooleanOperationsWidget;
QmitkContourModelToImageWidget* m_ContourModelToImageWidget;
QmitkImageMaskingWidget* m_ImageMaskingWidget;
QmitkMorphologicalOperationsWidget* m_MorphologicalOperationsWidget;
QmitkSurfaceToImageWidget* m_SurfaceToImageWidget;
- QmitkCTKWidgetsWidget* m_CTKWidgetsWidget;
};
#endif