fix: scan

Author: Leoglme

web/app/composables/useCardAutoScan.ts

@@ -32,18 +32,19 @@ export interface UseCardAutoScanOptions {
 const FRAME_MS = 100
 /** Long edge of the downscaled frame sent for detection (more = sharper quad). */
 const PROC_EDGE = 640
-/** Steady tolerance as a fraction of the frame's long edge. */
-const STEADY_FRAC = 0.014
-/** Consecutive steady detections before firing (~0.4 s @ 100 ms cadence). */
-const STEADY_TICKS = 4
 /** "No card" detections before re-arming after a shot (card removed). */
 const LOST_TICKS_REARM = 3
 /** Floor between two captures (anti double-shot). */
 const MIN_COOLDOWN_MS = 1500
-/** How many shots we take in a burst — we keep the sharpest for OCR. */
-const BURST_COUNT = 2
-/** Gap between burst shots so focus / exposure has a chance to settle. */
-const BURST_INTERVAL_MS = 130
+/**
+ * How many shots we take in a burst — we keep the sharpest for OCR. Pikacheck-
+ * style: a slightly larger burst over a longer window so the user can pivot
+ * the card during capture (revealing a glary corner, exposing missing text…)
+ * and the sharpest / clearest angle still wins.
+ */
+const BURST_COUNT = 3
+/** Gap between burst shots — wide enough for hand movement to expose new info. */
+const BURST_INTERVAL_MS = 280
 /** Lerp weight (new vs previous) when tracking the displayed quad. */
 const SMOOTH_LERP = 0.5
 /** Drift above this fraction of the long edge ⇒ new scene, snap instead of lerp. */
@@ -96,7 +97,6 @@ export function useCardAutoScan(opts: UseCardAutoScanOptions) {
   let displayedCorners: Pt[] | null = null
   let pendingCorners: Pt[] | null = null
   let missTicks = 0
-  let steadyTicks = 0
   let lostTicks = 0
   let lastCaptureAt = 0
 
@@ -241,25 +241,28 @@ export function useCardAutoScan(opts: UseCardAutoScanOptions) {
 
   /** Send the next warp request from the burst (or finalise if we've collected enough). */
   function requestWarp(): void {
-    if (!worker || !burstCorners) {
+    if (!worker) {
       finaliseBurst()
       return
     }
     if (burstShots.length >= burstAwaiting) {
       finaliseBurst()
       return
     }
+    // Use the freshest detected corners so a pivot/move during the burst still
+    // yields a correctly cropped card. Fall back to the trigger corners if the
+    // detector hasn't returned a new quad yet.
+    const corners = lastCorners ?? burstCorners
     const full = grabFrame(0)
-    if (!full) {
-      // Skip this shot but keep trying — maybe the next one lands.
+    if (!corners || !full) {
       if (burstShots.length + 1 < burstAwaiting) {
         burstTimer = setTimeout(requestWarp, BURST_INTERVAL_MS)
       } else {
         finaliseBurst()
       }
       return
     }
-    worker.postMessage({ t: 'warp', buf: full.buf, w: full.w, h: full.h, corners: burstCorners }, [full.buf])
+    worker.postMessage({ t: 'warp', buf: full.buf, w: full.w, h: full.h, corners }, [full.buf])
   }
 
   /** Pick the sharpest shot from the burst, encode JPEG and hand it to `onCapture`. */
@@ -333,7 +336,6 @@ export function useCardAutoScan(opts: UseCardAutoScanOptions) {
         lastCorners = null
         displayedCorners = null
         quad.value = null
-        steadyTicks = 0
         if (phase.value === 'cooldown') {
           lostTicks += 1
           if (lostTicks >= LOST_TICKS_REARM) {
@@ -368,28 +370,31 @@ export function useCardAutoScan(opts: UseCardAutoScanOptions) {
     quad.value = [shaped[0]!, shaped[1]!, shaped[2]!, shaped[3]!]
     lostTicks = 0
 
+    lastCorners = corners
+
     if (phase.value === 'cooldown' || capturing) {
       return
     }
 
-    if (lastCorners && cornerDrift(corners, lastCorners) < longEdge * STEADY_FRAC) {
-      steadyTicks += 1
-    } else {
-      steadyTicks = 0
-    }
-    lastCorners = corners
-
-    if (steadyTicks < STEADY_TICKS || busy.value || Date.now() - lastCaptureAt < MIN_COOLDOWN_MS) {
-      phase.value = 'settling'
+    // No "hold steady" wait — Pikacheck-style. As soon as a card is confirmed
+    // (vote passed) and we're past the cooldown, we shoot a burst. The user is
+    // free to pivot/move the card during the burst; each shot uses the freshest
+    // corners and the sharpest wins.
+    if (busy.value || Date.now() - lastCaptureAt < MIN_COOLDOWN_MS) {
+      phase.value = 'watching'
       return
     }
 
     beginBurst(corners)
   }
 
-  /** Grab one downscaled frame and hand it to the worker for detection. */
+  /**
+   * Grab one downscaled frame and hand it to the worker for detection. Note we
+   * intentionally keep running during a capture burst so `lastCorners` stays
+   * fresh — each burst shot uses the latest detection, supporting movement.
+   */
   function pumpFrame(): void {
-    if (!worker || !enabled.value || detectInFlight || capturing || busy.value) {
+    if (!worker || !enabled.value || detectInFlight || busy.value) {
       return
     }
     const el = video.value

web/app/pages/collection/scan.vue

@@ -24,7 +24,7 @@
             </h1>
             <p class="text-muted text-sm">
               Scannez vos cartes à la chaîne&nbsp;: la langue (FR / JP…) est reconnue automatiquement. En HTTPS, le mode
-              caisse capture chaque carte tenue immobile sans rien toucher.
+              caisse capture chaque carte dès qu'elle est tracée — vous pouvez bouger / pivoter pour aider l'OCR.
             </p>
           </div>
         </div>
@@ -41,7 +41,9 @@
               v-model="autoScan"
               label="Scan auto (caisse)"
               :description="
-                autoScan ? 'Capture quand vous passez une carte puis la tenez immobile' : 'Capture manuelle uniquement'
+                autoScan
+                  ? 'Capture dès qu\'une carte est tracée — vous pouvez bouger ou pivoter'
+                  : 'Capture manuelle uniquement'
               "
             />
             <div v-else />
@@ -249,8 +251,8 @@
             </div>
             <p class="text-muted text-[11px]">
               <template v-if="autoScan">
-                Présentez chaque carte bien à plat dans le cadre et tenez-la immobile&nbsp;: elle est capturée toute
-                seule, puis retirez-la pour enchaîner. Molette pour zoomer.
+                Présentez chaque carte dans le cadre&nbsp;: dès qu'elle est tracée, elle est capturée toute seule, puis
+                retirez-la pour enchaîner. Molette pour zoomer.
               </template>
               <template v-else>Molette sur l’aperçu pour zoomer. {{ zoomHint }}</template>
             </p>
@@ -1513,7 +1515,7 @@ const autoScanStatus = computed<{ label: string; color: 'primary' | 'success' |
     case 'watching':
       return { label: 'Placez ou passez une carte', color: 'neutral' }
     case 'settling':
-      return { label: 'Lecture… tenez la carte immobile', color: 'primary' }
+      return { label: 'Lecture en cours…', color: 'primary' }
     case 'captured':
       return { label: 'Carte capturée', color: 'success' }
     case 'cooldown':