From 0f30648646b58dd0cf6c92bb1d67e08d270eeff1 Mon Sep 17 00:00:00 2001 From: Bruno Alves de Faria Date: Fri, 7 Jul 2017 09:07:09 -0300 Subject: [PATCH] Adapting StudyPrefetcher to the new metadata structure --- .../ohif-viewerbase/client/lib/classes/StudyPrefetcher.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Packages/ohif-viewerbase/client/lib/classes/StudyPrefetcher.js b/Packages/ohif-viewerbase/client/lib/classes/StudyPrefetcher.js index 9537462f1..9089ca0cd 100644 --- a/Packages/ohif-viewerbase/client/lib/classes/StudyPrefetcher.js +++ b/Packages/ohif-viewerbase/client/lib/classes/StudyPrefetcher.js @@ -167,12 +167,12 @@ export class StudyPrefetcher { getSeries(study, image) { const seriesMetadata = cornerstoneTools.metaData.get('series', image.imageId); - return _.find(study.seriesList, series => series.seriesInstanceUid === seriesMetadata.seriesInstanceUid); + return study.getSeriesByUID(seriesMetadata.seriesInstanceUid); } getInstance(series, image) { const instanceMetadata = cornerstoneTools.metaData.get('instance', image.imageId); - return _.find(series.instances, instance => instance.sopInstanceUid === instanceMetadata.sopInstanceUid); + return series.getInstanceByUID(instanceMetadata.sopInstanceUid); } getActiveDisplaySet(displaySets, instance) { @@ -191,10 +191,6 @@ export class StudyPrefetcher { } const study = this.getStudy(image); - if (!study.seriesList || !study.seriesList.length) { - console.error(study); - } - const series = this.getSeries(study, image); const instance = this.getInstance(series, image); const displaySets = study.displaySets;