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

Switch from cornerstoneTools.metaData (deprecated) to cornerstone.metaData

Browse Source
This commit is contained in:
Erik Ziegler 2017-10-25 09:56:24 +02:00
parent c5596128c1
commit 05d9a41f45
20 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LesionTracker/client/components/viewer/viewer.js
View File

@ -24,7 +24,7 @@ Meteor.startup(() => {
// Metadata configuration // Metadata configuration
const metadataProvider = OHIF.viewer.metadataProvider; const metadataProvider = OHIF.viewer.metadataProvider;
cornerstoneTools.metaData.addProvider(metadataProvider.getProvider()); cornerstone.metaData.addProvider(metadataProvider.getProvider());
// Target tools configuration // Target tools configuration
OHIF.lesiontracker.configureTargetToolsHandles(); OHIF.lesiontracker.configureTargetToolsHandles();

2
OHIFViewer/client/components/viewer/viewer.js
View File

@ -73,7 +73,7 @@ Meteor.startup(() => {
// Metadata configuration // Metadata configuration
const metadataProvider = OHIF.viewer.metadataProvider; const metadataProvider = OHIF.viewer.metadataProvider;
cornerstoneTools.metaData.addProvider(metadataProvider.provider.bind(metadataProvider)); cornerstone.metaData.addProvider(metadataProvider.provider.bind(metadataProvider));
}); });
Template.viewer.onCreated(() => { Template.viewer.onCreated(() => {

2
Packages/ohif-hanging-protocols/client/components/ruleEntryDialog/ruleEntryDialog.js
View File

@ -133,7 +133,7 @@ function getAbstractPriorValue(imageId) {
return; return;
} }
const priorStudy = cornerstoneTools.metaData.get('study', imageId); const priorStudy = cornerstone.metaData.get('study', imageId);
if (!priorStudy) { if (!priorStudy) {
return; return;
} }

4
Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js
View File

@ -135,12 +135,12 @@ function createNewMeasurement(mouseEventData) {
var imageId = mouseEventData.image.imageId; var imageId = mouseEventData.image.imageId;
// Get studyInstanceUid // Get studyInstanceUid
var study = cornerstoneTools.metaData.get('study', imageId); var study = cornerstone.metaData.get('study', imageId);
var studyInstanceUid = study.studyInstanceUid; var studyInstanceUid = study.studyInstanceUid;
var patientId = study.patientId; var patientId = study.patientId;
// Get seriesInstanceUid // Get seriesInstanceUid
var series = cornerstoneTools.metaData.get('series', imageId); var series = cornerstone.metaData.get('series', imageId);
var seriesInstanceUid = series.seriesInstanceUid; var seriesInstanceUid = series.seriesInstanceUid;
// create the measurement data for this tool with the end handle activated // create the measurement data for this tool with the end handle activated

4
Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js
View File

@ -127,12 +127,12 @@ function createQualitativeTargetTool(toolType) {
var imageId = mouseEventData.image.imageId; var imageId = mouseEventData.image.imageId;
// Get studyInstanceUid // Get studyInstanceUid
var study = cornerstoneTools.metaData.get('study', imageId); var study = cornerstone.metaData.get('study', imageId);
var studyInstanceUid = study.studyInstanceUid; var studyInstanceUid = study.studyInstanceUid;
var patientId = study.patientId; var patientId = study.patientId;
// Get seriesInstanceUid // Get seriesInstanceUid
var series = cornerstoneTools.metaData.get('series', imageId); var series = cornerstone.metaData.get('series', imageId);
var seriesInstanceUid = series.seriesInstanceUid; var seriesInstanceUid = series.seriesInstanceUid;
// create the measurement data for this tool with the end handle activated // create the measurement data for this tool with the end handle activated

6
Packages/ohif-measurements/client/lib/MeasurementHandlers.js
View File

@ -20,16 +20,16 @@ class MeasurementHandlers {
const imageId = enabledElement.image.imageId; const imageId = enabledElement.image.imageId;
// Get studyInstanceUid & patientId // Get studyInstanceUid & patientId
const study = cornerstoneTools.metaData.get('study', imageId); const study = cornerstone.metaData.get('study', imageId);
const studyInstanceUid = study.studyInstanceUid; const studyInstanceUid = study.studyInstanceUid;
const patientId = study.patientId; const patientId = study.patientId;
// Get seriesInstanceUid // Get seriesInstanceUid
const series = cornerstoneTools.metaData.get('series', imageId); const series = cornerstone.metaData.get('series', imageId);
const seriesInstanceUid = series.seriesInstanceUid; const seriesInstanceUid = series.seriesInstanceUid;
// Get sopInstanceUid // Get sopInstanceUid
const sopInstance = cornerstoneTools.metaData.get('instance', imageId); const sopInstance = cornerstone.metaData.get('instance', imageId);
const sopInstanceUid = sopInstance.sopInstanceUid; const sopInstanceUid = sopInstance.sopInstanceUid;
const frameIndex = sopInstance.frame || 0; const frameIndex = sopInstance.frame || 0;

4
Packages/ohif-measurements/client/lib/exportPdf.js
View File

@ -19,8 +19,8 @@ OHIF.measurements.exportPdf = (measurementApi, timepointApi) => {
const printMeasurement = (measurement, callback) => { const printMeasurement = (measurement, callback) => {
OHIF.measurements.getImageDataUrl({ measurement }).then(imageDataUrl => { OHIF.measurements.getImageDataUrl({ measurement }).then(imageDataUrl => {
const imageId = OHIF.viewerbase.getImageIdForImagePath(measurement.imagePath); const imageId = OHIF.viewerbase.getImageIdForImagePath(measurement.imagePath);
const series = cornerstoneTools.metaData.get('series', imageId); const series = cornerstone.metaData.get('series', imageId);
const instance = cornerstoneTools.metaData.get('instance', imageId); const instance = cornerstone.metaData.get('instance', imageId);
let info = measurement.response; let info = measurement.response;
if (!info) { if (!info) {

4
Packages/ohif-measurements/client/lib/jumpToRowItem.js
View File

@ -141,8 +141,8 @@ OHIF.measurements.jumpToRowItem = (rowItem, timepoints) => {
if (enabledElement && enabledElement.image) { if (enabledElement && enabledElement.image) {
const imageId = enabledElement.image.imageId; const imageId = enabledElement.image.imageId;
const series = cornerstoneTools.metaData.get('series', imageId); const series = cornerstone.metaData.get('series', imageId);
const study = cornerstoneTools.metaData.get('study', imageId); const study = cornerstone.metaData.get('study', imageId);
if (series.seriesInstanceUid === measurementData.seriesInstanceUid && if (series.seriesInstanceUid === measurementData.seriesInstanceUid &&
study.studyInstanceUid === measurementData.studyInstanceUid) { study.studyInstanceUid === measurementData.studyInstanceUid) {

2
Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
View File

@ -408,7 +408,7 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
OHIF.viewer.data.loadedSeriesData = layoutManager.viewportData; OHIF.viewer.data.loadedSeriesData = layoutManager.viewportData;
// Check if image plane (orientation / location) data is present for the current image // 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 (imagePlane && imagePlane.frameOfReferenceUID) {
// If it is, add this element to the global synchronizer... // If it is, add this element to the global synchronizer...
OHIF.viewer.updateImageSynchronizer.add(element); OHIF.viewer.updateImageSynchronizer.add(element);

4
Packages/ohif-viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.js
View File

@ -156,7 +156,7 @@ Template.viewportOverlay.helpers({
return false; return false;
} }
const instance = cornerstoneTools.metaData.get('instance', this.imageId); const instance = cornerstone.metaData.get('instance', this.imageId);
if (!instance) { if (!instance) {
return ''; return '';
} }
@ -234,7 +234,7 @@ Template.viewportOverlay.helpers({
}); });
// Get study data // Get study data
const study = cornerstoneTools.metaData.get('study', this.imageId); const study = cornerstone.metaData.get('study', this.imageId);
if (!study) { if (!study) {
return; return;
} }

2
Packages/ohif-viewerbase/client/lib/classes/ResizeViewportManager.js
View File

@ -113,7 +113,7 @@ export class ResizeViewportManager {
if (enabledElement.fitToWindow === false) { if (enabledElement.fitToWindow === false) {
const imageId = enabledElement.image.imageId; 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); const instanceClassViewport = getInstanceClassDefaultViewport(instance, enabledElement, imageId);
cornerstone.setViewport(element, instanceClassViewport); cornerstone.setViewport(element, instanceClassViewport);
} }

2
Packages/ohif-viewerbase/client/lib/classes/StackImagePositionOffsetSynchronizer.js
View File

@ -201,7 +201,7 @@ export class StackImagePositionOffsetSynchronizer {
} }
const imageId = enabledElement.image.imageId; 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) { if (!imagePlane || !imagePlane.rowCosines || !imagePlane.columnCosines) {
return; return;

6
Packages/ohif-viewerbase/client/lib/classes/StudyPrefetcher.js
View File

@ -161,19 +161,19 @@ export class StudyPrefetcher {
} }
getStudy(image) { 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); return OHIF.viewer.Studies.find(study => study.studyInstanceUid === studyMetadata.studyInstanceUid);
} }
getSeries(study, image) { 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); const studyMetadata = OHIF.viewerbase.getStudyMetadata(study);
return studyMetadata.getSeriesByUID(seriesMetadata.seriesInstanceUid); return studyMetadata.getSeriesByUID(seriesMetadata.seriesInstanceUid);
} }
getInstance(series, image) { getInstance(series, image) {
const instanceMetadata = cornerstoneTools.metaData.get('instance', image.imageId); const instanceMetadata = cornerstone.metaData.get('instance', image.imageId);
return series.getInstanceByUID(instanceMetadata.sopInstanceUid); return series.getInstanceByUID(instanceMetadata.sopInstanceUid);
} }

2
Packages/ohif-viewerbase/client/lib/displayReferenceLines.js
View File

@ -19,7 +19,7 @@ export function displayReferenceLines(element) {
} }
const imageId = enabledElement.image.imageId; 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 // Disable reference lines for the current element
cornerstoneTools.referenceLines.tool.disable(element); cornerstoneTools.referenceLines.tool.disable(element);

2
Packages/ohif-viewerbase/client/lib/getFrameOfReferenceUID.js
View File

@ -21,7 +21,7 @@ export function getFrameOfReferenceUID(element) {
} }
var imageId = enabledElement.image.imageId; var imageId = enabledElement.image.imageId;
var imagePlane = cornerstoneTools.metaData.get('imagePlane', imageId); var imagePlane = cornerstone.metaData.get('imagePlane', imageId);
if (!imagePlane || !imagePlane.frameOfReferenceUID) { if (!imagePlane || !imagePlane.frameOfReferenceUID) {
return; return;
} }

2
Packages/ohif-viewerbase/client/lib/setMammogramViewportAlignment.js
View File

@ -9,7 +9,7 @@ const setMammogramViewportAlignment = (series, enabledElement, imageId) => {
const viewTypes = ['MLO', 'CC', 'LM', 'ML', 'XCCL']; const viewTypes = ['MLO', 'CC', 'LM', 'ML', 'XCCL'];
const requiresInversion = ['LM']; // Tomo series are flipped const requiresInversion = ['LM']; // Tomo series are flipped
const instance = cornerstoneTools.metaData.get('instance', imageId); const instance = cornerstone.metaData.get('instance', imageId);
if (!instance) { if (!instance) {
return; return;
} }

2
Packages/ohif-viewerbase/client/lib/updateOrientationMarkers.js
View File

@ -16,7 +16,7 @@ export function updateOrientationMarkers(element, viewport) {
// Updates the orientation labels on the viewport // Updates the orientation labels on the viewport
const enabledElement = cornerstone.getEnabledElement(element); 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) { if (!imagePlane || !imagePlane.rowCosines || !imagePlane.columnCosines) {
return; return;

10
Packages/ohif-viewerbase/client/lib/viewportOverlayUtils.js
View File

@ -5,7 +5,7 @@ const getPatient = function(property) {
return false; return false;
} }
const patient = cornerstoneTools.metaData.get('patient', this.imageId); const patient = cornerstone.metaData.get('patient', this.imageId);
if (!patient) { if (!patient) {
return ''; return '';
} }
@ -18,7 +18,7 @@ const getStudy = function(property) {
return false; return false;
} }
const study = cornerstoneTools.metaData.get('study', this.imageId); const study = cornerstone.metaData.get('study', this.imageId);
if (!study) { if (!study) {
return ''; return '';
} }
@ -31,7 +31,7 @@ const getSeries = function(property) {
return false; return false;
} }
const series = cornerstoneTools.metaData.get('series', this.imageId); const series = cornerstone.metaData.get('series', this.imageId);
if (!series) { if (!series) {
return ''; return '';
} }
@ -44,7 +44,7 @@ const getInstance = function(property) {
return false; return false;
} }
const instance = cornerstoneTools.metaData.get('instance', this.imageId); const instance = cornerstone.metaData.get('instance', this.imageId);
if (!instance) { if (!instance) {
return ''; return '';
} }
@ -57,7 +57,7 @@ const getTagDisplay = function(property) {
return false; return false;
} }
const instance = cornerstoneTools.metaData.get('tagDisplay', this.imageId); const instance = cornerstone.metaData.get('tagDisplay', this.imageId);
if (!instance) { if (!instance) {
return ''; return '';
} }

2
Packages/ohif-viewerbase/client/lib/viewportUtils.js
View File

@ -138,7 +138,7 @@ const resetViewport = () => {
const enabledElement = cornerstone.getEnabledElement(element); const enabledElement = cornerstone.getEnabledElement(element);
if (enabledElement.fitToWindow === false) { if (enabledElement.fitToWindow === false) {
const imageId = enabledElement.image.imageId; 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); enabledElement.viewport = cornerstone.getDefaultViewport(enabledElement.canvas, enabledElement.image);

2
StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js
View File

@ -17,7 +17,7 @@ Template.standaloneViewerMain.onCreated(() => {
OHIF.viewer.metadataProvider = OHIF.cornerstone.metadataProvider; OHIF.viewer.metadataProvider = OHIF.cornerstone.metadataProvider;
// Metadata configuration // Metadata configuration
const metadataProvider = OHIF.viewer.metadataProvider; const metadataProvider = OHIF.viewer.metadataProvider;
cornerstoneTools.metaData.addProvider(metadataProvider.provider.bind(metadataProvider)); cornerstone.metaData.addProvider(metadataProvider.provider.bind(metadataProvider));
}); });
Template.standaloneViewerMain.onRendered(() => { Template.standaloneViewerMain.onRendered(() => {