Merge remote-tracking branch 'origin/bug-16744-dcm-refactor-integration-2014…
48cb07676932
Actions

Description

Merge remote-tracking branch 'origin/bug-16744-dcm-refactor-integration-2014-03' into personal/hering/mic-hackfest-dicom

Conflicts:
Core/Code/Rendering/mitkImageVtkMapper2D.cpp
Core/Code/Testing/DCMTesting/mitkTestDCMLoading.h
Modules/DICOMReader/CMakeLists.txt

Details

Provenance

• hering

Authored on Aug 5 2014, 5:01 PM

Parents

rMITKc461b1466498: Merge branch 'bug-16813-dcm-refactor-diffusion-master-ITK451' into…
rMITKf56a316dda57: Merge remote-tracking branch 'origin/bug-16744-develop' into bug-16744-dcm…

Branches

Unknown

Tags

Unknown

Event Timeline

• hering committed rMITK48cb07676932: Merge remote-tracking branch 'origin/bug-16744-dcm-refactor-integration-2014… (authored by • hering).Aug 5 2014, 5:02 PM

Merged Changes

f56a316dda57 Merge remote-tracking branch 'origin/bug-16744-develop' into bug-16744-dcm…
Author
• hering
Browse Repository
No Builds
No Audits
23d72d8b70cb Adapted DICOM classes to new module naming
Author
• hering
Browse Repository
No Builds
No Audits
4d8006f166ea Merge remote-tracking branch 'origin/bug-16744-integration-master' into bug…
Author
• hering
Browse Repository
No Builds
No Audits
be0c62730bd0 Handle exceptions during string trimming
Author
maleike
Browse Repository
No Builds
No Audits
7b7df14d6748 Fix parsing of spacing (was completely broken, see failing tests)
Author
maleike
Browse Repository
No Builds
No Audits
b704eb23a62d Improve configuration descriptions: more details
Author
maleike
Browse Repository
No Builds
No Audits
5e95a48e4899 Reword a "strange special case" to "ExpectDistanceOne" and change its…
Author
maleike
Browse Repository
No Builds
No Audits
b3d52e58f093 Replace atof by istringstream
Author
maleike
Browse Repository
No Builds
No Audits
ebdc118fad7b Fix memory leak
Author
maleike
Browse Repository
No Builds
No Audits
97bc41049762 Remove debug message
Author
maleike
Browse Repository
No Builds
No Audits
1af8c24dbaf2 Convert only first component of WindowCenter/WindowWidth to number!
Author
maleike
Browse Repository
No Builds
No Audits
e558913990a1 Add a repeated loading step to mitkdump
Author
maleike
Browse Repository
No Builds
No Audits
16b17bed5ce4 Add a "soft" sorting by Instance Number
Author
maleike
Browse Repository
No Builds
No Audits
3f27cc213dd6 Make "strict sorting" really strict
Author
maleike
Browse Repository
No Builds
No Audits
6f00a85f1bcf added additional properties to mitk::Image
Author
engelm
Browse Repository
No Builds
No Audits
c8eb8c72e367 Merge remote-tracking branch 'origin/bug-16744-develop' into bug-16744…
Author
maleike
Browse Repository
No Builds
No Audits
ad4e53e3cb23 Do not return classic reader, seems never the best choice
Author
maleike
Browse Repository
No Builds
No Audits

Changes (45)

Path

Size

Packages

Core/

Code/

Testing/

DCMTesting/

CMakeLists.txt

mitkTestDCMLoading.h

Examples/

mitkdump/

CMakeLists.txt

mitkdump.cpp

Modules/

DICOMReader/

CMakeLists.txt

Resources/

configurations/

3D/

classicreader.xml

imageposition.xml

imageposition_byacquisition.xml

imagetime.xml

instancenumber.xml

	instancenumber_soft.xml
	instancenumber.xml

slicelocation.xml

files.cmake

mitkClassicDICOMSeriesReader.h

mitkDICOMDatasetAccess.h

mitkDICOMDatasetSorter.h

mitkDICOMFileReader.h

mitkDICOMFileReaderSelector.cpp

mitkDICOMFileReaderSelector.h

mitkDICOMGDCMImageFrameInfo.cpp

mitkDICOMGDCMImageFrameInfo.h

mitkDICOMGDCMTagScanner.h

mitkDICOMITKSeriesGDCMReader.h

mitkDICOMImageBlockDescriptor.cpp

mitkDICOMImageBlockDescriptor.h

mitkDICOMImageFrameInfo.h

mitkDICOMReaderConfigurator.cpp

mitkDICOMReaderConfigurator.h

mitkDICOMSortByTag.cpp

mitkDICOMSortByTag.h

mitkDICOMSortCriterion.h

mitkDICOMTag.cpp

mitkDICOMTag.h

mitkDICOMTagBasedSorter.cpp

mitkDICOMTagBasedSorter.h

mitkDICOMTagCache.h

mitkEquiDistantBlocksSorter.h

mitkGantryTiltInformation.h

mitkNormalDirectionConsistencySorter.h

mitkSortByImagePositionPatient.h

mitkThreeDnTDICOMSeriesReader.h

DICOMTesting/

CMakeLists.txt

O3: MITK Reviewer Group II

mitkTestDICOMLoading.h

O3: MITK Reviewer Group II

ImageStatistics/

Testing/

CMakeLists.txt

O1: MITK Reviewer Group I

MapperExt/

Internal/

vtkPointSetSlicer.h

rMITK48cb07676932

View Options

Core/Code/Testing/DCMTesting/CMakeLists.txt

View Options

Core/Code/Testing/DCMTesting/mitkTestDCMLoading.h

View Options

Examples/mitkdump/CMakeLists.txt

View Options

Examples/mitkdump/mitkdump.cpp

View Options

Modules/DICOMReader/CMakeLists.txt

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Modules/DICOMReader/files.cmake

View Options

Modules/DICOMReader/mitkClassicDICOMSeriesReader.h

View Options

Modules/DICOMReader/mitkDICOMDatasetAccess.h

View Options

Modules/DICOMReader/mitkDICOMDatasetSorter.h

View Options

Modules/DICOMReader/mitkDICOMFileReader.h

View Options

Modules/DICOMReader/mitkDICOMFileReaderSelector.cpp

View Options

Modules/DICOMReader/mitkDICOMFileReaderSelector.h

View Options

Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp

View Options

Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.h

View Options

Modules/DICOMReader/mitkDICOMGDCMTagScanner.h

View Options

Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.h

View Options

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.cpp

View Options

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.h

View Options

Modules/DICOMReader/mitkDICOMImageFrameInfo.h

View Options

Modules/DICOMReader/mitkDICOMReaderConfigurator.cpp

View Options

Modules/DICOMReader/mitkDICOMReaderConfigurator.h

View Options

Modules/DICOMReader/mitkDICOMSortByTag.cpp

View Options

Modules/DICOMReader/mitkDICOMSortByTag.h

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

View Options

Modules/DICOMReader/mitkEquiDistantBlocksSorter.h

View Options

Modules/DICOMReader/mitkGantryTiltInformation.h

View Options

Modules/DICOMReader/mitkNormalDirectionConsistencySorter.h

View Options

Modules/DICOMReader/mitkSortByImagePositionPatient.h

View Options

Modules/DICOMReader/mitkThreeDnTDICOMSeriesReader.h

View Options

Modules/DICOMTesting/CMakeLists.txt

View Options

Modules/DICOMTesting/mitkTestDICOMLoading.h

View Options

Modules/ImageStatistics/Testing/CMakeLists.txt

View Options

Modules/MapperExt/Internal/vtkPointSetSlicer.h

Merge remote-tracking branch 'origin/bug-16744-dcm-refactor-integration-2014…48cb07676932Actions

Description

Details

Event Timeline

Merged Changes

Changes (45)

rMITK48cb07676932

Core/Code/Testing/DCMTesting/CMakeLists.txt

Core/Code/Testing/DCMTesting/mitkTestDCMLoading.h

Examples/mitkdump/CMakeLists.txt

Examples/mitkdump/mitkdump.cpp

Modules/DICOMReader/CMakeLists.txt

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/instancenumber_soft.xml

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

Modules/DICOMReader/files.cmake

Modules/DICOMReader/mitkClassicDICOMSeriesReader.h

Modules/DICOMReader/mitkDICOMDatasetAccess.h

Modules/DICOMReader/mitkDICOMDatasetSorter.h

Modules/DICOMReader/mitkDICOMFileReader.h

Modules/DICOMReader/mitkDICOMFileReaderSelector.cpp

Modules/DICOMReader/mitkDICOMFileReaderSelector.h

Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp

Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.h

Modules/DICOMReader/mitkDICOMGDCMTagScanner.h

Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.h

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.cpp

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.h

Modules/DICOMReader/mitkDICOMImageFrameInfo.h

Modules/DICOMReader/mitkDICOMReaderConfigurator.cpp

Modules/DICOMReader/mitkDICOMReaderConfigurator.h

Modules/DICOMReader/mitkDICOMSortByTag.cpp

Modules/DICOMReader/mitkDICOMSortByTag.h

Modules/DICOMReader/mitkDICOMSortCriterion.h

Modules/DICOMReader/mitkDICOMTag.cpp

Modules/DICOMReader/mitkDICOMTag.h

Modules/DICOMReader/mitkDICOMTagBasedSorter.cpp

Modules/DICOMReader/mitkDICOMTagBasedSorter.h

Modules/DICOMReader/mitkDICOMTagCache.h

Modules/DICOMReader/mitkEquiDistantBlocksSorter.h

Modules/DICOMReader/mitkGantryTiltInformation.h

Modules/DICOMReader/mitkNormalDirectionConsistencySorter.h

Modules/DICOMReader/mitkSortByImagePositionPatient.h

Modules/DICOMReader/mitkThreeDnTDICOMSeriesReader.h

Modules/DICOMTesting/CMakeLists.txt

Modules/DICOMTesting/mitkTestDICOMLoading.h

Modules/ImageStatistics/Testing/CMakeLists.txt

Modules/MapperExt/Internal/vtkPointSetSlicer.h

Merge remote-tracking branch 'origin/bug-16744-dcm-refactor-integration-2014…
48cb07676932
Actions