Diffusion MITK 62e2e5ba98df

Merge branch 'master' into niftk, to pick up MITK bug 14640 containing fixes…
62e2e5ba98dfUnpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge branch 'master' into niftk, to pick up MITK bug 14640 containing fixes for g++ 4.1.2.

Details

Provenance

clarkson	Authored on Mar 8 2013, 8:30 AM
kislinsk	Pushed on Aug 6 2018, 4:04 PM

Parents

rMITKf4dfc10c4dd0: Merge branch 'master' into niftk to include MITK org.mitk.gui.qt.cmdlinemodules…
rMITK0a7828eaa17d: Merge branch 'bug-13273-fix-memory-leaks-in-statemachinefactory'

Branches

Unknown

Tags

Unknown

Event Timeline

clarkson committed rMITK62e2e5ba98df: Merge branch 'master' into niftk, to pick up MITK bug 14640 containing fixes… (authored by clarkson).Mar 8 2013, 8:30 AM

Merged Changes

0a7828eaa17d Merge branch 'bug-13273-fix-memory-leaks-in-statemachinefactory'
Author
zelzer
Browse Repository
No Builds
No Audits
e0197c5a0135 Merge branch 'bug-14647-IVIM-view-crashes'
Author
• cordes
Browse Repository
No Builds
No Audits
7d03823f48ca Merge branch 'bug-8165-fix-gcc412-compile-errors'
Author
zelzer
Browse Repository
No Builds
No Audits
91f8d319681a Fixed implicit conversion errors with gcc 4.1.2.
Author
zelzer
Browse Repository
No Builds
No Audits
932bb1297732 Added missing newline at end of file.
Author
zelzer
Browse Repository
No Builds
No Audits
033310b1f8bb Merge branch 'bug-14675-fix-plugin-doc-grouping'
Author
zelzer
Browse Repository
No Builds
No Audits
165d5f217982 Properly grouped the plug-in user manual.
Author
zelzer
Browse Repository
No Builds
No Audits
421d35ab4ad4 initialize non-smartpointer with 0 in QmitkIVIMView::FittIVIMStart()
Author
• cordes
Browse Repository
No Builds
No Audits
c4c06e0f287c Merge branch 'bug-14657-TypoInPreprocessing'
Author
• cordes
Browse Repository
No Builds
No Audits
8aa2d9da3bfc Merge branch 'bug-11046-more-clang-fixes'
Author
• cordes
Browse Repository
No Builds
No Audits
f9efba33fefc remove unused vraible m_InformerService in mitkBindDispatcherInteractor…
Author
• cordes
Browse Repository
No Builds
No Audits
fd61412758d6 remove unused vraible m_NewRenderer in mitkVtkPropRenderer - declaration in…
Author
• cordes
Browse Repository
No Builds
No Audits
6f701e29f810 Merge branch 'bug-14541-extend-user-manual-portal-page'
Author
• goch
Browse Repository
No Builds
No Audits
557db5f218b8 typo correction in UI file of PreprocessingViewControls
Author
• cordes
Browse Repository
No Builds
No Audits
fc28d471cc36 Merge branch 'bug-14626-Recursive-ImageAccessorCall-AffineRegistration'
Author
• hering
Browse Repository
No Builds
No Audits
3685bcf3bbf9 Merge branch 'bug-11046-more-clang-fixes'
Author
nolden
Browse Repository
No Builds
No Audits
63c7cdb0eb56 Replaced nested calls to ImageAccessor for 3D transforms
Author
• hering
Browse Repository
No Builds
No Audits
74ef8eb5e955 Replacing nested ImageAccessor calls in 2D Transform
Author
• hering
Browse Repository
No Builds
No Audits
08916d58f10a Some introductory text
Author
• goch
Browse Repository
No Builds
No Audits
e5878866b44c Merge branch 'bug-14627-Fix-initial-parameter-in-registration'
Author
• hering
Browse Repository
No Builds
No Audits
6e9d2cf8993c Fixing transform parameter setting for registration
Author
• hering
Browse Repository
No Builds
No Audits
d273112189ec Do not warn about unknown warnings
Author
nolden
Browse Repository
No Builds
No Audits
eac22b591320 Fixed usage of DEPRECATED macro in mapper classes
Author
nolden
Browse Repository
No Builds
No Audits
b0f240080711 Clean-up Transition objects if they are not added to the "State" object.
Author
zelzer
Browse Repository
No Builds
No Audits

Changes (31)

Path

Size

Packages

CMake/

mitkMacroCreateModule.cmake

O1: MITK Reviewer Group I

Core/

Code/

Algorithms/

mitkPlaneClipping.h

Interactions/

mitkBindDispatcherInteractor.cpp

mitkBindDispatcherInteractor.h

mitkStateMachineFactory.cpp

mitkStateMachineFactory.h

Rendering/

mitkRenderingTestHelper.cpp

mitkVtkMapper.h

mitkVtkPropRenderer.cpp

mitkVtkPropRenderer.h

vtkMitkLevelWindowFilter.cpp

Documentation/

Doxygen/

UserManual/

MITKPluginManualsList.dox

UserManualPortal.dox

Modules/

RigidRegistration/

mitkImageRegistrationMethodAccessFunctor.txx

RigidRegistrationUI/

RigidRegistrationTransforms/

QmitkAffineTransformView.cpp

QmitkCenteredRigid2DTransformView.cpp

QmitkCenteredSimilarity2DTransformView.cpp

QmitkEuler2DTransformView.cpp

QmitkFixedCenterOfRotationAffineTransformView.cpp

QmitkQuaternionRigidTransformView.cpp

QmitkRigid2DTransformView.cpp

QmitkScaleSkewVersor3DTransformView.cpp

QmitkSimilarity2DTransformView.cpp

QmitkSimilarity3DTransformView.cpp

QmitkVersorRigid3DTransformView.cpp

QmitkVersorTransformView.cpp

Plugins/

org.mitk.gui.qt.cmdlinemodules/

documentation/

UserManual/

O3: MITK Reviewer Group II

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkIVIMView.cpp

QmitkPreprocessingViewControls.ui

rMITK62e2e5ba98df

CMake/mitkMacroCreateModule.cmake

Loading...

Core/Code/Algorithms/mitkPlaneClipping.h

Loading...

Core/Code/Interactions/mitkBindDispatcherInteractor.cpp

Loading...

Core/Code/Interactions/mitkBindDispatcherInteractor.h

Loading...

Core/Code/Interactions/mitkStateMachineFactory.cpp

Loading...

Core/Code/Interactions/mitkStateMachineFactory.h

Loading...

Core/Code/Rendering/mitkGLMapper.h

Loading...

Core/Code/Rendering/mitkMapper.h

Loading...

Core/Code/Rendering/mitkRenderingTestHelper.cpp

Loading...

Core/Code/Rendering/mitkVtkMapper.h

Loading...

Core/Code/Rendering/mitkVtkPropRenderer.cpp

Loading...

Core/Code/Rendering/mitkVtkPropRenderer.h

Loading...

Core/Code/Rendering/vtkMitkLevelWindowFilter.cpp

Loading...

Documentation/Doxygen/UserManual/MITKPluginManualsList.dox

Loading...

Documentation/Doxygen/UserManual/UserManualPortal.dox

Loading...

Modules/RigidRegistration/mitkImageRegistrationMethodAccessFunctor.txx

Loading...

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkAffineTransformView.cpp

Loading...

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkCenteredRigid2DTransformView.cpp

Loading...

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkCenteredSimilarity2DTransformView.cpp

Loading...

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkEuler2DTransformView.cpp

Loading...

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkFixedCenterOfRotationAffineTransformView.cpp

Loading...

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkQuaternionRigidTransformView.cpp

Loading...

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkRigid2DTransformView.cpp

Loading...

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkScaleSkewVersor3DTransformView.cpp

Loading...

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkSimilarity2DTransformView.cpp

Loading...

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkSimilarity3DTransformView.cpp

Loading...

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkVersorRigid3DTransformView.cpp

Loading...

Modules/RigidRegistrationUI/RigidRegistrationTransforms/QmitkVersorTransformView.cpp

Loading...

Plugins/org.mitk.gui.qt.cmdlinemodules/documentation/UserManual/Manual.dox

Loading...

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

Loading...

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingViewControls.ui

Loading...