@cornerstonejs/tools 0.18.1 → 0.19.0
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/store/ToolGroupManager/ToolGroup.d.ts +2 -0
- package/dist/cjs/store/ToolGroupManager/ToolGroup.js +8 -3
- package/dist/cjs/store/ToolGroupManager/ToolGroup.js.map +1 -1
- package/dist/cjs/tools/StackScrollTool.d.ts +3 -1
- package/dist/cjs/tools/StackScrollTool.js +33 -11
- package/dist/cjs/tools/StackScrollTool.js.map +1 -1
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.d.ts +4 -1
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js +17 -9
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js.map +1 -1
- package/dist/cjs/tools/ZoomTool.d.ts +13 -3
- package/dist/cjs/tools/ZoomTool.js +64 -4
- package/dist/cjs/tools/ZoomTool.js.map +1 -1
- package/dist/cjs/types/IToolGroup.d.ts +2 -1
- package/dist/cjs/types/JumpToSliceOptions.d.ts +1 -0
- package/dist/cjs/types/ScrollOptions.d.ts +1 -0
- package/dist/cjs/utilities/cine/playClip.js +8 -7
- package/dist/cjs/utilities/cine/playClip.js.map +1 -1
- package/dist/cjs/utilities/index.d.ts +3 -2
- package/dist/cjs/utilities/index.js +5 -3
- package/dist/cjs/utilities/index.js.map +1 -1
- package/dist/cjs/utilities/scroll.d.ts +4 -0
- package/dist/cjs/utilities/scroll.js +40 -0
- package/dist/cjs/utilities/scroll.js.map +1 -0
- package/dist/cjs/utilities/stackPrefetch/index.d.ts +2 -0
- package/dist/cjs/utilities/stackPrefetch/index.js +9 -0
- package/dist/cjs/utilities/stackPrefetch/index.js.map +1 -0
- package/dist/cjs/utilities/stackPrefetch/stackPrefetch.d.ts +8 -0
- package/dist/cjs/utilities/stackPrefetch/stackPrefetch.js +232 -0
- package/dist/cjs/utilities/stackPrefetch/stackPrefetch.js.map +1 -0
- package/dist/cjs/utilities/stackPrefetch/state.d.ts +3 -0
- package/dist/cjs/utilities/stackPrefetch/state.js +18 -0
- package/dist/cjs/utilities/stackPrefetch/state.js.map +1 -0
- package/dist/cjs/utilities/viewport/jumpToSlice.d.ts +1 -1
- package/dist/cjs/utilities/viewport/jumpToSlice.js +9 -7
- package/dist/cjs/utilities/viewport/jumpToSlice.js.map +1 -1
- package/dist/esm/store/ToolGroupManager/ToolGroup.d.ts +2 -0
- package/dist/esm/store/ToolGroupManager/ToolGroup.js +9 -4
- package/dist/esm/store/ToolGroupManager/ToolGroup.js.map +1 -1
- package/dist/esm/tools/StackScrollTool.d.ts +3 -1
- package/dist/esm/tools/StackScrollTool.js +34 -12
- package/dist/esm/tools/StackScrollTool.js.map +1 -1
- package/dist/esm/tools/StackScrollToolMouseWheelTool.d.ts +4 -1
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js +17 -9
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js.map +1 -1
- package/dist/esm/tools/ZoomTool.d.ts +13 -3
- package/dist/esm/tools/ZoomTool.js +64 -4
- package/dist/esm/tools/ZoomTool.js.map +1 -1
- package/dist/esm/types/IToolGroup.d.ts +2 -1
- package/dist/esm/types/JumpToSliceOptions.d.ts +1 -0
- package/dist/esm/types/ScrollOptions.d.ts +1 -0
- package/dist/esm/utilities/cine/playClip.js +8 -7
- package/dist/esm/utilities/cine/playClip.js.map +1 -1
- package/dist/esm/utilities/index.d.ts +3 -2
- package/dist/esm/utilities/index.js +3 -2
- package/dist/esm/utilities/index.js.map +1 -1
- package/dist/esm/utilities/scroll.d.ts +4 -0
- package/dist/esm/utilities/scroll.js +35 -0
- package/dist/esm/utilities/scroll.js.map +1 -0
- package/dist/esm/utilities/stackPrefetch/index.d.ts +2 -0
- package/dist/esm/utilities/stackPrefetch/index.js +3 -0
- package/dist/esm/utilities/stackPrefetch/index.js.map +1 -0
- package/dist/esm/utilities/stackPrefetch/stackPrefetch.d.ts +8 -0
- package/dist/esm/utilities/stackPrefetch/stackPrefetch.js +226 -0
- package/dist/esm/utilities/stackPrefetch/stackPrefetch.js.map +1 -0
- package/dist/esm/utilities/stackPrefetch/state.d.ts +3 -0
- package/dist/esm/utilities/stackPrefetch/state.js +14 -0
- package/dist/esm/utilities/stackPrefetch/state.js.map +1 -0
- package/dist/esm/utilities/viewport/jumpToSlice.d.ts +1 -1
- package/dist/esm/utilities/viewport/jumpToSlice.js +9 -7
- package/dist/esm/utilities/viewport/jumpToSlice.js.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.LICENSE.txt +2 -0
- package/dist/umd/index.js.map +1 -1
- package/package.json +4 -4
- package/dist/cjs/utilities/stackScrollTool/index.d.ts +0 -2
- package/dist/cjs/utilities/stackScrollTool/index.js +0 -9
- package/dist/cjs/utilities/stackScrollTool/index.js.map +0 -1
- package/dist/cjs/utilities/stackScrollTool/scrollThroughStack.d.ts +0 -3
- package/dist/cjs/utilities/stackScrollTool/scrollThroughStack.js +0 -43
- package/dist/cjs/utilities/stackScrollTool/scrollThroughStack.js.map +0 -1
- package/dist/esm/utilities/stackScrollTool/index.d.ts +0 -2
- package/dist/esm/utilities/stackScrollTool/index.js +0 -3
- package/dist/esm/utilities/stackScrollTool/index.js.map +0 -1
- package/dist/esm/utilities/stackScrollTool/scrollThroughStack.d.ts +0 -3
- package/dist/esm/utilities/stackScrollTool/scrollThroughStack.js +0 -37
- package/dist/esm/utilities/stackScrollTool/scrollThroughStack.js.map +0 -1
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getConfiguration = exports.setConfiguration = exports.disable = exports.enable = void 0;
|
|
4
|
+
const stackPrefetch_1 = require("./stackPrefetch");
|
|
5
|
+
Object.defineProperty(exports, "enable", { enumerable: true, get: function () { return stackPrefetch_1.enable; } });
|
|
6
|
+
Object.defineProperty(exports, "disable", { enumerable: true, get: function () { return stackPrefetch_1.disable; } });
|
|
7
|
+
Object.defineProperty(exports, "setConfiguration", { enumerable: true, get: function () { return stackPrefetch_1.setConfiguration; } });
|
|
8
|
+
Object.defineProperty(exports, "getConfiguration", { enumerable: true, get: function () { return stackPrefetch_1.getConfiguration; } });
|
|
9
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utilities/stackPrefetch/index.ts"],"names":[],"mappings":";;;AAAA,mDAKyB;AAEhB,uFANP,sBAAM,OAMO;AAAE,wFALf,uBAAO,OAKe;AAAE,iGAJxB,gCAAgB,OAIwB;AAAE,iGAH1C,gCAAgB,OAG0C"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
declare function enable(element: any): void;
|
|
2
|
+
declare function disable(element: any): void;
|
|
3
|
+
declare function getConfiguration(): {
|
|
4
|
+
maxImagesToPrefetch: number;
|
|
5
|
+
preserveExistingPool: boolean;
|
|
6
|
+
};
|
|
7
|
+
declare function setConfiguration(config: any): void;
|
|
8
|
+
export { enable, disable, getConfiguration, setConfiguration };
|
|
@@ -0,0 +1,232 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setConfiguration = exports.getConfiguration = exports.disable = exports.enable = void 0;
|
|
4
|
+
const core_1 = require("@cornerstonejs/core");
|
|
5
|
+
const state_1 = require("./state");
|
|
6
|
+
const requestType = core_1.Enums.RequestType.Prefetch;
|
|
7
|
+
const priority = 0;
|
|
8
|
+
const addToBeginning = true;
|
|
9
|
+
let configuration = {
|
|
10
|
+
maxImagesToPrefetch: Infinity,
|
|
11
|
+
preserveExistingPool: false,
|
|
12
|
+
};
|
|
13
|
+
let resetPrefetchTimeout;
|
|
14
|
+
const resetPrefetchDelay = 10;
|
|
15
|
+
function range(lowEnd, highEnd) {
|
|
16
|
+
lowEnd = Math.round(lowEnd) || 0;
|
|
17
|
+
highEnd = Math.round(highEnd) || 0;
|
|
18
|
+
const arr = [];
|
|
19
|
+
let c = highEnd - lowEnd + 1;
|
|
20
|
+
if (c <= 0) {
|
|
21
|
+
return arr;
|
|
22
|
+
}
|
|
23
|
+
while (c--) {
|
|
24
|
+
arr[c] = highEnd--;
|
|
25
|
+
}
|
|
26
|
+
return arr;
|
|
27
|
+
}
|
|
28
|
+
function nearestIndex(arr, x) {
|
|
29
|
+
let low = 0;
|
|
30
|
+
let high = arr.length - 1;
|
|
31
|
+
arr.forEach((v, idx) => {
|
|
32
|
+
if (v < x) {
|
|
33
|
+
low = Math.max(idx, low);
|
|
34
|
+
}
|
|
35
|
+
else if (v > x) {
|
|
36
|
+
high = Math.min(idx, high);
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
return { low, high };
|
|
40
|
+
}
|
|
41
|
+
function getStackData(element) {
|
|
42
|
+
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
43
|
+
if (!enabledElement) {
|
|
44
|
+
throw new Error('stackPrefetch: element must be a valid Cornerstone enabled element');
|
|
45
|
+
}
|
|
46
|
+
const { viewport } = enabledElement;
|
|
47
|
+
if (!(viewport instanceof core_1.StackViewport)) {
|
|
48
|
+
throw new Error('stackPrefetch: element must be a StackViewport, VolumeViewport stackPrefetch not yet implemented');
|
|
49
|
+
}
|
|
50
|
+
return {
|
|
51
|
+
currentImageIdIndex: viewport.getCurrentImageIdIndex(),
|
|
52
|
+
imageIds: viewport.getImageIds(),
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
function prefetch(element) {
|
|
56
|
+
const stackPrefetchData = (0, state_1.getToolState)(element);
|
|
57
|
+
if (!stackPrefetchData) {
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
const stackPrefetch = stackPrefetchData || {};
|
|
61
|
+
const stack = getStackData(element);
|
|
62
|
+
if (!stack || !stack.imageIds || stack.imageIds.length === 0) {
|
|
63
|
+
console.warn('CornerstoneTools.stackPrefetch: No images in stack.');
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
if (!stackPrefetch.indicesToRequest ||
|
|
67
|
+
!stackPrefetch.indicesToRequest.length) {
|
|
68
|
+
stackPrefetch.enabled = false;
|
|
69
|
+
}
|
|
70
|
+
if (stackPrefetch.enabled === false) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
function removeFromList(imageIdIndex) {
|
|
74
|
+
const index = stackPrefetch.indicesToRequest.indexOf(imageIdIndex);
|
|
75
|
+
if (index > -1) {
|
|
76
|
+
stackPrefetch.indicesToRequest.splice(index, 1);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
stackPrefetchData.indicesToRequest.sort((a, b) => a - b);
|
|
80
|
+
const indicesToRequestCopy = stackPrefetch.indicesToRequest.slice();
|
|
81
|
+
indicesToRequestCopy.forEach(function (imageIdIndex) {
|
|
82
|
+
const imageId = stack.imageIds[imageIdIndex];
|
|
83
|
+
if (!imageId) {
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
86
|
+
const imageLoadObject = core_1.cache.getImageLoadObject(imageId);
|
|
87
|
+
if (imageLoadObject) {
|
|
88
|
+
removeFromList(imageIdIndex);
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
if (!stackPrefetch.indicesToRequest.length) {
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
if (!configuration.preserveExistingPool) {
|
|
95
|
+
core_1.imageLoadPoolManager.clearRequestStack(requestType);
|
|
96
|
+
}
|
|
97
|
+
const nearest = nearestIndex(stackPrefetch.indicesToRequest, stack.currentImageIdIndex);
|
|
98
|
+
let imageId;
|
|
99
|
+
let nextImageIdIndex;
|
|
100
|
+
const preventCache = false;
|
|
101
|
+
function doneCallback(image) {
|
|
102
|
+
console.log('prefetch done: %s', image.imageId);
|
|
103
|
+
const imageIdIndex = stack.imageIds.indexOf(image.imageId);
|
|
104
|
+
removeFromList(imageIdIndex);
|
|
105
|
+
}
|
|
106
|
+
let lowerIndex = nearest.low;
|
|
107
|
+
let higherIndex = nearest.high;
|
|
108
|
+
const imageIdsToPrefetch = [];
|
|
109
|
+
while (lowerIndex >= 0 ||
|
|
110
|
+
higherIndex < stackPrefetch.indicesToRequest.length) {
|
|
111
|
+
const currentIndex = stack.currentImageIdIndex;
|
|
112
|
+
const shouldSkipLower = currentIndex - stackPrefetch.indicesToRequest[lowerIndex] >
|
|
113
|
+
configuration.maxImagesToPrefetch;
|
|
114
|
+
const shouldSkipHigher = stackPrefetch.indicesToRequest[higherIndex] - currentIndex >
|
|
115
|
+
configuration.maxImagesToPrefetch;
|
|
116
|
+
const shouldLoadLower = !shouldSkipLower && lowerIndex >= 0;
|
|
117
|
+
const shouldLoadHigher = !shouldSkipHigher && higherIndex < stackPrefetch.indicesToRequest.length;
|
|
118
|
+
if (!shouldLoadHigher && !shouldLoadLower) {
|
|
119
|
+
break;
|
|
120
|
+
}
|
|
121
|
+
if (shouldLoadLower) {
|
|
122
|
+
nextImageIdIndex = stackPrefetch.indicesToRequest[lowerIndex--];
|
|
123
|
+
imageId = stack.imageIds[nextImageIdIndex];
|
|
124
|
+
imageIdsToPrefetch.push(imageId);
|
|
125
|
+
}
|
|
126
|
+
if (shouldLoadHigher) {
|
|
127
|
+
nextImageIdIndex = stackPrefetch.indicesToRequest[higherIndex++];
|
|
128
|
+
imageId = stack.imageIds[nextImageIdIndex];
|
|
129
|
+
imageIdsToPrefetch.push(imageId);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
const requestFn = (imageId, options) => core_1.imageLoader.loadAndCacheImage(imageId, options);
|
|
133
|
+
imageIdsToPrefetch.forEach((imageId) => {
|
|
134
|
+
const scalingParameters = core_1.utilities.getScalingParameters(imageId);
|
|
135
|
+
const options = {
|
|
136
|
+
targetBuffer: {
|
|
137
|
+
type: 'Float32Array',
|
|
138
|
+
offset: null,
|
|
139
|
+
length: null,
|
|
140
|
+
},
|
|
141
|
+
preScale: {
|
|
142
|
+
scalingParameters,
|
|
143
|
+
},
|
|
144
|
+
requestType,
|
|
145
|
+
};
|
|
146
|
+
core_1.imageLoadPoolManager.addRequest(requestFn.bind(null, imageId, options), requestType, {
|
|
147
|
+
imageId,
|
|
148
|
+
}, priority);
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
function getPromiseRemovedHandler(element) {
|
|
152
|
+
return function (e) {
|
|
153
|
+
const eventData = e.detail;
|
|
154
|
+
let stackData;
|
|
155
|
+
try {
|
|
156
|
+
stackData = getStackData(element);
|
|
157
|
+
}
|
|
158
|
+
catch (error) {
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
if (!stackData || !stackData.imageIds || stackData.imageIds.length === 0) {
|
|
162
|
+
return;
|
|
163
|
+
}
|
|
164
|
+
const stack = stackData;
|
|
165
|
+
const imageIdIndex = stack.imageIds.indexOf(eventData.imageId);
|
|
166
|
+
if (imageIdIndex < 0) {
|
|
167
|
+
return;
|
|
168
|
+
}
|
|
169
|
+
const stackPrefetchData = (0, state_1.getToolState)(element);
|
|
170
|
+
if (!stackPrefetchData ||
|
|
171
|
+
!stackPrefetchData.data ||
|
|
172
|
+
!stackPrefetchData.data.length) {
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
175
|
+
stackPrefetchData.indicesToRequest.push(imageIdIndex);
|
|
176
|
+
};
|
|
177
|
+
}
|
|
178
|
+
function onImageUpdated(e) {
|
|
179
|
+
clearTimeout(resetPrefetchTimeout);
|
|
180
|
+
resetPrefetchTimeout = setTimeout(function () {
|
|
181
|
+
const element = e.target;
|
|
182
|
+
try {
|
|
183
|
+
prefetch(element);
|
|
184
|
+
}
|
|
185
|
+
catch (error) {
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
188
|
+
}, resetPrefetchDelay);
|
|
189
|
+
}
|
|
190
|
+
function enable(element) {
|
|
191
|
+
const stack = getStackData(element);
|
|
192
|
+
if (!stack || !stack.imageIds || stack.imageIds.length === 0) {
|
|
193
|
+
console.warn('CornerstoneTools.stackPrefetch: No images in stack.');
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
196
|
+
const stackPrefetchData = {
|
|
197
|
+
indicesToRequest: range(0, stack.imageIds.length - 1),
|
|
198
|
+
enabled: true,
|
|
199
|
+
direction: 1,
|
|
200
|
+
};
|
|
201
|
+
const indexOfCurrentImage = stackPrefetchData.indicesToRequest.indexOf(stack.currentImageIdIndex);
|
|
202
|
+
stackPrefetchData.indicesToRequest.splice(indexOfCurrentImage, 1);
|
|
203
|
+
(0, state_1.addToolState)(element, stackPrefetchData);
|
|
204
|
+
prefetch(element);
|
|
205
|
+
element.removeEventListener(core_1.Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
|
|
206
|
+
element.addEventListener(core_1.Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
|
|
207
|
+
const promiseRemovedHandler = getPromiseRemovedHandler(element);
|
|
208
|
+
core_1.eventTarget.removeEventListener(core_1.Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
|
|
209
|
+
core_1.eventTarget.addEventListener(core_1.Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
|
|
210
|
+
}
|
|
211
|
+
exports.enable = enable;
|
|
212
|
+
function disable(element) {
|
|
213
|
+
clearTimeout(resetPrefetchTimeout);
|
|
214
|
+
element.removeEventListener(core_1.Enums.Events.STACK_NEW_IMAGE, onImageUpdated);
|
|
215
|
+
const promiseRemovedHandler = getPromiseRemovedHandler(element);
|
|
216
|
+
core_1.eventTarget.removeEventListener(core_1.Enums.Events.IMAGE_CACHE_IMAGE_REMOVED, promiseRemovedHandler);
|
|
217
|
+
const stackPrefetchData = (0, state_1.getToolState)(element);
|
|
218
|
+
if (stackPrefetchData && stackPrefetchData.data.length) {
|
|
219
|
+
stackPrefetchData.enabled = false;
|
|
220
|
+
core_1.imageLoadPoolManager.clearRequestStack(requestType);
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
exports.disable = disable;
|
|
224
|
+
function getConfiguration() {
|
|
225
|
+
return configuration;
|
|
226
|
+
}
|
|
227
|
+
exports.getConfiguration = getConfiguration;
|
|
228
|
+
function setConfiguration(config) {
|
|
229
|
+
configuration = config;
|
|
230
|
+
}
|
|
231
|
+
exports.setConfiguration = setConfiguration;
|
|
232
|
+
//# sourceMappingURL=stackPrefetch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stackPrefetch.js","sourceRoot":"","sources":["../../../../src/utilities/stackPrefetch/stackPrefetch.ts"],"names":[],"mappings":";;;AAAA,8CAS6B;AAC7B,mCAAqD;AAErD,MAAM,WAAW,GAAG,YAAK,CAAC,WAAW,CAAC,QAAQ,CAAC;AAC/C,MAAM,QAAQ,GAAG,CAAC,CAAC;AACnB,MAAM,cAAc,GAAG,IAAI,CAAC;AAE5B,IAAI,aAAa,GAAG;IAClB,mBAAmB,EAAE,QAAQ;IAC7B,oBAAoB,EAAE,KAAK;CAC5B,CAAC;AAEF,IAAI,oBAAoB,CAAC;AACzB,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAE9B,SAAS,KAAK,CAAC,MAAM,EAAE,OAAO;IAG5B,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,GAAG,GAAG,EAAE,CAAC;IACf,IAAI,CAAC,GAAG,OAAO,GAAG,MAAM,GAAG,CAAC,CAAC;IAE7B,IAAI,CAAC,IAAI,CAAC,EAAE;QACV,OAAO,GAAG,CAAC;KACZ;IAED,OAAO,CAAC,EAAE,EAAE;QACV,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC;KACpB;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,YAAY,CAAC,GAAG,EAAE,CAAC;IAG1B,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,IAAI,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;IAE1B,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;QACrB,IAAI,CAAC,GAAG,CAAC,EAAE;YACT,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SAC1B;aAAM,IAAI,CAAC,GAAG,CAAC,EAAE;YAChB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;SAC5B;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;AACvB,CAAC;AAED,SAAS,YAAY,CAAC,OAAO;IAC3B,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAElD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,oEAAoE,CACrE,CAAC;KACH;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,IAAI,CAAC,CAAC,QAAQ,YAAY,oBAAa,CAAC,EAAE;QACxC,MAAM,IAAI,KAAK,CACb,kGAAkG,CACnG,CAAC;KACH;IAED,OAAO;QACL,mBAAmB,EAAE,QAAQ,CAAC,sBAAsB,EAAE;QACtD,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAAE;KACjC,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,OAAO;IAEvB,MAAM,iBAAiB,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;IAEhD,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO;KACR;IAED,MAAM,aAAa,GAAG,iBAAiB,IAAI,EAAE,CAAC;IAC9C,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IAEpC,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5D,OAAO,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;QACpE,OAAO;KACR;IAGD,IACE,CAAC,aAAa,CAAC,gBAAgB;QAC/B,CAAC,aAAa,CAAC,gBAAgB,CAAC,MAAM,EACtC;QACA,aAAa,CAAC,OAAO,GAAG,KAAK,CAAC;KAC/B;IAGD,IAAI,aAAa,CAAC,OAAO,KAAK,KAAK,EAAE;QACnC,OAAO;KACR;IAID,SAAS,cAAc,CAAC,YAAY;QAClC,MAAM,KAAK,GAAG,aAAa,CAAC,gBAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAEnE,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;YAEd,aAAa,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SACjD;IACH,CAAC;IAID,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACzD,MAAM,oBAAoB,GAAG,aAAa,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;IAEpE,oBAAoB,CAAC,OAAO,CAAC,UAAU,YAAY;QACjD,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAE7C,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QAED,MAAM,eAAe,GAAG,YAAK,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAE1D,IAAI,eAAe,EAAE;YACnB,cAAc,CAAC,YAAY,CAAC,CAAC;SAC9B;IACH,CAAC,CAAC,CAAC;IAIH,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,MAAM,EAAE;QAC1C,OAAO;KACR;IAGD,IAAI,CAAC,aAAa,CAAC,oBAAoB,EAAE;QACvC,2BAAoB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;KACrD;IAGD,MAAM,OAAO,GAAG,YAAY,CAC1B,aAAa,CAAC,gBAAgB,EAC9B,KAAK,CAAC,mBAAmB,CAC1B,CAAC;IAEF,IAAI,OAAO,CAAC;IACZ,IAAI,gBAAgB,CAAC;IACrB,MAAM,YAAY,GAAG,KAAK,CAAC;IAE3B,SAAS,YAAY,CAAC,KAAK;QACzB,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAE3D,cAAc,CAAC,YAAY,CAAC,CAAC;IAuB/B,CAAC;IAcD,IAAI,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC;IAC7B,IAAI,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAC/B,MAAM,kBAAkB,GAAG,EAAE,CAAC;IAE9B,OACE,UAAU,IAAI,CAAC;QACf,WAAW,GAAG,aAAa,CAAC,gBAAgB,CAAC,MAAM,EACnD;QACA,MAAM,YAAY,GAAG,KAAK,CAAC,mBAAmB,CAAC;QAC/C,MAAM,eAAe,GACnB,YAAY,GAAG,aAAa,CAAC,gBAAgB,CAAC,UAAU,CAAC;YACzD,aAAa,CAAC,mBAAmB,CAAC;QACpC,MAAM,gBAAgB,GACpB,aAAa,CAAC,gBAAgB,CAAC,WAAW,CAAC,GAAG,YAAY;YAC1D,aAAa,CAAC,mBAAmB,CAAC;QAEpC,MAAM,eAAe,GAAG,CAAC,eAAe,IAAI,UAAU,IAAI,CAAC,CAAC;QAC5D,MAAM,gBAAgB,GACpB,CAAC,gBAAgB,IAAI,WAAW,GAAG,aAAa,CAAC,gBAAgB,CAAC,MAAM,CAAC;QAE3E,IAAI,CAAC,gBAAgB,IAAI,CAAC,eAAe,EAAE;YACzC,MAAM;SACP;QAED,IAAI,eAAe,EAAE;YACnB,gBAAgB,GAAG,aAAa,CAAC,gBAAgB,CAAC,UAAU,EAAE,CAAC,CAAC;YAChE,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;YAC3C,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAClC;QAED,IAAI,gBAAgB,EAAE;YACpB,gBAAgB,GAAG,aAAa,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC;YACjE,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;YAC3C,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAClC;KACF;IAQD,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CACrC,kBAAW,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAElD,kBAAkB,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACrC,MAAM,iBAAiB,GAAG,gBAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAIhE,MAAM,OAAO,GAAG;YACd,YAAY,EAAE;gBACZ,IAAI,EAAE,cAAc;gBACpB,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;aACb;YACD,QAAQ,EAAE;gBACR,iBAAiB;aAClB;YACD,WAAW;SACZ,CAAC;QAEF,2BAAoB,CAAC,UAAU,CAC7B,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EACtC,WAAW,EAEX;YACE,OAAO;SACR,EACD,QAAQ,CAET,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,wBAAwB,CAAC,OAAO;IACvC,OAAO,UAAU,CAAC;QAChB,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC;QAK3B,IAAI,SAAS,CAAC;QAEd,IAAI;YAEF,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;SACnC;QAAC,OAAO,KAAK,EAAE;YACd,OAAO;SACR;QAED,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACxE,OAAO;SACR;QAED,MAAM,KAAK,GAAG,SAAS,CAAC;QACxB,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAI/D,IAAI,YAAY,GAAG,CAAC,EAAE;YACpB,OAAO;SACR;QAED,MAAM,iBAAiB,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;QAEhD,IACE,CAAC,iBAAiB;YAClB,CAAC,iBAAiB,CAAC,IAAI;YACvB,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAC9B;YACA,OAAO;SACR;QAED,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACxD,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,CAAC;IAGvB,YAAY,CAAC,oBAAoB,CAAC,CAAC;IACnC,oBAAoB,GAAG,UAAU,CAAC;QAChC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC;QAIzB,IAAI;YACF,QAAQ,CAAC,OAAO,CAAC,CAAC;SACnB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO;SACR;IACH,CAAC,EAAE,kBAAkB,CAAC,CAAC;AACzB,CAAC;AAED,SAAS,MAAM,CAAC,OAAO;IACrB,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IAEpC,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5D,OAAO,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;QACpE,OAAO;KACR;IAGD,MAAM,iBAAiB,GAAG;QACxB,gBAAgB,EAAE,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACrD,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,CAAC;KACb,CAAC;IAGF,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,CACpE,KAAK,CAAC,mBAAmB,CAC1B,CAAC;IAEF,iBAAiB,CAAC,gBAAgB,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC;IAElE,IAAA,oBAAY,EAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IAEzC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAElB,OAAO,CAAC,mBAAmB,CAAC,YAAK,CAAC,MAAM,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;IAC1E,OAAO,CAAC,gBAAgB,CAAC,YAAK,CAAC,MAAM,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;IAEvE,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAEhE,kBAAW,CAAC,mBAAmB,CAC7B,YAAK,CAAC,MAAM,CAAC,yBAAyB,EACtC,qBAAqB,CACtB,CAAC;IACF,kBAAW,CAAC,gBAAgB,CAC1B,YAAK,CAAC,MAAM,CAAC,yBAAyB,EACtC,qBAAqB,CACtB,CAAC;AACJ,CAAC;AAgCQ,wBAAM;AA9Bf,SAAS,OAAO,CAAC,OAAO;IACtB,YAAY,CAAC,oBAAoB,CAAC,CAAC;IACnC,OAAO,CAAC,mBAAmB,CAAC,YAAK,CAAC,MAAM,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;IAE1E,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAEhE,kBAAW,CAAC,mBAAmB,CAC7B,YAAK,CAAC,MAAM,CAAC,yBAAyB,EACtC,qBAAqB,CACtB,CAAC;IAEF,MAAM,iBAAiB,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;IAGhD,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE;QACtD,iBAAiB,CAAC,OAAO,GAAG,KAAK,CAAC;QAGlC,2BAAoB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;KACrD;AACH,CAAC;AAUgB,0BAAO;AARxB,SAAS,gBAAgB;IACvB,OAAO,aAAa,CAAC;AACvB,CAAC;AAMyB,4CAAgB;AAJ1C,SAAS,gBAAgB,CAAC,MAAM;IAC9B,aAAa,GAAG,MAAM,CAAC;AACzB,CAAC;AAE2C,4CAAgB"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getToolState = exports.addToolState = void 0;
|
|
4
|
+
const core_1 = require("@cornerstonejs/core");
|
|
5
|
+
const state = {};
|
|
6
|
+
function addToolState(element, data) {
|
|
7
|
+
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
8
|
+
const { viewportId } = enabledElement;
|
|
9
|
+
state[viewportId] = data;
|
|
10
|
+
}
|
|
11
|
+
exports.addToolState = addToolState;
|
|
12
|
+
function getToolState(element) {
|
|
13
|
+
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
14
|
+
const { viewportId } = enabledElement;
|
|
15
|
+
return state[viewportId];
|
|
16
|
+
}
|
|
17
|
+
exports.getToolState = getToolState;
|
|
18
|
+
//# sourceMappingURL=state.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../src/utilities/stackPrefetch/state.ts"],"names":[],"mappings":";;;AAAA,8CAAwD;AAExD,MAAM,KAAK,GAAwB,EAAE,CAAC;AAEtC,SAAS,YAAY,CAAC,OAAuB,EAAE,IAAI;IACjD,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;IACtC,KAAK,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;AAC3B,CAAC;AAQQ,oCAAY;AANrB,SAAS,YAAY,CAAC,OAAuB;IAC3C,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;IACtC,OAAO,KAAK,CAAC,UAAU,CAAC,CAAC;AAC3B,CAAC;AAEsB,oCAAY"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import JumpToSliceOptions from '../../types/JumpToSliceOptions';
|
|
2
|
-
declare function jumpToSlice(element: HTMLDivElement, options
|
|
2
|
+
declare function jumpToSlice(element: HTMLDivElement, options?: JumpToSliceOptions): Promise<void>;
|
|
3
3
|
export default jumpToSlice;
|
|
@@ -14,26 +14,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const core_1 = require("@cornerstonejs/core");
|
|
16
16
|
const clip_1 = __importDefault(require("../clip"));
|
|
17
|
-
const
|
|
18
|
-
function jumpToSlice(element, options) {
|
|
17
|
+
const scroll_1 = __importDefault(require("../scroll"));
|
|
18
|
+
function jumpToSlice(element, options = {}) {
|
|
19
19
|
return __awaiter(this, void 0, void 0, function* () {
|
|
20
|
-
const { imageIndex } = options;
|
|
20
|
+
const { imageIndex, debounceLoading } = options;
|
|
21
21
|
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
22
22
|
if (!enabledElement) {
|
|
23
23
|
throw new Error('Element has been disabled');
|
|
24
24
|
}
|
|
25
25
|
const { viewport } = enabledElement;
|
|
26
|
-
const { imageIndex: currentImageIndex, numberOfSlices } = _getImageSliceData(viewport);
|
|
26
|
+
const { imageIndex: currentImageIndex, numberOfSlices } = _getImageSliceData(viewport, debounceLoading);
|
|
27
27
|
const imageIndexToJump = _getImageIndexToJump(numberOfSlices, imageIndex);
|
|
28
28
|
const delta = imageIndexToJump - currentImageIndex;
|
|
29
|
-
(0,
|
|
29
|
+
(0, scroll_1.default)(viewport, { delta, debounceLoading });
|
|
30
30
|
});
|
|
31
31
|
}
|
|
32
|
-
function _getImageSliceData(viewport) {
|
|
32
|
+
function _getImageSliceData(viewport, debounceLoading) {
|
|
33
33
|
if (viewport instanceof core_1.StackViewport) {
|
|
34
34
|
return {
|
|
35
35
|
numberOfSlices: viewport.getImageIds().length,
|
|
36
|
-
imageIndex:
|
|
36
|
+
imageIndex: debounceLoading
|
|
37
|
+
? viewport.getTargetImageIdIndex()
|
|
38
|
+
: viewport.getCurrentImageIdIndex(),
|
|
37
39
|
};
|
|
38
40
|
}
|
|
39
41
|
else if (viewport instanceof core_1.VolumeViewport) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jumpToSlice.js","sourceRoot":"","sources":["../../../../src/utilities/viewport/jumpToSlice.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,8CAM6B;AAE7B,mDAA2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"jumpToSlice.js","sourceRoot":"","sources":["../../../../src/utilities/viewport/jumpToSlice.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,8CAM6B;AAE7B,mDAA2B;AAC3B,uDAA+B;AAY/B,SAAe,WAAW,CACxB,OAAuB,EACvB,UAAU,EAAwB;;QAElC,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;QAChD,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAElD,IAAI,CAAC,cAAc,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;QAED,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QAEpC,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,cAAc,EAAE,GAAG,kBAAkB,CAC1E,QAAQ,EACR,eAAe,CAChB,CAAC;QAEF,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAC1E,MAAM,KAAK,GAAG,gBAAgB,GAAG,iBAAiB,CAAC;QAEnD,IAAA,gBAAM,EAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;IAC/C,CAAC;CAAA;AAED,SAAS,kBAAkB,CACzB,QAAsD,EACtD,eAAyB;IAEzB,IAAI,QAAQ,YAAY,oBAAa,EAAE;QACrC,OAAO;YACL,cAAc,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM;YAC7C,UAAU,EAAE,eAAe;gBACzB,CAAC,CAAC,QAAQ,CAAC,qBAAqB,EAAE;gBAClC,CAAC,CAAC,QAAQ,CAAC,sBAAsB,EAAE;SACtC,CAAC;KACH;SAAM,IAAI,QAAQ,YAAY,qBAAc,EAAE;QAC7C,OAAO,gBAAO,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAC;KAC7D;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;KAC9C;AACH,CAAC;AAED,SAAS,oBAAoB,CAC3B,cAAsB,EACtB,UAAkB;IAElB,MAAM,cAAc,GAAG,cAAc,GAAG,CAAC,CAAC;IAE1C,OAAO,IAAA,cAAI,EAAC,UAAU,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC;AAC7C,CAAC;AAED,kBAAe,WAAW,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Types } from '@cornerstonejs/core';
|
|
1
2
|
import { IToolGroup, SetToolBindingsType, ToolOptionsType } from '../../types';
|
|
2
3
|
import { MouseCursor } from '../../cursors';
|
|
3
4
|
export default class ToolGroup implements IToolGroup {
|
|
@@ -7,6 +8,7 @@ export default class ToolGroup implements IToolGroup {
|
|
|
7
8
|
_toolInstances: {};
|
|
8
9
|
constructor(id: string);
|
|
9
10
|
getViewportIds(): string[];
|
|
11
|
+
getViewportsInfo(): Array<Types.IViewportId>;
|
|
10
12
|
getToolInstance(toolName: string): any;
|
|
11
13
|
addTool(toolName: string, configuration?: {}): void;
|
|
12
14
|
addViewport(viewportId: string, renderingEngineId?: string): void;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MouseBindings, ToolModes } from '../../enums';
|
|
2
|
-
import { getRenderingEngine, getRenderingEngines, Settings, } from '@cornerstonejs/core';
|
|
2
|
+
import { getRenderingEngine, getRenderingEngines, getEnabledElementByIds, Settings, } from '@cornerstonejs/core';
|
|
3
3
|
import { state } from '../index';
|
|
4
4
|
import { MouseCursor, SVGMouseCursor } from '../../cursors';
|
|
5
5
|
import { initElementCursor } from '../../cursors/elementCursor';
|
|
@@ -14,6 +14,9 @@ export default class ToolGroup {
|
|
|
14
14
|
getViewportIds() {
|
|
15
15
|
return this.viewportsInfo.map(({ viewportId }) => viewportId);
|
|
16
16
|
}
|
|
17
|
+
getViewportsInfo() {
|
|
18
|
+
return Object.assign({}, this.viewportsInfo);
|
|
19
|
+
}
|
|
17
20
|
getToolInstance(toolName) {
|
|
18
21
|
const toolInstance = this._toolInstances[toolName];
|
|
19
22
|
if (!toolInstance) {
|
|
@@ -190,10 +193,12 @@ export default class ToolGroup {
|
|
|
190
193
|
}
|
|
191
194
|
_setCursorForViewports(cursor) {
|
|
192
195
|
this.viewportsInfo.forEach(({ renderingEngineId, viewportId }) => {
|
|
193
|
-
const
|
|
194
|
-
if (
|
|
195
|
-
|
|
196
|
+
const enabledElement = getEnabledElementByIds(viewportId, renderingEngineId);
|
|
197
|
+
if (!enabledElement) {
|
|
198
|
+
return;
|
|
196
199
|
}
|
|
200
|
+
const { viewport } = enabledElement;
|
|
201
|
+
initElementCursor(viewport.element, cursor);
|
|
197
202
|
});
|
|
198
203
|
}
|
|
199
204
|
_hasMousePrimaryButtonBinding(toolOptions) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolGroup.js","sourceRoot":"","sources":["../../../../src/store/ToolGroupManager/ToolGroup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,QAAQ,GACT,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"ToolGroup.js","sourceRoot":"","sources":["../../../../src/store/ToolGroupManager/ToolGroup.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,11 @@ import { BaseTool } from './base';
|
|
|
2
2
|
import { PublicToolProps, ToolProps, EventTypes } from '../types';
|
|
3
3
|
export default class StackScrollTool extends BaseTool {
|
|
4
4
|
static toolName: string;
|
|
5
|
-
|
|
5
|
+
deltaY: number;
|
|
6
6
|
touchDragCallback: () => void;
|
|
7
7
|
mouseDragCallback: () => void;
|
|
8
8
|
constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
|
|
9
9
|
_dragCallback(evt: EventTypes.MouseDragEventType): void;
|
|
10
|
+
_getPixelPerImage(viewport: any): number;
|
|
11
|
+
_getNumberOfSlices(viewport: any): number;
|
|
10
12
|
}
|
|
@@ -1,38 +1,60 @@
|
|
|
1
|
-
import { getEnabledElementByIds, VolumeViewport } from '@cornerstonejs/core';
|
|
1
|
+
import { getEnabledElementByIds, VolumeViewport, StackViewport, utilities as csUtils, } from '@cornerstonejs/core';
|
|
2
2
|
import { BaseTool } from './base';
|
|
3
|
-
import {
|
|
3
|
+
import { scroll } from '../utilities';
|
|
4
4
|
export default class StackScrollTool extends BaseTool {
|
|
5
5
|
constructor(toolProps = {}, defaultToolProps = {
|
|
6
6
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
7
7
|
configuration: {
|
|
8
8
|
invert: false,
|
|
9
|
+
debounceIfNotLoaded: true,
|
|
9
10
|
},
|
|
10
11
|
}) {
|
|
11
12
|
super(toolProps, defaultToolProps);
|
|
12
|
-
this.
|
|
13
|
+
this.deltaY = 1;
|
|
13
14
|
this.touchDragCallback = this._dragCallback.bind(this);
|
|
14
15
|
this.mouseDragCallback = this._dragCallback.bind(this);
|
|
15
16
|
}
|
|
16
17
|
_dragCallback(evt) {
|
|
17
18
|
const { deltaPoints, viewportId, renderingEngineId } = evt.detail;
|
|
18
|
-
const deltaFrames = deltaPoints.canvas[1];
|
|
19
19
|
const { viewport } = getEnabledElementByIds(viewportId, renderingEngineId);
|
|
20
20
|
const targetId = this.getTargetId(viewport);
|
|
21
|
-
const {
|
|
21
|
+
const { debounceIfNotLoaded } = this.configuration;
|
|
22
|
+
const deltaPointY = deltaPoints.canvas[1];
|
|
22
23
|
let volumeId;
|
|
23
24
|
if (viewport instanceof VolumeViewport) {
|
|
24
25
|
volumeId = targetId.split('volumeId:')[1];
|
|
25
26
|
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
const pixelsPerImage = this._getPixelPerImage(viewport);
|
|
28
|
+
const deltaY = deltaPointY + this.deltaY;
|
|
29
|
+
if (!pixelsPerImage) {
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
if (Math.abs(deltaY) >= pixelsPerImage) {
|
|
33
|
+
const imageIdIndexOffset = Math.round(deltaY / pixelsPerImage);
|
|
34
|
+
scroll(viewport, {
|
|
35
|
+
delta: imageIdIndexOffset,
|
|
36
|
+
volumeId,
|
|
37
|
+
debounceLoading: debounceIfNotLoaded,
|
|
38
|
+
});
|
|
39
|
+
this.deltaY = deltaY % pixelsPerImage;
|
|
29
40
|
}
|
|
30
41
|
else {
|
|
31
|
-
|
|
32
|
-
|
|
42
|
+
this.deltaY = deltaY;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
_getPixelPerImage(viewport) {
|
|
46
|
+
const { element } = viewport;
|
|
47
|
+
const numberOfSlices = this._getNumberOfSlices(viewport);
|
|
48
|
+
return Math.max(2, element.offsetHeight / Math.max(numberOfSlices, 8));
|
|
49
|
+
}
|
|
50
|
+
_getNumberOfSlices(viewport) {
|
|
51
|
+
if (viewport instanceof VolumeViewport) {
|
|
52
|
+
const { numberOfSlices } = csUtils.getImageSliceDataForVolumeViewport(viewport);
|
|
53
|
+
return numberOfSlices;
|
|
54
|
+
}
|
|
55
|
+
else if (viewport instanceof StackViewport) {
|
|
56
|
+
return viewport.getImageIds().length;
|
|
33
57
|
}
|
|
34
|
-
const delta = direction * (invert ? -1 : 1);
|
|
35
|
-
scrollThroughStack(viewport, { delta, volumeId });
|
|
36
58
|
}
|
|
37
59
|
}
|
|
38
60
|
StackScrollTool.toolName = 'StackScroll';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackScrollTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollTool.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"StackScrollTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,10 @@ export default class StackScrollMouseWheelTool extends BaseTool {
|
|
|
5
5
|
_configuration: any;
|
|
6
6
|
constructor(toolProps?: {}, defaultToolProps?: {
|
|
7
7
|
supportedInteractionTypes: string[];
|
|
8
|
-
|
|
8
|
+
configuration: {
|
|
9
|
+
invert: boolean;
|
|
10
|
+
debounceIfNotLoaded: boolean;
|
|
11
|
+
};
|
|
9
12
|
});
|
|
10
13
|
mouseWheelCallback(evt: MouseWheelEventType): void;
|
|
11
14
|
}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
|
+
import { getEnabledElement, VolumeViewport, StackViewport, } from '@cornerstonejs/core';
|
|
1
2
|
import { BaseTool } from './base';
|
|
2
|
-
import {
|
|
3
|
-
import { getEnabledElement, VolumeViewport } from '@cornerstonejs/core';
|
|
3
|
+
import { scrollVolume } from '../utilities/scroll';
|
|
4
4
|
export default class StackScrollMouseWheelTool extends BaseTool {
|
|
5
5
|
constructor(toolProps = {}, defaultToolProps = {
|
|
6
6
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
7
|
-
|
|
7
|
+
configuration: {
|
|
8
|
+
invert: false,
|
|
9
|
+
debounceIfNotLoaded: true,
|
|
10
|
+
},
|
|
8
11
|
}) {
|
|
9
12
|
super(toolProps, defaultToolProps);
|
|
10
13
|
}
|
|
@@ -13,13 +16,18 @@ export default class StackScrollMouseWheelTool extends BaseTool {
|
|
|
13
16
|
const { direction } = wheel;
|
|
14
17
|
const { invert } = this.configuration;
|
|
15
18
|
const { viewport } = getEnabledElement(element);
|
|
16
|
-
const targetId = this.getTargetId(viewport);
|
|
17
|
-
let volumeId;
|
|
18
|
-
if (viewport instanceof VolumeViewport) {
|
|
19
|
-
volumeId = targetId.split('volumeId:')[1];
|
|
20
|
-
}
|
|
21
19
|
const delta = direction * (invert ? -1 : 1);
|
|
22
|
-
|
|
20
|
+
if (viewport instanceof StackViewport) {
|
|
21
|
+
viewport.scroll(delta, this.configuration.debounceIfNotLoaded);
|
|
22
|
+
}
|
|
23
|
+
else if (viewport instanceof VolumeViewport) {
|
|
24
|
+
const targetId = this.getTargetId(viewport);
|
|
25
|
+
const volumeId = targetId.split('volumeId:')[1];
|
|
26
|
+
scrollVolume(viewport, volumeId, delta);
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
throw new Error('StackScrollMouseWheelTool: Unsupported viewport type');
|
|
30
|
+
}
|
|
23
31
|
}
|
|
24
32
|
}
|
|
25
33
|
StackScrollMouseWheelTool.toolName = 'StackScrollMouseWheel';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,aAAa,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAMnD,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,QAAQ;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,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,IAAI,QAAQ,YAAY,aAAa,EAAE;YACrC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;SAChE;aAAM,IAAI,QAAQ,YAAY,cAAc,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,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;SACzC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;SACzE;IACH,CAAC;;AAjCM,kCAAQ,GAAG,uBAAuB,CAAC"}
|
|
@@ -1,11 +1,21 @@
|
|
|
1
|
+
import { Types } from '@cornerstonejs/core';
|
|
1
2
|
import { BaseTool } from './base';
|
|
2
|
-
import { PublicToolProps, ToolProps } from '../types';
|
|
3
|
+
import { EventTypes, PublicToolProps, ToolProps } from '../types';
|
|
3
4
|
export default class ZoomTool extends BaseTool {
|
|
4
5
|
static toolName: string;
|
|
5
6
|
touchDragCallback: () => void;
|
|
6
7
|
mouseDragCallback: () => void;
|
|
8
|
+
initialMousePosWorld: Types.Point3;
|
|
9
|
+
dirVec: Types.Point3;
|
|
10
|
+
minZoomScale: number;
|
|
11
|
+
maxZoomScale: number;
|
|
7
12
|
constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
|
|
8
|
-
|
|
9
|
-
|
|
13
|
+
preMouseDownCallback: (evt: EventTypes.MouseDownActivateEventType) => boolean;
|
|
14
|
+
_dragCallback(evt: EventTypes.MouseDragEventType): void;
|
|
15
|
+
_dragParallelProjection: (evt: EventTypes.MouseDragEventType, camera: Types.ICamera) => void;
|
|
10
16
|
_dragPerspectiveProjection: (evt: any, camera: any) => void;
|
|
17
|
+
_getCappedParallelScale: (viewport: any, parallelScale: any) => {
|
|
18
|
+
parallelScale: any;
|
|
19
|
+
thresholdExceeded: boolean;
|
|
20
|
+
};
|
|
11
21
|
}
|