Fixing keyboard shortcuts for pausing

Author: andrefecto

CHANGELOG.md

@@ -74,7 +74,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - **Hold to scrub**: Holding down arrow keys continuously steps through frames at ~15 FPS
     - Slider updates in real-time to show current position during arrow key scrubbing
     - Automatically pauses when using arrows on playing video
-  - **Pause/Play**: Spacebar to toggle pause/play for all cameras
+  - **Pause/Play**: Spacebar to toggle pause/play
+    - Press Spacebar alone to pause/play all cameras
+    - Hold 1, 2, 3, or 4 while pressing Spacebar to pause/play specific quadrant only
+    - Works with both number row keys and numpad keys
   - **Recording**: R key to start/stop recording on all live cameras
   - **Screenshot**: S key to take screenshots from all cameras
   - Cross-platform: Automatically uses CMD on macOS, CTRL on Windows/Linux
@@ -149,11 +152,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- **Arrow Key Frame Scrubbing**: Fixed left/right arrow keys not working for frame stepping
+  - Added missing main loop logic to check `holding_frame_back` and `holding_frame_forward` flags
+  - Main loop now calls `step_frame_back()` and `step_frame_forward()` at ~15 FPS when keys are held
+  - Arrow keys now properly step through frames and update sliders for both video files and live camera buffers
+- **Spacebar Pause/Play Toggling**: Changed to trigger on key release instead of key press
+  - Pause/play action now executes when spacebar is RELEASED, not when pressed
+  - Prevents intermediate toggles when holding spacebar and pressing different number keys
+  - Allows user to hold spacebar, change which number key is pressed, then release to toggle the final target
+  - Example: Hold Space, press 1, change mind and press 2 instead, release Space → only toggles quadrant 2
+  - Eliminates unwanted "toggle all cameras" when user is about to specify a quadrant
 - **Keyboard Shortcut Key Constants**: Fixed `AttributeError` for non-existent DearPyGUI key constants
   - Removed references to `mvKey_Equal`, `mvKey_NumPadAdd`, and `mvKey_NumPadSubtract` (don't exist in DearPyGUI)
   - Now correctly uses `mvKey_Plus`, `mvKey_Minus`, `mvKey_Add`, and `mvKey_Subtract`
   - Fixed zoom shortcuts to use Plus/Minus keys that actually exist
   - All keyboard shortcuts now work without errors
+- **Numpad Support for Quadrant Selection**: Fixed numpad key support for quadrant-specific pause/play
+  - Fixed `AttributeError` for incorrect constant `mvKey_Numpad1` (should be `mvKey_NumPad1` with capital P)
+  - Spacebar + NumPad 1-4 now works correctly in addition to number row 1-4
+  - Ensures consistent behavior across different keyboard layouts
+- **Right Command Key Support (macOS)**: Fixed modifier detection to include right Command key
+  - Previously only checked left Command key, now checks both `mvKey_LWin` and `mvKey_RWin`
+  - Ensures keyboard shortcuts work regardless of which Command key is pressed
 - **Keyboard Modifier Keys**: Fixed `AttributeError` for `dpg.mvKey_Control`
   - Now correctly uses `dpg.mvKey_LControl` and `dpg.mvKey_RControl`
   - Also checks left/right variants for Shift and Alt keys

gui/layout.py

@@ -1123,7 +1123,7 @@ def on_key_press_handler(sender, app_data):
     # Check for modifier keys
     # Note: DearPyGUI uses different constants for modifiers
     modifier_pressed = {
-        'ctrl': dpg.is_key_down(dpg.mvKey_LControl) or dpg.is_key_down(dpg.mvKey_RControl) or (is_mac and dpg.is_key_down(dpg.mvKey_LWin)),
+        'ctrl': dpg.is_key_down(dpg.mvKey_LControl) or dpg.is_key_down(dpg.mvKey_RControl) or (is_mac and (dpg.is_key_down(dpg.mvKey_LWin) or dpg.is_key_down(dpg.mvKey_RWin))),
         'shift': dpg.is_key_down(dpg.mvKey_LShift) or dpg.is_key_down(dpg.mvKey_RShift),
         'alt': dpg.is_key_down(dpg.mvKey_LAlt) or dpg.is_key_down(dpg.mvKey_RAlt)
     }
@@ -1135,6 +1135,10 @@ def on_key_press_handler(sender, app_data):
     settings = get_settings()
     shortcuts = settings.keyboard_shortcuts
 
+    # Debug logging for spacebar and number keys
+    if key == dpg.mvKey_Spacebar or key in [dpg.mvKey_1, dpg.mvKey_2, dpg.mvKey_3, dpg.mvKey_4]:
+        logger.info(f"KEY PRESS: key={key}, spacebar_held={state.spacebar_held}, current_target={state.spacebar_target_quadrant}")
+
     # For arrow keys, just set flags - the main loop will handle continuous movement
     if _check_shortcut_match(key, modifier_pressed, shortcuts.get('frame_back')):
         state.holding_frame_back = True
@@ -1178,59 +1182,36 @@ def on_key_press_handler(sender, app_data):
                         dpg.set_value(zoom_label_tag, f"{camera.zoom_level:.2f}x")
 
     elif _check_shortcut_match(key, modifier_pressed, shortcuts.get('pause_play')):
-        # Check if a number key (1-4) is also pressed for quadrant-specific pause
+        # Track that spacebar is held and update target whenever a number key changes
+        state.spacebar_held = True
+
+        # Check which quadrant is targeted (updates as number keys are pressed)
         target_quadrant = None
-        if dpg.is_key_down(dpg.mvKey_1):
+        if dpg.is_key_down(dpg.mvKey_1) or dpg.is_key_down(dpg.mvKey_NumPad1):
             target_quadrant = 0
-        elif dpg.is_key_down(dpg.mvKey_2):
+        elif dpg.is_key_down(dpg.mvKey_2) or dpg.is_key_down(dpg.mvKey_NumPad2):
             target_quadrant = 1
-        elif dpg.is_key_down(dpg.mvKey_3):
+        elif dpg.is_key_down(dpg.mvKey_3) or dpg.is_key_down(dpg.mvKey_NumPad3):
             target_quadrant = 2
-        elif dpg.is_key_down(dpg.mvKey_4):
+        elif dpg.is_key_down(dpg.mvKey_4) or dpg.is_key_down(dpg.mvKey_NumPad4):
             target_quadrant = 3
 
-        if target_quadrant is not None:
-            logger.info(f"Keyboard: Toggle pause/play for quadrant {target_quadrant + 1}")
-        else:
-            logger.info("Keyboard: Toggle pause/play for all cameras")
-
-        for camera in state.cameras:
-            # Find which quadrant this camera is in
-            cam_quadrant = None
-            for cam_id, quad_pos in state.camera_positions.items():
-                if id(camera) == cam_id:
-                    cam_quadrant = quad_pos
-                    break
-
-            # Skip this camera if we're targeting a specific quadrant and this isn't it
-            if target_quadrant is not None and cam_quadrant != target_quadrant:
-                continue
-
-            if camera.is_video_file:
-                camera.paused = not camera.paused
-                # Update button labels
-                if cam_quadrant is not None:
-                    pause_btn_tag = f"pause_btn_{cam_quadrant}"
-                    if dpg.does_item_exist(pause_btn_tag):
-                        dpg.configure_item(pause_btn_tag, label="Play" if camera.paused else "Pause")
-            elif not camera.is_video_file:
-                # For live cameras, use toggle_live_pause() like the button does
-                is_paused = camera.toggle_live_pause()
-                if cam_quadrant is not None:
-                    pause_btn_tag = f"pause_btn_{cam_quadrant}"
-                    if dpg.does_item_exist(pause_btn_tag):
-                        dpg.configure_item(pause_btn_tag, label="Resume" if is_paused else "Pause")
-
-                    # Show/hide slider and step buttons like the button callback does
-                    slider_tag = f"live_slider_{cam_quadrant}"
-                    step_back_tag = f"step_back_btn_{cam_quadrant}"
-                    step_fwd_tag = f"step_fwd_btn_{cam_quadrant}"
-                    if dpg.does_item_exist(slider_tag):
-                        dpg.configure_item(slider_tag, show=is_paused)
-                    if dpg.does_item_exist(step_back_tag):
-                        dpg.configure_item(step_back_tag, show=is_paused)
-                    if dpg.does_item_exist(step_fwd_tag):
-                        dpg.configure_item(step_fwd_tag, show=is_paused)
+        state.spacebar_target_quadrant = target_quadrant
+        logger.info(f"Spacebar PRESSED: target updated to {target_quadrant}")
+
+    # Also update target when number keys are pressed while spacebar is held
+    elif state.spacebar_held and (key in [dpg.mvKey_1, dpg.mvKey_2, dpg.mvKey_3, dpg.mvKey_4,
+                                           dpg.mvKey_NumPad1, dpg.mvKey_NumPad2, dpg.mvKey_NumPad3, dpg.mvKey_NumPad4]):
+        logger.info(f"Number key detected: key={key}, mvKey_2={dpg.mvKey_2}, match={key == dpg.mvKey_2}")
+        if key == dpg.mvKey_1 or key == dpg.mvKey_NumPad1:
+            state.spacebar_target_quadrant = 0
+        elif key == dpg.mvKey_2 or key == dpg.mvKey_NumPad2:
+            state.spacebar_target_quadrant = 1
+        elif key == dpg.mvKey_3 or key == dpg.mvKey_NumPad3:
+            state.spacebar_target_quadrant = 2
+        elif key == dpg.mvKey_4 or key == dpg.mvKey_NumPad4:
+            state.spacebar_target_quadrant = 3
+        logger.info(f"Number key PRESSED while spacebar held: target updated to {state.spacebar_target_quadrant}")
 
     elif _check_shortcut_match(key, modifier_pressed, shortcuts.get('record')):
         logger.info("Keyboard: Toggle recording")
@@ -1332,13 +1313,17 @@ def on_key_release_handler(sender, app_data):
 
     # Check for modifier keys
     modifier_pressed = {
-        'ctrl': dpg.is_key_down(dpg.mvKey_LControl) or dpg.is_key_down(dpg.mvKey_RControl) or (is_mac and dpg.is_key_down(dpg.mvKey_LWin)),
+        'ctrl': dpg.is_key_down(dpg.mvKey_LControl) or dpg.is_key_down(dpg.mvKey_RControl) or (is_mac and (dpg.is_key_down(dpg.mvKey_LWin) or dpg.is_key_down(dpg.mvKey_RWin))),
         'shift': dpg.is_key_down(dpg.mvKey_LShift) or dpg.is_key_down(dpg.mvKey_RShift),
         'alt': dpg.is_key_down(dpg.mvKey_LAlt) or dpg.is_key_down(dpg.mvKey_RAlt)
     }
 
     key = app_data
 
+    # Debug logging
+    if key == dpg.mvKey_Spacebar:
+        logger.info(f"KEY RELEASE: key={key}, spacebar_held={state.spacebar_held}, target={state.spacebar_target_quadrant}")
+
     # Load shortcuts from settings
     from utils.settings import get_settings
     settings = get_settings()
@@ -1350,6 +1335,64 @@ def on_key_release_handler(sender, app_data):
     elif _check_shortcut_match(key, modifier_pressed, shortcuts.get('frame_forward')):
         state.holding_frame_forward = False
 
+    # Execute pause/play when spacebar is released (not when pressed)
+    # Use the target that was set during the press phase
+    if _check_shortcut_match(key, modifier_pressed, shortcuts.get('pause_play')):
+        # Only execute if spacebar was actually held (prevents issues with key repeat)
+        if not state.spacebar_held:
+            return
+
+        target_quadrant = state.spacebar_target_quadrant
+
+        logger.info(f"Spacebar RELEASED: using target_quadrant={target_quadrant}")
+
+        if target_quadrant is not None:
+            logger.info(f"Keyboard: Toggle pause/play for quadrant {target_quadrant + 1}")
+        else:
+            logger.info("Keyboard: Toggle pause/play for all cameras")
+
+        # Reset state for next press
+        state.spacebar_held = False
+        state.spacebar_target_quadrant = None
+
+        for camera in state.cameras:
+            # Find which quadrant this camera is in
+            cam_quadrant = None
+            for cam_id, quad_pos in state.camera_positions.items():
+                if id(camera) == cam_id:
+                    cam_quadrant = quad_pos
+                    break
+
+            # Skip this camera if we're targeting a specific quadrant and this isn't it
+            if target_quadrant is not None and cam_quadrant != target_quadrant:
+                continue
+
+            if camera.is_video_file:
+                camera.paused = not camera.paused
+                # Update button labels
+                if cam_quadrant is not None:
+                    pause_btn_tag = f"pause_btn_{cam_quadrant}"
+                    if dpg.does_item_exist(pause_btn_tag):
+                        dpg.configure_item(pause_btn_tag, label="Play" if camera.paused else "Pause")
+            elif not camera.is_video_file:
+                # For live cameras, use toggle_live_pause() like the button does
+                is_paused = camera.toggle_live_pause()
+                if cam_quadrant is not None:
+                    pause_btn_tag = f"pause_btn_{cam_quadrant}"
+                    if dpg.does_item_exist(pause_btn_tag):
+                        dpg.configure_item(pause_btn_tag, label="Resume" if is_paused else "Pause")
+
+                    # Show/hide slider and step buttons like the button callback does
+                    slider_tag = f"live_slider_{cam_quadrant}"
+                    step_back_tag = f"step_back_btn_{cam_quadrant}"
+                    step_fwd_tag = f"step_fwd_btn_{cam_quadrant}"
+                    if dpg.does_item_exist(slider_tag):
+                        dpg.configure_item(slider_tag, show=is_paused)
+                    if dpg.does_item_exist(step_back_tag):
+                        dpg.configure_item(step_back_tag, show=is_paused)
+                    if dpg.does_item_exist(step_fwd_tag):
+                        dpg.configure_item(step_fwd_tag, show=is_paused)
+
 
 def register_global_mouse_handlers():
     """Register global mouse and keyboard handlers"""

gui/state.py

@@ -31,3 +31,7 @@
 holding_frame_back = False
 holding_frame_forward = False
 last_frame_step_time = 0.0  # Track when we last stepped a frame
+
+# Track spacebar state for pause/play
+spacebar_held = False
+spacebar_target_quadrant = None  # Which quadrant to toggle when spacebar is released

main.py

@@ -172,6 +172,19 @@ def on_startup_complete(athlete_name, bike_name):
         while dpg.is_dearpygui_running():
             # Only update camera textures if main UI is showing
             if show_main_ui:
+                # Handle continuous frame scrubbing with arrow keys
+                current_time = time.time()
+                if state.holding_frame_back or state.holding_frame_forward:
+                    # Rate limit to ~15 FPS for smooth scrubbing
+                    if current_time - state.last_frame_step_time >= 1.0/15.0:
+                        if state.holding_frame_back:
+                            from gui.layout import step_frame_back
+                            step_frame_back()
+                        elif state.holding_frame_forward:
+                            from gui.layout import step_frame_forward
+                            step_frame_forward()
+                        state.last_frame_step_time = current_time
+
                 # Update camera textures
                 for camera in state.cameras:
                     camera.update_texture()
@@ -189,7 +202,6 @@ def on_startup_complete(athlete_name, bike_name):
 
                 # Resize quadrants and images periodically (check every 0.1 seconds)
                 # But skip if we're currently dragging a divider
-                current_time = time.time()
                 if current_time - last_resize_time > 0.1:
                     if not state.dragging_vertical_divider and not state.dragging_horizontal_divider:
                         update_quadrant_sizes()