Merge branch 'bugfix/T29318-SegmentationToolIconsAndCursors' into develop
1f6ec651fa54
Actions

Description

Merge branch 'bugfix/T29318-SegmentationToolIconsAndCursors' into develop

Details

Provenance

kislinsk	Authored on Oct 4 2022, 5:08 PM
kislinsk	Pushed on Oct 4 2022, 5:08 PM

Parents

rMITK57d5e382d392: Set new resource file names
rMITKe5f00365d075: T29078-Fix_erase_tool

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK1f6ec651fa54: Merge branch 'bugfix/T29318-SegmentationToolIconsAndCursors' into develop (authored by kislinsk).Oct 4 2022, 5:08 PM

kislinsk mentioned this in T29327: 2022 Week 40 (Very Early October).Oct 6 2022, 5:46 AM

Merged Changes

57d5e382d392 Set new resource file names
Author
kislinsk
Browse Repository
No Builds
No Audits
4846fc735537 Improve icon and cursor for Close segmentation tool
Author
kislinsk
Browse Repository
No Builds
No Audits
e7d267f68790 Merge remote-tracking branch 'origin/develop' into bugfix/T29318…
Author
kislinsk
Browse Repository
No Builds
No Audits
752c7855db19 Use SVG icons and cursors for segmentation tools
Author
kislinsk
Browse Repository
No Builds
No Audits
a75def7c9049 Improve templates for segmentation tool icons and cursors
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (71)

Path

Size

Packages

Modules/

Segmentation/

Interactions/

mitkAddContourTool.cpp

O1: MITK Reviewer Group I

mitkBinaryThresholdTool.cpp

O1: MITK Reviewer Group I

mitkBinaryThresholdULTool.cpp

O1: MITK Reviewer Group I

mitkCloseRegionTool.cpp

O1: MITK Reviewer Group I

mitkDrawPaintbrushTool.cpp

O1: MITK Reviewer Group I

mitkErasePaintbrushTool.cpp

O1: MITK Reviewer Group I

mitkEraseRegionTool.cpp

O1: MITK Reviewer Group I

mitkFillRegionTool.cpp

O1: MITK Reviewer Group I

mitkLassoTool.cpp

O1: MITK Reviewer Group I

mitkLiveWireTool2D.cpp

O1: MITK Reviewer Group I

mitkOtsuTool3D.cpp

O1: MITK Reviewer Group I

mitkPickingTool.cpp

O1: MITK Reviewer Group I

mitkRegionGrowingTool.cpp

O1: MITK Reviewer Group I

mitkSubtractContourTool.cpp

O1: MITK Reviewer Group I

mitknnUnetTool.cpp

O1: MITK Reviewer Group I

Resources/

AI.svg

O1: MITK Reviewer Group I

AI_48x48.png

O1: MITK Reviewer Group I

AI_Cursor.svg

O1: MITK Reviewer Group I

AI_Cursor_32x32.png

O1: MITK Reviewer Group I

Add.svg

O1: MITK Reviewer Group I

Add_48x48.png

O1: MITK Reviewer Group I

Add_Cursor.svg

O1: MITK Reviewer Group I

Add_Cursor_32x32.png

O1: MITK Reviewer Group I

Close.svg

O1: MITK Reviewer Group I

Close_Cursor.svg

O1: MITK Reviewer Group I

Erase.svg

O1: MITK Reviewer Group I

Erase_48x48.png

O1: MITK Reviewer Group I

Erase_Cursor.svg

O1: MITK Reviewer Group I

Erase_Cursor_32x32.png

O1: MITK Reviewer Group I

Fill.svg

O1: MITK Reviewer Group I

Fill_48x48.png

O1: MITK Reviewer Group I

Fill_Cursor.svg

O1: MITK Reviewer Group I

Fill_Cursor_32x32.png

O1: MITK Reviewer Group I

Icons.svg

O1: MITK Reviewer Group I

Lasso.svg

O1: MITK Reviewer Group I

Lasso_Cursor.svg

O1: MITK Reviewer Group I

LiveWire.svg

O1: MITK Reviewer Group I

LiveWire_48x48.png

O1: MITK Reviewer Group I

LiveWire_Cursor.svg

O1: MITK Reviewer Group I

LiveWire_Cursor_32x32.png

O1: MITK Reviewer Group I

NewAdd_48x48.png

O1: MITK Reviewer Group I

NewAdd_Cursor_32x32.png

O1: MITK Reviewer Group I

Otsu.svg

O1: MITK Reviewer Group I

Otsu_48x48.png

O1: MITK Reviewer Group I

Paint.svg

O1: MITK Reviewer Group I

Paint_48x48.png

O1: MITK Reviewer Group I

Paint_Cursor.svg

O1: MITK Reviewer Group I

Paint_Cursor_32x32.png

O1: MITK Reviewer Group I

Pick_48x48.png

O1: MITK Reviewer Group I

Picking.svg

O1: MITK Reviewer Group I

RegionGrowing.svg

O1: MITK Reviewer Group I

RegionGrowing_48x48.png

O1: MITK Reviewer Group I

RegionGrowing_Cursor.svg

O1: MITK Reviewer Group I

RegionGrowing_Cursor_32x32.png

O1: MITK Reviewer Group I

Subtract.svg

O1: MITK Reviewer Group I

Subtract_48x48.png

O1: MITK Reviewer Group I

Subtract_Cursor.svg

O1: MITK Reviewer Group I

Subtract_Cursor_32x32.png

O1: MITK Reviewer Group I

Templates

O1: MITK Reviewer Group I

ToolCursor.svg

O1: MITK Reviewer Group I

ToolIcon.svg

O1: MITK Reviewer Group I

Threshold.svg

O1: MITK Reviewer Group I

Threshold_48x48.png

O1: MITK Reviewer Group I

TwoThresholds_48x48.png

O1: MITK Reviewer Group I

ULThreshold.svg

O1: MITK Reviewer Group I

Wipe.svg

O1: MITK Reviewer Group I

Wipe_48x48.png

O1: MITK Reviewer Group I

Wipe_Cursor.svg

O1: MITK Reviewer Group I

Wipe_Cursor_32x32.png

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.segmentation/

documentation/

UserManual/

QmitkSegmentation_IMGIconClose.png

O1: MITK Reviewer Group I

rMITK1f6ec651fa54

View Options

Modules/Segmentation/Interactions/mitkAddContourTool.cpp

View Options

Modules/Segmentation/Interactions/mitkBinaryThresholdTool.cpp

View Options

Modules/Segmentation/Interactions/mitkBinaryThresholdULTool.cpp

View Options

Modules/Segmentation/Interactions/mitkCloseRegionTool.cpp

View Options

Modules/Segmentation/Interactions/mitkDrawPaintbrushTool.cpp

View Options

Modules/Segmentation/Interactions/mitkErasePaintbrushTool.cpp

View Options

Modules/Segmentation/Interactions/mitkEraseRegionTool.cpp

View Options

Modules/Segmentation/Interactions/mitkFillRegionTool.cpp

View Options

Modules/Segmentation/Interactions/mitkLassoTool.cpp

View Options

Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp

View Options

Modules/Segmentation/Interactions/mitkOtsuTool3D.cpp

View Options

Modules/Segmentation/Interactions/mitkPickingTool.cpp

View Options

Modules/Segmentation/Interactions/mitkRegionGrowingTool.cpp

View Options

Modules/Segmentation/Interactions/mitkSubtractContourTool.cpp

View Options

Modules/Segmentation/Interactions/mitknnUnetTool.cpp

View Options

Modules/Segmentation/Resources/AI.svg

View Options

Modules/Segmentation/Resources/AI_48x48.png

View Options

Modules/Segmentation/Resources/AI_Cursor.svg

View Options

Modules/Segmentation/Resources/AI_Cursor_32x32.png

View Options

Modules/Segmentation/Resources/Add.svg

View Options

Modules/Segmentation/Resources/Add_48x48.png

View Options

Modules/Segmentation/Resources/Add_Cursor.svg

View Options

Modules/Segmentation/Resources/Add_Cursor_32x32.png

View Options

Modules/Segmentation/Resources/Close.svg

View Options

Modules/Segmentation/Resources/Close_Cursor.svg

View Options

Modules/Segmentation/Resources/Erase.svg

View Options

Modules/Segmentation/Resources/Erase_48x48.png

View Options

Modules/Segmentation/Resources/Erase_Cursor.svg

View Options

Modules/Segmentation/Resources/Erase_Cursor_32x32.png

View Options

Modules/Segmentation/Resources/Fill.svg

View Options

Modules/Segmentation/Resources/Fill_48x48.png

View Options

Modules/Segmentation/Resources/Fill_Cursor.svg

View Options

Modules/Segmentation/Resources/Fill_Cursor_32x32.png

View Options

Modules/Segmentation/Resources/Icons.svg

View Options

Modules/Segmentation/Resources/Lasso.svg

View Options

Modules/Segmentation/Resources/Lasso_Cursor.svg

View Options

Modules/Segmentation/Resources/LiveWire.svg

View Options

Modules/Segmentation/Resources/LiveWire_48x48.png

View Options

Modules/Segmentation/Resources/LiveWire_Cursor.svg

View Options

Modules/Segmentation/Resources/LiveWire_Cursor_32x32.png

View Options

Modules/Segmentation/Resources/NewAdd_48x48.png

View Options

Modules/Segmentation/Resources/NewAdd_Cursor_32x32.png

View Options

Modules/Segmentation/Resources/Otsu.svg

View Options

Modules/Segmentation/Resources/Otsu_48x48.png

View Options

Modules/Segmentation/Resources/Paint.svg

View Options

Modules/Segmentation/Resources/Paint_48x48.png

View Options

Modules/Segmentation/Resources/Paint_Cursor.svg

View Options

Modules/Segmentation/Resources/Paint_Cursor_32x32.png

View Options

Modules/Segmentation/Resources/Pick_48x48.png

View Options

Modules/Segmentation/Resources/Picking.svg

View Options

Modules/Segmentation/Resources/RegionGrowing.svg

View Options

Modules/Segmentation/Resources/RegionGrowing_48x48.png

View Options

Modules/Segmentation/Resources/RegionGrowing_Cursor.svg

View Options

Modules/Segmentation/Resources/RegionGrowing_Cursor_32x32.png

View Options

Modules/Segmentation/Resources/Subtract.svg

View Options

Modules/Segmentation/Resources/Subtract_48x48.png

View Options

Modules/Segmentation/Resources/Subtract_Cursor.svg

View Options

Modules/Segmentation/Resources/Subtract_Cursor_32x32.png

View Options

Modules/Segmentation/Resources/Templates/ToolCursor.svg

View Options

Modules/Segmentation/Resources/Templates/ToolIcon.svg

View Options

Modules/Segmentation/Resources/Threshold.svg

View Options

Modules/Segmentation/Resources/Threshold_48x48.png

View Options

Modules/Segmentation/Resources/TwoThresholds_48x48.png

View Options

Modules/Segmentation/Resources/ULThreshold.svg

View Options

Modules/Segmentation/Resources/Wipe.svg

View Options

Modules/Segmentation/Resources/Wipe_48x48.png

View Options

Modules/Segmentation/Resources/Wipe_Cursor.svg

View Options

Modules/Segmentation/Resources/Wipe_Cursor_32x32.png

View Options

Modules/Segmentation/files.cmake

View Options

Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_IMGIconClose.png

Merge branch 'bugfix/T29318-SegmentationToolIconsAndCursors' into develop1f6ec651fa54Actions

Description

Details

Event Timeline

Merged Changes

Changes (71)

rMITK1f6ec651fa54

Modules/Segmentation/Interactions/mitkAddContourTool.cpp

Modules/Segmentation/Interactions/mitkBinaryThresholdTool.cpp

Modules/Segmentation/Interactions/mitkBinaryThresholdULTool.cpp

Modules/Segmentation/Interactions/mitkCloseRegionTool.cpp

Modules/Segmentation/Interactions/mitkDrawPaintbrushTool.cpp

Modules/Segmentation/Interactions/mitkErasePaintbrushTool.cpp

Modules/Segmentation/Interactions/mitkEraseRegionTool.cpp

Modules/Segmentation/Interactions/mitkFillRegionTool.cpp

Modules/Segmentation/Interactions/mitkLassoTool.cpp

Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp

Modules/Segmentation/Interactions/mitkOtsuTool3D.cpp

Modules/Segmentation/Interactions/mitkPickingTool.cpp

Modules/Segmentation/Interactions/mitkRegionGrowingTool.cpp

Modules/Segmentation/Interactions/mitkSubtractContourTool.cpp

Modules/Segmentation/Interactions/mitknnUnetTool.cpp

Modules/Segmentation/Resources/AI.svg

Modules/Segmentation/Resources/AI_48x48.png

Modules/Segmentation/Resources/AI_Cursor.svg

Modules/Segmentation/Resources/AI_Cursor_32x32.png

Modules/Segmentation/Resources/Add.svg

Modules/Segmentation/Resources/Add_48x48.png

Modules/Segmentation/Resources/Add_Cursor.svg

Modules/Segmentation/Resources/Add_Cursor_32x32.png

Modules/Segmentation/Resources/Close.svg

Modules/Segmentation/Resources/Close_Cursor.svg

Modules/Segmentation/Resources/Erase.svg

Modules/Segmentation/Resources/Erase_48x48.png

Modules/Segmentation/Resources/Erase_Cursor.svg

Modules/Segmentation/Resources/Erase_Cursor_32x32.png

Modules/Segmentation/Resources/Fill.svg

Modules/Segmentation/Resources/Fill_48x48.png

Modules/Segmentation/Resources/Fill_Cursor.svg

Modules/Segmentation/Resources/Fill_Cursor_32x32.png

Modules/Segmentation/Resources/Icons.svg

Modules/Segmentation/Resources/Lasso.svg

Modules/Segmentation/Resources/Lasso_Cursor.svg

Modules/Segmentation/Resources/LiveWire.svg

Modules/Segmentation/Resources/LiveWire_48x48.png

Modules/Segmentation/Resources/LiveWire_Cursor.svg

Modules/Segmentation/Resources/LiveWire_Cursor_32x32.png

Modules/Segmentation/Resources/NewAdd_48x48.png

Modules/Segmentation/Resources/NewAdd_Cursor_32x32.png

Modules/Segmentation/Resources/Otsu.svg

Modules/Segmentation/Resources/Otsu_48x48.png

Modules/Segmentation/Resources/Paint.svg

Modules/Segmentation/Resources/Paint_48x48.png

Modules/Segmentation/Resources/Paint_Cursor.svg

Modules/Segmentation/Resources/Paint_Cursor_32x32.png

Modules/Segmentation/Resources/Pick_48x48.png

Modules/Segmentation/Resources/Picking.svg

Modules/Segmentation/Resources/RegionGrowing.svg

Modules/Segmentation/Resources/RegionGrowing_48x48.png

Modules/Segmentation/Resources/RegionGrowing_Cursor.svg

Modules/Segmentation/Resources/RegionGrowing_Cursor_32x32.png

Modules/Segmentation/Resources/Subtract.svg

Modules/Segmentation/Resources/Subtract_48x48.png

Modules/Segmentation/Resources/Subtract_Cursor.svg

Modules/Segmentation/Resources/Subtract_Cursor_32x32.png

Modules/Segmentation/Resources/Templates/ToolCursor.svg

Modules/Segmentation/Resources/Templates/ToolIcon.svg

Modules/Segmentation/Resources/Threshold.svg

Modules/Segmentation/Resources/Threshold_48x48.png

Modules/Segmentation/Resources/TwoThresholds_48x48.png

Modules/Segmentation/Resources/ULThreshold.svg

Modules/Segmentation/Resources/Wipe.svg

Modules/Segmentation/Resources/Wipe_48x48.png

Modules/Segmentation/Resources/Wipe_Cursor.svg

Modules/Segmentation/Resources/Wipe_Cursor_32x32.png

Modules/Segmentation/files.cmake

Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_IMGIconClose.png

Merge branch 'bugfix/T29318-SegmentationToolIconsAndCursors' into develop
1f6ec651fa54
Actions