Merge remote-tracking branch 'origin/bug-16813-diffusion-dicom-integration'…
04c7d25308ff
Actions

Description

Merge remote-tracking branch 'origin/bug-16813-diffusion-dicom-integration' into bug-16813-dicom-refactoring-integration

Conflicts:
Modules/CMakeLists.txt
Modules/DiffusionImaging/DiffusionCore/Testing/files.cmake
Modules/MapperExt/Internal/vtkPointSetSlicer.h

Details

Provenance

• goch

Authored on Oct 7 2014, 5:39 PM

Parents

rMITK1403cab9fcbf: Add SplitMosaic control button
rMITKee1f83b4cd17: Merge remote-tracking branch 'origin/bug-18112-DWI-Registration…

Branches

Unknown

Tags

Unknown

Event Timeline

• goch committed rMITK04c7d25308ff: Merge remote-tracking branch 'origin/bug-16813-diffusion-dicom-integration'… (authored by • goch).Oct 7 2014, 5:39 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

1403cab9fcbf Add SplitMosaic control button
Author
• hering
Browse Repository
No Builds
No Audits
5b339412c7f1 Fixed MOSAIC Handling
Author
• hering
Browse Repository
No Builds
No Audits
0510081d4007 Fixed DICOM Diffusion sorting
Author
• hering
Browse Repository
No Builds
No Audits
a5621cedd07a Add missing include
Author
• hering
Browse Repository
No Builds
No Audits
3a0ea7c8ddc7 Re-added accidentally removed test source file
Author
• hering
Browse Repository
No Builds
No Audits
8a66836aad19 Re-added accidentally removed test
Author
• hering
Browse Repository
No Builds
No Audits
e9a182ef9dcb Fixed compile errors on WIN
Author
• hering
Browse Repository
No Builds
No Audits
bebbf5e8f847 Fixed loading of MOSAIC information
Author
• hering
Browse Repository
No Builds
No Audits
e7aafe5758cb Fixed node naming for loaded DICOM DWIs
Author
• hering
Browse Repository
No Builds
No Audits
fa7eb0507bc1 Adapted MiniApp to new interface
Author
• hering
Browse Repository
No Builds
No Audits
b8dacce622ef Fix module deps names
Author
• hering
Browse Repository
No Builds
No Audits
c9427f69c693 Merge branch 'personal/hering/mic-hackfest-dicom' into bug-16813-diffusion…
Author
• hering
Browse Repository
No Builds
No Audits
107534dbd938 Formatting output messages
Author
• hering
Browse Repository
No Builds
No Audits
4c6de2d0c8c7 Merge branch 'personal/hering/mic-hackfest-dicom' into bug-16813-diffusion…
Author
• hering
Browse Repository
No Builds
No Audits
1a6f2fb7d6b6 Add multi-file loading support
Author
• hering
Browse Repository
No Builds
No Audits
37238fb66ac6 Let the DiffusionDICOM inherit the ThreeDnT Reader
Author
• hering
Browse Repository
No Builds
No Audits
ac98b2a744b5 Directinos has to be set after reference value
Author
• hering
Browse Repository
No Builds
No Audits
e3f97e45e8d9 Finishing Philips DICOM Header import support
Author
• hering
Browse Repository
No Builds
No Audits
50c9a9578a5a Add support (WIP) for Philips Diffusion
Author
• hering
Browse Repository
No Builds
No Audits
ed6ab54a11e7 Add handling meta information in MOSAIC data
Author
• hering
Browse Repository
No Builds
No Audits
c5334fc02184 Add handling SIEMENES Mosaic Files
Author
• hering
Browse Repository
No Builds
No Audits
c1f5493c8406 Fixed PREFIX usage in QmitkDICOM
Author
• hering
Browse Repository
No Builds
No Audits
0cf946e171f3 Merge remote-tracking branch 'origin/personal/hering/mic-hackfest-dicom' into…
Author
• hering
Browse Repository
No Builds
No Audits
6905e65237a6 Enhance recursive scanning in DiffusionDICOM
Author
• hering
Browse Repository
No Builds
No Audits
67927b849454 Enhance recursive scanning in DiffusionDICOM
Author
• hering
Browse Repository
No Builds
No Audits
a7e92808d32f Adapting DICOMLoader to new API
Author
• hering
Browse Repository
No Builds
No Audits
4fc77af50a2f Merge branch 'personal/hering/dcm-refactor-diffusion-gui' into…
Author
• hering
Browse Repository
No Builds
No Audits
2a2398870545 Adapt old code to new module structure
Author
• hering
Browse Repository
No Builds
No Audits
48cb07676932 Merge remote-tracking branch 'origin/bug-16744-dcm-refactor-integration-2014…
Author
• hering
Browse Repository
No Builds
No Audits
c461b1466498 Merge branch 'bug-16813-dcm-refactor-diffusion-master-ITK451' into…
Author
• hering
Browse Repository
No Builds
No Audits
8814ca7de0fb Merge branch 'bug-16813-dcm-refactor-diffusion-master' into bug-16813-dcm…
Author
• hering
Browse Repository
No Builds
No Audits
195883ddb125 New MiniApp for Diffusion DICOM Loading
Author
• hering
Browse Repository
No Builds
No Audits
b1c6e38ec3be Adapting new DICOM to current master
Author
• hering
Browse Repository
No Builds
No Audits
e94a1843d309 Merge branch 'personal/hering/dcm-refactor-diffusion' into bug-16813-dcm…
Author
• hering
Browse Repository
No Builds
No Audits
f5cf04bfe717 Merge remote-tracking branch 'origin/bug-16744-integration-master' into bug…
Author
• hering
Browse Repository
No Builds
No Audits
a643625406a2 Merge branch 'bug-16780-RemoveWarningsInDiffusionImaging'
Author
• hering
Browse Repository
No Builds
No Audits
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
4423fbe366ff Adapting QmitkDiffusionDicomView
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

Changes (36)

Path

Size

Core/

Code/

Rendering/

mitkImageVtkMapper2D.cpp

Testing/

DCMTesting/

mitkTestDCMLoading.cpp

mitkTestDCMLoading.h

files.cmake

mitkDicomSeriesReaderTest.cpp

TestingHelper/

mitkTestingMacros.h

Modules/

DICOMReader/

CMakeLists.txt

mitkDICOMFileReaderSelector.cpp

mitkDICOMTag.h

mitkGantryTiltInformation.h

DiffusionImaging/

DiffusionCore/

CMakeLists.txt

DicomImport/

mitkDiffusionDICOMFileReader.cpp

mitkDiffusionDICOMFileReader.h

mitkDiffusionDICOMFileReaderHelper.h

mitkDiffusionHeaderDICOMFileReader.cpp

mitkDiffusionHeaderDICOMFileReader.h

mitkDiffusionHeaderGEDICOMFileReader.cpp

mitkDiffusionHeaderGEDICOMFileReader.h

mitkDiffusionHeaderPhilipsDICOMFileReader.cpp

mitkDiffusionHeaderPhilipsDICOMFileReader.h

mitkDiffusionHeaderSiemensDICOMFileHelper.cpp

mitkDiffusionHeaderSiemensDICOMFileHelper.h

mitkDiffusionHeaderSiemensDICOMFileReader.cpp

mitkDiffusionHeaderSiemensDICOMFileReader.h

mitkDiffusionHeaderSiemensMosaicDICOMFileReader.cpp

mitkDiffusionHeaderSiemensMosaicDICOMFileReader.h

test.txt

Testing/

files.cmake

mitkDiffusionDICOMFileReaderTest.cpp

mitkDiffusionDICOMFileReaderTestHelper.h

files.cmake

MiniApps/

DICOMLoader.cpp

files.cmake

Plugins/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkDiffusionDicomImportView.cpp

QmitkDiffusionDicomImportView.h

QmitkDiffusionDicomImportViewControls.ui

rMITK04c7d25308ff

View Options

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

View Options

Core/Code/Testing/DCMTesting/mitkTestDCMLoading.cpp

View Options

Core/Code/Testing/DCMTesting/mitkTestDCMLoading.h

View Options

Core/Code/Testing/files.cmake

View Options

Core/Code/Testing/mitkDicomSeriesReaderTest.cpp

View Options

Core/Code/TestingHelper/mitkTestingMacros.h

View Options

Modules/DICOMReader/CMakeLists.txt

View Options

Modules/DICOMReader/mitkDICOMFileReaderSelector.cpp

View Options

Modules/DICOMReader/mitkDICOMTag.h

View Options

Modules/DICOMReader/mitkGantryTiltInformation.h

View Options

Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionDICOMFileReader.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionDICOMFileReader.h

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionDICOMFileReaderHelper.h

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderDICOMFileReader.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderDICOMFileReader.h

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderGEDICOMFileReader.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderGEDICOMFileReader.h

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderPhilipsDICOMFileReader.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderPhilipsDICOMFileReader.h

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderSiemensDICOMFileHelper.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderSiemensDICOMFileHelper.h

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderSiemensDICOMFileReader.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderSiemensDICOMFileReader.h

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderSiemensMosaicDICOMFileReader.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkDiffusionHeaderSiemensMosaicDICOMFileReader.h

View Options

Modules/DiffusionImaging/DiffusionCore/DicomImport/test.txt

View Options

Modules/DiffusionImaging/DiffusionCore/Testing/files.cmake

View Options

Modules/DiffusionImaging/DiffusionCore/Testing/mitkDiffusionDICOMFileReaderTest.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/Testing/mitkDiffusionDICOMFileReaderTestHelper.h

View Options

Modules/DiffusionImaging/DiffusionCore/files.cmake

View Options

Modules/DiffusionImaging/MiniApps/DICOMLoader.cpp

View Options

Modules/DiffusionImaging/MiniApps/files.cmake

View Options

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

View Options

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

View Options

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

Merge remote-tracking branch 'origin/bug-16813-diffusion-dicom-integration'…04c7d25308ffActions

Description

Details

Event Timeline

Merged Changes

Changes (36)

rMITK04c7d25308ff

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

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/MiniApps/DICOMLoader.cpp

Modules/DiffusionImaging/MiniApps/files.cmake

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 remote-tracking branch 'origin/bug-16813-diffusion-dicom-integration'…
04c7d25308ff
Actions