From cba5bc9b39738a42df87b09cea98ffc9599b9617 Mon Sep 17 00:00:00 2001 From: Chris Pham Date: Thu, 8 Feb 2018 14:59:56 -0800 Subject: [PATCH] Create setup_signals for Map Coords --- .../Framework/MapSystems/RoverMapCoordinator.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/software/ground_station/Framework/MapSystems/RoverMapCoordinator.py b/software/ground_station/Framework/MapSystems/RoverMapCoordinator.py index 76437bb..58cdf37 100644 --- a/software/ground_station/Framework/MapSystems/RoverMapCoordinator.py +++ b/software/ground_station/Framework/MapSystems/RoverMapCoordinator.py @@ -45,9 +45,6 @@ class RoverMapCoordinator(QtCore.QThread): self.__wait_for_map_thread() self.logger.debug("Stopping Map Coordinator Thread") - def __wait_for_map_thread(self): - self.map_thread.wait() - def _setup_map_threads(self): self.map_thread = RoverMap.GMapsStitcher(1280, 720, 44.567161, -123.278432, @@ -56,5 +53,14 @@ class RoverMapCoordinator(QtCore.QThread): def pixmap_ready_slot(self): 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): - self.run_thread_flag = False \ No newline at end of file + 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) \ No newline at end of file