Update app.py

app.py

@@ -4,8 +4,6 @@ import gradio as gr
 from pathlib import Path
 from collections import Counter, defaultdict
 from huggingface_hub import hf_hub_download
-import matplotlib.pyplot as plt
-import io
 
 from facial_fer_model import FacialExpressionRecog
 from yunet import YuNet
@@ -40,7 +38,7 @@ def to_dutch(label: str) -> str:
     key = label.strip().lower()
     return EN_TO_NL.get(key, label)
 
-# Opslag voor statistieken
+# In-memory statistieken
 emotion_stats = defaultdict(int)
 
 def visualize(image, det_res, fer_res):
@@ -66,51 +64,100 @@ def summarize_emotions(fer_res):
     details = ", ".join([f"{name} ({n})" for name, n in counts])
     return f"# **{top}**\n\n_Gedetecteerde emoties: {details}_"
 
-def update_stats_and_plot(names_nl):
+# --- 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?
+    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)
+        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
+
+    labels = list(stats.keys())
+    values = [stats[k] for k in labels]
+    max_val = max(values) if max(values) > 0 else 1
+
+    n = len(labels)
+    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.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
+        ty = height - bottom + th + 12
+        cv.putText(img, show_lab, (tx, ty), cv.FONT_HERSHEY_SIMPLEX, 0.5, (40, 40, 40), 1, cv.LINE_AA)
+
+    return cv.cvtColor(img, cv.COLOR_BGR2RGB)
+
+def update_stats_and_chart(names_nl):
     for name in names_nl:
         emotion_stats[name] += 1
-    # Maak plot
-    fig, ax = plt.subplots()
-    labels = list(emotion_stats.keys())
-    values = [emotion_stats[k] for k in labels]
-    ax.bar(labels, values)
-    ax.set_ylabel("Aantal keer gedetecteerd")
-    ax.set_title("Live emotie-statistieken")
-    plt.xticks(rotation=45)
-    buf = io.BytesIO()
-    plt.tight_layout()
-    fig.savefig(buf, format="png")
-    plt.close(fig)
-    buf.seek(0)
-    return buf
+    return draw_bar_chart_cv(emotion_stats)
 
 def detect_expression(input_image):
     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([])
-        stats_plot = update_stats_and_plot([])
+        # 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
+
     fer_res = [fer_model.infer(image, face_points[:-1])[0] for face_points in dets]
     output = visualize(image, dets, fer_res)
     emotion_md = summarize_emotions(fer_res)
     names_nl = [to_dutch(FacialExpressionRecog.getDesc(x)) for x in fer_res]
-    stats_plot = update_stats_and_plot(names_nl)
+    stats_plot = update_stats_and_chart(names_nl)
+
     return cv.cvtColor(output, cv.COLOR_BGR2RGB), emotion_md, stats_plot
 
 # Voorbeelden automatisch laden
 IMAGE_EXTS = {".jpg", ".jpeg", ".png", ".bmp", ".webp"}
 EXAMPLES_DIR = Path("examples")
-if EXAMPLES_DIR.exists():
-    example_paths = [str(p) for p in sorted(EXAMPLES_DIR.iterdir()) if p.suffix.lower() in IMAGE_EXTS]
+if EXAMPLES_DIR.exists() and EXAMPLES_DIR.is_dir():
+    example_paths = [str(p) for p in sorted(EXAMPLES_DIR.iterdir()) if Path(p).suffix.lower() in IMAGE_EXTS]
 else:
     example_paths = []
 example_list = [[p] for p in example_paths]
 CACHE_EXAMPLES = bool(example_list)
 
-# CSS voor groene tekst
+# CSS (groene emotietekst)
 custom_css = """
 #emotie-uitslag { color: #16a34a; }
 #emotie-uitslag h1, #emotie-uitslag h2, #emotie-uitslag h3 { margin: 0.25rem 0; }
@@ -131,12 +178,19 @@ with gr.Blocks(css=custom_css) as demo:
             emotion_md = gr.Markdown("## **Nog geen resultaat**", elem_id="emotie-uitslag")
             stats_image = gr.Image(label="Statistieken", type="numpy")
 
-    def clear_all():
-        return None, "## **Nog geen resultaat**", None
-    input_image.change(fn=clear_all, outputs=[output_image, emotion_md, stats_image])
+    # Clear-helpers
+    def clear_all_on_new():
+        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])
     submit_btn.click(fn=detect_expression, inputs=input_image, outputs=[output_image, emotion_md, stats_image])
-    clear_btn.click(fn=clear_all, outputs=[input_image, output_image, emotion_md, stats_image])
+    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.")
     gr.Examples(
         examples=example_list,
         inputs=input_image,