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

Fixing console errors related to cornerstone

Browse Source
This commit is contained in:
Bruno Alves de Faria 2018-03-23 09:34:17 -03:00
parent 04da9310d1
commit af611109c0
5 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/doubleClickCallback.js
View File

@ -18,6 +18,13 @@ export default function (event) {
return false; return false;
} }
// Check if the element is enabled and stop here if not
try {
cornerstone.getEnabledElement(element);
} catch (error) {
return;
}
const config = cornerstoneTools.bidirectional.getConfiguration(); const config = cornerstoneTools.bidirectional.getConfiguration();
const coords = eventData.currentPoints.canvas; const coords = eventData.currentPoints.canvas;

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

@ -419,6 +419,13 @@ function doubleClickCallback(e) {
return false; return false;
} }
// Check if the element is enabled and stop here if not
try {
cornerstone.getEnabledElement(element);
} catch (error) {
return;
}
const config = cornerstoneTools.nonTarget.getConfiguration(); const config = cornerstoneTools.nonTarget.getConfiguration();
const coords = eventData.currentPoints.canvas; const coords = eventData.currentPoints.canvas;

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

@ -430,6 +430,13 @@ function createQualitativeTargetTool(toolType, responseText='') {
return false; return false;
} }
// Check if the element is enabled and stop here if not
try {
cornerstone.getEnabledElement(element);
} catch (error) {
return;
}
const config = cornerstoneTools[toolType].getConfiguration(); const config = cornerstoneTools[toolType].getConfiguration();
const coords = eventData.currentPoints.canvas; const coords = eventData.currentPoints.canvas;

6
Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js
View File

@ -66,14 +66,14 @@ Template[defaultTemplate].helpers({
const date = moment(patientBirthDate, 'YYYYMMDD'); const date = moment(patientBirthDate, 'YYYYMMDD');
const yearDiff = moment().diff(date, 'years'); const yearDiff = moment().diff(date, 'years');
if (yearDiff) { if (yearDiff) {
values.push(yearDiff + 'Y').padStart(4, '0'); values.push((yearDiff + 'Y').padStart(4, '0'));
} else { } else {
const monthDiff = moment().diff(date, 'months'); const monthDiff = moment().diff(date, 'months');
if (monthDiff) { if (monthDiff) {
values.push(monthDiff + 'M').padStart(4, '0'); values.push((monthDiff + 'M').padStart(4, '0'));
} else { } else {
const dayDiff = moment().diff(date, 'days') || 0; const dayDiff = moment().diff(date, 'days') || 0;
values.push(dayDiff + 'D').padStart(4, '0'); values.push((dayDiff + 'D').padStart(4, '0'));
} }
} }
} }

16
Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js
View File

@ -63,7 +63,9 @@ Template.imageThumbnail.onRendered(() => {
cornerstone.displayImage(element, image); cornerstone.displayImage(element, image);
$element.one('cornerstoneimagerendered', () => { $element.one('cornerstoneimagerendered', event => {
const eventData = event.originalEvent.detail;
const { element } = eventData;
const enabledElement = cornerstone.getEnabledElement(element); const enabledElement = cornerstone.getEnabledElement(element);
// Create a static image from // Create a static image from
@ -72,8 +74,10 @@ Template.imageThumbnail.onRendered(() => {
const dataUrl = enabledElement.canvas.toDataURL('image/jpeg', 1); const dataUrl = enabledElement.canvas.toDataURL('image/jpeg', 1);
imageElement.src = dataUrl; imageElement.src = dataUrl;
// Disable cornerstone for thumbnail element and remove its canvas // Try to disable cornerstone for thumbnail element and remove its canvas
cornerstone.disable(element); try {
cornerstone.disable(element);
} catch (e) {}
$element.append(imageElement); $element.append(imageElement);
@ -117,7 +121,11 @@ Template.imageThumbnail.onDestroyed(() => {
const $parent = instance.$('.imageThumbnail'); const $parent = instance.$('.imageThumbnail');
const $element = $parent.find('.imageThumbnailCanvas'); const $element = $parent.find('.imageThumbnailCanvas');
const element = $element.get(0); const element = $element.get(0);
cornerstone.disable(element);
// Try to disable the element if it still exists
try {
cornerstone.disable(element);
} catch (e) {}
}); });
Template.imageThumbnail.helpers({ Template.imageThumbnail.helpers({