Merge branch 'bug-9030-FiberBundleXEvaluator'
4dd97def9c02
Actions

Description

Merge branch 'bug-9030-FiberBundleXEvaluator'

Details

Provenance

Authored on Sep 8 2011, 3:43 PM

Parents

rMITKe74b0873657b: infrastructure for fancy thread monitoring implemented
rMITKc20c4a14988a: Merge branch 'bug-9285-CreatePackageTest'

Branches

Unknown

Tags

Unknown

Event Timeline

reicht committed rMITK4dd97def9c02: Merge branch 'bug-9030-FiberBundleXEvaluator' (authored by reicht).Sep 8 2011, 3:43 PM

Merged Changes

e74b0873657b infrastructure for fancy thread monitoring implemented
Author
reicht
Browse Repository
No Builds
No Audits
e1357b1a5068 timer improvements, garbage collection enhancement
Author
reicht
Browse Repository
No Builds
No Audits
8d30252900ac cleanup in threads
Author
reicht
Browse Repository
No Builds
No Audits
35eae2d91dae fancy timers rearranged for better structure
Author
reicht
Browse Repository
No Builds
No Audits
a1e06f870625 generate random fibers using threadbased architecture enabled, todo mutexLockx
Author
reicht
Browse Repository
No Builds
No Audits
6aa00357a042 major architecture for fiber generating set. using functors and struct for…
Author
reicht
Browse Repository
No Builds
No Audits
cccd6ce3820e generate random fibers worker infrastructure implemented
Author
reicht
Browse Repository
No Builds
No Audits
4e024de2f418 newlines
Author
reicht
Browse Repository
No Builds
No Audits
95ed95d071a1 resolved timer errors
Author
reicht
Browse Repository
No Builds
No Audits
6a70adbff448 adding timer to generateFibers [ctOK]
Author
reicht
Browse Repository
No Builds
No Audits

Changes (10)

Path

Size

Modules/

Bundles/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkFiberBundleDeveloperView.cpp

QmitkFiberBundleDeveloperView.h

QmitkFiberBundleDeveloperViewControls.ui

DiffusionImaging/

IODataStructures/

FiberBundleX/

mitkFiberBundleX.cpp

mitkFiberBundleXThreadMonitor.cpp

mitkFiberBundleXThreadMonitor.h

mitkDiffusionImagingObjectFactory.cpp

Rendering/

mitkFiberBundleXThreadMonitorMapper3D.cpp

	mitkFiberBundleXThreadMonitorMapper3D.h
	mitkFiberBundleXMapper3D.h

files.cmake

rMITK4dd97def9c02

View Options

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

View Options

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

View Options

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

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXThreadMonitor.cpp

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXThreadMonitor.h

View Options

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkFiberBundleXThreadMonitorMapper3D.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkFiberBundleXThreadMonitorMapper3D.h

View Options

Modules/DiffusionImaging/files.cmake

Merge branch 'bug-9030-FiberBundleXEvaluator'4dd97def9c02Actions

Description

Details

Event Timeline

Merged Changes

Changes (10)

rMITK4dd97def9c02

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/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXThreadMonitor.cpp

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleXThreadMonitor.h

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleXThreadMonitorMapper3D.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleXThreadMonitorMapper3D.h

Modules/DiffusionImaging/files.cmake

Merge branch 'bug-9030-FiberBundleXEvaluator'
4dd97def9c02
Actions