dcm…
7fbed852f2f4
Actions

Description

Merge branch 'personal/maleike/dcm-refactor' into personal/hering/dcm-refactor-diffusion

Conflicts:
Core/Code/Common/mitkTestingMacros.h
Core/Code/Testing/CMakeLists.txt
Core/Code/Testing/mitkDicomSeriesReaderTest.cpp

Details

Provenance

• hering

Authored on Dec 13 2013, 11:50 PM

Parents

rMITKe140a6fbf556: Updating TODOs a bit
rMITK62769a89acd5: Merge branch 'bug-16674-fix-memory-leaks'

Branches

Unknown

Tags

Unknown

Event Timeline

• hering committed rMITK7fbed852f2f4: Merge branch 'personal/maleike/dcm-refactor' into personal/hering/dcm… (authored by • hering).Dec 13 2013, 11:50 PM

Merged Changes

e140a6fbf556 Updating TODOs a bit
Author
maleike
Browse Repository
No Builds
No Audits
72db1e926723 Fix image position sorting (formerly: wrong indices used)
Author
maleike
Browse Repository
No Builds
No Audits
9a2f48b26e7b Fix tilt calculation precision
Author
maleike
Browse Repository
No Builds
No Audits
a3e75bc8a4e7 Implement ganry tilt "correction" by image shearing
Author
maleike
Browse Repository
No Builds
No Audits
3876e2a0a637 Use mitk::ScalarType instead of float
Author
maleike
Browse Repository
No Builds
No Audits
055ab2da81a6 Consider only a configurable number of digits for ImageOrientation
Author
maleike
Browse Repository
No Builds
No Audits
2b83f0e40ade More debugging output
Author
maleike
Browse Repository
No Builds
No Audits
da6cd2e3cb8e Prefer Pixel Spacing over Imager Pixel Spacing
Author
maleike
Browse Repository
No Builds
No Audits
1e16ec118418 Handle defaults for Image Position (Patient) and Image Orientation
Author
maleike
Browse Repository
No Builds
No Audits
763b4a7a58a9 Sorter for ImagePositionPatient/ImageOrientationPatient
Author
maleike
Browse Repository
No Builds
No Audits
9c1f26afda5c Removing test of questionable value
Author
maleike
Browse Repository
No Builds
No Audits
63600a419b17 Start fixing DICOM tests, using ClassicDICOMSeriesReader in ImageStatisticsTest
Author
maleike
Browse Repository
No Builds
No Audits
6ec4b43ec5f6 Use DICOMTag in mitkdump
Author
maleike
Browse Repository
No Builds
No Audits
f4975a6f55ca Implemented IsDICOM()
Author
maleike
Browse Repository
No Builds
No Audits
47d57fbf78a5 Move DICOMTesting from Core/Testing to Modules/
Author
maleike
Browse Repository
No Builds
No Audits
392af68a6920 Add class DICOMTag for brevity
Author
maleike
Browse Repository
No Builds
No Audits
eea6ab340498 ClassicDICOMSeriesReader mimics old DicomSeriesReader with new classes
Author
maleike
Browse Repository
No Builds
No Audits
0fa1474a9f6e slice distance sorter
Author
maleike
Browse Repository
No Builds
No Audits
cf5e6382ad58 mitkdump commandline tool to predict output
Author
maleike
Browse Repository
No Builds
No Audits
1f9e441e01d0 Implement basic Image loading
Author
maleike
Browse Repository
No Builds
No Audits
c4f2999136fe WIP sorting
Author
maleike
Browse Repository
No Builds
No Audits
1e12027add2b Basic splitting/sorting classes
Author
maleike
Browse Repository
No Builds
No Audits
3ed22bfd6619 Basic test (all inputs are distributed to outputs)
Author
maleike
Browse Repository
No Builds
No Audits
83b74456bb35 Include guards for test macros
Author
maleike
Browse Repository
No Builds
No Audits
4343d6ce2b5f Prepare sorting for DICOMITKSeriesGDCMReader
Author
maleike
Browse Repository
No Builds
No Audits
be4767a14f86 FileReader and BlockDescriptor
Author
maleike
Browse Repository
No Builds
No Audits

Changes (83)

Path

Size

Packages

Core/

Code/

Common/

mitkTestingMacros.h

IO/

mitkDicomSeriesReader.cpp

Testing/

CMakeLists.txt

DICOMTesting

CMakeLists.txt

DumpDICOMMitkImage.cpp

Testing

CMakeLists.txt

files.cmake

mitkDICOMPreloadedVolumeTest.cpp

mitkDICOMTestingSanityTest.cpp

VerifyDICOMMitkImageDump.cpp

files.cmake

mitkTestDICOMLoading.cpp

mitkTestDICOMLoading.h

files.cmake

mitkDicomSeriesReaderTest.cpp

Examples/

Modules/

mitkDICOMFileReaderTest.cpp

mitkDICOMFileReaderTestHelper.h

mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp

mitkDICOMNullFileReader.cpp

mitkDICOMNullFileReader.h

files.cmake

mitkClassicDICOMSeriesReader.cpp

mitkClassicDICOMSeriesReader.h

mitkDICOMDatasetAccess.h

mitkDICOMDatasetSorter.cpp

mitkDICOMDatasetSorter.h

mitkDICOMEnums.h

mitkDICOMFileReader.cpp

mitkDICOMFileReader.h

mitkDICOMFilenameSorter.cpp

mitkDICOMFilenameSorter.h

mitkDICOMGDCMImageFrameInfo.cpp

mitkDICOMGDCMImageFrameInfo.h

mitkDICOMITKSeriesGDCMReader.cpp

mitkDICOMITKSeriesGDCMReader.h

mitkDICOMImageBlockDescriptor.cpp

mitkDICOMImageBlockDescriptor.h

mitkDICOMImageFrameInfo.cpp

mitkDICOMImageFrameInfo.h

mitkDICOMSortByTag.cpp

mitkDICOMSortByTag.h

mitkDICOMSortCriterion.cpp

mitkDICOMSortCriterion.h

mitkDICOMTag.cpp

mitkDICOMTag.h

mitkDICOMTagBasedSorter.cpp

mitkDICOMTagBasedSorter.h

mitkEquiDistantBlocksSorter.cpp

mitkEquiDistantBlocksSorter.h

mitkGantryTiltInformation.cpp

mitkGantryTiltInformation.h

mitkITKDICOMSeriesReaderHelper.cpp

mitkITKDICOMSeriesReaderHelper.h

mitkITKDICOMSeriesReaderHelper.txx

mitkSortByImagePositionPatient.cpp

mitkSortByImagePositionPatient.h

DICOMTesting

O3: MITK Reviewer Group II

Testing

O3: MITK Reviewer Group II

mitkDICOMLocaleTest.cpp

O3: MITK Reviewer Group II

ImageStatistics/

Testing/

CMakeLists.txt

O1: MITK Reviewer Group I

mitkImageStatisticsCalculatorTest.cpp

O1: MITK Reviewer Group I

	Modules/			DICOMTesting/
	Core/	Code/	Testing/	DICOMTesting/

CMakeLists.txt

O3: MITK Reviewer Group II

DumpDICOMMitkImage.cpp

O3: MITK Reviewer Group II

Testing/

CMakeLists.txt

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

mitkDICOMPreloadedVolumeTest.cpp

O3: MITK Reviewer Group II

mitkDICOMTestingSanityTest.cpp

O3: MITK Reviewer Group II

VerifyDICOMMitkImageDump.cpp

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

mitkTestDICOMLoading.cpp

O3: MITK Reviewer Group II

mitkTestDICOMLoading.h

O3: MITK Reviewer Group II

rMITK7fbed852f2f4

View Options

Core/Code/Common/mitkTestingMacros.h

View Options

Core/Code/IO/mitkDicomSeriesReader.cpp

View Options

Core/Code/Testing/CMakeLists.txt

View Options

Core/Code/Testing/DICOMTesting

View Options

Core/Code/Testing/DICOMTesting/CMakeLists.txt

View Options

Core/Code/Testing/DICOMTesting/DumpDICOMMitkImage.cpp

View Options

Core/Code/Testing/DICOMTesting/Testing

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Core/Code/Testing/DICOMTesting/VerifyDICOMMitkImageDump.cpp

View Options

Core/Code/Testing/DICOMTesting/files.cmake

View Options

Core/Code/Testing/DICOMTesting/mitkTestDICOMLoading.cpp

View Options

Core/Code/Testing/DICOMTesting/mitkTestDICOMLoading.h

View Options

Core/Code/Testing/files.cmake

View Options

Core/Code/Testing/mitkDicomSeriesReaderTest.cpp

View Options

Examples/CMakeLists.txt

View Options

Examples/mitkdump/CMakeLists.txt

View Options

Examples/mitkdump/mitkdump.cpp

View Options

Modules/CMakeLists.txt

View Options

Modules/DICOMReader/CMakeLists.txt

View Options

Modules/DICOMReader/Testing/CMakeLists.txt

View Options

Modules/DICOMReader/Testing/files.cmake

View Options

Modules/DICOMReader/Testing/mitkDICOMFileReaderTest.cpp

View Options

Modules/DICOMReader/Testing/mitkDICOMFileReaderTestHelper.h

View Options

Modules/DICOMReader/Testing/mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp

View Options

Modules/DICOMReader/Testing/mitkDICOMNullFileReader.cpp

View Options

Modules/DICOMReader/Testing/mitkDICOMNullFileReader.h

View Options

Modules/DICOMReader/files.cmake

View Options

Modules/DICOMReader/mitkClassicDICOMSeriesReader.cpp

View Options

Modules/DICOMReader/mitkClassicDICOMSeriesReader.h

View Options

Modules/DICOMReader/mitkDICOMDatasetAccess.h

View Options

Modules/DICOMReader/mitkDICOMDatasetSorter.cpp

View Options

Modules/DICOMReader/mitkDICOMDatasetSorter.h

View Options

Modules/DICOMReader/mitkDICOMEnums.h

View Options

Modules/DICOMReader/mitkDICOMFileReader.cpp

View Options

Modules/DICOMReader/mitkDICOMFileReader.h

View Options

Modules/DICOMReader/mitkDICOMFilenameSorter.cpp

View Options

Modules/DICOMReader/mitkDICOMFilenameSorter.h

View Options

Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp

View Options

Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.h

View Options

Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.cpp

View Options

Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.h

View Options

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.cpp

View Options

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.h

View Options

Modules/DICOMReader/mitkDICOMImageFrameInfo.cpp

View Options

Modules/DICOMReader/mitkDICOMImageFrameInfo.h

View Options

Modules/DICOMReader/mitkDICOMSortByTag.cpp

View Options

Modules/DICOMReader/mitkDICOMSortByTag.h

View Options

Modules/DICOMReader/mitkDICOMSortCriterion.cpp

View Options

Modules/DICOMReader/mitkDICOMSortCriterion.h

View Options

Modules/DICOMReader/mitkDICOMTag.cpp

View Options

Modules/DICOMReader/mitkDICOMTag.h

View Options

Modules/DICOMReader/mitkDICOMTagBasedSorter.cpp

View Options

Modules/DICOMReader/mitkDICOMTagBasedSorter.h

View Options

Modules/DICOMReader/mitkEquiDistantBlocksSorter.cpp

View Options

Modules/DICOMReader/mitkEquiDistantBlocksSorter.h

View Options

Modules/DICOMReader/mitkGantryTiltInformation.cpp

View Options

Modules/DICOMReader/mitkGantryTiltInformation.h

View Options

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.cpp

View Options

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.h

View Options

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.txx

View Options

Modules/DICOMReader/mitkSortByImagePositionPatient.cpp

View Options

Modules/DICOMReader/mitkSortByImagePositionPatient.h

View Options

Modules/DICOMTesting/CMakeLists.txt

View Options

Modules/DICOMTesting/DumpDICOMMitkImage.cpp

View Options

Modules/DICOMTesting/Testing/CMakeLists.txt

View Options

Modules/DICOMTesting/Testing/files.cmake

View Options

Modules/DICOMTesting/Testing/mitkDICOMLocaleTest.cpp

View Options

Modules/DICOMTesting/Testing/mitkDICOMPreloadedVolumeTest.cpp

View Options

Modules/DICOMTesting/Testing/mitkDICOMTestingSanityTest.cpp

View Options

Modules/DICOMTesting/VerifyDICOMMitkImageDump.cpp

View Options

Modules/DICOMTesting/files.cmake

View Options

Modules/DICOMTesting/mitkTestDICOMLoading.cpp

View Options

Modules/DICOMTesting/mitkTestDICOMLoading.h

View Options

Modules/ImageStatistics/Testing/CMakeLists.txt

View Options

Modules/ImageStatistics/Testing/mitkImageStatisticsCalculatorTest.cpp

Merge branch 'personal/maleike/dcm-refactor' into personal/hering/dcm…7fbed852f2f4Actions

Description

Details

Event Timeline

Merged Changes

Changes (83)

rMITK7fbed852f2f4

Core/Code/Common/mitkTestingMacros.h

Core/Code/IO/mitkDicomSeriesReader.cpp

Core/Code/Testing/CMakeLists.txt

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

Examples/CMakeLists.txt

Examples/mitkdump/CMakeLists.txt

Examples/mitkdump/mitkdump.cpp

Modules/CMakeLists.txt

Modules/DICOMReader/CMakeLists.txt

Modules/DICOMReader/Testing/CMakeLists.txt

Modules/DICOMReader/Testing/files.cmake

Modules/DICOMReader/Testing/mitkDICOMFileReaderTest.cpp

Modules/DICOMReader/Testing/mitkDICOMFileReaderTestHelper.h

Modules/DICOMReader/Testing/mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp

Modules/DICOMReader/Testing/mitkDICOMNullFileReader.cpp

Modules/DICOMReader/Testing/mitkDICOMNullFileReader.h

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.h

Modules/DICOMReader/mitkDICOMFileReader.cpp

Modules/DICOMReader/mitkDICOMFileReader.h

Modules/DICOMReader/mitkDICOMFilenameSorter.cpp

Modules/DICOMReader/mitkDICOMFilenameSorter.h

Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp

Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.h

Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.cpp

Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.h

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.cpp

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.h

Modules/DICOMReader/mitkDICOMImageFrameInfo.cpp

Modules/DICOMReader/mitkDICOMImageFrameInfo.h

Modules/DICOMReader/mitkDICOMSortByTag.cpp

Modules/DICOMReader/mitkDICOMSortByTag.h

Modules/DICOMReader/mitkDICOMSortCriterion.cpp

Modules/DICOMReader/mitkDICOMSortCriterion.h

Modules/DICOMReader/mitkDICOMTag.cpp

Modules/DICOMReader/mitkDICOMTag.h

Modules/DICOMReader/mitkDICOMTagBasedSorter.cpp

Modules/DICOMReader/mitkDICOMTagBasedSorter.h

Modules/DICOMReader/mitkEquiDistantBlocksSorter.cpp

Modules/DICOMReader/mitkEquiDistantBlocksSorter.h

Modules/DICOMReader/mitkGantryTiltInformation.cpp

Modules/DICOMReader/mitkGantryTiltInformation.h

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.cpp

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.h

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.txx

Modules/DICOMReader/mitkSortByImagePositionPatient.cpp

Modules/DICOMReader/mitkSortByImagePositionPatient.h

Modules/DICOMTesting/CMakeLists.txt

Modules/DICOMTesting/DumpDICOMMitkImage.cpp

Modules/DICOMTesting/Testing/CMakeLists.txt

Modules/DICOMTesting/Testing/files.cmake

Modules/DICOMTesting/Testing/mitkDICOMLocaleTest.cpp

Modules/DICOMTesting/Testing/mitkDICOMPreloadedVolumeTest.cpp

Modules/DICOMTesting/Testing/mitkDICOMTestingSanityTest.cpp

Modules/DICOMTesting/VerifyDICOMMitkImageDump.cpp

Merge branch 'personal/maleike/dcm-refactor' into personal/hering/dcm…
7fbed852f2f4
Actions