@cornerstonejs/tools 5.8.2 → 5.10.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/config.js +3 -1
- package/dist/esm/cursors/setCursorForElement.js +3 -1
- package/dist/esm/eventDispatchers/mouseEventHandlers/mouseDownActivate.js +3 -1
- package/dist/esm/eventDispatchers/touchEventHandlers/touchStartActivate.js +3 -1
- package/dist/esm/eventListeners/annotations/contourSegmentation/contourSegmentationCompleted.js +3 -1
- package/dist/esm/stateManagement/annotation/AnnotationRenderingEngine.js +3 -1
- package/dist/esm/stateManagement/segmentation/SegmentationRenderingEngine.js +4 -2
- package/dist/esm/stateManagement/segmentation/SegmentationStateManager.js +9 -3
- package/dist/esm/stateManagement/segmentation/addColorLUT.js +3 -1
- package/dist/esm/stateManagement/segmentation/config/segmentationColor.js +3 -1
- package/dist/esm/stateManagement/segmentation/helpers/normalizeSegmentationInput.js +2 -0
- package/dist/esm/stateManagement/segmentation/internalAddRepresentationData.js +3 -1
- package/dist/esm/stateManagement/segmentation/internalAddSegmentationRepresentation.js +3 -1
- package/dist/esm/stateManagement/segmentation/removeSegmentationRepresentations.js +3 -1
- package/dist/esm/stateManagement/segmentation/segmentIndex.js +3 -1
- package/dist/esm/stateManagement/segmentation/utilities/convertContourHoles.js +9 -7
- package/dist/esm/stateManagement/segmentation/utilities/decimateContours.js +6 -4
- package/dist/esm/stateManagement/segmentation/utilities/getPolylineMap.js +3 -1
- package/dist/esm/stateManagement/segmentation/utilities/removeContourHoles.js +5 -3
- package/dist/esm/stateManagement/segmentation/utilities/removeContourIslands.js +5 -3
- package/dist/esm/stateManagement/segmentation/utilities/smoothContours.js +6 -4
- package/dist/esm/store/SynchronizerManager/Synchronizer.js +4 -2
- package/dist/esm/store/ToolGroupManager/ToolGroup.js +17 -15
- package/dist/esm/store/ToolGroupManager/createToolGroup.js +3 -1
- package/dist/esm/store/filterToolsWithAnnotationsForElement.js +3 -1
- package/dist/esm/tools/AdvancedMagnifyTool.js +3 -1
- package/dist/esm/tools/CrosshairsTool.js +4 -2
- package/dist/esm/tools/MIPJumpToClickTool.js +3 -1
- package/dist/esm/tools/OrientationControllerTool.js +6 -4
- package/dist/esm/tools/OverlayGridTool.js +5 -3
- package/dist/esm/tools/ReferenceCursors.js +3 -1
- package/dist/esm/tools/ReferenceLinesTool.js +3 -1
- package/dist/esm/tools/SculptorTool.js +7 -5
- package/dist/esm/tools/SegmentationIntersectionTool.js +3 -1
- package/dist/esm/tools/VolumeCroppingControlTool.js +5 -3
- package/dist/esm/tools/VolumeCroppingTool.js +5 -3
- package/dist/esm/tools/WindowLevelRegionTool.js +3 -1
- package/dist/esm/tools/annotation/AngleTool.js +3 -1
- package/dist/esm/tools/annotation/ArrowAnnotateTool.js +3 -1
- package/dist/esm/tools/annotation/BidirectionalTool.js +3 -1
- package/dist/esm/tools/annotation/CircleROITool.js +30 -33
- package/dist/esm/tools/annotation/CobbAngleTool.js +3 -1
- package/dist/esm/tools/annotation/DragProbeTool.js +3 -1
- package/dist/esm/tools/annotation/ETDRSGridTool.js +3 -1
- package/dist/esm/tools/annotation/EllipticalROITool.js +35 -38
- package/dist/esm/tools/annotation/HeightTool.js +3 -1
- package/dist/esm/tools/annotation/KeyImageTool.js +3 -1
- package/dist/esm/tools/annotation/LabelTool.js +3 -1
- package/dist/esm/tools/annotation/LengthTool.js +4 -2
- package/dist/esm/tools/annotation/LivewireContourTool.js +3 -1
- package/dist/esm/tools/annotation/PlanarFreehandROITool.d.ts +13 -2
- package/dist/esm/tools/annotation/PlanarFreehandROITool.js +28 -81
- package/dist/esm/tools/annotation/ProbeTool.js +3 -1
- package/dist/esm/tools/annotation/RectangleROITool.js +31 -20
- package/dist/esm/tools/annotation/SplineROITool.js +3 -1
- package/dist/esm/tools/annotation/UltrasoundDirectionalTool.js +3 -1
- package/dist/esm/tools/annotation/UltrasoundPleuraBLineTool/UltrasoundPleuraBLineTool.js +5 -3
- package/dist/esm/tools/annotation/VideoRedactionTool.js +3 -1
- package/dist/esm/tools/annotation/planarFreehandROITool/findOpenUShapedContourVectorToPeak.js +3 -1
- package/dist/esm/tools/base/AnnotationTool.js +3 -1
- package/dist/esm/tools/base/ContourBaseTool.js +3 -1
- package/dist/esm/tools/displayTools/Contour/contourDisplay.js +4 -2
- package/dist/esm/tools/displayTools/Contour/contourHandler/handleContourSegmentation.js +3 -1
- package/dist/esm/tools/displayTools/Contour/contourHandler/utils.js +3 -1
- package/dist/esm/tools/displayTools/Labelmap/labelmapDisplay.js +4 -2
- package/dist/esm/tools/displayTools/Labelmap/labelmapRenderPlan/legacyVolumePlan.js +4 -2
- package/dist/esm/tools/displayTools/Labelmap/syncStackLabelmapActors.js +3 -1
- package/dist/esm/tools/displayTools/Surface/surfaceDisplay.js +6 -4
- package/dist/esm/tools/segmentation/CircleROIStartEndThresholdTool.js +3 -1
- package/dist/esm/tools/segmentation/CircleScissorsTool.js +3 -1
- package/dist/esm/tools/segmentation/LabelmapEditWithContour.js +3 -1
- package/dist/esm/tools/segmentation/PaintFillTool.js +3 -1
- package/dist/esm/tools/segmentation/RectangleROIStartEndThresholdTool.js +3 -1
- package/dist/esm/tools/segmentation/RectangleROIThresholdTool.js +3 -1
- package/dist/esm/tools/segmentation/RectangleScissorsTool.js +3 -1
- package/dist/esm/tools/segmentation/SegmentBidirectionalTool.js +3 -1
- package/dist/esm/tools/segmentation/SegmentSelectTool.d.ts +6 -1
- package/dist/esm/tools/segmentation/SegmentSelectTool.js +30 -4
- package/dist/esm/tools/segmentation/SphereScissorsTool.js +3 -1
- package/dist/esm/tools/segmentation/strategies/compositions/circularCursor.js +3 -1
- package/dist/esm/tools/segmentation/strategies/compositions/index.js +1 -1
- package/dist/esm/types/SegmentationStateTypes.d.ts +4 -0
- package/dist/esm/utilities/calibrateImageSpacing.js +3 -1
- package/dist/esm/utilities/cine/playClip.js +3 -1
- package/dist/esm/utilities/contourSegmentation/applyContourStroke.js +3 -1
- package/dist/esm/utilities/contourSegmentation/contourSegmentationOperation.js +4 -2
- package/dist/esm/utilities/contourSegmentation/convertContourSegmentation.js +3 -1
- package/dist/esm/utilities/contourSegmentation/logicalOperators.js +6 -4
- package/dist/esm/utilities/contourSegmentation/mergeMultipleAnnotations.js +3 -1
- package/dist/esm/utilities/contourSegmentation/sharedOperations.js +3 -1
- package/dist/esm/utilities/contours/generateContourSetsFromLabelmap.js +3 -1
- package/dist/esm/utilities/contours/interpolation/findAnnotationForInterpolation.js +3 -1
- package/dist/esm/utilities/contours/interpolation/interpolate.js +3 -1
- package/dist/esm/utilities/dynamicVolume/generateImageFromTimeData.js +4 -2
- package/dist/esm/utilities/dynamicVolume/getDataInTime.js +3 -1
- package/dist/esm/utilities/index.d.ts +2 -1
- package/dist/esm/utilities/index.js +2 -1
- package/dist/esm/utilities/livewire/LivewireScissors.js +3 -1
- package/dist/esm/utilities/math/basic/Calculator.js +3 -1
- package/dist/esm/utilities/math/polyline/addCanvasPointsToArray.js +3 -1
- package/dist/esm/utilities/math/polyline/combinePolyline.js +4 -2
- package/dist/esm/utilities/math/polyline/getSubPixelSpacingAndXYDirections.js +12 -6
- package/dist/esm/utilities/math/polyline/intersectPolylines.js +4 -2
- package/dist/esm/utilities/math/polyline/subtractPolylines.js +4 -2
- package/dist/esm/utilities/sampleAreaAnnotationVoxels.d.ts +44 -0
- package/dist/esm/utilities/sampleAreaAnnotationVoxels.js +63 -0
- package/dist/esm/utilities/segmentation/InterpolationManager/InterpolationManager.js +5 -3
- package/dist/esm/utilities/segmentation/growCut/runFloodFillSegmentation.js +10 -5
- package/dist/esm/utilities/segmentation/growCut/runGrowCut.js +3 -1
- package/dist/esm/utilities/segmentation/growCut/runGrowCutForSphere.js +3 -1
- package/dist/esm/utilities/segmentation/growCut/runOneClickGrowCut.js +10 -8
- package/dist/esm/utilities/segmentation/isLineInSegment.js +3 -1
- package/dist/esm/utilities/segmentation/islandRemoval.js +3 -1
- package/dist/esm/utilities/segmentation/segmentContourAction.js +4 -2
- package/dist/esm/utilities/segmentation/utilsForWorker.js +4 -2
- package/dist/esm/utilities/spatial/areViewportsSpatiallyLinked.js +2 -1
- package/dist/esm/utilities/stackPrefetch/stackContextPrefetch.js +5 -3
- package/dist/esm/utilities/stackPrefetch/stackPrefetch.js +4 -2
- package/dist/esm/utilities/triggerAnnotationRenderForToolGroupIds.js +4 -2
- package/dist/esm/utilities/triggerAnnotationRenderForViewportIds.js +4 -2
- package/dist/esm/utilities/voi/colorbar/Colorbar.js +3 -1
- package/dist/esm/utilities/voi/windowlevel/extractWindowLevelRegionToolData.js +3 -1
- package/dist/esm/utilities/vtkjs/OrientationControllerWidget/index.js +4 -2
- package/dist/esm/version.d.ts +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/workers/computeWorker.js +5 -3
- package/package.json +4 -5
- package/LICENSE +0 -21
|
@@ -17,6 +17,7 @@ class SegmentSelectTool extends BaseTool {
|
|
|
17
17
|
},
|
|
18
18
|
}) {
|
|
19
19
|
super(toolProps, defaultToolProps);
|
|
20
|
+
this.hoverElement = null;
|
|
20
21
|
this.mouseMoveCallback = (evt) => {
|
|
21
22
|
if (this.mode !== ToolModes.Active) {
|
|
22
23
|
return;
|
|
@@ -24,20 +25,45 @@ class SegmentSelectTool extends BaseTool {
|
|
|
24
25
|
if (this.hoverTimer) {
|
|
25
26
|
clearTimeout(this.hoverTimer);
|
|
26
27
|
}
|
|
28
|
+
const { element } = evt.detail;
|
|
29
|
+
if (this.hoverElement !== element) {
|
|
30
|
+
this._detachHoverLeaveListener();
|
|
31
|
+
this.hoverElement = element;
|
|
32
|
+
element.addEventListener('mouseleave', this._cancelPendingHover);
|
|
33
|
+
}
|
|
27
34
|
this.hoverTimer = setTimeout(() => {
|
|
28
35
|
this._setActiveSegment(evt);
|
|
29
36
|
this.hoverTimer = null;
|
|
30
37
|
}, this.configuration.hoverTimeout);
|
|
31
38
|
return true;
|
|
32
39
|
};
|
|
33
|
-
this.
|
|
34
|
-
this.
|
|
40
|
+
this._cancelPendingHover = () => {
|
|
41
|
+
if (this.hoverTimer) {
|
|
42
|
+
clearTimeout(this.hoverTimer);
|
|
43
|
+
this.hoverTimer = null;
|
|
44
|
+
}
|
|
45
|
+
};
|
|
46
|
+
this._detachHoverLeaveListener = () => {
|
|
47
|
+
if (this.hoverElement) {
|
|
48
|
+
this.hoverElement.removeEventListener('mouseleave', this._cancelPendingHover);
|
|
49
|
+
this.hoverElement = null;
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
this._releaseHover = () => {
|
|
53
|
+
this._cancelPendingHover();
|
|
54
|
+
this._detachHoverLeaveListener();
|
|
35
55
|
};
|
|
36
56
|
this.onSetToolActive = () => {
|
|
37
|
-
this.
|
|
57
|
+
this._cancelPendingHover();
|
|
58
|
+
};
|
|
59
|
+
this.onSetToolEnabled = () => {
|
|
60
|
+
this._releaseHover();
|
|
61
|
+
};
|
|
62
|
+
this.onSetToolPassive = () => {
|
|
63
|
+
this._releaseHover();
|
|
38
64
|
};
|
|
39
65
|
this.onSetToolDisabled = () => {
|
|
40
|
-
this.
|
|
66
|
+
this._releaseHover();
|
|
41
67
|
};
|
|
42
68
|
this.hoverTimer = null;
|
|
43
69
|
}
|
|
@@ -11,6 +11,8 @@ import LabelmapBaseTool from './LabelmapBaseTool.js';
|
|
|
11
11
|
import getViewportICamera from '../../utilities/getViewportICamera.js';
|
|
12
12
|
import getEllipseWorldCoordinates from '../../utilities/getEllipseWorldCoordinates.js';
|
|
13
13
|
import { getCenterAndRadiusInCanvas } from '../../utilities/getCenterAndRadiusInCanvas.js';
|
|
14
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
15
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('tools.segmentation.SphereScissorsTool');
|
|
14
16
|
class SphereScissorsTool extends LabelmapBaseTool {
|
|
15
17
|
constructor(toolProps = {}, defaultToolProps = {
|
|
16
18
|
supportedInteractionTypes: ['Mouse', 'Touch'],
|
|
@@ -196,7 +198,7 @@ class SphereScissorsTool extends LabelmapBaseTool {
|
|
|
196
198
|
const { center, radius } = getCenterAndRadiusInCanvas(points, viewport);
|
|
197
199
|
const color = `rgb(${toolMetadata.segmentColor.slice(0, 3)})`;
|
|
198
200
|
if (!viewport.getRenderingEngine()) {
|
|
199
|
-
|
|
201
|
+
cs3dLogger.warn('Rendering Engine has been destroyed');
|
|
200
202
|
return renderStatus;
|
|
201
203
|
}
|
|
202
204
|
const circleUID = '0';
|
|
@@ -2,6 +2,8 @@ import { vec3 } from 'gl-matrix';
|
|
|
2
2
|
import StrategyCallbacks from '../../../../enums/StrategyCallbacks.js';
|
|
3
3
|
import { drawCircle as drawCircleSvg, drawPath as drawPathSvg, } from '../../../../drawingSvg/index.js';
|
|
4
4
|
import getViewportICamera from '../../../../utilities/getViewportICamera.js';
|
|
5
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
6
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('tools.segmentation.strategies.compositions.circularCursor');
|
|
5
7
|
export default {
|
|
6
8
|
[StrategyCallbacks.CalculateCursorGeometry]: function (enabledElement, operationData) {
|
|
7
9
|
if (!operationData) {
|
|
@@ -73,7 +75,7 @@ export default {
|
|
|
73
75
|
const data = brushCursor.data;
|
|
74
76
|
const color = `rgb(${toolMetadata.segmentColor?.slice(0, 3) || [0, 0, 0]})`;
|
|
75
77
|
if (!viewport.getRenderingEngine()) {
|
|
76
|
-
|
|
78
|
+
cs3dLogger.warn('Rendering Engine has been destroyed');
|
|
77
79
|
return;
|
|
78
80
|
}
|
|
79
81
|
const points = data.handles?.points || [];
|
|
@@ -24,6 +24,8 @@ export type Segmentation = {
|
|
|
24
24
|
segmentationId: string;
|
|
25
25
|
label: string;
|
|
26
26
|
fallbackLabel?: string;
|
|
27
|
+
labelIsGenerated?: boolean;
|
|
28
|
+
predecessorImageId?: string;
|
|
27
29
|
segments: {
|
|
28
30
|
[segmentIndex: number]: Segment;
|
|
29
31
|
};
|
|
@@ -85,6 +87,8 @@ export type SegmentationPublicInput = {
|
|
|
85
87
|
segmentOrder?: number[];
|
|
86
88
|
label?: string;
|
|
87
89
|
fallbackLabel?: string;
|
|
90
|
+
labelIsGenerated?: boolean;
|
|
91
|
+
predecessorImageId?: string;
|
|
88
92
|
cachedStats?: {
|
|
89
93
|
[key: string]: unknown;
|
|
90
94
|
};
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { utilities, Enums } from '@cornerstonejs/core';
|
|
2
2
|
import { viewportSupportsStackCalibration, viewportSupportsStackCompatibility, } from './viewportCapabilities.js';
|
|
3
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
4
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.calibrateImageSpacing');
|
|
3
5
|
const { calibratedPixelSpacingMetadataProvider } = utilities;
|
|
4
6
|
export default function calibrateImageSpacing(imageId, renderingEngine, calibrationOrScale) {
|
|
5
7
|
if (typeof calibrationOrScale === 'number') {
|
|
@@ -26,7 +28,7 @@ export default function calibrateImageSpacing(imageId, renderingEngine, calibrat
|
|
|
26
28
|
viewport.render();
|
|
27
29
|
})
|
|
28
30
|
.catch((error) => {
|
|
29
|
-
|
|
31
|
+
cs3dLogger.warn('calibrateImageSpacing: failed to refresh stack-compatible viewport', error);
|
|
30
32
|
});
|
|
31
33
|
}
|
|
32
34
|
});
|
|
@@ -2,6 +2,8 @@ import { glMatrix, vec3 } from 'gl-matrix';
|
|
|
2
2
|
import { utilities as csUtils, getEnabledElement, StackViewport, VideoViewport, VolumeViewport, cache, BaseVolumeViewport, Enums, } from '@cornerstonejs/core';
|
|
3
3
|
import CINE_EVENTS from './events.js';
|
|
4
4
|
import { addToolState, getToolState, getToolStateByViewportId } from './state.js';
|
|
5
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
6
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.cine.playClip');
|
|
5
7
|
const { ViewportStatus } = Enums;
|
|
6
8
|
const { triggerEvent } = csUtils;
|
|
7
9
|
const debounced = true;
|
|
@@ -95,7 +97,7 @@ function playClip(element, playClipOptions) {
|
|
|
95
97
|
playClipContext.scroll(delta);
|
|
96
98
|
}
|
|
97
99
|
catch (e) {
|
|
98
|
-
|
|
100
|
+
cs3dLogger.warn('Play clip not scrolling', e);
|
|
99
101
|
_stopClipWithData(playClipData);
|
|
100
102
|
triggerEvent(element, CINE_EVENTS.CLIP_STOPPED, { element });
|
|
101
103
|
}
|
|
@@ -11,6 +11,8 @@ import { triggerAnnotationModified } from '../../stateManagement/annotation/help
|
|
|
11
11
|
import areSameSegment from './areSameSegment.js';
|
|
12
12
|
import isContourSegmentationAnnotation from './isContourSegmentationAnnotation.js';
|
|
13
13
|
import { hasToolByName } from '../../store/addTool.js';
|
|
14
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
15
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.contourSegmentation.applyContourStroke');
|
|
14
16
|
const DEFAULT_CONTOUR_SEG_TOOL_NAME = 'PlanarFreehandContourSegmentationTool';
|
|
15
17
|
const { DefaultHistoryMemo } = csUtils.HistoryMemo;
|
|
16
18
|
export function addContourStroke(viewport, sourceAnnotation) {
|
|
@@ -21,7 +23,7 @@ export function removeContourStroke(viewport, sourceAnnotation) {
|
|
|
21
23
|
}
|
|
22
24
|
function applyStroke(viewport, sourceAnnotation, op) {
|
|
23
25
|
if (!hasToolByName(DEFAULT_CONTOUR_SEG_TOOL_NAME)) {
|
|
24
|
-
|
|
26
|
+
cs3dLogger.warn(`${DEFAULT_CONTOUR_SEG_TOOL_NAME} is not registered. Cannot apply stroke.`);
|
|
25
27
|
removeAnnotationCompletely(sourceAnnotation);
|
|
26
28
|
return;
|
|
27
29
|
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { getAnnotation } from '../../stateManagement/annotation/annotationState.js';
|
|
2
2
|
import getViewportsForAnnotation from '../getViewportsForAnnotation.js';
|
|
3
3
|
import { convertContourPolylineToCanvasSpace, checkIntersection, createPolylineHole, combinePolylines, } from './sharedOperations.js';
|
|
4
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
5
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.contourSegmentation.contourSegmentationOperation');
|
|
4
6
|
export async function contourSegmentationOperation(sourceAnnotationOrUID, targetAnnotationOrUID, viewport, contourHoleProcessingEnabled = true) {
|
|
5
7
|
const sourceAnnotation = typeof sourceAnnotationOrUID === 'string'
|
|
6
8
|
? getAnnotation(sourceAnnotationOrUID)
|
|
@@ -18,12 +20,12 @@ export async function contourSegmentationOperation(sourceAnnotationOrUID, target
|
|
|
18
20
|
const targetPolyline = convertContourPolylineToCanvasSpace(targetAnnotation.data.contour.polyline, viewport);
|
|
19
21
|
const intersectionInfo = checkIntersection(sourcePolyline, targetPolyline);
|
|
20
22
|
if (!intersectionInfo.hasIntersection) {
|
|
21
|
-
|
|
23
|
+
cs3dLogger.warn('No intersection found between the two annotations');
|
|
22
24
|
return;
|
|
23
25
|
}
|
|
24
26
|
if (intersectionInfo.isContourHole) {
|
|
25
27
|
if (!contourHoleProcessingEnabled) {
|
|
26
|
-
|
|
28
|
+
cs3dLogger.warn('Hole processing is disabled');
|
|
27
29
|
return;
|
|
28
30
|
}
|
|
29
31
|
createPolylineHole(viewport, targetAnnotation, sourceAnnotation);
|
|
@@ -3,11 +3,13 @@ import { addAnnotation, removeAnnotation } from '../../stateManagement/index.js'
|
|
|
3
3
|
import { removeContourSegmentationAnnotation } from './removeContourSegmentationAnnotation.js';
|
|
4
4
|
import { addContourSegmentationAnnotation } from './addContourSegmentationAnnotation.js';
|
|
5
5
|
import { triggerAnnotationModified } from '../../stateManagement/annotation/helpers/state.js';
|
|
6
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
7
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.contourSegmentation.convertContourSegmentation');
|
|
6
8
|
const DEFAULT_CONTOUR_SEG_TOOL_NAME = 'PlanarFreehandContourSegmentationTool';
|
|
7
9
|
export default function convertContourSegmentationAnnotation(annotation) {
|
|
8
10
|
const { polyline } = annotation.data?.contour || {};
|
|
9
11
|
if (!polyline || polyline.length < 3) {
|
|
10
|
-
|
|
12
|
+
cs3dLogger.warn('Skipping creation of new annotation due to invalid polyline:', polyline);
|
|
11
13
|
return;
|
|
12
14
|
}
|
|
13
15
|
removeAnnotation(annotation.annotationUID);
|
|
@@ -10,6 +10,8 @@ import { subtractPolylineSets } from './polylineSubtract.js';
|
|
|
10
10
|
import { intersectPolylinesSets } from './polylineIntersect.js';
|
|
11
11
|
import { xorPolylinesSets } from './polylineXor.js';
|
|
12
12
|
import { getViewReferenceFromAnnotation } from './getViewReferenceFromAnnotation.js';
|
|
13
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
14
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.contourSegmentation.logicalOperators');
|
|
13
15
|
export var LogicalOperation;
|
|
14
16
|
(function (LogicalOperation) {
|
|
15
17
|
LogicalOperation[LogicalOperation["Union"] = 0] = "Union";
|
|
@@ -183,21 +185,21 @@ export function copy(segment, options) {
|
|
|
183
185
|
export function deleteOperation(segment) {
|
|
184
186
|
const segmentation = getSegmentation(segment.segmentationId);
|
|
185
187
|
if (!segmentation) {
|
|
186
|
-
|
|
188
|
+
cs3dLogger.info('No active segmentation detected');
|
|
187
189
|
return;
|
|
188
190
|
}
|
|
189
191
|
if (!segmentation.representationData.Contour) {
|
|
190
|
-
|
|
192
|
+
cs3dLogger.info('No contour representation found');
|
|
191
193
|
return;
|
|
192
194
|
}
|
|
193
195
|
const representationData = segmentation.representationData.Contour;
|
|
194
196
|
const { annotationUIDsMap } = representationData;
|
|
195
197
|
if (!annotationUIDsMap) {
|
|
196
|
-
|
|
198
|
+
cs3dLogger.info('No annotation map found');
|
|
197
199
|
return;
|
|
198
200
|
}
|
|
199
201
|
if (!annotationUIDsMap.has(segment.segmentIndex)) {
|
|
200
|
-
|
|
202
|
+
cs3dLogger.info('Segmentation index has no annotations');
|
|
201
203
|
return;
|
|
202
204
|
}
|
|
203
205
|
const annotationUIDList = annotationUIDsMap.get(segment.segmentIndex);
|
|
@@ -10,6 +10,8 @@ import triggerAnnotationRenderForViewportIds from '../triggerAnnotationRenderFor
|
|
|
10
10
|
import { getViewportIdsWithToolToRender } from '../viewportFilters/index.js';
|
|
11
11
|
import { hasToolByName, hasTool } from '../../store/addTool.js';
|
|
12
12
|
import { applyBoolean, BooleanOp, } from './clipperBooleanOps.js';
|
|
13
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
14
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.contourSegmentation.mergeMultipleAnnotations');
|
|
13
15
|
const DEFAULT_CONTOUR_SEG_TOOL_NAME = 'PlanarFreehandContourSegmentationTool';
|
|
14
16
|
function processMultipleIntersections(viewport, sourceAnnotation, sourcePolyline, intersectingContours) {
|
|
15
17
|
const holeOperations = intersectingContours.filter((item) => item.isContourHole);
|
|
@@ -27,7 +29,7 @@ function processMultipleIntersections(viewport, sourceAnnotation, sourcePolyline
|
|
|
27
29
|
return;
|
|
28
30
|
}
|
|
29
31
|
if (!hasToolByName(DEFAULT_CONTOUR_SEG_TOOL_NAME)) {
|
|
30
|
-
|
|
32
|
+
cs3dLogger.warn(`${DEFAULT_CONTOUR_SEG_TOOL_NAME} is not registered in cornerstone. Cannot process multiple intersections.`);
|
|
31
33
|
return;
|
|
32
34
|
}
|
|
33
35
|
processSequentialIntersections(viewport, sourceAnnotation, sourcePolyline, mergeOperations);
|
|
@@ -10,6 +10,8 @@ import triggerAnnotationRenderForViewportIds from '../triggerAnnotationRenderFor
|
|
|
10
10
|
import { getViewportIdsWithToolToRender } from '../viewportFilters/index.js';
|
|
11
11
|
import { hasToolByName } from '../../store/addTool.js';
|
|
12
12
|
import { applyBoolean, BooleanOp, } from './clipperBooleanOps.js';
|
|
13
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
14
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.contourSegmentation.sharedOperations');
|
|
13
15
|
const TOLERANCE = 1e-10;
|
|
14
16
|
const DEFAULT_CONTOUR_SEG_TOOL_NAME = 'PlanarFreehandContourSegmentationTool';
|
|
15
17
|
export function convertContourPolylineToCanvasSpace(polyline, viewport) {
|
|
@@ -73,7 +75,7 @@ export function createPolylineHole(viewport, targetAnnotation, holeAnnotation) {
|
|
|
73
75
|
}
|
|
74
76
|
export function combinePolylines(viewport, targetAnnotation, targetPolyline, sourceAnnotation, sourcePolyline) {
|
|
75
77
|
if (!hasToolByName(DEFAULT_CONTOUR_SEG_TOOL_NAME)) {
|
|
76
|
-
|
|
78
|
+
cs3dLogger.warn(`${DEFAULT_CONTOUR_SEG_TOOL_NAME} is not registered in cornerstone. Cannot combine polylines.`);
|
|
77
79
|
return;
|
|
78
80
|
}
|
|
79
81
|
const sourceStartPoint = sourcePolyline[0];
|
|
@@ -4,6 +4,8 @@ import { WorkerTypes } from '../../enums/index.js';
|
|
|
4
4
|
import { registerComputeWorker } from '../registerComputeWorker.js';
|
|
5
5
|
import { triggerWorkerProgress } from '../segmentation/utilsForWorker.js';
|
|
6
6
|
import getOrCreateSegmentationVolume from '../segmentation/getOrCreateSegmentationVolume.js';
|
|
7
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
8
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.contours.generateContourSetsFromLabelmap');
|
|
7
9
|
const { Labelmap } = SegmentationRepresentations;
|
|
8
10
|
async function generateContourSetsFromLabelmap({ segmentations }) {
|
|
9
11
|
registerComputeWorker();
|
|
@@ -18,7 +20,7 @@ async function generateContourSetsFromLabelmap({ segmentations }) {
|
|
|
18
20
|
}
|
|
19
21
|
const vol = cornerstoneCache.getVolume(segVolumeId);
|
|
20
22
|
if (!vol) {
|
|
21
|
-
|
|
23
|
+
cs3dLogger.warn(`No volume found for ${segVolumeId}`);
|
|
22
24
|
return;
|
|
23
25
|
}
|
|
24
26
|
const voxelManager = vol.voxelManager;
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import getInterpolationData from './getInterpolationData.js';
|
|
2
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
3
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.contours.interpolation.findAnnotationForInterpolation');
|
|
2
4
|
function findAnnotationsForInterpolation(toolData, viewportData) {
|
|
3
5
|
const interpolationData = getInterpolationData(viewportData, [
|
|
4
6
|
{
|
|
@@ -8,7 +10,7 @@ function findAnnotationsForInterpolation(toolData, viewportData) {
|
|
|
8
10
|
]);
|
|
9
11
|
const rangeToInterpolate = getRangeToInterpolate(interpolationData);
|
|
10
12
|
if (!rangeToInterpolate) {
|
|
11
|
-
|
|
13
|
+
cs3dLogger.warn('No annotations found to interpolate', interpolationData);
|
|
12
14
|
return;
|
|
13
15
|
}
|
|
14
16
|
const sliceEdited = _getSlicePositionOfToolData(interpolationData, toolData.annotationUID);
|
|
@@ -7,6 +7,8 @@ import * as annotationState from '../../../stateManagement/annotation/index.js';
|
|
|
7
7
|
import selectHandles from './selectHandles.js';
|
|
8
8
|
import updateChildInterpolationUID from './updateChildInterpolationUID.js';
|
|
9
9
|
import { createPolylineHole } from '../../contourSegmentation/index.js';
|
|
10
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
11
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.contours.interpolation.interpolate');
|
|
10
12
|
const { PointsManager } = utilities;
|
|
11
13
|
const dP = 0.2;
|
|
12
14
|
function interpolate(viewportData) {
|
|
@@ -63,7 +65,7 @@ function _linearlyInterpolateBetween(indices, annotationPair, interpolationData,
|
|
|
63
65
|
const annotation1 = interpolationData.get(annotationPair[1])[0];
|
|
64
66
|
const c1 = _generateClosedContour(annotation0.data.contour.polyline);
|
|
65
67
|
const c2 = _generateClosedContour(annotation1.data.contour.polyline);
|
|
66
|
-
|
|
68
|
+
cs3dLogger.warn('annotation0=', annotation0);
|
|
67
69
|
const { c1Interp, c2Interp } = _generateInterpolationContourPair(c1, c2);
|
|
68
70
|
c1Interp.kIndex = annotationPair[0];
|
|
69
71
|
c2Interp.kIndex = annotationPair[1];
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { Enums } from '@cornerstonejs/core';
|
|
2
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
3
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.dynamicVolume.generateImageFromTimeData');
|
|
2
4
|
function sumOverDimensionGroups(voxelManager, dimensionGroups) {
|
|
3
5
|
const arrayLength = voxelManager.getScalarDataLength();
|
|
4
6
|
const resultArray = new Float32Array(arrayLength);
|
|
@@ -47,7 +49,7 @@ const operationFunctions = {
|
|
|
47
49
|
function generateImageFromTimeData(dynamicVolume, operation, options) {
|
|
48
50
|
const { dimensionGroupNumbers, frameNumbers } = options;
|
|
49
51
|
if (frameNumbers) {
|
|
50
|
-
|
|
52
|
+
cs3dLogger.warn('Warning: frameNumbers parameter is deprecated. Please use dimensionGroupNumbers instead.');
|
|
51
53
|
}
|
|
52
54
|
const dimensionGroups = dimensionGroupNumbers ||
|
|
53
55
|
frameNumbers ||
|
|
@@ -73,7 +75,7 @@ function updateVolumeFromTimeData(dynamicVolume, operation, options) {
|
|
|
73
75
|
throw new Error('A target volume must be provided');
|
|
74
76
|
}
|
|
75
77
|
if (frameNumbers) {
|
|
76
|
-
|
|
78
|
+
cs3dLogger.warn('Warning: frameNumbers parameter is deprecated. Please use dimensionGroupNumbers instead.');
|
|
77
79
|
}
|
|
78
80
|
const dimensionGroups = dimensionGroupNumbers ||
|
|
79
81
|
frameNumbers ||
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { utilities, cache } from '@cornerstonejs/core';
|
|
2
2
|
import { getVoxelOverlap } from '../segmentation/utilities.js';
|
|
3
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
4
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.dynamicVolume.getDataInTime');
|
|
3
5
|
function getDataInTime(dynamicVolume, options) {
|
|
4
6
|
let dataInTime;
|
|
5
7
|
const dimensionGroups = options.dimensionGroupNumbers ||
|
|
6
8
|
options.frameNumbers ||
|
|
7
9
|
Array.from({ length: dynamicVolume.numDimensionGroups }, (_, i) => i + 1);
|
|
8
10
|
if (options.frameNumbers) {
|
|
9
|
-
|
|
11
|
+
cs3dLogger.warn('Warning: frameNumbers parameter is deprecated. Please use dimensionGroupNumbers instead.');
|
|
10
12
|
}
|
|
11
13
|
if (!options.maskVolumeId && !options.worldCoordinate) {
|
|
12
14
|
throw new Error('You should provide either maskVolumeId or imageCoordinate');
|
|
@@ -9,6 +9,7 @@ import triggerAnnotationRenderForViewportIds from './triggerAnnotationRenderForV
|
|
|
9
9
|
import triggerAnnotationRenderForToolGroupIds from './triggerAnnotationRenderForToolGroupIds.js';
|
|
10
10
|
import triggerAnnotationRender from './triggerAnnotationRender.js';
|
|
11
11
|
import { getSphereBoundsInfo } from './getSphereBoundsInfo.js';
|
|
12
|
+
import sampleAreaAnnotationVoxels from './sampleAreaAnnotationVoxels.js';
|
|
12
13
|
import { pointToString } from './pointToString.js';
|
|
13
14
|
import AnnotationMultiSlice from './AnnotationMultiSlice.js';
|
|
14
15
|
import getViewportForAnnotation from './getViewportForAnnotation.js';
|
|
@@ -47,4 +48,4 @@ import * as usFanExtraction from '../tools/annotation/UltrasoundPleuraBLineTool/
|
|
|
47
48
|
import { jumpToFocalPoint } from './genericViewportToolHelpers.js';
|
|
48
49
|
import pickIntensityPointInSlab, { getSlabIntensityPickContext } from './pickIntensityPointInSlab.js';
|
|
49
50
|
export * from './defaultGetTextLines.js';
|
|
50
|
-
export { math, planar, spatial, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, getPixelValueUnits, getPixelValueUnitsImageId, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, viewport, cine, boundingBox, draw3D, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, usFanExtraction, setAnnotationLabel, moveAnnotationToViewPlane, safeStructuredClone, getOrCreateImageVolume, jumpToFocalPoint, pickIntensityPointInSlab, getSlabIntensityPickContext, };
|
|
51
|
+
export { math, planar, spatial, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, getPixelValueUnits, getPixelValueUnitsImageId, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, sampleAreaAnnotationVoxels, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, viewport, cine, boundingBox, draw3D, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, usFanExtraction, setAnnotationLabel, moveAnnotationToViewPlane, safeStructuredClone, getOrCreateImageVolume, jumpToFocalPoint, pickIntensityPointInSlab, getSlabIntensityPickContext, };
|
|
@@ -9,6 +9,7 @@ import triggerAnnotationRenderForViewportIds from './triggerAnnotationRenderForV
|
|
|
9
9
|
import triggerAnnotationRenderForToolGroupIds from './triggerAnnotationRenderForToolGroupIds.js';
|
|
10
10
|
import triggerAnnotationRender from './triggerAnnotationRender.js';
|
|
11
11
|
import { getSphereBoundsInfo } from './getSphereBoundsInfo.js';
|
|
12
|
+
import sampleAreaAnnotationVoxels from './sampleAreaAnnotationVoxels.js';
|
|
12
13
|
import { pointToString } from './pointToString.js';
|
|
13
14
|
import AnnotationMultiSlice from './AnnotationMultiSlice.js';
|
|
14
15
|
import getViewportForAnnotation from './getViewportForAnnotation.js';
|
|
@@ -47,4 +48,4 @@ import * as usFanExtraction from '../tools/annotation/UltrasoundPleuraBLineTool/
|
|
|
47
48
|
import { jumpToFocalPoint } from './genericViewportToolHelpers.js';
|
|
48
49
|
import pickIntensityPointInSlab, { getSlabIntensityPickContext, } from './pickIntensityPointInSlab.js';
|
|
49
50
|
export * from './defaultGetTextLines.js';
|
|
50
|
-
export { math, planar, spatial, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, getPixelValueUnits, getPixelValueUnitsImageId, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, viewport, cine, boundingBox, draw3D, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, usFanExtraction, setAnnotationLabel, moveAnnotationToViewPlane, safeStructuredClone, getOrCreateImageVolume, jumpToFocalPoint, pickIntensityPointInSlab, getSlabIntensityPickContext, };
|
|
51
|
+
export { math, planar, spatial, viewportFilters, drawing, debounce, dynamicVolume, throttle, orientation, isObject, touch, triggerEvent, calibrateImageSpacing, getCalibratedLengthUnitsAndScale, getCalibratedProbeUnitsAndValue, getCalibratedAspect, getPixelValueUnits, getPixelValueUnitsImageId, segmentation, contours, triggerAnnotationRenderForViewportIds, triggerAnnotationRenderForToolGroupIds, triggerAnnotationRender, getSphereBoundsInfo, sampleAreaAnnotationVoxels, getAnnotationNearPoint, getViewportForAnnotation, getAnnotationNearPointOnEnabledElement, viewport, cine, boundingBox, draw3D, rectangleROITool, planarFreehandROITool, stackPrefetch, stackContextPrefetch, roundNumber, pointToString, polyDataUtils, voi, AnnotationMultiSlice, contourSegmentation, annotationHydration, getClosestImageIdForStackViewport, pointInSurroundingSphereCallback, normalizeViewportPlane, IslandRemoval, geometricSurfaceUtils, usFanExtraction, setAnnotationLabel, moveAnnotationToViewPlane, safeStructuredClone, getOrCreateImageVolume, jumpToFocalPoint, pickIntensityPointInSlab, getSlabIntensityPickContext, };
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { utilities } from '@cornerstonejs/core';
|
|
2
2
|
import { BucketQueue } from '../BucketQueue.js';
|
|
3
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
4
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.livewire.LivewireScissors');
|
|
3
5
|
const { isEqual } = utilities;
|
|
4
6
|
const MAX_UINT32 = 4294967295;
|
|
5
7
|
const TWO_THIRD_PI = 2 / (3 * Math.PI);
|
|
@@ -249,7 +251,7 @@ export class LivewireScissors {
|
|
|
249
251
|
dq = Math.min(Math.max(dq, -1), 1);
|
|
250
252
|
const direction = TWO_THIRD_PI * (Math.acos(Math.min(dp, 1)) + Math.acos(dq));
|
|
251
253
|
if (isNaN(direction) || !isFinite(direction)) {
|
|
252
|
-
|
|
254
|
+
cs3dLogger.warn('Found non-direction:', px, py, qx, qy, dp, dq, direction);
|
|
253
255
|
return 1;
|
|
254
256
|
}
|
|
255
257
|
return direction;
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
2
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.math.basic.Calculator');
|
|
1
3
|
export class Calculator {
|
|
2
4
|
}
|
|
3
5
|
export class InstanceCalculator {
|
|
@@ -5,6 +7,6 @@ export class InstanceCalculator {
|
|
|
5
7
|
this.storePointData = options.storePointData;
|
|
6
8
|
}
|
|
7
9
|
getStatistics() {
|
|
8
|
-
|
|
10
|
+
cs3dLogger.debug('InstanceCalculator getStatistics called');
|
|
9
11
|
}
|
|
10
12
|
}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { getEnabledElement } from '@cornerstonejs/core';
|
|
2
2
|
import { vec2, vec3 } from 'gl-matrix';
|
|
3
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
4
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.math.polyline.addCanvasPointsToArray');
|
|
3
5
|
const addCanvasPointsToArray = (element, canvasPoints, newCanvasPoint, commonData) => {
|
|
4
6
|
const { xDir, yDir, spacing } = commonData;
|
|
5
7
|
const enabledElement = getEnabledElement(element);
|
|
6
8
|
const { viewport } = enabledElement;
|
|
7
9
|
if (!canvasPoints.length) {
|
|
8
10
|
canvasPoints.push(newCanvasPoint);
|
|
9
|
-
|
|
11
|
+
cs3dLogger.info('>>>>> !canvasPoints. :: RETURN');
|
|
10
12
|
return 1;
|
|
11
13
|
}
|
|
12
14
|
const lastWorldPos = viewport.canvasToWorld(canvasPoints[canvasPoints.length - 1]);
|
|
@@ -6,6 +6,8 @@ import intersectPolyline from './intersectPolyline.js';
|
|
|
6
6
|
import getNormal2 from './getNormal2.js';
|
|
7
7
|
import { glMatrix, vec3 } from 'gl-matrix';
|
|
8
8
|
import getLinesIntersection from './getLinesIntersection.js';
|
|
9
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
10
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.math.polyline.combinePolyline');
|
|
9
11
|
var PolylinePointType;
|
|
10
12
|
(function (PolylinePointType) {
|
|
11
13
|
PolylinePointType[PolylinePointType["Vertex"] = 0] = "Vertex";
|
|
@@ -172,12 +174,12 @@ function mergePolylines(targetPolyline, sourcePolyline) {
|
|
|
172
174
|
mergedPolyline.push(currentPoint.coordinates);
|
|
173
175
|
currentPoint = currentPoint.next;
|
|
174
176
|
if (!currentPoint) {
|
|
175
|
-
|
|
177
|
+
cs3dLogger.warn('Broken linked list detected in mergePolylines, breaking loop');
|
|
176
178
|
break;
|
|
177
179
|
}
|
|
178
180
|
}
|
|
179
181
|
if (iterationCount >= maxIterations) {
|
|
180
|
-
|
|
182
|
+
cs3dLogger.warn('Maximum iterations reached in mergePolylines, possible infinite loop detected');
|
|
181
183
|
}
|
|
182
184
|
return mergedPolyline;
|
|
183
185
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { StackViewport, utilities as csUtils } from '@cornerstonejs/core';
|
|
2
2
|
import { vec3 } from 'gl-matrix';
|
|
3
3
|
import getViewportICamera from '../../getViewportICamera.js';
|
|
4
|
+
const { getEffectiveSpacingAlongDirection } = csUtils;
|
|
4
5
|
const EPSILON = 1e-3;
|
|
5
6
|
const getSubPixelSpacingAndXYDirections = (viewport, subPixelResolution) => {
|
|
6
7
|
let spacing;
|
|
@@ -25,8 +26,11 @@ const getSubPixelSpacingAndXYDirections = (viewport, subPixelResolution) => {
|
|
|
25
26
|
const iVector = direction.slice(0, 3);
|
|
26
27
|
const jVector = direction.slice(3, 6);
|
|
27
28
|
const kVector = direction.slice(6, 9);
|
|
29
|
+
const normalizedViewUp = vec3.create();
|
|
30
|
+
vec3.normalize(normalizedViewUp, viewUp);
|
|
28
31
|
const viewRight = vec3.create();
|
|
29
|
-
vec3.cross(viewRight,
|
|
32
|
+
vec3.cross(viewRight, normalizedViewUp, viewPlaneNormal);
|
|
33
|
+
vec3.normalize(viewRight, viewRight);
|
|
30
34
|
const absViewRightDotI = Math.abs(vec3.dot(viewRight, iVector));
|
|
31
35
|
const absViewRightDotJ = Math.abs(vec3.dot(viewRight, jVector));
|
|
32
36
|
const absViewRightDotK = Math.abs(vec3.dot(viewRight, kVector));
|
|
@@ -44,11 +48,12 @@ const getSubPixelSpacingAndXYDirections = (viewport, subPixelResolution) => {
|
|
|
44
48
|
xDir = kVector;
|
|
45
49
|
}
|
|
46
50
|
else {
|
|
47
|
-
|
|
51
|
+
xSpacing = getEffectiveSpacingAlongDirection(imageData, viewRight);
|
|
52
|
+
xDir = Array.from(viewRight);
|
|
48
53
|
}
|
|
49
|
-
const absViewUpDotI = Math.abs(vec3.dot(
|
|
50
|
-
const absViewUpDotJ = Math.abs(vec3.dot(
|
|
51
|
-
const absViewUpDotK = Math.abs(vec3.dot(
|
|
54
|
+
const absViewUpDotI = Math.abs(vec3.dot(normalizedViewUp, iVector));
|
|
55
|
+
const absViewUpDotJ = Math.abs(vec3.dot(normalizedViewUp, jVector));
|
|
56
|
+
const absViewUpDotK = Math.abs(vec3.dot(normalizedViewUp, kVector));
|
|
52
57
|
let ySpacing;
|
|
53
58
|
if (Math.abs(1 - absViewUpDotI) < EPSILON) {
|
|
54
59
|
ySpacing = volumeSpacing[0];
|
|
@@ -63,7 +68,8 @@ const getSubPixelSpacingAndXYDirections = (viewport, subPixelResolution) => {
|
|
|
63
68
|
yDir = kVector;
|
|
64
69
|
}
|
|
65
70
|
else {
|
|
66
|
-
|
|
71
|
+
ySpacing = getEffectiveSpacingAlongDirection(imageData, normalizedViewUp);
|
|
72
|
+
yDir = Array.from(normalizedViewUp);
|
|
67
73
|
}
|
|
68
74
|
spacing = [xSpacing, ySpacing];
|
|
69
75
|
}
|
|
@@ -2,6 +2,8 @@ import { vec2 } from 'gl-matrix';
|
|
|
2
2
|
import containsPoint from './containsPoint.js';
|
|
3
3
|
import getSignedArea from './getSignedArea.js';
|
|
4
4
|
import { EPSILON, IntersectionDirection, pointsAreEqual, PolylineNodeType, robustSegmentIntersection, } from './robustSegmentIntersection.js';
|
|
5
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
6
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.math.polyline.intersectPolylines');
|
|
5
7
|
export default function intersectPolylines(mainPolyCoords, clipPolyCoordsInput) {
|
|
6
8
|
if (mainPolyCoords.length < 3 || clipPolyCoordsInput.length < 3) {
|
|
7
9
|
return [];
|
|
@@ -213,12 +215,12 @@ export default function intersectPolylines(mainPolyCoords, clipPolyCoordsInput)
|
|
|
213
215
|
clipAugmented.forEach((n) => (n.processedInPath = false));
|
|
214
216
|
do {
|
|
215
217
|
if (safetyBreak++ > maxIter) {
|
|
216
|
-
|
|
218
|
+
cs3dLogger.warn('Intersection: Max iterations in path tracing.', pathStartNode.id, currentNode.id);
|
|
217
219
|
currentPathCoords = [];
|
|
218
220
|
break;
|
|
219
221
|
}
|
|
220
222
|
if (currentNode.processedInPath && currentNode !== pathStartNode) {
|
|
221
|
-
|
|
223
|
+
cs3dLogger.warn('Intersection: Path processing loop detected, discarding path segment.', pathStartNode.id, currentNode.id);
|
|
222
224
|
currentPathCoords = [];
|
|
223
225
|
break;
|
|
224
226
|
}
|
|
@@ -3,6 +3,8 @@ import getSignedArea from './getSignedArea.js';
|
|
|
3
3
|
import { EPSILON, IntersectionDirection, pointsAreEqual, PolylineNodeType, robustSegmentIntersection, } from './robustSegmentIntersection.js';
|
|
4
4
|
import containsPoint from './containsPoint.js';
|
|
5
5
|
import arePolylinesIdentical from './arePolylinesIdentical.js';
|
|
6
|
+
import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
|
|
7
|
+
const cs3dLogger = cornerstoneUtilities.logger.toolsLog.getLogger('utilities.math.polyline.subtractPolylines');
|
|
6
8
|
export default function subtractPolylines(targetPolylineCoords, sourcePolylineCoordsInput) {
|
|
7
9
|
if (targetPolylineCoords.length < 3) {
|
|
8
10
|
return [];
|
|
@@ -169,7 +171,7 @@ export default function subtractPolylines(targetPolylineCoords, sourcePolylineCo
|
|
|
169
171
|
const maxIter = (targetAugmented.length + sourceAugmented.length) * 2;
|
|
170
172
|
do {
|
|
171
173
|
if (safetyBreak++ > maxIter) {
|
|
172
|
-
|
|
174
|
+
cs3dLogger.warn('Subtraction: Max iterations reached, possible infinite loop.');
|
|
173
175
|
break;
|
|
174
176
|
}
|
|
175
177
|
currentNode.visited = true;
|
|
@@ -191,7 +193,7 @@ export default function subtractPolylines(targetPolylineCoords, sourcePolylineCo
|
|
|
191
193
|
onTargetList = true;
|
|
192
194
|
}
|
|
193
195
|
else {
|
|
194
|
-
|
|
196
|
+
cs3dLogger.warn('Subtraction: Intersection on source without partner.');
|
|
195
197
|
}
|
|
196
198
|
}
|
|
197
199
|
}
|