Merge branch 'bug-17935-PrototypeSignalgen' into bug-17935-PrototypeSignalgen2
10e92fc87ccc
Actions

Description

Merge branch 'bug-17935-PrototypeSignalgen' into bug-17935-PrototypeSignalgen2

Conflicts:
Modules/DiffusionImaging/MiniApps/FiberDirectionExtraction.cpp
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberfoxView.cpp

Details

Provenance

neher

Authored on Aug 20 2014, 11:32 AM

Parents

rMITKf5a2edc7dc3f: wip
rMITKca745d87032a: Merge branch 'bug-18018-PlanarFigureComposite'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK10e92fc87ccc: Merge branch 'bug-17935-PrototypeSignalgen' into bug-17935-PrototypeSignalgen2 (authored by neher).Aug 20 2014, 11:32 AM

Merged Changes

f5a2edc7dc3f wip
Author
neher
Browse Repository
No Builds
No Audits
c522460f60f8 changed setter from itk macro to normal setter method
Author
neher
Browse Repository
No Builds
No Audits
16220d091952 Merge branch 'WIP' into bug-17935-PrototypeSignalgen
Author
neher
Browse Repository
No Builds
No Audits
1c6868d2e0b0 wip
Author
neher
Browse Repository
No Builds
No Audits
3079f09c67bf added prototype signal gen to gui
Author
neher
Browse Repository
No Builds
No Audits
b54646ace381 Merge branch 'bug-17916-TractsToVectorImageNew' into BLA
Author
neher
Browse Repository
No Builds
No Audits
95bf72a8d5c7 threshold on peak size working
Author
neher
Browse Repository
No Builds
No Audits

Changes (43)

Path

Size

Packages

Applications/

Diffusion/

CMakeLists.txt

BlueBerry/

Bundles/

org.blueberry.ui.qt/

files.cmake.user

Modules/

DiffusionImaging/

DiffusionCore/

Algorithms/

itkDwiNormilzationFilter.h

itkDwiNormilzationFilter.txx

	itkExtractDwiChannelFilter.h
	itkAdcImageFilter.h

itkExtractDwiChannelFilter.txx

itkRemoveDwiChannelFilter.h

itkRemoveDwiChannelFilter.txx

files.cmake

FiberTracking/

Algorithms/

itkTractDensityImageFilter.cpp

itkTractDensityImageFilter.h

itkTractsToDWIImageFilter.cpp

itkTractsToDWIImageFilter.h

itkTractsToVectorImageFilter.cpp

itkTractsToVectorImageFilter.h

IODataStructures/

FiberBundleX/

mitkFiberBundleX.cpp

mitkFiberfoxParameters.cpp

mitkFiberfoxParameters.h

SignalModels/

mitkAstroStickModel.h

mitkBallModel.h

mitkDiffusionSignalModel.h

Testing/

mitkLocalFiberPlausibilityTest.cpp

MiniApps/

FiberDirectionExtraction.cpp

Plugins/

org.mitk.gui.qt.cmdlinemodules/

src/

internal/

QmitkCmdLineModuleProgressWidget.cpp

O3: MITK Reviewer Group II

org.mitk.gui.qt.diffusionimaging/

files.cmake

src/

	QmitkPrototypeSignalParametersWidget.cpp
	QmitkBallModelParametersWidget.cpp

QmitkPrototypeSignalParametersWidget.h

	QmitkPrototypeSignalParametersWidgetControls.ui
	QmitkTensorModelParametersWidgetControls.ui

internal/

QmitkFiberExtractionViewControls.ui

QmitkFiberProcessingView.cpp

QmitkFiberProcessingView.h

QmitkFiberProcessingViewControls.ui

QmitkFiberfoxView.cpp

QmitkFiberfoxView.h

QmitkFiberfoxViewControls.ui

QmitkPreprocessingView.cpp

QmitkPreprocessingView.h

QmitkPreprocessingViewControls.ui

rMITK10e92fc87ccc

View Options

Applications/Diffusion/CMakeLists.txt

View Options

BlueBerry/Bundles/org.blueberry.ui.qt/files.cmake.user

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkDwiNormilzationFilter.h

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkDwiNormilzationFilter.txx

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkExtractDwiChannelFilter.h

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkExtractDwiChannelFilter.txx

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkRemoveDwiChannelFilter.h

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkRemoveDwiChannelFilter.txx

View Options

Modules/DiffusionImaging/DiffusionCore/files.cmake

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractDensityImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractDensityImageFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToVectorImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToVectorImageFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberfoxParameters.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberfoxParameters.h

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkAstroStickModel.h

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkBallModel.h

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkDiffusionSignalModel.h

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkDotModel.h

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkRawShModel.cpp

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkRawShModel.h

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkStickModel.h

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkTensorModel.h

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkLocalFiberPlausibilityTest.cpp

View Options

Modules/DiffusionImaging/MiniApps/FiberDirectionExtraction.cpp

View Options

Plugins/org.mitk.gui.qt.cmdlinemodules/src/internal/QmitkCmdLineModuleProgressWidget.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkPrototypeSignalParametersWidget.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkPrototypeSignalParametersWidget.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkPrototypeSignalParametersWidgetControls.ui

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

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 branch 'bug-17935-PrototypeSignalgen' into bug-17935-PrototypeSignalgen210e92fc87cccActions

Description

Details

Event Timeline

Merged Changes

Changes (43)

rMITK10e92fc87ccc

Applications/Diffusion/CMakeLists.txt

BlueBerry/Bundles/org.blueberry.ui.qt/files.cmake.user

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkDwiNormilzationFilter.h

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkDwiNormilzationFilter.txx

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkExtractDwiChannelFilter.h

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkExtractDwiChannelFilter.txx

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkRemoveDwiChannelFilter.h

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkRemoveDwiChannelFilter.txx

Modules/DiffusionImaging/DiffusionCore/files.cmake

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractDensityImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractDensityImageFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToVectorImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToVectorImageFilter.h

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberfoxParameters.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberfoxParameters.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkAstroStickModel.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkBallModel.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkDiffusionSignalModel.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkDotModel.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkRawShModel.cpp

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkRawShModel.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkStickModel.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkTensorModel.h

Modules/DiffusionImaging/FiberTracking/Testing/mitkLocalFiberPlausibilityTest.cpp

Modules/DiffusionImaging/MiniApps/FiberDirectionExtraction.cpp

Plugins/org.mitk.gui.qt.cmdlinemodules/src/internal/QmitkCmdLineModuleProgressWidget.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkPrototypeSignalParametersWidget.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkPrototypeSignalParametersWidget.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkPrototypeSignalParametersWidgetControls.ui

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

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

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

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

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

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

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

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 branch 'bug-17935-PrototypeSignalgen' into bug-17935-PrototypeSignalgen2
10e92fc87ccc
Actions