@cornerstonejs/tools 1.46.0 → 1.47.1
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/tools/MIPJumpToClickTool.js +1 -1
- package/dist/cjs/tools/MIPJumpToClickTool.js.map +1 -1
- package/dist/cjs/tools/ReferenceLinesTool.js +3 -0
- package/dist/cjs/tools/ReferenceLinesTool.js.map +1 -1
- package/dist/cjs/tools/StackScrollTool.js +1 -1
- package/dist/cjs/tools/StackScrollTool.js.map +1 -1
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js +1 -1
- 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/base/AnnotationDisplayTool.js +1 -1
- package/dist/cjs/tools/base/AnnotationDisplayTool.js.map +1 -1
- package/dist/cjs/tools/base/AnnotationTool.js +1 -1
- package/dist/cjs/tools/base/AnnotationTool.js.map +1 -1
- package/dist/cjs/tools/base/BaseTool.js +7 -10
- package/dist/cjs/tools/base/BaseTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js +3 -3
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/cjs/utilities/viewport/isViewportPreScaled.js +3 -1
- package/dist/cjs/utilities/viewport/isViewportPreScaled.js.map +1 -1
- package/dist/esm/tools/MIPJumpToClickTool.js +1 -1
- package/dist/esm/tools/MIPJumpToClickTool.js.map +1 -1
- package/dist/esm/tools/ReferenceLinesTool.js +3 -0
- package/dist/esm/tools/ReferenceLinesTool.js.map +1 -1
- package/dist/esm/tools/StackScrollTool.js +1 -1
- package/dist/esm/tools/StackScrollTool.js.map +1 -1
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js +1 -1
- 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/base/AnnotationDisplayTool.js +1 -1
- package/dist/esm/tools/base/AnnotationDisplayTool.js.map +1 -1
- package/dist/esm/tools/base/AnnotationTool.js +1 -1
- package/dist/esm/tools/base/AnnotationTool.js.map +1 -1
- package/dist/esm/tools/base/BaseTool.js +7 -11
- package/dist/esm/tools/base/BaseTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js +3 -3
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js +1 -1
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/esm/utilities/viewport/isViewportPreScaled.js +3 -1
- package/dist/esm/utilities/viewport/isViewportPreScaled.js.map +1 -1
- package/dist/types/tools/ReferenceLinesTool.d.ts.map +1 -1
- package/dist/types/tools/base/BaseTool.d.ts.map +1 -1
- package/dist/types/utilities/viewport/isViewportPreScaled.d.ts.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +3 -3
- package/src/tools/MIPJumpToClickTool.ts +1 -1
- package/src/tools/ReferenceLinesTool.ts +4 -0
- package/src/tools/StackScrollTool.ts +1 -1
- package/src/tools/StackScrollToolMouseWheelTool.ts +1 -1
- package/src/tools/WindowLevelTool.ts +1 -1
- package/src/tools/base/AnnotationDisplayTool.ts +1 -1
- package/src/tools/base/AnnotationTool.ts +1 -1
- package/src/tools/base/BaseTool.ts +7 -10
- package/src/tools/segmentation/RectangleROIStartEndThresholdTool.ts +3 -3
- package/src/tools/segmentation/RectangleROIThresholdTool.ts +1 -1
- package/src/utilities/viewport/isViewportPreScaled.ts +3 -1
|
@@ -25,7 +25,7 @@ class MIPJumpToClickTool extends base_1.BaseTool {
|
|
|
25
25
|
if (!targetId.startsWith('volumeId')) {
|
|
26
26
|
throw new Error(`MIPJumpToClickTool: targetId is not a volumeId, you should only use MIPJumpToClickTool with a volumeId as the targetId`);
|
|
27
27
|
}
|
|
28
|
-
const volumeId = targetId.split(
|
|
28
|
+
const volumeId = targetId.split(/volumeId:|\?/)[1];
|
|
29
29
|
let maxIntensity = -Infinity;
|
|
30
30
|
const maxFn = (intensity, point) => {
|
|
31
31
|
if (intensity > maxIntensity) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MIPJumpToClickTool.js","sourceRoot":"","sources":["../../../src/tools/MIPJumpToClickTool.ts"],"names":[],"mappings":";;;;;AAAA,iCAAkC;AAClC,8CAAwE;AAExE,gDAAwE;AACxE,oFAA4D;AAE5D,gEAAoE;AAQpE,MAAM,kBAAmB,SAAQ,eAAQ;IAKvC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,iBAAiB,EAAE,EAAE;SACtB;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC;IAWD,kBAAkB,CAAC,GAAG;QACpB,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAG9C,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;QAGrD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAiC,CAAC,CAAC;QAErE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,wHAAwH,CACzH,CAAC;SACH;QAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"MIPJumpToClickTool.js","sourceRoot":"","sources":["../../../src/tools/MIPJumpToClickTool.ts"],"names":[],"mappings":";;;;;AAAA,iCAAkC;AAClC,8CAAwE;AAExE,gDAAwE;AACxE,oFAA4D;AAE5D,gEAAoE;AAQpE,MAAM,kBAAmB,SAAQ,eAAQ;IAKvC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,iBAAiB,EAAE,EAAE;SACtB;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC;IAWD,kBAAkB,CAAC,GAAG;QACpB,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAG9C,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;QAGrD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAiC,CAAC,CAAC;QAErE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,wHAAwH,CACzH,CAAC;SACH;QAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAGnD,IAAI,YAAY,GAAG,CAAC,QAAQ,CAAC;QAC7B,MAAM,KAAK,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;YACjC,IAAI,SAAS,GAAG,YAAY,EAAE;gBAC5B,YAAY,GAAG,SAAS,CAAC;gBACzB,OAAO,KAAK,CAAC;aACd;QACH,CAAC,CAAC;QAGF,MAAM,cAAc,GAAG,IAAA,0CAAiC,EACtD,QAAiC,EACjC,aAAa,CAAC,KAAK,EACnB,QAAQ,EACR,KAAK,CACN,CAAC;QAEF,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;YAC7C,OAAO;SACR;QAED,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAE9D,MAAM,SAAS,GAAG,eAAe,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;YAC7D,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,KAAI,CAAC,EAAE;gBAC1C,OAAO,IAAI,CAAC;aACb;YACD,MAAM,cAAc,GAAG,IAAA,0CAAuB,EAAC,EAAE,CAAC,EAAE,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC;YAC1E,IAAI,WAAW,IAAI,WAAW,MAAK,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,EAAE,CAAA,EAAE;gBACrD,OAAO,IAAI,CAAC;aACb;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAGH,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAG7B,IAAI,QAAQ,YAAY,qBAAc,EAAE;gBACtC,IAAA,qBAAW,EAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;aACvC;iBAAM;gBACL,OAAO,CAAC,IAAI,CACV,wFAAwF,CACzF,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,kBAAkB,CAAC,QAAQ,GAAG,oBAAoB,CAAC;AACnD,kBAAe,kBAAkB,CAAC"}
|
|
@@ -132,6 +132,9 @@ class ReferenceLines extends AnnotationDisplayTool_1.default {
|
|
|
132
132
|
if (this.configuration.showFullDimension) {
|
|
133
133
|
canvasCoordinates = this.handleFullDimension(targetViewport, lineStartWorld, viewPlaneNormal, viewUp, lineEndWorld, canvasCoordinates);
|
|
134
134
|
}
|
|
135
|
+
if (canvasCoordinates.length < 2) {
|
|
136
|
+
return renderStatus;
|
|
137
|
+
}
|
|
135
138
|
const dataId = `${annotationUID}-line`;
|
|
136
139
|
const lineUID = '1';
|
|
137
140
|
(0, drawingSvg_1.drawLine)(svgDrawingHelper, annotationUID, lineUID, canvasCoordinates[0], canvasCoordinates[1], {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReferenceLinesTool.js","sourceRoot":"","sources":["../../../src/tools/ReferenceLinesTool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ReferenceLinesTool.js","sourceRoot":"","sources":["../../../src/tools/ReferenceLinesTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ class StackScrollTool extends base_1.BaseTool {
|
|
|
29
29
|
const deltaPointY = deltaPoints.canvas[1];
|
|
30
30
|
let volumeId;
|
|
31
31
|
if (viewport instanceof core_1.VolumeViewport) {
|
|
32
|
-
volumeId = targetId.split(
|
|
32
|
+
volumeId = targetId.split(/volumeId:|\?/)[1];
|
|
33
33
|
}
|
|
34
34
|
const pixelsPerImage = this._getPixelPerImage(viewport);
|
|
35
35
|
const deltaY = deltaPointY + this.deltaY;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackScrollTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollTool.ts"],"names":[],"mappings":";;AAAA,8CAA6E;AAC7E,iCAAkC;AAClC,4CAAsC;AAOtC,MAAM,eAAgB,SAAQ,eAAQ;IAGpC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,MAAM,EAAE,KAAK;YACb,mBAAmB,EAAE,IAAI;YACzB,IAAI,EAAE,KAAK;SACZ;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,iBAAiB,CAAC,GAAoC;QACpD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IACD,iBAAiB,CAAC,GAAoC;QACpD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,aAAa,CAAC,GAAoC;QAChD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAClE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,6BAAsB,EAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAE3E,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAEjE,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,QAAQ,CAAC;QACb,IAAI,QAAQ,YAAY,qBAAc,EAAE;YACtC,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"StackScrollTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollTool.ts"],"names":[],"mappings":";;AAAA,8CAA6E;AAC7E,iCAAkC;AAClC,4CAAsC;AAOtC,MAAM,eAAgB,SAAQ,eAAQ;IAGpC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,MAAM,EAAE,KAAK;YACb,mBAAmB,EAAE,IAAI;YACzB,IAAI,EAAE,KAAK;SACZ;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,iBAAiB,CAAC,GAAoC;QACpD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IACD,iBAAiB,CAAC,GAAoC;QACpD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,aAAa,CAAC,GAAoC;QAChD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAClE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,6BAAsB,EAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAE3E,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAEjE,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,QAAQ,CAAC;QACb,IAAI,QAAQ,YAAY,qBAAc,EAAE;YACtC,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9C;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC;QAEzC,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO;SACR;QAED,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,cAAc,EAAE;YACtC,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC;YAE/D,IAAA,kBAAM,EAAC,QAAQ,EAAE;gBACf,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,kBAAkB;gBACxD,QAAQ;gBACR,eAAe,EAAE,mBAAmB;gBACpC,IAAI,EAAE,IAAI;aACX,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,GAAG,MAAM,GAAG,cAAc,CAAC;SACvC;aAAM;YACL,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;SACtB;IACH,CAAC;IAED,iBAAiB,CAAC,QAAQ;QACxB,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAC7B,MAAM,cAAc,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAGpD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC;IACzE,CAAC;CACF;AAED,eAAe,CAAC,QAAQ,GAAG,aAAa,CAAC;AACzC,kBAAe,eAAe,CAAC"}
|
|
@@ -25,7 +25,7 @@ class StackScrollMouseWheelTool extends base_1.BaseTool {
|
|
|
25
25
|
const { viewport } = (0, core_1.getEnabledElement)(element);
|
|
26
26
|
const delta = direction * (invert ? -1 : 1);
|
|
27
27
|
const targetId = this.getTargetId(viewport);
|
|
28
|
-
const volumeId = targetId.split(
|
|
28
|
+
const volumeId = targetId.split(/volumeId:|\?/)[1];
|
|
29
29
|
(0, scroll_1.default)(viewport, {
|
|
30
30
|
delta,
|
|
31
31
|
debounceLoading: this.configuration.debounceIfNotLoaded,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAAwD;AACxD,iCAAkC;AAElC,iEAAyC;AAMzC,MAAM,yBAA0B,SAAQ,eAAQ;IAK9C,YACE,SAAS,GAAG,EAAE,EACd,gBAAgB,GAAG;QACjB,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,MAAM,EAAE,KAAK;YACb,mBAAmB,EAAE,IAAI;YACzB,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,KAAK;SACnB;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC;IAED,kBAAkB,CAAC,GAAwB;QACzC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QACtC,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;QAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAAwD;AACxD,iCAAkC;AAElC,iEAAyC;AAMzC,MAAM,yBAA0B,SAAQ,eAAQ;IAK9C,YACE,SAAS,GAAG,EAAE,EACd,gBAAgB,GAAG;QACjB,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,MAAM,EAAE,KAAK;YACb,mBAAmB,EAAE,IAAI;YACzB,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,KAAK;SACnB;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC;IAED,kBAAkB,CAAC,GAAwB;QACzC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QACtC,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;QAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnD,IAAA,gBAAM,EAAC,QAAQ,EAAE;YACf,KAAK;YACL,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,mBAAmB;YACvD,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI;YAC7B,QAAQ;YACR,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,WAAW;SAC5C,CAAC,CAAC;IACL,CAAC;CACF;AAED,yBAAyB,CAAC,QAAQ,GAAG,uBAAuB,CAAC;AAC7D,kBAAe,yBAAyB,CAAC"}
|
|
@@ -51,7 +51,7 @@ class WindowLevelTool extends base_1.BaseTool {
|
|
|
51
51
|
const properties = viewport.getProperties();
|
|
52
52
|
if (viewport instanceof core_1.VolumeViewport) {
|
|
53
53
|
const targetId = this.getTargetId(viewport);
|
|
54
|
-
volumeId = targetId.split(
|
|
54
|
+
volumeId = targetId.split(/volumeId:|\?/)[1];
|
|
55
55
|
viewportsContainingVolumeUID = core_1.utilities.getViewportsWithVolumeId(volumeId, renderingEngine.id);
|
|
56
56
|
({ lower, upper } = properties.voiRange);
|
|
57
57
|
const volume = core_1.cache.getVolume(volumeId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WindowLevelTool.js","sourceRoot":"","sources":["../../../src/tools/WindowLevelTool.ts"],"names":[],"mappings":";;AAAA,iCAAkC;AAClC,8CAO6B;AAI7B,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,2BAA2B,GAAG,IAAI,CAAC;AACzC,MAAM,EAAE,GAAG,IAAI,CAAC;AAQhB,MAAM,eAAgB,SAAQ,eAAQ;IAEpC,YACE,SAAS,GAAG,EAAE,EACd,gBAAgB,GAAG;QACjB,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;KAC9C;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAoMrC,yCAAoC,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE;YAChE,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAEvD,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAClD,IAAI,aAAa,CAAC;YAClB,IAAI,qBAAqB,CAAC;YAE1B,IAAI,UAAU,YAAY,YAAY,EAAE;gBACtC,aAAa,GAAG,CAAC,CAAC;gBAClB,qBAAqB,GAAG,YAAY,CAAC;aACtC;iBAAM,IAAI,UAAU,YAAY,UAAU,EAAE;gBAC3C,aAAa,GAAG,CAAC,CAAC;gBAClB,qBAAqB,GAAG,UAAU,CAAC;aACpC;iBAAM,IAAI,UAAU,YAAY,WAAW,EAAE;gBAC5C,aAAa,GAAG,CAAC,CAAC;gBAClB,qBAAqB,GAAG,WAAW,CAAC;aACrC;iBAAM,IAAI,UAAU,YAAY,UAAU,EAAE;gBAC3C,aAAa,GAAG,CAAC,CAAC;gBAClB,qBAAqB,GAAG,UAAU,CAAC;aACpC;YAED,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;YACjC,MAAM,UAAU,GAAG,gBAAgB,GAAG,WAAW,GAAG,aAAa,CAAC;YAClE,MAAM,KAAK,GAAG,IAAI,qBAAqB,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;YAEzE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YAEzD,OAAO,GAAG,GAAG,GAAG,CAAC;QACnB,CAAC,CAAC;IA/NF,CAAC;IAED,iBAAiB,CAAC,GAAoC;QACpD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,iBAAiB,CAAC,GAAoC;;QACpD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5C,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QAErD,IAAI,QAAQ,EACV,KAAK,EACL,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,4BAA4B,CAAC;QAC/B,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,EAAE,CAAC;QAC5C,IAAI,QAAQ,YAAY,qBAAc,EAAE;YACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAiC,CAAC,CAAC;YACrE,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"WindowLevelTool.js","sourceRoot":"","sources":["../../../src/tools/WindowLevelTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,7 +57,7 @@ class AnnotationDisplayTool extends BaseTool_1.default {
|
|
|
57
57
|
referencedImageId = targetId.split('videoId:')[1];
|
|
58
58
|
}
|
|
59
59
|
else {
|
|
60
|
-
const volumeId = targetId.split(
|
|
60
|
+
const volumeId = targetId.split(/volumeId:|\?/)[1];
|
|
61
61
|
const imageVolume = core_1.cache.getVolume(volumeId);
|
|
62
62
|
referencedImageId = core_1.utilities.getClosestImageId(imageVolume, worldPos, viewPlaneNormal);
|
|
63
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationDisplayTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAM6B;AAG7B,0DAAkC;AAClC,sFAAwF;AAExF,sGAA8E;AAC9E,qHAA6F;AAC7F,6EAAmF;AACnF,oEAAmE;AAanE,MAAe,qBAAsB,SAAQ,kBAAQ;IAArD;;QAqDS,6BAAwB,GAAG,CAChC,GAAiD,EACjD,EAAE;YACF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;YAExC,MAAM,QAAQ,GAAG,gBAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACjD,MAAM,iBAAiB,GAAG,IAAA,sCAAoB,GAAE,CAAC;YACjD,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;YAGnE,iBAAiB,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;gBAC7C,MAAM,mCAAmC,GACvC,iBAAiB,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;gBAErD,MAAM,uBAAuB,GAC3B,mCAAmC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBAE1D,IAAI,CAAC,uBAAuB,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE;oBAC/D,OAAO;iBACR;gBAGD,uBAAuB,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;;oBAC7C,IAAI,CAAC,CAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,iBAAiB,CAAA,EAAE;wBAC3C,OAAO;qBACR;oBAGD,MAAM,kBAAkB,GAAG,gBAAS,CAAC,YAAY,CAC/C,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CACtC,CAAC;oBAEF,IAAI,kBAAkB,KAAK,QAAQ,EAAE;wBAGnC,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC;wBAC9B,UAAU,CAAC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;qBAClC;gBACH,CAAC,CAAC,CAAC;gBACH,IAAA,iCAAuB,EAAC,OAAO,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;IAuDJ,CAAC;IAvHC,uCAAuC,CACrC,OAAuB,EACvB,WAAwB;QAExB,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;YACvC,OAAO;SACR;QAED,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QAEpC,OAAO,IAAA,qCAA2B,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC;IAsDS,oBAAoB,CAC5B,QAAyB,EACzB,QAAsB,EACtB,eAA6B,EAC7B,MAAoB;QAEpB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE5C,IAAI,iBAAiB,CAAC;QAEtB,IAAI,QAAQ,YAAY,oBAAa,EAAE;YACrC,iBAAiB,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;SACnD;aAAM,IAAI,QAAQ,YAAY,oBAAa,EAAE;YAC5C,iBAAiB,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;SACnD;aAAM;YACL,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"AnnotationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationDisplayTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,7 +99,7 @@ class AnnotationTool extends AnnotationDisplayTool_1.default {
|
|
|
99
99
|
isSuvScaled(viewport, targetId, imageId) {
|
|
100
100
|
var _a;
|
|
101
101
|
if (viewport instanceof core_1.BaseVolumeViewport) {
|
|
102
|
-
const volumeId = targetId.split(
|
|
102
|
+
const volumeId = targetId.split(/volumeId:|\?/)[1];
|
|
103
103
|
const volume = core_1.cache.getVolume(volumeId);
|
|
104
104
|
return ((_a = volume.scaling) === null || _a === void 0 ? void 0 : _a.PT) !== undefined;
|
|
105
105
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAK6B;AAG7B,yCAAiC;AAEjC,oFAA4D;AAC5D,0FAAwF;AACxF,gGAA4F;AAsB5F,MAAe,cAAe,SAAQ,+BAAqB;IAMzD,YAAY,SAA0B,EAAE,gBAA2B;;QACjE,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAqF9B,sBAAiB,GAAG,CACzB,GAAkC,EAClC,mBAAiC,EACxB,EAAE;YACX,IAAI,CAAC,mBAAmB,EAAE;gBACxB,OAAO,KAAK,CAAC;aACd;YAED,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;YAC9C,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC;YAC1C,IAAI,0BAA0B,GAAG,KAAK,CAAC;YAEvC,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE;gBAE5C,IACE,IAAA,sCAAkB,EAAC,UAAU,CAAC;oBAC9B,CAAC,IAAA,0CAAmB,EAAC,UAAU,CAAC,aAAa,CAAC,EAC9C;oBACA,SAAS;iBACV;gBAED,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;gBAC5B,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO;oBACtC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB;oBAChC,CAAC,CAAC,SAAS,CAAC;gBAId,MAAM,IAAI,GAAG,IAAI,CAAC,2BAA2B,CAC3C,OAAO,EACP,UAAU,EACV,YAAY,EACZ,CAAC,CACF,CAAC;gBAEF,MAAM,0BAA0B,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;gBACnE,MAAM,0BAA0B,GAAG,CAAC,IAAI,IAAI,UAAU,CAAC,WAAW,CAAC;gBACnE,IAAI,0BAA0B,IAAI,0BAA0B,EAAE;oBAC5D,UAAU,CAAC,WAAW,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC;oBACjD,0BAA0B,GAAG,IAAI,CAAC;iBACnC;qBAAM,IACL,IAAI,CAAC,OAAO;oBACZ,IAAI,CAAC,OAAO,CAAC,iBAAiB,KAAK,mBAAmB,EACtD;oBAEA,0BAA0B,GAAG,IAAI,CAAC;iBACnC;aACF;YAED,OAAO,0BAA0B,CAAC;QACpC,CAAC,CAAC;QArIA,IAAI,MAAA,SAAS,CAAC,aAAa,0CAAE,YAAY,EAAE;YACzC,IAAI,CAAC,aAAa,CAAC,YAAY,GAAG,SAAS,CAAC,aAAa,CAAC,YAAY,CAAC;SACxE;QAED,IAAI,MAAA,SAAS,CAAC,aAAa,0CAAE,eAAe,EAAE;YAC5C,IAAI,CAAC,aAAa,CAAC,eAAe;gBAChC,SAAS,CAAC,aAAa,CAAC,eAAe,CAAC;SAC3C;IACH,CAAC;IA4ID,uBAAuB,CACrB,OAAuB,EACvB,UAAsB,EACtB,YAA0B,EAC1B,SAAiB;QAEjB,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QAEpC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;QAC5B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAEzC,IAAI,OAAO,EAAE;YACX,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;YACrC,IAAI,gBAAgB,EAAE;gBACpB,MAAM,iBAAiB,GAAG;oBACxB,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,gBAAgB,CAAC,OAAO,CAAC;oBACzD,QAAQ,EAAE,QAAQ,CAAC,aAAa,CAAC,gBAAgB,CAAC,QAAQ,CAAC;oBAC3D,UAAU,EAAE,QAAQ,CAAC,aAAa,CAAC,gBAAgB,CAAC,UAAU,CAAC;oBAC/D,WAAW,EAAE,QAAQ,CAAC,aAAa,CAAC,gBAAgB,CAAC,WAAW,CAAC;iBAClE,CAAC;gBAEF,IACE,YAAY,CAAC,CAAC,CAAC,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC/C,YAAY,CAAC,CAAC,CAAC,IAAI,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC;oBACnD,YAAY,CAAC,CAAC,CAAC,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC/C,YAAY,CAAC,CAAC,CAAC,IAAI,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,EACnD;oBACA,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;oBACtC,OAAO,OAAqB,CAAC;iBAC9B;aACF;SACF;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,0BAA0B,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAEjE,MAAM,IAAI,GACR,gBAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,0BAA0B,CAAC,GAAG,SAAS,CAAC;YAEtE,IAAI,IAAI,KAAK,IAAI,EAAE;gBACjB,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC;gBACnC,OAAO,KAAK,CAAC;aACd;SACF;QAED,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IACxC,CAAC;IAYM,qBAAqB,CAC1B,cAA8B,EAC9B,UAAuB;QAKvB,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,QAAQ,CACvB,mBAAmB,EACnB,cAAc,EACd,UAAU,CACX;YACD,UAAU,EAAE,IAAI,CAAC,QAAQ,CACvB,mBAAmB,EACnB,cAAc,EACd,UAAU,CACX;YACD,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,cAAc,EAAE,UAAU,CAAC;YACtE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,EAAE,UAAU,CAAC;YAChE,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,cAAc,EAAE,UAAU,CAAC;YAClE,UAAU,EAAE,IAAI,CAAC,QAAQ,CACvB,mBAAmB,EACnB,cAAc,EACd,UAAU,CACX;YACD,SAAS,EAAE,IAAI,CAAC,QAAQ,CACtB,sBAAsB,EACtB,cAAc,EACd,UAAU,CACX;YACD,QAAQ,EAAE,IAAI,CAAC,QAAQ,CACrB,qBAAqB,EACrB,cAAc,EACd,UAAU,CACX;SACF,CAAC;IACJ,CAAC;IASD,WAAW,CACT,QAAsD,EACtD,QAAgB,EAChB,OAAgB;;QAEhB,IAAI,QAAQ,YAAY,yBAAkB,EAAE;YAC1C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,7 +67,7 @@ class BaseTool {
|
|
|
67
67
|
return viewports[0].getImageData();
|
|
68
68
|
}
|
|
69
69
|
else if (targetId.startsWith('volumeId:')) {
|
|
70
|
-
const volumeId = targetId.split(
|
|
70
|
+
const volumeId = targetId.split(/volumeId:|\?/)[1];
|
|
71
71
|
const viewports = core_1.utilities.getViewportsWithVolumeId(volumeId, renderingEngine.id);
|
|
72
72
|
if (!viewports || !viewports.length) {
|
|
73
73
|
return;
|
|
@@ -87,18 +87,15 @@ class BaseTool {
|
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
getTargetId(viewport) {
|
|
90
|
-
|
|
91
|
-
|
|
90
|
+
var _a;
|
|
91
|
+
const targetId = (_a = viewport.getTargetId) === null || _a === void 0 ? void 0 : _a.call(viewport);
|
|
92
|
+
if (targetId) {
|
|
93
|
+
return targetId;
|
|
92
94
|
}
|
|
93
|
-
|
|
95
|
+
if (viewport instanceof core_1.BaseVolumeViewport) {
|
|
94
96
|
return `volumeId:${this.getTargetVolumeId(viewport)}`;
|
|
95
97
|
}
|
|
96
|
-
|
|
97
|
-
return `videoId:${viewport.getCurrentImageId()}`;
|
|
98
|
-
}
|
|
99
|
-
else {
|
|
100
|
-
throw new Error('getTargetId: viewport must be a StackViewport or VolumeViewport');
|
|
101
|
-
}
|
|
98
|
+
throw new Error('getTargetId: viewport must have a getTargetId method');
|
|
102
99
|
}
|
|
103
100
|
}
|
|
104
101
|
BaseTool.toolName = 'BaseTool';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAK6B;AAE7B,sEAA8C;AA0B9C,MAAe,QAAQ;IAUrB,YAAY,SAA0B,EAAE,gBAA2B;QACjE,MAAM,YAAY,GAAG,gBAAS,CAAC,SAAS,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;QAEtE,MAAM,EACJ,aAAa,GAAG,EAAE,EAClB,yBAAyB,EACzB,WAAW,GACZ,GAAG,YAAY,CAAC;QAGjB,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE;YAC7B,aAAa,CAAC,UAAU,GAAG,EAAE,CAAC;YAC9B,aAAa,CAAC,eAAe,GAAG,SAAS,CAAC;YAC1C,aAAa,CAAC,cAAc,GAAG,SAAS,CAAC;YACzC,aAAa,CAAC,eAAe,GAAG,EAAE,CAAC;SACpC;QAED,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,yBAAyB,GAAG,yBAAyB,IAAI,EAAE,CAAC;QACjE,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;QACtD,IAAI,CAAC,IAAI,GAAG,mBAAS,CAAC,QAAQ,CAAC;IACjC,CAAC;IAMM,WAAW;QAEhB,OAAyB,IAAI,CAAC,WAAY,CAAC,QAAQ,CAAC;IACtD,CAAC;IASM,mBAAmB,CACxB,cAAqC,EACrC,aAAsB;;QAEtB,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAC1D,OAAO,MAAA,UAAU,CAAC,cAAc,CAAC,0CAAE,IAAI,CACrC,IAAI,EACJ,cAAc,EACd,aAAa,CACd,CAAC;IACJ,CAAC;IAaM,2BAA2B,CAChC,cAAqC,EACrC,aAAsB,EACtB,YAAwC;;QAExC,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAC1D,OAAO,MAAA,UAAU,CAAC,cAAc,CAAC,CAAC,YAAY,CAAC,0CAAE,IAAI,CACnD,IAAI,EACJ,cAAc,EACd,aAAa,CACd,CAAC;IACJ,CAAC;IAMM,gBAAgB,CAAC,gBAAqC;QAC3D,IAAI,CAAC,aAAa,GAAG,gBAAS,CAAC,SAAS,CACtC,IAAI,CAAC,aAAa,EAClB,gBAAgB,CACjB,CAAC;IACJ,CAAC;IASM,iBAAiB,CAAC,YAAoB;QAC3C,IAAI,CAAC,gBAAgB,CAAC,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC,CAAC;IAC1D,CAAC;IAcO,iBAAiB,CAAC,QAAyB;;QACjD,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE;YAC/B,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;SACpC;QAID,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QAE1C,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO;SACR;QAGD,OAAO,MAAA,YAAY,CAAC,IAAI,CACtB,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,WAAW,CAChE,0CAAE,GAAG,CAAC;IACT,CAAC;IAaS,gBAAgB,CACxB,QAAgB,EAChB,eAAuC;QAEvC,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,MAAM,QAAQ,GAAG,gBAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,SAAS,GAAG,gBAAS,CAAC,wBAAwB,CAChD,QAAQ,EACR,eAAe,CAAC,EAAE,CACnB,CAAC;YAEF,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;gBACnC,OAAO;aACR;YAED,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACxC,OAAO,QAAQ,CAAC,iBAAiB,EAAE,KAAK,OAAO,CAAC;YAClD,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;gBACnC,OAAO;aACR;YAED,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;SACpC;aAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YAC3C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;YACnD,MAAM,SAAS,GAAG,gBAAS,CAAC,wBAAwB,CAClD,QAAQ,EACR,eAAe,CAAC,EAAE,CACnB,CAAC;YAEF,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;gBACnC,OAAO;aACR;YAED,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;SACpC;aAAM,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YAE1C,MAAM,QAAQ,GAAG,gBAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAClD,MAAM,SAAS,GAAG,gBAAS,CAAC,wBAAwB,CAClD,QAAQ,EACR,eAAe,CAAC,EAAE,CACnB,CAAC;YAEF,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;gBACnC,OAAO;aACR;YAED,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;SACpC;aAAM;YACL,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;SACH;IACH,CAAC;IAYS,WAAW,CAAC,QAAyB;;QAC7C,MAAM,QAAQ,GAAG,MAAA,QAAQ,CAAC,WAAW,wDAAI,CAAC;QAC1C,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAC;SACjB;QACD,IAAI,QAAQ,YAAY,yBAAkB,EAAE;YAC1C,OAAO,YAAY,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;SACvD;QACD,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;CACF;AAID,QAAQ,CAAC,QAAQ,GAAG,UAAU,CAAC;AAC/B,kBAAe,QAAQ,CAAC"}
|
|
@@ -38,7 +38,7 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool_1.default {
|
|
|
38
38
|
}
|
|
39
39
|
else {
|
|
40
40
|
const targetId = this.getTargetId(viewport);
|
|
41
|
-
volumeId = targetId.split(
|
|
41
|
+
volumeId = targetId.split(/volumeId:|\?/)[1];
|
|
42
42
|
imageVolume = core_1.cache.getVolume(volumeId);
|
|
43
43
|
referencedImageId = core_1.utilities.getClosestImageId(imageVolume, worldPos, viewPlaneNormal);
|
|
44
44
|
}
|
|
@@ -209,8 +209,8 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool_1.default {
|
|
|
209
209
|
const data = annotation.data;
|
|
210
210
|
const { viewportId, renderingEngineId, viewport } = enabledElement;
|
|
211
211
|
const { cachedStats } = data;
|
|
212
|
-
const
|
|
213
|
-
const imageVolume = core_1.cache.getVolume(
|
|
212
|
+
const targetId = this.getTargetId(viewport);
|
|
213
|
+
const imageVolume = core_1.cache.getVolume(targetId.split(/volumeId:|\?/)[1]);
|
|
214
214
|
this._computeProjectionPoints(annotation, imageVolume);
|
|
215
215
|
annotation.invalidated = false;
|
|
216
216
|
const eventType = enums_1.Events.ANNOTATION_MODIFIED;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RectangleROIStartEndThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleROIStartEndThresholdTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAQ6B;AAG7B,yCAAiC;AACjC,uCAAqC;AACrC,2DAAsE;AACtE,0FAAwF;AACxF,iDAG0B;AAC1B,qEAAiF;AACjF,wEAAgD;AAEhD,gGAA4F;AAC5F,+DAAgE;AAChE,kIAA0G;AAS1G,sFAA8D;AAG9D,MAAM,EAAE,qBAAqB,EAAE,GAAG,gBAAO,CAAC;AAc1C,MAAM,iCAAkC,SAAQ,0BAAgB;IAa9D,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,aAAa,EAAE;YACb,oBAAoB,EAAE,EAAE;SACzB;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAiBrC,qBAAgB,GAAG,CAAC,GAAoC,EAAE,EAAE;YAC1D,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC;YAC/B,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;YAC/C,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC;YAErC,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;YAClD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;YAErD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YAEtB,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;YACpC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;YAE3C,IAAI,iBAAiB,EAAE,WAAW,EAAE,QAAQ,CAAC;YAC7C,IAAI,QAAQ,YAAY,oBAAa,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;aACnD;iBAAM;gBACL,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;gBAC5C,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"RectangleROIStartEndThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleROIStartEndThresholdTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ class RectangleROIThresholdTool extends RectangleROITool_1.default {
|
|
|
37
37
|
referencedImageId = targetId.split('imageId:')[1];
|
|
38
38
|
}
|
|
39
39
|
else {
|
|
40
|
-
volumeId = targetId.split(
|
|
40
|
+
volumeId = targetId.split(/volumeId:|\?/)[1];
|
|
41
41
|
const imageVolume = core_1.cache.getVolume(volumeId);
|
|
42
42
|
referencedImageId = core_1.utilities.getClosestImageId(imageVolume, worldPos, viewPlaneNormal);
|
|
43
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RectangleROIThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleROIThresholdTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAO6B;AAG7B,2DAAsE;AACtE,0FAAwF;AACxF,uCAAqC;AAErC,iDAG0B;AAC1B,qEAAiF;AACjF,+DAAgE;AAChE,kIAA0G;AAC1G,gGAA4F;AAS5F,sFAA8D;AAS9D,MAAM,yBAA0B,SAAQ,0BAAgB;IAatD,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,MAAM,EAAE,IAAI;YACZ,yBAAyB,EAAE,KAAK;SACjC;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAWrC,qBAAgB,GAAG,CAAC,GAAoC,EAAE,EAAE;YAC1D,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC;YAC/B,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;YAC/C,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC;YAErC,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;YAClD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;YAErD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YAEtB,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;YACpC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;YAE3C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC5C,IAAI,iBAAiB,EAAE,QAAQ,CAAC;YAEhC,IAAI,QAAQ,YAAY,oBAAa,EAAE;gBACrC,iBAAiB,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;aACnD;iBAAM;gBACL,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"RectangleROIThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/RectangleROIThresholdTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,9 @@ const core_1 = require("@cornerstonejs/core");
|
|
|
5
5
|
function isViewportPreScaled(viewport, targetId) {
|
|
6
6
|
if (viewport instanceof core_1.BaseVolumeViewport) {
|
|
7
7
|
const targetIdTokens = targetId.split('volumeId:');
|
|
8
|
-
const volumeId = targetIdTokens.length > 1
|
|
8
|
+
const volumeId = targetIdTokens.length > 1
|
|
9
|
+
? targetIdTokens[1].split('?')[0]
|
|
10
|
+
: targetIdTokens[0];
|
|
9
11
|
const volume = core_1.cache.getVolume(volumeId);
|
|
10
12
|
return !!(volume === null || volume === void 0 ? void 0 : volume.scaling) && Object.keys(volume.scaling).length > 0;
|
|
11
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isViewportPreScaled.js","sourceRoot":"","sources":["../../../../src/utilities/viewport/isViewportPreScaled.ts"],"names":[],"mappings":";;;AAAA,8CAK6B;AAE7B,SAAS,mBAAmB,CAC1B,QAAsD,EACtD,QAAgB;IAEhB,IAAI,QAAQ,YAAY,yBAAkB,EAAE;QAC1C,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACnD,MAAM,QAAQ,GACZ,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"isViewportPreScaled.js","sourceRoot":"","sources":["../../../../src/utilities/viewport/isViewportPreScaled.ts"],"names":[],"mappings":";;;AAAA,8CAK6B;AAE7B,SAAS,mBAAmB,CAC1B,QAAsD,EACtD,QAAgB;IAEhB,IAAI,QAAQ,YAAY,yBAAkB,EAAE;QAC1C,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACnD,MAAM,QAAQ,GACZ,cAAc,CAAC,MAAM,GAAG,CAAC;YACvB,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACjC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,MAAM,GAAG,YAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACzC,OAAO,CAAC,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAA,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;KACpE;SAAM,IAAI,QAAQ,YAAY,oBAAa,EAAE;QAC5C,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC;QACnD,OAAO,CAAC,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAA,CAAC;KAC3B;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAEQ,kDAAmB"}
|
|
@@ -20,7 +20,7 @@ class MIPJumpToClickTool extends BaseTool {
|
|
|
20
20
|
if (!targetId.startsWith('volumeId')) {
|
|
21
21
|
throw new Error(`MIPJumpToClickTool: targetId is not a volumeId, you should only use MIPJumpToClickTool with a volumeId as the targetId`);
|
|
22
22
|
}
|
|
23
|
-
const volumeId = targetId.split(
|
|
23
|
+
const volumeId = targetId.split(/volumeId:|\?/)[1];
|
|
24
24
|
let maxIntensity = -Infinity;
|
|
25
25
|
const maxFn = (intensity, point) => {
|
|
26
26
|
if (intensity > maxIntensity) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MIPJumpToClickTool.js","sourceRoot":"","sources":["../../../src/tools/MIPJumpToClickTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAExE,OAAO,EAAE,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,WAAW,MAAM,mCAAmC,CAAC;AAE5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAQpE,MAAM,kBAAmB,SAAQ,QAAQ;IAKvC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,iBAAiB,EAAE,EAAE;SACtB;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC;IAWD,kBAAkB,CAAC,GAAG;QACpB,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAG9C,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;QAGrD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAiC,CAAC,CAAC;QAErE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,wHAAwH,CACzH,CAAC;SACH;QAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"MIPJumpToClickTool.js","sourceRoot":"","sources":["../../../src/tools/MIPJumpToClickTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAExE,OAAO,EAAE,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,WAAW,MAAM,mCAAmC,CAAC;AAE5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAQpE,MAAM,kBAAmB,SAAQ,QAAQ;IAKvC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,iBAAiB,EAAE,EAAE;SACtB;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC;IAWD,kBAAkB,CAAC,GAAG;QACpB,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAG9C,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,cAAc,CAAC;QAGrD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAiC,CAAC,CAAC;QAErE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,wHAAwH,CACzH,CAAC;SACH;QAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAGnD,IAAI,YAAY,GAAG,CAAC,QAAQ,CAAC;QAC7B,MAAM,KAAK,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;YACjC,IAAI,SAAS,GAAG,YAAY,EAAE;gBAC5B,YAAY,GAAG,SAAS,CAAC;gBACzB,OAAO,KAAK,CAAC;aACd;QACH,CAAC,CAAC;QAGF,MAAM,cAAc,GAAG,iCAAiC,CACtD,QAAiC,EACjC,aAAa,CAAC,KAAK,EACnB,QAAQ,EACR,KAAK,CACN,CAAC;QAEF,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;YAC7C,OAAO;SACR;QAED,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAE9D,MAAM,SAAS,GAAG,eAAe,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;YAC7D,IAAI,iBAAiB,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;gBAC1C,OAAO,IAAI,CAAC;aACb;YACD,MAAM,cAAc,GAAG,uBAAuB,CAAC,EAAE,CAAC,EAAE,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC;YAC1E,IAAI,WAAW,IAAI,WAAW,KAAK,cAAc,EAAE,EAAE,EAAE;gBACrD,OAAO,IAAI,CAAC;aACb;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAGH,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAG7B,IAAI,QAAQ,YAAY,cAAc,EAAE;gBACtC,WAAW,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;aACvC;iBAAM;gBACL,OAAO,CAAC,IAAI,CACV,wFAAwF,CACzF,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAED,kBAAkB,CAAC,QAAQ,GAAG,oBAAoB,CAAC;AACnD,eAAe,kBAAkB,CAAC"}
|
|
@@ -126,6 +126,9 @@ class ReferenceLines extends AnnotationDisplayTool {
|
|
|
126
126
|
if (this.configuration.showFullDimension) {
|
|
127
127
|
canvasCoordinates = this.handleFullDimension(targetViewport, lineStartWorld, viewPlaneNormal, viewUp, lineEndWorld, canvasCoordinates);
|
|
128
128
|
}
|
|
129
|
+
if (canvasCoordinates.length < 2) {
|
|
130
|
+
return renderStatus;
|
|
131
|
+
}
|
|
129
132
|
const dataId = `${annotationUID}-line`;
|
|
130
133
|
const lineUID = '1';
|
|
131
134
|
drawLineSvg(svgDrawingHelper, annotationUID, lineUID, canvasCoordinates[0], canvasCoordinates[1], {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReferenceLinesTool.js","sourceRoot":"","sources":["../../../src/tools/ReferenceLinesTool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ReferenceLinesTool.js","sourceRoot":"","sources":["../../../src/tools/ReferenceLinesTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ class StackScrollTool extends BaseTool {
|
|
|
27
27
|
const deltaPointY = deltaPoints.canvas[1];
|
|
28
28
|
let volumeId;
|
|
29
29
|
if (viewport instanceof VolumeViewport) {
|
|
30
|
-
volumeId = targetId.split(
|
|
30
|
+
volumeId = targetId.split(/volumeId:|\?/)[1];
|
|
31
31
|
}
|
|
32
32
|
const pixelsPerImage = this._getPixelPerImage(viewport);
|
|
33
33
|
const deltaY = deltaPointY + this.deltaY;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackScrollTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAOtC,MAAM,eAAgB,SAAQ,QAAQ;IAGpC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,MAAM,EAAE,KAAK;YACb,mBAAmB,EAAE,IAAI;YACzB,IAAI,EAAE,KAAK;SACZ;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,iBAAiB,CAAC,GAAoC;QACpD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IACD,iBAAiB,CAAC,GAAoC;QACpD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,aAAa,CAAC,GAAoC;QAChD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAClE,MAAM,EAAE,QAAQ,EAAE,GAAG,sBAAsB,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAE3E,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAEjE,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,QAAQ,CAAC;QACb,IAAI,QAAQ,YAAY,cAAc,EAAE;YACtC,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"StackScrollTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAOtC,MAAM,eAAgB,SAAQ,QAAQ;IAGpC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,MAAM,EAAE,KAAK;YACb,mBAAmB,EAAE,IAAI;YACzB,IAAI,EAAE,KAAK;SACZ;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,iBAAiB,CAAC,GAAoC;QACpD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IACD,iBAAiB,CAAC,GAAoC;QACpD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,aAAa,CAAC,GAAoC;QAChD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAClE,MAAM,EAAE,QAAQ,EAAE,GAAG,sBAAsB,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAE3E,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAEjE,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,QAAQ,CAAC;QACb,IAAI,QAAQ,YAAY,cAAc,EAAE;YACtC,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9C;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC;QAEzC,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO;SACR;QAED,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,cAAc,EAAE;YACtC,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC;YAE/D,MAAM,CAAC,QAAQ,EAAE;gBACf,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,kBAAkB;gBACxD,QAAQ;gBACR,eAAe,EAAE,mBAAmB;gBACpC,IAAI,EAAE,IAAI;aACX,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,GAAG,MAAM,GAAG,cAAc,CAAC;SACvC;aAAM;YACL,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;SACtB;IACH,CAAC;IAED,iBAAiB,CAAC,QAAQ;QACxB,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAC7B,MAAM,cAAc,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAGpD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC;IACzE,CAAC;CACF;AAED,eAAe,CAAC,QAAQ,GAAG,aAAa,CAAC;AACzC,eAAe,eAAe,CAAC"}
|
|
@@ -20,7 +20,7 @@ class StackScrollMouseWheelTool extends BaseTool {
|
|
|
20
20
|
const { viewport } = getEnabledElement(element);
|
|
21
21
|
const delta = direction * (invert ? -1 : 1);
|
|
22
22
|
const targetId = this.getTargetId(viewport);
|
|
23
|
-
const volumeId = targetId.split(
|
|
23
|
+
const volumeId = targetId.split(/volumeId:|\?/)[1];
|
|
24
24
|
scroll(viewport, {
|
|
25
25
|
delta,
|
|
26
26
|
debounceLoading: this.configuration.debounceIfNotLoaded,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,MAAM,MAAM,qBAAqB,CAAC;AAMzC,MAAM,yBAA0B,SAAQ,QAAQ;IAK9C,YACE,SAAS,GAAG,EAAE,EACd,gBAAgB,GAAG;QACjB,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,MAAM,EAAE,KAAK;YACb,mBAAmB,EAAE,IAAI;YACzB,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,KAAK;SACnB;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC;IAED,kBAAkB,CAAC,GAAwB;QACzC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QACtC,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;QAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,MAAM,MAAM,qBAAqB,CAAC;AAMzC,MAAM,yBAA0B,SAAQ,QAAQ;IAK9C,YACE,SAAS,GAAG,EAAE,EACd,gBAAgB,GAAG;QACjB,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;QAC7C,aAAa,EAAE;YACb,MAAM,EAAE,KAAK;YACb,mBAAmB,EAAE,IAAI;YACzB,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,KAAK;SACnB;KACF;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACrC,CAAC;IAED,kBAAkB,CAAC,GAAwB;QACzC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QACtC,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;QAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnD,MAAM,CAAC,QAAQ,EAAE;YACf,KAAK;YACL,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,mBAAmB;YACvD,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI;YAC7B,QAAQ;YACR,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,WAAW;SAC5C,CAAC,CAAC;IACL,CAAC;CACF;AAED,yBAAyB,CAAC,QAAQ,GAAG,uBAAuB,CAAC;AAC7D,eAAe,yBAAyB,CAAC"}
|
|
@@ -48,7 +48,7 @@ class WindowLevelTool extends BaseTool {
|
|
|
48
48
|
const properties = viewport.getProperties();
|
|
49
49
|
if (viewport instanceof VolumeViewport) {
|
|
50
50
|
const targetId = this.getTargetId(viewport);
|
|
51
|
-
volumeId = targetId.split(
|
|
51
|
+
volumeId = targetId.split(/volumeId:|\?/)[1];
|
|
52
52
|
viewportsContainingVolumeUID = utilities.getViewportsWithVolumeId(volumeId, renderingEngine.id);
|
|
53
53
|
({ lower, upper } = properties.voiRange);
|
|
54
54
|
const volume = cache.getVolume(volumeId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WindowLevelTool.js","sourceRoot":"","sources":["../../../src/tools/WindowLevelTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EACL,iBAAiB,EACjB,cAAc,EAEd,SAAS,EACT,KAAK,GAEN,MAAM,qBAAqB,CAAC;AAI7B,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,2BAA2B,GAAG,IAAI,CAAC;AACzC,MAAM,EAAE,GAAG,IAAI,CAAC;AAQhB,MAAM,eAAgB,SAAQ,QAAQ;IAEpC,YACE,SAAS,GAAG,EAAE,EACd,gBAAgB,GAAG;QACjB,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;KAC9C;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAoMrC,yCAAoC,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE;YAChE,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAEvD,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAClD,IAAI,aAAa,CAAC;YAClB,IAAI,qBAAqB,CAAC;YAE1B,IAAI,UAAU,YAAY,YAAY,EAAE;gBACtC,aAAa,GAAG,CAAC,CAAC;gBAClB,qBAAqB,GAAG,YAAY,CAAC;aACtC;iBAAM,IAAI,UAAU,YAAY,UAAU,EAAE;gBAC3C,aAAa,GAAG,CAAC,CAAC;gBAClB,qBAAqB,GAAG,UAAU,CAAC;aACpC;iBAAM,IAAI,UAAU,YAAY,WAAW,EAAE;gBAC5C,aAAa,GAAG,CAAC,CAAC;gBAClB,qBAAqB,GAAG,WAAW,CAAC;aACrC;iBAAM,IAAI,UAAU,YAAY,UAAU,EAAE;gBAC3C,aAAa,GAAG,CAAC,CAAC;gBAClB,qBAAqB,GAAG,UAAU,CAAC;aACpC;YAED,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;YACjC,MAAM,UAAU,GAAG,gBAAgB,GAAG,WAAW,GAAG,aAAa,CAAC;YAClE,MAAM,KAAK,GAAG,IAAI,qBAAqB,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;YAEzE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YAEzD,OAAO,GAAG,GAAG,GAAG,CAAC;QACnB,CAAC,CAAC;IA/NF,CAAC;IAED,iBAAiB,CAAC,GAAoC;QACpD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,iBAAiB,CAAC,GAAoC;QACpD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5C,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QAErD,IAAI,QAAQ,EACV,KAAK,EACL,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,4BAA4B,CAAC;QAC/B,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,EAAE,CAAC;QAC5C,IAAI,QAAQ,YAAY,cAAc,EAAE;YACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAiC,CAAC,CAAC;YACrE,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"WindowLevelTool.js","sourceRoot":"","sources":["../../../src/tools/WindowLevelTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ class AnnotationDisplayTool extends BaseTool {
|
|
|
51
51
|
referencedImageId = targetId.split('videoId:')[1];
|
|
52
52
|
}
|
|
53
53
|
else {
|
|
54
|
-
const volumeId = targetId.split(
|
|
54
|
+
const volumeId = targetId.split(/volumeId:|\?/)[1];
|
|
55
55
|
const imageVolume = cache.getVolume(volumeId);
|
|
56
56
|
referencedImageId = utilities.getClosestImageId(imageVolume, worldPos, viewPlaneNormal);
|
|
57
57
|
}
|