quick fix for tags breaking precomputed annotations

seung-lab · Oct 3, 2024 · 1b45ee5 · 1b45ee5
1 parent 8b8a9ea
commit 1b45ee5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/src/annotation/frontend_source.ts b/src/annotation/frontend_source.ts
@@ -56,7 +56,7 @@ import {
   SliceViewChunkSource,
 } from "#src/sliceview/frontend.js";
 import { StatusMessage } from "#src/status.js";
-import type { WatchableValue } from "#src/trackable_value.js";
+import { WatchableValue } from "#src/trackable_value.js";
 import type { Borrowed, Owned } from "#src/util/disposable.js";
 import { ENDIANNESS, Endianness } from "#src/util/endian.js";
 import * as matrix from "#src/util/matrix.js";
@@ -532,7 +532,7 @@ export class MultiscaleAnnotationSource
   ) {
     super();
     this.rank = options.rank;
-    this.properties.value = options.properties;
+    this.properties = new WatchableValue(options.properties);
     this.annotationPropertySerializers = makeAnnotationPropertySerializers(
       this.rank,
       this.properties.value,

diff --git a/src/layer/annotation/index.ts b/src/layer/annotation/index.ts
@@ -51,6 +51,7 @@ import type { SegmentationDisplayState } from "#src/segmentation_display_state/f
 import type { TrackableBoolean } from "#src/trackable_boolean.js";
 import { TrackableBooleanCheckbox } from "#src/trackable_boolean.js";
 import {
+  ComputedWatchableValue,
   makeCachedLazyDerivedWatchableValue,
   WatchableValue,
 } from "#src/trackable_value.js";
@@ -705,29 +706,23 @@ export class AnnotationUserLayer extends Base {
     this.annotationProjectionRenderScaleTarget.changed.add(
       this.specificationChanged.dispatch,
     );
-
-    this.registerDisposer(
-      this.localAnnotationProperties.changed.add(() => {
-        const { localAnnotations } = this;
-        if (localAnnotations) {
-          const tagIdentifiers = localAnnotations
-            .getTagProperties()
-            .map((x) => x.identifier);
-          this.syncTagTools(tagIdentifiers);
-        }
-      }),
-    );
     this.tabs.add("rendering", {
       label: "Rendering",
       order: -100,
       getter: () => new RenderingOptionsTab(this),
     });
-    this.tabs.default = "annotations";
+    const hideTagsTab = this.registerDisposer(
+      new ComputedWatchableValue(() => {
+        return this.localAnnotations === undefined;
+      }, this.dataSourcesChanged),
+    );
     this.tabs.add("tags", {
       label: "Tags",
       order: 10,
       getter: () => new TagsTab(this),
+      hidden: hideTagsTab,
     });
+    this.tabs.default = "annotations";
   }
 
   syncTagTools = (tagIdentifiers: string[]) => {

diff --git a/src/ui/annotations.ts b/src/ui/annotations.ts
@@ -172,6 +172,23 @@ export class MergedAnnotationStates
   }
 }
 
+function getAVertexPosition(pos: Float32Array, annotation: Annotation) {
+  switch (annotation.type) {
+    case AnnotationType.AXIS_ALIGNED_BOUNDING_BOX:
+    case AnnotationType.LINE:
+      pos.set(annotation.pointA);
+      break;
+    case AnnotationType.POINT:
+      pos.set(annotation.point);
+      break;
+    case AnnotationType.ELLIPSOID:
+      pos.set(annotation.center);
+      break;
+  }
+}
+
+getAVertexPosition;
+
 function getCenterPosition(center: Float32Array, annotation: Annotation) {
   switch (annotation.type) {
     case AnnotationType.AXIS_ALIGNED_BOUNDING_BOX:
@@ -187,6 +204,7 @@ function getCenterPosition(center: Float32Array, annotation: Annotation) {
       break;
   }
 }
+getCenterPosition;
 
 function setLayerPosition(
   layer: UserLayer,
@@ -240,7 +258,7 @@ const moveToAnnotation = (
   const { layerRank } = chunkTransform;
   const chunkPosition = new Float32Array(layerRank);
   const layerPosition = new Float32Array(layerRank);
-  getCenterPosition(chunkPosition, annotation);
+  getAVertexPosition(chunkPosition, annotation);
   matrix.transformPoint(
     layerPosition,
     chunkTransform.chunkToLayerTransform,