Skip to content

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

TypeScript

Jon/sesh setup screen (#244)

jonmatthis17ea61ce6884
diff --git a/src/export_stuff/blender_stuff/get_best_guess_of_blender_path.py b/src/export_stuff/blender_stuff/get_best_guess_of_blender_path.py
index 3fd1ebb3..245bba43 100644
--- a/src/export_stuff/blender_stuff/get_best_guess_of_blender_path.py
+++ b/src/export_stuff/blender_stuff/get_best_guess_of_blender_path.py
@@ -19,7 +19,9 @@ def get_best_guess_of_blender_path():
return str(blender_exe_path)
except Exception as e:
print(e)
- logger.warning("Couldn't find Blender path automatically, need to select it manually")
+ logger.warning(
+ "Couldn't find Blender path automatically, need to select it manually"
+ )
return None
diff --git a/src/gui/icis_conference_main/layout/slop_main_window.py b/src/gui/icis_conference_main/layout/slop_main_window.py
index 6fb49d51..3edcdf4e 100644
--- a/src/gui/icis_conference_main/layout/slop_main_window.py
+++ b/src/gui/icis_conference_main/layout/slop_main_window.py
@@ -150,7 +150,7 @@ class SlopMainWindow(QMainWindow):
screen = NewRecordingSession()
self._control_panel_layout.addWidget(screen)
# self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
- # screen.start_new_session_button.clicked.connect(self._show_cam_config_screen)
+ # screen.start_session_button.clicked.connect(self._show_cam_config_screen)
screen.submit.clicked.connect(self._show_cam_config_screen)
def _show_cam_config_screen(self):
diff --git a/src/gui/main/app.py b/src/gui/main/app.py
index 57a65aae..0035bd5e 100644
--- a/src/gui/main/app.py
+++ b/src/gui/main/app.py
@@ -4,7 +4,7 @@ from pyqtgraph import mkQApp
APP = None
-def get_qt_app()->QApplication:
+def get_qt_app() -> QApplication:
global APP
if APP is None:
APP = mkQApp()
diff --git a/src/gui/main/main.py b/src/gui/main/main.py
index 3f47b161..78b62d6e 100644
--- a/src/gui/main/main.py
+++ b/src/gui/main/main.py
@@ -25,12 +25,6 @@ def sigint_handler(*args):
"""Handler for the SIGINT signal."""
QApplication.quit()
-def log_gui_loop():
- global loop_count
- loop_count += 1
- if loop_count % 10 == 0:
- logger.debug("GUI loop {}".format(loop_count))
-
if __name__ == "__main__":
logger.info("Starting main...")
@@ -39,9 +33,7 @@ if __name__ == "__main__":
app.setStyleSheet(qt_app_css_style_sheet)
timer = QTimer()
timer.start(500)
- # # timer.timeout.connect(log_gui_loop) # Let the interpreter run each 500 ms.
- # timer.timeout.connect(lambda: None) # Let the interpreter run each 500 ms.
-
+ timer.timeout.connect(lambda: None) # Let the interpreter run each 500 ms.
while True:
# rebootable GUI method based on this - https://stackoverflow.com/a/56563926/14662833
diff --git a/src/gui/main/main_window/left_panel_controls/control_panel.py b/src/gui/main/main_window/left_panel_controls/control_panel.py
index e3ff3ff1..e4fc9bf0 100644
--- a/src/gui/main/main_window/left_panel_controls/control_panel.py
+++ b/src/gui/main/main_window/left_panel_controls/control_panel.py
@@ -1,26 +1,15 @@
-from typing import List
-
from PyQt6.QtWidgets import (
QFrame,
QVBoxLayout,
- QLabel,
QToolBox,
)
-from src.cameras.detection.models import FoundCamerasResponse
-from src.config.webcam_config import WebcamConfig
from src.gui.main.main_window.left_panel_controls.toolbox_widgets.calibrate_capture_volume_panel import (
CalibrateCaptureVolumePanel,
)
from src.gui.main.main_window.left_panel_controls.toolbox_widgets.camera_setup_control_panel import (
CameraSetupControlPanel,
)
-from src.gui.main.main_window.left_panel_controls.toolbox_widgets.welcome_create_or_load_new_session_panel import (
- WelcomeCreateOrLoadNewSessionPanel,
-)
-from src.gui.main.main_window.left_panel_controls.toolbox_widgets.process_session_data_panel import (
- ProcessSessionDataPanel,
-)
from src.gui.main.main_window.left_panel_controls.toolbox_widgets.record_motion_capture_videos_panel import (
RecordMotionCatpureVideosPanel,
)
@@ -28,8 +17,6 @@ from src.gui.main.main_window.left_panel_controls.toolbox_widgets.visualize_moti
VisualizeMotionCaptureDataPanel,
)
-from src.gui.main.qt_utils.clear_layout import clear_layout
-
import logging
logger = logging.getLogger(__name__)
diff --git a/src/gui/main/main_window/main_window.py b/src/gui/main/main_window/main_window.py
index 88bf0014..e72a0bc0 100644
--- a/src/gui/main/main_window/main_window.py
+++ b/src/gui/main/main_window/main_window.py
@@ -56,7 +56,6 @@ from src.sending_anonymous_user_info_to_places.send_pipedream_ping import (
# reboot GUI method based on this - https://stackoverflow.com/a/56563926/14662833
EXIT_CODE_REBOOT = -123456789
-
logger = logging.getLogger(__name__)
@@ -69,18 +68,14 @@ class MainWindow(QMainWindow):
self.setWindowTitle("freemocap \U0001F480 \U00002728")
# self._set_icon()
-
-
-
self._main_window_width = int(1920 * 0.9)
self._main_window_height = int(1080 * 0.8)
APP_STATE.main_window_height = self._main_window_height
APP_STATE.main_window_width = self._main_window_width
self.setGeometry(0, 0, self._main_window_width, self._main_window_height)
- self.setMaximumHeight(1000)
self._main_layout = self._create_main_layout()
-
+ self._main_layout.setMaximumHeight(self._main_window_height)
# left side (control) panel
self._control_panel = self._create_control_panel()
self._main_layout.addWidget(self._control_panel.frame)
@@ -123,7 +118,7 @@ class MainWindow(QMainWindow):
width = self._main_window_width * 0.2
height = self._main_window_height
- panel.frame.setMinimumHeight(height)
+ panel.frame.setMinimumHeight(height / 2)
panel.frame.setMinimumWidth(width / 2)
size_hint = panel.frame.sizeHint()
size_hint.setWidth(width)
@@ -135,7 +130,7 @@ class MainWindow(QMainWindow):
panel = MiddleViewingPanel()
width = self._main_window_width * 0.7
height = self._main_window_height
- panel.frame.setMinimumHeight(height)
+ panel.frame.setMinimumHeight(height / 2)
panel.frame.setMinimumWidth(width / 2)
size_hint = panel.frame.sizeHint()
size_hint.setWidth(width)
@@ -150,7 +145,7 @@ class MainWindow(QMainWindow):
width = self._main_window_width * 0.1
height = self._main_window_height
- panel.frame.setMinimumHeight(height)
+ # panel.frame.setMinimumHeight(height)
panel.frame.setMinimumWidth(width / 2)
size_hint = panel.frame.sizeHint()
size_hint.setWidth(width)
@@ -263,10 +258,7 @@ class MainWindow(QMainWindow):
def _connect_actions_to_slots(self):
self._new_session_action.triggered.connect(
- lambda: self._start_session(
- session_id=self._middle_viewing_panel.welcome_create_or_load_session_panel.session_id_input_string,
- new_session=True,
- )
+ self._middle_viewing_panel.welcome_create_or_load_session_panel.show_new_session_setup_view
)
self._load_most_recent_session_action.triggered.connect(
@@ -319,8 +311,11 @@ class MainWindow(QMainWindow):
logger.info("Connecting buttons to stuff")
# Welcome Panel
- self._middle_viewing_panel.welcome_create_or_load_session_panel.start_new_session_button.clicked.connect(
- self._new_session_action.trigger
+ self._middle_viewing_panel.welcome_create_or_load_session_panel.start_session_button.clicked.connect(
+ lambda: self._start_session(
+ session_id=self._middle_viewing_panel.welcome_create_or_load_session_panel.session_id_input_string,
+ new_session=True,
+ )
)
self._middle_viewing_panel.welcome_create_or_load_session_panel.load_most_recent_session_button.clicked.connect(
@@ -490,7 +485,10 @@ class MainWindow(QMainWindow):
text + ", session_id: " + self._session_id
)
- self._thread_worker_manager.launch_detect_cameras_worker()
+ if (
+ self._middle_viewing_panel.welcome_create_or_load_session_panel.auto_detect_cameras_checkbox.isChecked()
+ ):
+ self._thread_worker_manager.launch_detect_cameras_worker()
self._show_camera_control_panel_action.trigger()
@@ -501,7 +499,10 @@ class MainWindow(QMainWindow):
self._middle_viewing_panel.show_camera_streams()
- if new_session:
+ if (
+ new_session
+ and self._middle_viewing_panel.welcome_create_or_load_session_panel.auto_connect_to_cameras_checkbox.isChecked()
+ ):
self._auto_launch_camera_streams = True
def _handle_found_cameras_response(
@@ -608,7 +609,9 @@ class MainWindow(QMainWindow):
self._session_id
)
charuco_board_definition = self._get_user_specified_charuco_definition()
- logger.info(f"Launching Anipose calibration thread worker with the following parameters: {charuco_board_definition.__dict__}")
+ logger.info(
+ f"Launching Anipose calibration thread worker with the following parameters: {charuco_board_definition.__dict__}"
+ )
self._thread_worker_manager.launch_anipose_calibration_thread_worker(
charuco_board_definition=charuco_board_definition,
calibration_videos_folder_path=calibration_videos_folder_path,
diff --git a/src/gui/main/main_window/middle_panel_viewers/session_playback_view/middle_viewing_panel.py b/src/gui/main/main_window/middle_panel_viewers/session_playback_view/middle_viewing_panel.py
index f5b7f695..f201d289 100644
--- a/src/gui/main/main_window/middle_panel_viewers/session_playback_view/middle_viewing_panel.py
+++ b/src/gui/main/main_window/middle_panel_viewers/session_playback_view/middle_viewing_panel.py
@@ -7,7 +7,7 @@ from PyQt6.QtWidgets import (
QWidget,
)
-from src.gui.main.main_window.left_panel_controls.toolbox_widgets.welcome_create_or_load_new_session_panel import (
+from src.gui.main.main_window.middle_panel_viewers.welcome_view.welcome_create_or_load_new_session_panel import (
WelcomeCreateOrLoadNewSessionPanel,
)
@@ -17,10 +17,6 @@ from src.gui.main.main_window.middle_panel_viewers.camera_stream_grid_view impor
from src.gui.main.main_window.middle_panel_viewers.session_playback_view.session_playback_view import (
SessionPlaybackView,
)
-from src.gui.main.main_window.middle_panel_viewers.session_playback_view.video_playback_grid_view import (
- VideoPlaybackGridView,
-)
-from src.gui.main.visualize_session.gl_3d_view_port import Gl3dViewPort
import logging
diff --git a/src/gui/main/main_window/middle_panel_viewers/welcome_view/__init__.py b/src/gui/main/main_window/middle_panel_viewers/welcome_view/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_create_or_load_new_session_panel.py b/src/gui/main/main_window/middle_panel_viewers/welcome_view/welcome_create_or_load_new_session_panel.py
similarity index 60%
rename from src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_create_or_load_new_session_panel.py
rename to src/gui/main/main_window/middle_panel_viewers/welcome_view/welcome_create_or_load_new_session_panel.py
index 7bde6433..4a62443d 100644
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_create_or_load_new_session_panel.py
+++ b/src/gui/main/main_window/middle_panel_viewers/welcome_view/welcome_create_or_load_new_session_panel.py
@@ -12,9 +12,10 @@ from PyQt6.QtWidgets import (
)
from src.config.home_dir import create_default_session_id
+from src.gui.main.qt_utils.clear_layout import clear_layout
+from src.gui.main.qt_utils.hide_all_in_layout import hide_all_in_layout
from src.gui.main.style_stuff.css_style_sheet import recommended_next_button_style_sheet
from src.gui.main.style_stuff.styled_widgets.page_title import PageTitle
-from src.gui.main.style_stuff.styled_widgets.primary_button import PrimaryButton
logger = logging.getLogger(__name__)
@@ -32,11 +33,15 @@ class WelcomeCreateOrLoadNewSessionPanel(QWidget):
self._layout.addStretch()
- self._layout.addLayout(self._create_get_session_id_form_layout())
-
- self._start_new_session_button = QPushButton("&Start New Session (Ctrl+N)")
- self._start_new_session_button.setStyleSheet(recommended_next_button_style_sheet)
- self._layout.addWidget(self._start_new_session_button)
+ self._create_new_session_button = QPushButton("Create &New Session (Ctrl+N)")
+ self._create_new_session_button.setStyleSheet(
+ recommended_next_button_style_sheet
+ )
+ self._create_new_session_button.clicked.connect(
+ self.show_new_session_setup_view
+ )
+ self._create_new_session_button.setFocus()
+ self._layout.addWidget(self._create_new_session_button)
self._load_most_recent_session_button = QPushButton(
"Load Most &Recent Session (Ctrl+D)",
@@ -54,17 +59,38 @@ class WelcomeCreateOrLoadNewSessionPanel(QWidget):
self._import_external_videos_button.setEnabled(True)
self._layout.addWidget(self._import_external_videos_button)
- self._layout.addStretch()
-
+ send_pings_label = QLabel(
+ "(being able to show that people are using this thing will help us get funding for this project :D )"
+ )
+ send_pings_label.setWordWrap(True)
self._send_pings_checkbox = QCheckBox(
- "Send ping to devs to let us know when you make a new session because that will help us get funding for this project :D "
+ "Send ping to devs to let us know when you make a new session"
)
self._send_pings_checkbox.setChecked(True)
self._layout.addWidget(self._send_pings_checkbox)
+ self._layout.addWidget(send_pings_label)
+
+ self._layout.addStretch()
+ # show this if user selects 'new session' button
+ self._session_id_form_layout = self._create_get_session_id_form_layout()
+ self._auto_detect_cameras_checkbox = QCheckBox("Automatically detect cameras")
+ self._auto_detect_cameras_checkbox.setChecked(True)
+
+ self._auto_connect_to_cameras_checkbox = QCheckBox(
+ "Automatically connect to cameras"
+ )
+ self._auto_connect_to_cameras_checkbox.setChecked(True)
+
+ self._start_session_button = QPushButton("Start Session \U00002728")
+ self._start_session_button.setStyleSheet(recommended_next_button_style_sheet)
@property
- def start_new_session_button(self):
- return self._start_new_session_button
+ def create_new_session_button(self):
+ return self._create_new_session_button
+
+ @property
+ def start_session_button(self):
+ return self._start_session_button
@property
def load_most_recent_session_button(self):
@@ -86,6 +112,14 @@ class WelcomeCreateOrLoadNewSessionPanel(QWidget):
def session_id_input_string(self):
return self._session_input.text()
+ @property
+ def auto_detect_cameras_checkbox(self):
+ return self._auto_detect_cameras_checkbox
+
+ @property
+ def auto_connect_to_cameras_checkbox(self):
+ return self._auto_connect_to_cameras_checkbox
+
def _welcome_to_freemocap_title(self):
# TO DO - this shouldn't be part of the `camera_view_panel` - it should be its own thing that gets swapped out on session start
logger.info("Creating `welcome to freemocap` widget")
@@ -113,3 +147,15 @@ class WelcomeCreateOrLoadNewSessionPanel(QWidget):
self._session_input = self._create_session_id_input()
session_id_form_layout.addRow(QLabel("Session Id"), self._session_input)
return session_id_form_layout
+
+ def show_new_session_setup_view(self):
+ hide_all_in_layout(self._layout)
+ self._layout.addStretch()
+ self._layout.addLayout(self._session_id_form_layout)
+
+ self._layout.addWidget(self._auto_detect_cameras_checkbox)
+
+ self._layout.addWidget(self._auto_connect_to_cameras_checkbox)
+ self._layout.addWidget(self._start_session_button)
+ self._start_session_button.setFocus()
+ self._layout.addStretch()
diff --git a/src/gui/main/qt_utils/hide_all_in_layout.py b/src/gui/main/qt_utils/hide_all_in_layout.py
new file mode 100644
index 00000000..ec24a38e
--- /dev/null
+++ b/src/gui/main/qt_utils/hide_all_in_layout.py
@@ -0,0 +1,16 @@
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+def hide_all_in_layout(layout):
+ logger.debug(f"Hiding everything in layout {layout}")
+ while layout.count():
+ child = layout.takeAt(0)
+ if child.widget():
+ logger.debug(f"Hiding child widget {child.widget}")
+ child.widget().hide()
+ elif child.layout():
+ hide_all_in_layout(child.layout())
+ logger.debug(f"Hiding sub-layout {child.layout}")
+ child.layout().hide()
diff --git a/src/gui/main/style_stuff/css_style_sheet.py b/src/gui/main/style_stuff/css_style_sheet.py
index ff1e3177..5ce8e579 100644
--- a/src/gui/main/style_stuff/css_style_sheet.py
+++ b/src/gui/main/style_stuff/css_style_sheet.py
@@ -7,7 +7,7 @@ qt_app_css_style_sheet = """
QPushButton {
background-color: #2b4e50;
color: #ffffff;
- border-radius: 4px;
+ border-radius: 4px;
font-size: 13px;
}
QPushButton:hover {
@@ -16,9 +16,9 @@ qt_app_css_style_sheet = """
QPushButton:disabled {
background-color: #6d8587;
}
-
+
"""
recommended_next_button_style_sheet = """
border: 2px solid #d95157;
- """
\ No newline at end of file
+ """
diff --git a/src/gui/main/workers/cam_charuco_frame_thread_worker.py b/src/gui/main/workers/cam_charuco_frame_thread_worker.py
index f3befb14..dd330a72 100644
--- a/src/gui/main/workers/cam_charuco_frame_thread_worker.py
+++ b/src/gui/main/workers/cam_charuco_frame_thread_worker.py
@@ -103,9 +103,10 @@ class CamCharucoFrameThreadWorker(QThread):
image_to_display.shape[0],
QImage.Format.Format_RGB888,
)
- #TODO - Figure out why this is needed lol
+ # TODO - Figure out why this is needed lol
q_image = q_image.scaledToHeight(
- APP_STATE.main_window_height / 1#np.min([3,len(APP_STATE.available_cameras)])
+ APP_STATE.main_window_height
+ / 1 # np.min([3,len(APP_STATE.available_cameras)])
)
self.image_updated_signal.emit(q_image)