Free Motion Capture for Everyone πβ¨
TypeScript
something is working, kinda not really but kinda?
Jon5730e8cd5d52
diff --git a/src/pipelines/session_pipeline/data_classes/data_3d_single_frame_payload.py b/src/pipelines/session_pipeline/data_classes/data_3d_single_frame_payload.pyindex 0b859770..2b161709 100644--- a/src/pipelines/session_pipeline/data_classes/data_3d_single_frame_payload.py+++ b/src/pipelines/session_pipeline/data_classes/data_3d_single_frame_payload.py@@ -1,10 +1,13 @@import numpy as npfrom pydantic import BaseModel+class TweakedModel(BaseModel):class Config:arbitrary_types_allowed = True+class Data3dSingleFramePayload(TweakedModel):+ has_data: bool = True,data3d_trackedPointNum_xyz: np.ndarray = Nonedata3d_trackedPointNum_reprojectionError: np.ndarray = Nonediff --git a/src/pipelines/session_pipeline/session_pipeline_orchestrator.py b/src/pipelines/session_pipeline/session_pipeline_orchestrator.pyindex 7a9038ef..fef8feca 100644--- a/src/pipelines/session_pipeline/session_pipeline_orchestrator.py+++ b/src/pipelines/session_pipeline/session_pipeline_orchestrator.py@@ -131,6 +131,8 @@ class SessionPipelineOrchestrator:try:if show_visualizer_gui:self._visualizer_gui.setup_and_launch(self._open_cv_camera_manager.available_webcam_ids)+ if detect_charuco:+ self._visualizer_gui.initialize_charuco_dottos(self._charuco_board_detector.number_of_charuco_corners)timestamp_manager = TimestampManager(self._open_cv_camera_manager.available_webcam_ids,self._session_start_time_unix_ns)@@ -144,8 +146,8 @@ class SessionPipelineOrchestrator:if reconstruct_3d:if detect_charuco:charuco_frame_payload = self._reconstruct_3d_charuco(incoming_charuco_frame_data_per_camera_dict)- if show_visualizer_gui:- self._visualizer_gui.update_3d_view_port(charuco_frame_payload, type='charuco')+ if show_visualizer_gui and charuco_frame_payload is not None:+ self._visualizer_gui.update_charuco_3d_dottos(charuco_frame_payload)for this_webcam_id, this_open_cv_camera in connected_cameras_dict.items():if not this_open_cv_camera.new_frame_ready:@@ -188,7 +190,7 @@ class SessionPipelineOrchestrator:timestamp_manager.median_frames_per_second_for_webcam(this_webcam_id),)self._visualizer_gui.update_camera_view_image(this_webcam_id, image_to_display)- self._visualizer_gui.update_timestamp_plots(timestamp_manager)+ # self._visualizer_gui.update_timestamp_plots(timestamp_manager)# exit loop when user presses ESC keyexit_key = cv2.waitKey(1)@@ -297,7 +299,8 @@ class SessionPipelineOrchestrator:data2d_camNum_trackedPointNum_xyz,mean=True)- return Data3dSingleFramePayload(data3d_trackedPointNum_xyz=data3d_trackedPointNum_xyz,+ return Data3dSingleFramePayload(has_data= True,+ data3d_trackedPointNum_xyz=data3d_trackedPointNum_xyz,data3d_trackedPointNum_reprojectionError=data3d_trackedPointNum_reprojectionError, )diff --git a/src/qt_visualizer_and_gui/qt_visualizer_and_gui.py b/src/qt_visualizer_and_gui/qt_visualizer_and_gui.pyindex 520399e1..ce2c8227 100644--- a/src/qt_visualizer_and_gui/qt_visualizer_and_gui.py+++ b/src/qt_visualizer_and_gui/qt_visualizer_and_gui.py@@ -17,7 +17,7 @@ logger = logging.getLogger(__name__)class QTVisualizerAndGui:- def __init__(self):+ def __init__(self, source:str=None):# https://pyqtgraph.readthedocs.io/en/latest/config_options.htmlself._camera0_id = '0'pg.setConfigOptions(imageAxisOrder='row-major')@@ -48,11 +48,10 @@ class QTVisualizerAndGui:self._setup_main_window()self._setup_control_panel()self._setup_camera_views_dock()- self._setup_timestamp_plot()- self._setup_time_difference_from_cam0_line_plot()- self._setup_time_difference_from_cam0_histogram_plot()+ # self._setup_timestamp_plot()+ # self._setup_time_difference_from_cam0_line_plot()+ # self._setup_time_difference_from_cam0_histogram_plot()self._setup_3d_viewport()- self._initialize_charuco_dottos()logger.info('launching QT Visualizer and GUI window')self._main_window_widget.show()@@ -274,17 +273,16 @@ class QTVisualizerAndGui:self.opengl_3d_plot_dock.addWidget(self.opengl_3d_plot_widget)self._main_dock_area.addDock(self.opengl_3d_plot_dock, 'bottom', self._camera_views_dock)- def update_charuco_3d_dottos(self, charuco_frame_payload: Data3dSingleFramePayload, type: str = 'generic'):+ def update_charuco_3d_dottos(self, charuco_frame_payload: Data3dSingleFramePayload):self._charuco_scatter_item.setData(pos=charuco_frame_payload.data3d_trackedPointNum_xyz)- def initialize_charuco_dottos(self, number_of_charuco_corners: int = 24):- logger.warning("Sloppy assuming that there are 24 charuco corners, which might not be true in the future")+ def initialize_charuco_dottos(self, number_of_charuco_corners: int):dummy_charuco_points = np.zeros((number_of_charuco_corners, 3))self._charuco_scatter_item = gl.GLScatterPlotItem(pos=dummy_charuco_points,color=(1, 1, 0, 1),- width=3+ size=20)self.opengl_3d_plot_widget.addItem(self._charuco_scatter_item)