@cornerstonejs/tools 3.11.8 → 3.12.0

package/dist/esm/tools/segmentation/CircleROIStartEndThresholdTool.js

@@ -7,6 +7,7 @@ import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters'
 import getWorldWidthAndHeightFromTwoPoints from '../../utilities/planar/getWorldWidthAndHeightFromTwoPoints';
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
 import throttle from '../../utilities/throttle';
+import debounce from '../../utilities/debounce';
 import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
 import { hideElementCursor, resetElementCursor, } from '../../cursors/elementCursor';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
@@ -26,10 +27,11 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
         configuration: {
             storePointData: false,
             numSlicesToPropagate: 10,
-            calculatePointsInsideVolume: false,
+            calculatePointsInsideVolume: true,
             getTextLines: defaultGetTextLines,
             statsCalculator: BasicStatsCalculator,
             showTextBox: false,
+            throttleTimeout: 100,
         },
     }) {
         super(toolProps, defaultToolProps);
@@ -133,13 +135,14 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
             }
             const targetId = this.getTargetId(enabledElement.viewport);
             const imageVolume = cache.getVolume(targetId.split(/volumeId:|\?/)[1]);
-            if (this.configuration.calculatePointsInsideVolume) {
-                this._computePointsInsideVolume(annotation, imageVolume, targetId, enabledElement);
-            }
+            this._computePointsInsideVolume(annotation, imageVolume, targetId, enabledElement);
             triggerAnnotationRenderForViewportIds(viewportIdsToRender);
             if (newAnnotation) {
                 triggerAnnotationCompleted(annotation);
             }
+            else {
+                triggerAnnotationModified(annotation, element);
+            }
         };
         this.renderAnnotation = (enabledElement, svgDrawingHelper) => {
             let renderStatus = false;
@@ -244,8 +247,7 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
                     }
                 }
                 renderStatus = true;
-                if (this.configuration.showTextBox == true &&
-                    this.configuration.calculatePointsInsideVolume == true) {
+                if (this.configuration.showTextBox) {
                     const options = this.getLinkedTextBoxStyle(styleSpecifier, annotation);
                     if (!options.visibility) {
                         data.handles.textBox = {
@@ -284,7 +286,12 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
             }
             return renderStatus;
         };
-        this._throttledCalculateCachedStats = throttle(this._calculateCachedStatsTool, 100, { trailing: true });
+        if (this.configuration.calculatePointsInsideVolume) {
+            this._throttledCalculateCachedStats = throttle(this._calculateCachedStatsTool, this.configuration.throttleTimeout, { trailing: true });
+        }
+        else {
+            this._throttledCalculateCachedStats = debounce(this._calculateCachedStatsTool, this.configuration.throttleTimeout);
+        }
     }
     _computeProjectionPoints(annotation, imageVolume) {
         const { data, metadata } = annotation;
@@ -424,9 +431,7 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
         const targetId = this.getTargetId(viewport);
         const imageVolume = cache.getVolume(targetId.split(/volumeId:|\?/)[1]);
         this._computeProjectionPoints(annotation, imageVolume);
-        if (this.configuration.calculatePointsInsideVolume) {
-            this._computePointsInsideVolume(annotation, imageVolume, targetId, enabledElement);
-        }
+        this._computePointsInsideVolume(annotation, imageVolume, targetId, enabledElement);
         annotation.invalidated = false;
         triggerAnnotationModified(annotation, viewport.element);
         return cachedStats;

package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js

@@ -6,6 +6,7 @@ import { isAnnotationLocked } from '../../stateManagement/annotation/annotationL
 import { drawHandles as drawHandlesSvg, drawRect as drawRectSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } from '../../drawingSvg';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import throttle from '../../utilities/throttle';
+import debounce from '../../utilities/debounce';
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
 import getWorldWidthAndHeightFromCorners from '../../utilities/planar/getWorldWidthAndHeightFromCorners';
 import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
@@ -23,10 +24,11 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
         configuration: {
             storePointData: false,
             numSlicesToPropagate: 10,
-            computePointsInsideVolume: false,
+            calculatePointsInsideVolume: true,
             getTextLines: defaultGetTextLines,
             statsCalculator: BasicStatsCalculator,
             showTextBox: false,
+            throttleTimeout: 100,
         },
     }) {
         super(toolProps, defaultToolProps);
@@ -135,13 +137,14 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
             }
             const targetId = this.getTargetId(enabledElement.viewport);
             const imageVolume = cache.getVolume(targetId.split(/volumeId:|\?/)[1]);
-            if (this.configuration.calculatePointsInsideVolume) {
-                this._computePointsInsideVolume(annotation, targetId, imageVolume, enabledElement);
-            }
+            this._computePointsInsideVolume(annotation, targetId, imageVolume, enabledElement);
             triggerAnnotationRenderForViewportIds(viewportIdsToRender);
             if (newAnnotation) {
                 triggerAnnotationCompleted(annotation);
             }
+            else {
+                triggerAnnotationModified(annotation, element);
+            }
         };
         this.renderAnnotation = (enabledElement, svgDrawingHelper) => {
             let renderStatus = false;
@@ -230,8 +233,7 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
                     lineWidth,
                 });
                 renderStatus = true;
-                if (this.configuration.showTextBox &&
-                    this.configuration.calculatePointsInsideVolume) {
+                if (this.configuration.showTextBox) {
                     const options = this.getLinkedTextBoxStyle(styleSpecifier, annotation);
                     if (!options.visibility) {
                         data.handles.textBox = {
@@ -269,7 +271,12 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
             }
             return renderStatus;
         };
-        this._throttledCalculateCachedStats = throttle(this._calculateCachedStatsTool, 100, { trailing: true });
+        if (this.configuration.calculatePointsInsideVolume) {
+            this._throttledCalculateCachedStats = throttle(this._calculateCachedStatsTool, this.configuration.throttleTimeout, { trailing: true });
+        }
+        else {
+            this._throttledCalculateCachedStats = debounce(this._calculateCachedStatsTool, this.configuration.throttleTimeout);
+        }
     }
     _computeProjectionPoints(annotation, imageVolume) {
         const { data, metadata } = annotation;
@@ -385,9 +392,7 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
         const targetId = this.getTargetId(viewport);
         const imageVolume = cache.getVolume(targetId.split(/volumeId:|\?/)[1]);
         this._computeProjectionPoints(annotation, imageVolume);
-        if (this.configuration.calculatePointsInsideVolume) {
-            this._computePointsInsideVolume(annotation, targetId, imageVolume, enabledElement);
-        }
+        this._computePointsInsideVolume(annotation, targetId, imageVolume, enabledElement);
         annotation.invalidated = false;
         triggerAnnotationModified(annotation, viewport.element);
         return cachedStats;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.11.8",
+  "version": "3.12.0",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -103,7 +103,7 @@
     "canvas": "^3.1.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.11.8",
+    "@cornerstonejs/core": "^3.12.0",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -122,5 +122,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "c4d9fd52163b0b546ed5ab5105f5e28819ba0f08"
+  "gitHead": "763786d4994c50236c5fe7f964546e758bdbe64d"
 }