Upload app.py

app.py

@@ -1,20 +1,17 @@
+
 import gradio as gr
 import numpy as np
 from PIL import Image
 import io
+import tempfile
+import os
 
 def resize_images_to_match(images, resize_mode="height"):
-    """
-    調整圖片尺寸以匹配拼接需求
-    resize_mode: "height" - 垂直邊等長(水平拼接), "width" - 水平邊等長(垂直拼接)
-    """
     if not images or len(images) == 0:
         return []
-    
     valid_images = [img for img in images if img is not None]
     if not valid_images:
         return []
-    
     if resize_mode == "height":
         target_height = min(img.size[1] for img in valid_images)
         resized_images = []
@@ -23,7 +20,7 @@ def resize_images_to_match(images, resize_mode="height"):
             new_width = int(target_height * aspect_ratio)
             resized_img = img.resize((new_width, target_height), Image.Resampling.LANCZOS)
             resized_images.append(resized_img)
-    else:  # width mode
+    else:
         target_width = min(img.size[0] for img in valid_images)
         resized_images = []
         for img in valid_images:
@@ -31,23 +28,14 @@ def resize_images_to_match(images, resize_mode="height"):
             new_height = int(target_width * aspect_ratio)
             resized_img = img.resize((target_width, new_height), Image.Resampling.LANCZOS)
             resized_images.append(resized_img)
-    
     return resized_images
 
 def concatenate_images(images, direction="horizontal", spacing=0, background_color="white"):
-    """
-    拼接圖片
-    direction: "horizontal" - 水平拼接, "vertical" - 垂直拼接
-    spacing: 圖片間距(像素)
-    background_color: 背景顏色
-    """
     if not images or len(images) == 0:
         return None
-    
     valid_images = [img for img in images if img is not None]
     if not valid_images:
         return None
-    
     rgb_images = []
     for img in valid_images:
         if img.mode != 'RGB':
@@ -59,10 +47,8 @@ def concatenate_images(images, direction="horizontal", spacing=0, background_col
                 rgb_images.append(img.convert('RGB'))
         else:
             rgb_images.append(img)
-    
     if len(rgb_images) == 1:
         return rgb_images[0]
-    
     if direction == "horizontal":
         total_width = sum(img.size[0] for img in rgb_images) + spacing * (len(rgb_images) - 1)
         max_height = max(img.size[1] for img in rgb_images)
@@ -81,16 +67,11 @@ def concatenate_images(images, direction="horizontal", spacing=0, background_col
             x_offset = (max_width - img.size[0]) // 2
             result.paste(img, (x_offset, y_offset))
             y_offset += img.size[1] + spacing
-    
     return result
 
 def save_as_jpg(image, quality=95):
-    """
-    將圖片保存為高質量JPG格式
-    """
     if image is None:
         return None
-    
     if image.mode != 'RGB':
         if image.mode in ('RGBA', 'LA'):
             background = Image.new('RGB', image.size, 'white')
@@ -98,7 +79,6 @@ def save_as_jpg(image, quality=95):
             image = background
         else:
             image = image.convert('RGB')
-    
     buffer = io.BytesIO()
     image.save(buffer, format='JPEG', quality=quality, optimize=True)
     buffer.seek(0)
@@ -108,18 +88,12 @@ def process_images(
     image1, image2, image3, image4, image5, image6,
     resize_mode, concat_direction, spacing, bg_color, jpg_quality
 ):
-    """
-    處理圖片拼接的主函數
-    """
     uploaded_images = [image1, image2, image3, image4, image5, image6]
     valid_images = [img for img in uploaded_images if img is not None]
-    
     if len(valid_images) == 0:
-        return None, "❌ 請至少上傳一張圖片"
-    
+        return None, "❌ 請至少上傳一張圖片", None
     if len(valid_images) == 1:
-        return valid_images[0], f"✅ 只有一張圖片，無需拼接"
-    
+        return valid_images[0], f"✅ 只有一張圖片，無需拼接", None
     try:
         if resize_mode == "等高度 (水平拼接)":
             resized_images = resize_images_to_match(valid_images, "height")
@@ -127,42 +101,27 @@ def process_images(
         else:
             resized_images = resize_images_to_match(valid_images, "width")
             direction = "vertical"
-        
         if concat_direction != "自動 (根據調整模式)":
             direction = "horizontal" if concat_direction == "水平拼接" else "vertical"
-        
         result = concatenate_images(resized_images, direction, spacing, bg_color)
         if result is None:
-            return None, "❌ 拼接失敗"
-        
+            return None, "❌ 拼接失敗", None
         result = save_as_jpg(result, quality=jpg_quality)
-        
+        temp_path = os.path.join(tempfile.gettempdir(), "result.jpg")
+        result.save(temp_path, format="JPEG", quality=jpg_quality)
         info = f"✅ 成功拼接 {len(valid_images)} 張圖片\n"
         info += f"📐 最終尺寸: {result.size[0]} x {result.size[1]} 像素\n"
         info += f"🔄 調整模式: {resize_mode}\n"
         info += f"➡️ 拼接方向: {'水平' if direction == 'horizontal' else '垂直'}\n"
         info += f"📏 間距: {spacing} 像素\n"
         info += f"💾 輸出品質: {jpg_quality}%"
-        
-        return result, info
-        
+        return result, info, temp_path
     except Exception as e:
-        return None, f"❌ 處理過程中出現錯誤: {str(e)}"
+        return None, f"❌ 處理過程中出現錯誤: {str(e)}", None
 
 def create_interface():
     with gr.Blocks(title="圖片拼接比較工具", theme=gr.themes.Soft()) as iface:
-        gr.Markdown("""
-        # 🖼️ 圖片拼接比較工具
-        
-        上傳多張PNG/JPG圖片，自動調整尺寸並拼接成比較圖。
-        
-        ### 使用說明：
-        1. **上傳圖片**：最多可上傳6張圖片
-        2. **選擇調整模式**：等高度適合水平拼接，等寬度適合垂直拼接
-        3. **設定參數**：調整間距和背景顏色
-        4. **點擊處理**：生成拼接後的比較圖
-        """)
-        
+        gr.Markdown("# 🖼️ 圖片拼接比較工具")
         with gr.Row():
             with gr.Column(scale=2):
                 gr.Markdown("### 📁 上傳圖片")
@@ -174,7 +133,6 @@ def create_interface():
                     image4 = gr.Image(type="pil", label="圖片 4")
                     image5 = gr.Image(type="pil", label="圖片 5")
                     image6 = gr.Image(type="pil", label="圖片 6")
-                
                 gr.Markdown("### ⚙️ 處理設定")
                 with gr.Row():
                     resize_mode = gr.Dropdown(
@@ -200,24 +158,13 @@ def create_interface():
                 gr.Markdown("### 🎯 處理結果")
                 result_image = gr.Image(type="pil", label="拼接結果")
                 result_info = gr.Textbox(label="處理信息", lines=6, max_lines=10)
-        
+                result_file = gr.File(label="下載 JPG 檔案")
         process_btn.click(
             fn=process_images,
             inputs=[image1, image2, image3, image4, image5, image6,
                     resize_mode, concat_direction, spacing, bg_color, jpg_quality],
-            outputs=[result_image, result_info]
+            outputs=[result_image, result_info, result_file]
         )
-        
-        gr.Markdown("""
-        ### 💡 小貼士：
-        - **等高度模式**：所有圖片調整為相同高度，適合水平對比
-        - **等寬度模式**：所有圖片調整為相同寬度，適合垂直對比  
-        - 支持常見圖片格式：PNG, JPG, JPEG, WEBP
-        - 處理過程保持圖片原始寬高比
-        - **輸出格式：JPG**
-        - **品質建議**：95% 提供最佳品質，85% 平衡品質與檔案大小
-        - 自動處理透明背景（轉為白色背景）
-        """)
     return iface
 
 if __name__ == "__main__":