Diffusion MITK f56a316dda57

Merge remote-tracking branch 'origin/bug-16744-develop' into bug-16744-dcm…
f56a316dda57
Actions

Description

Merge remote-tracking branch 'origin/bug-16744-develop' into bug-16744-dcm-refactor-integration-2014-03

Conflicts:
Core/Code/DataManagement/mitkPropertyList.cpp

Details

Provenance

• hering

Authored on Apr 23 2014, 3:25 PM

Parents

rMITKbe0c62730bd0: Handle exceptions during string trimming
rMITK23d72d8b70cb: Adapted DICOM classes to new module naming

Branches

Unknown

Tags

Unknown

Event Timeline

• hering committed rMITKf56a316dda57: Merge remote-tracking branch 'origin/bug-16744-develop' into bug-16744-dcm… (authored by • hering).Apr 23 2014, 3:25 PM

Merged Changes

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

Changes (17)

Path

Size

Examples/

mitkdump/

mitkdump.cpp

Modules/

DICOMReader/

Resources/

configurations/

3D/

classicreader.xml

imageposition.xml

imageposition_byacquisition.xml

imagetime.xml

instancenumber.xml

	instancenumber_soft.xml
	instancenumber.xml

slicelocation.xml

files.cmake

mitkDICOMFileReaderSelector.cpp

mitkDICOMGDCMImageFrameInfo.cpp

mitkDICOMImageBlockDescriptor.cpp

mitkDICOMReaderConfigurator.cpp

mitkDICOMSortByTag.cpp

mitkDICOMTag.cpp

mitkDICOMTagBasedSorter.cpp

mitkDICOMTagBasedSorter.h

rMITKf56a316dda57

View Options

Examples/mitkdump/mitkdump.cpp

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

View Options

Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp

View Options

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.cpp

View Options

Modules/DICOMReader/mitkDICOMReaderConfigurator.cpp

View Options

Modules/DICOMReader/mitkDICOMSortByTag.cpp

View Options

Modules/DICOMReader/mitkDICOMTag.cpp

View Options

Modules/DICOMReader/mitkDICOMTagBasedSorter.cpp

View Options

Modules/DICOMReader/mitkDICOMTagBasedSorter.h

Merge remote-tracking branch 'origin/bug-16744-develop' into bug-16744-dcm…f56a316dda57Actions

Description

Details

Event Timeline

Merged Changes

Changes (17)

rMITKf56a316dda57

Examples/mitkdump/mitkdump.cpp

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

Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.cpp

Modules/DICOMReader/mitkDICOMReaderConfigurator.cpp

Modules/DICOMReader/mitkDICOMSortByTag.cpp

Modules/DICOMReader/mitkDICOMTag.cpp

Modules/DICOMReader/mitkDICOMTagBasedSorter.cpp

Modules/DICOMReader/mitkDICOMTagBasedSorter.h

Merge remote-tracking branch 'origin/bug-16744-develop' into bug-16744-dcm…
f56a316dda57
Actions