othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OHIF-24 Retrieving Pallete Color tables on metadata request...

Browse Source
This commit is contained in:
Emanuel F. Oliveira 2016-12-05 10:29:20 -02:00 committed by Leonardo Campos
parent d86cac112b
commit c27b1f2290
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Packages/ohif-study-list/server/services/wado/retrieveMetadata.js
View File

@ -119,13 +119,26 @@ function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
lossyImageCompressionRatio: DICOMWeb.getString(instance['00282112']), lossyImageCompressionRatio: DICOMWeb.getString(instance['00282112']),
lossyImageCompressionMethod: DICOMWeb.getString(instance['00282114']), lossyImageCompressionMethod: DICOMWeb.getString(instance['00282114']),
echoNumber: DICOMWeb.getString(instance['00180086']), echoNumber: DICOMWeb.getString(instance['00180086']),
contrastBolusAgent: DICOMWeb.getString(instance['00180010']) contrastBolusAgent: DICOMWeb.getString(instance['00180010']),
baseWadoRsUri: server.wadoRoot + '/studies/' + studyInstanceUid + '/series/' + seriesInstanceUid + '/instances/' + sopInstanceUid
}; };
// Get additional information if the instance uses "PALETTE COLOR" photometric interpretation
if (instanceSummary.photometricInterpretation === 'PALETTE COLOR') {
instanceSummary.paletteColorLookupTableUID = DICOMWeb.getString(instance['00281199']);
instanceSummary.redPaletteColorLookupTableDescriptor = DICOMWeb.getString(instance['00281101']);
instanceSummary.greenPaletteColorLookupTableDescriptor = DICOMWeb.getString(instance['00281102']);
instanceSummary.bluePaletteColorLookupTableDescriptor = DICOMWeb.getString(instance['00281103']);
instanceSummary.redPaletteColorLookupTableData = instance['00281201'];
instanceSummary.greenPaletteColorLookupTableData = instance['00281202'];
instanceSummary.bluePaletteColorLookupTableData = instance['00281203'];
}
if (server.imageRendering === 'wadouri') { if (server.imageRendering === 'wadouri') {
instanceSummary.wadouri = WADOProxy.convertURL(server.wadoUriRoot + '?requestType=WADO&studyUID=' + studyInstanceUid + '&seriesUID=' + seriesInstanceUid + '&objectUID=' + sopInstanceUid + '&contentType=application%2Fdicom', server.requestOptions); instanceSummary.wadouri = WADOProxy.convertURL(server.wadoUriRoot + '?requestType=WADO&studyUID=' + studyInstanceUid + '&seriesUID=' + seriesInstanceUid + '&objectUID=' + sopInstanceUid + '&contentType=application%2Fdicom', server.requestOptions);
} else { } else {
instanceSummary.wadorsuri = server.wadoRoot + '/studies/' + studyInstanceUid + '/series/' + seriesInstanceUid + '/instances/' + sopInstanceUid + '/frames/1'; instanceSummary.wadorsuri = server.wadoRoot + '/studies/' + studyInstanceUid + '/series/' + seriesInstanceUid + '/instances/' + sopInstanceUid + '/frames/1';
// instanceSummary.wadorsuri = WADOProxy.convertURL(server.wadoRoot + '/studies/' + studyInstanceUid + '/series/' + seriesInstanceUid + '/instances/' + sopInstanceUid + '/frames/1');
} }
series.instances.push(instanceSummary); series.instances.push(instanceSummary);

3
Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js
View File

@ -13,8 +13,9 @@ Template.imageThumbnail.onCreated(() => {
instance.getThumbnailImageId = () => { instance.getThumbnailImageId = () => {
const stack = instance.data.thumbnail.stack; const stack = instance.data.thumbnail.stack;
const lastIndex = (stack.images.length || 1) - 1; const lastIndex = (stack.images.length || 1) - 1;
const imageIndex = Math.floor(lastIndex / 2); const imageIndex = Math.floor(lastIndex / 2) !== 0 ? 0 : 0;
const imageInstance = stack.images[imageIndex]; const imageInstance = stack.images[imageIndex];
return imageInstance.getImageId(); return imageInstance.getImageId();
}; };
}); });