mirror of
https://github.com/OSURoboticsClub/Rover_2017_2018.git
synced 2025-11-09 02:31:14 +00:00
Changed file names and started initer for MapCoordinator
This commit is contained in:
@@ -8,7 +8,7 @@ import logging
|
|||||||
import rospy
|
import rospy
|
||||||
|
|
||||||
# Custom Imports
|
# Custom Imports
|
||||||
import MapHelper
|
import RoverMap
|
||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
# Global Variables
|
# Global Variables
|
||||||
@@ -23,4 +23,32 @@ class RoverMapCoordinator(QtCore.QThread):
|
|||||||
super(RoverMapCoordinator, self).init()
|
super(RoverMapCoordinator, self).init()
|
||||||
|
|
||||||
self.shared_objects = shared_objects
|
self.shared_objects = shared_objects
|
||||||
self.right_screen = self.shared_objects["screens"]["left_screen"]
|
self.right_screen = self.shared_objects["screens"]["left_screen"]
|
||||||
|
|
||||||
|
self.setings = QtCore.QSettings()
|
||||||
|
|
||||||
|
self.logger = logging.getLogger("groundstation")
|
||||||
|
|
||||||
|
self.run_thread_flag = True
|
||||||
|
self.setup_map_flag = True
|
||||||
|
|
||||||
|
# setup map
|
||||||
|
self._get_map()
|
||||||
|
self._setup_map_threads()
|
||||||
|
|
||||||
|
def run(self):
|
||||||
|
self.logger.debug("Starting Map Coordinator Thread")
|
||||||
|
|
||||||
|
while self.run_thread_flag:
|
||||||
|
self.msleep(10)
|
||||||
|
|
||||||
|
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(2000,
|
||||||
|
2000, 44.567161, -123.278432,
|
||||||
|
18, 'terrain', None, 20)
|
||||||
|
|||||||
Reference in New Issue
Block a user