Skip to content

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

TypeScript

Trent/tab reorg (#355)

trentwirth160610b9a708
diff --git a/freemocap/gui/qt/actions_and_menus/actions.py b/freemocap/gui/qt/actions_and_menus/actions.py
index 9381318f..fdad2781 100644
--- a/freemocap/gui/qt/actions_and_menus/actions.py
+++ b/freemocap/gui/qt/actions_and_menus/actions.py
@@ -3,7 +3,7 @@ from PyQt6.QtGui import QAction
CREATE_NEW_RECORDING_ACTION_NAME = "New Recording"
LOAD_MOST_RECENT_RECORDING_ACTION_NAME = "Load Most Recent Recording"
-LOAD_EXISTING_RECORDING_ACTION_NAME = "Load Existing Recording"
+LOAD_RECORDING_ACTION_NAME = "Load Recording"
IMPORT_VIDEOS_ACTION_NAME = "Import Videos"
KILL_THREADS_AND_PROCESSES_ACTION_NAME = "Kill Threads and Processes"
REBOOT_GUI_ACTION_NAME = "Reboot GUI"
@@ -25,7 +25,7 @@ class Actions:
freemocap_main_window.handle_load_most_recent_recording
)
- self.load_existing_recording_action = QAction(LOAD_EXISTING_RECORDING_ACTION_NAME, parent=freemocap_main_window)
+ self.load_existing_recording_action = QAction(LOAD_RECORDING_ACTION_NAME, parent=freemocap_main_window)
self.load_existing_recording_action.setShortcut("Ctrl+O")
self.load_existing_recording_action.triggered.connect(freemocap_main_window.open_load_existing_recording_dialog)
diff --git a/freemocap/gui/qt/main_window/freemocap_main_window.py b/freemocap/gui/qt/main_window/freemocap_main_window.py
index 6c285090..31308641 100644
--- a/freemocap/gui/qt/main_window/freemocap_main_window.py
+++ b/freemocap/gui/qt/main_window/freemocap_main_window.py
@@ -10,7 +10,7 @@ from PyQt6.QtWidgets import (
QDockWidget,
QMainWindow,
QFileDialog,
- QTabWidget, )
+ QTabWidget, QWidget, QHBoxLayout, )
from skelly_viewer import SkellyViewer
from skellycam import (
SkellyCamParameterTreeWidget,
@@ -46,8 +46,8 @@ from freemocap.gui.qt.widgets.control_panel.visualization_control_panel import V
from freemocap.gui.qt.widgets.directory_view_widget import DirectoryViewWidget
from freemocap.gui.qt.widgets.import_videos_window import ImportVideosWizard
from freemocap.gui.qt.widgets.log_view_widget import LogViewWidget
-from freemocap.gui.qt.widgets.welcome_panel_widget import (
- WelcomeToFreemocapPanel,
+from freemocap.gui.qt.widgets.home_widget import (
+ HomeWidget,
)
from freemocap.parameter_info_models.recording_info_model import (
RecordingInfoModel,
@@ -90,6 +90,11 @@ class FreemocapMainWindow(QMainWindow):
self.setWindowIcon(QIcon(PATH_TO_FREEMOCAP_LOGO_SVG))
self.setWindowTitle("freemocap \U0001F480 \U00002728")
+ dummy_widget = QWidget()
+ self._layout = QHBoxLayout()
+ dummy_widget.setLayout(self._layout)
+ self.setCentralWidget(dummy_widget)
+
self._css_file_watcher = self._set_up_stylesheet()
self._freemocap_data_folder_path = freemocap_data_folder_path
@@ -120,16 +125,16 @@ class FreemocapMainWindow(QMainWindow):
self._tools_dock_widget = self._create_tools_dock_widget()
self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self._tools_dock_widget)
- self._tools_dock_tab_widget = QTabWidget(self)
- self._tools_dock_widget.setWidget(self._tools_dock_tab_widget)
-
- self._control_panel_dock_widget = self._create_control_panel_widget()
- self._tools_dock_tab_widget.addTab(self._control_panel_dock_widget, f"Control Panel")
-
- self._tools_dock_tab_widget.addTab(self._directory_view_widget, f"Directory View")
- self._tools_dock_tab_widget.addTab(
- self._active_recording_info_widget, f"Active Recording Info"
- )
+ # self._tools_dock_tab_widget = QTabWidget(self)
+
+ self._control_panel_widget = self._create_control_panel_widget()
+ self._tools_dock_widget.setWidget(self._control_panel_widget)
+ # self._tools_dock_tab_widget.addTab(self._control_panel_widget, f"Control Panel")
+ #
+ # self._tools_dock_tab_widget.addTab(self._directory_view_widget, f"Directory View")
+ # self._tools_dock_tab_widget.addTab(
+ # self._active_recording_info_widget, f"Active Recording Info"
+ # )
# self.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self._directory_view_dock_widget)
@@ -144,9 +149,12 @@ class FreemocapMainWindow(QMainWindow):
log_view_dock_widget = QDockWidget("Log View", self)
self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, log_view_dock_widget)
log_view_dock_widget.setWidget(self._log_view_widget)
+ log_view_dock_widget.setFeatures(
+ QDockWidget.DockWidgetFeature.DockWidgetMovable | QDockWidget.DockWidgetFeature.DockWidgetFloatable
+ )
def _create_tools_dock_widget(self):
- tools_dock_widget = QDockWidget("Tools and Info", self)
+ tools_dock_widget = QDockWidget("Control Panel", self)
tools_dock_widget.setAllowedAreas(Qt.DockWidgetArea.LeftDockWidgetArea | Qt.DockWidgetArea.RightDockWidgetArea)
tools_dock_widget.setFeatures(
QDockWidget.DockWidgetFeature.DockWidgetMovable | QDockWidget.DockWidgetFeature.DockWidgetFloatable
@@ -206,7 +214,7 @@ class FreemocapMainWindow(QMainWindow):
def _create_central_tab_widget(self):
- self._welcome_to_freemocap_widget = WelcomeToFreemocapPanel(actions=self._actions, parent=self)
+ self._home_widget = HomeWidget(actions=self._actions, parent=self)
self._skellycam_widget = SkellyCamWidget(
self._create_new_synchronized_videos_folder,
@@ -231,8 +239,10 @@ class FreemocapMainWindow(QMainWindow):
parent=self,
skelly_cam_widget=self._skellycam_widget,
camera_controller_widget=self._controller_group_box,
- welcome_to_freemocap_widget=self._welcome_to_freemocap_widget,
+ welcome_to_freemocap_widget=self._home_widget,
skelly_viewer_widget=self._skelly_viewer_widget,
+ directory_view_widget=self._directory_view_widget,
+ active_recording_info_widget=self._active_recording_info_widget
)
center_tab_widget.set_welcome_tab_enabled(True)
@@ -397,7 +407,7 @@ class FreemocapMainWindow(QMainWindow):
self._active_recording_info_widget.set_active_recording(recording_folder_path=get_most_recent_recording_path())
self._central_tab_widget.setCurrentIndex(2)
- self._control_panel_dock_widget.tab_widget.setCurrentWidget(self._process_motion_capture_data_panel)
+ self._control_panel_widget.tab_widget.setCurrentWidget(self._process_motion_capture_data_panel)
def open_load_existing_recording_dialog(self):
# from this tutorial - https://www.youtube.com/watch?v=gg5TepTc2Jg&t=649s
@@ -411,10 +421,10 @@ class FreemocapMainWindow(QMainWindow):
logger.info("User cancelled `Load Existing Recording` dialog")
return
- user_selected_directory = user_selected_directory[0]
logger.info(f"User selected recording path:{user_selected_directory}")
self._active_recording_info_widget.set_active_recording(recording_folder_path=user_selected_directory)
+ self._central_tab_widget.setCurrentIndex(2)
def open_import_videos_dialog(self):
# from this tutorial - https://www.youtube.com/watch?v=gg5TepTc2Jg&t=649s
diff --git a/freemocap/gui/qt/widgets/central_tab_widget.py b/freemocap/gui/qt/widgets/central_tab_widget.py
index ed04d2d7..85ef68b4 100644
--- a/freemocap/gui/qt/widgets/central_tab_widget.py
+++ b/freemocap/gui/qt/widgets/central_tab_widget.py
@@ -5,8 +5,8 @@ from PyQt6.QtWidgets import QTabWidget, QVBoxLayout, QWidget
# from skelly_viewer import SkellyViewer
from skellycam import SkellyCamWidget
-from freemocap.gui.qt.widgets.welcome_panel_widget import (
- WelcomeToFreemocapPanel,
+from freemocap.gui.qt.widgets.home_widget import (
+ HomeWidget,
)
from freemocap.system.paths_and_files_names import CAMERA_WITH_FLASH_EMOJI_STRING, EYES_EMOJI_STRING
@@ -18,8 +18,10 @@ class CentralTabWidget(QTabWidget):
self,
skelly_cam_widget: SkellyCamWidget,
camera_controller_widget: QWidget,
- welcome_to_freemocap_widget: WelcomeToFreemocapPanel,
+ welcome_to_freemocap_widget: HomeWidget,
skelly_viewer_widget: QWidget,
+ directory_view_widget: QWidget,
+ active_recording_info_widget: QWidget,
parent=None,
):
super().__init__(parent=parent)
@@ -31,10 +33,14 @@ class CentralTabWidget(QTabWidget):
self._camera_controller_widget = camera_controller_widget
self._welcome_to_freemocap_widget = welcome_to_freemocap_widget
self._skelly_viewer_widget = skelly_viewer_widget
+ self._directory_view_widget = directory_view_widget
+ self._active_recording_info_widget = active_recording_info_widget
self._create_welcome_tab(self)
self._create_skellycam_view_tab(self)
self._create_skelly_viewer_tab(self)
+ self._create_directory_view_tab(self)
+ self._create_active_recording_info_tab(self)
def set_welcome_tab_enabled(self, enabled: bool):
self.setTabEnabled(0, enabled)
@@ -55,7 +61,7 @@ class CentralTabWidget(QTabWidget):
self._camera_view_layout = QVBoxLayout()
self._camera_view_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
dummy_widget.setLayout(self._camera_view_layout)
- tab_widget.addTab(dummy_widget, f"Skelly Cam")
+ tab_widget.addTab(dummy_widget, f"Cameras")
# tab_widget.setToolTip(skellycam.__repo_url__)
# self._qt_multi_camera_viewer_widget.resize(1280, 720)
@@ -65,5 +71,14 @@ class CentralTabWidget(QTabWidget):
def _create_skelly_viewer_tab(self, tab_widget: QTabWidget):
logger.info("Creating export_data tab")
- tab_widget.addTab(self._skelly_viewer_widget, f"Skelly Viewer")
+ tab_widget.addTab(self._skelly_viewer_widget, f"Data Viewer")
# tab_widget.setToolTip(skelly_viewer.__repo_url__)
+
+ def _create_directory_view_tab(self, tab_widget: QTabWidget):
+ logger.info("Creating directory view tab")
+ tab_widget.addTab(self._directory_view_widget, f"Directory View")
+
+ def _create_active_recording_info_tab(self, tab_widget: QTabWidget):
+ logger.info("Creating active recording info tab")
+ tab_widget.addTab(self._active_recording_info_widget, f"Active Recording Info")
+
diff --git a/freemocap/gui/qt/widgets/welcome_panel_widget.py b/freemocap/gui/qt/widgets/home_widget.py
similarity index 90%
rename from freemocap/gui/qt/widgets/welcome_panel_widget.py
rename to freemocap/gui/qt/widgets/home_widget.py
index 9516cdae..8fb258aa 100644
--- a/freemocap/gui/qt/widgets/welcome_panel_widget.py
+++ b/freemocap/gui/qt/widgets/home_widget.py
@@ -13,7 +13,7 @@ from PyQt6.QtWidgets import (
from freemocap.gui.qt.actions_and_menus.actions import (
CREATE_NEW_RECORDING_ACTION_NAME,
LOAD_MOST_RECENT_RECORDING_ACTION_NAME,
- LOAD_EXISTING_RECORDING_ACTION_NAME,
+ LOAD_RECORDING_ACTION_NAME,
IMPORT_VIDEOS_ACTION_NAME,
Actions,
)
@@ -29,7 +29,7 @@ class WelcomeScreenButton(QPushButton):
self.setFixedWidth(400)
-class WelcomeToFreemocapPanel(QWidget):
+class HomeWidget(QWidget):
def __init__(self, actions: Actions, parent: QWidget = None):
super().__init__(parent=parent)
@@ -59,9 +59,9 @@ class WelcomeToFreemocapPanel(QWidget):
# self._load_most_recent_session_button.clicked.connect(actions.load_most_recent_recording_action.trigger)
# self._layout.addWidget(self._load_most_recent_session_button, alignment=Qt.AlignmentFlag.AlignCenter)
#
- # self._load_existing_session_button = WelcomeScreenButton(f"{LOAD_EXISTING_RECORDING_ACTION_NAME}")
- # self._load_existing_session_button.clicked.connect(actions.load_most_recent_recording_action.trigger)
- # self._layout.addWidget(self._load_existing_session_button, alignment=Qt.AlignmentFlag.AlignCenter)
+ self._load_existing_session_button = WelcomeScreenButton(f"{LOAD_RECORDING_ACTION_NAME}")
+ self._load_existing_session_button.clicked.connect(actions.load_existing_recording_action.trigger)
+ self._layout.addWidget(self._load_existing_session_button, alignment=Qt.AlignmentFlag.AlignCenter)
self._import_videos_button = WelcomeScreenButton(f"{IMPORT_VIDEOS_ACTION_NAME}")
self._import_videos_button.clicked.connect(actions.import_videos_action.trigger)