@cornerstonejs/tools 0.63.0 → 0.63.2
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/shared/getActiveToolForMouseEvent.js +1 -1
- package/dist/cjs/eventDispatchers/shared/getActiveToolForMouseEvent.js.map +1 -1
- package/dist/cjs/eventDispatchers/shared/getActiveToolForTouchEvent.js +2 -1
- package/dist/cjs/eventDispatchers/shared/getActiveToolForTouchEvent.js.map +1 -1
- package/dist/cjs/eventDispatchers/shared/getMouseModifier.d.ts +1 -1
- package/dist/cjs/eventDispatchers/shared/getMouseModifier.js +1 -1
- package/dist/cjs/eventDispatchers/shared/getMouseModifier.js.map +1 -1
- package/dist/cjs/eventListeners/mouse/mouseDownListener.js +2 -2
- package/dist/cjs/eventListeners/mouse/mouseDownListener.js.map +1 -1
- package/dist/cjs/tools/displayTools/Contour/removeContourFromElement.js +1 -1
- package/dist/cjs/tools/displayTools/Contour/removeContourFromElement.js.map +1 -1
- package/dist/esm/eventDispatchers/shared/getActiveToolForMouseEvent.js +1 -1
- package/dist/esm/eventDispatchers/shared/getActiveToolForMouseEvent.js.map +1 -1
- package/dist/esm/eventDispatchers/shared/getActiveToolForTouchEvent.js +2 -1
- package/dist/esm/eventDispatchers/shared/getActiveToolForTouchEvent.js.map +1 -1
- package/dist/esm/eventDispatchers/shared/getMouseModifier.d.ts +1 -1
- package/dist/esm/eventDispatchers/shared/getMouseModifier.js +1 -1
- package/dist/esm/eventDispatchers/shared/getMouseModifier.js.map +1 -1
- package/dist/esm/eventListeners/mouse/mouseDownListener.js +2 -2
- package/dist/esm/eventListeners/mouse/mouseDownListener.js.map +1 -1
- package/dist/esm/tools/displayTools/Contour/removeContourFromElement.js +1 -1
- package/dist/esm/tools/displayTools/Contour/removeContourFromElement.js.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +2 -2
- package/src/eventDispatchers/shared/getActiveToolForMouseEvent.ts +4 -3
- package/src/eventDispatchers/shared/getActiveToolForTouchEvent.ts +3 -1
- package/src/eventDispatchers/shared/getMouseModifier.ts +1 -1
- package/src/eventListeners/mouse/mouseDownListener.ts +2 -2
- package/src/tools/displayTools/Contour/removeContourFromElement.ts +1 -1
|
@@ -11,7 +11,7 @@ const { Active } = enums_1.ToolModes;
|
|
|
11
11
|
function getActiveToolForMouseEvent(evt) {
|
|
12
12
|
const { renderingEngineId, viewportId } = evt.detail;
|
|
13
13
|
const mouseEvent = evt.detail.event;
|
|
14
|
-
const modifierKey =
|
|
14
|
+
const modifierKey = (0, getMouseModifier_1.default)(mouseEvent) || eventListeners_1.keyEventListener.getModifierKey();
|
|
15
15
|
const toolGroup = store_1.ToolGroupManager.getToolGroupForViewport(viewportId, renderingEngineId);
|
|
16
16
|
if (!toolGroup) {
|
|
17
17
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getActiveToolForMouseEvent.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/getActiveToolForMouseEvent.ts"],"names":[],"mappings":";;;;;AAAA,uCAA+C;AAC/C,uCAAuD;AACvD,yDAAwD;AAExD,0EAAkD;AAElD,MAAM,EAAE,MAAM,EAAE,GAAG,iBAAS,CAAC;AAW7B,SAAwB,0BAA0B,CAChD,GAAwC;IAGxC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IACrD,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"getActiveToolForMouseEvent.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/getActiveToolForMouseEvent.ts"],"names":[],"mappings":";;;;;AAAA,uCAA+C;AAC/C,uCAAuD;AACvD,yDAAwD;AAExD,0EAAkD;AAElD,MAAM,EAAE,MAAM,EAAE,GAAG,iBAAS,CAAC;AAW7B,SAAwB,0BAA0B,CAChD,GAAwC;IAGxC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IACrD,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;IAKpC,MAAM,WAAW,GACf,IAAA,0BAAgB,EAAC,UAAU,CAAC,IAAI,iCAAgB,CAAC,cAAc,EAAE,CAAC;IAEpE,MAAM,SAAS,GAAG,wBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAC;KACb;IAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAE9D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAClD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAIpD,MAAM,cAAc,GAClB,WAAW,CAAC,QAAQ,CAAC,MAAM;YAC3B,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBACpC,OAAO,CACL,OAAO,CAAC,WAAW;oBACjB,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAa,CAAC,OAAO,CAAC;oBAC3D,OAAO,CAAC,WAAW,KAAK,WAAW,CACpC,CAAC;YACJ,CAAC,CAAC,CAAC;QAEL,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,IAAI,cAAc,EAAE;YACjD,OAAO,SAAS,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;SAC5C;KACF;AACH,CAAC;AA5CD,6CA4CC"}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const store_1 = require("../../store");
|
|
7
7
|
const enums_1 = require("../../enums");
|
|
8
8
|
const getMouseModifier_1 = __importDefault(require("./getMouseModifier"));
|
|
9
|
+
const eventListeners_1 = require("../../eventListeners");
|
|
9
10
|
const { Active } = enums_1.ToolModes;
|
|
10
11
|
function getActiveToolForTouchEvent(evt) {
|
|
11
12
|
const { renderingEngineId, viewportId } = evt.detail;
|
|
@@ -16,7 +17,7 @@ function getActiveToolForTouchEvent(evt) {
|
|
|
16
17
|
}
|
|
17
18
|
const toolGroupToolNames = Object.keys(toolGroup.toolOptions);
|
|
18
19
|
const numTouchPoints = Object.keys(touchEvent.touches).length;
|
|
19
|
-
const modifierKey = (0, getMouseModifier_1.default)(touchEvent);
|
|
20
|
+
const modifierKey = (0, getMouseModifier_1.default)(touchEvent) || eventListeners_1.keyEventListener.getModifierKey();
|
|
20
21
|
for (let j = 0; j < toolGroupToolNames.length; j++) {
|
|
21
22
|
const toolName = toolGroupToolNames[j];
|
|
22
23
|
const toolOptions = toolGroup.toolOptions[toolName];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getActiveToolForTouchEvent.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/getActiveToolForTouchEvent.ts"],"names":[],"mappings":";;;;;AAAA,uCAA+C;AAC/C,uCAAuD;AAEvD,0EAAkD;
|
|
1
|
+
{"version":3,"file":"getActiveToolForTouchEvent.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/getActiveToolForTouchEvent.ts"],"names":[],"mappings":";;;;;AAAA,uCAA+C;AAC/C,uCAAuD;AAEvD,0EAAkD;AAClD,yDAAwD;AAExD,MAAM,EAAE,MAAM,EAAE,GAAG,iBAAS,CAAC;AAW7B,SAAwB,0BAA0B,CAChD,GAAwC;IAGxC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IACrD,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;IAEpC,MAAM,SAAS,GAAG,wBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAC;KACb;IAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAE9D,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;IAG9D,MAAM,WAAW,GACf,IAAA,0BAAgB,EAAC,UAAU,CAAC,IAAI,iCAAgB,CAAC,cAAc,EAAE,CAAC;IAEpE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAClD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAEpD,MAAM,cAAc,GAClB,WAAW,CAAC,QAAQ,CAAC,MAAM;YAO3B,WAAW,CAAC,QAAQ,CAAC,IAAI,CACvB,CAAC,OAAO,EAAE,EAAE,CACV,CAAC,OAAO,CAAC,cAAc,KAAK,cAAc;gBACxC,CAAC,cAAc,KAAK,CAAC;oBACnB,OAAO,CAAC,WAAW,KAAK,qBAAa,CAAC,OAAO,CAAC,CAAC;gBACnD,OAAO,CAAC,WAAW,KAAK,WAAW,CACtC,CAAC;QAEJ,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,IAAI,cAAc,EAAE;YACjD,OAAO,SAAS,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;SAC5C;KACF;AACH,CAAC;AAhDD,6CAgDC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { KeyboardBindings as kb } from '../../enums';
|
|
2
|
-
declare const getMouseModifierKey: (evt: any) => kb
|
|
2
|
+
declare const getMouseModifierKey: (evt: any) => kb;
|
|
3
3
|
export default getMouseModifierKey;
|
|
@@ -22,7 +22,7 @@ const getMouseModifierKey = (evt) => {
|
|
|
22
22
|
return (evt.metaKey && enums_1.KeyboardBindings.AltMeta) || enums_1.KeyboardBindings.Alt;
|
|
23
23
|
}
|
|
24
24
|
if (evt.metaKey) {
|
|
25
|
-
enums_1.KeyboardBindings.Meta;
|
|
25
|
+
return enums_1.KeyboardBindings.Meta;
|
|
26
26
|
}
|
|
27
27
|
return undefined;
|
|
28
28
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getMouseModifier.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/getMouseModifier.ts"],"names":[],"mappings":";;AAAA,uCAAqD;AAOrD,MAAM,mBAAmB,GAAG,CAAC,GAAG,EAAE,EAAE;IAElC,IAAI,GAAG,CAAC,QAAQ,EAAE;QAChB,IAAI,GAAG,CAAC,OAAO;YAAE,OAAO,wBAAE,CAAC,SAAS,CAAC;QACrC,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,wBAAE,CAAC,QAAQ,CAAC;QACnC,IAAI,GAAG,CAAC,OAAO;YAAE,OAAO,wBAAE,CAAC,SAAS,CAAC;QACrC,OAAO,wBAAE,CAAC,KAAK,CAAC;KACjB;IACD,IAAI,GAAG,CAAC,OAAO,EAAE;QACf,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,wBAAE,CAAC,OAAO,CAAC;QAClC,IAAI,GAAG,CAAC,OAAO;YAAE,OAAO,wBAAE,CAAC,QAAQ,CAAC;QACpC,OAAO,wBAAE,CAAC,IAAI,CAAC;KAChB;IACD,IAAI,GAAG,CAAC,MAAM,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,wBAAE,CAAC,OAAO,CAAC,IAAI,wBAAE,CAAC,GAAG,CAAC;KAC9C;IACD,IAAI,GAAG,CAAC,OAAO,EAAE;QACf,wBAAE,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"getMouseModifier.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/getMouseModifier.ts"],"names":[],"mappings":";;AAAA,uCAAqD;AAOrD,MAAM,mBAAmB,GAAG,CAAC,GAAG,EAAE,EAAE;IAElC,IAAI,GAAG,CAAC,QAAQ,EAAE;QAChB,IAAI,GAAG,CAAC,OAAO;YAAE,OAAO,wBAAE,CAAC,SAAS,CAAC;QACrC,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,wBAAE,CAAC,QAAQ,CAAC;QACnC,IAAI,GAAG,CAAC,OAAO;YAAE,OAAO,wBAAE,CAAC,SAAS,CAAC;QACrC,OAAO,wBAAE,CAAC,KAAK,CAAC;KACjB;IACD,IAAI,GAAG,CAAC,OAAO,EAAE;QACf,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,wBAAE,CAAC,OAAO,CAAC;QAClC,IAAI,GAAG,CAAC,OAAO;YAAE,OAAO,wBAAE,CAAC,QAAQ,CAAC;QACpC,OAAO,wBAAE,CAAC,IAAI,CAAC;KAChB;IACD,IAAI,GAAG,CAAC,MAAM,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,wBAAE,CAAC,OAAO,CAAC,IAAI,wBAAE,CAAC,GAAG,CAAC;KAC9C;IACD,IAAI,GAAG,CAAC,OAAO,EAAE;QACf,OAAO,wBAAE,CAAC,IAAI,CAAC;KAChB;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,kBAAe,mBAAmB,CAAC"}
|
|
@@ -63,11 +63,11 @@ function mouseDownListener(evt) {
|
|
|
63
63
|
if (doubleClickState.doubleClickTimeout) {
|
|
64
64
|
return;
|
|
65
65
|
}
|
|
66
|
-
doubleClickState.doubleClickTimeout = setTimeout(_doStateMouseDownAndUp, evt.
|
|
66
|
+
doubleClickState.doubleClickTimeout = setTimeout(_doStateMouseDownAndUp, evt.buttons === 1 ? DOUBLE_CLICK_TOLERANCE_MS : 0);
|
|
67
67
|
doubleClickState.mouseDownEvent = evt;
|
|
68
68
|
doubleClickState.ignoreDoubleClick = false;
|
|
69
69
|
state.element = evt.currentTarget;
|
|
70
|
-
state.mouseButton = evt.
|
|
70
|
+
state.mouseButton = evt.buttons;
|
|
71
71
|
const enabledElement = (0, core_1.getEnabledElement)(state.element);
|
|
72
72
|
const { renderingEngineId, viewportId } = enabledElement;
|
|
73
73
|
state.renderingEngineId = renderingEngineId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mouseDownListener.js","sourceRoot":"","sources":["../../../../src/eventListeners/mouse/mouseDownListener.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsE;AAGtE,gEAAwC;AACxC,4EAAoD;AAEpD,gFAAwD;AAExD,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,GAC1E,gBAAM,CAAC;AAaT,MAAM,yBAAyB,GAAG,GAAG,CAAC;AAStC,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAsBtC,MAAM,YAAY,GAA4B;IAC5C,WAAW,EAAE,SAAS;IAEtB,OAAO,EAAE,IAAI;IACb,iBAAiB,EAAE,SAAS;IAC5B,UAAU,EAAE,SAAS;IAErB,YAAY,EAAE,IAAI;IAClB,UAAU,EAAE,GAAG;IACf,mBAAmB,EAAE,IAAI;IACzB,WAAW,EAAE;QACX,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACZ,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KACjB;IACD,UAAU,EAAE;QACV,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACZ,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KACjB;CACF,CAAC;AAEF,IAAI,KAAK,GAA4B;IACnC,WAAW,EAAE,SAAS;IAEtB,iBAAiB,EAAE,SAAS;IAC5B,UAAU,EAAE,SAAS;IAErB,YAAY,EAAE,IAAI;IAClB,UAAU,EAAE,GAAG;IACf,OAAO,EAAE,IAAI;IACb,mBAAmB,EAAE,IAAI;IACzB,WAAW,EAAE;QACX,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACZ,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KACjB;IACD,UAAU,EAAE;QACV,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACZ,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KACjB;CACF,CAAC;AAEF,MAAM,gBAAgB,GAAsB;IAC1C,kBAAkB,EAAE,IAAI;IACxB,cAAc,EAAE,IAAI;IACpB,YAAY,EAAE,IAAI;IAClB,iBAAiB,EAAE,KAAK;CACzB,CAAC;AAmBF,SAAS,iBAAiB,CAAC,GAAe;IAGxC,IAAI,gBAAgB,CAAC,kBAAkB,EAAE;QACvC,OAAO;KACR;IAID,gBAAgB,CAAC,kBAAkB,GAAG,UAAU,CAC9C,sBAAsB,EACtB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"mouseDownListener.js","sourceRoot":"","sources":["../../../../src/eventListeners/mouse/mouseDownListener.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ function removeContourFromElement(element, segmentationRepresentationUID, remove
|
|
|
6
6
|
const { viewport } = enabledElement;
|
|
7
7
|
const actorEntries = viewport.getActors();
|
|
8
8
|
const actorUIDsToRemove = actorEntries
|
|
9
|
-
.map(({ uid }) => uid.
|
|
9
|
+
.map(({ uid }) => uid.includes(segmentationRepresentationUID) ? uid : undefined)
|
|
10
10
|
.filter(Boolean);
|
|
11
11
|
viewport.removeActors(actorUIDsToRemove);
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeContourFromElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/removeContourFromElement.ts"],"names":[],"mappings":";;AAAA,8CAAwD;AAaxD,SAAS,wBAAwB,CAC/B,OAAuB,EACvB,6BAAqC,EACrC,eAAe,GAAG,KAAK;IAEvB,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,MAAM,YAAY,GAAI,QAAkC,CAAC,SAAS,EAAE,CAAC;IAGrE,MAAM,iBAAiB,GAAG,YAAY;SACnC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CACf,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"removeContourFromElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/removeContourFromElement.ts"],"names":[],"mappings":";;AAAA,8CAAwD;AAaxD,SAAS,wBAAwB,CAC/B,OAAuB,EACvB,6BAAqC,EACrC,eAAe,GAAG,KAAK;IAEvB,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,MAAM,YAAY,GAAI,QAAkC,CAAC,SAAS,EAAE,CAAC;IAGrE,MAAM,iBAAiB,GAAG,YAAY;SACnC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CACf,GAAG,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAC9D;SACA,MAAM,CAAC,OAAO,CAAC,CAAC;IAGnB,QAAQ,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;AAC3C,CAAC;AAED,kBAAe,wBAAwB,CAAC"}
|
|
@@ -6,7 +6,7 @@ const { Active } = ToolModes;
|
|
|
6
6
|
export default function getActiveToolForMouseEvent(evt) {
|
|
7
7
|
const { renderingEngineId, viewportId } = evt.detail;
|
|
8
8
|
const mouseEvent = evt.detail.event;
|
|
9
|
-
const modifierKey =
|
|
9
|
+
const modifierKey = getMouseModifier(mouseEvent) || keyEventListener.getModifierKey();
|
|
10
10
|
const toolGroup = ToolGroupManager.getToolGroupForViewport(viewportId, renderingEngineId);
|
|
11
11
|
if (!toolGroup) {
|
|
12
12
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getActiveToolForMouseEvent.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/getActiveToolForMouseEvent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAElD,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;AAW7B,MAAM,CAAC,OAAO,UAAU,0BAA0B,CAChD,GAAwC;IAGxC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IACrD,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"getActiveToolForMouseEvent.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/getActiveToolForMouseEvent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAElD,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;AAW7B,MAAM,CAAC,OAAO,UAAU,0BAA0B,CAChD,GAAwC;IAGxC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IACrD,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;IAKpC,MAAM,WAAW,GACf,gBAAgB,CAAC,UAAU,CAAC,IAAI,gBAAgB,CAAC,cAAc,EAAE,CAAC;IAEpE,MAAM,SAAS,GAAG,gBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAC;KACb;IAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAE9D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAClD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAIpD,MAAM,cAAc,GAClB,WAAW,CAAC,QAAQ,CAAC,MAAM;YAC3B,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBACpC,OAAO,CACL,OAAO,CAAC,WAAW;oBACjB,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC;oBAC3D,OAAO,CAAC,WAAW,KAAK,WAAW,CACpC,CAAC;YACJ,CAAC,CAAC,CAAC;QAEL,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,IAAI,cAAc,EAAE;YACjD,OAAO,SAAS,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;SAC5C;KACF;AACH,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ToolGroupManager } from '../../store';
|
|
2
2
|
import { MouseBindings, ToolModes } from '../../enums';
|
|
3
3
|
import getMouseModifier from './getMouseModifier';
|
|
4
|
+
import { keyEventListener } from '../../eventListeners';
|
|
4
5
|
const { Active } = ToolModes;
|
|
5
6
|
export default function getActiveToolForTouchEvent(evt) {
|
|
6
7
|
const { renderingEngineId, viewportId } = evt.detail;
|
|
@@ -11,7 +12,7 @@ export default function getActiveToolForTouchEvent(evt) {
|
|
|
11
12
|
}
|
|
12
13
|
const toolGroupToolNames = Object.keys(toolGroup.toolOptions);
|
|
13
14
|
const numTouchPoints = Object.keys(touchEvent.touches).length;
|
|
14
|
-
const modifierKey = getMouseModifier(touchEvent);
|
|
15
|
+
const modifierKey = getMouseModifier(touchEvent) || keyEventListener.getModifierKey();
|
|
15
16
|
for (let j = 0; j < toolGroupToolNames.length; j++) {
|
|
16
17
|
const toolName = toolGroupToolNames[j];
|
|
17
18
|
const toolOptions = toolGroup.toolOptions[toolName];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getActiveToolForTouchEvent.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/getActiveToolForTouchEvent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"getActiveToolForTouchEvent.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/getActiveToolForTouchEvent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;AAW7B,MAAM,CAAC,OAAO,UAAU,0BAA0B,CAChD,GAAwC;IAGxC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IACrD,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;IAEpC,MAAM,SAAS,GAAG,gBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAC;KACb;IAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAE9D,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;IAG9D,MAAM,WAAW,GACf,gBAAgB,CAAC,UAAU,CAAC,IAAI,gBAAgB,CAAC,cAAc,EAAE,CAAC;IAEpE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAClD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAEpD,MAAM,cAAc,GAClB,WAAW,CAAC,QAAQ,CAAC,MAAM;YAO3B,WAAW,CAAC,QAAQ,CAAC,IAAI,CACvB,CAAC,OAAO,EAAE,EAAE,CACV,CAAC,OAAO,CAAC,cAAc,KAAK,cAAc;gBACxC,CAAC,cAAc,KAAK,CAAC;oBACnB,OAAO,CAAC,WAAW,KAAK,aAAa,CAAC,OAAO,CAAC,CAAC;gBACnD,OAAO,CAAC,WAAW,KAAK,WAAW,CACtC,CAAC;QAEJ,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,IAAI,cAAc,EAAE;YACjD,OAAO,SAAS,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;SAC5C;KACF;AACH,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { KeyboardBindings as kb } from '../../enums';
|
|
2
|
-
declare const getMouseModifierKey: (evt: any) => kb
|
|
2
|
+
declare const getMouseModifierKey: (evt: any) => kb;
|
|
3
3
|
export default getMouseModifierKey;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getMouseModifier.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/getMouseModifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,IAAI,EAAE,EAAE,MAAM,aAAa,CAAC;AAOrD,MAAM,mBAAmB,GAAG,CAAC,GAAG,EAAE,EAAE;IAElC,IAAI,GAAG,CAAC,QAAQ,EAAE;QAChB,IAAI,GAAG,CAAC,OAAO;YAAE,OAAO,EAAE,CAAC,SAAS,CAAC;QACrC,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC,QAAQ,CAAC;QACnC,IAAI,GAAG,CAAC,OAAO;YAAE,OAAO,EAAE,CAAC,SAAS,CAAC;QACrC,OAAO,EAAE,CAAC,KAAK,CAAC;KACjB;IACD,IAAI,GAAG,CAAC,OAAO,EAAE;QACf,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC,OAAO,CAAC;QAClC,IAAI,GAAG,CAAC,OAAO;YAAE,OAAO,EAAE,CAAC,QAAQ,CAAC;QACpC,OAAO,EAAE,CAAC,IAAI,CAAC;KAChB;IACD,IAAI,GAAG,CAAC,MAAM,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC;KAC9C;IACD,IAAI,GAAG,CAAC,OAAO,EAAE;QACf,EAAE,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"getMouseModifier.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/shared/getMouseModifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,IAAI,EAAE,EAAE,MAAM,aAAa,CAAC;AAOrD,MAAM,mBAAmB,GAAG,CAAC,GAAG,EAAE,EAAE;IAElC,IAAI,GAAG,CAAC,QAAQ,EAAE;QAChB,IAAI,GAAG,CAAC,OAAO;YAAE,OAAO,EAAE,CAAC,SAAS,CAAC;QACrC,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC,QAAQ,CAAC;QACnC,IAAI,GAAG,CAAC,OAAO;YAAE,OAAO,EAAE,CAAC,SAAS,CAAC;QACrC,OAAO,EAAE,CAAC,KAAK,CAAC;KACjB;IACD,IAAI,GAAG,CAAC,OAAO,EAAE;QACf,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC,OAAO,CAAC;QAClC,IAAI,GAAG,CAAC,OAAO;YAAE,OAAO,EAAE,CAAC,QAAQ,CAAC;QACpC,OAAO,EAAE,CAAC,IAAI,CAAC;KAChB;IACD,IAAI,GAAG,CAAC,MAAM,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC;KAC9C;IACD,IAAI,GAAG,CAAC,OAAO,EAAE;QACf,OAAO,EAAE,CAAC,IAAI,CAAC;KAChB;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
|
@@ -57,11 +57,11 @@ function mouseDownListener(evt) {
|
|
|
57
57
|
if (doubleClickState.doubleClickTimeout) {
|
|
58
58
|
return;
|
|
59
59
|
}
|
|
60
|
-
doubleClickState.doubleClickTimeout = setTimeout(_doStateMouseDownAndUp, evt.
|
|
60
|
+
doubleClickState.doubleClickTimeout = setTimeout(_doStateMouseDownAndUp, evt.buttons === 1 ? DOUBLE_CLICK_TOLERANCE_MS : 0);
|
|
61
61
|
doubleClickState.mouseDownEvent = evt;
|
|
62
62
|
doubleClickState.ignoreDoubleClick = false;
|
|
63
63
|
state.element = evt.currentTarget;
|
|
64
|
-
state.mouseButton = evt.
|
|
64
|
+
state.mouseButton = evt.buttons;
|
|
65
65
|
const enabledElement = getEnabledElement(state.element);
|
|
66
66
|
const { renderingEngineId, viewportId } = enabledElement;
|
|
67
67
|
state.renderingEngineId = renderingEngineId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mouseDownListener.js","sourceRoot":"","sources":["../../../../src/eventListeners/mouse/mouseDownListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGtE,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AAExD,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,GAC1E,MAAM,CAAC;AAaT,MAAM,yBAAyB,GAAG,GAAG,CAAC;AAStC,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAsBtC,MAAM,YAAY,GAA4B;IAC5C,WAAW,EAAE,SAAS;IAEtB,OAAO,EAAE,IAAI;IACb,iBAAiB,EAAE,SAAS;IAC5B,UAAU,EAAE,SAAS;IAErB,YAAY,EAAE,IAAI;IAClB,UAAU,EAAE,GAAG;IACf,mBAAmB,EAAE,IAAI;IACzB,WAAW,EAAE;QACX,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACZ,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KACjB;IACD,UAAU,EAAE;QACV,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACZ,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KACjB;CACF,CAAC;AAEF,IAAI,KAAK,GAA4B;IACnC,WAAW,EAAE,SAAS;IAEtB,iBAAiB,EAAE,SAAS;IAC5B,UAAU,EAAE,SAAS;IAErB,YAAY,EAAE,IAAI;IAClB,UAAU,EAAE,GAAG;IACf,OAAO,EAAE,IAAI;IACb,mBAAmB,EAAE,IAAI;IACzB,WAAW,EAAE;QACX,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACZ,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KACjB;IACD,UAAU,EAAE;QACV,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACZ,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACd,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KACjB;CACF,CAAC;AAEF,MAAM,gBAAgB,GAAsB;IAC1C,kBAAkB,EAAE,IAAI;IACxB,cAAc,EAAE,IAAI;IACpB,YAAY,EAAE,IAAI;IAClB,iBAAiB,EAAE,KAAK;CACzB,CAAC;AAmBF,SAAS,iBAAiB,CAAC,GAAe;IAGxC,IAAI,gBAAgB,CAAC,kBAAkB,EAAE;QACvC,OAAO;KACR;IAID,gBAAgB,CAAC,kBAAkB,GAAG,UAAU,CAC9C,sBAAsB,EACtB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"mouseDownListener.js","sourceRoot":"","sources":["../../../../src/eventListeners/mouse/mouseDownListener.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ function removeContourFromElement(element, segmentationRepresentationUID, remove
|
|
|
4
4
|
const { viewport } = enabledElement;
|
|
5
5
|
const actorEntries = viewport.getActors();
|
|
6
6
|
const actorUIDsToRemove = actorEntries
|
|
7
|
-
.map(({ uid }) => uid.
|
|
7
|
+
.map(({ uid }) => uid.includes(segmentationRepresentationUID) ? uid : undefined)
|
|
8
8
|
.filter(Boolean);
|
|
9
9
|
viewport.removeActors(actorUIDsToRemove);
|
|
10
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeContourFromElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/removeContourFromElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAaxD,SAAS,wBAAwB,CAC/B,OAAuB,EACvB,6BAAqC,EACrC,eAAe,GAAG,KAAK;IAEvB,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,MAAM,YAAY,GAAI,QAAkC,CAAC,SAAS,EAAE,CAAC;IAGrE,MAAM,iBAAiB,GAAG,YAAY;SACnC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CACf,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"removeContourFromElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/removeContourFromElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAaxD,SAAS,wBAAwB,CAC/B,OAAuB,EACvB,6BAAqC,EACrC,eAAe,GAAG,KAAK;IAEvB,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IAEpC,MAAM,YAAY,GAAI,QAAkC,CAAC,SAAS,EAAE,CAAC;IAGrE,MAAM,iBAAiB,GAAG,YAAY;SACnC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CACf,GAAG,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAC9D;SACA,MAAM,CAAC,OAAO,CAAC,CAAC;IAGnB,QAAQ,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;AAC3C,CAAC;AAED,eAAe,wBAAwB,CAAC"}
|