Skip to content

Commit 05f58a4

Browse files
committed
fix(viewport-overlay): Fix WADO-RS metadata provider
1 parent 4a17bd7 commit 05f58a4

File tree

3 files changed

+39
-2
lines changed

3 files changed

+39
-2
lines changed

example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"moment": "^2.22.2",
1515
"prop-types": "^15.6.2",
1616
"react": "^16.4.1",
17-
"react-cornerstone-viewport": "^0.1.14",
17+
"react-cornerstone-viewport": "^0.1.20",
1818
"react-dom": "^16.4.1",
1919
"react-resize-detector": "^3.4.0",
2020
"react-scripts": "^2.1.5"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-cornerstone-viewport",
3-
"version": "0.1.19",
3+
"version": "0.1.20",
44
"description": "Cornerstone medical image viewport component for React",
55
"author": "Cornerstone Contributors",
66
"license": "MIT",

src/metadataProvider.js

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ import cornerstone from 'cornerstone-core';
22
import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
33
import dicomParser from 'dicom-parser';
44

5+
const {
6+
getNumberString,
7+
getNumberValue,
8+
getNumberValues,
9+
getValue
10+
} = cornerstoneWADOImageLoader.wadors.metaData;
11+
512
function wadoRsMetaDataProvider(type, imageId) {
613
const metaData = cornerstoneWADOImageLoader.wadors.metaDataManager.get(
714
imageId
@@ -27,6 +34,36 @@ function wadoRsMetaDataProvider(type, imageId) {
2734
) {
2835
return metaData[typeCleaned].Value[0];
2936
}
37+
38+
if (type === 'generalImageModule') {
39+
return {
40+
instanceNumber: getNumberValue(metaData['00200013']),
41+
lossyImageCompression: getValue(metaData['00282110']),
42+
lossyImageCompressionRatio: getValue(metaData['00282112']),
43+
lossyImageCompressionMethod: getValue(metaData['00282114'])
44+
};
45+
}
46+
47+
if (type === 'patientModule') {
48+
return {
49+
patientName: getValue(metaData['00100010']),
50+
patientId: getValue(metaData['00100020'])
51+
};
52+
}
53+
54+
if (type === 'generalStudyModule') {
55+
return {
56+
studyDescription: getValue(metaData['00081030']),
57+
studyDate: getValue(metaData['00080020']),
58+
studyTime: getValue(metaData['00080030'])
59+
};
60+
}
61+
62+
if (type === 'cineModule') {
63+
return {
64+
frameTime: getNumberValue(metaData['00181063'])
65+
};
66+
}
3067
}
3168

3269
cornerstone.metaData.addProvider(wadoRsMetaDataProvider);

0 commit comments

Comments
 (0)