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

Use livesteam gui as pilot gui #188

Merged
merged 15 commits into from
Jun 9, 2024
Merged

Use livesteam gui as pilot gui #188

merged 15 commits into from
Jun 9, 2024

Conversation

InvincibleRMC
Copy link
Member

Use livestream gui for pilot gui and move flood warning to operator gui. Add fun surprise to flood warning :)

Move flood warning to operator and add alarm sound :)
@InvincibleRMC
Copy link
Member Author

Oops I'm logged in as Michael

src/surface/gui/gui/pilot_app.py Show resolved Hide resolved
src/surface/gui/gui/sounds/alarm.wav Outdated Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added the IP & Heartbeat widgets to the main tab as well as the temp sensor in main
It'd be cool if they were still there

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oop

@@ -141,16 +145,27 @@ def __init__(self) -> None:
main_layout.addLayout(video_layout)
main_layout.addLayout(make_bottom_bar())

def show_on_monitor(self, monitor_id: int) -> None:
def apply_monitor_config(self, gui_id: str) -> None:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make gui_id an enum

src/surface/gui/gui/pilot_app.py Show resolved Hide resolved
TWO_MONITOR_CONFIG = {GuiType.PILOT: None, GuiType.LIVESTREAM: 1}
THREE_MONITOR_CONFIG = {GuiType.PILOT: 2, GuiType.LIVESTREAM: 1}


def make_bottom_bar() -> QHBoxLayout:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add docstring and move into PilotApp

src/surface/gui/gui/pilot_app.py Outdated Show resolved Hide resolved
def show_on_monitor(self, monitor_id: int) -> None:
self.apply_monitor_config(gui_type)

def apply_monitor_config(self, gui_type: GuiType) -> None:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add docstring

NoahMollerstuen and others added 3 commits June 9, 2024 14:45
Co-authored-by: Benjamin Poulin <90342856+benjaminwp18@users.noreply.github.com>
Copy link
Contributor

@benjaminwp18 benjaminwp18 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@NoahMollerstuen NoahMollerstuen merged commit 1d8046e into main Jun 9, 2024
1 check passed
@NoahMollerstuen NoahMollerstuen deleted the horizontal-pilot-gui branch June 9, 2024 19:18
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.

3 participants