From 05d9a41f45bf4c557d8debd1d609bc4603ebdf0c Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Wed, 25 Oct 2017 09:56:24 +0200 Subject: [PATCH] Switch from cornerstoneTools.metaData (deprecated) to cornerstone.metaData --- LesionTracker/client/components/viewer/viewer.js | 2 +- OHIFViewer/client/components/viewer/viewer.js | 2 +- .../components/ruleEntryDialog/ruleEntryDialog.js | 2 +- .../client/compatibility/nonTargetTool.js | 4 ++-- .../client/compatibility/qualitativeTargetTools.js | 4 ++-- .../client/lib/MeasurementHandlers.js | 6 +++--- Packages/ohif-measurements/client/lib/exportPdf.js | 4 ++-- Packages/ohif-measurements/client/lib/jumpToRowItem.js | 4 ++-- .../viewer/imageViewerViewport/imageViewerViewport.js | 2 +- .../viewer/viewportOverlay/viewportOverlay.js | 4 ++-- .../client/lib/classes/ResizeViewportManager.js | 2 +- .../classes/StackImagePositionOffsetSynchronizer.js | 2 +- .../client/lib/classes/StudyPrefetcher.js | 6 +++--- .../client/lib/displayReferenceLines.js | 2 +- .../client/lib/getFrameOfReferenceUID.js | 2 +- .../client/lib/setMammogramViewportAlignment.js | 2 +- .../client/lib/updateOrientationMarkers.js | 2 +- .../ohif-viewerbase/client/lib/viewportOverlayUtils.js | 10 +++++----- Packages/ohif-viewerbase/client/lib/viewportUtils.js | 2 +- .../standaloneViewerMain/standaloneViewerMain.js | 2 +- 20 files changed, 33 insertions(+), 33 deletions(-) diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js index f27c500fc..f38f14081 100644 --- a/LesionTracker/client/components/viewer/viewer.js +++ b/LesionTracker/client/components/viewer/viewer.js @@ -24,7 +24,7 @@ Meteor.startup(() => { // Metadata configuration const metadataProvider = OHIF.viewer.metadataProvider; - cornerstoneTools.metaData.addProvider(metadataProvider.getProvider()); + cornerstone.metaData.addProvider(metadataProvider.getProvider()); // Target tools configuration OHIF.lesiontracker.configureTargetToolsHandles(); diff --git a/OHIFViewer/client/components/viewer/viewer.js b/OHIFViewer/client/components/viewer/viewer.js index be71fa65a..765196166 100644 --- a/OHIFViewer/client/components/viewer/viewer.js +++ b/OHIFViewer/client/components/viewer/viewer.js @@ -73,7 +73,7 @@ Meteor.startup(() => { // Metadata configuration const metadataProvider = OHIF.viewer.metadataProvider; - cornerstoneTools.metaData.addProvider(metadataProvider.provider.bind(metadataProvider)); + cornerstone.metaData.addProvider(metadataProvider.provider.bind(metadataProvider)); }); Template.viewer.onCreated(() => { diff --git a/Packages/ohif-hanging-protocols/client/components/ruleEntryDialog/ruleEntryDialog.js b/Packages/ohif-hanging-protocols/client/components/ruleEntryDialog/ruleEntryDialog.js index e641faf93..3b532385a 100644 --- a/Packages/ohif-hanging-protocols/client/components/ruleEntryDialog/ruleEntryDialog.js +++ b/Packages/ohif-hanging-protocols/client/components/ruleEntryDialog/ruleEntryDialog.js @@ -133,7 +133,7 @@ function getAbstractPriorValue(imageId) { return; } - const priorStudy = cornerstoneTools.metaData.get('study', imageId); + const priorStudy = cornerstone.metaData.get('study', imageId); if (!priorStudy) { return; } diff --git a/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js b/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js index 1e4c1678d..0a1e7276e 100644 --- a/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js +++ b/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js @@ -135,12 +135,12 @@ function createNewMeasurement(mouseEventData) { var imageId = mouseEventData.image.imageId; // Get studyInstanceUid - var study = cornerstoneTools.metaData.get('study', imageId); + var study = cornerstone.metaData.get('study', imageId); var studyInstanceUid = study.studyInstanceUid; var patientId = study.patientId; // Get seriesInstanceUid - var series = cornerstoneTools.metaData.get('series', imageId); + var series = cornerstone.metaData.get('series', imageId); var seriesInstanceUid = series.seriesInstanceUid; // create the measurement data for this tool with the end handle activated diff --git a/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js b/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js index e5df251d8..585b53a31 100644 --- a/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js +++ b/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js @@ -127,12 +127,12 @@ function createQualitativeTargetTool(toolType) { var imageId = mouseEventData.image.imageId; // Get studyInstanceUid - var study = cornerstoneTools.metaData.get('study', imageId); + var study = cornerstone.metaData.get('study', imageId); var studyInstanceUid = study.studyInstanceUid; var patientId = study.patientId; // Get seriesInstanceUid - var series = cornerstoneTools.metaData.get('series', imageId); + var series = cornerstone.metaData.get('series', imageId); var seriesInstanceUid = series.seriesInstanceUid; // create the measurement data for this tool with the end handle activated diff --git a/Packages/ohif-measurements/client/lib/MeasurementHandlers.js b/Packages/ohif-measurements/client/lib/MeasurementHandlers.js index c2656cb14..dcc7a1c66 100644 --- a/Packages/ohif-measurements/client/lib/MeasurementHandlers.js +++ b/Packages/ohif-measurements/client/lib/MeasurementHandlers.js @@ -20,16 +20,16 @@ class MeasurementHandlers { const imageId = enabledElement.image.imageId; // Get studyInstanceUid & patientId - const study = cornerstoneTools.metaData.get('study', imageId); + const study = cornerstone.metaData.get('study', imageId); const studyInstanceUid = study.studyInstanceUid; const patientId = study.patientId; // Get seriesInstanceUid - const series = cornerstoneTools.metaData.get('series', imageId); + const series = cornerstone.metaData.get('series', imageId); const seriesInstanceUid = series.seriesInstanceUid; // Get sopInstanceUid - const sopInstance = cornerstoneTools.metaData.get('instance', imageId); + const sopInstance = cornerstone.metaData.get('instance', imageId); const sopInstanceUid = sopInstance.sopInstanceUid; const frameIndex = sopInstance.frame || 0; diff --git a/Packages/ohif-measurements/client/lib/exportPdf.js b/Packages/ohif-measurements/client/lib/exportPdf.js index 1d22f41af..7c1063eb0 100644 --- a/Packages/ohif-measurements/client/lib/exportPdf.js +++ b/Packages/ohif-measurements/client/lib/exportPdf.js @@ -19,8 +19,8 @@ OHIF.measurements.exportPdf = (measurementApi, timepointApi) => { const printMeasurement = (measurement, callback) => { OHIF.measurements.getImageDataUrl({ measurement }).then(imageDataUrl => { const imageId = OHIF.viewerbase.getImageIdForImagePath(measurement.imagePath); - const series = cornerstoneTools.metaData.get('series', imageId); - const instance = cornerstoneTools.metaData.get('instance', imageId); + const series = cornerstone.metaData.get('series', imageId); + const instance = cornerstone.metaData.get('instance', imageId); let info = measurement.response; if (!info) { diff --git a/Packages/ohif-measurements/client/lib/jumpToRowItem.js b/Packages/ohif-measurements/client/lib/jumpToRowItem.js index 4be588bcd..790da273b 100644 --- a/Packages/ohif-measurements/client/lib/jumpToRowItem.js +++ b/Packages/ohif-measurements/client/lib/jumpToRowItem.js @@ -141,8 +141,8 @@ OHIF.measurements.jumpToRowItem = (rowItem, timepoints) => { if (enabledElement && enabledElement.image) { const imageId = enabledElement.image.imageId; - const series = cornerstoneTools.metaData.get('series', imageId); - const study = cornerstoneTools.metaData.get('study', imageId); + const series = cornerstone.metaData.get('series', imageId); + const study = cornerstone.metaData.get('study', imageId); if (series.seriesInstanceUid === measurementData.seriesInstanceUid && study.studyInstanceUid === measurementData.studyInstanceUid) { diff --git a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js index a3f4cfd9d..b1a619c2d 100644 --- a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js +++ b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js @@ -408,7 +408,7 @@ const loadDisplaySetIntoViewport = (data, templateData) => { OHIF.viewer.data.loadedSeriesData = layoutManager.viewportData; // Check if image plane (orientation / location) data is present for the current image - const imagePlane = cornerstoneTools.metaData.get('imagePlane', image.imageId); + const imagePlane = cornerstone.metaData.get('imagePlane', image.imageId); if (imagePlane && imagePlane.frameOfReferenceUID) { // If it is, add this element to the global synchronizer... OHIF.viewer.updateImageSynchronizer.add(element); diff --git a/Packages/ohif-viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.js b/Packages/ohif-viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.js index c3487497e..fd5c13741 100644 --- a/Packages/ohif-viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.js +++ b/Packages/ohif-viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.js @@ -156,7 +156,7 @@ Template.viewportOverlay.helpers({ return false; } - const instance = cornerstoneTools.metaData.get('instance', this.imageId); + const instance = cornerstone.metaData.get('instance', this.imageId); if (!instance) { return ''; } @@ -234,7 +234,7 @@ Template.viewportOverlay.helpers({ }); // Get study data - const study = cornerstoneTools.metaData.get('study', this.imageId); + const study = cornerstone.metaData.get('study', this.imageId); if (!study) { return; } diff --git a/Packages/ohif-viewerbase/client/lib/classes/ResizeViewportManager.js b/Packages/ohif-viewerbase/client/lib/classes/ResizeViewportManager.js index 8f780c6bc..8ed5b3366 100644 --- a/Packages/ohif-viewerbase/client/lib/classes/ResizeViewportManager.js +++ b/Packages/ohif-viewerbase/client/lib/classes/ResizeViewportManager.js @@ -113,7 +113,7 @@ export class ResizeViewportManager { if (enabledElement.fitToWindow === false) { const imageId = enabledElement.image.imageId; - const instance = cornerstoneTools.metaData.get('instance', imageId); + const instance = cornerstone.metaData.get('instance', imageId); const instanceClassViewport = getInstanceClassDefaultViewport(instance, enabledElement, imageId); cornerstone.setViewport(element, instanceClassViewport); } diff --git a/Packages/ohif-viewerbase/client/lib/classes/StackImagePositionOffsetSynchronizer.js b/Packages/ohif-viewerbase/client/lib/classes/StackImagePositionOffsetSynchronizer.js index c5de4a417..92c905d2e 100644 --- a/Packages/ohif-viewerbase/client/lib/classes/StackImagePositionOffsetSynchronizer.js +++ b/Packages/ohif-viewerbase/client/lib/classes/StackImagePositionOffsetSynchronizer.js @@ -201,7 +201,7 @@ export class StackImagePositionOffsetSynchronizer { } const imageId = enabledElement.image.imageId; - const imagePlane = cornerstoneTools.metaData.get('imagePlane', imageId); + const imagePlane = cornerstone.metaData.get('imagePlane', imageId); if (!imagePlane || !imagePlane.rowCosines || !imagePlane.columnCosines) { return; diff --git a/Packages/ohif-viewerbase/client/lib/classes/StudyPrefetcher.js b/Packages/ohif-viewerbase/client/lib/classes/StudyPrefetcher.js index 8bdb27fde..097d0e0c2 100644 --- a/Packages/ohif-viewerbase/client/lib/classes/StudyPrefetcher.js +++ b/Packages/ohif-viewerbase/client/lib/classes/StudyPrefetcher.js @@ -161,19 +161,19 @@ export class StudyPrefetcher { } getStudy(image) { - const studyMetadata = cornerstoneTools.metaData.get('study', image.imageId); + const studyMetadata = cornerstone.metaData.get('study', image.imageId); return OHIF.viewer.Studies.find(study => study.studyInstanceUid === studyMetadata.studyInstanceUid); } getSeries(study, image) { - const seriesMetadata = cornerstoneTools.metaData.get('series', image.imageId); + const seriesMetadata = cornerstone.metaData.get('series', image.imageId); const studyMetadata = OHIF.viewerbase.getStudyMetadata(study); return studyMetadata.getSeriesByUID(seriesMetadata.seriesInstanceUid); } getInstance(series, image) { - const instanceMetadata = cornerstoneTools.metaData.get('instance', image.imageId); + const instanceMetadata = cornerstone.metaData.get('instance', image.imageId); return series.getInstanceByUID(instanceMetadata.sopInstanceUid); } diff --git a/Packages/ohif-viewerbase/client/lib/displayReferenceLines.js b/Packages/ohif-viewerbase/client/lib/displayReferenceLines.js index 8cc4cb7e3..2fafd7db5 100644 --- a/Packages/ohif-viewerbase/client/lib/displayReferenceLines.js +++ b/Packages/ohif-viewerbase/client/lib/displayReferenceLines.js @@ -19,7 +19,7 @@ export function displayReferenceLines(element) { } const imageId = enabledElement.image.imageId; - const imagePlane = cornerstoneTools.metaData.get('imagePlane', imageId); + const imagePlane = cornerstone.metaData.get('imagePlane', imageId); // Disable reference lines for the current element cornerstoneTools.referenceLines.tool.disable(element); diff --git a/Packages/ohif-viewerbase/client/lib/getFrameOfReferenceUID.js b/Packages/ohif-viewerbase/client/lib/getFrameOfReferenceUID.js index a0e7bf7f8..fedcd4577 100644 --- a/Packages/ohif-viewerbase/client/lib/getFrameOfReferenceUID.js +++ b/Packages/ohif-viewerbase/client/lib/getFrameOfReferenceUID.js @@ -21,7 +21,7 @@ export function getFrameOfReferenceUID(element) { } var imageId = enabledElement.image.imageId; - var imagePlane = cornerstoneTools.metaData.get('imagePlane', imageId); + var imagePlane = cornerstone.metaData.get('imagePlane', imageId); if (!imagePlane || !imagePlane.frameOfReferenceUID) { return; } diff --git a/Packages/ohif-viewerbase/client/lib/setMammogramViewportAlignment.js b/Packages/ohif-viewerbase/client/lib/setMammogramViewportAlignment.js index 75989dc2f..c49de7b86 100644 --- a/Packages/ohif-viewerbase/client/lib/setMammogramViewportAlignment.js +++ b/Packages/ohif-viewerbase/client/lib/setMammogramViewportAlignment.js @@ -9,7 +9,7 @@ const setMammogramViewportAlignment = (series, enabledElement, imageId) => { const viewTypes = ['MLO', 'CC', 'LM', 'ML', 'XCCL']; const requiresInversion = ['LM']; // Tomo series are flipped - const instance = cornerstoneTools.metaData.get('instance', imageId); + const instance = cornerstone.metaData.get('instance', imageId); if (!instance) { return; } diff --git a/Packages/ohif-viewerbase/client/lib/updateOrientationMarkers.js b/Packages/ohif-viewerbase/client/lib/updateOrientationMarkers.js index c2ad8e0a7..9cd14a2d6 100644 --- a/Packages/ohif-viewerbase/client/lib/updateOrientationMarkers.js +++ b/Packages/ohif-viewerbase/client/lib/updateOrientationMarkers.js @@ -16,7 +16,7 @@ export function updateOrientationMarkers(element, viewport) { // Updates the orientation labels on the viewport const enabledElement = cornerstone.getEnabledElement(element); - const imagePlane = cornerstoneTools.metaData.get('imagePlane', enabledElement.image.imageId); + const imagePlane = cornerstone.metaData.get('imagePlane', enabledElement.image.imageId); if (!imagePlane || !imagePlane.rowCosines || !imagePlane.columnCosines) { return; diff --git a/Packages/ohif-viewerbase/client/lib/viewportOverlayUtils.js b/Packages/ohif-viewerbase/client/lib/viewportOverlayUtils.js index 811f5e7c8..be2f94072 100644 --- a/Packages/ohif-viewerbase/client/lib/viewportOverlayUtils.js +++ b/Packages/ohif-viewerbase/client/lib/viewportOverlayUtils.js @@ -5,7 +5,7 @@ const getPatient = function(property) { return false; } - const patient = cornerstoneTools.metaData.get('patient', this.imageId); + const patient = cornerstone.metaData.get('patient', this.imageId); if (!patient) { return ''; } @@ -18,7 +18,7 @@ const getStudy = function(property) { return false; } - const study = cornerstoneTools.metaData.get('study', this.imageId); + const study = cornerstone.metaData.get('study', this.imageId); if (!study) { return ''; } @@ -31,7 +31,7 @@ const getSeries = function(property) { return false; } - const series = cornerstoneTools.metaData.get('series', this.imageId); + const series = cornerstone.metaData.get('series', this.imageId); if (!series) { return ''; } @@ -44,7 +44,7 @@ const getInstance = function(property) { return false; } - const instance = cornerstoneTools.metaData.get('instance', this.imageId); + const instance = cornerstone.metaData.get('instance', this.imageId); if (!instance) { return ''; } @@ -57,7 +57,7 @@ const getTagDisplay = function(property) { return false; } - const instance = cornerstoneTools.metaData.get('tagDisplay', this.imageId); + const instance = cornerstone.metaData.get('tagDisplay', this.imageId); if (!instance) { return ''; } diff --git a/Packages/ohif-viewerbase/client/lib/viewportUtils.js b/Packages/ohif-viewerbase/client/lib/viewportUtils.js index e9edc97c4..dfb94ba6b 100644 --- a/Packages/ohif-viewerbase/client/lib/viewportUtils.js +++ b/Packages/ohif-viewerbase/client/lib/viewportUtils.js @@ -138,7 +138,7 @@ const resetViewport = () => { const enabledElement = cornerstone.getEnabledElement(element); if (enabledElement.fitToWindow === false) { const imageId = enabledElement.image.imageId; - const instance = cornerstoneTools.metaData.get('instance', imageId); + const instance = cornerstone.metaData.get('instance', imageId); enabledElement.viewport = cornerstone.getDefaultViewport(enabledElement.canvas, enabledElement.image); diff --git a/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js index c0a5c653a..7ed4af946 100644 --- a/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js +++ b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js @@ -17,7 +17,7 @@ Template.standaloneViewerMain.onCreated(() => { OHIF.viewer.metadataProvider = OHIF.cornerstone.metadataProvider; // Metadata configuration const metadataProvider = OHIF.viewer.metadataProvider; - cornerstoneTools.metaData.addProvider(metadataProvider.provider.bind(metadataProvider)); + cornerstone.metaData.addProvider(metadataProvider.provider.bind(metadataProvider)); }); Template.standaloneViewerMain.onRendered(() => {