diff --git a/Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/NewSegmentationSession_48x48.png b/Modules/SegmentationUI/resources/NewSegmentation_48x48.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/NewSegmentationSession_48x48.png
rename to Modules/SegmentationUI/resources/NewSegmentation_48x48.png
diff --git a/Modules/SegmentationUI/resources/SegmentationUI.qrc b/Modules/SegmentationUI/resources/SegmentationUI.qrc
index d39c0b1016..cfab8d398d 100644
--- a/Modules/SegmentationUI/resources/SegmentationUI.qrc
+++ b/Modules/SegmentationUI/resources/SegmentationUI.qrc
@@ -1,39 +1,40 @@
AcceptCurrentInterpolation.png
AcceptAllInterpolations.png
AcceptSurfaceInterpolation.png
BooleanDifference_48x48.png
BooleanIntersection_48x48.png
BooleanUnion_48x48.png
Accept_48x48.png
Cancel_48x48.png
Run_48x48.png
ImportLabelSet_48x48.png
ImportLabeledImage_48x48.png
DeleteLayer_48x48.png
PreviousLayer_48x48.png
NextLayer_48x48.png
AddLayer_48x48.png
SegmentationInteractor_48x48.png
LockExterior_48x48.png
UnlockExterior_48x48.png
NewLabel_48x48.png
+ NewSegmentation_48x48.png
ClearSeeds_48x48.png
Start.png
Stop.png
Help_48x48.png
AdvancedTools.png
visible.svg
invisible.svg
lock.svg
unlock.svg
MergeLabels.png
RemoveLabel.png
EraseLabel.png
CreateSurface.png
CreateMask.png
RandomColor.png
RenameLabel.png
diff --git a/Plugins/org.mitk.gui.qt.multilabelsegmentation/files.cmake b/Plugins/org.mitk.gui.qt.multilabelsegmentation/files.cmake
index 92c311902c..84c2868566 100644
--- a/Plugins/org.mitk.gui.qt.multilabelsegmentation/files.cmake
+++ b/Plugins/org.mitk.gui.qt.multilabelsegmentation/files.cmake
@@ -1,101 +1,100 @@
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/NewSegmentationSession_48x48.png
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/resources/multilabelsegmentation.qrc b/Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/multilabelsegmentation.qrc
index b8493eaab3..2e294d12aa 100644
--- a/Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/multilabelsegmentation.qrc
+++ b/Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/multilabelsegmentation.qrc
@@ -1,6 +1,5 @@
multilabelsegmentation.svg
- NewSegmentationSession_48x48.png
diff --git a/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationViewControls.ui b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationViewControls.ui
index 595e2dbba9..29e1076d6b 100644
--- a/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationViewControls.ui
@@ -1,306 +1,316 @@
QmitkSegmentationViewControls
0
0
300
600
0
0
-
0
0
Data selection
-
Selected image
-
0
40
-
Selected segmentation
-
0
40
-
Create a new segmentation
- New...
+ ...
-
- Qt::ToolButtonTextOnly
+
+
+ :/Qmitk/NewSegmentation_48x48.png:/Qmitk/NewSegmentation_48x48.png
+
+
+
+ 28
+ 28
+
+
+
+ true
-
0
0
true
-
0
0
-
0
0
-
0
0
QTabWidget::tab-bar { alignment: middle; }
0
2D tools
-
0
0
50
false
-
0
0
50
false
-
0
0
50
false
-
Qt::Vertical
20
40
3D tools
-
0
0
50
false
-
0
0
50
false
-
Qt::Vertical
20
40
-
Qt::Vertical
20
40
QmitkSingleNodeSelectionWidget
QWidget
QmitkSingleNodeSelectionWidget.h
1
QmitkLayersWidget
QWidget
internal/Common/QmitkLayersWidget.h
1
QmitkLabelsWidget
QWidget
internal/Common/QmitkLabelsWidget.h
1
QmitkToolSelectionBox
QWidget
QmitkToolGUIArea
QWidget
QmitkSlicesInterpolator
QWidget
QmitkSlicesInterpolator.h