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

Made compass update heading and next goal with same value for now. Randomized speed. Just to show that things are working.

Browse Source
This commit is contained in:
Corwin Perren
2018-03-13 14:52:18 -07:00
parent 5dc774b135
commit f9560e17d6
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
software/ros_packages/ground_station/src/Framework/NavigationSystems/SpeedAndHeadingIndication.py
View File

@@ -8,6 +8,7 @@ import logging
from time import time from time import time
import PIL.Image import PIL.Image
from PIL.ImageQt import ImageQt from PIL.ImageQt import ImageQt
from random import random
##################################### #####################################
# Global Variables # Global Variables
@@ -23,6 +24,7 @@ ROTATION_SPEED_MODIFIER = 1
class SpeedAndHeadingIndication(QtCore.QThread): class SpeedAndHeadingIndication(QtCore.QThread):
show_compass_image__signal = QtCore.pyqtSignal() show_compass_image__signal = QtCore.pyqtSignal()
heading_text_update_ready__signal = QtCore.pyqtSignal(str) heading_text_update_ready__signal = QtCore.pyqtSignal(str)
new_speed_update_ready__signal = QtCore.pyqtSignal(str)
def __init__(self, shared_objects): def __init__(self, shared_objects):
super(SpeedAndHeadingIndication, self).__init__() super(SpeedAndHeadingIndication, self).__init__()
@@ -110,14 +112,19 @@ class SpeedAndHeadingIndication(QtCore.QThread):
new_heading = (self.current_heading - 10) % 360 new_heading = (self.current_heading - 10) % 360
self.on_heading_changed__slot(new_heading) 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) + "°") self.heading_text_update_ready__signal.emit(str(new_heading) + "°")
def on_new_compass_image_ready__slot(self): def on_new_compass_image_ready__slot(self):
self.heading_compass_label.setPixmap(self.compass_pixmap) self.heading_compass_label.setPixmap(self.compass_pixmap)
def connect_signals_and_slots(self): def connect_signals_and_slots(self):
self.show_compass_image__signal.connect(self.on_new_compass_image_ready__slot) 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.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 self.heading_compass_label.mousePressEvent = self.__on_heading_clicked__slot