@cornerstonejs/adapters 1.49.2 → 1.50.1

package/dist/adapters.es.js

@@ -14272,7 +14272,7 @@ function isNumberType(value) {
 function isNumberArrayLike(value) {
   return 'length' in value && typeof value[0] === 'number';
 }
-function isEqual$1(v1, v2, tolerance = 1e-5) {
+function isEqual$2(v1, v2, tolerance = 1e-5) {
   if (typeof v1 !== typeof v2 || v1 === null || v2 === null) {
     return false;
   }
@@ -38491,7 +38491,7 @@ function isValidVolume(imageIds) {
       columns,
       rows
     } = getMetaData('imagePlaneModule', imageId);
-    return seriesInstanceUID === baseMetadata.seriesInstanceUID && modality === baseMetadata.modality && columns === baseMetadata.columns && rows === baseMetadata.rows && isEqual$1(imageOrientationPatient, baseMetadata.imageOrientationPatient) && isEqual$1(pixelSpacing, baseMetadata.pixelSpacing);
+    return seriesInstanceUID === baseMetadata.seriesInstanceUID && modality === baseMetadata.modality && columns === baseMetadata.columns && rows === baseMetadata.rows && isEqual$2(imageOrientationPatient, baseMetadata.imageOrientationPatient) && isEqual$2(pixelSpacing, baseMetadata.pixelSpacing);
   });
   return validVolume;
 }
@@ -40896,7 +40896,7 @@ class Viewport {
         cameraModifiedOutOfPlane = Math.abs(vtkMath.dot(deltaCamera, currentViewPlaneNormal)) > 0;
       }
       if (viewUp) {
-        viewUpHasChanged = !isEqual$1(currentViewUp, prevViewUp);
+        viewUpHasChanged = !isEqual$2(currentViewUp, prevViewUp);
       }
       if (cameraModifiedOutOfPlane || viewUpHasChanged || this.newActorAdded) {
         const actorEntry = this.getDefaultActor();
@@ -42266,7 +42266,7 @@ var utilities = /*#__PURE__*/Object.freeze({
   imageToWorldCoords: imageToWorldCoords,
   indexWithinDimensions: indexWithinDimensions,
   invertRgbTransferFunction: invertRgbTransferFunction,
-  isEqual: isEqual$1,
+  isEqual: isEqual$2,
   isImageActor: isImageActor,
   isOpposite: isOpposite,
   isPTPrescaledWithSUV: isPTPrescaledWithSUV$1,
@@ -45041,9 +45041,9 @@ class StackViewport extends Viewport$1 {
     const rowCosines = direction.slice(0, 3);
     const columnCosines = direction.slice(3, 6);
     const dataType = imageData.getPointData().getScalars().getDataType();
-    const isSameXSpacing = isEqual$1(xSpacing, image.columnPixelSpacing);
-    const isSameYSpacing = isEqual$1(ySpacing, image.rowPixelSpacing);
-    return (isSameXSpacing || image.columnPixelSpacing === null && xSpacing === 1.0) && (isSameYSpacing || image.rowPixelSpacing === null && ySpacing === 1.0) && xVoxels === image.columns && yVoxels === image.rows && isEqual$1(imagePlaneModule.rowCosines, rowCosines) && isEqual$1(imagePlaneModule.columnCosines, columnCosines) && (!this.useNativeDataType || dataType === image.getPixelData().constructor.name);
+    const isSameXSpacing = isEqual$2(xSpacing, image.columnPixelSpacing);
+    const isSameYSpacing = isEqual$2(ySpacing, image.rowPixelSpacing);
+    return (isSameXSpacing || image.columnPixelSpacing === null && xSpacing === 1.0) && (isSameYSpacing || image.rowPixelSpacing === null && ySpacing === 1.0) && xVoxels === image.columns && yVoxels === image.rows && isEqual$2(imagePlaneModule.rowCosines, rowCosines) && isEqual$2(imagePlaneModule.columnCosines, columnCosines) && (!this.useNativeDataType || dataType === image.getPixelData().constructor.name);
   }
   _updateVTKImageDataFromCornerstoneImage(image) {
     const imagePlaneModule = this._getImagePlaneModule(image.imageId);
@@ -47407,7 +47407,7 @@ let state = {
 };
 
 const {
-  isEqual
+  isEqual: isEqual$1
 } = utilities;
 function getViewportForAnnotation(annotation) {
   const {
@@ -47420,7 +47420,7 @@ function getViewportForAnnotation(annotation) {
         viewPlaneNormal,
         viewUp
       } = viewport.getCamera();
-      return isEqual(viewPlaneNormal, metadata.viewPlaneNormal) && (!metadata.viewUp || isEqual(viewUp, metadata.viewUp));
+      return isEqual$1(viewPlaneNormal, metadata.viewPlaneNormal) && (!metadata.viewUp || isEqual$1(viewUp, metadata.viewUp));
     }
     return;
   });
@@ -48502,7 +48502,7 @@ function _linearlyInterpolateContour(c1Interp, c2Interp, sliceIndex, annotationP
   const zInterp = (sliceIndex - startIndex) / (endIndex - startIndex);
   const interpolated3DPoints = _generateInterpolatedOpenContour(c1Interp, c2Interp, zInterp, c1HasMoreNodes);
   const nearestAnnotation = interpolationData.get(annotationPair[zInterp > 0.5 ? 1 : 0])[0];
-  const handleCount = Math.round(Math.max(8, interpolationData.get(startIndex)[0].data.handles.points.length * 2, interpolationData.get(endIndex)[0].data.handles.points.length * 2));
+  const handleCount = Math.round(Math.max(8, interpolationData.get(startIndex)[0].data.handles.points.length, interpolationData.get(endIndex)[0].data.handles.points.length, interpolated3DPoints.x.length / 50));
   const handlePoints = _subselect(interpolated3DPoints, handleCount);
   if (interpolationData.has(sliceIndex)) {
     _editInterpolatedContour(interpolated3DPoints, handlePoints, sliceIndex, nearestAnnotation, eventData);
@@ -48933,6 +48933,7 @@ class InterpolationManager {
         console.warn('Unable to find matching viewport for annotation interpolation', annotation);
         return;
       }
+      annotation.autoGenerated = false;
       const sliceData = getSliceData(viewport);
       const viewportData = {
         viewport,
@@ -48989,12 +48990,51 @@ var index$1 = /*#__PURE__*/Object.freeze({
   InterpolationManager: InterpolationManager
 });
 
+const {
+  isEqual
+} = utilities;
+function findHandlePolylineIndex(annotation, handleIndex) {
+  const {
+    polyline
+  } = annotation.data.contour;
+  const {
+    points
+  } = annotation.data.handles;
+  const {
+    length
+  } = points;
+  if (handleIndex === length) {
+    return polyline.length;
+  }
+  if (handleIndex < 0) {
+    handleIndex = (handleIndex + length) % length;
+  }
+  if (handleIndex === 0) {
+    return 0;
+  }
+  const handle = points[handleIndex];
+  const index = polyline.findIndex(point => isEqual(handle, point));
+  if (index !== -1) {
+    return index;
+  }
+  let closestDistance = Infinity;
+  return polyline.reduce((closestIndex, point, testIndex) => {
+    const distance = vec3.squaredDistance(point, handle);
+    if (distance < closestDistance) {
+      closestDistance = distance;
+      return testIndex;
+    }
+    return closestIndex;
+  }, -1);
+}
+
 var index = /*#__PURE__*/Object.freeze({
   __proto__: null,
   AnnotationToPointData: AnnotationToPointData$2,
   acceptAutogeneratedInterpolations: acceptAutogeneratedInterpolations,
   contourFinder: contourFinder,
   detectContourHoles: detectContourHoles,
+  findHandlePolylineIndex: findHandlePolylineIndex,
   generateContourSetsFromLabelmap: generateContourSetsFromLabelmap$2,
   interpolation: index$1,
   mergePoints: mergePoints