Diffusion MITK d24d9e9617bc

dcm-refactor' into…
d24d9e9617bc
Actions

Description

Merge remote-tracking branch 'origin/personal/maleike/dcm-refactor' into personal/hering/dcm-refactor-diffusion

Conflicts:
Modules/DICOMReader/mitkDICOMImageBlockDescriptor.cpp
Modules/DICOMReader/mitkDICOMImageBlockDescriptor.h

Details

Provenance

• hering

Authored on Dec 18 2013, 5:23 PM

Parents

rMITK9683ccb18237: Enable GE Diffusion DICOM Header reading
rMITK556c92b04b53: Provide mitk properties to describe outputs

Branches

Unknown

Tags

Unknown

Event Timeline

• hering committed rMITKd24d9e9617bc: Merge remote-tracking branch 'origin/personal/maleike/dcm-refactor' into… (authored by • hering).Dec 18 2013, 5:23 PM

Merged Changes

556c92b04b53 Provide mitk properties to describe outputs
Author
maleike
Browse Repository
No Builds
No Audits
fd5ba9bb28f7 WIP: Add basic slice description via properties
Author
maleike
Browse Repository
No Builds
No Audits
bd3d9d4482c2 Handle locales during AnalyzeImages and LoadImages
Author
maleike
Browse Repository
No Builds
No Audits
a265cb035c35 Remove obsolete TODOs
Author
maleike
Browse Repository
No Builds
No Audits
8699d9b294f1 FixupSpacing in DICOMImageBlockDescriptor
Author
maleike
Browse Repository
No Builds
No Audits
755fe3157d4a Remove obsolete methods
Author
maleike
Browse Repository
No Builds
No Audits
f6270302984c InPlaceFixUpTiltedGeometry -> FixUpTiltedGeometry
Author
maleike
Browse Repository
No Builds
No Audits
e8c3c57d5f8c Remove some simple TODOs, update others
Author
maleike
Browse Repository
No Builds
No Audits
521747964d53 INFO -> DEBUG
Author
maleike
Browse Repository
No Builds
No Audits
725402e037a4 Put hard requirements into DICOMITKSeriesGDCMReader
Author
maleike
Browse Repository
No Builds
No Audits
9fe957f01b71 3D+t loading
Author
maleike
Browse Repository
No Builds
No Audits
1d8d8ca9bb15 Fixed float -> ScalarType in BlockDescriptor
Author
• hering
Browse Repository
No Builds
No Audits

Changes (29)

Path

Size

Examples/

mitkdump/

mitkdump.cpp

Modules/

DICOMReader/

Testing/

mitkDICOMFileReaderTestHelper.h

mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp

files.cmake

mitkClassicDICOMSeriesReader.cpp

mitkClassicDICOMSeriesReader.h

mitkDICOMDatasetSorter.cpp

mitkDICOMEnums.cpp

mitkDICOMEnums.h

mitkDICOMFileReader.cpp

mitkDICOMFileReader.h

mitkDICOMGDCMImageFrameInfo.cpp

mitkDICOMITKSeriesGDCMReader.cpp

mitkDICOMITKSeriesGDCMReader.h

mitkDICOMImageBlockDescriptor.cpp

mitkDICOMImageBlockDescriptor.h

mitkDICOMImageFrameInfo.cpp

mitkDICOMImageFrameInfo.h

mitkDICOMSortByTag.cpp

mitkDICOMTagBasedSorter.h

mitkEquiDistantBlocksSorter.cpp

mitkEquiDistantBlocksSorter.h

mitkGantryTiltInformation.cpp

mitkITKDICOMSeriesReaderHelper.cpp

mitkITKDICOMSeriesReaderHelper.h

mitkITKDICOMSeriesReaderHelper.txx

mitkThreeDnTDICOMSeriesReader.cpp

mitkThreeDnTDICOMSeriesReader.h

	DICOMReader/
	QmitkExt/

	mitkDICOMTagCache.h
	QmitkExtRegisterClasses.h

rMITKd24d9e9617bc

View Options

Examples/mitkdump/mitkdump.cpp

View Options

Modules/DICOMReader/Testing/mitkDICOMFileReaderTestHelper.h

View Options

Modules/DICOMReader/Testing/mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp

View Options

Modules/DICOMReader/files.cmake

View Options

Modules/DICOMReader/mitkClassicDICOMSeriesReader.cpp

View Options

Modules/DICOMReader/mitkClassicDICOMSeriesReader.h

View Options

Modules/DICOMReader/mitkDICOMDatasetSorter.cpp

View Options

Modules/DICOMReader/mitkDICOMEnums.cpp

View Options

Modules/DICOMReader/mitkDICOMEnums.h

View Options

Modules/DICOMReader/mitkDICOMFileReader.cpp

View Options

Modules/DICOMReader/mitkDICOMFileReader.h

View Options

Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp

View Options

Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.cpp

View Options

Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.h

View Options

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.cpp

View Options

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.h

View Options

Modules/DICOMReader/mitkDICOMImageFrameInfo.cpp

View Options

Modules/DICOMReader/mitkDICOMImageFrameInfo.h

View Options

Modules/DICOMReader/mitkDICOMSortByTag.cpp

View Options

Modules/DICOMReader/mitkDICOMTagBasedSorter.h

View Options

Modules/DICOMReader/mitkDICOMTagCache.h

View Options

Modules/DICOMReader/mitkEquiDistantBlocksSorter.cpp

View Options

Modules/DICOMReader/mitkEquiDistantBlocksSorter.h

View Options

Modules/DICOMReader/mitkGantryTiltInformation.cpp

View Options

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.cpp

View Options

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.h

View Options

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.txx

View Options

Modules/DICOMReader/mitkThreeDnTDICOMSeriesReader.cpp

View Options

Modules/DICOMReader/mitkThreeDnTDICOMSeriesReader.h

Merge remote-tracking branch 'origin/personal/maleike/dcm-refactor' into…d24d9e9617bcActions

Description

Details

Event Timeline

Merged Changes

Changes (29)

rMITKd24d9e9617bc

Examples/mitkdump/mitkdump.cpp

Modules/DICOMReader/Testing/mitkDICOMFileReaderTestHelper.h

Modules/DICOMReader/Testing/mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp

Modules/DICOMReader/files.cmake

Modules/DICOMReader/mitkClassicDICOMSeriesReader.cpp

Modules/DICOMReader/mitkClassicDICOMSeriesReader.h

Modules/DICOMReader/mitkDICOMDatasetSorter.cpp

Modules/DICOMReader/mitkDICOMEnums.cpp

Modules/DICOMReader/mitkDICOMEnums.h

Modules/DICOMReader/mitkDICOMFileReader.cpp

Modules/DICOMReader/mitkDICOMFileReader.h

Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp

Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.cpp

Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.h

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.cpp

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.h

Modules/DICOMReader/mitkDICOMImageFrameInfo.cpp

Modules/DICOMReader/mitkDICOMImageFrameInfo.h

Modules/DICOMReader/mitkDICOMSortByTag.cpp

Modules/DICOMReader/mitkDICOMTagBasedSorter.h

Modules/DICOMReader/mitkDICOMTagCache.h

Modules/DICOMReader/mitkEquiDistantBlocksSorter.cpp

Modules/DICOMReader/mitkEquiDistantBlocksSorter.h

Modules/DICOMReader/mitkGantryTiltInformation.cpp

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.cpp

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.h

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.txx

Modules/DICOMReader/mitkThreeDnTDICOMSeriesReader.cpp

Modules/DICOMReader/mitkThreeDnTDICOMSeriesReader.h

Merge remote-tracking branch 'origin/personal/maleike/dcm-refactor' into…
d24d9e9617bc
Actions