@cornerstonejs/tools 1.55.0 → 1.56.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/eventListeners/segmentation/imageChangeEventListener.js +15 -7
- package/dist/cjs/eventListeners/segmentation/imageChangeEventListener.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation.js +1 -1
- package/dist/cjs/stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation.js.map +1 -1
- package/dist/cjs/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.js +2 -1
- package/dist/cjs/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.js.map +1 -1
- package/dist/cjs/tools/segmentation/BrushTool.js +1 -1
- package/dist/cjs/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/BrushStrategy.d.ts +3 -2
- package/dist/cjs/tools/segmentation/strategies/BrushStrategy.js +11 -4
- package/dist/cjs/tools/segmentation/strategies/BrushStrategy.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/compositions/dynamicThreshold.js +9 -3
- package/dist/cjs/tools/segmentation/strategies/compositions/dynamicThreshold.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/compositions/islandRemoval.js +1 -1
- package/dist/cjs/tools/segmentation/strategies/compositions/islandRemoval.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/compositions/threshold.js +6 -2
- package/dist/cjs/tools/segmentation/strategies/compositions/threshold.js.map +1 -1
- package/dist/cjs/tools/segmentation/strategies/utils/getStrategyData.d.ts +2 -3
- package/dist/cjs/tools/segmentation/strategies/utils/getStrategyData.js +21 -6
- package/dist/cjs/tools/segmentation/strategies/utils/getStrategyData.js.map +1 -1
- package/dist/cjs/utilities/pointInShapeCallback.js +3 -1
- package/dist/cjs/utilities/pointInShapeCallback.js.map +1 -1
- package/dist/cjs/utilities/segmentation/floodFill.js +16 -22
- package/dist/cjs/utilities/segmentation/floodFill.js.map +1 -1
- package/dist/cjs/utilities/segmentation/getSegmentAtLabelmapBorder.js +3 -2
- package/dist/cjs/utilities/segmentation/getSegmentAtLabelmapBorder.js.map +1 -1
- package/dist/cjs/utilities/segmentation/getSegmentAtWorldPoint.js +3 -2
- package/dist/cjs/utilities/segmentation/getSegmentAtWorldPoint.js.map +1 -1
- package/dist/esm/eventListeners/segmentation/imageChangeEventListener.js +16 -8
- package/dist/esm/eventListeners/segmentation/imageChangeEventListener.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation.js +1 -1
- package/dist/esm/stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation.js.map +1 -1
- package/dist/esm/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.js +2 -1
- package/dist/esm/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.js.map +1 -1
- package/dist/esm/tools/segmentation/BrushTool.js +1 -1
- package/dist/esm/tools/segmentation/BrushTool.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/BrushStrategy.js +10 -3
- package/dist/esm/tools/segmentation/strategies/BrushStrategy.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/compositions/dynamicThreshold.js +9 -3
- package/dist/esm/tools/segmentation/strategies/compositions/dynamicThreshold.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/compositions/islandRemoval.js +1 -1
- package/dist/esm/tools/segmentation/strategies/compositions/islandRemoval.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/compositions/threshold.js +6 -2
- package/dist/esm/tools/segmentation/strategies/compositions/threshold.js.map +1 -1
- package/dist/esm/tools/segmentation/strategies/utils/getStrategyData.js +21 -6
- package/dist/esm/tools/segmentation/strategies/utils/getStrategyData.js.map +1 -1
- package/dist/esm/utilities/pointInShapeCallback.js +3 -1
- package/dist/esm/utilities/pointInShapeCallback.js.map +1 -1
- package/dist/esm/utilities/segmentation/floodFill.js +16 -22
- package/dist/esm/utilities/segmentation/floodFill.js.map +1 -1
- package/dist/esm/utilities/segmentation/getSegmentAtLabelmapBorder.js +3 -2
- package/dist/esm/utilities/segmentation/getSegmentAtLabelmapBorder.js.map +1 -1
- package/dist/esm/utilities/segmentation/getSegmentAtWorldPoint.js +3 -2
- package/dist/esm/utilities/segmentation/getSegmentAtWorldPoint.js.map +1 -1
- package/dist/types/eventListeners/segmentation/imageChangeEventListener.d.ts.map +1 -1
- package/dist/types/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.d.ts.map +1 -1
- package/dist/types/tools/segmentation/strategies/BrushStrategy.d.ts +3 -2
- package/dist/types/tools/segmentation/strategies/BrushStrategy.d.ts.map +1 -1
- package/dist/types/tools/segmentation/strategies/compositions/dynamicThreshold.d.ts.map +1 -1
- package/dist/types/tools/segmentation/strategies/compositions/islandRemoval.d.ts.map +1 -1
- package/dist/types/tools/segmentation/strategies/compositions/threshold.d.ts.map +1 -1
- package/dist/types/tools/segmentation/strategies/utils/getStrategyData.d.ts +2 -3
- package/dist/types/tools/segmentation/strategies/utils/getStrategyData.d.ts.map +1 -1
- package/dist/types/utilities/pointInShapeCallback.d.ts.map +1 -1
- package/dist/types/utilities/segmentation/floodFill.d.ts.map +1 -1
- package/dist/types/utilities/segmentation/getSegmentAtLabelmapBorder.d.ts.map +1 -1
- package/dist/types/utilities/segmentation/getSegmentAtWorldPoint.d.ts.map +1 -1
- package/dist/umd/985.index.js +1 -1
- package/dist/umd/985.index.js.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +7 -3
- package/src/eventListeners/segmentation/imageChangeEventListener.ts +28 -13
- package/src/stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation.ts +1 -1
- package/src/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.ts +3 -1
- package/src/tools/segmentation/BrushTool.ts +1 -1
- package/src/tools/segmentation/strategies/BrushStrategy.ts +25 -4
- package/src/tools/segmentation/strategies/compositions/dynamicThreshold.ts +12 -2
- package/src/tools/segmentation/strategies/compositions/islandRemoval.ts +1 -2
- package/src/tools/segmentation/strategies/compositions/threshold.ts +8 -6
- package/src/tools/segmentation/strategies/utils/getStrategyData.ts +20 -5
- package/src/utilities/pointInShapeCallback.ts +2 -0
- package/src/utilities/segmentation/floodFill.ts +44 -31
- package/src/utilities/segmentation/getSegmentAtLabelmapBorder.ts +6 -5
- package/src/utilities/segmentation/getSegmentAtWorldPoint.ts +6 -5
|
@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
function floodFill(getter, seed, options = {}) {
|
|
4
4
|
const onFlood = options.onFlood;
|
|
5
5
|
const onBoundary = options.onBoundary;
|
|
6
|
-
const equals = options.equals
|
|
6
|
+
const equals = options.equals;
|
|
7
7
|
const diagonals = options.diagonals || false;
|
|
8
8
|
const startNode = get(seed);
|
|
9
9
|
const permutations = prunedPermutations();
|
|
10
10
|
const stack = [];
|
|
11
11
|
const flooded = [];
|
|
12
|
-
const visits =
|
|
13
|
-
const bounds =
|
|
12
|
+
const visits = new Set();
|
|
13
|
+
const bounds = new Map();
|
|
14
14
|
stack.push({ currentArgs: seed });
|
|
15
15
|
while (stack.length > 0) {
|
|
16
16
|
flood(stack.pop());
|
|
@@ -35,14 +35,18 @@ function floodFill(getter, seed, options = {}) {
|
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
function visited(key) {
|
|
38
|
-
|
|
38
|
+
const [x, y, z = 0] = key;
|
|
39
|
+
const iKey = x + 32768 + 65536 * (y + 32768 + 65536 * (z + 32768));
|
|
40
|
+
return visits.has(iKey);
|
|
39
41
|
}
|
|
40
42
|
function markAsVisited(key) {
|
|
41
|
-
|
|
43
|
+
const [x, y, z = 0] = key;
|
|
44
|
+
const iKey = x + 32768 + 65536 * (y + 32768 + 65536 * (z + 32768));
|
|
45
|
+
visits.add(iKey);
|
|
42
46
|
}
|
|
43
47
|
function member(getArgs) {
|
|
44
|
-
const node =
|
|
45
|
-
return
|
|
48
|
+
const node = get(getArgs);
|
|
49
|
+
return equals ? equals(node, startNode) : node === startNode;
|
|
46
50
|
}
|
|
47
51
|
function markAsFlooded(getArgs) {
|
|
48
52
|
flooded.push(getArgs);
|
|
@@ -51,7 +55,9 @@ function floodFill(getter, seed, options = {}) {
|
|
|
51
55
|
}
|
|
52
56
|
}
|
|
53
57
|
function markAsBoundary(prevArgs) {
|
|
54
|
-
|
|
58
|
+
const [x, y, z = 0] = prevArgs;
|
|
59
|
+
const iKey = x + 32768 + 65536 * (y + 32768 + 65536 * (z + 32768));
|
|
60
|
+
bounds.set(iKey, prevArgs);
|
|
55
61
|
if (onBoundary) {
|
|
56
62
|
onBoundary(...prevArgs);
|
|
57
63
|
}
|
|
@@ -72,14 +78,6 @@ function floodFill(getter, seed, options = {}) {
|
|
|
72
78
|
function get(getArgs) {
|
|
73
79
|
return getter(...getArgs);
|
|
74
80
|
}
|
|
75
|
-
function safely(f, args) {
|
|
76
|
-
try {
|
|
77
|
-
return f(...args);
|
|
78
|
-
}
|
|
79
|
-
catch (error) {
|
|
80
|
-
return;
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
81
|
function prunedPermutations() {
|
|
84
82
|
const permutations = permute(seed.length);
|
|
85
83
|
return permutations.filter(function (perm) {
|
|
@@ -101,12 +99,8 @@ function floodFill(getter, seed, options = {}) {
|
|
|
101
99
|
return perms;
|
|
102
100
|
}
|
|
103
101
|
function boundaries() {
|
|
104
|
-
const array =
|
|
105
|
-
|
|
106
|
-
if (bounds[key] !== undefined) {
|
|
107
|
-
array.unshift(bounds[key]);
|
|
108
|
-
}
|
|
109
|
-
}
|
|
102
|
+
const array = Array.from(bounds.values());
|
|
103
|
+
array.reverse();
|
|
110
104
|
return array;
|
|
111
105
|
}
|
|
112
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"floodFill.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/floodFill.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"floodFill.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/floodFill.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,8 +32,9 @@ function getSegmentAtLabelmapBorder(segmentationId, worldPoint, { viewport, sear
|
|
|
32
32
|
const imageData = segmentationActor === null || segmentationActor === void 0 ? void 0 : segmentationActor.actor.getMapper().getInputData();
|
|
33
33
|
const indexIJK = core_1.utilities.transformWorldToIndex(imageData, worldPoint);
|
|
34
34
|
const dimensions = imageData.getDimensions();
|
|
35
|
-
const voxelManager =
|
|
36
|
-
|
|
35
|
+
const voxelManager = (imageData.voxelManager ||
|
|
36
|
+
core_1.utilities.VoxelManager.createVolumeVoxelManager(dimensions, imageData.getPointData().getScalars().getData()));
|
|
37
|
+
const segmentIndex = voxelManager.getAtIJKPoint(indexIJK);
|
|
37
38
|
const onEdge = isSegmentOnEdgeIJK(indexIJK, dimensions, voxelManager, segmentIndex);
|
|
38
39
|
return onEdge ? segmentIndex : undefined;
|
|
39
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSegmentAtLabelmapBorder.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/getSegmentAtLabelmapBorder.ts"],"names":[],"mappings":";;;AAAA,8CAAuD;AAEvD,4FAG8D;AAK9D,iGAAkG;AAiBlG,SAAgB,0BAA0B,CACxC,cAAsB,EACtB,UAAwB,EACxB,EAAE,QAAQ,EAAE,YAAY,EAAW;IAEnC,MAAM,YAAY,GAAG,IAAA,mCAAe,EAAC,cAAc,CAAC,CAAC;IAErD,MAAM,YAAY,GAAG,YAAY,CAAC,kBAAkB,CAAC,QAAQ,CAAC;IAE9D,IAAI,IAAA,uCAAoB,EAAC,YAAY,CAAC,EAAE;QACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,YAA8C,CAAC;QACpE,MAAM,kBAAkB,GAAG,YAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAErD,IAAI,CAAC,kBAAkB,EAAE;YACvB,OAAO;SACR;QAED,MAAM,SAAS,GAAG,kBAAkB,CAAC,SAAS,CAAC;QAE/C,MAAM,YAAY,GAAG,SAAS,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;QAEnE,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAEvD,MAAM,MAAM,GAAG,qBAAqB,CAClC,WAA2B,EAC3B,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,YAAY,CACb,CAAC;QAEF,OAAO,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;KAC1C;IAGD,MAAM,EAAE,mBAAmB,EAAE,GAAG,YAA6C,CAAC;IAE9E,MAAM,cAAc,GAAI,QAAiC,CAAC,iBAAiB,EAAE,CAAC;IAE9E,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,YAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAElD,IAAI,CAAC,KAAK,EAAE;QACV,OAAO;KACR;IAKD,MAAM,2BAA2B,GAAG,IAAA,oDAAgC,EAClE,YAAY,CAAC,cAAc,CAC5B,CAAC;IAEF,MAAM,EAAE,6BAA6B,EAAE,GAAG,2BAA2B,CAAC,CAAC,CAAC,CAAC;IACzE,MAAM,iBAAiB,GAAG,QAAQ,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,KAAK,CAAC,SAAS,GAAG,YAAY,EAAE,CAAC;IACtE,MAAM,QAAQ,GAAG,gBAAS,CAAC,qBAAqB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAExE,MAAM,UAAU,GAAG,SAAS,CAAC,aAAa,EAAE,CAAC;IAC7C,MAAM,YAAY,GAAG,gBAAS,CAAC,YAAY,CAAC,wBAAwB,
|
|
1
|
+
{"version":3,"file":"getSegmentAtLabelmapBorder.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/getSegmentAtLabelmapBorder.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,8 +49,9 @@ function getSegmentAtWorldForLabelmap(segmentation, worldPoint, { viewport }) {
|
|
|
49
49
|
const imageData = segmentationActor === null || segmentationActor === void 0 ? void 0 : segmentationActor.actor.getMapper().getInputData();
|
|
50
50
|
const indexIJK = core_1.utilities.transformWorldToIndex(imageData, worldPoint);
|
|
51
51
|
const dimensions = imageData.getDimensions();
|
|
52
|
-
const voxelManager =
|
|
53
|
-
|
|
52
|
+
const voxelManager = (imageData.voxelManager ||
|
|
53
|
+
core_1.utilities.VoxelManager.createVolumeVoxelManager(dimensions, imageData.getPointData().getScalars().getData()));
|
|
54
|
+
const segmentIndex = voxelManager.getAtIJKPoint(indexIJK);
|
|
54
55
|
return segmentIndex;
|
|
55
56
|
}
|
|
56
57
|
exports.getSegmentAtWorldForLabelmap = getSegmentAtWorldForLabelmap;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSegmentAtWorldPoint.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/getSegmentAtWorldPoint.ts"],"names":[],"mappings":";;;AAAA,8CAAuD;AAEvD,uCAA0D;AAC1D,4FAG8D;AAK9D,iGAAkG;AAElG,2DAAsD;AACtD,+CAA2D;AAc3D,SAAgB,sBAAsB,CACpC,cAAsB,EACtB,UAAwB,EACxB,UAAU,EAAa;;IAEvB,MAAM,YAAY,GAAG,IAAA,mCAAe,EAAC,cAAc,CAAC,CAAC;IAErD,MAAM,kBAAkB,GAAG,YAAY,CAAC,kBAAkB,CAAC;IAG3D,MAAM,qBAAqB,GACzB,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,mCAAI,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpE,IAAI,CAAC,qBAAqB,EAAE;QAC1B,MAAM,IAAI,KAAK,CACb,gBAAgB,cAAc,oCAAoC,CACnE,CAAC;KACH;IAED,QAAQ,qBAAqB,EAAE;QAC7B,KAAK,mCAA2B,CAAC,QAAQ;YACvC,OAAO,4BAA4B,CAAC,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACzE,KAAK,mCAA2B,CAAC,OAAO;YACtC,OAAO,2BAA2B,CAAC,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACxE;YACE,OAAO;KACV;AACH,CAAC;AA3BD,wDA2BC;AAUD,SAAgB,4BAA4B,CAC1C,YAA0B,EAC1B,UAAwB,EACxB,EAAE,QAAQ,EAAW;IAErB,MAAM,YAAY,GAAG,YAAY,CAAC,kBAAkB,CAAC,QAAQ,CAAC;IAE9D,IAAI,IAAA,uCAAoB,EAAC,YAAY,CAAC,EAAE;QACtC,MAAM,EAAE,QAAQ,EAAE,GAAG,YAA8C,CAAC;QACpE,MAAM,kBAAkB,GAAG,YAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAErD,IAAI,CAAC,kBAAkB,EAAE;YACvB,OAAO;SACR;QAED,MAAM,YAAY,GAChB,kBAAkB,CAAC,SAAS,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;QAEnE,OAAO,YAAY,CAAC;KACrB;IAGD,MAAM,EAAE,mBAAmB,EAAE,GAAG,YAA6C,CAAC;IAE9E,MAAM,cAAc,GAAI,QAAiC,CAAC,iBAAiB,EAAE,CAAC;IAE9E,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,YAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAElD,IAAI,CAAC,KAAK,EAAE;QACV,OAAO;KACR;IAKD,MAAM,2BAA2B,GAAG,IAAA,oDAAgC,EAClE,YAAY,CAAC,cAAc,CAC5B,CAAC;IAEF,MAAM,EAAE,6BAA6B,EAAE,GAAG,2BAA2B,CAAC,CAAC,CAAC,CAAC;IAEzE,MAAM,iBAAiB,GAAG,QAAQ,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,KAAK,CAAC,SAAS,GAAG,YAAY,EAAE,CAAC;IACtE,MAAM,QAAQ,GAAG,gBAAS,CAAC,qBAAqB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAExE,MAAM,UAAU,GAAG,SAAS,CAAC,aAAa,EAAE,CAAC;IAC7C,MAAM,YAAY,GAAG,gBAAS,CAAC,YAAY,CAAC,wBAAwB,
|
|
1
|
+
{"version":3,"file":"getSegmentAtWorldPoint.js","sourceRoot":"","sources":["../../../../src/utilities/segmentation/getSegmentAtWorldPoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import vtkDataArray from '@kitware/vtk.js/Common/Core/DataArray';
|
|
2
2
|
import vtkImageData from '@kitware/vtk.js/Common/DataModel/ImageData';
|
|
3
|
-
import {
|
|
3
|
+
import { BaseVolumeViewport, getEnabledElement, Enums, getEnabledElementByIds, cache, utilities, } from '@cornerstonejs/core';
|
|
4
4
|
import { getToolGroupForViewport } from '../../store/ToolGroupManager';
|
|
5
5
|
import Representations from '../../enums/SegmentationRepresentations';
|
|
6
6
|
import * as SegmentationState from '../../stateManagement/segmentation/segmentationState';
|
|
@@ -8,17 +8,13 @@ import { isVolumeSegmentation } from '../../tools/segmentation/strategies/utils/
|
|
|
8
8
|
import triggerSegmentationRender from '../../utilities/segmentation/triggerSegmentationRender';
|
|
9
9
|
const enable = function (element) {
|
|
10
10
|
const { viewport } = getEnabledElement(element);
|
|
11
|
-
if (
|
|
11
|
+
if (viewport instanceof BaseVolumeViewport) {
|
|
12
12
|
return;
|
|
13
13
|
}
|
|
14
14
|
element.addEventListener(Enums.Events.STACK_NEW_IMAGE, _imageChangeEventListener);
|
|
15
15
|
element.addEventListener(Enums.Events.IMAGE_RENDERED, _imageChangeEventListener);
|
|
16
16
|
};
|
|
17
17
|
const disable = function (element) {
|
|
18
|
-
const { viewport } = getEnabledElement(element);
|
|
19
|
-
if (!(viewport instanceof StackViewport)) {
|
|
20
|
-
return;
|
|
21
|
-
}
|
|
22
18
|
element.removeEventListener(Enums.Events.STACK_NEW_IMAGE, _imageChangeEventListener);
|
|
23
19
|
element.removeEventListener(Enums.Events.IMAGE_RENDERED, _imageChangeEventListener);
|
|
24
20
|
};
|
|
@@ -74,6 +70,10 @@ function _imageChangeEventListener(evt) {
|
|
|
74
70
|
const derivedImageId = imageIdReferenceMap.get(currentImageId);
|
|
75
71
|
const segmentationImageData = segmentationActor.getMapper().getInputData();
|
|
76
72
|
if (!derivedImageId) {
|
|
73
|
+
if (segmentationImageData.setDerivedImage) {
|
|
74
|
+
segmentationImageData.setDerivedImage(null);
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
77
|
const scalarArray = vtkDataArray.newInstance({
|
|
78
78
|
name: 'Pixels',
|
|
79
79
|
numberOfComponents: 1,
|
|
@@ -86,7 +86,10 @@ function _imageChangeEventListener(evt) {
|
|
|
86
86
|
}
|
|
87
87
|
const derivedImage = cache.getImage(derivedImageId);
|
|
88
88
|
const { dimensions, spacing, direction } = viewport.getImageDataMetadata(derivedImage);
|
|
89
|
-
const currentImage = cache.getImage(currentImageId)
|
|
89
|
+
const currentImage = cache.getImage(currentImageId) ||
|
|
90
|
+
{
|
|
91
|
+
imageId: currentImageId,
|
|
92
|
+
};
|
|
90
93
|
const { origin: currentOrigin } = viewport.getImageDataMetadata(currentImage);
|
|
91
94
|
const originToUse = currentOrigin;
|
|
92
95
|
segmentationImageData.setOrigin(originToUse);
|
|
@@ -117,7 +120,12 @@ function _imageChangeEventListener(evt) {
|
|
|
117
120
|
triggerSegmentationRender(toolGroup.id);
|
|
118
121
|
return;
|
|
119
122
|
}
|
|
120
|
-
|
|
123
|
+
if (segmentationImageData.setDerivedImage) {
|
|
124
|
+
segmentationImageData.setDerivedImage(derivedImage);
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
utilities.updateVTKImageDataWithCornerstoneImage(segmentationImageData, derivedImage);
|
|
128
|
+
}
|
|
121
129
|
viewport.render();
|
|
122
130
|
if (evt.type === Enums.Events.IMAGE_RENDERED) {
|
|
123
131
|
viewport.element.removeEventListener(Enums.Events.IMAGE_RENDERED, _imageChangeEventListener);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imageChangeEventListener.js","sourceRoot":"","sources":["../../../../src/eventListeners/segmentation/imageChangeEventListener.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,uCAAuC,CAAC;AACjE,OAAO,YAAY,MAAM,4CAA4C,CAAC;AACtE,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"imageChangeEventListener.js","sourceRoot":"","sources":["../../../../src/eventListeners/segmentation/imageChangeEventListener.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,uCAAuC,CAAC;AACjE,OAAO,YAAY,MAAM,4CAA4C,CAAC;AACtE,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,KAAK,EACL,sBAAsB,EACtB,KAAK,EACL,SAAS,GAEV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,eAAe,MAAM,yCAAyC,CAAC;AACtE,OAAO,KAAK,iBAAiB,MAAM,sDAAsD,CAAC;AAE1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,4DAA4D,CAAC;AAClG,OAAO,yBAAyB,MAAM,wDAAwD,CAAC;AAE/F,MAAM,MAAM,GAAG,UAAU,OAAuB;IAC9C,MAAM,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAEhD,IAAI,QAAQ,YAAY,kBAAkB,EAAE;QAC1C,OAAO;KACR;IAED,OAAO,CAAC,gBAAgB,CACtB,KAAK,CAAC,MAAM,CAAC,eAAe,EAC5B,yBAA0C,CAC3C,CAAC;IAEF,OAAO,CAAC,gBAAgB,CACtB,KAAK,CAAC,MAAM,CAAC,cAAc,EAC3B,yBAA0C,CAC3C,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,UAAU,OAAuB;IAC/C,OAAO,CAAC,mBAAmB,CACzB,KAAK,CAAC,MAAM,CAAC,eAAe,EAC5B,yBAA0C,CAC3C,CAAC;IACF,OAAO,CAAC,mBAAmB,CACzB,KAAK,CAAC,MAAM,CAAC,cAAc,EAC3B,yBAA0C,CAC3C,CAAC;AACJ,CAAC,CAAC;AAYF,SAAS,yBAAyB,CAAC,GAAG;IACpC,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC;IAC7B,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,SAAS,CAAC;IACpD,MAAM,EAAE,QAAQ,EAAE,GAAG,sBAAsB,CACzC,UAAU,EACV,iBAAiB,CACoB,CAAC;IAExC,MAAM,SAAS,GAAG,uBAAuB,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAEzE,IAAI,CAAC,SAAS,EAAE;QACd,OAAO;KACR;IAED,IAAI,oCAAoC,GACtC,iBAAiB,CAAC,8BAA8B,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;IAEvE,oCAAoC;QAClC,oCAAoC,CAAC,MAAM,CACzC,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,KAAK,eAAe,CAAC,QAAQ,CACrE,CAAC;IAEJ,IAAI,CAAC,oCAAoC,EAAE,MAAM,EAAE;QACjD,OAAO;KACR;IAED,MAAM,2BAA2B,GAAG,EAAE,CAAC;IACvC,oCAAoC,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;QAC9D,MAAM,YAAY,GAAG,iBAAiB,CAAC,eAAe,CACpD,cAAc,CAAC,cAAc,CAC9B,CAAC;QAEF,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,QAAQ,EAAE;YAC/D,OAAO;SACR;QAED,MAAM,YAAY,GAAG,YAAY,CAAC,kBAAkB,CAAC,QAAQ,CAAC;QAE9D,IAAI,oBAAoB,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE;YAChD,OAAO;SACR;QAED,MAAM,EAAE,mBAAmB,EAAE,GAC3B,YAA6C,CAAC;QAEhD,2BAA2B,CAAC,cAAc,CAAC,6BAA6B,CAAC;YACvE;gBACE,mBAAmB;aACpB,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IACpE,MAAM,cAAc,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC;IACpD,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IAEpC,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QAC9C,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,iBAAiB,EAAE;QAKtB,yBAAyB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAIxC,OAAO;KACR;IAED,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAC3C,OAAO;SACR;QACD,MAAM,iBAAiB,GAAG,KAAK,CAAC,KAAK,CAAC;QAEtC,MAAM,EAAE,mBAAmB,EAAE,GAAG,2BAA2B,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEvE,MAAM,cAAc,GAAG,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAE/D,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,SAAS,EAAE,CAAC,YAAY,EAAE,CAAC;QAE3E,IAAI,CAAC,cAAc,EAAE;YAInB,IAAI,qBAAqB,CAAC,eAAe,EAAE;gBAKzC,qBAAqB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC5C,OAAO;aACR;YAGD,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;gBAC3C,IAAI,EAAE,QAAQ;gBACd,kBAAkB,EAAE,CAAC;gBACrB,MAAM,EAAE,IAAI,UAAU,CAAC,qBAAqB,CAAC,iBAAiB,EAAE,CAAC;aAClE,CAAC,CAAC;YAEH,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;YAC7C,SAAS,CAAC,YAAY,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YACjD,iBAAiB,CAAC,SAAS,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YACtD,OAAO;SACR;QAED,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAEpD,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,GACtC,QAAQ,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAE9C,MAAM,YAAY,GAChB,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC;YAC7B;gBACC,OAAO,EAAE,cAAc;aACP,CAAC;QACrB,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAC7B,QAAQ,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAa9C,MAAM,WAAW,GAAG,aAAa,CAAC;QAElC,qBAAqB,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC7C,qBAAqB,CAAC,QAAQ,EAAE,CAAC;QAEjC,IACE,qBAAqB,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC;YAC1D,qBAAqB,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,EAC1D;YAKA,QAAQ,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YACnC,QAAQ,CAAC,SAAS,CAChB;gBACE;oBACE,OAAO,EAAE,cAAc;oBACvB,QAAQ,EAAE,KAAK,CAAC,GAAG;oBACnB,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;wBAC3B,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;4BAC3C,IAAI,EAAE,QAAQ;4BACd,kBAAkB,EAAE,CAAC;4BACrB,MAAM,EAAE,CAAC,GAAG,YAAY,CAAC,YAAY,EAAE,CAAC;yBACzC,CAAC,CAAC;wBAEH,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;wBAE7C,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;wBACzD,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;wBAC9B,SAAS,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;wBAClC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;wBACjC,SAAS,CAAC,YAAY,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;wBAEjD,UAAU,CAAC,SAAS,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBACjD,CAAC;iBACF;aACF,EACD,IAAI,EACJ,KAAK,CACN,CAAC;YAEF,yBAAyB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YACxC,OAAO;SACR;QAED,IAAI,qBAAqB,CAAC,eAAe,EAAE;YAGzC,qBAAqB,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;SACrD;aAAM;YAEL,SAAS,CAAC,sCAAsC,CAC9C,qBAAqB,EACrB,YAAY,CACb,CAAC;SACH;QACD,QAAQ,CAAC,MAAM,EAAE,CAAC;QAKlB,IAAI,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM,CAAC,cAAc,EAAE;YAE5C,QAAQ,CAAC,OAAO,CAAC,mBAAmB,CAClC,KAAK,CAAC,MAAM,CAAC,cAAc,EAC3B,yBAA0C,CAC3C,CAAC;SACH;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,eAAe;IACb,MAAM;IACN,OAAO;CACR,CAAC"}
|
|
@@ -2,6 +2,6 @@ import { SegmentationRepresentations } from '../../../../enums';
|
|
|
2
2
|
import { computeAndAddRepresentation } from '../computeAndAddRepresentation';
|
|
3
3
|
import { computeLabelmapData } from './labelmapComputationStrategies';
|
|
4
4
|
export function computeAndAddLabelmapRepresentation(segmentationId, options = {}) {
|
|
5
|
-
return computeAndAddRepresentation(segmentationId, SegmentationRepresentations.Labelmap, () => computeLabelmapData(segmentationId, options), () =>
|
|
5
|
+
return computeAndAddRepresentation(segmentationId, SegmentationRepresentations.Labelmap, () => computeLabelmapData(segmentationId, options), () => undefined);
|
|
6
6
|
}
|
|
7
7
|
//# sourceMappingURL=computeAndAddLabelmapRepresentation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeAndAddLabelmapRepresentation.js","sourceRoot":"","sources":["../../../../../../src/stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAYtE,MAAM,UAAU,mCAAmC,CACjD,cAAsB,EACtB,UAAoC,EAAE;IAEtC,OAAO,2BAA2B,CAChC,cAAc,EACd,2BAA2B,CAAC,QAAQ,EACpC,GAAG,EAAE,CAAC,mBAAmB,CAAC,cAAc,EAAE,OAAO,CAAC,EAClD,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"computeAndAddLabelmapRepresentation.js","sourceRoot":"","sources":["../../../../../../src/stateManagement/segmentation/polySeg/Labelmap/computeAndAddLabelmapRepresentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAYtE,MAAM,UAAU,mCAAmC,CACjD,cAAsB,EACtB,UAAoC,EAAE;IAEtC,OAAO,2BAA2B,CAChC,cAAc,EACd,2BAA2B,CAAC,QAAQ,EACpC,GAAG,EAAE,CAAC,mBAAmB,CAAC,cAAc,EAAE,OAAO,CAAC,EAClD,GAAG,EAAE,CAAC,SAAS,CAChB,CAAC;AACJ,CAAC"}
|
|
@@ -49,5 +49,6 @@ export async function convertSurfaceToVolumeLabelmap(surfaceRepresentationData,
|
|
|
49
49
|
volumeId: segmentationVolume.volumeId,
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
|
-
export async function convertSurfaceToStackLabelmap() {
|
|
52
|
+
export async function convertSurfaceToStackLabelmap() {
|
|
53
|
+
}
|
|
53
54
|
//# sourceMappingURL=convertSurfaceToLabelmap.js.map
|
package/dist/esm/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertSurfaceToLabelmap.js","sourceRoot":"","sources":["../../../../../../src/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAEL,KAAK,EACL,WAAW,EACX,mBAAmB,EACnB,YAAY,GACb,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAC;AAE5C,MAAM,qBAAqB,GAAG,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE;IACtD,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,mBAAmB,EAAE;QAC1D,QAAQ;QACR,IAAI,EAAE,WAAW,CAAC,2BAA2B;KAC9C,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,yBAAkD,EAClD,kBAAsC;IAEtC,MAAM,EAAE,WAAW,EAAE,GAAG,yBAAyB,CAAC;IAClD,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,MAAM,YAAY,GAAG,IAAI,GAAG,EAM3B,CAAC;IAEF,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,YAAY,EAAE,EAAE;QAC/C,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAsB,CAAC;QACrD,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QAEtC,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE;YAC7B,MAAM;YACN,KAAK;SACN,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAAC;IAEtE,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAEtC,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,WAAW,CACnD,SAAS,EACT,iCAAiC,EACjC;QACE,YAAY;QACZ,UAAU;QACV,OAAO;QACP,SAAS;QACT,MAAM;KACP,EACD;QACE,SAAS,EAAE;YACT,CAAC,QAAQ,EAAE,EAAE;gBACX,qBAAqB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;SACF;KACF,CACF,CAAC;IAEF,qBAAqB,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAExC,kBAAkB,CAAC,SAAS;SACzB,YAAY,EAAE;SACd,UAAU,EAAE;SACZ,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1B,kBAAkB,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;IAGxC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;IAE9B,OAAO;QACL,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;KACtC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B,
|
|
1
|
+
{"version":3,"file":"convertSurfaceToLabelmap.js","sourceRoot":"","sources":["../../../../../../src/stateManagement/segmentation/polySeg/Labelmap/convertSurfaceToLabelmap.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAEL,KAAK,EACL,WAAW,EACX,mBAAmB,EACnB,YAAY,GACb,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAC;AAE5C,MAAM,qBAAqB,GAAG,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE;IACtD,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,mBAAmB,EAAE;QAC1D,QAAQ;QACR,IAAI,EAAE,WAAW,CAAC,2BAA2B;KAC9C,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,yBAAkD,EAClD,kBAAsC;IAEtC,MAAM,EAAE,WAAW,EAAE,GAAG,yBAAyB,CAAC;IAClD,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,MAAM,YAAY,GAAG,IAAI,GAAG,EAM3B,CAAC;IAEF,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,YAAY,EAAE,EAAE;QAC/C,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAsB,CAAC;QACrD,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QAEtC,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE;YAC7B,MAAM;YACN,KAAK;SACN,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAAC;IAEtE,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAEtC,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,WAAW,CACnD,SAAS,EACT,iCAAiC,EACjC;QACE,YAAY;QACZ,UAAU;QACV,OAAO;QACP,SAAS;QACT,MAAM;KACP,EACD;QACE,SAAS,EAAE;YACT,CAAC,QAAQ,EAAE,EAAE;gBACX,qBAAqB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;SACF;KACF,CACF,CAAC;IAEF,qBAAqB,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAExC,kBAAkB,CAAC,SAAS;SACzB,YAAY,EAAE;SACd,UAAU,EAAE;SACZ,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1B,kBAAkB,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;IAGxC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;IAE9B,OAAO;QACL,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;KACtC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B;AAEnD,CAAC"}
|
|
@@ -150,7 +150,7 @@ class BrushTool extends BaseTool {
|
|
|
150
150
|
delta < dragMoveDistance) {
|
|
151
151
|
return;
|
|
152
152
|
}
|
|
153
|
-
this._previewData.preview = this.applyActiveStrategy(enabledElement, this.getOperationData());
|
|
153
|
+
this._previewData.preview = this.applyActiveStrategy(enabledElement, this.getOperationData(element));
|
|
154
154
|
this._previewData.element = element;
|
|
155
155
|
this._previewData.timerStart = Date.now() + dragTimeMs;
|
|
156
156
|
this._previewData.isDrag = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrushTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/BrushTool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"BrushTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/BrushTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,10 @@ export default class BrushStrategy {
|
|
|
11
11
|
this._fill = [];
|
|
12
12
|
this._onInteractionStart = [];
|
|
13
13
|
this.fill = (enabledElement, operationData) => {
|
|
14
|
-
const initializedData = this.initialize(enabledElement, operationData);
|
|
14
|
+
const initializedData = this.initialize(enabledElement, operationData, StrategyCallbacks.Fill);
|
|
15
|
+
if (!initializedData) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
15
18
|
const { strategySpecificConfiguration = {}, centerIJK } = initializedData;
|
|
16
19
|
if (csUtils.isEqual(centerIJK, strategySpecificConfiguration.centerIJK)) {
|
|
17
20
|
return operationData.preview;
|
|
@@ -34,6 +37,9 @@ export default class BrushStrategy {
|
|
|
34
37
|
return;
|
|
35
38
|
}
|
|
36
39
|
const initializedData = this.initialize(enabledElement, operationData);
|
|
40
|
+
if (!initializedData) {
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
37
43
|
this._onInteractionStart.forEach((func) => func.call(this, initializedData));
|
|
38
44
|
};
|
|
39
45
|
this.configurationName = name;
|
|
@@ -68,7 +74,7 @@ export default class BrushStrategy {
|
|
|
68
74
|
[StrategyCallbacks.Preview]: addSingletonMethod(StrategyCallbacks.Preview, false),
|
|
69
75
|
compositions: null,
|
|
70
76
|
}; }
|
|
71
|
-
initialize(enabledElement, operationData) {
|
|
77
|
+
initialize(enabledElement, operationData, operationName) {
|
|
72
78
|
const { viewport } = enabledElement;
|
|
73
79
|
const data = getStrategyData({ operationData, viewport });
|
|
74
80
|
if (!data) {
|
|
@@ -92,6 +98,7 @@ export default class BrushStrategy {
|
|
|
92
98
|
const previewEnabled = !!operationData.previewColors;
|
|
93
99
|
const previewSegmentIndex = previewEnabled ? 255 : undefined;
|
|
94
100
|
const initializedData = {
|
|
101
|
+
operationName,
|
|
95
102
|
previewSegmentIndex,
|
|
96
103
|
...operationData,
|
|
97
104
|
enabledElement,
|
|
@@ -114,7 +121,7 @@ function addListMethod(name, createInitialized) {
|
|
|
114
121
|
brushStrategy[listName].push(func);
|
|
115
122
|
brushStrategy[name] ||= createInitialized
|
|
116
123
|
? (enabledElement, operationData) => {
|
|
117
|
-
const initializedData = brushStrategy[createInitialized](enabledElement, operationData);
|
|
124
|
+
const initializedData = brushStrategy[createInitialized](enabledElement, operationData, name);
|
|
118
125
|
brushStrategy[listName].forEach((func) => func.call(brushStrategy, initializedData));
|
|
119
126
|
}
|
|
120
127
|
: (operationData) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrushStrategy.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/BrushStrategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAElE,OAAO,EAAE,+BAA+B,EAAE,MAAM,iEAAiE,CAAC;AAClH,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAOnD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"BrushStrategy.js","sourceRoot":"","sources":["../../../../../src/tools/segmentation/strategies/BrushStrategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAElE,OAAO,EAAE,+BAA+B,EAAE,MAAM,iEAAiE,CAAC;AAClH,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAOnD,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;AA8DjC,MAAM,CAAC,OAAO,OAAO,aAAa;IAkDhC,YAAY,IAAI,EAAE,GAAG,YAA2B;QALtC,gBAAW,GAAG,EAAE,CAAC;QACjB,UAAK,GAAG,EAAE,CAAC;QAEX,wBAAmB,GAAG,EAAE,CAAC;QA+B5B,SAAI,GAAG,CACZ,cAAqC,EACrC,aAA2C,EAC3C,EAAE;YACF,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CACrC,cAAc,EACd,aAAa,EACb,iBAAiB,CAAC,IAAI,CACvB,CAAC;YAEF,IAAI,CAAC,eAAe,EAAE;gBAEpB,OAAO;aACR;YAED,MAAM,EAAE,6BAA6B,GAAG,EAAE,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC;YAG1E,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,6BAA6B,CAAC,SAAS,CAAC,EAAE;gBACvE,OAAO,aAAa,CAAC,OAAO,CAAC;aAC9B;iBAAM;gBACL,6BAA6B,CAAC,SAAS,GAAG,SAAS,CAAC;aACrD;YAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;YAEpD,MAAM,EACJ,wBAAwB,EACxB,mBAAmB,EACnB,mBAAmB,GACpB,GAAG,eAAe,CAAC;YAEpB,+BAA+B,CAC7B,eAAe,CAAC,cAAc,EAC9B,wBAAwB,CAAC,gBAAgB,EAAE,CAC5C,CAAC;YAGF,IAAI,CAAC,mBAAmB,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,IAAI,EAAE;gBACpE,OAAO,IAAI,CAAC;aACb;YAED,OAAO,eAAe,CAAC,OAAO,IAAI,eAAe,CAAC;QACpD,CAAC,CAAC;QAuEK,uBAAkB,GAAG,CAC1B,cAAqC,EACrC,aAA2C,EAC3C,EAAE;YACF,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;YAGlC,IAAI,OAAO,EAAE,kBAAkB,EAAE;gBAC/B,OAAO,CAAC,kBAAkB,GAAG,KAAK,CAAC;gBACnC,OAAO;aACR;YACD,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;YACvE,IAAI,CAAC,eAAe,EAAE;gBAEpB,OAAO;aACR;YACD,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACxC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CACjC,CAAC;QACJ,CAAC,CAAC;QAjKA,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC9B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YACnC,MAAM,MAAM,GACV,OAAO,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;YAClE,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO;aACR;YACD,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;gBACxB,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;oBACtC,MAAM,IAAI,KAAK,CAAC,eAAe,GAAG,sBAAsB,CAAC,CAAC;iBAC3D;gBACD,aAAa,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;aACtD;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB,GAAG,CAAC,cAAc,EAAE,aAAa,EAAE,EAAE,CACxD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAE3C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE;YAC3D,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;SACxC;IACH,CAAC;IAnED,SAAc,iBAAY,GAAG,YAAY,CAAC,EAAA;IAE1C,SAAiB,mBAAc,GAAG;QAChC,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,aAAa,CACnD,iBAAiB,CAAC,kBAAkB,EACpC,iBAAiB,CAAC,UAAU,CAC7B;QACD,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,aAAa,CACjD,iBAAiB,CAAC,gBAAgB,EAClC,iBAAiB,CAAC,UAAU,CAC7B;QACD,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,iBAAiB,CAAC,IAAI,CAAC;QAC/D,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,iBAAiB,CAAC,UAAU,CAAC;QAC3E,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,EAAE,kBAAkB,CACzD,iBAAiB,CAAC,mBAAmB,CACtC;QACD,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE,aAAa,CAC9C,iBAAiB,CAAC,aAAa,EAC/B,iBAAiB,CAAC,UAAU,CAC7B;QACD,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE,aAAa,CAC9C,iBAAiB,CAAC,aAAa,EAC/B,iBAAiB,CAAC,UAAU,CAC7B;QACD,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,EAAE,kBAAkB,CACvD,iBAAiB,CAAC,iBAAiB,CACpC;QACD,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAC7C,iBAAiB,CAAC,OAAO,EACzB,KAAK,CACN;QAGD,YAAY,EAAE,IAAI;KACnB,CAAC,EAAA;IAqFQ,UAAU,CAClB,cAAqC,EACrC,aAA2C,EAC3C,aAAsB;QAEtB,MAAM,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;QACpC,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YAChD,OAAO,aAAa,CAAC,OAAO,CAAC;SAC9B;QAED,IAAI,oBAAoB,CAAC,aAAa,EAAE,QAAQ,CAAC,EAAE;YACjD,MAAM,EAAE,kBAAkB,EAAE,QAAQ,EAAE,GACpC,aAAgD,CAAC;YAEnD,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAE/C,IAAI,kBAAkB,EAAE;gBACtB,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;gBAExD,IACE,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC;oBACjE,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,EAAE,WAAW,CAAC,SAAS,CAAC,EAC/D;oBACA,MAAM,IAAI,KAAK,CACb,gGAAgG,CACjG,CAAC;iBACH;aACF;SACF;QAED,MAAM,EACJ,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,GACtB,GAAG,IAAI,CAAC;QACT,MAAM,mBAAmB,GACvB,aAAa,CAAC,OAAO,EAAE,mBAAmB;YAC1C,YAAY,CAAC,yBAAyB,CAAC,wBAAwB,CAAC,CAAC;QACnE,MAAM,cAAc,GAAG,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC;QACrD,MAAM,mBAAmB,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;QAE7D,MAAM,eAAe,GAA6B;YAChD,aAAa;YACb,mBAAmB;YACnB,GAAG,aAAa;YAChB,cAAc;YACd,iBAAiB;YACjB,wBAAwB;YACxB,qBAAqB;YACrB,mBAAmB;YACnB,QAAQ;YAER,WAAW,EAAE,IAAI;YACjB,aAAa,EAAE,IAAI;SACpB,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;QAE1D,OAAO,eAAe,CAAC;IACzB,CAAC;;AAqFH,SAAS,aAAa,CAAC,IAAY,EAAE,iBAA0B;IAC7D,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC;IAC5B,OAAO,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE;QAC7B,aAAa,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC/B,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,aAAa,CAAC,IAAI,CAAC,KAAK,iBAAiB;YACvC,CAAC,CAAC,CAAC,cAAc,EAAE,aAAa,EAAE,EAAE;gBAChC,MAAM,eAAe,GAAG,aAAa,CAAC,iBAAiB,CAAC,CACtD,cAAc,EACd,aAAa,EACb,IAAI,CACL,CAAC;gBACF,aAAa,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACvC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,CAC1C,CAAC;YACJ,CAAC;YACH,CAAC,CAAC,CAAC,aAAa,EAAE,EAAE;gBAChB,aAAa,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACvC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,aAAa,CAAC,CACxC,CAAC;YACJ,CAAC,CAAC;IACR,CAAC,CAAC;AACJ,CAAC;AAKD,SAAS,kBAAkB,CAAC,IAAY,EAAE,aAAa,GAAG,IAAI;IAC5D,OAAO,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE;QAC7B,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,iBAAiB,CAAC,CAAC;SAChE;QACD,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa;YACjC,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,CAAC,cAAc,EAAE,aAAa,EAAE,EAAE;gBAGhC,aAAa,CAAC,cAAc,GAAG,cAAc,CAAC;gBAC9C,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YACjD,CAAC,CAAC;IACR,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,11 +1,16 @@
|
|
|
1
|
+
import { vec3 } from 'gl-matrix';
|
|
1
2
|
import StrategyCallbacks from '../../../../enums/StrategyCallbacks';
|
|
2
3
|
export default {
|
|
3
4
|
[StrategyCallbacks.Initialize]: (operationData) => {
|
|
4
|
-
const { centerIJK, strategySpecificConfiguration, segmentationVoxelManager: segmentationVoxelManager, imageVoxelManager: imageVoxelManager, segmentIndex, } = operationData;
|
|
5
|
+
const { operationName, centerIJK, strategySpecificConfiguration, segmentationVoxelManager: segmentationVoxelManager, imageVoxelManager: imageVoxelManager, segmentIndex, } = operationData;
|
|
5
6
|
const { THRESHOLD } = strategySpecificConfiguration;
|
|
6
7
|
if (!THRESHOLD?.isDynamic || !centerIJK || !segmentIndex) {
|
|
7
8
|
return;
|
|
8
9
|
}
|
|
10
|
+
if (operationName === StrategyCallbacks.RejectPreview ||
|
|
11
|
+
operationName === StrategyCallbacks.OnInteractionEnd) {
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
9
14
|
const { boundsIJK } = segmentationVoxelManager;
|
|
10
15
|
const { threshold: oldThreshold, dynamicRadius = 0 } = THRESHOLD;
|
|
11
16
|
const useDelta = oldThreshold ? 0 : dynamicRadius;
|
|
@@ -18,8 +23,9 @@ export default {
|
|
|
18
23
|
});
|
|
19
24
|
const threshold = oldThreshold || [Infinity, -Infinity];
|
|
20
25
|
const callback = ({ value }) => {
|
|
21
|
-
|
|
22
|
-
threshold[
|
|
26
|
+
const gray = Array.isArray(value) ? vec3.len(value) : value;
|
|
27
|
+
threshold[0] = Math.min(gray, threshold[0]);
|
|
28
|
+
threshold[1] = Math.max(gray, threshold[1]);
|
|
23
29
|
};
|
|
24
30
|
imageVoxelManager.forEach(callback, { boundsIJK: nestedBounds });
|
|
25
31
|
operationData.strategySpecificConfiguration.THRESHOLD.threshold = threshold;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamicThreshold.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/compositions/dynamicThreshold.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dynamicThreshold.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/compositions/dynamicThreshold.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AAUpE,eAAe;IACb,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC,aAAuC,EAAE,EAAE;QAC1E,MAAM,EACJ,aAAa,EACb,SAAS,EACT,6BAA6B,EAC7B,wBAAwB,EAAE,wBAAwB,EAClD,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,GACb,GAAG,aAAa,CAAC;QAClB,MAAM,EAAE,SAAS,EAAE,GAAG,6BAA6B,CAAC;QAEpD,IAAI,CAAC,SAAS,EAAE,SAAS,IAAI,CAAC,SAAS,IAAI,CAAC,YAAY,EAAE;YACxD,OAAO;SACR;QACD,IACE,aAAa,KAAK,iBAAiB,CAAC,aAAa;YACjD,aAAa,KAAK,iBAAiB,CAAC,gBAAgB,EACpD;YACA,OAAO;SACR;QAED,MAAM,EAAE,SAAS,EAAE,GAAG,wBAAwB,CAAC;QAC/C,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,GAAG,CAAC,EAAE,GAAG,SAAS,CAAC;QACjE,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;QAClD,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC9C,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC;YACvB,OAAO;gBACL,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;gBACxC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;aACzC,CAAC;QACJ,CAAC,CAAc,CAAC;QAEhB,MAAM,SAAS,GAAG,YAAY,IAAI,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;YAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACnE,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5C,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,CAAC,CAAC;QACF,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC;QAEjE,aAAa,CAAC,6BAA6B,CAAC,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC;IAC9E,CAAC;IAED,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,CACtC,aAAuC,EACvC,EAAE;QACF,MAAM,EAAE,6BAA6B,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;QACjE,IAAI,CAAC,6BAA6B,EAAE,SAAS,EAAE,SAAS,IAAI,CAAC,OAAO,EAAE;YACpE,OAAO;SACR;QACD,6BAA6B,CAAC,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC;IAC3D,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"islandRemoval.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/compositions/islandRemoval.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,8CAA8C,CAAC;AACrE,OAAO,EAAE,+BAA+B,EAAE,MAAM,oEAAoE,CAAC;AACrH,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AASpE,eAAe;IACb,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,CACpC,aAAuC,EACvC,EAAE;QACF,MAAM,EACJ,mBAAmB,EAAE,mBAAmB,EACxC,wBAAwB,EAAE,wBAAwB,EAClD,6BAA6B,EAC7B,mBAAmB,EACnB,YAAY,GACb,GAAG,aAAa,CAAC;QAElB,IAAI,CAAC,6BAA6B,CAAC,SAAS,IAAI,YAAY,KAAK,IAAI,EAAE;YACrE,OAAO;SACR;QAED,MAAM,aAAa,GAAG,mBAAmB,CAAC,SAAS,EAAE,CAAC;QACtD,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE;YAC1B,OAAO;SACR;QAED,IAAI,mBAAmB,KAAK,SAAS,EAAE;YACrC,OAAO;SACR;QAID,MAAM,SAAS,GAAG,mBAAmB;aAClC,YAAY,EAAE;aACd,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;YACjB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9D,CAAC,CAAC;QAEL,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,EAAE;YAEtD,OAAO;SACR;QAED,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QAErC,MAAM,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;YACzB,IACE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnB,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnB,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnB,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnB,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnB,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACnB;gBACA,OAAO,CAAC,CAAC,CAAC;aACX;YACD,MAAM,KAAK,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC1D,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBAEzB,OAAO,CAAC,CAAC,CAAC;aACX;YACD,MAAM,MAAM,GAAG,wBAAwB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAC1D,MAAM,IAAI,GACR,MAAM,KAAK,mBAAmB,IAAI,MAAM,KAAK,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,IAAI,CAAC,IAAI,EAAE;gBACT,wBAAwB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;aAC1C;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,IAAI,YAAY,GAAG,CAAC,CAAC;QAErB,MAAM,OAAO,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;YAC1B,MAAM,KAAK,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC1D,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBACzB,OAAO;aACR;YAED,mBAAmB,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,mBAAmB,CAAC,CAAC;YAC3D,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACtB,YAAY,EAAE,CAAC;QACjB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"islandRemoval.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/compositions/islandRemoval.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,22 @@
|
|
|
1
|
+
import { vec3 } from 'gl-matrix';
|
|
1
2
|
import StrategyCallbacks from '../../../../enums/StrategyCallbacks';
|
|
2
3
|
export default {
|
|
3
4
|
[StrategyCallbacks.CreateIsInThreshold]: (operationData) => {
|
|
4
|
-
const { imageVoxelManager
|
|
5
|
+
const { imageVoxelManager, strategySpecificConfiguration, segmentIndex } = operationData;
|
|
5
6
|
if (!strategySpecificConfiguration || !segmentIndex) {
|
|
6
7
|
return;
|
|
7
8
|
}
|
|
8
9
|
return (index) => {
|
|
9
10
|
const { THRESHOLD, THRESHOLD_INSIDE_CIRCLE } = strategySpecificConfiguration;
|
|
10
11
|
const voxelValue = imageVoxelManager.getAtIndex(index);
|
|
12
|
+
const gray = Array.isArray(voxelValue)
|
|
13
|
+
? vec3.length(voxelValue)
|
|
14
|
+
: voxelValue;
|
|
11
15
|
const { threshold } = THRESHOLD || THRESHOLD_INSIDE_CIRCLE || {};
|
|
12
16
|
if (!threshold?.length) {
|
|
13
17
|
return true;
|
|
14
18
|
}
|
|
15
|
-
return threshold[0] <=
|
|
19
|
+
return threshold[0] <= gray && gray <= threshold[1];
|
|
16
20
|
};
|
|
17
21
|
},
|
|
18
22
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"threshold.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/compositions/threshold.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"threshold.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/compositions/threshold.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AAOpE,eAAe;IACb,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,EAAE,CACvC,aAAuC,EACvC,EAAE;QACF,MAAM,EAAE,iBAAiB,EAAE,6BAA6B,EAAE,YAAY,EAAE,GACtE,aAAa,CAAC;QAChB,IAAI,CAAC,6BAA6B,IAAI,CAAC,YAAY,EAAE;YACnD,OAAO;SACR;QACD,OAAO,CAAC,KAAK,EAAE,EAAE;YACf,MAAM,EAAE,SAAS,EAAE,uBAAuB,EAAE,GAC1C,6BAA6B,CAAC;YAEhC,MAAM,UAAU,GAAG,iBAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACvD,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;gBACpC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,UAA0B,CAAC;gBACzC,CAAC,CAAC,UAAU,CAAC;YAGf,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,IAAI,uBAAuB,IAAI,EAAE,CAAC;YACjE,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE;gBACtB,OAAO,IAAI,CAAC;aACb;YACD,OAAO,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC;IACJ,CAAC;CACF,CAAC"}
|