dcm-refactor-diffusion' into bug-16813-dcm…
e94a1843d309
Actions

Description

Merge branch 'personal/hering/dcm-refactor-diffusion' into bug-16813-dcm-refactor-diffusion-master

Conflicts:
Core/Code/TestingHelper/mitkTestingMacros.h
Modules/DICOMReader/mitkDICOMFileReaderSelector.cpp
Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt
Modules/DiffusionImaging/DiffusionCore/Testing/files.cmake
Modules/DiffusionImaging/DiffusionCore/files.cmake

Details

Provenance

• hering

Authored on Jan 29 2014, 12:58 PM

Parents

rMITKb9890e923763: Enhance test : variable output
rMITKf5cf04bfe717: Merge remote-tracking branch 'origin/bug-16744-integration-master' into bug…

Branches

Unknown

Tags

Unknown

Event Timeline

• hering committed rMITKe94a1843d309: Merge branch 'personal/hering/dcm-refactor-diffusion' into bug-16813-dcm… (authored by • hering).Jan 29 2014, 1:56 PM

Merged Changes

b9890e923763 Enhance test : variable output
Author
• hering
Browse Repository
No Builds
No Audits
fb40ed3af0f2 FIX: Direction normalization for output
Author
• hering
Browse Repository
No Builds
No Audits
86ffe90c1ca0 Fixed b-value parsing for GE
Author
• hering
Browse Repository
No Builds
No Audits
496f2e4c07db Normalize diffusion vector
Author
• hering
Browse Repository
No Builds
No Audits
5a6fdb171607 WIP : Extending Diffusion DICOM Reader to handle mosaic
Author
• hering
Browse Repository
No Builds
No Audits
39768e9e4c11 Special struct for holding SIEMENS MOSAIC Diffusion header info
Author
• hering
Browse Repository
No Builds
No Audits
b441d8900d17 Prototyping MOSAIC image data loading for Diffusion
Author
• hering
Browse Repository
No Builds
No Audits
a6ce7ab6db2f Fixed namespace for ModuleContext
Author
• hering
Browse Repository
No Builds
No Audits
d8ae672ed66c Merge remote-tracking branch 'origin/bug-16744-dcm-refactor' into…
Author
• hering
Browse Repository
No Builds
No Audits
d24d9e9617bc Merge remote-tracking branch 'origin/personal/maleike/dcm-refactor' into…
Author
• hering
Browse Repository
No Builds
No Audits
9683ccb18237 Enable GE Diffusion DICOM Header reading
Author
• hering
Browse Repository
No Builds
No Audits
295270c0898f Implementing GE Diffusion DICOM Header reader
Author
• hering
Browse Repository
No Builds
No Audits
d239136c99d7 Clean-up code
Author
• hering
Browse Repository
No Builds
No Audits
86e098416438 Finalizing the prototype for DiffusionDICOM Loading
Author
• hering
Browse Repository
No Builds
No Audits
9b6b05bdccd1 Extended test
Author
• hering
Browse Repository
No Builds
No Audits
578e9dbb8e90 Added output analyze and file loading stub
Author
• hering
Browse Repository
No Builds
No Audits
c616900f2a09 Cleanup, add output production
Author
• hering
Browse Repository
No Builds
No Audits
97a58f984ba2 Add extraction of siemens mosaic information
Author
• hering
Browse Repository
No Builds
No Audits
897f85fc5a3c Moving methods for better re-usage
Author
• hering
Browse Repository
No Builds
No Audits
67eb40cc184e Move header information to topmost class
Author
• hering
Browse Repository
No Builds
No Audits
5b4ae7357b75 Isotropic data handling
Author
• hering
Browse Repository
No Builds
No Audits
20c568a4746b Moving string parsing to superclass
Author
• hering
Browse Repository
No Builds
No Audits
a3bc132e0454 Added diffusion header SIEMENS tag parsing
Author
• hering
Browse Repository
No Builds
No Audits
b8943d916774 Enable DiffusionHeaderReader in CMake
Author
• hering
Browse Repository
No Builds
No Audits
4196b159afb1 Added SIEMENS specific diffusion header parser
Author
• hering
Browse Repository
No Builds
No Audits
a95c4fb6a301 Added new superclass for all diffusion header reader
Author
• hering
Browse Repository
No Builds
No Audits
dc23fb50be6b Added basic test for reader
Author
• hering
Browse Repository
No Builds
No Audits
06b1de0cc32f Added diffusion DICOM reader, unified API
Author
• hering
Browse Repository
No Builds
No Audits
00c4c5d12b1f Fixed float -> ScalarType in BlockDescriptor
Author
• hering
Browse Repository
No Builds
No Audits
7fbed852f2f4 Merge branch 'personal/maleike/dcm-refactor' into personal/hering/dcm-refactor…
Author
• hering
Browse Repository
No Builds
No Audits

Changes (18)

Path

Size

Core/

Code/

TestingHelper/

mitkTestingMacros.h

Modules/

DICOMReader/

mitkDICOMFileReaderSelector.cpp

DiffusionImaging/

DiffusionCore/

DicomImport/

mitkDiffusionDICOMFileReader.cpp

mitkDiffusionDICOMFileReader.h

mitkDiffusionDICOMFileReaderHelper.h

	mitkDiffusionHeaderDICOMFileReader.cpp
	mitkPhilipsDicomDiffusionImageHeaderReader.cpp

mitkDiffusionHeaderDICOMFileReader.h

mitkDiffusionHeaderGEDICOMFileReader.cpp

mitkDiffusionHeaderGEDICOMFileReader.h

mitkDiffusionHeaderSiemensDICOMFileHelper.h

mitkDiffusionHeaderSiemensDICOMFileReader.cpp

mitkDiffusionHeaderSiemensDICOMFileReader.h

mitkDiffusionHeaderSiemensMosaicDICOMFileReader.cpp

mitkDiffusionHeaderSiemensMosaicDICOMFileReader.h

Testing/

files.cmake

	DiffusionImaging/	DiffusionCore/	Testing/
		DICOMReader/	Testing/

	mitkDiffusionDICOMFileReaderTest.cpp
	mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp

	mitkDiffusionDICOMFileReaderTestHelper.h
	mitkDICOMFileReaderTestHelper.h

Merge branch 'personal/hering/dcm-refactor-diffusion' into bug-16813-dcm…e94a1843d309Actions

Description

Details

Event Timeline

Merged Changes

Changes (18)

rMITKe94a1843d309

Core/Code/TestingHelper/mitkTestingMacros.h

Modules/DICOMReader/mitkDICOMFileReaderSelector.cpp

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionDICOMFileReader.cpp

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionDICOMFileReader.h

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionDICOMFileReaderHelper.h

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderDICOMFileReader.cpp

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderDICOMFileReader.h

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderGEDICOMFileReader.cpp

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderGEDICOMFileReader.h

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderSiemensDICOMFileHelper.h

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderSiemensDICOMFileReader.cpp

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderSiemensDICOMFileReader.h

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderSiemensMosaicDICOMFileReader.cpp

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderSiemensMosaicDICOMFileReader.h

Modules/DiffusionImaging/DiffusionCore/Testing/files.cmake

Modules/DiffusionImaging/DiffusionCore/Testing/mitkDiffusionDICOMFileReaderTest.cpp

Modules/DiffusionImaging/DiffusionCore/Testing/mitkDiffusionDICOMFileReaderTestHelper.h

Modules/DiffusionImaging/DiffusionCore/files.cmake

Merge branch 'personal/hering/dcm-refactor-diffusion' into bug-16813-dcm…
e94a1843d309
Actions