Merge commit 'a0dedffb74dbcb57726366a56716f489ccf18337' into…
889987359cfb
Actions

Description

Merge commit 'a0dedffb74dbcb57726366a56716f489ccf18337' into personal/floca/DIPP-2016-12 (synced MITK-Codebase for DIPP with release)

Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>

Details

Provenance

floca	Authored on Mar 3 2017, 2:11 PM
floca	Pushed on Mar 3 2017, 2:11 PM

Parents

rMITKa0dedffb74db: Update version information for release
rMITK049f5b6c9abe: Allow C++ 14 features like make_unique

Branches

Tags

Event Timeline

floca committed rMITK889987359cfb: Merge commit 'a0dedffb74dbcb57726366a56716f489ccf18337' into… (authored by floca).Mar 3 2017, 2:11 PM

Merged Changes

a0dedffb74db Update version information for release
Author
• goch
Browse Repository
No Builds
No Audits
2e98fbf0333d Update MatchPoint Fixes T22463
Author
• goch
Browse Repository
No Builds
No Audits
4185189481fb fixed improper handling of this->Modified() in MaskGenerators and…
Author
isensee
Browse Repository
No Builds
No Audits
1ab5094365a3 added a teardown function to the test. this solves the memory leak
Author
isensee
Browse Repository
No Builds
No Audits
0c8004985016 Copy translation files to installer
Author
• goch
Browse Repository
No Builds
No Audits
42f6b6894153 Alter multilabel segmentation icons
Author
kislinsk
Browse Repository
No Builds
No Audits
d8812b100700 Fix gcc compiler warning treated as error: sign-compare
Author
kalali
Browse Repository
No Builds
No Audits
c628853b411d Add component extraction for multi-component images; use component extraction…
Author
kalali
Browse Repository
No Builds
No Audits
688f6e1c442d Merge branch 'T22412-prevent-regiongrowing-timestep-crash' into releases/2016…
Author
• goch
Browse Repository
No Builds
No Audits
0809fc098abd Only use timestep zero as the extracted slices contain only the current timestep
Author
• goch
Browse Repository
No Builds
No Audits
afb33628c6e5 Merge branch 'T22442-Housekeeping' into releases/2016-11-beta
Author
kislinsk
Browse Repository
No Builds
No Audits
18af2dce0b77 Update more URLs
Author
kislinsk
Browse Repository
No Builds
No Audits
3a62f7af3887 Update URLs, minimal required versions, and stuff
Author
kislinsk
Browse Repository
No Builds
No Audits
ab1d36b72bd9 Merge branch 'T22437-update-build-instructions' into releases/2016-11-beta
Author
• goch
Browse Repository
No Builds
No Audits
9a15aa367750 Update documentation
Author
• goch
Browse Repository
No Builds
No Audits

Changes (34)

Path

Size

Packages

Applications/

PluginGenerator/

ProjectTemplate/

CMakeExternals/

MITK.cmake

CMakeLists.txt

CMake/

MITKDashboardScript.TEMPLATE.cmake

O1: MITK Reviewer Group I

MITKDashboardSetup.cmake

O1: MITK Reviewer Group I

mitkInstallRules.cmake

O1: MITK Reviewer Group I

CMakeExternals/

MatchPoint.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Changelog.txt

Documentation/

Doxygen/

3-DeveloperManual/

Starting/

SettingUpMITK/

BuildInstructions.dox

BuildToolkits.dox

4-API/

Pages.dox

LICENSE.txt

Modules/

ImageStatistics/

Testing/

mitkImageStatisticsCalculatorTest.cpp

O1: MITK Reviewer Group I

mitkHotspotMaskGenerator.cpp

O1: MITK Reviewer Group I

mitkHotspotMaskGenerator.h

O1: MITK Reviewer Group I

mitkIgnorePixelMaskGenerator.cpp

O1: MITK Reviewer Group I

mitkIgnorePixelMaskGenerator.h

O1: MITK Reviewer Group I

mitkImageMaskGenerator.cpp

O1: MITK Reviewer Group I

mitkImageMaskGenerator.h

O1: MITK Reviewer Group I

mitkImageStatisticsCalculator.cpp

O1: MITK Reviewer Group I

mitkMaskGenerator.cpp

O1: MITK Reviewer Group I

mitkMaskGenerator.h

O1: MITK Reviewer Group I

mitkPlanarFigureMaskGenerator.cpp

O1: MITK Reviewer Group I

mitkPlanarFigureMaskGenerator.h

O1: MITK Reviewer Group I

QtWidgetsExt/

resource/

logo_dkfz.png

O3: MITK Reviewer Group II

src/

QmitkAboutDialogGUI.ui

O3: MITK Reviewer Group II

Segmentation/

Interactions/

mitkRegionGrowingTool.cpp

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.multilabelsegmentation/

resources/

BooleanOperations_48x48.png

Icons.svg

MultiLabelSegmentationUtilities_48x48.png

multilabelsegmentation.png

README.md

Widget

xml

rMITK889987359cfb

View Options

Applications/PluginGenerator/ProjectTemplate/CMakeExternals/MITK.cmake

View Options

Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt

View Options

CMake/MITKDashboardScript.TEMPLATE.cmake

View Options

CMake/MITKDashboardSetup.cmake

View Options

CMake/mitkInstallRules.cmake

View Options

CMakeExternals/MatchPoint.cmake

View Options

CMakeLists.txt

View Options

Changelog.txt

View Options

Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/BuildInstructions.dox

View Options

Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/BuildToolkits.dox

View Options

Documentation/Doxygen/4-API/Pages.dox

View Options

LICENSE.txt

View Options

Modules/ImageStatistics/Testing/mitkImageStatisticsCalculatorTest.cpp

View Options

Modules/ImageStatistics/mitkHotspotMaskGenerator.cpp

View Options

Modules/ImageStatistics/mitkHotspotMaskGenerator.h

View Options

Modules/ImageStatistics/mitkIgnorePixelMaskGenerator.cpp

View Options

Modules/ImageStatistics/mitkIgnorePixelMaskGenerator.h

View Options

Modules/ImageStatistics/mitkImageMaskGenerator.cpp

View Options

Modules/ImageStatistics/mitkImageMaskGenerator.h

View Options

Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp

View Options

Modules/ImageStatistics/mitkMaskGenerator.cpp

View Options

Modules/ImageStatistics/mitkMaskGenerator.h

View Options

Modules/ImageStatistics/mitkPlanarFigureMaskGenerator.cpp

View Options

Modules/ImageStatistics/mitkPlanarFigureMaskGenerator.h

View Options

Modules/QtWidgetsExt/resource/logo_dkfz.png

View Options

Modules/QtWidgetsExt/src/QmitkAboutDialogGUI.ui

View Options

Modules/Segmentation/Interactions/mitkRegionGrowingTool.cpp

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/BooleanOperations_48x48.png

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/Icons.svg

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/MultiLabelSegmentationUtilities_48x48.png

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/multilabelsegmentation.png

View Options

README.md

View Options

Widget

View Options

Merge commit 'a0dedffb74dbcb57726366a56716f489ccf18337' into…889987359cfbActions

Description

Details

Event Timeline

Merged Changes

Changes (34)

rMITK889987359cfb

Applications/PluginGenerator/ProjectTemplate/CMakeExternals/MITK.cmake

Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt

CMake/MITKDashboardScript.TEMPLATE.cmake

CMake/MITKDashboardSetup.cmake

CMake/mitkInstallRules.cmake

CMakeExternals/MatchPoint.cmake

CMakeLists.txt

Changelog.txt

Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/BuildInstructions.dox

Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/BuildToolkits.dox

Documentation/Doxygen/4-API/Pages.dox

LICENSE.txt

Modules/ImageStatistics/Testing/mitkImageStatisticsCalculatorTest.cpp

Modules/ImageStatistics/mitkHotspotMaskGenerator.cpp

Modules/ImageStatistics/mitkHotspotMaskGenerator.h

Modules/ImageStatistics/mitkIgnorePixelMaskGenerator.cpp

Modules/ImageStatistics/mitkIgnorePixelMaskGenerator.h

Modules/ImageStatistics/mitkImageMaskGenerator.cpp

Modules/ImageStatistics/mitkImageMaskGenerator.h

Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp

Modules/ImageStatistics/mitkMaskGenerator.cpp

Modules/ImageStatistics/mitkMaskGenerator.h

Modules/ImageStatistics/mitkPlanarFigureMaskGenerator.cpp

Modules/ImageStatistics/mitkPlanarFigureMaskGenerator.h

Modules/QtWidgetsExt/resource/logo_dkfz.png

Modules/QtWidgetsExt/src/QmitkAboutDialogGUI.ui

Modules/Segmentation/Interactions/mitkRegionGrowingTool.cpp

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/BooleanOperations_48x48.png

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/Icons.svg

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/MultiLabelSegmentationUtilities_48x48.png

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/multilabelsegmentation.png

README.md

Widget

xml

Merge commit 'a0dedffb74dbcb57726366a56716f489ccf18337' into…
889987359cfb
Actions