copper3d 3.0.1 → 3.1.0

package/dist/Utils/segmentation/tools/DragSliceTool.js

@@ -23,16 +23,17 @@ export class DragSliceTool extends BaseTool {
     updateIndex(move) {
         let sliceModifyNum = 0;
         let contrastModifyNum = 0;
-        const nrrd = this.ctx.nrrd_states;
-        if (nrrd.showContrast) {
+        const view = this.ctx.nrrd_states.view;
+        const image = this.ctx.nrrd_states.image;
+        if (view.showContrast) {
             contrastModifyNum = move % this.ctx.protectedData.displaySlices.length;
-            nrrd.contrastNum += contrastModifyNum;
+            view.contrastNum += contrastModifyNum;
             if (move > 0) {
-                if (nrrd.currentIndex <= nrrd.maxIndex) {
+                if (view.currentSliceIndex <= view.maxIndex) {
                     sliceModifyNum = Math.floor(move / this.ctx.protectedData.displaySlices.length);
-                    if (nrrd.contrastNum > this.ctx.protectedData.displaySlices.length - 1) {
+                    if (view.contrastNum > this.ctx.protectedData.displaySlices.length - 1) {
                         sliceModifyNum += 1;
-                        nrrd.contrastNum -= this.ctx.protectedData.displaySlices.length;
+                        view.contrastNum -= this.ctx.protectedData.displaySlices.length;
                     }
                 }
                 else {
@@ -41,8 +42,8 @@ export class DragSliceTool extends BaseTool {
             }
             else {
                 sliceModifyNum = Math.ceil(move / this.ctx.protectedData.displaySlices.length);
-                if (nrrd.contrastNum < 0) {
-                    nrrd.contrastNum += this.ctx.protectedData.displaySlices.length;
+                if (view.contrastNum < 0) {
+                    view.contrastNum += this.ctx.protectedData.displaySlices.length;
                     sliceModifyNum -= 1;
                 }
             }
@@ -50,65 +51,74 @@ export class DragSliceTool extends BaseTool {
         else {
             sliceModifyNum = move;
         }
-        let newIndex = nrrd.currentIndex + sliceModifyNum;
-        if (newIndex != nrrd.currentIndex || nrrd.showContrast) {
-            if (newIndex > nrrd.maxIndex) {
-                newIndex = nrrd.maxIndex;
-                nrrd.contrastNum = this.ctx.protectedData.displaySlices.length - 1;
+        let newIndex = view.currentSliceIndex + sliceModifyNum;
+        if (newIndex != view.currentSliceIndex || view.showContrast) {
+            if (newIndex > view.maxIndex) {
+                newIndex = view.maxIndex;
+                view.contrastNum = this.ctx.protectedData.displaySlices.length - 1;
             }
-            else if (newIndex < nrrd.minIndex) {
-                newIndex = nrrd.minIndex;
-                nrrd.contrastNum = 0;
+            else if (newIndex < view.minIndex) {
+                newIndex = view.minIndex;
+                view.contrastNum = 0;
             }
             else {
-                this.ctx.protectedData.mainPreSlices.index = newIndex * nrrd.RSARatio;
+                this.ctx.protectedData.mainPreSlices.index = newIndex * image.RSARatio;
                 this.callbacks.setSyncsliceNum();
                 let isSameIndex = true;
-                if (newIndex != nrrd.currentIndex) {
-                    nrrd.switchSliceFlag = true;
+                if (newIndex != view.currentSliceIndex) {
+                    view.switchSliceFlag = true;
                     isSameIndex = false;
                 }
                 this.cleanCanvases(isSameIndex);
-                if (nrrd.changedWidth === 0) {
-                    nrrd.changedWidth = nrrd.originWidth;
-                    nrrd.changedHeight = nrrd.originHeight;
+                if (view.changedWidth === 0) {
+                    view.changedWidth = image.originWidth;
+                    view.changedHeight = image.originHeight;
                 }
                 const needToUpdateSlice = this.updateCurrentContrastSlice();
                 needToUpdateSlice.repaint.call(needToUpdateSlice);
-                nrrd.currentIndex = newIndex;
+                view.currentSliceIndex = newIndex;
                 this.drawDragSlice(needToUpdateSlice.canvas);
             }
-            nrrd.oldIndex = newIndex * nrrd.RSARatio;
-            this.updateShowNumDiv(nrrd.contrastNum);
+            view.preSliceIndex = newIndex * image.RSARatio;
+            this.updateShowNumDiv(view.contrastNum);
         }
     }
     // ===== Draw Drag Slice =====
     drawDragSlice(canvas) {
-        const nrrd = this.ctx.nrrd_states;
+        var _a, _b;
+        const view = this.ctx.nrrd_states.view;
         // Draw base image (CT/MRI scan)
         this.ctx.protectedData.ctxes.displayCtx.save();
         this.callbacks.flipDisplayImageByAxis();
-        this.ctx.protectedData.ctxes.displayCtx.drawImage(canvas, 0, 0, nrrd.changedWidth, nrrd.changedHeight);
+        this.ctx.protectedData.ctxes.displayCtx.drawImage(canvas, 0, 0, view.changedWidth, view.changedHeight);
         this.ctx.protectedData.ctxes.displayCtx.restore();
         // Phase 3: Draw ALL layers from MaskVolume (multi-layer compositing)
-        if (nrrd.switchSliceFlag) {
-            const axis = this.ctx.protectedData.axis;
-            const sliceIndex = nrrd.currentIndex;
-            // Get a single reusable buffer — shared across all layer renders
-            const buffer = this.callbacks.getOrCreateSliceBuffer(axis);
-            if (buffer) {
-                const w = nrrd.changedWidth;
-                const h = nrrd.changedHeight;
-                for (const layerId of this.ctx.nrrd_states.layers) {
-                    const target = this.ctx.protectedData.layerTargets.get(layerId);
-                    if (target) {
-                        this.callbacks.renderSliceToCanvas(layerId, axis, sliceIndex, buffer, target.ctx, w, h);
+        // Skip layer mask rendering when sphere mode is active —
+        // layer masks should remain hidden until the user exits sphere mode.
+        if (view.switchSliceFlag) {
+            if (!this.ctx.gui_states.mode.sphere) {
+                const axis = this.ctx.protectedData.axis;
+                const sliceIndex = view.currentSliceIndex;
+                // Get a single reusable buffer — shared across all layer renders
+                const buffer = this.callbacks.getOrCreateSliceBuffer(axis);
+                if (buffer) {
+                    const w = view.changedWidth;
+                    const h = view.changedHeight;
+                    for (const layerId of this.ctx.nrrd_states.image.layers) {
+                        const target = this.ctx.protectedData.layerTargets.get(layerId);
+                        if (target) {
+                            this.callbacks.renderSliceToCanvas(layerId, axis, sliceIndex, buffer, target.ctx, w, h);
+                        }
                     }
                 }
+                // Composite all layers to master canvas
+                this.compositeAllLayers();
             }
-            // Composite all layers to master canvas
-            this.compositeAllLayers();
-            nrrd.switchSliceFlag = false;
+            // Refresh sphere overlay from volume for the new slice
+            if (this.ctx.gui_states.mode.sphere) {
+                (_b = (_a = this.callbacks).refreshSphereOverlay) === null || _b === void 0 ? void 0 : _b.call(_a);
+            }
+            view.switchSliceFlag = false;
         }
     }
     /**
@@ -116,12 +126,12 @@ export class DragSliceTool extends BaseTool {
      */
     compositeAllLayers() {
         const masterCtx = this.ctx.protectedData.ctxes.drawingLayerMasterCtx;
-        const width = this.ctx.nrrd_states.changedWidth;
-        const height = this.ctx.nrrd_states.changedHeight;
+        const width = this.ctx.nrrd_states.view.changedWidth;
+        const height = this.ctx.nrrd_states.view.changedHeight;
         masterCtx.clearRect(0, 0, width, height);
         // Master stores full-alpha composite; globalAlpha applied in start() render loop.
-        for (const layerId of this.ctx.nrrd_states.layers) {
-            if (!this.ctx.gui_states.layerVisibility[layerId])
+        for (const layerId of this.ctx.nrrd_states.image.layers) {
+            if (!this.ctx.gui_states.layerChannel.layerVisibility[layerId])
                 continue;
             const target = this.ctx.protectedData.layerTargets.get(layerId);
             if (target)
@@ -149,21 +159,21 @@ export class DragSliceTool extends BaseTool {
     // ===== UI Updates =====
     updateShowNumDiv(contrastNum) {
         if (this.ctx.protectedData.mainPreSlices) {
-            const nrrd = this.ctx.nrrd_states;
-            if (nrrd.currentIndex > nrrd.maxIndex) {
-                nrrd.currentIndex = nrrd.maxIndex;
+            const view = this.ctx.nrrd_states.view;
+            if (view.currentSliceIndex > view.maxIndex) {
+                view.currentSliceIndex = view.maxIndex;
             }
-            if (nrrd.showContrast) {
-                this.showDragNumberDiv.innerHTML = `ContrastNum: ${contrastNum}/${this.ctx.protectedData.displaySlices.length - 1} SliceNum: ${nrrd.currentIndex}/${nrrd.maxIndex}`;
+            if (view.showContrast) {
+                this.showDragNumberDiv.innerHTML = `ContrastNum: ${contrastNum}/${this.ctx.protectedData.displaySlices.length - 1} SliceNum: ${view.currentSliceIndex}/${view.maxIndex}`;
             }
             else {
-                this.showDragNumberDiv.innerHTML = `SliceNum: ${nrrd.currentIndex}/${nrrd.maxIndex}`;
+                this.showDragNumberDiv.innerHTML = `SliceNum: ${view.currentSliceIndex}/${view.maxIndex}`;
             }
         }
     }
     updateCurrentContrastSlice() {
         this.ctx.protectedData.currentShowingSlice =
-            this.ctx.protectedData.displaySlices[this.ctx.nrrd_states.contrastNum];
+            this.ctx.protectedData.displaySlices[this.ctx.nrrd_states.view.contrastNum];
         return this.ctx.protectedData.currentShowingSlice;
     }
 }

package/dist/Utils/segmentation/tools/DragSliceTool.js.map

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

package/dist/Utils/segmentation/tools/DrawingTool.d.ts

@@ -0,0 +1,85 @@
+/**
+ * DrawingTool - Pencil/Brush/Eraser drawing on canvas layers
+ *
+ * Extracted from DrawToolCore.paintOnCanvas() closure (Phase 3).
+ * Handles left-click drawing operations: pencil stroke + fill, brush strokes,
+ * eraser, and undo snapshot capture/push.
+ */
+import { BaseTool } from "./BaseTool";
+import type { ToolContext } from "./BaseTool";
+import type { DrawingHostDeps } from "./ToolHost";
+export declare class DrawingTool extends BaseTool {
+    /** Left mouse button currently held (draw mode) */
+    private leftClicked;
+    /** True while actively painting (between pointerdown and pointerup) */
+    private isPainting;
+    /** Accumulated pencil stroke points for fill-on-release */
+    private drawingLines;
+    /** Eraser arc function, assigned once per paintOnCanvas() call */
+    private clearArcFn;
+    /** Snapshot of the active layer's slice captured on mouse-down (before drawing) */
+    private preDrawSlice;
+    private preDrawAxis;
+    private preDrawSliceIndex;
+    private callbacks;
+    constructor(ctx: ToolContext, callbacks: DrawingHostDeps);
+    /** Whether a draw operation is currently active */
+    get isActive(): boolean;
+    /** Whether paint strokes are being recorded */
+    get painting(): boolean;
+    /**
+     * Reset drawing state. Called at start of each paintOnCanvas() cycle.
+     * @param clearArcFn - Eraser function for this paint cycle
+     */
+    reset(clearArcFn: (x: number, y: number, size: number) => void): void;
+    /**
+     * Called on left-click pointerdown in draw mode.
+     * Sets up drawing state, cursor, undo snapshot, and start position.
+     */
+    onPointerDown(e: MouseEvent): void;
+    /**
+     * Called on pointermove during an active drawing operation.
+     * Handles eraser clearing or brush/pencil stroke accumulation.
+     */
+    onPointerMove(e: MouseEvent): void;
+    /**
+     * Called on pointerup in draw mode.
+     * Completes stroke, fills pencil path, syncs volume, pushes undo delta.
+     */
+    onPointerUp(_e: MouseEvent): void;
+    /**
+     * Called on pointerleave during drawing.
+     * Resets painting state and cleans up leftClicked.
+     * @returns true if drawing was in progress when leave occurred
+     */
+    onPointerLeave(): boolean;
+    /**
+     * Create a self-managing mouseover/mouseout/mousemove handler
+     * that tracks brush hover position for the preview circle.
+     *
+     * The returned function should be registered on drawingCanvas for
+     * "mouseover" and "mouseout" events.  It adds/removes a "mousemove"
+     * listener on itself to keep mouseOverX/Y up-to-date while the
+     * cursor is inside the canvas.
+     */
+    createBrushTrackingHandler(): (e: MouseEvent) => void;
+    /**
+     * Render brush circle preview on the drawing context.
+     * Called from the start() render loop when in draw mode and not
+     * actively painting.  Skipped in pencil/eraser mode.
+     */
+    renderBrushPreview(ctx: CanvasRenderingContext2D, width: number, height: number): void;
+    /** Capture pre-draw slice snapshot for undo */
+    private capturePreDrawSnapshot;
+    /** Push delta to UndoManager after drawing completes */
+    private pushUndoDelta;
+    /**
+     * Redraws persisted layer data onto ctx before new pencil fill.
+     * Extracted from DrawToolCore.
+     */
+    private redrawPreviousImageToLayerCtx;
+    /** Draw a line segment on a layer canvas */
+    private drawLinesOnLayer;
+    /** Paint a segment on the current layer canvas and composite to master */
+    private paintOnCanvasLayer;
+}

package/dist/Utils/segmentation/tools/DrawingTool.js

@@ -0,0 +1,270 @@
+/**
+ * DrawingTool - Pencil/Brush/Eraser drawing on canvas layers
+ *
+ * Extracted from DrawToolCore.paintOnCanvas() closure (Phase 3).
+ * Handles left-click drawing operations: pencil stroke + fill, brush strokes,
+ * eraser, and undo snapshot capture/push.
+ */
+import { BaseTool } from "./BaseTool";
+import { switchEraserSize } from "../../utils";
+export class DrawingTool extends BaseTool {
+    constructor(ctx, callbacks) {
+        super(ctx);
+        /** Left mouse button currently held (draw mode) */
+        this.leftClicked = false;
+        /** True while actively painting (between pointerdown and pointerup) */
+        this.isPainting = false;
+        /** Accumulated pencil stroke points for fill-on-release */
+        this.drawingLines = [];
+        /** Eraser arc function, assigned once per paintOnCanvas() call */
+        this.clearArcFn = null;
+        /** Snapshot of the active layer's slice captured on mouse-down (before drawing) */
+        this.preDrawSlice = null;
+        this.preDrawAxis = "z";
+        this.preDrawSliceIndex = 0;
+        this.callbacks = callbacks;
+    }
+    /** Whether a draw operation is currently active */
+    get isActive() {
+        return this.leftClicked;
+    }
+    /** Whether paint strokes are being recorded */
+    get painting() {
+        return this.isPainting;
+    }
+    /**
+     * Reset drawing state. Called at start of each paintOnCanvas() cycle.
+     * @param clearArcFn - Eraser function for this paint cycle
+     */
+    reset(clearArcFn) {
+        this.leftClicked = false;
+        this.isPainting = false;
+        this.drawingLines = [];
+        this.clearArcFn = clearArcFn;
+    }
+    /**
+     * Called on left-click pointerdown in draw mode.
+     * Sets up drawing state, cursor, undo snapshot, and start position.
+     */
+    onPointerDown(e) {
+        this.leftClicked = true;
+        this.drawingLines = [];
+        this.isPainting = true;
+        this.ctx.protectedData.isDrawing = true;
+        // Set cursor based on mode
+        if (this.ctx.gui_states.mode.eraser) {
+            const urls = this.callbacks.getEraserUrls();
+            this.ctx.protectedData.canvases.drawingCanvas.style.cursor =
+                urls.length > 0
+                    ? switchEraserSize(this.ctx.gui_states.drawing.brushAndEraserSize, urls)
+                    : switchEraserSize(this.ctx.gui_states.drawing.brushAndEraserSize);
+        }
+        else {
+            this.ctx.protectedData.canvases.drawingCanvas.style.cursor =
+                this.ctx.gui_states.viewConfig.defaultPaintCursor;
+        }
+        // Record draw start position
+        this.ctx.nrrd_states.interaction.drawStartPos.x = e.offsetX;
+        this.ctx.nrrd_states.interaction.drawStartPos.y = e.offsetY;
+        // Capture pre-draw slice snapshot for undo
+        this.capturePreDrawSnapshot();
+    }
+    /**
+     * Called on pointermove during an active drawing operation.
+     * Handles eraser clearing or brush/pencil stroke accumulation.
+     */
+    onPointerMove(e) {
+        var _a;
+        this.ctx.protectedData.isDrawing = true;
+        if (this.isPainting) {
+            if (this.ctx.gui_states.mode.eraser) {
+                this.ctx.nrrd_states.flags.stepClear = 1;
+                (_a = this.clearArcFn) === null || _a === void 0 ? void 0 : _a.call(this, e.offsetX, e.offsetY, this.ctx.gui_states.drawing.brushAndEraserSize);
+            }
+            else {
+                this.drawingLines.push({ x: e.offsetX, y: e.offsetY });
+                this.paintOnCanvasLayer(e.offsetX, e.offsetY);
+            }
+        }
+    }
+    /**
+     * Called on pointerup in draw mode.
+     * Completes stroke, fills pencil path, syncs volume, pushes undo delta.
+     */
+    onPointerUp(_e) {
+        this.leftClicked = false;
+        const { ctx, canvas } = this.callbacks.setCurrentLayer();
+        ctx.closePath();
+        if (!this.ctx.gui_states.mode.eraser) {
+            if (this.ctx.gui_states.mode.pencil) {
+                // Clear only the current layer canvas (NOT master)
+                canvas.width = canvas.width;
+                // Redraw previous layer data from volume
+                this.redrawPreviousImageToLayerCtx(ctx);
+                // Draw new pencil strokes on current layer canvas
+                ctx.beginPath();
+                ctx.moveTo(this.drawingLines[0].x, this.drawingLines[0].y);
+                for (let i = 1; i < this.drawingLines.length; i++) {
+                    ctx.lineTo(this.drawingLines[i].x, this.drawingLines[i].y);
+                }
+                ctx.closePath();
+                ctx.lineWidth = 1;
+                ctx.fillStyle = this.ctx.gui_states.drawing.fillColor;
+                ctx.fill();
+                // Composite ALL layers to master (not just current layer)
+                this.callbacks.compositeAllLayers();
+            }
+        }
+        this.callbacks.syncLayerSliceData(this.ctx.nrrd_states.view.currentSliceIndex, this.ctx.gui_states.layerChannel.layer);
+        this.isPainting = false;
+        // Push undo delta
+        this.pushUndoDelta();
+    }
+    /**
+     * Called on pointerleave during drawing.
+     * Resets painting state and cleans up leftClicked.
+     * @returns true if drawing was in progress when leave occurred
+     */
+    onPointerLeave() {
+        this.isPainting = false;
+        if (!this.leftClicked)
+            return false;
+        this.leftClicked = false;
+        this.ctx.protectedData.ctxes.drawingLayerMasterCtx.closePath();
+        return true;
+    }
+    // ── Brush hover tracking & preview ──────────────────────────
+    /**
+     * Create a self-managing mouseover/mouseout/mousemove handler
+     * that tracks brush hover position for the preview circle.
+     *
+     * The returned function should be registered on drawingCanvas for
+     * "mouseover" and "mouseout" events.  It adds/removes a "mousemove"
+     * listener on itself to keep mouseOverX/Y up-to-date while the
+     * cursor is inside the canvas.
+     */
+    createBrushTrackingHandler() {
+        const handler = (e) => {
+            e.preventDefault();
+            this.ctx.nrrd_states.interaction.mouseOverX = e.offsetX;
+            this.ctx.nrrd_states.interaction.mouseOverY = e.offsetY;
+            if (this.ctx.nrrd_states.interaction.mouseOverX === undefined) {
+                this.ctx.nrrd_states.interaction.mouseOverX = e.clientX;
+                this.ctx.nrrd_states.interaction.mouseOverY = e.clientY;
+            }
+            if (e.type === "mouseout") {
+                this.ctx.nrrd_states.interaction.mouseOver = false;
+                this.ctx.protectedData.canvases.drawingCanvas.removeEventListener("mousemove", handler);
+            }
+            else if (e.type === "mouseover") {
+                this.ctx.nrrd_states.interaction.mouseOver = true;
+                this.ctx.protectedData.canvases.drawingCanvas.addEventListener("mousemove", handler);
+            }
+        };
+        return handler;
+    }
+    /**
+     * Render brush circle preview on the drawing context.
+     * Called from the start() render loop when in draw mode and not
+     * actively painting.  Skipped in pencil/eraser mode.
+     */
+    renderBrushPreview(ctx, width, height) {
+        if (this.ctx.gui_states.mode.pencil ||
+            this.ctx.gui_states.mode.eraser ||
+            !this.ctx.nrrd_states.interaction.mouseOver) {
+            return;
+        }
+        ctx.clearRect(0, 0, width, height);
+        ctx.fillStyle = this.ctx.gui_states.drawing.brushColor;
+        ctx.beginPath();
+        ctx.arc(this.ctx.nrrd_states.interaction.mouseOverX, this.ctx.nrrd_states.interaction.mouseOverY, this.ctx.gui_states.drawing.brushAndEraserSize / 2 + 1, 0, Math.PI * 2);
+        ctx.strokeStyle = this.ctx.gui_states.drawing.brushColor;
+        ctx.stroke();
+    }
+    // ── Private helpers ────────────────────────────────────────
+    /** Capture pre-draw slice snapshot for undo */
+    capturePreDrawSnapshot() {
+        try {
+            this.preDrawAxis = this.ctx.protectedData.axis;
+            this.preDrawSliceIndex = this.ctx.nrrd_states.view.currentSliceIndex;
+            const vol = this.callbacks.getVolumeForLayer(this.ctx.gui_states.layerChannel.layer);
+            this.preDrawSlice = vol.getSliceUint8(this.preDrawSliceIndex, this.preDrawAxis).data.slice();
+        }
+        catch (_a) {
+            this.preDrawSlice = null;
+        }
+    }
+    /** Push delta to UndoManager after drawing completes */
+    pushUndoDelta() {
+        if (!this.preDrawSlice)
+            return;
+        try {
+            const vol = this.callbacks.getVolumeForLayer(this.ctx.gui_states.layerChannel.layer);
+            const { data: newSlice } = vol.getSliceUint8(this.preDrawSliceIndex, this.preDrawAxis);
+            const delta = {
+                layerId: this.ctx.gui_states.layerChannel.layer,
+                axis: this.preDrawAxis,
+                sliceIndex: this.preDrawSliceIndex,
+                oldSlice: this.preDrawSlice,
+                newSlice: newSlice.slice(),
+            };
+            this.callbacks.pushUndoDelta(delta);
+        }
+        catch (_a) {
+            // Volume not ready — skip
+        }
+        this.preDrawSlice = null;
+    }
+    /**
+     * Redraws persisted layer data onto ctx before new pencil fill.
+     * Extracted from DrawToolCore.
+     */
+    redrawPreviousImageToLayerCtx(ctx) {
+        var _a;
+        const tempPreImg = (_a = this.callbacks.filterDrawedImage(this.ctx.protectedData.axis, this.ctx.nrrd_states.view.currentSliceIndex)) === null || _a === void 0 ? void 0 : _a.image;
+        this.ctx.protectedData.canvases.emptyCanvas.width =
+            this.ctx.protectedData.canvases.emptyCanvas.width;
+        this.ctx.protectedData.ctxes.emptyCtx.putImageData(tempPreImg, 0, 0);
+        ctx.imageSmoothingEnabled = false;
+        // Coronal (axis='y') Z-flip: same as renderSliceToCanvas.
+        if (this.ctx.protectedData.axis === 'y') {
+            ctx.save();
+            ctx.scale(1, -1);
+            ctx.translate(0, -this.ctx.nrrd_states.view.changedHeight);
+        }
+        ctx.drawImage(this.ctx.protectedData.canvases.emptyCanvas, 0, 0, this.ctx.nrrd_states.view.changedWidth, this.ctx.nrrd_states.view.changedHeight);
+        if (this.ctx.protectedData.axis === 'y') {
+            ctx.restore();
+        }
+    }
+    /** Draw a line segment on a layer canvas */
+    drawLinesOnLayer(ctx, x, y) {
+        ctx.beginPath();
+        ctx.moveTo(this.ctx.nrrd_states.interaction.drawStartPos.x, this.ctx.nrrd_states.interaction.drawStartPos.y);
+        if (this.ctx.gui_states.mode.pencil) {
+            ctx.strokeStyle = this.ctx.gui_states.drawing.color;
+            ctx.lineWidth = this.ctx.gui_states.drawing.lineWidth;
+        }
+        else {
+            ctx.strokeStyle = this.ctx.gui_states.drawing.brushColor;
+            ctx.lineWidth = this.ctx.gui_states.drawing.brushAndEraserSize;
+        }
+        ctx.lineTo(x, y);
+        ctx.stroke();
+        ctx.closePath();
+    }
+    /** Paint a segment on the current layer canvas and composite to master */
+    paintOnCanvasLayer(x, y) {
+        const { ctx } = this.callbacks.setCurrentLayer();
+        // Draw only on the current layer canvas (not master directly)
+        this.drawLinesOnLayer(ctx, x, y);
+        // Composite all layers to master to preserve other layers' data
+        this.callbacks.compositeAllLayers();
+        // Reset drawing start position to current position
+        this.ctx.nrrd_states.interaction.drawStartPos.x = x;
+        this.ctx.nrrd_states.interaction.drawStartPos.y = y;
+        // Flag the map as needing updating
+        this.ctx.protectedData.mainPreSlices.mesh.material.map.needsUpdate = true;
+    }
+}
+//# sourceMappingURL=DrawingTool.js.map

package/dist/Utils/segmentation/tools/DrawingTool.js.map

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

package/dist/Utils/segmentation/tools/EraserTool.js

@@ -16,9 +16,9 @@ export class EraserTool extends BaseTool {
     createClearArc() {
         const clearArc = (x, y, radius) => {
             var _a;
-            const activeChannel = this.ctx.gui_states.activeChannel || 1;
+            const activeChannel = this.ctx.gui_states.layerChannel.activeChannel || 1;
             // Get color from current layer's volume (respects custom per-layer colors)
-            const layer = this.ctx.gui_states.layer;
+            const layer = this.ctx.gui_states.layerChannel.layer;
             const volume = this.ctx.protectedData.maskData.volumes[layer];
             const channelColor = volume
                 ? volume.getChannelColor(activeChannel)
@@ -31,8 +31,8 @@ export class EraserTool extends BaseTool {
             // Calculate bounding box of the eraser circle
             const x0 = Math.max(0, Math.floor(x - radius));
             const y0 = Math.max(0, Math.floor(y - radius));
-            const x1 = Math.min(this.ctx.nrrd_states.changedWidth, Math.ceil(x + radius));
-            const y1 = Math.min(this.ctx.nrrd_states.changedHeight, Math.ceil(y + radius));
+            const x1 = Math.min(this.ctx.nrrd_states.view.changedWidth, Math.ceil(x + radius));
+            const y1 = Math.min(this.ctx.nrrd_states.view.changedHeight, Math.ceil(y + radius));
             const w = x1 - x0;
             const h = y1 - y0;
             if (w <= 0 || h <= 0)
@@ -75,11 +75,11 @@ export class EraserTool extends BaseTool {
             // Recomposite master from all layer canvases (full alpha;
             // globalAlpha applied in start() render loop).
             const masterCtx = this.ctx.protectedData.ctxes.drawingLayerMasterCtx;
-            const fullW = this.ctx.nrrd_states.changedWidth;
-            const fullH = this.ctx.nrrd_states.changedHeight;
+            const fullW = this.ctx.nrrd_states.view.changedWidth;
+            const fullH = this.ctx.nrrd_states.view.changedHeight;
             masterCtx.clearRect(0, 0, fullW, fullH);
-            for (const layerId of this.ctx.nrrd_states.layers) {
-                if (!this.ctx.gui_states.layerVisibility[layerId])
+            for (const layerId of this.ctx.nrrd_states.image.layers) {
+                if (!this.ctx.gui_states.layerChannel.layerVisibility[layerId])
                     continue;
                 const lt = this.ctx.protectedData.layerTargets.get(layerId);
                 if (lt)