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

OHIF-33 Removed base64 encoding of color palettes...

Browse Source
This commit is contained in:
Emanuel Oliveira 2016-12-07 00:36:53 -02:00 committed by Leonardo Campos
parent 9e32df99ba
commit 26920dd5bd
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,11 +89,9 @@ function getPaletteColors(server, instance) {
// no entry on cache... Fetch remote data. // no entry on cache... Fetch remote data.
try { try {
let r, g, b; let r, g, b;
// Palettes are quite small (standard defines a limit of 64KiB but it's usually much less... like 512 ~ 1024 bytes) r = DICOMWeb.getBulkData(instance['00281201'].BulkDataURI, server.requestOptions);
// ... so no problem if we store them using base64 encoding. g = DICOMWeb.getBulkData(instance['00281202'].BulkDataURI, server.requestOptions);
r = DICOMWeb.getBulkData(instance['00281201'].BulkDataURI, server.requestOptions).toString('base64'); b = DICOMWeb.getBulkData(instance['00281203'].BulkDataURI, server.requestOptions);
g = DICOMWeb.getBulkData(instance['00281202'].BulkDataURI, server.requestOptions).toString('base64');
b = DICOMWeb.getBulkData(instance['00281203'].BulkDataURI, server.requestOptions).toString('base64');
entry = { red: r, green: g, blue: b }; entry = { red: r, green: g, blue: b };
if (paletteUID !== null) { if (paletteUID !== null) {
// when paletteUID is present, the entry can be cached... // when paletteUID is present, the entry can be cached...
@ -215,9 +213,9 @@ function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
instanceSummary.redPaletteColorLookupTable = palettes.red; instanceSummary.redPaletteColorLookupTable = palettes.red;
instanceSummary.greenPaletteColorLookupTable = palettes.green; instanceSummary.greenPaletteColorLookupTable = palettes.green;
instanceSummary.bluePaletteColorLookupTable = palettes.blue; instanceSummary.bluePaletteColorLookupTable = palettes.blue;
instanceSummary.redPaletteColorLookupTableDescriptor = DICOMWeb.getString(instance['00281101']); instanceSummary.redPaletteColorLookupTableDescriptor = parseFloatArray(DICOMWeb.getString(instance['00281101']));
instanceSummary.greenPaletteColorLookupTableDescriptor = DICOMWeb.getString(instance['00281102']); instanceSummary.greenPaletteColorLookupTableDescriptor = parseFloatArray(DICOMWeb.getString(instance['00281102']));
instanceSummary.bluePaletteColorLookupTableDescriptor = DICOMWeb.getString(instance['00281103']); instanceSummary.bluePaletteColorLookupTableDescriptor = parseFloatArray(DICOMWeb.getString(instance['00281103']));
} }
} }
@ -225,9 +223,10 @@ function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
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');
} }
instanceSummary.wadorsuri = WADOProxy.convertURL(server.wadoRoot + '/studies/' + studyInstanceUid + '/series/' + seriesInstanceUid + '/instances/' + sopInstanceUid + '/frames/1');
series.instances.push(instanceSummary); series.instances.push(instanceSummary);
}); });