From 339f346fdfd44cf93055a5227364d0a095929ed2 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Sat, 17 Mar 2018 16:34:01 -0700 Subject: [PATCH] Fixed OSURC logo, modified leftui. --- .../src/Framework/StatusSystems/StatusCore.py | 2 +- .../src/Resources/Images/osurclogo.png | Bin 13297 -> 22714 bytes .../src/Resources/Ui/left_screen.ui | 123 +++++++++++++----- 3 files changed, 95 insertions(+), 30 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 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 5aa6b92c33c81b8f6ce6fd701892da8e36e9c50b..e5ea8473336b96b856a2e217c36d0ef6af367951 100644 GIT binary patch literal 22714 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 H8wdXn<#co( 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