From 744169267fa2bc73f141baa5f6a5a251a596efe3 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Sat, 17 Mar 2018 15:26:51 -0700 Subject: [PATCH 1/3] Fixed clock element name --- .../ground_station/src/Framework/StatusSystems/StatusCore.py | 2 +- .../ground_station/src/Resources/Ui/left_screen.ui | 4 ++-- 2 files changed, 3 insertions(+), 3 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 b152097..0e2a03f 100644 --- a/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py +++ b/software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py @@ -70,7 +70,7 @@ class SensorCore(QtCore.QThread): self.bogie_right = self.screen_main_window.right_bogie # type: QtWidgets.QLabel self.bogie_left = self.screen_main_window.left_bogie # type: QtWidgets.QLabel self.bogie_rear = self.screen_main_window.rear_bogie # type: QtWidgets.QLabel - self.clock = self.screen_main_window.clock # type: QtWidgets.QLCDNumber + self.clock = self.screen_main_window.clock_qlcdnumber # type: QtWidgets.QLCDNumber self.cpu = self.screen_main_window.cpu # type: QtWidgets.QLabel self.ram = self.screen_main_window.ram # type: QtWidgets.QLabel self.gpu_temp = self.screen_main_window.gpu_temp # type: QtWidgets.QLabel 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 1589b90..f332673 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 @@ -72,10 +72,10 @@ - + - + From 00f826d5e8dbf5449790ab857df42bce69788fd9 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Sat, 17 Mar 2018 15:30:31 -0700 Subject: [PATCH 2/3] Added osurclogo --- .../src/Resources/Images/osurclogo.png | Bin 0 -> 13297 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 software/ros_packages/ground_station/src/Resources/Images/osurclogo.png diff --git a/software/ros_packages/ground_station/src/Resources/Images/osurclogo.png b/software/ros_packages/ground_station/src/Resources/Images/osurclogo.png new file mode 100644 index 0000000000000000000000000000000000000000..5aa6b92c33c81b8f6ce6fd701892da8e36e9c50b GIT binary patch literal 13297 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 H8wdXn<#co( literal 0 HcmV?d00001 From df75949dd1d477e5515138f55ccfe8460bd99e78 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Sat, 17 Mar 2018 15:33:19 -0700 Subject: [PATCH 3/3] Added landmark names so things don't break --- .../ground_station/src/Resources/Ui/left_screen.ui | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 f332673..20a177e 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 @@ -1981,6 +1981,11 @@ QTableView QTableCornerButton::section{ Dist + + + Astronaut + + 32.1665 @@ -1996,6 +2001,11 @@ QTableView QTableCornerButton::section{ 2.4 KM + + + Water + + 33.1124