@cornerstonejs/tools 0.1.4 → 0.4.2

package/dist/cjs/tools/displayTools/Labelmap/validateRepresentationData.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@cornerstonejs/core");
+function validate(segmentationInput) {
+    if (!segmentationInput.representation.data) {
+        throw new Error('The segmentationInput.representationData.data is undefined, please provide a valid representationData.data');
+    }
+    const representationData = segmentationInput.representation.data;
+    if (!representationData.volumeId) {
+        throw new Error('The segmentationInput.representationData.volumeId is undefined, please provide a valid representationData.volumeId');
+    }
+    const cachedVolume = core_1.cache.getVolume(representationData.volumeId);
+    if (!cachedVolume) {
+        throw new Error(`volumeId of ${representationData.volumeId} not found in cache, you should load and cache volume before adding segmentation`);
+    }
+}
+exports.default = validate;
+//# sourceMappingURL=validateRepresentationData.js.map

package/dist/cjs/tools/displayTools/Labelmap/validateRepresentationData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateRepresentationData.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Labelmap/validateRepresentationData.ts"],"names":[],"mappings":";;AACA,8CAA2C;AAE3C,SAAS,QAAQ,CAAC,iBAA0C;IAC1D,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,4GAA4G,CAC7G,CAAA;KACF;IAED,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAA;IAEhE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE;QAChC,MAAM,IAAI,KAAK,CACb,oHAAoH,CACrH,CAAA;KACF;IAED,MAAM,YAAY,GAAG,YAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAA;IAEjE,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CACb,eAAe,kBAAkB,CAAC,QAAQ,kFAAkF,CAC7H,CAAA;KACF;AACH,CAAC;AAED,kBAAe,QAAQ,CAAA"}

package/dist/cjs/tools/displayTools/SegmentationDisplayTool.d.ts

@@ -1,11 +1,11 @@
 import { BaseTool } from '../base';
-import { SegmentationConfig } from '../../types/SegmentationStateTypes';
 import { PublicToolProps, ToolProps } from '../../types';
+import { SegmentationRepresentationConfig } from '../../types/SegmentationStateTypes';
 export default class SegmentationDisplayTool extends BaseTool {
     static toolName: string;
     constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
     enableCallback(): void;
     disableCallback(): void;
     renderSegmentation: (toolGroupId: string) => void;
-    _getSegmentationConfig(toolGroupId: string): SegmentationConfig;
+    _getMergedRepresentationsConfig(toolGroupId: string): SegmentationRepresentationConfig;
 }

package/dist/cjs/tools/displayTools/SegmentationDisplayTool.js

@@ -18,23 +18,22 @@ class SegmentationDisplayTool extends base_1.BaseTool {
     }) {
         super(toolProps, defaultToolProps);
         this.renderSegmentation = (toolGroupId) => {
-            const toolGroup = (0, ToolGroupManager_1.getToolGroupByToolGroupId)(toolGroupId);
+            const toolGroup = (0, ToolGroupManager_1.getToolGroup)(toolGroupId);
             if (!toolGroup) {
                 return;
             }
-            const toolGroupSegmentationState = (0, segmentationState_1.getSegmentationState)(toolGroupId);
+            const toolGroupSegmentationRepresentations = (0, segmentationState_1.getSegmentationRepresentations)(toolGroupId);
             const toolGroupViewports = toolGroup.viewportsInfo.map(({ renderingEngineId, viewportId }) => {
                 const enabledElement = (0, core_1.getEnabledElementByIds)(viewportId, renderingEngineId);
                 if (enabledElement) {
                     return enabledElement.viewport;
                 }
             });
-            toolGroupSegmentationState.forEach((segmentationData) => {
-                const config = this._getSegmentationConfig(toolGroupId);
-                const { representation } = segmentationData;
+            toolGroupSegmentationRepresentations.forEach((representation) => {
+                const config = this._getMergedRepresentationsConfig(toolGroupId);
                 toolGroupViewports.forEach((viewport) => {
                     if (representation.type == SegmentationRepresentations_1.default.Labelmap) {
-                        Labelmap_1.LabelmapDisplay.render(viewport, segmentationData, config);
+                        Labelmap_1.labelmapDisplay.render(viewport, representation, config);
                     }
                     else {
                         throw new Error(`Render for ${representation.type} is not supported yet`);
@@ -48,29 +47,31 @@ class SegmentationDisplayTool extends base_1.BaseTool {
     }
     enableCallback() {
         const toolGroupId = this.toolGroupId;
-        const toolGroupSegmentationState = (0, segmentationState_1.getSegmentationState)(toolGroupId);
-        if (toolGroupSegmentationState.length === 0) {
+        const toolGroupSegmentationRepresentations = (0, segmentationState_1.getSegmentationRepresentations)(toolGroupId);
+        if (!toolGroupSegmentationRepresentations ||
+            toolGroupSegmentationRepresentations.length === 0) {
             return;
         }
-        for (const segmentationData of toolGroupSegmentationState) {
-            segmentationData.visibility = true;
+        for (const segmentationRepresentation of toolGroupSegmentationRepresentations) {
+            segmentationRepresentation.visibility = true;
+            (0, triggerSegmentationEvents_1.triggerSegmentationRepresentationModified)(toolGroupId, segmentationRepresentation.segmentationRepresentationUID);
         }
-        (0, triggerSegmentationEvents_1.triggerSegmentationStateModified)(toolGroupId);
     }
     disableCallback() {
         const toolGroupId = this.toolGroupId;
-        const toolGroupSegmentationState = (0, segmentationState_1.getSegmentationState)(toolGroupId);
-        if (toolGroupSegmentationState.length === 0) {
+        const toolGroupSegmentationRepresentations = (0, segmentationState_1.getSegmentationRepresentations)(toolGroupId);
+        if (!toolGroupSegmentationRepresentations ||
+            toolGroupSegmentationRepresentations.length === 0) {
             return;
         }
-        for (const segmentationData of toolGroupSegmentationState) {
-            segmentationData.visibility = false;
+        for (const segmentationRepresentation of toolGroupSegmentationRepresentations) {
+            segmentationRepresentation.visibility = false;
+            (0, triggerSegmentationEvents_1.triggerSegmentationRepresentationModified)(toolGroupId, segmentationRepresentation.segmentationRepresentationUID);
         }
-        (0, triggerSegmentationEvents_1.triggerSegmentationStateModified)(toolGroupId);
     }
-    _getSegmentationConfig(toolGroupId) {
-        const toolGroupConfig = segmentation_1.segmentationConfig.getSegmentationConfig(toolGroupId);
-        const globalConfig = segmentation_1.segmentationConfig.getGlobalSegmentationConfig();
+    _getMergedRepresentationsConfig(toolGroupId) {
+        const toolGroupConfig = segmentation_1.segmentationConfig.getToolGroupSpecificConfig(toolGroupId);
+        const globalConfig = segmentation_1.segmentationConfig.getGlobalConfig();
         const mergedConfig = (0, utilities_1.deepMerge)(globalConfig, toolGroupConfig);
         return mergedConfig;
     }

package/dist/cjs/tools/displayTools/SegmentationDisplayTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"SegmentationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/displayTools/SegmentationDisplayTool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SegmentationDisplayTool.js","sourceRoot":"","sources":["../../../../src/tools/displayTools/SegmentationDisplayTool.ts"],"names":[],"mappings":"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"}

package/dist/cjs/tools/index.d.ts

@@ -10,12 +10,13 @@ import CrosshairsTool from './CrosshairsTool';
 import BidirectionalTool from './annotation/BidirectionalTool';
 import LengthTool from './annotation/LengthTool';
 import ProbeTool from './annotation/ProbeTool';
-import RectangleRoiTool from './annotation/RectangleRoiTool';
-import EllipticalRoiTool from './annotation/EllipticalRoiTool';
+import RectangleROITool from './annotation/RectangleROITool';
+import EllipticalROITool from './annotation/EllipticalROITool';
 import SegmentationDisplayTool from './displayTools/SegmentationDisplayTool';
 import RectangleScissorsTool from './segmentation/RectangleScissorsTool';
 import CircleScissorsTool from './segmentation/CircleScissorsTool';
 import SphereScissorsTool from './segmentation/SphereScissorsTool';
-import RectangleRoiThresholdTool from './segmentation/RectangleRoiThresholdTool';
-import RectangleRoiStartEndThresholdTool from './segmentation/RectangleRoiStartEndThresholdTool';
-export { BaseTool, AnnotationTool, PanTool, WindowLevelTool, StackScrollTool, StackScrollMouseWheelTool, ZoomTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, CrosshairsTool, BidirectionalTool, LengthTool, ProbeTool, RectangleRoiTool, EllipticalRoiTool, SegmentationDisplayTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleRoiThresholdTool, RectangleRoiStartEndThresholdTool, };
+import RectangleROIThresholdTool from './segmentation/RectangleROIThresholdTool';
+import RectangleROIStartEndThresholdTool from './segmentation/RectangleROIStartEndThresholdTool';
+import BrushTool from './segmentation/BrushTool';
+export { BaseTool, AnnotationTool, PanTool, WindowLevelTool, StackScrollTool, StackScrollMouseWheelTool, ZoomTool, VolumeRotateMouseWheelTool, MIPJumpToClickTool, CrosshairsTool, BidirectionalTool, LengthTool, ProbeTool, RectangleROITool, EllipticalROITool, SegmentationDisplayTool, RectangleScissorsTool, CircleScissorsTool, SphereScissorsTool, RectangleROIThresholdTool, RectangleROIStartEndThresholdTool, BrushTool, };

package/dist/cjs/tools/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RectangleRoiStartEndThresholdTool = exports.RectangleRoiThresholdTool = exports.SphereScissorsTool = exports.CircleScissorsTool = exports.RectangleScissorsTool = exports.SegmentationDisplayTool = exports.EllipticalRoiTool = exports.RectangleRoiTool = exports.ProbeTool = exports.LengthTool = exports.BidirectionalTool = exports.CrosshairsTool = exports.MIPJumpToClickTool = exports.VolumeRotateMouseWheelTool = exports.ZoomTool = exports.StackScrollMouseWheelTool = exports.StackScrollTool = exports.WindowLevelTool = exports.PanTool = exports.AnnotationTool = exports.BaseTool = void 0;
+exports.BrushTool = exports.RectangleROIStartEndThresholdTool = exports.RectangleROIThresholdTool = exports.SphereScissorsTool = exports.CircleScissorsTool = exports.RectangleScissorsTool = exports.SegmentationDisplayTool = exports.EllipticalROITool = exports.RectangleROITool = exports.ProbeTool = exports.LengthTool = exports.BidirectionalTool = exports.CrosshairsTool = exports.MIPJumpToClickTool = exports.VolumeRotateMouseWheelTool = exports.ZoomTool = exports.StackScrollMouseWheelTool = exports.StackScrollTool = exports.WindowLevelTool = exports.PanTool = exports.AnnotationTool = exports.BaseTool = void 0;
 const base_1 = require("./base");
 Object.defineProperty(exports, "BaseTool", { enumerable: true, get: function () { return base_1.BaseTool; } });
 Object.defineProperty(exports, "AnnotationTool", { enumerable: true, get: function () { return base_1.AnnotationTool; } });
@@ -29,10 +29,10 @@ const LengthTool_1 = __importDefault(require("./annotation/LengthTool"));
 exports.LengthTool = LengthTool_1.default;
 const ProbeTool_1 = __importDefault(require("./annotation/ProbeTool"));
 exports.ProbeTool = ProbeTool_1.default;
-const RectangleRoiTool_1 = __importDefault(require("./annotation/RectangleRoiTool"));
-exports.RectangleRoiTool = RectangleRoiTool_1.default;
-const EllipticalRoiTool_1 = __importDefault(require("./annotation/EllipticalRoiTool"));
-exports.EllipticalRoiTool = EllipticalRoiTool_1.default;
+const RectangleROITool_1 = __importDefault(require("./annotation/RectangleROITool"));
+exports.RectangleROITool = RectangleROITool_1.default;
+const EllipticalROITool_1 = __importDefault(require("./annotation/EllipticalROITool"));
+exports.EllipticalROITool = EllipticalROITool_1.default;
 const SegmentationDisplayTool_1 = __importDefault(require("./displayTools/SegmentationDisplayTool"));
 exports.SegmentationDisplayTool = SegmentationDisplayTool_1.default;
 const RectangleScissorsTool_1 = __importDefault(require("./segmentation/RectangleScissorsTool"));
@@ -41,8 +41,10 @@ const CircleScissorsTool_1 = __importDefault(require("./segmentation/CircleSciss
 exports.CircleScissorsTool = CircleScissorsTool_1.default;
 const SphereScissorsTool_1 = __importDefault(require("./segmentation/SphereScissorsTool"));
 exports.SphereScissorsTool = SphereScissorsTool_1.default;
-const RectangleRoiThresholdTool_1 = __importDefault(require("./segmentation/RectangleRoiThresholdTool"));
-exports.RectangleRoiThresholdTool = RectangleRoiThresholdTool_1.default;
-const RectangleRoiStartEndThresholdTool_1 = __importDefault(require("./segmentation/RectangleRoiStartEndThresholdTool"));
-exports.RectangleRoiStartEndThresholdTool = RectangleRoiStartEndThresholdTool_1.default;
+const RectangleROIThresholdTool_1 = __importDefault(require("./segmentation/RectangleROIThresholdTool"));
+exports.RectangleROIThresholdTool = RectangleROIThresholdTool_1.default;
+const RectangleROIStartEndThresholdTool_1 = __importDefault(require("./segmentation/RectangleROIStartEndThresholdTool"));
+exports.RectangleROIStartEndThresholdTool = RectangleROIStartEndThresholdTool_1.default;
+const BrushTool_1 = __importDefault(require("./segmentation/BrushTool"));
+exports.BrushTool = BrushTool_1.default;
 //# sourceMappingURL=index.js.map

package/dist/cjs/tools/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/index.ts"],"names":[],"mappings":";;;;;;AAAA,iCAAiD;AA4B/C,yFA5BO,eAAQ,OA4BP;AACR,+FA7BiB,qBAAc,OA6BjB;AA5BhB,wDAA+B;AA8B7B,kBA9BK,iBAAO,CA8BL;AA7BT,wEAA+C;AA8B7C,0BA9BK,yBAAe,CA8BL;AA7BjB,wEAA+C;AA8B7C,0BA9BK,yBAAe,CA8BL;AA7BjB,oGAAuE;AA8BrE,oCA9BK,uCAAyB,CA8BL;AA7B3B,0DAAiC;AA8B/B,mBA9BK,kBAAQ,CA8BL;AA7BV,8FAAqE;AA8BnE,qCA9BK,oCAA0B,CA8BL;AA7B5B,8EAAqD;AA8BnD,6BA9BK,4BAAkB,CA8BL;AA7BpB,sEAA6C;AA+B3C,yBA/BK,wBAAc,CA+BL;AA7BhB,uFAA8D;AA8B5D,4BA9BK,2BAAiB,CA8BL;AA7BnB,yEAAgD;AA8B9C,qBA9BK,oBAAU,CA8BL;AA7BZ,uEAA8C;AA8B5C,oBA9BK,mBAAS,CA8BL;AA7BX,qFAA4D;AA8B1D,2BA9BK,0BAAgB,CA8BL;AA7BlB,uFAA8D;AA8B5D,4BA9BK,2BAAiB,CA8BL;AA3BnB,qGAA4E;AA6B1E,kCA7BK,iCAAuB,CA6BL;AA1BzB,iGAAwE;AA4BtE,gCA5BK,+BAAqB,CA4BL;AA3BvB,2FAAkE;AA4BhE,6BA5BK,4BAAkB,CA4BL;AA3BpB,2FAAkE;AA4BhE,6BA5BK,4BAAkB,CA4BL;AA3BpB,yGAAgF;AA4B9E,oCA5BK,mCAAyB,CA4BL;AA3B3B,yHAAgG;AA4B9F,4CA5BK,2CAAiC,CA4BL"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/index.ts"],"names":[],"mappings":";;;;;;AAAA,iCAAiD;AA6B/C,yFA7BO,eAAQ,OA6BP;AACR,+FA9BiB,qBAAc,OA8BjB;AA7BhB,wDAA+B;AA+B7B,kBA/BK,iBAAO,CA+BL;AA9BT,wEAA+C;AA+B7C,0BA/BK,yBAAe,CA+BL;AA9BjB,wEAA+C;AA+B7C,0BA/BK,yBAAe,CA+BL;AA9BjB,oGAAuE;AA+BrE,oCA/BK,uCAAyB,CA+BL;AA9B3B,0DAAiC;AA+B/B,mBA/BK,kBAAQ,CA+BL;AA9BV,8FAAqE;AA+BnE,qCA/BK,oCAA0B,CA+BL;AA9B5B,8EAAqD;AA+BnD,6BA/BK,4BAAkB,CA+BL;AA9BpB,sEAA6C;AAgC3C,yBAhCK,wBAAc,CAgCL;AA9BhB,uFAA8D;AA+B5D,4BA/BK,2BAAiB,CA+BL;AA9BnB,yEAAgD;AA+B9C,qBA/BK,oBAAU,CA+BL;AA9BZ,uEAA8C;AA+B5C,oBA/BK,mBAAS,CA+BL;AA9BX,qFAA4D;AA+B1D,2BA/BK,0BAAgB,CA+BL;AA9BlB,uFAA8D;AA+B5D,4BA/BK,2BAAiB,CA+BL;AA5BnB,qGAA4E;AA8B1E,kCA9BK,iCAAuB,CA8BL;AA3BzB,iGAAwE;AA6BtE,gCA7BK,+BAAqB,CA6BL;AA5BvB,2FAAkE;AA6BhE,6BA7BK,4BAAkB,CA6BL;AA5BpB,2FAAkE;AA6BhE,6BA7BK,4BAAkB,CA6BL;AA5BpB,yGAAgF;AA6B9E,oCA7BK,mCAAyB,CA6BL;AA5B3B,yHAAgG;AA6B9F,4CA7BK,2CAAiC,CA6BL;AA5BnC,yEAAgD;AA6B9C,oBA7BK,mBAAS,CA6BL"}

package/dist/cjs/tools/segmentation/BrushTool.d.ts

@@ -0,0 +1,17 @@
+import type { Types } from '@cornerstonejs/core';
+import type { PublicToolProps, ToolProps, EventTypes } from '../../types';
+import { BaseTool } from '../base';
+export default class BrushTool extends BaseTool {
+    static toolName: string;
+    private _editData;
+    private _hoverData;
+    private _isDrawing;
+    constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
+    preMouseDownCallback: (evt: EventTypes.MouseDownActivateEventType) => boolean;
+    mouseMoveCallback: (evt: EventTypes.MouseDragEventType) => void;
+    private _mouseDragCallback;
+    private _mouseUpCallback;
+    private _activateDraw;
+    private _deactivateDraw;
+    renderAnnotation(enabledElement: Types.IEnabledElement, svgDrawingHelper: any): void;
+}

package/dist/cjs/tools/segmentation/BrushTool.js

@@ -0,0 +1,285 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@cornerstonejs/core");
+const base_1 = require("../base");
+const fillCircle_1 = require("./strategies/fillCircle");
+const enums_1 = require("../../enums");
+const drawingSvg_1 = require("../../drawingSvg");
+const elementCursor_1 = require("../../cursors/elementCursor");
+const triggerAnnotationRenderForViewportIds_1 = __importDefault(require("../../utilities/triggerAnnotationRenderForViewportIds"));
+const segmentation_1 = require("../../stateManagement/segmentation");
+class BrushTool extends base_1.BaseTool {
+    constructor(toolProps = {}, defaultToolProps = {
+        supportedInteractionTypes: ['Mouse', 'Touch'],
+        configuration: {
+            strategies: {
+                FILL_INSIDE: fillCircle_1.fillInsideCircle,
+            },
+            defaultStrategy: 'FILL_INSIDE',
+            activeStrategy: 'FILL_INSIDE',
+            brushSize: 25,
+        },
+    }) {
+        super(toolProps, defaultToolProps);
+        this.preMouseDownCallback = (evt) => {
+            const eventData = evt.detail;
+            const { currentPoints, element } = eventData;
+            const worldPos = currentPoints.world;
+            const canvasPos = currentPoints.canvas;
+            const enabledElement = (0, core_1.getEnabledElement)(element);
+            const { viewport, renderingEngine } = enabledElement;
+            this._isDrawing = true;
+            const camera = viewport.getCamera();
+            const { viewPlaneNormal, viewUp } = camera;
+            const toolGroupId = this.toolGroupId;
+            const activeSegmentationRepresentation = segmentation_1.activeSegmentation.getActiveSegmentationRepresentation(toolGroupId);
+            if (!activeSegmentationRepresentation) {
+                throw new Error('No active segmentation detected, create one before using the brush tool');
+            }
+            const { segmentationRepresentationUID, segmentationId, type } = activeSegmentationRepresentation;
+            const segmentIndex = segmentation_1.segmentIndex.getActiveSegmentIndex(toolGroupId);
+            const segmentsLocked = segmentation_1.segmentLocking.getSegmentsLockedForSegmentation(segmentationId);
+            const segmentColor = segmentation_1.segmentationColor.getColorForSegmentIndex(toolGroupId, segmentationRepresentationUID, segmentIndex);
+            const { representations } = segmentation_1.state.getSegmentation(segmentationId);
+            const { volumeId } = representations[type];
+            const segmentation = core_1.cache.getVolume(volumeId);
+            const brushCursor = {
+                metadata: {
+                    viewPlaneNormal: [...viewPlaneNormal],
+                    viewUp: [...viewUp],
+                    FrameOfReferenceUID: viewport.getFrameOfReferenceUID(),
+                    referencedImageId: '',
+                    toolName: BrushTool.toolName,
+                    segmentColor,
+                },
+                data: {
+                    invalidated: true,
+                    handles: {
+                        points: [[...worldPos], [...worldPos], [...worldPos], [...worldPos]],
+                    },
+                    cachedStats: {},
+                },
+            };
+            const viewportIdsToRender = [viewport.id];
+            this._editData = {
+                brushCursor,
+                segmentation,
+                centerCanvas: canvasPos,
+                segmentIndex,
+                segmentationId,
+                segmentationRepresentationUID,
+                segmentsLocked,
+                segmentColor,
+                viewportIdsToRender,
+            };
+            this._activateDraw(element);
+            (0, elementCursor_1.hideElementCursor)(element);
+            evt.preventDefault();
+            (0, triggerAnnotationRenderForViewportIds_1.default)(renderingEngine, viewportIdsToRender);
+            return true;
+        };
+        this.mouseMoveCallback = (evt) => {
+            debugger;
+            const brushSize = this.configuration.brushSize;
+            const eventData = evt.detail;
+            const { element } = eventData;
+            const { currentPoints } = eventData;
+            const canvasPos = currentPoints.canvas;
+            const worldPos = currentPoints.world;
+            const enabledElement = (0, core_1.getEnabledElement)(element);
+            const { renderingEngine, viewport } = enabledElement;
+            const { canvasToWorld } = viewport;
+            const camera = viewport.getCamera();
+            const { viewPlaneNormal, viewUp } = camera;
+            const toolGroupId = this.toolGroupId;
+            const activeSegmentationRepresentation = segmentation_1.activeSegmentation.getActiveSegmentationRepresentation(toolGroupId);
+            if (!activeSegmentationRepresentation) {
+                throw new Error('No active segmentation detected, create one before using the brush tool');
+            }
+            const { segmentationRepresentationUID, segmentationId, type } = activeSegmentationRepresentation;
+            const segmentIndex = segmentation_1.segmentIndex.getActiveSegmentIndex(toolGroupId);
+            const segmentColor = segmentation_1.segmentationColor.getColorForSegmentIndex(toolGroupId, segmentationRepresentationUID, segmentIndex);
+            const viewportIdsToRender = [viewport.id];
+            const brushCursor = {
+                metadata: {
+                    viewPlaneNormal: [...viewPlaneNormal],
+                    viewUp: [...viewUp],
+                    FrameOfReferenceUID: viewport.getFrameOfReferenceUID(),
+                    referencedImageId: '',
+                    toolName: BrushTool.toolName,
+                    segmentColor,
+                },
+                data: {
+                    invalidated: true,
+                    handles: {
+                        points: [[...worldPos], [...worldPos], [...worldPos], [...worldPos]],
+                    },
+                    cachedStats: {},
+                },
+            };
+            const { data } = brushCursor;
+            const centerCanvas = canvasPos;
+            const radius = brushSize;
+            const bottomCanvas = [
+                centerCanvas[0],
+                centerCanvas[1] + radius,
+            ];
+            const topCanvas = [centerCanvas[0], centerCanvas[1] - radius];
+            const leftCanvas = [centerCanvas[0] - radius, centerCanvas[1]];
+            const rightCanvas = [
+                centerCanvas[0] + radius,
+                centerCanvas[1],
+            ];
+            data.handles.points = [
+                canvasToWorld(bottomCanvas),
+                canvasToWorld(topCanvas),
+                canvasToWorld(leftCanvas),
+                canvasToWorld(rightCanvas),
+            ];
+            data.invalidated = true;
+            this._hoverData = {
+                brushCursor,
+                centerCanvas,
+                segmentIndex,
+                segmentationId,
+                segmentationRepresentationUID,
+                segmentColor,
+                viewportIdsToRender,
+            };
+            (0, triggerAnnotationRenderForViewportIds_1.default)(renderingEngine, viewportIdsToRender);
+        };
+        this._mouseDragCallback = (evt) => {
+            this._isDrawing = true;
+            const brushSize = this.configuration.brushSize;
+            const eventData = evt.detail;
+            const { element } = eventData;
+            const { currentPoints } = eventData;
+            const currentCanvasPoints = currentPoints.canvas;
+            const enabledElement = (0, core_1.getEnabledElement)(element);
+            const { renderingEngine, viewport } = enabledElement;
+            const { canvasToWorld } = viewport;
+            const { segmentation, segmentIndex, segmentsLocked, segmentationId, segmentationRepresentationUID, brushCursor, viewportIdsToRender, } = this._editData;
+            const { viewPlaneNormal, viewUp } = brushCursor.metadata;
+            const { data } = brushCursor;
+            const centerCanvas = currentCanvasPoints;
+            const radius = brushSize;
+            const bottomCanvas = [
+                centerCanvas[0],
+                centerCanvas[1] + radius,
+            ];
+            const topCanvas = [centerCanvas[0], centerCanvas[1] - radius];
+            const leftCanvas = [centerCanvas[0] - radius, centerCanvas[1]];
+            const rightCanvas = [
+                centerCanvas[0] + radius,
+                centerCanvas[1],
+            ];
+            data.handles.points = [
+                canvasToWorld(bottomCanvas),
+                canvasToWorld(topCanvas),
+                canvasToWorld(leftCanvas),
+                canvasToWorld(rightCanvas),
+            ];
+            data.invalidated = true;
+            (0, triggerAnnotationRenderForViewportIds_1.default)(renderingEngine, viewportIdsToRender);
+            const operationData = {
+                points: data.handles.points,
+                volume: segmentation,
+                segmentIndex,
+                segmentsLocked,
+                viewPlaneNormal,
+                toolGroupId: this.toolGroupId,
+                segmentationId,
+                segmentationRepresentationUID,
+                viewUp,
+            };
+            this.applyActiveStrategy(enabledElement, operationData);
+        };
+        this._mouseUpCallback = (evt) => {
+            const eventData = evt.detail;
+            const { element } = eventData;
+            const { brushCursor, segmentation, segmentIndex, segmentsLocked, segmentationId, segmentationRepresentationUID, } = this._editData;
+            const { data } = brushCursor;
+            const { viewPlaneNormal, viewUp } = brushCursor.metadata;
+            this._deactivateDraw(element);
+            (0, elementCursor_1.resetElementCursor)(element);
+            const enabledElement = (0, core_1.getEnabledElement)(element);
+            const { viewport } = enabledElement;
+            this._editData = null;
+            this._isDrawing = false;
+            if (viewport instanceof core_1.StackViewport) {
+                throw new Error('Not implemented yet');
+            }
+            const operationData = {
+                points: data.handles.points,
+                volume: segmentation,
+                segmentIndex,
+                segmentsLocked,
+                viewPlaneNormal,
+                toolGroupId: this.toolGroupId,
+                segmentationId,
+                segmentationRepresentationUID,
+                viewUp,
+            };
+            this.applyActiveStrategy(enabledElement, operationData);
+        };
+        this._activateDraw = (element) => {
+            element.addEventListener(enums_1.Events.MOUSE_UP, this._mouseUpCallback);
+            element.addEventListener(enums_1.Events.MOUSE_DRAG, this._mouseDragCallback);
+            element.addEventListener(enums_1.Events.MOUSE_CLICK, this._mouseUpCallback);
+        };
+        this._deactivateDraw = (element) => {
+            element.removeEventListener(enums_1.Events.MOUSE_UP, this._mouseUpCallback);
+            element.removeEventListener(enums_1.Events.MOUSE_DRAG, this._mouseDragCallback);
+            element.removeEventListener(enums_1.Events.MOUSE_CLICK, this._mouseUpCallback);
+        };
+    }
+    renderAnnotation(enabledElement, svgDrawingHelper) {
+        if (!this._editData && !this._hoverData) {
+            return;
+        }
+        const { viewport } = enabledElement;
+        let viewportIdsToRender;
+        let brushCursor;
+        if (this._isDrawing) {
+            viewportIdsToRender = this._editData.viewportIdsToRender;
+            if (!viewportIdsToRender.includes(viewport.id)) {
+                return;
+            }
+            brushCursor = this._editData.brushCursor;
+        }
+        else {
+            viewportIdsToRender = this._hoverData.viewportIdsToRender;
+            if (!viewportIdsToRender.includes(viewport.id)) {
+                return;
+            }
+            brushCursor = this._hoverData.brushCursor;
+        }
+        const toolMetadata = brushCursor.metadata;
+        const annotationUID = toolMetadata.brushCursorUID;
+        const data = brushCursor.data;
+        const { points } = data.handles;
+        const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
+        const bottom = canvasCoordinates[0];
+        const top = canvasCoordinates[1];
+        const center = [
+            Math.floor((bottom[0] + top[0]) / 2),
+            Math.floor((bottom[1] + top[1]) / 2),
+        ];
+        const radius = Math.abs(bottom[1] - Math.floor((bottom[1] + top[1]) / 2));
+        const color = `rgb(${toolMetadata.segmentColor.slice(0, 3)})`;
+        if (!viewport.getRenderingEngine()) {
+            console.warn('Rendering Engine has been destroyed');
+            return;
+        }
+        const circleUID = '0';
+        (0, drawingSvg_1.drawCircle)(svgDrawingHelper, BrushTool.toolName, annotationUID, circleUID, center, radius, {
+            color,
+        });
+    }
+}
+exports.default = BrushTool;
+BrushTool.toolName = 'Brush';
+//# sourceMappingURL=BrushTool.js.map

package/dist/cjs/tools/segmentation/BrushTool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BrushTool.js","sourceRoot":"","sources":["../../../../src/tools/segmentation/BrushTool.ts"],"names":[],"mappings":"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"}

package/dist/cjs/tools/segmentation/CircleScissorsTool.d.ts

@@ -7,7 +7,7 @@ export default class CircleScissorsTool extends BaseTool {
         annotation: any;
         segmentation: any;
         segmentIndex: number;
-        segmentationDataUID: string;
+        segmentationId: string;
         segmentsLocked: number[];
         segmentColor: [number, number, number, number];
         viewportIdsToRender: string[];
@@ -20,7 +20,7 @@ export default class CircleScissorsTool extends BaseTool {
     isDrawing: boolean;
     isHandleOutsideImage: boolean;
     constructor(toolProps?: PublicToolProps, defaultToolProps?: ToolProps);
-    addNewAnnotation: (evt: EventTypes.MouseDownActivateEventType) => void;
+    preMouseDownCallback: (evt: EventTypes.MouseDownActivateEventType) => boolean;
     _mouseDragCallback: (evt: EventTypes.MouseDragEventType) => void;
     _mouseUpCallback: (evt: EventTypes.MouseUpEventType | EventTypes.MouseClickEventType) => void;
     _activateDraw: (element: any) => void;

package/dist/cjs/tools/segmentation/CircleScissorsTool.js

@@ -11,6 +11,7 @@ const drawingSvg_1 = require("../../drawingSvg");
 const elementCursor_1 = require("../../cursors/elementCursor");
 const triggerAnnotationRenderForViewportIds_1 = __importDefault(require("../../utilities/triggerAnnotationRenderForViewportIds"));
 const segmentation_1 = require("../../stateManagement/segmentation");
+const segmentationState_1 = require("../../stateManagement/segmentation/segmentationState");
 class CircleScissorsTool extends base_1.BaseTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -23,7 +24,7 @@ class CircleScissorsTool extends base_1.BaseTool {
         },
     }) {
         super(toolProps, defaultToolProps);
-        this.addNewAnnotation = (evt) => {
+        this.preMouseDownCallback = (evt) => {
             const eventDetail = evt.detail;
             const { currentPoints, element } = eventDetail;
             const worldPos = currentPoints.world;
@@ -34,14 +35,16 @@ class CircleScissorsTool extends base_1.BaseTool {
             const camera = viewport.getCamera();
             const { viewPlaneNormal, viewUp } = camera;
             const toolGroupId = this.toolGroupId;
-            const activeSegmentationInfo = segmentation_1.activeSegmentation.getActiveSegmentationInfo(toolGroupId);
-            if (!activeSegmentationInfo) {
+            const activeSegmentationRepresentation = segmentation_1.activeSegmentation.getActiveSegmentationRepresentation(toolGroupId);
+            if (!activeSegmentationRepresentation) {
                 throw new Error('No active segmentation detected, create one before using scissors tool');
             }
-            const { volumeId, segmentationDataUID } = activeSegmentationInfo;
+            const { segmentationRepresentationUID, segmentationId, type } = activeSegmentationRepresentation;
             const segmentIndex = segmentation_1.segmentIndex.getActiveSegmentIndex(toolGroupId);
-            const segmentsLocked = segmentation_1.segmentLocking.getSegmentsLockedForSegmentation(volumeId);
-            const segmentColor = segmentation_1.segmentationColor.getColorForSegmentIndex(toolGroupId, activeSegmentationInfo.segmentationDataUID, segmentIndex);
+            const segmentsLocked = segmentation_1.segmentLocking.getSegmentsLockedForSegmentation(segmentationId);
+            const segmentColor = segmentation_1.segmentationColor.getColorForSegmentIndex(toolGroupId, segmentationRepresentationUID, segmentIndex);
+            const { representations } = (0, segmentationState_1.getSegmentation)(segmentationId);
+            const { volumeId } = representations[type];
             const segmentation = core_1.cache.getVolume(volumeId);
             const annotation = {
                 invalidated: true,
@@ -69,7 +72,7 @@ class CircleScissorsTool extends base_1.BaseTool {
                 segmentation,
                 centerCanvas: canvasPos,
                 segmentIndex,
-                segmentationDataUID,
+                segmentationId,
                 segmentsLocked,
                 segmentColor,
                 viewportIdsToRender,
@@ -82,6 +85,7 @@ class CircleScissorsTool extends base_1.BaseTool {
             (0, elementCursor_1.hideElementCursor)(element);
             evt.preventDefault();
             (0, triggerAnnotationRenderForViewportIds_1.default)(renderingEngine, viewportIdsToRender);
+            return true;
         };
         this._mouseDragCallback = (evt) => {
             this.isDrawing = true;
@@ -120,7 +124,7 @@ class CircleScissorsTool extends base_1.BaseTool {
         this._mouseUpCallback = (evt) => {
             const eventDetail = evt.detail;
             const { element } = eventDetail;
-            const { annotation, newAnnotation, hasMoved, segmentation, segmentIndex, segmentsLocked, segmentationDataUID, } = this.editData;
+            const { annotation, newAnnotation, hasMoved, segmentation, segmentIndex, segmentsLocked, segmentationId, } = this.editData;
             const { data } = annotation;
             const { viewPlaneNormal, viewUp } = annotation.metadata;
             if (newAnnotation && !hasMoved) {
@@ -143,8 +147,7 @@ class CircleScissorsTool extends base_1.BaseTool {
                 segmentIndex,
                 segmentsLocked,
                 viewPlaneNormal,
-                toolGroupId: this.toolGroupId,
-                segmentationDataUID,
+                segmentationId,
                 viewUp,
             };
             this.applyActiveStrategy(enabledElement, operationData);