@cornerstonejs/tools 4.5.0 → 4.5.2

package/dist/esm/tools/PanTool.d.ts

@@ -1,10 +1,12 @@
 import { BaseTool } from './base';
+import type { Types } from '@cornerstonejs/core';
 import type { EventTypes, PublicToolProps, ToolProps } from '../types';
 declare class PanTool extends BaseTool {
     static toolName: any;
     constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
     touchDragCallback(evt: EventTypes.InteractionEventType): void;
     mouseDragCallback(evt: EventTypes.InteractionEventType): void;
+    _checkImageInViewport(viewport: any, deltaPointsCanvas: Types.Point2): boolean;
     _dragCallback(evt: EventTypes.InteractionEventType): void;
 }
 export default PanTool;

package/dist/esm/tools/PanTool.js

@@ -1,8 +1,11 @@
 import { BaseTool } from './base';
-import { getEnabledElement } from '@cornerstonejs/core';
+import { getEnabledElement, utilities as csUtils } from '@cornerstonejs/core';
 class PanTool extends BaseTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
+        configuration: {
+            limitToViewport: false,
+        },
     }) {
         super(toolProps, defaultToolProps);
     }
@@ -12,17 +15,77 @@ class PanTool extends BaseTool {
     mouseDragCallback(evt) {
         this._dragCallback(evt);
     }
+    _checkImageInViewport(viewport, deltaPointsCanvas) {
+        const { canvas } = viewport;
+        const ratio = window.devicePixelRatio;
+        const viewportLeft = 0;
+        const viewportRight = canvas.width / ratio;
+        const viewportTop = 0;
+        const viewportBottom = canvas.height / ratio;
+        const defaultActor = viewport.getDefaultActor();
+        const renderer = viewport.getRenderer();
+        let bounds;
+        if (defaultActor && csUtils.isImageActor(defaultActor)) {
+            const imageData = defaultActor.actor.getMapper().getInputData();
+            bounds = imageData.getBounds();
+        }
+        else {
+            bounds = renderer.computeVisiblePropBounds();
+        }
+        const [imageLeft, imageTop] = viewport.worldToCanvas([
+            bounds[0],
+            bounds[2],
+            bounds[4],
+        ]);
+        const [imageRight, imageBottom] = viewport.worldToCanvas([
+            bounds[1],
+            bounds[3],
+            bounds[5],
+        ]);
+        const zoom = viewport.getZoom();
+        if (zoom <= 1) {
+            if ((imageLeft + deltaPointsCanvas[0] < viewportLeft &&
+                deltaPointsCanvas[0] < 0) ||
+                (imageRight + deltaPointsCanvas[0] > viewportRight &&
+                    deltaPointsCanvas[0] > 0) ||
+                (imageTop + deltaPointsCanvas[1] < viewportTop &&
+                    deltaPointsCanvas[1] < 0) ||
+                (imageBottom + deltaPointsCanvas[1] > viewportBottom &&
+                    deltaPointsCanvas[1] > 0)) {
+                return false;
+            }
+        }
+        else {
+            if ((imageLeft + deltaPointsCanvas[0] > viewportLeft &&
+                deltaPointsCanvas[0] > 0) ||
+                (imageRight + deltaPointsCanvas[0] < viewportRight &&
+                    deltaPointsCanvas[0] < 0) ||
+                (imageTop + deltaPointsCanvas[1] > viewportTop &&
+                    deltaPointsCanvas[1] > 0) ||
+                (imageBottom + deltaPointsCanvas[1] < viewportBottom &&
+                    deltaPointsCanvas[1] < 0)) {
+                return false;
+            }
+        }
+        return true;
+    }
     _dragCallback(evt) {
         const { element, deltaPoints } = evt.detail;
         const enabledElement = getEnabledElement(element);
         const deltaPointsWorld = deltaPoints.world;
+        const deltaPointsCanvas = deltaPoints.canvas;
         if (deltaPointsWorld[0] === 0 &&
             deltaPointsWorld[1] === 0 &&
             deltaPointsWorld[2] === 0) {
             return;
         }
-        const camera = enabledElement.viewport.getCamera();
+        const viewport = enabledElement.viewport;
+        const camera = viewport.getCamera();
         const { focalPoint, position } = camera;
+        if (this.configuration.limitToViewport &&
+            !this._checkImageInViewport(viewport, deltaPointsCanvas)) {
+            return;
+        }
         const updatedPosition = [
             position[0] - deltaPointsWorld[0],
             position[1] - deltaPointsWorld[1],
@@ -33,11 +96,11 @@ class PanTool extends BaseTool {
             focalPoint[1] - deltaPointsWorld[1],
             focalPoint[2] - deltaPointsWorld[2],
         ];
-        enabledElement.viewport.setCamera({
+        viewport.setCamera({
             focalPoint: updatedFocalPoint,
             position: updatedPosition,
         });
-        enabledElement.viewport.render();
+        viewport.render();
     }
 }
 PanTool.toolName = 'Pan';

package/dist/esm/utilities/contourSegmentation/logicalOperators.js

@@ -69,14 +69,21 @@ function addSegmentInSegmentation(segmentation, { segmentIndex, label, color })
     if (!segmentation?.segments) {
         return;
     }
-    segmentation.segments[segmentIndex] = {
+    const segmentData = segmentation.segments[segmentIndex] ?? {
         active: false,
         locked: false,
-        label,
         segmentIndex,
         cachedStats: {},
+        label,
         color,
     };
+    if (label !== undefined) {
+        segmentData.label = label;
+    }
+    if (color !== undefined) {
+        segmentData.color = color;
+    }
+    segmentation.segments[segmentIndex] = segmentData;
 }
 function removeAnnotations(annotationUIDList) {
     annotationUIDList.forEach((annotationUID) => {

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.5.0";
+export declare const version = "4.5.2";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.5.0';
+export const version = '4.5.2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.5.0",
+  "version": "4.5.2",
   "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": "4.5.0",
+    "@cornerstonejs/core": "4.5.2",
     "@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": "b678e3f34fb4984c6ba94c1564e60b63ae08cd42"
+  "gitHead": "586ad50c7640afcea3e89fa3777ca7698b955ccb"
 }