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="80px", font_family="Arial", font_color="Weiß"):
+def add_text_to_image(image, text, text_x, text_y, font_size="80px", font_family="Roboto", font_color="Weiß"):
     """Fügt Text mit PIL zum Bild hinzu mit Formatierungsoptionen"""
     if image is None or not text:
         return image
@@ -20,7 +20,7 @@ def add_text_to_image(image, text, text_x, text_y, font_size="80px", font_family
             pixel_size = int(font_size.replace("px", ""))
             print(f"Schriftgröße direkt: {font_size} -> {pixel_size}px")
         except:
-            pixel_size = 80  # Fallback - HÖHERER WERT
+            pixel_size = 80  # Fallback
         
         # Schriftfarbe Mapping - schwarz, weiß, rot
         color_mapping = {
@@ -32,48 +32,28 @@ def add_text_to_image(image, text, text_x, text_y, font_size="80px", font_family
         actual_color = color_mapping.get(font_color, "white")
         print(f"Schriftfarbe Mapping: {font_color} -> {actual_color}")
         
-        # VERBESSERT: Größere Schriftarten erzwingen
+        # NEU: 3 garantierte TrueType-Schriftarten mit relativen Pfaden
+        font_paths = {
+            "Roboto": "./fonts/Roboto-Regular.ttf",
+            "Open Sans": "./fonts/OpenSans-Regular.ttf", 
+            "DejaVu Sans": "./fonts/DejaVuSans.ttf"
+        }
+        
         try:
-            if font_family == "Arial":
-                # Versuche verschiedene Arial-Varianten
-                try:
-                    font = ImageFont.truetype("arial.ttf", pixel_size)
-                except:
-                    try:
-                        font = ImageFont.truetype("Arial.ttf", pixel_size)
-                    except:
-                        try:
-                            font = ImageFont.truetype("/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf", pixel_size)
-                        except:
-                            # Finaler Fallback mit Default-Font
-                            font = ImageFont.load_default()
-                            print(f"Verwende Default-Schriftart mit Größe {pixel_size}")
-            elif font_family == "Times New Roman":
-                try:
-                    font = ImageFont.truetype("times.ttf", pixel_size)
-                except:
-                    try:
-                        font = ImageFont.truetype("Times New Roman.ttf", pixel_size)
-                    except:
-                        font = ImageFont.load_default()
-            elif font_family == "Courier New":
-                try:
-                    font = ImageFont.truetype("cour.ttf", pixel_size)
-                except:
-                    try:
-                        font = ImageFont.truetype("Courier New.ttf", pixel_size)
-                    except:
-                        font = ImageFont.load_default()
-            else:
-                font = ImageFont.load_default()
-                
+            font_path = font_paths.get(font_family, "./fonts/Roboto-Regular.ttf")
+            font = ImageFont.truetype(font_path, pixel_size)
             print(f"Schriftart geladen: {font_family} 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()
-            print("Fallback auf Default Font")
+            print(f"Fehler beim Laden der Schriftart {font_family}: {font_error}")
+            # Fallback: Versuche die erste verfügbare Schriftart
+            try:
+                font = ImageFont.truetype("./fonts/Roboto-Regular.ttf", pixel_size)
+                print(f"Fallback auf Roboto mit Größe {pixel_size}px")
+            except:
+                # Letzter Fallback - sollte nicht passieren wenn Schriftarten vorhanden sind
+                font = ImageFont.load_default()
+                print(f"KRITISCH: Keine TrueType-Schriftart gefunden! Verwende Default (nicht skalierbar)")
         
         # Text zeichnen
         draw.text((text_x, text_y), text, fill=actual_color, font=font)
@@ -84,7 +64,7 @@ def add_text_to_image(image, text, text_x, text_y, font_size="80px", font_family
         print(f"Fehler beim Text hinzufügen: {e}")
         return image
 
-def create_text_preview(image, text, text_x, text_y, font_size="80px", font_family="Arial", font_color="Weiß"):
+def create_text_preview(image, text, text_x, text_y, font_size="80px", font_family="Roboto", font_color="Weiß"):
     """Erstellt eine Vorschau mit Text und rotem Marker - nur EINEN Punkt"""
     if image is None:
         return image
@@ -116,7 +96,7 @@ def create_text_preview(image, text, text_x, text_y, font_size="80px", font_fami
             try:
                 pixel_size = int(font_size.replace("px", ""))
             except:
-                pixel_size = 80  # HÖHERER FALLBACK
+                pixel_size = 80
             
             # Schriftfarbe Mapping für Vorschau
             color_mapping = {
@@ -127,38 +107,24 @@ def create_text_preview(image, text, text_x, text_y, font_size="80px", font_fami
             
             actual_color = color_mapping.get(font_color, "white")
             
-            # Gleiche Schriftart-Logik wie in add_text_to_image
+            # NEU: Gleiche Schriftart-Logik wie in add_text_to_image
+            font_paths = {
+                "Roboto": "./fonts/Roboto-Regular.ttf",
+                "Open Sans": "./fonts/OpenSans-Regular.ttf",
+                "DejaVu Sans": "./fonts/DejaVuSans.ttf"
+            }
+            
             try:
-                if font_family == "Arial":
-                    try:
-                        font = ImageFont.truetype("arial.ttf", pixel_size)
-                    except:
-                        try:
-                            font = ImageFont.truetype("Arial.ttf", pixel_size)
-                        except:
-                            font = ImageFont.load_default()
-                elif font_family == "Times New Roman":
-                    try:
-                        font = ImageFont.truetype("times.ttf", pixel_size)
-                    except:
-                        try:
-                            font = ImageFont.truetype("Times New Roman.ttf", pixel_size)
-                        except:
-                            font = ImageFont.load_default()
-                elif font_family == "Courier New":
-                    try:
-                        font = ImageFont.truetype("cour.ttf", pixel_size)
-                    except:
-                        try:
-                            font = ImageFont.truetype("Courier New.ttf", pixel_size)
-                        except:
-                            font = ImageFont.load_default()
-                else:
-                    font = ImageFont.load_default()
-                    
+                font_path = font_paths.get(font_family, "./fonts/Roboto-Regular.ttf")
+                font = ImageFont.truetype(font_path, pixel_size)
             except Exception as font_error:
                 print(f"Fehler beim Laden der Schriftart für Vorschau: {font_error}")
-                font = ImageFont.load_default()
+                # Fallback
+                try:
+                    font = ImageFont.truetype("./fonts/Roboto-Regular.ttf", pixel_size)
+                except:
+                    font = ImageFont.load_default()
+                    print("WARNUNG: Fallback auf nicht-skalierbare Default-Schriftart")
             
             draw.text((text_x, text_y), text, fill=actual_color, font=font)
             print(f"Vorschau: Text mit Größe {pixel_size}px, Farbe {actual_color} gezeichnet")
@@ -169,7 +135,6 @@ def create_text_preview(image, text, text_x, text_y, font_size="80px", font_fami
         print(f"Fehler bei Text-Vorschau: {e}")
         return image
 
-# Die restlichen Funktionen bleiben unverändert...
 def update_text_preview_i2i(original_image, generated_image, text, text_x, text_y, target_selector):
     """Aktualisiert die Text-Vorschau für Bild-zu-Bild"""
     if target_selector == "Originalbild":
@@ -210,14 +175,14 @@ def create_text_integration_section_t2i():
     with gr.Row():
         with gr.Column():
             font_size_t2i = gr.Dropdown(
-                choices=["120px", "80px", "40px"],  # DEUTLICH HÖHERE WERTE
+                choices=["120px", "80px", "40px"],
                 value="80px",
                 label="Schriftgröße"
             )
         with gr.Column():
             font_family_t2i = gr.Dropdown(
-                choices=["Arial", "Times New Roman", "Courier New"],
-                value="Arial", 
+                choices=["Roboto", "Open Sans", "DejaVu Sans"],  # NEU: 3 TrueType-Schriftarten
+                value="Roboto", 
                 label="Schriftart"
             )
         with gr.Column():