npm - @cornerstonejs/tools - Versions diffs - 0.18.0 → 0.19.1 - Mend

@cornerstonejs/tools 0.18.0 → 0.19.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (86) hide show

package/dist/cjs/store/ToolGroupManager/ToolGroup.d.ts CHANGED Viewed

@@ -1,4 +1,6 @@
+import type { Types } from '@cornerstonejs/core';
 import { IToolGroup, SetToolBindingsType, ToolOptionsType } from '../../types';
+import { MouseCursor } from '../../cursors';
 export default class ToolGroup implements IToolGroup {
     id: string;
     viewportsInfo: any[];
@@ -6,6 +8,7 @@ export default class ToolGroup implements IToolGroup {
     _toolInstances: {};
     constructor(id: string);
     getViewportIds(): string[];
+    getViewportsInfo(): Array<Types.IViewportId>;
     getToolInstance(toolName: string): any;
     addTool(toolName: string, configuration?: {}): void;
     addViewport(viewportId: string, renderingEngineId?: string): void;
@@ -17,6 +20,7 @@ export default class ToolGroup implements IToolGroup {
     getToolOptions(toolName: string): ToolOptionsType;
     getActivePrimaryMouseButtonTool(): string;
     setViewportsCursorByToolName(toolName: string, strategyName?: string): void;
+    _setCursorForViewports(cursor: MouseCursor): void;
     private _hasMousePrimaryButtonBinding;
     private _renderViewports;
 }

package/dist/cjs/store/ToolGroupManager/ToolGroup.js CHANGED Viewed

@@ -16,6 +16,9 @@ class ToolGroup {
     getViewportIds() {
         return this.viewportsInfo.map(({ viewportId }) => viewportId);
     }
+    getViewportsInfo() {
+        return Object.assign({}, this.viewportsInfo);
+    }
     getToolInstance(toolName) {
         const toolInstance = this._toolInstances[toolName];
         if (!toolInstance) {
@@ -103,10 +106,14 @@ class ToolGroup {
         this.toolOptions[toolName] = toolOptions;
         this._toolInstances[toolName].mode = Active;
         const runtimeSettings = core_1.Settings.getRuntimeSettings();
-        if (this._hasMousePrimaryButtonBinding(toolBindingsOptions) &&
-            runtimeSettings.get('useCursors')) {
+        const useCursor = runtimeSettings.get('useCursors');
+        if (this._hasMousePrimaryButtonBinding(toolBindingsOptions) && useCursor) {
             this.setViewportsCursorByToolName(toolName);
         }
+        else {
+            const cursor = cursors_1.MouseCursor.getDefinedCursor('default');
+            this._setCursorForViewports(cursor);
+        }
         if (typeof this._toolInstances[toolName].onSetToolActive === 'function') {
             this._toolInstances[toolName].onSetToolActive();
         }
@@ -184,11 +191,16 @@ class ToolGroup {
         if (!cursor) {
             cursor = cursors_1.MouseCursor.getDefinedCursor('default');
         }
+        this._setCursorForViewports(cursor);
+    }
+    _setCursorForViewports(cursor) {
         this.viewportsInfo.forEach(({ renderingEngineId, viewportId }) => {
-            const viewport = (0, core_1.getRenderingEngine)(renderingEngineId).getViewport(viewportId);
-            if (viewport && viewport.element) {
-                (0, elementCursor_1.initElementCursor)(viewport.element, cursor);
+            const enabledElement = (0, core_1.getEnabledElementByIds)(viewportId, renderingEngineId);
+            if (!enabledElement) {
+                return;
             }
+            const { viewport } = enabledElement;
+            (0, elementCursor_1.initElementCursor)(viewport.element, cursor);
         });
     }
     _hasMousePrimaryButtonBinding(toolOptions) {

package/dist/cjs/store/ToolGroupManager/ToolGroup.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ToolGroup.js","sourceRoot":"","sources":["../../../../src/store/ToolGroupManager/ToolGroup.ts"],"names":[],"mappings":";;AAAA,uCAAuD;AACvD,~~8CAI6B~~;~~AAC7B~~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~~IACE~~,IAAI,CAAC,6BAA6B,CAAC,mBAAmB,CAAC;~~YACvD~~,~~eAAe~~,CAAC,GAAG,CAAC,~~YAAY~~,CAAC,~~EACjC~~;~~YACA~~,IAAI,CAAC,~~4BAA4B~~,CAAC,~~QAAQ~~,CAAC,CAAC;~~SAC7C~~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~~QAC~~/D,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,GAAG,qBAAW,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;SAClD;~~QACD~~,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,iBAAiB,EAAE,UAAU,EAAE,EAAE,EAAE;YAC/D,MAAM,~~QAAQ~~,~~GACZ~~,IAAA,~~yBAAkB~~,~~EAAC~~,iBAAiB,~~CAAC~~,CAAC,~~WAAW~~,CAAC,~~UAAU~~,~~CAAC~~,~~CAAC~~;~~YAChE~~,~~IAAI~~,QAAQ,~~IAAI~~,~~QAAQ~~,CAAC~~,OAAO,EAAE~~;~~gBAChC~~,IAAA,iCAAiB,EAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;~~aAC7C;QACH~~,CAAC,CAAC,CAAC;IACL,CAAC;IAOO,6BAA6B,CAAC,WAAW;;QAC/C,OAAO,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,0CAAE,IAAI,CAChC,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,CAAC,WAAW,KAAK,qBAAa,CAAC,OAAO;YAC7C,OAAO,CAAC,WAAW,KAAK,SAAS,CACpC,CAAC;IACJ,CAAC;IAKO,gBAAgB;QACtB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,iBAAiB,EAAE,UAAU,EAAE,EAAE,EAAE;YAC/D,IAAA,yBAAkB,EAAC,iBAAiB,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACL,CAAC;CACF;~~AApYD~~,~~4BAoYC~~"}
1	+ {"version":3,"file":"ToolGroup.js","sourceRoot":"","sources":["../../../../src/store/ToolGroupManager/ToolGroup.ts"],"names":[],"mappings":"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"}

package/dist/cjs/tools/StackScrollTool.d.ts CHANGED Viewed

@@ -2,9 +2,11 @@ import { BaseTool } from './base';
 import { PublicToolProps, ToolProps, EventTypes } from '../types';
 export default class StackScrollTool extends BaseTool {
     static toolName: string;
-    previousDirection: number;
+    deltaY: number;
     touchDragCallback: () => void;
     mouseDragCallback: () => void;
     constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
     _dragCallback(evt: EventTypes.MouseDragEventType): void;
+    _getPixelPerImage(viewport: any): number;
+    _getNumberOfSlices(viewport: any): number;
 }

package/dist/cjs/tools/StackScrollTool.js CHANGED Viewed

@@ -2,39 +2,61 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@cornerstonejs/core");
 const base_1 = require("./base");
-const stackScrollTool_1 = require("../utilities/stackScrollTool");
+const utilities_1 = require("../utilities");
 class StackScrollTool extends base_1.BaseTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
         configuration: {
             invert: false,
+            debounceIfNotLoaded: true,
         },
     }) {
         super(toolProps, defaultToolProps);
-        this.previousDirection = 1;
+        this.deltaY = 1;
         this.touchDragCallback = this._dragCallback.bind(this);
         this.mouseDragCallback = this._dragCallback.bind(this);
     }
     _dragCallback(evt) {
         const { deltaPoints, viewportId, renderingEngineId } = evt.detail;
-        const deltaFrames = deltaPoints.canvas[1];
         const { viewport } = (0, core_1.getEnabledElementByIds)(viewportId, renderingEngineId);
         const targetId = this.getTargetId(viewport);
-        const { invert } = this.configuration;
+        const { debounceIfNotLoaded } = this.configuration;
+        const deltaPointY = deltaPoints.canvas[1];
         let volumeId;
         if (viewport instanceof core_1.VolumeViewport) {
             volumeId = targetId.split('volumeId:')[1];
         }
-        let direction;
-        if (deltaFrames === 0) {
-            direction = this.previousDirection;
+        const pixelsPerImage = this._getPixelPerImage(viewport);
+        const deltaY = deltaPointY + this.deltaY;
+        if (!pixelsPerImage) {
+            return;
+        }
+        if (Math.abs(deltaY) >= pixelsPerImage) {
+            const imageIdIndexOffset = Math.round(deltaY / pixelsPerImage);
+            (0, utilities_1.scroll)(viewport, {
+                delta: imageIdIndexOffset,
+                volumeId,
+                debounceLoading: debounceIfNotLoaded,
+            });
+            this.deltaY = deltaY % pixelsPerImage;
         }
         else {
-            direction = deltaFrames > 0 ? 1 : -1;
-            this.previousDirection = direction;
+            this.deltaY = deltaY;
+        }
+    }
+    _getPixelPerImage(viewport) {
+        const { element } = viewport;
+        const numberOfSlices = this._getNumberOfSlices(viewport);
+        return Math.max(2, element.offsetHeight / Math.max(numberOfSlices, 8));
+    }
+    _getNumberOfSlices(viewport) {
+        if (viewport instanceof core_1.VolumeViewport) {
+            const { numberOfSlices } = core_1.utilities.getImageSliceDataForVolumeViewport(viewport);
+            return numberOfSlices;
+        }
+        else if (viewport instanceof core_1.StackViewport) {
+            return viewport.getImageIds().length;
         }
-        const delta = direction * (invert ? -1 : 1);
-        (0, stackScrollTool_1.scrollThroughStack)(viewport, { delta, volumeId });
     }
 }
 exports.default = StackScrollTool;

package/dist/cjs/tools/StackScrollTool.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"StackScrollTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollTool.ts"],"names":[],"mappings":";;AAAA,~~8CAA6E~~;~~AAC7E~~,iCAAkC;AAClC,~~kEAAkE~~;~~AAOlE~~,MAAqB,eAAgB,SAAQ,eAAQ;IAMnD,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,MAAM,EAAE,KAAK;~~SACd~~;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QACnC,IAAI,CAAC,~~iBAAiB~~,GAAG,CAAC,CAAC;~~QAE3B~~,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,aAAa,CAAC,GAAkC;QAC9C,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAClE,MAAM,~~WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,~~EAAE,QAAQ,EAAE,GAAG,IAAA,6BAAsB,EAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,EAAE,~~MAAM~~,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;~~QAEtC~~,IAAI,QAAQ,CAAC;QACb,IAAI,QAAQ,YAAY,qBAAc,EAAE;YACtC,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3C;~~QAID~~,~~IAAI~~,~~SAAS~~,~~CAAC;QACd~~,IAAI,~~WAAW~~,~~KAAK~~,CAAC,~~EAAE~~;~~YACrB~~,~~SAAS~~,GAAG,IAAI,CAAC,~~iBAAiB~~,CAAC;~~SACpC~~;~~aAAM~~;~~YACL~~,~~SAAS~~,~~GAAG~~,~~WAAW~~,GAAG,CAAC,~~CAAC~~,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;~~YACrC~~,IAAI,CAAC,~~iBAAiB~~,GAAG,~~SAAS~~,CAAC;~~SACpC~~;~~QAED~~,MAAM,~~KAAK~~,~~GAAG~~,~~SAAS~~,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;~~QAE5C~~,~~IAAA~~,~~oCAAkB~~,~~EAAC~~,QAAQ,EAAE,EAAE,~~KAAK~~,EAAE,QAAQ,EAAE,CAAC,CAAC;~~IACpD~~,CAAC;;~~AA/CH~~,~~kCAgDC~~;~~AA/CQ~~,wBAAQ,GAAG,aAAa,CAAC"}
1	+ {"version":3,"file":"StackScrollTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollTool.ts"],"names":[],"mappings":";;AAAA,8CAK6B;AAC7B,iCAAkC;AAClC,4CAAsC;AAOtC,MAAqB,eAAgB,SAAQ,eAAQ;IAMnD,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,MAAM,EAAE,KAAK;YACb,mBAAmB,EAAE,IAAI;SAC1B;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAEhB,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,aAAa,CAAC,GAAkC;QAC9C,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAClE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,6BAAsB,EAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAEnD,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAE1C,IAAI,QAAQ,CAAC;QACb,IAAI,QAAQ,YAAY,qBAAc,EAAE;YACtC,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3C;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC;QAEzC,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO;SACR;QAED,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,cAAc,EAAE;YACtC,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC;YAE/D,IAAA,kBAAM,EAAC,QAAQ,EAAE;gBACf,KAAK,EAAE,kBAAkB;gBACzB,QAAQ;gBACR,eAAe,EAAE,mBAAmB;aACrC,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,GAAG,MAAM,GAAG,cAAc,CAAC;SACvC;aAAM;YACL,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;SACtB;IACH,CAAC;IAED,iBAAiB,CAAC,QAAQ;QACxB,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAC7B,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAGzD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,kBAAkB,CAAC,QAAQ;QACzB,IAAI,QAAQ,YAAY,qBAAc,EAAE;YACtC,MAAM,EAAE,cAAc,EAAE,GACtB,gBAAO,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAC;YACvD,OAAO,cAAc,CAAC;SACvB;aAAM,IAAI,QAAQ,YAAY,oBAAa,EAAE;YAC5C,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;SACtC;IACH,CAAC;;AA1EH,kCA2EC;AA1EQ,wBAAQ,GAAG,aAAa,CAAC"}

package/dist/cjs/tools/StackScrollToolMouseWheelTool.d.ts CHANGED Viewed

@@ -5,7 +5,10 @@ export default class StackScrollMouseWheelTool extends BaseTool {
     _configuration: any;
     constructor(toolProps?: {}, defaultToolProps?: {
         supportedInteractionTypes: string[];
-        invert: boolean;
+        configuration: {
+            invert: boolean;
+            debounceIfNotLoaded: boolean;
+        };
     });
     mouseWheelCallback(evt: MouseWheelEventType): void;
 }

package/dist/cjs/tools/StackScrollToolMouseWheelTool.js CHANGED Viewed

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const base_1 = require("./base");
-const stackScrollTool_1 = require("../utilities/stackScrollTool");
 const core_1 = require("@cornerstonejs/core");
+const base_1 = require("./base");
+const scroll_1 = require("../utilities/scroll");
 class StackScrollMouseWheelTool extends base_1.BaseTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
-        invert: false,
+        configuration: {
+            invert: false,
+            debounceIfNotLoaded: true,
+        },
     }) {
         super(toolProps, defaultToolProps);
     }
@@ -15,13 +18,18 @@ class StackScrollMouseWheelTool extends base_1.BaseTool {
         const { direction } = wheel;
         const { invert } = this.configuration;
         const { viewport } = (0, core_1.getEnabledElement)(element);
-        const targetId = this.getTargetId(viewport);
-        let volumeId;
-        if (viewport instanceof core_1.VolumeViewport) {
-            volumeId = targetId.split('volumeId:')[1];
-        }
         const delta = direction * (invert ? -1 : 1);
-        (0, stackScrollTool_1.scrollThroughStack)(viewport, { delta, volumeId });
+        if (viewport instanceof core_1.StackViewport) {
+            viewport.scroll(delta, this.configuration.debounceIfNotLoaded);
+        }
+        else if (viewport instanceof core_1.VolumeViewport) {
+            const targetId = this.getTargetId(viewport);
+            const volumeId = targetId.split('volumeId:')[1];
+            (0, scroll_1.scrollVolume)(viewport, volumeId, delta);
+        }
+        else {
+            throw new Error('StackScrollMouseWheelTool: Unsupported viewport type');
+        }
     }
 }
 exports.default = StackScrollMouseWheelTool;

package/dist/cjs/tools/StackScrollToolMouseWheelTool.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":";;AAAA,~~iCAAkC~~;~~AAClC~~,~~kEAAkE~~;~~AAElE~~,~~8CAAwE~~;~~AAMxE~~,MAAqB,yBAA0B,SAAQ,eAAQ;IAK7D,YACE,SAAS,GAAG,EAAE,EACd,gBAAgB,GAAG;QACjB,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,MAAM,EAAE,KAAK;~~KACd~~;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC;IAED,kBAAkB,CAAC,GAAwB;QACzC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QACtC,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;QAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAChD,MAAM,~~QAAQ~~,GAAG,~~IAAI~~,CAAC,~~WAAW~~,CAAC,~~QAAQ~~,CAAC,CAAC~~;QAE5C~~,~~IAAI~~,~~QAAQ~~,CAAC;~~QACb~~,IAAI,QAAQ,YAAY,~~qBAAc~~,EAAE;~~YACtC~~,QAAQ,~~GAAG~~,~~QAAQ~~,CAAC,KAAK,~~CAAC~~,~~WAAW~~,CAAC,~~CAAC~~,CAAC,CAAC,CAAC;~~SAC3C~~;~~QAED~~,MAAM,~~KAAK~~,GAAG,~~SAAS~~,~~GAAG,~~CAAC,~~MAAM~~,CAAC,~~CAAC~~,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;~~QAC5C~~,IAAA,~~oCAAkB~~,EAAC,QAAQ,EAAE,EAAE,KAAK,~~EAAE~~,~~QAAQ~~,~~EAAE~~,CAAC,CAAC;~~IACpD~~,CAAC;;~~AA7BH~~,~~4CA8BC~~;~~AA7BQ~~,kCAAQ,GAAG,uBAAuB,CAAC"}
1	+ {"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":";;AAAA,8CAI6B;AAC7B,iCAAkC;AAElC,gDAAmD;AAMnD,MAAqB,yBAA0B,SAAQ,eAAQ;IAK7D,YACE,SAAS,GAAG,EAAE,EACd,gBAAgB,GAAG;QACjB,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,MAAM,EAAE,KAAK;YACb,mBAAmB,EAAE,IAAI;SAC1B;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC;IAED,kBAAkB,CAAC,GAAwB;QACzC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QACtC,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;QAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5C,IAAI,QAAQ,YAAY,oBAAa,EAAE;YACrC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;SAChE;aAAM,IAAI,QAAQ,YAAY,qBAAc,EAAE;YAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,IAAA,qBAAY,EAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;SACzC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;SACzE;IACH,CAAC;;AAlCH,4CAmCC;AAlCQ,kCAAQ,GAAG,uBAAuB,CAAC"}

package/dist/cjs/tools/ZoomTool.d.ts CHANGED Viewed

@@ -1,11 +1,21 @@
+import { Types } from '@cornerstonejs/core';
 import { BaseTool } from './base';
-import { PublicToolProps, ToolProps } from '../types';
+import { EventTypes, PublicToolProps, ToolProps } from '../types';
 export default class ZoomTool extends BaseTool {
     static toolName: string;
     touchDragCallback: () => void;
     mouseDragCallback: () => void;
+    initialMousePosWorld: Types.Point3;
+    dirVec: Types.Point3;
+    minZoomScale: number;
+    maxZoomScale: number;
     constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
-    _dragCallback(evt: any): void;
-    _dragParallelProjection: (evt: any, camera: any) => void;
+    preMouseDownCallback: (evt: EventTypes.MouseDownActivateEventType) => boolean;
+    _dragCallback(evt: EventTypes.MouseDragEventType): void;
+    _dragParallelProjection: (evt: EventTypes.MouseDragEventType, camera: Types.ICamera) => void;
     _dragPerspectiveProjection: (evt: any, camera: any) => void;
+    _getCappedParallelScale: (viewport: any, parallelScale: any) => {
+        parallelScale: any;
+        thresholdExceeded: boolean;
+    };
 }

package/dist/cjs/tools/ZoomTool.js CHANGED Viewed

@@ -3,24 +3,59 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const base_1 = require("./base");
-const core_1 = require("@cornerstonejs/core");
+const gl_matrix_1 = require("gl-matrix");
 const Math_1 = __importDefault(require("@kitware/vtk.js/Common/Core/Math"));
+const core_1 = require("@cornerstonejs/core");
+const base_1 = require("./base");
 class ZoomTool extends base_1.BaseTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
+        configuration: {
+            zoomToCenter: false,
+        },
     }) {
         super(toolProps, defaultToolProps);
+        this.minZoomScale = 0.1;
+        this.maxZoomScale = 10;
+        this.preMouseDownCallback = (evt) => {
+            const eventData = evt.detail;
+            const { currentPoints, element } = eventData;
+            const worldPos = currentPoints.world;
+            const enabledElement = (0, core_1.getEnabledElement)(element);
+            const camera = enabledElement.viewport.getCamera();
+            const { focalPoint } = camera;
+            this.initialMousePosWorld = worldPos;
+            let dirVec = gl_matrix_1.vec3.fromValues(focalPoint[0] - worldPos[0], focalPoint[1] - worldPos[1], focalPoint[2] - worldPos[2]);
+            dirVec = gl_matrix_1.vec3.normalize(gl_matrix_1.vec3.create(), dirVec);
+            this.dirVec = dirVec;
+            return true;
+        };
         this._dragParallelProjection = (evt, camera) => {
             const { element, deltaPoints } = evt.detail;
             const enabledElement = (0, core_1.getEnabledElement)(element);
             const { viewport } = enabledElement;
             const size = [element.clientWidth, element.clientHeight];
+            const { parallelScale, focalPoint, position } = camera;
             const zoomScale = 1.5 / size[1];
             const deltaY = deltaPoints.canvas[1];
             const k = deltaY * zoomScale;
-            const newParallelScale = (1.0 - k) * camera.parallelScale;
-            viewport.setCamera({ parallelScale: newParallelScale });
+            let newParallelScale = (1.0 - k) * parallelScale;
+            let focalPointToSet = focalPoint;
+            let positionToSet = position;
+            if (!this.configuration.zoomToCenter) {
+                const distanceToCanvasCenter = gl_matrix_1.vec3.distance(focalPoint, this.initialMousePosWorld);
+                const zoomScale = 10 / size[1];
+                const k = deltaY * zoomScale;
+                newParallelScale = (1.0 - k) * parallelScale;
+                positionToSet = gl_matrix_1.vec3.scaleAndAdd(gl_matrix_1.vec3.create(), position, this.dirVec, -distanceToCanvasCenter * k);
+                focalPointToSet = gl_matrix_1.vec3.scaleAndAdd(gl_matrix_1.vec3.create(), focalPoint, this.dirVec, -distanceToCanvasCenter * k);
+            }
+            const { parallelScale: cappedParallelScale, thresholdExceeded } = this._getCappedParallelScale(viewport, newParallelScale);
+            viewport.setCamera({
+                parallelScale: cappedParallelScale,
+                focalPoint: thresholdExceeded ? focalPoint : focalPointToSet,
+                position: thresholdExceeded ? position : positionToSet,
+            });
         };
         this._dragPerspectiveProjection = (evt, camera) => {
             const { element, deltaPoints } = evt.detail;
@@ -48,6 +83,31 @@ class ZoomTool extends base_1.BaseTool {
             focalPoint[2] += tmp;
             viewport.setCamera({ position, focalPoint });
         };
+        this._getCappedParallelScale = (viewport, parallelScale) => {
+            const imageData = viewport.getImageData();
+            if (!imageData) {
+                return;
+            }
+            const { dimensions, spacing } = imageData;
+            const t = dimensions[0] * spacing[0];
+            const scale = t / parallelScale;
+            let newParallelScale = parallelScale;
+            let thresholdExceeded = false;
+            if (scale < this.minZoomScale) {
+                newParallelScale = t / this.minZoomScale;
+                thresholdExceeded = true;
+            }
+            else if (scale > this.maxZoomScale) {
+                newParallelScale = t / this.maxZoomScale;
+                thresholdExceeded = true;
+            }
+            return {
+                parallelScale: newParallelScale,
+                thresholdExceeded,
+            };
+        };
+        this.initialMousePosWorld = [0, 0, 0];
+        this.dirVec = [0, 0, 0];
         this.touchDragCallback = this._dragCallback.bind(this);
         this.mouseDragCallback = this._dragCallback.bind(this);
     }

package/dist/cjs/tools/ZoomTool.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ZoomTool.js","sourceRoot":"","sources":["../../../src/tools/ZoomTool.ts"],"names":[],"mappings":";;;;;AAAA,~~iCAAkC~~;~~AAElC~~,~~8CAAwD~~;~~AAExD~~,~~4EAAuD~~;~~AAOvD~~,MAAqB,QAAS,SAAQ,eAAQ;~~IAM5C~~,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;~~KAC9C~~;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;~~QA+BrC~~,~~4BAAuB~~,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;~~YACxC~~,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;YAC5C,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;YAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;YACpC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;YAEzD,MAAM,SAAS,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;~~YAEhC~~,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;~~YAErC~~,MAAM,CAAC,GAAG,MAAM,GAAG,SAAS,CAAC;YAE7B,~~MAAM~~,gBAAgB,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,~~MAAM~~,CAAC,aAAa,CAAC;~~YAE1D~~,QAAQ,CAAC,SAAS,CAAC,EAAE,aAAa,EAAE,gBAAgB,EAAE,CAAC,CAAC;~~QAC1D~~,CAAC,CAAC;QAEF,+BAA0B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;YAC5C,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;YAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;YACpC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;YACzD,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;YAEzD,MAAM,QAAQ,GAAG,cAAO,CAAC,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YACtE,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YAEhD,MAAM,qBAAqB,GAAG;gBAC5B,CAAC,eAAe,CAAC,CAAC,CAAC;gBACnB,CAAC,eAAe,CAAC,CAAC,CAAC;gBACnB,CAAC,eAAe,CAAC,CAAC,CAAC;aACpB,CAAC;YAEF,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAErC,MAAM,CAAC,GAAG,MAAM,GAAG,SAAS,CAAC;YAE7B,IAAI,GAAG,GAAG,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACvC,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;YACnB,UAAU,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;YAErB,GAAG,GAAG,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACnC,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;YACnB,UAAU,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;YAErB,GAAG,GAAG,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACnC,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;YACnB,UAAU,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;YAErB,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;QAC/C,CAAC,CAAC;~~QAvEA~~,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;~~IAGD~~,aAAa,CAAC,~~GAAG~~;~~QACf~~,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC/B,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QAEpC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QAEpC,IAAI,MAAM,CAAC,kBAAkB,EAAE;YAC7B,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;SAC3C;aAAM;YACL,IAAI,CAAC,0BAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;SAC9C;QAED,QAAQ,CAAC,MAAM,EAAE,CAAC;IACpB,CAAC;;~~AAzCH~~,~~2BA8FC~~;~~AA7FQ~~,iBAAQ,GAAG,MAAM,CAAC"}
1	+ {"version":3,"file":"ZoomTool.js","sourceRoot":"","sources":["../../../src/tools/ZoomTool.ts"],"names":[],"mappings":"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"}

package/dist/cjs/types/IToolGroup.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Types } from '@cornerstonejs/core';
+import type { Types } from '@cornerstonejs/core';
 import { SetToolBindingsType, ToolOptionsType } from './ISetToolModeOptions';
 export default interface IToolGroup {
     _toolInstances: Record<string, any>;
@@ -6,6 +6,7 @@ export default interface IToolGroup {
     viewportsInfo: Array<Types.IViewportId>;
     toolOptions: Record<string, any>;
     getViewportIds: () => string[];
+    getViewportsInfo: () => Array<Types.IViewportId>;
     getToolInstance: {
         (toolName: string): any;
     };

package/dist/cjs/types/JumpToSliceOptions.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 declare type JumpToSliceOptions = {
     imageIndex: number;
+    debounceLoading?: boolean;
 };
 export default JumpToSliceOptions;

package/dist/cjs/types/ScrollOptions.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 declare type ScrollOptions = {
     delta: number;
     volumeId?: string;
+    debounceLoading?: boolean;
 };
 export default ScrollOptions;

package/dist/cjs/utilities/cine/playClip.js CHANGED Viewed

@@ -8,6 +8,8 @@ const core_1 = require("@cornerstonejs/core");
 const events_1 = __importDefault(require("./events"));
 const state_1 = require("./state");
 const { triggerEvent } = core_1.utilities;
+const debounced = true;
+const loop = true;
 function playClip(element, playClipOptions) {
     var _a, _b, _c, _d;
     let playClipTimeouts;
@@ -24,7 +26,7 @@ function playClip(element, playClipOptions) {
         throw new Error('playClip: element must be a stack viewport, volume viewport playClip not yet implemented');
     }
     const stackData = {
-        currentImageIdIndex: viewport.getCurrentImageIdIndex(),
+        targetImageIdIndex: viewport.getTargetImageIdIndex(),
         imageIds: viewport.getImageIds(),
     };
     let playClipData = (0, state_1.getToolState)(element);
@@ -59,7 +61,7 @@ function playClip(element, playClipOptions) {
         playClipIsTimeVarying = isTimeVarying;
     }
     const playClipAction = () => {
-        let newImageIdIndex = stackData.currentImageIdIndex;
+        let newImageIdIndex = stackData.targetImageIdIndex;
         const imageCount = stackData.imageIds.length;
         if (playClipData.reverse) {
             newImageIdIndex--;
@@ -82,10 +84,9 @@ function playClip(element, playClipOptions) {
         if (newImageIdIndex < 0) {
             newImageIdIndex = imageCount - 1;
         }
-        if (newImageIdIndex !== stackData.currentImageIdIndex) {
-            viewport.setImageIdIndex(newImageIdIndex).then(() => {
-                stackData.currentImageIdIndex = newImageIdIndex;
-            });
+        if (newImageIdIndex !== stackData.targetImageIdIndex) {
+            const delta = newImageIdIndex - stackData.targetImageIdIndex;
+            viewport.scroll(delta, debounced, loop);
         }
     };
     if (playClipTimeouts &&
@@ -93,7 +94,7 @@ function playClip(element, playClipOptions) {
         playClipIsTimeVarying) {
         playClipData.usingFrameTimeVector = true;
         playClipData.intervalId = window.setTimeout(function playClipTimeoutHandler() {
-            playClipData.intervalId = window.setTimeout(playClipTimeoutHandler, playClipTimeouts[stackData.currentImageIdIndex]);
+            playClipData.intervalId = window.setTimeout(playClipTimeoutHandler, playClipTimeouts[stackData.targetImageIdIndex]);
             playClipAction();
         }, 0);
     }

package/dist/cjs/utilities/cine/playClip.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"playClip.js","sourceRoot":"","sources":["../../../../src/utilities/cine/playClip.ts"],"names":[],"mappings":";;;;;;AAAA,8CAI6B;AAC7B,sDAAmC;AACnC,mCAAqD;AAGrD,MAAM,EAAE,YAAY,EAAE,GAAG,gBAAS,CAAC;~~AASnC~~,SAAS,QAAQ,CACf,OAAuB,EACvB,eAA0C;;IAE1C,IAAI,gBAAgB,CAAC;IACrB,IAAI,qBAAqB,CAAC;IAE1B,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;KAC5D;IAED,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAElD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;KACH;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,IAAI,CAAC,CAAC,QAAQ,YAAY,oBAAa,CAAC,EAAE;QACxC,MAAM,IAAI,KAAK,CACb,0FAA0F,CAC3F,CAAC;KACH;IAED,MAAM,SAAS,GAAG;QAChB,~~mBAAmB~~,EAAE,QAAQ,CAAC,~~sBAAsB~~,EAAE;~~QACtD~~,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAAE;KACjC,CAAC;IAEF,IAAI,YAAY,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;IAEzC,IAAI,CAAC,YAAY,EAAE;QACjB,YAAY,GAAG;YACb,UAAU,EAAE,SAAS;YACrB,eAAe,EAAE,EAAE;YACnB,kBAAkB,EAAE,SAAS;YAC7B,qBAAqB,EAAE,KAAK;YAC5B,oBAAoB,EAAE,KAAK;YAC3B,eAAe,EAAE,MAAA,eAAe,CAAC,eAAe,mCAAI,SAAS;YAC7D,KAAK,EAAE,MAAA,eAAe,CAAC,8BAA8B,mCAAI,CAAC;YAC1D,OAAO,EAAE,MAAA,eAAe,CAAC,OAAO,mCAAI,KAAK;YACzC,IAAI,EAAE,MAAA,eAAe,CAAC,IAAI,mCAAI,IAAI;SACnC,CAAC;QACF,IAAA,oBAAY,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;KACrC;SAAM;QAEL,iBAAiB,CAAC,YAAY,CAAC,CAAC;KACjC;IAGD,IACE,eAAe,CAAC,eAAe,GAAG,CAAC;QACnC,eAAe,CAAC,eAAe,GAAG,CAAC,EACnC;QACA,YAAY,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;QACvE,YAAY,CAAC,OAAO,GAAG,YAAY,CAAC,eAAe,GAAG,CAAC,CAAC;QAExD,YAAY,CAAC,qBAAqB,GAAG,IAAI,CAAC;KAC3C;IAGD,IACE,YAAY,CAAC,qBAAqB,KAAK,IAAI;QAC3C,YAAY,CAAC,eAAe;QAC5B,YAAY,CAAC,eAAe,CAAC,MAAM,KAAK,SAAS,CAAC,QAAQ,CAAC,MAAM,EACjE;QACA,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,oBAAoB,CACtD,YAAY,CAAC,eAAe,EAC5B,YAAY,CAAC,KAAK,CACnB,CAAC;QAEF,gBAAgB,GAAG,QAAQ,CAAC;QAC5B,qBAAqB,GAAG,aAAa,CAAC;KACvC;IAGD,MAAM,cAAc,GAAG,GAAG,EAAE;QAE1B,IAAI,eAAe,GAAG,SAAS,CAAC,~~mBAAmB~~,CAAC;~~QAEpD~~,MAAM,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;QAE7C,IAAI,YAAY,CAAC,OAAO,EAAE;YACxB,eAAe,EAAE,CAAC;SACnB;aAAM;YACL,eAAe,EAAE,CAAC;SACnB;QAED,IACE,CAAC,YAAY,CAAC,IAAI;YAClB,CAAC,eAAe,GAAG,CAAC,IAAI,eAAe,IAAI,UAAU,CAAC,EACtD;YACA,iBAAiB,CAAC,YAAY,CAAC,CAAC;YAChC,MAAM,WAAW,GAAG;gBAClB,OAAO;aACR,CAAC;YAEF,YAAY,CAAC,OAAO,EAAE,gBAAW,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;YAE7D,OAAO;SACR;QAGD,IAAI,eAAe,IAAI,UAAU,EAAE;YACjC,eAAe,GAAG,CAAC,CAAC;SACrB;QAED,IAAI,eAAe,GAAG,CAAC,EAAE;YACvB,eAAe,GAAG,UAAU,GAAG,CAAC,CAAC;SAClC;QAED,IAAI,eAAe,KAAK,SAAS,CAAC,~~mBAAmB~~,EAAE;~~YACrD~~,~~QAAQ~~,~~CAAC~~,eAAe,CAAC,~~eAAe~~,CAAC,CAAC,~~IAAI~~,CAAC,~~GAAG~~,EAAE~~;gBAClD~~,SAAS,~~CAAC~~,~~mBAAmB~~,~~GAAG,eAAe,~~CAAC~~;YAClD~~,CAAC~~,CAAC,CAAC~~;~~SACJ~~;IACH,CAAC,CAAC;IAIF,IACE,gBAAgB;QAChB,gBAAgB,CAAC,MAAM,GAAG,CAAC;QAC3B,qBAAqB,EACrB;QACA,YAAY,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACzC,YAAY,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CACzC,SAAS,sBAAsB;YAC7B,YAAY,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CACzC,sBAAsB,EACtB,gBAAgB,CAAC,SAAS,CAAC,~~mBAAmB~~,CAAC,~~CAChD~~,CAAC;YACF,cAAc,EAAE,CAAC;QACnB,CAAC,EACD,CAAC,CACF,CAAC;KACH;SAAM;QAEL,YAAY,CAAC,oBAAoB,GAAG,KAAK,CAAC;QAC1C,YAAY,CAAC,UAAU,GAAG,MAAM,CAAC,WAAW,CAC1C,cAAc,EACd,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,eAAe,CAAC,CAC9C,CAAC;KACH;IAED,MAAM,WAAW,GAAG;QAClB,OAAO;KACR,CAAC;IAEF,YAAY,CAAC,OAAO,EAAE,gBAAW,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AAC/D,CAAC;AAwFQ,4BAAQ;AAlFjB,SAAS,QAAQ,CAAC,OAAuB;IACvC,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,MAAM,YAAY,GAAG,IAAA,oBAAY,EAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEpD,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO;KACR;IAED,iBAAiB,CAAC,YAAY,CAAC,CAAC;AAClC,CAAC;AAuEkB,4BAAQ;AA9D3B,SAAS,oBAAoB,CAAC,MAAgB,EAAE,KAAa;IAC3D,IAAI,CAAC,CAAC;IACN,IAAI,MAAM,CAAC;IACX,IAAI,KAAK,CAAC;IACV,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5B,MAAM,QAAQ,GAAG,EAAE,CAAC;IAGpB,IAAI,aAAa,GAAG,KAAK,CAAC;IAE1B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,IAAI,CAAC,EAAE;QAC3C,KAAK,GAAG,CAAC,CAAC;KACX;IAGD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;QAE1B,KAAK,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,EAAE;YAEX,MAAM,GAAG,KAAK,CAAC;SAChB;aAAM,IAAI,KAAK,KAAK,MAAM,EAAE;YAC3B,aAAa,GAAG,IAAI,CAAC;SACtB;QAED,GAAG,IAAI,KAAK,CAAC;KACd;IAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,IAAI,aAAa,EAAE;YAGjB,KAAK,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SACrC;aAAM;YACL,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;SACrB;QAED,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KACtB;IAED,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC;AACrC,CAAC;AAMD,SAAS,iBAAiB,CAAC,YAAY;IACrC,MAAM,EAAE,GAAG,YAAY,CAAC,UAAU,CAAC;IAEnC,IAAI,OAAO,EAAE,KAAK,WAAW,EAAE;QAC7B,YAAY,CAAC,UAAU,GAAG,SAAS,CAAC;QACpC,IAAI,YAAY,CAAC,oBAAoB,EAAE;YACrC,YAAY,CAAC,EAAE,CAAC,CAAC;SAClB;aAAM;YACL,aAAa,CAAC,EAAE,CAAC,CAAC;SACnB;KACF;AACH,CAAC"}
1	+ {"version":3,"file":"playClip.js","sourceRoot":"","sources":["../../../../src/utilities/cine/playClip.ts"],"names":[],"mappings":"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"}

package/dist/cjs/utilities/index.d.ts CHANGED Viewed

@@ -9,15 +9,16 @@ import triggerAnnotationRenderForViewportIds from './triggerAnnotationRenderForV
 import jumpToSlice from './viewport/jumpToSlice';
 import pointInShapeCallback from './pointInShapeCallback';
 import pointInSurroundingSphereCallback from './pointInSurroundingSphereCallback';
+import scroll from './scroll';
 import * as segmentation from './segmentation';
 import * as drawing from './drawing';
 import * as math from './math';
 import * as planar from './planar';
-import * as stackScrollTool from './stackScrollTool';
 import * as viewportFilters from './viewportFilters';
 import * as orientation from './orientation';
 import * as cine from './cine';
 import * as boundingBox from './boundingBox';
 import * as rectangleROITool from './rectangleROITool';
+import * as stackPrefetch from './stackPrefetch';
 import { triggerEvent } from '@cornerstonejs/core';
-export { math, planar, viewportFilters, stackScrollTool, drawing, debounce, deepMerge, throttle, orientation, isObject, triggerEvent, calibrateImageSpacing, segmentation, triggerAnnotationRenderForViewportIds, pointInShapeCallback, pointInSurroundingSphereCallback, getAnnotationNearPoint, getAnnotationNearPointOnEnabledElement, jumpToSlice, cine, clip, boundingBox, rectangleROITool, };
+export { math, planar, viewportFilters, drawing, debounce, deepMerge, throttle, orientation, isObject, triggerEvent, calibrateImageSpacing, segmentation, triggerAnnotationRenderForViewportIds, pointInShapeCallback, pointInSurroundingSphereCallback, getAnnotationNearPoint, getAnnotationNearPointOnEnabledElement, jumpToSlice, cine, clip, boundingBox, rectangleROITool, stackPrefetch, scroll, };

package/dist/cjs/utilities/index.js CHANGED Viewed

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rectangleROITool = exports.boundingBox = exports.clip = exports.cine = exports.jumpToSlice = exports.getAnnotationNearPointOnEnabledElement = exports.getAnnotationNearPoint = exports.pointInSurroundingSphereCallback = exports.pointInShapeCallback = exports.triggerAnnotationRenderForViewportIds = exports.segmentation = exports.calibrateImageSpacing = exports.triggerEvent = exports.isObject = exports.orientation = exports.throttle = exports.deepMerge = exports.debounce = exports.drawing = exports.stackScrollTool = exports.viewportFilters = exports.planar = exports.math = void 0;
+exports.scroll = exports.stackPrefetch = exports.rectangleROITool = exports.boundingBox = exports.clip = exports.cine = exports.jumpToSlice = exports.getAnnotationNearPointOnEnabledElement = exports.getAnnotationNearPoint = exports.pointInSurroundingSphereCallback = exports.pointInShapeCallback = exports.triggerAnnotationRenderForViewportIds = exports.segmentation = exports.calibrateImageSpacing = exports.triggerEvent = exports.isObject = exports.orientation = exports.throttle = exports.deepMerge = exports.debounce = exports.drawing = exports.viewportFilters = exports.planar = exports.math = void 0;
 const getAnnotationNearPoint_1 = require("./getAnnotationNearPoint");
 Object.defineProperty(exports, "getAnnotationNearPoint", { enumerable: true, get: function () { return getAnnotationNearPoint_1.getAnnotationNearPoint; } });
 Object.defineProperty(exports, "getAnnotationNearPointOnEnabledElement", { enumerable: true, get: function () { return getAnnotationNearPoint_1.getAnnotationNearPointOnEnabledElement; } });
@@ -46,6 +46,8 @@ const pointInShapeCallback_1 = __importDefault(require("./pointInShapeCallback")
 exports.pointInShapeCallback = pointInShapeCallback_1.default;
 const pointInSurroundingSphereCallback_1 = __importDefault(require("./pointInSurroundingSphereCallback"));
 exports.pointInSurroundingSphereCallback = pointInSurroundingSphereCallback_1.default;
+const scroll_1 = __importDefault(require("./scroll"));
+exports.scroll = scroll_1.default;
 const segmentation = __importStar(require("./segmentation"));
 exports.segmentation = segmentation;
 const drawing = __importStar(require("./drawing"));
@@ -54,8 +56,6 @@ const math = __importStar(require("./math"));
 exports.math = math;
 const planar = __importStar(require("./planar"));
 exports.planar = planar;
-const stackScrollTool = __importStar(require("./stackScrollTool"));
-exports.stackScrollTool = stackScrollTool;
 const viewportFilters = __importStar(require("./viewportFilters"));
 exports.viewportFilters = viewportFilters;
 const orientation = __importStar(require("./orientation"));
@@ -66,6 +66,8 @@ const boundingBox = __importStar(require("./boundingBox"));
 exports.boundingBox = boundingBox;
 const rectangleROITool = __importStar(require("./rectangleROITool"));
 exports.rectangleROITool = rectangleROITool;
+const stackPrefetch = __importStar(require("./stackPrefetch"));
+exports.stackPrefetch = stackPrefetch;
 const core_1 = require("@cornerstonejs/core");
 Object.defineProperty(exports, "triggerEvent", { enumerable: true, get: function () { return core_1.triggerEvent; } });
 //# sourceMappingURL=index.js.map

package/dist/cjs/utilities/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utilities/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qEAGkC;AA+ChC,uGAjDA,+CAAsB,OAiDA;AACtB,uHAjDA,+DAAsC,OAiDA;AA7CxC,0DAAkC;AAiChC,mBAjCK,kBAAQ,CAiCL;AAhCV,4DAAoC;AAiClC,oBAjCK,mBAAS,CAiCL;AAhCX,0DAAkC;AAiChC,mBAjCK,kBAAQ,CAiCL;AAhCV,0DAAkC;AAkChC,mBAlCK,kBAAQ,CAkCL;AAjCV,kDAA0B;AA4CxB,eA5CK,cAAI,CA4CL;AA3CN,oFAA4D;AAkC1D,gCAlCK,+BAAqB,CAkCL;AAjCvB,oHAA4F;AAmC1F,gDAnCK,+CAAqC,CAmCL;AAlCvC,yEAAiD;AAuC/C,sBAvCK,qBAAW,CAuCL;AArCb,kFAA0D;AAiCxD,+BAjCK,8BAAoB,CAiCL;AAhCtB,0GAAkF;AAiChF,2CAjCK,0CAAgC,CAiCL;~~AA9BlC~~,6DAA+C;~~AA2B7C~~,oCAAY;~~AA1Bd~~,mDAAqC;~~AAkBnC~~,0BAAO;~~AAjBT~~,6CAA+B;AAa7B,oBAAI;AAZN,iDAAmC;AAajC,wBAAM;AAZR,mEAAqD;~~AAcnD~~,0CAAe;~~AAbjB~~,~~mEAAqD;AAYnD,0CAAe;AAXjB,~~2DAA6C;AAiB3C,kCAAW;AAhBb,6CAA+B;AA2B7B,oBAAI;AA1BN,2DAA6C;AA4B3C,kCAAW;AA3Bb,qEAAuD;AA4BrD,4CAAgB;~~AAzBlB~~,8CAAmD;~~AAajD~~,~~6FAbO~~,mBAAY,~~OAaP~~"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utilities/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qEAGkC;AA+ChC,uGAjDA,+CAAsB,OAiDA;AACtB,uHAjDA,+DAAsC,OAiDA;AA7CxC,0DAAkC;AAiChC,mBAjCK,kBAAQ,CAiCL;AAhCV,4DAAoC;AAiClC,oBAjCK,mBAAS,CAiCL;AAhCX,0DAAkC;AAiChC,mBAjCK,kBAAQ,CAiCL;AAhCV,0DAAkC;AAkChC,mBAlCK,kBAAQ,CAkCL;AAjCV,kDAA0B;AA4CxB,eA5CK,cAAI,CA4CL;AA3CN,oFAA4D;AAkC1D,gCAlCK,+BAAqB,CAkCL;AAjCvB,oHAA4F;AAmC1F,gDAnCK,+CAAqC,CAmCL;AAlCvC,yEAAiD;AAuC/C,sBAvCK,qBAAW,CAuCL;AArCb,kFAA0D;AAiCxD,+BAjCK,8BAAoB,CAiCL;AAhCtB,0GAAkF;AAiChF,2CAjCK,0CAAgC,CAiCL;AAhClC,sDAA8B;AAyC5B,iBAzCK,gBAAM,CAyCL;AAtCR,6DAA+C;AA0B7C,oCAAY;AAzBd,mDAAqC;AAiBnC,0BAAO;AAhBT,6CAA+B;AAa7B,oBAAI;AAZN,iDAAmC;AAajC,wBAAM;AAZR,mEAAqD;AAanD,0CAAe;AAZjB,2DAA6C;AAiB3C,kCAAW;AAhBb,6CAA+B;AA2B7B,oBAAI;AA1BN,2DAA6C;AA4B3C,kCAAW;AA3Bb,qEAAuD;AA4BrD,4CAAgB;AA3BlB,+DAAiD;AA4B/C,sCAAa;AAzBf,8CAAmD;AAYjD,6FAZO,mBAAY,OAYP"}

package/dist/cjs/utilities/scroll.d.ts ADDED Viewed

@@ -0,0 +1,4 @@
+import { Types, VolumeViewport } from '@cornerstonejs/core';
+import { ScrollOptions } from '../types';
+export default function scroll(viewport: Types.IStackViewport | Types.IVolumeViewport, options: ScrollOptions): void;
+export declare function scrollVolume(viewport: VolumeViewport, volumeId: string, delta: number): void;