@cornerstonejs/tools 0.9.1 → 0.9.4
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/config/getState.js +1 -1
- package/dist/cjs/stateManagement/annotation/config/getState.js.map +1 -1
- package/dist/cjs/tools/CrosshairsTool.js +21 -21
- package/dist/cjs/tools/CrosshairsTool.js.map +1 -1
- package/dist/cjs/tools/WindowLevelTool.js +8 -3
- package/dist/cjs/tools/WindowLevelTool.js.map +1 -1
- package/dist/cjs/tools/annotation/BidirectionalTool.js +9 -9
- package/dist/cjs/tools/annotation/BidirectionalTool.js.map +1 -1
- package/dist/cjs/tools/annotation/EllipticalROITool.js +8 -8
- package/dist/cjs/tools/annotation/EllipticalROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/LengthTool.js +8 -8
- package/dist/cjs/tools/annotation/LengthTool.js.map +1 -1
- package/dist/cjs/tools/annotation/ProbeTool.js +6 -6
- package/dist/cjs/tools/annotation/ProbeTool.js.map +1 -1
- package/dist/cjs/tools/annotation/RectangleROITool.js +8 -8
- package/dist/cjs/tools/annotation/RectangleROITool.js.map +1 -1
- package/dist/cjs/tools/segmentation/BrushTool.js +3 -3
- package/dist/cjs/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/CircleScissorsTool.js +2 -2
- package/dist/cjs/tools/segmentation/CircleScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js +5 -5
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js +5 -5
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js +3 -3
- package/dist/cjs/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/SphereScissorsTool.js +2 -2
- package/dist/cjs/tools/segmentation/SphereScissorsTool.js.map +1 -1
- package/dist/cjs/types/EventTypes.d.ts +3 -3
- 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/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/config/getState.js +1 -1
- package/dist/esm/stateManagement/annotation/config/getState.js.map +1 -1
- package/dist/esm/tools/CrosshairsTool.js +21 -21
- package/dist/esm/tools/CrosshairsTool.js.map +1 -1
- package/dist/esm/tools/WindowLevelTool.js +8 -3
- package/dist/esm/tools/WindowLevelTool.js.map +1 -1
- package/dist/esm/tools/annotation/BidirectionalTool.js +9 -9
- package/dist/esm/tools/annotation/BidirectionalTool.js.map +1 -1
- package/dist/esm/tools/annotation/EllipticalROITool.js +8 -8
- package/dist/esm/tools/annotation/EllipticalROITool.js.map +1 -1
- package/dist/esm/tools/annotation/LengthTool.js +8 -8
- package/dist/esm/tools/annotation/LengthTool.js.map +1 -1
- package/dist/esm/tools/annotation/ProbeTool.js +6 -6
- package/dist/esm/tools/annotation/ProbeTool.js.map +1 -1
- package/dist/esm/tools/annotation/RectangleROITool.js +8 -8
- package/dist/esm/tools/annotation/RectangleROITool.js.map +1 -1
- package/dist/esm/tools/segmentation/BrushTool.js +3 -3
- package/dist/esm/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/esm/tools/segmentation/CircleScissorsTool.js +2 -2
- package/dist/esm/tools/segmentation/CircleScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js +5 -5
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js +5 -5
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js +3 -3
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js.map +1 -1
- package/dist/esm/tools/segmentation/SphereScissorsTool.js +2 -2
- package/dist/esm/tools/segmentation/SphereScissorsTool.js.map +1 -1
- package/dist/esm/types/EventTypes.d.ts +3 -3
- 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/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +4 -4
|
@@ -41,14 +41,14 @@ function mouseDown(evt) {
|
|
|
41
41
|
const isMultiSelect = !!evt.detail.event.shiftKey;
|
|
42
42
|
if (annotationToolsWithMoveableHandles.length > 0) {
|
|
43
43
|
const { tool, annotation, handle } = getAnnotationForSelection(annotationToolsWithMoveableHandles);
|
|
44
|
-
toggleAnnotationSelection(annotation, isMultiSelect);
|
|
44
|
+
toggleAnnotationSelection(annotation.annotationUID, isMultiSelect);
|
|
45
45
|
tool.handleSelectedCallback(evt, annotation, handle, 'Mouse');
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
48
48
|
const moveableAnnotationTools = (0, filterMoveableAnnotationTools_1.default)(element, annotationToolsWithAnnotations, canvasCoords, 'mouse');
|
|
49
49
|
if (moveableAnnotationTools.length > 0) {
|
|
50
50
|
const { tool, annotation } = getAnnotationForSelection(moveableAnnotationTools);
|
|
51
|
-
toggleAnnotationSelection(annotation, isMultiSelect);
|
|
51
|
+
toggleAnnotationSelection(annotation.annotationUID, isMultiSelect);
|
|
52
52
|
tool.toolSelectedCallback(evt, annotation, 'Mouse');
|
|
53
53
|
return;
|
|
54
54
|
}
|
|
@@ -65,19 +65,19 @@ function getAnnotationForSelection(toolsWithMovableHandles) {
|
|
|
65
65
|
toolsWithMovableHandles.find((item) => !(0, annotationLocking_1.isAnnotationLocked)(item.annotation))) ||
|
|
66
66
|
toolsWithMovableHandles[0]);
|
|
67
67
|
}
|
|
68
|
-
function toggleAnnotationSelection(
|
|
68
|
+
function toggleAnnotationSelection(annotationUID, isMultiSelect = false) {
|
|
69
69
|
if (isMultiSelect) {
|
|
70
|
-
if ((0, annotationSelection_1.isAnnotationSelected)(
|
|
71
|
-
(0, annotationSelection_1.setAnnotationSelected)(
|
|
70
|
+
if ((0, annotationSelection_1.isAnnotationSelected)(annotationUID)) {
|
|
71
|
+
(0, annotationSelection_1.setAnnotationSelected)(annotationUID, false);
|
|
72
72
|
}
|
|
73
73
|
else {
|
|
74
74
|
const preserveSelected = true;
|
|
75
|
-
(0, annotationSelection_1.setAnnotationSelected)(
|
|
75
|
+
(0, annotationSelection_1.setAnnotationSelected)(annotationUID, true, preserveSelected);
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
else {
|
|
79
79
|
const preserveSelected = false;
|
|
80
|
-
(0, annotationSelection_1.setAnnotationSelected)(
|
|
80
|
+
(0, annotationSelection_1.setAnnotationSelected)(annotationUID, true, preserveSelected);
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
83
|
//# sourceMappingURL=mouseDown.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mouseDown.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/mouseEventHandlers/mouseDown.ts"],"names":[],"mappings":";;;;;AAAA,uCAAoC;AACpC,uCAAwC;AAOxC,8FAG8D;AAE9D,0FAAwF;AAGxF,gHAAwF;AACxF,4HAAoG;AACpG,8GAAsF;AACtF,sGAA8E;AAC9E,8GAAsF;AAEtF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAS,CAAC;AAyBtC,SAAwB,SAAS,CAAC,GAAkC;IAElE,IAAI,aAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,oCAA0B,EAAC,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,IAAA,wCAA8B,EAChE,GAAG,EACH,CAAC,MAAM,CAAC,EACR,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CACzB,CAAC;IACF,MAAM,wCAAwC,GAAG,cAAc;QAC7D,CAAC,CAAC,IAAA,wCAA8B,EAAC,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,IAAA,8CAAoC,EACzE,OAAO,EACP,eAAe,CAChB,CAAC;IAEF,MAAM,YAAY,GAAG,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC;IAKtD,MAAM,kCAAkC,GAAG,IAAA,wCAA8B,EACvE,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":";;;;;AAAA,uCAAoC;AACpC,uCAAwC;AAOxC,8FAG8D;AAE9D,0FAAwF;AAGxF,gHAAwF;AACxF,4HAAoG;AACpG,8GAAsF;AACtF,sGAA8E;AAC9E,8GAAsF;AAEtF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,iBAAS,CAAC;AAyBtC,SAAwB,SAAS,CAAC,GAAkC;IAElE,IAAI,aAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,oCAA0B,EAAC,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,IAAA,wCAA8B,EAChE,GAAG,EACH,CAAC,MAAM,CAAC,EACR,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CACzB,CAAC;IACF,MAAM,wCAAwC,GAAG,cAAc;QAC7D,CAAC,CAAC,IAAA,wCAA8B,EAAC,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,IAAA,8CAAoC,EACzE,OAAO,EACP,eAAe,CAChB,CAAC;IAEF,MAAM,YAAY,GAAG,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC;IAKtD,MAAM,kCAAkC,GAAG,IAAA,wCAA8B,EACvE,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,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QACnE,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAE9D,OAAO;KACR;IAID,MAAM,uBAAuB,GAAG,IAAA,uCAA6B,EAC3D,OAAO,EACP,8BAA8B,EAC9B,YAAY,EACZ,OAAO,CACR,CAAC;IAIF,IAAI,uBAAuB,CAAC,MAAM,GAAG,CAAC,EAAE;QACtC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,yBAAyB,CACpD,uBAAuB,CACxB,CAAC;QAEF,yBAAyB,CAAC,UAAU,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QACnE,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QAEpD,OAAO;KACR;IAGD,IAAI,UAAU,IAAI,OAAO,UAAU,CAAC,qBAAqB,KAAK,UAAU,EAAE;QACxE,MAAM,aAAa,GAAG,UAAU,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAE5D,IAAI,aAAa,EAAE;YAEjB,OAAO;SACR;KACF;AAGH,CAAC;AAvGD,4BAuGC;AAQD,SAAS,yBAAyB,CAChC,uBAA6C;IAE7C,OAAO,CACL,CAAC,uBAAuB,CAAC,MAAM,GAAG,CAAC;QACjC,uBAAuB,CAAC,IAAI,CAC1B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAA,sCAAkB,EAAC,IAAI,CAAC,UAAU,CAAC,CAC/C,CAAC;QACJ,uBAAuB,CAAC,CAAC,CAAC,CAC3B,CAAC;AACJ,CAAC;AASD,SAAS,yBAAyB,CAChC,aAAqB,EACrB,aAAa,GAAG,KAAK;IAErB,IAAI,aAAa,EAAE;QACjB,IAAI,IAAA,0CAAoB,EAAC,aAAa,CAAC,EAAE;YACvC,IAAA,2CAAqB,EAAC,aAAa,EAAE,KAAK,CAAC,CAAC;SAC7C;aAAM;YACL,MAAM,gBAAgB,GAAG,IAAI,CAAC;YAC9B,IAAA,2CAAqB,EAAC,aAAa,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;SAC9D;KACF;SAAM;QACL,MAAM,gBAAgB,GAAG,KAAK,CAAC;QAC/B,IAAA,2CAAqB,EAAC,aAAa,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;KAC9D;AACH,CAAC"}
|
|
@@ -19,7 +19,7 @@ function mouseDownActivate(evt) {
|
|
|
19
19
|
}
|
|
20
20
|
if (activeTool.addNewAnnotation) {
|
|
21
21
|
const annotation = activeTool.addNewAnnotation(evt, 'mouse');
|
|
22
|
-
(0, annotationSelection_1.setAnnotationSelected)(annotation);
|
|
22
|
+
(0, annotationSelection_1.setAnnotationSelected)(annotation.annotationUID);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
exports.default = mouseDownActivate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mouseDownActivate.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/mouseEventHandlers/mouseDownActivate.ts"],"names":[],"mappings":";;;;;AAAA,uCAAoC;AACpC,sGAA8E;AAC9E,8FAA6F;AAU7F,SAAwB,iBAAiB,CACvC,GAA0C;IAG1C,IAAI,aAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,oCAA0B,EAAC,GAAG,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO;KACR;IAED,IAAI,aAAK,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,IAAA,2CAAqB,EAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"mouseDownActivate.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/mouseEventHandlers/mouseDownActivate.ts"],"names":[],"mappings":";;;;;AAAA,uCAAoC;AACpC,sGAA8E;AAC9E,8FAA6F;AAU7F,SAAwB,iBAAiB,CACvC,GAA0C;IAG1C,IAAI,aAAK,CAAC,qBAAqB,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,oCAA0B,EAAC,GAAG,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO;KACR;IAED,IAAI,aAAK,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,IAAA,2CAAqB,EAAC,UAAU,CAAC,aAAa,CAAC,CAAC;KACjD;AACH,CAAC;AAtBD,oCAsBC"}
|
|
@@ -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,64 +1,60 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isAnnotationSelected = exports.deselectAnnotation = exports.getAnnotationsSelectedCount = exports.getAnnotationsSelectedByToolName = exports.
|
|
3
|
+
exports.isAnnotationSelected = exports.deselectAnnotation = exports.getAnnotationsSelectedCount = exports.getAnnotationsSelectedByToolName = exports.getAnnotationsSelected = exports.setAnnotationSelected = void 0;
|
|
4
4
|
const core_1 = require("@cornerstonejs/core");
|
|
5
5
|
const enums_1 = require("../../enums");
|
|
6
|
-
const
|
|
7
|
-
|
|
6
|
+
const annotationState_1 = require("./annotationState");
|
|
7
|
+
const selectedAnnotationUIDs = new Set();
|
|
8
|
+
function setAnnotationSelected(annotationUID, selected = true, preserveSelected = false) {
|
|
8
9
|
if (selected) {
|
|
9
|
-
selectAnnotation(
|
|
10
|
+
selectAnnotation(annotationUID, preserveSelected);
|
|
10
11
|
}
|
|
11
12
|
else {
|
|
12
|
-
deselectAnnotation(
|
|
13
|
+
deselectAnnotation(annotationUID);
|
|
13
14
|
}
|
|
14
15
|
}
|
|
15
16
|
exports.setAnnotationSelected = setAnnotationSelected;
|
|
16
|
-
function selectAnnotation(
|
|
17
|
+
function selectAnnotation(annotationUID, preserveSelected = false) {
|
|
17
18
|
const detail = makeEventDetail();
|
|
18
19
|
if (!preserveSelected) {
|
|
19
|
-
clearSelectionSet(
|
|
20
|
+
clearSelectionSet(selectedAnnotationUIDs, detail);
|
|
20
21
|
}
|
|
21
|
-
if (
|
|
22
|
-
|
|
23
|
-
detail.added.push(
|
|
22
|
+
if (annotationUID && !selectedAnnotationUIDs.has(annotationUID)) {
|
|
23
|
+
selectedAnnotationUIDs.add(annotationUID);
|
|
24
|
+
detail.added.push(annotationUID);
|
|
24
25
|
}
|
|
25
|
-
publish(detail,
|
|
26
|
+
publish(detail, selectedAnnotationUIDs);
|
|
26
27
|
}
|
|
27
|
-
function deselectAnnotation(
|
|
28
|
+
function deselectAnnotation(annotationUID) {
|
|
28
29
|
const detail = makeEventDetail();
|
|
29
|
-
if (
|
|
30
|
-
if (
|
|
31
|
-
detail.removed.push(
|
|
30
|
+
if (annotationUID) {
|
|
31
|
+
if (selectedAnnotationUIDs.delete(annotationUID)) {
|
|
32
|
+
detail.removed.push(annotationUID);
|
|
32
33
|
}
|
|
33
34
|
}
|
|
34
35
|
else {
|
|
35
|
-
clearSelectionSet(
|
|
36
|
+
clearSelectionSet(selectedAnnotationUIDs, detail);
|
|
36
37
|
}
|
|
37
|
-
publish(detail,
|
|
38
|
+
publish(detail, selectedAnnotationUIDs);
|
|
38
39
|
}
|
|
39
40
|
exports.deselectAnnotation = deselectAnnotation;
|
|
40
41
|
function getAnnotationsSelected() {
|
|
41
|
-
return Array.from(
|
|
42
|
+
return Array.from(selectedAnnotationUIDs);
|
|
42
43
|
}
|
|
43
44
|
exports.getAnnotationsSelected = getAnnotationsSelected;
|
|
44
|
-
function getAnnotationSelected(annotationUID) {
|
|
45
|
-
return getAnnotationsSelected().find((annotation) => {
|
|
46
|
-
return annotation.annotationUID === annotationUID;
|
|
47
|
-
});
|
|
48
|
-
}
|
|
49
|
-
exports.getAnnotationSelected = getAnnotationSelected;
|
|
50
45
|
function getAnnotationsSelectedByToolName(toolName) {
|
|
51
|
-
return getAnnotationsSelected().filter((
|
|
46
|
+
return getAnnotationsSelected().filter((annotationUID) => {
|
|
47
|
+
const annotation = (0, annotationState_1.getAnnotation)(annotationUID);
|
|
52
48
|
return annotation.metadata.toolName === toolName;
|
|
53
49
|
});
|
|
54
50
|
}
|
|
55
51
|
exports.getAnnotationsSelectedByToolName = getAnnotationsSelectedByToolName;
|
|
56
|
-
function isAnnotationSelected(
|
|
57
|
-
return
|
|
52
|
+
function isAnnotationSelected(annotationUID) {
|
|
53
|
+
return selectedAnnotationUIDs.has(annotationUID);
|
|
58
54
|
}
|
|
59
55
|
exports.isAnnotationSelected = isAnnotationSelected;
|
|
60
56
|
function getAnnotationsSelectedCount() {
|
|
61
|
-
return
|
|
57
|
+
return selectedAnnotationUIDs.size;
|
|
62
58
|
}
|
|
63
59
|
exports.getAnnotationsSelectedCount = getAnnotationsSelectedCount;
|
|
64
60
|
function makeEventDetail() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotationSelection.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationSelection.ts"],"names":[],"mappings":";;;AAAA,8CAAgE;AAChE,uCAAqC;
|
|
1
|
+
{"version":3,"file":"annotationSelection.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationSelection.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ function getState(annotation) {
|
|
|
7
7
|
if (annotation) {
|
|
8
8
|
if (annotation.data && annotation.highlighted)
|
|
9
9
|
return enums_1.AnnotationStyleStates.Highlighted;
|
|
10
|
-
if ((0, annotationSelection_1.isAnnotationSelected)(annotation))
|
|
10
|
+
if ((0, annotationSelection_1.isAnnotationSelected)(annotation.annotationUID))
|
|
11
11
|
return enums_1.AnnotationStyleStates.Selected;
|
|
12
12
|
if ((0, annotationLocking_1.isAnnotationLocked)(annotation))
|
|
13
13
|
return enums_1.AnnotationStyleStates.Locked;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getState.js","sourceRoot":"","sources":["../../../../../src/stateManagement/annotation/config/getState.ts"],"names":[],"mappings":";;AACA,4DAA0D;AAC1D,gEAA8D;AAC9D,0CAAuD;AAQvD,SAAS,QAAQ,CAAC,UAAuB;IACvC,IAAI,UAAU,EAAE;QACd,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,WAAW;YAC3C,OAAO,6BAAqB,CAAC,WAAW,CAAC;QAC3C,IAAI,IAAA,0CAAoB,EAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"getState.js","sourceRoot":"","sources":["../../../../../src/stateManagement/annotation/config/getState.ts"],"names":[],"mappings":";;AACA,4DAA0D;AAC1D,gEAA8D;AAC9D,0CAAuD;AAQvD,SAAS,QAAQ,CAAC,UAAuB;IACvC,IAAI,UAAU,EAAE;QACd,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,WAAW;YAC3C,OAAO,6BAAqB,CAAC,WAAW,CAAC;QAC3C,IAAI,IAAA,0CAAoB,EAAC,UAAU,CAAC,aAAa,CAAC;YAChD,OAAO,6BAAqB,CAAC,QAAQ,CAAC;QAGxC,IAAI,IAAA,sCAAkB,EAAC,UAAU,CAAC;YAAE,OAAO,6BAAqB,CAAC,MAAM,CAAC;KACzE;IAED,OAAO,6BAAqB,CAAC,OAAO,CAAC;AACvC,CAAC;AAED,kBAAe,QAAQ,CAAC"}
|
|
@@ -76,7 +76,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
76
76
|
const { FrameOfReferenceUID, viewport } = enabledElement;
|
|
77
77
|
const { element } = viewport;
|
|
78
78
|
const { position, focalPoint, viewPlaneNormal } = viewport.getCamera();
|
|
79
|
-
let annotations = (0, annotationState_1.getAnnotations)(element,
|
|
79
|
+
let annotations = (0, annotationState_1.getAnnotations)(element, this.getToolName());
|
|
80
80
|
annotations = this.filterInteractableAnnotationsForElement(element, annotations);
|
|
81
81
|
if (annotations.length) {
|
|
82
82
|
(0, annotationState_1.removeAnnotation)(annotations[0].annotationUID, element);
|
|
@@ -87,7 +87,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
87
87
|
cameraPosition: [...position],
|
|
88
88
|
cameraFocalPoint: [...focalPoint],
|
|
89
89
|
FrameOfReferenceUID,
|
|
90
|
-
toolName:
|
|
90
|
+
toolName: this.getToolName(),
|
|
91
91
|
},
|
|
92
92
|
data: {
|
|
93
93
|
handles: {
|
|
@@ -142,7 +142,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
142
142
|
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
143
143
|
const { viewport } = enabledElement;
|
|
144
144
|
this._jump(enabledElement, jumpWorld);
|
|
145
|
-
const annotations = (0, annotationState_1.getAnnotations)(element,
|
|
145
|
+
const annotations = (0, annotationState_1.getAnnotations)(element, this.getToolName());
|
|
146
146
|
const filteredAnnotations = this.filterInteractableAnnotationsForElement(viewport.element, annotations);
|
|
147
147
|
const { data } = filteredAnnotations[0];
|
|
148
148
|
const { rotationPoints } = data.handles;
|
|
@@ -196,8 +196,8 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
196
196
|
const { renderingEngine } = enabledElement;
|
|
197
197
|
const viewport = enabledElement.viewport;
|
|
198
198
|
const requireSameOrientation = false;
|
|
199
|
-
const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element,
|
|
200
|
-
const annotations = (0, annotationState_1.getAnnotations)(element,
|
|
199
|
+
const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element, this.getToolName(), requireSameOrientation);
|
|
200
|
+
const annotations = (0, annotationState_1.getAnnotations)(element, this.getToolName());
|
|
201
201
|
const filteredToolAnnotations = this.filterInteractableAnnotationsForElement(element, annotations);
|
|
202
202
|
const viewportAnnotation = filteredToolAnnotations[0];
|
|
203
203
|
if (!viewportAnnotation) {
|
|
@@ -292,7 +292,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
292
292
|
this.renderAnnotation = (enabledElement, svgDrawingHelper) => {
|
|
293
293
|
const { viewport, renderingEngine } = enabledElement;
|
|
294
294
|
const { element } = viewport;
|
|
295
|
-
const annotations = (0, annotationState_1.getAnnotations)(element,
|
|
295
|
+
const annotations = (0, annotationState_1.getAnnotations)(element, this.getToolName());
|
|
296
296
|
const camera = viewport.getCamera();
|
|
297
297
|
const filteredToolAnnotations = this.filterInteractableAnnotationsForElement(element, annotations);
|
|
298
298
|
const viewportAnnotation = filteredToolAnnotations[0];
|
|
@@ -453,18 +453,18 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
453
453
|
let lineUID = `${lineIndex}`;
|
|
454
454
|
if (viewportControllable && viewportDraggableRotatable) {
|
|
455
455
|
lineUID = `${lineIndex}One`;
|
|
456
|
-
(0, drawingSvg_1.drawLine)(svgDrawingHelper,
|
|
456
|
+
(0, drawingSvg_1.drawLine)(svgDrawingHelper, this.getToolName(), annotationUID, lineUID, line[1], line[2], {
|
|
457
457
|
color,
|
|
458
458
|
lineWidth,
|
|
459
459
|
});
|
|
460
460
|
lineUID = `${lineIndex}Two`;
|
|
461
|
-
(0, drawingSvg_1.drawLine)(svgDrawingHelper,
|
|
461
|
+
(0, drawingSvg_1.drawLine)(svgDrawingHelper, this.getToolName(), annotationUID, lineUID, line[3], line[4], {
|
|
462
462
|
color,
|
|
463
463
|
lineWidth,
|
|
464
464
|
});
|
|
465
465
|
}
|
|
466
466
|
else {
|
|
467
|
-
(0, drawingSvg_1.drawLine)(svgDrawingHelper,
|
|
467
|
+
(0, drawingSvg_1.drawLine)(svgDrawingHelper, this.getToolName(), annotationUID, lineUID, line[2], line[4], {
|
|
468
468
|
color,
|
|
469
469
|
lineWidth,
|
|
470
470
|
});
|
|
@@ -520,13 +520,13 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
520
520
|
viewportDraggableRotatable &&
|
|
521
521
|
viewportSlabThicknessControlsOn) {
|
|
522
522
|
let handleUID = `${lineIndex}One`;
|
|
523
|
-
(0, drawingSvg_1.drawHandles)(svgDrawingHelper,
|
|
523
|
+
(0, drawingSvg_1.drawHandles)(svgDrawingHelper, this.getToolName(), annotationUID, handleUID, rotationHandles, {
|
|
524
524
|
color,
|
|
525
525
|
handleRadius: 3,
|
|
526
526
|
type: 'circle',
|
|
527
527
|
});
|
|
528
528
|
handleUID = `${lineIndex}Two`;
|
|
529
|
-
(0, drawingSvg_1.drawHandles)(svgDrawingHelper,
|
|
529
|
+
(0, drawingSvg_1.drawHandles)(svgDrawingHelper, this.getToolName(), annotationUID, handleUID, slabThicknessHandles, {
|
|
530
530
|
color,
|
|
531
531
|
handleRadius: 3,
|
|
532
532
|
type: 'rect',
|
|
@@ -537,7 +537,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
537
537
|
!slabThicknessHandlesActive &&
|
|
538
538
|
viewportDraggableRotatable) {
|
|
539
539
|
const handleUID = `${lineIndex}`;
|
|
540
|
-
(0, drawingSvg_1.drawHandles)(svgDrawingHelper,
|
|
540
|
+
(0, drawingSvg_1.drawHandles)(svgDrawingHelper, this.getToolName(), annotationUID, handleUID, rotationHandles, {
|
|
541
541
|
color,
|
|
542
542
|
handleRadius: 3,
|
|
543
543
|
type: 'circle',
|
|
@@ -548,7 +548,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
548
548
|
!slabThicknessHandlesActive &&
|
|
549
549
|
viewportSlabThicknessControlsOn) {
|
|
550
550
|
const handleUID = `${lineIndex}`;
|
|
551
|
-
(0, drawingSvg_1.drawHandles)(svgDrawingHelper,
|
|
551
|
+
(0, drawingSvg_1.drawHandles)(svgDrawingHelper, this.getToolName(), annotationUID, handleUID, slabThicknessHandles, {
|
|
552
552
|
color,
|
|
553
553
|
handleRadius: 3,
|
|
554
554
|
type: 'rect',
|
|
@@ -556,7 +556,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
556
556
|
}
|
|
557
557
|
else if (rotHandlesActive && viewportDraggableRotatable) {
|
|
558
558
|
const handleUID = `${lineIndex}`;
|
|
559
|
-
(0, drawingSvg_1.drawHandles)(svgDrawingHelper,
|
|
559
|
+
(0, drawingSvg_1.drawHandles)(svgDrawingHelper, this.getToolName(), annotationUID, handleUID, rotationHandles, {
|
|
560
560
|
color,
|
|
561
561
|
handleRadius: 2,
|
|
562
562
|
fill: color,
|
|
@@ -566,7 +566,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
566
566
|
else if (slabThicknessHandlesActive &&
|
|
567
567
|
selectedViewportId &&
|
|
568
568
|
viewportSlabThicknessControlsOn) {
|
|
569
|
-
(0, drawingSvg_1.drawHandles)(svgDrawingHelper,
|
|
569
|
+
(0, drawingSvg_1.drawHandles)(svgDrawingHelper, this.getToolName(), annotationUID, lineUID, slabThicknessHandles, {
|
|
570
570
|
color,
|
|
571
571
|
handleRadius: 2,
|
|
572
572
|
fill: color,
|
|
@@ -576,13 +576,13 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
576
576
|
const slabThicknessValue = otherViewport.getSlabThickness();
|
|
577
577
|
if (slabThicknessValue > 0.5 && viewportSlabThicknessControlsOn) {
|
|
578
578
|
lineUID = `${lineIndex}STOne`;
|
|
579
|
-
(0, drawingSvg_1.drawLine)(svgDrawingHelper,
|
|
579
|
+
(0, drawingSvg_1.drawLine)(svgDrawingHelper, this.getToolName(), annotationUID, lineUID, line[5], line[6], {
|
|
580
580
|
color,
|
|
581
581
|
width: 1,
|
|
582
582
|
lineDash: [2, 3],
|
|
583
583
|
});
|
|
584
584
|
lineUID = `${lineIndex}STTwo`;
|
|
585
|
-
(0, drawingSvg_1.drawLine)(svgDrawingHelper,
|
|
585
|
+
(0, drawingSvg_1.drawLine)(svgDrawingHelper, this.getToolName(), annotationUID, lineUID, line[7], line[8], {
|
|
586
586
|
color,
|
|
587
587
|
width: line,
|
|
588
588
|
lineDash: [2, 3],
|
|
@@ -598,7 +598,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
598
598
|
];
|
|
599
599
|
const circleRadius = canvasDiagonalLength * 0.01;
|
|
600
600
|
const circleUID = '0';
|
|
601
|
-
(0, drawingSvg_1.drawCircle)(svgDrawingHelper,
|
|
601
|
+
(0, drawingSvg_1.drawCircle)(svgDrawingHelper, this.getToolName(), annotationUID, circleUID, referenceColorCoordinates, circleRadius, { color, fill: color });
|
|
602
602
|
};
|
|
603
603
|
this._areViewportIdArraysEqual = (viewportIdArrayOne, viewportIdArrayTwo) => {
|
|
604
604
|
if (viewportIdArrayOne.length !== viewportIdArrayTwo.length) {
|
|
@@ -782,7 +782,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
782
782
|
this._jump = (enabledElement, jumpWorld) => {
|
|
783
783
|
store_1.state.isInteractingWithTool = true;
|
|
784
784
|
const { viewport, renderingEngine } = enabledElement;
|
|
785
|
-
const annotations = (0, annotationState_1.getAnnotations)(viewport.element,
|
|
785
|
+
const annotations = (0, annotationState_1.getAnnotations)(viewport.element, this.getToolName());
|
|
786
786
|
const delta = [0, 0, 0];
|
|
787
787
|
Math_1.default.subtract(jumpWorld, this.toolCenter, delta);
|
|
788
788
|
const otherViewportAnnotations = this._getAnnotationsForViewportsWithDifferentCameras(enabledElement, annotations);
|
|
@@ -826,7 +826,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
826
826
|
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
827
827
|
const { renderingEngine } = enabledElement;
|
|
828
828
|
const requireSameOrientation = false;
|
|
829
|
-
const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element,
|
|
829
|
+
const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element, this.getToolName(), requireSameOrientation);
|
|
830
830
|
(0, triggerAnnotationRenderForViewportIds_1.default)(renderingEngine, viewportIdsToRender);
|
|
831
831
|
};
|
|
832
832
|
this._mouseDragCallback = (evt) => {
|
|
@@ -840,7 +840,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
840
840
|
const { element } = eventDetail;
|
|
841
841
|
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
842
842
|
const { renderingEngine, viewport } = enabledElement;
|
|
843
|
-
const annotations = (0, annotationState_1.getAnnotations)(element,
|
|
843
|
+
const annotations = (0, annotationState_1.getAnnotations)(element, this.getToolName());
|
|
844
844
|
const filteredToolAnnotations = this.filterInteractableAnnotationsForElement(element, annotations);
|
|
845
845
|
const viewportAnnotation = filteredToolAnnotations[0];
|
|
846
846
|
if (!viewportAnnotation) {
|