Merge remote-tracking branch 'origin/bug-11507-Advanced-B0-ImageExtraction'…
d2298e0e1b6d
Actions

Description

Merge remote-tracking branch 'origin/bug-11507-Advanced-B0-ImageExtraction' into bug-11507-Advanced-B0-Extraction

Conflicts:
Modules/DiffusionImaging/files.cmake~
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingView.cpp
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingView.h

Details

Provenance

• hering

Authored on May 10 2012, 10:33 AM

Parents

rMITKee13dcdc09c2: Enhancing GenerateData()
rMITKb4903588961e: Merge branch 'bug-11829-warn-as-errors'

Branches

Unknown

Tags

Unknown

Event Timeline

• hering committed rMITKd2298e0e1b6d: Merge remote-tracking branch 'origin/bug-11507-Advanced-B0-ImageExtraction'… (authored by • hering).May 10 2012, 10:33 AM

Merged Changes

ee13dcdc09c2 Enhancing GenerateData()
Author
• hering
Browse Repository
No Builds
No Audits
23f4062a9929 Added another B0 extraction filter
Author
• hering
Browse Repository
No Builds
No Audits
83e81d3b28e9 Added non-averaging B0 extraction decl
Author
• hering
Browse Repository
No Builds
No Audits
e0af2d24f3f6 Added CheckBox to PreProcessingView
Author
• hering
Browse Repository
No Builds
No Audits

Changes (9)

Path

Size

Modules/

DiffusionImaging/

Algorithms/

itkB0ImageExtractionImageFilter.h

itkB0ImageExtractionImageFilter.txx

itkB0ImageExtractionToSeparateImageFilter.h

itkB0ImageExtractionToSeparateImageFilter.txx

files.cmake

files.cmake~

Plugins/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkPreprocessingView.cpp

QmitkPreprocessingView.h

QmitkPreprocessingViewControls.ui

rMITKd2298e0e1b6d

View Options

Modules/DiffusionImaging/Algorithms/itkB0ImageExtractionImageFilter.h

View Options

Modules/DiffusionImaging/Algorithms/itkB0ImageExtractionImageFilter.txx

View Options

Modules/DiffusionImaging/Algorithms/itkB0ImageExtractionToSeparateImageFilter.h

View Options

Modules/DiffusionImaging/Algorithms/itkB0ImageExtractionToSeparateImageFilter.txx

View Options

Modules/DiffusionImaging/files.cmake

View Options

Modules/DiffusionImaging/files.cmake~

View Options

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

View Options

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

View Options

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

Merge remote-tracking branch 'origin/bug-11507-Advanced-B0-ImageExtraction'…d2298e0e1b6dActions

Description

Details

Event Timeline

Merged Changes

Changes (9)

rMITKd2298e0e1b6d

Modules/DiffusionImaging/Algorithms/itkB0ImageExtractionImageFilter.h

Modules/DiffusionImaging/Algorithms/itkB0ImageExtractionImageFilter.txx

Modules/DiffusionImaging/Algorithms/itkB0ImageExtractionToSeparateImageFilter.h

Modules/DiffusionImaging/Algorithms/itkB0ImageExtractionToSeparateImageFilter.txx

Modules/DiffusionImaging/files.cmake

Modules/DiffusionImaging/files.cmake~

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

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

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

Merge remote-tracking branch 'origin/bug-11507-Advanced-B0-ImageExtraction'…
d2298e0e1b6d
Actions