From 744169267fa2bc73f141baa5f6a5a251a596efe3 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Sat, 17 Mar 2018 15:26:51 -0700 Subject: [PATCH] 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 @@ - + - +