optica-core 0.2.4 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "optica-core",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "description": "Shared frontend core of the Optica viewers",
   "license": "GPL-3.0-or-later",
   "type": "module",

package/src/components/ui/image-viewer/ImageViewer.vue

@@ -80,6 +80,11 @@ const canvas = useTemplateRef('canvas')
 
 // image drawn on the canvas, the thumbnail first then the full image
 let baseImage: HTMLImageElement = new Image()
+// halved copies of baseImage (level i is 1/2^i of its size), drawn when zoomed out
+// so the noise is averaged instead of aliased
+let pyramid: CanvasImageSource[] = []
+// no more halving below this size, in pixels
+const PYRAMID_MIN_SIZE = 512
 // incremented on each image change so late loads of a previous image are ignored
 let loadToken = 0
 
@@ -97,7 +102,7 @@ function loadImage() {
     if (token != loadToken) {
       return
     }
-    baseImage = first
+    setBaseImage(first)
     if (props.camera.zoom <= 0 || props.fitOnImageChange) {
       screenFit()
     }
@@ -112,7 +117,7 @@ function loadImage() {
         full.alt = image.name
         full.onload = () => {
           if (token == loadToken) {
-            baseImage = full
+            setBaseImage(full)
             update()
           }
         }
@@ -123,6 +128,26 @@ function loadImage() {
   first.src = image.thumbnail || image.image
 }
 
+function setBaseImage(image: HTMLImageElement) {
+  baseImage = image
+  pyramid = [image]
+  let prev: CanvasImageSource = image
+  let width = image.naturalWidth
+  let height = image.naturalHeight
+  while (width > PYRAMID_MIN_SIZE && height > PYRAMID_MIN_SIZE) {
+    width = Math.ceil(width / 2)
+    height = Math.ceil(height / 2)
+    const level = document.createElement('canvas')
+    level.width = width
+    level.height = height
+    const ctx = level.getContext('2d')!
+    ctx.imageSmoothingQuality = 'high'
+    ctx.drawImage(prev, 0, 0, width, height)
+    pyramid.push(level)
+    prev = level
+  }
+}
+
 loadImage()
 
 watch(() => [props.image.name, props.image.image, props.image.thumbnail], loadImage)
@@ -253,7 +278,13 @@ function drawImage(c: HTMLCanvasElement) {
     x: Math.max(0, (c.width - baseImage.naturalWidth * zoomX) / 2) / zoomX,
     y: Math.max(0, (c.height - baseImage.naturalHeight * zoomY) / 2) / zoomY
   }
-  ctx.drawImage(baseImage, 0, 0, baseImage.naturalWidth, baseImage.naturalHeight,
+  // the smallest level still at least as detailed as the screen, the last downscale stays under 2x
+  const level = Math.max(0, Math.min(pyramid.length - 1, Math.floor(Math.log2(1 / Math.max(zoomX, zoomY)))))
+  const source = pyramid[level]
+  const sourceWidth = level == 0 ? baseImage.naturalWidth : (source as HTMLCanvasElement).width
+  const sourceHeight = level == 0 ? baseImage.naturalHeight : (source as HTMLCanvasElement).height
+  ctx.imageSmoothingQuality = 'high'
+  ctx.drawImage(source, 0, 0, sourceWidth, sourceHeight,
     shiftCanvas.x, shiftCanvas.y, baseImage.naturalWidth, baseImage.naturalHeight)
 
   const toCanvas = (pos: Coordinates): Coordinates => ({

package/src/data/models/annotations.ts

@@ -46,7 +46,7 @@ export const POSITION_CSV_HEADER = ["X", "Y", "Z"]
 
 export const DEFAULT_CSV_HEADER = [...LANDMARK_CSV_HEADER, ...POSE_CSV_HEADER, ...POSITION_CSV_HEADER]
 
-// one CSV row (ANNOTATIONS_CSV_HEADER), `group`: label of the distance or profile of the landmark
+// one CSV row (DEFAULT_CSV_HEADER), `group`: label of the distance or profile of the landmark
 export function landmarkCSVRow(type: string, group: string, landmark: Landmark): string[] {
     const { marker, image } = landmark.pose
     const position = landmark.position