@cornerstonejs/tools 4.15.10 → 4.15.11

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

@@ -45,7 +45,7 @@ class LivewireContourSegmentationTool extends LivewireContourTool {
                 });
             }
             const acceptedPath = new LivewirePath();
-            for (let i = 0; i < count; i++) {
+            for (let i = 0; i < count - 1; i++) {
                 scissors.startSearch(worldToSlice(points[i]));
                 const path = scissors.findPathToPoint(worldToSlice(points[(i + 1) % count]));
                 acceptedPath.addPoints(path);

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

@@ -76,8 +76,6 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
                 viewportIdsToRender,
                 movingTextBox: false,
             };
-            const enabledElement = getEnabledElement(element);
-            const { renderingEngine } = enabledElement;
             this._activateModify(element);
             triggerAnnotationRenderForViewportIds(viewportIdsToRender);
             evt.preventDefault();
@@ -104,8 +102,6 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
                 movingTextBox,
             };
             this._activateModify(element);
-            const enabledElement = getEnabledElement(element);
-            const { renderingEngine } = enabledElement;
             triggerAnnotationRenderForViewportIds(viewportIdsToRender);
             evt.preventDefault();
         };
@@ -154,7 +150,7 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
             const { canvas: canvasPos, world: worldPosOriginal } = currentPoints;
             let worldPos = worldPosOriginal;
             const enabledElement = getEnabledElement(element);
-            const { viewport, renderingEngine } = enabledElement;
+            const { viewport } = enabledElement;
             const controlPoints = this.editData.currentPath.getControlPoints();
             let closePath = controlPoints.length >= 2 && doubleClick;
             this.doneEditMemo();
@@ -200,6 +196,9 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
             annotation.invalidated = true;
             triggerAnnotationRenderForViewportIds(viewportIdsToRender);
             if (this.editData.closed) {
+                if (closePath) {
+                    annotation.data.isOpenUShapeContour = 'lineSegment';
+                }
                 this.updateAnnotation(this.editData.confirmedPath);
                 this._endCallback(evt);
             }
@@ -208,7 +207,6 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
         this._mouseMoveCallback = (evt) => {
             const { element, currentPoints } = evt.detail;
             const { world: worldPos, canvas: canvasPos } = currentPoints;
-            const { renderingEngine } = getEnabledElement(element);
             const viewportIdsToRender = getViewportIdsWithToolToRender(element, this.getToolName());
             this.editData.lastCanvasPoint = canvasPos;
             const { width: imgWidth, height: imgHeight } = this.scissors;
@@ -254,8 +252,6 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
                 this.editHandle(worldPos, element, annotation, handleIndex);
             }
             this.editData.hasMoved = true;
-            const enabledElement = getEnabledElement(element);
-            const { renderingEngine } = enabledElement;
             triggerAnnotationRenderForViewportIds(viewportIdsToRender);
         };
         this.cancel = (element) => {
@@ -315,7 +311,7 @@ class LivewireContourTool extends ContourSegmentationBaseTool {
                 return;
             }
             const enabledElement = getEnabledElement(element);
-            const { viewport, renderingEngine } = enabledElement;
+            const { viewport } = enabledElement;
             const { cachedStats } = data;
             const { polyline: points } = data.contour;
             const targetIds = Object.keys(cachedStats);

package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.js

@@ -133,7 +133,7 @@ function completeDrawClosedContour(element, options) {
     }
     const { annotation, viewportIdsToRender } = this.commonData;
     const enabledElement = getEnabledElement(element);
-    const { viewport, renderingEngine } = enabledElement;
+    const { viewport } = enabledElement;
     addCanvasPointsToArray(element, canvasPoints, canvasPoints[0], this.commonData);
     canvasPoints.pop();
     const updatedPoints = shouldSmooth(this.configuration, annotation)
@@ -179,7 +179,7 @@ function completeDrawOpenContour(element, options) {
     }
     const { annotation, viewportIdsToRender } = this.commonData;
     const enabledElement = getEnabledElement(element);
-    const { viewport, renderingEngine } = enabledElement;
+    const { viewport } = enabledElement;
     const updatedPoints = shouldSmooth(this.configuration, annotation)
         ? getInterpolatedPoints(this.configuration, canvasPoints)
         : canvasPoints;
@@ -193,7 +193,8 @@ function completeDrawOpenContour(element, options) {
         worldPoints[0],
         worldPoints[worldPoints.length - 1],
     ];
-    if (annotation.data.isOpenUShapeContour) {
+    if (annotation.data.isOpenUShapeContour === true ||
+        annotation.data.isOpenUShapeContour === 'farthestT') {
         annotation.data.openUShapeContourVectorToPeak =
             findOpenUShapedContourVectorToPeak(canvasPoints, viewport);
     }
@@ -261,8 +262,6 @@ function haltDrawing(element, canvasPoints) {
     const { subPixelResolution } = this.configuration;
     if (shouldHaltDrawing(canvasPoints, subPixelResolution)) {
         const { annotation, viewportIdsToRender } = this.commonData;
-        const enabledElement = getEnabledElement(element);
-        const { renderingEngine } = enabledElement;
         removeAnnotation(annotation.annotationUID);
         this.isDrawing = false;
         this.drawData = undefined;

package/dist/esm/types/AnnotationTypes.d.ts

@@ -11,6 +11,7 @@ export type AnnotationData = {
     cachedStats?: Record<string, unknown>;
     label?: string;
     contour?: Contour;
+    isOpenUShapeContour?: boolean | 'farthestT' | 'lineSegment' | 'orthogonalT';
     [key: string]: unknown;
 };
 export type Annotation = {

package/dist/esm/types/ToolSpecificAnnotationTypes.d.ts

@@ -311,7 +311,7 @@ export interface CircleROIStartEndThresholdAnnotation extends Annotation {
 export type PlanarFreehandROIAnnotation = ContourAnnotation & {
     data: {
         label?: string;
-        isOpenUShapeContour?: boolean;
+        isOpenUShapeContour?: boolean | 'lineSegment' | 'orthogonalT';
         openUShapeContourVectorToPeak?: Types.Point3[];
         cachedStats?: ROICachedStats;
     };

package/dist/esm/utilities/contours/interpolation/interpolate.js

@@ -63,6 +63,7 @@ function _linearlyInterpolateBetween(indices, annotationPair, interpolationData,
     const annotation1 = interpolationData.get(annotationPair[1])[0];
     const c1 = _generateClosedContour(annotation0.data.contour.polyline);
     const c2 = _generateClosedContour(annotation1.data.contour.polyline);
+    console.warn('annotation0=', annotation0);
     const { c1Interp, c2Interp } = _generateInterpolationContourPair(c1, c2);
     c1Interp.kIndex = annotationPair[0];
     c2Interp.kIndex = annotationPair[1];
@@ -70,15 +71,6 @@ function _linearlyInterpolateBetween(indices, annotationPair, interpolationData,
         _linearlyInterpolateContour(c1Interp, c2Interp, index, annotationPair, interpolationData, c1.x.length > c2.x.length, eventData);
     });
 }
-function getPointCount(pointArray) {
-    let sum = 0;
-    for (let i = 0; i < pointArray.I.length; i++) {
-        if (pointArray.I[i]) {
-            sum++;
-        }
-    }
-    return sum;
-}
 function _linearlyInterpolateContour(c1Interp, c2Interp, sliceIndex, annotationPair, interpolationData, c1HasMoreNodes, eventData) {
     const [startIndex, endIndex] = annotationPair;
     const zInterp = (sliceIndex - startIndex) / (endIndex - startIndex);
@@ -86,7 +78,10 @@ function _linearlyInterpolateContour(c1Interp, c2Interp, sliceIndex, annotationP
     const annotation1 = interpolationData.get(endIndex)[0];
     const interpolated3DPoints = _generateInterpolatedOpenContour(c1Interp, c2Interp, zInterp, c1HasMoreNodes);
     const nearestAnnotation = zInterp > 0.5 ? annotation1 : annotation0;
-    const handlePoints = selectHandles(interpolated3DPoints);
+    const isOpenUShapeContour = nearestAnnotation.data.isOpenUShapeContour;
+    const handlePoints = selectHandles(interpolated3DPoints, {
+        isOpenUShapeContour,
+    });
     if (interpolationData.has(sliceIndex)) {
         _editInterpolatedContour(interpolated3DPoints, handlePoints, sliceIndex, nearestAnnotation, eventData);
     }

package/dist/esm/utilities/contours/interpolation/selectHandles.d.ts

@@ -1,4 +1,8 @@
 import type { PointsArray3 } from './interpolate';
-export default function selectHandles(polyline: PointsArray3, handleCount?: number): PointsArray3;
+export interface SelectHandlesOptions {
+    handleCount?: number;
+    isOpenUShapeContour?: boolean;
+}
+export default function selectHandles(polyline: PointsArray3, options?: SelectHandlesOptions): PointsArray3;
 export declare function createDotValues(polyline: PointsArray3, distance?: number): Float32Array;
 export declare function addInterval(indices: any, start: any, finish: any, interval: any, length: any): any;

package/dist/esm/utilities/contours/interpolation/selectHandles.js

@@ -1,12 +1,18 @@
 import { vec3 } from 'gl-matrix';
 import { utilities } from '@cornerstonejs/core';
 const { PointsManager } = utilities;
-export default function selectHandles(polyline, handleCount = 12) {
+export default function selectHandles(polyline, options = {}) {
+    const { handleCount = 12, isOpenUShapeContour } = options;
     const handles = PointsManager.create3(handleCount);
     handles.sources = [];
     const { sources: destPoints } = handles;
     const { length, sources: sourcePoints = [] } = polyline;
     const distance = 5;
+    if (isOpenUShapeContour) {
+        const handles = polyline.subselect(handleCount);
+        handles.push(polyline.getPoint(polyline.length - 1));
+        return handles;
+    }
     if (length < distance * 3) {
         return polyline.subselect(handleCount);
     }

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.15.10";
+export declare const version = "4.15.11";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.15.10';
+export const version = '4.15.11';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.15.10",
+  "version": "4.15.11",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.15.10",
+    "@cornerstonejs/core": "4.15.11",
     "@kitware/vtk.js": "34.15.1",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "e86eb206088373c38b7a6d0e9c91bf39250e1eea"
+  "gitHead": "6b73b3890a2f0501ab1dfb2db1aef1206224560c"
 }