copper3d 3.0.1 → 3.1.0

package/dist/Utils/segmentation/CanvasState.d.ts

@@ -0,0 +1,31 @@
+import { IProtected, ICursorPage, IKeyBoardSettings, IAnnotationCallbacks } from "./core/types";
+import { NrrdState } from "./coreTools/NrrdState";
+import { GuiState } from "./coreTools/GuiState";
+/**
+ * CanvasState — Pure state container.
+ *
+ * Holds all shared mutable state that was previously scattered across the
+ * CommToolsData base class.  No rendering logic lives here; rendering is
+ * handled by {@link RenderingUtils}.
+ *
+ * Created once by NrrdTools and shared (by reference) with DrawToolCore,
+ * RenderingUtils, DragOperator, and all legacy Tool instances.
+ */
+export declare class CanvasState {
+    baseCanvasesSize: number;
+    /** External annotation callbacks — set via draw() options */
+    annotationCallbacks: IAnnotationCallbacks;
+    /** Whether the keyboard-config dialog is open (suppresses all shortcuts). */
+    configKeyBoard: boolean;
+    /** Active keyboard shortcut bindings. */
+    keyboardSettings: IKeyBoardSettings;
+    nrrd_states: NrrdState;
+    gui_states: GuiState;
+    protectedData: IProtected;
+    cursorPage: ICursorPage;
+    constructor(container: HTMLElement, mainAreaContainer: HTMLElement, options?: {
+        layers?: string[];
+    });
+    private generateSystemCanvases;
+    private generateLayerTargets;
+}

package/dist/Utils/segmentation/CanvasState.js

@@ -0,0 +1,167 @@
+import { NrrdState } from "./coreTools/NrrdState";
+import { GuiState } from "./coreTools/GuiState";
+import { MaskVolume } from "./core/index";
+import { switchPencilIcon } from "../utils";
+import { CHANNEL_HEX_COLORS } from "./core/types";
+/**
+ * CanvasState — Pure state container.
+ *
+ * Holds all shared mutable state that was previously scattered across the
+ * CommToolsData base class.  No rendering logic lives here; rendering is
+ * handled by {@link RenderingUtils}.
+ *
+ * Created once by NrrdTools and shared (by reference) with DrawToolCore,
+ * RenderingUtils, DragOperator, and all legacy Tool instances.
+ */
+export class CanvasState {
+    constructor(container, mainAreaContainer, options) {
+        var _a;
+        this.baseCanvasesSize = 1;
+        /** External annotation callbacks — set via draw() options */
+        this.annotationCallbacks = {
+            onMaskChanged: () => { },
+            onSphereChanged: () => { },
+            onCalculatorPositionsChanged: () => { },
+            onLayerVolumeCleared: () => { },
+            onChannelColorChanged: () => { },
+        };
+        /** Whether the keyboard-config dialog is open (suppresses all shortcuts). */
+        this.configKeyBoard = false;
+        /** Active keyboard shortcut bindings. */
+        this.keyboardSettings = {
+            draw: "Shift",
+            undo: "z",
+            redo: "y",
+            contrast: ["Control", "Meta"],
+            crosshair: "s",
+            sphere: "q",
+            mouseWheel: "Scroll:Zoom",
+        };
+        this.cursorPage = {
+            x: {
+                cursorPageX: 0,
+                cursorPageY: 0,
+                index: 0,
+                updated: false,
+            },
+            y: {
+                cursorPageX: 0,
+                cursorPageY: 0,
+                index: 0,
+                updated: false,
+            },
+            z: {
+                cursorPageX: 0,
+                cursorPageY: 0,
+                index: 0,
+                updated: false,
+            },
+        };
+        const layers = (_a = options === null || options === void 0 ? void 0 : options.layers) !== null && _a !== void 0 ? _a : ["layer1", "layer2", "layer3"];
+        if (layers.length > 10) {
+            console.warn(`CanvasState: ${layers.length} layers requested; recommended maximum is 10.`);
+        }
+        this.nrrd_states = new NrrdState(this.baseCanvasesSize);
+        this.gui_states = new GuiState({
+            defaultPaintCursor: switchPencilIcon("dot"),
+            defaultFillColor: CHANNEL_HEX_COLORS[1],
+            defaultBrushColor: CHANNEL_HEX_COLORS[1],
+        });
+        // Override the default states with the actual layer list
+        this.nrrd_states.image.layers = layers;
+        this.gui_states.layerChannel.layerVisibility = Object.fromEntries(layers.map((id) => [id, true]));
+        this.gui_states.layerChannel.channelVisibility = Object.fromEntries(layers.map((id) => [
+            id,
+            { 1: true, 2: true, 3: true, 4: true, 5: true, 6: true, 7: true, 8: true },
+        ]));
+        const systemCanvases = this.generateSystemCanvases();
+        const layerTargets = this.generateLayerTargets(layers);
+        // Get NRRD dimensions (will be set later when NRRD loads)
+        // Default to 1x1x1 for now, will be re-initialized in NrrdTools when dimensions are known
+        const dims = this.nrrd_states.image.dimensions;
+        const [width, height, depth] = dims.length === 3 ? dims : [1, 1, 1];
+        this.protectedData = {
+            container,
+            mainAreaContainer,
+            allSlicesArray: [],
+            displaySlices: [],
+            backUpDisplaySlices: [],
+            skipSlicesDic: {},
+            currentShowingSlice: undefined,
+            mainPreSlices: undefined,
+            isDrawing: false,
+            axis: "z",
+            maskData: {
+                // Volumetric storage (Phase 3 — only storage mechanism)
+                volumes: layers.reduce((acc, id) => {
+                    acc[id] = new MaskVolume(width, height, depth, 1);
+                    return acc;
+                }, {}),
+            },
+            layerTargets,
+            canvases: {
+                /**
+                 * Caches raw image data from the current slice.
+                 * Used as a source for zoom/pan operations to avoid repeated decoding.
+                 * Initialized as null, set in NrrdTools.ts.
+                 */
+                originCanvas: null,
+                /**
+                 * Top-most interaction layer.
+                 * Captures mouse/pen events and displays real-time drawing strokes
+                 * before they are committed to a specific layer.
+                 */
+                drawingCanvas: systemCanvases.drawingCanvas,
+                /**
+                 * Background layer displaying the actual medical image slice (CT/MRI).
+                 * This is the "base" image the user sees.
+                 */
+                displayCanvas: systemCanvases.displayCanvas,
+                /**
+                 * Composite display layer.
+                 * Merges all segmentation layers for unified visualization
+                 * on top of the medical image.
+                 */
+                drawingCanvasLayerMaster: systemCanvases.drawingCanvasLayerMaster,
+                /**
+                 * Dedicated layer for 3D Sphere tool visualization.
+                 * Kept separate to allow independent rendering of sphere UI elements.
+                 */
+                drawingSphereCanvas: systemCanvases.drawingSphereCanvas,
+                /**
+                 * Off-screen scratchpad canvas.
+                 * Used for internal image processing, scaling, and format conversion.
+                 */
+                emptyCanvas: systemCanvases.emptyCanvas,
+            },
+            ctxes: {
+                drawingCtx: systemCanvases.drawingCanvas.getContext("2d"),
+                displayCtx: systemCanvases.displayCanvas.getContext("2d"),
+                drawingLayerMasterCtx: systemCanvases.drawingCanvasLayerMaster.getContext("2d"),
+                drawingSphereCtx: systemCanvases.drawingSphereCanvas.getContext("2d"),
+                emptyCtx: systemCanvases.emptyCanvas.getContext("2d", {
+                    willReadFrequently: true,
+                }),
+            },
+        };
+    }
+    generateSystemCanvases() {
+        return {
+            drawingCanvas: document.createElement("canvas"),
+            displayCanvas: document.createElement("canvas"),
+            drawingCanvasLayerMaster: document.createElement("canvas"),
+            drawingSphereCanvas: document.createElement("canvas"),
+            emptyCanvas: document.createElement("canvas"),
+        };
+    }
+    generateLayerTargets(layerIds) {
+        const map = new Map();
+        for (const id of layerIds) {
+            const canvas = document.createElement("canvas");
+            const ctx = canvas.getContext("2d");
+            map.set(id, { canvas, ctx });
+        }
+        return map;
+    }
+}
+//# sourceMappingURL=CanvasState.js.map

package/dist/Utils/segmentation/CanvasState.js.map

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

package/dist/Utils/segmentation/DragOperator.d.ts

@@ -1,4 +1,6 @@
-import { IDragOpts, IDrawingEvents, IProtected, IGUIStates, INrrdStates } from "./coreTools/coreType";
+import { IDragOpts, IDrawingEvents, IProtected } from "./core/types";
+import { NrrdState } from "./coreTools/NrrdState";
+import { GuiState } from "./coreTools/GuiState";
 import type { EventRouter } from "./eventRouter";
 export declare class DragOperator {
     container: HTMLElement;
@@ -16,10 +18,16 @@ export declare class DragOperator {
     private setEmptyCanvasSize;
     private getOrCreateSliceBuffer;
     private renderSliceToCanvas;
+    private refreshSphereOverlayCb;
     private eventRouter;
-    constructor(container: HTMLElement, nrrd_sates: INrrdStates, gui_states: IGUIStates, protectedData: IProtected, drawingPrameters: IDrawingEvents, setSyncsliceNum: () => void, setIsDrawFalse: (target: number) => void, flipDisplayImageByAxis: () => void, setEmptyCanvasSize: (axis?: "x" | "y" | "z") => void, getOrCreateSliceBuffer: (axis: "x" | "y" | "z") => ImageData | null, renderSliceToCanvas: (layer: string, axis: "x" | "y" | "z", sliceIndex: number, buffer: ImageData, targetCtx: CanvasRenderingContext2D, scaledWidth: number, scaledHeight: number) => void);
+    constructor(container: HTMLElement, nrrd_sates: NrrdState, gui_states: GuiState, protectedData: IProtected, drawingPrameters: IDrawingEvents, setSyncsliceNum: () => void, setIsDrawFalse: (target: number) => void, flipDisplayImageByAxis: () => void, setEmptyCanvasSize: (axis?: "x" | "y" | "z") => void, getOrCreateSliceBuffer: (axis: "x" | "y" | "z") => ImageData | null, renderSliceToCanvas: (layer: string, axis: "x" | "y" | "z", sliceIndex: number, buffer: ImageData, targetCtx: CanvasRenderingContext2D, scaledWidth: number, scaledHeight: number) => void);
     private init;
     setShowDragNumberDiv(sliceIndexContainer: HTMLDivElement): void;
+    /**
+     * Set the sphere overlay refresh callback.
+     * Called by NrrdTools after DrawToolCore is initialized.
+     */
+    setRefreshSphereOverlay(cb: () => void): void;
     /**
      * Set the EventRouter reference for centralized event handling.
      * Called by NrrdTools/DrawToolCore after EventRouter is initialized.

package/dist/Utils/segmentation/DragOperator.js

@@ -13,6 +13,7 @@ export class DragOperator {
             handleOnDragMouseMove: (ev) => { },
         };
         this.sensitiveArray = [];
+        this.refreshSphereOverlayCb = null;
         // EventRouter for centralized event handling
         this.eventRouter = null;
         this.configDragMode = () => {
@@ -41,7 +42,7 @@ export class DragOperator {
         this.init();
     }
     init() {
-        for (let i = 0; i < this.gui_states.max_sensitive; i++) {
+        for (let i = 0; i < this.gui_states.viewConfig.max_sensitive; i++) {
             this.sensitiveArray.push((i + 1) / 20);
         }
         const dragEffectCanvases = {
@@ -62,12 +63,20 @@ export class DragOperator {
             setEmptyCanvasSize: (axis) => this.setEmptyCanvasSize(axis),
             getOrCreateSliceBuffer: (axis) => this.getOrCreateSliceBuffer(axis),
             renderSliceToCanvas: (layer, axis, sliceIndex, buffer, targetCtx, w, h) => this.renderSliceToCanvas(layer, axis, sliceIndex, buffer, targetCtx, w, h),
+            refreshSphereOverlay: () => { var _a; return (_a = this.refreshSphereOverlayCb) === null || _a === void 0 ? void 0 : _a.call(this); },
         }, this.showDragNumberDiv, dragEffectCanvases);
     }
     setShowDragNumberDiv(sliceIndexContainer) {
         this.showDragNumberDiv = sliceIndexContainer;
         this.dragSliceTool.setShowDragNumberDiv(sliceIndexContainer);
     }
+    /**
+     * Set the sphere overlay refresh callback.
+     * Called by NrrdTools after DrawToolCore is initialized.
+     */
+    setRefreshSphereOverlay(cb) {
+        this.refreshSphereOverlayCb = cb;
+    }
     /**
      * Set the EventRouter reference for centralized event handling.
      * Called by NrrdTools/DrawToolCore after EventRouter is initialized.
@@ -84,8 +93,9 @@ export class DragOperator {
                 this.removeDragMode();
             }
             // When leaving draw, contrast, or crosshair mode (returning to idle), restore drag mode
+            // Do NOT restore if sphere mode is active
             if ((prev === 'draw' || prev === 'contrast' || prev === 'crosshair') && next === 'idle') {
-                if (!this.gui_states.sphere) {
+                if (!this.gui_states.mode.sphere) {
                     this.configDragMode();
                 }
             }
@@ -98,13 +108,12 @@ export class DragOperator {
             this.container.appendChild(this.showDragNumberDiv);
         }
         this.dragPrameters.handleOnDragMouseDown = (ev) => {
-            // before start drag event, remove wheel event.
-            this.protectedData.canvases.drawingCanvas.removeEventListener("wheel", this.drawingPrameters.handleMouseZoomSliceWheel);
+            // Wheel is now managed by EventRouter's wheel dispatcher (no manual remove needed)
             if (ev.button === 0) {
                 this.dragPrameters.y = ev.offsetY / this.dragPrameters.h;
                 this.container.addEventListener("pointermove", this.dragPrameters.handleOnDragMouseMove, false);
                 this.dragPrameters.sensivity =
-                    this.sensitiveArray[this.gui_states.dragSensitivity - 1];
+                    this.sensitiveArray[this.gui_states.viewConfig.dragSensitivity - 1];
             }
         };
         this.dragPrameters.handleOnDragMouseMove = throttle((ev) => {
@@ -118,12 +127,11 @@ export class DragOperator {
             }
             this.updateIndex(this.dragPrameters.move);
             (opts === null || opts === void 0 ? void 0 : opts.getSliceNum) &&
-                opts.getSliceNum(this.nrrd_states.currentIndex, this.nrrd_states.contrastNum);
+                opts.getSliceNum(this.nrrd_states.view.currentSliceIndex, this.nrrd_states.view.contrastNum);
             this.dragPrameters.y = ev.offsetY / this.dragPrameters.h;
         }, this.dragPrameters.sensivity * 200);
         this.dragPrameters.handleOnDragMouseUp = (ev) => {
-            // after drag, add the wheel event
-            this.protectedData.canvases.drawingCanvas.addEventListener("wheel", this.drawingPrameters.handleMouseZoomSliceWheel);
+            // Wheel is now managed by EventRouter's wheel dispatcher (no manual add needed)
             this.setSyncsliceNum();
             this.container.removeEventListener("pointermove", this.dragPrameters.handleOnDragMouseMove, false);
         };

package/dist/Utils/segmentation/DragOperator.js.map

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

package/dist/Utils/segmentation/DrawToolCore.d.ts

@@ -1,51 +1,66 @@
-import { IConvertObjType, IDrawingEvents, IContrastEvents, IDrawOpts } from "./coreTools/coreType";
-import { CommToolsData } from "./CommToolsData";
+import { IConvertObjType, IDrawingEvents, IContrastEvents, IDrawOpts } from "./core/types";
+import { CanvasState } from "./CanvasState";
+import { RenderingUtils } from "./RenderingUtils";
 import { EventRouter } from "./eventRouter";
 import { SphereTool } from "./tools/SphereTool";
 import { CrosshairTool } from "./tools/CrosshairTool";
 import { ContrastTool } from "./tools/ContrastTool";
 import { ZoomTool } from "./tools/ZoomTool";
 import { EraserTool } from "./tools/EraserTool";
+import { PanTool } from "./tools/PanTool";
+import { DrawingTool } from "./tools/DrawingTool";
 import { ImageStoreHelper } from "./tools/ImageStoreHelper";
 import { UndoManager } from "./core";
-export declare class DrawToolCore extends CommToolsData {
+/**
+ * DrawToolCore — Tool orchestration and event routing.
+ *
+ * Previously extended CommToolsData; now uses composition:
+ * - `state: CanvasState` — pure state container
+ * - `renderer: RenderingUtils` — rendering / slice-buffer helpers
+ *
+ * Created by NrrdTools which passes in a shared CanvasState.
+ */
+export declare class DrawToolCore {
     container: HTMLElement;
     mainAreaContainer: HTMLDivElement;
+    /** Shared state container (created by NrrdTools, passed in). */
+    readonly state: CanvasState;
+    /** Rendering utilities (created here, uses shared state). */
+    readonly renderer: RenderingUtils;
     drawingPrameters: IDrawingEvents;
     contrastEventPrameters: IContrastEvents;
     eraserUrls: string[];
     pencilUrls: string[];
     undoManager: UndoManager;
-    /** Snapshot of the active layer's slice captured on mouse-down (before drawing). */
-    private preDrawSlice;
-    private preDrawAxis;
-    private preDrawSliceIndex;
-    protected eventRouter: EventRouter | null;
-    protected sphereTool: SphereTool;
-    protected crosshairTool: CrosshairTool;
+    eventRouter: EventRouter;
+    sphereTool: SphereTool;
+    crosshairTool: CrosshairTool;
     protected contrastTool: ContrastTool;
     protected zoomTool: ZoomTool;
     protected eraserTool: EraserTool;
+    protected panTool: PanTool;
+    protected drawingTool: DrawingTool;
     protected imageStoreHelper: ImageStoreHelper;
+    /** Slice index recorded when paintOnCanvas() starts, guards stale-click */
+    private paintSliceIndex;
+    /** Wheel event dispatch mode — replaces manual wheel add/remove (Phase 2) */
+    private activeWheelMode;
     start: () => void;
-    constructor(container: HTMLElement, options?: {
-        layers?: string[];
-    });
+    constructor(container: HTMLElement, state: CanvasState);
     private initTools;
     private initDrawToolCore;
     setEraserUrls(urls: string[]): void;
     setPencilIconUrls(urls: string[]): void;
     private setCurrentLayer;
     draw(opts?: IDrawOpts): void;
-    drawCalSphereDown(x: number, y: number, sliceIndex: number, cal_position: "tumour" | "skin" | "nipple" | "ribcage"): void;
-    drawCalSphereUp(): void;
     private zoomActionAfterDrawSphere;
-    private clearSpherePrintStoreImages;
     private paintOnCanvas;
-    /*************************************May consider to move outside *******************************************/
-    private drawLine;
-    private drawLinesOnLayer;
-    private paintOnCanvasLayer;
+    /**
+     * Extracted from paintOnCanvas() pointerleave handler.
+     */
+    private handlePointerLeave;
+    /** Extracted from paintOnCanvas() — handles sphere placement on left-click */
+    private handleSphereClick;
     private initAllCanvas;
     private useEraser;
     configMouseZoomWheel(): (e: WheelEvent) => void;
@@ -54,10 +69,13 @@ export declare class DrawToolCore extends CommToolsData {
     drawImageOnEmptyImage(canvas: HTMLCanvasElement): void;
     /****************************Sphere functions (delegated to SphereTool)****************************************************/
     drawCalculatorSphereOnEachViews(axis: "x" | "y" | "z"): void;
-    private drawSphereOnEachViews;
     private configMouseSphereWheel;
     drawCalculatorSphere(radius: number): void;
     drawSphere(mouseX: number, mouseY: number, radius: number): void;
+    /**
+     * Refresh sphere canvas from sphereMaskVolume for the current slice/axis.
+     */
+    refreshSphereOverlay(): void;
     /**
      * Convert cursor point between axis views.
      * Delegated to CrosshairTool.
@@ -68,38 +86,49 @@ export declare class DrawToolCore extends CommToolsData {
     getRestLayer(): string[];
     /**************************** Undo/Redo functions (Phase 6 — Delta-based) ****************************/
     /**
-     * Clear mask on current slice canvas.
-     *
-     * Only clears the active layer's MaskVolume slice data.
-     * Other layers are left untouched. After clearing, all layer canvases
-     * are re-rendered from MaskVolume to keep visuals in sync.
+     * Clear the mask on the current slice canvas for the active layer ONLY.
      */
-    clearPaint(): void;
+    clearActiveSlice(): void;
     /**
      * Undo the last drawing operation on the active layer.
-     * Restores the MaskVolume slice to its pre-draw state, re-renders
-     * the canvas, and notifies the backend.
      */
     undoLastPainting(): void;
     /**
      * Redo the last undone operation on the active layer.
-     * Reapplies the MaskVolume slice to its post-draw state, re-renders
-     * the canvas, and notifies the backend.
      */
     redoLastPainting(): void;
     /**
      * Re-render a layer canvas from MaskVolume and composite to master.
-     * Called after writing oldSlice/newSlice back to the volume during undo/redo.
      */
     private applyUndoRedoToCanvas;
     /****************************Store images (delegated to ImageStoreHelper)****************************************************/
-    storeAllImages(index: number, layer: string): void;
-    storeImageToLayer(index: number, canvas: HTMLCanvasElement): ImageData;
-    storeEachLayerImage(index: number, layer: string): void;
+    syncLayerSliceData(index: number, layer: string): void;
     /******************************** Utils gui related functions (delegated to ContrastTool) ***************************************/
     setupConrastEvents(callback: (step: number, towards: "horizental" | "vertical") => void): void;
     configContrastDragMode: () => void;
     removeContrastDragMode: () => void;
     updateSlicesContrast: (value: number, flag: string) => void;
     repraintCurrentContrastSlice: () => void;
+    /** Override in NrrdTools */
+    setIsDrawFalse(target: number): void;
+    /** Override in NrrdTools */
+    setSyncsliceNum(): void;
+    /** Override in NrrdTools */
+    resetPaintAreaUIPosition(l?: number, t?: number): void;
+    /** Override in NrrdTools */
+    resizePaintArea(factor: number): void;
+    /** Override in NrrdTools */
+    setEmptyCanvasSize(axis?: "x" | "y" | "z"): void;
+    /** Override in NrrdTools */
+    flipDisplayImageByAxis(): void;
+    /** Override in NrrdTools */
+    updateOriginAndChangedWH(): void;
+    /** Override in NrrdTools */
+    resetLayerCanvas(): void;
+    /** Override in NrrdTools */
+    redrawDisplayCanvas(): void;
+    /** Override in NrrdTools */
+    enterSphereMode(): void;
+    /** Override in NrrdTools */
+    exitSphereMode(): void;
 }