Changeset a14c6b0 in flexograder

Timestamp:

12/15/25 14:10:35 (4 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

fake-data, main, master

Children:

9b1abd2

Parents:

34e976b

Message:

image preview added

Files:

• builder/media_items.py (modified) (3 diffs)
• gui/answer_options_dialog.py (modified) (2 diffs)
• gui/attach_media_dialog.py (modified) (5 diffs)
• gui/detail_panel.py (modified) (7 diffs)
• gui/edit_answer_dialog.py (modified) (1 diff)
• gui/gui.py (modified) (1 diff)
• gui/option_question_editor.py (modified) (4 diffs)

builder/media_items.py

@@ -78 +78 @@
 
         return obj
-    
+
     def to_html(self):
         raise NotImplementedError
@@ -112 +112 @@
 @dataclass
 class DownloadItem(MediaItem):
-#    def __init__(self, src: str, label: str = None):
-#        super().__init__(domain="GEN", entity_type=EntityType.MEDIA, state=EntityState.DRAFT, src=src)
-#        self.label = label or "Datei herunterladen"
-
     label: str = "Datei herunterladen"
 
@@ -151 +147 @@
 
 def media_factory(m: dict) -> MediaItem:
-
-    mtype = m.get("type", "").lower()
+    print("Dict:", m)
+    mtype = m.get("mtype", "").lower()
 
     cls = {

gui/answer_options_dialog.py

@@ -38 +38 @@
 
         # --- Buttons below ---
-        ttk.Button(frame, text="Add", command=self.add_option).grid(row=1, column=0, sticky="ew", padx=(0, 5))
-        ttk.Button(frame, text="Edit", command=self.edit_option).grid(row=1, column=1, sticky="ew", padx=(0, 5))
-        ttk.Button(frame, text="Delete", command=self.delete_option).grid(row=1, column=2, sticky="ew")
+        ttk.Button(frame, text="Add", command=self.add_option).grid(row=1,
+                                                                    column=0,
+                                                                    sticky="ew",
+                                                                    padx=(0, 5))
+        ttk.Button(frame, text="Edit", command=self.edit_option).grid(row=1,
+                                                                      column=1,
+                                                                      sticky="ew",
+                                                                      padx=(0, 5))
+        ttk.Button(frame, text="Delete", command=self.delete_option).grid(row=1,
+                                                                          column=2,
+                                                                          sticky="ew")
 
         # --- OK / Cancel ---
@@ -100 +108 @@
 
             option_id = chr(ord("A") + index)
-            
             all_items.append({
                 "id": option_id,

gui/attach_media_dialog.py

@@ -1 +1 @@
 import tkinter as tk
 from tkinter import ttk, filedialog
+from pathlib import Path
 from builder.media_items import MediaItem
-from flexoentity import FlexOID  # if you use entity-based IDs
 
 class AttachMediaDialog(tk.Toplevel):
-    def __init__(self, parent, question):
+    def __init__(self, parent, question_dict):
         super().__init__(parent)
         self.title("Media attachments")
-        self.question = question
+        self.question_dict = question_dict
+        self.result = []
+        # Ensure media list exists
+        self.media_list = question_dict.get("media", [])
         self.resizable(False, False)
 
@@ -15 +18 @@
         self.listbox.pack(padx=10, pady=5, fill="both")
 
-        print(question.media)
-        for m in question.media:
-            self.listbox.insert(tk.END, f"{m.mtype.upper()}: {m.src}")
+        for m in self.media_list:
+            mtype = str(m.get("mtype", "unknown")).upper()
+            src = m.get("src", "?")
+            self.listbox.insert(tk.END, f"{mtype}: {src}")
 
         btn_frame = ttk.Frame(self)
@@ -24 +28 @@
         ttk.Button(btn_frame, text="Add...", command=self.add_media).pack(side=tk.LEFT, padx=5)
         ttk.Button(btn_frame, text="Remove", command=self.remove_media).pack(side=tk.LEFT, padx=5)
-        ttk.Button(btn_frame, text="Close", command=self.destroy).pack(side=tk.RIGHT, padx=5)
+        ttk.Button(btn_frame, text="Close", command=self.on_ok).pack(side=tk.RIGHT, padx=5)
 
     def add_media(self):
-        print("add")
         path = filedialog.askopenfilename(
             title="Select media file",
@@ -34 +37 @@
         if not path:
             return
-        media_item = MediaItem(src=path)
-        self.question.media.append(media_item)
-        self.listbox.insert(tk.END, f"{media_item.mtype.upper()}: {path}")
+
+        # Determine media type from extension
+        ext = Path(path).suffix.lower()
+        if ext in {".png", ".jpg", ".jpeg"}:
+            mtype = "image"
+        elif ext in {".mp4"}:
+            mtype = "video"
+        elif ext in {".wav"}:
+            mtype = "audio"
+        elif ext in {".pdf"}:
+            mtype = "pdf"
+        else:
+            mtype = "unknown"
+        media_entry = {"mtype": mtype, "src": path}
+        self.media_list.append(media_entry)
+        print("List:", self.media_list)
+        self.listbox.insert(tk.END, f"{mtype.upper()}: {path}")
 
     def remove_media(self):
@@ -44 +61 @@
         idx = selection[0]
         self.listbox.delete(idx)
-        del self.question.media[idx]
+        try:
+            del self.media_list[idx]
+        except IndexError:
+            pass
+
+    def on_ok(self):
+        """Return the final edited media list."""
+        print("OK:", self.media_list)
+        self.result = self.media_list
+        self.destroy()
+
+    def on_close(self):
+        """Return the final edited media list."""
+        self.result = self.media_list
+        self.destroy()

gui/detail_panel.py

@@ -1 @@
-#!/usr/bin/env python3
-
 import tkinter as tk
 from tkinter import ttk
-
+import tkinter.font as tkfont
+from PIL import Image, ImageTk
 
 class DetailPanel(ttk.Frame):
     """
-    Right-hand info panel for Flex-O-Grader main window.
-    Displays question text, metadata, answers, and context (catalog + clipboard).
+    Right-hand info panel for Flex-O-Grader.
+    With question text, metadata, preview image, answers, and context.
     """
+
+    MAX_IMG_WIDTH = 360
+    MAX_IMG_HEIGHT = 500 
 
     def __init__(self, parent):
@@ -15 +17 @@
         self.grid(row=0, column=1, sticky="nsew")
         self.columnconfigure(0, weight=1)
-        self.rowconfigure(3, weight=1)  # answers section expands
+
+        # Cache for the currently displayed PhotoImage (must hold ref!)
+        self._image_ref = None
 
         # ─────────────────────────── Question text ───────────────────────────
@@ -21 +25 @@
         self.txt_question = tk.Text(self, wrap="word", height=3)
         self.txt_question.grid(row=1, column=0, sticky="ew", pady=(0, 4))
-
+        self.font_question = tkfont.Font(family="TkDefaultFont", size=13)
+        self.txt_question.configure(font=self.font_question)
         # ─────────────────────────── Metadata ────────────────────────────────
         meta = ttk.LabelFrame(self, text="Metadata", padding=(6, 4))
@@ -43 +48 @@
         self.lbl_media.grid(row=3, column=1, sticky="w")
 
+        # ─────────────────────────── Image preview section ───────────────────
+        self.img_frame = ttk.LabelFrame(self, text="Picture Preview", padding=(6, 6))
+        self.img_frame.grid(row=3, column=0, sticky="nsew", pady=(0, 4))
+        self.img_frame.columnconfigure(0, weight=1)
+        self.rowconfigure(3, weight=3)  # allow preview area to expand
+
+        self.img_label = ttk.Label(self.img_frame, anchor="center")
+        self.img_label.grid(row=0, column=0, sticky="nsew")
+
         # ─────────────────────────── Answers table ───────────────────────────
-        ttk.Label(self, text="Answers").grid(row=3, column=0, sticky="w")
+        ttk.Label(self, text="Answers").grid(row=4, column=0, sticky="w")
         self.tree_answers = ttk.Treeview(
             self, columns=("text", "points"), show="headings", height=5
@@ -52 +66 @@
         self.tree_answers.column("text", width=320, anchor="w")
         self.tree_answers.column("points", width=60, anchor="center")
-        self.tree_answers.grid(row=4, column=0, sticky="nsew", pady=(0, 4))
+        self.tree_answers.grid(row=5, column=0, sticky="nsew", pady=(0, 4))
+        self.rowconfigure(5, weight=0)
 
         # ─────────────────────────── Context ────────────────────────────────
         ctx = ttk.LabelFrame(self, text="Context", padding=(6, 4))
-        ctx.grid(row=5, column=0, sticky="ew", pady=(4, 0))
+        ctx.grid(row=6, column=0, sticky="ew", pady=(4, 0))
         ctx.columnconfigure(1, weight=1)
 
@@ -68 +83 @@
 
     # ───────────────────────────────────────────────────────────────────────
+    def _load_and_resize_image(self, img_path):
+        """Load an image from disk and resize to fit preview area."""
+        try:
+            img = Image.open(img_path)
+        except Exception:
+            return None
+
+        img.thumbnail((self.MAX_IMG_WIDTH, self.MAX_IMG_HEIGHT), Image.Resampling.LANCZOS)
+        return ImageTk.PhotoImage(img)
+
+    # ───────────────────────────────────────────────────────────────────────
     def refresh_details(self, question=None, catalog_title=None,
-                    clipboard_action=None, clipboard_count=0):
-        """
-        Refresh all visible info according to the selected question and state.
-        Called by main GUI after question selection or clipboard change.
-        """
-        # Clear / update question text
+                        clipboard_action=None, clipboard_count=0):
+
+        # Clear question text
         self.txt_question.delete("1.0", tk.END)
+
+        # Clear image preview
+        self.img_label.configure(image="")
+        self._image_ref = None
+
+        # Clear answers
+        for item in self.tree_answers.get_children():
+            self.tree_answers.delete(item)
+
         if question:
+            # Question text
             self.txt_question.insert("1.0", question.text)
+
+            # Metadata
             self.lbl_type.config(text=question.__class__.__name__)
-            try:
-                self.lbl_state.config(text=question.state.name)
-            except AttributeError:
-                self.lbl_state.config(text=str(question.state))
+            self.lbl_state.config(text=getattr(question.state, "name", str(question.state)))
             self.lbl_id.config(text=str(question.flexo_id))
             self.lbl_media.config(
                 text=", ".join([m.src for m in question.media if m]) or "—"
             )
+
+            # Answers
+            for text, points in question.answer_options_for_display():
+                self.tree_answers.insert("", "end", values=(text, points))
+
+            # Image preview (first media entry wins)
+            if question.media:
+                first = question.media[0]
+                if first and getattr(first, "src", None):
+                    img = self._load_and_resize_image(first.src)
+                    if img:
+                        self._image_ref = img  # must keep reference
+                        self.img_label.configure(image=img)
+
         else:
             self.lbl_type.config(text="—")
@@ -93 +139 @@
             self.lbl_media.config(text="—")
 
-        # Update answers
-        for item in self.tree_answers.get_children():
-            self.tree_answers.delete(item)
-        if question:
-            for text, points in question.answer_options_for_display():
-                self.tree_answers.insert("", "end", values=(text, points))
+        # Context
+        self.lbl_catalog.config(text=catalog_title or "—")
+        self.lbl_clipboard.config(
+            text="Empty" if clipboard_count == 0
+            else f"{clipboard_action or '?'} ({clipboard_count})"
+        )
 
-        # Context: catalog & clipboard
-        self.lbl_catalog.config(text=catalog_title or "—")
-        if clipboard_count == 0:
-            self.lbl_clipboard.config(text="Empty")
-        else:
-            self.lbl_clipboard.config(
-                text=f"{clipboard_action or '?'} ({clipboard_count})"
-            )

gui/edit_answer_dialog.py

@@ -33 +33 @@
         button_frame.grid(row=2, column=0, columnspan=2, sticky="e")
 
-        ttk.Button(button_frame, text="OK", command=self.on_ok).grid(row=0, column=0, padx=5)
-        ttk.Button(button_frame, text="Cancel", command=self.on_cancel).grid(row=0, column=1, padx=5)
+        ttk.Button(button_frame, text="OK", command=self.on_ok).grid(row=0,
+                                                                     column=0,
+                                                                     padx=5)
+
+        ttk.Button(button_frame, text="Cancel", command=self.on_cancel).grid(row=0,
+                                                                             column=1,
+                                                                             padx=5)
 
         # Enter/ESC bindings

gui/gui.py

@@ -471 +471 @@
         dlg = self.get_question_editor_for(self, q, editing=True)
         self.wait_window(dlg)
+        print("Factory:", dlg.result)
         dlg.result["meta"]["originator_id"] = str(uuid4())
         dlg.result["meta"]["owner_id"] = str(uuid4())

gui/option_question_editor.py

@@ -19 +19 @@
         self.question_dict = question_dict
         self.result = None
-        print(question_dict)
         self.meta = question_dict.get("meta", {})
         self.content = question_dict.get("content", {})
@@ -116 +115 @@
         self.wait_window(dlg)
 
+        if dlg.result is not None:
+            # ensure target structure exists
+            if "media" not in self.question_dict:
+                self.question_dict["media"] = []
+
+            # overwrite old list
+            self.question_dict["media"] = dlg.result
+
+            # also update content-side snapshot
+            self.content["media"] = dlg.result
+
+            messagebox.showinfo("Media updated", f"{len(dlg.result)} media items attached.")
+
     def on_ok(self):
         text = self.txt_question.get("1.0", tk.END).strip()
@@ -122 +134 @@
             return
 
-        print(self.meta)
         content = {"text": text,
-                   "options": self.content.get("options", {})
+                   "options": self.content.get("options", {}),
+                   "media": self.content.get("media", [])
                    }
         meta = {
@@ -138 +150 @@
                        "content": content
                        }
-        print(self.result)
+        print("Final:", self.result)
         self.destroy()