diff --git a/src/imageLoader/wadors/metaData/metaDataProvider.js b/src/imageLoader/wadors/metaData/metaDataProvider.js index 7794634f..c55adf2a 100644 --- a/src/imageLoader/wadors/metaData/metaDataProvider.js +++ b/src/imageLoader/wadors/metaData/metaDataProvider.js @@ -21,6 +21,10 @@ function metaDataProvider(type, imageId) { studyInstanceUID: getValue(metaData['0020000D']), seriesDate: dicomParser.parseDA(getValue(metaData['00080021'])), seriesTime: dicomParser.parseTM(getValue(metaData['00080031'], 0, '')), + acquisitionDate: dicomParser.parseDA(getValue(metaData['00080022']), ''), + acquisitionTime: dicomParser.parseTM( + getValue(metaData['00080032'], 0, '') + ), }; } @@ -28,6 +32,7 @@ function metaDataProvider(type, imageId) { return { patientAge: getNumberValue(metaData['00101010']), patientSize: getNumberValue(metaData['00101020']), + patientSex: getValue(metaData['00100040']), patientWeight: getNumberValue(metaData['00101030']), }; } @@ -165,6 +170,21 @@ function metaDataProvider(type, imageId) { transferSyntaxUID: getValue(metaData['00020010']), }; } + + if (type === 'petSeriesModule') { + return { + correctedImage: getValue(metaData['00280051']), + units: getValue(metaData['00541001']), + decayCorrection: getValue(metaData['00541102']), + }; + } + + if (type === 'petImageModule') { + return { + frameReferenceTime: getNumberValue(metaData['00541300']), + actualFrameDuration: getNumberValue(metaData['00181242']), + }; + } } export default metaDataProvider; diff --git a/src/imageLoader/wadouri/metaData/metaDataProvider.js b/src/imageLoader/wadouri/metaData/metaDataProvider.js index 2418d8e8..ce0bf31a 100644 --- a/src/imageLoader/wadouri/metaData/metaDataProvider.js +++ b/src/imageLoader/wadouri/metaData/metaDataProvider.js @@ -25,6 +25,8 @@ function metaDataProvider(type, imageId) { studyInstanceUID: dataSet.string('x0020000d'), seriesDate: dicomParser.parseDA(dataSet.string('x00080021')), seriesTime: dicomParser.parseTM(dataSet.string('x00080031') || ''), + acquisitionDate: dicomParser.parseDA(dataSet.string('x00080022') || ''), + acquisitionTime: dicomParser.parseTM(dataSet.string('x00080032') || ''), }; } @@ -154,6 +156,23 @@ function metaDataProvider(type, imageId) { transferSyntaxUID: dataSet.string('x00020010'), }; } + + if (type === 'petSeriesModule') { + return { + correctedImage: dataSet.string('x00280051'), + units: dataSet.string('x00541001'), + decayCorrection: dataSet.string('x00541102'), + }; + } + + if (type === 'petImageModule') { + return { + frameReferenceTime: dicomParser.floatString( + dataSet.string('x00541300') || '' + ), + actualFrameDuration: dicomParser.intString(dataSet.string('x00181242')), + }; + } } export default metaDataProvider;