Merge branch 'bug-9000-tbssImage'
784fb333a261
Actions

Description

Merge branch 'bug-9000-tbssImage'

Conflicts:
Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssImageReader.cpp
Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp
Modules/DiffusionImaging/files.cmake

Details

Provenance

• vanbruggen

Authored on Oct 13 2011, 9:26 AM

Parents

rMITK273166e1e194: removed accidental occurence of code line in mitkCoreObjectFactory.cpp
rMITK89bcc203abe5: Merge branch 'bug-9712-DiAppVerbosity'

Branches

Unknown

Tags

Unknown

Event Timeline

• vanbruggen committed rMITK784fb333a261: Merge branch 'bug-9000-tbssImage' (authored by • vanbruggen).Oct 13 2011, 9:26 AM

Merged Changes

273166e1e194 removed accidental occurence of code line in mitkCoreObjectFactory.cpp
Author
• vanbruggen
Browse Repository
No Builds
No Audits
2804bd1184a6 creation of rois with tbss meta images
Author
• vanbruggen
Browse Repository
No Builds
No Audits
356e05aa73fb Merge remote branch 'origin/bug-9000-tbssImage' into bug-9000-tbssImage
Author
• vanbruggen
Browse Repository
No Builds
No Audits
f226e6aff86d intermediate commit
Author
• vanbruggen
Browse Repository
No Builds
No Audits
d2c96b00d631 intermediate
Author
• vanbruggen
Browse Repository
No Builds
No Audits
bea8cb729fc9 Merge remote branch 'origin/bug-9000-tbssImage' into bug-9000-tbssImage
Author
• vanbruggen
Browse Repository
No Builds
No Audits
c929f8ab1c1a Merge remote-tracking branch 'origin/bug-9000-tbssImage' into bug-9000-tbssImage
Author
• vanbruggen
Browse Repository
No Builds
No Audits
df146a5730ff intermediate commit
Author
• vanbruggen
Browse Repository
No Builds
No Audits
ec0b1f116082 tbss image template free
Author
• vanbruggen
Browse Repository
No Builds
No Audits
5f0c70582dc2 intermediate commit
Author
• vanbruggen
Browse Repository
No Builds
No Audits
ea79a9f636f8 modified mapper and reader for vector tbss images
Author
• vanbruggen
Browse Repository
No Builds
No Audits
df7a9799d87c old tbss image is now tbss roi image with its own reader/writer/factories etc.
Author
• vanbruggen
Browse Repository
No Builds
No Audits
bae08a5ca947 intermediate commit
Author
• vanbruggen
Browse Repository
No Builds
No Audits

Changes (30)

Path

Size

Modules/

Bundles/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkControlVisualizationPropertiesView.cpp

DiffusionImaging/

IODataStructures/

DiffusionWeightedImages/

mitkNrrdDiffusionImageReader.cpp

TbssImages/

mitkNrrdTbssImageIOFactory.cpp

mitkNrrdTbssImageReader.cpp

mitkNrrdTbssImageReader.h

mitkNrrdTbssImageWriter.cpp

mitkNrrdTbssImageWriter.h

mitkNrrdTbssImageWriterFactory.cpp

	mitkNrrdTbssRoiImageIOFactory.cpp
	mitkNrrdTbssImageIOFactory.cpp

mitkNrrdTbssRoiImageIOFactory.h

	mitkNrrdTbssRoiImageReader.cpp
	mitkNrrdTbssImageReader.cpp

	mitkNrrdTbssRoiImageReader.h
	mitkNrrdTbssImageReader.h

mitkNrrdTbssRoiImageWriter.cpp

	mitkNrrdTbssRoiImageWriter.h
	mitkNrrdTbssImageWriter.h

	mitkNrrdTbssRoiImageWriterFactory.cpp
	mitkNrrdTbssImageWriterFactory.cpp

mitkNrrdTbssRoiImageWriterFactory.h

mitkTbssImage.cpp

mitkTbssImage.h

mitkTbssImageSource.cpp

mitkTbssImageSource.h

mitkTbssImporter.cpp

mitkTbssImporter.h

	mitkTbssRoiImage.cpp
	mitkTbssImage.cpp

	mitkTbssRoiImage.h
	mitkTbssImage.h

	mitkTbssRoiImageSource.cpp
	mitkTbssImageSource.cpp

	mitkTbssRoiImageSource.h
	mitkTbssImageSource.h

mitkDiffusionImagingObjectFactory.cpp

Rendering/

mitkTbssImageMapper.cpp

mitkTbssImageMapper.h

files.cmake

rMITK784fb333a261

View Options

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

View Options

Modules/DiffusionImaging/IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageReader.cpp

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssImageIOFactory.cpp

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssImageReader.cpp

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssImageReader.h

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssImageWriter.cpp

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssImageWriter.h

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssImageWriterFactory.cpp

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageIOFactory.cpp

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageIOFactory.h

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageReader.cpp

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageReader.h

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageWriter.cpp

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageWriter.h

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageWriterFactory.cpp

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageWriterFactory.h

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImage.cpp

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImage.h

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImageSource.cpp

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImageSource.h

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImporter.cpp

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImporter.h

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssRoiImage.cpp

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssRoiImage.h

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssRoiImageSource.cpp

View Options

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssRoiImageSource.h

View Options

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkTbssImageMapper.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkTbssImageMapper.h

View Options

Modules/DiffusionImaging/files.cmake

Merge branch 'bug-9000-tbssImage'784fb333a261Actions

Description

Details

Event Timeline

Merged Changes

Changes (30)

rMITK784fb333a261

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

Modules/DiffusionImaging/IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageReader.cpp

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssImageIOFactory.cpp

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssImageReader.cpp

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssImageReader.h

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssImageWriter.cpp

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssImageWriter.h

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssImageWriterFactory.cpp

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageIOFactory.cpp

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageIOFactory.h

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageReader.cpp

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageReader.h

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageWriter.cpp

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageWriter.h

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageWriterFactory.cpp

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssRoiImageWriterFactory.h

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImage.cpp

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImage.h

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImageSource.cpp

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImageSource.h

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImporter.cpp

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssImporter.h

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssRoiImage.cpp

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssRoiImage.h

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssRoiImageSource.cpp

Modules/DiffusionImaging/IODataStructures/TbssImages/mitkTbssRoiImageSource.h

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

Modules/DiffusionImaging/Rendering/mitkTbssImageMapper.cpp

Modules/DiffusionImaging/Rendering/mitkTbssImageMapper.h

Modules/DiffusionImaging/files.cmake

Merge branch 'bug-9000-tbssImage'
784fb333a261
Actions