Painting layer: fix painting in non-zero scale levels

Author: tomka

django/applications/catmaid/control/cropping.py

@@ -1021,7 +1021,7 @@ def write_block(request:HttpRequest, project_id=None, writable_stack_id=None) ->
         # Assume the dataset exists already
         pass
 
-    dataset += f"s{scale_level}"
+    dataset += f"{'/' if len(dataset) else ''}s{scale_level}"
     n5 = pyn5.open(full_path, dataset, dtype.lower(), False)
     pyn5.write(n5, (np.array(data_bounds[0]), np.array(data_bounds[1]) + 1), data, dtype)
 

django/applications/catmaid/control/stack.py

@@ -298,16 +298,26 @@ def post(self, request:HttpRequest, project_id) -> JsonResponse:
         }
         scale_attributes = []
         for n, scale_level in enumerate(stack.downsample_factors):
+            dimensions = [
+                int(metadata['dataset_size'][0] / scale_level.x),
+                int(metadata['dataset_size'][1] / scale_level.y),
+                int(metadata['dataset_size'][2] / scale_level.z),
+            ]
+            resolution = [
+                metadata['resolution'][0] / scale_level.x,
+                metadata['resolution'][1] / scale_level.y,
+                metadata['resolution'][2] / scale_level.z,
+            ]
             scale_attributes.append({
                 "dataType": metadata['dtype'],
                 "compression": {
                     "type": encoding,
                 },
                 "blockSize": metadata['block_size'],
-                "dimensions": metadata['dataset_size'],
+                "dimensions": dimensions,
                 "pixelResolution": {
                     "unit": "um",
-                    "dimensions": metadata['resolution'],
+                    "dimensions": resolution,
                 },
                 "downsamplingFactors": [
                     scale_level.x,

django/applications/catmaid/static/js/layers/painting-layer.js

@@ -207,19 +207,14 @@
 
     // Convert screen coordinates to voxel coordinates. Convert voxel
     // coordinates into block coordinates.
+    let zoom = this.stackViewer.s;
     const screenPosition = this.stackViewer.screenPosition();
-    const voxelPosX = screenPosition.left +
-        x / this.stackViewer.scale / this.stackViewer.primaryStack.anisotropy(0).x;
-    const voxelPosY = screenPosition.top  +
-        y / this.stackViewer.scale / this.stackViewer.primaryStack.anisotropy(0).y;
+    const voxelPosX = (screenPosition.left +
+        x * Math.pow(2, zoom) / this.stackViewer.primaryStack.anisotropy(0).x) / Math.pow(2, zoom);
+    const voxelPosY = (screenPosition.top  +
+        y * Math.pow(2, zoom) / this.stackViewer.primaryStack.anisotropy(0).y) / Math.pow(2, zoom);
     const voxelPosZ = this.stackViewer.z;
 
-    const datasetSize = activeWritableStack.metadata.dataset_size;
-    if (!datasetSize) {
-      throw new CATMAID.ValueError('Need writable stacke metadata field: dataset_size');
-    }
-
-    let zoom = this.stackViewer.s;
     var mag = 1.0;
 
     //var anisotropy = this.dataLayer.stack.anisotropy(zoom);
@@ -255,9 +250,17 @@
       }
     }
 
-    // TODO: Maybe better get from active writable stack?
-    const blockSize = this.dataLayer.tileSource.blockSize(this.stackViewer.s);
+    // Use meta data from data layer, because it actually shows the
+    // server-side N5 file.
     const dataType = this.dataLayer.tileSource.dataType();
+    const blockSize = this.dataLayer.tileSource.blockSize(this.stackViewer.s);
+    const blockCoordBounds = this.dataLayer.tileSource.blockCoordBounds(zoom);
+    // The +1 is needed, because the bounds are inclusice.
+    const datasetSize = [
+      (blockCoordBounds.max[0] - blockCoordBounds.min[0] + 1) * blockSize[0],
+      (blockCoordBounds.max[1] - blockCoordBounds.min[1] + 1) * blockSize[1],
+      (blockCoordBounds.max[2] - blockCoordBounds.min[2] + 1) * blockSize[2],
+    ];
     const blockShape = [
       datasetSize[0] / blockSize[0],
       datasetSize[1] / blockSize[1],
@@ -300,8 +303,7 @@
                 method: 'POST',
                 parallel: true,
                 data: {
-                  // TODO: Allow other scale levels
-                  scale_level: 0,
+                  scale_level: bS,
                   //compression: 'raw',
                   //data: mostRecentBlock.tolist().join(','),
                   compression: 'msgpack',