fix(wado-proxy): Use wado proxy to retrieve images if enabled in configuration

This commit is contained in:
Evren Ozkan 2019-05-01 11:27:53 -04:00
parent 46ed339579
commit 7ff9a87b6e
4 changed files with 12 additions and 2 deletions

View File

@ -433,8 +433,8 @@ async function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
contrastBolusAgent: DICOMWeb.getString(instance['00180010']), contrastBolusAgent: DICOMWeb.getString(instance['00180010']),
radiopharmaceuticalInfo: getRadiopharmaceuticalInfo(instance), radiopharmaceuticalInfo: getRadiopharmaceuticalInfo(instance),
baseWadoRsUri: baseWadoRsUri, baseWadoRsUri: baseWadoRsUri,
wadouri: wadouri, wadouri: WADOProxy.convertURL(wadouri, server),
wadorsuri: wadorsuri, wadorsuri: WADOProxy.convertURL(wadorsuri, server),
imageRendering: server.imageRendering, imageRendering: server.imageRendering,
thumbnailRendering: server.thumbnailRendering thumbnailRendering: server.thumbnailRendering
}; };

View File

@ -11,6 +11,10 @@ WADOProxy.convertURL = (url, serverConfiguration) => {
} }
const { settings } = WADOProxy; const { settings } = WADOProxy;
if (!settings.enabled) {
return url;
}
const serverId = serverConfiguration._id; const serverId = serverConfiguration._id;
const query = queryString.stringify({url, serverId}); const query = queryString.stringify({url, serverId});

View File

@ -50,5 +50,8 @@
"studyListFunctionsEnabled": true, "studyListFunctionsEnabled": true,
"studyListDateFilterNumDays": 1 "studyListDateFilterNumDays": 1
} }
},
"proxy": {
"enabled": true
} }
} }

View File

@ -30,5 +30,8 @@
} }
] ]
} }
},
"proxy": {
"enabled": true
} }
} }