@cornerstonejs/tools 2.0.0-beta.21 → 2.0.0-beta.22

package/dist/esm/tools/annotation/BidirectionalTool.js

@@ -1,7 +1,6 @@
 import { vec2, vec3 } from 'gl-matrix';
 import { getEnabledElement, utilities as csUtils } from '@cornerstonejs/core';
 import { getCalibratedLengthUnitsAndScale } from '../../utilities/getCalibratedUnits';
-import { roundNumber } from '../../utilities';
 import { AnnotationTool } from '../base';
 import throttle from '../../utilities/throttle';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement/annotation/annotationState';
@@ -9,7 +8,7 @@ import { isAnnotationLocked } from '../../stateManagement/annotation/annotationL
 import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { drawLine as drawLineSvg, drawHandles as drawHandlesSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { Events } from '../../enums';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import * as lineSegment from '../../utilities/math/line';
@@ -721,7 +720,7 @@ function defaultGetTextLines(data, targetId) {
     if (length === undefined) {
         return textLines;
     }
-    textLines.push(`L: ${roundNumber(length)} ${lengthUnits || unit}`, `W: ${roundNumber(width)} ${widthUnit || unit}`);
+    textLines.push(`L: ${csUtils.roundNumber(length)} ${lengthUnits || unit}`, `W: ${csUtils.roundNumber(width)} ${widthUnit || unit}`);
     return textLines;
 }
 BidirectionalTool.toolName = 'Bidirectional';

package/dist/esm/tools/annotation/CircleROITool.js

@@ -1,14 +1,13 @@
 import { AnnotationTool } from '../base';
 import { getEnabledElement, VolumeViewport, utilities as csUtils, } from '@cornerstonejs/core';
-import { getCalibratedAspect } from '../../utilities/getCalibratedUnits';
-import { getCalibratedLengthUnitsAndScale, roundNumber } from '../../utilities';
+import { getCalibratedAspect, getCalibratedLengthUnitsAndScale, } from '../../utilities/getCalibratedUnits';
 import throttle from '../../utilities/throttle';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement/annotation/annotationState';
 import { isAnnotationLocked } from '../../stateManagement/annotation/annotationLocking';
 import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { drawCircle as drawCircleSvg, drawHandles as drawHandlesSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { Events } from '../../enums';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
@@ -566,23 +565,23 @@ function defaultGetTextLines(data, targetId) {
     if (radius) {
         const radiusLine = isEmptyArea
             ? `Radius: Oblique not supported`
-            : `Radius: ${roundNumber(radius)} ${radiusUnit}`;
+            : `Radius: ${csUtils.roundNumber(radius)} ${radiusUnit}`;
         textLines.push(radiusLine);
     }
     if (area) {
         const areaLine = isEmptyArea
             ? `Area: Oblique not supported`
-            : `Area: ${roundNumber(area)} ${areaUnits}`;
+            : `Area: ${csUtils.roundNumber(area)} ${areaUnits}`;
         textLines.push(areaLine);
     }
     if (mean) {
-        textLines.push(`Mean: ${roundNumber(mean)} ${pixelValueUnits}`);
+        textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${pixelValueUnits}`);
     }
     if (max) {
-        textLines.push(`Max: ${roundNumber(max)} ${pixelValueUnits}`);
+        textLines.push(`Max: ${csUtils.roundNumber(max)} ${pixelValueUnits}`);
     }
     if (stdDev) {
-        textLines.push(`Std Dev: ${roundNumber(stdDev)} ${pixelValueUnits}`);
+        textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${pixelValueUnits}`);
     }
     return textLines;
 }

package/dist/esm/tools/annotation/CobbAngleTool.js

@@ -10,7 +10,7 @@ import * as lineSegment from '../../utilities/math/line';
 import angleBetweenLines from '../../utilities/math/angle/angleBetweenLines';
 import { midPoint2 } from '../../utilities/math/midPoint';
 import { drawHandles as drawHandlesSvg, drawLine as drawLineSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, drawTextBox as drawTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';

package/dist/esm/tools/annotation/EllipticalROITool.js

@@ -1,14 +1,13 @@
 import { AnnotationTool } from '../base';
 import { getEnabledElement, VolumeViewport, utilities as csUtils, } from '@cornerstonejs/core';
 import { getCalibratedLengthUnitsAndScale } from '../../utilities/getCalibratedUnits';
-import { roundNumber } from '../../utilities';
 import throttle from '../../utilities/throttle';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement/annotation/annotationState';
 import { isAnnotationLocked } from '../../stateManagement/annotation/annotationLocking';
 import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { drawCircle as drawCircleSvg, drawEllipseByCoordinates as drawEllipseSvg, drawHandles as drawHandlesSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { Events } from '../../enums';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
@@ -657,17 +656,17 @@ function defaultGetTextLines(data, targetId) {
     if (area) {
         const areaLine = isEmptyArea
             ? `Area: Oblique not supported`
-            : `Area: ${roundNumber(area)} ${areaUnits}`;
+            : `Area: ${csUtils.roundNumber(area)} ${areaUnits}`;
         textLines.push(areaLine);
     }
     if (mean) {
-        textLines.push(`Mean: ${roundNumber(mean)} ${pixelValueUnits}`);
+        textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${pixelValueUnits}`);
     }
     if (max) {
-        textLines.push(`Max: ${roundNumber(max)} ${pixelValueUnits}`);
+        textLines.push(`Max: ${csUtils.roundNumber(max)} ${pixelValueUnits}`);
     }
     if (stdDev) {
-        textLines.push(`Std Dev: ${roundNumber(stdDev)} ${pixelValueUnits}`);
+        textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${pixelValueUnits}`);
     }
     return textLines;
 }

package/dist/esm/tools/annotation/HeightTool.js

@@ -1,7 +1,6 @@
 import { Events } from '../../enums';
 import { getEnabledElement, utilities as csUtils } from '@cornerstonejs/core';
 import { getCalibratedLengthUnitsAndScale } from '../../utilities/getCalibratedUnits';
-import { roundNumber } from '../../utilities';
 import { AnnotationTool } from '../base';
 import throttle from '../../utilities/throttle';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement/annotation/annotationState';
@@ -10,7 +9,7 @@ import { isAnnotationVisible } from '../../stateManagement/annotation/annotation
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import * as lineSegment from '../../utilities/math/line';
 import { drawHandles as drawHandlesSvg, drawHeight as drawHeightSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
@@ -428,7 +427,7 @@ function defaultGetTextLines(data, targetId) {
     if (height === undefined || height === null || isNaN(height)) {
         return;
     }
-    const textLines = [`${roundNumber(height)} ${lengthUnits}`];
+    const textLines = [`${csUtils.roundNumber(height)} ${lengthUnits}`];
     return textLines;
 }
 HeightTool.toolName = 'Height';

package/dist/esm/tools/annotation/KeyImageTool.js

@@ -4,7 +4,7 @@ import { AnnotationTool } from '../base';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement/annotation/annotationState';
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { drawArrow as drawArrowSvg } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { resetElementCursor } from '../../cursors/elementCursor';

package/dist/esm/tools/annotation/LengthTool.js

@@ -1,7 +1,6 @@
 import { Events } from '../../enums';
 import { getEnabledElement, utilities as csUtils } from '@cornerstonejs/core';
 import { getCalibratedLengthUnitsAndScale } from '../../utilities/getCalibratedUnits';
-import { roundNumber } from '../../utilities';
 import { AnnotationTool } from '../base';
 import throttle from '../../utilities/throttle';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement/annotation/annotationState';
@@ -10,7 +9,7 @@ import { isAnnotationVisible } from '../../stateManagement/annotation/annotation
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import * as lineSegment from '../../utilities/math/line';
 import { drawHandles as drawHandlesSvg, drawLine as drawLineSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
@@ -420,7 +419,7 @@ function defaultGetTextLines(data, targetId) {
     if (length === undefined || length === null || isNaN(length)) {
         return;
     }
-    const textLines = [`${roundNumber(length)} ${lengthUnits}`];
+    const textLines = [`${csUtils.roundNumber(length)} ${lengthUnits}`];
     return textLines;
 }
 LengthTool.toolName = 'Length';

package/dist/esm/tools/annotation/LivewireContourTool.js

@@ -2,11 +2,12 @@ import { vec3 } from 'gl-matrix';
 import { getEnabledElement, utilities as csUtils, VolumeViewport, } from '@cornerstonejs/core';
 import { removeAnnotation } from '../../stateManagement/annotation/annotationState';
 import { drawHandles as drawHandlesSvg } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { Events, KeyboardBindings, ChangeTypes } from '../../enums';
 import { resetElementCursor } from '../../cursors/elementCursor';
 import getMouseModifierKey from '../../eventDispatchers/shared/getMouseModifier';
-import { math, triggerAnnotationRenderForViewportIds } from '../../utilities';
+import * as math from '../../utilities/math';
+import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import findHandlePolylineIndex from '../../utilities/contours/findHandlePolylineIndex';
 import { ContourWindingDirection } from '../../types/ContourAnnotation';
 import { triggerAnnotationModified, triggerContourAnnotationCompleted, } from '../../stateManagement/annotation/helpers/state';

package/dist/esm/tools/annotation/PlanarFreehandContourSegmentationTool.d.ts

@@ -1,5 +1,4 @@
-import type { PublicToolProps } from '../../types';
-import type { AnnotationRenderContext } from '../../types';
+import type { AnnotationRenderContext, PublicToolProps } from '../../types';
 import PlanarFreehandROITool from './PlanarFreehandROITool';
 declare class PlanarFreehandContourSegmentationTool extends PlanarFreehandROITool {
     static toolName: any;

package/dist/esm/tools/annotation/PlanarFreehandROITool.js

@@ -1,7 +1,7 @@
 import { CONSTANTS, getEnabledElement, VolumeViewport, utilities as csUtils, } from '@cornerstonejs/core';
 import { vec3 } from 'gl-matrix';
 import { getCalibratedLengthUnitsAndScale } from '../../utilities/getCalibratedUnits';
-import { math, roundNumber } from '../../utilities';
+import * as math from '../../utilities/math';
 import { polyline } from '../../utilities/math';
 import { filterAnnotationsForDisplay } from '../../utilities/planar';
 import throttle from '../../utilities/throttle';
@@ -506,23 +506,23 @@ function defaultGetTextLines(data, targetId) {
     if (area) {
         const areaLine = isEmptyArea
             ? `Area: Oblique not supported`
-            : `Area: ${roundNumber(area)} ${areaUnits}`;
+            : `Area: ${csUtils.roundNumber(area)} ${areaUnits}`;
         textLines.push(areaLine);
     }
     if (mean) {
-        textLines.push(`Mean: ${roundNumber(mean)} ${pixelValueUnits}`);
+        textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${pixelValueUnits}`);
     }
     if (Number.isFinite(max)) {
-        textLines.push(`Max: ${roundNumber(max)} ${pixelValueUnits}`);
+        textLines.push(`Max: ${csUtils.roundNumber(max)} ${pixelValueUnits}`);
     }
     if (stdDev) {
-        textLines.push(`Std Dev: ${roundNumber(stdDev)} ${pixelValueUnits}`);
+        textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${pixelValueUnits}`);
     }
     if (perimeter) {
-        textLines.push(`Perimeter: ${roundNumber(perimeter)} ${lengthUnits}`);
+        textLines.push(`Perimeter: ${csUtils.roundNumber(perimeter)} ${lengthUnits}`);
     }
     if (length) {
-        textLines.push(`${roundNumber(length)} ${lengthUnits}`);
+        textLines.push(`${csUtils.roundNumber(length)} ${lengthUnits}`);
     }
     return textLines;
 }

package/dist/esm/tools/annotation/ProbeTool.js

@@ -5,10 +5,9 @@ import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateMan
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { getCalibratedProbeUnitsAndValue } from '../../utilities/getCalibratedUnits';
 import { drawHandles as drawHandlesSvg, drawTextBox as drawTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { Events } from '../../enums';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
-import { roundNumber } from '../../utilities';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { getPixelValueUnits } from '../../utilities/getPixelValueUnits';
@@ -323,11 +322,11 @@ function defaultGetTextLines(data, targetId) {
     textLines.push(`(${index[0]}, ${index[1]}, ${index[2]})`);
     if (value instanceof Array && pixelValueUnits instanceof Array) {
         for (let i = 0; i < value.length; i++) {
-            textLines.push(`${roundNumber(value[i])} ${pixelValueUnits[i]}`);
+            textLines.push(`${csUtils.roundNumber(value[i])} ${pixelValueUnits[i]}`);
         }
     }
     else {
-        textLines.push(`${roundNumber(value)} ${pixelValueUnits}`);
+        textLines.push(`${csUtils.roundNumber(value)} ${pixelValueUnits}`);
     }
     return textLines;
 }

package/dist/esm/tools/annotation/RectangleROITool.js

@@ -1,14 +1,13 @@
 import { AnnotationTool } from '../base';
 import { getEnabledElement, VolumeViewport, utilities as csUtils, } from '@cornerstonejs/core';
 import { getCalibratedLengthUnitsAndScale } from '../../utilities/getCalibratedUnits';
-import { roundNumber } from '../../utilities';
 import throttle from '../../utilities/throttle';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement';
 import { isAnnotationLocked } from '../../stateManagement/annotation/annotationLocking';
 import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { drawHandles as drawHandlesSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, drawRectByCoordinates as drawRectSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { Events } from '../../enums';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import * as rectangle from '../../utilities/math/rectangle';
@@ -538,10 +537,10 @@ function defaultGetTextLines(data, targetId) {
         return;
     }
     const textLines = [];
-    textLines.push(`Area: ${roundNumber(area)} ${areaUnits}`);
-    textLines.push(`Mean: ${roundNumber(mean)} ${pixelValueUnits}`);
-    textLines.push(`Max: ${roundNumber(max)} ${pixelValueUnits}`);
-    textLines.push(`Std Dev: ${roundNumber(stdDev)} ${pixelValueUnits}`);
+    textLines.push(`Area: ${csUtils.roundNumber(area)} ${areaUnits}`);
+    textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${pixelValueUnits}`);
+    textLines.push(`Max: ${csUtils.roundNumber(max)} ${pixelValueUnits}`);
+    textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${pixelValueUnits}`);
     return textLines;
 }
 RectangleROITool.toolName = 'RectangleROI';

package/dist/esm/tools/annotation/SplineROITool.js

@@ -2,19 +2,22 @@ import { getEnabledElement, eventTarget, triggerEvent, utilities, } from '@corne
 import { vec3 } from 'gl-matrix';
 import { getChildAnnotations, removeAnnotation, } from '../../stateManagement/annotation/annotationState';
 import { drawHandles as drawHandlesSvg, drawPolyline as drawPolylineSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { Events, MouseBindings, KeyboardBindings, ChangeTypes, } from '../../enums';
 import { resetElementCursor } from '../../cursors/elementCursor';
-import { math, throttle, roundNumber, triggerAnnotationRenderForViewportIds, getCalibratedLengthUnitsAndScale, } from '../../utilities';
-import getMouseModifierKey from '../../eventDispatchers/shared/getMouseModifier';
+import * as math from '../../utilities/math';
+import throttle from '../../utilities/throttle';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
+import { getCalibratedLengthUnitsAndScale } from '../../utilities/getCalibratedUnits';
+import getMouseModifierKey from '../../eventDispatchers/shared/getMouseModifier';
 import { ContourWindingDirection } from '../../types/ContourAnnotation';
 import { CardinalSpline } from './splines/CardinalSpline';
 import { LinearSpline } from './splines/LinearSpline';
 import { CatmullRomSpline } from './splines/CatmullRomSpline';
 import { BSpline } from './splines/BSpline';
 import ContourSegmentationBaseTool from '../base/ContourSegmentationBaseTool';
+import { triggerAnnotationRenderForViewportIds } from '../../utilities';
 const SPLINE_MIN_POINTS = 3;
 const SPLINE_CLICK_CLOSE_CURVE_DIST = 10;
 const DEFAULT_SPLINE_CONFIG = {
@@ -717,7 +720,7 @@ function defaultGetTextLines(data, targetId) {
     if (area) {
         const areaLine = isEmptyArea
             ? `Area: Oblique not supported`
-            : `Area: ${roundNumber(area)} ${areaUnits}`;
+            : `Area: ${utilities.roundNumber(area)} ${areaUnits}`;
         textLines.push(areaLine);
     }
     return textLines;

package/dist/esm/tools/annotation/UltrasoundDirectionalTool.js

@@ -5,9 +5,8 @@ import throttle from '../../utilities/throttle';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement/annotation/annotationState';
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { drawHandle as drawHandleSvg, drawLine as drawLineSvg, drawLinkedTextBox as drawLinkedTextBoxSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
-import { roundNumber } from '../../utilities';
 import { distanceToPoint } from '../../utilities/math/point';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
@@ -439,23 +438,23 @@ function defaultGetTextLines(data, targetId, configuration) {
     const cachedStats = data.cachedStats[targetId];
     const { xValues, yValues, units, isUnitless, isHorizontal } = cachedStats;
     if (isUnitless) {
-        return [`${roundNumber(xValues[0])} px`];
+        return [`${csUtils.roundNumber(xValues[0])} px`];
     }
     if (configuration.displayBothAxesDistances) {
         const dist1 = Math.abs(xValues[1] - xValues[0]);
         const dist2 = Math.abs(yValues[1] - yValues[0]);
         return [
-            `${roundNumber(dist1)} ${units[0]}`,
-            `${roundNumber(dist2)} ${units[1]}`,
+            `${csUtils.roundNumber(dist1)} ${units[0]}`,
+            `${csUtils.roundNumber(dist2)} ${units[1]}`,
         ];
     }
     if (isHorizontal) {
         const dist = Math.abs(xValues[1] - xValues[0]);
-        return [`${roundNumber(dist)} ${units[0]}`];
+        return [`${csUtils.roundNumber(dist)} ${units[0]}`];
     }
     else {
         const dist = Math.abs(yValues[1] - yValues[0]);
-        return [`${roundNumber(dist)} ${units[1]}`];
+        return [`${csUtils.roundNumber(dist)} ${units[1]}`];
     }
 }
 UltrasoundDirectionalTool.toolName = 'UltrasoundDirectionalTool';

package/dist/esm/tools/annotation/VideoRedactionTool.js

@@ -4,7 +4,7 @@ import { AnnotationTool } from '../base';
 import throttle from '../../utilities/throttle';
 import { addAnnotation, getAnnotations, removeAnnotation, } from '../../stateManagement';
 import { drawHandles as drawHandlesSvg, drawRedactionRect as drawRedactionRectSvg, } from '../../drawingSvg';
-import { state } from '../../store';
+import { state } from '../../store/state';
 import { Events } from '../../enums';
 import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters';
 import * as rectangle from '../../utilities/math/rectangle';

package/dist/esm/tools/annotation/planarFreehandROITool/closedContourEditLoop.js

@@ -1,6 +1,6 @@
 import { vec3, vec2 } from 'gl-matrix';
 import { getEnabledElement } from '@cornerstonejs/core';
-import { state } from '../../../store';
+import { state } from '../../../store/state';
 import { Events } from '../../../enums';
 import { resetElementCursor, hideElementCursor, } from '../../../cursors/elementCursor';
 import { polyline } from '../../../utilities/math';

package/dist/esm/tools/annotation/planarFreehandROITool/drawLoop.js

@@ -1,7 +1,7 @@
 import { getEnabledElement, utilities } from '@cornerstonejs/core';
 import { resetElementCursor, hideElementCursor, } from '../../../cursors/elementCursor';
 import { Events } from '../../../enums';
-import { state } from '../../../store';
+import { state } from '../../../store/state';
 import { vec3 } from 'gl-matrix';
 import { shouldSmooth, getInterpolatedPoints, } from '../../../utilities/planarFreehandROITool/smoothPoints';
 import getMouseModifierKey from '../../../eventDispatchers/shared/getMouseModifier';

package/dist/esm/tools/annotation/planarFreehandROITool/openContourEditLoop.js

@@ -1,12 +1,12 @@
 import { vec3, vec2 } from 'gl-matrix';
 import { getEnabledElement } from '@cornerstonejs/core';
-import { state } from '../../../store';
+import { state } from '../../../store/state';
 import { Events } from '../../../enums';
 import { resetElementCursor, hideElementCursor, } from '../../../cursors/elementCursor';
 import { polyline } from '../../../utilities/math';
 import { shouldSmooth, getInterpolatedPoints, } from '../../../utilities/planarFreehandROITool/smoothPoints';
 import triggerAnnotationRenderForViewportIds from '../../../utilities/triggerAnnotationRenderForViewportIds';
-import { updateContourPolyline } from '../../../utilities/contours';
+import updateContourPolyline from '../../../utilities/contours/updateContourPolyline';
 import findOpenUShapedContourVectorToPeak from './findOpenUShapedContourVectorToPeak';
 import { triggerAnnotationModified } from '../../../stateManagement/annotation/helpers/state';
 const { addCanvasPointsToArray, getSubPixelSpacingAndXYDirections } = polyline;

package/dist/esm/tools/annotation/planarFreehandROITool/openContourEndEditLoop.js

@@ -1,5 +1,5 @@
 import { getEnabledElement } from '@cornerstonejs/core';
-import { state } from '../../../store';
+import { state } from '../../../store/state';
 import { Events } from '../../../enums';
 import { hideElementCursor } from '../../../cursors/elementCursor';
 import { polyline } from '../../../utilities/math';

package/dist/esm/tools/annotation/planarFreehandROITool/renderMethods.js

@@ -1,7 +1,7 @@
 import { drawHandles as drawHandlesSvg, drawPolyline as drawPolylineSvg, drawPath as drawPathSvg, } from '../../../drawingSvg';
 import { polyline } from '../../../utilities/math';
 import { findOpenUShapedContourVectorToPeakOnRender } from './findOpenUShapedContourVectorToPeak';
-import { getContourHolesDataCanvas } from '../../../utilities/contours';
+import getContourHolesDataCanvas from '../../../utilities/contours/getContourHolesDataCanvas';
 const { pointsAreWithinCloseContourProximity } = polyline;
 function _getRenderingOptions(enabledElement, annotation) {
     const styleSpecifier = {

package/dist/esm/tools/base/ContourBaseTool.js

@@ -2,8 +2,8 @@ import { getEnabledElement } from '@cornerstonejs/core';
 import { addAnnotation, getAnnotations, getChildAnnotations, } from '../../stateManagement/annotation/annotationState';
 import { drawPath as drawPathSvg } from '../../drawingSvg';
 import AnnotationTool from './AnnotationTool';
-import { updateContourPolyline } from '../../utilities/contours/';
-import { getContourHolesDataCanvas } from '../../utilities/contours';
+import updateContourPolyline from '../../utilities/contours/updateContourPolyline';
+import getContourHolesDataCanvas from '../../utilities/contours/getContourHolesDataCanvas';
 class ContourBaseTool extends AnnotationTool {
     constructor(toolProps, defaultToolProps) {
         super(toolProps, defaultToolProps);

package/dist/esm/tools/base/ContourSegmentationBaseTool.js

@@ -1,13 +1,22 @@
 import { getEnabledElement, utilities } from '@cornerstonejs/core';
-import { config as segmentationConfig, state as segmentationState, segmentLocking, segmentIndex as segmentIndexController, activeSegmentation, } from '../../stateManagement/segmentation';
+import { getGlobalConfig, getSegmentationRepresentationConfig, getSegmentIndexConfig, } from '../../stateManagement/segmentation/config/segmentationConfig';
+import { getSegmentation } from '../../stateManagement/segmentation/getSegmentation';
 import { SegmentationRepresentations } from '../../enums';
 import ContourBaseTool from './ContourBaseTool';
 import { triggerSegmentationDataModified } from '../../stateManagement/segmentation/triggerSegmentationEvents';
-import { InterpolationManager } from '../../utilities/contours/interpolation';
+import InterpolationManager from '../../utilities/segmentation/InterpolationManager/InterpolationManager';
 import { addContourSegmentationAnnotation, removeContourSegmentationAnnotation, } from '../../utilities/contourSegmentation';
-import { triggerAnnotationRenderForToolGroupIds } from '../../utilities';
-import { getActiveSegmentationRepresentation, getSegmentationRepresentationsForSegmentation, getSegmentationRepresentations, getViewportIdsWithSegmentation, } from '../../stateManagement/segmentation/segmentationState';
+import { triggerAnnotationRenderForToolGroupIds } from '../../utilities/triggerAnnotationRenderForToolGroupIds';
 import { getToolGroupForViewport } from '../../store/ToolGroupManager';
+import { getSegmentIndexColor } from '../../stateManagement/segmentation/config/segmentationColor';
+import { getSegmentationRepresentations } from '../../stateManagement/segmentation/getSegmentationRepresentations';
+import { getSegmentationRepresentationsForSegmentation } from '../../stateManagement/segmentation/getSegmentationRepresentationsForSegmentation';
+import { getActiveSegmentationRepresentation } from '../../stateManagement/segmentation/getActiveSegmentationRepresentation';
+import { getSegmentationRepresentationVisibility } from '../../stateManagement/segmentation/getSegmentationRepresentationVisibility';
+import { getViewportIdsWithSegmentation } from '../../stateManagement/segmentation/getViewportIdsWithSegmentation';
+import { getActiveSegmentIndex } from '../../stateManagement/segmentation/getActiveSegmentIndex';
+import { getLockedSegmentIndices } from '../../stateManagement/segmentation/segmentLocking';
+import { getSegmentIndexVisibility } from '../../stateManagement/segmentation/config/segmentationVisibility';
 class ContourSegmentationBaseTool extends ContourBaseTool {
     constructor(toolProps, defaultToolProps) {
         super(toolProps, defaultToolProps);
@@ -30,7 +39,7 @@ class ContourSegmentationBaseTool extends ContourBaseTool {
         if (!this.isContourSegmentationTool()) {
             return contourAnnotation;
         }
-        const activeSeg = activeSegmentation.getActiveSegmentationRepresentation(viewport.id);
+        const activeSeg = getActiveSegmentationRepresentation(viewport.id);
         if (!activeSeg) {
             throw new Error('No active segmentation detected, create one before using scissors tool');
         }
@@ -39,7 +48,7 @@ class ContourSegmentationBaseTool extends ContourBaseTool {
             throw new Error(`A contour segmentation must be active`);
         }
         const { segmentationId } = activeSeg;
-        const segmentIndex = segmentIndexController.getActiveSegmentIndex(segmentationId);
+        const segmentIndex = getActiveSegmentIndex(segmentationId);
         return utilities.deepMerge(contourAnnotation, {
             data: {
                 segmentation: {
@@ -90,7 +99,7 @@ class ContourSegmentationBaseTool extends ContourBaseTool {
     _getContourSegmentationStyle(context) {
         const annotation = context.annotation;
         const { segmentationId, segmentIndex } = annotation.data.segmentation;
-        const segmentation = segmentationState.getSegmentation(segmentationId);
+        const segmentation = getSegmentation(segmentationId);
         const segmentationRepresentations = getSegmentationRepresentationsForSegmentation(segmentationId);
         if (!segmentationRepresentations?.length) {
             return {};
@@ -107,19 +116,19 @@ class ContourSegmentationBaseTool extends ContourBaseTool {
         }
         const { segmentationRepresentationUID } = segmentationRepresentation;
         const { autoGenerated } = annotation;
-        const segmentsLocked = segmentLocking.getLockedSegmentIndices(segmentationId);
+        const segmentsLocked = getLockedSegmentIndices(segmentationId);
         const annotationLocked = segmentsLocked.includes(segmentIndex);
-        const segmentColor = segmentationConfig.color.getSegmentIndexColor(segmentationRepresentationUID, segmentIndex);
+        const segmentColor = getSegmentIndexColor(segmentationRepresentationUID, segmentIndex);
         const viewportId = context.styleSpecifier.viewportId;
-        const segmentationVisible = segmentationConfig.visibility.getSegmentationRepresentationVisibility(viewportId, segmentationRepresentationUID);
-        const globalConfig = segmentationConfig.getGlobalConfig();
-        const getSegmentationRepresentationConfig = segmentationConfig.getSegmentationRepresentationConfig(segmentationRepresentationUID);
-        const segmentConfig = segmentationConfig.getSegmentIndexConfig(segmentationRepresentationUID, segmentIndex);
-        const segmentVisible = segmentationConfig.visibility.getSegmentIndexVisibility(viewportId, segmentationRepresentationUID, segmentIndex);
+        const segmentationVisible = getSegmentationRepresentationVisibility(viewportId, segmentationRepresentationUID);
+        const globalConfig = getGlobalConfig();
+        const segmentationRepresentationConfig = getSegmentationRepresentationConfig(segmentationRepresentationUID);
+        const segmentConfig = getSegmentIndexConfig(segmentationRepresentationUID, segmentIndex);
+        const segmentVisible = getSegmentIndexVisibility(viewportId, segmentationRepresentationUID, segmentIndex);
         const activeSegRep = getActiveSegmentationRepresentation(viewportId);
         const isActive = activeSegRep.segmentationRepresentationUID ===
             segmentationRepresentationUID;
-        const mergedConfig = Object.assign({}, globalConfig?.representations?.CONTOUR ?? {}, getSegmentationRepresentationConfig?.CONTOUR ?? {}, segmentConfig?.CONTOUR ?? {});
+        const mergedConfig = Object.assign({}, globalConfig?.representations?.CONTOUR ?? {}, segmentationRepresentationConfig?.CONTOUR ?? {}, segmentConfig?.CONTOUR ?? {});
         let lineWidth = 1;
         let lineDash = undefined;
         let lineOpacity = 1;

package/dist/esm/tools/displayTools/Contour/contourDisplay.js

@@ -1,10 +1,11 @@
-import { getEnabledElementByIds, getEnabledElementByViewportId, } from '@cornerstonejs/core';
+import { getEnabledElementByViewportId } from '@cornerstonejs/core';
 import Representations from '../../../enums/SegmentationRepresentations';
-import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
-import removeContourFromElement from './removeContourFromElement';
 import { deleteConfigCache } from './contourHandler/contourConfigCache';
-import { polySeg } from '../../../stateManagement/segmentation';
 import { handleContourSegmentation } from './contourHandler/handleContourSegmentation';
+import { removeRepresentation as _removeRepresentation } from '../../../stateManagement/segmentation/removeRepresentation';
+import { getSegmentation } from '../../../stateManagement/segmentation/getSegmentation';
+import { canComputeRequestedRepresentation } from '../../../stateManagement/segmentation/polySeg/canComputeRequestedRepresentation';
+import { computeAndAddContourRepresentation } from '../../../stateManagement/segmentation/polySeg/Contour/computeAndAddContourRepresentation';
 let polySegConversionInProgress = false;
 function removeRepresentation(viewportId, segmentationRepresentationUID, renderImmediate = false) {
     const enabledElement = getEnabledElementByViewportId(viewportId);
@@ -12,7 +13,7 @@ function removeRepresentation(viewportId, segmentationRepresentationUID, renderI
         return;
     }
     const { viewport } = enabledElement;
-    SegmentationState.removeRepresentation(segmentationRepresentationUID);
+    _removeRepresentation(segmentationRepresentationUID);
     deleteConfigCache(segmentationRepresentationUID);
     if (!renderImmediate) {
         return;
@@ -21,16 +22,16 @@ function removeRepresentation(viewportId, segmentationRepresentationUID, renderI
 }
 async function render(viewport, contourRepresentation) {
     const { segmentationId } = contourRepresentation;
-    const segmentation = SegmentationState.getSegmentation(segmentationId);
+    const segmentation = getSegmentation(segmentationId);
     if (!segmentation) {
         return;
     }
     let contourData = segmentation.representationData[Representations.Contour];
     if (!contourData &&
-        polySeg.canComputeRequestedRepresentation(contourRepresentation.segmentationRepresentationUID) &&
+        canComputeRequestedRepresentation(contourRepresentation.segmentationRepresentationUID) &&
         !polySegConversionInProgress) {
         polySegConversionInProgress = true;
-        contourData = await polySeg.computeAndAddContourRepresentation(segmentationId, {
+        contourData = await computeAndAddContourRepresentation(segmentationId, {
             segmentationRepresentationUID: contourRepresentation.segmentationRepresentationUID,
             viewport,
         });

package/dist/esm/tools/displayTools/Contour/contourHandler/handleContourSegmentation.js

@@ -1,12 +1,12 @@
-import { addAnnotation } from '../../../../stateManagement';
+import { addAnnotation } from '../../../../stateManagement/annotation/annotationState';
 import { cache, utilities } from '@cornerstonejs/core';
 import { getClosestImageIdForStackViewport } from '../../../../utilities/annotationHydration';
 import { getConfigCache, setConfigCache } from './contourConfigCache';
 import { addContourSegmentationAnnotation } from '../../../../utilities/contourSegmentation';
 import { validateGeometry } from './utils';
-import { getGlobalConfig, getPerSegmentConfig, } from '../../../../stateManagement/segmentation/segmentationState';
+import { getGlobalConfig } from '../../../../stateManagement/segmentation/getGlobalConfig';
 import { getHiddenSegmentIndices } from '../../../../stateManagement/segmentation/config/segmentationVisibility';
-import { getSegmentIndexConfig } from '../../../../stateManagement/segmentation/config';
+import { getSegmentIndexConfig } from '../../../../stateManagement/segmentation/config/segmentationConfig';
 function handleContourSegmentation(viewport, geometryIds, annotationUIDsMap, contourRepresentation) {
     const addOrUpdateFn = annotationUIDsMap.size
         ? updateContourSets