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 0e2a03f..00a339b 100644 --- a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py +++ b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py @@ -94,7 +94,7 @@ 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_pil = PIL.Image.open("Resources/Images/osurclogo.png").resize((210, 75), PIL.Image.BICUBIC) 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 diff --git a/software/ros_packages/ground_station/src/Resources/Images/osurclogo.png b/software/ros_packages/ground_station/src/Resources/Images/osurclogo.png index 5aa6b92..e5ea847 100644 Binary files a/software/ros_packages/ground_station/src/Resources/Images/osurclogo.png and b/software/ros_packages/ground_station/src/Resources/Images/osurclogo.png differ 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 20a177e..8380cda 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,29 +56,6 @@ 0 - - - - - - - 0 - 75 - - - - - - - - - - - - - - - @@ -99,7 +76,10 @@ 540 - + + + 0 + 0 @@ -112,10 +92,95 @@ 0 - - 0 - - + + + + 10 + + + QLayout::SetDefaultConstraint + + + 3 + + + 0 + + + 3 + + + + + + 0 + 0 + + + + + 0 + 75 + + + + + 16777215 + 75 + + + + + + + + + + + + 0 + 0 + + + + + 0 + 75 + + + + + 16777215 + 75 + + + + + + + + + 0 + 0 + + + + + 0 + 75 + + + + + 16777215 + 75 + + + + + + + 0 @@ -710,7 +775,7 @@ Connected - 1 + 0