From f91fc1c897f962e05e2bdeb1a67fd4a471782a48 Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Thu, 2 Mar 2017 13:40:01 -0300
Subject: [PATCH] Fixing issues with PDF report

---
 .../ohif-measurements/client/lib/exportPdf.js | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/Packages/ohif-measurements/client/lib/exportPdf.js b/Packages/ohif-measurements/client/lib/exportPdf.js
index 6642d6ab7..c8e22cdcb 100644
--- a/Packages/ohif-measurements/client/lib/exportPdf.js
+++ b/Packages/ohif-measurements/client/lib/exportPdf.js
@@ -1,5 +1,6 @@
 import { OHIF } from 'meteor/ohif:core';
 import { MeasurementReport } from 'meteor/ohif:measurements/client/reports/measurement';
+import { $ } from 'meteor/jquery';
 
 OHIF.measurements.exportPdf = (measurementApi, timepointApi) => {
     const currentTimepoint = timepointApi.current();
@@ -45,8 +46,10 @@ OHIF.measurements.exportPdf = (measurementApi, timepointApi) => {
 
         const measurement = current.value;
         cornerstone.loadImage(measurement.imageId).then(image => {
+            const state = Object.assign({}, measurement, { active: true });
+            cornerstoneTools.clearToolState(element, measurement.toolType);
             cornerstone.displayImage(element, image);
-            cornerstoneTools.addToolState(element, measurement.toolType, measurement);
+            cornerstoneTools.addToolState(element, measurement.toolType, state);
             cornerstoneTools[measurement.toolType].enable(element);
 
             const series = cornerstoneTools.metaData.get('series', measurement.imageId);
@@ -66,16 +69,17 @@ OHIF.measurements.exportPdf = (measurementApi, timepointApi) => {
             let type = measurementApi.toolsGroupsMap[measurement.toolType];
             type = type === 'targets' ? 'Target' : 'Non-target';
 
-            report.printMeasurement({
-                type,
-                number: measurement.measurementNumber,
-                location: OHIF.measurements.getLocationLabel(measurement.location) || '',
-                info,
-                image: enabledElement.canvas.toDataURL('image/jpeg', 0.85)
+            $element.one('CornerstoneImageRendered', () => {
+                report.printMeasurement({
+                    type,
+                    number: measurement.measurementNumber,
+                    location: OHIF.measurements.getLocationLabel(measurement.location) || '',
+                    info,
+                    image: enabledElement.canvas.toDataURL('image/jpeg', 0.85)
+                });
             });
-            cornerstoneTools.clearToolState(element, measurement.toolType);
 
-            printMeasurements(callback);
+            setTimeout(() => printMeasurements(callback));
         });
     };