@janelia-flyem/neuroglancer - npm Package Compare versions

Comparing version 2.34.1 to 2.34.3

dist/module/neuroglancer/annotation/backend.js

@@ -31,2 +31,3 @@ import _Object$assign from "babel-runtime/core-js/object/assign";
 import { ChunkPriorityTier, ChunkState } from "../chunk_manager/base";
+import { displayDimensionRenderInfosEqual } from "../navigation_state";
 import { RenderLayerBackend } from "../render_layer_backend";
@@ -37,4 +38,3 @@ import { receiveVisibleSegmentsState } from "../segmentation_display_state/backend";
 import { registerNested, WatchableValue } from "../trackable_value";
-import { getBasePriority, getPriorityTier } from "../visibility_priority/backend";
-import { withSharedVisibility } from "../visibility_priority/backend";
+import { getBasePriority, getPriorityTier, withSharedVisibility } from "../visibility_priority/backend";
 import { registerRPC, registerSharedObject, SharedObjectCounterpart } from "../worker_rpc";
@@ -253,8 +253,13 @@ const ANNOTATION_METADATA_CHUNK_PRIORITY = 200;
             }
-            var _attachment$state = attachment.state;
-            const transformedSources = _attachment$state.transformedSources,
-                  displayDimensionRenderInfo = _attachment$state.displayDimensionRenderInfo;
+            const attachmentState = attachment.state;
+            const transformedSources = attachmentState.transformedSources,
+                  displayDimensionRenderInfo = attachmentState.displayDimensionRenderInfo;
 
-            if (transformedSources.length === 0 || displayDimensionRenderInfo !== view.projectionParameters.value.displayDimensionRenderInfo) {
-                continue;
+            if (transformedSources.length === 0) continue;
+            const viewDisplayDimensionRenderInfo = view.projectionParameters.value.displayDimensionRenderInfo;
+            if (displayDimensionRenderInfo !== viewDisplayDimensionRenderInfo) {
+                if (!displayDimensionRenderInfosEqual(displayDimensionRenderInfo, viewDisplayDimensionRenderInfo)) {
+                    continue;
+                }
+                attachmentState.displayDimensionRenderInfo = viewDisplayDimensionRenderInfo;
             }
@@ -286,3 +291,3 @@ const priorityTier = getPriorityTier(visibility);
     attachment.state.transformedSources = deserializeTransformedSources(this, x.sources, layer);
-    attachment.state.displayDimensionRenderInfo = attachment.view.projectionParameters.value.displayDimensionRenderInfo;
+    attachment.state.displayDimensionRenderInfo = x.displayDimensionRenderInfo;
     layer.chunkManager.scheduleUpdateChunkPriorities();
@@ -289,0 +294,0 @@ });

dist/module/neuroglancer/annotation/renderlayer.js

@@ -604,2 +604,3 @@ import _Object$assign from "babel-runtime/core-js/object/assign";
                     view: attachment.view.rpcId,
+                    displayDimensionRenderInfo,
                     sources: serializeAllTransformedSources(transformedSources)
@@ -606,0 +607,0 @@ });

dist/module/neuroglancer/ui/layer_side_panel.js

@@ -130,2 +130,10 @@ import _Map from 'babel-runtime/core-js/map';
         titleBar.appendChild(this.registerDisposer(new LayerNameWidget(layer.managedLayer)).element);
+        this.registerDisposer(observeWatchable(visible => {
+            element.dataset.neuroglancerLayerVisible = visible.toString();
+        }, {
+            get value() {
+                return layer.managedLayer.visible;
+            },
+            changed: layer.managedLayer.layerChanged
+        }));
         const pickButton = this.registerDisposer(new CheckboxIcon({
@@ -132,0 +140,0 @@ get value() {

dist/module/neuroglancer/ui/tool.js

@@ -55,3 +55,2 @@ import _Object$entries from 'babel-runtime/core-js/object/entries';
     }
-    deactivate() {}
     unbind() {
@@ -58,0 +57,0 @@ const layer = this.layer;

dist/module/neuroglancer/util/si_units.js

@@ -27,4 +27,7 @@ import _JSON$stringify from 'babel-runtime/core-js/json/stringify';
 // {prefix: 'd', exponent: -1},
-{ prefix: 'c', exponent: -2 }, { prefix: 'm', exponent: -3 }, { prefix: 'µ', exponent: -6 }, { prefix: 'n', exponent: -9 }, { prefix: 'p', exponent: -12 }, { prefix: 'f', exponent: -15 }, { prefix: 'a', exponent: -18 }, { prefix: 'z', exponent: -21 }, { prefix: 'y', exponent: -24 }];
-const siPrefixesWithAlternatives = [{ prefix: 'u', exponent: -6 }, ...siPrefixes];
+// {prefix: 'c', exponent: -2},
+{ prefix: 'm', exponent: -3 }, { prefix: 'µ', exponent: -6 }, { prefix: 'n', exponent: -9 }, { prefix: 'p', exponent: -12 }, { prefix: 'f', exponent: -15 }, { prefix: 'a', exponent: -18 }, { prefix: 'z', exponent: -21 }, { prefix: 'y', exponent: -24 }];
+const siPrefixesWithAlternatives = [
+// Parse 'c' for centi, but don't pick it.
+{ prefix: 'c', exponent: -2 }, { prefix: 'u', exponent: -6 }, ...siPrefixes];
 export const supportedUnits = new _Map();
@@ -31,0 +34,0 @@ supportedUnits.set('', { unit: '', exponent: 0 });

package.json

@@ -5,3 +5,3 @@ {
   "license": "Apache-2.0",
-  "version": "2.34.1",
+  "version": "2.34.3",
   "main": "dist/module/main_module.js",
@@ -8,0 +8,0 @@ "repository": {

README.md

@@ -7,2 +7,3 @@ Neuroglancer: Web-based volumetric data visualization
 ![Build](https://github.com/google/neuroglancer/workflows/Build/badge.svg)
+[![DOI](https://zenodo.org/badge/59798355.svg)](https://zenodo.org/badge/latestdoi/59798355)
 
@@ -174,2 +175,3 @@ Neuroglancer is a WebGL-based viewer for volumetric data.  It is capable of displaying arbitrary (non axis-aligned) cross-sectional views of volumetric data, as well as 3-D meshes and line-segment based models (skeletons).
 - [cloudvolume](https://github.com/seung-lab/cloud-volume) - Python interface of neuroglancer precomputed data format.
+- [multiresolution-mesh-creator](https://github.com/janelia-cosem/multiresolution-mesh-creator) - Python tool for creating [multi-resolution meshes](https://github.com/google/neuroglancer/blob/master/src/neuroglancer/datasource/precomputed/meshes.md#multi-resolution-mesh-format) from single resolution - or multiscale - meshes.
 
@@ -176,0 +178,0 @@ # Contributing

src/neuroglancer/annotation/backend.ts

@@ -21,3 +21,3 @@ /**
 import {ChunkPriorityTier, ChunkState} from 'neuroglancer/chunk_manager/base';
-import {DisplayDimensionRenderInfo} from 'neuroglancer/navigation_state';
+import {DisplayDimensionRenderInfo, displayDimensionRenderInfosEqual} from 'neuroglancer/navigation_state';
 import {RenderedViewBackend, RenderLayerBackend, RenderLayerBackendAttachment} from 'neuroglancer/render_layer_backend';
@@ -33,4 +33,3 @@ import {receiveVisibleSegmentsState} from 'neuroglancer/segmentation_display_state/backend';
 import {Uint64} from 'neuroglancer/util/uint64';
-import {getBasePriority, getPriorityTier} from 'neuroglancer/visibility_priority/backend';
-import {withSharedVisibility} from 'neuroglancer/visibility_priority/backend';
+import {getBasePriority, getPriorityTier, withSharedVisibility} from 'neuroglancer/visibility_priority/backend';
 import {registerRPC, registerSharedObject, RPC, SharedObjectCounterpart} from 'neuroglancer/worker_rpc';
@@ -312,8 +311,13 @@
       }
-      const {transformedSources, displayDimensionRenderInfo} =
-          attachment.state! as AnnotationRenderLayerAttachmentState;
-      if (transformedSources.length === 0 ||
-          displayDimensionRenderInfo !==
-              view.projectionParameters.value.displayDimensionRenderInfo) {
-        continue;
+      const attachmentState = attachment.state! as AnnotationRenderLayerAttachmentState;
+      const {transformedSources, displayDimensionRenderInfo} = attachmentState;
+      if (transformedSources.length === 0) continue;
+      const viewDisplayDimensionRenderInfo =
+          view.projectionParameters.value.displayDimensionRenderInfo;
+      if (displayDimensionRenderInfo !== viewDisplayDimensionRenderInfo) {
+        if (!displayDimensionRenderInfosEqual(
+                displayDimensionRenderInfo, viewDisplayDimensionRenderInfo)) {
+          continue;
+        }
+        attachmentState.displayDimensionRenderInfo = viewDisplayDimensionRenderInfo;
       }
@@ -354,4 +358,3 @@ const priorityTier = getPriorityTier(visibility);
       this, x.sources, layer);
-  attachment.state!.displayDimensionRenderInfo =
-      attachment.view.projectionParameters.value.displayDimensionRenderInfo;
+  attachment.state!.displayDimensionRenderInfo = x.displayDimensionRenderInfo;
   layer.chunkManager.scheduleUpdateChunkPriorities();
@@ -358,0 +361,0 @@ });

src/neuroglancer/annotation/renderlayer.ts

@@ -698,2 +698,3 @@ /**
               view: attachment.view.rpcId,
+              displayDimensionRenderInfo,
               sources: serializeAllTransformedSources(transformedSources),
@@ -700,0 +701,0 @@ });

src/neuroglancer/ui/layer_side_panel.ts

@@ -123,2 +123,10 @@ /**
     titleBar.appendChild(this.registerDisposer(new LayerNameWidget(layer.managedLayer)).element);
+    this.registerDisposer(observeWatchable(visible => {
+      element.dataset.neuroglancerLayerVisible = visible.toString();
+    }, {
+      get value() {
+        return layer.managedLayer.visible;
+      },
+      changed: layer.managedLayer.layerChanged,
+    }));
     const pickButton = this.registerDisposer(new CheckboxIcon(
@@ -125,0 +133,0 @@ {

src/neuroglancer/ui/tool.ts

@@ -61,3 +61,2 @@ /**
   abstract toJSON(): any;
-  deactivate(): void {}
   abstract description: string;
@@ -64,0 +63,0 @@ unbind() {

src/neuroglancer/util/si_units.ts

@@ -37,3 +37,3 @@ /**
   // {prefix: 'd', exponent: -1},
-  {prefix: 'c', exponent: -2},
+  // {prefix: 'c', exponent: -2},
   {prefix: 'm', exponent: -3},
@@ -50,2 +50,4 @@ {prefix: 'µ', exponent: -6},
 const siPrefixesWithAlternatives = [
+  // Parse 'c' for centi, but don't pick it.
+  {prefix: 'c', exponent: -2},
   {prefix: 'u', exponent: -6},  // Also allow "u" for micro
@@ -52,0 +54,0 @@ ...siPrefixes,

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

9330712

increased by0.34%

Lines of code

201290

increased by0.03%

Number of lines in readme file

197

increased by1.03%

No dependency changes