Update app.py

app.py

@@ -1,66 +1,75 @@
 import gradio as gr
 import cv2
 import numpy as np
-from PIL import Image
+from PIL import Image, ImageOps
 import subprocess
 
-# --- 1. The Core Logic (CNC Brain) ---
-def process_vector(image, mode, thickness, noise_level, smooth_factor):
+# --- 1. The Core Logic (CNC Brain V3 - Final Polish) ---
+def process_vector(image, mode, fill_gaps, thickness, smooth_factor):
     if image is None: return None, None
 
     # A. Pre-processing (Convert to Grayscale)
-    # Color se hamein matlab nahi, hamein sirf Light/Dark difference chahiye
     img_np = np.array(image.convert("RGB"))
     gray = cv2.cvtColor(img_np, cv2.COLOR_RGB2GRAY)
 
-    # B. TRACING MODES
-    if mode == "Standard (High Contrast)":
-        # Simple Logic: Agar photo saaf hai (Black & White)
-        _, binary = cv2.threshold(gray, 128, 255, cv2.THRESH_BINARY_INV)
-        
-    elif mode == "Scanner Mode (Colored/Light Lights)":
-        # ADVANCED: Adaptive Thresholding
-        # Ye local areas dekhta hai. Colored lights ya shadows ko ignore karta hai.
-        # Block Size 11, C 2 (Standard scanner settings)
-        binary = cv2.adaptiveThreshold(gray, 255, cv2.ADAPTIVE_THRESH_GAUSSIAN_C, 
-                                     cv2.THRESH_BINARY_INV, 15, 4)
+    # --- THE NEW MAGIC STEP: Smart Smoothing ---
+    # Bilateral Filter: Ye noise hatata hai par edges ko sharp rakhta hai.
+    # Real photos ke liye ye sabse zaroori hai.
+    gray_blurred = cv2.bilateralFilter(gray, 9, 75, 75)
+
+    # B. TRACING MODES (Improved)
+    if mode == "1. Adaptive Scanner (Best for most photos)":
+        # Ye lighting variations ko handle karta hai.
+        # Block size 11, C 2 (Standard settings for clean scan)
+        binary = cv2.adaptiveThreshold(gray_blurred, 255, cv2.ADAPTIVE_THRESH_GAUSSIAN_C, 
+                                     cv2.THRESH_BINARY_INV, 11, 2)
     
-    elif mode == "Silhouette (Dark Object)":
-        # Agar Jali kaali hai aur peeche light hai
-        _, binary = cv2.threshold(gray, 100, 255, cv2.THRESH_BINARY)
+    elif mode == "2. Silhouette / Backlit (Dark Jali, Bright Back)":
+        # Agar jali kaali dikh rahi hai aur peeche light hai.
+        # Simple hard threshold. Value 100 se neeche sab black.
+        _, binary = cv2.threshold(gray_blurred, 100, 255, cv2.THRESH_BINARY_INV)
+        
+    elif mode == "3. Solid Graphic (Perfect B&W Image)":
+        # Agar pehle se hi saaf graphic image hai.
+        _, binary = cv2.threshold(gray_blurred, 128, 255, cv2.THRESH_BINARY_INV)
 
-    # C. CLEANING & THICKNESS (Thickness Slider Logic)
-    # Morphological Operations - Jali ko mota/patla karne ke liye
+    # C. POST-PROCESSING (Filling and Cleaning)
     kernel = np.ones((3,3), np.uint8)
-    
-    # Noise Removal (Chote daane hatana)
-    if noise_level > 0:
-        # Opening: Removes small noise (white dots)
-        binary = cv2.morphologyEx(binary, cv2.MORPH_OPEN, kernel, iterations=int(noise_level))
 
-    # Thickness (Erosion/Dilation)
+    # Step C1: Fill Gaps (Agar Jali toot rahi hai ya khokhli aa rahi hai)
+    if fill_gaps:
+        # Morphological CLOSE: Dilate then Erode. Fills small holes inside black areas.
+        binary = cv2.morphologyEx(binary, cv2.MORPH_CLOSE, kernel, iterations=1)
+        # Thoda sa aur bharo taaki solid lage
+        binary = cv2.dilate(binary, kernel, iterations=1)
+
+    # Step C2: Thickness Adjustment (User Controlled)
     if thickness > 0:
-        # Dilate: Makes white lines thicker (Jali moti hogi)
+        # Dilate: Makes design thicker
         binary = cv2.dilate(binary, kernel, iterations=int(thickness))
     elif thickness < 0:
-        # Erode: Makes lines thinner
+        # Erode: Makes design thinner
         binary = cv2.erode(binary, kernel, iterations=abs(int(thickness)))
 
     # D. Save Temp BMP for Potrace
     temp_bmp = "temp_trace.bmp"
-    cv2.imwrite(temp_bmp, binary)
+    # Ensure it's pure black and white for Potrace
+    (thresh, binary_final) = cv2.threshold(binary, 128, 255, cv2.THRESH_BINARY)
+    cv2.imwrite(temp_bmp, binary_final)
 
     # E. Vectorize using Potrace
     output_svg = "ts_vector_design.svg"
     
     # Potrace Commands
+    # -t 5: Thoda noise ignore karega
+    # --longcurve: CNC ke liye lambi smooth lines banane ki koshish karega
     cmd = [
         "potrace", temp_bmp,
-        "-s", # Output SVG
-        "-o", output_svg,
-        "-t", "2", # Remove Speckles
-        "-a", str(smooth_factor), # Corner Smoothness
-        "--opaque" # Solid Fill
+        "-s", "-o", output_svg,
+        "-t", "5", 
+        "-a", str(smooth_factor),
+        "--longcurve",
+        "--opaque"
     ]
     
     try:
@@ -69,57 +78,46 @@ def process_vector(image, mode, thickness, noise_level, smooth_factor):
         print(f"Error: {e}")
         return None, None
 
-    # Return SVG and the B&W Preview
-    return output_svg, Image.fromarray(binary)
+    # Return SVG and the B&W Preview (Invert preview for better visualization if needed)
+    return output_svg, Image.fromarray(binary_final)
 
 # --- 2. Interface Design ---
 custom_css = """
 @import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;600;900&display=swap');
 body, .gradio-container { font-family: 'Inter', sans-serif !important; background: #1e1e2e !important; color: white !important; }
-
-#main_card {
-    background: rgba(255, 255, 255, 0.05);
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    border-radius: 20px;
-    padding: 30px;
-}
-.primary-btn {
-    background: linear-gradient(90deg, #FF9966, #FF5E62) !important;
-    color: white !important;
-    border: none !important;
-    font-size: 1.2rem !important;
-    font-weight: bold !important;
-}
+#main_card { background: rgba(255, 255, 255, 0.05); border: 1px solid rgba(255, 255, 255, 0.1); border-radius: 20px; padding: 30px; }
+.primary-btn { background: linear-gradient(90deg, #FF9966, #FF5E62) !important; color: white !important; border: none !important; font-size: 1.2rem !important; font-weight: bold !important; }
+.svelte-1g805jl img { border: 1px solid #FF9966; } /* Orange border on preview */
 """
 
 with gr.Blocks(css=custom_css, theme=gr.themes.Soft()) as app:
     with gr.Column(elem_id="main_card"):
-        gr.Markdown("# 📐 TS VECTOR PRO", elem_id="logo_text")
-        gr.Markdown("### Advanced CNC Tracer (Color/Light Proof)")
+        gr.Markdown("# 📐 TS VECTOR MASTER", elem_id="logo_text")
+        gr.Markdown("### Professional CNC Tracer for Real Photos")
+        
+        gr.Markdown("ℹ️ **Pro Tip:** Best results come from photos taken straight-on (flat), not at an angle.")
         
         with gr.Row():
             with gr.Column():
-                inp_img = gr.Image(type="pil", label="Upload Jali Image", height=300)
-                
-                # --- NEW CONTROLS ---
-                gr.Markdown("### 🎛️ Trace Settings")
+                inp_img = gr.Image(type="pil", label="Upload Jali Photo", height=300)
                 
+                gr.Markdown("### 🎛️ Fine-Tune Result")
                 mode_drp = gr.Dropdown(
-                    ["Scanner Mode (Colored/Light Lights)", "Standard (High Contrast)", "Silhouette (Dark Object)"],
-                    value="Scanner Mode (Colored/Light Lights)",
-                    label="1. Tracing Mode (Best for Colored Lights)"
+                    ["1. Adaptive Scanner (Best for most photos)", "2. Silhouette / Backlit (Dark Jali, Bright Back)", "3. Solid Graphic (Perfect B&W Image)"],
+                    value="1. Adaptive Scanner (Best for most photos)",
+                    label="Tracing Mode"
                 )
                 
-                thick_sld = gr.Slider(-2, 5, value=0, step=1, label="2. Thickness (Mota/Patla)")
-                noise_sld = gr.Slider(0, 3, value=1, step=1, label="3. Clean Noise (Daane Hataye)")
-                smooth_sld = gr.Slider(0, 1.4, value=1.0, label="4. Smoothing")
+                fill_chk = gr.Checkbox(label="Fill Gaps & Holes (Agar design toot raha ho)", value=True)
+                thick_sld = gr.Slider(-2, 4, value=0, step=1, label="Thickness Adjustment")
+                smooth_sld = gr.Slider(0, 1.3, value=1.0, label="Corner Smoothing")
                 
-                btn = gr.Button("🚀 CONVERT TO VECTOR", variant="primary", elem_classes=["primary-btn"])
+                btn = gr.Button("🚀 TRACE IT!", variant="primary", elem_classes=["primary-btn"])
 
             with gr.Column():
-                preview_img = gr.Image(label="AI Vision (B&W)", interactive=False)
-                out_file = gr.File(label="Download SVG")
+                preview_img = gr.Image(label="AI Vision Preview (Check quality here)", interactive=False)
+                out_file = gr.File(label="Download Finished Vector (.SVG)")
 
-    btn.click(process_vector, inputs=[inp_img, mode_drp, thick_sld, noise_sld, smooth_sld], outputs=[out_file, preview_img])
+    btn.click(process_vector, inputs=[inp_img, mode_drp, fill_chk, thick_sld, smooth_sld], outputs=[out_file, preview_img])
 
 app.launch()