Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

*kinda* works lol

Jonf5121f666151
diff --git a/src/cameras/capture/opencv_camera/camera_stream_thread_handler.py b/src/cameras/capture/opencv_camera/camera_stream_thread_handler.py
index 5346835f..886e5b26 100644
--- a/src/cameras/capture/opencv_camera/camera_stream_thread_handler.py
+++ b/src/cameras/capture/opencv_camera/camera_stream_thread_handler.py
@@ -79,7 +79,7 @@ class VideoCaptureThread(threading.Thread):
self._elapsed_during_frame_grab.append(time.perf_counter_ns() - start)
self._timestamps_npy.append(self._frame.timestamp_in_seconds_from_record_start)
self._num_frames_processed += 1
- logger.debug(f"Camera {self._webcam_id}: captured frame# {self._num_frames_processed}: Recording? {self.is_recording_frames}")
+ # logger.debug(f"Camera {self._webcam_id}: captured frame# {self._num_frames_processed}: Recording? {self.is_recording_frames}")
if self.is_recording_frames:
self._frame_list.append(self._frame)
except:
diff --git a/src/cameras/capture/opencv_camera/opencv_camera.py b/src/cameras/capture/opencv_camera/opencv_camera.py
index 1cd62a90..3c675017 100644
--- a/src/cameras/capture/opencv_camera/opencv_camera.py
+++ b/src/cameras/capture/opencv_camera/opencv_camera.py
@@ -112,7 +112,7 @@ class OpenCVCamera:
cap_backend = cv2.CAP_ANY
self._opencv_video_capture_object = cv2.VideoCapture(
- self._config.webcam_id, cap_backend
+ int(self._config.webcam_id), cap_backend
)
self._apply_configuration()
success, image = self._opencv_video_capture_object.read()
@@ -160,6 +160,7 @@ class OpenCVCamera:
def _create_thread(self):
return VideoCaptureThread(
+ webcam_id=self.webcam_id_as_str,
get_next_frame=self.get_next_frame,
)
@@ -209,7 +210,7 @@ class OpenCVCamera:
if success:
self._number_of_frames_recorded += 1
if self._camera_view_update_function is not None:
- self._camera_view_update_function(self.webcam_id_as_str, image)
+ self._camera_view_update_function(self.webcam_id_as_str, cv2.cvtColor(image, cv2.COLOR_BGR2RGB))
return FramePayload(success=success,
image=image,
diff --git a/src/cameras/launch_camera_frame_loop.py b/src/cameras/launch_camera_frame_loop.py
index cff83cbd..a980a944 100644
--- a/src/cameras/launch_camera_frame_loop.py
+++ b/src/cameras/launch_camera_frame_loop.py
@@ -23,9 +23,11 @@ def launch_camera_frame_loop(
show_camera_views_in_windows: bool = False,
calibration_videos_bool: bool = False,
detect_charuco_in_image: bool = True,
- camera_view_update_function=None
+ camera_view_update_function=None,
+ update_gui_function = None,
+ exit_event_bool:bool = False,
):
- calibration_videos_bool = False
+
any_frames_recorded = False
if detect_charuco_in_image:
@@ -41,6 +43,10 @@ def launch_camera_frame_loop(
try:
should_continue = True
while should_continue:
+
+ if update_gui_function is None:
+ update_gui_function()
+
for this_webcam_id, this_opencv_camera in connected_cameras_dict.items():
this_frame_payload = this_opencv_camera.latest_frame
@@ -57,11 +63,16 @@ def launch_camera_frame_loop(
image_to_display,
opencv_camera_manager.timestamp_manager
)
+
# exit loop when user presses ESC key
exit_key = cv2.waitKey(1)
if exit_key == 27:
logger.info("ESC has been pressed.")
should_continue = False
+
+ if exit_event_bool is not None:
+ if exit_event_bool:
+ should_continue = False
except:
logger.error("Printing traceback")
traceback.print_exc()
@@ -72,3 +83,4 @@ def launch_camera_frame_loop(
this_open_cv_camera.video_recorder.save_list_of_frames_to_video_file(
this_open_cv_camera.video_recorder.frame_list)
this_open_cv_camera.video_recorder.close()
+ this_open_cv_camera.close()
diff --git a/src/cameras/multicam_manager/cv_camera_manager.py b/src/cameras/multicam_manager/cv_camera_manager.py
index ee586b5f..09950ee8 100644
--- a/src/cameras/multicam_manager/cv_camera_manager.py
+++ b/src/cameras/multicam_manager/cv_camera_manager.py
@@ -30,6 +30,7 @@ class OpenCVCameraManager:
def __init__(self,
session_id: str = None,
expected_framerate: Union[int, float] = None,
+ shut_down_event_bool:bool = None,
):
self._session_id = session_id
self._config_service = UserConfigService()
@@ -39,6 +40,7 @@ class OpenCVCameraManager:
self._connected_cameras_dict = {}
self._available_cameras_dict = {}
self._expected_framerate = expected_framerate
+ self._shut_down_event_bool = shut_down_event_bool
@property
def timestamp_manager(self):
@@ -206,3 +208,7 @@ class OpenCVCameraManager:
def _stop_frame_capture(self, opencv_cam_objs: List[OpenCVCamera]):
for cv_cam in opencv_cam_objs:
cv_cam.stop_frame_capture()
+
+ def close(self):
+ for this_cam in self._connected_cameras_dict.values():
+ this_cam.close()
diff --git a/src/freemocap_qt_gui/freemocap_qt_gui.py b/src/freemocap_qt_gui/freemocap_qt_gui.py
index 2e9f3816..225c9ddd 100644
--- a/src/freemocap_qt_gui/freemocap_qt_gui.py
+++ b/src/freemocap_qt_gui/freemocap_qt_gui.py
@@ -29,19 +29,35 @@ logger = logging.getLogger(__name__)
default_webcam_config = WebcamConfig()
+class MainWindow(QWidget):
+ def __init__(self):
+ super().__init__()
+
+ def closeEvent(self, QCloseEvent):
+ self.shut_it_down = True
+
+
class FreemocapQtGUI:
def __init__(self):
self._camera_view_docks_dict = {}
self._camera_view_update_functions_dict = {}
self._camera_qt_image_items_dict = {}
self.pyqtgraph_app = pg.mkQApp('freemocap pyqtgraph app! :D')
- self._setup_and_launch()
self._session_id = None
self._shut_it_down = False
self.gui_update_number = -1
self._dictionary_of_available_webcam_configs = {}
self._available_cameras_data_tree_widget = None
self._have_calibration_bool = False
+ self._shut_it_down = False
+ self._opencv_camera_manager = None
+ self._setup_and_launch()
+
+ def shut_it_down(self):
+ if self._opencv_camera_manager is not None:
+ self._opencv_camera_manager.close()
+ self._main_window_widget.close()
+ return self._shut_it_down
@property
def session_id(self):
@@ -96,12 +112,21 @@ class FreemocapQtGUI:
session_id_widget.setLayout(session_id_layout)
self._welcome_panel_layout_widget.addWidget(session_id_widget, row='next')
- self._start_button = QtWidgets.QPushButton('Start new session')
+ self._start_button_text = 'Start new session'
+ self._pointing_arrow_emoji = " ⬅️⬅️ "
+ self._start_button = QtWidgets.QPushButton(self._start_button_text + self._pointing_arrow_emoji)
self._start_button.setEnabled(True)
self._start_button.clicked.connect(self._start)
self._welcome_panel_layout_widget.addWidget(self._start_button, row='next')
+ self._shut_down_button = QtWidgets.QPushButton('Shut it down! πŸ¦•')
+ self._shut_down_button.hide()
+ self._shut_down_button.setEnabled(True)
+ self._shut_down_button.clicked.connect(self.shut_it_down)
+
+ self._welcome_panel_layout_widget.addWidget(self._shut_down_button, row='next')
+
def _create_setup_control_panel(self):
self._main_window_width += 100
@@ -114,8 +139,8 @@ class FreemocapQtGUI:
self._main_dock_area.addDock(self._setup_panel_dock,
'bottom',
self._welcome_panel_dock)
-
- self._detect_cameras_button = QtWidgets.QPushButton('Detect Available Cameras πŸ”ŽπŸŽ₯')
+ self._detect_available_cameras_text = 'Detect Available Cameras πŸ”ŽπŸŽ₯'
+ self._detect_cameras_button = QtWidgets.QPushButton(self._detect_available_cameras_text + self._pointing_arrow_emoji)
self._detect_cameras_button.setEnabled(True)
self._detect_cameras_button.clicked.connect(self._detect_available_cameras)
self._setup_panel_layout_widget.addWidget(self._detect_cameras_button)
@@ -124,7 +149,8 @@ class FreemocapQtGUI:
self.hint_label.hide()
self._setup_panel_layout_widget.addWidget(self.hint_label, row=1, col=0)
- self._connect_to_cameras_button = QtWidgets.QPushButton('Connect to cameras πŸŽ₯ ✨')
+ self._connect_to_cameras_button_text = 'Connect to cameras πŸŽ₯ ✨'
+ self._connect_to_cameras_button = QtWidgets.QPushButton(self._connect_to_cameras_button_text)
self._connect_to_cameras_button.setEnabled(True)
self._connect_to_cameras_button.clicked.connect(self._connect_to_cameras)
self._connect_to_cameras_button.hide()
@@ -134,7 +160,7 @@ class FreemocapQtGUI:
self._calibrate_cameras_button.setEnabled(True)
self._calibrate_cameras_button.clicked.connect(self._record_calibration_videos)
self._calibrate_cameras_button.hide()
- self._setup_panel_layout_widget.addWidget(self._calibrate_cameras_button, row=0, col=1)
+ self._setup_panel_layout_widget.addWidget(self._calibrate_cameras_button, row=1, col=1)
# self._use_previous_calibration_checkbox = QtWidgets.QCheckBox("Use Previous Calibration πŸŽ₯ ⏳")
# self._use_previous_calibration_checkbox.setChecked(False)
@@ -150,6 +176,10 @@ class FreemocapQtGUI:
def _start(self):
logger.debug('start button pressed')
+ self._start_button.text = self._start_button_text
+
+ self._shut_down_button.show()
+
self._lock_in_session_id(self.session_id_line_edit.text())
# self._start_button.setText("Reset πŸ’«")
self._start_button.hide()
@@ -178,7 +208,7 @@ class FreemocapQtGUI:
logger.debug(
f"`get_or_create_cams()` returned:_available_cameras_dictionary {self._dictionary_of_available_webcam_configs}")
- self._detect_cameras_button.setText('Re-Detect Available Cameras πŸ”ŽπŸŽ₯')
+ self._detect_cameras_button.setText('Re-Detect Available Cameras πŸ”ŽπŸŽ₯' )
self.hint_label.hide()
if self._available_cameras_data_tree_widget is None:
@@ -187,16 +217,20 @@ class FreemocapQtGUI:
self._update_webcam_config_parameter_tree(self._dictionary_of_available_webcam_configs)
self._main_window_width *= 1.618
- self._main_window_widget.resize(self._main_window_width, self._main_window_height)
+ self._main_window_widget.resize(int(self._main_window_width), int(self._main_window_height))
+ self._connect_to_cameras_button.setText(self._connect_to_cameras_button_text + self._pointing_arrow_emoji)
self._connect_to_cameras_button.show()
- self._calibrate_cameras_button.show()
+ # self._calibrate_cameras_button.show()
- self._launch_camera_windows_button.show()
+ # self._launch_camera_windows_button.show()
# self._use_previous_calibration_checkbox.show()
def _connect_to_cameras(self):
+ self._main_window_width = self._main_window_width *2
+ # self._main_window_height
+ self._main_window_widget.resize(self._main_window_width, self._main_window_height)
self._dictionary_of_camera_qt_image_items = self._create_camera_view_docks(
self._dictionary_of_available_webcam_configs)
@@ -205,9 +239,12 @@ class FreemocapQtGUI:
launch_camera_frame_loop(session_id=self.session_id,
webcam_configs_dict=self._dictionary_of_available_webcam_configs,
opencv_camera_manager=self._opencv_camera_manager,
- camera_view_update_function=self.update_camera_view_image)
+ camera_view_update_function=self.update_camera_view_image,
+ update_gui_function=self.pyqtgraph_app.processEvents)
+
def _create_camera_view_docks(self, dictionary_of_available_webcams) -> Dict:
+ pg.setConfigOptions(imageAxisOrder='row-major') #set this so camera images aren't rotated
dictionary_of_camera_qt_image_items = {}
for this_webcam_id in dictionary_of_available_webcams.keys():
dictionary_of_camera_qt_image_items[this_webcam_id] = self._setup_camera_view_dock(this_webcam_id)
@@ -232,7 +269,7 @@ class FreemocapQtGUI:
logger.warning(f'Could not find ViewBoxWidget for camera {webcam_id}')
raise e
- camera_image_item_widget.setImage(image_to_display)
+ camera_image_item_widget.setImage(image_to_display, )
def _record_calibration_videos(self):
logger.debug("`launch camera windows` button pressed")