caperren/osurc_mars_rover_2017_2018
1
0
Fork 0
mirror of https://github.com/OSURoboticsClub/Rover_2017_2018.git synced 2025-11-08 10:11:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix flicker bug -start

Browse Source
This commit is contained in:
Corwin Perren
2018-03-13 19:20:08 -07:00
parent 7737c42a15
commit 3a1089973d
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
software/ros_packages/ground_station/src/Framework/StatusSystems/StatusCore.py
View File

@@ -17,6 +17,9 @@ MISC_TOPIC_NAME = "/rover_status/misc_status"
class SensorCore(QtCore.QThread): class SensorCore(QtCore.QThread):
jetson_cpu_update_ready__signal = QtCore.pyqtSignal(str)
jetson_cpu_stylesheet_change_ready__signal = QtCore.pyqtSignal(str)
def __init__(self, shared_objects): def __init__(self, shared_objects):
super(SensorCore, self).__init__() super(SensorCore, self).__init__()
@@ -120,25 +123,30 @@ class SensorCore(QtCore.QThread):
self.jetson_msg.jetson_CPU = data.jetson_CPU self.jetson_msg.jetson_CPU = data.jetson_CPU
# self.cpu_read.setText(str(self.jetson_msg.jetson_CPU)) # self.cpu_read.setText(str(self.jetson_msg.jetson_CPU))
self.cpu.setText(str(self.jetson_msg.jetson_CPU)) # self.cpu.setText(str(self.jetson_msg.jetson_CPU))
self.jetson_cpu_update_ready__signal.emit(str(self.jetson_msg.jetson_CPU))
if self.jetson_msg.jetson_CPU > 79: if self.jetson_msg.jetson_CPU > 79:
self.cpu.setStyleSheet("background-color: orange;") self.jetson_cpu_stylesheet_change_ready__signal.emit("background-color: orange;")
# self.cpu.setStyleSheet("background-color: orange;")
elif self.jetson_msg.jetson_CPU > 89: elif self.jetson_msg.jetson_CPU > 89:
self.cpu.setStyleSheet("background-color: red;") self.jetson_cpu_stylesheet_change_ready__signal.emit("background-color: red;")
# self.cpu.setStyleSheet("background-color: red;")
else: else:
self.cpu.setStyleSheet("background-color: darkgreen;") self.jetson_cpu_stylesheet_change_ready__signal.emit("background-color: darkgreen;")
# self.cpu.setStyleSheet("background-color: darkgreen;")
self.jetson_msg.jetson_RAM = data.jetson_RAM # self.jetson_msg.jetson_RAM = data.jetson_RAM
self.ram.setText(str(self.jetson_msg.jetson_RAM)) # self.ram.setText(str(self.jetson_msg.jetson_RAM))
if self.jetson_msg.jetson_RAM > 79: # if self.jetson_msg.jetson_RAM > 79:
self.ram.setStyleSheet("background-color: orange;") # self.ram.setStyleSheet("background-color: orange;")
elif self.jetson_msg.jetson_RAM > 89: # elif self.jetson_msg.jetson_RAM > 89:
self.ram.setStyleSheet("background-color: red;") # self.ram.setStyleSheet("background-color: red;")
else: # else:
self.ram.setStyleSheet("background-color: darkgreen;") # self.ram.setStyleSheet("background-color: darkgreen;")
#
self.jetson_msg.jetson_EMMC = data.jetson_EMMC # self.jetson_msg.jetson_EMMC = data.jetson_EMMC
self.jetson_msg.jetson_NVME_SSD = data.jetson_NVME_SSD # self.jetson_msg.jetson_NVME_SSD = data.jetson_NVME_SSD
#rospy.loginfo(self.jetson_msg) #rospy.loginfo(self.jetson_msg)
def __gps_callback(self, data): def __gps_callback(self, data):
@@ -167,7 +175,8 @@ class SensorCore(QtCore.QThread):
self.msleep(100) self.msleep(100)
def connect_signals_and_slots(self): def connect_signals_and_slots(self):
pass self.jetson_cpu_update_ready__signal.connect(self.cpu.setText)
self.jetson_cpu_stylesheet_change_ready__signal.connect(self.cpu.setStyleSheet)
def setup_signals(self, start_signal, signals_and_slots_signal, kill_signal): def setup_signals(self, start_signal, signals_and_slots_signal, kill_signal):
start_signal.connect(self.start) start_signal.connect(self.start)