Update app.py

app.py

@@ -66,31 +66,19 @@ def summarize_emotions(fer_res):
 
 # --- Staafdiagram tekenen met OpenCV (geen matplotlib nodig) ---
 def draw_bar_chart_cv(stats: dict, width=640, height=320):
-    """
-    Maakt een simpele staafdiagram als numpy image (RGB).
-    """
-    # Wit canvas (BGR eerst, later naar RGB)
     img = np.full((height, width, 3), 255, dtype=np.uint8)
-
-    # Titel
-    title = "Live emotie-statistieken"
-    cv.putText(img, title, (12, 28), cv.FONT_HERSHEY_SIMPLEX, 0.8, (0, 0, 0), 2, cv.LINE_AA)
-
-    # Geen data?
+    cv.putText(img, "Live emotie-statistieken", (12, 28), cv.FONT_HERSHEY_SIMPLEX, 0.8, (0, 0, 0), 2, cv.LINE_AA)
     if not stats:
-        msg = "Nog geen statistieken"
-        cv.putText(img, msg, (12, height//2), cv.FONT_HERSHEY_SIMPLEX, 0.9, (128, 128, 128), 2, cv.LINE_AA)
+        cv.putText(img, "Nog geen statistieken", (12, height//2), cv.FONT_HERSHEY_SIMPLEX, 0.9, (128, 128, 128), 2, cv.LINE_AA)
         return cv.cvtColor(img, cv.COLOR_BGR2RGB)
 
-    # Marges & plotgebied
     left, right, top, bottom = 60, 20, 50, 40
     plot_w = width - left - right
     plot_h = height - top - bottom
     origin = (left, height - bottom)
 
-    # Assen
-    cv.line(img, origin, (left + plot_w, height - bottom), (0, 0, 0), 2)                 # x-as
-    cv.line(img, origin, (left, height - bottom - plot_h), (0, 0, 0), 2)                 # y-as
+    cv.line(img, origin, (left + plot_w, height - bottom), (0, 0, 0), 2)
+    cv.line(img, origin, (left, height - bottom - plot_h), (0, 0, 0), 2)
 
     labels = list(stats.keys())
     values = [stats[k] for k in labels]
@@ -100,20 +88,15 @@ def draw_bar_chart_cv(stats: dict, width=640, height=320):
     gap = 12
     bar_w = max(10, int((plot_w - gap * (n + 1)) / max(1, n)))
 
-    # Bars (groen)
     for i, (lab, val) in enumerate(zip(labels, values)):
         x1 = left + gap + i * (bar_w + gap)
         x2 = x1 + bar_w
-        # Hoogte proportioneel
         h_px = int((val / max_val) * (plot_h - 10))
         y1 = height - bottom - h_px
         y2 = height - bottom - 1
-        cv.rectangle(img, (x1, y1), (x2, y2), (0, 170, 60), -1)  # groene balk
-
-        # Waardelabel boven balk
+        cv.rectangle(img, (x1, y1), (x2, y2), (0, 170, 60), -1)
         cv.putText(img, str(val), (x1 + 2, y1 - 6), cv.FONT_HERSHEY_SIMPLEX, 0.5, (0, 90, 30), 1, cv.LINE_AA)
 
-        # X-label onder balk (afgekort indien lang)
         show_lab = lab if len(lab) <= 10 else lab[:9] + "…"
         (tw, th), _ = cv.getTextSize(show_lab, cv.FONT_HERSHEY_SIMPLEX, 0.5, 1)
         tx = x1 + (bar_w - tw) // 2
@@ -122,30 +105,36 @@ def draw_bar_chart_cv(stats: dict, width=640, height=320):
 
     return cv.cvtColor(img, cv.COLOR_BGR2RGB)
 
-def update_stats_and_chart(names_nl):
-    for name in names_nl:
-        emotion_stats[name] += 1
-    return draw_bar_chart_cv(emotion_stats)
-
-def detect_expression(input_image):
+def process_image(input_image):
+    """Helper: run detectie en retourneer (output_img, fer_res as list of ints)."""
     image = cv.cvtColor(input_image, cv.COLOR_RGB2BGR)
     h, w, _ = image.shape
     detect_model.setInputSize([w, h])
     dets = detect_model.infer(image)
-
     if dets is None:
-        emotion_md = summarize_emotions([])
-        # Geen incremente — alleen huidige chart tonen
-        stats_plot = draw_bar_chart_cv(emotion_stats)
-        return cv.cvtColor(image, cv.COLOR_BGR2RGB), emotion_md, stats_plot
-
+        return cv.cvtColor(image, cv.COLOR_BGR2RGB), []
     fer_res = [fer_model.infer(image, face_points[:-1])[0] for face_points in dets]
     output = visualize(image, dets, fer_res)
+    return cv.cvtColor(output, cv.COLOR_BGR2RGB), fer_res
+
+def detect_expression(input_image):
+    """Versie die WÉL statistieken bijwerkt (gebruik voor 'Verstuur')."""
+    output_img, fer_res = process_image(input_image)
     emotion_md = summarize_emotions(fer_res)
+    # update stats alleen hier:
     names_nl = [to_dutch(FacialExpressionRecog.getDesc(x)) for x in fer_res]
-    stats_plot = update_stats_and_chart(names_nl)
+    for name in names_nl:
+        emotion_stats[name] += 1
+    stats_plot = draw_bar_chart_cv(emotion_stats)
+    return output_img, emotion_md, stats_plot
 
-    return cv.cvtColor(output, cv.COLOR_BGR2RGB), emotion_md, stats_plot
+def detect_expression_no_stats(input_image):
+    """Versie die GEEN statistieken bijwerkt (gebruik voor gr.Examples & caching)."""
+    output_img, fer_res = process_image(input_image)
+    emotion_md = summarize_emotions(fer_res)
+    # géén update van emotion_stats
+    stats_plot = draw_bar_chart_cv(emotion_stats)  # toon huidige stand (kan leeg zijn)
+    return output_img, emotion_md, stats_plot
 
 # Voorbeelden automatisch laden
 IMAGE_EXTS = {".jpg", ".jpeg", ".png", ".bmp", ".webp"}
@@ -164,8 +153,8 @@ custom_css = """
 """
 
 with gr.Blocks(css=custom_css) as demo:
-    gr.Markdown("## Herkenning van gezichtsuitdrukkingen (FER) met OpenCV DNN")
-    gr.Markdown("Detecteert gezichten en herkent gezichtsuitdrukkingen met YuNet + MobileFaceNet (ONNX).")
+    gr.Markdown("## Herkenning van gezichtsuitdrukkingen ")
+    gr.Markdown("Detecteert gezichten en herkent gezichtsuitdrukkingen ")
 
     with gr.Row():
         with gr.Column():
@@ -183,7 +172,6 @@ with gr.Blocks(css=custom_css) as demo:
         return None, "## **Nog geen resultaat**", draw_bar_chart_cv(emotion_stats)
 
     def clear_all_button():
-        # reset alleen UI; statistieken laten we staan
         return None, None, "## **Nog geen resultaat**", draw_bar_chart_cv(emotion_stats)
 
     input_image.change(fn=clear_all_on_new, outputs=[output_image, emotion_md, stats_image])
@@ -191,11 +179,12 @@ with gr.Blocks(css=custom_css) as demo:
     clear_btn.click(fn=clear_all_button, outputs=[input_image, output_image, emotion_md, stats_image])
 
     gr.Markdown("Klik op een voorbeeld om te testen.")
+    # BELANGRIJK: gebruik de 'no_stats'-functie voor Examples zodat deze NIET meetellen
     gr.Examples(
         examples=example_list,
         inputs=input_image,
         outputs=[output_image, emotion_md, stats_image],
-        fn=detect_expression,
+        fn=detect_expression_no_stats,   # <- telt NIET mee
         examples_per_page=20,
         cache_examples=CACHE_EXAMPLES
     )