fix(voxel-annotations): do not display the brush cursor in the 3d view

Author: briossant

src/layer/vox/index.ts

@@ -300,7 +300,8 @@ export function UserLayerWithVoxelEditingMixin<
         value = BigInt(x);
       }
 
-      const info = DATA_TYPE_BIT_INFO[dataType as keyof typeof DATA_TYPE_BIT_INFO];
+      const info =
+        DATA_TYPE_BIT_INFO[dataType as keyof typeof DATA_TYPE_BIT_INFO];
       if (!info) {
         this.paintValue.value = value;
         return value;
@@ -313,15 +314,14 @@ export function UserLayerWithVoxelEditingMixin<
       if (signed) {
         const signBit = 1n << BigInt(bits - 1);
         if ((truncated & signBit) !== 0n) {
-          truncated -= (1n << BigInt(bits));
+          truncated -= 1n << BigInt(bits);
         }
       }
 
       this.paintValue.value = truncated;
       return truncated;
     }
 
-
     abstract _createVoxelRenderLayer(
       source: MultiscaleVolumeChunkSource,
       transform: WatchableValueInterface<RenderLayerTransformOrError>,

src/rendered_data_panel.ts

@@ -816,16 +816,16 @@ export abstract class RenderedDataPanel extends RenderedPanel {
       },
     );
 
-    this.overlay_canvas = document.createElement('canvas');
-    this.overlay_canvas.style.position = 'absolute';
-    this.overlay_canvas.style.top = '0';
-    this.overlay_canvas.style.left = '0';
-    this.overlay_canvas.style.width = '100%';
-    this.overlay_canvas.style.height = '100%';
-    this.overlay_canvas.style.pointerEvents = 'none';
-    this.overlay_canvas.style.zIndex = '10';
+    this.overlay_canvas = document.createElement("canvas");
+    this.overlay_canvas.style.position = "absolute";
+    this.overlay_canvas.style.top = "0";
+    this.overlay_canvas.style.left = "0";
+    this.overlay_canvas.style.width = "100%";
+    this.overlay_canvas.style.height = "100%";
+    this.overlay_canvas.style.pointerEvents = "none";
+    this.overlay_canvas.style.zIndex = "10";
     this.element.appendChild(this.overlay_canvas);
-    this.overlay_context = this.overlay_canvas.getContext('2d')!;
+    this.overlay_context = this.overlay_canvas.getContext("2d")!;
 
     this.boundsUpdated.add(() => {
       this.overlay_canvas.width = this.renderViewport.logicalWidth;
@@ -842,19 +842,24 @@ export abstract class RenderedDataPanel extends RenderedPanel {
     if (radius > 0) {
       ctx.beginPath();
       ctx.arc(x, y, radius, 0, 2 * Math.PI);
-      ctx.fillStyle = 'rgba(255, 255, 255, 0.2)';
+      ctx.fillStyle = "rgba(255, 255, 255, 0.2)";
       ctx.fill();
-      ctx.strokeStyle = 'rgba(255, 255, 255, 1)';
+      ctx.strokeStyle = "rgba(255, 255, 255, 1)";
       ctx.lineWidth = 3;
       ctx.stroke();
-      ctx.strokeStyle = 'rgba(0, 0, 0, 1)';
+      ctx.strokeStyle = "rgba(0, 0, 0, 1)";
       ctx.lineWidth = 1.5;
       ctx.stroke();
     }
   }
 
   clearOverlay() {
-    this.overlay_context.clearRect(0, 0, this.overlay_canvas.width, this.overlay_canvas.height);
+    this.overlay_context.clearRect(
+      0,
+      0,
+      this.overlay_canvas.width,
+      this.overlay_canvas.height,
+    );
   }
 
   abstract translateDataPointByViewportPixels(

src/ui/voxel_annotations.ts

@@ -20,6 +20,7 @@ import type {
   VoxelEditingContext,
 } from "#src/layer/vox/index.js";
 import { RenderedDataPanel } from "#src/rendered_data_panel.js";
+import { SliceViewPanel } from "#src/sliceview/panel.js";
 import { StatusMessage } from "#src/status.js";
 import { LayerTool, registerTool, type ToolActivation } from "#src/ui/tool.js";
 import { vec3 } from "#src/util/geom.js";
@@ -146,15 +147,15 @@ export class VoxelBrushTool extends BaseVoxelTool {
     activation.registerDisposer(
       this.mouseState.changed.add(() => {
         this.updateBrushOutline();
-      })
+      }),
     );
   }
 
   private getActivePanel(): RenderedDataPanel | undefined {
     let activePanel: RenderedDataPanel | undefined;
     for (const panel of this.layer.manager.root.display.panels) {
       if (panel instanceof RenderedDataPanel) {
-        if (panel.mouseX !== -1) {
+        if (panel.mouseX !== -1 && panel instanceof SliceViewPanel) {
           activePanel = panel;
         } else {
           panel.clearOverlay();