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

Create setup_signals for Map Coords

Browse Source
This commit is contained in:
Chris Pham
2018-02-08 14:59:56 -08:00
parent e64c42c45f
commit cba5bc9b39
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,9 +45,6 @@ class RoverMapCoordinator(QtCore.QThread):
self.__wait_for_map_thread() self.__wait_for_map_thread()
self.logger.debug("Stopping Map Coordinator Thread") self.logger.debug("Stopping Map Coordinator Thread")
def __wait_for_map_thread(self):
self.map_thread.wait()
def _setup_map_threads(self): def _setup_map_threads(self):
self.map_thread = RoverMap.GMapsStitcher(1280, self.map_thread = RoverMap.GMapsStitcher(1280,
720, 44.567161, -123.278432, 720, 44.567161, -123.278432,
@@ -56,5 +53,14 @@ class RoverMapCoordinator(QtCore.QThread):
def pixmap_ready_slot(self): def pixmap_ready_slot(self):
self.mapping_label.setPixmap(self.map_thread.display_image) self.mapping_label.setPixmap(self.map_thread.display_image)
def __wait_for_map_thread(self):
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
def setup_signals(self, start_signal, signals_and_slots_signal,
kill_signal):
start_signal.connect(self.start)
signals_and_slots_signal(self.connect_signals_and_slots)
kill_signal.connect(self.on_kill_threads_requested_slot)