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

Fixes for using OHIF Viewer against https site over DICOMWeb

Browse Source
This commit is contained in:
Erik Ziegler committed 2017-04-12 12:03:32 +02:00
1 parent 143d65b8c8
commit 7ec1c60bc5
12 files changed
+179 -64
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Packages/ohif-study-list/server/services/dimse/retrieveMetadata.js
+2 -1
View File
@@ -135,7 +135,8 @@ function resultDataToStudyMetadata(studyInstanceUid, resultData) {
// Retrieve the actual data over WADO-URI
var server = getCurrentServer();
instanceSummary.wadouri = WADOProxy.convertURL(server.wadoUriRoot + '?requestType=WADO&studyUID=' + studyInstanceUid + '&seriesUID=' + seriesInstanceUid + '&objectUID=' + sopInstanceUid + '&contentType=application%2Fdicom', server.requestOptions);
const wadouri = `${server.wadoUriRoot}?requestType=WADO&studyUID=${studyInstanceUid}&seriesUID=${seriesInstanceUid}&objectUID=${sopInstanceUid}&contentType=application%2Fdicom`;
instanceSummary.wadouri = WADOProxy.convertURL(wadouri, server);
series.instances.push(instanceSummary);
});
Packages/ohif-study-list/server/services/wado/retrieveMetadata.js
+4 -3
View File
@@ -101,7 +101,8 @@ function getPaletteColor(server, instance, tag, lutDescriptor) {
const lut = [];
const numLutEntries = lutDescriptor[0];
const bits = lutDescriptor[2];
const data = DICOMWeb.getBulkData(instance[tag].BulkDataURI, server.requestOptions);
const uri = WADOProxy.convertURL(instance[tag].BulkDataURI, server)
const data = DICOMWeb.getBulkData(uri);
for (var i = 0; i < numLutEntries; i++) {
if(bits === 16) {
@@ -296,8 +297,8 @@ function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
contrastBolusAgent: DICOMWeb.getString(instance['00180010']),
radiopharmaceuticalInfo: getRadiopharmaceuticalInfo(instance),
baseWadoRsUri: baseWadoRsUri,
wadouri: WADOProxy.convertURL(wadouri, server.requestOptions),
wadorsuri: WADOProxy.convertURL(wadorsuri),
wadouri: WADOProxy.convertURL(wadouri, server),
wadorsuri: WADOProxy.convertURL(wadorsuri, server),
imageRendering: server.imageRendering,
thumbnailRendering: server.thumbnailRendering
};