roughly implement cursor toggle

Author: acidcoke

configs/default/cursor.json

@@ -14,6 +14,7 @@
     "tick_interval_ms": 16, 
     "hold_trigger_ms": 500, 
     "auto_play": false, 
+    "enable": true, 
     "mouse_acceleration": false, 
     "use_transformation_matrix": false
 }

configs/profile_1/cursor.json

@@ -1,19 +1,20 @@
-{
-    "fix_width": 640, 
-    "fix_height": 480, 
-    "camera_id": 0, 
-    "tracking_vert_idxs": [
-        8
-    ], 
-    "spd_up": 40, 
-    "spd_down": 40, 
-    "spd_left": 40, 
-    "spd_right": 40, 
-    "pointer_smooth": 6, 
-    "shape_smooth": 10, 
-    "tick_interval_ms": 16, 
-    "hold_trigger_ms": 500, 
-    "auto_play": false, 
-    "mouse_acceleration": false, 
-    "use_transformation_matrix": false
+{
+    "fix_width": 640, 
+    "fix_height": 480, 
+    "camera_id": 0, 
+    "tracking_vert_idxs": [
+        8
+    ], 
+    "spd_up": 14, 
+    "spd_down": 12, 
+    "spd_left": 15, 
+    "spd_right": 15, 
+    "pointer_smooth": 6, 
+    "shape_smooth": 10, 
+    "tick_interval_ms": 16, 
+    "hold_trigger_ms": 500, 
+    "auto_play": false, 
+    "enable": true, 
+    "mouse_acceleration": false, 
+    "use_transformation_matrix": false
 }

configs/profile_1/mouse_bindings.json

@@ -1 +1,20 @@
-{}
+{
+    "Mouth left": [
+        "mouse", 
+        "cycle", 
+        0.505, 
+        "single"
+    ], 
+    "Mouth right": [
+        "mouse", 
+        "pause", 
+        0.07930000000000006, 
+        "single"
+    ], 
+    "Open mouth": [
+        "mouse", 
+        "left", 
+        0.505, 
+        "single"
+    ]
+}

configs/profile_2/cursor.json

@@ -14,6 +14,7 @@
     "tick_interval_ms": 16, 
     "hold_trigger_ms": 500, 
     "auto_play": false, 
+    "enabled": true, 
     "mouse_acceleration": false, 
     "use_transformation_matrix": false
 }

src/camera_manager.py

@@ -25,7 +25,7 @@
 
 import src.utils as utils
 from src.config_manager import ConfigManager
-from src.controllers import MouseController
+from src.controllers import Keybinder
 from src.singleton_meta import Singleton
 
 MAX_SEARCH_CAMS = 5
@@ -123,7 +123,7 @@ def draw_overlay(self, track_loc):
         self.frame_buffers["debug"] = self.frame_buffers["raw"].copy()
 
         # Disabled
-        if not MouseController().is_active.get():
+        if not Keybinder().is_active.get():
             self.frame_buffers["debug"] = add_overlay(
                 self.frame_buffers["debug"], self.overlay_disabled, 0, 0, 640,
                 108)

src/controllers/keybinder.py

@@ -19,10 +19,10 @@
 
 import pydirectinput
 import win32api
+import tkinter as tk
 
 import src.shape_list as shape_list
 from src.config_manager import ConfigManager
-from src.controllers.mouse_controller import MouseController
 from src.singleton_meta import Singleton
 
 logger = logging.getLogger("Keybinder")
@@ -42,6 +42,7 @@ def __init__(self) -> None:
         self.holding = False
         self.is_started = False
         self.last_know_keybinds = {}
+        self.is_active = None
 
     def start(self):
         if not self.is_started:
@@ -51,6 +52,9 @@ def start(self):
             self.monitors = self.get_monitors()
             self.is_started = True
 
+            self.is_active = tk.BooleanVar()
+            self.is_active.set(ConfigManager().config["auto_play"])
+
     def init_states(self) -> None:
         """Re initializes the state of the keybinder.
            If new keybinds are added.
@@ -177,13 +181,14 @@ def act(self, blendshape_values) -> dict:
                     if mon_id is None:
                         return
 
-                    MouseController().toggle_active()
+                    self.toggle_active()
+                    #MouseController().toggle_active()
 
                     self.key_states[state_name] = True
                 elif (val < thres) and (self.key_states[state_name] is True):
                     self.key_states[state_name] = False
 
-            elif MouseController().is_active.get():
+            elif self.is_active:
 
                 if device == "mouse":
 
@@ -222,6 +227,16 @@ def act(self, blendshape_values) -> dict:
                 elif device == "keyboard":
                     self.keyboard_action(val, action, thres, mode)
 
+    def set_active(self, flag: bool) -> None:
+        self.is_active.set(flag)
+        if flag:
+            self.delay_count = 0
+
+    def toggle_active(self):
+        logging.info("Toggle active")
+        curr_state = self.is_active.get()
+        self.set_active(not curr_state)
+
     def destroy(self):
         """Destroy the keybinder"""
         return

src/controllers/mouse_controller.py

@@ -48,7 +48,8 @@ def __init__(self):
         self.is_started = False
         self.is_destroyed = False
         self.stop_flag = None
-        self.is_active = None
+        self.is_active = tk.BooleanVar()
+        self.is_enabled = None
 
     def start(self):
         if not self.is_started:
@@ -60,8 +61,8 @@ def start(self):
             self.screen_w, self.screen_h = pyautogui.size()
             self.calc_smooth_kernel()
 
-            self.is_active = tk.BooleanVar()
-            self.is_active.set(ConfigManager().config["auto_play"])
+            self.is_enabled = tk.BooleanVar()
+            self.is_enabled.set(ConfigManager().config["enable"])
 
             self.stop_flag = threading.Event()
             self.pool.submit(self.main_loop)
@@ -102,7 +103,7 @@ def main_loop(self) -> None:
             return
 
         while not self.stop_flag.is_set():
-            if not self.is_active.get():
+            if not self.is_active.get() or not self.is_enabled.get():
                 time.sleep(0.001)
                 continue
 
@@ -136,6 +137,11 @@ def main_loop(self) -> None:
 
             time.sleep(ConfigManager().config["tick_interval_ms"] / 1000)
 
+    def set_enabled(self, flag: bool) -> None:
+        self.is_enabled.set(flag)
+        if flag:
+            self.delay_count = 0
+
     def set_active(self, flag: bool) -> None:
         self.is_active.set(flag)
         if flag:

src/gui/frames/frame_cam_preview.py

@@ -19,7 +19,7 @@
 
 from src.camera_manager import CameraManager
 from src.config_manager import ConfigManager
-from src.controllers import MouseController
+from src.controllers import Keybinder
 from src.gui.frames.safe_disposable_frame import SafeDisposableFrame
 
 CANVAS_WIDTH = 216
@@ -72,7 +72,7 @@ def __init__(self, master, master_callback: callable, **kwargs):
             border_color="transparent",
             switch_height=18,
             switch_width=32,
-            variable=MouseController().is_active,
+            variable=Keybinder().is_active,
             command=lambda: master_callback(
                 "toggle_switch", {"switch_status": self.toggle_switch.get()}),
             onvalue=1,
@@ -87,7 +87,7 @@ def __init__(self, master, master_callback: callable, **kwargs):
                                 pady=5,
                                 sticky="nw")
 
-        # Toggle label
+        # Toggle description label
         self.toggle_label = customtkinter.CTkLabel(
             master=self,
             compound='right',

src/gui/main_gui.py

@@ -21,7 +21,7 @@
 import src.gui.frames as frames
 import src.gui.pages as pages
 from src.config_manager import ConfigManager
-from src.controllers import MouseController
+from src.controllers import Keybinder, MouseController
 
 customtkinter.set_appearance_mode("light")
 customtkinter.set_default_color_theme("assets/themes/google_theme.json")
@@ -162,10 +162,13 @@ def cam_preview_callback(self, command, args: dict):
         if command == "toggle_switch":
             self.set_mediapipe_mouse_enable(new_state=args["switch_status"])
 
+
     def set_mediapipe_mouse_enable(self, new_state: bool):
         if new_state:
+            Keybinder().set_active(True)
             MouseController().set_active(True)
         else:
+            Keybinder().set_active(False)
             MouseController().set_active(False)
 
     def change_page(self, target_page_name: str):

src/gui/pages/page_cursor.py

@@ -21,7 +21,7 @@
 from PIL import Image
 
 from src.config_manager import ConfigManager
-from src.controllers import MouseController
+from src.controllers import MouseController, Keybinder
 from src.gui.balloon import Balloon
 from src.gui.frames.safe_disposable_frame import SafeDisposableFrame
 
@@ -73,6 +73,44 @@ def __init__(
         })
 
         self.load_initial_config()
+                        # Toggle label
+        self.toggle_label = customtkinter.CTkLabel(master=self,
+                                                   compound='right',
+                                                   text="Face control",
+                                                   text_color="black",
+                                                   justify=tkinter.RIGHT)
+        self.toggle_label.cget("font").configure(size=14)
+        self.toggle_label.grid(row=2,
+                               column=0,
+                               padx=(10, 0),
+                               pady=5,
+                               sticky="nw")
+
+
+        # Toggle switch
+        self.toggle_switch = customtkinter.CTkSwitch(
+            master=self,
+            text="",
+            width=200,
+            border_color="transparent",
+            switch_height=18,
+            switch_width=32,
+            command=lambda: self.cursor_toggle_callback(
+                "toggle_switch", {"switch_status": self.toggle_switch.get()}),
+            variable=MouseController().is_enabled,
+            onvalue=1,
+            offvalue=0,
+        )
+        if ConfigManager().config["auto_play"]:
+            self.toggle_switch.select()
+
+        self.toggle_switch.grid(row=2,
+                                column=1,
+                                padx=(100, 0),
+                                pady=5,
+                                sticky="nw")
+
+
 
     def load_initial_config(self):
         """Load default from config and set the UI
@@ -218,6 +256,18 @@ def slider_mouse_up_callback(self, div_name: str, event):
     def inner_refresh_profile(self):
         self.load_initial_config()
 
+    def cursor_toggle_callback(self, command, args: dict):
+        logger.info(f"cursor_toggle_callback {command} with {args}")
+
+        if command == "toggle_switch":
+            self.set_mediapipe_mouse_enable(new_state=args["switch_status"])
+
+    def set_mediapipe_mouse_enable(self, new_state: bool):
+        if new_state:
+            MouseController().set_enabled(True)
+        else:
+            MouseController().set_enabled(False)
+
 
 class PageCursor(SafeDisposableFrame):
 
@@ -241,7 +291,7 @@ def __init__(self, master, **kwargs):
                             columnspan=1)
 
         # Description.
-        des_txt = "Mouse cursor moves with your head movement. Use this settings to adjust how fast your mouse moves in each direction."
+        des_txt = "Adjust how the mouse cursor responds to your head movements."
         des_label = customtkinter.CTkLabel(master=self,
                                            text=des_txt,
                                            wraplength=300,
@@ -251,7 +301,7 @@ def __init__(self, master, **kwargs):
 
         # Inner frame
         self.inner_frame = FrameSelectGesture(self)
-        self.inner_frame.grid(row=2, column=0, padx=5, pady=5, sticky="nw")
+        self.inner_frame.grid(row=4, column=0, padx=5, pady=5, sticky="nw")
 
     def refresh_profile(self):
         self.inner_frame.inner_refresh_profile()