@cornerstonejs/tools 0.43.0 → 0.43.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/tools/TrackballRotateTool.js +8 -6
- package/dist/cjs/tools/TrackballRotateTool.js.map +1 -1
- package/dist/cjs/tools/displayTools/Contour/addContourToElement.d.ts +2 -1
- package/dist/cjs/tools/displayTools/Contour/addContourToElement.js +42 -1
- package/dist/cjs/tools/displayTools/Contour/addContourToElement.js.map +1 -1
- package/dist/cjs/tools/displayTools/Contour/contourDisplay.js +20 -7
- package/dist/cjs/tools/displayTools/Contour/contourDisplay.js.map +1 -1
- package/dist/esm/tools/TrackballRotateTool.js +8 -6
- package/dist/esm/tools/TrackballRotateTool.js.map +1 -1
- package/dist/esm/tools/displayTools/Contour/addContourToElement.d.ts +2 -1
- package/dist/esm/tools/displayTools/Contour/addContourToElement.js +40 -1
- package/dist/esm/tools/displayTools/Contour/addContourToElement.js.map +1 -1
- package/dist/esm/tools/displayTools/Contour/contourDisplay.js +19 -6
- package/dist/esm/tools/displayTools/Contour/contourDisplay.js.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -84,15 +84,17 @@ class TrackballRotateTool extends base_1.BaseTool {
|
|
|
84
84
|
Math.sign(normalizedPosition[0] - normalizedPreviousPosition[0]) *
|
|
85
85
|
rotateIncrementDegrees;
|
|
86
86
|
const upVec = camera.viewUp;
|
|
87
|
-
Math_1.default.normalize(upVec);
|
|
88
|
-
this.rotateCamera(viewport, centerWorld, upVec, angleX);
|
|
89
|
-
const angleY = (normalizedPreviousPosition[1] - normalizedPosition[1]) *
|
|
90
|
-
rotateIncrementDegrees;
|
|
91
87
|
const atV = camera.viewPlaneNormal;
|
|
92
|
-
const upV = camera.viewUp;
|
|
93
88
|
const rightV = [0, 0, 0];
|
|
94
|
-
|
|
89
|
+
const forwardV = [0, 0, 0];
|
|
90
|
+
Math_1.default.cross(upVec, atV, rightV);
|
|
95
91
|
Math_1.default.normalize(rightV);
|
|
92
|
+
Math_1.default.cross(atV, rightV, forwardV);
|
|
93
|
+
Math_1.default.normalize(forwardV);
|
|
94
|
+
Math_1.default.normalize(upVec);
|
|
95
|
+
this.rotateCamera(viewport, centerWorld, forwardV, angleX);
|
|
96
|
+
const angleY = (normalizedPreviousPosition[1] - normalizedPosition[1]) *
|
|
97
|
+
rotateIncrementDegrees;
|
|
96
98
|
this.rotateCamera(viewport, centerWorld, rightV, angleY);
|
|
97
99
|
viewport.render();
|
|
98
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TrackballRotateTool.js","sourceRoot":"","sources":["../../../src/tools/TrackballRotateTool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TrackballRotateTool.js","sourceRoot":"","sources":["../../../src/tools/TrackballRotateTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { Types } from '@cornerstonejs/core';
|
|
2
2
|
declare function addContourToElement(element: HTMLDivElement, contour: Types.IContour, actorUID: string): void;
|
|
3
|
-
|
|
3
|
+
declare function addContourSetToElement(element: HTMLDivElement, contourSet: Types.IContourSet, actorUID: string): void;
|
|
4
|
+
export { addContourToElement, addContourSetToElement };
|
|
@@ -3,6 +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.addContourSetToElement = exports.addContourToElement = void 0;
|
|
6
7
|
const core_1 = require("@cornerstonejs/core");
|
|
7
8
|
const PolyData_1 = __importDefault(require("@kitware/vtk.js/Common/DataModel/PolyData"));
|
|
8
9
|
const CellArray_1 = __importDefault(require("@kitware/vtk.js/Common/Core/CellArray"));
|
|
@@ -42,5 +43,45 @@ function addContourToElement(element, contour, actorUID) {
|
|
|
42
43
|
actor1.getProperty().setColor(colorToUse[0], colorToUse[1], colorToUse[2]);
|
|
43
44
|
viewport.addActor({ actor: actor1, uid: actorUID });
|
|
44
45
|
}
|
|
45
|
-
exports.
|
|
46
|
+
exports.addContourToElement = addContourToElement;
|
|
47
|
+
function addContourSetToElement(element, contourSet, actorUID) {
|
|
48
|
+
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
49
|
+
const { renderingEngine, viewport } = enabledElement;
|
|
50
|
+
const { id: viewportId } = viewport;
|
|
51
|
+
const visibility = true;
|
|
52
|
+
const immediateRender = false;
|
|
53
|
+
const suppressEvents = true;
|
|
54
|
+
const actor1 = Actor_1.default.newInstance();
|
|
55
|
+
let color;
|
|
56
|
+
const pointArray = [];
|
|
57
|
+
const points = Points_1.default.newInstance();
|
|
58
|
+
const lines = CellArray_1.default.newInstance();
|
|
59
|
+
let pointIndex = 0;
|
|
60
|
+
contourSet.getContours().forEach((contour) => {
|
|
61
|
+
const pointList = contour.getPoints();
|
|
62
|
+
const flatPoints = contour.getFlatPointsArray();
|
|
63
|
+
color = contour.getColor();
|
|
64
|
+
const type = contour.getType();
|
|
65
|
+
const pointIndexes = pointList.map((_, i) => i + pointIndex);
|
|
66
|
+
if (type === core_1.Enums.ContourType.CLOSED_PLANAR) {
|
|
67
|
+
pointIndexes.push(pointIndexes[0]);
|
|
68
|
+
}
|
|
69
|
+
const linePoints = Float32Array.from(flatPoints);
|
|
70
|
+
pointArray.push(...linePoints);
|
|
71
|
+
lines.insertNextCell([...pointIndexes]);
|
|
72
|
+
pointIndex = pointIndex + pointList.length;
|
|
73
|
+
});
|
|
74
|
+
points.setData(pointArray, 3);
|
|
75
|
+
const polygon = PolyData_1.default.newInstance();
|
|
76
|
+
polygon.setPoints(points);
|
|
77
|
+
polygon.setLines(lines);
|
|
78
|
+
const mapper1 = Mapper_1.default.newInstance();
|
|
79
|
+
mapper1.setInputData(polygon);
|
|
80
|
+
actor1.setMapper(mapper1);
|
|
81
|
+
actor1.getProperty().setLineWidth(4);
|
|
82
|
+
const colorToUse = color.map((c) => c / 255);
|
|
83
|
+
actor1.getProperty().setColor(colorToUse[0], colorToUse[1], colorToUse[2]);
|
|
84
|
+
viewport.addActor({ actor: actor1, uid: actorUID });
|
|
85
|
+
}
|
|
86
|
+
exports.addContourSetToElement = addContourSetToElement;
|
|
46
87
|
//# sourceMappingURL=addContourToElement.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addContourToElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/addContourToElement.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"addContourToElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/addContourToElement.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ const SegmentationRepresentations_1 = __importDefault(require("../../../enums/Se
|
|
|
42
42
|
const ToolGroupManager_1 = require("../../../store/ToolGroupManager");
|
|
43
43
|
const utilities_1 = require("../../../utilities");
|
|
44
44
|
const removeContourFromElement_1 = __importDefault(require("./removeContourFromElement"));
|
|
45
|
-
const addContourToElement_1 =
|
|
45
|
+
const addContourToElement_1 = require("./addContourToElement");
|
|
46
46
|
function addSegmentationRepresentation(toolGroupId, representationInput, toolGroupSpecificConfig) {
|
|
47
47
|
return __awaiter(this, void 0, void 0, function* () {
|
|
48
48
|
const { segmentationId } = representationInput;
|
|
@@ -115,11 +115,24 @@ function _renderContourSets(viewport, geometryIds, segmentationRepresentationUID
|
|
|
115
115
|
_renderContourSet(viewport, contourSet, segmentationRepresentationUID);
|
|
116
116
|
});
|
|
117
117
|
}
|
|
118
|
-
function _renderContourSet(viewport, contourSet, segmentationRepresentationUID) {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
118
|
+
function _renderContourSet(viewport, contourSet, segmentationRepresentationUID, separated = false) {
|
|
119
|
+
if (separated) {
|
|
120
|
+
contourSet.getContours().forEach((contour, index) => {
|
|
121
|
+
const contourUID = `${segmentationRepresentationUID}_${contourSet.id}_${index}}`;
|
|
122
|
+
_renderContour(viewport, contour, contourUID);
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
const contourUID = `${segmentationRepresentationUID}_${contourSet.id}`;
|
|
127
|
+
const actorUID = contourUID;
|
|
128
|
+
const actorEntry = viewport.getActor(actorUID);
|
|
129
|
+
if (!actorEntry) {
|
|
130
|
+
(0, addContourToElement_1.addContourSetToElement)(viewport.element, contourSet, actorUID);
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
throw new Error('Not implemented yet. (Update contour)');
|
|
134
|
+
}
|
|
135
|
+
}
|
|
123
136
|
viewport.resetCamera();
|
|
124
137
|
viewport.render();
|
|
125
138
|
}
|
|
@@ -127,7 +140,7 @@ function _renderContour(viewport, contour, contourUID) {
|
|
|
127
140
|
const actorUID = contourUID;
|
|
128
141
|
const actorEntry = viewport.getActor(actorUID);
|
|
129
142
|
if (!actorEntry) {
|
|
130
|
-
(0, addContourToElement_1.
|
|
143
|
+
(0, addContourToElement_1.addContourToElement)(viewport.element, contour, actorUID);
|
|
131
144
|
}
|
|
132
145
|
else {
|
|
133
146
|
throw new Error('Not implemented yet. (Update contour)');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAM6B;AAE7B,2GAA6F;AAC7F,oHAAsG;AACtG,6GAAyE;AACzE,sEAA+D;AAO/D,kDAA+C;AAC/C,0FAAkE;AAClE
|
|
1
|
+
{"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,15 +79,17 @@ class TrackballRotateTool extends BaseTool {
|
|
|
79
79
|
Math.sign(normalizedPosition[0] - normalizedPreviousPosition[0]) *
|
|
80
80
|
rotateIncrementDegrees;
|
|
81
81
|
const upVec = camera.viewUp;
|
|
82
|
-
vtkMath.normalize(upVec);
|
|
83
|
-
this.rotateCamera(viewport, centerWorld, upVec, angleX);
|
|
84
|
-
const angleY = (normalizedPreviousPosition[1] - normalizedPosition[1]) *
|
|
85
|
-
rotateIncrementDegrees;
|
|
86
82
|
const atV = camera.viewPlaneNormal;
|
|
87
|
-
const upV = camera.viewUp;
|
|
88
83
|
const rightV = [0, 0, 0];
|
|
89
|
-
|
|
84
|
+
const forwardV = [0, 0, 0];
|
|
85
|
+
vtkMath.cross(upVec, atV, rightV);
|
|
90
86
|
vtkMath.normalize(rightV);
|
|
87
|
+
vtkMath.cross(atV, rightV, forwardV);
|
|
88
|
+
vtkMath.normalize(forwardV);
|
|
89
|
+
vtkMath.normalize(upVec);
|
|
90
|
+
this.rotateCamera(viewport, centerWorld, forwardV, angleX);
|
|
91
|
+
const angleY = (normalizedPreviousPosition[1] - normalizedPosition[1]) *
|
|
92
|
+
rotateIncrementDegrees;
|
|
91
93
|
this.rotateCamera(viewport, centerWorld, rightV, angleY);
|
|
92
94
|
viewport.render();
|
|
93
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TrackballRotateTool.js","sourceRoot":"","sources":["../../../src/tools/TrackballRotateTool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TrackballRotateTool.js","sourceRoot":"","sources":["../../../src/tools/TrackballRotateTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { Types } from '@cornerstonejs/core';
|
|
2
2
|
declare function addContourToElement(element: HTMLDivElement, contour: Types.IContour, actorUID: string): void;
|
|
3
|
-
|
|
3
|
+
declare function addContourSetToElement(element: HTMLDivElement, contourSet: Types.IContourSet, actorUID: string): void;
|
|
4
|
+
export { addContourToElement, addContourSetToElement };
|
|
@@ -37,5 +37,44 @@ function addContourToElement(element, contour, actorUID) {
|
|
|
37
37
|
actor1.getProperty().setColor(colorToUse[0], colorToUse[1], colorToUse[2]);
|
|
38
38
|
viewport.addActor({ actor: actor1, uid: actorUID });
|
|
39
39
|
}
|
|
40
|
-
|
|
40
|
+
function addContourSetToElement(element, contourSet, actorUID) {
|
|
41
|
+
const enabledElement = getEnabledElement(element);
|
|
42
|
+
const { renderingEngine, viewport } = enabledElement;
|
|
43
|
+
const { id: viewportId } = viewport;
|
|
44
|
+
const visibility = true;
|
|
45
|
+
const immediateRender = false;
|
|
46
|
+
const suppressEvents = true;
|
|
47
|
+
const actor1 = vtkActor.newInstance();
|
|
48
|
+
let color;
|
|
49
|
+
const pointArray = [];
|
|
50
|
+
const points = vtkPoints.newInstance();
|
|
51
|
+
const lines = vtkCellArray.newInstance();
|
|
52
|
+
let pointIndex = 0;
|
|
53
|
+
contourSet.getContours().forEach((contour) => {
|
|
54
|
+
const pointList = contour.getPoints();
|
|
55
|
+
const flatPoints = contour.getFlatPointsArray();
|
|
56
|
+
color = contour.getColor();
|
|
57
|
+
const type = contour.getType();
|
|
58
|
+
const pointIndexes = pointList.map((_, i) => i + pointIndex);
|
|
59
|
+
if (type === Enums.ContourType.CLOSED_PLANAR) {
|
|
60
|
+
pointIndexes.push(pointIndexes[0]);
|
|
61
|
+
}
|
|
62
|
+
const linePoints = Float32Array.from(flatPoints);
|
|
63
|
+
pointArray.push(...linePoints);
|
|
64
|
+
lines.insertNextCell([...pointIndexes]);
|
|
65
|
+
pointIndex = pointIndex + pointList.length;
|
|
66
|
+
});
|
|
67
|
+
points.setData(pointArray, 3);
|
|
68
|
+
const polygon = vtkPolyData.newInstance();
|
|
69
|
+
polygon.setPoints(points);
|
|
70
|
+
polygon.setLines(lines);
|
|
71
|
+
const mapper1 = vtkMapper.newInstance();
|
|
72
|
+
mapper1.setInputData(polygon);
|
|
73
|
+
actor1.setMapper(mapper1);
|
|
74
|
+
actor1.getProperty().setLineWidth(4);
|
|
75
|
+
const colorToUse = color.map((c) => c / 255);
|
|
76
|
+
actor1.getProperty().setColor(colorToUse[0], colorToUse[1], colorToUse[2]);
|
|
77
|
+
viewport.addActor({ actor: actor1, uid: actorUID });
|
|
78
|
+
}
|
|
79
|
+
export { addContourToElement, addContourSetToElement };
|
|
41
80
|
//# sourceMappingURL=addContourToElement.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addContourToElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/addContourToElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAS,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,WAAW,MAAM,2CAA2C,CAAC;AACpE,OAAO,YAAY,MAAM,uCAAuC,CAAC;AACjE,OAAO,SAAS,MAAM,oCAAoC,CAAC;AAC3D,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,QAAQ,MAAM,sCAAsC,CAAC;AAK5D,SAAS,mBAAmB,CAC1B,OAAuB,EACvB,OAAuB,EACvB,QAAgB;IAEhB,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;IACrD,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;IAKpC,MAAM,UAAU,GAAG,IAAI,CAAC;IACxB,MAAM,eAAe,GAAG,KAAK,CAAC;IAC9B,MAAM,cAAc,GAAG,IAAI,CAAC;IAE5B,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IACtC,MAAM,UAAU,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAChD,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IACjC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAE/B,MAAM,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAErC,IAAI,IAAI,KAAK,KAAK,CAAC,WAAW,CAAC,aAAa,EAAE;QAC5C,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACX;IAED,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAEhD,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;IAE7C,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAExB,MAAM,KAAK,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;IAEzC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAEvB,MAAM,OAAO,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;IAC1C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExB,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IACxC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAC9B,MAAM,MAAM,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;IACtC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC1B,MAAM,CAAC,WAAW,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACrC,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3E,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;AACtD,CAAC;AAED,eAAe,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"addContourToElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/addContourToElement.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import Representations from '../../../enums/SegmentationRepresentations';
|
|
|
5
5
|
import { getToolGroup } from '../../../store/ToolGroupManager';
|
|
6
6
|
import { deepMerge } from '../../../utilities';
|
|
7
7
|
import removeContourFromElement from './removeContourFromElement';
|
|
8
|
-
import addContourToElement from './addContourToElement';
|
|
8
|
+
import { addContourToElement, addContourSetToElement, } from './addContourToElement';
|
|
9
9
|
async function addSegmentationRepresentation(toolGroupId, representationInput, toolGroupSpecificConfig) {
|
|
10
10
|
const { segmentationId } = representationInput;
|
|
11
11
|
const segmentationRepresentationUID = utilities.uuidv4();
|
|
@@ -76,11 +76,24 @@ function _renderContourSets(viewport, geometryIds, segmentationRepresentationUID
|
|
|
76
76
|
_renderContourSet(viewport, contourSet, segmentationRepresentationUID);
|
|
77
77
|
});
|
|
78
78
|
}
|
|
79
|
-
function _renderContourSet(viewport, contourSet, segmentationRepresentationUID) {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
79
|
+
function _renderContourSet(viewport, contourSet, segmentationRepresentationUID, separated = false) {
|
|
80
|
+
if (separated) {
|
|
81
|
+
contourSet.getContours().forEach((contour, index) => {
|
|
82
|
+
const contourUID = `${segmentationRepresentationUID}_${contourSet.id}_${index}}`;
|
|
83
|
+
_renderContour(viewport, contour, contourUID);
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
const contourUID = `${segmentationRepresentationUID}_${contourSet.id}`;
|
|
88
|
+
const actorUID = contourUID;
|
|
89
|
+
const actorEntry = viewport.getActor(actorUID);
|
|
90
|
+
if (!actorEntry) {
|
|
91
|
+
addContourSetToElement(viewport.element, contourSet, actorUID);
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
throw new Error('Not implemented yet. (Update contour)');
|
|
95
|
+
}
|
|
96
|
+
}
|
|
84
97
|
viewport.resetCamera();
|
|
85
98
|
viewport.render();
|
|
86
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,sBAAsB,EAEtB,SAAS,EACT,KAAK,GACN,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,iBAAiB,MAAM,yDAAyD,CAAC;AAC7F,OAAO,KAAK,kBAAkB,MAAM,iEAAiE,CAAC;AACtG,OAAO,eAAe,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAO/D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":"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"}
|