@cornerstonejs/tools 0.9.0 → 0.9.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/eventDispatchers/mouseEventHandlers/mouseDown.js +7 -7
- package/dist/cjs/eventDispatchers/mouseEventHandlers/mouseDown.js.map +1 -1
- package/dist/cjs/eventDispatchers/mouseEventHandlers/mouseDownActivate.js +1 -1
- package/dist/cjs/eventDispatchers/mouseEventHandlers/mouseDownActivate.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/annotationSelection.d.ts +6 -8
- package/dist/cjs/stateManagement/annotation/annotationSelection.js +24 -28
- package/dist/cjs/stateManagement/annotation/annotationSelection.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/annotationState.d.ts +1 -1
- package/dist/cjs/stateManagement/annotation/annotationState.js +6 -7
- package/dist/cjs/stateManagement/annotation/annotationState.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/config/getState.js +1 -1
- package/dist/cjs/stateManagement/annotation/config/getState.js.map +1 -1
- package/dist/cjs/store/ToolGroupManager/ToolGroup.js +2 -0
- package/dist/cjs/store/ToolGroupManager/ToolGroup.js.map +1 -1
- package/dist/cjs/store/removeEnabledElement.js +1 -1
- package/dist/cjs/store/removeEnabledElement.js.map +1 -1
- package/dist/cjs/tools/CrosshairsTool.js +1 -1
- package/dist/cjs/tools/CrosshairsTool.js.map +1 -1
- package/dist/cjs/tools/StackScrollTool.d.ts +1 -0
- package/dist/cjs/tools/StackScrollTool.js +14 -1
- package/dist/cjs/tools/StackScrollTool.js.map +1 -1
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js +6 -2
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js.map +1 -1
- package/dist/cjs/tools/WindowLevelTool.js +1 -1
- package/dist/cjs/tools/WindowLevelTool.js.map +1 -1
- package/dist/cjs/tools/annotation/BidirectionalTool.js +1 -1
- package/dist/cjs/tools/annotation/BidirectionalTool.js.map +1 -1
- package/dist/cjs/tools/annotation/EllipticalROITool.js +1 -1
- package/dist/cjs/tools/annotation/EllipticalROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/LengthTool.js +1 -1
- package/dist/cjs/tools/annotation/LengthTool.js.map +1 -1
- package/dist/cjs/tools/annotation/ProbeTool.js +1 -1
- package/dist/cjs/tools/annotation/ProbeTool.js.map +1 -1
- package/dist/cjs/tools/annotation/RectangleROITool.js +1 -1
- package/dist/cjs/tools/annotation/RectangleROITool.js.map +1 -1
- package/dist/cjs/types/EventTypes.d.ts +4 -5
- package/dist/cjs/types/ScrollOptions.d.ts +6 -0
- package/dist/cjs/types/ScrollOptions.js +3 -0
- package/dist/cjs/types/ScrollOptions.js.map +1 -0
- package/dist/cjs/types/index.d.ts +2 -1
- package/dist/cjs/utilities/index.d.ts +2 -1
- package/dist/cjs/utilities/index.js +3 -1
- package/dist/cjs/utilities/index.js.map +1 -1
- package/dist/cjs/utilities/orientation/getOrientationStringLPS.d.ts +2 -0
- package/dist/cjs/utilities/orientation/getOrientationStringLPS.js +45 -0
- package/dist/cjs/utilities/orientation/getOrientationStringLPS.js.map +1 -0
- package/dist/cjs/utilities/orientation/index.d.ts +3 -0
- package/dist/cjs/utilities/orientation/index.js +11 -0
- package/dist/cjs/utilities/orientation/index.js.map +1 -0
- package/dist/cjs/utilities/orientation/invertOrientationStringLPS.d.ts +1 -0
- package/dist/cjs/utilities/orientation/invertOrientationStringLPS.js +14 -0
- package/dist/cjs/utilities/orientation/invertOrientationStringLPS.js.map +1 -0
- package/dist/cjs/utilities/stackScrollTool/index.d.ts +0 -6
- package/dist/cjs/utilities/stackScrollTool/index.js +0 -5
- package/dist/cjs/utilities/stackScrollTool/index.js.map +1 -1
- package/dist/cjs/utilities/stackScrollTool/scrollThroughStack.d.ts +2 -1
- package/dist/cjs/utilities/stackScrollTool/scrollThroughStack.js +5 -8
- package/dist/cjs/utilities/stackScrollTool/scrollThroughStack.js.map +1 -1
- package/dist/cjs/utilities/viewport/jumpToSlice.js +7 -1
- package/dist/cjs/utilities/viewport/jumpToSlice.js.map +1 -1
- package/dist/esm/eventDispatchers/mouseEventHandlers/mouseDown.js +7 -7
- package/dist/esm/eventDispatchers/mouseEventHandlers/mouseDown.js.map +1 -1
- package/dist/esm/eventDispatchers/mouseEventHandlers/mouseDownActivate.js +1 -1
- package/dist/esm/eventDispatchers/mouseEventHandlers/mouseDownActivate.js.map +1 -1
- package/dist/esm/stateManagement/annotation/annotationSelection.d.ts +6 -8
- package/dist/esm/stateManagement/annotation/annotationSelection.js +24 -27
- package/dist/esm/stateManagement/annotation/annotationSelection.js.map +1 -1
- package/dist/esm/stateManagement/annotation/annotationState.d.ts +1 -1
- package/dist/esm/stateManagement/annotation/annotationState.js +6 -7
- package/dist/esm/stateManagement/annotation/annotationState.js.map +1 -1
- package/dist/esm/stateManagement/annotation/config/getState.js +1 -1
- package/dist/esm/stateManagement/annotation/config/getState.js.map +1 -1
- package/dist/esm/store/ToolGroupManager/ToolGroup.js +2 -0
- package/dist/esm/store/ToolGroupManager/ToolGroup.js.map +1 -1
- package/dist/esm/store/removeEnabledElement.js +1 -1
- package/dist/esm/store/removeEnabledElement.js.map +1 -1
- package/dist/esm/tools/CrosshairsTool.js +1 -1
- package/dist/esm/tools/CrosshairsTool.js.map +1 -1
- package/dist/esm/tools/StackScrollTool.d.ts +1 -0
- package/dist/esm/tools/StackScrollTool.js +15 -2
- package/dist/esm/tools/StackScrollTool.js.map +1 -1
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js +7 -3
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js.map +1 -1
- package/dist/esm/tools/WindowLevelTool.js +1 -1
- package/dist/esm/tools/WindowLevelTool.js.map +1 -1
- package/dist/esm/tools/annotation/BidirectionalTool.js +1 -1
- package/dist/esm/tools/annotation/BidirectionalTool.js.map +1 -1
- package/dist/esm/tools/annotation/EllipticalROITool.js +1 -1
- package/dist/esm/tools/annotation/EllipticalROITool.js.map +1 -1
- package/dist/esm/tools/annotation/LengthTool.js +1 -1
- package/dist/esm/tools/annotation/LengthTool.js.map +1 -1
- package/dist/esm/tools/annotation/ProbeTool.js +1 -1
- package/dist/esm/tools/annotation/ProbeTool.js.map +1 -1
- package/dist/esm/tools/annotation/RectangleROITool.js +1 -1
- package/dist/esm/tools/annotation/RectangleROITool.js.map +1 -1
- package/dist/esm/types/EventTypes.d.ts +4 -5
- package/dist/esm/types/ScrollOptions.d.ts +6 -0
- package/dist/esm/types/ScrollOptions.js +2 -0
- package/dist/esm/types/ScrollOptions.js.map +1 -0
- package/dist/esm/types/index.d.ts +2 -1
- package/dist/esm/utilities/index.d.ts +2 -1
- package/dist/esm/utilities/index.js +2 -1
- package/dist/esm/utilities/index.js.map +1 -1
- package/dist/esm/utilities/orientation/getOrientationStringLPS.d.ts +2 -0
- package/dist/esm/utilities/orientation/getOrientationStringLPS.js +42 -0
- package/dist/esm/utilities/orientation/getOrientationStringLPS.js.map +1 -0
- package/dist/esm/utilities/orientation/index.d.ts +3 -0
- package/dist/esm/utilities/orientation/index.js +4 -0
- package/dist/esm/utilities/orientation/index.js.map +1 -0
- package/dist/esm/utilities/orientation/invertOrientationStringLPS.d.ts +1 -0
- package/dist/esm/utilities/orientation/invertOrientationStringLPS.js +11 -0
- package/dist/esm/utilities/orientation/invertOrientationStringLPS.js.map +1 -0
- package/dist/esm/utilities/stackScrollTool/index.d.ts +0 -6
- package/dist/esm/utilities/stackScrollTool/index.js +0 -5
- package/dist/esm/utilities/stackScrollTool/index.js.map +1 -1
- package/dist/esm/utilities/stackScrollTool/scrollThroughStack.d.ts +2 -1
- package/dist/esm/utilities/stackScrollTool/scrollThroughStack.js +5 -8
- package/dist/esm/utilities/stackScrollTool/scrollThroughStack.js.map +1 -1
- package/dist/esm/utilities/viewport/jumpToSlice.js +4 -1
- package/dist/esm/utilities/viewport/jumpToSlice.js.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utilities/stackScrollTool/index.ts"],"names":[],"mappings":";;;;;;AAAA,oFAA4D;AAInD,gCAJF,+BAAqB,CAIE;AAH9B,oEAA4C;AAGZ,wBAHzB,uBAAa,CAGyB;AAF7C,8EAAsD;AAEP,6BAFxC,4BAAkB,CAEwC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/utilities/stackScrollTool/index.ts"],"names":[],"mappings":";;;;;;AAAA,oFAA4D;AAInD,gCAJF,+BAAqB,CAIE;AAH9B,oEAA4C;AAGZ,wBAHzB,uBAAa,CAGyB;AAF7C,8EAAsD;AAEP,6BAFxC,4BAAkB,CAEwC"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
import { Types } from '@cornerstonejs/core';
|
|
2
|
-
|
|
2
|
+
import { ScrollOptions } from '../../types';
|
|
3
|
+
export default function scrollThroughStack(viewport: Types.IStackViewport | Types.IVolumeViewport, options: ScrollOptions): void;
|
|
@@ -7,11 +7,10 @@ const core_1 = require("@cornerstonejs/core");
|
|
|
7
7
|
const clip_1 = __importDefault(require("../clip"));
|
|
8
8
|
const getSliceRange_1 = __importDefault(require("./getSliceRange"));
|
|
9
9
|
const snapFocalPointToSlice_1 = __importDefault(require("./snapFocalPointToSlice"));
|
|
10
|
-
function scrollThroughStack(viewport,
|
|
10
|
+
function scrollThroughStack(viewport, options) {
|
|
11
11
|
const { type: viewportType } = viewport;
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
const delta = invert ? -deltaFrames : deltaFrames;
|
|
12
|
+
const { volumeId, direction, invert } = options;
|
|
13
|
+
const delta = invert ? -direction : direction;
|
|
15
14
|
if (viewport instanceof core_1.StackViewport) {
|
|
16
15
|
const currentImageIdIndex = viewport.getCurrentImageIdIndex();
|
|
17
16
|
const numberOfFrames = viewport.getImageIds().length;
|
|
@@ -20,10 +19,8 @@ function scrollThroughStack(viewport, targetId, deltaFrames, invert = false) {
|
|
|
20
19
|
viewport.setImageIdIndex(newImageIdIndex);
|
|
21
20
|
}
|
|
22
21
|
else if (viewport instanceof core_1.VolumeViewport) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}
|
|
26
|
-
const volumeId = targetId.split('volumeId:')[1];
|
|
22
|
+
const camera = viewport.getCamera();
|
|
23
|
+
const { focalPoint, viewPlaneNormal, position } = camera;
|
|
27
24
|
const { spacingInNormalDirection, imageVolume } = core_1.utilities.getTargetVolumeAndSpacingInNormalDir(viewport, camera, volumeId);
|
|
28
25
|
if (!imageVolume) {
|
|
29
26
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scrollThroughStack.js","sourceRoot":"","sources":["../../../../src/utilities/stackScrollTool/scrollThroughStack.ts"],"names":[],"mappings":";;;;;AAAA,8CAK6B;AAC7B,mDAA2B;AAC3B,oEAA4C;AAC5C,oFAA4D;
|
|
1
|
+
{"version":3,"file":"scrollThroughStack.js","sourceRoot":"","sources":["../../../../src/utilities/stackScrollTool/scrollThroughStack.ts"],"names":[],"mappings":";;;;;AAAA,8CAK6B;AAC7B,mDAA2B;AAC3B,oEAA4C;AAC5C,oFAA4D;AAY5D,SAAwB,kBAAkB,CACxC,QAAsD,EACtD,OAAsB;IAEtB,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IACxC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEhD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAE9C,IAAI,QAAQ,YAAY,oBAAa,EAAE;QAErC,MAAM,mBAAmB,GAAG,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QAC9D,MAAM,cAAc,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;QACrD,IAAI,eAAe,GAAG,mBAAmB,GAAG,KAAK,CAAC;QAClD,eAAe,GAAG,IAAA,cAAI,EAAC,eAAe,EAAE,CAAC,EAAE,cAAc,GAAG,CAAC,CAAC,CAAC;QAE/D,QAAQ,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;KAC3C;SAAM,IAAI,QAAQ,YAAY,qBAAc,EAAE;QAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QACzD,MAAM,EAAE,wBAAwB,EAAE,WAAW,EAAE,GAC7C,gBAAO,CAAC,oCAAoC,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAE3E,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO;SACR;QAED,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAEtD,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;SAC3E;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;QAC9B,MAAM,WAAW,GAAG,IAAA,uBAAa,EAAC,WAAW,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC;QAE5E,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,IAAA,+BAAqB,EAC1D,UAAU,EACV,QAAQ,EACR,WAAW,EACX,eAAe,EACf,wBAAwB,EACxB,KAAK,CACN,CAAC;QAEF,QAAQ,CAAC,SAAS,CAAC;YACjB,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,WAAW;SACtB,CAAC,CAAC;QACH,QAAQ,CAAC,MAAM,EAAE,CAAC;KACnB;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,sCAAsC,YAAY,EAAE,CAAC,CAAC;KACvE;AACH,CAAC;AArDD,qCAqDC"}
|
|
@@ -1,6 +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");
|
|
7
|
+
const clip_1 = __importDefault(require("../clip"));
|
|
4
8
|
function jumpToSlice(element, options) {
|
|
5
9
|
const { imageIdIndex } = options;
|
|
6
10
|
if (imageIdIndex === undefined) {
|
|
@@ -14,7 +18,9 @@ function jumpToSlice(element, options) {
|
|
|
14
18
|
if (!(viewport instanceof core_1.StackViewport)) {
|
|
15
19
|
throw new Error('Cannot scroll to slice on a non-stack viewport yet');
|
|
16
20
|
}
|
|
17
|
-
|
|
21
|
+
const numberOfFrames = viewport.getImageIds().length;
|
|
22
|
+
const newImageIdIndex = (0, clip_1.default)(imageIdIndex, 0, numberOfFrames - 1);
|
|
23
|
+
return viewport.setImageIdIndex(newImageIdIndex);
|
|
18
24
|
}
|
|
19
25
|
exports.default = jumpToSlice;
|
|
20
26
|
//# sourceMappingURL=jumpToSlice.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jumpToSlice.js","sourceRoot":"","sources":["../../../../src/utilities/viewport/jumpToSlice.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jumpToSlice.js","sourceRoot":"","sources":["../../../../src/utilities/viewport/jumpToSlice.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuE;AAEvE,mDAA2B;AAa3B,SAAS,WAAW,CAClB,OAAuB,EACvB,OAA2B;IAE3B,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IACjC,IAAI,YAAY,KAAK,SAAS,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAElD,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;KAC9C;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,IAAI,CAAC,CAAC,QAAQ,YAAY,oBAAa,CAAC,EAAE;QACxC,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;KACvE;IAED,MAAM,cAAc,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;IACrD,MAAM,eAAe,GAAG,IAAA,cAAI,EAAC,YAAY,EAAE,CAAC,EAAE,cAAc,GAAG,CAAC,CAAC,CAAC;IAElE,OAAO,QAAQ,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;AACnD,CAAC;AAED,kBAAe,WAAW,CAAC"}
|
|
@@ -36,14 +36,14 @@ export default function mouseDown(evt) {
|
|
|
36
36
|
const isMultiSelect = !!evt.detail.event.shiftKey;
|
|
37
37
|
if (annotationToolsWithMoveableHandles.length > 0) {
|
|
38
38
|
const { tool, annotation, handle } = getAnnotationForSelection(annotationToolsWithMoveableHandles);
|
|
39
|
-
toggleAnnotationSelection(annotation, isMultiSelect);
|
|
39
|
+
toggleAnnotationSelection(annotation.annotationUID, isMultiSelect);
|
|
40
40
|
tool.handleSelectedCallback(evt, annotation, handle, 'Mouse');
|
|
41
41
|
return;
|
|
42
42
|
}
|
|
43
43
|
const moveableAnnotationTools = filterMoveableAnnotationTools(element, annotationToolsWithAnnotations, canvasCoords, 'mouse');
|
|
44
44
|
if (moveableAnnotationTools.length > 0) {
|
|
45
45
|
const { tool, annotation } = getAnnotationForSelection(moveableAnnotationTools);
|
|
46
|
-
toggleAnnotationSelection(annotation, isMultiSelect);
|
|
46
|
+
toggleAnnotationSelection(annotation.annotationUID, isMultiSelect);
|
|
47
47
|
tool.toolSelectedCallback(evt, annotation, 'Mouse');
|
|
48
48
|
return;
|
|
49
49
|
}
|
|
@@ -59,19 +59,19 @@ function getAnnotationForSelection(toolsWithMovableHandles) {
|
|
|
59
59
|
toolsWithMovableHandles.find((item) => !isAnnotationLocked(item.annotation))) ||
|
|
60
60
|
toolsWithMovableHandles[0]);
|
|
61
61
|
}
|
|
62
|
-
function toggleAnnotationSelection(
|
|
62
|
+
function toggleAnnotationSelection(annotationUID, isMultiSelect = false) {
|
|
63
63
|
if (isMultiSelect) {
|
|
64
|
-
if (isAnnotationSelected(
|
|
65
|
-
setAnnotationSelected(
|
|
64
|
+
if (isAnnotationSelected(annotationUID)) {
|
|
65
|
+
setAnnotationSelected(annotationUID, false);
|
|
66
66
|
}
|
|
67
67
|
else {
|
|
68
68
|
const preserveSelected = true;
|
|
69
|
-
setAnnotationSelected(
|
|
69
|
+
setAnnotationSelected(annotationUID, true, preserveSelected);
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
else {
|
|
73
73
|
const preserveSelected = false;
|
|
74
|
-
setAnnotationSelected(
|
|
74
|
+
setAnnotationSelected(annotationUID, true, preserveSelected);
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
77
|
//# sourceMappingURL=mouseDown.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mouseDown.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/mouseEventHandlers/mouseDown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAOxC,OAAO,EACL,qBAAqB,EACrB,oBAAoB,GACrB,MAAM,sDAAsD,CAAC;AAE9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oDAAoD,CAAC;AAGxF,OAAO,8BAA8B,MAAM,4CAA4C,CAAC;AACxF,OAAO,oCAAoC,MAAM,kDAAkD,CAAC;AACpG,OAAO,6BAA6B,MAAM,2CAA2C,CAAC;AACtF,OAAO,0BAA0B,MAAM,sCAAsC,CAAC;AAC9E,OAAO,8BAA8B,MAAM,0CAA0C,CAAC;AAEtF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;AAyBtC,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,GAAkC;IAElE,IAAI,KAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;IAInD,IAAI,UAAU,IAAI,OAAO,UAAU,CAAC,oBAAoB,KAAK,UAAU,EAAE;QACvE,MAAM,aAAa,GAAG,UAAU,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;QAE3D,IAAI,aAAa,EAAE;YACjB,OAAO;SACR;KACF;IAGD,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,KAAK,CAAC,CAAC;IACtD,MAAM,2BAA2B,GAAG,8BAA8B,CAChE,GAAG,EACH,CAAC,MAAM,CAAC,EACR,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CACzB,CAAC;IACF,MAAM,wCAAwC,GAAG,cAAc;QAC7D,CAAC,CAAC,8BAA8B,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QAChD,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,eAAe,GAAG;QACtB,GAAG,CAAC,2BAA2B,IAAI,EAAE,CAAC;QACtC,GAAG,CAAC,wCAAwC,IAAI,EAAE,CAAC;KACpD,CAAC;IAEF,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAGhC,MAAM,8BAA8B,GAAG,oCAAoC,CACzE,OAAO,EACP,eAAe,CAChB,CAAC;IAEF,MAAM,YAAY,GAAG,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC;IAKtD,MAAM,kCAAkC,GAAG,8BAA8B,CACvE,OAAO,EACP,8BAA8B,EAC9B,YAAY,EACZ,OAAO,CACR,CAAC;IAGF,MAAM,aAAa,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;IAIlD,IAAI,kCAAkC,CAAC,MAAM,GAAG,CAAC,EAAE;QACjD,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,yBAAyB,CAC5D,kCAAkC,CACP,CAAC;QAE9B,yBAAyB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"mouseDown.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/mouseEventHandlers/mouseDown.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export default function mouseDownActivate(evt) {
|
|
|
14
14
|
}
|
|
15
15
|
if (activeTool.addNewAnnotation) {
|
|
16
16
|
const annotation = activeTool.addNewAnnotation(evt, 'mouse');
|
|
17
|
-
setAnnotationSelected(annotation);
|
|
17
|
+
setAnnotationSelected(annotation.annotationUID);
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
//# sourceMappingURL=mouseDownActivate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mouseDownActivate.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/mouseEventHandlers/mouseDownActivate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,0BAA0B,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sDAAsD,CAAC;AAU7F,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,GAA0C;IAG1C,IAAI,KAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO;KACR;IAED,IAAI,KAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO;KACR;IAED,IAAI,UAAU,CAAC,gBAAgB,EAAE;QAC/B,MAAM,UAAU,GAAG,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC7D,qBAAqB,CAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"mouseDownActivate.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/mouseEventHandlers/mouseDownActivate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,0BAA0B,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sDAAsD,CAAC;AAU7F,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,GAA0C;IAG1C,IAAI,KAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO;KACR;IAED,IAAI,KAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO;KACR;IAED,IAAI,UAAU,CAAC,gBAAgB,EAAE;QAC/B,MAAM,UAAU,GAAG,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC7D,qBAAqB,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;KACjD;AACH,CAAC"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
declare function
|
|
3
|
-
declare function
|
|
4
|
-
declare function
|
|
5
|
-
declare function
|
|
6
|
-
declare function getAnnotationsSelectedByToolName(toolName: string): Array<Annotation>;
|
|
7
|
-
declare function isAnnotationSelected(annotation: Annotation): boolean;
|
|
1
|
+
declare function setAnnotationSelected(annotationUID: string, selected?: boolean, preserveSelected?: boolean): void;
|
|
2
|
+
declare function deselectAnnotation(annotationUID?: string): void;
|
|
3
|
+
declare function getAnnotationsSelected(): Array<string>;
|
|
4
|
+
declare function getAnnotationsSelectedByToolName(toolName: string): Array<string>;
|
|
5
|
+
declare function isAnnotationSelected(annotationUID: string): boolean;
|
|
8
6
|
declare function getAnnotationsSelectedCount(): number;
|
|
9
|
-
export { setAnnotationSelected, getAnnotationsSelected,
|
|
7
|
+
export { setAnnotationSelected, getAnnotationsSelected, getAnnotationsSelectedByToolName, getAnnotationsSelectedCount, deselectAnnotation, isAnnotationSelected, };
|
|
@@ -1,55 +1,52 @@
|
|
|
1
1
|
import { eventTarget, triggerEvent } from '@cornerstonejs/core';
|
|
2
2
|
import { Events } from '../../enums';
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
import { getAnnotation } from './annotationState';
|
|
4
|
+
const selectedAnnotationUIDs = new Set();
|
|
5
|
+
function setAnnotationSelected(annotationUID, selected = true, preserveSelected = false) {
|
|
5
6
|
if (selected) {
|
|
6
|
-
selectAnnotation(
|
|
7
|
+
selectAnnotation(annotationUID, preserveSelected);
|
|
7
8
|
}
|
|
8
9
|
else {
|
|
9
|
-
deselectAnnotation(
|
|
10
|
+
deselectAnnotation(annotationUID);
|
|
10
11
|
}
|
|
11
12
|
}
|
|
12
|
-
function selectAnnotation(
|
|
13
|
+
function selectAnnotation(annotationUID, preserveSelected = false) {
|
|
13
14
|
const detail = makeEventDetail();
|
|
14
15
|
if (!preserveSelected) {
|
|
15
|
-
clearSelectionSet(
|
|
16
|
+
clearSelectionSet(selectedAnnotationUIDs, detail);
|
|
16
17
|
}
|
|
17
|
-
if (
|
|
18
|
-
|
|
19
|
-
detail.added.push(
|
|
18
|
+
if (annotationUID && !selectedAnnotationUIDs.has(annotationUID)) {
|
|
19
|
+
selectedAnnotationUIDs.add(annotationUID);
|
|
20
|
+
detail.added.push(annotationUID);
|
|
20
21
|
}
|
|
21
|
-
publish(detail,
|
|
22
|
+
publish(detail, selectedAnnotationUIDs);
|
|
22
23
|
}
|
|
23
|
-
function deselectAnnotation(
|
|
24
|
+
function deselectAnnotation(annotationUID) {
|
|
24
25
|
const detail = makeEventDetail();
|
|
25
|
-
if (
|
|
26
|
-
if (
|
|
27
|
-
detail.removed.push(
|
|
26
|
+
if (annotationUID) {
|
|
27
|
+
if (selectedAnnotationUIDs.delete(annotationUID)) {
|
|
28
|
+
detail.removed.push(annotationUID);
|
|
28
29
|
}
|
|
29
30
|
}
|
|
30
31
|
else {
|
|
31
|
-
clearSelectionSet(
|
|
32
|
+
clearSelectionSet(selectedAnnotationUIDs, detail);
|
|
32
33
|
}
|
|
33
|
-
publish(detail,
|
|
34
|
+
publish(detail, selectedAnnotationUIDs);
|
|
34
35
|
}
|
|
35
36
|
function getAnnotationsSelected() {
|
|
36
|
-
return Array.from(
|
|
37
|
-
}
|
|
38
|
-
function getAnnotationSelected(annotationUID) {
|
|
39
|
-
return getAnnotationsSelected().find((annotation) => {
|
|
40
|
-
return annotation.annotationUID === annotationUID;
|
|
41
|
-
});
|
|
37
|
+
return Array.from(selectedAnnotationUIDs);
|
|
42
38
|
}
|
|
43
39
|
function getAnnotationsSelectedByToolName(toolName) {
|
|
44
|
-
return getAnnotationsSelected().filter((
|
|
40
|
+
return getAnnotationsSelected().filter((annotationUID) => {
|
|
41
|
+
const annotation = getAnnotation(annotationUID);
|
|
45
42
|
return annotation.metadata.toolName === toolName;
|
|
46
43
|
});
|
|
47
44
|
}
|
|
48
|
-
function isAnnotationSelected(
|
|
49
|
-
return
|
|
45
|
+
function isAnnotationSelected(annotationUID) {
|
|
46
|
+
return selectedAnnotationUIDs.has(annotationUID);
|
|
50
47
|
}
|
|
51
48
|
function getAnnotationsSelectedCount() {
|
|
52
|
-
return
|
|
49
|
+
return selectedAnnotationUIDs.size;
|
|
53
50
|
}
|
|
54
51
|
function makeEventDetail() {
|
|
55
52
|
return Object.freeze({
|
|
@@ -71,5 +68,5 @@ function publish(detail, selectionSet) {
|
|
|
71
68
|
triggerEvent(eventTarget, Events.ANNOTATION_SELECTION_CHANGE, detail);
|
|
72
69
|
}
|
|
73
70
|
}
|
|
74
|
-
export { setAnnotationSelected, getAnnotationsSelected,
|
|
71
|
+
export { setAnnotationSelected, getAnnotationsSelected, getAnnotationsSelectedByToolName, getAnnotationsSelectedCount, deselectAnnotation, isAnnotationSelected, };
|
|
75
72
|
//# sourceMappingURL=annotationSelection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotationSelection.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationSelection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"annotationSelection.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationSelection.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,6 @@ declare function getDefaultAnnotationManager(): import("./FrameOfReferenceSpecif
|
|
|
4
4
|
declare function getViewportSpecificAnnotationManager(element?: Types.IEnabledElement | HTMLDivElement): import("./FrameOfReferenceSpecificAnnotationManager").default;
|
|
5
5
|
declare function getAnnotations(element: HTMLDivElement, toolName: string): Annotations;
|
|
6
6
|
declare function addAnnotation(element: HTMLDivElement, annotation: Annotation): void;
|
|
7
|
-
declare function removeAnnotation(
|
|
7
|
+
declare function removeAnnotation(annotationUID: string, element?: HTMLDivElement): void;
|
|
8
8
|
declare function getAnnotation(annotationUID: string, element?: HTMLDivElement): Annotation;
|
|
9
9
|
export { getAnnotations, addAnnotation, getAnnotation, removeAnnotation, getViewportSpecificAnnotationManager, getDefaultAnnotationManager, };
|
|
@@ -30,18 +30,17 @@ function addAnnotation(element, annotation) {
|
|
|
30
30
|
};
|
|
31
31
|
triggerEvent(eventTarget, eventType, eventDetail);
|
|
32
32
|
}
|
|
33
|
-
function removeAnnotation(
|
|
34
|
-
|
|
33
|
+
function removeAnnotation(annotationUID, element) {
|
|
34
|
+
let annotationManager = getDefaultAnnotationManager();
|
|
35
|
+
if (element) {
|
|
36
|
+
annotationManager = getViewportSpecificAnnotationManager(element);
|
|
37
|
+
}
|
|
35
38
|
const annotation = annotationManager.getAnnotation(annotationUID);
|
|
36
39
|
annotationManager.removeAnnotation(annotationUID);
|
|
37
|
-
const enabledElement = getEnabledElement(element);
|
|
38
|
-
const { renderingEngine } = enabledElement;
|
|
39
|
-
const { viewportId } = enabledElement;
|
|
40
40
|
const eventType = Events.ANNOTATION_REMOVED;
|
|
41
41
|
const eventDetail = {
|
|
42
42
|
annotation,
|
|
43
|
-
|
|
44
|
-
renderingEngineId: renderingEngine.id,
|
|
43
|
+
annotationManagerUID: annotationManager.uid,
|
|
45
44
|
};
|
|
46
45
|
triggerEvent(eventTarget, eventType, eventDetail);
|
|
47
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotationState.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationState.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,WAAW,EACX,SAAS,IAAI,OAAO,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,gDAAgD,EAAE,MAAM,6CAA6C,CAAC;AAY/G,SAAS,2BAA2B;IAClC,OAAO,gDAAgD,CAAC;AAC1D,CAAC;AAQD,SAAS,oCAAoC,CAC3C,OAAgD;IAQhD,OAAO,gDAAgD,CAAC;AAC1D,CAAC;AAUD,SAAS,cAAc,CACrB,OAAuB,EACvB,QAAgB;IAEhB,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,iBAAiB,GACrB,oCAAoC,CAAC,cAAc,CAAC,CAAC;IACvD,MAAM,EAAE,mBAAmB,EAAE,GAAG,cAAc,CAAC;IAE/C,OAAO,iBAAiB,CAAC,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;AAC9D,CAAC;AASD,SAAS,aAAa,CAAC,OAAuB,EAAE,UAAsB;IACpE,MAAM,iBAAiB,GAAG,oCAAoC,CAAC,OAAO,CAAC,CAAC;IAExE,IAAI,UAAU,CAAC,aAAa,KAAK,SAAS,EAAE;QAC1C,UAAU,CAAC,aAAa,GAAG,OAAO,CAAC,MAAM,EAAY,CAAC;KACvD;IAED,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAE5C,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;IAC3C,MAAM,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;IAEtC,MAAM,SAAS,GAAG,MAAM,CAAC,gBAAgB,CAAC;IAE1C,MAAM,WAAW,GAA+B;QAC9C,UAAU;QACV,UAAU;QACV,iBAAiB,EAAE,eAAe,CAAC,EAAE;KACtC,CAAC;IAEF,YAAY,CAAC,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC;AAOD,SAAS,gBAAgB,CACvB,
|
|
1
|
+
{"version":3,"file":"annotationState.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationState.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,WAAW,EACX,SAAS,IAAI,OAAO,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,gDAAgD,EAAE,MAAM,6CAA6C,CAAC;AAY/G,SAAS,2BAA2B;IAClC,OAAO,gDAAgD,CAAC;AAC1D,CAAC;AAQD,SAAS,oCAAoC,CAC3C,OAAgD;IAQhD,OAAO,gDAAgD,CAAC;AAC1D,CAAC;AAUD,SAAS,cAAc,CACrB,OAAuB,EACvB,QAAgB;IAEhB,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,iBAAiB,GACrB,oCAAoC,CAAC,cAAc,CAAC,CAAC;IACvD,MAAM,EAAE,mBAAmB,EAAE,GAAG,cAAc,CAAC;IAE/C,OAAO,iBAAiB,CAAC,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;AAC9D,CAAC;AASD,SAAS,aAAa,CAAC,OAAuB,EAAE,UAAsB;IACpE,MAAM,iBAAiB,GAAG,oCAAoC,CAAC,OAAO,CAAC,CAAC;IAExE,IAAI,UAAU,CAAC,aAAa,KAAK,SAAS,EAAE;QAC1C,UAAU,CAAC,aAAa,GAAG,OAAO,CAAC,MAAM,EAAY,CAAC;KACvD;IAED,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAE5C,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;IAC3C,MAAM,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;IAEtC,MAAM,SAAS,GAAG,MAAM,CAAC,gBAAgB,CAAC;IAE1C,MAAM,WAAW,GAA+B;QAC9C,UAAU;QACV,UAAU;QACV,iBAAiB,EAAE,eAAe,CAAC,EAAE;KACtC,CAAC;IAEF,YAAY,CAAC,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC;AAOD,SAAS,gBAAgB,CACvB,aAAqB,EACrB,OAAwB;IAExB,IAAI,iBAAiB,GAAG,2BAA2B,EAAE,CAAC;IACtD,IAAI,OAAO,EAAE;QACX,iBAAiB,GAAG,oCAAoC,CAAC,OAAO,CAAC,CAAC;KACnE;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAClE,iBAAiB,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAGlD,MAAM,SAAS,GAAG,MAAM,CAAC,kBAAkB,CAAC;IAE5C,MAAM,WAAW,GAAiC;QAChD,UAAU;QACV,oBAAoB,EAAE,iBAAiB,CAAC,GAAG;KAC5C,CAAC;IAEF,YAAY,CAAC,WAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC;AAQD,SAAS,aAAa,CACpB,aAAqB,EACrB,OAAwB;IAExB,MAAM,iBAAiB,GAAG,oCAAoC,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG,iBAAiB,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAElE,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,OAAO,EACL,cAAc,EACd,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,oCAAoC,EACpC,2BAA2B,GAC5B,CAAC"}
|
|
@@ -5,7 +5,7 @@ function getState(annotation) {
|
|
|
5
5
|
if (annotation) {
|
|
6
6
|
if (annotation.data && annotation.highlighted)
|
|
7
7
|
return AnnotationStyleStates.Highlighted;
|
|
8
|
-
if (isAnnotationSelected(annotation))
|
|
8
|
+
if (isAnnotationSelected(annotation.annotationUID))
|
|
9
9
|
return AnnotationStyleStates.Selected;
|
|
10
10
|
if (isAnnotationLocked(annotation))
|
|
11
11
|
return AnnotationStyleStates.Locked;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getState.js","sourceRoot":"","sources":["../../../../../src/stateManagement/annotation/config/getState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAQvD,SAAS,QAAQ,CAAC,UAAuB;IACvC,IAAI,UAAU,EAAE;QACd,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,WAAW;YAC3C,OAAO,qBAAqB,CAAC,WAAW,CAAC;QAC3C,IAAI,oBAAoB,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"getState.js","sourceRoot":"","sources":["../../../../../src/stateManagement/annotation/config/getState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAQvD,SAAS,QAAQ,CAAC,UAAuB;IACvC,IAAI,UAAU,EAAE;QACd,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,WAAW;YAC3C,OAAO,qBAAqB,CAAC,WAAW,CAAC;QAC3C,IAAI,oBAAoB,CAAC,UAAU,CAAC,aAAa,CAAC;YAChD,OAAO,qBAAqB,CAAC,QAAQ,CAAC;QAGxC,IAAI,kBAAkB,CAAC,UAAU,CAAC;YAAE,OAAO,qBAAqB,CAAC,MAAM,CAAC;KACzE;IAED,OAAO,qBAAqB,CAAC,OAAO,CAAC;AACvC,CAAC;AAED,eAAe,QAAQ,CAAC"}
|
|
@@ -57,6 +57,8 @@ export default class ToolGroup {
|
|
|
57
57
|
viewportId,
|
|
58
58
|
renderingEngineId: renderingEngineUIDToUse,
|
|
59
59
|
});
|
|
60
|
+
const activeToolName = this.getActivePrimaryMouseButtonTool();
|
|
61
|
+
this.setViewportsCursorByToolName(activeToolName);
|
|
60
62
|
}
|
|
61
63
|
removeViewports(renderingEngineId, viewportId) {
|
|
62
64
|
const indices = [];
|
|
@@ -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,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAGjC,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;AAczD,MAAM,CAAC,OAAO,OAAO,SAAS;IAM5B,YAAY,EAAU;QAJtB,kBAAa,GAAG,EAAE,CAAC;QACnB,gBAAW,GAAG,EAAE,CAAC;QACjB,mBAAc,GAAG,EAAE,CAAC;QAGlB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAMD,cAAc;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;IAChE,CAAC;IAOD,eAAe,CAAC,QAAgB;QAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO,CAAC,IAAI,CAAC,IAAI,QAAQ,0CAA0C,CAAC,CAAC;YACrE,OAAO;SACR;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;IAWD,OAAO,CAAC,QAAgB,EAAE,aAAa,GAAG,EAAE;QAC1C,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,OAAO,QAAQ,KAAK,WAAW,IAAI,QAAQ,KAAK,EAAE,CAAC;QACvE,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAErD,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,CAAC,IAAI,CACV,sDAAsD,EACtD,aAAa,CACd,CAAC;YACF,OAAO;SACR;QAED,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO,CAAC,IAAI,CAAC,IAAI,QAAQ,uCAAuC,CAAC,CAAC;YAClE,OAAO;SACR;QAED,IAAI,iBAAiB,EAAE;YACrB,OAAO,CAAC,IAAI,CACV,IAAI,QAAQ,yCAAyC,IAAI,CAAC,EAAE,GAAG,CAChE,CAAC;YACF,OAAO;SACR;QAID,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,cAAc,CAAC;QAEhD,MAAM,SAAS,GAAG;YAChB,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,IAAI,CAAC,EAAE;YACpB,aAAa;SACd,CAAC;QAEF,MAAM,gBAAgB,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC;QAIlD,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC;IACnD,CAAC;IAYD,WAAW,CAAC,UAAkB,EAAE,iBAA0B;QACxD,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;QAE/C,IAAI,CAAC,iBAAiB,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YACrD,MAAM,IAAI,KAAK,CACb,iFAAiF,CAClF,CAAC;SACH;QAED,MAAM,uBAAuB,GAAG,iBAAiB,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAE5E,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,UAAU;YACV,iBAAiB,EAAE,uBAAuB;SAC3C,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ToolGroup.js","sourceRoot":"","sources":["../../../../src/store/ToolGroupManager/ToolGroup.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,7 @@ const _removeAllToolsForElement = function (element) {
|
|
|
54
54
|
const toolsWithData = filterToolsWithAnnotationsForElement(element, tools);
|
|
55
55
|
toolsWithData.forEach(({ annotations }) => {
|
|
56
56
|
annotations.forEach((annotation) => {
|
|
57
|
-
removeAnnotation(
|
|
57
|
+
removeAnnotation(annotation.annotationUID, element);
|
|
58
58
|
});
|
|
59
59
|
});
|
|
60
60
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeEnabledElement.js","sourceRoot":"","sources":["../../../src/store/removeEnabledElement.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"removeEnabledElement.js","sourceRoot":"","sources":["../../../src/store/removeEnabledElement.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,7 @@ export default class CrosshairsTool extends AnnotationTool {
|
|
|
54
54
|
let annotations = getAnnotations(element, CrosshairsTool.toolName);
|
|
55
55
|
annotations = this.filterInteractableAnnotationsForElement(element, annotations);
|
|
56
56
|
if (annotations.length) {
|
|
57
|
-
removeAnnotation(
|
|
57
|
+
removeAnnotation(annotations[0].annotationUID, element);
|
|
58
58
|
}
|
|
59
59
|
const annotation = {
|
|
60
60
|
highlighted: false,
|