From 97f48bd27c3fc2f0ecb0b9a4aae6457414628dcc Mon Sep 17 00:00:00 2001 From: Bruno Alves de Faria Date: Wed, 4 Jan 2017 18:31:06 -0200 Subject: [PATCH] LT-115: Fixing Non-Target and Ellipse data issues --- .../client/components/dialog/nonTargetMeasurement.js | 4 ++-- .../ohif-measurements/client/lib/MeasurementHandlers.js | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Packages/ohif-lesiontracker/client/components/dialog/nonTargetMeasurement.js b/Packages/ohif-lesiontracker/client/components/dialog/nonTargetMeasurement.js index 238da0c78..dc37f2180 100644 --- a/Packages/ohif-lesiontracker/client/components/dialog/nonTargetMeasurement.js +++ b/Packages/ohif-lesiontracker/client/components/dialog/nonTargetMeasurement.js @@ -18,8 +18,8 @@ Template.dialogNonTargetMeasurement.onCreated(() => { // Remove the measurement from the collection instance.removeMeasurement = () => { const measurementApi = instance.viewerData.measurementApi; - measurementApi.deleteMeasurements(instance.measurementTypeId, { - _id: instance.data.measurementData._id + measurementApi.deleteMeasurements('nonTargets', { + toolItemId: instance.data.measurementData._id }); // Update the Overall Measurement Numbers for all Measurements diff --git a/Packages/ohif-measurements/client/lib/MeasurementHandlers.js b/Packages/ohif-measurements/client/lib/MeasurementHandlers.js index 392af2319..de747fc5c 100644 --- a/Packages/ohif-measurements/client/lib/MeasurementHandlers.js +++ b/Packages/ohif-measurements/client/lib/MeasurementHandlers.js @@ -9,7 +9,7 @@ class MeasurementHandlers { const measurementApi = instance.data.measurementApi; const Collection = measurementApi.tools[eventData.toolType]; - // Stop here if collection was not found for the given tool + // Stop here if the tool data shall not be stored (e.g. temp tools) if (!Collection) { return; } @@ -77,6 +77,11 @@ class MeasurementHandlers { const measurementApi = instance.data.measurementApi; const Collection = measurementApi.tools[eventData.toolType]; + // Stop here if the tool data shall not be stored (e.g. temp tools) + if (!Collection) { + return; + } + OHIF.log.info('CornerstoneToolsMeasurementModified'); let measurement = Collection.findOne(measurementData._id);