@cornerstonejs/tools 0.56.6 → 0.57.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/stateManagement/segmentation/SegmentationStateManager.d.ts +1 -1
- package/dist/cjs/stateManagement/segmentation/SegmentationStateManager.js +5 -2
- package/dist/cjs/stateManagement/segmentation/SegmentationStateManager.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/config/segmentationColor.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/config/segmentationVisibility.js +23 -5
- package/dist/cjs/stateManagement/segmentation/config/segmentationVisibility.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/segmentationState.js +0 -10
- package/dist/cjs/stateManagement/segmentation/segmentationState.js.map +1 -1
- package/dist/cjs/tools/displayTools/Contour/addContourSetsToElement.d.ts +3 -0
- package/dist/cjs/tools/displayTools/Contour/addContourSetsToElement.js +70 -0
- package/dist/cjs/tools/displayTools/Contour/addContourSetsToElement.js.map +1 -0
- package/dist/cjs/tools/displayTools/Contour/addOrUpdateContourSets.d.ts +3 -0
- package/dist/cjs/tools/displayTools/Contour/addOrUpdateContourSets.js +14 -0
- package/dist/cjs/tools/displayTools/Contour/addOrUpdateContourSets.js.map +1 -0
- package/dist/cjs/tools/displayTools/Contour/contourConfig.d.ts +3 -0
- package/dist/cjs/tools/displayTools/Contour/contourConfig.js +14 -0
- package/dist/cjs/tools/displayTools/Contour/contourConfig.js.map +1 -0
- package/dist/cjs/tools/displayTools/Contour/contourConfigCache.d.ts +9 -0
- package/dist/cjs/tools/displayTools/Contour/contourConfigCache.js +17 -0
- package/dist/cjs/tools/displayTools/Contour/contourConfigCache.js.map +1 -0
- package/dist/cjs/tools/displayTools/Contour/contourDisplay.d.ts +1 -1
- package/dist/cjs/tools/displayTools/Contour/contourDisplay.js +4 -52
- package/dist/cjs/tools/displayTools/Contour/contourDisplay.js.map +1 -1
- package/dist/cjs/tools/displayTools/Contour/updateContourSets.d.ts +3 -0
- package/dist/cjs/tools/displayTools/Contour/updateContourSets.js +78 -0
- package/dist/cjs/tools/displayTools/Contour/updateContourSets.js.map +1 -0
- package/dist/cjs/tools/displayTools/Contour/utils.d.ts +6 -0
- package/dist/cjs/tools/displayTools/Contour/utils.js +63 -0
- package/dist/cjs/tools/displayTools/Contour/utils.js.map +1 -0
- package/dist/cjs/tools/displayTools/Labelmap/labelmapDisplay.js.map +1 -1
- package/dist/cjs/types/ContourTypes.d.ts +1 -0
- package/dist/cjs/types/SegmentationStateTypes.d.ts +4 -4
- package/dist/cjs/types/index.d.ts +2 -2
- package/dist/esm/stateManagement/segmentation/SegmentationStateManager.d.ts +1 -1
- package/dist/esm/stateManagement/segmentation/SegmentationStateManager.js +5 -2
- package/dist/esm/stateManagement/segmentation/SegmentationStateManager.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/config/segmentationColor.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/config/segmentationVisibility.js +19 -5
- package/dist/esm/stateManagement/segmentation/config/segmentationVisibility.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/segmentationState.js +1 -11
- package/dist/esm/stateManagement/segmentation/segmentationState.js.map +1 -1
- package/dist/esm/tools/displayTools/Contour/addContourSetsToElement.d.ts +3 -0
- package/dist/esm/tools/displayTools/Contour/addContourSetsToElement.js +63 -0
- package/dist/esm/tools/displayTools/Contour/addContourSetsToElement.js.map +1 -0
- package/dist/esm/tools/displayTools/Contour/addOrUpdateContourSets.d.ts +3 -0
- package/dist/esm/tools/displayTools/Contour/addOrUpdateContourSets.js +10 -0
- package/dist/esm/tools/displayTools/Contour/addOrUpdateContourSets.js.map +1 -0
- package/dist/esm/tools/displayTools/Contour/contourConfig.d.ts +3 -0
- package/dist/esm/tools/displayTools/Contour/contourConfig.js +12 -0
- package/dist/esm/tools/displayTools/Contour/contourConfig.js.map +1 -0
- package/dist/esm/tools/displayTools/Contour/contourConfigCache.d.ts +9 -0
- package/dist/esm/tools/displayTools/Contour/contourConfigCache.js +11 -0
- package/dist/esm/tools/displayTools/Contour/contourConfigCache.js.map +1 -0
- package/dist/esm/tools/displayTools/Contour/contourDisplay.d.ts +1 -1
- package/dist/esm/tools/displayTools/Contour/contourDisplay.js +6 -54
- package/dist/esm/tools/displayTools/Contour/contourDisplay.js.map +1 -1
- package/dist/esm/tools/displayTools/Contour/updateContourSets.d.ts +3 -0
- package/dist/esm/tools/displayTools/Contour/updateContourSets.js +71 -0
- package/dist/esm/tools/displayTools/Contour/updateContourSets.js.map +1 -0
- package/dist/esm/tools/displayTools/Contour/utils.d.ts +6 -0
- package/dist/esm/tools/displayTools/Contour/utils.js +53 -0
- package/dist/esm/tools/displayTools/Contour/utils.js.map +1 -0
- package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.js.map +1 -1
- package/dist/esm/types/ContourTypes.d.ts +1 -0
- package/dist/esm/types/SegmentationStateTypes.d.ts +4 -4
- package/dist/esm/types/index.d.ts +2 -2
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +3 -3
- package/src/stateManagement/segmentation/SegmentationStateManager.ts +10 -7
- package/src/stateManagement/segmentation/config/segmentationColor.ts +1 -0
- package/src/stateManagement/segmentation/config/segmentationVisibility.ts +25 -7
- package/src/stateManagement/segmentation/segmentationState.ts +7 -23
- package/src/tools/displayTools/Contour/addContourSetsToElement.ts +110 -0
- package/src/tools/displayTools/Contour/addOrUpdateContourSets.ts +28 -0
- package/src/tools/displayTools/Contour/contourConfig.ts +15 -0
- package/src/tools/displayTools/Contour/contourConfigCache.ts +37 -0
- package/src/tools/displayTools/Contour/contourDisplay.ts +11 -91
- package/src/tools/displayTools/Contour/updateContourSets.ts +111 -0
- package/src/tools/displayTools/Contour/utils.ts +117 -0
- package/src/tools/displayTools/Labelmap/labelmapDisplay.ts +5 -2
- package/src/types/ContourTypes.ts +2 -0
- package/src/types/SegmentationStateTypes.ts +22 -8
- package/src/types/index.ts +2 -0
- package/dist/cjs/tools/displayTools/Contour/addContourToElement.d.ts +0 -4
- package/dist/cjs/tools/displayTools/Contour/addContourToElement.js +0 -87
- package/dist/cjs/tools/displayTools/Contour/addContourToElement.js.map +0 -1
- package/dist/esm/tools/displayTools/Contour/addContourToElement.d.ts +0 -4
- package/dist/esm/tools/displayTools/Contour/addContourToElement.js +0 -80
- package/dist/esm/tools/displayTools/Contour/addContourToElement.js.map +0 -1
- package/src/tools/displayTools/Contour/addContourToElement.ts +0 -135
|
@@ -0,0 +1,63 @@
|
|
|
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
|
+
exports.getPolyData = exports.validateGeometry = exports.getSegmentSpecificConfig = void 0;
|
|
7
|
+
const core_1 = require("@cornerstonejs/core");
|
|
8
|
+
const CellArray_1 = __importDefault(require("@kitware/vtk.js/Common/Core/CellArray"));
|
|
9
|
+
const Points_1 = __importDefault(require("@kitware/vtk.js/Common/Core/Points"));
|
|
10
|
+
const PolyData_1 = __importDefault(require("@kitware/vtk.js/Common/DataModel/PolyData"));
|
|
11
|
+
function getSegmentSpecificConfig(contourRepresentation, segmentId, index) {
|
|
12
|
+
var _a, _b;
|
|
13
|
+
let segmentSpecificConfig = (_a = contourRepresentation.segmentSpecificConfig) === null || _a === void 0 ? void 0 : _a[segmentId];
|
|
14
|
+
if (!segmentSpecificConfig) {
|
|
15
|
+
segmentSpecificConfig =
|
|
16
|
+
(_b = contourRepresentation.segmentSpecificConfig) === null || _b === void 0 ? void 0 : _b[index];
|
|
17
|
+
}
|
|
18
|
+
if (!segmentSpecificConfig) {
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
21
|
+
return segmentSpecificConfig.CONTOUR;
|
|
22
|
+
}
|
|
23
|
+
exports.getSegmentSpecificConfig = getSegmentSpecificConfig;
|
|
24
|
+
function validateGeometry(geometry) {
|
|
25
|
+
if (!geometry) {
|
|
26
|
+
throw new Error(`No contours found for geometryId ${geometry.id}`);
|
|
27
|
+
}
|
|
28
|
+
const geometryId = geometry.id;
|
|
29
|
+
if (geometry.type !== core_1.Enums.GeometryType.CONTOUR) {
|
|
30
|
+
throw new Error(`Geometry type ${geometry.type} not supported for rendering.`);
|
|
31
|
+
}
|
|
32
|
+
if (!geometry.data) {
|
|
33
|
+
console.warn(`No contours found for geometryId ${geometryId}. Skipping render.`);
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
exports.validateGeometry = validateGeometry;
|
|
38
|
+
function getPolyData(contourSet) {
|
|
39
|
+
const pointArray = [];
|
|
40
|
+
const points = Points_1.default.newInstance();
|
|
41
|
+
const lines = CellArray_1.default.newInstance();
|
|
42
|
+
let pointIndex = 0;
|
|
43
|
+
contourSet.getContours().forEach((contour) => {
|
|
44
|
+
const pointList = contour.getPoints();
|
|
45
|
+
const flatPoints = contour.getFlatPointsArray();
|
|
46
|
+
const type = contour.getType();
|
|
47
|
+
const pointIndexes = pointList.map((_, pointListIndex) => pointListIndex + pointIndex);
|
|
48
|
+
if (type === core_1.Enums.ContourType.CLOSED_PLANAR) {
|
|
49
|
+
pointIndexes.push(pointIndexes[0]);
|
|
50
|
+
}
|
|
51
|
+
const linePoints = Float32Array.from(flatPoints);
|
|
52
|
+
pointArray.push(...linePoints);
|
|
53
|
+
lines.insertNextCell([...pointIndexes]);
|
|
54
|
+
pointIndex = pointIndex + pointList.length;
|
|
55
|
+
});
|
|
56
|
+
points.setData(pointArray, 3);
|
|
57
|
+
const polygon = PolyData_1.default.newInstance();
|
|
58
|
+
polygon.setPoints(points);
|
|
59
|
+
polygon.setLines(lines);
|
|
60
|
+
return polygon;
|
|
61
|
+
}
|
|
62
|
+
exports.getPolyData = getPolyData;
|
|
63
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/utils.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAmD;AACnD,sFAAiE;AAEjE,gFAA2D;AAC3D,yFAAoE;AAepE,SAAgB,wBAAwB,CACtC,qBAA6D,EAC7D,SAAiB,EACjB,KAAa;;IAEb,IAAI,qBAAqB,GACvB,MAAA,qBAAqB,CAAC,qBAAqB,0CAAG,SAAS,CAAC,CAAC;IAE3D,IAAI,CAAC,qBAAqB,EAAE;QAE1B,qBAAqB;YACnB,MAAA,qBAAqB,CAAC,qBAAqB,0CAAG,KAAK,CAAC,CAAC;KACxD;IAED,IAAI,CAAC,qBAAqB,EAAE;QAC1B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,qBAAqB,CAAC,OAAO,CAAC;AACvC,CAAC;AAnBD,4DAmBC;AAOD,SAAgB,gBAAgB,CAAC,QAAyB;IACxD,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;KACpE;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC;IAE/B,IAAI,QAAQ,CAAC,IAAI,KAAK,YAAK,CAAC,YAAY,CAAC,OAAO,EAAE;QAChD,MAAM,IAAI,KAAK,CACb,iBAAiB,QAAQ,CAAC,IAAI,+BAA+B,CAC9D,CAAC;KACH;IAED,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;QAClB,OAAO,CAAC,IAAI,CACV,oCAAoC,UAAU,oBAAoB,CACnE,CAAC;QACF,OAAO;KACR;AACH,CAAC;AAnBD,4CAmBC;AAUD,SAAgB,WAAW,CAAC,UAA6B;IACvD,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,MAAM,MAAM,GAAG,gBAAS,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,mBAAY,CAAC,WAAW,EAAE,CAAC;IAIzC,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,OAAuB,EAAE,EAAE;QAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAG/B,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAChC,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC,cAAc,GAAG,UAAU,CACnD,CAAC;QAGF,IAAI,IAAI,KAAK,YAAK,CAAC,WAAW,CAAC,aAAa,EAAE;YAC5C,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;SACpC;QAED,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEjD,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;QAE/B,KAAK,CAAC,cAAc,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;QAExC,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;IAC7C,CAAC,CAAC,CAAC;IAGH,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAG9B,MAAM,OAAO,GAAG,kBAAW,CAAC,WAAW,EAAE,CAAC;IAC1C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExB,OAAO,OAAO,CAAC;AACjB,CAAC;AA1CD,kCA0CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"labelmapDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Labelmap/labelmapDisplay.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2GAAsF;AACtF,iHAA4F;AAE5F,8CAK6B;AAE7B,6GAAyE;AACzE,oHAAsG;AACtG,2GAA6F;AAC7F,sEAA+D;
|
|
1
|
+
{"version":3,"file":"labelmapDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Labelmap/labelmapDisplay.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import * as Enums from '../enums';
|
|
2
|
-
import { ContourConfig, ContourSegmentationData } from './ContourTypes';
|
|
2
|
+
import { ContourConfig, ContourRenderingConfig, ContourSegmentationData } from './ContourTypes';
|
|
3
3
|
import type { LabelmapConfig, LabelmapRenderingConfig, LabelmapSegmentationData } from './LabelmapTypes';
|
|
4
4
|
export declare type Color = [number, number, number, number];
|
|
5
5
|
export declare type ColorLUT = Array<Color>;
|
|
6
6
|
export declare type SegmentSpecificRepresentationConfig = {
|
|
7
|
-
[key: number]: RepresentationConfig;
|
|
7
|
+
[key: number | string]: RepresentationConfig;
|
|
8
8
|
};
|
|
9
9
|
export declare type RepresentationConfig = {
|
|
10
10
|
LABELMAP?: LabelmapConfig;
|
|
@@ -46,11 +46,11 @@ export declare type ToolGroupSpecificLabelmapRepresentation = ToolGroupSpecificR
|
|
|
46
46
|
segmentSpecificConfig?: SegmentSpecificRepresentationConfig;
|
|
47
47
|
};
|
|
48
48
|
export declare type ToolGroupSpecificContourRepresentation = ToolGroupSpecificRepresentationState & {
|
|
49
|
-
config:
|
|
49
|
+
config: ContourRenderingConfig;
|
|
50
50
|
segmentationRepresentationSpecificConfig?: RepresentationConfig;
|
|
51
51
|
segmentSpecificConfig?: SegmentSpecificRepresentationConfig;
|
|
52
52
|
};
|
|
53
|
-
export declare type ToolGroupSpecificRepresentation = ToolGroupSpecificLabelmapRepresentation;
|
|
53
|
+
export declare type ToolGroupSpecificRepresentation = ToolGroupSpecificLabelmapRepresentation | ToolGroupSpecificContourRepresentation;
|
|
54
54
|
export declare type ToolGroupSpecificRepresentations = Array<ToolGroupSpecificRepresentation>;
|
|
55
55
|
export declare type SegmentationState = {
|
|
56
56
|
colorLUT: ColorLUT[];
|
|
@@ -19,11 +19,11 @@ import type ScrollOptions from './ScrollOptions';
|
|
|
19
19
|
import type BoundsIJK from './BoundsIJK';
|
|
20
20
|
import type SVGDrawingHelper from './SVGDrawingHelper';
|
|
21
21
|
import type * as CINETypes from './CINETypes';
|
|
22
|
-
import type { Color, ColorLUT, RepresentationConfig, SegmentationRepresentationConfig, SegmentationRepresentationData, Segmentation, ToolGroupSpecificRepresentationState, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, SegmentationState, RepresentationPublicInput } from './SegmentationStateTypes';
|
|
22
|
+
import type { Color, ColorLUT, RepresentationConfig, SegmentationRepresentationConfig, SegmentationRepresentationData, Segmentation, ToolGroupSpecificRepresentationState, ToolGroupSpecificContourRepresentation, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, SegmentationState, RepresentationPublicInput } from './SegmentationStateTypes';
|
|
23
23
|
import ISynchronizerEventHandler from './ISynchronizerEventHandler';
|
|
24
24
|
import { FloodFillGetter, FloodFillOptions, FloodFillResult } from './FloodFillTypes';
|
|
25
25
|
import IToolClassReference from './IToolClassReference';
|
|
26
26
|
import { ContourSegmentationData } from './ContourTypes';
|
|
27
27
|
import IAnnotationManager from './IAnnotationManager';
|
|
28
28
|
import AnnotationGroupSelector from './AnnotationGroupSelector';
|
|
29
|
-
export type { Annotation, Annotations, IAnnotationManager, GroupSpecificAnnotations, AnnotationState, AnnotationStyle, ToolSpecificAnnotationTypes, JumpToSliceOptions, AnnotationGroupSelector, PlanarBoundingBox, ToolProps, PublicToolProps, EventTypes, IPoints, ITouchPoints, IDistance, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, IToolGroup, IToolClassReference, ISynchronizerEventHandler, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationState, SegmentationRepresentationData, SegmentationRepresentationConfig, RepresentationConfig, ToolGroupSpecificRepresentationState, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, RepresentationPublicInput, Color, ColorLUT, LabelmapTypes, SVGCursorDescriptor, SVGPoint, ScrollOptions, CINETypes, BoundsIJK, SVGDrawingHelper, FloodFillResult, FloodFillGetter, FloodFillOptions, ContourSegmentationData, };
|
|
29
|
+
export type { Annotation, Annotations, IAnnotationManager, GroupSpecificAnnotations, AnnotationState, AnnotationStyle, ToolSpecificAnnotationTypes, JumpToSliceOptions, AnnotationGroupSelector, PlanarBoundingBox, ToolProps, PublicToolProps, EventTypes, IPoints, ITouchPoints, IDistance, IToolBinding, SetToolBindingsType, ToolOptionsType, InteractionTypes, IToolGroup, IToolClassReference, ISynchronizerEventHandler, ToolHandle, AnnotationHandle, TextBoxHandle, Segmentation, SegmentationState, SegmentationRepresentationData, SegmentationRepresentationConfig, RepresentationConfig, ToolGroupSpecificRepresentationState, ToolGroupSpecificContourRepresentation, ToolGroupSpecificLabelmapRepresentation, ToolGroupSpecificRepresentation, RepresentationPublicInput, Color, ColorLUT, LabelmapTypes, SVGCursorDescriptor, SVGPoint, ScrollOptions, CINETypes, BoundsIJK, SVGDrawingHelper, FloodFillResult, FloodFillGetter, FloodFillOptions, ContourSegmentationData, };
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ColorLUT, RepresentationConfig, Segmentation, SegmentationRepresentationConfig, SegmentationState, SegmentSpecificRepresentationConfig, ToolGroupSpecificRepresentation, ToolGroupSpecificRepresentations } from '../../types/SegmentationStateTypes';
|
|
2
2
|
export default class SegmentationStateManager {
|
|
3
3
|
private state;
|
|
4
4
|
readonly uid: string;
|
|
@@ -1,13 +1,16 @@
|
|
|
1
|
-
import cloneDeep from 'lodash.clonedeep';
|
|
2
1
|
import { utilities as csUtils } from '@cornerstonejs/core';
|
|
2
|
+
import cloneDeep from 'lodash.clonedeep';
|
|
3
3
|
import CORNERSTONE_COLOR_LUT from '../../constants/COLOR_LUT';
|
|
4
|
-
import getDefaultLabelmapConfig from '../../tools/displayTools/Labelmap/labelmapConfig';
|
|
5
4
|
import { SegmentationRepresentations } from '../../enums';
|
|
5
|
+
import getDefaultContourConfig from '../../tools/displayTools/Contour/contourConfig';
|
|
6
|
+
import getDefaultLabelmapConfig from '../../tools/displayTools/Labelmap/labelmapConfig';
|
|
6
7
|
const defaultLabelmapConfig = getDefaultLabelmapConfig();
|
|
8
|
+
const defaultContourConfig = getDefaultContourConfig();
|
|
7
9
|
const newGlobalConfig = {
|
|
8
10
|
renderInactiveSegmentations: true,
|
|
9
11
|
representations: {
|
|
10
12
|
[SegmentationRepresentations.Labelmap]: defaultLabelmapConfig,
|
|
13
|
+
[SegmentationRepresentations.Contour]: defaultContourConfig,
|
|
11
14
|
},
|
|
12
15
|
};
|
|
13
16
|
const initialDefaultState = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SegmentationStateManager.js","sourceRoot":"","sources":["../../../../src/stateManagement/segmentation/SegmentationStateManager.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"SegmentationStateManager.js","sourceRoot":"","sources":["../../../../src/stateManagement/segmentation/SegmentationStateManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segmentationColor.js","sourceRoot":"","sources":["../../../../../src/stateManagement/segmentation/config/segmentationColor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,iBAAiB,MAAM,yDAAyD,CAAC;AAG7F,OAAO,EAAE,yCAAyC,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"segmentationColor.js","sourceRoot":"","sources":["../../../../../src/stateManagement/segmentation/config/segmentationColor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,iBAAiB,MAAM,yDAAyD,CAAC;AAG7F,OAAO,EAAE,yCAAyC,EAAE,MAAM,8BAA8B,CAAC;AAWzF,SAAS,WAAW,CAAC,QAAkB,EAAE,aAAqB;IAC5D,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;IAGD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;QACjD,OAAO,CAAC,IAAI,CACV,qHAAqH,CACtH,CAAC;QACF,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAChC;IAED,iBAAiB,CAAC,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;AACzD,CAAC;AASD,SAAS,WAAW,CAClB,WAAmB,EACnB,6BAAqC,EACrC,aAAqB;IAErB,MAAM,iBAAiB,GACrB,iBAAiB,CAAC,kCAAkC,CAClD,WAAW,EACX,6BAA6B,CAC9B,CAAC;IAEJ,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,IAAI,KAAK,CACb,oEAAoE,6BAA6B,EAAE,CACpG,CAAC;KACH;IAED,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE;QACjD,MAAM,IAAI,KAAK,CACb,mDAAmD,aAAa,EAAE,CACnE,CAAC;KACH;IAED,iBAAiB,CAAC,aAAa,GAAG,aAAa,CAAC;IAEhD,yCAAyC,CACvC,WAAW,EACX,6BAA6B,CAC9B,CAAC;AACJ,CAAC;AAYD,SAAS,uBAAuB,CAC9B,WAAmB,EACnB,6BAAqC,EACrC,YAAoB;IAEpB,MAAM,0BAA0B,GAC9B,iBAAiB,CAAC,kCAAkC,CAClD,WAAW,EACX,6BAA6B,CAC9B,CAAC;IAEJ,IAAI,CAAC,0BAA0B,EAAE;QAC/B,MAAM,IAAI,KAAK,CACb,wCAAwC,6BAA6B,kCAAkC,WAAW,EAAE,CACrH,CAAC;KACH;IAED,MAAM,EAAE,aAAa,EAAE,GAAG,0BAA0B,CAAC;IAGrD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IAC9D,OAAO,QAAQ,CAAC,YAAY,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,uBAAuB,CAC9B,WAAmB,EACnB,6BAAqC,EACrC,YAAoB,EACpB,KAAY;IAGZ,MAAM,cAAc,GAAG,uBAAuB,CAC5C,WAAW,EACX,6BAA6B,EAC7B,YAAY,CACb,CAAC;IAGF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,cAAc,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;KAC9B;IAED,yCAAyC,CACvC,WAAW,EACX,6BAA6B,CAC9B,CAAC;AACJ,CAAC;AAED,OAAO,EACL,uBAAuB,EACvB,WAAW,EACX,WAAW,EACX,uBAAuB,GACxB,CAAC"}
|
|
@@ -2,12 +2,26 @@ import { cache } from '@cornerstonejs/core';
|
|
|
2
2
|
import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
|
|
3
3
|
import { getSegmentationRepresentations } from '../../../stateManagement/segmentation/segmentationState';
|
|
4
4
|
import { triggerSegmentationRepresentationModified } from '../triggerSegmentationEvents';
|
|
5
|
+
import SegmentationRepresentations from '../../../enums/SegmentationRepresentations';
|
|
5
6
|
function getSegmentationIndices(segmentationId) {
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
const segmentation = SegmentationState.getSegmentation(segmentationId);
|
|
8
|
+
if (segmentation.type === SegmentationRepresentations.Labelmap) {
|
|
9
|
+
const volume = cache.getVolume(segmentationId);
|
|
10
|
+
const scalarData = volume.getScalarData();
|
|
11
|
+
const keySet = {};
|
|
12
|
+
scalarData.forEach((it) => (keySet[it] = it));
|
|
13
|
+
return Object.keys(keySet).map((it) => parseInt(it, 10));
|
|
14
|
+
}
|
|
15
|
+
else if (segmentation.type === SegmentationRepresentations.Contour) {
|
|
16
|
+
const geometryIds = segmentation.representationData.CONTOUR?.geometryIds;
|
|
17
|
+
if (!geometryIds) {
|
|
18
|
+
throw new Error(`No geometryIds found for segmentationId ${segmentationId}`);
|
|
19
|
+
}
|
|
20
|
+
return geometryIds.map((geometryId) => {
|
|
21
|
+
const geometry = cache.getGeometry(geometryId);
|
|
22
|
+
return geometry.data.getSegmentIndex();
|
|
23
|
+
});
|
|
24
|
+
}
|
|
11
25
|
}
|
|
12
26
|
function setSegmentationVisibility(toolGroupId, segmentationRepresentationUID, visibility) {
|
|
13
27
|
const toolGroupSegmentationRepresentations = getSegmentationRepresentations(toolGroupId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segmentationVisibility.js","sourceRoot":"","sources":["../../../../../src/stateManagement/segmentation/config/segmentationVisibility.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"segmentationVisibility.js","sourceRoot":"","sources":["../../../../../src/stateManagement/segmentation/config/segmentationVisibility.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { defaultSegmentationStateManager } from './SegmentationStateManager';
|
|
2
|
-
import {
|
|
2
|
+
import { triggerSegmentationModified, triggerSegmentationRemoved, triggerSegmentationRepresentationModified, triggerSegmentationRepresentationRemoved, } from './triggerSegmentationEvents';
|
|
3
3
|
import normalizeSegmentationInput from './helpers/normalizeSegmentationInput';
|
|
4
|
-
import getDefaultLabelmapConfig from '../../tools/displayTools/Labelmap/labelmapConfig';
|
|
5
|
-
import { SegmentationRepresentations } from '../../enums';
|
|
6
4
|
function getDefaultSegmentationStateManager() {
|
|
7
5
|
return defaultSegmentationStateManager;
|
|
8
6
|
}
|
|
@@ -119,13 +117,5 @@ function addColorLUT(colorLUT, index) {
|
|
|
119
117
|
const segmentationStateManager = getDefaultSegmentationStateManager();
|
|
120
118
|
segmentationStateManager.addColorLUT(colorLUT, index);
|
|
121
119
|
}
|
|
122
|
-
const defaultLabelmapConfig = getDefaultLabelmapConfig();
|
|
123
|
-
const newGlobalConfig = {
|
|
124
|
-
renderInactiveSegmentations: true,
|
|
125
|
-
representations: {
|
|
126
|
-
[SegmentationRepresentations.Labelmap]: defaultLabelmapConfig,
|
|
127
|
-
},
|
|
128
|
-
};
|
|
129
|
-
setGlobalConfig(newGlobalConfig, true);
|
|
130
120
|
export { getDefaultSegmentationStateManager, getSegmentation, getSegmentations, addSegmentation, removeSegmentation, getSegmentationRepresentations, addSegmentationRepresentation, removeSegmentationRepresentation, getToolGroupSpecificConfig, setToolGroupSpecificConfig, getGlobalConfig, setGlobalConfig, getSegmentationRepresentationSpecificConfig, setSegmentationRepresentationSpecificConfig, getSegmentSpecificRepresentationConfig, setSegmentSpecificRepresentationConfig, getToolGroupIdsWithSegmentation, getSegmentationRepresentationByUID, addColorLUT, getColorLUT, removeColorLUT, };
|
|
131
121
|
//# sourceMappingURL=segmentationState.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segmentationState.js","sourceRoot":"","sources":["../../../../src/stateManagement/segmentation/segmentationState.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"segmentationState.js","sourceRoot":"","sources":["../../../../src/stateManagement/segmentation/segmentationState.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,+BAA+B,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EACL,2BAA2B,EAC3B,0BAA0B,EAC1B,yCAAyC,EACzC,wCAAwC,GACzC,MAAM,6BAA6B,CAAC;AAErC,OAAO,0BAA0B,MAAM,sCAAsC,CAAC;AAK9E,SAAS,kCAAkC;IACzC,OAAO,+BAA+B,CAAC;AACzC,CAAC;AAaD,SAAS,eAAe,CAAC,cAAsB;IAC7C,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,OAAO,wBAAwB,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;AAClE,CAAC;AAMD,SAAS,gBAAgB;IACvB,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,MAAM,KAAK,GAAG,wBAAwB,CAAC,QAAQ,EAAE,CAAC;IAElD,OAAO,KAAK,CAAC,aAAa,CAAC;AAC7B,CAAC;AAOD,SAAS,eAAe,CACtB,iBAA0C,EAC1C,cAAwB;IAExB,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IAEtE,MAAM,YAAY,GAAG,0BAA0B,CAAC,iBAAiB,CAAC,CAAC;IAEnE,wBAAwB,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAEvD,IAAI,CAAC,cAAc,EAAE;QACnB,2BAA2B,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;KAC1D;AACH,CAAC;AAQD,SAAS,8BAA8B,CACrC,WAAmB;IAEnB,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,OAAO,wBAAwB,CAAC,8BAA8B,CAAC,WAAW,CAAC,CAAC;AAC9E,CAAC;AAQD,SAAS,+BAA+B,CAAC,cAAsB;IAC7D,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,MAAM,KAAK,GAAG,wBAAwB,CAAC,QAAQ,EAAE,CAAC;IAClD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAEnD,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QACnC,MAAM,oCAAoC,GACxC,wBAAwB,CAAC,8BAA8B,CAAC,WAAW,CAAC,CAAC;QAEvE,oCAAoC,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;YAC9D,IAAI,cAAc,CAAC,cAAc,KAAK,cAAc,EAAE;gBACpD,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aACrC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAQD,SAAS,0BAA0B,CACjC,WAAmB;IAEnB,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,OAAO,wBAAwB,CAAC,0BAA0B,CAAC,WAAW,CAAC,CAAC;AAC1E,CAAC;AAaD,SAAS,0BAA0B,CACjC,WAAmB,EACnB,MAAwC,EACxC,cAAwB;IAExB,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,wBAAwB,CAAC,mCAAmC,CAC1D,WAAW,EACX,MAAM,CACP,CAAC;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,yCAAyC,CAAC,WAAW,CAAC,CAAC;KACxD;AACH,CAAC;AASD,SAAS,2CAA2C,CAClD,WAAmB,EACnB,6BAAqC,EACrC,MAA4B,EAC5B,cAAc,GAAG,KAAK;IAEtB,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,wBAAwB,CAAC,2CAA2C,CAClE,WAAW,EACX,6BAA6B,EAC7B,MAAM,CACP,CAAC;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,yCAAyC,CACvC,WAAW,EACX,6BAA6B,CAC9B,CAAC;KACH;AACH,CAAC;AAOD,SAAS,2CAA2C,CAClD,WAAmB,EACnB,6BAAqC;IAErC,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,OAAO,wBAAwB,CAAC,2CAA2C,CACzE,WAAW,EACX,6BAA6B,CAC9B,CAAC;AACJ,CAAC;AAED,SAAS,sCAAsC,CAC7C,WAAmB,EACnB,6BAAqC,EACrC,YAAoB;IAEpB,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,OAAO,wBAAwB,CAAC,wBAAwB,CACtD,WAAW,EACX,6BAA6B,EAC7B,YAAY,CACb,CAAC;AACJ,CAAC;AAED,SAAS,sCAAsC,CAC7C,WAAmB,EACnB,6BAAqC,EACrC,MAA2C,EAC3C,cAAc,GAAG,KAAK;IAEtB,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,wBAAwB,CAAC,wBAAwB,CAC/C,WAAW,EACX,6BAA6B,EAC7B,MAAM,CACP,CAAC;IAIF,IAAI,CAAC,cAAc,EAAE;QACnB,yCAAyC,CACvC,WAAW,EACX,6BAA6B,CAC9B,CAAC;KACH;AACH,CAAC;AAYD,SAAS,6BAA6B,CACpC,WAAmB,EACnB,0BAA2D,EAC3D,cAAwB;IAExB,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,wBAAwB,CAAC,6BAA6B,CACpD,WAAW,EACX,0BAA0B,CAC3B,CAAC;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,yCAAyC,CACvC,WAAW,EACX,0BAA0B,CAAC,6BAA6B,CACzD,CAAC;KACH;AACH,CAAC;AAQD,SAAS,eAAe;IACtB,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,OAAO,wBAAwB,CAAC,eAAe,EAAE,CAAC;AACpD,CAAC;AAUD,SAAS,eAAe,CACtB,MAAwC,EACxC,cAAwB;IAExB,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,wBAAwB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAEjD,IAAI,CAAC,cAAc,EAAE;QACnB,2BAA2B,EAAE,CAAC;KAC/B;AACH,CAAC;AAWD,SAAS,kCAAkC,CACzC,WAAmB,EACnB,6BAAqC;IAErC,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,OAAO,wBAAwB,CAAC,kCAAkC,CAChE,WAAW,EACX,6BAA6B,CAC9B,CAAC;AACJ,CAAC;AASD,SAAS,kBAAkB,CAAC,cAAsB;IAChD,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,wBAAwB,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;IAC5D,0BAA0B,CAAC,cAAc,CAAC,CAAC;AAC7C,CAAC;AAcD,SAAS,gCAAgC,CACvC,WAAmB,EACnB,6BAAqC;IAErC,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,wBAAwB,CAAC,gCAAgC,CACvD,WAAW,EACX,6BAA6B,CAC9B,CAAC;IAEF,wCAAwC,CACtC,WAAW,EACX,6BAA6B,CAC9B,CAAC;AACJ,CAAC;AAOD,SAAS,cAAc,CAAC,aAAqB;IAC3C,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,wBAAwB,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;AACzD,CAAC;AAOD,SAAS,WAAW,CAAC,KAAa;IAChC,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,OAAO,wBAAwB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AACrD,CAAC;AAOD,SAAS,WAAW,CAAC,QAAkB,EAAE,KAAa;IACpD,MAAM,wBAAwB,GAAG,kCAAkC,EAAE,CAAC;IACtE,wBAAwB,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;AAExD,CAAC;AAED,OAAO,EACL,kCAAkC,EAElC,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAElB,8BAA8B,EAC9B,6BAA6B,EAC7B,gCAAgC,EAEhC,0BAA0B,EAC1B,0BAA0B,EAC1B,eAAe,EACf,eAAe,EACf,2CAA2C,EAC3C,2CAA2C,EAC3C,sCAAsC,EACtC,sCAAsC,EAEtC,+BAA+B,EAC/B,kCAAkC,EAElC,WAAW,EACX,WAAW,EACX,cAAc,GACf,CAAC"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { Types } from '@cornerstonejs/core';
|
|
2
|
+
import { SegmentationRepresentationConfig, ToolGroupSpecificContourRepresentation } from '../../../types';
|
|
3
|
+
export declare function addContourSetsToElement(viewport: Types.IVolumeViewport, geometryIds: string[], contourRepresentation: ToolGroupSpecificContourRepresentation, contourRepresentationConfig: SegmentationRepresentationConfig, contourActorUID: string): void;
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { cache } from '@cornerstonejs/core';
|
|
2
|
+
import vtkDataArray from '@kitware/vtk.js/Common/Core/DataArray';
|
|
3
|
+
import vtkAppendPolyData from '@kitware/vtk.js/Filters/General/AppendPolyData';
|
|
4
|
+
import vtkActor from '@kitware/vtk.js/Rendering/Core/Actor';
|
|
5
|
+
import vtkMapper from '@kitware/vtk.js/Rendering/Core/Mapper';
|
|
6
|
+
import { getPolyData, getSegmentSpecificConfig, validateGeometry, } from './utils';
|
|
7
|
+
import { getConfigCache, setConfigCache } from './contourConfigCache';
|
|
8
|
+
export function addContourSetsToElement(viewport, geometryIds, contourRepresentation, contourRepresentationConfig, contourActorUID) {
|
|
9
|
+
const { segmentationRepresentationUID, segmentsHidden } = contourRepresentation;
|
|
10
|
+
const appendPolyData = vtkAppendPolyData.newInstance();
|
|
11
|
+
const scalarToColorMap = new Map();
|
|
12
|
+
const segmentSpecificMap = new Map();
|
|
13
|
+
geometryIds.forEach((geometryId) => {
|
|
14
|
+
const geometry = cache.getGeometry(geometryId);
|
|
15
|
+
if (!geometry) {
|
|
16
|
+
console.warn(`No geometry found for geometryId ${geometryId}. Skipping render.`);
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
const segmentIndex = geometry.data.getSegmentIndex();
|
|
20
|
+
validateGeometry(geometry);
|
|
21
|
+
const segmentSpecificConfig = getSegmentSpecificConfig(contourRepresentation, geometryId, segmentIndex);
|
|
22
|
+
const contourSet = geometry.data;
|
|
23
|
+
const polyData = getPolyData(contourSet);
|
|
24
|
+
const color = contourSet.getColor();
|
|
25
|
+
const size = polyData.getPoints().getNumberOfPoints();
|
|
26
|
+
const scalars = vtkDataArray.newInstance({
|
|
27
|
+
size: size * 4,
|
|
28
|
+
numberOfComponents: 4,
|
|
29
|
+
dataType: 'Uint8Array',
|
|
30
|
+
});
|
|
31
|
+
for (let i = 0; i < size; ++i) {
|
|
32
|
+
scalars.setTuple(i, [...color, 255]);
|
|
33
|
+
}
|
|
34
|
+
polyData.getPointData().setScalars(scalars);
|
|
35
|
+
if (segmentSpecificConfig) {
|
|
36
|
+
segmentSpecificMap.set(segmentIndex, segmentSpecificConfig);
|
|
37
|
+
}
|
|
38
|
+
scalarToColorMap.set(segmentIndex, [
|
|
39
|
+
...color,
|
|
40
|
+
segmentsHidden.has(segmentIndex) ? 0 : 255,
|
|
41
|
+
]);
|
|
42
|
+
segmentIndex === 0
|
|
43
|
+
? appendPolyData.setInputData(polyData)
|
|
44
|
+
: appendPolyData.addInputData(polyData);
|
|
45
|
+
});
|
|
46
|
+
const polyDataOutput = appendPolyData.getOutputData();
|
|
47
|
+
const outlineWidthActive = contourRepresentationConfig.representations.CONTOUR.outlineWidthActive;
|
|
48
|
+
const mapper = vtkMapper.newInstance();
|
|
49
|
+
mapper.setInputData(polyDataOutput);
|
|
50
|
+
const actor = vtkActor.newInstance();
|
|
51
|
+
actor.setMapper(mapper);
|
|
52
|
+
actor.getProperty().setLineWidth(outlineWidthActive);
|
|
53
|
+
setConfigCache(segmentationRepresentationUID, Object.assign({}, getConfigCache(segmentationRepresentationUID), {
|
|
54
|
+
segmentsHidden: new Set(segmentsHidden),
|
|
55
|
+
segmentSpecificMap,
|
|
56
|
+
outlineWidthActive,
|
|
57
|
+
}));
|
|
58
|
+
actor.setForceOpaque(true);
|
|
59
|
+
viewport.addActor({ uid: contourActorUID, actor });
|
|
60
|
+
viewport.resetCamera();
|
|
61
|
+
viewport.render();
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=addContourSetsToElement.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"addContourSetsToElement.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/addContourSetsToElement.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { Types } from '@cornerstonejs/core';
|
|
2
|
+
import { SegmentationRepresentationConfig, ToolGroupSpecificContourRepresentation } from '../../../types';
|
|
3
|
+
export declare function addOrUpdateContourSets(viewport: Types.IVolumeViewport, geometryIds: string[], contourRepresentation: ToolGroupSpecificContourRepresentation, contourRepresentationConfig: SegmentationRepresentationConfig): void;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { addContourSetsToElement } from './addContourSetsToElement';
|
|
2
|
+
import { updateContourSets } from './updateContourSets';
|
|
3
|
+
export function addOrUpdateContourSets(viewport, geometryIds, contourRepresentation, contourRepresentationConfig) {
|
|
4
|
+
const { segmentationRepresentationUID } = contourRepresentation;
|
|
5
|
+
const actorUID = `CONTOUR_${segmentationRepresentationUID}`;
|
|
6
|
+
const actor = viewport.getActor(actorUID);
|
|
7
|
+
const addOrUpdateFn = actor ? updateContourSets : addContourSetsToElement;
|
|
8
|
+
addOrUpdateFn(viewport, geometryIds, contourRepresentation, contourRepresentationConfig, actorUID);
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=addOrUpdateContourSets.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"addOrUpdateContourSets.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/addOrUpdateContourSets.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,UAAU,sBAAsB,CACpC,QAA+B,EAC/B,WAAqB,EACrB,qBAA6D,EAC7D,2BAA6D;IAE7D,MAAM,EAAE,6BAA6B,EAAE,GAAG,qBAAqB,CAAC;IAChE,MAAM,QAAQ,GAAG,WAAW,6BAA6B,EAAE,CAAC;IAC5D,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE1C,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,uBAAuB,CAAC;IAC1E,aAAa,CACX,QAAQ,EACR,WAAW,EACX,qBAAqB,EACrB,2BAA2B,EAC3B,QAAQ,CACT,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
const defaultContourConfig = {
|
|
2
|
+
renderOutline: true,
|
|
3
|
+
outlineWidthActive: 2,
|
|
4
|
+
outlineWidthInactive: 2,
|
|
5
|
+
outlineOpacity: 1,
|
|
6
|
+
outlineOpacityInactive: 0.85,
|
|
7
|
+
};
|
|
8
|
+
function getDefaultContourConfig() {
|
|
9
|
+
return defaultContourConfig;
|
|
10
|
+
}
|
|
11
|
+
export default getDefaultContourConfig;
|
|
12
|
+
//# sourceMappingURL=contourConfig.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contourConfig.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourConfig.ts"],"names":[],"mappings":"AAEA,MAAM,oBAAoB,GAAkB;IAC1C,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,CAAC;IACrB,oBAAoB,EAAE,CAAC;IACvB,cAAc,EAAE,CAAC;IACjB,sBAAsB,EAAE,IAAI;CAC7B,CAAC;AAEF,SAAS,uBAAuB;IAC9B,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,eAAe,uBAAuB,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
declare type ConfigCache = {
|
|
2
|
+
segmentsHidden: Set<number>;
|
|
3
|
+
outlineWidthActive: number;
|
|
4
|
+
visibility: boolean;
|
|
5
|
+
};
|
|
6
|
+
export declare function getConfigCache(segmentationRepresentationUID: string): ConfigCache;
|
|
7
|
+
export declare function setConfigCache(segmentationRepresentationUID: string, config: ConfigCache): void;
|
|
8
|
+
export declare function deleteConfigCache(segmentationRepresentationUID: string): void;
|
|
9
|
+
export {};
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
const configCachePerSegmentationRepresentationUID = new Map();
|
|
2
|
+
export function getConfigCache(segmentationRepresentationUID) {
|
|
3
|
+
return configCachePerSegmentationRepresentationUID.get(segmentationRepresentationUID);
|
|
4
|
+
}
|
|
5
|
+
export function setConfigCache(segmentationRepresentationUID, config) {
|
|
6
|
+
configCachePerSegmentationRepresentationUID.set(segmentationRepresentationUID, config);
|
|
7
|
+
}
|
|
8
|
+
export function deleteConfigCache(segmentationRepresentationUID) {
|
|
9
|
+
configCachePerSegmentationRepresentationUID.delete(segmentationRepresentationUID);
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=contourConfigCache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contourConfigCache.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourConfigCache.ts"],"names":[],"mappings":"AAYA,MAAM,2CAA2C,GAAG,IAAI,GAAG,EAAE,CAAC;AAE9D,MAAM,UAAU,cAAc,CAC5B,6BAAqC;IAErC,OAAO,2CAA2C,CAAC,GAAG,CACpD,6BAA6B,CAC9B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,6BAAqC,EACrC,MAAmB;IAEnB,2CAA2C,CAAC,GAAG,CAC7C,6BAA6B,EAC7B,MAAM,CACP,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,6BAAqC;IACrE,2CAA2C,CAAC,MAAM,CAChD,6BAA6B,CAC9B,CAAC;AACJ,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { Types } from '@cornerstonejs/core';
|
|
|
2
2
|
import { RepresentationPublicInput, SegmentationRepresentationConfig, ToolGroupSpecificRepresentation } from '../../../types/SegmentationStateTypes';
|
|
3
3
|
declare function addSegmentationRepresentation(toolGroupId: string, representationInput: RepresentationPublicInput, toolGroupSpecificConfig?: SegmentationRepresentationConfig): Promise<string>;
|
|
4
4
|
declare function removeSegmentationRepresentation(toolGroupId: string, segmentationRepresentationUID: string, renderImmediate?: boolean): void;
|
|
5
|
-
declare function render(viewport: Types.IVolumeViewport,
|
|
5
|
+
declare function render(viewport: Types.IVolumeViewport, representationConfig: ToolGroupSpecificRepresentation, toolGroupConfig: SegmentationRepresentationConfig): Promise<void>;
|
|
6
6
|
declare const _default: {
|
|
7
7
|
render: typeof render;
|
|
8
8
|
addSegmentationRepresentation: typeof addSegmentationRepresentation;
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getEnabledElementByIds, utilities as csUtils, } from '@cornerstonejs/core';
|
|
2
2
|
import Representations from '../../../enums/SegmentationRepresentations';
|
|
3
3
|
import * as SegmentationConfig from '../../../stateManagement/segmentation/config/segmentationConfig';
|
|
4
4
|
import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
|
|
5
5
|
import { getToolGroup } from '../../../store/ToolGroupManager';
|
|
6
|
-
import {
|
|
7
|
-
import
|
|
6
|
+
import { addOrUpdateContourSets } from './addOrUpdateContourSets';
|
|
7
|
+
import removeContourFromElement from './removeContourFromElement';
|
|
8
8
|
async function addSegmentationRepresentation(toolGroupId, representationInput, toolGroupSpecificConfig) {
|
|
9
9
|
const { segmentationId } = representationInput;
|
|
10
10
|
const segmentationRepresentationUID = csUtils.uuidv4();
|
|
@@ -47,63 +47,15 @@ function removeSegmentationRepresentation(toolGroupId, segmentationRepresentatio
|
|
|
47
47
|
});
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
-
async function render(viewport,
|
|
51
|
-
const {
|
|
50
|
+
async function render(viewport, representationConfig, toolGroupConfig) {
|
|
51
|
+
const { segmentationId } = representationConfig;
|
|
52
52
|
const segmentation = SegmentationState.getSegmentation(segmentationId);
|
|
53
53
|
const contourData = segmentation.representationData[Representations.Contour];
|
|
54
54
|
const { geometryIds } = contourData;
|
|
55
55
|
if (!geometryIds?.length) {
|
|
56
56
|
console.warn(`No contours found for segmentationId ${segmentationId}. Skipping render.`);
|
|
57
57
|
}
|
|
58
|
-
|
|
59
|
-
}
|
|
60
|
-
function _renderContourSets(viewport, geometryIds, segmentationRepresentationUID) {
|
|
61
|
-
geometryIds.forEach((geometryId) => {
|
|
62
|
-
const geometry = cache.getGeometry(geometryId);
|
|
63
|
-
if (!geometry) {
|
|
64
|
-
throw new Error(`No contours found for geometryId ${geometryId}`);
|
|
65
|
-
}
|
|
66
|
-
if (geometry.type !== Enums.GeometryType.CONTOUR) {
|
|
67
|
-
throw new Error(`Geometry type ${geometry.type} not supported for rendering.`);
|
|
68
|
-
}
|
|
69
|
-
if (!geometry.data) {
|
|
70
|
-
console.warn(`No contours found for geometryId ${geometryId}. Skipping render.`);
|
|
71
|
-
return;
|
|
72
|
-
}
|
|
73
|
-
const contourSet = geometry.data;
|
|
74
|
-
_renderContourSet(viewport, contourSet, segmentationRepresentationUID);
|
|
75
|
-
});
|
|
76
|
-
}
|
|
77
|
-
function _renderContourSet(viewport, contourSet, segmentationRepresentationUID, separated = false) {
|
|
78
|
-
if (separated) {
|
|
79
|
-
contourSet.getContours().forEach((contour, index) => {
|
|
80
|
-
const contourUID = `${segmentationRepresentationUID}_${contourSet.id}_${index}}`;
|
|
81
|
-
_renderContour(viewport, contour, contourUID);
|
|
82
|
-
});
|
|
83
|
-
}
|
|
84
|
-
else {
|
|
85
|
-
const contourUID = `${segmentationRepresentationUID}_${contourSet.id}`;
|
|
86
|
-
const actorUID = contourUID;
|
|
87
|
-
const actorEntry = viewport.getActor(actorUID);
|
|
88
|
-
if (!actorEntry) {
|
|
89
|
-
addContourSetToElement(viewport.element, contourSet, actorUID);
|
|
90
|
-
}
|
|
91
|
-
else {
|
|
92
|
-
throw new Error('Not implemented yet. (Update contour)');
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
viewport.resetCamera();
|
|
96
|
-
viewport.render();
|
|
97
|
-
}
|
|
98
|
-
function _renderContour(viewport, contour, contourUID) {
|
|
99
|
-
const actorUID = contourUID;
|
|
100
|
-
const actorEntry = viewport.getActor(actorUID);
|
|
101
|
-
if (!actorEntry) {
|
|
102
|
-
addContourToElement(viewport.element, contour, actorUID);
|
|
103
|
-
}
|
|
104
|
-
else {
|
|
105
|
-
throw new Error('Not implemented yet. (Update contour)');
|
|
106
|
-
}
|
|
58
|
+
addOrUpdateContourSets(viewport, geometryIds, representationConfig, toolGroupConfig);
|
|
107
59
|
}
|
|
108
60
|
function _removeContourFromToolGroupViewports(toolGroupId, segmentationRepresentationUID) {
|
|
109
61
|
const toolGroup = getToolGroup(toolGroupId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { Types } from '@cornerstonejs/core';
|
|
2
|
+
import { SegmentationRepresentationConfig, ToolGroupSpecificContourRepresentation } from '../../../types';
|
|
3
|
+
export declare function updateContourSets(viewport: Types.IVolumeViewport, geometryIds: string[], contourRepresentation: ToolGroupSpecificContourRepresentation, contourRepresentationConfig: SegmentationRepresentationConfig, contourActorUID: string): void;
|