Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept
4f433360bf6d
Actions

Description

Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept

Details

Provenance

Authored on Apr 3 2013, 2:45 PM

Parents

rMITKbd529556247e: Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept
rMITK19664d9c2da3: Merge branch 'bug-13527-UpdateRenderWindows'

Branches

Unknown

Tags

Unknown

Event Timeline

• metzger committed rMITK4f433360bf6d: Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept (authored by • metzger).Apr 3 2013, 2:45 PM

Merged Changes

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

19664d9c2da3 Merge branch 'bug-13527-UpdateRenderWindows'
Author
neher
Browse Repository
No Builds
No Audits
443b2ce34a83 calling mitk::RenderingManager::GetInstance()->RequestUpdateAll() in…
Author
neher
Browse Repository
No Builds
No Audits
89ec000fb7c7 Merge branch 'bug-14560-PlayerLoadAndRenderTests'
Author
• kilgus
Browse Repository
No Builds
No Audits
826dccfa6ab7 Added a test for loading depth and rendering depth images and one for RGB…
Author
• kilgus
Browse Repository
No Builds
No Audits
7d446ae6cece Merge branch 'bug-14465-movePropertyListXmlIoToMitkExt'
Author
• goerres
Browse Repository
No Builds
No Audits
19a87de01777 Merge branch 'bug-14877-fix-typos-etc-in-interaction-fw'
Author
zelzer
Browse Repository
No Builds
No Audits
dadc5e3bb7c5 Fixed typos, some class names, and added mitk:: prefix for proper linking.
Author
zelzer
Browse Repository
No Builds
No Audits
2badc72cc7a1 Merge branch 'bug-14870-GibbsLessVerbose'
Author
neher
Browse Repository
No Builds
No Audits
bb160084099f replaced output at each step by boost progress display
Author
neher
Browse Repository
No Builds
No Audits
84df39c567ce Merge branch 'bug-12265-version-number-update-post-201303'
Author
zelzer
Browse Repository
No Builds
No Audits
d8d222d107e0 Updated master version to 2013.03.99
Author
zelzer
Browse Repository
No Builds
No Audits
bce82c595e31 Merge branch 'bug-11046-fix-clang-deprecated-macro-usage'
Author
zelzer
Browse Repository
No Builds
No Audits
4456c56605e0 Fixed DEPRECATED macros usage for Clang again.
Author
zelzer
Browse Repository
No Builds
No Audits
36b3ba439cf7 Merge branch 'bug-13664-code-review-changes'
Author
zelzer
Browse Repository
No Builds
No Audits
ee98f0705be4 COMP: Fix example to use renamed method.
Author
zelzer
Browse Repository
No Builds
No Audits
2e9e1f8ae1c6 Merge branch 'bug-13664-code-review-changes'
Author
zelzer
Browse Repository
No Builds
No Audits
2d4c337ea0b5 Use the correct method to unregister DataInteractor from DataNode.
Author
zelzer
Browse Repository
No Builds
No Audits
90d8c3c2c763 Fixed copy constructor for mitk::CameraIntrinsics.
Author
zelzer
Browse Repository
No Builds
No Audits
a499df4e6f18 Removed DEPRECATED macro again, since it leads to compile errors.
Author
zelzer
Browse Repository
No Builds
No Audits
6cc320de9466 Merge branch 'bug-14783-cmake-compiler-and-linker-flags' into bug-13664-code…
Author
zelzer
Browse Repository
No Builds
No Audits
46a6fa11c939 Merge branch 'bug-14783-cmake-compiler-and-linker-flags'
Author
zelzer
Browse Repository
No Builds
No Audits
3af2ef7fe35c Replace - and / with _ in CMake compiler flag variables to avoid warnings.
Author
zelzer
Browse Repository
No Builds
No Audits
3b550aaab691 Harmonized Set/Load/Add event config methods.
Author
zelzer
Browse Repository
No Builds
No Audits
f8f0c03f2821 Removed GetEventClass() method, using GetNameOfClass() instead.
Author
zelzer
Browse Repository
No Builds
No Audits
0f2869dd9a64 Deprecated classes, added const and pass by reference, simplified inheritance.
Author
zelzer
Browse Repository
No Builds
No Audits
7d2f2202f492 Moved interaction event constants to DataInteractor and InteractionEvent.
Author
zelzer
Browse Repository
No Builds
No Audits
25c8bce4b253 Added proper clone methods for properties.
Author
zelzer
Browse Repository
No Builds
No Audits
a52e5dc88e27 Improved equality methods using static casts.
Author
zelzer
Browse Repository
No Builds
No Audits
65863b003c13 Added deprecated macro for old Interactor class.
Author
zelzer
Browse Repository
No Builds
No Audits
357df31029d8 Moved test interaction xml files to the test driver.
Author
zelzer
Browse Repository
No Builds
No Audits
7a3277af073a Use C++ style operator== for comparing interaction events.
Author
zelzer
Browse Repository
No Builds
No Audits
f7e74e4f45b8 Deprecated TActionFunctor and used mitk::Message instead.
Author
zelzer
Browse Repository
No Builds
No Audits
2773cc795563 Added const modifiers and passing arguments by reference instead of value.
Author
zelzer
Browse Repository
No Builds
No Audits
2633fc092537 Merge branch 'bug-14855-MergeDwisMultiB'
Author
neher
Browse Repository
No Builds
No Audits
ba95b208d4ea Merge branch 'bug-14859-FiberfoxLevelWindowRelease'
Author
neher
Browse Repository
No Builds
No Audits
3861a8729ba3 merging of dwis with multiple b-values is now working correctly. adjusting…
Author
neher
Browse Repository
No Builds
No Audits
25198c13e8b3 missing default return value --> all channels are classified as baseline -->…
Author
neher
Browse Repository
No Builds
No Audits
56034eaac29e Merge branch 'bug-14864-UpdateWelcomeScreen'
Author
neher
Browse Repository
No Builds
No Audits
8117e3a49a23 changed some icons and descriptions. synthetic images perspecitve is now called…
Author
neher
Browse Repository
No Builds
No Audits
779562dc6280 Merge branch 'bug-13664-RedesignInteraction-Integration-5'
Author
• webechr
Browse Repository
No Builds
No Audits
a01f8015b601 fix typo, indendation
Author
• webechr
Browse Repository
No Builds
No Audits
53db60605de1 Merge branch 'bug-13664-RedesignInteraction-Integration-5' of mitk.org:MITK…
Author
• webechr
Browse Repository
No Builds
No Audits
2c8dc4dde2a0 fix typo, add space bar
Author
• webechr
Browse Repository
No Builds
No Audits
e2ee6ce20b2e fix typo, add space bar
Author
• webechr
Browse Repository
No Builds
No Audits
1d93843ee86a Let everything activated for our own release, but provide external devlopers…
Author
• webechr
Browse Repository
No Builds
No Audits
438374dd1fcd Merge branch 'bug-13664-RedesignInteraction-Integration-4' into bug-13664…
Author
• webechr
Browse Repository
No Builds
No Audits
791ae9119d3c Load alternative Configuration for the display interactor, when a tool is…
Author
• webechr
Browse Repository
No Builds
No Audits
465d5876d7b7 Merge branch 'bug-12056-DefaultValueForRenderingMode'
Author
• kilgus
Browse Repository
No Builds
No Audits
445d36da66e1 Always check for 'use color' and replace it.
Author
• kilgus
Browse Repository
No Builds
No Audits
dad07aa1879d Merge branch 'bug-14853-ClippedLabelsWithImageRenderingMode'
Author
• metzger
Browse Repository
No Builds
No Audits

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.

Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept4f433360bf6dActions

Description

Details

Event Timeline

Merged Changes

Very Large Commit

Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept
4f433360bf6d
Actions