Update app.py

app.py

@@ -4,71 +4,52 @@ import numpy as np
 from PIL import Image, ImageOps
 import subprocess
 
-# --- 1. The Core Logic (CNC Brain V3 - Final Polish) ---
-def process_vector(image, mode, fill_gaps, thickness, smooth_factor):
+# --- 1. CNC BRAIN V4 (Solid Shape Logic) ---
+def process_vector(image, threshold_val, solidify_strength, smooth_factor, remove_noise):
     if image is None: return None, None
 
-    # A. Pre-processing (Convert to Grayscale)
+    # Step A: Convert to Grayscale & Blur (Shine hatane ke liye)
     img_np = np.array(image.convert("RGB"))
     gray = cv2.cvtColor(img_np, cv2.COLOR_RGB2GRAY)
-
-    # --- 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 == "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)
+    # Strong Blur to mix Gold Highlight and Shadow
+    gray_blurred = cv2.GaussianBlur(gray, (5, 5), 0)
 
-    # C. POST-PROCESSING (Filling and Cleaning)
+    # Step B: Thresholding (Solid Black logic)
+    # Binary Inverse: Jali banegi WHITE, Background banega BLACK (Processing ke liye)
+    _, binary = cv2.threshold(gray_blurred, threshold_val, 255, cv2.THRESH_BINARY_INV)
+
+    # Step C: SOLIDIFY (Ye hai wo magic fix)
+    # Agar line double aa rahi hai, to hum usse "Dilate" (failayenge) taaki wo jud jaye
     kernel = np.ones((3,3), np.uint8)
+    
+    if solidify_strength > 0:
+        # Dilate: White hissa (Jali) mota hoga aur beech ke holes bharenge
+        binary = cv2.dilate(binary, kernel, iterations=int(solidify_strength))
+        # Wapas thoda shape mein laane ke liye halka erode (Optional, balancing)
+        binary = cv2.erode(binary, kernel, iterations=1)
 
-    # 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 D: Noise Removal (Watermark ke chote daane hatana)
+    if remove_noise:
+        # Morph Open: Chote white dots (noise) gayab karega
+        binary = cv2.morphologyEx(binary, cv2.MORPH_OPEN, kernel, iterations=1)
 
-    # Step C2: Thickness Adjustment (User Controlled)
-    if thickness > 0:
-        # Dilate: Makes design thicker
-        binary = cv2.dilate(binary, kernel, iterations=int(thickness))
-    elif thickness < 0:
-        # Erode: Makes design thinner
-        binary = cv2.erode(binary, kernel, iterations=abs(int(thickness)))
+    # Step E: Invert for Potrace (Potrace needs Black Shape on White)
+    # Ab Jali Black ho jayegi, Background White
+    final_binary = cv2.bitwise_not(binary)
 
-    # D. Save Temp BMP for Potrace
+    # Save Temp
     temp_bmp = "temp_trace.bmp"
-    # 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)
+    cv2.imwrite(temp_bmp, final_binary)
 
-    # E. Vectorize using Potrace
-    output_svg = "ts_vector_design.svg"
+    # Step F: Vectorize
+    output_svg = "ts_vector_solid.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", "-o", output_svg,
-        "-t", "5", 
+        "-t", "10", # Despeckle level (ignore small text parts)
         "-a", str(smooth_factor),
-        "--longcurve",
         "--opaque"
     ]
     
@@ -78,46 +59,40 @@ def process_vector(image, mode, fill_gaps, thickness, smooth_factor):
         print(f"Error: {e}")
         return None, None
 
-    # Return SVG and the B&W Preview (Invert preview for better visualization if needed)
-    return output_svg, Image.fromarray(binary_final)
+    # Preview Image (Hum user ko wahi dikhayenge jo Potrace ne dekha)
+    return output_svg, Image.fromarray(final_binary)
 
-# --- 2. Interface Design ---
+# --- 2. Interface ---
 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; }
-.svelte-1g805jl img { border: 1px solid #FF9966; } /* Orange border on preview */
+body, .gradio-container { font-family: 'Inter', sans-serif !important; background: #000000 !important; color: white !important; }
+#main_card { border: 1px solid #333; border-radius: 15px; padding: 20px; background: #111; }
+.primary-btn { background: #FFD700 !important; color: black !important; font-weight: bold !important; }
 """
 
-with gr.Blocks(css=custom_css, theme=gr.themes.Soft()) as app:
+with gr.Blocks(css=custom_css, theme=gr.themes.Base(mode='dark')) as app:
     with gr.Column(elem_id="main_card"):
-        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.")
+        gr.Markdown("# 🏆 TS SOLID TRACER", elem_id="logo_text")
         
         with gr.Row():
             with gr.Column():
-                inp_img = gr.Image(type="pil", label="Upload Jali Photo", height=300)
+                inp_img = gr.Image(type="pil", label="Upload Photo", height=300)
                 
-                gr.Markdown("### 🎛️ Fine-Tune Result")
-                mode_drp = gr.Dropdown(
-                    ["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"
-                )
+                gr.Markdown("### 🎛️ Settings (Adjust to fix double lines)")
                 
-                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")
+                # Controls optimized for the specific problem
+                thresh_sld = gr.Slider(0, 255, value=140, step=1, label="1. Darkness Threshold (Kam=Light gayab, Zyada=Sab Black)")
+                solid_sld = gr.Slider(0, 5, value=2, step=1, label="2. Solidify (Double Line Jodne ke liye badhao)")
+                noise_chk = gr.Checkbox(label="3. Clean Noise (Watermark dots hataye)", value=True)
+                smooth_sld = gr.Slider(0, 1.3, value=1.0, label="4. Smoothing")
                 
-                btn = gr.Button("🚀 TRACE IT!", variant="primary", elem_classes=["primary-btn"])
+                btn = gr.Button("🔥 CREATE SOLID VECTOR", variant="primary", elem_classes=["primary-btn"])
 
             with gr.Column():
-                preview_img = gr.Image(label="AI Vision Preview (Check quality here)", interactive=False)
-                out_file = gr.File(label="Download Finished Vector (.SVG)")
+                # Preview ab bohot important hai
+                preview_img = gr.Image(label="Computer Vision (Isse check karo)", interactive=False)
+                out_file = gr.File(label="Download SVG")
 
-    btn.click(process_vector, inputs=[inp_img, mode_drp, fill_chk, thick_sld, smooth_sld], outputs=[out_file, preview_img])
+    btn.click(process_vector, inputs=[inp_img, thresh_sld, solid_sld, smooth_sld, noise_chk], outputs=[out_file, preview_img])
 
 app.launch()