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

Fix QObject thread for Map Coordinator

Browse Source
This commit is contained in:
Chris Pham
2018-02-10 13:37:16 -08:00
parent c50675b301
commit bd4deb1b2a
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
software/ground_station/Framework/MapSystems/RoverMapCoordinator.py
View File

@@ -33,6 +33,10 @@ class RoverMapCoordinator(QtCore.QThread):
self.run_thread_flag = True self.run_thread_flag = True
self.setup_map_flag = True self.setup_map_flag = True
self.google_maps_object = None
self.map_image = None
self.overlay_image = None
# setup map # setup map
self._setup_map_threads() self._setup_map_threads()
@@ -40,21 +44,28 @@ class RoverMapCoordinator(QtCore.QThread):
self.logger.debug("Starting Map Coordinator Thread") self.logger.debug("Starting Map Coordinator Thread")
while self.run_thread_flag: while self.run_thread_flag:
self.msleep(10) if self.setup_map_flag:
self.__map_setup()
self.setup_map_flag = False
else:
self._get_map_image()
self.msleep(3)
self.__wait_for_map_thread()
self.logger.debug("Stopping Map Coordinator Thread") self.logger.debug("Stopping Map Coordinator Thread")
def _setup_map_threads(self): def _setup_map_threads(self):
self.map_thread = RoverMap.GMapsStitcher(1280, self.google_maps_object = RoverMap.GMapsStitcher(1280,
720, 44.567161, -123.278432, 720,
18, 'terrain', None, 20) 44.567161,
-123.278432,
18,
'terrain',
None, 20)
def pixmap_ready_slot(self): def _get_map_image(self):
self.mapping_label.setPixmap(self.map_thread.display_image) self.map_image = self.google_maps_object.display_image
# get overlay here
def __wait_for_map_thread(self): self.pixmap_ready_signal.emit()
self.map_thread.wait()
def on_kill_threads_requested_slot(self): def on_kill_threads_requested_slot(self):
self.run_thread_flag = False self.run_thread_flag = False
@@ -66,4 +77,4 @@ class RoverMapCoordinator(QtCore.QThread):
kill_signal.connect(self.on_kill_threads_requested_slot) kill_signal.connect(self.on_kill_threads_requested_slot)
def connect_signals_and_slots(self): def connect_signals_and_slots(self):
self.map_thread.image_ready_signal.connect(self.pixmap_ready_slot) self.image_ready_signal.connect(self.pixmap_ready_slot)