From c2c773a8e753c5bc173e310f74d19793e2a16398 Mon Sep 17 00:00:00 2001 From: Leonardo Campos Date: Wed, 15 Mar 2017 16:45:07 -0300 Subject: [PATCH] fixing issues after rebasing with master --- Packages/ohif-study-list/client/lib/retrieveStudyMetadata.js | 3 +++ Packages/ohif-viewerbase/client/lib/getWADORSImageUrl.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Packages/ohif-study-list/client/lib/retrieveStudyMetadata.js b/Packages/ohif-study-list/client/lib/retrieveStudyMetadata.js index d09455555..d17a867cc 100644 --- a/Packages/ohif-study-list/client/lib/retrieveStudyMetadata.js +++ b/Packages/ohif-study-list/client/lib/retrieveStudyMetadata.js @@ -58,6 +58,9 @@ OHIF.studylist.retrieveStudyMetadata = studyInstanceUid => { // Once the data was retrieved, the series are sorted by series and instance number OHIF.viewerbase.sortStudy(study); + // Updates WADO-RS metaDataManager + OHIF.viewerbase.updateMetaDataManager(study); + // Add additional metadata to our study from the studylist const studylistStudy = StudyListStudies.findOne({ studyInstanceUid: study.studyInstanceUid diff --git a/Packages/ohif-viewerbase/client/lib/getWADORSImageUrl.js b/Packages/ohif-viewerbase/client/lib/getWADORSImageUrl.js index b21aaccd5..c0df8fdf9 100644 --- a/Packages/ohif-viewerbase/client/lib/getWADORSImageUrl.js +++ b/Packages/ohif-viewerbase/client/lib/getWADORSImageUrl.js @@ -13,5 +13,5 @@ export function getWADORSImageUrl(instance, frame) { // Example: WADOProxy.convertURL(baseWadoRsUri + '/frame/' + frame) wadorsuri = wadorsuri.replace(/(%2Fframes%2F)(\d+)/, `$1${frame}`); - return Meteor.absoluteUrl(wadorsuri); + return wadorsuri; }