diff --git a/examples/finger_pipeline.py b/examples/finger_pipeline.py index 10b17d3..dcd6b95 100644 --- a/examples/finger_pipeline.py +++ b/examples/finger_pipeline.py @@ -90,6 +90,7 @@ def main(): threshold=0.4, grid_spacing=10, arrow_scale=1.0, + valid_mask=tactile.valid_mask, ) cv2.imshow("UV Unrolled", arrows) diff --git a/examples/gui/viewer3d/dashboard.py b/examples/gui/viewer3d/dashboard.py index 985885f..b95e623 100644 --- a/examples/gui/viewer3d/dashboard.py +++ b/examples/gui/viewer3d/dashboard.py @@ -570,6 +570,8 @@ class FingerDashboardWindow(QMainWindow): camera_id = str(camera_id).strip() if not camera_id: return + # Explicit camera pick clears sticky file mode and persists the live source. + self.settings_panel.set_video_source(camera_id) self.config.video = camera_id self._save_preferences() self._update_play_enabled_for_source() diff --git a/examples/gui/viewer3d/widgets/settings_panel.py b/examples/gui/viewer3d/widgets/settings_panel.py index 2cfb022..094651f 100644 --- a/examples/gui/viewer3d/widgets/settings_panel.py +++ b/examples/gui/viewer3d/widgets/settings_panel.py @@ -110,6 +110,8 @@ class SettingsPanelWidget(QWidget): self.camera_combo = QComboBox() self.camera_combo.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) self.camera_combo.setToolTip("Select an available camera") + # activated fires on user pick even when the index is unchanged (file → live override). + self.camera_combo.activated.connect(self._on_camera_combo_changed) self.camera_combo.currentIndexChanged.connect(self._on_camera_combo_changed) video_row.addWidget(self.camera_combo, 1) self.btn_refresh_cameras = QPushButton("Refresh") diff --git a/sensors/finger/assets/finger/30fps-0703/README.md b/sensors/finger/assets/30fps-0703/README.md similarity index 100% rename from sensors/finger/assets/finger/30fps-0703/README.md rename to sensors/finger/assets/30fps-0703/README.md diff --git a/sensors/finger/assets/finger/30fps-0703/camera_intrinsics.npz b/sensors/finger/assets/30fps-0703/camera_intrinsics.npz similarity index 100% rename from sensors/finger/assets/finger/30fps-0703/camera_intrinsics.npz rename to sensors/finger/assets/30fps-0703/camera_intrinsics.npz diff --git a/sensors/finger/assets/finger/30fps-0703/mesh.npz b/sensors/finger/assets/30fps-0703/mesh.npz similarity index 100% rename from sensors/finger/assets/finger/30fps-0703/mesh.npz rename to sensors/finger/assets/30fps-0703/mesh.npz diff --git a/sensors/finger/assets/finger/30fps-0703/pixel_to_xyz.npz b/sensors/finger/assets/30fps-0703/pixel_to_xyz.npz similarity index 100% rename from sensors/finger/assets/finger/30fps-0703/pixel_to_xyz.npz rename to sensors/finger/assets/30fps-0703/pixel_to_xyz.npz diff --git a/sensors/finger/assets/finger/30fps-0703/unroll_map_uv_s0.4.npz b/sensors/finger/assets/30fps-0703/unroll_map_uv_s0.4.npz similarity index 100% rename from sensors/finger/assets/finger/30fps-0703/unroll_map_uv_s0.4.npz rename to sensors/finger/assets/30fps-0703/unroll_map_uv_s0.4.npz diff --git a/sensors/finger/assets/finger/30fps-0703/world_to_cam.npy b/sensors/finger/assets/30fps-0703/world_to_cam.npy similarity index 100% rename from sensors/finger/assets/finger/30fps-0703/world_to_cam.npy rename to sensors/finger/assets/30fps-0703/world_to_cam.npy diff --git a/sensors/finger/assets/finger/visualization/README.md b/sensors/finger/assets/visualization/README.md similarity index 100% rename from sensors/finger/assets/finger/visualization/README.md rename to sensors/finger/assets/visualization/README.md diff --git a/sensors/finger/assets/finger/visualization/camera_intrinsics.npz b/sensors/finger/assets/visualization/camera_intrinsics.npz similarity index 100% rename from sensors/finger/assets/finger/visualization/camera_intrinsics.npz rename to sensors/finger/assets/visualization/camera_intrinsics.npz diff --git a/sensors/finger/assets/finger/visualization/flatten_remap.npz b/sensors/finger/assets/visualization/flatten_remap.npz similarity index 100% rename from sensors/finger/assets/finger/visualization/flatten_remap.npz rename to sensors/finger/assets/visualization/flatten_remap.npz diff --git a/sensors/finger/assets/finger/visualization/mesh.npz b/sensors/finger/assets/visualization/mesh.npz similarity index 100% rename from sensors/finger/assets/finger/visualization/mesh.npz rename to sensors/finger/assets/visualization/mesh.npz diff --git a/sensors/finger/assets/finger/visualization/pixel_to_xyz.npz b/sensors/finger/assets/visualization/pixel_to_xyz.npz similarity index 100% rename from sensors/finger/assets/finger/visualization/pixel_to_xyz.npz rename to sensors/finger/assets/visualization/pixel_to_xyz.npz diff --git a/sensors/finger/assets/finger/visualization/world_to_cam.npy b/sensors/finger/assets/visualization/world_to_cam.npy similarity index 100% rename from sensors/finger/assets/finger/visualization/world_to_cam.npy rename to sensors/finger/assets/visualization/world_to_cam.npy