@cornerstonejs/tools 1.66.5 → 1.66.7
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/drawingSvg/drawArrow.js +1 -1
- package/dist/cjs/drawingSvg/drawArrow.js.map +1 -1
- package/dist/cjs/drawingSvg/drawCircle.js +1 -1
- package/dist/cjs/drawingSvg/drawCircle.js.map +1 -1
- package/dist/cjs/drawingSvg/drawEllipseByCoordinates.js +1 -1
- package/dist/cjs/drawingSvg/drawEllipseByCoordinates.js.map +1 -1
- package/dist/cjs/drawingSvg/drawHandle.js +1 -1
- package/dist/cjs/drawingSvg/drawHandle.js.map +1 -1
- package/dist/cjs/drawingSvg/drawLine.js +1 -1
- package/dist/cjs/drawingSvg/drawLine.js.map +1 -1
- package/dist/cjs/drawingSvg/drawPath.js +1 -1
- package/dist/cjs/drawingSvg/drawPath.js.map +1 -1
- package/dist/cjs/drawingSvg/drawPolyline.js +1 -1
- package/dist/cjs/drawingSvg/drawPolyline.js.map +1 -1
- package/dist/cjs/drawingSvg/drawRect.js +1 -1
- package/dist/cjs/drawingSvg/drawRect.js.map +1 -1
- package/dist/cjs/drawingSvg/drawRedactionRect.js +1 -1
- package/dist/cjs/drawingSvg/drawRedactionRect.js.map +1 -1
- package/dist/cjs/tools/MIPJumpToClickTool.js +2 -2
- package/dist/cjs/tools/MIPJumpToClickTool.js.map +1 -1
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js +1 -2
- package/dist/cjs/tools/StackScrollToolMouseWheelTool.js.map +1 -1
- package/dist/cjs/tools/WindowLevelTool.js +1 -2
- package/dist/cjs/tools/WindowLevelTool.js.map +1 -1
- package/dist/cjs/tools/base/AnnotationDisplayTool.js +1 -2
- package/dist/cjs/tools/base/AnnotationDisplayTool.js.map +1 -1
- package/dist/cjs/tools/base/AnnotationTool.js +1 -2
- package/dist/cjs/tools/base/AnnotationTool.js.map +1 -1
- package/dist/cjs/tools/base/BaseTool.js +1 -2
- package/dist/cjs/tools/base/BaseTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/CircleROIStartEndThresholdTool.js +1 -3
- package/dist/cjs/tools/segmentation/CircleROIStartEndThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js +1 -2
- package/dist/cjs/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js +1 -2
- package/dist/cjs/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/cjs/utilities/index.d.ts +1 -2
- package/dist/cjs/utilities/index.js +1 -3
- package/dist/cjs/utilities/index.js.map +1 -1
- package/dist/esm/drawingSvg/drawArrow.js +1 -1
- package/dist/esm/drawingSvg/drawArrow.js.map +1 -1
- package/dist/esm/drawingSvg/drawCircle.js +1 -1
- package/dist/esm/drawingSvg/drawCircle.js.map +1 -1
- package/dist/esm/drawingSvg/drawEllipseByCoordinates.js +1 -1
- package/dist/esm/drawingSvg/drawEllipseByCoordinates.js.map +1 -1
- package/dist/esm/drawingSvg/drawHandle.js +1 -1
- package/dist/esm/drawingSvg/drawHandle.js.map +1 -1
- package/dist/esm/drawingSvg/drawLine.js +1 -1
- package/dist/esm/drawingSvg/drawLine.js.map +1 -1
- package/dist/esm/drawingSvg/drawPath.js +1 -1
- package/dist/esm/drawingSvg/drawPath.js.map +1 -1
- package/dist/esm/drawingSvg/drawPolyline.js +1 -1
- package/dist/esm/drawingSvg/drawPolyline.js.map +1 -1
- package/dist/esm/drawingSvg/drawRect.js +1 -1
- package/dist/esm/drawingSvg/drawRect.js.map +1 -1
- package/dist/esm/drawingSvg/drawRedactionRect.js +1 -1
- package/dist/esm/drawingSvg/drawRedactionRect.js.map +1 -1
- package/dist/esm/tools/MIPJumpToClickTool.js +2 -2
- package/dist/esm/tools/MIPJumpToClickTool.js.map +1 -1
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js +2 -3
- package/dist/esm/tools/StackScrollToolMouseWheelTool.js.map +1 -1
- package/dist/esm/tools/WindowLevelTool.js +2 -3
- package/dist/esm/tools/WindowLevelTool.js.map +1 -1
- package/dist/esm/tools/base/AnnotationDisplayTool.js +1 -2
- package/dist/esm/tools/base/AnnotationDisplayTool.js.map +1 -1
- package/dist/esm/tools/base/AnnotationTool.js +1 -2
- package/dist/esm/tools/base/AnnotationTool.js.map +1 -1
- package/dist/esm/tools/base/BaseTool.js +1 -2
- package/dist/esm/tools/base/BaseTool.js.map +1 -1
- package/dist/esm/tools/segmentation/CircleROIStartEndThresholdTool.js +1 -3
- package/dist/esm/tools/segmentation/CircleROIStartEndThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js +1 -2
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js.map +1 -1
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js +1 -2
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js.map +1 -1
- package/dist/esm/utilities/index.js +1 -2
- package/dist/esm/utilities/index.js.map +1 -1
- package/dist/types/tools/MIPJumpToClickTool.d.ts.map +1 -1
- package/dist/types/tools/StackScrollToolMouseWheelTool.d.ts.map +1 -1
- package/dist/types/tools/WindowLevelTool.d.ts.map +1 -1
- package/dist/types/tools/base/AnnotationDisplayTool.d.ts.map +1 -1
- package/dist/types/tools/base/AnnotationTool.d.ts.map +1 -1
- package/dist/types/tools/base/BaseTool.d.ts.map +1 -1
- package/dist/types/tools/segmentation/CircleROIStartEndThresholdTool.d.ts.map +1 -1
- package/dist/types/tools/segmentation/RectangleROIStartEndThresholdTool.d.ts.map +1 -1
- package/dist/types/tools/segmentation/RectangleROIThresholdTool.d.ts.map +1 -1
- package/dist/types/utilities/index.d.ts +1 -2
- package/dist/types/utilities/index.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/drawingSvg/drawArrow.ts +1 -1
- package/src/drawingSvg/drawCircle.ts +1 -1
- package/src/drawingSvg/drawEllipseByCoordinates.ts +1 -1
- package/src/drawingSvg/drawHandle.ts +1 -1
- package/src/drawingSvg/drawLine.ts +1 -1
- package/src/drawingSvg/drawPath.ts +1 -1
- package/src/drawingSvg/drawPolyline.ts +1 -1
- package/src/drawingSvg/drawRect.ts +1 -1
- package/src/drawingSvg/drawRedactionRect.ts +1 -1
- package/src/tools/MIPJumpToClickTool.ts +2 -3
- package/src/tools/StackScrollToolMouseWheelTool.ts +2 -3
- package/src/tools/WindowLevelTool.ts +2 -4
- package/src/tools/base/AnnotationDisplayTool.ts +1 -2
- package/src/tools/base/AnnotationTool.ts +1 -2
- package/src/tools/base/BaseTool.ts +1 -2
- package/src/tools/segmentation/CircleROIStartEndThresholdTool.ts +1 -3
- package/src/tools/segmentation/RectangleROIStartEndThresholdTool.ts +1 -2
- package/src/tools/segmentation/RectangleROIThresholdTool.ts +1 -2
- package/src/utilities/index.ts +0 -2
- package/dist/cjs/utilities/getVolumeId.d.ts +0 -1
- package/dist/cjs/utilities/getVolumeId.js +0 -16
- package/dist/cjs/utilities/getVolumeId.js.map +0 -1
- package/dist/esm/utilities/getVolumeId.js +0 -12
- package/dist/esm/utilities/getVolumeId.js.map +0 -1
- package/dist/types/utilities/getVolumeId.d.ts +0 -2
- package/dist/types/utilities/getVolumeId.d.ts.map +0 -1
- package/src/utilities/getVolumeId.ts +0 -13
|
@@ -9,7 +9,7 @@ function drawArrow(svgDrawingHelper, annotationUID, arrowUID, start, end, option
|
|
|
9
9
|
return;
|
|
10
10
|
}
|
|
11
11
|
const { color, width, lineWidth, lineDash } = Object.assign({
|
|
12
|
-
color: '
|
|
12
|
+
color: 'rgb(0, 255, 0)',
|
|
13
13
|
width: '2',
|
|
14
14
|
lineWidth: undefined,
|
|
15
15
|
lineDash: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawArrow.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawArrow.ts"],"names":[],"mappings":";;;;;AAEA,0DAAkC;AAElC,SAAwB,SAAS,CAC/B,gBAAkC,EAClC,aAAqB,EACrB,QAAgB,EAChB,KAAmB,EACnB,GAAiB,EACjB,OAAO,GAAG,EAAE;IAGZ,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;QACxE,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,CACzD;QACE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"drawArrow.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawArrow.ts"],"names":[],"mappings":";;;;;AAEA,0DAAkC;AAElC,SAAwB,SAAS,CAC/B,gBAAkC,EAClC,aAAqB,EACrB,QAAgB,EAChB,KAAmB,EACnB,GAAiB,EACjB,OAAO,GAAG,EAAE;IAGZ,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;QACxE,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,CACzD;QACE,KAAK,EAAE,gBAAgB;QACvB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;KACpB,EACD,OAAO,CACR,CAAC;IAGF,IAAA,kBAAQ,EAAC,gBAAgB,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE;QAC9D,KAAK;QACL,KAAK;QACL,SAAS;QACT,QAAQ;KACT,CAAC,CAAC;IAIH,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAE/D,MAAM,SAAS,GAAG;QAChB,KAAK,EAAE;YACL,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;YACnD,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;SACpC;QACjB,GAAG,EAAE,GAAG;KACT,CAAC;IAEF,MAAM,UAAU,GAAG;QACjB,KAAK,EAAE;YACL,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;YACnD,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;SACpC;QACjB,GAAG,EAAE,GAAG;KACT,CAAC;IAEF,IAAA,kBAAQ,EACN,gBAAgB,EAChB,aAAa,EACb,GAAG,EACH,SAAS,CAAC,KAAK,EACf,SAAS,CAAC,GAAG,EACb;QACE,KAAK;QACL,KAAK;QACL,SAAS;KACV,CACF,CAAC;IAEF,IAAA,kBAAQ,EACN,gBAAgB,EAChB,aAAa,EACb,GAAG,EACH,UAAU,CAAC,KAAK,EAChB,UAAU,CAAC,GAAG,EACd;QACE,KAAK;QACL,KAAK;QACL,SAAS;KACV,CACF,CAAC;AACJ,CAAC;AA7ED,4BA6EC"}
|
|
@@ -8,7 +8,7 @@ const setAttributesIfNecessary_1 = __importDefault(require("./setAttributesIfNec
|
|
|
8
8
|
const setNewAttributesIfValid_1 = __importDefault(require("./setNewAttributesIfValid"));
|
|
9
9
|
function drawCircle(svgDrawingHelper, annotationUID, circleUID, center, radius, options = {}, dataId = '') {
|
|
10
10
|
const { color, fill, width, lineWidth, lineDash, fillOpacity, strokeOpacity, } = Object.assign({
|
|
11
|
-
color: '
|
|
11
|
+
color: 'rgb(0, 255, 0)',
|
|
12
12
|
fill: 'transparent',
|
|
13
13
|
width: '2',
|
|
14
14
|
lineDash: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawCircle.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawCircle.ts"],"names":[],"mappings":";;;;;AAGA,0DAAkC;AAElC,0FAAkE;AAClE,wFAAgE;AAEhE,SAAS,UAAU,CACjB,gBAAkC,EAClC,aAAqB,EACrB,SAAiB,EACjB,MAAoB,EACpB,MAAc,EACd,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAEX,MAAM,EACJ,KAAK,EACL,IAAI,EACJ,KAAK,EACL,SAAS,EACT,QAAQ,EACR,WAAW,EACX,aAAa,GACd,GAAG,MAAM,CAAC,MAAM,CACf;QACE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"drawCircle.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawCircle.ts"],"names":[],"mappings":";;;;;AAGA,0DAAkC;AAElC,0FAAkE;AAClE,wFAAgE;AAEhE,SAAS,UAAU,CACjB,gBAAkC,EAClC,aAAqB,EACrB,SAAiB,EACjB,MAAoB,EACpB,MAAc,EACd,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAEX,MAAM,EACJ,KAAK,EACL,IAAI,EACJ,KAAK,EACL,SAAS,EACT,QAAQ,EACR,WAAW,EACX,aAAa,GACd,GAAG,MAAM,CAAC,MAAM,CACf;QACE,KAAK,EAAE,gBAAgB;QACvB,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,SAAS;QACnB,SAAS,EAAE,SAAS;QACpB,aAAa,EAAE,CAAC;QAChB,WAAW,EAAE,CAAC;KACf,EACD,OAAO,CACR,CAAC;IAGF,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAGvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,IAAA,kBAAQ,EAAC,aAAa,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACjE,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAEvE,MAAM,UAAU,GAAG;QACjB,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE;QAClB,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE;QAClB,CAAC,EAAE,GAAG,MAAM,EAAE;QACd,MAAM,EAAE,KAAK;QACb,IAAI;QACJ,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;QAC5B,cAAc,EAAE,WAAW;QAC3B,gBAAgB,EAAE,aAAa;KAChC,CAAC;IAEF,IAAI,qBAAqB,EAAE;QACzB,IAAA,kCAAwB,EAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;QAE5D,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,gBAAgB,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAEnE,IAAI,MAAM,KAAK,EAAE,EAAE;YACjB,gBAAgB,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAClD;QAED,IAAA,iCAAuB,EAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAEtD,gBAAgB,CAAC,UAAU,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;KAC5D;AACH,CAAC;AAED,kBAAe,UAAU,CAAC"}
|
|
@@ -8,7 +8,7 @@ const setAttributesIfNecessary_1 = __importDefault(require("./setAttributesIfNec
|
|
|
8
8
|
const setNewAttributesIfValid_1 = __importDefault(require("./setNewAttributesIfValid"));
|
|
9
9
|
function drawEllipseByCoordinates(svgDrawingHelper, annotationUID, ellipseUID, canvasCoordinates, options = {}, dataId = '') {
|
|
10
10
|
const { color, width, lineWidth, lineDash } = Object.assign({
|
|
11
|
-
color: '
|
|
11
|
+
color: 'rgb(0, 255, 0)',
|
|
12
12
|
width: '2',
|
|
13
13
|
lineWidth: undefined,
|
|
14
14
|
lineDash: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawEllipseByCoordinates.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawEllipseByCoordinates.ts"],"names":[],"mappings":";;;;;AAGA,0DAAkC;AAClC,0FAAkE;AAClE,wFAAgE;AAEhE,SAAS,wBAAwB,CAC/B,gBAAkC,EAClC,aAAqB,EACrB,UAAkB,EAClB,iBAA2E,EAC3E,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAEX,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,CACzD;QACE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"drawEllipseByCoordinates.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawEllipseByCoordinates.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ const setNewAttributesIfValid_1 = __importDefault(require("./setNewAttributesIfV
|
|
|
8
8
|
const setAttributesIfNecessary_1 = __importDefault(require("./setAttributesIfNecessary"));
|
|
9
9
|
function drawHandle(svgDrawingHelper, annotationUID, handleGroupUID, handle, options = {}, uniqueIndex) {
|
|
10
10
|
const { color, handleRadius, width, lineWidth, fill, type, opacity } = Object.assign({
|
|
11
|
-
color: '
|
|
11
|
+
color: 'rgb(0, 255, 0)',
|
|
12
12
|
handleRadius: '6',
|
|
13
13
|
width: '2',
|
|
14
14
|
lineWidth: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawHandle.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawHandle.ts"],"names":[],"mappings":";;;;;AAEA,0DAAkC;AAClC,wFAAgE;AAChE,0FAAkE;AAGlE,SAAS,UAAU,CACjB,gBAAkC,EAClC,aAAqB,EACrB,cAAsB,EACtB,MAAoB,EACpB,OAAO,GAAG,EAAE,EACZ,WAAW;IAEX,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAClE,MAAM,CAAC,MAAM,CACX;QACE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"drawHandle.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawHandle.ts"],"names":[],"mappings":";;;;;AAEA,0DAAkC;AAClC,wFAAgE;AAChE,0FAAkE;AAGlE,SAAS,UAAU,CACjB,gBAAkC,EAClC,aAAqB,EACrB,cAAsB,EACtB,MAAoB,EACpB,OAAO,GAAG,EAAE,EACZ,WAAW;IAEX,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAClE,MAAM,CAAC,MAAM,CACX;QACE,KAAK,EAAE,gBAAgB;QACvB,YAAY,EAAE,GAAG;QACjB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,IAAI,EAAE,aAAa;QACnB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC;KACX,EACD,OAAO,CACR,CAAC;IAGJ,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAGvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,IAAA,kBAAQ,EAC1B,aAAa,EACb,QAAQ,EACR,MAAM,cAAc,UAAU,WAAW,EAAE,CAC5C,CAAC;IAEF,IAAI,UAAU,CAAC;IACf,IAAI,IAAI,KAAK,QAAQ,EAAE;QACrB,UAAU,GAAG;YACX,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE;YAClB,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE;YAClB,CAAC,EAAE,YAAY;YACf,MAAM,EAAE,KAAK;YACb,IAAI;YACJ,cAAc,EAAE,WAAW;YAC3B,OAAO,EAAE,OAAO;SACjB,CAAC;KACH;SAAM,IAAI,IAAI,KAAK,MAAM,EAAE;QAC1B,MAAM,iBAAiB,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;QACnD,MAAM,IAAI,GAAG,iBAAiB,GAAG,GAAG,CAAC;QACrC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC;QACjC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC;QAEjC,UAAU,GAAG;YACX,CAAC,EAAE,GAAG,CAAC,EAAE;YACT,CAAC,EAAE,GAAG,CAAC,EAAE;YACT,KAAK,EAAE,GAAG,IAAI,EAAE;YAChB,MAAM,EAAE,GAAG,IAAI,EAAE;YACjB,MAAM,EAAE,KAAK;YACb,IAAI;YACJ,cAAc,EAAE,WAAW;YAC3B,EAAE,EAAE,GAAG,IAAI,GAAG,GAAG,EAAE;YACnB,OAAO,EAAE,OAAO;SACjB,CAAC;KACH;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,EAAE,CAAC,CAAC;KACrD;IAED,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAEvE,IAAI,qBAAqB,EAAE;QACzB,IAAA,kCAAwB,EAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;QAE5D,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,gBAAgB,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAE/D,IAAA,iCAAuB,EAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAEtD,gBAAgB,CAAC,UAAU,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;KAC5D;AACH,CAAC;AAED,kBAAe,UAAU,CAAC"}
|
|
@@ -11,7 +11,7 @@ function drawLine(svgDrawingHelper, annotationUID, lineUID, start, end, options
|
|
|
11
11
|
return;
|
|
12
12
|
}
|
|
13
13
|
const { color, width, lineWidth, lineDash, shadow } = Object.assign({
|
|
14
|
-
color: '
|
|
14
|
+
color: 'rgb(0, 255, 0)',
|
|
15
15
|
width: '2',
|
|
16
16
|
lineWidth: undefined,
|
|
17
17
|
lineDash: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawLine.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawLine.ts"],"names":[],"mappings":";;;;;AAEA,0DAAkC;AAClC,wFAAgE;AAChE,0FAAkE;AAGlE,SAAwB,QAAQ,CAC9B,gBAAkC,EAClC,aAAqB,EACrB,OAAe,EACf,KAAmB,EACnB,GAAiB,EACjB,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAGX,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;QACxE,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CACjE;QACE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"drawLine.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawLine.ts"],"names":[],"mappings":";;;;;AAEA,0DAAkC;AAClC,wFAAgE;AAChE,0FAAkE;AAGlE,SAAwB,QAAQ,CAC9B,gBAAkC,EAClC,aAAqB,EACrB,OAAe,EACf,KAAmB,EACnB,GAAiB,EACjB,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAGX,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;QACxE,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CACjE;QACE,KAAK,EAAE,gBAAgB;QACvB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,SAAS;KAClB,EACD,OAAO,CACR,CAAC;IAGF,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAEvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,IAAA,kBAAQ,EAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7D,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,MAAM;QAC5B,CAAC,CAAC,sBAAsB,gBAAgB,CAAC,eAAe,CAAC,EAAE,IAAI;QAC/D,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,UAAU,GAAG;QACjB,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE;QACjB,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE;QACjB,EAAE,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE;QACf,EAAE,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE;QACf,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,eAAe;QACtB,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,YAAY,EAAE;QAEhB,IAAA,kCAAwB,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAEnD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAExD,IAAI,MAAM,KAAK,EAAE,EAAE;YACjB,OAAO,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SACzC;QAED,IAAA,iCAAuB,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAE7C,gBAAgB,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;KACnD;AACH,CAAC;AA9DD,2BA8DC"}
|
|
@@ -9,7 +9,7 @@ const setAttributesIfNecessary_1 = __importDefault(require("./setAttributesIfNec
|
|
|
9
9
|
function drawPath(svgDrawingHelper, annotationUID, pathUID, points, options) {
|
|
10
10
|
const hasSubArrays = points.length && points[0].length && Array.isArray(points[0][0]);
|
|
11
11
|
const pointsArrays = hasSubArrays ? points : [points];
|
|
12
|
-
const { color = '
|
|
12
|
+
const { color = 'rgb(0, 255, 0)', width = 10, fillColor = 'none', fillOpacity = 0, lineWidth, lineDash, closePath = false, } = options;
|
|
13
13
|
const strokeWidth = lineWidth || width;
|
|
14
14
|
const svgns = 'http://www.w3.org/2000/svg';
|
|
15
15
|
const svgNodeHash = (0, _getHash_1.default)(annotationUID, 'path', pathUID);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawPath.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawPath.ts"],"names":[],"mappings":";;;;;AACA,0DAAkC;AAClC,wFAAgE;AAChE,0FAAkE;AASlE,SAAwB,QAAQ,CAC9B,gBAAkC,EAClC,aAAqB,EACrB,OAAe,EACf,MAAyC,EACzC,OAQC;IAID,MAAM,YAAY,GAChB,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnE,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACtD,MAAM,EACJ,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"drawPath.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawPath.ts"],"names":[],"mappings":";;;;;AACA,0DAAkC;AAClC,wFAAgE;AAChE,0FAAkE;AASlE,SAAwB,QAAQ,CAC9B,gBAAkC,EAClC,aAAqB,EACrB,OAAe,EACf,MAAyC,EACzC,OAQC;IAID,MAAM,YAAY,GAChB,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnE,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACtD,MAAM,EACJ,KAAK,GAAG,gBAAgB,EACxB,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,MAAM,EAClB,WAAW,GAAG,CAAC,EACf,SAAS,EACT,QAAQ,EACR,SAAS,GAAG,KAAK,GAClB,GAAG,OAAO,CAAC;IAGZ,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAEvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,IAAA,kBAAQ,EAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7D,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC9D,IAAI,eAAe,GAAG,EAAE,CAAC;IAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;QACnE,MAAM,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;QAEhC,IAAI,SAAS,GAAG,CAAC,EAAE;YACjB,SAAS;SACV;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;YAClC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YAE1B,eAAe,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CACnE,CAAC,CACF,GAAG,CAAC;SACN;QAED,IAAI,SAAS,EAAE;YACb,eAAe,IAAI,IAAI,CAAC;SACzB;KACF;IAED,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO;KACR;IAED,MAAM,UAAU,GAAG;QACjB,CAAC,EAAE,eAAe;QAClB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,SAAS;QACf,cAAc,EAAE,WAAW;QAC3B,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,YAAY,EAAE;QAEhB,IAAA,kCAAwB,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAEnD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAExD,IAAA,iCAAuB,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC7C,gBAAgB,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;KACnD;AACH,CAAC;AArFD,2BAqFC"}
|
|
@@ -10,7 +10,7 @@ function drawPolyline(svgDrawingHelper, annotationUID, polylineUID, points, opti
|
|
|
10
10
|
if (points.length < 2) {
|
|
11
11
|
return;
|
|
12
12
|
}
|
|
13
|
-
const { color = '
|
|
13
|
+
const { color = 'rgb(0, 255, 0)', width = 10, fillColor = 'none', fillOpacity = 0, lineWidth, lineDash, closePath = false, } = options;
|
|
14
14
|
const strokeWidth = lineWidth || width;
|
|
15
15
|
const svgns = 'http://www.w3.org/2000/svg';
|
|
16
16
|
const svgNodeHash = (0, _getHash_1.default)(annotationUID, 'polyline', polylineUID);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawPolyline.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawPolyline.ts"],"names":[],"mappings":";;;;;AACA,0DAAkC;AAClC,wFAAgE;AAChE,0FAAkE;AASlE,SAAwB,YAAY,CAClC,gBAAkC,EAClC,aAAqB,EACrB,WAAmB,EACnB,MAAsB,EACtB,OAQC;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,OAAO;KACR;IAED,MAAM,EACJ,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"drawPolyline.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawPolyline.ts"],"names":[],"mappings":";;;;;AACA,0DAAkC;AAClC,wFAAgE;AAChE,0FAAkE;AASlE,SAAwB,YAAY,CAClC,gBAAkC,EAClC,aAAqB,EACrB,WAAmB,EACnB,MAAsB,EACtB,OAQC;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,OAAO;KACR;IAED,MAAM,EACJ,KAAK,GAAG,gBAAgB,EACxB,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,MAAM,EAClB,WAAW,GAAG,CAAC,EACf,SAAS,EACT,QAAQ,EACR,SAAS,GAAG,KAAK,GAClB,GAAG,OAAO,CAAC;IAGZ,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,CAAC;IAEvC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,IAAA,kBAAQ,EAAC,aAAa,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACrE,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,eAAe,GAAG,EAAE,CAAC;IAEzB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,eAAe,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;KACtE;IAED,IAAI,SAAS,EAAE;QACb,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAE7B,eAAe,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;KACzD;IAED,MAAM,UAAU,GAAG;QACjB,MAAM,EAAE,eAAe;QACvB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,SAAS;QACf,cAAc,EAAE,WAAW;QAC3B,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,gBAAgB,EAAE;QAEpB,IAAA,kCAAwB,EAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAEvD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,WAAW,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAEhE,IAAA,iCAAuB,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAEjD,gBAAgB,CAAC,UAAU,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;KACvD;AACH,CAAC;AArED,+BAqEC"}
|
|
@@ -8,7 +8,7 @@ const setAttributesIfNecessary_1 = __importDefault(require("./setAttributesIfNec
|
|
|
8
8
|
const setNewAttributesIfValid_1 = __importDefault(require("./setNewAttributesIfValid"));
|
|
9
9
|
function drawRect(svgDrawingHelper, annotationUID, rectangleUID, start, end, options = {}, dataId = '') {
|
|
10
10
|
const { color, width: _width, lineWidth, lineDash, } = Object.assign({
|
|
11
|
-
color: '
|
|
11
|
+
color: 'rgb(0, 255, 0)',
|
|
12
12
|
width: '2',
|
|
13
13
|
lineWidth: undefined,
|
|
14
14
|
lineDash: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawRect.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawRect.ts"],"names":[],"mappings":";;;;;AAEA,0DAAkC;AAClC,0FAAkE;AAClE,wFAAgE;AAIhE,SAAwB,QAAQ,CAC9B,gBAAkC,EAClC,aAAqB,EACrB,YAAoB,EACpB,KAAmB,EACnB,GAAiB,EACjB,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAEX,MAAM,EACJ,KAAK,EACL,KAAK,EAAE,MAAM,EACb,SAAS,EACT,QAAQ,GACT,GAAG,MAAM,CAAC,MAAM,CACf;QACE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"drawRect.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawRect.ts"],"names":[],"mappings":";;;;;AAEA,0DAAkC;AAClC,0FAAkE;AAClE,wFAAgE;AAIhE,SAAwB,QAAQ,CAC9B,gBAAkC,EAClC,aAAqB,EACrB,YAAoB,EACpB,KAAmB,EACnB,GAAiB,EACjB,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,EAAE;IAEX,MAAM,EACJ,KAAK,EACL,KAAK,EAAE,MAAM,EACb,SAAS,EACT,QAAQ,GACT,GAAG,MAAM,CAAC,MAAM,CACf;QACE,KAAK,EAAE,gBAAgB;QACvB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;KACpB,EACD,OAAO,CACR,CAAC;IAGF,MAAM,WAAW,GAAG,SAAS,IAAI,MAAM,CAAC;IAExC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,IAAA,kBAAQ,EAAC,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAClE,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAE9D,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3C,MAAM,UAAU,GAAG;QACjB,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;QACf,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;QACf,KAAK,EAAE,GAAG,KAAK,EAAE;QACjB,MAAM,EAAE,GAAG,MAAM,EAAE;QACnB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,aAAa;QACnB,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,YAAY,EAAE;QAChB,IAAA,kCAAwB,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAEnD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,cAAc,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAE/D,IAAI,MAAM,KAAK,EAAE,EAAE;YACjB,cAAc,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAChD;QAED,IAAA,iCAAuB,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAEpD,gBAAgB,CAAC,UAAU,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;KAC1D;AACH,CAAC;AA7DD,2BA6DC"}
|
|
@@ -8,7 +8,7 @@ const setAttributesIfNecessary_1 = __importDefault(require("./setAttributesIfNec
|
|
|
8
8
|
const setNewAttributesIfValid_1 = __importDefault(require("./setNewAttributesIfValid"));
|
|
9
9
|
function drawRedactionRect(svgDrawingHelper, annotationUID, rectangleUID, start, end, options = {}) {
|
|
10
10
|
const { color, width: _width, lineWidth, lineDash, } = Object.assign({
|
|
11
|
-
color: '
|
|
11
|
+
color: 'rgb(0, 255, 0)',
|
|
12
12
|
width: '2',
|
|
13
13
|
lineWidth: undefined,
|
|
14
14
|
lineDash: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drawRedactionRect.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawRedactionRect.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,0FAAmE;AACnE,wFAAiE;AAGjE,SAAwB,iBAAiB,CACvC,gBAAqB,EACrB,aAAqB,EACrB,YAAoB,EACpB,KAAU,EACV,GAAQ,EACR,OAAO,GAAG,EAAE;IAEZ,MAAM,EACJ,KAAK,EACL,KAAK,EAAE,MAAM,EACb,SAAS,EACT,QAAQ,GACT,GAAG,MAAM,CAAC,MAAM,CACf;QACE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"drawRedactionRect.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawRedactionRect.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,0FAAmE;AACnE,wFAAiE;AAGjE,SAAwB,iBAAiB,CACvC,gBAAqB,EACrB,aAAqB,EACrB,YAAoB,EACpB,KAAU,EACV,GAAQ,EACR,OAAO,GAAG,EAAE;IAEZ,MAAM,EACJ,KAAK,EACL,KAAK,EAAE,MAAM,EACb,SAAS,EACT,QAAQ,GACT,GAAG,MAAM,CAAC,MAAM,CACf;QACE,KAAK,EAAE,gBAAgB;QACvB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;KACpB,EACD,OAAO,CACR,CAAC;IAGF,MAAM,WAAW,GAAG,SAAS,IAAI,MAAM,CAAC;IAExC,MAAM,KAAK,GAAG,4BAA4B,CAAC;IAC3C,MAAM,WAAW,GAAG,IAAA,kBAAQ,EAAC,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAClE,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAE9D,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3C,MAAM,UAAU,GAAG;QACjB,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;QACf,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;QACf,KAAK,EAAE,GAAG,KAAK,EAAE;QACjB,MAAM,EAAE,GAAG,MAAM,EAAE;QACnB,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,OAAO;QACb,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,YAAY,EAAE;QAChB,IAAA,kCAAyB,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAEpD,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,cAAc,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAE/D,IAAA,iCAAwB,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAErD,gBAAgB,CAAC,UAAU,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;KAC1D;AACH,CAAC;AAxDD,oCAwDC"}
|
|
@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const base_1 = require("./base");
|
|
7
7
|
const core_1 = require("@cornerstonejs/core");
|
|
8
|
+
const core_2 = require("@cornerstonejs/core");
|
|
8
9
|
const planar_1 = require("../utilities/planar");
|
|
9
10
|
const jumpToWorld_1 = __importDefault(require("../utilities/viewport/jumpToWorld"));
|
|
10
11
|
const ToolGroupManager_1 = require("../store/ToolGroupManager");
|
|
11
|
-
const getVolumeId_1 = require("../utilities/getVolumeId");
|
|
12
12
|
class MIPJumpToClickTool extends base_1.BaseTool {
|
|
13
13
|
constructor(toolProps = {}, defaultToolProps = {
|
|
14
14
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
@@ -26,7 +26,7 @@ class MIPJumpToClickTool extends base_1.BaseTool {
|
|
|
26
26
|
if (!targetId.startsWith('volumeId')) {
|
|
27
27
|
throw new Error(`MIPJumpToClickTool: targetId is not a volumeId, you should only use MIPJumpToClickTool with a volumeId as the targetId`);
|
|
28
28
|
}
|
|
29
|
-
const volumeId =
|
|
29
|
+
const volumeId = core_2.utilities.getVolumeId(targetId);
|
|
30
30
|
let maxIntensity = -Infinity;
|
|
31
31
|
const maxFn = (intensity, point) => {
|
|
32
32
|
if (intensity > maxIntensity) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MIPJumpToClickTool.js","sourceRoot":"","sources":["../../../src/tools/MIPJumpToClickTool.ts"],"names":[],"mappings":";;;;;AAAA,iCAAkC;AAClC,8CAAwE;
|
|
1
|
+
{"version":3,"file":"MIPJumpToClickTool.js","sourceRoot":"","sources":["../../../src/tools/MIPJumpToClickTool.ts"],"names":[],"mappings":";;;;;AAAA,iCAAkC;AAClC,8CAAwE;AACxE,8CAA4D;AAC5D,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,gBAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAGjD,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"}
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const core_1 = require("@cornerstonejs/core");
|
|
7
7
|
const base_1 = require("./base");
|
|
8
8
|
const scroll_1 = __importDefault(require("../utilities/scroll"));
|
|
9
|
-
const getVolumeId_1 = require("../utilities/getVolumeId");
|
|
10
9
|
class StackScrollMouseWheelTool extends base_1.BaseTool {
|
|
11
10
|
constructor(toolProps = {}, defaultToolProps = {
|
|
12
11
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
@@ -26,7 +25,7 @@ class StackScrollMouseWheelTool extends base_1.BaseTool {
|
|
|
26
25
|
const { viewport } = (0, core_1.getEnabledElement)(element);
|
|
27
26
|
const delta = direction * (invert ? -1 : 1);
|
|
28
27
|
const targetId = this.getTargetId(viewport);
|
|
29
|
-
const volumeId =
|
|
28
|
+
const volumeId = core_1.utilities.getVolumeId(targetId);
|
|
30
29
|
(0, scroll_1.default)(viewport, {
|
|
31
30
|
delta,
|
|
32
31
|
debounceLoading: this.configuration.debounceIfNotLoaded,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"StackScrollToolMouseWheelTool.js","sourceRoot":"","sources":["../../../src/tools/StackScrollToolMouseWheelTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAAmE;AACnE,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,gBAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAEjD,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"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const base_1 = require("./base");
|
|
4
4
|
const core_1 = require("@cornerstonejs/core");
|
|
5
|
-
const getVolumeId_1 = require("../utilities/getVolumeId");
|
|
6
5
|
const DEFAULT_MULTIPLIER = 4;
|
|
7
6
|
const DEFAULT_IMAGE_DYNAMIC_RANGE = 1024;
|
|
8
7
|
const PT = 'PT';
|
|
@@ -52,7 +51,7 @@ class WindowLevelTool extends base_1.BaseTool {
|
|
|
52
51
|
const properties = viewport.getProperties();
|
|
53
52
|
if (viewport instanceof core_1.VolumeViewport) {
|
|
54
53
|
const targetId = this.getTargetId(viewport);
|
|
55
|
-
volumeId =
|
|
54
|
+
volumeId = core_1.utilities.getVolumeId(targetId);
|
|
56
55
|
viewportsContainingVolumeUID = core_1.utilities.getViewportsWithVolumeId(volumeId, renderingEngine.id);
|
|
57
56
|
({ lower, upper } = properties.voiRange);
|
|
58
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,
|
|
1
|
+
{"version":3,"file":"WindowLevelTool.js","sourceRoot":"","sources":["../../../src/tools/WindowLevelTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,6 @@ const triggerAnnotationRender_1 = __importDefault(require("../../utilities/trigg
|
|
|
10
10
|
const filterAnnotationsForDisplay_1 = __importDefault(require("../../utilities/planar/filterAnnotationsForDisplay"));
|
|
11
11
|
const helpers_1 = require("../../stateManagement/annotation/config/helpers");
|
|
12
12
|
const config_1 = require("../../stateManagement/annotation/config");
|
|
13
|
-
const getVolumeId_1 = require("../../utilities/getVolumeId");
|
|
14
13
|
class AnnotationDisplayTool extends BaseTool_1.default {
|
|
15
14
|
constructor() {
|
|
16
15
|
super(...arguments);
|
|
@@ -58,7 +57,7 @@ class AnnotationDisplayTool extends BaseTool_1.default {
|
|
|
58
57
|
referencedImageId = targetId.split('videoId:')[1];
|
|
59
58
|
}
|
|
60
59
|
else {
|
|
61
|
-
const volumeId =
|
|
60
|
+
const volumeId = core_1.utilities.getVolumeId(targetId);
|
|
62
61
|
const imageVolume = core_1.cache.getVolume(volumeId);
|
|
63
62
|
referencedImageId = core_1.utilities.getClosestImageId(imageVolume, worldPos, viewPlaneNormal);
|
|
64
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;
|
|
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,gBAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACjD,MAAM,WAAW,GAAG,YAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAE9C,iBAAiB,GAAG,gBAAS,CAAC,iBAAiB,CAC7C,WAAW,EACX,QAAQ,EACR,eAAe,CAChB,CAAC;SACH;QAED,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAeM,QAAQ,CACb,QAAgB,EAChB,cAA8B,EAC9B,UAAuB;QAEvB,OAAO,IAAA,0BAAgB,EACrB,QAAQ,EACR,cAAc,EACd,IAAA,iBAAQ,EAAC,UAAU,CAAC,EACpB,IAAI,CAAC,IAAI,CACV,CAAC;IACJ,CAAC;CACF;AAED,qBAAqB,CAAC,QAAQ,GAAG,uBAAuB,CAAC;AACzD,kBAAe,qBAAqB,CAAC"}
|
|
@@ -10,7 +10,6 @@ const annotationLocking_1 = require("../../stateManagement/annotation/annotation
|
|
|
10
10
|
const annotationVisibility_1 = require("../../stateManagement/annotation/annotationVisibility");
|
|
11
11
|
const annotationState_1 = require("../../stateManagement/annotation/annotationState");
|
|
12
12
|
const state_1 = require("../../stateManagement/annotation/helpers/state");
|
|
13
|
-
const getVolumeId_1 = require("../../utilities/getVolumeId");
|
|
14
13
|
class AnnotationTool extends AnnotationDisplayTool_1.default {
|
|
15
14
|
constructor(toolProps, defaultToolProps) {
|
|
16
15
|
var _a, _b;
|
|
@@ -141,7 +140,7 @@ class AnnotationTool extends AnnotationDisplayTool_1.default {
|
|
|
141
140
|
isSuvScaled(viewport, targetId, imageId) {
|
|
142
141
|
var _a;
|
|
143
142
|
if (viewport instanceof core_1.BaseVolumeViewport) {
|
|
144
|
-
const volumeId =
|
|
143
|
+
const volumeId = core_1.utilities.getVolumeId(targetId);
|
|
145
144
|
const volume = core_1.cache.getVolume(volumeId);
|
|
146
145
|
return ((_a = volume.scaling) === null || _a === void 0 ? void 0 : _a.PT) !== undefined;
|
|
147
146
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAM6B;AAG7B,yCAAiC;AAEjC,oFAA4D;AAC5D,0FAAwF;AACxF,gGAA4F;AAU5F,sFAAiF;AAEjF,0EAA2F;
|
|
1
|
+
{"version":3,"file":"AnnotationTool.js","sourceRoot":"","sources":["../../../../src/tools/base/AnnotationTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const core_1 = require("@cornerstonejs/core");
|
|
7
7
|
const ToolModes_1 = __importDefault(require("../../enums/ToolModes"));
|
|
8
|
-
const getVolumeId_1 = require("../../utilities/getVolumeId");
|
|
9
8
|
class BaseTool {
|
|
10
9
|
constructor(toolProps, defaultToolProps) {
|
|
11
10
|
const initialProps = core_1.utilities.deepMerge(defaultToolProps, toolProps);
|
|
@@ -71,7 +70,7 @@ class BaseTool {
|
|
|
71
70
|
return viewports[0].getImageData();
|
|
72
71
|
}
|
|
73
72
|
else if (targetId.startsWith('volumeId:')) {
|
|
74
|
-
const volumeId =
|
|
73
|
+
const volumeId = core_1.utilities.getVolumeId(targetId);
|
|
75
74
|
const viewports = core_1.utilities.getViewportsWithVolumeId(volumeId, renderingEngine.id);
|
|
76
75
|
if (!viewports || !viewports.length) {
|
|
77
76
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAAoE;AAEpE,sEAA8C;
|
|
1
|
+
{"version":3,"file":"BaseTool.js","sourceRoot":"","sources":["../../../../src/tools/base/BaseTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,6 @@ const CircleROITool_1 = __importDefault(require("../annotation/CircleROITool"));
|
|
|
19
19
|
const circle_1 = require("../../utilities/math/circle");
|
|
20
20
|
const ellipse_1 = require("../../utilities/math/ellipse");
|
|
21
21
|
const utilities_1 = require("../../utilities");
|
|
22
|
-
const getVolumeId_1 = require("../../utilities/getVolumeId");
|
|
23
22
|
const { transformWorldToIndex } = core_1.utilities;
|
|
24
23
|
class CircleROIStartEndThresholdTool extends CircleROITool_1.default {
|
|
25
24
|
constructor(toolProps = {}, defaultToolProps = {
|
|
@@ -35,7 +34,6 @@ class CircleROIStartEndThresholdTool extends CircleROITool_1.default {
|
|
|
35
34
|
const eventDetail = evt.detail;
|
|
36
35
|
const { currentPoints, element } = eventDetail;
|
|
37
36
|
const worldPos = currentPoints.world;
|
|
38
|
-
const canvasPos = currentPoints.canvas;
|
|
39
37
|
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
40
38
|
const { viewport, renderingEngine } = enabledElement;
|
|
41
39
|
this.isDrawing = true;
|
|
@@ -47,7 +45,7 @@ class CircleROIStartEndThresholdTool extends CircleROITool_1.default {
|
|
|
47
45
|
}
|
|
48
46
|
else {
|
|
49
47
|
const targetId = this.getTargetId(viewport);
|
|
50
|
-
volumeId =
|
|
48
|
+
volumeId = core_1.utilities.getVolumeId(targetId);
|
|
51
49
|
imageVolume = core_1.cache.getVolume(volumeId);
|
|
52
50
|
referencedImageId = core_1.utilities.getClosestImageId(imageVolume, worldPos, viewPlaneNormal);
|
|
53
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CircleROIStartEndThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/CircleROIStartEndThresholdTool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"CircleROIStartEndThresholdTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/CircleROIStartEndThresholdTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,6 @@ const triggerAnnotationRenderForViewportIds_1 = __importDefault(require("../../u
|
|
|
17
17
|
const state_2 = require("../../stateManagement/annotation/helpers/state");
|
|
18
18
|
const RectangleROITool_1 = __importDefault(require("../annotation/RectangleROITool"));
|
|
19
19
|
const utilities_1 = require("../../utilities/");
|
|
20
|
-
const getVolumeId_1 = require("../../utilities/getVolumeId");
|
|
21
20
|
const { transformWorldToIndex } = core_1.utilities;
|
|
22
21
|
class RectangleROIStartEndThresholdTool extends RectangleROITool_1.default {
|
|
23
22
|
constructor(toolProps = {}, defaultToolProps = {
|
|
@@ -42,7 +41,7 @@ class RectangleROIStartEndThresholdTool extends RectangleROITool_1.default {
|
|
|
42
41
|
}
|
|
43
42
|
else {
|
|
44
43
|
const targetId = this.getTargetId(viewport);
|
|
45
|
-
volumeId =
|
|
44
|
+
volumeId = core_1.utilities.getVolumeId(targetId);
|
|
46
45
|
imageVolume = core_1.cache.getVolume(volumeId);
|
|
47
46
|
referencedImageId = core_1.utilities.getClosestImageId(imageVolume, worldPos, viewPlaneNormal);
|
|
48
47
|
}
|