updateed center

app.py

@@ -457,15 +457,30 @@ def position_logic_old(image_path, canvas_size, padding_top, padding_right, padd
 def position_logic_none(image, canvas_size):
     target_width, target_height = canvas_size
     aspect_ratio = image.width / image.height
-    if aspect_ratio > 1:
+    
+    # Tentukan ukuran yang tepat dengan mempertahankan aspect ratio
+    # dan memastikan gambar muat dalam canvas
+    if aspect_ratio > 1:  # landscape
         new_width = target_width
         new_height = int(new_width / aspect_ratio)
-    else:
+        if new_height > target_height:
+            new_height = target_height
+            new_width = int(new_height * aspect_ratio)
+    else:  # portrait
         new_height = target_height
         new_width = int(new_height * aspect_ratio)
+        if new_width > target_width:
+            new_width = target_width
+            new_height = int(new_width / aspect_ratio)
+    
+    # Resize gambar dengan ukuran baru
     image = image.resize((new_width, new_height), Image.LANCZOS)
+    
+    # Posisi tengah canvas
     x = (target_width - new_width) // 2
     y = (target_height - new_height) // 2
+    
+    print(f"Image centered: size={new_width}x{new_height}, position=({x},{y})")
     log = [{"action": "resize_and_center", "new_size": f"{new_width}x{new_height}", "position": f"{x},{y}"}]
     return log, image, x, y
 
@@ -1124,13 +1139,8 @@ def process_single_image(
     temp_image_path = os.path.join(output_folder, f"temp_{filename}")
     image_with_no_bg.save(temp_image_path, format='PNG')
     
-    # Menerapkan snap settings ke padding values
-    effective_padding_top = 0 if snap_to_top else padding_top
-    effective_padding_bottom = 0 if snap_to_bottom else padding_bottom
-    effective_padding_left = 0 if snap_to_left else padding_left
-    effective_padding_right = 0 if snap_to_right else padding_right
-    
-    # Cetak status snap untuk debugging
+    # Selalu gunakan position_logic_none untuk centering gambar
+    # Kode snap masih disimpan untuk kompatibilitas
     if snap_to_left:
         print(f"Snap to Left active: Forcing padding_left = 0 (original: {padding_left})")
     if snap_to_right:
@@ -1139,16 +1149,10 @@ def process_single_image(
         print(f"Snap to Top active: Forcing padding_top = 0 (original: {padding_top})")
     if snap_to_bottom:
         print(f"Snap to Bottom active: Forcing padding_bottom = 0 (original: {padding_bottom})")
-    
-    logs, cropped_img, x, y = position_logic_old(
-        temp_image_path, canvas_size, 
-        effective_padding_top,
-        effective_padding_right,
-        effective_padding_bottom,
-        effective_padding_left,
-        use_threshold=True, bg_method=bg_method, is_person=snap_to_bottom, 
-        snap_to_top=snap_to_top, snap_to_left=snap_to_left, snap_to_right=snap_to_right
-    )
+        
+    # Gunakan position_logic_none untuk memastikan semua gambar diletakkan di tengah
+    image = Image.open(temp_image_path)
+    logs, cropped_img, x, y = position_logic_none(image, canvas_size)
     if bg_choice == 'white':
         canvas = Image.new("RGBA", canvas_size, "WHITE")
     elif bg_choice == 'custom':
@@ -1180,24 +1184,13 @@ def process_single_image(
             new_canvas = Image.new("RGBA", canvas_size, dom_col)
         else:
             new_canvas = Image.new("RGBA", canvas_size, (0, 0, 0, 0))
-        available_width = canvas_size[0] - padding_left - padding_right
-        target_height = canvas_size[1] - padding_top - padding_bottom
-        rs_w, rs_h = rotated_subject.size
-        scale_factor = target_height / rs_h
-        new_width_h = int(rs_w * scale_factor)
-        if new_width_h > available_width:
-            scale_factor = available_width / rs_w
-            new_width = available_width
-            new_height = int(rs_h * scale_factor)
-        else:
-            new_width = new_width_h
-            new_height = target_height
-        rotated_subject = rotated_subject.resize((new_width, new_height), Image.LANCZOS)
-        new_x = padding_left + (available_width - new_width) // 2
-        new_y = padding_top + (target_height - new_height) // 2
-        new_canvas.paste(rotated_subject, (new_x, new_y), rotated_subject)
+            
+        # Gunakan position_logic_none untuk rotated image juga
+        _, rotated_sized_img, rotated_x, rotated_y = position_logic_none(rotated_subject, canvas_size)
+        
+        new_canvas.paste(rotated_sized_img, (rotated_x, rotated_y), rotated_sized_img)
         canvas = new_canvas
-        logs.append({"action": "rotate_final", "rotation": rotation, "direction": direction})
+        logs.append({"action": "rotate_final_centered", "rotation": rotation, "direction": direction})
     out_ext = "jpg" if output_format == "JPG" else "png"
     out_filename = f"{os.path.splitext(filename)[0]}.{out_ext}"
     out_path = os.path.join(output_folder, out_filename)
@@ -1667,7 +1660,7 @@ def preset_snap_rules(filename, image_path=None):
 with gr.Blocks(theme='allenai/gradio-theme') as iface:
     gr.Markdown("## Image BG Removal with Rotation, Watermark, Twibbon & Classifications for Padding Override")
     with gr.Row():
-        input_files = gr.File(label="Upload (Image(s)/ZIP)", file_types=[".zip", ".rar", "image"], interactive=True)
+        input_files = gr.File(label="Upload (Image(s)/ZIP/RAR)", file_types=[".zip", ".rar", "image"], interactive=True)
         watermark = gr.File(label="Watermark (Optional)", file_types=[".png"])
         twibbon = gr.File(label="Twibbon (Optional)", file_types=[".png"])
         sheet_file = gr.File(label="Upload Sheet (.xlsx/.csv)", file_types=[".xlsx", ".csv"], interactive=True)