Update text_integration.py

text_integration.py

@@ -2,7 +2,7 @@ from PIL import Image, ImageDraw, ImageFont
 import gradio as gr
 import numpy as np
 
-def add_text_to_image(image, text, text_x, text_y, font_size=90, font_family="Arial", font_color="#FFFFFF"):
+def add_text_to_image(image, text, text_x, text_y, font_size="90", font_family="Arial", font_color="Weiß"):
     """Fügt Text mit PIL zum Bild hinzu mit Formatierungsoptionen"""
     if image is None or not text:
         return image
@@ -15,6 +15,19 @@ def add_text_to_image(image, text, text_x, text_y, font_size=90, font_family="Ar
         image_with_text = image.copy()
         draw = ImageDraw.Draw(image_with_text)
         
+        # Schriftgröße direkt verwenden (kein Mapping mehr)
+        try:
+            pixel_size = int(font_size)
+        except:
+            pixel_size = 90
+        
+        # Farbnamen in Hex-Codes umwandeln
+        color_mapping = {
+            "Weiß": "#FFFFFF",
+            "Schwarz": "#000000"
+        }
+        hex_color = color_mapping.get(font_color, "#FFFFFF")
+        
         # Schriftart basierend auf Auswahl
         font_paths = {
             "Arial": "arial.ttf",
@@ -24,20 +37,26 @@ def add_text_to_image(image, text, text_x, text_y, font_size=90, font_family="Ar
         
         try:
             font_path = font_paths.get(font_family, "arial.ttf")
-            font = ImageFont.truetype(font_path, int(font_size))
-        except:
+            font = ImageFont.truetype(font_path, pixel_size)
+            print(f"Schriftart geladen: {font_path} mit Größe {pixel_size}px")
+        except Exception as font_error:
+            print(f"Fehler beim Laden der Schriftart: {font_error}")
             # Fallback auf Default Font
-            font = ImageFont.load_default()
+            try:
+                font = ImageFont.truetype("arial.ttf", pixel_size)
+            except:
+                font = ImageFont.load_default()
+                print("Fallback auf Default Font")
         
-        draw.text((text_x, text_y), text, fill=font_color, font=font)
-        print(f"Text '{text}' an Position ({text_x}, {text_y}) hinzugefügt - Größe: {font_size}, Schrift: {font_family}, Farbe: {font_color}")
+        draw.text((text_x, text_y), text, fill=hex_color, font=font)
+        print(f"Text '{text}' an Position ({text_x}, {text_y}) hinzugefügt - Größe: {pixel_size}px, Schrift: {font_family}, Farbe: {font_color} ({hex_color})")
         return image_with_text
         
     except Exception as e:
         print(f"Fehler beim Text hinzufügen: {e}")
         return image
 
-def create_text_preview(image, text, text_x, text_y, font_size=90, font_family="Arial", font_color="#FFFFFF"):
+def create_text_preview(image, text, text_x, text_y, font_size="90", font_family="Arial", font_color="Weiß"):
     """Erstellt eine Vorschau mit Text und rotem Marker - nur EINEN Punkt"""
     if image is None:
         return image
@@ -65,6 +84,19 @@ def create_text_preview(image, text, text_x, text_y, font_size=90, font_family="
         
         # Text zeichnen wenn vorhanden
         if text:
+            # Schriftgröße direkt verwenden (kein Mapping mehr)
+            try:
+                pixel_size = int(font_size)
+            except:
+                pixel_size = 90
+            
+            # Farbnamen in Hex-Codes umwandeln
+            color_mapping = {
+                "Weiß": "#FFFFFF", 
+                "Schwarz": "#000000"
+            }
+            hex_color = color_mapping.get(font_color, "#FFFFFF")
+            
             # Schriftart basierend auf Auswahl
             font_paths = {
                 "Arial": "arial.ttf",
@@ -74,12 +106,17 @@ def create_text_preview(image, text, text_x, text_y, font_size=90, font_family="
             
             try:
                 font_path = font_paths.get(font_family, "arial.ttf")
-                font = ImageFont.truetype(font_path, int(font_size))
-            except:
+                font = ImageFont.truetype(font_path, pixel_size)
+            except Exception as font_error:
+                print(f"Fehler beim Laden der Schriftart für Vorschau: {font_error}")
                 # Fallback auf Default Font
-                font = ImageFont.load_default()
+                try:
+                    font = ImageFont.truetype("arial.ttf", pixel_size)
+                except:
+                    font = ImageFont.load_default()
             
-            draw.text((text_x, text_y), text, fill=font_color, font=font)
+            draw.text((text_x, text_y), text, fill=hex_color, font=font)
+            print(f"Vorschau: Text mit Größe {pixel_size}px, Farbe {font_color} ({hex_color}) gezeichnet")
         
         return preview
         
@@ -98,6 +135,7 @@ def update_text_preview_i2i(original_image, generated_image, text, text_x, text_
 
 def update_text_preview_t2i(image, text, text_x, text_y, font_size, font_family, font_color):
     """Aktualisiert die Text-Vorschau für Text-zu-Bild mit Formatierung"""
+    print(f"Update Vorschau - Größe: {font_size}px, Schrift: {font_family}, Farbe: {font_color}")
     return create_text_preview(image, text, text_x, text_y, font_size, font_family, font_color)
 
 def capture_click(event: gr.SelectData):
@@ -138,8 +176,8 @@ def create_text_integration_section_t2i():
             )
         with gr.Column():
             font_color_t2i = gr.Dropdown(
-                choices=["#FFFFFF", "#000000"],
-                value="#FFFFFF",
+                choices=["Weiß", "Schwarz"],
+                value="Weiß",
                 label="Schriftfarbe"
             )
         
@@ -151,7 +189,7 @@ def create_text_integration_section_t2i():
     with gr.Row():
         text_btn_t2i = gr.Button("📝 Text auf generiertes Bild", variant="secondary")
     
-    return text_input_t2i, text_x_t2i, text_y_t2i, text_btn_t2i
+    return text_input_t2i, text_x_t2i, text_y_t2i, font_size_t2i, font_family_t2i, font_color_t2i, text_btn_t2i
 
 def create_text_integration_section_i2i():
     """Erstellt die UI-Komponenten für Text-Integration in Bild-zu-Bild"""