copper3d 3.1.1 → 3.2.0

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

@@ -0,0 +1,489 @@
+/**
+ * SphereBrushTool — 3D sphere brush and eraser on layer MaskVolume.
+ *
+ * Unlike SphereTool (which uses its own isolated sphereMaskVolume),
+ * this tool writes/erases directly in the active layer's shared MaskVolume —
+ * the same volume used by pencil/brush/eraser tools.
+ *
+ * Two operation modes handled by one class:
+ * - **sphereBrush**: Direct click to paint a 3D sphere of the active channel label.
+ * - **sphereEraser**: Shift+click to erase a 3D sphere (only voxels matching active channel).
+ *
+ * Interaction:
+ * 1. Pointer-down records sphere center, switches wheel to radius mode.
+ * 2. Scroll wheel adjusts sphereBrushRadius [1, 50].
+ * 3. Pointer-up writes/erases sphere to volume, captures grouped undo, refreshes canvas.
+ */
+import { BaseTool } from "./BaseTool";
+import { CHANNEL_HEX_COLORS } from "../core";
+export class SphereBrushTool extends BaseTool {
+    constructor(ctx, callbacks) {
+        super(ctx);
+        /** Recorded sphere center in canvas mm-space */
+        this.centerX = 0;
+        this.centerY = 0;
+        this.centerSlice = 0;
+        /** Whether a sphere placement is in progress */
+        this.active = false;
+        /** Current operation mode for the active placement */
+        this.mode = "brush";
+        /** Cumulative "before" snapshots for drag-erase undo (z-index → slice data) */
+        this.dragBeforeSnapshots = new Map();
+        /** Whether a drag-erase has actually moved (vs. simple click-release) */
+        this.dragMoved = false;
+        this.callbacks = callbacks;
+    }
+    setCallbacks(callbacks) {
+        this.callbacks = callbacks;
+    }
+    // ── Geometry (ported from SphereTool) ──────────────────────────
+    /**
+     * Convert canvas mm-space coordinates to 3D voxel coordinates.
+     */
+    canvasToVoxelCenter(canvasX, canvasY, sliceIndex, axis) {
+        const nrrd = this.ctx.nrrd_states;
+        switch (axis) {
+            case 'z':
+                return {
+                    x: canvasX * nrrd.image.nrrd_x_pixel / nrrd.image.nrrd_x_mm,
+                    y: canvasY * nrrd.image.nrrd_y_pixel / nrrd.image.nrrd_y_mm,
+                    z: sliceIndex,
+                };
+            case 'y':
+                return {
+                    x: canvasX * nrrd.image.nrrd_x_pixel / nrrd.image.nrrd_x_mm,
+                    y: sliceIndex,
+                    z: (nrrd.image.nrrd_z_mm - canvasY) * nrrd.image.nrrd_z_pixel / nrrd.image.nrrd_z_mm,
+                };
+            case 'x':
+                return {
+                    x: sliceIndex,
+                    y: canvasY * nrrd.image.nrrd_y_pixel / nrrd.image.nrrd_y_mm,
+                    z: canvasX * nrrd.image.nrrd_z_pixel / nrrd.image.nrrd_z_mm,
+                };
+        }
+    }
+    /**
+     * Convert mm radius to per-axis voxel radii.
+     */
+    getVoxelRadii(radius) {
+        const nrrd = this.ctx.nrrd_states;
+        return {
+            rx: radius * nrrd.image.nrrd_x_pixel / nrrd.image.nrrd_x_mm,
+            ry: radius * nrrd.image.nrrd_y_pixel / nrrd.image.nrrd_y_mm,
+            rz: radius * nrrd.image.nrrd_z_pixel / nrrd.image.nrrd_z_mm,
+        };
+    }
+    /**
+     * Compute clamped bounding box for an ellipsoid in voxel space.
+     */
+    getBoundingBox(center, radii, dims) {
+        return {
+            minX: Math.max(0, Math.floor(center.x - radii.rx)),
+            maxX: Math.min(dims.width - 1, Math.ceil(center.x + radii.rx)),
+            minY: Math.max(0, Math.floor(center.y - radii.ry)),
+            maxY: Math.min(dims.height - 1, Math.ceil(center.y + radii.ry)),
+            minZ: Math.max(0, Math.floor(center.z - radii.rz)),
+            maxZ: Math.min(dims.depth - 1, Math.ceil(center.z + radii.rz)),
+        };
+    }
+    // ── 3D Volume Write / Erase ────────────────────────────────────
+    /**
+     * Write a 3D sphere of the active channel label into the layer's MaskVolume.
+     */
+    write3DSphereToBrush(vol, center, radii, bb, label) {
+        const { rx, ry, rz } = radii;
+        for (let z = bb.minZ; z <= bb.maxZ; z++) {
+            for (let y = bb.minY; y <= bb.maxY; y++) {
+                for (let x = bb.minX; x <= bb.maxX; x++) {
+                    const dx = rx > 0 ? (x - center.x) / rx : 0;
+                    const dy = ry > 0 ? (y - center.y) / ry : 0;
+                    const dz = rz > 0 ? (z - center.z) / rz : 0;
+                    if (dx * dx + dy * dy + dz * dz <= 1.0) {
+                        vol.setVoxel(x, y, z, label);
+                    }
+                }
+            }
+        }
+    }
+    /**
+     * Erase a 3D sphere from the layer's MaskVolume.
+     * Only clears voxels whose current value equals the active channel label.
+     */
+    erase3DSphereFromVolume(vol, center, radii, bb, label) {
+        const { rx, ry, rz } = radii;
+        for (let z = bb.minZ; z <= bb.maxZ; z++) {
+            for (let y = bb.minY; y <= bb.maxY; y++) {
+                for (let x = bb.minX; x <= bb.maxX; x++) {
+                    const dx = rx > 0 ? (x - center.x) / rx : 0;
+                    const dy = ry > 0 ? (y - center.y) / ry : 0;
+                    const dz = rz > 0 ? (z - center.z) / rz : 0;
+                    if (dx * dx + dy * dy + dz * dz <= 1.0) {
+                        if (vol.getVoxel(x, y, z) === label) {
+                            vol.setVoxel(x, y, z, 0);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    // ── Undo Capture ───────────────────────────────────────────────
+    /**
+     * Capture slice snapshots for all Z-slices in the bounding box.
+     * Used before and after the sphere operation to build MaskDelta groups.
+     *
+     * We always capture along the Z axis since the 3D sphere spans Z slices.
+     */
+    captureSliceSnapshots(vol, minZ, maxZ) {
+        const snapshots = new Map();
+        for (let z = minZ; z <= maxZ; z++) {
+            try {
+                const { data } = vol.getSliceUint8(z, 'z');
+                snapshots.set(z, data.slice());
+            }
+            catch (_a) {
+                // slice out of bounds — skip
+            }
+        }
+        return snapshots;
+    }
+    /**
+     * Build MaskDelta group from before/after snapshots.
+     */
+    buildUndoGroup(layerId, before, after) {
+        const deltas = [];
+        for (const [sliceIndex, oldSlice] of before) {
+            const newSlice = after.get(sliceIndex);
+            if (!newSlice)
+                continue;
+            // Only include slices that actually changed
+            let changed = false;
+            for (let i = 0; i < oldSlice.length; i++) {
+                if (oldSlice[i] !== newSlice[i]) {
+                    changed = true;
+                    break;
+                }
+            }
+            if (changed) {
+                deltas.push({ layerId, axis: 'z', sliceIndex, oldSlice, newSlice });
+            }
+        }
+        return deltas;
+    }
+    // ── Preview Rendering ──────────────────────────────────────────
+    /**
+     * Draw a preview circle on the sphere canvas during sphere placement.
+     */
+    drawPreview(mouseX, mouseY, radius, isEraser) {
+        const sphereCanvas = this.ctx.protectedData.canvases.drawingSphereCanvas;
+        const sphereCtx = this.ctx.protectedData.ctxes.drawingSphereCtx;
+        // Clear and resize sphere canvas
+        sphereCanvas.width = this.ctx.protectedData.canvases.originCanvas.width;
+        sphereCanvas.height = this.ctx.protectedData.canvases.originCanvas.height;
+        sphereCtx.beginPath();
+        sphereCtx.arc(mouseX, mouseY, radius, 0, 2 * Math.PI);
+        if (isEraser) {
+            // Eraser preview: dashed outline
+            sphereCtx.strokeStyle = "#ff4444";
+            sphereCtx.lineWidth = 2;
+            sphereCtx.setLineDash([4, 4]);
+            sphereCtx.stroke();
+            sphereCtx.setLineDash([]);
+        }
+        else {
+            // Brush preview: semi-transparent fill with active channel color
+            const channel = this.ctx.gui_states.layerChannel.activeChannel || 1;
+            const color = this.getActiveChannelColor(channel);
+            sphereCtx.fillStyle = color;
+            sphereCtx.globalAlpha = 0.5;
+            sphereCtx.fill();
+            sphereCtx.globalAlpha = 1.0;
+        }
+        sphereCtx.closePath();
+    }
+    /**
+     * Clear the sphere preview canvas.
+     */
+    clearPreview() {
+        const sphereCanvas = this.ctx.protectedData.canvases.drawingSphereCanvas;
+        sphereCanvas.width = sphereCanvas.width;
+    }
+    /**
+     * Get the hex color for the active channel from the layer's MaskVolume.
+     */
+    getActiveChannelColor(channel) {
+        var _a;
+        const layer = this.ctx.gui_states.layerChannel.layer;
+        const volumes = this.ctx.protectedData.maskData.volumes;
+        const vol = volumes[layer];
+        if (vol) {
+            const rgba = vol.getChannelColor(channel);
+            const r = rgba.r.toString(16).padStart(2, '0');
+            const g = rgba.g.toString(16).padStart(2, '0');
+            const b = rgba.b.toString(16).padStart(2, '0');
+            return `#${r}${g}${b}`;
+        }
+        return (_a = CHANNEL_HEX_COLORS[channel]) !== null && _a !== void 0 ? _a : "#ff0000";
+    }
+    // ── Wheel Handler ──────────────────────────────────────────────
+    /**
+     * Returns a wheel event handler for adjusting sphereBrushRadius.
+     * Used in both sphereBrush and sphereEraser modes.
+     */
+    configSphereBrushWheel() {
+        return (e) => {
+            e.preventDefault();
+            const sphere = this.ctx.nrrd_states.sphere;
+            if (e.deltaY < 0) {
+                sphere.sphereBrushRadius += 1;
+            }
+            else {
+                sphere.sphereBrushRadius -= 1;
+            }
+            sphere.sphereBrushRadius = Math.max(1, Math.min(sphere.sphereBrushRadius, 50));
+            // Redraw preview
+            if (this.active) {
+                this.drawPreview(this.centerX, this.centerY, sphere.sphereBrushRadius, this.mode === "eraser");
+            }
+        };
+    }
+    // ── Sphere Brush Click/PointerUp ───────────────────────────────
+    /**
+     * Handle pointer-down in sphereBrush mode (direct click, no Shift needed).
+     */
+    onSphereBrushClick(e) {
+        this.centerX = e.offsetX / this.ctx.nrrd_states.view.sizeFactor;
+        this.centerY = e.offsetY / this.ctx.nrrd_states.view.sizeFactor;
+        this.centerSlice = this.ctx.nrrd_states.view.currentSliceIndex;
+        this.active = true;
+        this.mode = "brush";
+        this.drawPreview(this.centerX, this.centerY, this.ctx.nrrd_states.sphere.sphereBrushRadius, false);
+    }
+    /**
+     * Handle pointer-up in sphereBrush mode — write sphere to volume.
+     */
+    onSphereBrushPointerUp() {
+        if (!this.active || this.mode !== "brush")
+            return;
+        this.active = false;
+        const layer = this.ctx.gui_states.layerChannel.layer;
+        const channel = this.ctx.gui_states.layerChannel.activeChannel || 1;
+        const axis = this.ctx.protectedData.axis;
+        const radius = this.ctx.nrrd_states.sphere.sphereBrushRadius;
+        let vol;
+        try {
+            vol = this.callbacks.getVolumeForLayer(layer);
+        }
+        catch (_a) {
+            this.clearPreview();
+            return;
+        }
+        const dims = vol.getDimensions();
+        const center = this.canvasToVoxelCenter(this.centerX, this.centerY, this.centerSlice, axis);
+        const radii = this.getVoxelRadii(radius);
+        const bb = this.getBoundingBox(center, radii, dims);
+        // Capture pre-write snapshots
+        const before = this.captureSliceSnapshots(vol, bb.minZ, bb.maxZ);
+        // Write sphere
+        this.write3DSphereToBrush(vol, center, radii, bb, channel);
+        // Capture post-write snapshots and push undo group
+        const after = this.captureSliceSnapshots(vol, bb.minZ, bb.maxZ);
+        const deltas = this.buildUndoGroup(layer, before, after);
+        if (deltas.length > 0) {
+            this.callbacks.pushUndoGroup(deltas);
+        }
+        // Refresh display and notify backend of ALL changed slices
+        this.refreshDisplay(layer, deltas);
+        this.clearPreview();
+    }
+    // ── Sphere Eraser Click/PointerUp ──────────────────────────────
+    /**
+     * Handle pointer-down in sphereEraser mode.
+     * Initializes drag tracking for cumulative undo.
+     */
+    onSphereEraserClick(e) {
+        this.centerX = e.offsetX / this.ctx.nrrd_states.view.sizeFactor;
+        this.centerY = e.offsetY / this.ctx.nrrd_states.view.sizeFactor;
+        this.centerSlice = this.ctx.nrrd_states.view.currentSliceIndex;
+        this.active = true;
+        this.mode = "eraser";
+        this.dragMoved = false;
+        this.dragBeforeSnapshots.clear();
+        // Capture initial "before" snapshots for the first sphere position
+        const layer = this.ctx.gui_states.layerChannel.layer;
+        const radius = this.ctx.nrrd_states.sphere.sphereBrushRadius;
+        try {
+            const vol = this.callbacks.getVolumeForLayer(layer);
+            const dims = vol.getDimensions();
+            const axis = this.ctx.protectedData.axis;
+            const center = this.canvasToVoxelCenter(this.centerX, this.centerY, this.centerSlice, axis);
+            const radii = this.getVoxelRadii(radius);
+            const bb = this.getBoundingBox(center, radii, dims);
+            this.expandDragBeforeSnapshots(vol, bb.minZ, bb.maxZ);
+        }
+        catch (_a) {
+            // Volume not ready
+        }
+        this.drawPreview(this.centerX, this.centerY, radius, true);
+    }
+    /**
+     * Handle pointer-move in sphereEraser mode — drag to continuously erase.
+     */
+    onSphereEraserMove(e) {
+        if (!this.active || this.mode !== "eraser")
+            return;
+        this.dragMoved = true;
+        const mouseX = e.offsetX / this.ctx.nrrd_states.view.sizeFactor;
+        const mouseY = e.offsetY / this.ctx.nrrd_states.view.sizeFactor;
+        const sliceIndex = this.ctx.nrrd_states.view.currentSliceIndex;
+        const layer = this.ctx.gui_states.layerChannel.layer;
+        const channel = this.ctx.gui_states.layerChannel.activeChannel || 1;
+        const axis = this.ctx.protectedData.axis;
+        const radius = this.ctx.nrrd_states.sphere.sphereBrushRadius;
+        let vol;
+        try {
+            vol = this.callbacks.getVolumeForLayer(layer);
+        }
+        catch (_a) {
+            return;
+        }
+        const dims = vol.getDimensions();
+        const center = this.canvasToVoxelCenter(mouseX, mouseY, sliceIndex, axis);
+        const radii = this.getVoxelRadii(radius);
+        const bb = this.getBoundingBox(center, radii, dims);
+        // Expand "before" snapshots to cover any new Z slices
+        this.expandDragBeforeSnapshots(vol, bb.minZ, bb.maxZ);
+        // Erase sphere at current position
+        this.erase3DSphereFromVolume(vol, center, radii, bb, channel);
+        // Update preview position
+        this.drawPreview(mouseX, mouseY, radius, true);
+        // Refresh display so user sees the erase in real-time
+        this.refreshDisplay(layer);
+    }
+    /**
+     * Handle pointer-up in sphereEraser mode — finalize erase + push undo group.
+     * Works for both click-release and drag-release.
+     */
+    onSphereEraserPointerUp() {
+        if (!this.active || this.mode !== "eraser")
+            return;
+        this.active = false;
+        const layer = this.ctx.gui_states.layerChannel.layer;
+        const channel = this.ctx.gui_states.layerChannel.activeChannel || 1;
+        const axis = this.ctx.protectedData.axis;
+        const radius = this.ctx.nrrd_states.sphere.sphereBrushRadius;
+        let vol;
+        try {
+            vol = this.callbacks.getVolumeForLayer(layer);
+        }
+        catch (_a) {
+            this.clearPreview();
+            this.dragBeforeSnapshots.clear();
+            return;
+        }
+        // If no drag occurred, erase at the click position (original click-release behavior)
+        if (!this.dragMoved) {
+            const dims = vol.getDimensions();
+            const center = this.canvasToVoxelCenter(this.centerX, this.centerY, this.centerSlice, axis);
+            const radii = this.getVoxelRadii(radius);
+            const bb = this.getBoundingBox(center, radii, dims);
+            this.erase3DSphereFromVolume(vol, center, radii, bb, channel);
+        }
+        // Build undo group from cumulative "before" snapshots vs current state
+        const after = this.captureSliceSnapshots(vol, this.dragMinZ(), this.dragMaxZ());
+        const deltas = this.buildUndoGroup(layer, this.dragBeforeSnapshots, after);
+        if (deltas.length > 0) {
+            this.callbacks.pushUndoGroup(deltas);
+        }
+        // Refresh display and notify backend of ALL changed slices
+        this.refreshDisplay(layer, deltas);
+        this.clearPreview();
+        this.dragBeforeSnapshots.clear();
+    }
+    /**
+     * Expand cumulative "before" snapshots to cover z range [minZ, maxZ].
+     * Only captures slices not yet in the map (preserves original state).
+     */
+    expandDragBeforeSnapshots(vol, minZ, maxZ) {
+        for (let z = minZ; z <= maxZ; z++) {
+            if (!this.dragBeforeSnapshots.has(z)) {
+                try {
+                    const { data } = vol.getSliceUint8(z, 'z');
+                    this.dragBeforeSnapshots.set(z, data.slice());
+                }
+                catch (_a) {
+                    // slice out of bounds
+                }
+            }
+        }
+    }
+    /** Get minimum Z index from drag snapshots */
+    dragMinZ() {
+        let min = Infinity;
+        for (const z of this.dragBeforeSnapshots.keys()) {
+            if (z < min)
+                min = z;
+        }
+        return min === Infinity ? 0 : min;
+    }
+    /** Get maximum Z index from drag snapshots */
+    dragMaxZ() {
+        let max = -Infinity;
+        for (const z of this.dragBeforeSnapshots.keys()) {
+            if (z > max)
+                max = z;
+        }
+        return max === -Infinity ? 0 : max;
+    }
+    // ── Post-write Display Refresh ─────────────────────────────────
+    /**
+     * After writing/erasing the sphere in the volume, re-render the current
+     * slice's layer canvas and composite all layers to master.
+     *
+     * @param changedDeltas - If provided, fire onMaskChanged for ALL changed
+     *   slices (not just the current view slice) so the backend receives the
+     *   full 3D sphere data for NII/GLTF export.
+     */
+    refreshDisplay(layerId, changedDeltas) {
+        // Re-render layer canvas from volume for the current slice
+        const target = this.ctx.protectedData.layerTargets.get(layerId);
+        if (target) {
+            const { ctx, canvas } = target;
+            canvas.width = canvas.width; // clear
+            const buffer = this.callbacks.getOrCreateSliceBuffer(this.ctx.protectedData.axis);
+            if (buffer) {
+                this.callbacks.renderSliceToCanvas(layerId, this.ctx.protectedData.axis, this.ctx.nrrd_states.view.currentSliceIndex, buffer, ctx, this.ctx.nrrd_states.view.changedWidth, this.ctx.nrrd_states.view.changedHeight);
+            }
+        }
+        // Composite all layers to master canvas
+        this.callbacks.compositeAllLayers();
+        // Fire onMaskChanged for ALL changed slices (not just the current view slice)
+        // This ensures the backend receives the full 3D sphere data for export.
+        try {
+            const vol = this.callbacks.getVolumeForLayer(layerId);
+            const channel = this.ctx.gui_states.layerChannel.activeChannel || 1;
+            if (changedDeltas && changedDeltas.length > 0) {
+                // Report every changed Z slice
+                for (const delta of changedDeltas) {
+                    const { data: sliceData, width, height } = vol.getSliceUint8(delta.sliceIndex, delta.axis);
+                    this.ctx.callbacks.onMaskChanged(sliceData, layerId, channel, delta.sliceIndex, delta.axis, width, height, false);
+                }
+            }
+            else {
+                // Fallback: report only the current slice
+                const axis = this.ctx.protectedData.axis;
+                const sliceIndex = this.ctx.nrrd_states.view.currentSliceIndex;
+                const { data: sliceData, width, height } = vol.getSliceUint8(sliceIndex, axis);
+                this.ctx.callbacks.onMaskChanged(sliceData, layerId, channel, sliceIndex, axis, width, height, false);
+            }
+        }
+        catch (_a) {
+            // Volume not ready
+        }
+    }
+    /** Whether a sphere placement is currently in progress */
+    get isActive() {
+        return this.active;
+    }
+}
+//# sourceMappingURL=SphereBrushTool.js.map

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

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

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

@@ -40,6 +40,7 @@ export interface ToolHost {
         image: ImageData;
     } | undefined;
     pushUndoDelta(delta: MaskDelta): void;
+    pushUndoGroup(deltas: MaskDelta[]): void;
     getEraserUrls(): string[];
     enableCrosshair(): void;
     setUpSphereOrigins(mouseX: number, mouseY: number, sliceIndex: number): void;
@@ -72,3 +73,5 @@ export type LayerChannelHostDeps = Pick<ToolHost, 'reloadMasksFromVolume' | 'get
 export type SliceRenderHostDeps = Pick<ToolHost, 'compositeAllLayers' | 'getOrCreateSliceBuffer' | 'renderSliceToCanvas' | 'getVolumeForLayer' | 'refreshSphereOverlay' | 'syncGuiParameterSettings' | 'repraintCurrentContrastSlice' | 'clearUndoHistory' | 'updateShowNumDiv' | 'updateCurrentContrastSlice'>;
 /** DataLoader host dependencies */
 export type DataLoaderHostDeps = Pick<ToolHost, 'invalidateSliceBuffer' | 'setDisplaySlicesBaseOnAxis' | 'afterLoadSlice' | 'setEmptyCanvasSize' | 'syncLayerSliceData' | 'reloadMasksFromVolume' | 'resetZoom'>;
+/** SphereBrushTool host dependencies */
+export type SphereBrushHostDeps = Pick<ToolHost, 'getVolumeForLayer' | 'compositeAllLayers' | 'pushUndoGroup' | 'renderSliceToCanvas' | 'getOrCreateSliceBuffer' | 'setEmptyCanvasSize' | 'reloadMasksFromVolume' | 'getEraserUrls'>;

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

@@ -16,10 +16,15 @@ export class ZoomTool extends BaseTool {
     configMouseZoomWheel() {
         let moveDistance = 1;
         return (e) => {
-            var _a;
+            var _a, _b;
             if ((_a = this.ctx.eventRouter) === null || _a === void 0 ? void 0 : _a.isShiftHeld()) {
                 return;
             }
+            // Block zoom wheel when sphereBrush/sphereEraser is actively placing (left button held)
+            if ((this.ctx.gui_states.mode.sphereBrush || this.ctx.gui_states.mode.sphereEraser)
+                && ((_b = this.ctx.eventRouter) === null || _b === void 0 ? void 0 : _b.isLeftButtonDown())) {
+                return;
+            }
             e.preventDefault();
             const delta = e.detail ? e.detail > 0 : e.wheelDelta < 0;
             this.ctx.protectedData.isDrawing = true;

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

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

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

@@ -8,13 +8,14 @@
  */
 export { BaseTool } from "./BaseTool";
 export type { ToolContext } from "./BaseTool";
-export type { ToolHost, ImageStoreHostDeps, PanHostDeps, ContrastHostDeps, ZoomHostDeps, SphereHostDeps, DrawingHostDeps, DragSliceHostDeps, LayerChannelHostDeps, SliceRenderHostDeps, DataLoaderHostDeps, } from "./ToolHost";
+export type { ToolHost, ImageStoreHostDeps, PanHostDeps, ContrastHostDeps, ZoomHostDeps, SphereHostDeps, SphereBrushHostDeps, DrawingHostDeps, DragSliceHostDeps, LayerChannelHostDeps, SliceRenderHostDeps, DataLoaderHostDeps, } from "./ToolHost";
 export { EraserTool } from "./EraserTool";
 export { DrawingTool } from "./DrawingTool";
 export { PanTool } from "./PanTool";
 export { ZoomTool } from "./ZoomTool";
 export { SphereTool, SPHERE_CHANNEL_MAP } from "./SphereTool";
 export type { SphereType } from "./SphereTool";
+export { SphereBrushTool } from "./SphereBrushTool";
 export { CrosshairTool } from "./CrosshairTool";
 export { ContrastTool } from "./ContrastTool";
 export { ImageStoreHelper } from "./ImageStoreHelper";

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

@@ -17,6 +17,7 @@ export { PanTool } from "./PanTool";
 export { ZoomTool } from "./ZoomTool";
 // Specialty Tools
 export { SphereTool, SPHERE_CHANNEL_MAP } from "./SphereTool";
+export { SphereBrushTool } from "./SphereBrushTool";
 export { CrosshairTool } from "./CrosshairTool";
 export { ContrastTool } from "./ContrastTool";
 // Image Storage

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/Utils/segmentation/tools/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO;AACP,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAkBtC,gBAAgB;AAChB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,mBAAmB;AACnB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,qBAAqB;AACrB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,kBAAkB;AAClB,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAG9D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,gBAAgB;AAChB,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,wBAAwB;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,6BAA6B;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,wBAAwB;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,eAAe;AACf,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/Utils/segmentation/tools/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO;AACP,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAmBtC,gBAAgB;AAChB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,mBAAmB;AACnB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,qBAAqB;AACrB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,kBAAkB;AAClB,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,gBAAgB;AAChB,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,wBAAwB;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,6BAA6B;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,wBAAwB;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,eAAe;AACf,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC"}