Diffusion MITK 44d2882c1e53

Merge branch 'bug-7620-bye-DICOMIO' into bug-7285-ensure-correct-slice-positions
44d2882c1e53
Actions

Description

Merge branch 'bug-7620-bye-DICOMIO' into bug-7285-ensure-correct-slice-positions

Conflicts:
Core/Code/IO/mitkDicomSeriesReader.h

Details

Provenance

maleike

Authored on May 6 2011, 5:49 PM

Parents

rMITK50404a15a2f8: Put filenames of individual slices into a property of mitk::Image
rMITK24b6aa1efd3e: Even more code blocks depending of a GDCM define

Branches

Unknown

Tags

Unknown

Event Timeline

maleike committed rMITK44d2882c1e53: Merge branch 'bug-7620-bye-DICOMIO' into bug-7285-ensure-correct-slice-positions (authored by maleike).May 6 2011, 5:49 PM

Merged Changes

24b6aa1efd3e Even more code blocks depending of a GDCM define
Author
maleike
Browse Repository
No Builds
No Audits
144c3b7b4648 Verify with CMake that we get at least GDCM 2.0.14
Author
maleike
Browse Repository
No Builds
No Audits
b2505aa12ff8 Expect GDCM > 2.0 ; keep spacing workaround for 2.0.14
Author
maleike
Browse Repository
No Builds
No Audits
3a138ba0213c Expect GDCM > 2.0
Author
maleike
Browse Repository
No Builds
No Audits
9e9d8cd14e1f Assume GDCMIO the default
Author
maleike
Browse Repository
No Builds
No Audits
71d3e211df1e Forgot my own old documentation from Documentation/Doxygen/DICOMLoadingTests.dox
Author
maleike
Browse Repository
No Builds
No Audits

Changes (16)

Path

Size

Packages

CMakeLists.txt

O1: MITK Reviewer Group I

Core/

Code/

Algorithms/

mitkDataNodeFactory.cpp

CMakeLists.txt

IO/

mitkDicomSeriesReader.cpp

mitkDicomSeriesReader.h

mitkDicomSeriesReader.txx

Testing/

DICOMTesting/

CMakeLists.txt

	Core/	Code/	Testing/	DICOMTesting/
			Documentation/	Doxygen/

	DICOMTesting.dox
	DICOMLoadingTests.dox

Documentation/

Doxygen/

DICOMLoadingTests.dox

MITKConfig.cmake.in

O1: MITK Reviewer Group I

Modules/

Bundles/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkDiffusionDicomImportView.cpp

DiffusionImaging/

DicomImport/

mitkGEDicomDiffusionImageHeaderReader.cpp

mitkSiemensDicomDiffusionImageHeaderReader.cpp

mitkSiemensMosaicDicomDiffusionImageHeaderReader.cpp

SuperBuild.cmake

O1: MITK Reviewer Group I

mitkConfig.h.in

rMITK44d2882c1e53

View Options

CMakeLists.txt

View Options

Core/Code/Algorithms/mitkDataNodeFactory.cpp

View Options

Core/Code/CMakeLists.txt

View Options

Core/Code/IO/mitkDicomSeriesReader.cpp

View Options

Core/Code/IO/mitkDicomSeriesReader.h

View Options

Core/Code/IO/mitkDicomSeriesReader.txx

View Options

Core/Code/Testing/DICOMTesting/CMakeLists.txt

View Options

Core/Code/Testing/DICOMTesting/DICOMTesting.dox

View Options

Documentation/Doxygen/DICOMLoadingTests.dox

View Options

MITKConfig.cmake.in

View Options

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

View Options

Modules/DiffusionImaging/DicomImport/mitkGEDicomDiffusionImageHeaderReader.cpp

View Options

Modules/DiffusionImaging/DicomImport/mitkSiemensDicomDiffusionImageHeaderReader.cpp

View Options

Modules/DiffusionImaging/DicomImport/mitkSiemensMosaicDicomDiffusionImageHeaderReader.cpp

View Options

SuperBuild.cmake

View Options

Merge branch 'bug-7620-bye-DICOMIO' into bug-7285-ensure-correct-slice-positions44d2882c1e53Actions

Description

Details

Event Timeline

Merged Changes

Changes (16)

rMITK44d2882c1e53

CMakeLists.txt

Core/Code/Algorithms/mitkDataNodeFactory.cpp

Core/Code/CMakeLists.txt

Core/Code/IO/mitkDicomSeriesReader.cpp

Core/Code/IO/mitkDicomSeriesReader.h

Core/Code/IO/mitkDicomSeriesReader.txx

Core/Code/Testing/DICOMTesting/CMakeLists.txt

Core/Code/Testing/DICOMTesting/DICOMTesting.dox

Documentation/Doxygen/DICOMLoadingTests.dox

MITKConfig.cmake.in

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

Modules/DiffusionImaging/DicomImport/mitkGEDicomDiffusionImageHeaderReader.cpp

Modules/DiffusionImaging/DicomImport/mitkSiemensDicomDiffusionImageHeaderReader.cpp

Modules/DiffusionImaging/DicomImport/mitkSiemensMosaicDicomDiffusionImageHeaderReader.cpp

SuperBuild.cmake

mitkConfig.h.in

Merge branch 'bug-7620-bye-DICOMIO' into bug-7285-ensure-correct-slice-positions
44d2882c1e53
Actions