Merge branch 'bug-10116-FiberBundleXintegration'
736b2c287d5d
Actions

Description

Merge branch 'bug-10116-FiberBundleXintegration'

Conflicts:
Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundle.cpp
Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.h
Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp
Modules/DiffusionImaging/Tractography/GibbsTracking/BuildFibres.cpp
Modules/DiffusionImaging/files.cmake

Details

Provenance

neher

Authored on Jan 12 2012, 2:55 PM

Parents

rMITKedd70029d677: Merge branch 'bug-10404-RadXmlToFibX' into bug-10116-FiberBundleXintegration
rMITKd8894ae6a5bb: Merge branch 'bug-9965-EliminateWarnings1'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK736b2c287d5d: Merge branch 'bug-10116-FiberBundleXintegration' (authored by neher).Jan 12 2012, 2:55 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

edd70029d677 Merge branch 'bug-10404-RadXmlToFibX' into bug-10116-FiberBundleXintegration
Author
neher
Browse Repository
No Builds
No Audits
0dfd5fe3893c removed old fiber bundle
Author
neher
Browse Repository
No Builds
No Audits
b0ec3f04fd8b colorcodings fixed
Author
reicht
Browse Repository
No Builds
No Audits
26e01b202cdd fa colorcoding works now
Author
reicht
Browse Repository
No Builds
No Audits
8804f09adae5 fa coloring works now for 3d
Author
reicht
Browse Repository
No Builds
No Audits
50726f277fb8 calling FA mapping via gui implemented
Author
reicht
Browse Repository
No Builds
No Audits
bc3c72864f3a colorcoding shall behave as expected :-)
Author
reicht
Browse Repository
No Builds
No Audits
db21f80a06ce colorcoding shall behave as expected :-)
Author
reicht
Browse Repository
No Builds
No Audits
f170dfa91b62 fix color selection issues
Author
reicht
Browse Repository
No Builds
No Audits
ae74d11d69cc method to reset opacity in Orientationbased colorarray v2
Author
reicht
Browse Repository
No Builds
No Audits
5c7d744ea826 method to reset opacity in Orientationbased colorarray
Author
reicht
Browse Repository
No Builds
No Audits
cf40e188d772 enhance FBX with FA coloring methods
Author
reicht
Browse Repository
No Builds
No Audits
72c159f6df73 set opacity to 1 when loading fiberbundleX
Author
reicht
Browse Repository
No Builds
No Audits
cd8021747a61 implemented OR/NOT
Author
reicht
Browse Repository
No Builds
No Audits
5408b63faf58 fixing OR
Author
reicht
Browse Repository
No Builds
No Audits
34b84b0f168a add transparency to fiber2D shader and mapper
Author
reicht
Browse Repository
No Builds
No Audits
68ee041512ff call orientationbased fibercoldoring and idGeneration in constructor of FBX
Author
reicht
Browse Repository
No Builds
No Audits
266564537ee3 removed fiberbundleX proprietary modification method
Author
reicht
Browse Repository
No Builds
No Audits
4fe6222f8cd5 introducing localstorage approach to fiberbundleXMapper3D
Author
reicht
Browse Repository
No Builds
No Audits
49172876cf44 individual color/opacity calls
Author
reicht
Browse Repository
No Builds
No Audits
5fd6737c0da9 duplicate check of fiberIds implemented
Author
reicht
Browse Repository
No Builds
No Audits
baaeba206436 changing fiberbundle extraction from unsigned long to long
Author
reicht
Browse Repository
No Builds
No Audits
d1300e5a0c00 implemented AND extractioin
Author
reicht
Browse Repository
No Builds
No Audits
9850ee0c1078 implemented AND extractioin
Author
reicht
Browse Repository
No Builds
No Audits
b3f61813f8f9 fix bool
Author
reicht
Browse Repository
No Builds
No Audits
308446d8f82e improved fiber extraction
Author
reicht
Browse Repository
No Builds
No Audits
de852da81afd returning cutting fiberbundle, no passing of additional values like FA or color
Author
reicht
Browse Repository
No Builds
No Audits
ed53f91853db returning cutting fiberbundle
Author
reicht
Browse Repository
No Builds
No Audits
634cfc70e41c Merge branch 'bug-10048-fastFiberExtraction' into bug-10116…
Author
reicht
Browse Repository
No Builds
No Audits
46f6c889b116 generating fiberstructures including extra values
Author
reicht
Browse Repository
No Builds
No Audits
4d3514362bd6 final improvements for fibercutting
Author
reicht
Browse Repository
No Builds
No Audits
211d48a4d1e2 improved performance
Author
reicht
Browse Repository
No Builds
No Audits
ffcaad8c7ec2 Merge branch 'bug-10428-TrilinearInterpol' into bug-10116…
Author
neher
Browse Repository
No Builds
No Audits
dae47b159694 fixed
Author
neher
Browse Repository
No Builds
No Audits
9229879060ac enhance performance for cutting
Author
reicht
Browse Repository
No Builds
No Audits
24f5c8a78107 fix identify fibers
Author
reicht
Browse Repository
No Builds
No Audits
dcc881a874c3 Merge branch 'bug-10048-fastFiberExtraction' into bug-10116…
Author
reicht
Browse Repository
No Builds
No Audits
8eb8255adebd fix calling wrong slots when executing thread for fiberextraction
Author
reicht
Browse Repository
No Builds
No Audits
009db48758ac fix calling wrong slots when executing thread for fiberextraction
Author
reicht
Browse Repository
No Builds
No Audits
8f7753ef1d2d Merge branch 'bug-10403-TractsToImageFilterGeometry' into bug-10116…
Author
neher
Browse Repository
No Builds
No Audits
f0e17162d27f implemented
Author
neher
Browse Repository
No Builds
No Audits
6b2d49b32d8e thread error while extracting
Author
reicht
Browse Repository
No Builds
No Audits
4bdf9bf50ac6 calling current colorcoding of fiberbundle in mappers
Author
reicht
Browse Repository
No Builds
No Audits
14de8dca58ca intermediate
Author
neher
Browse Repository
No Builds
No Audits
1745f9c9db81 Merge branch 'bug-10253-Stochastic' into bug-10116-FiberBundleXintegration
Author
neher
Browse Repository
No Builds
No Audits
e513df89b1be measurement frame is used. output is now processed as fiberbundlex. general…
Author
neher
Browse Repository
No Builds
No Audits
dcab58b7c1e3 Merge branch 'bug-10211-FiberProcessingX' into bug-10116-FiberBundleXintegration
Author
neher
Browse Repository
No Builds
No Audits
7783ccaf3f65 added join and subtract operator for fiberbundlex. updated filters to…
Author
neher
Browse Repository
No Builds
No Audits
051649d2484f Merge branch 'bug-10048-fastFiberExtraction' into bug-10116…
Author
reicht
Browse Repository
No Builds
No Audits
d77fe1385c71 plane sliceing implemented
Author
reicht
Browse Repository
No Builds
No Audits

Changes (76)

Path

Size

Modules/

Bundles/

org.mitk.gui.qt.diffusionimaging/

src/

QmitkODFRenderWidget.cpp

internal/

QmitkControlVisualizationPropertiesView.cpp

QmitkFiberBundleDeveloperView.cpp

QmitkFiberBundleDeveloperView.h

QmitkFiberBundleDeveloperViewControls.ui

QmitkFiberProcessingView.cpp

QmitkFiberProcessingView.h

QmitkFiberProcessingViewControls.ui

QmitkGibbsTrackingView.cpp

QmitkGibbsTrackingView.h

QmitkStochasticFiberTrackingView.cpp

QmitkStochasticFiberTrackingView.h

QmitkStochasticFiberTrackingViewControls.ui

org.mitk.gui.qt.diffusionimagingapp/

files.cmake

plugin.xml

src/

internal/

	QmitkDIAppTrackingEvaluationPerspective.cpp
	QmitkDIAppVolumeVisualizationPerspective.cpp

	QmitkDIAppTrackingEvaluationPerspective.h
	QmitkDIAppFiberTractographyPerspective.h

mitkPluginActivator.cpp

DiffusionImaging/

Algorithms/

itkTractDensityImageFilter.cpp

itkTractDensityImageFilter.h

itkTractsToFiberEndingsImageFilter.cpp

itkTractsToFiberEndingsImageFilter.h

itkTractsToProbabilityImageFilter.cpp

itkTractsToProbabilityImageFilter.h

itkTractsToRgbaImageFilter.cpp

itkTractsToRgbaImageFilter.h

IODataStructures/

FiberBundle

itkSlowPolyLineParametricPath.h

itkSlowPolyLineParametricPath.txx

mitkFiberBundle.cpp

mitkFiberBundle.h

mitkFiberBundleIOFactory.cpp

mitkFiberBundleIOFactory.h

mitkFiberBundleReader.cpp

mitkFiberBundleReader.h

mitkFiberBundleSerializer.cpp

mitkFiberBundleSerializer.h

mitkFiberBundleSource.cpp

mitkFiberBundleSource.h

mitkFiberBundleWriter.cpp

mitkFiberBundleWriter.h

mitkFiberBundleWriterFactory.cpp

mitkFiberBundleWriterFactory.h

FiberBundleX/

mitkFiberBundleX.cpp.orig

mitkFiberBundleX.h

mitkFiberBundleXReader.cpp

mitkFiberBundleXReader.h

mitkFiberBundleXWriter.cpp

mitkFiberBundleXWriter.h

mitkDiffusionImagingObjectFactory.cpp


	FiberBundle/

Interactions/

mitkFiberBundleInteractor.cpp

Rendering/

mitkFiberBundleMapper2D.cpp

mitkFiberBundleMapper2D.h

mitkFiberBundleMapper3D.cpp

mitkFiberBundleMapper3D.h

mitkFiberBundleXMapper2D.cpp

mitkFiberBundleXMapper2D.h

mitkFiberBundleXMapper3D.cpp

mitkFiberBundleXMapper3D.h

mitkPlanarCircleMapper3D.h

mitkShaderFiberClipping.xml

Tractography/

GibbsTracking/

BuildFibres.cpp

EnergyComputerBase.cpp

RJMCMC_randshift.cpp

Merge branch 'bug-10116-FiberBundleXintegration'736b2c287d5dActions

Description

Details

Event Timeline

Merged Changes

Changes (76)

rMITK736b2c287d5d

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.h

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperViewControls.ui

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.h

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingViewControls.ui

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkGibbsTrackingView.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkGibbsTrackingView.h

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.h

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingViewControls.ui

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/files.cmake

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/plugin.xml

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTrackingEvaluationPerspective.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTrackingEvaluationPerspective.h

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.cpp

Modules/DiffusionImaging/Algorithms/itkTractDensityImageFilter.cpp

Modules/DiffusionImaging/Algorithms/itkTractDensityImageFilter.h

Modules/DiffusionImaging/Algorithms/itkTractsToFiberEndingsImageFilter.cpp

Modules/DiffusionImaging/Algorithms/itkTractsToFiberEndingsImageFilter.h

Modules/DiffusionImaging/Algorithms/itkTractsToProbabilityImageFilter.cpp

Modules/DiffusionImaging/Algorithms/itkTractsToProbabilityImageFilter.h

Modules/DiffusionImaging/Algorithms/itkTractsToRgbaImageFilter.cpp

Modules/DiffusionImaging/Algorithms/itkTractsToRgbaImageFilter.h

Modules/DiffusionImaging/IODataStructures/FiberBundle

Modules/DiffusionImaging/IODataStructures/FiberBundle/itkSlowPolyLineParametricPath.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/itkSlowPolyLineParametricPath.txx

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundle.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundle.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleIOFactory.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleIOFactory.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleReader.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleReader.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleSerializer.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleSerializer.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleSource.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleSource.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleWriter.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleWriter.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleWriterFactory.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkFiberBundleWriterFactory.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkParticle.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkParticle.h

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkParticleGrid.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundle/mitkParticleGrid.h

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

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

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.h

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXReader.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXReader.h

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXWriter.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXWriter.h

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

Modules/DiffusionImaging/IODataStructures/mitkParticle.cpp

Modules/DiffusionImaging/IODataStructures/mitkParticle.h

Modules/DiffusionImaging/IODataStructures/mitkParticleGrid.cpp

Modules/DiffusionImaging/IODataStructures/mitkParticleGrid.h

Modules/DiffusionImaging/Interactions/mitkFiberBundleInteractor.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper2D.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper2D.h

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.h

Modules/DiffusionImaging/Rendering/mitkFiberBundleXMapper2D.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleXMapper2D.h

Modules/DiffusionImaging/Rendering/mitkFiberBundleXMapper3D.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleXMapper3D.h

Modules/DiffusionImaging/Rendering/mitkPlanarCircleMapper3D.h

Modules/DiffusionImaging/Rendering/mitkShaderFiberClipping.xml

Modules/DiffusionImaging/Tractography/GibbsTracking/BuildFibres.cpp

Modules/DiffusionImaging/Tractography/GibbsTracking/EnergyComputerBase.cpp

Modules/DiffusionImaging/Tractography/GibbsTracking/RJMCMC_randshift.cpp

Merge branch 'bug-10116-FiberBundleXintegration'
736b2c287d5d
Actions