mic-hackfest-dicom' into bug-16813-diffusion…
4c6de2d0c8c7
Actions

Description

Merge branch 'personal/hering/mic-hackfest-dicom' into bug-16813-diffusion-dicom-integration

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

Merge branch 'personal/hering/mic-hackfest-dicom' into bug-16813-diffusion…4c6de2d0c8c7Actions

Description

Details

Event Timeline

Merged Changes

Changes (40)

rMITK4c6de2d0c8c7

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

Core/Code/Testing/DCMTesting/mitkTestDCMLoading.cpp

Core/Code/Testing/DCMTesting/mitkTestDCMLoading.h

Core/Code/Testing/files.cmake

Core/Code/Testing/mitkDicomSeriesReaderTest.cpp

Core/Code/TestingHelper/mitkTestingMacros.h

Examples/mitkdump/CMakeLists.txt

Modules/CMakeLists.txt

Modules/DICOMReader/CMakeLists.txt

Modules/DICOMReader/mitkDICOMFileReaderSelector.cpp

Modules/DICOMReader/mitkDICOMTag.h

Modules/DICOMReader/mitkGantryTiltInformation.h

Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt

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/mitkDiffusionHeaderPhilipsDICOMFileReader.cpp

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderPhilipsDICOMFileReader.h

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderSiemensDICOMFileHelper.cpp

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/DicomImport/test.txt

Modules/DiffusionImaging/DiffusionCore/Testing/files.cmake

Modules/DiffusionImaging/DiffusionCore/Testing/mitkDiffusionDICOMFileReaderTest.cpp

Modules/DiffusionImaging/DiffusionCore/Testing/mitkDiffusionDICOMFileReaderTestHelper.h

Modules/DiffusionImaging/DiffusionCore/files.cmake

Modules/DiffusionImaging/FiberTracking/Interactions/mitkFiberBundleInteractor.h

Modules/DiffusionImaging/MiniApps/DICOMLoader.cpp

Modules/DiffusionImaging/MiniApps/files.cmake

Modules/MapperExt/Internal/vtkPointSetSlicer.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportView.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportViewControls.ui

Merge branch 'personal/hering/mic-hackfest-dicom' into bug-16813-diffusion…
4c6de2d0c8c7
Actions