@cornerstonejs/tools 1.32.1 → 1.32.3
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.
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.d.ts +1 -0
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js +2 -0
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js.map +1 -1
- package/dist/cjs/tools/base/BaseTool.d.ts +1 -1
- package/dist/cjs/tools/base/BaseTool.js +5 -2
- package/dist/cjs/tools/base/BaseTool.js.map +1 -1
- package/dist/cjs/types/ScrollOptions.d.ts +1 -0
- package/dist/cjs/utilities/planar/filterAnnotationsForDisplay.d.ts +1 -1
- package/dist/cjs/utilities/planar/filterAnnotationsForDisplay.js +2 -2
- package/dist/cjs/utilities/planar/filterAnnotationsForDisplay.js.map +1 -1
- package/dist/cjs/utilities/scroll.d.ts +1 -1
- package/dist/cjs/utilities/scroll.js +5 -4
- package/dist/cjs/utilities/scroll.js.map +1 -1
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js +2 -0
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js.map +1 -1
- package/dist/esm/tools/base/BaseTool.js +1 -1
- package/dist/esm/tools/base/BaseTool.js.map +1 -1
- package/dist/esm/utilities/planar/filterAnnotationsForDisplay.js +1 -1
- package/dist/esm/utilities/planar/filterAnnotationsForDisplay.js.map +1 -1
- package/dist/esm/utilities/scroll.js +5 -4
- package/dist/esm/utilities/scroll.js.map +1 -1
- package/dist/types/tools/StackScrollToolMouseWheelTool.d.ts +1 -0
- package/dist/types/tools/StackScrollToolMouseWheelTool.d.ts.map +1 -1
- package/dist/types/tools/base/BaseTool.d.ts +1 -1
- package/dist/types/tools/base/BaseTool.d.ts.map +1 -1
- package/dist/types/types/ScrollOptions.d.ts +1 -0
- package/dist/types/types/ScrollOptions.d.ts.map +1 -1
- package/dist/types/utilities/planar/filterAnnotationsForDisplay.d.ts +1 -1
- package/dist/types/utilities/planar/filterAnnotationsForDisplay.d.ts.map +1 -1
- package/dist/types/utilities/scroll.d.ts +1 -1
- package/dist/types/utilities/scroll.d.ts.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +3 -3
- package/src/tools/StackScrollToolMouseWheelTool.ts +2 -0
- package/src/tools/base/BaseTool.ts +1 -1
- package/src/types/ScrollOptions.ts +1 -0
- package/src/utilities/planar/filterAnnotationsForDisplay.ts +2 -2
- package/src/utilities/scroll.ts +7 -4
|
@@ -13,6 +13,7 @@ class StackScrollMouseWheelTool extends base_1.BaseTool {
|
|
|
13
13
|
invert: false,
|
|
14
14
|
debounceIfNotLoaded: true,
|
|
15
15
|
loop: false,
|
|
16
|
+
scrollSlabs: false,
|
|
16
17
|
},
|
|
17
18
|
}) {
|
|
18
19
|
super(toolProps, defaultToolProps);
|
|
@@ -30,6 +31,7 @@ class StackScrollMouseWheelTool extends base_1.BaseTool {
|
|
|
30
31
|
debounceLoading: this.configuration.debounceIfNotLoaded,
|
|
31
32
|
loop: this.configuration.loop,
|
|
32
33
|
volumeId,
|
|
34
|
+
scrollSlabs: this.configuration.scrollSlabs,
|
|
33
35
|
});
|
|
34
36
|
}
|
|
35
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAAwD;AACxD,iCAAkC;AAElC,iEAAyC;AAMzC,MAAM,yBAA0B,SAAQ,eAAQ;IAK9C,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;YACzB,IAAI,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAAwD;AACxD,iCAAkC;AAElC,iEAAyC;AAMzC,MAAM,yBAA0B,SAAQ,eAAQ;IAK9C,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;YACzB,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,KAAK;SACnB;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,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAEhD,IAAA,gBAAM,EAAC,QAAQ,EAAE;YACf,KAAK;YACL,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,mBAAmB;YACvD,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI;YAC7B,QAAQ;YACR,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,WAAW;SAC5C,CAAC,CAAC;IACL,CAAC;CACF;AAED,yBAAyB,CAAC,QAAQ,GAAG,uBAAuB,CAAC;AAC7D,kBAAe,yBAAyB,CAAC"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
const core_1 = require("@cornerstonejs/core");
|
|
4
|
-
const
|
|
7
|
+
const ToolModes_1 = __importDefault(require("../../enums/ToolModes"));
|
|
5
8
|
class BaseTool {
|
|
6
9
|
constructor(toolProps, defaultToolProps) {
|
|
7
10
|
const initialProps = core_1.utilities.deepMerge(defaultToolProps, toolProps);
|
|
@@ -15,7 +18,7 @@ class BaseTool {
|
|
|
15
18
|
this.toolGroupId = toolGroupId;
|
|
16
19
|
this.supportedInteractionTypes = supportedInteractionTypes || [];
|
|
17
20
|
this.configuration = Object.assign({}, configuration);
|
|
18
|
-
this.mode =
|
|
21
|
+
this.mode = ToolModes_1.default.Disabled;
|
|
19
22
|
}
|
|
20
23
|
getToolName() {
|
|
21
24
|
return this.constructor.toolName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const core_1 = require("@cornerstonejs/core");
|
|
7
7
|
const filterAnnotationsWithinSlice_1 = __importDefault(require("./filterAnnotationsWithinSlice"));
|
|
8
|
-
const
|
|
8
|
+
const annotationFrameRange_1 = __importDefault(require("../annotationFrameRange"));
|
|
9
9
|
const baseUrlExtractor = /(videoId:|imageId:|volumeId:)([a-zA-Z]*:)/;
|
|
10
10
|
function filterAnnotationsForDisplay(viewport, annotations) {
|
|
11
11
|
if (viewport instanceof core_1.StackViewport) {
|
|
@@ -38,7 +38,7 @@ function filterAnnotationsForDisplay(viewport, annotations) {
|
|
|
38
38
|
if (!viewport.hasImageURI(testURI)) {
|
|
39
39
|
return false;
|
|
40
40
|
}
|
|
41
|
-
const range =
|
|
41
|
+
const range = annotationFrameRange_1.default.getFrameRange(annotation);
|
|
42
42
|
const frameNumber = viewport.getFrameNumber();
|
|
43
43
|
if (Array.isArray(range)) {
|
|
44
44
|
return frameNumber >= range[0] && frameNumber <= range[1];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterAnnotationsForDisplay.js","sourceRoot":"","sources":["../../../../src/utilities/planar/filterAnnotationsForDisplay.ts"],"names":[],"mappings":";;;;;AAAA,8CAM6B;AAE7B,kGAA0E;AAE1E,
|
|
1
|
+
{"version":3,"file":"filterAnnotationsForDisplay.js","sourceRoot":"","sources":["../../../../src/utilities/planar/filterAnnotationsForDisplay.ts"],"names":[],"mappings":";;;;;AAAA,8CAM6B;AAE7B,kGAA0E;AAE1E,mFAA2D;AAE3D,MAAM,gBAAgB,GAAG,2CAA2C,CAAC;AAQrE,SAAwB,2BAA2B,CACjD,QAAyB,EACzB,WAAwB;IAExB,IAAI,QAAQ,YAAY,oBAAa,EAAE;QAErC,MAAM,OAAO,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAK7C,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;QAOnD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;YACvC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;gBACzB,OAAO,KAAK,CAAC;aACd;YAED,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC;YAEtD,IAAI,OAAO,KAAK,SAAS,EAAE;gBAGzB,OAAO,KAAK,CAAC;aACd;YAED,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;YAC5D,OAAO,iBAAiB,KAAK,QAAQ,CAAC;QACxC,CAAC,CAAC,CAAC;KACJ;SAAM,IAAI,QAAQ,YAAY,oBAAa,EAAE;QAC5C,MAAM,mBAAmB,GAAW,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QAEtE,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;YACvC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;gBACzB,OAAO,KAAK,CAAC;aACd;YACD,IAAI,UAAU,CAAC,QAAQ,CAAC,mBAAmB,KAAK,mBAAmB,EAAE;gBACnE,OAAO,KAAK,CAAC;aACd;YACD,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAC3D,gBAAgB,EAChB,EAAE,CACH,CAAC;YAEF,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;gBAClC,OAAO,KAAK,CAAC;aACd;YACD,MAAM,KAAK,GAAG,8BAAoB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAC7D,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;YAC9C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACxB,OAAO,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;aAC3D;YAKD,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;KACJ;SAAM,IAAI,QAAQ,YAAY,qBAAc,EAAE;QAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QAEpC,MAAM,EAAE,wBAAwB,EAAE,GAChC,gBAAO,CAAC,oCAAoC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAGjE,OAAO,IAAA,sCAA4B,EACjC,WAAW,EACX,MAAM,EACN,wBAAwB,CACzB,CAAC;KACH;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,iBAAiB,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC;KACjE;AACH,CAAC;AAhFD,8CAgFC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Types, VolumeViewport } from '@cornerstonejs/core';
|
|
2
2
|
import { ScrollOptions } from '../types';
|
|
3
3
|
export default function scroll(viewport: Types.IViewport, options: ScrollOptions): void;
|
|
4
|
-
export declare function scrollVolume(viewport: VolumeViewport, volumeId: string, delta: number): void;
|
|
4
|
+
export declare function scrollVolume(viewport: VolumeViewport, volumeId: string, delta: number, scrollSlabs?: boolean): void;
|
|
@@ -12,12 +12,12 @@ function scroll(viewport, options) {
|
|
|
12
12
|
throw new Error('Scroll::Stack Viewport has no images');
|
|
13
13
|
}
|
|
14
14
|
const { type: viewportType } = viewport;
|
|
15
|
-
const { volumeId, delta } = options;
|
|
15
|
+
const { volumeId, delta, scrollSlabs } = options;
|
|
16
16
|
if (viewport instanceof core_1.StackViewport) {
|
|
17
17
|
viewport.scroll(delta, options.debounceLoading, options.loop);
|
|
18
18
|
}
|
|
19
19
|
else if (viewport instanceof core_1.VolumeViewport) {
|
|
20
|
-
scrollVolume(viewport, volumeId, delta);
|
|
20
|
+
scrollVolume(viewport, volumeId, delta, scrollSlabs);
|
|
21
21
|
}
|
|
22
22
|
else if (viewport instanceof core_1.VideoViewport) {
|
|
23
23
|
viewport.scroll(delta);
|
|
@@ -27,8 +27,9 @@ function scroll(viewport, options) {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
exports.default = scroll;
|
|
30
|
-
function scrollVolume(viewport, volumeId, delta) {
|
|
31
|
-
const
|
|
30
|
+
function scrollVolume(viewport, volumeId, delta, scrollSlabs = false) {
|
|
31
|
+
const useSlabThickness = scrollSlabs;
|
|
32
|
+
const { numScrollSteps, currentStepIndex, sliceRangeInfo } = core_1.utilities.getVolumeViewportScrollInfo(viewport, volumeId, useSlabThickness);
|
|
32
33
|
if (!sliceRangeInfo) {
|
|
33
34
|
return;
|
|
34
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scroll.js","sourceRoot":"","sources":["../../../src/utilities/scroll.ts"],"names":[],"mappings":";;;AAAA,8CAS6B;AAY7B,SAAwB,MAAM,CAC5B,QAAyB,EACzB,OAAsB;IAGtB,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE3D,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;KAC3E;IAED,IACE,QAAQ,YAAY,oBAAa;QACjC,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,KAAK,CAAC,EACnC;QACA,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;KACzD;IAED,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IACxC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"scroll.js","sourceRoot":"","sources":["../../../src/utilities/scroll.ts"],"names":[],"mappings":";;;AAAA,8CAS6B;AAY7B,SAAwB,MAAM,CAC5B,QAAyB,EACzB,OAAsB;IAGtB,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE3D,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;KAC3E;IAED,IACE,QAAQ,YAAY,oBAAa;QACjC,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,KAAK,CAAC,EACnC;QACA,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;KACzD;IAED,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IACxC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAEjD,IAAI,QAAQ,YAAY,oBAAa,EAAE;QACrC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;KAC/D;SAAM,IAAI,QAAQ,YAAY,qBAAc,EAAE;QAC7C,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;KACtD;SAAM,IAAI,QAAQ,YAAY,oBAAa,EAAE;QAC5C,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KACxB;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,sCAAsC,YAAY,EAAE,CAAC,CAAC;KACvE;AACH,CAAC;AA9BD,yBA8BC;AAED,SAAgB,YAAY,CAC1B,QAAwB,EACxB,QAAgB,EAChB,KAAa,EACb,WAAW,GAAG,KAAK;IAEnB,MAAM,gBAAgB,GAAG,WAAW,CAAC;IAErC,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,cAAc,EAAE,GACxD,gBAAO,CAAC,2BAA2B,CAAC,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IAE5E,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO;KACR;IAED,MAAM,EAAE,UAAU,EAAE,wBAAwB,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;IACxE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEzD,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,gBAAO,CAAC,qBAAqB,CAClE,UAAU,EACV,QAAQ,EACR,UAAU,EACV,eAAe,EACf,wBAAwB,EACxB,KAAK,CACN,CAAC;IAEF,QAAQ,CAAC,SAAS,CAAC;QACjB,UAAU,EAAE,aAAa;QACzB,QAAQ,EAAE,WAAW;KACtB,CAAC,CAAC;IACH,QAAQ,CAAC,MAAM,EAAE,CAAC;IAElB,MAAM,gBAAgB,GAAG,gBAAgB,GAAG,KAAK,CAAC;IAElD,IACE,CAAC,gBAAgB,GAAG,cAAc,IAAI,gBAAgB,GAAG,CAAC,CAAC;QAC3D,QAAQ,CAAC,iBAAiB,EAAE,EAC5B;QAIA,MAAM,uBAAuB,GAAG;YAC9B,QAAQ;YACR,QAAQ;YACR,KAAK;YACL,gBAAgB;YAChB,gBAAgB;YAChB,cAAc;YACd,cAAc,EAAE,QAAQ,CAAC,iBAAiB,EAAE;SAC7C,CAAC;QAEF,gBAAO,CAAC,YAAY,CAClB,kBAAW,EACX,aAAM,CAAC,2BAA2B,EAClC,uBAAwE,CACzE,CAAC;KACH;AACH,CAAC;AA1DD,oCA0DC"}
|
|
@@ -8,6 +8,7 @@ class StackScrollMouseWheelTool extends BaseTool {
|
|
|
8
8
|
invert: false,
|
|
9
9
|
debounceIfNotLoaded: true,
|
|
10
10
|
loop: false,
|
|
11
|
+
scrollSlabs: false,
|
|
11
12
|
},
|
|
12
13
|
}) {
|
|
13
14
|
super(toolProps, defaultToolProps);
|
|
@@ -25,6 +26,7 @@ class StackScrollMouseWheelTool extends BaseTool {
|
|
|
25
26
|
debounceLoading: this.configuration.debounceIfNotLoaded,
|
|
26
27
|
loop: this.configuration.loop,
|
|
27
28
|
volumeId,
|
|
29
|
+
scrollSlabs: this.configuration.scrollSlabs,
|
|
28
30
|
});
|
|
29
31
|
}
|
|
30
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,MAAM,MAAM,qBAAqB,CAAC;AAMzC,MAAM,yBAA0B,SAAQ,QAAQ;IAK9C,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;YACzB,IAAI,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,MAAM,MAAM,qBAAqB,CAAC;AAMzC,MAAM,yBAA0B,SAAQ,QAAQ;IAK9C,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;YACzB,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,KAAK;SACnB;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,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAEhD,MAAM,CAAC,QAAQ,EAAE;YACf,KAAK;YACL,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,mBAAmB;YACvD,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI;YAC7B,QAAQ;YACR,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,WAAW;SAC5C,CAAC,CAAC;IACL,CAAC;CACF;AAED,yBAAyB,CAAC,QAAQ,GAAG,uBAAuB,CAAC;AAC7D,eAAe,yBAAyB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { StackViewport, utilities, BaseVolumeViewport, VideoViewport, } from '@cornerstonejs/core';
|
|
2
|
-
import
|
|
2
|
+
import ToolModes from '../../enums/ToolModes';
|
|
3
3
|
class BaseTool {
|
|
4
4
|
constructor(toolProps, defaultToolProps) {
|
|
5
5
|
const initialProps = utilities.deepMerge(defaultToolProps, toolProps);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,SAAS,EACT,kBAAkB,EAClB,aAAa,GACd,MAAM,qBAAqB,CAAC;AAE7B,OAAO,
|
|
1
|
+
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { StackViewport, VolumeViewport, VideoViewport, utilities as csUtils, } from '@cornerstonejs/core';
|
|
2
2
|
import filterAnnotationsWithinSlice from './filterAnnotationsWithinSlice';
|
|
3
|
-
import
|
|
3
|
+
import annotationFrameRange from '../annotationFrameRange';
|
|
4
4
|
const baseUrlExtractor = /(videoId:|imageId:|volumeId:)([a-zA-Z]*:)/;
|
|
5
5
|
export default function filterAnnotationsForDisplay(viewport, annotations) {
|
|
6
6
|
if (viewport instanceof StackViewport) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterAnnotationsForDisplay.js","sourceRoot":"","sources":["../../../../src/utilities/planar/filterAnnotationsForDisplay.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,cAAc,EACd,aAAa,EAEb,SAAS,IAAI,OAAO,GACrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAE1E,OAAO,
|
|
1
|
+
{"version":3,"file":"filterAnnotationsForDisplay.js","sourceRoot":"","sources":["../../../../src/utilities/planar/filterAnnotationsForDisplay.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,cAAc,EACd,aAAa,EAEb,SAAS,IAAI,OAAO,GACrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAE1E,OAAO,oBAAoB,MAAM,yBAAyB,CAAC;AAE3D,MAAM,gBAAgB,GAAG,2CAA2C,CAAC;AAQrE,MAAM,CAAC,OAAO,UAAU,2BAA2B,CACjD,QAAyB,EACzB,WAAwB;IAExB,IAAI,QAAQ,YAAY,aAAa,EAAE;QAErC,MAAM,OAAO,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAK7C,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;QAOnD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;YACvC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;gBACzB,OAAO,KAAK,CAAC;aACd;YAED,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC;YAEtD,IAAI,OAAO,KAAK,SAAS,EAAE;gBAGzB,OAAO,KAAK,CAAC;aACd;YAED,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;YAC5D,OAAO,iBAAiB,KAAK,QAAQ,CAAC;QACxC,CAAC,CAAC,CAAC;KACJ;SAAM,IAAI,QAAQ,YAAY,aAAa,EAAE;QAC5C,MAAM,mBAAmB,GAAW,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QAEtE,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;YACvC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE;gBACzB,OAAO,KAAK,CAAC;aACd;YACD,IAAI,UAAU,CAAC,QAAQ,CAAC,mBAAmB,KAAK,mBAAmB,EAAE;gBACnE,OAAO,KAAK,CAAC;aACd;YACD,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAC3D,gBAAgB,EAChB,EAAE,CACH,CAAC;YAEF,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;gBAClC,OAAO,KAAK,CAAC;aACd;YACD,MAAM,KAAK,GAAG,oBAAoB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAC7D,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;YAC9C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACxB,OAAO,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,WAAW,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;aAC3D;YAKD,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;KACJ;SAAM,IAAI,QAAQ,YAAY,cAAc,EAAE;QAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QAEpC,MAAM,EAAE,wBAAwB,EAAE,GAChC,OAAO,CAAC,oCAAoC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAGjE,OAAO,4BAA4B,CACjC,WAAW,EACX,MAAM,EACN,wBAAwB,CACzB,CAAC;KACH;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,iBAAiB,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC;KACjE;AACH,CAAC"}
|
|
@@ -9,12 +9,12 @@ export default function scroll(viewport, options) {
|
|
|
9
9
|
throw new Error('Scroll::Stack Viewport has no images');
|
|
10
10
|
}
|
|
11
11
|
const { type: viewportType } = viewport;
|
|
12
|
-
const { volumeId, delta } = options;
|
|
12
|
+
const { volumeId, delta, scrollSlabs } = options;
|
|
13
13
|
if (viewport instanceof StackViewport) {
|
|
14
14
|
viewport.scroll(delta, options.debounceLoading, options.loop);
|
|
15
15
|
}
|
|
16
16
|
else if (viewport instanceof VolumeViewport) {
|
|
17
|
-
scrollVolume(viewport, volumeId, delta);
|
|
17
|
+
scrollVolume(viewport, volumeId, delta, scrollSlabs);
|
|
18
18
|
}
|
|
19
19
|
else if (viewport instanceof VideoViewport) {
|
|
20
20
|
viewport.scroll(delta);
|
|
@@ -23,8 +23,9 @@ export default function scroll(viewport, options) {
|
|
|
23
23
|
throw new Error(`Not implemented for Viewport Type: ${viewportType}`);
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
|
-
export function scrollVolume(viewport, volumeId, delta) {
|
|
27
|
-
const
|
|
26
|
+
export function scrollVolume(viewport, volumeId, delta, scrollSlabs = false) {
|
|
27
|
+
const useSlabThickness = scrollSlabs;
|
|
28
|
+
const { numScrollSteps, currentStepIndex, sliceRangeInfo } = csUtils.getVolumeViewportScrollInfo(viewport, volumeId, useSlabThickness);
|
|
28
29
|
if (!sliceRangeInfo) {
|
|
29
30
|
return;
|
|
30
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scroll.js","sourceRoot":"","sources":["../../../src/utilities/scroll.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,cAAc,EACd,WAAW,EACX,MAAM,EACN,SAAS,IAAI,OAAO,EACpB,iBAAiB,EACjB,aAAa,GACd,MAAM,qBAAqB,CAAC;AAY7B,MAAM,CAAC,OAAO,UAAU,MAAM,CAC5B,QAAyB,EACzB,OAAsB;IAGtB,MAAM,cAAc,GAAG,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE3D,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;KAC3E;IAED,IACE,QAAQ,YAAY,aAAa;QACjC,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,KAAK,CAAC,EACnC;QACA,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;KACzD;IAED,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IACxC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"scroll.js","sourceRoot":"","sources":["../../../src/utilities/scroll.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,cAAc,EACd,WAAW,EACX,MAAM,EACN,SAAS,IAAI,OAAO,EACpB,iBAAiB,EACjB,aAAa,GACd,MAAM,qBAAqB,CAAC;AAY7B,MAAM,CAAC,OAAO,UAAU,MAAM,CAC5B,QAAyB,EACzB,OAAsB;IAGtB,MAAM,cAAc,GAAG,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE3D,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;KAC3E;IAED,IACE,QAAQ,YAAY,aAAa;QACjC,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,KAAK,CAAC,EACnC;QACA,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;KACzD;IAED,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IACxC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAEjD,IAAI,QAAQ,YAAY,aAAa,EAAE;QACrC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;KAC/D;SAAM,IAAI,QAAQ,YAAY,cAAc,EAAE;QAC7C,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;KACtD;SAAM,IAAI,QAAQ,YAAY,aAAa,EAAE;QAC5C,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KACxB;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,sCAAsC,YAAY,EAAE,CAAC,CAAC;KACvE;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,QAAwB,EACxB,QAAgB,EAChB,KAAa,EACb,WAAW,GAAG,KAAK;IAEnB,MAAM,gBAAgB,GAAG,WAAW,CAAC;IAErC,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,cAAc,EAAE,GACxD,OAAO,CAAC,2BAA2B,CAAC,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IAE5E,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO;KACR;IAED,MAAM,EAAE,UAAU,EAAE,wBAAwB,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;IACxE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEzD,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAClE,UAAU,EACV,QAAQ,EACR,UAAU,EACV,eAAe,EACf,wBAAwB,EACxB,KAAK,CACN,CAAC;IAEF,QAAQ,CAAC,SAAS,CAAC;QACjB,UAAU,EAAE,aAAa;QACzB,QAAQ,EAAE,WAAW;KACtB,CAAC,CAAC;IACH,QAAQ,CAAC,MAAM,EAAE,CAAC;IAElB,MAAM,gBAAgB,GAAG,gBAAgB,GAAG,KAAK,CAAC;IAElD,IACE,CAAC,gBAAgB,GAAG,cAAc,IAAI,gBAAgB,GAAG,CAAC,CAAC;QAC3D,QAAQ,CAAC,iBAAiB,EAAE,EAC5B;QAIA,MAAM,uBAAuB,GAAG;YAC9B,QAAQ;YACR,QAAQ;YACR,KAAK;YACL,gBAAgB;YAChB,gBAAgB;YAChB,cAAc;YACd,cAAc,EAAE,QAAQ,CAAC,iBAAiB,EAAE;SAC7C,CAAC;QAEF,OAAO,CAAC,YAAY,CAClB,WAAW,EACX,MAAM,CAAC,2BAA2B,EAClC,uBAAwE,CACzE,CAAC;KACH;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackScrollToolMouseWheelTool.d.ts","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAO1D,cAAM,yBAA0B,SAAQ,QAAQ;IAC9C,MAAM,CAAC,QAAQ,MAAC;IAEhB,cAAc,EAAE,GAAG,CAAC;gBAGlB,SAAS,KAAK,EACd,gBAAgB
|
|
1
|
+
{"version":3,"file":"StackScrollToolMouseWheelTool.d.ts","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAO1D,cAAM,yBAA0B,SAAQ,QAAQ;IAC9C,MAAM,CAAC,QAAQ,MAAC;IAEhB,cAAc,EAAE,GAAG,CAAC;gBAGlB,SAAS,KAAK,EACd,gBAAgB;;;;;;;;KAQf;IAKH,kBAAkB,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;CAkBnD;AAGD,eAAe,yBAAyB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"BaseTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE3E,MAAM,WAAW,SAAS;IAExB,WAAW,EAAE,MAAM,CAAC;IAEpB,yBAAyB,EAAE,gBAAgB,EAAE,CAAC;IAE9C,IAAI,EAAE,SAAS,CAAC;IAEhB,aAAa,EAAE;QACb,yBAAyB,CAAC,EAAE,OAAO,CAAC;QACpC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACjC,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC3C,CAAC;CACH;AAOD,uBAAe,QAAS,YAAW,SAAS;IAC1C,MAAM,CAAC,QAAQ,MAAC;IAET,yBAAyB,EAAE,gBAAgB,EAAE,CAAC;IAC9C,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnC,WAAW,EAAE,MAAM,CAAC;IAEpB,IAAI,EAAE,SAAS,CAAC;gBAEX,SAAS,EAAE,eAAe,EAAE,gBAAgB,EAAE,SAAS;IA2B5D,WAAW,IAAI,MAAM;IAWrB,mBAAmB,CACxB,cAAc,EAAE,KAAK,CAAC,eAAe,EACrC,aAAa,EAAE,OAAO,GACrB,GAAG;IASC,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAc7D,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IAgBpD,OAAO,CAAC,iBAAiB;IA8BzB,SAAS,CAAC,gBAAgB,CACxB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,KAAK,CAAC,gBAAgB,GACtC,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC,YAAY;IAgE9D,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,GAAG,MAAM,GAAG,SAAS;CAarE;AAKD,eAAe,QAAQ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScrollOptions.d.ts","sourceRoot":"","sources":["../../../src/types/ScrollOptions.ts"],"names":[],"mappings":"AAAA,aAAK,aAAa,GAAG;IAEnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ScrollOptions.d.ts","sourceRoot":"","sources":["../../../src/types/ScrollOptions.ts"],"names":[],"mappings":"AAAA,aAAK,aAAa,GAAG;IAEnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Types } from '@cornerstonejs/core';
|
|
2
|
-
import { Annotations } from '../../types';
|
|
2
|
+
import type { Annotations } from '../../types';
|
|
3
3
|
export default function filterAnnotationsForDisplay(viewport: Types.IViewport, annotations: Annotations): Annotations;
|
|
4
4
|
//# sourceMappingURL=filterAnnotationsForDisplay.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterAnnotationsForDisplay.d.ts","sourceRoot":"","sources":["../../../../src/utilities/planar/filterAnnotationsForDisplay.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,EAEN,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"filterAnnotationsForDisplay.d.ts","sourceRoot":"","sources":["../../../../src/utilities/planar/filterAnnotationsForDisplay.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,EAEN,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAW/C,MAAM,CAAC,OAAO,UAAU,2BAA2B,CACjD,QAAQ,EAAE,KAAK,CAAC,SAAS,EACzB,WAAW,EAAE,WAAW,GACvB,WAAW,CA6Eb"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Types, VolumeViewport } from '@cornerstonejs/core';
|
|
2
2
|
import { ScrollOptions } from '../types';
|
|
3
3
|
export default function scroll(viewport: Types.IViewport, options: ScrollOptions): void;
|
|
4
|
-
export declare function scrollVolume(viewport: VolumeViewport, volumeId: string, delta: number): void;
|
|
4
|
+
export declare function scrollVolume(viewport: VolumeViewport, volumeId: string, delta: number, scrollSlabs?: boolean): void;
|
|
5
5
|
//# sourceMappingURL=scroll.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scroll.d.ts","sourceRoot":"","sources":["../../../src/utilities/scroll.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EACL,cAAc,EAMf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAc,MAAM,UAAU,CAAC;AAWrD,MAAM,CAAC,OAAO,UAAU,MAAM,CAC5B,QAAQ,EAAE,KAAK,CAAC,SAAS,EACzB,OAAO,EAAE,aAAa,GACrB,IAAI,CA2BN;AAED,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"scroll.d.ts","sourceRoot":"","sources":["../../../src/utilities/scroll.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EACL,cAAc,EAMf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAc,MAAM,UAAU,CAAC;AAWrD,MAAM,CAAC,OAAO,UAAU,MAAM,CAC5B,QAAQ,EAAE,KAAK,CAAC,SAAS,EACzB,OAAO,EAAE,aAAa,GACrB,IAAI,CA2BN;AAED,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,WAAW,UAAQ,QAsDpB"}
|