Update app.py

app.py

@@ -4,12 +4,11 @@ import numpy as np
 from PIL import Image, ImageOps
 import subprocess
 
-# --- 1. CNC BRAIN V6 (Micro-Detail Logic) ---
-def process_vector(image, invert_input, detail_sens, thickness, remove_noise):
+# --- 1. CNC BRAIN V7 (Solid Shape Master) ---
+def process_vector(image, invert_input, threshold_val, solidify_strength, smooth_factor, remove_noise):
     if image is None: return None, None
 
-    # --- STEP 0: HD UPSCALE ---
-    # Detail nikalne ke liye photo bada hona zaroori hai
+    # --- STEP 1: HD UPSCALE (Quality ke liye) ---
     w, h = image.size
     image = image.resize((w * 2, h * 2), Image.LANCZOS)
 
@@ -17,35 +16,35 @@ def process_vector(image, invert_input, detail_sens, thickness, remove_noise):
     if invert_input:
         image = ImageOps.invert(image.convert("RGB"))
 
-    # Step A: Grayscale & Contrast Boost (No Blur!)
+    # Step A: Grayscale
     img_np = np.array(image.convert("RGB"))
     gray = cv2.cvtColor(img_np, cv2.COLOR_RGB2GRAY)
     
-    # CLAHE (Smart Contrast): Ye Gold color ko background se alag karega
-    clahe = cv2.createCLAHE(clipLimit=3.0, tileGridSize=(8,8))
-    gray = clahe.apply(gray)
-
-    # Step B: Adaptive Thresholding (Detail Hunter)
-    # Block size jitna chota (odd number), utni barik detail pakdega
-    block_size = int(detail_sens)
-    if block_size % 2 == 0: block_size += 1 # Must be odd
-    
-    binary = cv2.adaptiveThreshold(gray, 255, cv2.ADAPTIVE_THRESH_GAUSSIAN_C, 
-                                 cv2.THRESH_BINARY_INV, block_size, 5)
+    # --- STEP 2: MEDIAN BLUR (The Line-Art Killer) ---
+    # Ye texture/lines ko gayab karke shape ko 'Flat' banata hai.
+    # Value 5 ya 7 best hai 3D renders ke liye.
+    gray_flat = cv2.medianBlur(gray, 7)
+
+    # Step B: GLOBAL THRESHOLD (Wapas purana reliable logic)
+    # Adaptive hata diya kyunki wo sketch bana raha tha.
+    # Ab hum user ke hath mein power denge ki wo decide kare kya black hai kya white.
+    _, binary = cv2.threshold(gray_flat, threshold_val, 255, cv2.THRESH_BINARY_INV)
 
-    # Step C: THICKNESS CONTROL (Negative allows opening gaps)
+    # Step C: SOLIDIFY (Filling the gaps)
     kernel = np.ones((3,3), np.uint8)
     
-    if thickness > 0:
-        # Positive: Mota karo (Dilate)
-        binary = cv2.dilate(binary, kernel, iterations=int(thickness))
-    elif thickness < 0:
-        # Negative: Patla karo (Erode) - Ye 'chipki hui' lines ko kholega
-        binary = cv2.erode(binary, kernel, iterations=abs(int(thickness)))
-
-    # Step D: Noise Removal (Optional - for very noisy photos)
+    # Morph Close: Ye chote chote gaps ko forcefully band karta hai
+    # Taki wo 'Line Art' na rahe, 'Solid Block' ban jaye.
+    binary = cv2.morphologyEx(binary, cv2.MORPH_CLOSE, kernel, iterations=2)
+
+    # Extra Thickness Control
+    if solidify_strength > 0:
+        binary = cv2.dilate(binary, kernel, iterations=int(solidify_strength))
+    elif solidify_strength < 0:
+        binary = cv2.erode(binary, kernel, iterations=abs(int(solidify_strength)))
+
+    # Step D: Noise Removal
     if remove_noise:
-        # Bilkul halka sa clean, zyada nahi
         binary = cv2.morphologyEx(binary, cv2.MORPH_OPEN, kernel, iterations=1)
 
     # Step E: Invert for Potrace
@@ -56,13 +55,13 @@ def process_vector(image, invert_input, detail_sens, thickness, remove_noise):
     cv2.imwrite(temp_bmp, final_binary)
 
     # Step F: Vectorize
-    output_svg = "ts_vector_detail.svg"
+    output_svg = "ts_vector_solid.svg"
     
     cmd = [
         "potrace", temp_bmp,
         "-s", "-o", output_svg,
-        "-t", "2", # Turdsize kam kiya taaki chote dots na udein
-        "-a", "1.0",
+        "-t", "2",
+        "-a", str(smooth_factor),
         "--opaque"
     ]
     
@@ -79,13 +78,13 @@ 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: #000000 !important; color: white !important; }
 #main_card { border: 1px solid #333; border-radius: 15px; padding: 20px; background: #111; }
-.primary-btn { background: #00ff88 !important; color: black !important; font-weight: bold !important; }
+.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.Column(elem_id="main_card"):
-        gr.Markdown("# 🔬 TS VECTOR PRO (V6)", elem_id="logo_text")
-        gr.Markdown("### Optimized for High-Detail & Mandala Designs")
+        gr.Markdown("# 🏆 TS SOLID TRACER V7", elem_id="logo_text")
+        gr.Markdown("### Converts 3D Images into SOLID Cut Files")
         
         with gr.Row():
             with gr.Column():
@@ -94,22 +93,23 @@ with gr.Blocks(css=custom_css, theme=gr.themes.Soft()) as app:
                 gr.Markdown("### 🎨 Image Type")
                 inv_chk = gr.Checkbox(label="Is Design WHITE on BLACK?", value=False)
                 
-                gr.Markdown("### 🎛️ Detail Settings")
+                gr.Markdown("### 🎛️ Solid Settings")
                 
-                # Naya Slider: Block Size
-                sens_sld = gr.Slider(11, 99, value=45, step=2, label="1. Detail Sensitivity (Kam = Barik, Zyada = Mota Area)")
+                # Global Threshold wapas aa gaya hai - Sabse reliable
+                thresh_sld = gr.Slider(0, 255, value=128, step=1, label="1. Solid Threshold (Adjust until design is full Black)")
                 
-                # Naya Slider: Negative value allowed
-                thick_sld = gr.Slider(-3, 3, value=0, step=1, label="2. Line Thickness (Minus me le jao gap kholne ke liye)")
+                # Solidify
+                solid_sld = gr.Slider(-2, 5, value=1, step=1, label="2. Solidify (Mota/Patla)")
                 
-                noise_chk = gr.Checkbox(label="3. Clean Noise (Off rakho agar detail udd rahi hai)", value=False)
+                noise_chk = gr.Checkbox(label="3. Clean Noise", value=True)
+                smooth_sld = gr.Slider(0, 1.3, value=1.0, label="4. Smoothing")
                 
-                btn = gr.Button("🔥 CAPTURE DETAILS", 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="Computer Vision Preview", interactive=False)
+                preview_img = gr.Image(label="Computer Vision Preview (Black = Solid Material)", interactive=False)
                 out_file = gr.File(label="Download SVG")
 
-    btn.click(process_vector, inputs=[inp_img, inv_chk, sens_sld, thick_sld, noise_chk], outputs=[out_file, preview_img])
+    btn.click(process_vector, inputs=[inp_img, inv_chk, thresh_sld, solid_sld, smooth_sld, noise_chk], outputs=[out_file, preview_img])
 
 app.launch()