TrizTech/ohif-viewer
17
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 committed 2017-10-25 09:56:24 +02:00
1 parent c5596128c1
commit 05d9a41f45
20 files changed
+33 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
+1 -1
View File
@@ -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);
Packages/ohif-viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.js
+2 -2
View File
@@ -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;
}
Packages/ohif-viewerbase/client/lib/classes/ResizeViewportManager.js
+1 -1
View File
@@ -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);
}
Packages/ohif-viewerbase/client/lib/classes/StackImagePositionOffsetSynchronizer.js
+1 -1
View File
@@ -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;
Packages/ohif-viewerbase/client/lib/classes/StudyPrefetcher.js
+3 -3
View File
@@ -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);
}
Packages/ohif-viewerbase/client/lib/displayReferenceLines.js
+1 -1
View File
@@ -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);
Packages/ohif-viewerbase/client/lib/getFrameOfReferenceUID.js
+1 -1
View File
@@ -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;
}
Packages/ohif-viewerbase/client/lib/setMammogramViewportAlignment.js
+1 -1
View File
@@ -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;
}
Packages/ohif-viewerbase/client/lib/updateOrientationMarkers.js
+1 -1
View File
@@ -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;
Packages/ohif-viewerbase/client/lib/viewportOverlayUtils.js
+5 -5
View File
@@ -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 '';
}
Packages/ohif-viewerbase/client/lib/viewportUtils.js
+1 -1
View File
@@ -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);