Merge branch 'T22465-merge-release-into-master'
540ea2e4ed78
Actions

Description

Merge branch 'T22465-merge-release-into-master'

Details

Provenance

• goch	Authored on Feb 3 2017, 7:01 PM
• goch	Pushed on Feb 3 2017, 7:01 PM

Parents

rMITKb08e24445809: Re-enable borked multilabel functionality so it will not be forgotten
rMITK22d214c70454: Merge branch 'T22463-update-MatchPoint'

Branches

Unknown

Tags

Unknown

Event Timeline

• goch committed rMITK540ea2e4ed78: Merge branch 'T22465-merge-release-into-master' (authored by • goch).Feb 3 2017, 7:01 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

b08e24445809 Re-enable borked multilabel functionality so it will not be forgotten
Author
• goch
Browse Repository
No Builds
No Audits
d5b3c81caeb3 Re-dirtify source
Author
• goch
Browse Repository
No Builds
No Audits
94ee708eab27 Merge branch 'releases/2016-11' into T22465-merge-release-into-master
Author
• goch
Browse Repository
No Builds
No Audits
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
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
50b8fb17b4c0 Replace MITK_USE_QT with MITK_USE_Qt5
Author
kislinsk
Browse Repository
No Builds
No Audits
809e3d65dd5d Merge branch 'T22434-fix-linux-installer' into releases/2016-11-beta
Author
• goch
Browse Repository
No Builds
No Audits
750a9cf82d34 fixes time step handling and adds a timestep name tag to cropped 4D node
Author
• thomass
Browse Repository
No Builds
No Audits
1a41816d17e5 minor fixes concerning appearance and IO
Author
• thomass
Browse Repository
No Builds
No Audits
913ab31d1d76 Invoke render update during scroll event to secure right bounding box render…
Author
• thomass
Browse Repository
No Builds
No Audits
c1a5d431c44a Revert rendering test data.
Author
kislinsk
Browse Repository
No Builds
No Audits
36cec5a8270d Fix for converting slice number from double to unsigned int
Author
espak
Browse Repository
No Builds
No Audits
0435601e87b7 Update test data.
Author
kislinsk
Browse Repository
No Builds
No Audits
3763384a12ba Rewrote SliceNavigationController test.
Author
kislinsk
Browse Repository
No Builds
No Audits
80f233012613 Remove flipped parameter from Image::Initialize() method.
Author
kislinsk
Browse Repository
No Builds
No Audits
e2abdbcc9e65 Merge branch 'T22088-disable-color-for-labelsetimages' into releases/2016-11…
Author
• goch
Browse Repository
No Builds
No Audits
8fca02d09ba6 Corrected the merge of the 'T19933-Outline-of-segmentation-fix-rebase' feature…
Author
kalali
Browse Repository
No Builds
No Audits
722fd5a18854 'T19933-Outline-of-segmentation-fix-rebase' master merge with already approved…
Author
kalali
Browse Repository
No Builds
No Audits
968a97edea2b Merge remote-tracking branch 'origin/T22337-remove-msvs-batch-files' into…
Author
• goch
Browse Repository
No Builds
No Audits
5ea288663d8f Merge remote-tracking branch 'origin/T22339-color-rainbow-sequence' into…
Author
• goch
Browse Repository
No Builds
No Audits
595b68eca4e1 Merge remote-tracking branch 'origin/T19726-update-multilabel-documentation'…
Author
• goch
Browse Repository
No Builds
No Audits
d2bc35247801 Merge remote-tracking branch 'origin/T22329-update-gui-elements-on-multilabel…
Author
• goch
Browse Repository
No Builds
No Audits
00c0b0695ccb Merge remote-tracking branch 'origin/T22243-protect-symbolic-names-from…
Author
• goch
Browse Repository
No Builds
No Audits
8759fefc56af Merge remote-tracking branch 'origin/T22353-fix-labelsetwidget-context-menu'…
Author
• goch
Browse Repository
No Builds
No Audits
35a36d4ee7e9 Merge remote-tracking branch 'origin/T22187-watershed-tool-multilabel' into…
Author
• goch
Browse Repository
No Builds
No Audits
e9bef309b266 Merge remote-tracking branch 'origin/T22352-crash-in-view-manager' into…
Author
• goch
Browse Repository
No Builds
No Audits
6a8b28fab81f Merge remote-tracking branch 'origin/T22302-Fix_missing_batch_plugin' into…
Author
• goch
Browse Repository
No Builds
No Audits
922a31fcec13 Merge remote-tracking branch 'origin/T22330-switch-off-multilabel-interpolation…
Author
• goch
Browse Repository
No Builds
No Audits
1916b27ed2d2 Switch off multilable interpolation and segmentation utilities
Author
• goch
Browse Repository
No Builds
No Audits
de3eadbd305b fix name templates
Author
• groehl
Browse Repository
No Builds
No Audits
5798d2546e52 Merge branch 'T22254-GeometryFixesBasedOnReleaseBranch' into releases/2016-11…
Author
kislinsk
Browse Repository
No Builds
No Audits
64e7c5d1adc0 Adapted test to geometry changes of Miklos Espak
Author
kislinsk
Browse Repository
No Builds
No Audits
72a3a097395e Adapted test to the changes of Miklos Espak.
Author
kislinsk
Browse Repository
No Builds
No Audits
4abed65f8823 Adapted call signatures of SlicedGeometry3D::InitializeEvenlySpaced().
Author
kislinsk
Browse Repository
No Builds
No Audits
b478f2a9d241 Disable inverted controls for now. This should be a preference later.
Author
kislinsk
Browse Repository
No Builds
No Audits
57d0ef421da7 Fix wrong signature.
Author
kislinsk
Browse Repository
No Builds
No Audits
9e4e5ba6fcf1 Compose sliced geometries of planes with matching normal
Author
espak
Browse Repository
No Builds
No Audits
8648b1dfe702 Correct handedness of coronal renderer geometries
Author
espak
Browse Repository
No Builds
No Audits
c452be58e66c Compose sliced geometries of planes with matching normal
Author
espak
Browse Repository
No Builds
No Audits

Changes (6)

Path

Size

Packages

Applications/

PluginGenerator/

ProjectTemplate/

CMakeExternals/

MITK.cmake

CMakeLists.txt

CMakeExternals/

MITKData.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Modules/

QtWidgetsExt/

src/

QmitkAboutDialogGUI.ui

O3: MITK Reviewer Group II

Plugins/

org.mitk.gui.qt.multilabelsegmentation/

plugin.xml

rMITK540ea2e4ed78

View Options

Applications/PluginGenerator/ProjectTemplate/CMakeExternals/MITK.cmake

View Options

Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt

View Options

CMakeExternals/MITKData.cmake

View Options

CMakeLists.txt

View Options

Modules/QtWidgetsExt/src/QmitkAboutDialogGUI.ui

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/plugin.xml

Merge branch 'T22465-merge-release-into-master'540ea2e4ed78Actions

Description

Details

Event Timeline

Merged Changes

Changes (6)

rMITK540ea2e4ed78

Applications/PluginGenerator/ProjectTemplate/CMakeExternals/MITK.cmake

Applications/PluginGenerator/ProjectTemplate/CMakeLists.txt

CMakeExternals/MITKData.cmake

CMakeLists.txt

Modules/QtWidgetsExt/src/QmitkAboutDialogGUI.ui

Plugins/org.mitk.gui.qt.multilabelsegmentation/plugin.xml

Merge branch 'T22465-merge-release-into-master'
540ea2e4ed78
Actions