@cornerstonejs/tools 0.11.0 → 0.12.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.d.ts +8 -0
- package/dist/cjs/drawingSvg/drawPolyline.js +50 -0
- package/dist/cjs/drawingSvg/drawPolyline.js.map +1 -0
- package/dist/cjs/drawingSvg/index.d.ts +2 -1
- package/dist/cjs/drawingSvg/index.js +3 -1
- package/dist/cjs/drawingSvg/index.js.map +1 -1
- package/dist/cjs/index.d.ts +2 -2
- package/dist/cjs/index.js +2 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/stateManagement/annotation/config/annotationStyle.js +1 -1
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.d.ts +32 -0
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js +192 -0
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js.map +1 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/closedContourEditLoop.d.ts +2 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/closedContourEditLoop.js +216 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/closedContourEditLoop.js.map +1 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/drawLoop.d.ts +2 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/drawLoop.js +182 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/drawLoop.js.map +1 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/editLoopCommon.d.ts +2 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/editLoopCommon.js +127 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/editLoopCommon.js.map +1 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/openContourEditLoop.d.ts +2 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/openContourEditLoop.js +289 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/openContourEditLoop.js.map +1 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/openContourEndEditLoop.d.ts +2 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/openContourEndEditLoop.js +43 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/openContourEndEditLoop.js.map +1 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/renderMethods.d.ts +2 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/renderMethods.js +99 -0
- package/dist/cjs/tools/annotation/planarFreehandROITool/renderMethods.js.map +1 -0
- package/dist/cjs/tools/index.d.ts +2 -1
- package/dist/cjs/tools/index.js +3 -1
- package/dist/cjs/tools/index.js.map +1 -1
- package/dist/cjs/types/AnnotationTypes.d.ts +1 -0
- package/dist/cjs/types/ToolSpecificAnnotationTypes.d.ts +31 -0
- package/dist/cjs/utilities/math/index.d.ts +2 -1
- package/dist/cjs/utilities/math/index.js +3 -1
- package/dist/cjs/utilities/math/index.js.map +1 -1
- package/dist/cjs/utilities/math/polyline/addCanvasPointsToArray.d.ts +4 -0
- package/dist/cjs/utilities/math/polyline/addCanvasPointsToArray.js +36 -0
- package/dist/cjs/utilities/math/polyline/addCanvasPointsToArray.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/calculateAreaOfPoints.d.ts +2 -0
- package/dist/cjs/utilities/math/polyline/calculateAreaOfPoints.js +14 -0
- package/dist/cjs/utilities/math/polyline/calculateAreaOfPoints.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/getIntersectionWithPolyline.d.ts +7 -0
- package/dist/cjs/utilities/math/polyline/getIntersectionWithPolyline.js +110 -0
- package/dist/cjs/utilities/math/polyline/getIntersectionWithPolyline.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/getSubPixelSpacingAndXYDirections.d.ts +7 -0
- package/dist/cjs/utilities/math/polyline/getSubPixelSpacingAndXYDirections.js +67 -0
- package/dist/cjs/utilities/math/polyline/getSubPixelSpacingAndXYDirections.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/index.d.ts +7 -0
- package/dist/cjs/utilities/math/polyline/index.js +20 -0
- package/dist/cjs/utilities/math/polyline/index.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/planarFreehandROIInternalTypes.d.ts +22 -0
- package/dist/cjs/utilities/math/polyline/planarFreehandROIInternalTypes.js +3 -0
- package/dist/cjs/utilities/math/polyline/planarFreehandROIInternalTypes.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/pointCanProjectOnLine.d.ts +3 -0
- package/dist/cjs/utilities/math/polyline/pointCanProjectOnLine.js +35 -0
- package/dist/cjs/utilities/math/polyline/pointCanProjectOnLine.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/pointsAreWithinCloseContourProximity.d.ts +3 -0
- package/dist/cjs/utilities/math/polyline/pointsAreWithinCloseContourProximity.js +8 -0
- package/dist/cjs/utilities/math/polyline/pointsAreWithinCloseContourProximity.js.map +1 -0
- package/dist/esm/drawingSvg/drawPolyline.d.ts +8 -0
- package/dist/esm/drawingSvg/drawPolyline.js +44 -0
- package/dist/esm/drawingSvg/drawPolyline.js.map +1 -0
- package/dist/esm/drawingSvg/index.d.ts +2 -1
- package/dist/esm/drawingSvg/index.js +2 -1
- package/dist/esm/drawingSvg/index.js.map +1 -1
- package/dist/esm/index.d.ts +2 -2
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/stateManagement/annotation/config/annotationStyle.js +1 -1
- package/dist/esm/tools/annotation/PlanarFreehandROITool.d.ts +32 -0
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js +187 -0
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js.map +1 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/closedContourEditLoop.d.ts +2 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/closedContourEditLoop.js +211 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/closedContourEditLoop.js.map +1 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.d.ts +2 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.js +177 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.js.map +1 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/editLoopCommon.d.ts +2 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/editLoopCommon.js +125 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/editLoopCommon.js.map +1 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/openContourEditLoop.d.ts +2 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/openContourEditLoop.js +284 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/openContourEditLoop.js.map +1 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/openContourEndEditLoop.d.ts +2 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/openContourEndEditLoop.js +41 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/openContourEndEditLoop.js.map +1 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.d.ts +2 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.js +97 -0
- package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.js.map +1 -0
- package/dist/esm/tools/index.d.ts +2 -1
- package/dist/esm/tools/index.js +2 -1
- package/dist/esm/tools/index.js.map +1 -1
- package/dist/esm/types/AnnotationTypes.d.ts +1 -0
- package/dist/esm/types/ToolSpecificAnnotationTypes.d.ts +31 -0
- package/dist/esm/utilities/math/index.d.ts +2 -1
- package/dist/esm/utilities/math/index.js +2 -1
- package/dist/esm/utilities/math/index.js.map +1 -1
- package/dist/esm/utilities/math/polyline/addCanvasPointsToArray.d.ts +4 -0
- package/dist/esm/utilities/math/polyline/addCanvasPointsToArray.js +34 -0
- package/dist/esm/utilities/math/polyline/addCanvasPointsToArray.js.map +1 -0
- package/dist/esm/utilities/math/polyline/calculateAreaOfPoints.d.ts +2 -0
- package/dist/esm/utilities/math/polyline/calculateAreaOfPoints.js +11 -0
- package/dist/esm/utilities/math/polyline/calculateAreaOfPoints.js.map +1 -0
- package/dist/esm/utilities/math/polyline/getIntersectionWithPolyline.d.ts +7 -0
- package/dist/esm/utilities/math/polyline/getIntersectionWithPolyline.js +106 -0
- package/dist/esm/utilities/math/polyline/getIntersectionWithPolyline.js.map +1 -0
- package/dist/esm/utilities/math/polyline/getSubPixelSpacingAndXYDirections.d.ts +7 -0
- package/dist/esm/utilities/math/polyline/getSubPixelSpacingAndXYDirections.js +65 -0
- package/dist/esm/utilities/math/polyline/getSubPixelSpacingAndXYDirections.js.map +1 -0
- package/dist/esm/utilities/math/polyline/index.d.ts +7 -0
- package/dist/esm/utilities/math/polyline/index.js +8 -0
- package/dist/esm/utilities/math/polyline/index.js.map +1 -0
- package/dist/esm/utilities/math/polyline/planarFreehandROIInternalTypes.d.ts +22 -0
- package/dist/esm/utilities/math/polyline/planarFreehandROIInternalTypes.js +2 -0
- package/dist/esm/utilities/math/polyline/planarFreehandROIInternalTypes.js.map +1 -0
- package/dist/esm/utilities/math/polyline/pointCanProjectOnLine.d.ts +3 -0
- package/dist/esm/utilities/math/polyline/pointCanProjectOnLine.js +33 -0
- package/dist/esm/utilities/math/polyline/pointCanProjectOnLine.js.map +1 -0
- package/dist/esm/utilities/math/polyline/pointsAreWithinCloseContourProximity.d.ts +3 -0
- package/dist/esm/utilities/math/polyline/pointsAreWithinCloseContourProximity.js +6 -0
- package/dist/esm/utilities/math/polyline/pointsAreWithinCloseContourProximity.js.map +1 -0
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { Types } from '@cornerstonejs/core';
|
|
2
|
+
export default function drawPolyline(svgDrawingHelper: any, annotationUID: string, polylineUID: string, points: Types.Point2[], options: {
|
|
3
|
+
color?: string;
|
|
4
|
+
width?: number;
|
|
5
|
+
lineWidth?: number;
|
|
6
|
+
lineDash?: string;
|
|
7
|
+
connectLastToFirst?: boolean;
|
|
8
|
+
}): void;
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const _getHash_1 = __importDefault(require("./_getHash"));
|
|
7
|
+
const _setNewAttributesIfValid_1 = __importDefault(require("./_setNewAttributesIfValid"));
|
|
8
|
+
const _setAttributesIfNecessary_1 = __importDefault(require("./_setAttributesIfNecessary"));
|
|
9
|
+
function drawPolyline(svgDrawingHelper, annotationUID, polylineUID, points, options) {
|
|
10
|
+
if (points.length < 2) {
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
const { color, width, lineWidth, lineDash } = Object.assign({
|
|
14
|
+
color: 'dodgerblue',
|
|
15
|
+
width: '2',
|
|
16
|
+
lineWidth: undefined,
|
|
17
|
+
lineDash: undefined,
|
|
18
|
+
connectLastToFirst: false,
|
|
19
|
+
}, options);
|
|
20
|
+
const strokeWidth = lineWidth || width;
|
|
21
|
+
const svgns = 'http://www.w3.org/2000/svg';
|
|
22
|
+
const svgNodeHash = (0, _getHash_1.default)(annotationUID, 'polyline', polylineUID);
|
|
23
|
+
const existingPolyLine = svgDrawingHelper._getSvgNode(svgNodeHash);
|
|
24
|
+
let pointsAttribute = '';
|
|
25
|
+
for (const point of points) {
|
|
26
|
+
pointsAttribute += `${point[0]}, ${point[1]} `;
|
|
27
|
+
}
|
|
28
|
+
if (options.connectLastToFirst) {
|
|
29
|
+
const firstPoint = points[0];
|
|
30
|
+
pointsAttribute += `${firstPoint[0]}, ${firstPoint[1]}`;
|
|
31
|
+
}
|
|
32
|
+
const attributes = {
|
|
33
|
+
points: pointsAttribute,
|
|
34
|
+
stroke: color,
|
|
35
|
+
fill: 'none',
|
|
36
|
+
'stroke-width': strokeWidth,
|
|
37
|
+
'stroke-dasharray': lineDash,
|
|
38
|
+
};
|
|
39
|
+
if (existingPolyLine) {
|
|
40
|
+
(0, _setAttributesIfNecessary_1.default)(attributes, existingPolyLine);
|
|
41
|
+
svgDrawingHelper._setNodeTouched(svgNodeHash);
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
const newPolyLine = document.createElementNS(svgns, 'polyline');
|
|
45
|
+
(0, _setNewAttributesIfValid_1.default)(attributes, newPolyLine);
|
|
46
|
+
svgDrawingHelper._appendNode(newPolyLine, svgNodeHash);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
exports.default = drawPolyline;
|
|
50
|
+
//# sourceMappingURL=drawPolyline.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"drawPolyline.js","sourceRoot":"","sources":["../../../src/drawingSvg/drawPolyline.ts"],"names":[],"mappings":";;;;;AACA,0DAAkC;AAClC,0FAAkE;AAClE,4FAAoE;AAQpE,SAAwB,YAAY,CAClC,gBAAqB,EACrB,aAAqB,EACrB,WAAmB,EACnB,MAAsB,EACtB,OAMC;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,OAAO;KACR;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,CACzD;QACE,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,GAAG;QACV,SAAS,EAAE,SAAS;QACpB,QAAQ,EAAE,SAAS;QACnB,kBAAkB,EAAE,KAAK;KAC1B,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,UAAU,EAAE,WAAW,CAAC,CAAC;IACrE,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAEnE,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;KAChD;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,MAAM;QACZ,cAAc,EAAE,WAAW;QAC3B,kBAAkB,EAAE,QAAQ;KAC7B,CAAC;IAEF,IAAI,gBAAgB,EAAE;QAEpB,IAAA,mCAAyB,EAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAExD,gBAAgB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;KAC/C;SAAM;QACL,MAAM,WAAW,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAEhE,IAAA,kCAAwB,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAElD,gBAAgB,CAAC,WAAW,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;KACxD;AACH,CAAC;AAnED,+BAmEC"}
|
|
@@ -3,8 +3,9 @@ import drawCircle from './drawCircle';
|
|
|
3
3
|
import drawEllipse from './drawEllipse';
|
|
4
4
|
import drawHandles from './drawHandles';
|
|
5
5
|
import drawLine from './drawLine';
|
|
6
|
+
import drawPolyline from './drawPolyline';
|
|
6
7
|
import drawLinkedTextBox from './drawLinkedTextBox';
|
|
7
8
|
import drawRect from './drawRect';
|
|
8
9
|
import drawTextBox from './drawTextBox';
|
|
9
10
|
import drawArrow from './drawArrow';
|
|
10
|
-
export { draw, drawCircle, drawEllipse, drawHandles, drawLine, drawLinkedTextBox, drawRect, drawTextBox, drawArrow, };
|
|
11
|
+
export { draw, drawCircle, drawEllipse, drawHandles, drawLine, drawPolyline, drawLinkedTextBox, drawRect, drawTextBox, drawArrow, };
|
|
@@ -3,7 +3,7 @@ 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
|
-
exports.drawArrow = exports.drawTextBox = exports.drawRect = exports.drawLinkedTextBox = exports.drawLine = exports.drawHandles = exports.drawEllipse = exports.drawCircle = exports.draw = void 0;
|
|
6
|
+
exports.drawArrow = exports.drawTextBox = exports.drawRect = exports.drawLinkedTextBox = exports.drawPolyline = exports.drawLine = exports.drawHandles = exports.drawEllipse = exports.drawCircle = exports.draw = void 0;
|
|
7
7
|
const draw_1 = __importDefault(require("./draw"));
|
|
8
8
|
exports.draw = draw_1.default;
|
|
9
9
|
const drawCircle_1 = __importDefault(require("./drawCircle"));
|
|
@@ -14,6 +14,8 @@ const drawHandles_1 = __importDefault(require("./drawHandles"));
|
|
|
14
14
|
exports.drawHandles = drawHandles_1.default;
|
|
15
15
|
const drawLine_1 = __importDefault(require("./drawLine"));
|
|
16
16
|
exports.drawLine = drawLine_1.default;
|
|
17
|
+
const drawPolyline_1 = __importDefault(require("./drawPolyline"));
|
|
18
|
+
exports.drawPolyline = drawPolyline_1.default;
|
|
17
19
|
const drawLinkedTextBox_1 = __importDefault(require("./drawLinkedTextBox"));
|
|
18
20
|
exports.drawLinkedTextBox = drawLinkedTextBox_1.default;
|
|
19
21
|
const drawRect_1 = __importDefault(require("./drawRect"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/drawingSvg/index.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/drawingSvg/index.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAYxB,eAZK,cAAI,CAYL;AAXN,8DAAsC;AAYpC,qBAZK,oBAAU,CAYL;AAXZ,gEAAwC;AAYtC,sBAZK,qBAAW,CAYL;AAXb,gEAAwC;AAYtC,sBAZK,qBAAW,CAYL;AAXb,0DAAkC;AAYhC,mBAZK,kBAAQ,CAYL;AAXV,kEAA0C;AAYxC,uBAZK,sBAAY,CAYL;AAXd,4EAAoD;AAYlD,4BAZK,2BAAiB,CAYL;AAXnB,0DAAkC;AAYhC,mBAZK,kBAAQ,CAYL;AAXV,gEAAwC;AAYtC,sBAZK,qBAAW,CAYL;AAXb,4DAAoC;AAYlC,oBAZK,mBAAS,CAYL"}
|
package/dist/cjs/index.d.ts
CHANGED
|
@@ -8,6 +8,6 @@ import * as cursors from './cursors';
|
|
|
8
8
|
import * as Types from './types';
|
|
9
9
|
import * as annotation from './stateManagement/annotation';
|
|
10
10
|
import * as segmentation from './stateManagement/segmentation';
|
|
11
|
-
import { BaseTool, AnnotationTool, PanTool, WindowLevelTool, ZoomTool, StackScrollTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, ProbeTool, RectangleROITool, EllipticalROITool, BidirectionalTool, ArrowTool, CrosshairsTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, SegmentationDisplayTool, BrushTool } from './tools';
|
|
11
|
+
import { BaseTool, AnnotationTool, PanTool, WindowLevelTool, ZoomTool, StackScrollTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, ProbeTool, RectangleROITool, EllipticalROITool, BidirectionalTool, PlanarFreehandROITool, ArrowTool, CrosshairsTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, SegmentationDisplayTool, BrushTool } from './tools';
|
|
12
12
|
import * as Enums from './enums';
|
|
13
|
-
export { init, destroy, addTool, removeTool, cancelActiveManipulations, BaseTool, AnnotationTool, PanTool, WindowLevelTool, ZoomTool, StackScrollTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, CrosshairsTool, ProbeTool, RectangleROITool, EllipticalROITool, BidirectionalTool, ArrowTool, SegmentationDisplayTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, BrushTool, synchronizers, Synchronizer, SynchronizerManager, Types, ToolGroupManager, Enums, CONSTANTS, drawing, annotation, segmentation, utilities, cursors, };
|
|
13
|
+
export { init, destroy, addTool, removeTool, cancelActiveManipulations, BaseTool, AnnotationTool, PanTool, WindowLevelTool, ZoomTool, StackScrollTool, StackScrollMouseWheelTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, LengthTool, CrosshairsTool, ProbeTool, RectangleROITool, EllipticalROITool, BidirectionalTool, PlanarFreehandROITool, ArrowTool, SegmentationDisplayTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, BrushTool, synchronizers, Synchronizer, SynchronizerManager, Types, ToolGroupManager, Enums, CONSTANTS, drawing, annotation, segmentation, utilities, cursors, };
|
package/dist/cjs/index.js
CHANGED
|
@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
21
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.cursors = exports.utilities = exports.segmentation = exports.annotation = exports.drawing = exports.CONSTANTS = exports.Enums = exports.ToolGroupManager = exports.Types = exports.SynchronizerManager = exports.Synchronizer = exports.synchronizers = exports.BrushTool = exports.RectangleROIStartEndThresholdTool = exports.RectangleROIThresholdTool = exports.SphereScissorsTool = exports.CircleScissorsTool = exports.RectangleScissorsTool = exports.SegmentationDisplayTool = exports.ArrowTool = exports.BidirectionalTool = exports.EllipticalROITool = exports.RectangleROITool = exports.ProbeTool = exports.CrosshairsTool = exports.LengthTool = exports.MIPJumpToClickTool = exports.VolumeRotateMouseWheelTool = exports.StackScrollMouseWheelTool = exports.StackScrollTool = exports.ZoomTool = exports.WindowLevelTool = exports.PanTool = exports.AnnotationTool = exports.BaseTool = exports.cancelActiveManipulations = exports.removeTool = exports.addTool = exports.destroy = exports.init = void 0;
|
|
22
|
+
exports.cursors = exports.utilities = exports.segmentation = exports.annotation = exports.drawing = exports.CONSTANTS = exports.Enums = exports.ToolGroupManager = exports.Types = exports.SynchronizerManager = exports.Synchronizer = exports.synchronizers = exports.BrushTool = exports.RectangleROIStartEndThresholdTool = exports.RectangleROIThresholdTool = exports.SphereScissorsTool = exports.CircleScissorsTool = exports.RectangleScissorsTool = exports.SegmentationDisplayTool = exports.ArrowTool = exports.PlanarFreehandROITool = exports.BidirectionalTool = exports.EllipticalROITool = exports.RectangleROITool = exports.ProbeTool = exports.CrosshairsTool = exports.LengthTool = exports.MIPJumpToClickTool = exports.VolumeRotateMouseWheelTool = exports.StackScrollMouseWheelTool = exports.StackScrollTool = exports.ZoomTool = exports.WindowLevelTool = exports.PanTool = exports.AnnotationTool = exports.BaseTool = exports.cancelActiveManipulations = exports.removeTool = exports.addTool = exports.destroy = exports.init = void 0;
|
|
23
23
|
const init_1 = require("./init");
|
|
24
24
|
Object.defineProperty(exports, "init", { enumerable: true, get: function () { return init_1.init; } });
|
|
25
25
|
Object.defineProperty(exports, "destroy", { enumerable: true, get: function () { return init_1.destroy; } });
|
|
@@ -61,6 +61,7 @@ Object.defineProperty(exports, "ProbeTool", { enumerable: true, get: function ()
|
|
|
61
61
|
Object.defineProperty(exports, "RectangleROITool", { enumerable: true, get: function () { return tools_1.RectangleROITool; } });
|
|
62
62
|
Object.defineProperty(exports, "EllipticalROITool", { enumerable: true, get: function () { return tools_1.EllipticalROITool; } });
|
|
63
63
|
Object.defineProperty(exports, "BidirectionalTool", { enumerable: true, get: function () { return tools_1.BidirectionalTool; } });
|
|
64
|
+
Object.defineProperty(exports, "PlanarFreehandROITool", { enumerable: true, get: function () { return tools_1.PlanarFreehandROITool; } });
|
|
64
65
|
Object.defineProperty(exports, "ArrowTool", { enumerable: true, get: function () { return tools_1.ArrowTool; } });
|
|
65
66
|
Object.defineProperty(exports, "CrosshairsTool", { enumerable: true, get: function () { return tools_1.CrosshairsTool; } });
|
|
66
67
|
Object.defineProperty(exports, "RectangleScissorsTool", { enumerable: true, get: function () { return tools_1.RectangleScissorsTool; } });
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAuC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAuC;AAoDrC,qFApDO,WAAI,OAoDP;AACJ,wFArDa,cAAO,OAqDb;AApDT,mCAOiB;AA8Cf,wFApDA,eAAO,OAoDA;AACP,2FApDA,kBAAU,OAoDA;AAqCV,iGAxFA,wBAAgB,OAwFA;AAHhB,oGApFA,2BAAmB,OAoFA;AADnB,6FAlFA,oBAAY,OAkFA;AAhCZ,0GAjDA,iCAAyB,OAiDA;AA9C3B,uDAAyC;AAsFvC,8BAAS;AAnFX,+DAAiD;AA0E/C,sCAAa;AAzEf,sDAAwC;AAoFtC,0BAAO;AAnFT,uDAAyC;AAyFvC,8BAAS;AAxFX,mDAAqC;AAyFnC,0BAAO;AAxFT,+CAAiC;AAyE/B,sBAAK;AAxEP,yEAA2D;AAkFzD,gCAAU;AAjFZ,6EAA+D;AAmF7D,oCAAY;AAjFd,mCAyBiB;AAYf,yFApCA,gBAAQ,OAoCA;AACR,+FApCA,sBAAc,OAoCA;AAEd,wFArCA,eAAO,OAqCA;AACP,gGArCA,uBAAe,OAqCA;AACf,yFArCA,gBAAQ,OAqCA;AACR,gGArCA,uBAAe,OAqCA;AACf,0GArCA,iCAAyB,OAqCA;AACzB,2GArCA,kCAA0B,OAqCA;AAC1B,mGArCA,0BAAkB,OAqCA;AAElB,2FAtCA,kBAAU,OAsCA;AAEV,0FAvCA,iBAAS,OAuCA;AACT,iGAvCA,wBAAgB,OAuCA;AAChB,kGAvCA,yBAAiB,OAuCA;AACjB,kGAvCA,yBAAiB,OAuCA;AACjB,sGAvCA,6BAAqB,OAuCA;AACrB,0FAvCA,iBAAS,OAuCA;AANT,+FAhCA,sBAAc,OAgCA;AAUd,sGAzCA,6BAAqB,OAyCA;AACrB,mGAzCA,0BAAkB,OAyCA;AAClB,mGAzCA,0BAAkB,OAyCA;AAClB,0GAzCA,iCAAyB,OAyCA;AACzB,kHAzCA,yCAAiC,OAyCA;AANjC,wGAlCA,+BAAuB,OAkCA;AAOvB,0FAxCA,iBAAS,OAwCA;AArCX,+CAAiC;AA8C/B,sBAAK"}
|
|
@@ -6,7 +6,7 @@ const enums_1 = require("../../../enums");
|
|
|
6
6
|
core_1.Settings.getDefaultSettings().set('tool.style', {
|
|
7
7
|
color: 'rgb(255, 255, 0)',
|
|
8
8
|
colorHighlighted: 'rgb(0, 255, 0)',
|
|
9
|
-
colorSelected: 'rgb(0,
|
|
9
|
+
colorSelected: 'rgb(0, 220, 0)',
|
|
10
10
|
colorLocked: 'rgb(255, 255, 0)',
|
|
11
11
|
lineWidth: '1',
|
|
12
12
|
lineDash: '',
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import type { Types } from '@cornerstonejs/core';
|
|
2
|
+
import { AnnotationTool } from '../base';
|
|
3
|
+
import { EventTypes, ToolHandle, PublicToolProps, ToolProps, InteractionTypes } from '../../types';
|
|
4
|
+
import { PlanarFreehandROIAnnotation } from '../../types/ToolSpecificAnnotationTypes';
|
|
5
|
+
declare class PlanarFreehandROITool extends AnnotationTool {
|
|
6
|
+
static toolName: string;
|
|
7
|
+
touchDragCallback: any;
|
|
8
|
+
mouseDragCallback: any;
|
|
9
|
+
_throttledCalculateCachedStats: any;
|
|
10
|
+
private commonData?;
|
|
11
|
+
isDrawing: boolean;
|
|
12
|
+
isEditingClosed: boolean;
|
|
13
|
+
isEditingOpen: boolean;
|
|
14
|
+
private activateDraw;
|
|
15
|
+
private activateClosedContourEdit;
|
|
16
|
+
private activateOpenContourEdit;
|
|
17
|
+
private activateOpenContourEndEdit;
|
|
18
|
+
private renderContour;
|
|
19
|
+
private renderContourBeingDrawn;
|
|
20
|
+
private renderClosedContourBeingEdited;
|
|
21
|
+
private renderOpenContourBeingEdited;
|
|
22
|
+
constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
|
|
23
|
+
addNewAnnotation: (evt: EventTypes.MouseDownActivateEventType) => PlanarFreehandROIAnnotation;
|
|
24
|
+
handleSelectedCallback: (evt: EventTypes.MouseDownEventType, annotation: PlanarFreehandROIAnnotation, handle: ToolHandle, interactionType?: string) => void;
|
|
25
|
+
toolSelectedCallback: (evt: EventTypes.MouseDownEventType, annotation: PlanarFreehandROIAnnotation, interactionType: InteractionTypes) => void;
|
|
26
|
+
isPointNearTool: (element: HTMLDivElement, annotation: PlanarFreehandROIAnnotation, canvasCoords: Types.Point2, proximity: number) => boolean;
|
|
27
|
+
cancel: (element: HTMLDivElement) => void;
|
|
28
|
+
triggerAnnotationModified: (annotation: PlanarFreehandROIAnnotation, enabledElement: Types.IEnabledElement) => void;
|
|
29
|
+
triggerAnnotationCompleted: (annotation: PlanarFreehandROIAnnotation) => void;
|
|
30
|
+
renderAnnotation: (enabledElement: Types.IEnabledElement, svgDrawingHelper: any) => void;
|
|
31
|
+
}
|
|
32
|
+
export default PlanarFreehandROITool;
|
|
@@ -0,0 +1,192 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const core_1 = require("@cornerstonejs/core");
|
|
7
|
+
const enums_1 = require("../../enums");
|
|
8
|
+
const base_1 = require("../base");
|
|
9
|
+
const annotationState_1 = require("../../stateManagement/annotation/annotationState");
|
|
10
|
+
const math_1 = require("../../utilities/math");
|
|
11
|
+
const viewportFilters_1 = require("../../utilities/viewportFilters");
|
|
12
|
+
const triggerAnnotationRenderForViewportIds_1 = __importDefault(require("../../utilities/triggerAnnotationRenderForViewportIds"));
|
|
13
|
+
const drawLoop_1 = __importDefault(require("./planarFreehandROITool/drawLoop"));
|
|
14
|
+
const editLoopCommon_1 = __importDefault(require("./planarFreehandROITool/editLoopCommon"));
|
|
15
|
+
const closedContourEditLoop_1 = __importDefault(require("./planarFreehandROITool/closedContourEditLoop"));
|
|
16
|
+
const openContourEditLoop_1 = __importDefault(require("./planarFreehandROITool/openContourEditLoop"));
|
|
17
|
+
const openContourEndEditLoop_1 = __importDefault(require("./planarFreehandROITool/openContourEndEditLoop"));
|
|
18
|
+
const renderMethods_1 = __importDefault(require("./planarFreehandROITool/renderMethods"));
|
|
19
|
+
const { pointCanProjectOnLine } = math_1.polyline;
|
|
20
|
+
class PlanarFreehandROITool extends base_1.AnnotationTool {
|
|
21
|
+
constructor(toolProps = {}, defaultToolProps = {
|
|
22
|
+
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
23
|
+
configuration: {
|
|
24
|
+
shadow: true,
|
|
25
|
+
preventHandleOutsideImage: false,
|
|
26
|
+
allowOpenContours: true,
|
|
27
|
+
closeContourProximity: 10,
|
|
28
|
+
checkCanvasEditFallbackProximity: 6,
|
|
29
|
+
subPixelResolution: 4,
|
|
30
|
+
},
|
|
31
|
+
}) {
|
|
32
|
+
super(toolProps, defaultToolProps);
|
|
33
|
+
this.isDrawing = false;
|
|
34
|
+
this.isEditingClosed = false;
|
|
35
|
+
this.isEditingOpen = false;
|
|
36
|
+
this.addNewAnnotation = (evt) => {
|
|
37
|
+
const eventDetail = evt.detail;
|
|
38
|
+
const { currentPoints, element } = eventDetail;
|
|
39
|
+
const worldPos = currentPoints.world;
|
|
40
|
+
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
41
|
+
const { viewport, renderingEngine } = enabledElement;
|
|
42
|
+
const camera = viewport.getCamera();
|
|
43
|
+
const { viewPlaneNormal, viewUp } = camera;
|
|
44
|
+
const referencedImageId = this.getReferencedImageId(viewport, worldPos, viewPlaneNormal, viewUp);
|
|
45
|
+
const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element, this.getToolName());
|
|
46
|
+
const annotation = {
|
|
47
|
+
highlighted: true,
|
|
48
|
+
invalidated: true,
|
|
49
|
+
metadata: {
|
|
50
|
+
viewPlaneNormal: [...viewPlaneNormal],
|
|
51
|
+
viewUp: [...viewUp],
|
|
52
|
+
FrameOfReferenceUID: viewport.getFrameOfReferenceUID(),
|
|
53
|
+
referencedImageId,
|
|
54
|
+
toolName: this.getToolName(),
|
|
55
|
+
},
|
|
56
|
+
data: {
|
|
57
|
+
handles: {
|
|
58
|
+
points: [],
|
|
59
|
+
activeHandleIndex: null,
|
|
60
|
+
textBox: {
|
|
61
|
+
hasMoved: false,
|
|
62
|
+
worldPosition: [0, 0, 0],
|
|
63
|
+
worldBoundingBox: {
|
|
64
|
+
topLeft: [0, 0, 0],
|
|
65
|
+
topRight: [0, 0, 0],
|
|
66
|
+
bottomLeft: [0, 0, 0],
|
|
67
|
+
bottomRight: [0, 0, 0],
|
|
68
|
+
},
|
|
69
|
+
},
|
|
70
|
+
},
|
|
71
|
+
polyline: [[...worldPos]],
|
|
72
|
+
label: '',
|
|
73
|
+
},
|
|
74
|
+
};
|
|
75
|
+
core_1.Settings.getObjectSettings(annotation, PlanarFreehandROITool);
|
|
76
|
+
(0, annotationState_1.addAnnotation)(element, annotation);
|
|
77
|
+
this.activateDraw(evt, annotation, viewportIdsToRender);
|
|
78
|
+
evt.preventDefault();
|
|
79
|
+
(0, triggerAnnotationRenderForViewportIds_1.default)(renderingEngine, viewportIdsToRender);
|
|
80
|
+
return annotation;
|
|
81
|
+
};
|
|
82
|
+
this.handleSelectedCallback = (evt, annotation, handle, interactionType = 'mouse') => {
|
|
83
|
+
const eventDetail = evt.detail;
|
|
84
|
+
const { element } = eventDetail;
|
|
85
|
+
const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element, this.getToolName());
|
|
86
|
+
this.activateOpenContourEndEdit(evt, annotation, viewportIdsToRender);
|
|
87
|
+
};
|
|
88
|
+
this.toolSelectedCallback = (evt, annotation, interactionType) => {
|
|
89
|
+
const eventDetail = evt.detail;
|
|
90
|
+
const { element } = eventDetail;
|
|
91
|
+
const viewportIdsToRender = (0, viewportFilters_1.getViewportIdsWithToolToRender)(element, this.getToolName());
|
|
92
|
+
if (annotation.data.isOpenContour) {
|
|
93
|
+
this.activateOpenContourEdit(evt, annotation, viewportIdsToRender);
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
this.activateClosedContourEdit(evt, annotation, viewportIdsToRender);
|
|
97
|
+
}
|
|
98
|
+
};
|
|
99
|
+
this.isPointNearTool = (element, annotation, canvasCoords, proximity) => {
|
|
100
|
+
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
101
|
+
const { viewport } = enabledElement;
|
|
102
|
+
const points = annotation.data.polyline;
|
|
103
|
+
let previousPoint = viewport.worldToCanvas(points[0]);
|
|
104
|
+
for (let i = 1; i < points.length; i++) {
|
|
105
|
+
const p1 = previousPoint;
|
|
106
|
+
const p2 = viewport.worldToCanvas(points[i]);
|
|
107
|
+
const distance = pointCanProjectOnLine(canvasCoords, p1, p2, proximity);
|
|
108
|
+
if (distance === true) {
|
|
109
|
+
return true;
|
|
110
|
+
}
|
|
111
|
+
previousPoint = p2;
|
|
112
|
+
}
|
|
113
|
+
if (annotation.data.isOpenContour) {
|
|
114
|
+
return false;
|
|
115
|
+
}
|
|
116
|
+
const pStart = viewport.worldToCanvas(points[0]);
|
|
117
|
+
const pEnd = viewport.worldToCanvas(points[points.length - 1]);
|
|
118
|
+
const distance = pointCanProjectOnLine(canvasCoords, pStart, pEnd, proximity);
|
|
119
|
+
if (distance === true) {
|
|
120
|
+
return true;
|
|
121
|
+
}
|
|
122
|
+
return false;
|
|
123
|
+
};
|
|
124
|
+
this.cancel = (element) => {
|
|
125
|
+
};
|
|
126
|
+
this.triggerAnnotationModified = (annotation, enabledElement) => {
|
|
127
|
+
const { viewportId, renderingEngineId } = enabledElement;
|
|
128
|
+
const eventType = enums_1.Events.ANNOTATION_MODIFIED;
|
|
129
|
+
const eventDetail = {
|
|
130
|
+
annotation,
|
|
131
|
+
viewportId,
|
|
132
|
+
renderingEngineId,
|
|
133
|
+
};
|
|
134
|
+
(0, core_1.triggerEvent)(core_1.eventTarget, eventType, eventDetail);
|
|
135
|
+
};
|
|
136
|
+
this.triggerAnnotationCompleted = (annotation) => {
|
|
137
|
+
const eventType = enums_1.Events.ANNOTATION_COMPLETED;
|
|
138
|
+
const eventDetail = {
|
|
139
|
+
annotation,
|
|
140
|
+
};
|
|
141
|
+
(0, core_1.triggerEvent)(core_1.eventTarget, eventType, eventDetail);
|
|
142
|
+
};
|
|
143
|
+
this.renderAnnotation = (enabledElement, svgDrawingHelper) => {
|
|
144
|
+
const { viewport } = enabledElement;
|
|
145
|
+
const { element } = viewport;
|
|
146
|
+
let annotations = ((0, annotationState_1.getAnnotations)(element, this.getToolName()));
|
|
147
|
+
if (!(annotations === null || annotations === void 0 ? void 0 : annotations.length)) {
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
150
|
+
annotations = this.filterInteractableAnnotationsForElement(element, annotations);
|
|
151
|
+
if (!(annotations === null || annotations === void 0 ? void 0 : annotations.length)) {
|
|
152
|
+
return;
|
|
153
|
+
}
|
|
154
|
+
const isDrawing = this.isDrawing;
|
|
155
|
+
const isEditingOpen = this.isEditingOpen;
|
|
156
|
+
const isEditingClosed = this.isEditingClosed;
|
|
157
|
+
if (!(isDrawing || isEditingOpen || isEditingClosed)) {
|
|
158
|
+
annotations.forEach((annotation) => this.renderContour(enabledElement, svgDrawingHelper, annotation));
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
const activeAnnotationUID = this.commonData.annotation.annotationUID;
|
|
162
|
+
annotations.forEach((annotation) => {
|
|
163
|
+
if (annotation.annotationUID === activeAnnotationUID) {
|
|
164
|
+
if (isDrawing) {
|
|
165
|
+
this.renderContourBeingDrawn(enabledElement, svgDrawingHelper, annotation);
|
|
166
|
+
}
|
|
167
|
+
else if (isEditingClosed) {
|
|
168
|
+
this.renderClosedContourBeingEdited(enabledElement, svgDrawingHelper, annotation);
|
|
169
|
+
}
|
|
170
|
+
else if (isEditingOpen) {
|
|
171
|
+
this.renderOpenContourBeingEdited(enabledElement, svgDrawingHelper, annotation);
|
|
172
|
+
}
|
|
173
|
+
else {
|
|
174
|
+
throw new Error(`Unknown ${this.getToolName()} annotation rendering state`);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
else {
|
|
178
|
+
this.renderContour(enabledElement, svgDrawingHelper, annotation);
|
|
179
|
+
}
|
|
180
|
+
});
|
|
181
|
+
};
|
|
182
|
+
(0, drawLoop_1.default)(this);
|
|
183
|
+
(0, editLoopCommon_1.default)(this);
|
|
184
|
+
(0, closedContourEditLoop_1.default)(this);
|
|
185
|
+
(0, openContourEditLoop_1.default)(this);
|
|
186
|
+
(0, openContourEndEditLoop_1.default)(this);
|
|
187
|
+
(0, renderMethods_1.default)(this);
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
PlanarFreehandROITool.toolName = 'PlanarFreehandROI';
|
|
191
|
+
exports.default = PlanarFreehandROITool;
|
|
192
|
+
//# sourceMappingURL=PlanarFreehandROITool.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PlanarFreehandROITool.js","sourceRoot":"","sources":["../../../../src/tools/annotation/PlanarFreehandROITool.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,216 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const core_1 = require("@cornerstonejs/core");
|
|
7
|
+
const store_1 = require("../../../store");
|
|
8
|
+
const enums_1 = require("../../../enums");
|
|
9
|
+
const elementCursor_1 = require("../../../cursors/elementCursor");
|
|
10
|
+
const math_1 = require("../../../utilities/math");
|
|
11
|
+
const gl_matrix_1 = require("gl-matrix");
|
|
12
|
+
const triggerAnnotationRenderForViewportIds_1 = __importDefault(require("../../../utilities/triggerAnnotationRenderForViewportIds"));
|
|
13
|
+
const { getSubPixelSpacingAndXYDirections, addCanvasPointsToArray, calculateAreaOfPoints, } = math_1.polyline;
|
|
14
|
+
function activateClosedContourEdit(evt, annotation, viewportIdsToRender) {
|
|
15
|
+
this.isEditingClosed = true;
|
|
16
|
+
const eventDetail = evt.detail;
|
|
17
|
+
const { currentPoints, element } = eventDetail;
|
|
18
|
+
const canvasPos = currentPoints.canvas;
|
|
19
|
+
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
20
|
+
const { viewport } = enabledElement;
|
|
21
|
+
const prevCanvasPoints = annotation.data.polyline.map(viewport.worldToCanvas);
|
|
22
|
+
const { spacing, xDir, yDir } = getSubPixelSpacingAndXYDirections(viewport, this.configuration.subPixelResolution);
|
|
23
|
+
this.editData = {
|
|
24
|
+
prevCanvasPoints,
|
|
25
|
+
editCanvasPoints: [canvasPos],
|
|
26
|
+
startCrossingIndex: undefined,
|
|
27
|
+
editIndex: 0,
|
|
28
|
+
};
|
|
29
|
+
this.commonData = {
|
|
30
|
+
annotation,
|
|
31
|
+
viewportIdsToRender,
|
|
32
|
+
spacing,
|
|
33
|
+
xDir,
|
|
34
|
+
yDir,
|
|
35
|
+
};
|
|
36
|
+
store_1.state.isInteractingWithTool = true;
|
|
37
|
+
element.addEventListener(enums_1.Events.MOUSE_UP, this.mouseUpClosedContourEditCallback);
|
|
38
|
+
element.addEventListener(enums_1.Events.MOUSE_DRAG, this.mouseDragClosedContourEditCallback);
|
|
39
|
+
element.addEventListener(enums_1.Events.MOUSE_CLICK, this.mouseUpClosedContourEditCallback);
|
|
40
|
+
(0, elementCursor_1.hideElementCursor)(element);
|
|
41
|
+
}
|
|
42
|
+
function deactivateClosedContourEdit(element) {
|
|
43
|
+
store_1.state.isInteractingWithTool = false;
|
|
44
|
+
element.removeEventListener(enums_1.Events.MOUSE_UP, this.mouseUpClosedContourEditCallback);
|
|
45
|
+
element.removeEventListener(enums_1.Events.MOUSE_DRAG, this.mouseDragClosedContourEditCallback);
|
|
46
|
+
element.removeEventListener(enums_1.Events.MOUSE_CLICK, this.mouseUpClosedContourEditCallback);
|
|
47
|
+
(0, elementCursor_1.resetElementCursor)(element);
|
|
48
|
+
}
|
|
49
|
+
function mouseDragClosedContourEditCallback(evt) {
|
|
50
|
+
const eventDetail = evt.detail;
|
|
51
|
+
const { currentPoints, element } = eventDetail;
|
|
52
|
+
const worldPos = currentPoints.world;
|
|
53
|
+
const canvasPos = currentPoints.canvas;
|
|
54
|
+
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
55
|
+
const { renderingEngine, viewport } = enabledElement;
|
|
56
|
+
const { viewportIdsToRender, xDir, yDir, spacing } = this.commonData;
|
|
57
|
+
const { editIndex, editCanvasPoints, startCrossingIndex } = this.editData;
|
|
58
|
+
const lastCanvasPoint = editCanvasPoints[editCanvasPoints.length - 1];
|
|
59
|
+
const lastWorldPoint = viewport.canvasToWorld(lastCanvasPoint);
|
|
60
|
+
const worldPosDiff = gl_matrix_1.vec3.create();
|
|
61
|
+
gl_matrix_1.vec3.subtract(worldPosDiff, worldPos, lastWorldPoint);
|
|
62
|
+
const xDist = Math.abs(gl_matrix_1.vec3.dot(worldPosDiff, xDir));
|
|
63
|
+
const yDist = Math.abs(gl_matrix_1.vec3.dot(worldPosDiff, yDir));
|
|
64
|
+
if (xDist <= spacing[0] && yDist <= spacing[1]) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
const numPointsAdded = addCanvasPointsToArray(element, editCanvasPoints, canvasPos, this.commonData);
|
|
68
|
+
const currentEditIndex = editIndex + numPointsAdded;
|
|
69
|
+
this.editData.editIndex = currentEditIndex;
|
|
70
|
+
if (startCrossingIndex === undefined && editCanvasPoints.length > 1) {
|
|
71
|
+
this.checkForFirstCrossing(evt, true);
|
|
72
|
+
}
|
|
73
|
+
this.editData.snapIndex = this.findSnapIndex();
|
|
74
|
+
if (this.editData.snapIndex === -1) {
|
|
75
|
+
this.finishEditAndStartNewEdit(evt);
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
this.editData.fusedCanvasPoints = this.fuseEditPointsWithClosedContour(evt);
|
|
79
|
+
if (startCrossingIndex !== undefined &&
|
|
80
|
+
this.checkForSecondCrossing(evt, true)) {
|
|
81
|
+
this.removePointsAfterSecondCrossing(true);
|
|
82
|
+
this.finishEditAndStartNewEdit(evt);
|
|
83
|
+
}
|
|
84
|
+
(0, triggerAnnotationRenderForViewportIds_1.default)(renderingEngine, viewportIdsToRender);
|
|
85
|
+
}
|
|
86
|
+
function finishEditAndStartNewEdit(evt) {
|
|
87
|
+
const eventDetail = evt.detail;
|
|
88
|
+
const { element } = eventDetail;
|
|
89
|
+
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
90
|
+
const { viewport, renderingEngine } = enabledElement;
|
|
91
|
+
const { annotation, viewportIdsToRender } = this.commonData;
|
|
92
|
+
const { fusedCanvasPoints, editCanvasPoints } = this.editData;
|
|
93
|
+
const worldPoints = fusedCanvasPoints.map((canvasPoint) => viewport.canvasToWorld(canvasPoint));
|
|
94
|
+
annotation.data.polyline = worldPoints;
|
|
95
|
+
annotation.data.isOpenContour = false;
|
|
96
|
+
this.triggerAnnotationModified(annotation, enabledElement);
|
|
97
|
+
const lastEditCanvasPoint = editCanvasPoints.pop();
|
|
98
|
+
this.editData = {
|
|
99
|
+
prevCanvasPoints: fusedCanvasPoints,
|
|
100
|
+
editCanvasPoints: [lastEditCanvasPoint],
|
|
101
|
+
startCrossingIndex: undefined,
|
|
102
|
+
editIndex: 0,
|
|
103
|
+
snapIndex: undefined,
|
|
104
|
+
};
|
|
105
|
+
(0, triggerAnnotationRenderForViewportIds_1.default)(renderingEngine, viewportIdsToRender);
|
|
106
|
+
}
|
|
107
|
+
function fuseEditPointsWithClosedContour(evt) {
|
|
108
|
+
const { prevCanvasPoints, editCanvasPoints, startCrossingIndex, snapIndex } = this.editData;
|
|
109
|
+
if (startCrossingIndex === undefined || snapIndex === undefined) {
|
|
110
|
+
return;
|
|
111
|
+
}
|
|
112
|
+
const eventDetail = evt.detail;
|
|
113
|
+
const { element } = eventDetail;
|
|
114
|
+
const augmentedEditCanvasPoints = [...editCanvasPoints];
|
|
115
|
+
addCanvasPointsToArray(element, augmentedEditCanvasPoints, prevCanvasPoints[snapIndex], this.commonData);
|
|
116
|
+
if (augmentedEditCanvasPoints.length > editCanvasPoints.length) {
|
|
117
|
+
augmentedEditCanvasPoints.pop();
|
|
118
|
+
}
|
|
119
|
+
let lowIndex;
|
|
120
|
+
let highIndex;
|
|
121
|
+
if (startCrossingIndex > snapIndex) {
|
|
122
|
+
lowIndex = snapIndex;
|
|
123
|
+
highIndex = startCrossingIndex;
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
lowIndex = startCrossingIndex;
|
|
127
|
+
highIndex = snapIndex;
|
|
128
|
+
}
|
|
129
|
+
const distanceBetweenLowAndFirstPoint = gl_matrix_1.vec2.distance(prevCanvasPoints[lowIndex], augmentedEditCanvasPoints[0]);
|
|
130
|
+
const distanceBetweenLowAndLastPoint = gl_matrix_1.vec2.distance(prevCanvasPoints[lowIndex], augmentedEditCanvasPoints[augmentedEditCanvasPoints.length - 1]);
|
|
131
|
+
const distanceBetweenHighAndFirstPoint = gl_matrix_1.vec2.distance(prevCanvasPoints[highIndex], augmentedEditCanvasPoints[0]);
|
|
132
|
+
const distanceBetweenHighAndLastPoint = gl_matrix_1.vec2.distance(prevCanvasPoints[highIndex], augmentedEditCanvasPoints[augmentedEditCanvasPoints.length - 1]);
|
|
133
|
+
const pointSet1 = [];
|
|
134
|
+
for (let i = 0; i < lowIndex; i++) {
|
|
135
|
+
const canvasPoint = prevCanvasPoints[i];
|
|
136
|
+
pointSet1.push([canvasPoint[0], canvasPoint[1]]);
|
|
137
|
+
}
|
|
138
|
+
let inPlaceDistance = distanceBetweenLowAndFirstPoint + distanceBetweenHighAndLastPoint;
|
|
139
|
+
let reverseDistance = distanceBetweenLowAndLastPoint + distanceBetweenHighAndFirstPoint;
|
|
140
|
+
if (inPlaceDistance < reverseDistance) {
|
|
141
|
+
for (let i = 0; i < augmentedEditCanvasPoints.length; i++) {
|
|
142
|
+
const canvasPoint = augmentedEditCanvasPoints[i];
|
|
143
|
+
pointSet1.push([canvasPoint[0], canvasPoint[1]]);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
for (let i = augmentedEditCanvasPoints.length - 1; i >= 0; i--) {
|
|
148
|
+
const canvasPoint = augmentedEditCanvasPoints[i];
|
|
149
|
+
pointSet1.push([canvasPoint[0], canvasPoint[1]]);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
for (let i = highIndex; i < prevCanvasPoints.length; i++) {
|
|
153
|
+
const canvasPoint = prevCanvasPoints[i];
|
|
154
|
+
pointSet1.push([canvasPoint[0], canvasPoint[1]]);
|
|
155
|
+
}
|
|
156
|
+
const pointSet2 = [];
|
|
157
|
+
for (let i = lowIndex; i < highIndex; i++) {
|
|
158
|
+
const canvasPoint = prevCanvasPoints[i];
|
|
159
|
+
pointSet2.push([canvasPoint[0], canvasPoint[1]]);
|
|
160
|
+
}
|
|
161
|
+
inPlaceDistance =
|
|
162
|
+
distanceBetweenHighAndFirstPoint + distanceBetweenLowAndLastPoint;
|
|
163
|
+
reverseDistance =
|
|
164
|
+
distanceBetweenHighAndLastPoint + distanceBetweenLowAndFirstPoint;
|
|
165
|
+
if (inPlaceDistance < reverseDistance) {
|
|
166
|
+
for (let i = 0; i < augmentedEditCanvasPoints.length; i++) {
|
|
167
|
+
const canvasPoint = augmentedEditCanvasPoints[i];
|
|
168
|
+
pointSet2.push([canvasPoint[0], canvasPoint[1]]);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
for (let i = augmentedEditCanvasPoints.length - 1; i >= 0; i--) {
|
|
173
|
+
const canvasPoint = augmentedEditCanvasPoints[i];
|
|
174
|
+
pointSet2.push([canvasPoint[0], canvasPoint[1]]);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
const areaPointSet1 = calculateAreaOfPoints(pointSet1);
|
|
178
|
+
const areaPointSet2 = calculateAreaOfPoints(pointSet2);
|
|
179
|
+
const pointsToRender = areaPointSet1 > areaPointSet2 ? pointSet1 : pointSet2;
|
|
180
|
+
return pointsToRender;
|
|
181
|
+
}
|
|
182
|
+
function mouseUpClosedContourEditCallback(evt) {
|
|
183
|
+
const eventDetail = evt.detail;
|
|
184
|
+
const { element } = eventDetail;
|
|
185
|
+
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
186
|
+
const { viewport, renderingEngine } = enabledElement;
|
|
187
|
+
const { annotation, viewportIdsToRender } = this.commonData;
|
|
188
|
+
const { fusedCanvasPoints } = this.editData;
|
|
189
|
+
if (fusedCanvasPoints) {
|
|
190
|
+
const worldPoints = fusedCanvasPoints.map((canvasPoint) => viewport.canvasToWorld(canvasPoint));
|
|
191
|
+
annotation.data.polyline = worldPoints;
|
|
192
|
+
annotation.data.isOpenContour = false;
|
|
193
|
+
this.triggerAnnotationModified(annotation, enabledElement);
|
|
194
|
+
}
|
|
195
|
+
this.isEditingClosed = false;
|
|
196
|
+
this.editData = undefined;
|
|
197
|
+
this.commonData = undefined;
|
|
198
|
+
(0, triggerAnnotationRenderForViewportIds_1.default)(renderingEngine, viewportIdsToRender);
|
|
199
|
+
this.deactivateClosedContourEdit(element);
|
|
200
|
+
}
|
|
201
|
+
function registerClosedContourEditLoop(toolInstance) {
|
|
202
|
+
toolInstance.activateClosedContourEdit =
|
|
203
|
+
activateClosedContourEdit.bind(toolInstance);
|
|
204
|
+
toolInstance.deactivateClosedContourEdit =
|
|
205
|
+
deactivateClosedContourEdit.bind(toolInstance);
|
|
206
|
+
toolInstance.mouseDragClosedContourEditCallback =
|
|
207
|
+
mouseDragClosedContourEditCallback.bind(toolInstance);
|
|
208
|
+
toolInstance.mouseUpClosedContourEditCallback =
|
|
209
|
+
mouseUpClosedContourEditCallback.bind(toolInstance);
|
|
210
|
+
toolInstance.finishEditAndStartNewEdit =
|
|
211
|
+
finishEditAndStartNewEdit.bind(toolInstance);
|
|
212
|
+
toolInstance.fuseEditPointsWithClosedContour =
|
|
213
|
+
fuseEditPointsWithClosedContour.bind(toolInstance);
|
|
214
|
+
}
|
|
215
|
+
exports.default = registerClosedContourEditLoop;
|
|
216
|
+
//# sourceMappingURL=closedContourEditLoop.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"closedContourEditLoop.js","sourceRoot":"","sources":["../../../../../src/tools/annotation/planarFreehandROITool/closedContourEditLoop.ts"],"names":[],"mappings":"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"}
|