From f9560e17d6f5a1964a3b33a86c58cd22ae2257b8 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Tue, 13 Mar 2018 14:52:18 -0700 Subject: [PATCH] Made compass update heading and next goal with same value for now. Randomized speed. Just to show that things are working. --- .../NavigationSystems/SpeedAndHeadingIndication.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/software/ros_packages/ground_station/src/Framework/NavigationSystems/SpeedAndHeadingIndication.py b/software/ros_packages/ground_station/src/Framework/NavigationSystems/SpeedAndHeadingIndication.py index f5d4d5a..f408e89 100644 --- a/software/ros_packages/ground_station/src/Framework/NavigationSystems/SpeedAndHeadingIndication.py +++ b/software/ros_packages/ground_station/src/Framework/NavigationSystems/SpeedAndHeadingIndication.py @@ -8,6 +8,7 @@ import logging from time import time import PIL.Image from PIL.ImageQt import ImageQt +from random import random ##################################### # Global Variables @@ -23,6 +24,7 @@ ROTATION_SPEED_MODIFIER = 1 class SpeedAndHeadingIndication(QtCore.QThread): show_compass_image__signal = QtCore.pyqtSignal() heading_text_update_ready__signal = QtCore.pyqtSignal(str) + new_speed_update_ready__signal = QtCore.pyqtSignal(str) def __init__(self, shared_objects): super(SpeedAndHeadingIndication, self).__init__() @@ -110,14 +112,19 @@ class SpeedAndHeadingIndication(QtCore.QThread): new_heading = (self.current_heading - 10) % 360 self.on_heading_changed__slot(new_heading) + self.new_speed_update_ready__signal.emit("%.2f" % (random() * 2.5)) self.heading_text_update_ready__signal.emit(str(new_heading) + "°") + + def on_new_compass_image_ready__slot(self): self.heading_compass_label.setPixmap(self.compass_pixmap) def connect_signals_and_slots(self): self.show_compass_image__signal.connect(self.on_new_compass_image_ready__slot) self.heading_text_update_ready__signal.connect(self.heading_text_label.setText) + self.heading_text_update_ready__signal.connect(self.next_goal_label.setText) + self.new_speed_update_ready__signal.connect(self.current_speed_label.setText) self.heading_compass_label.mousePressEvent = self.__on_heading_clicked__slot