@cornerstonejs/tools 1.54.2 → 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/annotations/contourSegmentation/contourSegmentationCompleted.js +72 -74
- package/dist/cjs/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js.map +1 -1
- 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/annotation/LivewireContourTool.js +5 -2
- package/dist/cjs/tools/annotation/LivewireContourTool.js.map +1 -1
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js +4 -0
- package/dist/cjs/tools/annotation/PlanarFreehandROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/SplineROITool.js +5 -2
- package/dist/cjs/tools/annotation/SplineROITool.js.map +1 -1
- package/dist/cjs/tools/annotation/planarFreehandROITool/drawLoop.js +2 -3
- package/dist/cjs/tools/annotation/planarFreehandROITool/drawLoop.js.map +1 -1
- package/dist/cjs/tools/base/ContourBaseTool.d.ts +8 -0
- package/dist/cjs/tools/base/ContourBaseTool.js +13 -2
- package/dist/cjs/tools/base/ContourBaseTool.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/contours/updateContourPolyline.d.ts +5 -0
- package/dist/cjs/utilities/contours/updateContourPolyline.js +7 -2
- package/dist/cjs/utilities/contours/updateContourPolyline.js.map +1 -1
- package/dist/cjs/utilities/math/line/distanceToPointSquaredInfo.js.map +1 -1
- package/dist/cjs/utilities/math/polyline/decimate.d.ts +2 -0
- package/dist/cjs/utilities/math/polyline/decimate.js +73 -0
- package/dist/cjs/utilities/math/polyline/decimate.js.map +1 -0
- package/dist/cjs/utilities/math/polyline/index.d.ts +2 -1
- package/dist/cjs/utilities/math/polyline/index.js +3 -1
- package/dist/cjs/utilities/math/polyline/index.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/annotations/contourSegmentation/contourSegmentationCompleted.js +1 -1
- package/dist/esm/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.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/annotation/LivewireContourTool.js +5 -2
- package/dist/esm/tools/annotation/LivewireContourTool.js.map +1 -1
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js +4 -0
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js.map +1 -1
- package/dist/esm/tools/annotation/SplineROITool.js +5 -2
- package/dist/esm/tools/annotation/SplineROITool.js.map +1 -1
- package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.js +2 -3
- package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.js.map +1 -1
- package/dist/esm/tools/base/ContourBaseTool.js +10 -0
- package/dist/esm/tools/base/ContourBaseTool.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/contours/updateContourPolyline.js +6 -2
- package/dist/esm/utilities/contours/updateContourPolyline.js.map +1 -1
- package/dist/esm/utilities/math/line/distanceToPointSquaredInfo.js.map +1 -1
- package/dist/esm/utilities/math/polyline/decimate.js +47 -0
- package/dist/esm/utilities/math/polyline/decimate.js.map +1 -0
- package/dist/esm/utilities/math/polyline/index.js +2 -1
- package/dist/esm/utilities/math/polyline/index.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/annotation/LivewireContourTool.d.ts.map +1 -1
- package/dist/types/tools/annotation/PlanarFreehandROITool.d.ts.map +1 -1
- package/dist/types/tools/annotation/SplineROITool.d.ts.map +1 -1
- package/dist/types/tools/annotation/planarFreehandROITool/drawLoop.d.ts.map +1 -1
- package/dist/types/tools/base/ContourBaseTool.d.ts +8 -0
- package/dist/types/tools/base/ContourBaseTool.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/contours/updateContourPolyline.d.ts +5 -0
- package/dist/types/utilities/contours/updateContourPolyline.d.ts.map +1 -1
- package/dist/types/utilities/math/line/distanceToPointSquaredInfo.d.ts.map +1 -1
- package/dist/types/utilities/math/polyline/decimate.d.ts +3 -0
- package/dist/types/utilities/math/polyline/decimate.d.ts.map +1 -0
- package/dist/types/utilities/math/polyline/index.d.ts +2 -1
- package/dist/types/utilities/math/polyline/index.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/annotations/contourSegmentation/contourSegmentationCompleted.ts +1 -1
- 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/annotation/LivewireContourTool.ts +15 -2
- package/src/tools/annotation/PlanarFreehandROITool.ts +12 -0
- package/src/tools/annotation/SplineROITool.ts +13 -2
- package/src/tools/annotation/planarFreehandROITool/drawLoop.ts +2 -3
- package/src/tools/base/ContourBaseTool.ts +23 -0
- 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/contours/updateContourPolyline.ts +23 -1
- package/src/utilities/math/line/distanceToPointSquaredInfo.ts +2 -1
- package/src/utilities/math/polyline/decimate.ts +105 -0
- package/src/utilities/math/polyline/index.ts +2 -0
- 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
|
@@ -1,12 +1,11 @@
|
|
|
1
|
-
import { utilities } from '@cornerstonejs/core';
|
|
2
1
|
declare function getStrategyData({ operationData, viewport }: {
|
|
3
2
|
operationData: any;
|
|
4
3
|
viewport: any;
|
|
5
4
|
}): {
|
|
6
5
|
segmentationImageData: any;
|
|
7
6
|
segmentationScalarData: any;
|
|
8
|
-
segmentationVoxelManager:
|
|
7
|
+
segmentationVoxelManager: any;
|
|
9
8
|
imageScalarData: any;
|
|
10
|
-
imageVoxelManager:
|
|
9
|
+
imageVoxelManager: any;
|
|
11
10
|
};
|
|
12
11
|
export { getStrategyData };
|
|
@@ -5,15 +5,19 @@ const core_1 = require("@cornerstonejs/core");
|
|
|
5
5
|
const stackVolumeCheck_1 = require("./stackVolumeCheck");
|
|
6
6
|
const { VoxelManager } = core_1.utilities;
|
|
7
7
|
function getStrategyData({ operationData, viewport }) {
|
|
8
|
+
var _a;
|
|
8
9
|
let segmentationImageData, segmentationScalarData, imageScalarData;
|
|
9
10
|
let imageDimensions;
|
|
10
11
|
let segmentationDimensions;
|
|
12
|
+
let imageVoxelManager;
|
|
13
|
+
let segmentationVoxelManager;
|
|
11
14
|
if ((0, stackVolumeCheck_1.isVolumeSegmentation)(operationData, viewport)) {
|
|
12
15
|
const { volumeId, referencedVolumeId } = operationData;
|
|
13
16
|
const segmentationVolume = core_1.cache.getVolume(volumeId);
|
|
14
17
|
if (!segmentationVolume) {
|
|
15
18
|
return;
|
|
16
19
|
}
|
|
20
|
+
segmentationVoxelManager = segmentationVolume.voxelManager;
|
|
17
21
|
if (referencedVolumeId) {
|
|
18
22
|
const imageVolume = core_1.cache.getVolume(referencedVolumeId);
|
|
19
23
|
imageScalarData = imageVolume.getScalarData();
|
|
@@ -33,22 +37,33 @@ function getStrategyData({ operationData, viewport }) {
|
|
|
33
37
|
return;
|
|
34
38
|
}
|
|
35
39
|
const actor = viewport.getActor(segmentationRepresentationUID);
|
|
40
|
+
if (!actor) {
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
36
43
|
segmentationImageData = actor.actor.getMapper().getInputData();
|
|
44
|
+
segmentationVoxelManager = segmentationImageData.voxelManager;
|
|
37
45
|
const currentSegmentationImageId = imageIdReferenceMap.get(currentImageId);
|
|
38
46
|
const segmentationImage = core_1.cache.getImage(currentSegmentationImageId);
|
|
39
|
-
|
|
47
|
+
if (!segmentationImage) {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
segmentationScalarData = (_a = segmentationImage.getPixelData) === null || _a === void 0 ? void 0 : _a.call(segmentationImage);
|
|
40
51
|
const image = core_1.cache.getImage(currentImageId);
|
|
41
|
-
|
|
42
|
-
|
|
52
|
+
const imageData = image ? null : viewport.getImageData();
|
|
53
|
+
imageScalarData = (image === null || image === void 0 ? void 0 : image.getPixelData()) || imageData.getScalarData();
|
|
54
|
+
imageDimensions = image
|
|
55
|
+
? [image.columns, image.rows, 1]
|
|
56
|
+
: imageData.dimensions;
|
|
43
57
|
segmentationDimensions = [
|
|
44
58
|
segmentationImage.columns,
|
|
45
59
|
segmentationImage.rows,
|
|
46
60
|
1,
|
|
47
61
|
];
|
|
62
|
+
imageVoxelManager = image === null || image === void 0 ? void 0 : image.voxelManager;
|
|
48
63
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
VoxelManager.createVolumeVoxelManager(imageDimensions, imageScalarData);
|
|
64
|
+
segmentationVoxelManager || (segmentationVoxelManager = VoxelManager.createVolumeVoxelManager(segmentationDimensions, segmentationScalarData));
|
|
65
|
+
imageVoxelManager || (imageVoxelManager = imageDimensions &&
|
|
66
|
+
VoxelManager.createVolumeVoxelManager(imageDimensions, imageScalarData));
|
|
52
67
|
return {
|
|
53
68
|
segmentationImageData,
|
|
54
69
|
segmentationScalarData,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getStrategyData.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/utils/getStrategyData.ts"],"names":[],"mappings":";;;AAAA,8CAAuD;AAEvD,yDAA0D;AAG1D,MAAM,EAAE,YAAY,EAAE,GAAG,gBAAS,CAAC;AAEnC,SAAS,eAAe,CAAC,EAAE,aAAa,EAAE,QAAQ,EAAE
|
|
1
|
+
{"version":3,"file":"getStrategyData.js","sourceRoot":"","sources":["../../../../../../src/tools/segmentation/strategies/utils/getStrategyData.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,4 +7,9 @@ export default function updateContourPolyline(annotation: ContourAnnotation, pol
|
|
|
7
7
|
targetWindingDirection?: ContourWindingDirection;
|
|
8
8
|
}, transforms: {
|
|
9
9
|
canvasToWorld: (point: Types.Point2) => Types.Point3;
|
|
10
|
+
}, options?: {
|
|
11
|
+
decimate?: {
|
|
12
|
+
enabled?: boolean;
|
|
13
|
+
epsilon?: number;
|
|
14
|
+
};
|
|
10
15
|
}): void;
|
|
@@ -26,10 +26,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
const core_1 = require("@cornerstonejs/core");
|
|
27
27
|
const math = __importStar(require("../math"));
|
|
28
28
|
const stateManagement_1 = require("../../stateManagement");
|
|
29
|
-
function updateContourPolyline(annotation, polylineData, transforms) {
|
|
29
|
+
function updateContourPolyline(annotation, polylineData, transforms, options) {
|
|
30
|
+
var _a, _b;
|
|
30
31
|
const { canvasToWorld } = transforms;
|
|
31
32
|
const { data } = annotation;
|
|
32
|
-
const {
|
|
33
|
+
const { targetWindingDirection } = polylineData;
|
|
34
|
+
let { points: polyline } = polylineData;
|
|
35
|
+
if ((_a = options === null || options === void 0 ? void 0 : options.decimate) === null || _a === void 0 ? void 0 : _a.enabled) {
|
|
36
|
+
polyline = math.polyline.decimate(polylineData.points, (_b = options === null || options === void 0 ? void 0 : options.decimate) === null || _b === void 0 ? void 0 : _b.epsilon);
|
|
37
|
+
}
|
|
33
38
|
let { closed } = polylineData;
|
|
34
39
|
const numPoints = polyline.length;
|
|
35
40
|
const polylineWorldPoints = new Array(numPoints);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateContourPolyline.js","sourceRoot":"","sources":["../../../../src/utilities/contours/updateContourPolyline.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA2D;AAI3D,8CAAgC;AAChC,2DAG+B;
|
|
1
|
+
{"version":3,"file":"updateContourPolyline.js","sourceRoot":"","sources":["../../../../src/utilities/contours/updateContourPolyline.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA2D;AAI3D,8CAAgC;AAChC,2DAG+B;AAe/B,SAAwB,qBAAqB,CAC3C,UAA6B,EAC7B,YAIC,EACD,UAEC,EACD,OAKC;;IAED,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,CAAC;IACrC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;IAC5B,MAAM,EAAE,sBAAsB,EAAE,GAAG,YAAY,CAAC;IAChD,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC;IAGxC,IAAI,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,OAAO,EAAE;QAC9B,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAC/B,YAAY,CAAC,MAAM,EACnB,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,OAAO,CAC3B,CAAC;KACH;IAED,IAAI,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;IAC9B,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC;IAClC,MAAM,mBAAmB,GAAG,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,uBAAuB,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC5E,MAAM,gBAAgB,GAAG,IAAA,qCAAmB,EAAC,UAAU,CAAsB,CAAC;IAE9E,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,IAAI,kBAAkB,GAAG,KAAK,CAAC;QAG/B,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CACvD,QAAQ,CAAC,CAAC,CAAC,EACX,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC,CACxB,CAAC;YAEF,kBAAkB,GAAG,gBAAO,CAAC,OAAO,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;SAC1D;QAED,MAAM,GAAG,kBAAkB,CAAC;KAC7B;IAGD,IAAI,gBAAgB,GAAG,gBAAgB;QACrC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,GAAG,CAAC,CAAC;QACrD,CAAC,CAAC,sBAAsB,CAAC;IAE3B,IAAI,gBAAgB,KAAK,SAAS,EAAE;QAClC,gBAAgB,GAAG,uBAAuB,CAAC;KAC5C;SAAM,IAAI,gBAAgB,KAAK,uBAAuB,EAAE;QACvD,QAAQ,CAAC,OAAO,EAAE,CAAC;KACpB;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;QAClC,mBAAmB,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;KACrD;IAED,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,mBAAmB,CAAC;IAC5C,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;IAC7B,IAAI,CAAC,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAEjD,IAAA,sCAAoB,EAAC,UAAU,CAAC,CAAC;AACnC,CAAC;AAxED,wCAwEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"distanceToPointSquaredInfo.js","sourceRoot":"","sources":["../../../../../src/utilities/math/line/distanceToPointSquaredInfo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAA4B;AAc5B,SAAwB,0BAA0B,CAChD,SAAuB,EACvB,OAAqB,EACrB,KAAmB;IAKnB,IAAI,YAA0B,CAAC;IAC/B,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"distanceToPointSquaredInfo.js","sourceRoot":"","sources":["../../../../../src/utilities/math/line/distanceToPointSquaredInfo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAA4B;AAc5B,SAAwB,0BAA0B,CAChD,SAAuB,EACvB,OAAqB,EACrB,KAAmB;IAKnB,IAAI,YAA0B,CAAC;IAC/B,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAI9E,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE;QAC9D,YAAY,GAAG,SAAS,CAAC;KAC1B;IAED,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,UAAU,GACd,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YACtD,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1D,eAAe,CAAC;QAElB,IAAI,UAAU,GAAG,CAAC,EAAE;YAClB,YAAY,GAAG,SAAS,CAAC;SAC1B;aAAM,IAAI,UAAU,GAAG,CAAC,EAAE;YACzB,YAAY,GAAG,OAAO,CAAC;SACxB;aAAM;YACL,YAAY,GAAG;gBACb,SAAS,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;gBACvD,SAAS,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;aACxD,CAAC;SACH;KACF;IAED,OAAO;QACL,KAAK,EAAE,CAAC,GAAG,YAAY,CAAC;QACxB,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,KAAK,EAAE,YAAY,CAAC;KACxE,CAAC;AACJ,CAAC;AAvCD,6CAuCC"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
const mathLine = __importStar(require("../line"));
|
|
27
|
+
const DEFAULT_EPSILON = 0.1;
|
|
28
|
+
function decimate(polyline, epsilon = DEFAULT_EPSILON) {
|
|
29
|
+
const numPoints = polyline.length;
|
|
30
|
+
if (numPoints < 3) {
|
|
31
|
+
return polyline;
|
|
32
|
+
}
|
|
33
|
+
const epsilonSquared = epsilon * epsilon;
|
|
34
|
+
const partitionQueue = [[0, numPoints - 1]];
|
|
35
|
+
const polylinePointFlags = new Array(numPoints).fill(false);
|
|
36
|
+
let numDecimatedPoints = 2;
|
|
37
|
+
polylinePointFlags[0] = true;
|
|
38
|
+
polylinePointFlags[numPoints - 1] = true;
|
|
39
|
+
while (partitionQueue.length) {
|
|
40
|
+
const [startIndex, endIndex] = partitionQueue.pop();
|
|
41
|
+
if (endIndex - startIndex === 1) {
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
const startPoint = polyline[startIndex];
|
|
45
|
+
const endPoint = polyline[endIndex];
|
|
46
|
+
let maxDistSquared = -Infinity;
|
|
47
|
+
let maxDistIndex = -1;
|
|
48
|
+
for (let i = startIndex + 1; i < endIndex; i++) {
|
|
49
|
+
const currentPoint = polyline[i];
|
|
50
|
+
const distSquared = mathLine.distanceToPointSquared(startPoint, endPoint, currentPoint);
|
|
51
|
+
if (distSquared > maxDistSquared) {
|
|
52
|
+
maxDistSquared = distSquared;
|
|
53
|
+
maxDistIndex = i;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
if (maxDistSquared < epsilonSquared) {
|
|
57
|
+
continue;
|
|
58
|
+
}
|
|
59
|
+
polylinePointFlags[maxDistIndex] = true;
|
|
60
|
+
numDecimatedPoints++;
|
|
61
|
+
partitionQueue.push([maxDistIndex, endIndex]);
|
|
62
|
+
partitionQueue.push([startIndex, maxDistIndex]);
|
|
63
|
+
}
|
|
64
|
+
const decimatedPolyline = new Array(numDecimatedPoints);
|
|
65
|
+
for (let srcIndex = 0, dstIndex = 0; srcIndex < numPoints; srcIndex++) {
|
|
66
|
+
if (polylinePointFlags[srcIndex]) {
|
|
67
|
+
decimatedPolyline[dstIndex++] = polyline[srcIndex];
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
return decimatedPolyline;
|
|
71
|
+
}
|
|
72
|
+
exports.default = decimate;
|
|
73
|
+
//# sourceMappingURL=decimate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"decimate.js","sourceRoot":"","sources":["../../../../../src/utilities/math/polyline/decimate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAEpC,MAAM,eAAe,GAAG,GAAG,CAAC;AAkB5B,SAAwB,QAAQ,CAC9B,QAAwB,EACxB,OAAO,GAAG,eAAe;IAEzB,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC;IAGlC,IAAI,SAAS,GAAG,CAAC,EAAE;QACjB,OAAO,QAAQ,CAAC;KACjB;IAED,MAAM,cAAc,GAAG,OAAO,GAAG,OAAO,CAAC;IACzC,MAAM,cAAc,GAAG,CAAC,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC;IAK5C,MAAM,kBAAkB,GAAG,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAG5D,IAAI,kBAAkB,GAAG,CAAC,CAAC;IAG3B,kBAAkB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAC7B,kBAAkB,CAAC,SAAS,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;IAIzC,OAAO,cAAc,CAAC,MAAM,EAAE;QAC5B,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,cAAc,CAAC,GAAG,EAAE,CAAC;QAGpD,IAAI,QAAQ,GAAG,UAAU,KAAK,CAAC,EAAE;YAC/B,SAAS;SACV;QAED,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI,cAAc,GAAG,CAAC,QAAQ,CAAC;QAC/B,IAAI,YAAY,GAAG,CAAC,CAAC,CAAC;QAGtB,KAAK,IAAI,CAAC,GAAG,UAAU,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;YAC9C,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM,WAAW,GAAG,QAAQ,CAAC,sBAAsB,CACjD,UAAU,EACV,QAAQ,EACR,YAAY,CACb,CAAC;YAEF,IAAI,WAAW,GAAG,cAAc,EAAE;gBAChC,cAAc,GAAG,WAAW,CAAC;gBAC7B,YAAY,GAAG,CAAC,CAAC;aAClB;SACF;QAID,IAAI,cAAc,GAAG,cAAc,EAAE;YACnC,SAAS;SACV;QAID,kBAAkB,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;QACxC,kBAAkB,EAAE,CAAC;QAIrB,cAAc,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC9C,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;KACjD;IAGD,MAAM,iBAAiB,GAAmB,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAExE,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,SAAS,EAAE,QAAQ,EAAE,EAAE;QACrE,IAAI,kBAAkB,CAAC,QAAQ,CAAC,EAAE;YAChC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;SACpD;KACF;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAnFD,2BAmFC"}
|
|
@@ -9,6 +9,7 @@ import getNormal3 from './getNormal3';
|
|
|
9
9
|
import getNormal2 from './getNormal2';
|
|
10
10
|
import { mergePolylines, subtractPolylines } from './combinePolyline';
|
|
11
11
|
import intersectPolyline from './intersectPolyline';
|
|
12
|
+
import decimate from './decimate';
|
|
12
13
|
import getFirstLineSegmentIntersectionIndexes from './getFirstLineSegmentIntersectionIndexes';
|
|
13
14
|
import getLineSegmentIntersectionsIndexes from './getLineSegmentIntersectionsIndexes';
|
|
14
15
|
import getLineSegmentIntersectionsCoordinates from './getLineSegmentIntersectionsCoordinates';
|
|
@@ -18,4 +19,4 @@ import pointsAreWithinCloseContourProximity from './pointsAreWithinCloseContourP
|
|
|
18
19
|
import addCanvasPointsToArray from './addCanvasPointsToArray';
|
|
19
20
|
import pointCanProjectOnLine from './pointCanProjectOnLine';
|
|
20
21
|
import { isPointInsidePolyline3D } from './isPointInsidePolyline3D';
|
|
21
|
-
export { isClosed, containsPoint, containsPoints, getAABB, getArea, getSignedArea, getWindingDirection, getNormal3, getNormal2, intersectPolyline, getFirstLineSegmentIntersectionIndexes, getLineSegmentIntersectionsIndexes, getLineSegmentIntersectionsCoordinates, getClosestLineSegmentIntersection, getSubPixelSpacingAndXYDirections, pointsAreWithinCloseContourProximity, addCanvasPointsToArray, pointCanProjectOnLine, mergePolylines, subtractPolylines, isPointInsidePolyline3D, };
|
|
22
|
+
export { isClosed, containsPoint, containsPoints, getAABB, getArea, getSignedArea, getWindingDirection, getNormal3, getNormal2, intersectPolyline, decimate, getFirstLineSegmentIntersectionIndexes, getLineSegmentIntersectionsIndexes, getLineSegmentIntersectionsCoordinates, getClosestLineSegmentIntersection, getSubPixelSpacingAndXYDirections, pointsAreWithinCloseContourProximity, addCanvasPointsToArray, pointCanProjectOnLine, mergePolylines, subtractPolylines, isPointInsidePolyline3D, };
|
|
@@ -3,7 +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.isPointInsidePolyline3D = exports.subtractPolylines = exports.mergePolylines = exports.pointCanProjectOnLine = exports.addCanvasPointsToArray = exports.pointsAreWithinCloseContourProximity = exports.getSubPixelSpacingAndXYDirections = exports.getClosestLineSegmentIntersection = exports.getLineSegmentIntersectionsCoordinates = exports.getLineSegmentIntersectionsIndexes = exports.getFirstLineSegmentIntersectionIndexes = exports.intersectPolyline = exports.getNormal2 = exports.getNormal3 = exports.getWindingDirection = exports.getSignedArea = exports.getArea = exports.getAABB = exports.containsPoints = exports.containsPoint = exports.isClosed = void 0;
|
|
6
|
+
exports.isPointInsidePolyline3D = exports.subtractPolylines = exports.mergePolylines = exports.pointCanProjectOnLine = exports.addCanvasPointsToArray = exports.pointsAreWithinCloseContourProximity = exports.getSubPixelSpacingAndXYDirections = exports.getClosestLineSegmentIntersection = exports.getLineSegmentIntersectionsCoordinates = exports.getLineSegmentIntersectionsIndexes = exports.getFirstLineSegmentIntersectionIndexes = exports.decimate = exports.intersectPolyline = exports.getNormal2 = exports.getNormal3 = exports.getWindingDirection = exports.getSignedArea = exports.getArea = exports.getAABB = exports.containsPoints = exports.containsPoint = exports.isClosed = void 0;
|
|
7
7
|
const isClosed_1 = __importDefault(require("./isClosed"));
|
|
8
8
|
exports.isClosed = isClosed_1.default;
|
|
9
9
|
const containsPoint_1 = __importDefault(require("./containsPoint"));
|
|
@@ -27,6 +27,8 @@ Object.defineProperty(exports, "mergePolylines", { enumerable: true, get: functi
|
|
|
27
27
|
Object.defineProperty(exports, "subtractPolylines", { enumerable: true, get: function () { return combinePolyline_1.subtractPolylines; } });
|
|
28
28
|
const intersectPolyline_1 = __importDefault(require("./intersectPolyline"));
|
|
29
29
|
exports.intersectPolyline = intersectPolyline_1.default;
|
|
30
|
+
const decimate_1 = __importDefault(require("./decimate"));
|
|
31
|
+
exports.decimate = decimate_1.default;
|
|
30
32
|
const getFirstLineSegmentIntersectionIndexes_1 = __importDefault(require("./getFirstLineSegmentIntersectionIndexes"));
|
|
31
33
|
exports.getFirstLineSegmentIntersectionIndexes = getFirstLineSegmentIntersectionIndexes_1.default;
|
|
32
34
|
const getLineSegmentIntersectionsIndexes_1 = __importDefault(require("./getLineSegmentIntersectionsIndexes"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/utilities/math/polyline/index.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/utilities/math/polyline/index.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAuBhC,mBAvBK,kBAAQ,CAuBL;AAtBV,oEAA4C;AAuB1C,wBAvBK,uBAAa,CAuBL;AAtBf,sEAA8C;AAuB5C,yBAvBK,wBAAc,CAuBL;AAtBhB,wDAAgC;AAuB9B,kBAvBK,iBAAO,CAuBL;AAtBT,wDAAgC;AAuB9B,kBAvBK,iBAAO,CAuBL;AAtBT,oEAA4C;AAuB1C,wBAvBK,uBAAa,CAuBL;AAtBf,gFAAwD;AAuBtD,8BAvBK,6BAAmB,CAuBL;AAtBrB,8DAAsC;AAuBpC,qBAvBK,oBAAU,CAuBL;AAtBZ,8DAAsC;AAuBpC,qBAvBK,oBAAU,CAuBL;AAtBZ,uDAAsE;AAiCpE,+FAjCO,gCAAc,OAiCP;AACd,kGAlCuB,mCAAiB,OAkCvB;AAjCnB,4EAAoD;AAsBlD,4BAtBK,2BAAiB,CAsBL;AArBnB,0DAAkC;AAsBhC,mBAtBK,kBAAQ,CAsBL;AArBV,sHAA8F;AAsB5F,iDAtBK,gDAAsC,CAsBL;AArBxC,8GAAsF;AAsBpF,6CAtBK,4CAAkC,CAsBL;AArBpC,sHAA8F;AAsB5F,iDAtBK,gDAAsC,CAsBL;AArBxC,4GAAoF;AAsBlF,4CAtBK,2CAAiC,CAsBL;AArBnC,4GAAoF;AAsBlF,4CAtBK,2CAAiC,CAsBL;AArBnC,kHAA0F;AAsBxF,+CAtBK,8CAAoC,CAsBL;AArBtC,sFAA8D;AAsB5D,iCAtBK,gCAAsB,CAsBL;AArBxB,oFAA4D;AAsB1D,gCAtBK,+BAAqB,CAsBL;AArBvB,uEAAoE;AAwBlE,wGAxBO,iDAAuB,OAwBP"}
|
|
@@ -4,6 +4,7 @@ const gl_matrix_1 = require("gl-matrix");
|
|
|
4
4
|
function pointInShapeCallback(imageData, pointInShapeFn, callback, boundsIJK) {
|
|
5
5
|
let iMin, iMax, jMin, jMax, kMin, kMax;
|
|
6
6
|
let scalarData;
|
|
7
|
+
const { numComps } = imageData;
|
|
7
8
|
if (imageData.getScalarData) {
|
|
8
9
|
scalarData = imageData.getScalarData();
|
|
9
10
|
}
|
|
@@ -36,7 +37,8 @@ function pointInShapeCallback(imageData, pointInShapeFn, callback, boundsIJK) {
|
|
|
36
37
|
const rowStep = gl_matrix_1.vec3.fromValues(rowCosines[0] * rowSpacing, rowCosines[1] * rowSpacing, rowCosines[2] * rowSpacing);
|
|
37
38
|
const columnStep = gl_matrix_1.vec3.fromValues(columnCosines[0] * columnSpacing, columnCosines[1] * columnSpacing, columnCosines[2] * columnSpacing);
|
|
38
39
|
const scanAxisStep = gl_matrix_1.vec3.fromValues(scanAxisNormal[0] * scanAxisSpacing, scanAxisNormal[1] * scanAxisSpacing, scanAxisNormal[2] * scanAxisSpacing);
|
|
39
|
-
const xMultiple =
|
|
40
|
+
const xMultiple = numComps ||
|
|
41
|
+
scalarData.length / dimensions[2] / dimensions[1] / dimensions[0];
|
|
40
42
|
const yMultiple = dimensions[0] * xMultiple;
|
|
41
43
|
const zMultiple = dimensions[1] * yMultiple;
|
|
42
44
|
const pointsInShape = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pointInShapeCallback.js","sourceRoot":"","sources":["../../../src/utilities/pointInShapeCallback.ts"],"names":[],"mappings":";;AAAA,yCAAiC;AAwCjC,SAAwB,oBAAoB,CAC1C,SAA4C,EAC5C,cAA+B,EAC/B,QAA+B,EAC/B,SAAqB;IAErB,IAAI,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;IAEvC,IAAI,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"pointInShapeCallback.js","sourceRoot":"","sources":["../../../src/utilities/pointInShapeCallback.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|
package/dist/esm/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js
CHANGED
|
@@ -121,7 +121,7 @@ function getContourHolesData(viewport, annotation) {
|
|
|
121
121
|
return { annotation: holeAnnotation, polyline };
|
|
122
122
|
});
|
|
123
123
|
}
|
|
124
|
-
|
|
124
|
+
function combinePolylines(viewport, targetAnnotation, targetPolyline, sourceAnnotation, sourcePolyline) {
|
|
125
125
|
const sourceStartPoint = sourcePolyline[0];
|
|
126
126
|
const mergePolylines = math.polyline.containsPoint(targetPolyline, sourceStartPoint);
|
|
127
127
|
const contourHolesData = getContourHolesData(viewport, targetAnnotation);
|
package/dist/esm/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contourSegmentationCompleted.js","sourceRoot":"","sources":["../../../../../src/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"contourSegmentationCompleted.js","sourceRoot":"","sources":["../../../../../src/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.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);
|