Skip to content

Commit

Permalink
custom taskbar icons
Browse files Browse the repository at this point in the history
  • Loading branch information
ma4848 committed Nov 16, 2024
1 parent 6bd6566 commit f6dd8a5
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 1 deletion.
Binary file added src/surface/gui/gui/control.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/surface/gui/gui/controller.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/surface/gui/gui/operator_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,19 @@
from gui.widgets.temperature import TemperatureSensor
from gui.widgets.timer import InteractiveTimer

from PyQt6.QtGui import QIcon


class OperatorApp(App):
def __init__(self) -> None:
super().__init__('operator_gui_node')

self.setWindowTitle('Operator GUI - CWRUbotix ROV 2024')
icon = QIcon('control.png')

self.setWindowIcon(icon)



# Main tab
main_tab = QWidget()
Expand All @@ -42,6 +49,7 @@ def __init__(self) -> None:
right_pane.addWidget(IPWidget())
right_pane.addStretch()
right_pane.addWidget(TaskSelector())


# Add tabs to root
root_layout = QVBoxLayout()
Expand Down
13 changes: 12 additions & 1 deletion src/surface/gui/gui/pilot_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
from gui.widgets.timer import TimerDisplay
from gui.widgets.video_widget import CameraDescription, CameraType, VideoWidget

from PyQt6.QtGui import QIcon

FRONT_CAM_TOPIC = 'front_cam/image_raw'
BOTTOM_CAM_TOPIC = 'bottom_cam/image_raw'

Expand Down Expand Up @@ -42,8 +44,10 @@ class PilotApp(App):
def __init__(self) -> None:
super().__init__('pilot_gui_node')


main_layout = QVBoxLayout()
self.setLayout(main_layout)


simulation_param = self.node.declare_parameter('simulation', value=False)
gui_param = self.node.declare_parameter('gui', 'pilot')
Expand All @@ -58,7 +62,14 @@ def __init__(self) -> None:
gui_type = GuiType(gui_param.value)

if gui_type == GuiType.PILOT:
self.setWindowTitle('Pilot GUI - CWRUbotix ROV 2024')
self.setWindowTitle('HI')

icon = QIcon('control.png')

self.setWindowIcon(icon)




front_cam_description = CameraDescription(
front_cam_type, FRONT_CAM_TOPIC, 'Front Camera', 1280, 720
Expand Down

0 comments on commit f6dd8a5

Please sign in to comment.