@cornerstonejs/tools 2.14.10 → 2.14.12

package/dist/esm/tools/annotation/AngleTool.js

@@ -12,6 +12,7 @@ import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters'
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
+import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
 class AngleTool extends AnnotationTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -315,6 +316,9 @@ class AngleTool extends AnnotationTool {
                     console.warn('Rendering Engine has been destroyed');
                     return renderStatus;
                 }
+                if (!isAnnotationVisible(annotationUID)) {
+                    continue;
+                }
                 if (activeHandleCanvasCoords) {
                     const handleGroupUID = '0';
                     drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, canvasCoordinates, {

package/dist/esm/tools/annotation/ArrowAnnotateTool.js

@@ -10,6 +10,7 @@ import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters'
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
+import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
 class ArrowAnnotateTool extends AnnotationTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -312,6 +313,13 @@ class ArrowAnnotateTool extends AnnotationTool {
                     activeHandleIndex !== null) {
                     activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
                 }
+                if (!viewport.getRenderingEngine()) {
+                    console.warn('Rendering Engine has been destroyed');
+                    return renderStatus;
+                }
+                if (!isAnnotationVisible(annotationUID)) {
+                    continue;
+                }
                 if (activeHandleCanvasCoords) {
                     const handleGroupUID = '0';
                     drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, canvasCoordinates, {
@@ -335,10 +343,6 @@ class ArrowAnnotateTool extends AnnotationTool {
                     });
                 }
                 renderStatus = true;
-                if (!viewport.getRenderingEngine()) {
-                    console.warn('Rendering Engine has been destroyed');
-                    return renderStatus;
-                }
                 if (!text) {
                     continue;
                 }

package/dist/esm/tools/annotation/CobbAngleTool.js

@@ -15,6 +15,7 @@ import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters'
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
+import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
 class CobbAngleTool extends AnnotationTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -358,6 +359,9 @@ class CobbAngleTool extends AnnotationTool {
                     console.warn('Rendering Engine has been destroyed');
                     return renderStatus;
                 }
+                if (!isAnnotationVisible(annotationUID)) {
+                    continue;
+                }
                 if (activeHandleCanvasCoords) {
                     const handleGroupUID = '0';
                     drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, canvasCoordinates, {

package/dist/esm/utilities/voi/colorbar/ColorbarCanvas.js

@@ -139,13 +139,13 @@ class ColorbarCanvas {
         const maxValue = isHorizontal ? width : height;
         const { _voiRange: voiRange } = this;
         const range = this._showFullImageRange ? this._imageRange : { ...voiRange };
-        const { windowWidth } = utilities.windowLevel.toWindowLevel(voiRange.lower, voiRange.upper);
         let previousColorPoint = undefined;
         let currentColorPoint = getColorPoint(0);
         const incRawPixelValue = (range.upper - range.lower) / (maxValue - 1);
         let rawPixelValue = range.lower;
         for (let i = 0; i < maxValue; i++) {
-            const tVoiRange = (rawPixelValue - voiRange.lower) / windowWidth;
+            const tVoiRange = (rawPixelValue - voiRange.lower) /
+                Math.abs(voiRange.upper - voiRange.lower);
             if (currentColorPoint) {
                 for (let i = currentColorPoint.index; i < colorsCount; i++) {
                     if (tVoiRange <= currentColorPoint.position) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "2.14.10",
+  "version": "2.14.12",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -104,7 +104,7 @@
     "canvas": "^2.11.2"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^2.14.10",
+    "@cornerstonejs/core": "^2.14.12",
     "@kitware/vtk.js": "32.1.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -123,5 +123,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "5a7460e6e354f0fc1bc44e5d3d2e2398f5deff34"
+  "gitHead": "3062aecefb4115e44735550afbf9f33996cf8a02"
 }