Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jon/gui/lets make a working pipeline #221

Merged
merged 39 commits into from Aug 23, 2022

Conversation

jonmatthis
Copy link
Member

Gets all the way through the main pipeline,

At time of submission, the Blender data doesn't work for some reason, but it's probably something dumb

Jon and others added 11 commits August 15, 2022 13:27
…line' into jon/gui/lets-make-a-working-pipeline

# Conflicts:
#	src/gui/main/custom_widgets/single_camera_widget.py
#	src/gui/main/main_window/left_panel_controls/toolbox_widgets/calibrate_capture_volume_panel.py
#	src/gui/main/main_window/left_panel_controls/toolbox_widgets/camera_setup_control_panel.py
#	src/gui/main/main_window/middle_panel_camera_and_3D_viewer/camera_view_panel.py
#	src/gui/main/main_window/middle_panel_viewers/camera_stream_grid_view.py
#	src/gui/main/workers/cam_charuco_frame_thread_worker.py
@jonmatthis jonmatthis merged commit dcd4cea into main Aug 23, 2022
@jonmatthis jonmatthis deleted the jon/gui/lets-make-a-working-pipeline branch August 23, 2022 16:55
@jonmatthis
Copy link
Member Author

merging without review, per our conversation yesterday ✨

jeff-cn pushed a commit to jeff-cn/freemocap that referenced this pull request Nov 23, 2023
* update `black` version to avoid `click` incompatiblity

* starting new layout using `frames` with `splitters`

* new main window

* build fake tab things for standard workflow

* something resembling a webcam config whosit

* something resembling a webcam config whosit

* pulls the previous 'camera setup' thing into the middle window

* new branch from jon/all_in_one_main_window

* ok, cams are in there!

* cams connected to control panel (one-way) via dumb 'pushbutton' signal b/c i don't understand how signals work in pyqt lol

* janky but functional webcam settings whosit :D

* webcam control seems to work

* add file system view

* new branch aiming to make a working pipeline :D

* commiting from commandline bc I'm fancy?

* thats calibration baybee

* shows calibration data as data tree

* gets all the way to 'export to blender' bit

* creates a busted blender scene :D

* creates a busted blender scene :D

* create signal to update camera configs when connect to camera

* remove 'select workflow' screen and add (ugly af) buttons to 'create or load session' toolbar panel

* remove 'select workflow' screen and add (ugly af) buttons to 'create or load session' toolbar panel

* fix bug where parameter tree was double loading

* more or less complete (if janky) pipeline :D

* update reqs

* *might* resolve Issue freemocap#195 where 'OBS Virtual Cam' is detected as a real camamera

* rotate images kinda working after splitting VideoRecorder from OpenCVCamera

* commit after meet with Endurance

* camera detection and connection handled by thread workers and connected signals and whatnot

* commit after meet with Endurance

* revert

* shifting thread handling to `thread_manager` kinda thing

* video saving seems to work

* detect mediapie2d in thread worker

* full pipeline with work happening in qthreads and whatnot

* clean up imports and whatnot

Co-authored-by: Jon <jonmatthis@gmai.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant