feat: 🎸 Correctly handle and remove cancelled new measurements

cornerstonejs · Jul 3, 2020 · 6693743 · 6693743
1 parent b037c89
commit 6693743
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/src/eventDispatchers/mouseEventHandlers/addNewMeasurement.js b/src/eventDispatchers/mouseEventHandlers/addNewMeasurement.js
@@ -1,6 +1,9 @@
 import EVENTS from '../../events.js';
 import external from '../../externalModules.js';
-import { addToolState } from '../../stateManagement/toolState.js';
+import {
+  addToolState,
+  removeToolState,
+} from '../../stateManagement/toolState.js';
 import { moveHandle, moveNewHandle } from '../../manipulators/index.js';
 import { getLogger } from '../../util/logger.js';
 import triggerEvent from '../../util/triggerEvent.js';
@@ -36,20 +39,24 @@ export default function(evt, tool) {
     measurementData.handles.end,
     tool.options,
     'mouse',
-    () => {
+    success => {
       if (measurementData.cancelled) {
         return;
       }
 
-      const eventType = EVENTS.MEASUREMENT_COMPLETED;
-      const eventData = {
-        toolName: tool.name,
-        toolType: tool.name, // Deprecation notice: toolType will be replaced by toolName
-        element,
-        measurementData,
-      };
-
-      triggerEvent(element, eventType, eventData);
+      if (success) {
+        const eventType = EVENTS.MEASUREMENT_COMPLETED;
+        const eventData = {
+          toolName: tool.name,
+          toolType: tool.name, // Deprecation notice: toolType will be replaced by toolName
+          element,
+          measurementData,
+        };
+
+        triggerEvent(element, eventType, eventData);
+      } else {
+        removeToolState(element, tool.name, measurementData);
+      }
     }
   );
 }
diff --git a/src/tools/annotation/bidirectionalTool/addNewMeasurement.js b/src/tools/annotation/bidirectionalTool/addNewMeasurement.js
@@ -42,7 +42,12 @@ export default function(evt, interactionType) {
     end,
     {},
     interactionType,
-    () => {
+    success => {
+      if (!success) {
+        removeToolState(element, this.name, measurementData);
+
+        return;
+      }
       const { handles, longestDiameter, shortestDiameter } = measurementData;
       const hasHandlesOutside = anyHandlesOutsideImage(eventData, handles);
       const longestDiameterSize = parseFloat(longestDiameter) || 0;