@cornerstonejs/tools 1.54.0 → 1.54.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.54.0",
+  "version": "1.54.2",
   "description": "Cornerstone3D Tools",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -29,7 +29,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.54.0",
+    "@cornerstonejs/core": "^1.54.2",
     "@icr/polyseg-wasm": "0.4.0",
     "comlink": "^4.4.1",
     "lodash.clonedeep": "4.5.0",
@@ -55,5 +55,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "71b0b6f0035decbe7101f09fb45f6b1ff9bd6eac"
+  "gitHead": "6e3d8ea3d2aa05751ca8dcba38716d65324cc5f4"
 }

package/src/tools/SegmentationIntersectionTool.ts

@@ -5,7 +5,7 @@ import {
   addAnnotation,
   getAnnotations,
 } from '../stateManagement/annotation/annotationState';
-import { drawPolyline } from '../drawingSvg';
+import { drawPath } from '../drawingSvg';
 import { getToolGroup } from '../store/ToolGroupManager';
 import triggerAnnotationRenderForViewportIds from '../utilities/triggerAnnotationRenderForViewportIds';
 import { PublicToolProps, ToolProps, SVGDrawingHelper } from '../types';
@@ -147,10 +147,11 @@ class SegmentationIntersectionTool extends AnnotationDisplayTool {
           fillColor: color,
           fillOpacity: this.configuration.opacity,
           closePath: true,
+          lineWidth: 2,
         };
 
         const polyLineUID = actorEntry.uid + '#' + polyLineIdx;
-        drawPolyline(
+        drawPath(
           svgDrawingHelper,
           annotationUID,
           polyLineUID,

package/src/tools/displayTools/Surface/addOrUpdateSurfaceToElement.ts

@@ -105,6 +105,9 @@ function addOrUpdateSurfaceToElement(
     const filteredData = clippingFilter.getOutputData();
     mapper.setInputData(filteredData);
 
+    // @ts-ignore
+    const viewportPlanes = viewport.getClippingPlanesForActor?.();
+
     const evt = {
       detail: {
         actorEntry: {
@@ -114,9 +117,7 @@ function addOrUpdateSurfaceToElement(
           clippingFilter,
           uid: actorUID,
         },
-        // @ts-ignore
-        vtkPlanes: viewport.getClippingPlanesForActor?.(),
-        viewport,
+        vtkPlanes: viewportPlanes,
       },
     };
 
@@ -147,6 +148,7 @@ function addOrUpdateSurfaceToElement(
   });
 
   viewport.resetCamera();
+  viewport.render();
 
   setTimeout(() => {
     viewport.getRenderer().resetCameraClippingRange();
@@ -158,7 +160,7 @@ function addOrUpdateSurfaceToElement(
  */
 function updateSurfacePlanes(evt) {
   const { actorEntry, vtkPlanes, viewport } = evt.detail;
-  if (!actorEntry?.clippingFilter) {
+  if (!actorEntry?.clippingFilter || vtkPlanes.length === 0) {
     return;
   }
   const sliceIndex = viewport.getSliceIndex();

package/src/tools/displayTools/Surface/surfaceDisplay.ts

@@ -5,11 +5,11 @@ import {
   getEnabledElementByIds,
   Types,
   Enums,
-  VolumeViewport,
   getWebWorkerManager,
   eventTarget,
   triggerEvent,
   utilities,
+  VolumeViewport3D,
 } from '@cornerstonejs/core';
 
 import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
@@ -166,7 +166,7 @@ async function render(
     surfaces.push(surface);
   });
 
-  if (viewport instanceof VolumeViewport) {
+  if (!(viewport instanceof VolumeViewport3D)) {
     // const { viewPlaneNormal } = viewport.getCamera();
     // currentViewportNormal.set(surface.id, structuredClone(viewPlaneNormal));
     // if the viewport is not 3D means we should calculate
@@ -208,7 +208,7 @@ function _removeSurfaceFromToolGroupViewports(
 
 async function generateAndCacheClippedSurfaces(
   surfaces: Types.ISurface[],
-  viewport: Types.IVolumeViewport,
+  viewport: Types.IVolumeViewport | Types.IStackViewport,
   segmentationRepresentationUID: string
 ) {
   registerDisplayToolsWorker();
@@ -220,6 +220,13 @@ async function generateAndCacheClippedSurfaces(
   // @ts-ignore
   const planesInfo = viewport.getSlicesClippingPlanes?.();
 
+  if (!planesInfo) {
+    // this means it is probably the stack viewport not being ready
+    // in terms of planes which we should wait for the first render to
+    // get the planes
+    return;
+  }
+
   // @ts-ignore
   const currentSliceIndex = viewport.getSliceIndex();