From 8cb13fca6ba0b1158965d9d2b4f9177b8a35bc68 Mon Sep 17 00:00:00 2001 From: Bruno Alves de Faria Date: Tue, 24 Jan 2017 14:54:26 -0200 Subject: [PATCH] LT-55: Drawing the measurements on cornerstone canvas --- .../ohif-measurements/client/lib/exportPdf.js | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/Packages/ohif-measurements/client/lib/exportPdf.js b/Packages/ohif-measurements/client/lib/exportPdf.js index ca6ce626e..3f5e1e40f 100644 --- a/Packages/ohif-measurements/client/lib/exportPdf.js +++ b/Packages/ohif-measurements/client/lib/exportPdf.js @@ -25,6 +25,9 @@ OHIF.measurements.exportPdf = measurementGroups => { cornerstone.enable(element, { renderer: 'webgl' }); + const enabledElement = cornerstone.getEnabledElement(element); + enabledElement.toolStateManager = cornerstoneTools.newImageIdSpecificToolStateManager(); + const measurements = { targets: [], nonTargets: [] @@ -37,14 +40,22 @@ OHIF.measurements.exportPdf = measurementGroups => { }); let i = 0; - measurements.targets.forEach(target => { - setTimeout(() => { - cornerstone.loadImage(target.imageId).then(image => { - cornerstone.displayImage(element, image); - }); - }, i * 1000); - i++; - }); + const readMeasurements = toolGroupId => { + measurements[toolGroupId].forEach(measurement => { + setTimeout(() => { + cornerstone.loadImage(measurement.imageId).then(image => { + cornerstone.displayImage(element, image); + cornerstoneTools.addToolState(element, measurement.toolType, measurement); + cornerstoneTools[measurement.toolType].enable(element); + cornerstoneTools.clearToolState(element, measurement.toolType); + }); + }, i * 1000); + i++; + }); + }; + + readMeasurements('targets'); + readMeasurements('nonTargets'); setTimeout(() => $element.remove(), i * 1000); };