Diffusion MITK 32c9dfff64f3

Merge branch 'bug-11639-QBallTensorVisualisationRotatedPlanes'
32c9dfff64f3
Actions

Description

Merge branch 'bug-11639-QBallTensorVisualisationRotatedPlanes'

Conflicts:
CMakeExternals/CTK.cmake

Details

Provenance

• hering

Authored on Apr 17 2012, 3:00 PM

Parents

rMITK870497e770d7: Added observer to notice a SliceRotationEvent
rMITK942eed8e6361: Merge branch 'bug-11648-SubtractFibsCrash'

Branches

Unknown

Tags

Unknown

Event Timeline

• hering committed rMITK32c9dfff64f3: Merge branch 'bug-11639-QBallTensorVisualisationRotatedPlanes' (authored by • hering).Apr 17 2012, 3:00 PM

Merged Changes

870497e770d7 Added observer to notice a SliceRotationEvent
Author
• hering
Browse Repository
No Builds
No Audits
2e64b46ed404 Added label to the control view
Author
• hering
Browse Repository
No Builds
No Audits
c5e3e3f1eb93 Merge branch 'personal/hering/MITKDiffusion-2012-Bugfixes' into bug-11639…
Author
• hering
Browse Repository
No Builds
No Audits
37a59cd7179e Merge remote-tracking branch 'origin/bug-11702-fix-network-generation' into…
Author
• hering
Browse Repository
No Builds
No Audits
4b7b3f9f5a70 Merge remote-tracking branch 'origin/bug-11700-OdfRenderWidget' into…
Author
• hering
Browse Repository
No Builds
No Audits
3a6d842c60cd Merge remote-tracking branch 'origin/bug-11643-add-network-datamanager…
Author
• hering
Browse Repository
No Builds
No Audits
ab9a3a2b8cd9 Merge remote-tracking branch 'origin/bug-11645-fix-network-rendering' into…
Author
• hering
Browse Repository
No Builds
No Audits
a6a8f2dc9a85 Merge branch 'bug-11660-NegativeDWIValuesWarning' into…
Author
• hering
Browse Repository
No Builds
No Audits
274b9302b228 catching negative dwi values according to tuch
Author
neher
Browse Repository
No Builds
No Audits
8edc923e6dd8 Merge remote-tracking branch 'origin/bug-11538-SaveShCoefficients' into bug…
Author
• hering
Browse Repository
No Builds
No Audits
19f0de3b91ac Merge remote-tracking branch 'origin/bug-11644-make-selection-order…
Author
• hering
Browse Repository
No Builds
No Audits
642748929bda Merge remote-tracking branch 'origin/bug-11576-redesign-application-cpack…
Author
• hering
Browse Repository
No Builds
No Audits
3ced1363a1f2 Merge remote-tracking branch 'origin/bug-11576-redesign-application-cpack…
Author
• hering
Browse Repository
No Builds
No Audits
83201ad7c91c Merge remote-tracking branch 'origin/bug-11671-adapt-demo-gui' into…
Author
• hering
Browse Repository
No Builds
No Audits
fb2bbd0f660b Merge remote-tracking branch 'origin/bug-11550-Multiple-StdWidgetsFromPane'…
Author
• hering
Browse Repository
No Builds
No Audits
e8ecdf57a105 Merge remote-tracking branch 'origin/bug-11615-ctk-with-increased-maxdegree…
Author
• hering
Browse Repository
No Builds
No Audits
f86b28811ca5 Merge remote-tracking branch 'origin/bug-11564-resolve-transitive-dependency'…
Author
• hering
Browse Repository
No Builds
No Audits
0ed33abd8e45 Merge remote-tracking branch 'origin/bug-11152-QballRenderBug' into…
Author
• hering
Browse Repository
No Builds
No Audits
9618d947dd10 Merge remote-tracking branch 'origin/bug-11461-GfaScaling' into…
Author
• hering
Browse Repository
No Builds
No Audits
bfd04f2776c6 Merge remote-tracking branch 'origin/bug-11542-fix-mitk-Diffusion-not-starting'…
Author
• hering
Browse Repository
No Builds
No Audits
7ffc44d1c7f8 Merge remote-tracking branch 'origin/bug-11001-move-general-manual-to-ext…
Author
• hering
Browse Repository
No Builds
No Audits

Changes (3)

Path

Size

Plugins/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkControlVisualizationPropertiesView.cpp

QmitkControlVisualizationPropertiesView.h

QmitkControlVisualizationPropertiesViewControls.ui

rMITK32c9dfff64f3

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.h

View Options

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

Merge branch 'bug-11639-QBallTensorVisualisationRotatedPlanes'32c9dfff64f3Actions

Description

Details

Event Timeline

Merged Changes

Changes (3)

rMITK32c9dfff64f3

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

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.h

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

Merge branch 'bug-11639-QBallTensorVisualisationRotatedPlanes'
32c9dfff64f3
Actions