@cornerstonejs/tools 3.22.1 → 3.22.2

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

@@ -306,30 +306,35 @@ class CircleROIStartEndThresholdTool extends CircleROITool {
         imageData.indexToWorldVec3(startIJK, startWorld);
         const endWorld = vec3.create();
         imageData.indexToWorldVec3(endIJK, endWorld);
-        if (this._getIndexOfCoordinatesForViewplaneNormal(viewPlaneNormal) == 2) {
+        const projectionAxisIndex = this._getIndexOfCoordinatesForViewplaneNormal(viewPlaneNormal);
+        if (projectionAxisIndex == 2) {
             startWorld[2] = startCoordinate;
             endWorld[2] = endCoordinate;
             handlesToStart[0][2] = startCoordinate;
             handlesToStart[1][2] = startCoordinate;
         }
-        else if (this._getIndexOfCoordinatesForViewplaneNormal(viewPlaneNormal) == 0) {
+        else if (projectionAxisIndex == 0) {
             startWorld[0] = startCoordinate;
             endWorld[0] = endCoordinate;
             handlesToStart[0][0] = startCoordinate;
             handlesToStart[1][0] = startCoordinate;
         }
-        else if (this._getIndexOfCoordinatesForViewplaneNormal(viewPlaneNormal) == 1) {
+        else if (projectionAxisIndex == 1) {
             startWorld[1] = startCoordinate;
             endWorld[1] = endCoordinate;
             handlesToStart[0][1] = startCoordinate;
             handlesToStart[1][1] = startCoordinate;
         }
-        const distance = vec3.distance(startWorld, endWorld);
+        const direction = vec3.create();
+        vec3.subtract(direction, endWorld, startWorld);
+        const distance = vec3.length(direction);
+        vec3.normalize(direction, direction);
         const newProjectionPoints = [];
+        const basePoints = points;
         for (let dist = 0; dist < distance; dist += spacingInNormal) {
-            newProjectionPoints.push(handlesToStart.map((point) => {
+            newProjectionPoints.push(basePoints.map((point) => {
                 const newPoint = vec3.create();
-                vec3.scaleAndAdd(newPoint, point, viewPlaneNormal, dist);
+                vec3.scaleAndAdd(newPoint, point, direction, dist);
                 return Array.from(newPoint);
             }));
         }

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

@@ -290,24 +290,28 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool {
         imageData.indexToWorldVec3(startIJK, startWorld);
         const endWorld = vec3.create();
         imageData.indexToWorldVec3(endIJK, endWorld);
-        if (this._getIndexOfCoordinatesForViewplaneNormal(viewPlaneNormal) == 2) {
+        const projectionAxisIndex = this._getIndexOfCoordinatesForViewplaneNormal(viewPlaneNormal);
+        if (projectionAxisIndex == 2) {
             startWorld[2] = startCoordinate;
             endWorld[2] = endCoordinate;
         }
-        else if (this._getIndexOfCoordinatesForViewplaneNormal(viewPlaneNormal) == 0) {
+        else if (projectionAxisIndex == 0) {
             startWorld[0] = startCoordinate;
             endWorld[0] = endCoordinate;
         }
-        else if (this._getIndexOfCoordinatesForViewplaneNormal(viewPlaneNormal) == 1) {
+        else if (projectionAxisIndex == 1) {
             startWorld[1] = startCoordinate;
             endWorld[1] = endCoordinate;
         }
-        const distance = vec3.distance(startWorld, endWorld);
+        const direction = vec3.create();
+        vec3.subtract(direction, endWorld, startWorld);
+        const distance = vec3.length(direction);
+        vec3.normalize(direction, direction);
         const newProjectionPoints = [];
         for (let dist = 0; dist < distance; dist += spacingInNormal) {
             newProjectionPoints.push(points.map((point) => {
                 const newPoint = vec3.create();
-                vec3.scaleAndAdd(newPoint, point, viewPlaneNormal, dist);
+                vec3.scaleAndAdd(newPoint, point, direction, dist);
                 return Array.from(newPoint);
             }));
         }

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.22.1";
+export declare const version = "3.22.2";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '3.22.1';
+export const version = '3.22.2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.22.1",
+  "version": "3.22.2",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "^3.1.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.22.1",
+    "@cornerstonejs/core": "^3.22.2",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "23da62631a3c12ea7c677d89f01c12f99f2b9691"
+  "gitHead": "3d92fc6b7bb0483ba2a648a3207e3d29697690f0"
 }