improv home

app.py

@@ -86,6 +86,8 @@ _webcam_classes           = []
 _webcam_frame_count       = 0
 _webcam_detections        = 0
 _webcam_detections_by_class = defaultdict(int)
+_webcam_current_counts    = defaultdict(int)
+_webcam_seen_track_ids    = set()
 _webcam_lock              = threading.Lock()
 
 # ── Chargement du modèle en arrière-plan ──────────────────────────────────────
@@ -882,6 +884,7 @@ def api_logs_csv(scene_id):
 def api_webcam_start():
     global _webcam_active, _webcam_classes, _webcam_frame_count
     global _webcam_detections, _webcam_detections_by_class
+    global _webcam_current_counts, _webcam_seen_track_ids
 
     data    = request.json or {}
     classes = data.get("classes", DEFAULT_CLASSES)
@@ -896,6 +899,8 @@ def api_webcam_start():
         _webcam_frame_count         = 0
         _webcam_detections          = 0
         _webcam_detections_by_class = defaultdict(int)
+        _webcam_current_counts      = defaultdict(int)
+        _webcam_seen_track_ids      = set()
 
     print(f"✅ Webcam started with classes: {classes}")
     return jsonify({"status": "started"}), 200
@@ -903,6 +908,7 @@ def api_webcam_start():
 @app.route("/api/webcam/frame", methods=["POST"])
 def api_webcam_frame():
     global _webcam_frame_count, _webcam_detections, _webcam_detections_by_class
+    global _webcam_current_counts, _webcam_seen_track_ids
 
     if not _webcam_active or not _model_ready:
         return jsonify({"error": "Webcam not active"}), 503
@@ -918,21 +924,41 @@ def api_webcam_frame():
         if frame is None:
             return jsonify({"error": "Could not decode image"}), 400
 
-        # Inférence YOLO avec les paramètres corrigés
-        results = _model(frame, conf=CONF, iou=IOU, imgsz=INFER_SZ, verbose=False)
+        # Tracking YOLO: count unique objects by persistent track_id, not by frame.
+        results = _model.track(
+            frame,
+            conf=CONF,
+            iou=IOU,
+            imgsz=INFER_SZ,
+            persist=True,
+            verbose=False
+        )
 
-        annotated, detection_count = _draw_detections(frame, results, _webcam_classes)
+        annotated, _ = _draw_detections(frame, results, _webcam_classes)
+        current_counts = defaultdict(int)
+        new_unique_counts = defaultdict(int)
 
         with _webcam_lock:
             _webcam_frame_count  += 1
-            _webcam_detections   += detection_count
 
-            if results[0].boxes:
+            if results and results[0].boxes:
                 for box in results[0].boxes:
                     cls        = int(box.cls[0])
                     class_name = COCO_TO_LABEL.get(cls)
                     if class_name and class_name in _webcam_classes:
-                        _webcam_detections_by_class[class_name] += 1
+                        current_counts[class_name] += 1
+                        if box.id is None:
+                            continue
+                        track_id = int(box.id[0])
+                        unique_key = (class_name, track_id)
+                        if unique_key not in _webcam_seen_track_ids:
+                            _webcam_seen_track_ids.add(unique_key)
+                            new_unique_counts[class_name] += 1
+
+            for class_name, count in new_unique_counts.items():
+                _webcam_detections_by_class[class_name] += count
+            _webcam_current_counts = current_counts
+            _webcam_detections = sum(_webcam_detections_by_class.values())
 
         ret, buffer = cv2.imencode('.jpg', annotated)
         return Response(buffer.tobytes(), mimetype='image/jpeg'), 200
@@ -953,12 +979,13 @@ def api_webcam_stop():
 def api_webcam_stats():
     with _webcam_lock:
         by_class = dict(_webcam_detections_by_class)
+        frame_counts = dict(_webcam_current_counts)
         return jsonify({
             "active":               _webcam_active,
             "frame":                _webcam_frame_count,
             "detections":           _webcam_detections,
             "detections_by_class":  by_class,
-            "frame_counts":         by_class,
+            "frame_counts":         frame_counts,
             "unique_counts":        by_class
         }), 200
 

templates/dashboard.html

@@ -265,6 +265,17 @@ window._lastPieColors=[];
 window._lastFlowScene=null;
 window._lastCounts={};
 
+const CLASS_COLORS = {
+  'Vehicle':'#3b82f6',
+  'Motorcycle':'#10b981',
+  'Truck':'#f59e0b',
+  'Bus':'#8b5cf6',
+  'Human':'#ec4899',
+  'Bicycle':'#06b6d4',
+  'Traffic light':'#ef4444',
+  'Road sign':'#f97316'
+};
+
 function chartReady(){
   return false;
 }
@@ -485,6 +496,16 @@ function gc(){
   return{grid:dk?'rgba(255,255,255,0.05)':'rgba(0,0,0,0.06)',tick:dk?'#4a5a6a':'#94a3b8'};
 }
 
+function hexToRgba(hex,alpha){
+  const clean=String(hex||'').replace('#','');
+  const value=clean.length===3
+    ? clean.split('').map(ch=>ch+ch).join('')
+    : clean.padEnd(6,'0').slice(0,6);
+  const num=parseInt(value,16);
+  const r=(num>>16)&255,g=(num>>8)&255,b=num&255;
+  return `rgba(${r},${g},${b},${alpha})`;
+}
+
 /* ── Pie chart — Object Type Distribution ── */
 window.pch = null;
 
@@ -640,13 +661,27 @@ function drawHm(){
     mxR=Math.max(mxR,0.01);mxH=Math.max(mxH,0.01);
     pts.forEach(p=>{
       const px=(p.x/mxR)*w,py=(p.y/mxH)*h;
-      const rad=Math.max(10,Math.min(w,h)*0.015);
+      const rad=Math.max(10,Math.min(w,h)*0.018);
+      const color=p.color||CLASS_COLORS[p.cls]||'#dc2626';
       const grd=ctx.createRadialGradient(px,py,0,px,py,rad);
-      grd.addColorStop(0,'rgba(220,38,38,0.5)');
-      grd.addColorStop(0.4,'rgba(180,0,0,0.18)');
+      grd.addColorStop(0,hexToRgba(color,0.55));
+      grd.addColorStop(0.42,hexToRgba(color,0.22));
       grd.addColorStop(1,'rgba(0,0,0,0)');
       ctx.fillStyle=grd;ctx.fillRect(0,0,w,h);
     });
+    const classes=[...new Set(pts.map(p=>p.cls).filter(Boolean))].slice(0,8);
+    let lx=8,ly=h-12;
+    ctx.font="9px 'DM Sans',sans-serif";
+    ctx.textAlign='left';
+    classes.forEach(cls=>{
+      const color=CLASS_COLORS[cls]||'#888';
+      ctx.fillStyle=color;
+      ctx.fillRect(lx,ly-7,7,7);
+      ctx.fillStyle=dk?'rgba(255,255,255,0.55)':'rgba(15,25,35,0.6)';
+      ctx.fillText(cls,lx+10,ly);
+      lx+=ctx.measureText(cls).width+26;
+      if(lx>w-80){lx=8;ly-=14;}
+    });
     ctx.font="9px 'DM Mono',monospace";
     ctx.fillStyle=dk?'rgba(255,255,255,0.3)':'rgba(0,0,0,0.25)';
     ctx.textAlign='left';ctx.fillText(pts.length+' points',8,13);
@@ -669,7 +704,11 @@ async function loadHeatmap(){
     if(!rows.length)return;
     const pts=[];let mxX=0,mxY=0;
     rows.slice(0,4000).forEach(r=>{
-      if(r.cx>0&&r.cy>0){pts.push({x:r.cx,y:r.cy,r:0,h:0});if(r.cx>mxX)mxX=r.cx;if(r.cy>mxY)mxY=r.cy;}
+      if(r.cx>0&&r.cy>0){
+        const cls=r.class_name||r.class||'Unknown';
+        pts.push({x:r.cx,y:r.cy,cls,color:CLASS_COLORS[cls]||'#888',r:0,h:0});
+        if(r.cx>mxX)mxX=r.cx;if(r.cy>mxY)mxY=r.cy;
+      }
     });
     if(!pts.length)return;
     pts.forEach(p=>{p.r=mxX;p.h=mxY;});

templates/home.html

@@ -813,12 +813,7 @@ async function _pollWc(){
     const fc=d.frame_counts||{};
     const uc=d.unique_counts||{};
     _showCountsWc(fc,uc);
-    // ✅ Fix: afficher banner SEULEMENT si vraiment zéro détections
-    if(d.detections!==undefined){
-      _showBanner(d.detections===0 && d.frame>0);
-    }else{
-      _showBanner(!Object.keys(fc).length);
-    }
+    _showBanner(!Object.keys(fc).length && d.frame>0);
   }catch(e){}
 }