@cornerstonejs/tools 1.25.0 → 1.26.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/drawingSvg/drawRedactionRect.d.ts +1 -0
- package/dist/cjs/drawingSvg/drawRedactionRect.js +44 -0
- package/dist/cjs/drawingSvg/drawRedactionRect.js.map +1 -0
- package/dist/cjs/drawingSvg/index.d.ts +2 -1
- package/dist/cjs/drawingSvg/index.js +3 -1
- package/dist/cjs/drawingSvg/index.js.map +1 -1
- package/dist/cjs/eventListeners/touch/touchStartListener.js +0 -8
- package/dist/cjs/eventListeners/touch/touchStartListener.js.map +1 -1
- package/dist/cjs/index.d.ts +2 -1
- package/dist/cjs/index.js +7 -2
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/tools/ZoomTool.js +2 -5
- package/dist/cjs/tools/ZoomTool.js.map +1 -1
- package/dist/cjs/tools/annotation/VideoRedactionTool.d.ts +46 -0
- package/dist/cjs/tools/annotation/VideoRedactionTool.js +492 -0
- package/dist/cjs/tools/annotation/VideoRedactionTool.js.map +1 -0
- package/dist/cjs/tools/base/AnnotationDisplayTool.d.ts +1 -1
- package/dist/cjs/tools/base/AnnotationDisplayTool.js +2 -1
- package/dist/cjs/tools/base/AnnotationDisplayTool.js.map +1 -1
- package/dist/cjs/tools/base/AnnotationTool.js.map +1 -1
- package/dist/cjs/tools/base/BaseTool.js +3 -0
- package/dist/cjs/tools/base/BaseTool.js.map +1 -1
- package/dist/cjs/types/AnnotationTypes.d.ts +1 -1
- package/dist/cjs/types/ToolSpecificAnnotationTypes.d.ts +20 -0
- package/dist/cjs/utilities/planar/filterAnnotationsForDisplay.js +6 -0
- 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 +3 -0
- package/dist/cjs/utilities/scroll.js.map +1 -1
- package/dist/cjs/utilities/viewportFilters/filterViewportsWithFrameOfReferenceUID.d.ts +1 -1
- package/dist/cjs/utilities/viewportFilters/filterViewportsWithFrameOfReferenceUID.js.map +1 -1
- package/dist/cjs/utilities/viewportFilters/filterViewportsWithToolEnabled.d.ts +1 -1
- package/dist/cjs/utilities/viewportFilters/filterViewportsWithToolEnabled.js.map +1 -1
- package/dist/esm/drawingSvg/drawRedactionRect.d.ts +1 -0
- package/dist/esm/drawingSvg/drawRedactionRect.js +38 -0
- package/dist/esm/drawingSvg/drawRedactionRect.js.map +1 -0
- package/dist/esm/drawingSvg/index.d.ts +2 -1
- package/dist/esm/drawingSvg/index.js +2 -1
- package/dist/esm/drawingSvg/index.js.map +1 -1
- package/dist/esm/eventListeners/touch/touchStartListener.js +0 -8
- package/dist/esm/eventListeners/touch/touchStartListener.js.map +1 -1
- package/dist/esm/index.d.ts +2 -1
- package/dist/esm/index.js +2 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/tools/ZoomTool.js +2 -5
- package/dist/esm/tools/ZoomTool.js.map +1 -1
- package/dist/esm/tools/annotation/VideoRedactionTool.d.ts +46 -0
- package/dist/esm/tools/annotation/VideoRedactionTool.js +464 -0
- package/dist/esm/tools/annotation/VideoRedactionTool.js.map +1 -0
- package/dist/esm/tools/base/AnnotationDisplayTool.d.ts +1 -1
- package/dist/esm/tools/base/AnnotationDisplayTool.js +3 -2
- package/dist/esm/tools/base/AnnotationDisplayTool.js.map +1 -1
- package/dist/esm/tools/base/AnnotationTool.js.map +1 -1
- package/dist/esm/tools/base/BaseTool.js +4 -1
- package/dist/esm/tools/base/BaseTool.js.map +1 -1
- package/dist/esm/types/AnnotationTypes.d.ts +1 -1
- package/dist/esm/types/ToolSpecificAnnotationTypes.d.ts +20 -0
- package/dist/esm/utilities/planar/filterAnnotationsForDisplay.js +7 -1
- package/dist/esm/utilities/planar/filterAnnotationsForDisplay.js.map +1 -1
- package/dist/esm/utilities/scroll.d.ts +1 -1
- package/dist/esm/utilities/scroll.js +4 -1
- package/dist/esm/utilities/scroll.js.map +1 -1
- package/dist/esm/utilities/viewportFilters/filterViewportsWithFrameOfReferenceUID.d.ts +1 -1
- package/dist/esm/utilities/viewportFilters/filterViewportsWithFrameOfReferenceUID.js.map +1 -1
- package/dist/esm/utilities/viewportFilters/filterViewportsWithToolEnabled.d.ts +1 -1
- package/dist/esm/utilities/viewportFilters/filterViewportsWithToolEnabled.js.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/drawingSvg/drawRedactionRect.ts +62 -0
- package/src/drawingSvg/index.ts +2 -0
- package/src/eventListeners/touch/touchStartListener.ts +3 -10
- package/src/index.ts +3 -0
- package/src/tools/ZoomTool.ts +2 -10
- package/src/tools/annotation/VideoRedactionTool.ts +788 -0
- package/src/tools/base/AnnotationDisplayTool.ts +6 -3
- package/src/tools/base/AnnotationTool.ts +1 -1
- package/src/tools/base/BaseTool.ts +3 -0
- package/src/types/AnnotationTypes.ts +1 -1
- package/src/types/ToolSpecificAnnotationTypes.ts +21 -0
- package/src/utilities/planar/filterAnnotationsForDisplay.ts +7 -0
- package/src/utilities/scroll.ts +4 -1
- package/src/utilities/viewportFilters/filterViewportsWithFrameOfReferenceUID.ts +1 -1
- package/src/utilities/viewportFilters/filterViewportsWithToolEnabled.ts +1 -1
|
@@ -0,0 +1,464 @@
|
|
|
1
|
+
import { vec3, vec2 } from 'gl-matrix';
|
|
2
|
+
import { getEnabledElement, triggerEvent, eventTarget, utilities as csUtils, cache, } from '@cornerstonejs/core';
|
|
3
|
+
import { AnnotationTool } from '../base';
|
|
4
|
+
import throttle from '../../utilities/throttle';
|
|
5
|
+
import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement';
|
|
6
|
+
import { drawHandles as drawHandlesSvg, drawRedactionRect as drawRedactionRectSvg, } from '../../drawingSvg';
|
|
7
|
+
import { state } from '../../store';
|
|
8
|
+
import { Events } from '../../enums';
|
|
9
|
+
import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
|
|
10
|
+
import * as rectangle from '../../utilities/math/rectangle';
|
|
11
|
+
import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
|
|
12
|
+
import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
|
|
13
|
+
import getWorldWidthAndHeightFromTwoPoints from '../../utilities/planar/getWorldWidthAndHeightFromTwoPoints';
|
|
14
|
+
class VideoRedactionTool extends AnnotationTool {
|
|
15
|
+
constructor(toolConfiguration = {}) {
|
|
16
|
+
super(toolConfiguration, {
|
|
17
|
+
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
18
|
+
configuration: { shadow: true, preventHandleOutsideImage: false },
|
|
19
|
+
});
|
|
20
|
+
this.addNewAnnotation = (evt) => {
|
|
21
|
+
const eventData = evt.detail;
|
|
22
|
+
const { currentPoints, element } = eventData;
|
|
23
|
+
const worldPos = currentPoints.world;
|
|
24
|
+
const enabledElement = getEnabledElement(element);
|
|
25
|
+
const { viewport, renderingEngine } = enabledElement;
|
|
26
|
+
this.isDrawing = true;
|
|
27
|
+
const annotation = {
|
|
28
|
+
metadata: {
|
|
29
|
+
viewPlaneNormal: [0, 0, 1],
|
|
30
|
+
viewUp: [0, 1, 0],
|
|
31
|
+
FrameOfReferenceUID: viewport.getFrameOfReferenceUID(),
|
|
32
|
+
referencedImageId: viewport.getFrameOfReferenceUID(),
|
|
33
|
+
toolName: this.getToolName(),
|
|
34
|
+
},
|
|
35
|
+
data: {
|
|
36
|
+
invalidated: true,
|
|
37
|
+
handles: {
|
|
38
|
+
points: [
|
|
39
|
+
[...worldPos],
|
|
40
|
+
[...worldPos],
|
|
41
|
+
[...worldPos],
|
|
42
|
+
[...worldPos],
|
|
43
|
+
],
|
|
44
|
+
activeHandleIndex: null,
|
|
45
|
+
},
|
|
46
|
+
cachedStats: {},
|
|
47
|
+
active: true,
|
|
48
|
+
},
|
|
49
|
+
};
|
|
50
|
+
addAnnotation(annotation, element);
|
|
51
|
+
const viewportUIDsToRender = getViewportIdsWithToolToRender(element, this.getToolName(), false);
|
|
52
|
+
this.editData = {
|
|
53
|
+
annotation,
|
|
54
|
+
viewportUIDsToRender,
|
|
55
|
+
handleIndex: 3,
|
|
56
|
+
newAnnotation: true,
|
|
57
|
+
hasMoved: false,
|
|
58
|
+
};
|
|
59
|
+
this._activateDraw(element);
|
|
60
|
+
hideElementCursor(element);
|
|
61
|
+
evt.preventDefault();
|
|
62
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportUIDsToRender);
|
|
63
|
+
return annotation;
|
|
64
|
+
};
|
|
65
|
+
this.getHandleNearImagePoint = (element, annotation, canvasCoords, proximity) => {
|
|
66
|
+
const enabledElement = getEnabledElement(element);
|
|
67
|
+
const { viewport } = enabledElement;
|
|
68
|
+
const { data } = annotation;
|
|
69
|
+
const { points } = data.handles;
|
|
70
|
+
for (let i = 0; i < points.length; i++) {
|
|
71
|
+
const point = points[i];
|
|
72
|
+
const toolDataCanvasCoordinate = viewport.worldToCanvas(point);
|
|
73
|
+
const near = vec2.distance(canvasCoords, toolDataCanvasCoordinate) < proximity;
|
|
74
|
+
if (near === true) {
|
|
75
|
+
data.handles.activeHandleIndex = i;
|
|
76
|
+
return point;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
data.handles.activeHandleIndex = null;
|
|
80
|
+
};
|
|
81
|
+
this.isPointNearTool = (element, annotation, canvasCoords, proximity) => {
|
|
82
|
+
const enabledElement = getEnabledElement(element);
|
|
83
|
+
const { viewport } = enabledElement;
|
|
84
|
+
const { data } = annotation;
|
|
85
|
+
const { points } = data.handles;
|
|
86
|
+
const canvasPoint1 = viewport.worldToCanvas(points[0]);
|
|
87
|
+
const canvasPoint2 = viewport.worldToCanvas(points[3]);
|
|
88
|
+
const rect = this._getRectangleImageCoordinates([
|
|
89
|
+
canvasPoint1,
|
|
90
|
+
canvasPoint2,
|
|
91
|
+
]);
|
|
92
|
+
const point = [canvasCoords[0], canvasCoords[1]];
|
|
93
|
+
const { left, top, width, height } = rect;
|
|
94
|
+
const distanceToPoint = rectangle.distanceToPoint([left, top, width, height], point);
|
|
95
|
+
if (distanceToPoint <= proximity) {
|
|
96
|
+
return true;
|
|
97
|
+
}
|
|
98
|
+
};
|
|
99
|
+
this.toolSelectedCallback = (evt, annotation, interactionType = 'mouse') => {
|
|
100
|
+
const eventData = evt.detail;
|
|
101
|
+
const { element } = eventData;
|
|
102
|
+
const { data } = annotation;
|
|
103
|
+
data.active = true;
|
|
104
|
+
const viewportUIDsToRender = getViewportIdsWithToolToRender(element, this.getToolName(), false);
|
|
105
|
+
this.editData = {
|
|
106
|
+
annotation,
|
|
107
|
+
viewportUIDsToRender,
|
|
108
|
+
};
|
|
109
|
+
this._activateModify(element);
|
|
110
|
+
hideElementCursor(element);
|
|
111
|
+
const enabledElement = getEnabledElement(element);
|
|
112
|
+
const { renderingEngine } = enabledElement;
|
|
113
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportUIDsToRender);
|
|
114
|
+
evt.preventDefault();
|
|
115
|
+
};
|
|
116
|
+
this.handleSelectedCallback = (evt, annotation, handle, interactionType = 'mouse') => {
|
|
117
|
+
const eventData = evt.detail;
|
|
118
|
+
const { element } = eventData;
|
|
119
|
+
const { data } = annotation;
|
|
120
|
+
data.active = true;
|
|
121
|
+
let movingTextBox = false;
|
|
122
|
+
let handleIndex;
|
|
123
|
+
if (handle.worldPosition) {
|
|
124
|
+
movingTextBox = true;
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
handleIndex = data.handles.points.findIndex((p) => p === handle);
|
|
128
|
+
}
|
|
129
|
+
const viewportUIDsToRender = getViewportIdsWithToolToRender(element, this.getToolName(), false);
|
|
130
|
+
this.editData = {
|
|
131
|
+
annotation,
|
|
132
|
+
viewportUIDsToRender,
|
|
133
|
+
handleIndex,
|
|
134
|
+
};
|
|
135
|
+
this._activateModify(element);
|
|
136
|
+
hideElementCursor(element);
|
|
137
|
+
const enabledElement = getEnabledElement(element);
|
|
138
|
+
const { renderingEngine } = enabledElement;
|
|
139
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportUIDsToRender);
|
|
140
|
+
evt.preventDefault();
|
|
141
|
+
};
|
|
142
|
+
this._mouseUpCallback = (evt) => {
|
|
143
|
+
const eventData = evt.detail;
|
|
144
|
+
const { element } = eventData;
|
|
145
|
+
const { annotation, viewportUIDsToRender, newAnnotation, hasMoved } = this.editData;
|
|
146
|
+
const { data } = annotation;
|
|
147
|
+
if (newAnnotation && !hasMoved) {
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
150
|
+
data.active = false;
|
|
151
|
+
data.handles.activeHandleIndex = null;
|
|
152
|
+
this._deactivateModify(element);
|
|
153
|
+
this._deactivateDraw(element);
|
|
154
|
+
resetElementCursor(element);
|
|
155
|
+
const enabledElement = getEnabledElement(element);
|
|
156
|
+
const { renderingEngine } = enabledElement;
|
|
157
|
+
this.editData = null;
|
|
158
|
+
this.isDrawing = false;
|
|
159
|
+
if (this.isHandleOutsideImage &&
|
|
160
|
+
this.configuration.preventHandleOutsideImage) {
|
|
161
|
+
removeAnnotation(annotation.annotationUID);
|
|
162
|
+
}
|
|
163
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportUIDsToRender);
|
|
164
|
+
};
|
|
165
|
+
this._mouseDragCallback = (evt) => {
|
|
166
|
+
this.isDrawing = true;
|
|
167
|
+
const eventData = evt.detail;
|
|
168
|
+
const { element } = eventData;
|
|
169
|
+
const { annotation, viewportUIDsToRender, handleIndex } = this.editData;
|
|
170
|
+
const { data } = annotation;
|
|
171
|
+
if (handleIndex === undefined) {
|
|
172
|
+
const { deltaPoints } = eventData;
|
|
173
|
+
const worldPosDelta = deltaPoints.world;
|
|
174
|
+
const { points } = data.handles;
|
|
175
|
+
points.forEach((point) => {
|
|
176
|
+
point[0] += worldPosDelta[0];
|
|
177
|
+
point[1] += worldPosDelta[1];
|
|
178
|
+
point[2] += worldPosDelta[2];
|
|
179
|
+
});
|
|
180
|
+
data.invalidated = true;
|
|
181
|
+
}
|
|
182
|
+
else {
|
|
183
|
+
const { currentPoints } = eventData;
|
|
184
|
+
const enabledElement = getEnabledElement(element);
|
|
185
|
+
const { worldToCanvas, canvasToWorld } = enabledElement.viewport;
|
|
186
|
+
const worldPos = currentPoints.world;
|
|
187
|
+
const { points } = data.handles;
|
|
188
|
+
points[handleIndex] = [...worldPos];
|
|
189
|
+
let bottomLeftCanvas;
|
|
190
|
+
let bottomRightCanvas;
|
|
191
|
+
let topLeftCanvas;
|
|
192
|
+
let topRightCanvas;
|
|
193
|
+
let bottomLeftWorld;
|
|
194
|
+
let bottomRightWorld;
|
|
195
|
+
let topLeftWorld;
|
|
196
|
+
let topRightWorld;
|
|
197
|
+
switch (handleIndex) {
|
|
198
|
+
case 0:
|
|
199
|
+
case 3:
|
|
200
|
+
bottomLeftCanvas = worldToCanvas(points[0]);
|
|
201
|
+
topRightCanvas = worldToCanvas(points[3]);
|
|
202
|
+
bottomRightCanvas = [topRightCanvas[0], bottomLeftCanvas[1]];
|
|
203
|
+
topLeftCanvas = [bottomLeftCanvas[0], topRightCanvas[1]];
|
|
204
|
+
bottomRightWorld = canvasToWorld(bottomRightCanvas);
|
|
205
|
+
topLeftWorld = canvasToWorld(topLeftCanvas);
|
|
206
|
+
points[1] = bottomRightWorld;
|
|
207
|
+
points[2] = topLeftWorld;
|
|
208
|
+
break;
|
|
209
|
+
case 1:
|
|
210
|
+
case 2:
|
|
211
|
+
bottomRightCanvas = worldToCanvas(points[1]);
|
|
212
|
+
topLeftCanvas = worldToCanvas(points[2]);
|
|
213
|
+
bottomLeftCanvas = [
|
|
214
|
+
topLeftCanvas[0],
|
|
215
|
+
bottomRightCanvas[1],
|
|
216
|
+
];
|
|
217
|
+
topRightCanvas = [
|
|
218
|
+
bottomRightCanvas[0],
|
|
219
|
+
topLeftCanvas[1],
|
|
220
|
+
];
|
|
221
|
+
bottomLeftWorld = canvasToWorld(bottomLeftCanvas);
|
|
222
|
+
topRightWorld = canvasToWorld(topRightCanvas);
|
|
223
|
+
points[0] = bottomLeftWorld;
|
|
224
|
+
points[3] = topRightWorld;
|
|
225
|
+
break;
|
|
226
|
+
}
|
|
227
|
+
data.invalidated = true;
|
|
228
|
+
}
|
|
229
|
+
this.editData.hasMoved = true;
|
|
230
|
+
const enabledElement = getEnabledElement(element);
|
|
231
|
+
const { renderingEngine } = enabledElement;
|
|
232
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportUIDsToRender);
|
|
233
|
+
};
|
|
234
|
+
this._activateDraw = (element) => {
|
|
235
|
+
state.isInteractingWithTool = true;
|
|
236
|
+
element.addEventListener(Events.MOUSE_UP, this._mouseUpCallback);
|
|
237
|
+
element.addEventListener(Events.MOUSE_DRAG, this._mouseDragCallback);
|
|
238
|
+
element.addEventListener(Events.MOUSE_MOVE, this._mouseDragCallback);
|
|
239
|
+
element.addEventListener(Events.MOUSE_CLICK, this._mouseUpCallback);
|
|
240
|
+
element.addEventListener(Events.TOUCH_END, this._mouseUpCallback);
|
|
241
|
+
element.addEventListener(Events.TOUCH_DRAG, this._mouseDragCallback);
|
|
242
|
+
};
|
|
243
|
+
this._deactivateDraw = (element) => {
|
|
244
|
+
state.isInteractingWithTool = false;
|
|
245
|
+
element.removeEventListener(Events.MOUSE_UP, this._mouseUpCallback);
|
|
246
|
+
element.removeEventListener(Events.MOUSE_DRAG, this._mouseDragCallback);
|
|
247
|
+
element.removeEventListener(Events.MOUSE_MOVE, this._mouseDragCallback);
|
|
248
|
+
element.removeEventListener(Events.MOUSE_CLICK, this._mouseUpCallback);
|
|
249
|
+
element.removeEventListener(Events.TOUCH_END, this._mouseUpCallback);
|
|
250
|
+
element.removeEventListener(Events.TOUCH_DRAG, this._mouseDragCallback);
|
|
251
|
+
};
|
|
252
|
+
this._activateModify = (element) => {
|
|
253
|
+
state.isInteractingWithTool = true;
|
|
254
|
+
element.addEventListener(Events.MOUSE_UP, this._mouseUpCallback);
|
|
255
|
+
element.addEventListener(Events.MOUSE_DRAG, this._mouseDragCallback);
|
|
256
|
+
element.addEventListener(Events.MOUSE_CLICK, this._mouseUpCallback);
|
|
257
|
+
element.addEventListener(Events.TOUCH_END, this._mouseUpCallback);
|
|
258
|
+
element.addEventListener(Events.TOUCH_DRAG, this._mouseDragCallback);
|
|
259
|
+
};
|
|
260
|
+
this._deactivateModify = (element) => {
|
|
261
|
+
state.isInteractingWithTool = false;
|
|
262
|
+
element.removeEventListener(Events.MOUSE_UP, this._mouseUpCallback);
|
|
263
|
+
element.removeEventListener(Events.MOUSE_DRAG, this._mouseDragCallback);
|
|
264
|
+
element.removeEventListener(Events.MOUSE_CLICK, this._mouseUpCallback);
|
|
265
|
+
element.removeEventListener(Events.TOUCH_END, this._mouseUpCallback);
|
|
266
|
+
element.removeEventListener(Events.TOUCH_DRAG, this._mouseDragCallback);
|
|
267
|
+
};
|
|
268
|
+
this.renderAnnotation = (enabledElement, svgDrawingHelper) => {
|
|
269
|
+
const renderStatus = false;
|
|
270
|
+
const { viewport } = enabledElement;
|
|
271
|
+
const { element } = viewport;
|
|
272
|
+
let annotations = getAnnotations(this.getToolName(), element);
|
|
273
|
+
if (!annotations?.length) {
|
|
274
|
+
return renderStatus;
|
|
275
|
+
}
|
|
276
|
+
annotations = this.filterInteractableAnnotationsForElement(element, annotations);
|
|
277
|
+
if (!annotations?.length) {
|
|
278
|
+
return renderStatus;
|
|
279
|
+
}
|
|
280
|
+
const targetId = this.getTargetId(viewport);
|
|
281
|
+
const renderingEngine = viewport.getRenderingEngine();
|
|
282
|
+
const styleSpecifier = {
|
|
283
|
+
toolGroupId: this.toolGroupId,
|
|
284
|
+
toolName: this.getToolName(),
|
|
285
|
+
viewportId: enabledElement.viewport.id,
|
|
286
|
+
};
|
|
287
|
+
for (let i = 0; i < annotations.length; i++) {
|
|
288
|
+
const annotation = annotations[i];
|
|
289
|
+
const { annotationUID } = annotation;
|
|
290
|
+
const toolMetadata = annotation.metadata;
|
|
291
|
+
const data = annotation.data;
|
|
292
|
+
const { points, activeHandleIndex } = data.handles;
|
|
293
|
+
const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
|
|
294
|
+
const lineWidth = this.getStyle('lineWidth', styleSpecifier, annotation);
|
|
295
|
+
const lineDash = this.getStyle('lineDash', styleSpecifier, annotation);
|
|
296
|
+
const color = this.getStyle('color', styleSpecifier, annotation);
|
|
297
|
+
if (!viewport.getRenderingEngine()) {
|
|
298
|
+
console.warn('Rendering Engine has been destroyed');
|
|
299
|
+
return;
|
|
300
|
+
}
|
|
301
|
+
let activeHandleCanvasCoords;
|
|
302
|
+
if (!this.editData &&
|
|
303
|
+
activeHandleIndex !== null) {
|
|
304
|
+
activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
|
|
305
|
+
}
|
|
306
|
+
if (activeHandleCanvasCoords) {
|
|
307
|
+
const handleGroupUID = '0';
|
|
308
|
+
drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, activeHandleCanvasCoords, {
|
|
309
|
+
color,
|
|
310
|
+
});
|
|
311
|
+
}
|
|
312
|
+
const rectangleUID = '0';
|
|
313
|
+
drawRedactionRectSvg(svgDrawingHelper, annotationUID, rectangleUID, canvasCoordinates[0], canvasCoordinates[3], {
|
|
314
|
+
color: 'black',
|
|
315
|
+
lineDash,
|
|
316
|
+
lineWidth,
|
|
317
|
+
});
|
|
318
|
+
}
|
|
319
|
+
};
|
|
320
|
+
this._getRectangleImageCoordinates = (points) => {
|
|
321
|
+
const [point0, point1] = points;
|
|
322
|
+
return {
|
|
323
|
+
left: Math.min(point0[0], point1[0]),
|
|
324
|
+
top: Math.min(point0[1], point1[1]),
|
|
325
|
+
width: Math.abs(point0[0] - point1[0]),
|
|
326
|
+
height: Math.abs(point0[1] - point1[1]),
|
|
327
|
+
};
|
|
328
|
+
};
|
|
329
|
+
this._calculateCachedStats = (annotation, viewPlaneNormal, viewUp, renderingEngine, enabledElement) => {
|
|
330
|
+
const { data } = annotation;
|
|
331
|
+
const { viewportUID, renderingEngineUID, sceneUID } = enabledElement;
|
|
332
|
+
const worldPos1 = data.handles.points[0];
|
|
333
|
+
const worldPos2 = data.handles.points[3];
|
|
334
|
+
const { cachedStats } = data;
|
|
335
|
+
const targetUIDs = Object.keys(cachedStats);
|
|
336
|
+
for (let i = 0; i < targetUIDs.length; i++) {
|
|
337
|
+
const targetUID = targetUIDs[i];
|
|
338
|
+
const { imageVolume } = this._getImageVolumeFromTargetUID(targetUID, renderingEngine);
|
|
339
|
+
const { dimensions, scalarData, vtkImageData: imageData, metadata, } = imageVolume;
|
|
340
|
+
const worldPos1Index = vec3.fromValues(0, 0, 0);
|
|
341
|
+
const worldPos2Index = vec3.fromValues(0, 0, 0);
|
|
342
|
+
imageData.worldToIndexVec3(worldPos1, worldPos1Index);
|
|
343
|
+
worldPos1Index[0] = Math.floor(worldPos1Index[0]);
|
|
344
|
+
worldPos1Index[1] = Math.floor(worldPos1Index[1]);
|
|
345
|
+
worldPos1Index[2] = Math.floor(worldPos1Index[2]);
|
|
346
|
+
imageData.worldToIndexVec3(worldPos2, worldPos2Index);
|
|
347
|
+
worldPos2Index[0] = Math.floor(worldPos2Index[0]);
|
|
348
|
+
worldPos2Index[1] = Math.floor(worldPos2Index[1]);
|
|
349
|
+
worldPos2Index[2] = Math.floor(worldPos2Index[2]);
|
|
350
|
+
if (this._isInsideVolume(worldPos1Index, worldPos2Index, dimensions)) {
|
|
351
|
+
this.isHandleOutsideImage = false;
|
|
352
|
+
const iMin = Math.min(worldPos1Index[0], worldPos2Index[0]);
|
|
353
|
+
const iMax = Math.max(worldPos1Index[0], worldPos2Index[0]);
|
|
354
|
+
const jMin = Math.min(worldPos1Index[1], worldPos2Index[1]);
|
|
355
|
+
const jMax = Math.max(worldPos1Index[1], worldPos2Index[1]);
|
|
356
|
+
const kMin = Math.min(worldPos1Index[2], worldPos2Index[2]);
|
|
357
|
+
const kMax = Math.max(worldPos1Index[2], worldPos2Index[2]);
|
|
358
|
+
const { worldWidth, worldHeight } = getWorldWidthAndHeightFromTwoPoints(viewPlaneNormal, viewUp, worldPos1, worldPos2);
|
|
359
|
+
const area = worldWidth * worldHeight;
|
|
360
|
+
let count = 0;
|
|
361
|
+
let mean = 0;
|
|
362
|
+
let stdDev = 0;
|
|
363
|
+
const yMultiple = dimensions[0];
|
|
364
|
+
const zMultiple = dimensions[0] * dimensions[1];
|
|
365
|
+
for (let k = kMin; k <= kMax; k++) {
|
|
366
|
+
for (let j = jMin; j <= jMax; j++) {
|
|
367
|
+
for (let i = iMin; i <= iMax; i++) {
|
|
368
|
+
const value = scalarData[k * zMultiple + j * yMultiple + i];
|
|
369
|
+
count++;
|
|
370
|
+
mean += value;
|
|
371
|
+
}
|
|
372
|
+
}
|
|
373
|
+
}
|
|
374
|
+
mean /= count;
|
|
375
|
+
for (let k = kMin; k <= kMax; k++) {
|
|
376
|
+
for (let j = jMin; j <= jMax; j++) {
|
|
377
|
+
for (let i = iMin; i <= iMax; i++) {
|
|
378
|
+
const value = scalarData[k * zMultiple + j * yMultiple + i];
|
|
379
|
+
const valueMinusMean = value - mean;
|
|
380
|
+
stdDev += valueMinusMean * valueMinusMean;
|
|
381
|
+
}
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
stdDev /= count;
|
|
385
|
+
stdDev = Math.sqrt(stdDev);
|
|
386
|
+
cachedStats[targetUID] = {
|
|
387
|
+
Modality: metadata.Modality,
|
|
388
|
+
area,
|
|
389
|
+
mean,
|
|
390
|
+
stdDev,
|
|
391
|
+
};
|
|
392
|
+
}
|
|
393
|
+
else {
|
|
394
|
+
this.isHandleOutsideImage = true;
|
|
395
|
+
cachedStats[targetUID] = {
|
|
396
|
+
Modality: metadata.Modality,
|
|
397
|
+
};
|
|
398
|
+
}
|
|
399
|
+
}
|
|
400
|
+
data.invalidated = false;
|
|
401
|
+
const eventType = Events.ANNOTATION_MODIFIED;
|
|
402
|
+
const eventDetail = {
|
|
403
|
+
annotation,
|
|
404
|
+
viewportUID,
|
|
405
|
+
renderingEngineUID,
|
|
406
|
+
sceneUID: sceneUID,
|
|
407
|
+
};
|
|
408
|
+
triggerEvent(eventTarget, eventType, eventDetail);
|
|
409
|
+
return cachedStats;
|
|
410
|
+
};
|
|
411
|
+
this._isInsideVolume = (index1, index2, dimensions) => {
|
|
412
|
+
return (csUtils.indexWithinDimensions(index1, dimensions) &&
|
|
413
|
+
csUtils.indexWithinDimensions(index2, dimensions));
|
|
414
|
+
};
|
|
415
|
+
this._getTargetVolumeUID = (scene) => {
|
|
416
|
+
if (this.configuration.volumeUID) {
|
|
417
|
+
return this.configuration.volumeUID;
|
|
418
|
+
}
|
|
419
|
+
const volumeActors = scene.getVolumeActors();
|
|
420
|
+
if (!volumeActors && !volumeActors.length) {
|
|
421
|
+
return;
|
|
422
|
+
}
|
|
423
|
+
return volumeActors[0].uid;
|
|
424
|
+
};
|
|
425
|
+
this._throttledCalculateCachedStats = throttle(this._calculateCachedStats, 100, { trailing: true });
|
|
426
|
+
}
|
|
427
|
+
cancel(element) {
|
|
428
|
+
if (!this.isDrawing) {
|
|
429
|
+
return;
|
|
430
|
+
}
|
|
431
|
+
this.isDrawing = false;
|
|
432
|
+
this._deactivateDraw(element);
|
|
433
|
+
this._deactivateModify(element);
|
|
434
|
+
resetElementCursor(element);
|
|
435
|
+
const { annotation, viewportUIDsToRender } = this.editData;
|
|
436
|
+
const { data } = annotation;
|
|
437
|
+
data.active = false;
|
|
438
|
+
data.handles.activeHandleIndex = null;
|
|
439
|
+
const enabledElement = getEnabledElement(element);
|
|
440
|
+
const { renderingEngine } = enabledElement;
|
|
441
|
+
triggerAnnotationRenderForViewportIds(renderingEngine, viewportUIDsToRender);
|
|
442
|
+
this.editData = null;
|
|
443
|
+
return annotation.metadata.annotationUID;
|
|
444
|
+
}
|
|
445
|
+
_getImageVolumeFromTargetUID(targetUID, renderingEngine) {
|
|
446
|
+
let imageVolume, viewport;
|
|
447
|
+
if (targetUID.startsWith('stackTarget')) {
|
|
448
|
+
const coloneIndex = targetUID.indexOf(':');
|
|
449
|
+
const viewportUID = targetUID.substring(coloneIndex + 1);
|
|
450
|
+
const viewport = renderingEngine.getViewport(viewportUID);
|
|
451
|
+
imageVolume = viewport.getImageData();
|
|
452
|
+
}
|
|
453
|
+
else {
|
|
454
|
+
imageVolume = cache.getVolume(targetUID);
|
|
455
|
+
}
|
|
456
|
+
return { imageVolume, viewport };
|
|
457
|
+
}
|
|
458
|
+
_getTargetStackUID(viewport) {
|
|
459
|
+
return `stackTarget:${viewport.uid}`;
|
|
460
|
+
}
|
|
461
|
+
}
|
|
462
|
+
VideoRedactionTool.toolName = 'VideoRedaction';
|
|
463
|
+
export default VideoRedactionTool;
|
|
464
|
+
//# sourceMappingURL=VideoRedactionTool.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"VideoRedactionTool.js","sourceRoot":"","sources":["../../../../src/tools/annotation/VideoRedactionTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ declare abstract class AnnotationDisplayTool extends BaseTool {
|
|
|
7
7
|
abstract renderAnnotation(enabledElement: Types.IEnabledElement, svgDrawingHelper: SVGDrawingHelper): any;
|
|
8
8
|
filterInteractableAnnotationsForElement(element: HTMLDivElement, annotations: Annotations): Annotations | undefined;
|
|
9
9
|
onImageSpacingCalibrated: (evt: Types.EventTypes.ImageSpacingCalibratedEvent) => void;
|
|
10
|
-
protected getReferencedImageId(viewport: Types.
|
|
10
|
+
protected getReferencedImageId(viewport: Types.IViewport, worldPos: Types.Point3, viewPlaneNormal: Types.Point3, viewUp: Types.Point3): string;
|
|
11
11
|
getStyle(property: string, specifications: StyleSpecifier, annotation?: Annotation): unknown;
|
|
12
12
|
}
|
|
13
13
|
export default AnnotationDisplayTool;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { utilities, getEnabledElement, StackViewport, cache, } from '@cornerstonejs/core';
|
|
1
|
+
import { utilities, getEnabledElement, StackViewport, cache, VideoViewport, } from '@cornerstonejs/core';
|
|
2
2
|
import BaseTool from './BaseTool';
|
|
3
3
|
import { getAnnotationManager } from '../../stateManagement/annotation/annotationState';
|
|
4
4
|
import triggerAnnotationRender from '../../utilities/triggerAnnotationRender';
|
|
@@ -44,7 +44,8 @@ class AnnotationDisplayTool extends BaseTool {
|
|
|
44
44
|
getReferencedImageId(viewport, worldPos, viewPlaneNormal, viewUp) {
|
|
45
45
|
const targetId = this.getTargetId(viewport);
|
|
46
46
|
let referencedImageId;
|
|
47
|
-
if (viewport instanceof StackViewport
|
|
47
|
+
if (viewport instanceof StackViewport ||
|
|
48
|
+
viewport instanceof VideoViewport) {
|
|
48
49
|
referencedImageId = targetId.split('imageId:')[1];
|
|
49
50
|
}
|
|
50
51
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationDisplayTool.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,iBAAiB,
|
|
1
|
+
{"version":3,"file":"AnnotationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationDisplayTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { StackViewport, utilities, BaseVolumeViewport, } from '@cornerstonejs/core';
|
|
1
|
+
import { StackViewport, utilities, BaseVolumeViewport, VideoViewport, } from '@cornerstonejs/core';
|
|
2
2
|
import { ToolModes } from '../../enums';
|
|
3
3
|
class BaseTool {
|
|
4
4
|
constructor(toolProps, defaultToolProps) {
|
|
@@ -73,6 +73,9 @@ class BaseTool {
|
|
|
73
73
|
else if (viewport instanceof BaseVolumeViewport) {
|
|
74
74
|
return `volumeId:${this.getTargetVolumeId(viewport)}`;
|
|
75
75
|
}
|
|
76
|
+
else if (viewport instanceof VideoViewport) {
|
|
77
|
+
return '';
|
|
78
|
+
}
|
|
76
79
|
else {
|
|
77
80
|
throw new Error('getTargetId: viewport must be a StackViewport or VolumeViewport');
|
|
78
81
|
}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -350,4 +350,24 @@ export interface ScaleOverlayAnnotation extends Annotation {
|
|
|
350
350
|
viewportId: string;
|
|
351
351
|
};
|
|
352
352
|
}
|
|
353
|
+
export interface VideoRedactionAnnotation extends Annotation {
|
|
354
|
+
metadata: {
|
|
355
|
+
viewPlaneNormal: Types.Point3;
|
|
356
|
+
viewUp: Types.Point3;
|
|
357
|
+
FrameOfReferenceUID: string;
|
|
358
|
+
referencedImageId: string;
|
|
359
|
+
toolName: string;
|
|
360
|
+
};
|
|
361
|
+
data: {
|
|
362
|
+
invalidated: boolean;
|
|
363
|
+
handles: {
|
|
364
|
+
points: Types.Point3[];
|
|
365
|
+
activeHandleIndex: number | null;
|
|
366
|
+
};
|
|
367
|
+
cachedStats: {
|
|
368
|
+
[key: string]: any;
|
|
369
|
+
};
|
|
370
|
+
active: boolean;
|
|
371
|
+
};
|
|
372
|
+
}
|
|
353
373
|
export {};
|