@cornerstonejs/tools 1.58.2 → 1.58.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.58.2",
+  "version": "1.58.4",
   "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.58.2",
+    "@cornerstonejs/core": "^1.58.4",
     "@icr/polyseg-wasm": "0.4.0",
     "@types/offscreencanvas": "2019.7.3",
     "comlink": "^4.4.1",
@@ -59,5 +59,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "808abe92daab401511e2fbad6328281195a8e297"
+  "gitHead": "27788d9a480cf3dff59865f721cde0d158439734"
 }

package/src/utilities/contours/generateContourSetsFromLabelmap.ts

@@ -22,13 +22,6 @@ function generateContourSetsFromLabelmap({ segmentations }) {
 
   const numSlices = vol.dimensions[2];
 
-  // Get image volume segmentation references
-  const imageVol = cornerstoneCache.getVolume(vol.referencedVolumeId);
-  if (!imageVol) {
-    console.warn(`No volume found for ${vol.referencedVolumeId}`);
-    return;
-  }
-
   // NOTE: Workaround for marching squares not finding closed contours at
   // boundary of image volume, clear pixels along x-y border of volume
   const segData = vol.imageData.getPointData().getScalars().getData();
@@ -47,7 +40,7 @@ function generateContourSetsFromLabelmap({ segmentations }) {
   //
   const ContourSets = [];
 
-  const { FrameOfReferenceUID } = imageVol.metadata;
+  const { FrameOfReferenceUID } = vol.metadata;
   // Iterate through all segments in current segmentation set
   const numSegments = segments.length;
   for (let segIndex = 0; segIndex < numSegments; segIndex++) {
@@ -112,7 +105,6 @@ function generateContourSetsFromLabelmap({ segmentations }) {
           const contours = findContoursFromReducedSet(reducedSet.lines);
 
           sliceContours.push({
-            referencedImageId: imageVol.imageIds[sliceIndex],
             contours,
             polyData: reducedSet,
             FrameNumber: sliceIndex + 1,
@@ -127,7 +119,6 @@ function generateContourSetsFromLabelmap({ segmentations }) {
     }
 
     const metadata = {
-      referencedImageId: imageVol.imageIds[0], // just use 0 for overall
       FrameOfReferenceUID,
     };
 

package/src/utilities/contours/interpolation/selectHandles.ts

@@ -137,8 +137,7 @@ function findMinimumRegions(dotValues, handleCount) {
   const { length } = dotValues;
   // Fallback for very uniform ojects.
   if (deviation < 0.01 || length < handleCount * 3) {
-    // TODO - create handleCount evenly spaced handles
-    return [0, Math.floor(length / 3), Math.floor((length * 2) / 3)];
+    return [];
   }
 
   const inflection = [];

package/src/utilities/segmentation/createBidirectionalToolData.ts

@@ -10,7 +10,7 @@ export type BidirectionalData = {
   label?: string;
   color?: string | number[];
   referencedImageId: string;
-  FrameOfReferenceUID: string;
+  sliceIndex: number;
 };
 
 /**
@@ -21,27 +21,19 @@ export default function createBidirectionalToolData(
   bidirectionalData: BidirectionalData,
   viewport
 ): Annotation {
-  const {
-    majorAxis,
-    minorAxis,
-    label = '',
-    FrameOfReferenceUID,
-    referencedImageId,
-  } = bidirectionalData;
+  const { majorAxis, minorAxis, label = '', sliceIndex } = bidirectionalData;
   const [major0, major1] = majorAxis;
   const [minor0, minor1] = minorAxis;
 
-  const { viewUp, viewPlaneNormal } = viewport.getCamera();
   const points = [major0, major1, minor0, minor1];
   const bidirectionalToolData = {
     highlighted: true,
     invalidated: true,
     metadata: {
       toolName: 'Bidirectional',
-      viewPlaneNormal,
-      viewUp,
-      FrameOfReferenceUID,
-      referencedImageId,
+      // Get a view reference for the slice this applies to, not the currently
+      // displayed slice.  This will fill in the remaining data for that slice
+      ...viewport.getViewReference({ sliceIndex }),
     },
     data: {
       handles: {

package/src/utilities/segmentation/segmentContourAction.ts

@@ -125,15 +125,12 @@ export default function segmentContourAction(
   });
 
   if (newBidirectional) {
-    const { referencedImageId } = newBidirectional;
+    const { sliceIndex } = newBidirectional;
     const imageIds = enabledElement.viewport.getImageIds();
-    const imageIndex = imageIds.findIndex(
-      (imageId) => imageId === referencedImageId
-    );
 
     // TODO - figure out why this is reversed
     jumpToSlice(element, {
-      imageIndex: imageIds.length - 1 - imageIndex,
+      imageIndex: imageIds.length - 1 - sliceIndex,
     });
     enabledElement.viewport.render();
   } else {