From e53dda16c2e394b578d6c6b4c3331f57fc8c21e3 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Sat, 17 Mar 2018 14:50:20 -0700 Subject: [PATCH] Added osurc logo to the gui. --- .../src/Framework/StatusSystems/StatusCore.py | 8 + .../src/Resources/Ui/left_screen.ui | 599 +++++++++--------- 2 files changed, 316 insertions(+), 291 deletions(-) diff --git a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py index c1ed608..b152097 100644 --- a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py +++ b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py @@ -5,6 +5,8 @@ import rospy from rover_status.msg import * from PyQt5 import QtWidgets, QtCore, QtGui, uic from std_msgs.msg import Empty +import PIL.Image +from PIL.ImageQt import ImageQt # import Timer REQUEST_UPDATE_TOPIC = "/rover_status/update_requested" @@ -55,6 +57,7 @@ class SensorCore(QtCore.QThread): # self.ram_read = self.screen_main_window.lineEdit_2 # type: QtWidgets.QLabel # ########## set vars to gui elements + self.osurc_logo_label = self.screen_main_window.osurc_logo_label # type: QtWidgets.QLabel self.rover_conn = self.screen_main_window.rover # type: QtWidgets.QLabel self.frsky = self.screen_main_window.frsky # type: QtWidgets.QLabel self.nav_mouse = self.screen_main_window.nav_mouse # type: QtWidgets.QLabel @@ -90,6 +93,11 @@ class SensorCore(QtCore.QThread): self.update_requester = rospy.Publisher(REQUEST_UPDATE_TOPIC, Empty, queue_size=10) + # Apply OSURC Logo + self.osurc_logo_pil = PIL.Image.open("Resources/Images/osurclogo.png").resize((150, 75), PIL.Image.ANTIALIAS) + self.osurc_logo_pixmap = QtGui.QPixmap.fromImage(ImageQt(self.osurc_logo_pil)) + self.osurc_logo_label.setPixmap(self.osurc_logo_pixmap) # Init should be in main thread, should be fine + def __camera_callback(self, data): self.camera_msg.camera_zed = data.camera_zed self.camera_msg.camera_undercarriage = data.camera_undercarriage diff --git a/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui b/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui index 629acda..1589b90 100644 --- a/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui +++ b/software/ros_packages/ground_station/src/Resources/Ui/left_screen.ui @@ -56,6 +56,29 @@ 0 + + + + + + + 0 + 75 + + + + + + + + + + + + + + + @@ -97,287 +120,7 @@ 0 - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - background-color:darkred; - - - QFrame::NoFrame - - - Main Nav Camera -Connected - - - Qt::AlignCenter - - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - false - - - background-color:darkred; - - - GPS -Fix - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - false - - - background-color:darkred; - - - Right Bogie -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - background-color:darkred; - - - QFrame::NoFrame - - - Rear Bogie -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - background-color:darkred; - - - QFrame::NoFrame - - - Left Bogie -Connected - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 9999999 - 9999999 - - - - - 10 - 75 - true - - - - background-color:darkred; - - - QFrame::NoFrame - - - ZED Connected - - - Qt::AlignCenter - - - - - - - background-color: darkred; - - - <html><head/><body><p align="center"><span style=" font-weight:600;">TX2 CPU</span></p></body></html> - - - Qt::AlignCenter - - - - - - - background-color: darkred; - - - <html><head/><body><p align="center"><span style=" font-size:9pt; font-weight:600;">TX2 TEMP</span></p></body></html> - - - Qt::AlignCenter - - - - + background-color: darkred; @@ -390,7 +133,7 @@ Connected - + background-color: darkred; @@ -403,7 +146,7 @@ Connected - + @@ -448,7 +191,7 @@ Connected - + @@ -493,10 +236,7 @@ Connected - - - - + @@ -538,7 +278,7 @@ Connected - + @@ -583,7 +323,7 @@ Connected - + @@ -625,7 +365,7 @@ Connected - + @@ -667,6 +407,283 @@ Connected + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkred; + + + QFrame::NoFrame + + + Main Nav Camera +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + false + + + background-color:darkred; + + + GPS +Fix + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + false + + + background-color:darkred; + + + Right Bogie +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkred; + + + QFrame::NoFrame + + + Rear Bogie +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkred; + + + QFrame::NoFrame + + + Left Bogie +Connected + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 9999999 + 9999999 + + + + + 10 + 75 + true + + + + background-color:darkred; + + + QFrame::NoFrame + + + ZED Connected + + + Qt::AlignCenter + + + + + + + background-color: darkred; + + + <html><head/><body><p align="center"><span style=" font-weight:600;">TX2 CPU</span></p></body></html> + + + Qt::AlignCenter + + + + + + + background-color: darkred; + + + <html><head/><body><p align="center"><span style=" font-size:9pt; font-weight:600;">TX2 TEMP</span></p></body></html> + + + Qt::AlignCenter + + +