Merge branch 'T23898-Regu2'
5a0982dc5a5d
Actions

Description

Merge branch 'T23898-Regu2'

Details

Provenance

neher	Authored on Dec 14 2017, 4:23 PM
neher	Pushed on Dec 14 2017, 4:17 PM

Parents

rMITK9d3d0e72e91b: Update tractgraphy ROI interpolation
rMITKf5b359e4f281: fixed gcc compiler errors.

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK5a0982dc5a5d: Merge branch 'T23898-Regu2' (authored by neher).Dec 14 2017, 4:23 PM

Merged Changes

9d3d0e72e91b Update tractgraphy ROI interpolation
Author
neher
Browse Repository
No Builds
No Audits
20ff7b0a8a45 Interpolator as parameter for speedup
Author
neher
Browse Repository
No Builds
No Audits
5cabdcb54bcf Template fiber extraction filter
Author
neher
Browse Repository
No Builds
No Audits
11b1c97127f8 Use itk image interpolator instead of own trilinear interpolation
Author
neher
Browse Repository
No Builds
No Audits
bd7683b44d2f Move fiber extraction with ROI image from fiberbundle.cpp to separate filter
Author
neher
Browse Repository
No Builds
No Audits
baa90aa2c819 Restore old fit and regu estimation. Revisit later with new fit and regu…
Author
neher
Browse Repository
No Builds
No Audits
2061cd9489fc Merge branch 'T23898-Regu' into T23898-Regu2
Author
neher
Browse Repository
No Builds
No Audits
ff90fe981d9c User defined regu in cmdapp
Author
neher
Browse Repository
No Builds
No Audits
9f5baecc58a6 Fix regularization factor
Author
neher
Browse Repository
No Builds
No Audits
f45f97d7b3cb Regularization as parameter
Author
neher
Browse Repository
No Builds
No Audits

Changes (48)

Path

Size

Modules/

DiffusionImaging/

DiffusionCore/

include/

mitkDiffusionFunctionCollection.h

src/

mitkDiffusionFunctionCollection.cpp

FiberTracking/

Algorithms/

ClusteringMetrics/

mitkClusteringMetric.h

mitkClusteringMetricScalarMap.h

TrackingHandlers/

mitkTrackingDataHandler.h

mitkTrackingHandlerOdf.cpp

mitkTrackingHandlerOdf.h

mitkTrackingHandlerRandomForest.cpp

mitkTrackingHandlerRandomForest.h

mitkTrackingHandlerTensor.cpp

mitkTrackingHandlerTensor.h

itkFiberExtractionFilter.cpp

itkFiberExtractionFilter.h

itkFitFibersToImageFilter.cpp

itkFitFibersToImageFilter.h

itkStreamlineTrackingFilter.cpp

itkStreamlineTrackingFilter.h

itkTractClusteringFilter.cpp

itkTractClusteringFilter.h

Fiberfox/

itkKspaceImageFilter.cpp

itkKspaceImageFilter.h

itkTractsToDWIImageFilter.cpp

itkTractsToDWIImageFilter.h

IODataStructures/

FiberBundle/

mitkFiberBundle.cpp

mitkFiberBundle.h

Testing/

mitkFiberExtractionTest.cpp

mitkMachineLearningTrackingTest.cpp

mitkStreamlineTractographyTest.cpp

cmdapps/

FiberProcessing/

FiberExtraction.cpp

FiberExtractionRoi.cpp

FitFibersToImage.cpp

GetOverlappingTracts.cpp

Tractography/

StreamlineTractography.cpp

TractographyEvaluation/

AnchorBasedScoring.cpp

CMakeLists.txt

EvaluateLiFE.cpp

	ExtractAnchorTracts.cpp
	ExtractOverlappingTracts.cpp

ExtractOverlappingTracts.cpp

ExtractSimilarTracts.cpp

MergeOverlappingTracts.cpp

files.cmake

Plugins/

org.mitk.gui.qt.diffusionimaging.fiberprocessing/

src/

internal/

QmitkFiberFitViewControls.ui

QmitkFiberProcessingView.cpp

QmitkFiberProcessingView.h

QmitkFiberProcessingViewControls.ui

QmitkTractometryView.cpp

org.mitk.gui.qt.diffusionimaging.tractography/

src/

internal/

QmitkStreamlineTrackingView.cpp

QmitkStreamlineTrackingViewControls.ui

rMITK5a0982dc5a5d

View Options

Modules/DiffusionImaging/DiffusionCore/include/mitkDiffusionFunctionCollection.h

View Options

Modules/DiffusionImaging/DiffusionCore/src/mitkDiffusionFunctionCollection.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/ClusteringMetrics/mitkClusteringMetric.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/ClusteringMetrics/mitkClusteringMetricScalarMap.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingDataHandler.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerOdf.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerOdf.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerRandomForest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerRandomForest.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerTensor.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerTensor.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFiberExtractionFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFiberExtractionFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFitFibersToImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFitFibersToImageFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStreamlineTrackingFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStreamlineTrackingFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractClusteringFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractClusteringFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Fiberfox/itkKspaceImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Fiberfox/itkKspaceImageFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Fiberfox/itkTractsToDWIImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Fiberfox/itkTractsToDWIImageFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundle/mitkFiberBundle.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundle/mitkFiberBundle.h

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberExtractionTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkMachineLearningTrackingTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkStreamlineTractographyTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/FiberExtraction.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/FiberExtractionRoi.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/FitFibersToImage.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/GetOverlappingTracts.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/Tractography/StreamlineTractography.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/AnchorBasedScoring.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/CMakeLists.txt

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/EvaluateLiFE.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/ExtractAnchorTracts.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/ExtractOverlappingTracts.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/ExtractSimilarTracts.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/MergeOverlappingTracts.cpp

View Options

Modules/DiffusionImaging/FiberTracking/files.cmake

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberFitViewControls.ui

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkTractometryView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingViewControls.ui

Merge branch 'T23898-Regu2'5a0982dc5a5dActions

Description

Details

Event Timeline

Merged Changes

Changes (48)

rMITK5a0982dc5a5d

Modules/DiffusionImaging/DiffusionCore/include/mitkDiffusionFunctionCollection.h

Modules/DiffusionImaging/DiffusionCore/src/mitkDiffusionFunctionCollection.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/ClusteringMetrics/mitkClusteringMetric.h

Modules/DiffusionImaging/FiberTracking/Algorithms/ClusteringMetrics/mitkClusteringMetricScalarMap.h

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingDataHandler.h

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerOdf.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerOdf.h

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerRandomForest.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerRandomForest.h

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerTensor.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerTensor.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFiberExtractionFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFiberExtractionFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFitFibersToImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFitFibersToImageFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStreamlineTrackingFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStreamlineTrackingFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractClusteringFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractClusteringFilter.h

Modules/DiffusionImaging/FiberTracking/Fiberfox/itkKspaceImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Fiberfox/itkKspaceImageFilter.h

Modules/DiffusionImaging/FiberTracking/Fiberfox/itkTractsToDWIImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Fiberfox/itkTractsToDWIImageFilter.h

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundle/mitkFiberBundle.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundle/mitkFiberBundle.h

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberExtractionTest.cpp

Modules/DiffusionImaging/FiberTracking/Testing/mitkMachineLearningTrackingTest.cpp

Modules/DiffusionImaging/FiberTracking/Testing/mitkStreamlineTractographyTest.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/FiberExtraction.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/FiberExtractionRoi.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/FitFibersToImage.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/GetOverlappingTracts.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/Tractography/StreamlineTractography.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/AnchorBasedScoring.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/CMakeLists.txt

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/EvaluateLiFE.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/ExtractAnchorTracts.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/ExtractOverlappingTracts.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/ExtractSimilarTracts.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/MergeOverlappingTracts.cpp

Modules/DiffusionImaging/FiberTracking/files.cmake

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberFitViewControls.ui

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

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

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

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkTractometryView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingViewControls.ui

Merge branch 'T23898-Regu2'
5a0982dc5a5d
Actions