Merge remote-tracking branch 'origin/T19473-consider-triggertime-in-DICOM…
4340b243c9a7
Actions

Description

Merge remote-tracking branch 'origin/T19473-consider-triggertime-in-DICOM-loading-rebased' into T19473-consider-triggertime-in-DICOM-loading-Intigration_branch

Conflicts:
Modules/DICOMReader/src/mitkITKDICOMSeriesReaderHelper.cpp

Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>

Details

Provenance

floca	Authored on Apr 13 2017, 9:12 AM
floca	Pushed on Apr 13 2017, 10:42 AM

Differential Revision

Restricted Differential Revision

Parents

rMITKcd4b3f76278a: Fixed Typo
rMITKb408a3be8678: initialized trigger-timebounds with 0.0

Branches

Unknown

Tags

Unknown

Event Timeline

floca committed rMITK4340b243c9a7: Merge remote-tracking branch 'origin/T19473-consider-triggertime-in-DICOM… (authored by floca).Apr 13 2017, 9:12 AM

Merged Changes

b408a3be8678 initialized trigger-timebounds with 0.0
Author
engelm
Browse Repository
No Builds
No Audits
bb9e5437bf1d fixed compile error due to rebase
Author
engelm
Browse Repository
No Builds
No Audits
b06b396dd050 minor improvements
Author
engelm
Browse Repository
No Builds
No Audits
9b2e01a935ca correctly considering AquisitionTime even without AquisitionDate
Author
engelm
Browse Repository
No Builds
No Audits
e07fe5e5d196 added method that considers triggerTime in extraction of TimeBounds
Author
engelm
Browse Repository
No Builds
No Audits

Changes (2)

Path

Size

Modules/

DICOMReader/

include/

mitkITKDICOMSeriesReaderHelper.h

src/

mitkITKDICOMSeriesReaderHelper.cpp

rMITK4340b243c9a7

View Options

Modules/DICOMReader/include/mitkITKDICOMSeriesReaderHelper.h