@cornerstonejs/tools 4.3.16 → 4.4.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/esm/enums/Events.d.ts +1 -0
- package/dist/esm/enums/Events.js +1 -0
- package/dist/esm/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.js +5 -3
- package/dist/esm/types/EventTypes.d.ts +5 -1
- package/dist/esm/utilities/stackPrefetch/stackContextPrefetch.js +9 -1
- package/dist/esm/utilities/stackPrefetch/stackPrefetch.js +9 -1
- package/dist/esm/version.d.ts +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +3 -3
|
@@ -6,6 +6,7 @@ declare enum Events {
|
|
|
6
6
|
CROSSHAIR_TOOL_CENTER_CHANGED = "CORNERSTONE_TOOLS_CROSSHAIR_TOOL_CENTER_CHANGED",
|
|
7
7
|
VOLUMECROPPINGCONTROL_TOOL_CHANGED = "CORNERSTONE_TOOLS_VOLUMECROPPINGCONTROL_TOOL_CHANGED",
|
|
8
8
|
VOLUMECROPPING_TOOL_CHANGED = "CORNERSTONE_TOOLS_VOLUMECROPPING_TOOL_CHANGED",
|
|
9
|
+
STACK_PREFETCH_COMPLETE = "CORNERSTONE_TOOLS_STACK_PREFETCH_COMPLETE",
|
|
9
10
|
ANNOTATION_ADDED = "CORNERSTONE_TOOLS_ANNOTATION_ADDED",
|
|
10
11
|
ANNOTATION_COMPLETED = "CORNERSTONE_TOOLS_ANNOTATION_COMPLETED",
|
|
11
12
|
ANNOTATION_MODIFIED = "CORNERSTONE_TOOLS_ANNOTATION_MODIFIED",
|
package/dist/esm/enums/Events.js
CHANGED
|
@@ -7,6 +7,7 @@ var Events;
|
|
|
7
7
|
Events["CROSSHAIR_TOOL_CENTER_CHANGED"] = "CORNERSTONE_TOOLS_CROSSHAIR_TOOL_CENTER_CHANGED";
|
|
8
8
|
Events["VOLUMECROPPINGCONTROL_TOOL_CHANGED"] = "CORNERSTONE_TOOLS_VOLUMECROPPINGCONTROL_TOOL_CHANGED";
|
|
9
9
|
Events["VOLUMECROPPING_TOOL_CHANGED"] = "CORNERSTONE_TOOLS_VOLUMECROPPING_TOOL_CHANGED";
|
|
10
|
+
Events["STACK_PREFETCH_COMPLETE"] = "CORNERSTONE_TOOLS_STACK_PREFETCH_COMPLETE";
|
|
10
11
|
Events["ANNOTATION_ADDED"] = "CORNERSTONE_TOOLS_ANNOTATION_ADDED";
|
|
11
12
|
Events["ANNOTATION_COMPLETED"] = "CORNERSTONE_TOOLS_ANNOTATION_COMPLETED";
|
|
12
13
|
Events["ANNOTATION_MODIFIED"] = "CORNERSTONE_TOOLS_ANNOTATION_MODIFIED";
|
|
@@ -120,9 +120,11 @@ class FrameOfReferenceSpecificAnnotationManager {
|
|
|
120
120
|
}
|
|
121
121
|
if (toolName) {
|
|
122
122
|
const annotationsForTool = annotations[groupKey][toolName];
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
123
|
+
if (annotationsForTool) {
|
|
124
|
+
for (const annotation of annotationsForTool) {
|
|
125
|
+
this.removeAnnotation(annotation.annotationUID);
|
|
126
|
+
removedAnnotations.push(annotation);
|
|
127
|
+
}
|
|
126
128
|
}
|
|
127
129
|
}
|
|
128
130
|
else {
|
|
@@ -190,6 +190,10 @@ type MouseWheelEventDetail = NormalizedInteractionEventDetail & MouseCustomEvent
|
|
|
190
190
|
};
|
|
191
191
|
points: IPoints;
|
|
192
192
|
};
|
|
193
|
+
type StackPrefetchCompleteEventDetail = {
|
|
194
|
+
element: HTMLDivElement;
|
|
195
|
+
lastPrefetchedImageId: string;
|
|
196
|
+
};
|
|
193
197
|
type NormalizedMouseEventType = Types.CustomEventType<MouseCustomEventDetail>;
|
|
194
198
|
type NormalizedTouchEventType = Types.CustomEventType<TouchCustomEventDetail>;
|
|
195
199
|
type ToolModeChangedEventType = Types.CustomEventType<ToolModeChangedEventDetail>;
|
|
@@ -231,4 +235,4 @@ type MouseClickEventType = Types.CustomEventType<MouseClickEventDetail>;
|
|
|
231
235
|
type MouseMoveEventType = Types.CustomEventType<MouseMoveEventDetail>;
|
|
232
236
|
type MouseDoubleClickEventType = Types.CustomEventType<MouseDoubleClickEventDetail>;
|
|
233
237
|
type MouseWheelEventType = Types.CustomEventType<MouseWheelEventDetail>;
|
|
234
|
-
export type { InteractionStartType, InteractionEndType, InteractionEventType, NormalizedInteractionEventDetail, NormalizedMouseEventType, NormalizedTouchEventType, ToolModeChangedEventDetail, ToolModeChangedEventType, ToolActivatedEventDetail, ToolActivatedEventType, AnnotationAddedEventDetail, AnnotationAddedEventType, AnnotationCompletedEventDetail, AnnotationCompletedEventType, AnnotationModifiedEventDetail, AnnotationModifiedEventType, AnnotationRemovedEventDetail, AnnotationRemovedEventType, AnnotationSelectionChangeEventDetail, AnnotationSelectionChangeEventType, AnnotationRenderedEventDetail, AnnotationRenderedEventType, AnnotationLockChangeEventDetail, AnnotationVisibilityChangeEventDetail, AnnotationLockChangeEventType, AnnotationVisibilityChangeEventType, AnnotationInterpolationCompletedEventDetail, AnnotationInterpolationCompletedEventType, AnnotationInterpolationRemovedEventDetail, AnnotationInterpolationRemovedEventType, ContourAnnotationCompletedEventDetail, SegmentationDataModifiedEventType, SegmentationRepresentationModifiedEventDetail, SegmentationRepresentationModifiedEventType, SegmentationRepresentationRemovedEventDetail, SegmentationRepresentationRemovedEventType, SegmentationRemovedEventType, SegmentationRemovedEventDetail, SegmentationDataModifiedEventDetail, SegmentationRenderedEventType, SegmentationRenderedEventDetail, SegmentationModifiedEventType, SegmentationModifiedEventDetail, KeyDownEventDetail, KeyDownEventType, KeyUpEventDetail, KeyUpEventType, MouseDownEventDetail, TouchStartEventDetail, MouseDownEventType, TouchStartEventType, MouseDownActivateEventDetail, TouchStartActivateEventDetail, MouseDownActivateEventType, TouchStartActivateEventType, MouseDragEventDetail, TouchDragEventDetail, MouseDragEventType, TouchDragEventType, MouseUpEventDetail, TouchEndEventDetail, MouseUpEventType, TouchEndEventType, MouseClickEventDetail, MouseClickEventType, TouchTapEventDetail, TouchTapEventType, TouchSwipeEventDetail, TouchSwipeEventType, TouchPressEventDetail, TouchPressEventType, MouseMoveEventDetail, MouseMoveEventType, MouseDoubleClickEventDetail, MouseDoubleClickEventType, MouseWheelEventDetail, MouseWheelEventType, SegmentationAddedEventDetail, SegmentationAddedEventType, };
|
|
238
|
+
export type { InteractionStartType, InteractionEndType, InteractionEventType, NormalizedInteractionEventDetail, NormalizedMouseEventType, NormalizedTouchEventType, ToolModeChangedEventDetail, ToolModeChangedEventType, ToolActivatedEventDetail, ToolActivatedEventType, AnnotationAddedEventDetail, AnnotationAddedEventType, AnnotationCompletedEventDetail, AnnotationCompletedEventType, AnnotationModifiedEventDetail, AnnotationModifiedEventType, AnnotationRemovedEventDetail, AnnotationRemovedEventType, AnnotationSelectionChangeEventDetail, AnnotationSelectionChangeEventType, AnnotationRenderedEventDetail, AnnotationRenderedEventType, AnnotationLockChangeEventDetail, AnnotationVisibilityChangeEventDetail, AnnotationLockChangeEventType, AnnotationVisibilityChangeEventType, AnnotationInterpolationCompletedEventDetail, AnnotationInterpolationCompletedEventType, AnnotationInterpolationRemovedEventDetail, AnnotationInterpolationRemovedEventType, ContourAnnotationCompletedEventDetail, SegmentationDataModifiedEventType, SegmentationRepresentationModifiedEventDetail, SegmentationRepresentationModifiedEventType, SegmentationRepresentationRemovedEventDetail, SegmentationRepresentationRemovedEventType, SegmentationRemovedEventType, SegmentationRemovedEventDetail, SegmentationDataModifiedEventDetail, SegmentationRenderedEventType, SegmentationRenderedEventDetail, SegmentationModifiedEventType, SegmentationModifiedEventDetail, KeyDownEventDetail, KeyDownEventType, KeyUpEventDetail, KeyUpEventType, MouseDownEventDetail, TouchStartEventDetail, MouseDownEventType, TouchStartEventType, MouseDownActivateEventDetail, TouchStartActivateEventDetail, MouseDownActivateEventType, TouchStartActivateEventType, MouseDragEventDetail, TouchDragEventDetail, MouseDragEventType, TouchDragEventType, MouseUpEventDetail, TouchEndEventDetail, MouseUpEventType, TouchEndEventType, MouseClickEventDetail, MouseClickEventType, TouchTapEventDetail, TouchTapEventType, TouchSwipeEventDetail, TouchSwipeEventType, TouchPressEventDetail, TouchPressEventType, MouseMoveEventDetail, MouseMoveEventType, MouseDoubleClickEventDetail, MouseDoubleClickEventType, MouseWheelEventDetail, MouseWheelEventType, SegmentationAddedEventDetail, SegmentationAddedEventType, StackPrefetchCompleteEventDetail, };
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, metaData, utilities, } from '@cornerstonejs/core';
|
|
1
|
+
import { imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, metaData, utilities, triggerEvent, } from '@cornerstonejs/core';
|
|
2
2
|
import { addToolState, getToolState } from './state';
|
|
3
3
|
import { getStackData, requestType, clearFromImageIds, getPromiseRemovedHandler, } from './stackPrefetchUtils';
|
|
4
|
+
import { Events } from '../../enums';
|
|
4
5
|
const { imageRetrieveMetadataProvider } = utilities;
|
|
5
6
|
let configuration = {
|
|
6
7
|
maxImagesToPrefetch: Infinity,
|
|
@@ -105,6 +106,13 @@ function prefetch(element, priority = 0) {
|
|
|
105
106
|
}
|
|
106
107
|
}
|
|
107
108
|
}
|
|
109
|
+
if (stackPrefetch.indicesToRequest.length === 0) {
|
|
110
|
+
const eventDetail = {
|
|
111
|
+
element: element,
|
|
112
|
+
lastPrefetchedImageId: imageId,
|
|
113
|
+
};
|
|
114
|
+
triggerEvent(eventTarget, Events.STACK_PREFETCH_COMPLETE, eventDetail);
|
|
115
|
+
}
|
|
108
116
|
}
|
|
109
117
|
const requestFn = (imageId, options) => {
|
|
110
118
|
const { retrieveOptions = {} } = metaData.get(imageRetrieveMetadataProvider.IMAGE_RETRIEVE_CONFIGURATION, imageId, 'stack') || {};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, metaData, utilities, } from '@cornerstonejs/core';
|
|
1
|
+
import { imageLoader, Enums, eventTarget, imageLoadPoolManager, cache, metaData, utilities, triggerEvent, } from '@cornerstonejs/core';
|
|
2
2
|
import { addToolState, getToolState } from './state';
|
|
3
3
|
import { getStackData, requestType, priority, getPromiseRemovedHandler, nearestIndex, range, } from './stackPrefetchUtils';
|
|
4
|
+
import { Events } from '../../enums';
|
|
4
5
|
const { imageRetrieveMetadataProvider } = utilities;
|
|
5
6
|
let configuration = {
|
|
6
7
|
maxImagesToPrefetch: Infinity,
|
|
@@ -60,6 +61,13 @@ function prefetch(element) {
|
|
|
60
61
|
console.log('prefetch done: %s', imageId);
|
|
61
62
|
const imageIdIndex = stack.imageIds.indexOf(imageId);
|
|
62
63
|
removeFromList(imageIdIndex);
|
|
64
|
+
if (stackPrefetch.indicesToRequest.length === 0) {
|
|
65
|
+
const eventDetail = {
|
|
66
|
+
element: element,
|
|
67
|
+
lastPrefetchedImageId: imageId,
|
|
68
|
+
};
|
|
69
|
+
triggerEvent(eventTarget, Events.STACK_PREFETCH_COMPLETE, eventDetail);
|
|
70
|
+
}
|
|
63
71
|
}
|
|
64
72
|
let lowerIndex = nearest.low;
|
|
65
73
|
let higherIndex = nearest.high;
|
package/dist/esm/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const version = "4.
|
|
1
|
+
export declare const version = "4.4.0";
|
package/dist/esm/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = '4.
|
|
1
|
+
export const version = '4.4.0';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cornerstonejs/tools",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.4.0",
|
|
4
4
|
"description": "Cornerstone3D Tools",
|
|
5
5
|
"types": "./dist/esm/index.d.ts",
|
|
6
6
|
"module": "./dist/esm/index.js",
|
|
@@ -108,7 +108,7 @@
|
|
|
108
108
|
"canvas": "3.1.0"
|
|
109
109
|
},
|
|
110
110
|
"peerDependencies": {
|
|
111
|
-
"@cornerstonejs/core": "4.
|
|
111
|
+
"@cornerstonejs/core": "4.4.0",
|
|
112
112
|
"@kitware/vtk.js": "32.12.1",
|
|
113
113
|
"@types/d3-array": "3.2.1",
|
|
114
114
|
"@types/d3-interpolate": "3.0.4",
|
|
@@ -127,5 +127,5 @@
|
|
|
127
127
|
"type": "individual",
|
|
128
128
|
"url": "https://ohif.org/donate"
|
|
129
129
|
},
|
|
130
|
-
"gitHead": "
|
|
130
|
+
"gitHead": "7f58c122a035f53d22efbfcead943549dd18cfe4"
|
|
131
131
|
}
|