@cornerstonejs/tools 3.12.2 → 3.13.0

package/dist/esm/config.d.ts

@@ -26,7 +26,7 @@ type PolySegAddOn = {
     computeContourData: ComputeRepresentationFn<ContourSegmentationData>;
     computeLabelmapData: ComputeRepresentationFn<LabelmapSegmentationData>;
     computeSurfaceData: ComputeRepresentationFn<SurfaceSegmentationData>;
-    updateSurfaceData: ComputeRepresentationFn<SurfaceSegmentationData>;
+    updateSurfaceData: ComputeRepresentationFn<void>;
     clipAndCacheSurfacesForViewport: (surfacesInfo: SurfacesInfo[], viewport: Types.IVolumeViewport) => Promise<Map<number, Map<string, SurfaceClipResult>>>;
     extractContourData: (polyDataCache: Map<number, Map<string, SurfaceClipResult>>) => Map<number, SurfaceClipResult[]>;
     createAndAddContourSegmentationsFromClippedSurfaces: (rawContourData: Map<number, SurfaceClipResult[]>, viewport: Types.IStackViewport | Types.IVolumeViewport, segmentationId: string) => Map<number, Set<string>>;

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

@@ -1,11 +1,12 @@
 type PlayClipOptions = {
     framesPerSecond?: number;
     frameTimeVector?: number[];
+    frameTimeVectorSpeedMultiplier?: number;
     reverse?: boolean;
     loop?: boolean;
     dynamicCineEnabled?: boolean;
-    frameTimeVectorSpeedMultiplier?: number;
     waitForRendered?: number;
+    bounce?: boolean;
 };
 interface ToolData {
     intervalId: number | undefined;
@@ -17,6 +18,7 @@ interface ToolData {
     speed: number;
     reverse: boolean;
     loop: boolean;
+    bounce: boolean;
     dynamicCineEnabled?: boolean;
 }
 type CinePlayContext = {

package/dist/esm/utilities/cine/playClip.js

@@ -39,6 +39,7 @@ function playClip(element, playClipOptions) {
             speed: playClipOptions.frameTimeVectorSpeedMultiplier ?? 1,
             reverse: playClipOptions.reverse ?? false,
             loop: playClipOptions.loop ?? true,
+            bounce: playClipOptions.bounce ?? false,
         };
         addToolState(element, playClipData);
     }
@@ -63,24 +64,30 @@ function playClip(element, playClipOptions) {
         playClipTimeouts = timeouts;
         playClipIsTimeVarying = isTimeVarying;
     }
+    if (playClipOptions.bounce !== undefined) {
+        playClipData.bounce = playClipOptions.bounce;
+    }
     const playClipAction = () => {
         const { numScrollSteps, currentStepIndex } = playClipContext;
         let newStepIndex = currentStepIndex + (playClipData.reverse ? -1 : 1);
-        const newStepIndexOutOfRange = newStepIndex < 0 || newStepIndex >= numScrollSteps;
-        if (!playClipData.loop && newStepIndexOutOfRange) {
-            _stopClip(element, {
-                stopDynamicCine: !isDynamicCinePlaying,
-                viewportId: viewport.id,
-            });
-            const eventDetail = { element };
-            triggerEvent(element, CINE_EVENTS.CLIP_STOPPED, eventDetail);
-            return;
-        }
-        if (newStepIndex >= numScrollSteps) {
-            newStepIndex = 0;
-        }
-        else if (newStepIndex < 0) {
-            newStepIndex = numScrollSteps - 1;
+        const outOfRange = newStepIndex < 0 || newStepIndex >= numScrollSteps;
+        if (outOfRange) {
+            if (playClipData.bounce) {
+                playClipData.reverse = !playClipData.reverse;
+                newStepIndex = currentStepIndex + (playClipData.reverse ? -1 : 1);
+                newStepIndex = Math.max(0, Math.min(numScrollSteps - 1, newStepIndex));
+            }
+            else if (!playClipData.loop) {
+                _stopClip(element, {
+                    stopDynamicCine: !isDynamicCinePlaying,
+                    viewportId: viewport.id,
+                });
+                triggerEvent(element, CINE_EVENTS.CLIP_STOPPED, { element });
+                return;
+            }
+            else {
+                newStepIndex = playClipData.reverse ? numScrollSteps - 1 : 0;
+            }
         }
         const delta = newStepIndex - currentStepIndex;
         if (delta) {
@@ -90,8 +97,7 @@ function playClip(element, playClipOptions) {
             catch (e) {
                 console.warn('Play clip not scrolling', e);
                 _stopClipWithData(playClipData);
-                triggerEvent(element, CINE_EVENTS.CLIP_STOPPED, eventDetail);
-                return;
+                triggerEvent(element, CINE_EVENTS.CLIP_STOPPED, { element });
             }
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "3.12.2",
+  "version": "3.13.0",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -103,7 +103,7 @@
     "canvas": "^3.1.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^3.12.2",
+    "@cornerstonejs/core": "^3.13.0",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -122,5 +122,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "2e252505eafa22440251b1f41489a1d6803e5e97"
+  "gitHead": "f576d5b54b208a44403faa2cde957f4a98be4fd1"
 }