@cornerstonejs/tools 0.15.3 → 0.17.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/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.d.ts +1 -0
- package/dist/cjs/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.js +3 -0
- package/dist/cjs/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/annotationState.d.ts +2 -1
- package/dist/cjs/stateManagement/annotation/annotationState.js +9 -1
- package/dist/cjs/stateManagement/annotation/annotationState.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/annotationVisibility.js +1 -1
- package/dist/cjs/stateManagement/annotation/annotationVisibility.js.map +1 -1
- package/dist/cjs/store/SynchronizerManager/Synchronizer.d.ts +1 -0
- package/dist/cjs/store/SynchronizerManager/Synchronizer.js +6 -0
- package/dist/cjs/store/SynchronizerManager/Synchronizer.js.map +1 -1
- package/dist/cjs/store/SynchronizerManager/getSynchronizersForViewport.js +2 -1
- package/dist/cjs/store/SynchronizerManager/getSynchronizersForViewport.js.map +1 -1
- package/dist/cjs/store/ToolGroupManager/ToolGroup.js +7 -2
- package/dist/cjs/store/ToolGroupManager/ToolGroup.js.map +1 -1
- package/dist/cjs/tools/CrosshairsTool.d.ts +1 -1
- package/dist/cjs/tools/CrosshairsTool.js +36 -23
- package/dist/cjs/tools/CrosshairsTool.js.map +1 -1
- package/dist/cjs/tools/StackScrollTool.js +2 -1
- package/dist/cjs/tools/StackScrollTool.js.map +1 -1
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js +2 -1
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js.map +1 -1
- package/dist/cjs/tools/WindowLevelTool.js +3 -1
- package/dist/cjs/tools/WindowLevelTool.js.map +1 -1
- package/dist/cjs/tools/ZoomTool.js +1 -1
- package/dist/cjs/tools/ZoomTool.js.map +1 -1
- package/dist/cjs/tools/annotation/ArrowAnnotateTool.js +2 -0
- package/dist/cjs/tools/annotation/ArrowAnnotateTool.js.map +1 -1
- package/dist/cjs/tools/displayTools/Labelmap/addLabelmapToElement.js +1 -0
- package/dist/cjs/tools/displayTools/Labelmap/addLabelmapToElement.js.map +1 -1
- package/dist/cjs/types/JumpToSliceOptions.d.ts +1 -1
- package/dist/cjs/types/ScrollOptions.d.ts +1 -2
- package/dist/cjs/types/ToolSpecificAnnotationTypes.d.ts +1 -0
- 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/stackScrollTool/index.d.ts +1 -3
- package/dist/cjs/utilities/stackScrollTool/index.js +1 -5
- package/dist/cjs/utilities/stackScrollTool/index.js.map +1 -1
- package/dist/cjs/utilities/stackScrollTool/scrollThroughStack.js +3 -6
- package/dist/cjs/utilities/stackScrollTool/scrollThroughStack.js.map +1 -1
- package/dist/cjs/utilities/viewport/jumpToSlice.d.ts +1 -1
- package/dist/cjs/utilities/viewport/jumpToSlice.js +37 -12
- package/dist/cjs/utilities/viewport/jumpToSlice.js.map +1 -1
- package/dist/esm/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.d.ts +1 -0
- package/dist/esm/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.js +3 -0
- package/dist/esm/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.js.map +1 -1
- package/dist/esm/stateManagement/annotation/annotationState.d.ts +2 -1
- package/dist/esm/stateManagement/annotation/annotationState.js +8 -1
- package/dist/esm/stateManagement/annotation/annotationState.js.map +1 -1
- package/dist/esm/stateManagement/annotation/annotationVisibility.js +1 -1
- package/dist/esm/stateManagement/annotation/annotationVisibility.js.map +1 -1
- package/dist/esm/store/SynchronizerManager/Synchronizer.d.ts +1 -0
- package/dist/esm/store/SynchronizerManager/Synchronizer.js +6 -0
- package/dist/esm/store/SynchronizerManager/Synchronizer.js.map +1 -1
- package/dist/esm/store/SynchronizerManager/getSynchronizersForViewport.js +2 -1
- package/dist/esm/store/SynchronizerManager/getSynchronizersForViewport.js.map +1 -1
- package/dist/esm/store/ToolGroupManager/ToolGroup.js +8 -3
- package/dist/esm/store/ToolGroupManager/ToolGroup.js.map +1 -1
- package/dist/esm/tools/CrosshairsTool.d.ts +1 -1
- package/dist/esm/tools/CrosshairsTool.js +36 -23
- package/dist/esm/tools/CrosshairsTool.js.map +1 -1
- package/dist/esm/tools/StackScrollTool.js +2 -1
- package/dist/esm/tools/StackScrollTool.js.map +1 -1
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js +2 -1
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js.map +1 -1
- package/dist/esm/tools/WindowLevelTool.js +3 -1
- package/dist/esm/tools/WindowLevelTool.js.map +1 -1
- package/dist/esm/tools/ZoomTool.js +1 -1
- package/dist/esm/tools/ZoomTool.js.map +1 -1
- package/dist/esm/tools/annotation/ArrowAnnotateTool.js +2 -0
- package/dist/esm/tools/annotation/ArrowAnnotateTool.js.map +1 -1
- package/dist/esm/tools/displayTools/Labelmap/addLabelmapToElement.js +2 -1
- package/dist/esm/tools/displayTools/Labelmap/addLabelmapToElement.js.map +1 -1
- package/dist/esm/types/JumpToSliceOptions.d.ts +1 -1
- package/dist/esm/types/ScrollOptions.d.ts +1 -2
- package/dist/esm/types/ToolSpecificAnnotationTypes.d.ts +1 -0
- 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/stackScrollTool/index.d.ts +1 -3
- package/dist/esm/utilities/stackScrollTool/index.js +1 -3
- package/dist/esm/utilities/stackScrollTool/index.js.map +1 -1
- package/dist/esm/utilities/stackScrollTool/scrollThroughStack.js +3 -6
- package/dist/esm/utilities/stackScrollTool/scrollThroughStack.js.map +1 -1
- package/dist/esm/utilities/viewport/jumpToSlice.d.ts +1 -1
- package/dist/esm/utilities/viewport/jumpToSlice.js +25 -11
- 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 +5 -5
- package/dist/cjs/utilities/stackScrollTool/getSliceRange.d.ts +0 -6
- package/dist/cjs/utilities/stackScrollTool/getSliceRange.js +0 -32
- package/dist/cjs/utilities/stackScrollTool/getSliceRange.js.map +0 -1
- package/dist/cjs/utilities/stackScrollTool/snapFocalPointToSlice.d.ts +0 -5
- package/dist/cjs/utilities/stackScrollTool/snapFocalPointToSlice.js +0 -41
- package/dist/cjs/utilities/stackScrollTool/snapFocalPointToSlice.js.map +0 -1
- package/dist/esm/utilities/stackScrollTool/getSliceRange.d.ts +0 -6
- package/dist/esm/utilities/stackScrollTool/getSliceRange.js +0 -26
- package/dist/esm/utilities/stackScrollTool/getSliceRange.js.map +0 -1
- package/dist/esm/utilities/stackScrollTool/snapFocalPointToSlice.d.ts +0 -5
- package/dist/esm/utilities/stackScrollTool/snapFocalPointToSlice.js +0 -38
- package/dist/esm/utilities/stackScrollTool/snapFocalPointToSlice.js.map +0 -1
|
@@ -17,6 +17,7 @@ export default class FrameOfReferenceSpecificAnnotationManager {
|
|
|
17
17
|
removeAnnotation: (annotationUID: string, filter?: FilterInterface) => void;
|
|
18
18
|
saveAnnotations: (FrameOfReferenceUID?: string, toolName?: string) => AnnotationState | FrameOfReferenceSpecificAnnotations | Annotations;
|
|
19
19
|
restoreAnnotations: (state: AnnotationState | FrameOfReferenceSpecificAnnotations | Annotations, FrameOfReferenceUID?: string, toolName?: string) => void;
|
|
20
|
+
removeAllAnnotations: () => void;
|
|
20
21
|
private _getToolSpecificAnnotationsAndIndex;
|
|
21
22
|
}
|
|
22
23
|
declare const defaultFrameOfReferenceSpecificAnnotationManager: FrameOfReferenceSpecificAnnotationManager;
|
|
@@ -113,6 +113,9 @@ class FrameOfReferenceSpecificAnnotationManager {
|
|
|
113
113
|
this.annotations = (0, lodash_clonedeep_1.default)(state);
|
|
114
114
|
}
|
|
115
115
|
};
|
|
116
|
+
this.removeAllAnnotations = () => {
|
|
117
|
+
this.annotations = {};
|
|
118
|
+
};
|
|
116
119
|
if (!uid) {
|
|
117
120
|
uid = core_1.utilities.uuidv4();
|
|
118
121
|
}
|
package/dist/cjs/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FrameOfReferenceSpecificAnnotationManager.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FrameOfReferenceSpecificAnnotationManager.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/FrameOfReferenceSpecificAnnotationManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,4 +6,5 @@ declare function getAnnotations(element: HTMLDivElement, toolName: string): Anno
|
|
|
6
6
|
declare function addAnnotation(element: HTMLDivElement, annotation: Annotation): void;
|
|
7
7
|
declare function removeAnnotation(annotationUID: string, element?: HTMLDivElement): void;
|
|
8
8
|
declare function getAnnotation(annotationUID: string, element?: HTMLDivElement): Annotation;
|
|
9
|
-
|
|
9
|
+
declare function removeAllAnnotations(element?: HTMLDivElement): void;
|
|
10
|
+
export { getAnnotations, addAnnotation, getAnnotation, removeAnnotation, removeAllAnnotations, getViewportSpecificAnnotationManager, getDefaultAnnotationManager, };
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getDefaultAnnotationManager = exports.getViewportSpecificAnnotationManager = exports.removeAnnotation = exports.getAnnotation = exports.addAnnotation = exports.getAnnotations = void 0;
|
|
3
|
+
exports.getDefaultAnnotationManager = exports.getViewportSpecificAnnotationManager = exports.removeAllAnnotations = exports.removeAnnotation = exports.getAnnotation = exports.addAnnotation = exports.getAnnotations = void 0;
|
|
4
4
|
const core_1 = require("@cornerstonejs/core");
|
|
5
5
|
const enums_1 = require("../../enums");
|
|
6
6
|
const FrameOfReferenceSpecificAnnotationManager_1 = require("./FrameOfReferenceSpecificAnnotationManager");
|
|
@@ -58,4 +58,12 @@ function getAnnotation(annotationUID, element) {
|
|
|
58
58
|
return annotation;
|
|
59
59
|
}
|
|
60
60
|
exports.getAnnotation = getAnnotation;
|
|
61
|
+
function removeAllAnnotations(element) {
|
|
62
|
+
let annotationManager = getDefaultAnnotationManager();
|
|
63
|
+
if (element) {
|
|
64
|
+
annotationManager = getViewportSpecificAnnotationManager(element);
|
|
65
|
+
}
|
|
66
|
+
annotationManager.removeAllAnnotations();
|
|
67
|
+
}
|
|
68
|
+
exports.removeAllAnnotations = removeAllAnnotations;
|
|
61
69
|
//# sourceMappingURL=annotationState.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotationState.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationState.ts"],"names":[],"mappings":";;;AAAA,8CAK6B;AAC7B,uCAAqC;AAErC,2GAA+G;AAY/G,SAAS,2BAA2B;IAClC,OAAO,4FAAgD,CAAC;AAC1D,CAAC;
|
|
1
|
+
{"version":3,"file":"annotationState.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationState.ts"],"names":[],"mappings":";;;AAAA,8CAK6B;AAC7B,uCAAqC;AAErC,2GAA+G;AAY/G,SAAS,2BAA2B;IAClC,OAAO,4FAAgD,CAAC;AAC1D,CAAC;AAwIC,kEAA2B;AAhI7B,SAAS,oCAAoC,CAC3C,OAAgD;IAQhD,OAAO,4FAAgD,CAAC;AAC1D,CAAC;AAqHC,oFAAoC;AA3GtC,SAAS,cAAc,CACrB,OAAuB,EACvB,QAAgB;IAEhB,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,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;AA4FC,wCAAc;AAnFhB,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,gBAAO,CAAC,MAAM,EAAY,CAAC;KACvD;IAED,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAE5C,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;IAC3C,MAAM,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;IAEtC,MAAM,SAAS,GAAG,cAAM,CAAC,gBAAgB,CAAC;IAE1C,MAAM,WAAW,GAA+B;QAC9C,UAAU;QACV,UAAU;QACV,iBAAiB,EAAE,eAAe,CAAC,EAAE;KACtC,CAAC;IAEF,IAAA,mBAAY,EAAC,kBAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC;AA8DC,sCAAa;AAvDf,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,cAAM,CAAC,kBAAkB,CAAC;IAE5C,MAAM,WAAW,GAAiC;QAChD,UAAU;QACV,oBAAoB,EAAE,iBAAiB,CAAC,GAAG;KAC5C,CAAC;IAEF,IAAA,mBAAY,EAAC,kBAAW,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC;AAoCC,4CAAgB;AA5BlB,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;AAmBC,sCAAa;AAZf,SAAS,oBAAoB,CAAC,OAAwB;IACpD,IAAI,iBAAiB,GAAG,2BAA2B,EAAE,CAAC;IACtD,IAAI,OAAO,EAAE;QACX,iBAAiB,GAAG,oCAAoC,CAAC,OAAO,CAAC,CAAC;KACnE;IAED,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;AAC3C,CAAC;AAOC,oDAAoB"}
|
|
@@ -64,10 +64,10 @@ function show(annotationUID, annotationUIDsSet, detail) {
|
|
|
64
64
|
}
|
|
65
65
|
function hide(annotationUID, annotationUIDsSet, detail) {
|
|
66
66
|
if (!annotationUIDsSet.has(annotationUID)) {
|
|
67
|
+
annotationUIDsSet.add(annotationUID);
|
|
67
68
|
if ((0, annotationSelection_1.isAnnotationSelected)(annotationUID)) {
|
|
68
69
|
(0, annotationSelection_1.deselectAnnotation)(annotationUID);
|
|
69
70
|
}
|
|
70
|
-
annotationUIDsSet.add(annotationUID);
|
|
71
71
|
detail.lastHidden.push(annotationUID);
|
|
72
72
|
}
|
|
73
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotationVisibility.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationVisibility.ts"],"names":[],"mappings":";;;AAAA,8CAAgE;AAChE,uDAAkD;AAClD,uCAAqC;AAGrC,+DAG+B;AAK/B,MAAM,6BAA6B,GAAgB,IAAI,GAAG,EAAE,CAAC;AAiB7D,SAAS,uBAAuB,CAAC,aAAqB,EAAE,OAAO,GAAG,IAAI;IACpE,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,IAAI,aAAa,EAAE;QACjB,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,aAAa,EAAE,6BAA6B,EAAE,MAAM,CAAC,CAAC;SAC5D;aAAM;YACL,IAAI,CAAC,aAAa,EAAE,6BAA6B,EAAE,MAAM,CAAC,CAAC;SAC5D;KACF;IACD,OAAO,CAAC,MAAM,CAAC,CAAC;AAClB,CAAC;AA+GC,0DAAuB;AAzGzB,SAAS,kBAAkB;IACzB,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,6BAA6B,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;QACtD,IAAI,CAAC,aAAa,EAAE,6BAA6B,EAAE,MAAM,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,MAAM,CAAC,CAAC;AAClB,CAAC;AAoGC,gDAAkB;AA7FpB,SAAS,mBAAmB,CAAC,aAAqB;IAChD,MAAM,UAAU,GAAG,IAAA,+BAAa,EAAC,aAAa,CAAC,CAAC;IAEhD,IAAI,UAAU,EAAE;QACd,OAAO,CAAC,6BAA6B,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;KAC1D;AACH,CAAC;AAwFC,kDAAmB;AAjFrB,SAAS,+BAA+B,CAAC,UAAsB;;IAC7D,IAAI,UAAU,EAAE;QACd,MAAM,SAAS,GAAG,MAAA,UAAU,CAAC,SAAS,mCAAI,IAAI,CAAC;QAC/C,IAAI,6BAA6B,CAAC,UAAU,CAAC,EAAE;YAC7C,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,WAAW,EAAE;gBAC7C,YAAY,EAAE,KAAK;gBACnB,UAAU,EAAE,IAAI;gBAChB,GAAG,EAAE,YAAY;gBACjB,GAAG,EAAE,YAAY;aAClB,CAAC,CAAC;SACJ;QACD,uBAAuB,CAAC,UAAU,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KAC9D;AACH,CAAC;AAqEC,0EAA+B;AAhEjC,SAAS,eAAe;IACtB,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,WAAW,EAAE,EAAE;QACf,UAAU,EAAE,EAAE;QACd,MAAM,EAAE,EAAE;KACX,CAAC,CAAC;AACL,CAAC;AAED,SAAS,IAAI,CACX,aAAqB,EACrB,iBAA8B,EAC9B,MAA6C;IAE7C,IAAI,iBAAiB,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC3C,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;KACxC;AACH,CAAC;AAED,SAAS,IAAI,CACX,aAAqB,EACrB,iBAA8B,EAC9B,MAA6C;IAE7C,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;QACzC,IAAI,IAAA,0CAAoB,EAAC,aAAa,CAAC,EAAE;YACvC,IAAA,wCAAkB,EAAC,aAAa,CAAC,CAAC;SACnC;QACD,
|
|
1
|
+
{"version":3,"file":"annotationVisibility.js","sourceRoot":"","sources":["../../../../src/stateManagement/annotation/annotationVisibility.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ declare class Synchronizer {
|
|
|
22
22
|
removeSource(viewportInfo: Types.IViewportId): void;
|
|
23
23
|
removeTarget(viewportInfo: Types.IViewportId): void;
|
|
24
24
|
hasSourceViewport(renderingEngineId: string, viewportId: string): boolean;
|
|
25
|
+
hasTargetViewport(renderingEngineId: string, viewportId: string): boolean;
|
|
25
26
|
private fireEvent;
|
|
26
27
|
private _onEvent;
|
|
27
28
|
private _hasSourceElements;
|
|
@@ -90,6 +90,12 @@ class Synchronizer {
|
|
|
90
90
|
viewportId,
|
|
91
91
|
});
|
|
92
92
|
}
|
|
93
|
+
hasTargetViewport(renderingEngineId, viewportId) {
|
|
94
|
+
return _containsViewport(this._targetViewports, {
|
|
95
|
+
renderingEngineId,
|
|
96
|
+
viewportId,
|
|
97
|
+
});
|
|
98
|
+
}
|
|
93
99
|
fireEvent(sourceViewport, sourceEvent) {
|
|
94
100
|
if (this.isDisabled() || this._ignoreFiredEvents) {
|
|
95
101
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Synchronizer.js","sourceRoot":"","sources":["../../../../src/store/SynchronizerManager/Synchronizer.ts"],"names":[],"mappings":";;AAAA,8CAK6B;AAiB7B,MAAM,YAAY;IAWhB,YACE,cAAsB,EACtB,SAAiB,EACjB,YAAuC;
|
|
1
|
+
{"version":3,"file":"Synchronizer.js","sourceRoot":"","sources":["../../../../src/store/SynchronizerManager/Synchronizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,8 @@ function getSynchronizersForViewport(viewportId, renderingEngineId) {
|
|
|
10
10
|
const synchronizer = index_1.state.synchronizers[i];
|
|
11
11
|
const notDisabled = !synchronizer.isDisabled();
|
|
12
12
|
const hasSourceViewport = synchronizer.hasSourceViewport(renderingEngineId, viewportId);
|
|
13
|
-
|
|
13
|
+
const hasTargetViewport = synchronizer.hasTargetViewport(renderingEngineId, viewportId);
|
|
14
|
+
if (notDisabled && (hasSourceViewport || hasTargetViewport)) {
|
|
14
15
|
synchronizersFilteredByIds.push(synchronizer);
|
|
15
16
|
}
|
|
16
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSynchronizersForViewport.js","sourceRoot":"","sources":["../../../../src/store/SynchronizerManager/getSynchronizersForViewport.ts"],"names":[],"mappings":";;AAAA,oCAAiC;AAUjC,SAAS,2BAA2B,CAClC,UAAkB,EAClB,iBAAyB;IAEzB,MAAM,0BAA0B,GAAG,EAAE,CAAC;IAEtC,IAAI,CAAC,iBAAiB,IAAI,CAAC,UAAU,EAAE;QACrC,MAAM,IAAI,KAAK,CACb,iEAAiE,CAClE,CAAC;KACH;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAK,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACnD,MAAM,YAAY,GAAG,aAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QAC/C,MAAM,iBAAiB,GAAG,YAAY,CAAC,iBAAiB,CACtD,iBAAiB,EACjB,UAAU,CACX,CAAC;QAEF,IAAI,WAAW,IAAI,iBAAiB,EAAE;
|
|
1
|
+
{"version":3,"file":"getSynchronizersForViewport.js","sourceRoot":"","sources":["../../../../src/store/SynchronizerManager/getSynchronizersForViewport.ts"],"names":[],"mappings":";;AAAA,oCAAiC;AAUjC,SAAS,2BAA2B,CAClC,UAAkB,EAClB,iBAAyB;IAEzB,MAAM,0BAA0B,GAAG,EAAE,CAAC;IAEtC,IAAI,CAAC,iBAAiB,IAAI,CAAC,UAAU,EAAE;QACrC,MAAM,IAAI,KAAK,CACb,iEAAiE,CAClE,CAAC;KACH;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAK,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACnD,MAAM,YAAY,GAAG,aAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QAC/C,MAAM,iBAAiB,GAAG,YAAY,CAAC,iBAAiB,CACtD,iBAAiB,EACjB,UAAU,CACX,CAAC;QAEF,MAAM,iBAAiB,GAAG,YAAY,CAAC,iBAAiB,CACtD,iBAAiB,EACjB,UAAU,CACX,CAAC;QAEF,IAAI,WAAW,IAAI,CAAC,iBAAiB,IAAI,iBAAiB,CAAC,EAAE;YAC3D,0BAA0B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAC/C;KACF;IAED,OAAO,0BAA0B,CAAC;AACpC,CAAC;AAED,kBAAe,2BAA2B,CAAC"}
|
|
@@ -60,7 +60,10 @@ class ToolGroup {
|
|
|
60
60
|
renderingEngineId: renderingEngineUIDToUse,
|
|
61
61
|
});
|
|
62
62
|
const activeToolName = this.getActivePrimaryMouseButtonTool();
|
|
63
|
-
|
|
63
|
+
const runtimeSettings = core_1.Settings.getRuntimeSettings();
|
|
64
|
+
if (runtimeSettings.get('useCursors')) {
|
|
65
|
+
this.setViewportsCursorByToolName(activeToolName);
|
|
66
|
+
}
|
|
64
67
|
}
|
|
65
68
|
removeViewports(renderingEngineId, viewportId) {
|
|
66
69
|
const indices = [];
|
|
@@ -99,7 +102,9 @@ class ToolGroup {
|
|
|
99
102
|
};
|
|
100
103
|
this.toolOptions[toolName] = toolOptions;
|
|
101
104
|
this._toolInstances[toolName].mode = Active;
|
|
102
|
-
|
|
105
|
+
const runtimeSettings = core_1.Settings.getRuntimeSettings();
|
|
106
|
+
if (this._hasMousePrimaryButtonBinding(toolBindingsOptions) &&
|
|
107
|
+
runtimeSettings.get('useCursors')) {
|
|
103
108
|
this.setViewportsCursorByToolName(toolName);
|
|
104
109
|
}
|
|
105
110
|
if (typeof this._toolInstances[toolName].onSetToolActive === 'function') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolGroup.js","sourceRoot":"","sources":["../../../../src/store/ToolGroupManager/ToolGroup.ts"],"names":[],"mappings":";;AAAA,uCAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"ToolGroup.js","sourceRoot":"","sources":["../../../../src/store/ToolGroupManager/ToolGroup.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ export default class CrosshairsTool extends AnnotationTool {
|
|
|
46
46
|
_autoPanViewportIfNecessary(viewportId: string, renderingEngine: Types.IRenderingEngine): void;
|
|
47
47
|
_areViewportIdArraysEqual: (viewportIdArrayOne: any, viewportIdArrayTwo: any) => boolean;
|
|
48
48
|
_getAnnotationsForViewportsWithDifferentCameras: (enabledElement: any, annotations: any) => any;
|
|
49
|
-
|
|
49
|
+
_filterViewportWithSameOrientation: (enabledElement: any, referenceAnnotation: any, annotations: any) => any;
|
|
50
50
|
_filterAnnotationsByUniqueViewportOrientations: (enabledElement: any, annotations: any) => any[];
|
|
51
51
|
_checkIfViewportsRenderingSameScene: (viewport: any, otherViewport: any) => boolean;
|
|
52
52
|
_jump: (enabledElement: any, jumpWorld: any) => boolean;
|
|
@@ -38,6 +38,8 @@ const MatrixBuilder_1 = __importDefault(require("@kitware/vtk.js/Common/Core/Mat
|
|
|
38
38
|
const lineSegment = __importStar(require("../utilities/math/line"));
|
|
39
39
|
const annotationLocking_1 = require("../stateManagement/annotation/annotationLocking");
|
|
40
40
|
const triggerAnnotationRenderForViewportIds_1 = __importDefault(require("../utilities/triggerAnnotationRenderForViewportIds"));
|
|
41
|
+
const core_2 = require("@cornerstonejs/core");
|
|
42
|
+
const { MINIMUM_SLAB_THICKNESS } = core_2.CONSTANTS;
|
|
41
43
|
const { liangBarksyClip } = utilities_1.math.vec2;
|
|
42
44
|
function defaultReferenceLineColor() {
|
|
43
45
|
return 'rgb(200, 200, 200)';
|
|
@@ -634,25 +636,23 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
634
636
|
});
|
|
635
637
|
return viewportsWithDifferentCameras;
|
|
636
638
|
};
|
|
637
|
-
this.
|
|
638
|
-
const { renderingEngine
|
|
639
|
-
const
|
|
640
|
-
const
|
|
639
|
+
this._filterViewportWithSameOrientation = (enabledElement, referenceAnnotation, annotations) => {
|
|
640
|
+
const { renderingEngine } = enabledElement;
|
|
641
|
+
const { data } = referenceAnnotation;
|
|
642
|
+
const viewport = renderingEngine.getViewport(data.viewportId);
|
|
643
|
+
const linkedViewportAnnotations = annotations.filter((annotation) => {
|
|
641
644
|
const { data } = annotation;
|
|
642
645
|
const otherViewport = renderingEngine.getViewport(data.viewportId);
|
|
643
646
|
const otherViewportControllable = this._getReferenceLineControllable(otherViewport.id);
|
|
644
|
-
return
|
|
645
|
-
otherViewportControllable === true &&
|
|
646
|
-
viewportControllable === true);
|
|
647
|
+
return otherViewportControllable === true;
|
|
647
648
|
});
|
|
648
|
-
if (!
|
|
649
|
-
!otherLinkedViewportAnnotationsFromSameScene.length) {
|
|
649
|
+
if (!linkedViewportAnnotations || !linkedViewportAnnotations.length) {
|
|
650
650
|
return [];
|
|
651
651
|
}
|
|
652
652
|
const camera = viewport.getCamera();
|
|
653
653
|
const viewPlaneNormal = camera.viewPlaneNormal;
|
|
654
654
|
Math_1.default.normalize(viewPlaneNormal);
|
|
655
|
-
const
|
|
655
|
+
const otherViewportsAnnotationsWithSameCameraDirection = linkedViewportAnnotations.filter((annotation) => {
|
|
656
656
|
const { viewportId } = annotation.data;
|
|
657
657
|
const otherViewport = renderingEngine.getViewport(viewportId);
|
|
658
658
|
const otherCamera = otherViewport.getCamera();
|
|
@@ -661,7 +661,7 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
661
661
|
return (core_1.utilities.isEqual(viewPlaneNormal, otherViewPlaneNormal, 1e-2) &&
|
|
662
662
|
core_1.utilities.isEqual(camera.viewUp, otherCamera.viewUp, 1e-2));
|
|
663
663
|
});
|
|
664
|
-
return
|
|
664
|
+
return otherViewportsAnnotationsWithSameCameraDirection;
|
|
665
665
|
};
|
|
666
666
|
this._filterAnnotationsByUniqueViewportOrientations = (enabledElement, annotations) => {
|
|
667
667
|
const { renderingEngine, viewport } = enabledElement;
|
|
@@ -854,7 +854,11 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
854
854
|
const viewportsAnnotationsToUpdate = otherViewportAnnotations.filter((annotation) => {
|
|
855
855
|
const { data } = annotation;
|
|
856
856
|
const otherViewport = renderingEngine.getViewport(data.viewportId);
|
|
857
|
-
|
|
857
|
+
const otherViewportControllable = this._getReferenceLineControllable(otherViewport.id);
|
|
858
|
+
const otherViewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.id);
|
|
859
|
+
return (otherViewportControllable === true &&
|
|
860
|
+
otherViewportDraggableRotatable === true &&
|
|
861
|
+
viewportAnnotation.data.activeViewportIds.find((id) => id === otherViewport.id));
|
|
858
862
|
});
|
|
859
863
|
this._applyDeltaShiftToSelectedViewportCameras(renderingEngine, viewportsAnnotationsToUpdate, delta);
|
|
860
864
|
}
|
|
@@ -862,12 +866,11 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
862
866
|
const otherViewportAnnotations = this._getAnnotationsForViewportsWithDifferentCameras(enabledElement, annotations);
|
|
863
867
|
const viewportsAnnotationsToUpdate = otherViewportAnnotations.filter((annotation) => {
|
|
864
868
|
const { data } = annotation;
|
|
865
|
-
data.handles.toolCenter = center;
|
|
866
869
|
const otherViewport = renderingEngine.getViewport(data.viewportId);
|
|
867
870
|
const otherViewportControllable = this._getReferenceLineControllable(otherViewport.id);
|
|
868
|
-
const
|
|
871
|
+
const otherViewportDraggableRotatable = this._getReferenceLineDraggableRotatable(otherViewport.id);
|
|
869
872
|
return (otherViewportControllable === true &&
|
|
870
|
-
|
|
873
|
+
otherViewportDraggableRotatable === true);
|
|
871
874
|
});
|
|
872
875
|
const dir1 = gl_matrix_1.vec2.create();
|
|
873
876
|
const dir2 = gl_matrix_1.vec2.create();
|
|
@@ -919,11 +922,22 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
919
922
|
renderingEngine.renderViewports(otherViewportsIds);
|
|
920
923
|
}
|
|
921
924
|
else if (handles.activeOperation === OPERATION.SLAB) {
|
|
922
|
-
const
|
|
925
|
+
const otherViewportAnnotations = this._getAnnotationsForViewportsWithDifferentCameras(enabledElement, annotations);
|
|
926
|
+
const referenceAnnotations = otherViewportAnnotations.filter((annotation) => {
|
|
923
927
|
const { data } = annotation;
|
|
924
928
|
const otherViewport = renderingEngine.getViewport(data.viewportId);
|
|
925
|
-
|
|
929
|
+
const otherViewportControllable = this._getReferenceLineControllable(otherViewport.id);
|
|
930
|
+
const otherViewportSlabThicknessControlsOn = this._getReferenceLineSlabThicknessControlsOn(otherViewport.id);
|
|
931
|
+
return (otherViewportControllable === true &&
|
|
932
|
+
otherViewportSlabThicknessControlsOn === true &&
|
|
933
|
+
viewportAnnotation.data.activeViewportIds.find((id) => id === otherViewport.id));
|
|
926
934
|
});
|
|
935
|
+
if (referenceAnnotations.length === 0) {
|
|
936
|
+
return;
|
|
937
|
+
}
|
|
938
|
+
const viewportsAnnotationsToUpdate = this._filterViewportWithSameOrientation(enabledElement, referenceAnnotations[0], annotations);
|
|
939
|
+
const viewportsIds = [];
|
|
940
|
+
viewportsIds.push(viewport.id);
|
|
927
941
|
viewportsAnnotationsToUpdate.forEach((annotation) => {
|
|
928
942
|
const { data } = annotation;
|
|
929
943
|
const otherViewport = renderingEngine.getViewport(data.viewportId);
|
|
@@ -980,17 +994,16 @@ class CrosshairsTool extends base_1.AnnotationTool {
|
|
|
980
994
|
slabThicknessValue += mod;
|
|
981
995
|
}
|
|
982
996
|
slabThicknessValue = Math.abs(slabThicknessValue);
|
|
983
|
-
slabThicknessValue = Math.max(
|
|
997
|
+
slabThicknessValue = Math.max(MINIMUM_SLAB_THICKNESS, slabThicknessValue);
|
|
984
998
|
const near = this._pointNearReferenceLine(viewportAnnotation, canvasCoords, 6, otherViewport);
|
|
985
999
|
if (near) {
|
|
986
|
-
|
|
987
|
-
}
|
|
988
|
-
else {
|
|
989
|
-
otherViewport.setSlabThickness(slabThicknessValue);
|
|
1000
|
+
slabThicknessValue = MINIMUM_SLAB_THICKNESS;
|
|
990
1001
|
}
|
|
991
|
-
otherViewport.
|
|
1002
|
+
otherViewport.setSlabThicknessForAllVolumeActors(slabThicknessValue);
|
|
1003
|
+
viewportsIds.push(otherViewport.id);
|
|
992
1004
|
}
|
|
993
1005
|
});
|
|
1006
|
+
renderingEngine.renderViewports(viewportsIds);
|
|
994
1007
|
}
|
|
995
1008
|
};
|
|
996
1009
|
this._pointNearReferenceLine = (annotation, canvasCoords, proximity, lineViewport) => {
|