@cornerstonejs/tools 1.51.4 → 1.52.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/drawingSvg/drawPolyline.js +1 -1
- package/dist/cjs/drawingSvg/drawPolyline.js.map +1 -1
- package/dist/cjs/enums/ChangeTypes.d.ts +2 -1
- package/dist/cjs/enums/ChangeTypes.js +1 -0
- package/dist/cjs/enums/ChangeTypes.js.map +1 -1
- package/dist/cjs/eventDispatchers/keyboardEventHandlers/keyDown.js +1 -1
- package/dist/cjs/eventDispatchers/keyboardEventHandlers/keyDown.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/helpers/state.d.ts +2 -1
- package/dist/cjs/stateManagement/annotation/helpers/state.js +2 -1
- package/dist/cjs/stateManagement/annotation/helpers/state.js.map +1 -1
- package/dist/cjs/tools/annotation/LivewireContourSegmentationTool.d.ts +4 -0
- package/dist/cjs/tools/annotation/LivewireContourSegmentationTool.js +82 -0
- package/dist/cjs/tools/annotation/LivewireContourSegmentationTool.js.map +1 -1
- package/dist/cjs/tools/annotation/LivewireContourTool.d.ts +10 -9
- package/dist/cjs/tools/annotation/LivewireContourTool.js +56 -43
- package/dist/cjs/tools/annotation/LivewireContourTool.js.map +1 -1
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js +2 -1
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/SplineROITool.js +3 -3
- package/dist/cjs/tools/annotation/SplineROITool.js.map +1 -1
- package/dist/cjs/types/ContourSegmentationAnnotation.d.ts +8 -0
- package/dist/cjs/types/InterpolationTypes.d.ts +2 -0
- package/dist/cjs/types/ToolSpecificAnnotationTypes.d.ts +2 -5
- package/dist/cjs/utilities/contours/interpolation/acceptAutogeneratedInterpolations.js.map +1 -1
- package/dist/cjs/utilities/contours/interpolation/createPolylineToolData.js +2 -1
- package/dist/cjs/utilities/contours/interpolation/createPolylineToolData.js.map +1 -1
- package/dist/cjs/utilities/contours/interpolation/findAnnotationForInterpolation.js +2 -1
- package/dist/cjs/utilities/contours/interpolation/findAnnotationForInterpolation.js.map +1 -1
- package/dist/cjs/utilities/contours/interpolation/getInterpolationData.js +3 -1
- package/dist/cjs/utilities/contours/interpolation/getInterpolationData.js.map +1 -1
- package/dist/cjs/utilities/contours/interpolation/interpolate.d.ts +8 -0
- package/dist/cjs/utilities/contours/interpolation/interpolate.js +56 -42
- package/dist/cjs/utilities/contours/interpolation/interpolate.js.map +1 -1
- package/dist/cjs/utilities/contours/interpolation/selectHandles.d.ts +4 -0
- package/dist/cjs/utilities/contours/interpolation/selectHandles.js +170 -0
- package/dist/cjs/utilities/contours/interpolation/selectHandles.js.map +1 -0
- package/dist/cjs/utilities/livewire/LivewireScissors.d.ts +2 -1
- package/dist/cjs/utilities/livewire/LivewireScissors.js +46 -24
- package/dist/cjs/utilities/livewire/LivewireScissors.js.map +1 -1
- package/dist/cjs/utilities/segmentation/InterpolationManager/InterpolationManager.js +13 -3
- package/dist/cjs/utilities/segmentation/InterpolationManager/InterpolationManager.js.map +1 -1
- package/dist/esm/drawingSvg/drawPolyline.js +1 -1
- package/dist/esm/drawingSvg/drawPolyline.js.map +1 -1
- package/dist/esm/enums/ChangeTypes.js +1 -0
- package/dist/esm/enums/ChangeTypes.js.map +1 -1
- package/dist/esm/eventDispatchers/keyboardEventHandlers/keyDown.js +1 -1
- package/dist/esm/eventDispatchers/keyboardEventHandlers/keyDown.js.map +1 -1
- package/dist/esm/stateManagement/annotation/helpers/state.js +3 -2
- package/dist/esm/stateManagement/annotation/helpers/state.js.map +1 -1
- package/dist/esm/tools/annotation/LivewireContourSegmentationTool.js +81 -0
- package/dist/esm/tools/annotation/LivewireContourSegmentationTool.js.map +1 -1
- package/dist/esm/tools/annotation/LivewireContourTool.js +57 -44
- package/dist/esm/tools/annotation/LivewireContourTool.js.map +1 -1
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js +2 -1
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js.map +1 -1
- package/dist/esm/tools/annotation/SplineROITool.js +3 -3
- package/dist/esm/tools/annotation/SplineROITool.js.map +1 -1
- package/dist/esm/utilities/contours/interpolation/acceptAutogeneratedInterpolations.js.map +1 -1
- package/dist/esm/utilities/contours/interpolation/createPolylineToolData.js +2 -1
- package/dist/esm/utilities/contours/interpolation/createPolylineToolData.js.map +1 -1
- package/dist/esm/utilities/contours/interpolation/findAnnotationForInterpolation.js +2 -1
- package/dist/esm/utilities/contours/interpolation/findAnnotationForInterpolation.js.map +1 -1
- package/dist/esm/utilities/contours/interpolation/getInterpolationData.js +3 -1
- package/dist/esm/utilities/contours/interpolation/getInterpolationData.js.map +1 -1
- package/dist/esm/utilities/contours/interpolation/interpolate.js +57 -43
- package/dist/esm/utilities/contours/interpolation/interpolate.js.map +1 -1
- package/dist/esm/utilities/contours/interpolation/selectHandles.js +164 -0
- package/dist/esm/utilities/contours/interpolation/selectHandles.js.map +1 -0
- package/dist/esm/utilities/livewire/LivewireScissors.js +46 -24
- package/dist/esm/utilities/livewire/LivewireScissors.js.map +1 -1
- package/dist/esm/utilities/segmentation/InterpolationManager/InterpolationManager.js +13 -3
- package/dist/esm/utilities/segmentation/InterpolationManager/InterpolationManager.js.map +1 -1
- package/dist/types/enums/ChangeTypes.d.ts +2 -1
- package/dist/types/enums/ChangeTypes.d.ts.map +1 -1
- package/dist/types/stateManagement/annotation/helpers/state.d.ts +2 -1
- package/dist/types/stateManagement/annotation/helpers/state.d.ts.map +1 -1
- package/dist/types/tools/annotation/LivewireContourSegmentationTool.d.ts +4 -0
- package/dist/types/tools/annotation/LivewireContourSegmentationTool.d.ts.map +1 -1
- package/dist/types/tools/annotation/LivewireContourTool.d.ts +10 -9
- package/dist/types/tools/annotation/LivewireContourTool.d.ts.map +1 -1
- package/dist/types/tools/annotation/PlanarFreehandROITool.d.ts.map +1 -1
- package/dist/types/types/ContourSegmentationAnnotation.d.ts +8 -0
- package/dist/types/types/ContourSegmentationAnnotation.d.ts.map +1 -1
- package/dist/types/types/InterpolationTypes.d.ts +2 -0
- package/dist/types/types/InterpolationTypes.d.ts.map +1 -1
- package/dist/types/types/ToolSpecificAnnotationTypes.d.ts +2 -5
- package/dist/types/types/ToolSpecificAnnotationTypes.d.ts.map +1 -1
- package/dist/types/utilities/contours/interpolation/acceptAutogeneratedInterpolations.d.ts.map +1 -1
- package/dist/types/utilities/contours/interpolation/createPolylineToolData.d.ts.map +1 -1
- package/dist/types/utilities/contours/interpolation/findAnnotationForInterpolation.d.ts.map +1 -1
- package/dist/types/utilities/contours/interpolation/getInterpolationData.d.ts.map +1 -1
- package/dist/types/utilities/contours/interpolation/interpolate.d.ts +8 -0
- package/dist/types/utilities/contours/interpolation/interpolate.d.ts.map +1 -1
- package/dist/types/utilities/contours/interpolation/selectHandles.d.ts +5 -0
- package/dist/types/utilities/contours/interpolation/selectHandles.d.ts.map +1 -0
- package/dist/types/utilities/livewire/LivewireScissors.d.ts +2 -1
- package/dist/types/utilities/livewire/LivewireScissors.d.ts.map +1 -1
- package/dist/types/utilities/segmentation/InterpolationManager/InterpolationManager.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/drawPolyline.ts +1 -1
- package/src/enums/ChangeTypes.ts +4 -0
- package/src/eventDispatchers/keyboardEventHandlers/keyDown.ts +1 -1
- package/src/stateManagement/annotation/helpers/state.ts +4 -2
- package/src/tools/annotation/LivewireContourSegmentationTool.ts +151 -0
- package/src/tools/annotation/LivewireContourTool.ts +113 -82
- package/src/tools/annotation/PlanarFreehandROITool.ts +8 -3
- package/src/tools/annotation/SplineROITool.ts +3 -3
- package/src/types/ContourSegmentationAnnotation.ts +38 -0
- package/src/types/InterpolationTypes.ts +6 -0
- package/src/types/ToolSpecificAnnotationTypes.ts +7 -5
- package/src/utilities/contours/interpolation/acceptAutogeneratedInterpolations.ts +3 -1
- package/src/utilities/contours/interpolation/createPolylineToolData.ts +7 -1
- package/src/utilities/contours/interpolation/findAnnotationForInterpolation.ts +2 -1
- package/src/utilities/contours/interpolation/getInterpolationData.ts +3 -1
- package/src/utilities/contours/interpolation/interpolate.ts +94 -75
- package/src/utilities/contours/interpolation/selectHandles.ts +240 -0
- package/src/utilities/livewire/LivewireScissors.ts +65 -53
- package/src/utilities/segmentation/InterpolationManager/InterpolationManager.ts +39 -4
- package/dist/cjs/utilities/contours/PointsArray.d.ts +0 -29
- package/dist/cjs/utilities/contours/PointsArray.js +0 -104
- package/dist/cjs/utilities/contours/PointsArray.js.map +0 -1
- package/dist/esm/utilities/contours/PointsArray.js +0 -98
- package/dist/esm/utilities/contours/PointsArray.js.map +0 -1
- package/dist/types/utilities/contours/PointsArray.d.ts +0 -30
- package/dist/types/utilities/contours/PointsArray.d.ts.map +0 -1
- package/src/utilities/contours/PointsArray.ts +0 -165
|
@@ -25,7 +25,7 @@ function drawPolyline(svgDrawingHelper, annotationUID, polylineUID, points, opti
|
|
|
25
25
|
const existingPolyLine = svgDrawingHelper.getSvgNode(svgNodeHash);
|
|
26
26
|
let pointsAttribute = '';
|
|
27
27
|
for (const point of points) {
|
|
28
|
-
pointsAttribute += `${point[0]}, ${point[1]} `;
|
|
28
|
+
pointsAttribute += `${point[0].toFixed(1)}, ${point[1].toFixed(1)} `;
|
|
29
29
|
}
|
|
30
30
|
if (options.connectLastToFirst) {
|
|
31
31
|
const firstPoint = points[0];
|
|
@@ -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,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GACjE,MAAM,CAAC,MAAM,CACX;QACE,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,MAAM;QACjB,WAAW,EAAE,CAAC;QACd,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;QACnB,kBAAkB,EAAE,KAAK;KAC1B,EACD,OAAO,CACR,CAAC;IAGJ,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,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;
|
|
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,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GACjE,MAAM,CAAC,MAAM,CACX;QACE,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,MAAM;QACjB,WAAW,EAAE,CAAC;QACd,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;QACnB,kBAAkB,EAAE,KAAK;KAC1B,EACD,OAAO,CACR,CAAC;IAGJ,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,OAAO,CAAC,kBAAkB,EAAE;QAC9B,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;AAzED,+BAyEC"}
|
|
@@ -7,6 +7,7 @@ var ChangeTypes;
|
|
|
7
7
|
ChangeTypes["StatsUpdated"] = "StatsUpdated";
|
|
8
8
|
ChangeTypes["InitialSetup"] = "InitialSetup";
|
|
9
9
|
ChangeTypes["Completed"] = "Completed";
|
|
10
|
+
ChangeTypes["InterpolationUpdated"] = "InterpolationUpdated";
|
|
10
11
|
})(ChangeTypes || (ChangeTypes = {}));
|
|
11
12
|
exports.default = ChangeTypes;
|
|
12
13
|
//# sourceMappingURL=ChangeTypes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChangeTypes.js","sourceRoot":"","sources":["../../../src/enums/ChangeTypes.ts"],"names":[],"mappings":";;AAIA,IAAK,
|
|
1
|
+
{"version":3,"file":"ChangeTypes.js","sourceRoot":"","sources":["../../../src/enums/ChangeTypes.ts"],"names":[],"mappings":";;AAIA,IAAK,WA6BJ;AA7BD,WAAK,WAAW;IAKd,0CAA2B,CAAA;IAI3B,gDAAiC,CAAA;IAMjC,4CAA6B,CAAA;IAK7B,4CAA6B,CAAA;IAI7B,sCAAuB,CAAA;IAIvB,4DAA6C,CAAA;AAC/C,CAAC,EA7BI,WAAW,KAAX,WAAW,QA6Bf;AAED,kBAAe,WAAW,CAAC"}
|
|
@@ -24,7 +24,7 @@ function keyDown(evt) {
|
|
|
24
24
|
const { element } = evt.detail;
|
|
25
25
|
for (const [key, value] of [...activeToolsWithEventBinding.entries()]) {
|
|
26
26
|
const method = typeof value.method === 'function' ? value.method : key[value.method];
|
|
27
|
-
method.call(key, element, value);
|
|
27
|
+
method.call(key, element, value, evt);
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyDown.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/keyboardEventHandlers/keyDown.ts"],"names":[],"mappings":";;;;;AAAA,uCAA+C;AAC/C,4GAAoF;AACpF,0HAAiG;AAEjG,sEAA8C;AAO9C,SAAwB,OAAO,CAAC,GAAqB;IAEnD,MAAM,UAAU,GAAG,IAAA,uCAA6B,EAAC,GAAG,CAAC,CAAC;IAEtD,IAAI,UAAU,EAAE;QACd,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAErD,MAAM,SAAS,GAAG,wBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAC;QAEF,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACzD,SAAS,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;SAClD;KACF;IAED,MAAM,2BAA2B,GAAG,IAAA,8CAAmC,EAAC,GAAG,EAAE;QAC3E,mBAAS,CAAC,MAAM;KACjB,CAAC,CAAC;IAEH,IAAI,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,IAAI,EAAE;QACrC,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC/B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,2BAA2B,CAAC,OAAO,EAAE,CAAC,EAAE;YAKrE,MAAM,MAAM,GACV,OAAO,KAAK,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACxE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"keyDown.js","sourceRoot":"","sources":["../../../../src/eventDispatchers/keyboardEventHandlers/keyDown.ts"],"names":[],"mappings":";;;;;AAAA,uCAA+C;AAC/C,4GAAoF;AACpF,0HAAiG;AAEjG,sEAA8C;AAO9C,SAAwB,OAAO,CAAC,GAAqB;IAEnD,MAAM,UAAU,GAAG,IAAA,uCAA6B,EAAC,GAAG,CAAC,CAAC;IAEtD,IAAI,UAAU,EAAE;QACd,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAErD,MAAM,SAAS,GAAG,wBAAgB,CAAC,uBAAuB,CACxD,UAAU,EACV,iBAAiB,CAClB,CAAC;QAEF,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACzD,SAAS,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;SAClD;KACF;IAED,MAAM,2BAA2B,GAAG,IAAA,8CAAmC,EAAC,GAAG,EAAE;QAC3E,mBAAS,CAAC,MAAM;KACjB,CAAC,CAAC;IAEH,IAAI,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,IAAI,EAAE;QACrC,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC/B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,2BAA2B,CAAC,OAAO,EAAE,CAAC,EAAE;YAKrE,MAAM,MAAM,GACV,OAAO,KAAK,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACxE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;SACvC;KACF;AACH,CAAC;AAlCD,0BAkCC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { ChangeTypes } from '../../../enums';
|
|
1
2
|
import { Annotation } from '../../../types/AnnotationTypes';
|
|
2
3
|
declare function triggerAnnotationAddedForElement(annotation: Annotation, element: HTMLDivElement): void;
|
|
3
4
|
declare function triggerAnnotationAddedForFOR(annotation: Annotation): void;
|
|
4
|
-
declare function triggerAnnotationModified(annotation: Annotation, element: HTMLDivElement): void;
|
|
5
|
+
declare function triggerAnnotationModified(annotation: Annotation, element: HTMLDivElement, changeType?: ChangeTypes): void;
|
|
5
6
|
declare function triggerAnnotationCompleted(annotation: Annotation): void;
|
|
6
7
|
export { triggerAnnotationAddedForElement, triggerAnnotationAddedForFOR, triggerAnnotationModified, triggerAnnotationCompleted, };
|
|
@@ -45,7 +45,7 @@ function triggerAnnotationAddedForFOR(annotation) {
|
|
|
45
45
|
});
|
|
46
46
|
}
|
|
47
47
|
exports.triggerAnnotationAddedForFOR = triggerAnnotationAddedForFOR;
|
|
48
|
-
function triggerAnnotationModified(annotation, element) {
|
|
48
|
+
function triggerAnnotationModified(annotation, element, changeType = enums_1.ChangeTypes.HandlesUpdated) {
|
|
49
49
|
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
50
50
|
const { viewportId, renderingEngineId } = enabledElement;
|
|
51
51
|
const eventType = enums_1.Events.ANNOTATION_MODIFIED;
|
|
@@ -53,6 +53,7 @@ function triggerAnnotationModified(annotation, element) {
|
|
|
53
53
|
annotation,
|
|
54
54
|
viewportId,
|
|
55
55
|
renderingEngineId,
|
|
56
|
+
changeType,
|
|
56
57
|
};
|
|
57
58
|
(0, core_1.triggerEvent)(core_1.eventTarget, eventType, eventDetail);
|
|
58
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/stateManagement/annotation/helpers/state.ts"],"names":[],"mappings":";;;AAAA,8CAK6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/stateManagement/annotation/helpers/state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
|
+
import type { Types } from '@cornerstonejs/core';
|
|
1
2
|
import LivewireContourTool from './LivewireContourTool';
|
|
3
|
+
import type { ContourSegmentationAnnotation } from '../../types';
|
|
2
4
|
declare class LivewireContourSegmentationTool extends LivewireContourTool {
|
|
3
5
|
static toolName: any;
|
|
6
|
+
updateInterpolatedAnnotation(annotation: ContourSegmentationAnnotation, enabledElement: Types.IEnabledElement): void;
|
|
7
|
+
protected renderAnnotationInstance(renderContext: any): boolean;
|
|
4
8
|
protected isContourSegmentationTool(): boolean;
|
|
5
9
|
}
|
|
6
10
|
export default LivewireContourSegmentationTool;
|
|
@@ -3,8 +3,90 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const core_1 = require("@cornerstonejs/core");
|
|
6
7
|
const LivewireContourTool_1 = __importDefault(require("./LivewireContourTool"));
|
|
8
|
+
const LiveWirePath_1 = require("../../utilities/livewire/LiveWirePath");
|
|
9
|
+
const state_1 = require("../../stateManagement/annotation/helpers/state");
|
|
10
|
+
const enums_1 = require("../../enums");
|
|
11
|
+
const drawingSvg_1 = require("../../drawingSvg");
|
|
7
12
|
class LivewireContourSegmentationTool extends LivewireContourTool_1.default {
|
|
13
|
+
updateInterpolatedAnnotation(annotation, enabledElement) {
|
|
14
|
+
if (this.editData ||
|
|
15
|
+
!annotation.invalidated ||
|
|
16
|
+
!annotation.data.handles.interpolationSources) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
annotation.data.contour.originalPolyline = annotation.data.contour.polyline;
|
|
20
|
+
queueMicrotask(() => {
|
|
21
|
+
if (!annotation.data.handles.interpolationSources) {
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
const { points } = annotation.data.handles;
|
|
25
|
+
const { element } = enabledElement.viewport;
|
|
26
|
+
this.setupBaseEditData(points[0], element, annotation);
|
|
27
|
+
const { length: count } = points;
|
|
28
|
+
const { scissors } = this;
|
|
29
|
+
const { nearestEdge, repeatInterpolation } = this.configuration.interpolation;
|
|
30
|
+
annotation.data.handles.originalPoints = points;
|
|
31
|
+
const { worldToSlice, sliceToWorld } = this.editData;
|
|
32
|
+
const handleSmoothing = [];
|
|
33
|
+
if (nearestEdge) {
|
|
34
|
+
let lastPoint = worldToSlice(points[points.length - 1]);
|
|
35
|
+
points.forEach((point, hIndex) => {
|
|
36
|
+
const testPoint = worldToSlice(point);
|
|
37
|
+
lastPoint = testPoint;
|
|
38
|
+
handleSmoothing.push(testPoint);
|
|
39
|
+
scissors.startSearch(lastPoint);
|
|
40
|
+
scissors.findPathToPoint(testPoint);
|
|
41
|
+
scissors.findPathToPoint(worldToSlice(points[(hIndex + 3) % points.length]));
|
|
42
|
+
const minPoint = scissors.findMinNearby(testPoint, nearestEdge);
|
|
43
|
+
if (!core_1.utilities.isEqual(testPoint, minPoint)) {
|
|
44
|
+
handleSmoothing[hIndex] = minPoint;
|
|
45
|
+
lastPoint = minPoint;
|
|
46
|
+
points[hIndex] = sliceToWorld(minPoint);
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
const acceptedPath = new LiveWirePath_1.LivewirePath();
|
|
51
|
+
for (let i = 0; i < count; i++) {
|
|
52
|
+
scissors.startSearch(worldToSlice(points[i]));
|
|
53
|
+
const path = scissors.findPathToPoint(worldToSlice(points[(i + 1) % count]));
|
|
54
|
+
acceptedPath.addPoints(path);
|
|
55
|
+
}
|
|
56
|
+
this.updateAnnotation(element, acceptedPath);
|
|
57
|
+
this.scissors = null;
|
|
58
|
+
this.scissorsRight = null;
|
|
59
|
+
this.editData = null;
|
|
60
|
+
annotation.data.handles.interpolationSources = null;
|
|
61
|
+
if (repeatInterpolation) {
|
|
62
|
+
(0, state_1.triggerAnnotationModified)(annotation, enabledElement.viewport.element, enums_1.ChangeTypes.InterpolationUpdated);
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
renderAnnotationInstance(renderContext) {
|
|
67
|
+
var _a;
|
|
68
|
+
const { enabledElement, svgDrawingHelper } = renderContext;
|
|
69
|
+
const annotation = renderContext.annotation;
|
|
70
|
+
const { annotationUID } = annotation;
|
|
71
|
+
const { viewport } = enabledElement;
|
|
72
|
+
const { worldToCanvas } = viewport;
|
|
73
|
+
const { showInterpolationPolyline } = this.configuration.interpolation || {};
|
|
74
|
+
(_a = this.updateInterpolatedAnnotation) === null || _a === void 0 ? void 0 : _a.call(this, annotation, enabledElement);
|
|
75
|
+
const { originalPolyline } = annotation.data.contour;
|
|
76
|
+
const rendered = super.renderAnnotationInstance(renderContext);
|
|
77
|
+
if (showInterpolationPolyline &&
|
|
78
|
+
originalPolyline &&
|
|
79
|
+
annotation.autoGenerated) {
|
|
80
|
+
const polylineCanvasPoints = originalPolyline.map(worldToCanvas);
|
|
81
|
+
polylineCanvasPoints.push(polylineCanvasPoints[0]);
|
|
82
|
+
(0, drawingSvg_1.drawPolyline)(svgDrawingHelper, annotationUID, 'interpolationContour-0', polylineCanvasPoints, {
|
|
83
|
+
color: '#70ffff',
|
|
84
|
+
lineWidth: 1,
|
|
85
|
+
fillOpacity: 0,
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
return rendered;
|
|
89
|
+
}
|
|
8
90
|
isContourSegmentationTool() {
|
|
9
91
|
return true;
|
|
10
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LivewireContourSegmentationTool.js","sourceRoot":"","sources":["../../../../src/tools/annotation/LivewireContourSegmentationTool.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"LivewireContourSegmentationTool.js","sourceRoot":"","sources":["../../../../src/tools/annotation/LivewireContourSegmentationTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import type { Types } from '@cornerstonejs/core';
|
|
2
2
|
import { ChangeTypes } from '../../enums';
|
|
3
|
-
import type {
|
|
3
|
+
import type { EventTypes, ToolHandle, PublicToolProps, ToolProps, SVGDrawingHelper } from '../../types';
|
|
4
4
|
import { LivewireContourAnnotation } from '../../types/ToolSpecificAnnotationTypes';
|
|
5
|
+
import { LivewireScissors } from '../../utilities/livewire/LivewireScissors';
|
|
5
6
|
import { LivewirePath } from '../../utilities/livewire/LiveWirePath';
|
|
6
7
|
import ContourSegmentationBaseTool from '../base/ContourSegmentationBaseTool';
|
|
7
8
|
declare class LivewireContourTool extends ContourSegmentationBaseTool {
|
|
8
9
|
static toolName: string;
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
protected scissors: LivewireScissors;
|
|
11
|
+
protected scissorsRight: LivewireScissors;
|
|
11
12
|
touchDragCallback: any;
|
|
12
13
|
mouseDragCallback: any;
|
|
13
14
|
editData: {
|
|
@@ -33,9 +34,8 @@ declare class LivewireContourTool extends ContourSegmentationBaseTool {
|
|
|
33
34
|
isPointNearTool: (element: HTMLDivElement, annotation: LivewireContourAnnotation, canvasCoords: Types.Point2, proximity: number) => boolean;
|
|
34
35
|
toolSelectedCallback: (evt: EventTypes.InteractionEventType, annotation: LivewireContourAnnotation) => void;
|
|
35
36
|
handleSelectedCallback: (evt: EventTypes.InteractionEventType, annotation: LivewireContourAnnotation, handle: ToolHandle) => void;
|
|
36
|
-
_endCallback: (evt: EventTypes.InteractionEventType) => void;
|
|
37
|
-
|
|
38
|
-
triggerAnnotationModified: (annotation: LivewireContourAnnotation, enabledElement: Types.IEnabledElement, changeType?: ChangeTypes) => void;
|
|
37
|
+
_endCallback: (evt: EventTypes.InteractionEventType, clearAnnotation?: boolean) => void;
|
|
38
|
+
protected clearEditData(): void;
|
|
39
39
|
triggerChangeEvent: (annotation: LivewireContourAnnotation, enabledElement: Types.IEnabledElement, changeType?: ChangeTypes) => void;
|
|
40
40
|
private _mouseDownCallback;
|
|
41
41
|
private _mouseMoveCallback;
|
|
@@ -48,14 +48,15 @@ declare class LivewireContourTool extends ContourSegmentationBaseTool {
|
|
|
48
48
|
private _deactivateDraw;
|
|
49
49
|
renderAnnotation(enabledElement: Types.IEnabledElement, svgDrawingHelper: SVGDrawingHelper): boolean;
|
|
50
50
|
protected isContourSegmentationTool(): boolean;
|
|
51
|
-
protected createAnnotation(evt: EventTypes.InteractionEventType):
|
|
51
|
+
protected createAnnotation(evt: EventTypes.InteractionEventType): import("../../types").ContourAnnotation;
|
|
52
|
+
undo(element: any, config: any, evt: any): void;
|
|
52
53
|
protected renderAnnotationInstance(renderContext: {
|
|
53
54
|
enabledElement: Types.IEnabledElement;
|
|
54
55
|
targetId: string;
|
|
55
|
-
annotation:
|
|
56
|
+
annotation: LivewireContourAnnotation;
|
|
56
57
|
annotationStyle: Record<string, any>;
|
|
57
58
|
svgDrawingHelper: SVGDrawingHelper;
|
|
58
59
|
}): boolean;
|
|
59
|
-
|
|
60
|
+
protected updateAnnotation(_: any, livewirePath: LivewirePath): void;
|
|
60
61
|
}
|
|
61
62
|
export default LivewireContourTool;
|
|
@@ -12,18 +12,34 @@ const enums_1 = require("../../enums");
|
|
|
12
12
|
const elementCursor_1 = require("../../cursors/elementCursor");
|
|
13
13
|
const utilities_1 = require("../../utilities");
|
|
14
14
|
const findHandlePolylineIndex_1 = __importDefault(require("../../utilities/contours/findHandlePolylineIndex"));
|
|
15
|
+
const state_1 = require("../../stateManagement/annotation/helpers/state");
|
|
15
16
|
const reverseIfAntiClockwise_1 = __importDefault(require("../../utilities/contours/reverseIfAntiClockwise"));
|
|
16
17
|
const LivewireScissors_1 = require("../../utilities/livewire/LivewireScissors");
|
|
17
18
|
const LiveWirePath_1 = require("../../utilities/livewire/LiveWirePath");
|
|
18
19
|
const viewportFilters_1 = require("../../utilities/viewportFilters");
|
|
19
20
|
const ContourSegmentationBaseTool_1 = __importDefault(require("../base/ContourSegmentationBaseTool"));
|
|
20
|
-
const { isEqual } = core_1.utilities;
|
|
21
21
|
const CLICK_CLOSE_CURVE_SQR_DIST = Math.pow(10, 2);
|
|
22
22
|
class LivewireContourTool extends ContourSegmentationBaseTool_1.default {
|
|
23
23
|
constructor(toolProps = {}, defaultToolProps = {
|
|
24
24
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
25
25
|
configuration: {
|
|
26
26
|
preventHandleOutsideImage: false,
|
|
27
|
+
snapHandleNearby: 2,
|
|
28
|
+
interpolation: {
|
|
29
|
+
enabled: false,
|
|
30
|
+
nearestEdge: 2,
|
|
31
|
+
showInterpolationPolyline: false,
|
|
32
|
+
},
|
|
33
|
+
actions: {
|
|
34
|
+
undo: {
|
|
35
|
+
method: 'undo',
|
|
36
|
+
bindings: [
|
|
37
|
+
{
|
|
38
|
+
key: 'Escape',
|
|
39
|
+
},
|
|
40
|
+
],
|
|
41
|
+
},
|
|
42
|
+
},
|
|
27
43
|
},
|
|
28
44
|
}) {
|
|
29
45
|
super(toolProps, defaultToolProps);
|
|
@@ -78,7 +94,7 @@ class LivewireContourTool extends ContourSegmentationBaseTool_1.default {
|
|
|
78
94
|
(0, utilities_1.triggerAnnotationRenderForViewportIds)(renderingEngine, viewportIdsToRender);
|
|
79
95
|
evt.preventDefault();
|
|
80
96
|
};
|
|
81
|
-
this._endCallback = (evt) => {
|
|
97
|
+
this._endCallback = (evt, clearAnnotation = false) => {
|
|
82
98
|
const eventDetail = evt.detail;
|
|
83
99
|
const { element } = eventDetail;
|
|
84
100
|
const { annotation, viewportIdsToRender, newAnnotation } = this.editData;
|
|
@@ -89,9 +105,13 @@ class LivewireContourTool extends ContourSegmentationBaseTool_1.default {
|
|
|
89
105
|
(0, elementCursor_1.resetElementCursor)(element);
|
|
90
106
|
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
91
107
|
const { renderingEngine } = enabledElement;
|
|
92
|
-
if (this.isHandleOutsideImage &&
|
|
93
|
-
this.configuration.preventHandleOutsideImage)
|
|
108
|
+
if ((this.isHandleOutsideImage &&
|
|
109
|
+
this.configuration.preventHandleOutsideImage) ||
|
|
110
|
+
clearAnnotation) {
|
|
94
111
|
(0, annotationState_1.removeAnnotation)(annotation.annotationUID);
|
|
112
|
+
this.clearEditData();
|
|
113
|
+
(0, utilities_1.triggerAnnotationRenderForViewportIds)(renderingEngine, viewportIdsToRender);
|
|
114
|
+
return;
|
|
95
115
|
}
|
|
96
116
|
const { worldToSlice } = this.editData;
|
|
97
117
|
if (worldToSlice) {
|
|
@@ -102,36 +122,14 @@ class LivewireContourTool extends ContourSegmentationBaseTool_1.default {
|
|
|
102
122
|
? enums_1.ChangeTypes.Completed
|
|
103
123
|
: enums_1.ChangeTypes.HandlesUpdated;
|
|
104
124
|
this.triggerChangeEvent(annotation, enabledElement, changeType);
|
|
105
|
-
this.
|
|
106
|
-
this.scissors = null;
|
|
107
|
-
this.scissorsRight = null;
|
|
108
|
-
this.isDrawing = false;
|
|
109
|
-
};
|
|
110
|
-
this.triggerAnnotationCompleted = (annotation) => {
|
|
111
|
-
const eventType = enums_1.Events.ANNOTATION_COMPLETED;
|
|
112
|
-
const eventDetail = {
|
|
113
|
-
annotation,
|
|
114
|
-
changeType: enums_1.ChangeTypes.Completed,
|
|
115
|
-
};
|
|
116
|
-
(0, core_1.triggerEvent)(core_1.eventTarget, eventType, eventDetail);
|
|
117
|
-
};
|
|
118
|
-
this.triggerAnnotationModified = (annotation, enabledElement, changeType = enums_1.ChangeTypes.StatsUpdated) => {
|
|
119
|
-
const { viewportId, renderingEngineId } = enabledElement;
|
|
120
|
-
const eventType = enums_1.Events.ANNOTATION_MODIFIED;
|
|
121
|
-
const eventDetail = {
|
|
122
|
-
annotation,
|
|
123
|
-
viewportId,
|
|
124
|
-
renderingEngineId,
|
|
125
|
-
changeType,
|
|
126
|
-
};
|
|
127
|
-
(0, core_1.triggerEvent)(core_1.eventTarget, eventType, eventDetail);
|
|
125
|
+
this.clearEditData();
|
|
128
126
|
};
|
|
129
127
|
this.triggerChangeEvent = (annotation, enabledElement, changeType = enums_1.ChangeTypes.StatsUpdated) => {
|
|
130
128
|
if (changeType === enums_1.ChangeTypes.Completed) {
|
|
131
|
-
|
|
129
|
+
(0, state_1.triggerAnnotationCompleted)(annotation);
|
|
132
130
|
}
|
|
133
131
|
else {
|
|
134
|
-
|
|
132
|
+
(0, state_1.triggerAnnotationModified)(annotation, enabledElement.viewport.element, changeType);
|
|
135
133
|
}
|
|
136
134
|
};
|
|
137
135
|
this._mouseDownCallback = (evt) => {
|
|
@@ -169,15 +167,18 @@ class LivewireContourTool extends ContourSegmentationBaseTool_1.default {
|
|
|
169
167
|
closePath = true;
|
|
170
168
|
}
|
|
171
169
|
}
|
|
170
|
+
const { snapHandleNearby } = this.configuration;
|
|
171
|
+
if (snapHandleNearby && !this.editData.closed) {
|
|
172
|
+
const currentPath = new LiveWirePath_1.LivewirePath();
|
|
173
|
+
const snapPoint = this.scissors.findMinNearby(worldToSlice(worldPosOriginal), 1);
|
|
174
|
+
const pathPoints = this.scissors.findPathToPoint(snapPoint);
|
|
175
|
+
currentPath.addPoints(pathPoints);
|
|
176
|
+
currentPath.prependPath(this.editData.confirmedPath);
|
|
177
|
+
worldPos = sliceToWorld(snapPoint);
|
|
178
|
+
this.editData.currentPath = currentPath;
|
|
179
|
+
}
|
|
172
180
|
this.editData.closed = this.editData.closed || closePath;
|
|
173
181
|
this.editData.confirmedPath = this.editData.currentPath;
|
|
174
|
-
const smoothPathCount = this.scissors.smoothPathCount(this.editData.confirmedPath.pointArray, this.editData.currentPath.getLastControlPoint());
|
|
175
|
-
if (smoothPathCount) {
|
|
176
|
-
this.editData.currentPath.removeLastPoints(smoothPathCount);
|
|
177
|
-
annotation.data.contour.polyline.splice(annotation.data.contour.polyline.length - smoothPathCount, smoothPathCount);
|
|
178
|
-
worldPos =
|
|
179
|
-
annotation.data.contour.polyline[annotation.data.contour.polyline.length - 1];
|
|
180
|
-
}
|
|
181
182
|
const lastPoint = this.editData.currentPath.getLastPoint();
|
|
182
183
|
this.editData.confirmedPath.addControlPoint(lastPoint);
|
|
183
184
|
annotation.data.handles.points.push(sliceToWorld(lastPoint));
|
|
@@ -185,7 +186,7 @@ class LivewireContourTool extends ContourSegmentationBaseTool_1.default {
|
|
|
185
186
|
annotation.invalidated = true;
|
|
186
187
|
(0, utilities_1.triggerAnnotationRenderForViewportIds)(renderingEngine, viewportIdsToRender);
|
|
187
188
|
if (this.editData.closed) {
|
|
188
|
-
this.
|
|
189
|
+
this.updateAnnotation(element, this.editData.confirmedPath);
|
|
189
190
|
this._endCallback(evt);
|
|
190
191
|
}
|
|
191
192
|
evt.preventDefault();
|
|
@@ -367,6 +368,12 @@ class LivewireContourTool extends ContourSegmentationBaseTool_1.default {
|
|
|
367
368
|
(0, utilities_1.triggerAnnotationRenderForViewportIds)(renderingEngine, this.editData.viewportIdsToRender);
|
|
368
369
|
return annotation;
|
|
369
370
|
}
|
|
371
|
+
clearEditData() {
|
|
372
|
+
this.editData = null;
|
|
373
|
+
this.scissors = null;
|
|
374
|
+
this.scissorsRight = null;
|
|
375
|
+
this.isDrawing = false;
|
|
376
|
+
}
|
|
370
377
|
editHandle(worldPos, element, annotation, handleIndex) {
|
|
371
378
|
var _a;
|
|
372
379
|
const { data } = annotation;
|
|
@@ -402,7 +409,7 @@ class LivewireContourTool extends ContourSegmentationBaseTool_1.default {
|
|
|
402
409
|
const { worldToSlice, sliceToWorld } = editData;
|
|
403
410
|
const { activeHandleIndex } = data.handles;
|
|
404
411
|
if (activeHandleIndex === null || activeHandleIndex === undefined) {
|
|
405
|
-
data.
|
|
412
|
+
data.handles.activeHandleIndex = handleIndex;
|
|
406
413
|
}
|
|
407
414
|
else if (activeHandleIndex !== handleIndex) {
|
|
408
415
|
throw new Error(`Trying to edit a different handle than the one currently being edited ${handleIndex}!==${data.handles.activeHandleIndex}`);
|
|
@@ -435,7 +442,7 @@ class LivewireContourTool extends ContourSegmentationBaseTool_1.default {
|
|
|
435
442
|
var _a;
|
|
436
443
|
const { viewport } = enabledElement;
|
|
437
444
|
const { element } = viewport;
|
|
438
|
-
this.
|
|
445
|
+
this.updateAnnotation(element, (_a = this.editData) === null || _a === void 0 ? void 0 : _a.currentPath);
|
|
439
446
|
return super.renderAnnotation(enabledElement, svgDrawingHelper);
|
|
440
447
|
}
|
|
441
448
|
isContourSegmentationTool() {
|
|
@@ -444,20 +451,26 @@ class LivewireContourTool extends ContourSegmentationBaseTool_1.default {
|
|
|
444
451
|
createAnnotation(evt) {
|
|
445
452
|
const contourSegmentationAnnotation = super.createAnnotation(evt);
|
|
446
453
|
const { world: worldPos } = evt.detail.currentPoints;
|
|
447
|
-
|
|
454
|
+
const annotation = core_1.utilities.deepMerge(contourSegmentationAnnotation, {
|
|
448
455
|
data: {
|
|
449
456
|
handles: {
|
|
450
457
|
points: [[...worldPos]],
|
|
451
458
|
},
|
|
452
459
|
},
|
|
453
460
|
});
|
|
461
|
+
return annotation;
|
|
462
|
+
}
|
|
463
|
+
undo(element, config, evt) {
|
|
464
|
+
if (!this.editData) {
|
|
465
|
+
return;
|
|
466
|
+
}
|
|
467
|
+
this._endCallback(evt, true);
|
|
454
468
|
}
|
|
455
469
|
renderAnnotationInstance(renderContext) {
|
|
456
470
|
var _a, _b, _c;
|
|
457
|
-
const { enabledElement, svgDrawingHelper, annotationStyle } = renderContext;
|
|
471
|
+
const { annotation, enabledElement, svgDrawingHelper, annotationStyle } = renderContext;
|
|
458
472
|
const { viewport } = enabledElement;
|
|
459
473
|
const { worldToCanvas } = viewport;
|
|
460
|
-
const annotation = renderContext.annotation;
|
|
461
474
|
const { annotationUID, data, highlighted } = annotation;
|
|
462
475
|
const { handles } = data;
|
|
463
476
|
const newAnnotation = (_a = this.editData) === null || _a === void 0 ? void 0 : _a.newAnnotation;
|
|
@@ -476,7 +489,7 @@ class LivewireContourTool extends ContourSegmentationBaseTool_1.default {
|
|
|
476
489
|
super.renderAnnotationInstance(renderContext);
|
|
477
490
|
return true;
|
|
478
491
|
}
|
|
479
|
-
|
|
492
|
+
updateAnnotation(_, livewirePath) {
|
|
480
493
|
if (!this.editData || !livewirePath) {
|
|
481
494
|
return;
|
|
482
495
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LivewireContourTool.js","sourceRoot":"","sources":["../../../../src/tools/annotation/LivewireContourTool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"LivewireContourTool.js","sourceRoot":"","sources":["../../../../src/tools/annotation/LivewireContourTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,7 @@ const isViewportPreScaled_1 = require("../../utilities/viewport/isViewportPreSca
|
|
|
27
27
|
const getModalityUnit_1 = require("../../utilities/getModalityUnit");
|
|
28
28
|
const basic_1 = require("../../utilities/math/basic");
|
|
29
29
|
const ContourSegmentationBaseTool_1 = __importDefault(require("../base/ContourSegmentationBaseTool"));
|
|
30
|
+
const enums_1 = require("../../enums");
|
|
30
31
|
const { pointCanProjectOnLine } = math_1.polyline;
|
|
31
32
|
const { EPSILON } = core_1.CONSTANTS;
|
|
32
33
|
const PARALLEL_THRESHOLD = 1 - EPSILON;
|
|
@@ -244,7 +245,7 @@ class PlanarFreehandROITool extends ContourSegmentationBaseTool_1.default {
|
|
|
244
245
|
modalityUnit,
|
|
245
246
|
};
|
|
246
247
|
}
|
|
247
|
-
(0, state_1.triggerAnnotationModified)(annotation, element);
|
|
248
|
+
(0, state_1.triggerAnnotationModified)(annotation, enabledElement.element, enums_1.ChangeTypes.StatsUpdated);
|
|
248
249
|
annotation.invalidated = false;
|
|
249
250
|
return cachedStats;
|
|
250
251
|
};
|