Update app.py

app.py

@@ -25,11 +25,11 @@ CLICK_DELAY = 0.5
 
 buttons = ["WRITE", "ERASE", "WHITE", "YELLOW", "PINK"]
 button_colors = [
-    (80,200,120),
-    (0,0,255),
-    (255,255,255),
-    (0,255,255),
-    (255,0,255)
+    (80, 200, 120),
+    (0, 0, 255),
+    (255, 255, 255),
+    (0, 255, 255),
+    (255, 0, 255)
 ]
 
 
@@ -49,6 +49,7 @@ def process_frame(frame):
 
     finger, gesture = tracker.get_gesture(frame)
 
+    # ----- SOLID DARK BACKGROUND -----
     board = np.zeros((WINDOW_H, WINDOW_W, 3), dtype=np.uint8)
     board[:] = (25, 30, 45)
 
@@ -69,17 +70,20 @@ def process_frame(frame):
         bx = 50
         for i, text in enumerate(buttons):
 
-            if 25 <= y <= 85 and bx <= x <= bx+125:
+            if 25 <= y <= 85 and bx <= x <= bx + 125:
                 hover = i
 
-            cv2.rectangle(board, (bx,25), (bx+125,85), button_colors[i], -1)
-            cv2.putText(board, text, (bx+10,65),
-                        cv2.FONT_HERSHEY_SIMPLEX, 0.8, (0,0,0), 2)
+            cv2.rectangle(board, (bx, 25), (bx + 125, 85), button_colors[i], -1)
+            cv2.putText(board, text, (bx + 10, 65),
+                        cv2.FONT_HERSHEY_SIMPLEX, 0.8, (0, 0, 0), 2)
 
             bx += 135
 
+        # ======================
         # CLICK ACTION
-        if gesture == "CLICK_GESTURE" and hover is not None and time.time()-click_time > CLICK_DELAY:
+        # ======================
+
+        if gesture == "CLICK_GESTURE" and hover is not None and time.time() - click_time > CLICK_DELAY:
 
             click_time = time.time()
 
@@ -88,17 +92,17 @@ def process_frame(frame):
             elif hover == 1:
                 state.set_mode(StateController.ERASE_MODE)
             elif hover == 2:
-                canvas.set_color((255,255,255))
+                canvas.set_color((255, 255, 255))
                 state.set_mode(StateController.WRITING_MODE)
             elif hover == 3:
-                canvas.set_color((0,255,255))
+                canvas.set_color((0, 255, 255))
                 state.set_mode(StateController.WRITING_MODE)
             elif hover == 4:
-                canvas.set_color((255,0,255))
+                canvas.set_color((255, 0, 255))
                 state.set_mode(StateController.WRITING_MODE)
 
         # ======================
-        # WRITING MODE (STABLE VERSION)
+        # WRITING MODE
         # ======================
 
         if state.is_writing():
@@ -108,12 +112,12 @@ def process_frame(frame):
                 if prev_x is None:
                     prev_x, prev_y = x, y
 
-                # ---- JITTER REMOVAL ----
-                if abs(x - prev_x) < 4 and abs(y - prev_y) < 4:
+                # ---- JITTER FILTER ----
+                if abs(x - prev_x) < 5 and abs(y - prev_y) < 5:
                     x, y = prev_x, prev_y
 
-                # ---- STRONG SMOOTHING ----
-                alpha = 0.95
+                # ---- SMOOTHING ----
+                alpha = 0.92
                 smooth_x = int(prev_x * alpha + x * (1 - alpha))
                 smooth_y = int(prev_y * alpha + y * (1 - alpha))
 
@@ -131,14 +135,26 @@ def process_frame(frame):
         elif state.is_erasing():
 
             if gesture == "WRITE_GESTURE":
-                cv2.circle(canvas.canvas, (x, y), 35, (0,0,0), -1)
+                cv2.circle(canvas.canvas, (x, y), 35, (0, 0, 0), -1)
             else:
                 canvas.lift()
                 prev_x, prev_y = None, None
 
-        cv2.circle(board, (x, y), 8, (255,255,255), -1)
+        # Cursor
+        cv2.circle(board, (x, y), 8, (255, 255, 255), -1)
+
+    # ======================
+    # MERGE DRAWING PROPERLY
+    # ======================
+
+    mask = cv2.cvtColor(canvas.canvas, cv2.COLOR_BGR2GRAY)
+    _, mask = cv2.threshold(mask, 1, 255, cv2.THRESH_BINARY)
+    mask_inv = cv2.bitwise_not(mask)
+
+    bg = cv2.bitwise_and(board, board, mask=mask_inv)
+    fg = cv2.bitwise_and(canvas.canvas, canvas.canvas, mask=mask)
 
-    board = cv2.add(board, canvas.canvas)
+    board = cv2.add(bg, fg)
 
     return board