@cornerstonejs/tools 4.11.2 → 4.11.3

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

@@ -4,6 +4,7 @@ import { LivewirePath } from '../../utilities/livewire/LiveWirePath';
 import { triggerAnnotationModified } from '../../stateManagement/annotation/helpers/state';
 import { ChangeTypes } from '../../enums';
 import { drawPolyline as drawPolylineSvg } from '../../drawingSvg';
+import AnnotationToPointData from '../../utilities/contours/AnnotationToPointData';
 class LivewireContourSegmentationTool extends LivewireContourTool {
     static { this.toolName = 'LivewireContourSegmentationTool'; }
     updateInterpolatedAnnotation(annotation, enabledElement) {
@@ -85,5 +86,8 @@ class LivewireContourSegmentationTool extends LivewireContourTool {
     isContourSegmentationTool() {
         return true;
     }
+    static {
+        AnnotationToPointData.register(this);
+    }
 }
 export default LivewireContourSegmentationTool;

package/dist/esm/tools/annotation/PlanarFreehandContourSegmentationTool.d.ts

@@ -1,6 +1,6 @@
 import type { AnnotationRenderContext, PublicToolProps } from '../../types';
 import PlanarFreehandROITool from './PlanarFreehandROITool';
-declare class PlanarFreehandContourSegmentationTool extends PlanarFreehandROITool {
+export declare class PlanarFreehandContourSegmentationTool extends PlanarFreehandROITool {
     static toolName: string;
     constructor(toolProps: PublicToolProps);
     protected isContourSegmentationTool(): boolean;

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

@@ -1,7 +1,8 @@
 import { utilities } from '@cornerstonejs/core';
 import { triggerSegmentationDataModified } from '../../stateManagement/segmentation/triggerSegmentationEvents';
 import PlanarFreehandROITool from './PlanarFreehandROITool';
-class PlanarFreehandContourSegmentationTool extends PlanarFreehandROITool {
+import AnnotationToPointData from '../../utilities/contours/AnnotationToPointData';
+export class PlanarFreehandContourSegmentationTool extends PlanarFreehandROITool {
     static { this.toolName = 'PlanarFreehandContourSegmentationTool'; }
     constructor(toolProps) {
         const initialProps = utilities.deepMerge({
@@ -12,6 +13,9 @@ class PlanarFreehandContourSegmentationTool extends PlanarFreehandROITool {
         }, toolProps);
         super(initialProps);
     }
+    static {
+        AnnotationToPointData.register(this);
+    }
     isContourSegmentationTool() {
         return true;
     }

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

@@ -1,4 +1,3 @@
-import { AnnotationTool } from '../base';
 import { CONSTANTS, getEnabledElement, VolumeViewport, utilities as csUtils, metaData, } from '@cornerstonejs/core';
 import { vec3 } from 'gl-matrix';
 import { getCalibratedLengthUnitsAndScale } from '../../utilities/getCalibratedUnits';

package/dist/esm/tools/base/ContourBaseTool.d.ts

@@ -4,6 +4,12 @@ import AnnotationTool from './AnnotationTool';
 import type { ContourWindingDirection } from '../../types/ContourAnnotation';
 declare abstract class ContourBaseTool extends AnnotationTool {
     constructor(toolProps: PublicToolProps, defaultToolProps: ToolProps);
+    static getContourSequence(toolData: any, metadataProvider: any): {
+        NumberOfContourPoints: number;
+        ContourImageSequence: any;
+        ContourGeometricType: string;
+        ContourData: any[];
+    };
     renderAnnotation(enabledElement: Types.IEnabledElement, svgDrawingHelper: SVGDrawingHelper): boolean;
     protected createAnnotation(evt: EventTypes.InteractionEventType): ContourAnnotation;
     protected addAnnotation(annotation: Annotation, element: HTMLDivElement): string;

package/dist/esm/tools/base/ContourBaseTool.js

@@ -1,4 +1,3 @@
-import { getEnabledElement } from '@cornerstonejs/core';
 import { addAnnotation, getAnnotations, getChildAnnotations, } from '../../stateManagement/annotation/annotationState';
 import { drawPath as drawPathSvg } from '../../drawingSvg';
 import AnnotationTool from './AnnotationTool';
@@ -8,6 +7,23 @@ class ContourBaseTool extends AnnotationTool {
     constructor(toolProps, defaultToolProps) {
         super(toolProps, defaultToolProps);
     }
+    static getContourSequence(toolData, metadataProvider) {
+        const { data } = toolData;
+        const ContourData = [];
+        for (const point of data.contour.polyline) {
+            for (const v of point) {
+                ContourData.push(v.toFixed(2));
+            }
+        }
+        const { referencedImageId } = toolData.metadata;
+        const ContourImageSequence = metadataProvider.get('ImageSopInstanceReference', referencedImageId);
+        return {
+            NumberOfContourPoints: ContourData.length / 3,
+            ContourImageSequence,
+            ContourGeometricType: 'CLOSED_PLANAR',
+            ContourData,
+        };
+    }
     renderAnnotation(enabledElement, svgDrawingHelper) {
         let renderStatus = false;
         const { viewport } = enabledElement;

package/dist/esm/tools/displayTools/Contour/contourDisplay.js

@@ -108,14 +108,20 @@ function _checkContourGeometryMatchViewport(geometryIds, viewportNormal) {
         return false;
     }
     const contours = geometryData.contours;
-    const points = contours[0].points;
-    const point1 = points[0];
-    const point2 = points[1];
-    const point3 = points[2];
-    let normal = vec3.cross(vec3.create(), vec3.sub(vec3.create(), point2, point1), vec3.sub(vec3.create(), point3, point1));
-    normal = vec3.normalize(vec3.create(), normal);
-    const dotProduct = vec3.dot(normal, viewportNormal);
-    return Math.abs(dotProduct) > 0.9;
+    const { points } = contours[0];
+    const [point] = points;
+    const delta = vec3.create();
+    const { length } = points;
+    const increment = Math.ceil(length / 25);
+    for (let i = 1; i < length; i += increment) {
+        const point2 = points[i];
+        vec3.sub(delta, point, point2);
+        vec3.normalize(delta, delta);
+        if (vec3.dot(viewportNormal, delta) > 0.1) {
+            return false;
+        }
+    }
+    return true;
 }
 function _checkContourNormalsMatchViewport(annotationUIDsMap, viewportNormal) {
     const annotationUIDs = Array.from(annotationUIDsMap.values())

package/dist/esm/utilities/contours/AnnotationToPointData.d.ts

@@ -1,10 +1,20 @@
+import type { Types } from '@cornerstonejs/core';
+type ContourSequence = {
+    NumberOfContourPoints: number;
+    ContourImageSequence: Types.NormalModule[];
+    ContourGeometricType: string;
+    ContourData: string[];
+};
+type ContourSequenceProvider = {
+    getContourSequence: (annotation: any, metadataProvider: any) => ContourSequence | ContourSequence[];
+};
 declare class AnnotationToPointData {
-    static TOOL_NAMES: Record<string, unknown>;
+    static TOOL_NAMES: Record<string, ContourSequenceProvider>;
     constructor();
-    static convert(annotation: any, index: any, metadataProvider: any): {
+    static convert(annotation: any, segment: any, metadataProvider: any): {
         ReferencedROINumber: any;
-        ROIDisplayColor: number[];
-        ContourSequence: any;
+        ROIDisplayColor: any;
+        ContourSequence: ContourSequence[];
     };
     static register(toolClass: any): void;
 }

package/dist/esm/utilities/contours/AnnotationToPointData.js

@@ -3,7 +3,7 @@ function validateAnnotation(annotation) {
     if (!annotation?.data) {
         throw new Error('Tool data is empty');
     }
-    if (!annotation.metadata || annotation.metadata.referencedImageId) {
+    if (!annotation.metadata || !annotation.metadata.referencedImageId) {
         throw new Error('Tool data is not associated with any imageId');
     }
 }
@@ -11,23 +11,25 @@ class AnnotationToPointData {
     static { this.TOOL_NAMES = {}; }
     constructor() {
     }
-    static convert(annotation, index, metadataProvider) {
+    static convert(annotation, segment, metadataProvider) {
         validateAnnotation(annotation);
         const { toolName } = annotation.metadata;
         const toolClass = AnnotationToPointData.TOOL_NAMES[toolName];
         if (!toolClass) {
             throw new Error(`Unknown tool type: ${toolName}, cannot convert to RTSSReport`);
         }
-        const ContourSequence = toolClass.getContourSequence(annotation, metadataProvider);
-        const color = [
+        const contourSequence = toolClass.getContourSequence(annotation, metadataProvider);
+        const color = segment.color?.slice(0, 3) || [
             Math.floor(Math.random() * 255),
             Math.floor(Math.random() * 255),
             Math.floor(Math.random() * 255),
         ];
         return {
-            ReferencedROINumber: index + 1,
+            ReferencedROINumber: segment.segmentIndex,
             ROIDisplayColor: color,
-            ContourSequence,
+            ContourSequence: Array.isArray(contourSequence)
+                ? contourSequence
+                : [contourSequence],
         };
     }
     static register(toolClass) {

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.11.2";
+export declare const version = "4.11.3";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.11.2';
+export const version = '4.11.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.11.2",
+  "version": "4.11.3",
   "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.11.2",
+    "@cornerstonejs/core": "4.11.3",
     "@kitware/vtk.js": "32.12.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": "c7a497d005516256a2048ba0337153f32921ec6d"
+  "gitHead": "e7b0cea10f4ceb71710d3f01eaead75152180b7a"
 }