copper3d 3.0.2 → 3.1.1

package/dist/index.d.ts

@@ -17,13 +17,13 @@ import { Copper3dTrackballControls } from "./Controls/Copper3dTrackballControls"
 import { MeshNodeTool } from "./Utils/MeshNodeTool";
 import { removeGuiFolderChilden } from "./Utils/segmentation/coreTools/gui";
 import { nrrdMeshesType, nrrdSliceType, SensorDecodedValue_kiwrious, SensorReadResult_kiwrious, HeartRateResult_kiwrious, loadingBarType, exportPaintImageType, IOptVTKLoader } from "./types/types";
-import { IPaintImage, ICommXYZ, IGUIStates, IGuiParameterSettings, INrrdStates, IGuiMeta } from "./Utils/segmentation/coreTools/coreType";
+import { IPaintImage, ICommXYZ, IGUIStates, IGuiParameterSettings, INrrdStates, IGuiMeta } from "./Utils/segmentation/core/types";
 import { NrrdState } from "./Utils/segmentation/coreTools/NrrdState";
 import { GuiState } from "./Utils/segmentation/coreTools/GuiState";
-import type { ToolMode, IAnnotationCallbacks } from "./Utils/segmentation/coreTools/coreType";
+import type { ToolMode, IAnnotationCallbacks } from "./Utils/segmentation/core/types";
 import { CHANNEL_COLORS, CHANNEL_HEX_COLORS, rgbaToHex, rgbaToCss } from "./Utils/segmentation/core/index";
 import type { LayerId, ChannelValue } from "./Utils/segmentation/core/index";
 import "./css/style.css";
-export declare const REVISION = "v3.0.2-beta";
+export declare const REVISION = "v3.1.1-beta";
 export { copperRenderer, copperRendererOnDemond, copperMSceneRenderer, setHDRFilePath, addLabelToScene, convert3DPostoScreenPos, convertScreenPosto3DPos, addBoxHelper, fullScreenListenner, configKiwriousHeart, copperScene, copperSceneOnDemond, copperMScene, CameraViewPoint, kiwrious, NrrdTools, loading, Copper3dTrackballControls, createTexture2D_NRRD, MeshNodeTool, throttle, removeGuiFolderChilden, CHANNEL_COLORS, CHANNEL_HEX_COLORS, rgbaToHex, rgbaToCss, };
 export type { positionType, screenPosType, optsType, nrrdMeshesType, nrrdSliceType, SensorDecodedValue_kiwrious, SensorReadResult_kiwrious, HeartRateResult_kiwrious, loadingBarType, IPaintImage, exportPaintImageType, IOptVTKLoader, ICommXYZ, IGUIStates, IGuiParameterSettings, INrrdStates, NrrdState, GuiState, IGuiMeta, ToolMode, IAnnotationCallbacks, LayerId, ChannelValue, };

package/dist/index.js

@@ -20,7 +20,7 @@ import { MeshNodeTool } from "./Utils/MeshNodeTool";
 import { removeGuiFolderChilden } from "./Utils/segmentation/coreTools/gui";
 import { CHANNEL_COLORS, CHANNEL_HEX_COLORS, rgbaToHex, rgbaToCss } from "./Utils/segmentation/core/index";
 import "./css/style.css";
-export const REVISION = "v3.0.2-beta";
+export const REVISION = "v3.1.1-beta";
 console.log(`%cCopper3D Visualisation %cBeta:${REVISION}`, "padding: 3px;color:white; background:#023047", "padding: 3px;color:white; background:#f50a25");
 export { copperRenderer, copperRendererOnDemond, copperMSceneRenderer, setHDRFilePath, addLabelToScene, convert3DPostoScreenPos, convertScreenPosto3DPos, addBoxHelper, fullScreenListenner, configKiwriousHeart, copperScene, copperSceneOnDemond, copperMScene, CameraViewPoint, kiwrious, NrrdTools, loading, Copper3dTrackballControls, createTexture2D_NRRD, MeshNodeTool, throttle, removeGuiFolderChilden, CHANNEL_COLORS, CHANNEL_HEX_COLORS, rgbaToHex, rgbaToCss, };
 //# sourceMappingURL=index.js.map

package/dist/types/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/types/Utils/segmentation/DragOperator.d.ts

@@ -1,4 +1,4 @@
-import { IDragOpts, IDrawingEvents, IProtected } 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";

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

@@ -1,5 +1,6 @@
-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";
@@ -10,17 +11,30 @@ 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;
-    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;
@@ -29,10 +43,10 @@ export declare class DrawToolCore extends CommToolsData {
     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;
@@ -40,12 +54,13 @@ export declare class DrawToolCore extends CommToolsData {
     private setCurrentLayer;
     draw(opts?: IDrawOpts): void;
     private zoomActionAfterDrawSphere;
-    private clearSpherePrintStoreImages;
     private paintOnCanvas;
+    /**
+     * Extracted from paintOnCanvas() pointerleave handler.
+     */
+    private handlePointerLeave;
     /** Extracted from paintOnCanvas() — handles sphere placement on left-click */
     private handleSphereClick;
-    /*************************************May consider to move outside *******************************************/
-    private drawLine;
     private initAllCanvas;
     private useEraser;
     configMouseZoomWheel(): (e: WheelEvent) => void;
@@ -54,13 +69,11 @@ 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.
-     * Called after view changes (slice switch, zoom, contrast, axis switch).
      */
     refreshSphereOverlay(): void;
     /**
@@ -74,31 +87,18 @@ export declare class DrawToolCore extends CommToolsData {
     /**************************** Undo/Redo functions (Phase 6 — Delta-based) ****************************/
     /**
      * Clear the mask on the current slice canvas for the active layer ONLY.
-     *
-     * This method only clears the active layer's MaskVolume slice data for the
-     * currently viewed slice index. Other slices in the same layer remain intact.
-     * Other background layers are also left untouched.
-     * After clearing, all layer canvases are re-rendered from the `MaskVolume`
-     * to keep the visuals in sync.
-     *
-     * The operation is recorded to the UndoManager to allow for user rollback.
      */
     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)****************************************************/
@@ -109,4 +109,26 @@ export declare class DrawToolCore extends CommToolsData {
     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;
 }