Diffusion MITK 06c45f930122

Merge branch 'T22136-WaitFor3DInterpolation'
06c45f930122
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'T22136-WaitFor3DInterpolation'

Conflicts:
CMakeExternals/MITKData.cmake
Modules/Core/src/Rendering/mitkVtkPropRenderer.cpp

Details

Provenance

kislinsk	Authored on Dec 15 2016, 3:04 PM
kislinsk	Pushed on Dec 15 2016, 3:04 PM

Parents

rMITK4cf4ca4c918c: Fixed number of progress steps in plane suggestion in 3D-interpolation.
rMITK4d077da9bdd7: Merge branch 'T22185-IHaveNoIdeaWhatIAmDoing'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK06c45f930122: Merge branch 'T22136-WaitFor3DInterpolation' (authored by kislinsk).Dec 15 2016, 3:04 PM

Merged Changes

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

4cf4ca4c918c Fixed number of progress steps in plane suggestion in 3D-interpolation.
Author
KuznetsovAlexander <KuznetsovAlexander@rambler.ru>
Browse Repository
No Builds
No Audits
6fd07d875402 Checks and style fix.
Author
KuznetsovAlexander <KuznetsovAlexander@rambler.ru>
Browse Repository
No Builds
No Audits
dcb3a2c86e61 Fixed 3D-interpolation crash on closing plugin or deleting data.
Author
KuznetsovAlexander <KuznetsovAlexander@rambler.ru>
Browse Repository
No Builds
No Audits
3c0c7b650cd5 Merge branch 'T22185-IHaveNoIdeaWhatIAmDoing' into releases/2016-11-beta
Author
kislinsk
Browse Repository
No Builds
No Audits
53517989549b Merge branch 'T22278-CMake-3.5' into releases/2016-11-beta
Author
kislinsk
Browse Repository
No Builds
No Audits
ac46b02c10c5 Merge remote-tracking branch 'origin/T22247-ImageCropperHandleColorDisappeared'…
Author
kislinsk
Browse Repository
No Builds
No Audits
5581b61b9123 Merge branch 'T19609-2016-11-Integration' into releases/2016-11-beta
Author
kislinsk
Browse Repository
No Builds
No Audits
b6352a9c186b fixed hotspot statistics tests
Author
isensee
Browse Repository
No Builds
No Audits
b84b77412470 Update test data.
Author
kislinsk
Browse Repository
No Builds
No Audits
4b3683479adb reduced verbosity of image statistics caluculator. Also changed the path of the…
Author
isensee
Browse Repository
No Builds
No Audits
8bb8ec27f399 attempt to add and compile extractImageStatistics miniapp
Author
• kleina
Browse Repository
No Builds
No Audits
6c44a0a39885 Fix string stream copy.
Author
kislinsk
Browse Repository
No Builds
No Audits
de81ec6dec3f Merge branch 'T15777-rebased' into releases/2016-11-beta
Author
• goch
Browse Repository
No Builds
No Audits
33efb315df30 Fix export macro.
Author
kislinsk
Browse Repository
No Builds
No Audits
85ac89b1ad06 Add NavigationDataSliceVisualization filter to IGT module
Author
nocnokneo
Browse Repository
No Builds
No Audits
dc52b3d70970 Merge remote-tracking branch 'origin/T20204-MissingGettersInSlicedGeometry3D'…
Author
• goch
Browse Repository
No Builds
No Audits
5d7e1ff37499 Merge branch 'T20217-rebased' into releases/2016-11-beta
Author
• goch
Browse Repository
No Builds
No Audits
946ee54121a7 Equality checks when setting data storage for renderers
Author
espak
Browse Repository
No Builds
No Audits
040cec8b21e0 Merge branch 'T20218-rebased' into releases/2016-11-beta
Author
• goch
Browse Repository
No Builds
No Audits
a773ec628622 Turn spacing vector to world coordinate order for bounding box geometry…
Author
espak
Browse Repository
No Builds
No Audits
f34cc3982951 Correcting origin and bounds for geometry calculated from data storage
Author
espak
Browse Repository
No Builds
No Audits
78afeccd9d95 Merge branch 'T22091-rebased' into releases/2016-11-beta
Author
• goch
Browse Repository
No Builds
No Audits
3a9665cf521d Fix LoggingBackend unable to access logs for users with Russian names
Author
mpkh
Browse Repository
No Builds
No Audits
bcf3a7694a4e Merge branch 'T22092-rebased' into releases/2016-11-beta
Author
• goch
Browse Repository
No Builds
No Audits
c33e90534646 Fix wrong parameter type.
Author
kislinsk
Browse Repository
No Builds
No Audits
beff56b322b9 QmitkNewSegmentationDialog: Qt translation support
Author
mpkh
Browse Repository
No Builds
No Audits
304962fe02ca QmitkPointSetInteractionView: Qt translation support
Author
mpkh
Browse Repository
No Builds
No Audits
ed902a6a6a86 QmitkSegmentationView: Qt translation support
Author
mpkh
Browse Repository
No Builds
No Audits
f2f198011ea9 QmitkMeasurementView: Qt translation support
Author
mpkh
Browse Repository
No Builds
No Audits
b719ad30491e QmitkBasicImageProcessingView: Qt translation support
Author
mpkh
Browse Repository
No Builds
No Audits
66e884c0c313 QmitkDataManagerView: Qt translation support
Author
mpkh
Browse Repository
No Builds
No Audits
13efc0e1c77f Merge branch 'T22117-rebased' into releases/2016-11-beta
Author
• goch
Browse Repository
No Builds
No Audits
fbbe22ba6a89 Rewrite comment.
Author
kislinsk
Browse Repository
No Builds
No Audits
c9dbcfcd4360 Current world position re-calculated before updating status bar
Author
espak
Browse Repository
No Builds
No Audits
b38e821f1b87 Merge remote-tracking branch 'origin/T19635-Fix' into releases/2016-11-beta
Author
• goch
Browse Repository
No Builds
No Audits
1ca5138e971b Merge remote-tracking branch 'origin/T22123-Add-correct-documentation-level'…
Author
• goch
Browse Repository
No Builds
No Audits
46806132d5e8 Merge remote-tracking branch 'origin/T22132-CrashInRTDoseVisualization' into…
Author
• goch
Browse Repository
No Builds
No Audits
9510759c57e0 Fixed handling of RGB and RGBA images
Author
• goch
Browse Repository
No Builds
No Audits
575522da7a10 Merge remote-tracking branch 'origin/T22098-Multilabel-Segmentation-Tools' into…
Author
• goch
Browse Repository
No Builds
No Audits
ba5543120a81 Merge remote-tracking branch 'origin/T22076…
Author
• goch
Browse Repository
No Builds
No Audits
cbc513039176 Merge remote-tracking branch 'origin/T22179-screenshotmaker' into releases/2016…
Author
• goch
Browse Repository
No Builds
No Audits
58545f61f644 Merge remote-tracking branch 'origin/T22178-update-Workbench-release-config'…
Author
• goch
Browse Repository
No Builds
No Audits
5bad0491b761 Merge remote-tracking branch 'origin/T19958-XnatPreferencesFixingErrorMessage'…
Author
• goch
Browse Repository
No Builds
No Audits
3f2cc1f51338 Add additional keywords for some basic plugin preferences (Data Manager…
Author
• gaehlert
Browse Repository
No Builds
No Audits
b32f18218e79 Merge remote-tracking branch 'origin/T22105-MatchPoint-evaluator-manipulator…
Author
• goch
Browse Repository
No Builds
No Audits
0fe5be43ff20 Include safe guards in services for cases where no reader was found; Removed…
Author
floca
Browse Repository
No Builds
No Audits
267085836b94 Fixed PropertyNameHelper test (uppercase-output)
Author
kalali
Browse Repository
No Builds
No Audits
bb4bf2edf3ab Changed regex from 'only-digit' to 'hex'
Author
kalali
Browse Repository
No Builds
No Audits
a01a8ac14b97 Merge remote-tracking branch 'origin/T22090-SortPreferencesPage' into…
Author
• goch
Browse Repository
No Builds
No Audits
f73c2f1dd725 erge remote-tracking branch 'origin/T22093…
Author
• goch
Browse Repository
No Builds
No Audits

Changes (2)

Path

Size

Packages

Modules/

SegmentationUI/

Qmitk/

QmitkSlicesInterpolator.cpp

O1: MITK Reviewer Group I

QmitkSlicesInterpolator.h

O1: MITK Reviewer Group I

rMITK06c45f930122

Modules/SegmentationUI/Qmitk/QmitkSlicesInterpolator.cpp

Loading...

Modules/SegmentationUI/Qmitk/QmitkSlicesInterpolator.h

Loading...