Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept
d6bbf0023bff
Actions

Description

Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept

Details

Provenance

Authored on Jun 10 2013, 3:38 PM

Parents

rMITK68cd91ad2da0: Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept
rMITKde521bc49418: Merge branch 'bug-15052-SOFA_NO_OPENGL'

Branches

Unknown

Tags

Unknown

Event Timeline

• metzger committed rMITKd6bbf0023bff: Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept (authored by • metzger).Jun 10 2013, 3:38 PM

Merged Changes

de521bc49418 Merge branch 'bug-15052-SOFA_NO_OPENGL'
Author
kislinsk
Browse Repository
No Builds
No Audits
0e0163200cd1 COMP: Added SOFA_NO_OPENGL definition to projects that use SOFA.
Author
kislinsk
Browse Repository
No Builds
No Audits
9df97fd9c2ba Merge branch 'bug-15052-PatchDownMinimumRequiredCMakeVersionOfSOFA'
Author
kislinsk
Browse Repository
No Builds
No Audits
73160cd68303 Unleashed SOFA again.
Author
kislinsk
Browse Repository
No Builds
No Audits
b6abcf6cbbe4 Merge branch 'bug-15078-crash-on-startup'
Author
• goch
Browse Repository
No Builds
No Audits
6106e89c55f1 Merge branch 'bug-15163-ConvertEventConfigMembersToStaticFunctions'
Author
• webechr
Browse Repository
No Builds
No Audits
95fb2b9d8588 Merge branch 'bug-14821-improved-preloading-libraries-in-ctk'
Author
zelzer
Browse Repository
No Builds
No Audits
9c51a1ef2b5d Merge branch 'bug-6505-COMPFixForNewTest'
Author
goetzm
Browse Repository
No Builds
No Audits
26283d3e5a3a COMP: Deactivated test for Bug 6505, bug still present
Author
goetzm
Browse Repository
No Builds
No Audits
f2c2f658d022 Merge branch 'bug-6505-COMPFixForNewTest'
Author
goetzm
Browse Repository
No Builds
No Audits
d43a9eb45763 COMP: Increased eps to avoid test failure
Author
goetzm
Browse Repository
No Builds
No Audits
91beb1a727c8 Disable factory registration manager
Author
• goch
Browse Repository
No Builds
No Audits
0275a934a420 Use newer CTK version with improved pre-loading features.
Author
zelzer
Browse Repository
No Builds
No Audits
437c227fbd4b Merge branch 'bug-6505-SetClonedGeometryIsNotAccurate'
Author
goetzm
Browse Repository
No Builds
No Audits
d74bd7d97b28 Merge branch 'bug-14995-Fix-IVIM-After-Migration'
Author
• hering
Browse Repository
No Builds
No Audits
5e2d13babde5 Added label resetting to IVIMView
Author
• hering
Browse Repository
No Builds
No Audits
2e4c06e2dd17 Merge branch 'bug-15020-NavigationDataSequentialPlayerNotWorkingWithITK4'
Author
maerz
Browse Repository
No Builds
No Audits
da083b7cefc0 Fixed type for ThreadId used in filter
Author
• hering
Browse Repository
No Builds
No Audits
0fa1e54c413f Merge branch 'bug-15017-IGTSetInputNULLIsNotRemovingTheOutputAnymore'
Author
maerz
Browse Repository
No Builds
No Audits
3adb97b3490e Made NavigationDataToNavigationDataFilter use new RemoveInput Method from ITK 4…
Author
maerz
Browse Repository
No Builds
No Audits
2595bbfdf0d2 Style fixes: removed unnecessary comment line
Author
• hering
Browse Repository
No Builds
No Audits
ea784e8695cf Code style fixes ( unsigned index in for loop)
Author
• hering
Browse Repository
No Builds
No Audits
ebd3eb68edd7 Fixed GenerateThreadedData in IVIM Filter
Author
• hering
Browse Repository
No Builds
No Audits
629e20cd7806 Adapted NavigationDataSequentialPlayer and its test to ITK4 and added a new…
Author
seitela
Browse Repository
No Builds
No Audits
94f0ca420f88 Added test case for SeClonedGeometry to mitkImageTest
Author
goetzm
Browse Repository
No Builds
No Audits
5ea9e033e7e8 Merge branch 'bug-15082-Stochastic-tractography-does-not-work-with-ITK4'
Author
• hegemann
Browse Repository
No Builds
No Audits
f6abc9af237c Usage of itkStochasticTractographyFilter changed, so SetInput is now…
Author
• hegemann
Browse Repository
No Builds
No Audits
0b6597810528 SetInput method is now renamend to SetPrimaryInput due to avoid the 'hiding…
Author
• hegemann
Browse Repository
No Builds
No Audits
134f84053f88 Merge branch 'bug-14776-Resolving-Compiler-ProblemsVI'
Author
• engelhsa
Browse Repository
No Builds
No Audits
ed634f0511e8 Remove unused variable
Author
• engelhsa
Browse Repository
No Builds
No Audits
b5365a5ec672 Replaced members by static functions return const std::string
Author
• webechr
Browse Repository
No Builds
No Audits
4a983348b600 MITK 2013.03.02 version update
Author
zelzer
Browse Repository
No Builds
No Audits
0e56aeb69fbf Merge branch 'bug-14881-fix-opencl-context-creation' into releases/2013-03
Author
zelzer
Browse Repository
No Builds
No Audits
b11754c41092 Merge branch 'bug-14915-add-iostream-eventconfig-constructor' into…
Author
zelzer
Browse Repository
No Builds
No Audits
d26c4e6a16a7 Merge remote-tracking branch 'origin/bug-14937-fix-compiler-flag-checks' into…
Author
zelzer
Browse Repository
No Builds
No Audits
a66c0f000fd3 Merge remote-tracking branch 'origin/bug-14355-fix-resource-compiler-path' into…
Author
zelzer
Browse Repository
No Builds
No Audits
0910f4af886f Merge remote-tracking branch 'origin/bug-14920-fix-git-repo-check' into…
Author
zelzer
Browse Repository
No Builds
No Audits
b2afbc7c8dc3 Merge remote-tracking branch 'origin/bug-14841-gpu-volumrendering-memory-leak'…
Author
zelzer
Browse Repository
No Builds
No Audits

Changes (28)

Path

Size

Packages

CMake/

PackageDepends/

MITK_ITK_Config.cmake

O1: MITK Reviewer Group I

CMakeExternals/

CTK.cmake

O1: MITK Reviewer Group I

PatchSOFA-rev9479.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Core/

Code/

Interactions/

mitkEventConfig.cpp

mitkEventFactory.cpp

mitkInteractionEventConst.cpp

mitkInteractionEventConst.h

mitkStateMachineTransition.cpp

Rendering/

mitkPointSetVtkMapper2D.cpp

Testing/

mitkEventConfigTest.cpp

mitkImageTest.cpp

Modules/

DiffusionImaging/

DiffusionCore/

Algorithms/

Reconstruction/

itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.cpp

itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.h

itkDiffusionTensorPrincipalDirectionImageFilter.h

FiberTracking/

Algorithms/

itkStochasticTractographyFilter.h

Quantification/

Algorithms/

itkRegularizedIVIMLocalVariationImageFilter.h

itkRegularizedIVIMLocalVariationImageFilter.txx

itkRegularizedIVIMReconstructionSingleIteration.h

itkRegularizedIVIMReconstructionSingleIteration.txx

IGT/

IGTFilters/

mitkNavigationDataSequentialPlayer.cpp

mitkNavigationDataSource.cpp

mitkNavigationDataToNavigationDataFilter.cpp

Testing/

files.cmake

mitkNavigationDataSequentialPlayerTest.cpp

mitkNavigationDataToNavigationDataFilterTest.cpp

Plugins/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkIVIMView.cpp

QmitkStochasticFiberTrackingView.cpp

rMITKd6bbf0023bff

View Options

CMake/PackageDepends/MITK_ITK_Config.cmake

View Options

CMakeExternals/CTK.cmake

View Options

CMakeExternals/PatchSOFA-rev9479.cmake

View Options

CMakeLists.txt

View Options

Core/Code/Interactions/mitkEventConfig.cpp

View Options

Core/Code/Interactions/mitkEventFactory.cpp

View Options

Core/Code/Interactions/mitkInteractionEventConst.cpp

View Options

Core/Code/Interactions/mitkInteractionEventConst.h

View Options

Core/Code/Interactions/mitkStateMachineTransition.cpp

View Options

Core/Code/Rendering/mitkPointSetVtkMapper2D.cpp

View Options

Core/Code/Testing/mitkEventConfigTest.cpp

View Options

Core/Code/Testing/mitkImageTest.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.h

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkDiffusionTensorPrincipalDirectionImageFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStochasticTractographyFilter.h

View Options

Modules/DiffusionImaging/Quantification/Algorithms/itkRegularizedIVIMLocalVariationImageFilter.h

View Options

Modules/DiffusionImaging/Quantification/Algorithms/itkRegularizedIVIMLocalVariationImageFilter.txx

View Options

Modules/DiffusionImaging/Quantification/Algorithms/itkRegularizedIVIMReconstructionSingleIteration.h

View Options

Modules/DiffusionImaging/Quantification/Algorithms/itkRegularizedIVIMReconstructionSingleIteration.txx

View Options

Modules/IGT/IGTFilters/mitkNavigationDataSequentialPlayer.cpp

View Options

Modules/IGT/IGTFilters/mitkNavigationDataSource.cpp

View Options

Modules/IGT/IGTFilters/mitkNavigationDataToNavigationDataFilter.cpp

View Options

Modules/IGT/Testing/files.cmake

View Options

Modules/IGT/Testing/mitkNavigationDataSequentialPlayerTest.cpp

View Options

Modules/IGT/Testing/mitkNavigationDataToNavigationDataFilterTest.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.cpp

Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConceptd6bbf0023bffActions

Description

Details

Event Timeline

Merged Changes

Changes (28)

rMITKd6bbf0023bff

CMake/PackageDepends/MITK_ITK_Config.cmake

CMakeExternals/CTK.cmake

CMakeExternals/PatchSOFA-rev9479.cmake

CMakeLists.txt

Core/Code/Interactions/mitkEventConfig.cpp

Core/Code/Interactions/mitkEventFactory.cpp

Core/Code/Interactions/mitkInteractionEventConst.cpp

Core/Code/Interactions/mitkInteractionEventConst.h

Core/Code/Interactions/mitkStateMachineTransition.cpp

Core/Code/Rendering/mitkPointSetVtkMapper2D.cpp

Core/Code/Testing/mitkEventConfigTest.cpp

Core/Code/Testing/mitkImageTest.cpp

Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.cpp

Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.h

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkDiffusionTensorPrincipalDirectionImageFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStochasticTractographyFilter.h

Modules/DiffusionImaging/Quantification/Algorithms/itkRegularizedIVIMLocalVariationImageFilter.h

Modules/DiffusionImaging/Quantification/Algorithms/itkRegularizedIVIMLocalVariationImageFilter.txx

Modules/DiffusionImaging/Quantification/Algorithms/itkRegularizedIVIMReconstructionSingleIteration.h

Modules/DiffusionImaging/Quantification/Algorithms/itkRegularizedIVIMReconstructionSingleIteration.txx

Modules/IGT/IGTFilters/mitkNavigationDataSequentialPlayer.cpp

Modules/IGT/IGTFilters/mitkNavigationDataSource.cpp

Modules/IGT/IGTFilters/mitkNavigationDataToNavigationDataFilter.cpp

Modules/IGT/Testing/files.cmake

Modules/IGT/Testing/mitkNavigationDataSequentialPlayerTest.cpp

Modules/IGT/Testing/mitkNavigationDataToNavigationDataFilterTest.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.cpp

Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept
d6bbf0023bff
Actions