@cornerstonejs/tools 3.14.3 → 3.15.0

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

@@ -1,4 +1,4 @@
-import { CONSTANTS, getEnabledElement, VolumeViewport, utilities as csUtils, } from '@cornerstonejs/core';
+import { CONSTANTS, getEnabledElement, VolumeViewport, utilities as csUtils, metaData, } from '@cornerstonejs/core';
 import { vec3 } from 'gl-matrix';
 import { getCalibratedLengthUnitsAndScale } from '../../utilities/getCalibratedUnits';
 import * as math from '../../utilities/math';
@@ -260,7 +260,30 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool {
     filterAnnotationsWithinSlice(annotations, camera, spacingInNormalDirection) {
         const { viewPlaneNormal } = camera;
         const annotationsWithParallelNormals = annotations.filter((td) => {
-            const annotationViewPlaneNormal = td.metadata.viewPlaneNormal;
+            let annotationViewPlaneNormal = td.metadata.viewPlaneNormal;
+            if (!td.metadata.referencedImageId &&
+                !annotationViewPlaneNormal &&
+                td.metadata.FrameOfReferenceUID) {
+                for (const point of td.data.contour.polyline) {
+                    const vector = vec3.sub(vec3.create(), point, camera.focalPoint);
+                    const dotProduct = vec3.dot(vector, camera.viewPlaneNormal);
+                    if (!csUtils.isEqual(dotProduct, 0)) {
+                        return false;
+                    }
+                }
+                td.metadata.viewPlaneNormal = camera.viewPlaneNormal;
+                td.metadata.cameraFocalPoint = camera.focalPoint;
+                return true;
+            }
+            if (!annotationViewPlaneNormal) {
+                const { referencedImageId } = td.metadata;
+                const { imageOrientationPatient } = metaData.get('imagePlaneModule', referencedImageId);
+                const rowCosineVec = vec3.fromValues(imageOrientationPatient[0], imageOrientationPatient[1], imageOrientationPatient[2]);
+                const colCosineVec = vec3.fromValues(imageOrientationPatient[3], imageOrientationPatient[4], imageOrientationPatient[5]);
+                annotationViewPlaneNormal = vec3.create();
+                vec3.cross(annotationViewPlaneNormal, rowCosineVec, colCosineVec);
+                td.metadata.viewPlaneNormal = annotationViewPlaneNormal;
+            }
             const isParallel = Math.abs(vec3.dot(viewPlaneNormal, annotationViewPlaneNormal)) >
                 PARALLEL_THRESHOLD;
             return annotationViewPlaneNormal && isParallel;

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

@@ -45,6 +45,11 @@ declare abstract class AnnotationTool extends AnnotationDisplayTool {
             handles?: import("../../types/AnnotationTypes").Handles;
             cachedStats?: Record<string, unknown>;
             label?: string;
+            contour?: {
+                polyline?: Types.Point3[];
+                pointsManager?: Types.IPointsManager<Types.Point3>;
+                closed?: boolean;
+            };
         };
         deleting: boolean;
     };

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

@@ -20,8 +20,14 @@ type Annotation = {
         [key: string]: unknown;
         cachedStats?: Record<string, unknown>;
         label?: string;
+        contour?: Contour;
     };
 };
+type Contour = {
+    polyline?: Types.Point3[];
+    pointsManager?: Types.IPointsManager<Types.Point3>;
+    closed?: boolean;
+};
 type Annotations = Array<Annotation>;
 type GroupSpecificAnnotations = {
     [toolName: string]: Annotations;

package/dist/esm/utilities/planar/filterAnnotationsWithinSlice.js

@@ -1,11 +1,26 @@
 import { vec3 } from 'gl-matrix';
-import { CONSTANTS, metaData } from '@cornerstonejs/core';
+import { CONSTANTS, metaData, utilities } from '@cornerstonejs/core';
+const { isEqual } = utilities;
 const { EPSILON } = CONSTANTS;
 const PARALLEL_THRESHOLD = 1 - EPSILON;
 export default function filterAnnotationsWithinSlice(annotations, camera, spacingInNormalDirection) {
     const { viewPlaneNormal } = camera;
     const annotationsWithParallelNormals = annotations.filter((td) => {
         let annotationViewPlaneNormal = td.metadata.viewPlaneNormal;
+        if (!td.metadata.referencedImageId &&
+            !annotationViewPlaneNormal &&
+            td.metadata.FrameOfReferenceUID) {
+            for (const point of td.data.handles.points) {
+                const vector = vec3.sub(vec3.create(), point, camera.focalPoint);
+                const dotProduct = vec3.dot(vector, camera.viewPlaneNormal);
+                if (!isEqual(dotProduct, 0)) {
+                    return false;
+                }
+            }
+            td.metadata.viewPlaneNormal = camera.viewPlaneNormal;
+            td.metadata.cameraFocalPoint = camera.focalPoint;
+            return true;
+        }
         if (!annotationViewPlaneNormal) {
             const { referencedImageId } = td.metadata;
             const { imageOrientationPatient } = metaData.get('imagePlaneModule', referencedImageId);

package/dist/esm/utilities/segmentation/VolumetricCalculator.js

@@ -44,7 +44,7 @@ function volumetricGetStatistics(state, stats, options) {
         calibration,
         hasPixelSpacing: true,
     }, []);
-    const volumeScale = spacing ? spacing[0] * spacing[1] * spacing[2] * 1000 : 1;
+    const volumeScale = spacing ? spacing[0] * spacing[1] * spacing[2] : 1;
     stats.volume = {
         value: Array.isArray(stats.count.value)
             ? stats.count.value.map((v) => v * volumeScale)

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.14.3";
+export declare const version = "3.15.0";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '3.14.3';
+export const version = '3.15.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.14.3",
+  "version": "3.15.0",
   "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.14.3",
+    "@cornerstonejs/core": "^3.15.0",
     "@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": "902ff8c03f0bb19963532fcf6286155ecbdd2d98"
+  "gitHead": "77edfa9761d0f7dcf841386dd453dca9fbc83ca9"
 }