Changeset 9b1abd2 in flexograder for gui/detail_panel.py

Timestamp:

12/16/25 16:28:34 (4 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

fake-data, main, master

Children:

1a60982

Parents:

a14c6b0

Message:

fix some subtype issues, support png rendering via tk.PhotoImage and remove pillow - rename type to mtype attribute for media items

File:

• gui/detail_panel.py (modified) (7 diffs)

gui/detail_panel.py

@@ -2 +2 @@
 from tkinter import ttk
 import tkinter.font as tkfont
-from PIL import Image, ImageTk
+# from PIL import Image, ImageTk
 
 class DetailPanel(ttk.Frame):
@@ -27 +27 @@
         self.font_question = tkfont.Font(family="TkDefaultFont", size=13)
         self.txt_question.configure(font=self.font_question)
+
+        # ─────────────────────────── Topic / Subtopic ─────────────────────────
+        topic_frame = ttk.Frame(self)
+        topic_frame.grid(row=2, column=0, sticky="ew", pady=(0, 4))
+        topic_frame.columnconfigure(1, weight=1)
+
+        ttk.Label(topic_frame, text="Topic:", foreground="#555").grid(
+            row=0, column=0, sticky="w"
+        )
+
+        self.lbl_topic = ttk.Label(
+            topic_frame,
+            text="—",
+            foreground="#555"
+        )
+        self.lbl_topic.grid(row=0, column=1, sticky="w")
+
         # ─────────────────────────── Metadata ────────────────────────────────
         meta = ttk.LabelFrame(self, text="Metadata", padding=(6, 4))
-        meta.grid(row=2, column=0, sticky="ew", pady=(0, 4))
+        meta.grid(row=3, column=0, sticky="ew", pady=(0, 4))
         meta.columnconfigure(1, weight=1)
 
-        ttk.Label(meta, text="Type:").grid(row=0, column=0, sticky="w")
+        ttk.Label(meta, text="Type:").grid(row=4, column=0, sticky="w")
         self.lbl_type = ttk.Label(meta, text="—")
         self.lbl_type.grid(row=0, column=1, sticky="w")
@@ -52 +69 @@
         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_frame.rowconfigure(0, weight=1)
+        self.img_frame.columnconfigure(0, weight=1)
+
+        self.img_label = ttk.Label(
+            self.img_frame,
+            anchor="center",
+            relief="sunken"
+        )
         self.img_label.grid(row=0, column=0, sticky="nsew")
 
@@ -86 +109 @@
         """Load an image from disk and resize to fit preview area."""
         try:
-            img = Image.open(img_path)
+            img = tk.PhotoImage(file=img_path)
         except Exception:
             return None
 
-        img.thumbnail((self.MAX_IMG_WIDTH, self.MAX_IMG_HEIGHT), Image.Resampling.LANCZOS)
-        return ImageTk.PhotoImage(img)
+        w = img.width()
+        h = img.height()
+
+        # Compute integer subsample factor
+        scale_w = max(1, w // self.MAX_IMG_WIDTH)
+        scale_h = max(1, h // self.MAX_IMG_HEIGHT)
+        scale = max(scale_w, scale_h)
+
+        if scale > 1:
+            img = img.subsample(scale, scale)
+
+        return img
 
     # ───────────────────────────────────────────────────────────────────────
@@ -101 +134 @@
 
         # Clear image preview
-        self.img_label.configure(image="")
+
         self._image_ref = None
+        self.img_label.configure(image=None)
 
         # Clear answers
@@ -111 +145 @@
             # Question text
             self.txt_question.insert("1.0", question.text)
+
+            topic = getattr(question, "topic", None)
+            subtopic = getattr(question, "subtopic", None)
+
+            if topic and subtopic:
+                self.lbl_topic.config(text=f"{topic} › {subtopic}")
+            elif topic:
+                self.lbl_topic.config(text=topic)
+            else:
+                self.lbl_topic.config(text="—")
 
             # Metadata
@@ -134 +178 @@
 
         else:
+            self.lbl_topic.config(text="—")
             self.lbl_type.config(text="—")
             self.lbl_state.config(text="—")