@cornerstonejs/tools 0.43.1 → 0.44.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/tools/StackRotateTool.js.map +1 -1
- package/dist/cjs/tools/WindowLevelTool.js +13 -16
- package/dist/cjs/tools/WindowLevelTool.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/StackRotateTool.js.map +1 -1
- package/dist/esm/tools/WindowLevelTool.js +14 -17
- package/dist/esm/tools/WindowLevelTool.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 +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackRotateTool.js","sourceRoot":"","sources":["../../../src/tools/StackRotateTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAA+D;AAC/D,yCAAiC;AACjC,iCAAkC;AAClC,kGAA0E;AAO1E,MAAM,eAAgB,SAAQ,eAAQ;IAKpC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;KAC9C;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAEnC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,aAAa,CAAC,GAAkC;QAC9C,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC3D,MAAM,iBAAiB,GAAG,aAAa,CAAC,KAAK,CAAC;QAC9C,MAAM,eAAe,GAAG,WAAW,CAAC,KAAK,CAAC;QAC1C,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QACpC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;QAClC,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;QAEpC,MAAM,YAAY,GAAiB,CAAC,KAAK,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,CAAC;QAC/D,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QAEzD,IAAI,KAAK,GAAG,IAAA,2BAAiB,EAC3B,CAAC,eAAe,EAAE,WAAW,CAAC,EAC9B,CAAC,WAAW,EAAE,iBAAiB,CAAC,CACjC,CAAC;QAEF,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;QAEnC,MAAM,EAAE,GAAG,gBAAI,CAAC,GAAG,CAAC,gBAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;QACjE,MAAM,EAAE,GAAG,gBAAI,CAAC,GAAG,CAAC,gBAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,gBAAI,CAAC,KAAK,CAAC,gBAAI,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAChD,IAAI,gBAAI,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE;YACxC,KAAK,GAAG,CAAC,KAAK,CAAC;SAChB;QAED,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;YAAE,OAAO;QAEhC,MAAM,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"StackRotateTool.js","sourceRoot":"","sources":["../../../src/tools/StackRotateTool.ts"],"names":[],"mappings":";;;;;AAAA,8CAA+D;AAC/D,yCAAiC;AACjC,iCAAkC;AAClC,kGAA0E;AAO1E,MAAM,eAAgB,SAAQ,eAAQ;IAKpC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;KAC9C;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAEnC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,aAAa,CAAC,GAAkC;QAC9C,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC3D,MAAM,iBAAiB,GAAG,aAAa,CAAC,KAAK,CAAC;QAC9C,MAAM,eAAe,GAAG,WAAW,CAAC,KAAK,CAAC;QAC1C,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QACpC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;QAClC,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;QAEpC,MAAM,YAAY,GAAiB,CAAC,KAAK,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,CAAC;QAC/D,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QAEzD,IAAI,KAAK,GAAG,IAAA,2BAAiB,EAC3B,CAAC,eAAe,EAAE,WAAW,CAAC,EAC9B,CAAC,WAAW,EAAE,iBAAiB,CAAC,CACjC,CAAC;QAEF,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;QAEnC,MAAM,EAAE,GAAG,gBAAI,CAAC,GAAG,CAAC,gBAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;QACjE,MAAM,EAAE,GAAG,gBAAI,CAAC,GAAG,CAAC,gBAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,gBAAI,CAAC,KAAK,CAAC,gBAAI,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAChD,IAAI,gBAAI,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE;YACxC,KAAK,GAAG,CAAC,KAAK,CAAC;SAChB;QAED,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;YAAE,OAAO;QAEhC,MAAM,EAAE,QAAQ,EAAE,GAAI,QAAiC,CAAC,aAAa,EAAE,CAAC;QACxE,QAAQ,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,QAAQ,GAAG,KAAK,EAAE,CAAC,CAAC;QAEvD,QAAQ,CAAC,MAAM,EAAE,CAAC;IACpB,CAAC;CACF;AAED,eAAe,CAAC,QAAQ,GAAG,aAAa,CAAC;AACzC,kBAAe,eAAe,CAAC"}
|
|
@@ -36,17 +36,15 @@ class WindowLevelTool extends base_1.BaseTool {
|
|
|
36
36
|
mouseDragCallback(evt) {
|
|
37
37
|
const { element, deltaPoints } = evt.detail;
|
|
38
38
|
const enabledElement = (0, core_1.getEnabledElement)(element);
|
|
39
|
-
const { renderingEngine,
|
|
40
|
-
let volumeId,
|
|
39
|
+
const { renderingEngine, viewport } = enabledElement;
|
|
40
|
+
let volumeId, lower, upper, modality, newRange, viewportsContainingVolumeUID;
|
|
41
41
|
let isPreScaled = false;
|
|
42
42
|
if (viewport instanceof core_1.VolumeViewport) {
|
|
43
43
|
const targetId = this.getTargetId(viewport);
|
|
44
44
|
volumeId = targetId.split('volumeId:')[1];
|
|
45
|
-
const actorEntry = viewport.getActor(volumeId);
|
|
46
|
-
volumeActor = actorEntry.actor;
|
|
47
|
-
rgbTransferFunction = volumeActor.getProperty().getRGBTransferFunction(0);
|
|
48
45
|
viewportsContainingVolumeUID = core_1.utilities.getViewportsWithVolumeId(volumeId, renderingEngine.id);
|
|
49
|
-
|
|
46
|
+
const properties = viewport.getProperties();
|
|
47
|
+
({ lower, upper } = properties.voiRange);
|
|
50
48
|
const volume = core_1.cache.getVolume(volumeId);
|
|
51
49
|
modality = volume.metadata.Modality;
|
|
52
50
|
isPreScaled = volume.scaling && Object.keys(volume.scaling).length > 0;
|
|
@@ -78,11 +76,6 @@ class WindowLevelTool extends base_1.BaseTool {
|
|
|
78
76
|
upper,
|
|
79
77
|
});
|
|
80
78
|
}
|
|
81
|
-
const eventDetail = {
|
|
82
|
-
volumeId,
|
|
83
|
-
viewportId,
|
|
84
|
-
range: newRange,
|
|
85
|
-
};
|
|
86
79
|
if (viewport instanceof core_1.StackViewport) {
|
|
87
80
|
viewport.setProperties({
|
|
88
81
|
voiRange: newRange,
|
|
@@ -90,11 +83,15 @@ class WindowLevelTool extends base_1.BaseTool {
|
|
|
90
83
|
viewport.render();
|
|
91
84
|
return;
|
|
92
85
|
}
|
|
93
|
-
(
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
86
|
+
if (viewport instanceof core_1.VolumeViewport) {
|
|
87
|
+
viewport.setProperties({
|
|
88
|
+
voiRange: newRange,
|
|
89
|
+
});
|
|
90
|
+
viewportsContainingVolumeUID.forEach((vp) => {
|
|
91
|
+
vp.render();
|
|
92
|
+
});
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
98
95
|
}
|
|
99
96
|
getPTNewRange({ deltaPointsCanvas, lower, upper, clientHeight }) {
|
|
100
97
|
const deltaY = deltaPointsCanvas[1];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WindowLevelTool.js","sourceRoot":"","sources":["../../../src/tools/WindowLevelTool.ts"],"names":[],"mappings":";;AAAA,iCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"WindowLevelTool.js","sourceRoot":"","sources":["../../../src/tools/WindowLevelTool.ts"],"names":[],"mappings":";;AAAA,iCAAkC;AAClC,8CAO6B;AAI7B,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,MAAM,2BAA2B,GAAG,IAAI,CAAC;AACzC,MAAM,EAAE,GAAG,IAAI,CAAC;AAQhB,MAAM,eAAgB,SAAQ,eAAQ;IAEpC,YACE,SAAS,GAAG,EAAE,EACd,gBAAgB,GAAG;QACjB,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;KAC9C;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAyKrC,yCAAoC,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE;YAChE,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAEvD,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAClD,IAAI,aAAa,CAAC;YAClB,IAAI,qBAAqB,CAAC;YAE1B,IAAI,UAAU,YAAY,YAAY,EAAE;gBACtC,aAAa,GAAG,CAAC,CAAC;gBAClB,qBAAqB,GAAG,YAAY,CAAC;aACtC;iBAAM,IAAI,UAAU,YAAY,UAAU,EAAE;gBAC3C,aAAa,GAAG,CAAC,CAAC;gBAClB,qBAAqB,GAAG,UAAU,CAAC;aACpC;YAED,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;YACjC,MAAM,UAAU,GAAG,gBAAgB,GAAG,WAAW,GAAG,aAAa,CAAC;YAClE,MAAM,KAAK,GAAG,IAAI,qBAAqB,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;YAEzE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YAEzD,OAAO,GAAG,GAAG,GAAG,CAAC;QACnB,CAAC,CAAC;IA9LF,CAAC;IAED,iBAAiB,CAAC,GAAoC;QACpD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,iBAAiB,CAAC,GAAoC;QACpD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5C,MAAM,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QAErD,IAAI,QAAQ,EACV,KAAK,EACL,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,4BAA4B,CAAC;QAC/B,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,IAAI,QAAQ,YAAY,qBAAc,EAAE;YACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAiC,CAAC,CAAC;YACrE,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,4BAA4B,GAAG,gBAAS,CAAC,wBAAwB,CAC/D,QAAQ,EACR,eAAe,CAAC,EAAE,CACnB,CAAC;YACF,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,EAAE,CAAC;YAC5C,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;YACzC,MAAM,MAAM,GAAG,YAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YACzC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACpC,WAAW,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;SACxE;aAAM,IAAI,QAAQ,YAAY,oBAAa,EAAE;YAC5C,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,EAAE,CAAC;YAC5C,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;YAC7B,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;YACzC,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC7C,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC;SAC/B;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;SACjD;QAMD,IAAI,QAAQ,KAAK,EAAE,IAAI,WAAW,EAAE;YAClC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC;gBAC5B,iBAAiB,EAAE,WAAW,CAAC,MAAM;gBACrC,KAAK;gBACL,KAAK;gBACL,YAAY,EAAE,OAAO,CAAC,YAAY;aACnC,CAAC,CAAC;SACJ;aAAM;YACL,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC;gBAC1B,QAAQ;gBACR,iBAAiB,EAAE,WAAW,CAAC,MAAM;gBACrC,QAAQ;gBACR,KAAK;gBACL,KAAK;aACN,CAAC,CAAC;SACJ;QAED,IAAI,QAAQ,YAAY,oBAAa,EAAE;YACrC,QAAQ,CAAC,aAAa,CAAC;gBACrB,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAC;YAEH,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClB,OAAO;SACR;QAED,IAAI,QAAQ,YAAY,qBAAc,EAAE;YACtC,QAAQ,CAAC,aAAa,CAAC;gBACrB,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAC;YAEH,4BAA4B,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;gBAC1C,EAAE,CAAC,MAAM,EAAE,CAAC;YACd,CAAC,CAAC,CAAC;YACH,OAAO;SACR;IACH,CAAC;IAED,aAAa,CAAC,EAAE,iBAAiB,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE;QAC7D,MAAM,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,UAAU,GAAG,CAAC,GAAG,YAAY,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,GAAG,UAAU,CAAC;QAEpC,KAAK,IAAI,OAAO,CAAC;QACjB,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAE7B,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED,WAAW,CAAC,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE;QACjE,MAAM,UAAU,GACd,IAAI,CAAC,8BAA8B,CAAC,QAAQ,EAAE,QAAQ,CAAC;YACvD,kBAAkB,CAAC;QAErB,MAAM,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC;QAClD,MAAM,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC;QAElD,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,gBAAS,CAAC,WAAW,CAAC,aAAa,CACrE,KAAK,EACL,KAAK,CACN,CAAC;QAEF,WAAW,IAAI,OAAO,CAAC;QACvB,YAAY,IAAI,OAAO,CAAC;QAExB,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAGvC,OAAO,gBAAS,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IACzE,CAAC;IAED,8BAA8B,CAAC,QAAQ,EAAE,QAAQ;QAC/C,IAAI,iBAAiB,CAAC;QAEtB,IAAI,QAAQ,EAAE;YACZ,MAAM,WAAW,GAAG,YAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC9C,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;YAC/C,iBAAiB,GAAG,IAAI,CAAC,oCAAoC,CAC3D,UAAU,EACV,UAAU,CACX,CAAC;SACH;aAAM;YACL,iBAAiB,GAAG,IAAI,CAAC,iCAAiC,CAAC,QAAQ,CAAC,CAAC;SACtE;QAED,MAAM,KAAK,GAAG,iBAAiB,GAAG,2BAA2B,CAAC;QAE9D,IAAI,UAAU,GAAG,kBAAkB,CAAC;QAEpC,IAAI,KAAK,GAAG,CAAC,EAAE;YACb,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAChC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,iCAAiC,CAAC,QAAQ;QACxC,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;QAC9C,MAAM,UAAU,GAAG,SAAS,CAAC,aAAa,EAAE,CAAC;QAE7C,IAAI,UAAU,CAAC;QAEf,IAAI,SAAS,CAAC,aAAa,EAAE;YAC3B,UAAU,GAAG,SAAS,CAAC,aAAa,EAAE,CAAC;SACxC;aAAM;YACL,UAAU,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;SACpD;QAED,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;YACvB,OAAO,IAAI,CAAC,oCAAoC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;SAC1E;QAED,IAAI,KAAK,CAAC;QACV,IAAI,UAAU,CAAC,QAAQ,EAAE;YACvB,KAAK,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC;SAC/B;aAAM;YACL,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;YACpE,KAAK,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SACpB;QAED,OAAO,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;IA0BO,UAAU,CAAC,KAAgC,EAAE,WAAmB;QACtE,IAAI,GAAG,GAAG,QAAQ,CAAC;QACnB,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC;QAEpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;YACpC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAEvB,IAAI,KAAK,GAAG,GAAG,EAAE;gBACf,GAAG,GAAG,KAAK,CAAC;aACb;YAED,IAAI,KAAK,GAAG,GAAG,EAAE;gBACf,GAAG,GAAG,KAAK,CAAC;aACb;SACF;QACD,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IACtB,CAAC;CACF;AAED,eAAe,CAAC,QAAQ,GAAG,aAAa,CAAC;AACzC,kBAAe,eAAe,CAAC"}
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StackRotateTool.js","sourceRoot":"","sources":["../../../src/tools/StackRotateTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAS,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,iBAAiB,MAAM,2CAA2C,CAAC;AAO1E,MAAM,eAAgB,SAAQ,QAAQ;IAKpC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;KAC9C;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAEnC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,aAAa,CAAC,GAAkC;QAC9C,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC3D,MAAM,iBAAiB,GAAG,aAAa,CAAC,KAAK,CAAC;QAC9C,MAAM,eAAe,GAAG,WAAW,CAAC,KAAK,CAAC;QAC1C,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QACpC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;QAClC,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;QAEpC,MAAM,YAAY,GAAiB,CAAC,KAAK,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,CAAC;QAC/D,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QAEzD,IAAI,KAAK,GAAG,iBAAiB,CAC3B,CAAC,eAAe,EAAE,WAAW,CAAC,EAC9B,CAAC,WAAW,EAAE,iBAAiB,CAAC,CACjC,CAAC;QAEF,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;QAEnC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;QACjE,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAChD,IAAI,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE;YACxC,KAAK,GAAG,CAAC,KAAK,CAAC;SAChB;QAED,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;YAAE,OAAO;QAEhC,MAAM,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"StackRotateTool.js","sourceRoot":"","sources":["../../../src/tools/StackRotateTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAS,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,iBAAiB,MAAM,2CAA2C,CAAC;AAO1E,MAAM,eAAgB,SAAQ,QAAQ;IAKpC,YACE,YAA6B,EAAE,EAC/B,mBAA8B;QAC5B,yBAAyB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;KAC9C;QAED,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAEnC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,aAAa,CAAC,GAAkC;QAC9C,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC3D,MAAM,iBAAiB,GAAG,aAAa,CAAC,KAAK,CAAC;QAC9C,MAAM,eAAe,GAAG,WAAW,CAAC,KAAK,CAAC;QAC1C,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QACpC,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;QAClC,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;QAEpC,MAAM,YAAY,GAAiB,CAAC,KAAK,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,CAAC;QAC/D,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QAEzD,IAAI,KAAK,GAAG,iBAAiB,CAC3B,CAAC,eAAe,EAAE,WAAW,CAAC,EAC9B,CAAC,WAAW,EAAE,iBAAiB,CAAC,CACjC,CAAC;QAEF,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;QAEnC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;QACjE,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAChD,IAAI,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE;YACxC,KAAK,GAAG,CAAC,KAAK,CAAC;SAChB;QAED,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;YAAE,OAAO;QAEhC,MAAM,EAAE,QAAQ,EAAE,GAAI,QAAiC,CAAC,aAAa,EAAE,CAAC;QACxE,QAAQ,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,QAAQ,GAAG,KAAK,EAAE,CAAC,CAAC;QAEvD,QAAQ,CAAC,MAAM,EAAE,CAAC;IACpB,CAAC;CACF;AAED,eAAe,CAAC,QAAQ,GAAG,aAAa,CAAC;AACzC,eAAe,eAAe,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BaseTool } from './base';
|
|
2
|
-
import { getEnabledElement,
|
|
2
|
+
import { getEnabledElement, VolumeViewport, StackViewport, utilities, cache, } from '@cornerstonejs/core';
|
|
3
3
|
const DEFAULT_MULTIPLIER = 4;
|
|
4
4
|
const DEFAULT_IMAGE_DYNAMIC_RANGE = 1024;
|
|
5
5
|
const PT = 'PT';
|
|
@@ -34,17 +34,15 @@ class WindowLevelTool extends BaseTool {
|
|
|
34
34
|
mouseDragCallback(evt) {
|
|
35
35
|
const { element, deltaPoints } = evt.detail;
|
|
36
36
|
const enabledElement = getEnabledElement(element);
|
|
37
|
-
const { renderingEngine,
|
|
38
|
-
let volumeId,
|
|
37
|
+
const { renderingEngine, viewport } = enabledElement;
|
|
38
|
+
let volumeId, lower, upper, modality, newRange, viewportsContainingVolumeUID;
|
|
39
39
|
let isPreScaled = false;
|
|
40
40
|
if (viewport instanceof VolumeViewport) {
|
|
41
41
|
const targetId = this.getTargetId(viewport);
|
|
42
42
|
volumeId = targetId.split('volumeId:')[1];
|
|
43
|
-
const actorEntry = viewport.getActor(volumeId);
|
|
44
|
-
volumeActor = actorEntry.actor;
|
|
45
|
-
rgbTransferFunction = volumeActor.getProperty().getRGBTransferFunction(0);
|
|
46
43
|
viewportsContainingVolumeUID = utilities.getViewportsWithVolumeId(volumeId, renderingEngine.id);
|
|
47
|
-
|
|
44
|
+
const properties = viewport.getProperties();
|
|
45
|
+
({ lower, upper } = properties.voiRange);
|
|
48
46
|
const volume = cache.getVolume(volumeId);
|
|
49
47
|
modality = volume.metadata.Modality;
|
|
50
48
|
isPreScaled = volume.scaling && Object.keys(volume.scaling).length > 0;
|
|
@@ -76,11 +74,6 @@ class WindowLevelTool extends BaseTool {
|
|
|
76
74
|
upper,
|
|
77
75
|
});
|
|
78
76
|
}
|
|
79
|
-
const eventDetail = {
|
|
80
|
-
volumeId,
|
|
81
|
-
viewportId,
|
|
82
|
-
range: newRange,
|
|
83
|
-
};
|
|
84
77
|
if (viewport instanceof StackViewport) {
|
|
85
78
|
viewport.setProperties({
|
|
86
79
|
voiRange: newRange,
|
|
@@ -88,11 +81,15 @@ class WindowLevelTool extends BaseTool {
|
|
|
88
81
|
viewport.render();
|
|
89
82
|
return;
|
|
90
83
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
84
|
+
if (viewport instanceof VolumeViewport) {
|
|
85
|
+
viewport.setProperties({
|
|
86
|
+
voiRange: newRange,
|
|
87
|
+
});
|
|
88
|
+
viewportsContainingVolumeUID.forEach((vp) => {
|
|
89
|
+
vp.render();
|
|
90
|
+
});
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
96
93
|
}
|
|
97
94
|
getPTNewRange({ deltaPointsCanvas, lower, upper, clientHeight }) {
|
|
98
95
|
const deltaY = deltaPointsCanvas[1];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WindowLevelTool.js","sourceRoot":"","sources":["../../../src/tools/WindowLevelTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EACL,iBAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"WindowLevelTool.js","sourceRoot":"","sources":["../../../src/tools/WindowLevelTool.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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"}
|