@cornerstonejs/tools 0.52.0 → 0.52.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/stateManagement/segmentation/config/segmentationVisibility.d.ts +3 -2
- package/dist/cjs/stateManagement/segmentation/config/segmentationVisibility.js +49 -21
- package/dist/cjs/stateManagement/segmentation/config/segmentationVisibility.js.map +1 -1
- package/dist/cjs/tools/displayTools/Contour/contourDisplay.js +4 -5
- package/dist/cjs/tools/displayTools/Contour/contourDisplay.js.map +1 -1
- package/dist/cjs/tools/displayTools/Labelmap/labelmapDisplay.js +7 -9
- package/dist/cjs/tools/displayTools/Labelmap/labelmapDisplay.js.map +1 -1
- package/dist/cjs/tools/displayTools/SegmentationDisplayTool.d.ts +1 -1
- package/dist/cjs/tools/displayTools/SegmentationDisplayTool.js +11 -13
- package/dist/cjs/tools/displayTools/SegmentationDisplayTool.js.map +1 -1
- package/dist/cjs/types/SegmentationStateTypes.d.ts +1 -2
- package/dist/esm/stateManagement/segmentation/config/segmentationVisibility.d.ts +3 -2
- package/dist/esm/stateManagement/segmentation/config/segmentationVisibility.js +47 -20
- package/dist/esm/stateManagement/segmentation/config/segmentationVisibility.js.map +1 -1
- package/dist/esm/tools/displayTools/Contour/contourDisplay.js +7 -8
- package/dist/esm/tools/displayTools/Contour/contourDisplay.js.map +1 -1
- package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.js +7 -9
- package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.js.map +1 -1
- package/dist/esm/tools/displayTools/SegmentationDisplayTool.d.ts +1 -1
- package/dist/esm/tools/displayTools/SegmentationDisplayTool.js +11 -13
- package/dist/esm/tools/displayTools/SegmentationDisplayTool.js.map +1 -1
- package/dist/esm/types/SegmentationStateTypes.d.ts +1 -2
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
declare function setSegmentationVisibility(toolGroupId: string, segmentationRepresentationUID: string, visibility: boolean): void;
|
|
2
2
|
declare function getSegmentationVisibility(toolGroupId: string, segmentationRepresentationUID: string): boolean | undefined;
|
|
3
|
-
declare function
|
|
4
|
-
|
|
3
|
+
declare function setSegmentsVisibility(toolGroupId: string, segmentationRepresentationUID: string, segmentIndices: number[], visibility: boolean): void;
|
|
4
|
+
declare function setSegmentVisibility(toolGroupId: string, segmentationRepresentationUID: string, segmentIndex: number, visibility: boolean): void;
|
|
5
|
+
export { setSegmentationVisibility, getSegmentationVisibility, setSegmentVisibility, setSegmentsVisibility, };
|
|
@@ -23,46 +23,74 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.
|
|
27
|
-
const
|
|
28
|
-
const segmentationState_1 = require("../../../stateManagement/segmentation/segmentationState");
|
|
26
|
+
exports.setSegmentsVisibility = exports.setSegmentVisibility = exports.getSegmentationVisibility = exports.setSegmentationVisibility = void 0;
|
|
27
|
+
const core_1 = require("@cornerstonejs/core");
|
|
29
28
|
const SegmentationState = __importStar(require("../../../stateManagement/segmentation/segmentationState"));
|
|
29
|
+
const segmentationState_1 = require("../../../stateManagement/segmentation/segmentationState");
|
|
30
|
+
const triggerSegmentationEvents_1 = require("../triggerSegmentationEvents");
|
|
31
|
+
function getSegmentationIndices(segmentationId) {
|
|
32
|
+
const volume = core_1.cache.getVolume(segmentationId);
|
|
33
|
+
const scalarData = volume.getScalarData();
|
|
34
|
+
const keySet = {};
|
|
35
|
+
scalarData.forEach((it) => (keySet[it] = it));
|
|
36
|
+
return Object.keys(keySet).map((it) => parseInt(it, 10));
|
|
37
|
+
}
|
|
30
38
|
function setSegmentationVisibility(toolGroupId, segmentationRepresentationUID, visibility) {
|
|
31
39
|
const toolGroupSegmentationRepresentations = (0, segmentationState_1.getSegmentationRepresentations)(toolGroupId);
|
|
32
40
|
if (!toolGroupSegmentationRepresentations) {
|
|
33
41
|
return;
|
|
34
42
|
}
|
|
35
|
-
toolGroupSegmentationRepresentations.
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
43
|
+
const representation = toolGroupSegmentationRepresentations.find((representation) => representation.segmentationRepresentationUID ===
|
|
44
|
+
segmentationRepresentationUID);
|
|
45
|
+
if (!representation) {
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
const { segmentsHidden, segmentationId } = representation;
|
|
49
|
+
const indices = getSegmentationIndices(segmentationId);
|
|
50
|
+
if (visibility) {
|
|
51
|
+
segmentsHidden.clear();
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
indices.forEach((index) => {
|
|
55
|
+
segmentsHidden.add(index);
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
(0, triggerSegmentationEvents_1.triggerSegmentationRepresentationModified)(toolGroupId, representation.segmentationRepresentationUID);
|
|
42
59
|
}
|
|
43
60
|
exports.setSegmentationVisibility = setSegmentationVisibility;
|
|
44
61
|
function getSegmentationVisibility(toolGroupId, segmentationRepresentationUID) {
|
|
45
|
-
const
|
|
46
|
-
const
|
|
62
|
+
const toolGroupSegmentationRepresentations = (0, segmentationState_1.getSegmentationRepresentations)(toolGroupId);
|
|
63
|
+
const representation = toolGroupSegmentationRepresentations.find((representation) => representation.segmentationRepresentationUID ===
|
|
47
64
|
segmentationRepresentationUID);
|
|
48
|
-
if (!
|
|
65
|
+
if (!representation) {
|
|
49
66
|
return;
|
|
50
67
|
}
|
|
51
|
-
|
|
68
|
+
const { segmentsHidden } = representation;
|
|
69
|
+
return segmentsHidden.size === 0;
|
|
52
70
|
}
|
|
53
71
|
exports.getSegmentationVisibility = getSegmentationVisibility;
|
|
54
|
-
function
|
|
72
|
+
function setSegmentsVisibility(toolGroupId, segmentationRepresentationUID, segmentIndices, visibility) {
|
|
55
73
|
const segRepresentation = SegmentationState.getSegmentationRepresentationByUID(toolGroupId, segmentationRepresentationUID);
|
|
56
74
|
if (!segRepresentation) {
|
|
57
75
|
return;
|
|
58
76
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
77
|
+
segmentIndices.forEach((segmentIndex) => {
|
|
78
|
+
visibility
|
|
79
|
+
? segRepresentation.segmentsHidden.delete(segmentIndex)
|
|
80
|
+
: segRepresentation.segmentsHidden.add(segmentIndex);
|
|
81
|
+
});
|
|
82
|
+
(0, triggerSegmentationEvents_1.triggerSegmentationRepresentationModified)(toolGroupId, segmentationRepresentationUID);
|
|
83
|
+
}
|
|
84
|
+
exports.setSegmentsVisibility = setSegmentsVisibility;
|
|
85
|
+
function setSegmentVisibility(toolGroupId, segmentationRepresentationUID, segmentIndex, visibility) {
|
|
86
|
+
const segRepresentation = SegmentationState.getSegmentationRepresentationByUID(toolGroupId, segmentationRepresentationUID);
|
|
87
|
+
if (!segRepresentation) {
|
|
88
|
+
return;
|
|
64
89
|
}
|
|
90
|
+
visibility
|
|
91
|
+
? segRepresentation.segmentsHidden.delete(segmentIndex)
|
|
92
|
+
: segRepresentation.segmentsHidden.add(segmentIndex);
|
|
65
93
|
(0, triggerSegmentationEvents_1.triggerSegmentationRepresentationModified)(toolGroupId, segmentationRepresentationUID);
|
|
66
94
|
}
|
|
67
|
-
exports.
|
|
95
|
+
exports.setSegmentVisibility = setSegmentVisibility;
|
|
68
96
|
//# sourceMappingURL=segmentationVisibility.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segmentationVisibility.js","sourceRoot":"","sources":["../../../../../src/stateManagement/segmentation/config/segmentationVisibility.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"segmentationVisibility.js","sourceRoot":"","sources":["../../../../../src/stateManagement/segmentation/config/segmentationVisibility.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,12 +36,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
38
|
const core_1 = require("@cornerstonejs/core");
|
|
39
|
-
const SegmentationState = __importStar(require("../../../stateManagement/segmentation/segmentationState"));
|
|
40
|
-
const SegmentationConfig = __importStar(require("../../../stateManagement/segmentation/config/segmentationConfig"));
|
|
41
39
|
const SegmentationRepresentations_1 = __importDefault(require("../../../enums/SegmentationRepresentations"));
|
|
40
|
+
const SegmentationConfig = __importStar(require("../../../stateManagement/segmentation/config/segmentationConfig"));
|
|
41
|
+
const SegmentationState = __importStar(require("../../../stateManagement/segmentation/segmentationState"));
|
|
42
42
|
const ToolGroupManager_1 = require("../../../store/ToolGroupManager");
|
|
43
|
-
const removeContourFromElement_1 = __importDefault(require("./removeContourFromElement"));
|
|
44
43
|
const addContourToElement_1 = require("./addContourToElement");
|
|
44
|
+
const removeContourFromElement_1 = __importDefault(require("./removeContourFromElement"));
|
|
45
45
|
function addSegmentationRepresentation(toolGroupId, representationInput, toolGroupSpecificConfig) {
|
|
46
46
|
return __awaiter(this, void 0, void 0, function* () {
|
|
47
47
|
const { segmentationId } = representationInput;
|
|
@@ -55,7 +55,6 @@ function addSegmentationRepresentation(toolGroupId, representationInput, toolGro
|
|
|
55
55
|
segmentationRepresentationUID,
|
|
56
56
|
type: SegmentationRepresentations_1.default.Contour,
|
|
57
57
|
segmentsHidden,
|
|
58
|
-
visibility,
|
|
59
58
|
colorLUTIndex,
|
|
60
59
|
active,
|
|
61
60
|
segmentationRepresentationSpecificConfig: {},
|
|
@@ -87,7 +86,7 @@ function removeSegmentationRepresentation(toolGroupId, segmentationRepresentatio
|
|
|
87
86
|
}
|
|
88
87
|
function render(viewport, representation, toolGroupConfig) {
|
|
89
88
|
return __awaiter(this, void 0, void 0, function* () {
|
|
90
|
-
const { colorLUTIndex, active, segmentationId, segmentationRepresentationUID,
|
|
89
|
+
const { colorLUTIndex, active, segmentationId, segmentationRepresentationUID, segmentsHidden, } = representation;
|
|
91
90
|
const segmentation = SegmentationState.getSegmentation(segmentationId);
|
|
92
91
|
const contourData = segmentation.representationData[SegmentationRepresentations_1.default.Contour];
|
|
93
92
|
const { geometryIds } = contourData;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,12 +35,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
35
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
-
const ColorTransferFunction_1 = __importDefault(require("@kitware/vtk.js/Rendering/Core/ColorTransferFunction"));
|
|
39
38
|
const PiecewiseFunction_1 = __importDefault(require("@kitware/vtk.js/Common/DataModel/PiecewiseFunction"));
|
|
39
|
+
const ColorTransferFunction_1 = __importDefault(require("@kitware/vtk.js/Rendering/Core/ColorTransferFunction"));
|
|
40
40
|
const core_1 = require("@cornerstonejs/core");
|
|
41
|
-
const SegmentationState = __importStar(require("../../../stateManagement/segmentation/segmentationState"));
|
|
42
|
-
const SegmentationConfig = __importStar(require("../../../stateManagement/segmentation/config/segmentationConfig"));
|
|
43
41
|
const SegmentationRepresentations_1 = __importDefault(require("../../../enums/SegmentationRepresentations"));
|
|
42
|
+
const SegmentationConfig = __importStar(require("../../../stateManagement/segmentation/config/segmentationConfig"));
|
|
43
|
+
const SegmentationState = __importStar(require("../../../stateManagement/segmentation/segmentationState"));
|
|
44
44
|
const ToolGroupManager_1 = require("../../../store/ToolGroupManager");
|
|
45
45
|
const addLabelmapToElement_1 = __importDefault(require("./addLabelmapToElement"));
|
|
46
46
|
const removeLabelmapFromElement_1 = __importDefault(require("./removeLabelmapFromElement"));
|
|
@@ -51,7 +51,6 @@ function addSegmentationRepresentation(toolGroupId, representationInput, toolGro
|
|
|
51
51
|
const { segmentationId } = representationInput;
|
|
52
52
|
const segmentationRepresentationUID = core_1.utilities.uuidv4();
|
|
53
53
|
const segmentsHidden = new Set();
|
|
54
|
-
const visibility = true;
|
|
55
54
|
const colorLUTIndex = 0;
|
|
56
55
|
const active = true;
|
|
57
56
|
const cfun = ColorTransferFunction_1.default.newInstance();
|
|
@@ -62,7 +61,6 @@ function addSegmentationRepresentation(toolGroupId, representationInput, toolGro
|
|
|
62
61
|
segmentationRepresentationUID,
|
|
63
62
|
type: SegmentationRepresentations_1.default.Labelmap,
|
|
64
63
|
segmentsHidden,
|
|
65
|
-
visibility,
|
|
66
64
|
colorLUTIndex,
|
|
67
65
|
active,
|
|
68
66
|
segmentationRepresentationSpecificConfig: {},
|
|
@@ -97,7 +95,7 @@ function removeSegmentationRepresentation(toolGroupId, segmentationRepresentatio
|
|
|
97
95
|
}
|
|
98
96
|
function render(viewport, representation, toolGroupConfig) {
|
|
99
97
|
return __awaiter(this, void 0, void 0, function* () {
|
|
100
|
-
const { colorLUTIndex, active, segmentationId, segmentationRepresentationUID,
|
|
98
|
+
const { colorLUTIndex, active, segmentationId, segmentationRepresentationUID, segmentsHidden, config: renderingConfig, } = representation;
|
|
101
99
|
const segmentation = SegmentationState.getSegmentation(segmentationId);
|
|
102
100
|
const labelmapData = segmentation.representationData[SegmentationRepresentations_1.default.Labelmap];
|
|
103
101
|
const { volumeId: labelmapUID } = labelmapData;
|
|
@@ -114,10 +112,10 @@ function render(viewport, representation, toolGroupConfig) {
|
|
|
114
112
|
}
|
|
115
113
|
const { cfun, ofun } = renderingConfig;
|
|
116
114
|
const renderInactiveSegmentations = toolGroupConfig.renderInactiveSegmentations;
|
|
117
|
-
_setLabelmapColorAndOpacity(viewport.id, actorEntry, cfun, ofun, colorLUTIndex, toolGroupConfig.representations[SegmentationRepresentations_1.default.Labelmap], representation, active, renderInactiveSegmentations, segmentsHidden
|
|
115
|
+
_setLabelmapColorAndOpacity(viewport.id, actorEntry, cfun, ofun, colorLUTIndex, toolGroupConfig.representations[SegmentationRepresentations_1.default.Labelmap], representation, active, renderInactiveSegmentations, segmentsHidden);
|
|
118
116
|
});
|
|
119
117
|
}
|
|
120
|
-
function _setLabelmapColorAndOpacity(viewportId, actorEntry, cfun, ofun, colorLUTIndex, toolGroupLabelmapConfig, segmentationRepresentation, isActiveLabelmap, renderInactiveSegmentations, segmentsHidden
|
|
118
|
+
function _setLabelmapColorAndOpacity(viewportId, actorEntry, cfun, ofun, colorLUTIndex, toolGroupLabelmapConfig, segmentationRepresentation, isActiveLabelmap, renderInactiveSegmentations, segmentsHidden) {
|
|
121
119
|
var _a;
|
|
122
120
|
const { segmentSpecificConfig, segmentationRepresentationSpecificConfig } = segmentationRepresentation;
|
|
123
121
|
const segmentationRepresentationLabelmapConfig = segmentationRepresentationSpecificConfig[SegmentationRepresentations_1.default.Labelmap];
|
|
@@ -162,7 +160,7 @@ function _setLabelmapColorAndOpacity(viewportId, actorEntry, cfun, ofun, colorLU
|
|
|
162
160
|
volumeActor.getProperty().setUseLabelOutline(renderOutline);
|
|
163
161
|
volumeActor.getProperty().setLabelOutlineOpacity(outlineOpacity);
|
|
164
162
|
volumeActor.getProperty().setLabelOutlineThickness(outlineWidth);
|
|
165
|
-
const visible =
|
|
163
|
+
const visible = isActiveLabelmap || renderInactiveSegmentations;
|
|
166
164
|
volumeActor.setVisibility(visible);
|
|
167
165
|
}
|
|
168
166
|
function _getLabelmapConfig(toolGroupLabelmapConfig, segmentationRepresentationLabelmapConfig, isActiveLabelmap, segmentsLabelmapConfig) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"labelmapDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Labelmap/labelmapDisplay.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
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;AAQ/D,kFAA0D;AAE1D,4FAAoE;AAEpE,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAC9B,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAE,CAAC;AAWtC,SAAe,6BAA6B,CAC1C,WAAmB,EACnB,mBAA8C,EAC9C,uBAA0D;;QAE1D,MAAM,EAAE,cAAc,EAAE,GAAG,mBAAmB,CAAC;QAC/C,MAAM,6BAA6B,GAAG,gBAAS,CAAC,MAAM,EAAE,CAAC;QAGzD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAiB,CAAC;QAChD,MAAM,aAAa,GAAG,CAAC,CAAC;QACxB,MAAM,MAAM,GAAG,IAAI,CAAC;QACpB,MAAM,IAAI,GAAG,+BAAwB,CAAC,WAAW,EAAE,CAAC;QACpD,MAAM,IAAI,GAAG,2BAAoB,CAAC,WAAW,EAAE,CAAC;QAEhD,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEpB,MAAM,+BAA+B,GAAoC;YACvE,cAAc;YACd,6BAA6B;YAC7B,IAAI,EAAE,qCAAe,CAAC,QAAQ;YAC9B,cAAc;YACd,aAAa;YACb,MAAM;YACN,wCAAwC,EAAE,EAAE;YAC5C,qBAAqB,EAAE,EAAE;YACzB,MAAM,EAAE;gBACN,IAAI;gBACJ,IAAI;aACL;SACF,CAAC;QAGF,IAAI,uBAAuB,EAAE;YAI3B,MAAM,sBAAsB,GAC1B,kBAAkB,CAAC,0BAA0B,CAAC,WAAW,CAAC,CAAC;YAE7D,MAAM,YAAY,GAAG,gBAAS,CAAC,SAAS,CACtC,sBAAsB,EACtB,uBAAuB,CACxB,CAAC;YAEF,kBAAkB,CAAC,0BAA0B,CAAC,WAAW,EAAE;gBACzD,2BAA2B,EACzB,YAAY,CAAC,2BAA2B,IAAI,IAAI;gBAClD,eAAe,oBACV,YAAY,CAAC,eAAe,CAChC;aACF,CAAC,CAAC;SACJ;QAED,iBAAiB,CAAC,6BAA6B,CAC7C,WAAW,EACX,+BAA+B,CAChC,CAAC;QAEF,OAAO,6BAA6B,CAAC;IACvC,CAAC;CAAA;AAUD,SAAS,gCAAgC,CACvC,WAAmB,EACnB,6BAAqC,EACrC,eAAe,GAAG,KAAK;IAEvB,qCAAqC,CACnC,WAAW,EACX,6BAA6B,CAC9B,CAAC;IACF,iBAAiB,CAAC,gCAAgC,CAChD,WAAW,EACX,6BAA6B,CAC9B,CAAC;IAEF,IAAI,eAAe,EAAE;QACnB,MAAM,aAAa,GAAG,IAAA,+BAAY,EAAC,WAAW,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACnE,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE,EAAE;YAC1D,MAAM,cAAc,GAAG,IAAA,6BAAsB,EAC3C,UAAU,EACV,iBAAiB,CAClB,CAAC;YACF,cAAc,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACnC,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AASD,SAAe,MAAM,CACnB,QAA+B,EAC/B,cAA+C,EAC/C,eAAiD;;QAEjD,MAAM,EACJ,aAAa,EACb,MAAM,EACN,cAAc,EACd,6BAA6B,EAC7B,cAAc,EACd,MAAM,EAAE,eAAe,GACxB,GAAG,cAAc,CAAC;QAEnB,MAAM,YAAY,GAAG,iBAAiB,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QACvE,MAAM,YAAY,GAChB,YAAY,CAAC,kBAAkB,CAAC,qCAAe,CAAC,QAAQ,CAAC,CAAC;QAC5D,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC;QAE/C,MAAM,QAAQ,GAAG,YAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAE9C,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,WAAW,EAAE,CAAC,CAAC;SACnE;QAED,IAAI,UAAU,GAAG,QAAQ,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;QAElE,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,YAAY,GAAG,iBAAiB,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;YACvE,MAAM,EAAE,QAAQ,EAAE,GAChB,YAAY,CAAC,kBAAkB,CAAC,qCAAe,CAAC,QAAQ,CAAC,CAAC;YAE5D,MAAM,sBAAsB,CAC1B,QAAQ,EACR,QAAQ,EACR,6BAA6B,CAC9B,CAAC;YAEF,UAAU,GAAG,QAAQ,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;SAC/D;QAED,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC;QAEvC,MAAM,2BAA2B,GAC/B,eAAe,CAAC,2BAA2B,CAAC;QAE9C,2BAA2B,CACzB,QAAQ,CAAC,EAAE,EACX,UAAU,EACV,IAAI,EACJ,IAAI,EACJ,aAAa,EACb,eAAe,CAAC,eAAe,CAAC,qCAAe,CAAC,QAAQ,CAAC,EACzD,cAAc,EACd,MAAM,EACN,2BAA2B,EAC3B,cAAc,CACf,CAAC;IACJ,CAAC;CAAA;AAED,SAAS,2BAA2B,CAClC,UAAkB,EAClB,UAA4B,EAC5B,IAA8B,EAC9B,IAA0B,EAC1B,aAAqB,EACrB,uBAAuC,EACvC,0BAA2D,EAC3D,gBAAyB,EACzB,2BAAoC,EACpC,cAA2B;;IAE3B,MAAM,EAAE,qBAAqB,EAAE,wCAAwC,EAAE,GACvE,0BAA0B,CAAC;IAE7B,MAAM,wCAAwC,GAC5C,wCAAwC,CAAC,qCAAe,CAAC,QAAQ,CAAC,CAAC;IAIrE,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,UAAU,CAAC,KAA0B,CAAC;IAC1D,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;IAKrC,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,kBAAkB,CACxE,uBAAuB,EACvB,wCAAwC,EACxC,gBAAgB,CACjB,CAAC;IAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;QAClC,MAAM,YAAY,GAAG,CAAC,CAAC;QACvB,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;QAE5C,MAAM,6BAA6B,GACjC,MAAA,qBAAqB,CAAC,YAAY,CAAC,0CAAG,qCAAe,CAAC,QAAQ,CAAC,CAAC;QAElE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,GAC1D,kBAAkB,CAChB,uBAAuB,EACvB,wCAAwC,EACxC,gBAAgB,EAChB,6BAA6B,CAC9B,CAAC;QAEJ,MAAM,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,GAC5C,4BAA4B,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE;YAC/D,SAAS;YACT,UAAU;YACV,aAAa;YACb,YAAY;YACZ,YAAY;YACZ,cAAc;SACf,CAAC,CAAC;QAEL,IAAI,gBAAgB,EAAE;YACpB,IAAI,CAAC,WAAW,CACd,YAAY,EACZ,YAAY,CAAC,CAAC,CAAC,GAAG,iBAAiB,EACnC,YAAY,CAAC,CAAC,CAAC,GAAG,iBAAiB,EACnC,YAAY,CAAC,CAAC,CAAC,GAAG,iBAAiB,CACpC,CAAC;SACH;QAED,IAAI,kBAAkB,EAAE;YACtB,IAAI,UAAU,EAAE;gBACd,MAAM,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC;oBACrD,CAAC,CAAC,CAAC;oBACH,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,SAAS,CAAC;gBAExC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;gBAC/B,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAC3D;iBAAM;gBACL,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aACjD;SACF;KACF;IAED,WAAW,CAAC,WAAW,EAAE,CAAC,sBAAsB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAE1D,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACxB,WAAW,CAAC,WAAW,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAEpD,WAAW,CAAC,WAAW,EAAE,CAAC,6BAA6B,EAAE,CAAC;IAE1D,WAAW,CAAC,WAAW,EAAE,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;IAG5D,WAAW,CAAC,WAAW,EAAE,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC;IACjE,WAAW,CAAC,WAAW,EAAE,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC;IAKjE,MAAM,OAAO,GAAG,gBAAgB,IAAI,2BAA2B,CAAC;IAChE,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,kBAAkB,CACzB,uBAAuC,EACvC,wCAAwD,EACxD,gBAAyB,EACzB,sBAAuC;IAEvC,MAAM,qBAAqB,GAAG,sBAAsB,IAAI,EAAE,CAAC;IAE3D,MAAM,WAAW,iDACZ,uBAAuB,GACvB,wCAAwC,GACxC,qBAAqB,CACzB,CAAC;IAEF,MAAM,SAAS,GAAG,gBAAgB;QAChC,CAAC,CAAC,WAAW,CAAC,SAAS;QACvB,CAAC,CAAC,WAAW,CAAC,iBAAiB,CAAC;IAClC,MAAM,YAAY,GAAG,gBAAgB;QACnC,CAAC,CAAC,WAAW,CAAC,kBAAkB;QAChC,CAAC,CAAC,WAAW,CAAC,oBAAoB,CAAC;IAErC,MAAM,UAAU,GAAG,gBAAgB;QACjC,CAAC,CAAC,WAAW,CAAC,UAAU;QACxB,CAAC,CAAC,WAAW,CAAC,kBAAkB,CAAC;IAEnC,MAAM,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC;IAEhD,MAAM,cAAc,GAAG,gBAAgB;QACrC,CAAC,CAAC,WAAW,CAAC,cAAc;QAC5B,CAAC,CAAC,WAAW,CAAC,sBAAsB,CAAC;IAEvC,OAAO;QACL,SAAS;QACT,YAAY;QACZ,UAAU;QACV,aAAa;QACb,cAAc;KACf,CAAC;AACJ,CAAC;AAED,SAAS,4BAA4B,CACnC,UAAkB,EAClB,QAAgB,EAChB,YAAoB,EACpB,EACE,SAAS,EACT,UAAU,EACV,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,cAAc,GAQf;IAED,MAAM,QAAQ,GAAG,GAAG,UAAU,IAAI,QAAQ,IAAI,YAAY,EAAE,CAAC;IAC7D,MAAM,SAAS,GAAG,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAEpD,IAAI,CAAC,SAAS,EAAE;QACd,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE;YAChC,SAAS;YACT,UAAU;YACV,aAAa;YACb,YAAY;YACZ,YAAY;YACZ,cAAc,EAAE,IAAI,GAAG,CAAC,cAAc,CAAC;SACxC,CAAC,CAAC;QAEH,OAAO;YACL,kBAAkB,EAAE,IAAI;YACxB,gBAAgB,EAAE,IAAI;SACvB,CAAC;KACH;IAED,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,UAAU,EAAE,aAAa,EACzB,aAAa,EAAE,gBAAgB,EAC/B,YAAY,EAAE,eAAe,EAC7B,YAAY,EAAE,eAAe,EAC7B,cAAc,EAAE,iBAAiB,GAClC,GAAG,SAAS,CAAC;IAEd,MAAM,gBAAgB,GACpB,eAAe,CAAC,CAAC,CAAC,KAAK,YAAY,CAAC,CAAC,CAAC;QACtC,eAAe,CAAC,CAAC,CAAC,KAAK,YAAY,CAAC,CAAC,CAAC;QACtC,eAAe,CAAC,CAAC,CAAC,KAAK,YAAY,CAAC,CAAC,CAAC,CAAC;IAEzC,MAAM,kBAAkB,GACtB,eAAe,CAAC,CAAC,CAAC,KAAK,YAAY,CAAC,CAAC,CAAC;QACtC,YAAY,KAAK,SAAS;QAC1B,aAAa,KAAK,UAAU;QAC5B,gBAAgB,KAAK,aAAa;QAClC,eAAe,KAAK,YAAY;QAChC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAG3E,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE;QAChC,SAAS;QACT,UAAU;QACV,aAAa;QACb,YAAY;QACZ,YAAY;QACZ,cAAc,EAAE,IAAI,GAAG,CAAC,cAAc,CAAC;KACxC,CAAC,CAAC;IAEH,OAAO;QACL,kBAAkB;QAClB,gBAAgB;KACjB,CAAC;AACJ,CAAC;AAED,SAAS,qCAAqC,CAC5C,WAAmB,EACnB,6BAAqC;IAErC,MAAM,SAAS,GAAG,IAAA,+BAAY,EAAC,WAAW,CAAC,CAAC;IAE5C,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,8BAA8B,WAAW,iBAAiB,CAAC,CAAC;KAC7E;IAED,MAAM,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAEpC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,YAAY,CAAC;QACvD,MAAM,cAAc,GAAG,IAAA,6BAAsB,EAC3C,UAAU,EACV,iBAAiB,CAClB,CAAC;QACF,IAAA,mCAAyB,EACvB,cAAc,CAAC,QAAQ,CAAC,OAAO,EAC/B,6BAA6B,CAC9B,CAAC;KACH;AACH,CAAC;AAED,SAAe,sBAAsB,CACnC,QAA+B,EAC/B,QAAgB,EAChB,6BAAqC;;QAErC,MAAM,IAAA,8BAAoB,EACxB,QAAQ,CAAC,OAAO,EAChB,QAAQ,EACR,6BAA6B,CAC9B,CAAC;IACJ,CAAC;CAAA;AAED,kBAAe;IACb,MAAM;IACN,6BAA6B;IAC7B,gCAAgC;CACjC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { BaseTool } from '../base';
|
|
2
1
|
import { PublicToolProps, ToolProps } from '../../types';
|
|
2
|
+
import { BaseTool } from '../base';
|
|
3
3
|
import { SegmentationRepresentationConfig } from '../../types/SegmentationStateTypes';
|
|
4
4
|
declare class SegmentationDisplayTool extends BaseTool {
|
|
5
5
|
static toolName: any;
|
|
@@ -3,15 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const base_1 = require("../base");
|
|
7
6
|
const core_1 = require("@cornerstonejs/core");
|
|
8
7
|
const SegmentationRepresentations_1 = __importDefault(require("../../enums/SegmentationRepresentations"));
|
|
9
|
-
const segmentationState_1 = require("../../stateManagement/segmentation/segmentationState");
|
|
10
|
-
const Labelmap_1 = require("./Labelmap");
|
|
11
|
-
const Contour_1 = require("./Contour");
|
|
12
8
|
const segmentation_1 = require("../../stateManagement/segmentation");
|
|
13
|
-
const
|
|
9
|
+
const segmentationVisibility_1 = require("../../stateManagement/segmentation/config/segmentationVisibility");
|
|
10
|
+
const segmentationState_1 = require("../../stateManagement/segmentation/segmentationState");
|
|
14
11
|
const ToolGroupManager_1 = require("../../store/ToolGroupManager");
|
|
12
|
+
const base_1 = require("../base");
|
|
13
|
+
const Contour_1 = require("./Contour");
|
|
14
|
+
const Labelmap_1 = require("./Labelmap");
|
|
15
15
|
class SegmentationDisplayTool extends base_1.BaseTool {
|
|
16
16
|
constructor(toolProps = {}, defaultToolProps = {
|
|
17
17
|
configuration: {},
|
|
@@ -60,10 +60,9 @@ class SegmentationDisplayTool extends base_1.BaseTool {
|
|
|
60
60
|
toolGroupSegmentationRepresentations.length === 0) {
|
|
61
61
|
return;
|
|
62
62
|
}
|
|
63
|
-
|
|
64
|
-
segmentationRepresentation.
|
|
65
|
-
|
|
66
|
-
}
|
|
63
|
+
toolGroupSegmentationRepresentations.forEach((segmentationRepresentation) => {
|
|
64
|
+
(0, segmentationVisibility_1.setSegmentationVisibility)(toolGroupId, segmentationRepresentation.segmentationRepresentationUID, true);
|
|
65
|
+
});
|
|
67
66
|
}
|
|
68
67
|
onSetToolDisabled() {
|
|
69
68
|
const toolGroupId = this.toolGroupId;
|
|
@@ -72,10 +71,9 @@ class SegmentationDisplayTool extends base_1.BaseTool {
|
|
|
72
71
|
toolGroupSegmentationRepresentations.length === 0) {
|
|
73
72
|
return;
|
|
74
73
|
}
|
|
75
|
-
|
|
76
|
-
segmentationRepresentation.
|
|
77
|
-
|
|
78
|
-
}
|
|
74
|
+
toolGroupSegmentationRepresentations.forEach((segmentationRepresentation) => {
|
|
75
|
+
(0, segmentationVisibility_1.setSegmentationVisibility)(toolGroupId, segmentationRepresentation.segmentationRepresentationUID, false);
|
|
76
|
+
});
|
|
79
77
|
}
|
|
80
78
|
_getMergedRepresentationsConfig(toolGroupId) {
|
|
81
79
|
const toolGroupConfig = segmentation_1.config.getToolGroupSpecificConfig(toolGroupId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SegmentationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/displayTools/SegmentationDisplayTool.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"SegmentationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/displayTools/SegmentationDisplayTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as Enums from '../enums';
|
|
2
2
|
import { ContourConfig, ContourSegmentationData } from './ContourTypes';
|
|
3
|
-
import type { LabelmapConfig,
|
|
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 = {
|
|
@@ -38,7 +38,6 @@ export declare type ToolGroupSpecificRepresentationState = {
|
|
|
38
38
|
type: Enums.SegmentationRepresentations;
|
|
39
39
|
active: boolean;
|
|
40
40
|
segmentsHidden: Set<number>;
|
|
41
|
-
visibility: boolean;
|
|
42
41
|
colorLUTIndex: number;
|
|
43
42
|
};
|
|
44
43
|
export declare type ToolGroupSpecificLabelmapRepresentation = ToolGroupSpecificRepresentationState & {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
declare function setSegmentationVisibility(toolGroupId: string, segmentationRepresentationUID: string, visibility: boolean): void;
|
|
2
2
|
declare function getSegmentationVisibility(toolGroupId: string, segmentationRepresentationUID: string): boolean | undefined;
|
|
3
|
-
declare function
|
|
4
|
-
|
|
3
|
+
declare function setSegmentsVisibility(toolGroupId: string, segmentationRepresentationUID: string, segmentIndices: number[], visibility: boolean): void;
|
|
4
|
+
declare function setSegmentVisibility(toolGroupId: string, segmentationRepresentationUID: string, segmentIndex: number, visibility: boolean): void;
|
|
5
|
+
export { setSegmentationVisibility, getSegmentationVisibility, setSegmentVisibility, setSegmentsVisibility, };
|
|
@@ -1,40 +1,67 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { getSegmentationRepresentations } from '../../../stateManagement/segmentation/segmentationState';
|
|
1
|
+
import { cache } from '@cornerstonejs/core';
|
|
3
2
|
import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
|
|
3
|
+
import { getSegmentationRepresentations } from '../../../stateManagement/segmentation/segmentationState';
|
|
4
|
+
import { triggerSegmentationRepresentationModified } from '../triggerSegmentationEvents';
|
|
5
|
+
function getSegmentationIndices(segmentationId) {
|
|
6
|
+
const volume = cache.getVolume(segmentationId);
|
|
7
|
+
const scalarData = volume.getScalarData();
|
|
8
|
+
const keySet = {};
|
|
9
|
+
scalarData.forEach((it) => (keySet[it] = it));
|
|
10
|
+
return Object.keys(keySet).map((it) => parseInt(it, 10));
|
|
11
|
+
}
|
|
4
12
|
function setSegmentationVisibility(toolGroupId, segmentationRepresentationUID, visibility) {
|
|
5
13
|
const toolGroupSegmentationRepresentations = getSegmentationRepresentations(toolGroupId);
|
|
6
14
|
if (!toolGroupSegmentationRepresentations) {
|
|
7
15
|
return;
|
|
8
16
|
}
|
|
9
|
-
toolGroupSegmentationRepresentations.
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
17
|
+
const representation = toolGroupSegmentationRepresentations.find((representation) => representation.segmentationRepresentationUID ===
|
|
18
|
+
segmentationRepresentationUID);
|
|
19
|
+
if (!representation) {
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
const { segmentsHidden, segmentationId } = representation;
|
|
23
|
+
const indices = getSegmentationIndices(segmentationId);
|
|
24
|
+
if (visibility) {
|
|
25
|
+
segmentsHidden.clear();
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
indices.forEach((index) => {
|
|
29
|
+
segmentsHidden.add(index);
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
triggerSegmentationRepresentationModified(toolGroupId, representation.segmentationRepresentationUID);
|
|
16
33
|
}
|
|
17
34
|
function getSegmentationVisibility(toolGroupId, segmentationRepresentationUID) {
|
|
18
|
-
const
|
|
19
|
-
const
|
|
35
|
+
const toolGroupSegmentationRepresentations = getSegmentationRepresentations(toolGroupId);
|
|
36
|
+
const representation = toolGroupSegmentationRepresentations.find((representation) => representation.segmentationRepresentationUID ===
|
|
20
37
|
segmentationRepresentationUID);
|
|
21
|
-
if (!
|
|
38
|
+
if (!representation) {
|
|
22
39
|
return;
|
|
23
40
|
}
|
|
24
|
-
|
|
41
|
+
const { segmentsHidden } = representation;
|
|
42
|
+
return segmentsHidden.size === 0;
|
|
25
43
|
}
|
|
26
|
-
function
|
|
44
|
+
function setSegmentsVisibility(toolGroupId, segmentationRepresentationUID, segmentIndices, visibility) {
|
|
27
45
|
const segRepresentation = SegmentationState.getSegmentationRepresentationByUID(toolGroupId, segmentationRepresentationUID);
|
|
28
46
|
if (!segRepresentation) {
|
|
29
47
|
return;
|
|
30
48
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
49
|
+
segmentIndices.forEach((segmentIndex) => {
|
|
50
|
+
visibility
|
|
51
|
+
? segRepresentation.segmentsHidden.delete(segmentIndex)
|
|
52
|
+
: segRepresentation.segmentsHidden.add(segmentIndex);
|
|
53
|
+
});
|
|
54
|
+
triggerSegmentationRepresentationModified(toolGroupId, segmentationRepresentationUID);
|
|
55
|
+
}
|
|
56
|
+
function setSegmentVisibility(toolGroupId, segmentationRepresentationUID, segmentIndex, visibility) {
|
|
57
|
+
const segRepresentation = SegmentationState.getSegmentationRepresentationByUID(toolGroupId, segmentationRepresentationUID);
|
|
58
|
+
if (!segRepresentation) {
|
|
59
|
+
return;
|
|
36
60
|
}
|
|
61
|
+
visibility
|
|
62
|
+
? segRepresentation.segmentsHidden.delete(segmentIndex)
|
|
63
|
+
: segRepresentation.segmentsHidden.add(segmentIndex);
|
|
37
64
|
triggerSegmentationRepresentationModified(toolGroupId, segmentationRepresentationUID);
|
|
38
65
|
}
|
|
39
|
-
export { setSegmentationVisibility, getSegmentationVisibility,
|
|
66
|
+
export { setSegmentationVisibility, getSegmentationVisibility, setSegmentVisibility, setSegmentsVisibility, };
|
|
40
67
|
//# sourceMappingURL=segmentationVisibility.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segmentationVisibility.js","sourceRoot":"","sources":["../../../../../src/stateManagement/segmentation/config/segmentationVisibility.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"segmentationVisibility.js","sourceRoot":"","sources":["../../../../../src/stateManagement/segmentation/config/segmentationVisibility.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { cache,
|
|
2
|
-
import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
|
|
3
|
-
import * as SegmentationConfig from '../../../stateManagement/segmentation/config/segmentationConfig';
|
|
1
|
+
import { cache, Enums, getEnabledElementByIds, utilities as csUtils, } from '@cornerstonejs/core';
|
|
4
2
|
import Representations from '../../../enums/SegmentationRepresentations';
|
|
3
|
+
import * as SegmentationConfig from '../../../stateManagement/segmentation/config/segmentationConfig';
|
|
4
|
+
import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
|
|
5
5
|
import { getToolGroup } from '../../../store/ToolGroupManager';
|
|
6
|
-
import
|
|
7
|
-
import {
|
|
6
|
+
import { addContourSetToElement, addContourToElement, } from './addContourToElement';
|
|
7
|
+
import { default as removeContourFromElement } from './removeContourFromElement';
|
|
8
8
|
async function addSegmentationRepresentation(toolGroupId, representationInput, toolGroupSpecificConfig) {
|
|
9
9
|
const { segmentationId } = representationInput;
|
|
10
|
-
const segmentationRepresentationUID =
|
|
10
|
+
const segmentationRepresentationUID = csUtils.uuidv4();
|
|
11
11
|
const segmentsHidden = new Set();
|
|
12
12
|
const visibility = true;
|
|
13
13
|
const colorLUTIndex = 0;
|
|
@@ -17,7 +17,6 @@ async function addSegmentationRepresentation(toolGroupId, representationInput, t
|
|
|
17
17
|
segmentationRepresentationUID,
|
|
18
18
|
type: Representations.Contour,
|
|
19
19
|
segmentsHidden,
|
|
20
|
-
visibility,
|
|
21
20
|
colorLUTIndex,
|
|
22
21
|
active,
|
|
23
22
|
segmentationRepresentationSpecificConfig: {},
|
|
@@ -49,7 +48,7 @@ function removeSegmentationRepresentation(toolGroupId, segmentationRepresentatio
|
|
|
49
48
|
}
|
|
50
49
|
}
|
|
51
50
|
async function render(viewport, representation, toolGroupConfig) {
|
|
52
|
-
const { colorLUTIndex, active, segmentationId, segmentationRepresentationUID,
|
|
51
|
+
const { colorLUTIndex, active, segmentationId, segmentationRepresentationUID, segmentsHidden, } = representation;
|
|
53
52
|
const segmentation = SegmentationState.getSegmentation(segmentationId);
|
|
54
53
|
const contourData = segmentation.representationData[Representations.Contour];
|
|
55
54
|
const { geometryIds } = contourData;
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import vtkColorTransferFunction from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction';
|
|
2
1
|
import vtkPiecewiseFunction from '@kitware/vtk.js/Common/DataModel/PiecewiseFunction';
|
|
2
|
+
import vtkColorTransferFunction from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction';
|
|
3
3
|
import { cache, getEnabledElementByIds, utilities, } from '@cornerstonejs/core';
|
|
4
|
-
import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
|
|
5
|
-
import * as SegmentationConfig from '../../../stateManagement/segmentation/config/segmentationConfig';
|
|
6
4
|
import Representations from '../../../enums/SegmentationRepresentations';
|
|
5
|
+
import * as SegmentationConfig from '../../../stateManagement/segmentation/config/segmentationConfig';
|
|
6
|
+
import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
|
|
7
7
|
import { getToolGroup } from '../../../store/ToolGroupManager';
|
|
8
8
|
import addLabelmapToElement from './addLabelmapToElement';
|
|
9
9
|
import removeLabelmapFromElement from './removeLabelmapFromElement';
|
|
@@ -13,7 +13,6 @@ async function addSegmentationRepresentation(toolGroupId, representationInput, t
|
|
|
13
13
|
const { segmentationId } = representationInput;
|
|
14
14
|
const segmentationRepresentationUID = utilities.uuidv4();
|
|
15
15
|
const segmentsHidden = new Set();
|
|
16
|
-
const visibility = true;
|
|
17
16
|
const colorLUTIndex = 0;
|
|
18
17
|
const active = true;
|
|
19
18
|
const cfun = vtkColorTransferFunction.newInstance();
|
|
@@ -24,7 +23,6 @@ async function addSegmentationRepresentation(toolGroupId, representationInput, t
|
|
|
24
23
|
segmentationRepresentationUID,
|
|
25
24
|
type: Representations.Labelmap,
|
|
26
25
|
segmentsHidden,
|
|
27
|
-
visibility,
|
|
28
26
|
colorLUTIndex,
|
|
29
27
|
active,
|
|
30
28
|
segmentationRepresentationSpecificConfig: {},
|
|
@@ -59,7 +57,7 @@ function removeSegmentationRepresentation(toolGroupId, segmentationRepresentatio
|
|
|
59
57
|
}
|
|
60
58
|
}
|
|
61
59
|
async function render(viewport, representation, toolGroupConfig) {
|
|
62
|
-
const { colorLUTIndex, active, segmentationId, segmentationRepresentationUID,
|
|
60
|
+
const { colorLUTIndex, active, segmentationId, segmentationRepresentationUID, segmentsHidden, config: renderingConfig, } = representation;
|
|
63
61
|
const segmentation = SegmentationState.getSegmentation(segmentationId);
|
|
64
62
|
const labelmapData = segmentation.representationData[Representations.Labelmap];
|
|
65
63
|
const { volumeId: labelmapUID } = labelmapData;
|
|
@@ -76,9 +74,9 @@ async function render(viewport, representation, toolGroupConfig) {
|
|
|
76
74
|
}
|
|
77
75
|
const { cfun, ofun } = renderingConfig;
|
|
78
76
|
const renderInactiveSegmentations = toolGroupConfig.renderInactiveSegmentations;
|
|
79
|
-
_setLabelmapColorAndOpacity(viewport.id, actorEntry, cfun, ofun, colorLUTIndex, toolGroupConfig.representations[Representations.Labelmap], representation, active, renderInactiveSegmentations, segmentsHidden
|
|
77
|
+
_setLabelmapColorAndOpacity(viewport.id, actorEntry, cfun, ofun, colorLUTIndex, toolGroupConfig.representations[Representations.Labelmap], representation, active, renderInactiveSegmentations, segmentsHidden);
|
|
80
78
|
}
|
|
81
|
-
function _setLabelmapColorAndOpacity(viewportId, actorEntry, cfun, ofun, colorLUTIndex, toolGroupLabelmapConfig, segmentationRepresentation, isActiveLabelmap, renderInactiveSegmentations, segmentsHidden
|
|
79
|
+
function _setLabelmapColorAndOpacity(viewportId, actorEntry, cfun, ofun, colorLUTIndex, toolGroupLabelmapConfig, segmentationRepresentation, isActiveLabelmap, renderInactiveSegmentations, segmentsHidden) {
|
|
82
80
|
const { segmentSpecificConfig, segmentationRepresentationSpecificConfig } = segmentationRepresentation;
|
|
83
81
|
const segmentationRepresentationLabelmapConfig = segmentationRepresentationSpecificConfig[Representations.Labelmap];
|
|
84
82
|
const colorLUT = SegmentationState.getColorLUT(colorLUTIndex);
|
|
@@ -122,7 +120,7 @@ function _setLabelmapColorAndOpacity(viewportId, actorEntry, cfun, ofun, colorLU
|
|
|
122
120
|
volumeActor.getProperty().setUseLabelOutline(renderOutline);
|
|
123
121
|
volumeActor.getProperty().setLabelOutlineOpacity(outlineOpacity);
|
|
124
122
|
volumeActor.getProperty().setLabelOutlineThickness(outlineWidth);
|
|
125
|
-
const visible =
|
|
123
|
+
const visible = isActiveLabelmap || renderInactiveSegmentations;
|
|
126
124
|
volumeActor.setVisibility(visible);
|
|
127
125
|
}
|
|
128
126
|
function _getLabelmapConfig(toolGroupLabelmapConfig, segmentationRepresentationLabelmapConfig, isActiveLabelmap, segmentsLabelmapConfig) {
|