Merge branch 'bug-16813-dcm-refactor-diffusion-master-ITK451' into…
c461b1466498
Actions

Description

Merge branch 'bug-16813-dcm-refactor-diffusion-master-ITK451' into personal/hering/mic-hackfest-dicom

Conflicts:
Core/Code/Testing/DCMTesting/mitkTestDCMLoading.cpp
Core/Code/Testing/files.cmake
Core/Code/Testing/mitkDicomSeriesReaderTest.cpp
Modules/DiffusionImaging/DiffusionCore/Testing/files.cmake

Merge branch 'bug-16813-dcm-refactor-diffusion-master-ITK451' into…c461b1466498Actions

Description

Details

Event Timeline

Merged Changes

Changes (159)

rMITKc461b1466498

Core/Code/DataManagement/mitkLevelWindow.cpp

Core/Code/IO/mitkDicomSeriesReader.cpp

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

Core/Code/Testing/CMakeLists.txt

Core/Code/Testing/DCMTesting/CMakeLists.txt

Core/Code/Testing/DCMTesting/DumpDCMMitkImage.cpp

Core/Code/Testing/DCMTesting/Testing/CMakeLists.txt

Core/Code/Testing/DCMTesting/Testing/files.cmake

Core/Code/Testing/DCMTesting/Testing/mitkDCMPreloadedVolumeTest.cpp

Core/Code/Testing/DCMTesting/Testing/mitkDCMTestingSanityTest.cpp

Core/Code/Testing/DCMTesting/VerifyDCMMitkImageDump.cpp

Core/Code/Testing/DCMTesting/files.cmake

Core/Code/Testing/DCMTesting/mitkTestDCMLoading.cpp

Core/Code/Testing/DCMTesting/mitkTestDCMLoading.h

Core/Code/Testing/DICOMTesting

Core/Code/Testing/DICOMTesting/CMakeLists.txt

Core/Code/Testing/DICOMTesting/DumpDICOMMitkImage.cpp

Core/Code/Testing/DICOMTesting/Testing

Core/Code/Testing/DICOMTesting/Testing/CMakeLists.txt

Core/Code/Testing/DICOMTesting/Testing/files.cmake

Core/Code/Testing/DICOMTesting/Testing/mitkDICOMPreloadedVolumeTest.cpp

Core/Code/Testing/DICOMTesting/Testing/mitkDICOMTestingSanityTest.cpp

Core/Code/Testing/DICOMTesting/VerifyDICOMMitkImageDump.cpp

Core/Code/Testing/DICOMTesting/files.cmake

Core/Code/Testing/DICOMTesting/mitkTestDICOMLoading.cpp

Core/Code/Testing/DICOMTesting/mitkTestDICOMLoading.h

Core/Code/Testing/files.cmake

Core/Code/Testing/mitkDicomSeriesReaderTest.cpp

Core/Code/Testing/mitkLevelWindowTest.cpp

Core/Code/TestingHelper/mitkTestingMacros.h

Core/Documentation/Doxygen/Concepts/DICOMTesting.dox

Core/Documentation/images/tilt-correction.jpg

Examples/CMakeLists.txt

Examples/mitkdump/CMakeLists.txt

Examples/mitkdump/files.cmake

Examples/mitkdump/mitkdump.cpp

Examples/mitkdumpdir/CMakeLists.txt

Examples/mitkdumpdir/files.cmake

Examples/mitkdumpdir/mitkdumpdir.cpp

Modules/CMakeLists.txt

Modules/DICOMReader/CMakeLists.txt

Modules/DICOMReader/Documentation/Doxygen/Modules.dox

Modules/DICOMReader/Documentation/Doxygen/tilt-correction.jpg

Modules/DICOMReader/Documentation/images/implementeditkseriesgdcmreader.jpg

Modules/DICOMReader/Documentation/images/tilt-correction.jpg

Modules/DICOMReader/Resources/configurations/3D/classicreader.xml

Modules/DICOMReader/Resources/configurations/3D/imageposition.xml

Modules/DICOMReader/Resources/configurations/3D/imageposition_byacquisition.xml

Modules/DICOMReader/Resources/configurations/3D/imagetime.xml

Modules/DICOMReader/Resources/configurations/3D/instancenumber.xml

Modules/DICOMReader/Resources/configurations/3D/slicelocation.xml

Modules/DICOMReader/Resources/configurations/3DnT/classicreader.xml

Modules/DICOMReader/TODOs.txt

Modules/DICOMReader/Testing/CMakeLists.txt

Modules/DICOMReader/Testing/files.cmake

Modules/DICOMReader/Testing/mitkDICOMFileReaderTest.cpp

Modules/DICOMReader/Testing/mitkDICOMFileReaderTestHelper.h

Modules/DICOMReader/Testing/mitkDICOMFilenameSorter.cpp

Modules/DICOMReader/Testing/mitkDICOMFilenameSorter.h

Modules/DICOMReader/Testing/mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp

Modules/DICOMReader/Testing/mitkDICOMNullFileReader.cpp

Modules/DICOMReader/Testing/mitkDICOMNullFileReader.h

Modules/DICOMReader/Testing/mitkDICOMReaderConfiguratorTest.cpp

Modules/DICOMReader/files.cmake

Modules/DICOMReader/mitkClassicDICOMSeriesReader.cpp

Modules/DICOMReader/mitkClassicDICOMSeriesReader.h

Modules/DICOMReader/mitkDICOMDatasetAccess.h

Modules/DICOMReader/mitkDICOMDatasetSorter.cpp

Modules/DICOMReader/mitkDICOMDatasetSorter.h

Modules/DICOMReader/mitkDICOMEnums.cpp

Modules/DICOMReader/mitkDICOMEnums.h

Modules/DICOMReader/mitkDICOMFileReader.cpp

Modules/DICOMReader/mitkDICOMFileReader.h

Merge branch 'bug-16813-dcm-refactor-diffusion-master-ITK451' into…
c461b1466498
Actions