From 1a220a0de3e9f27aac1116361904acc1aa9169a6 Mon Sep 17 00:00:00 2001 From: Chris Pham Date: Sat, 24 Feb 2018 15:32:23 -0800 Subject: [PATCH] intergrate mapping overlay --- .../Framework/MapSystems/RoverMapCoordinator.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/software/ground_station/Framework/MapSystems/RoverMapCoordinator.py b/software/ground_station/Framework/MapSystems/RoverMapCoordinator.py index e2686a8..bcb7a53 100644 --- a/software/ground_station/Framework/MapSystems/RoverMapCoordinator.py +++ b/software/ground_station/Framework/MapSystems/RoverMapCoordinator.py @@ -38,6 +38,7 @@ class RoverMapCoordinator(QtCore.QThread): self.google_maps_object = None self.map_image = None self.overlay_image = None + self.overlay_image_object = None self.map_pixmap = None @@ -71,9 +72,17 @@ class RoverMapCoordinator(QtCore.QThread): 18, 'terrain', None, 20) + self.overlay_image_object = ( + RoverMap.OverlayImage(44.567161, -123.278432, + self.google_maps_object.northwest, + self.google_maps_object.southeast, + self.google_maps_object.big_image[0], + self.google_maps_object.big_image[1], + 1280, 720)) def _get_map_image(self): self.map_image = self.google_maps_object.display_image + self.map_image.paste(self.overlay_image_object.display_image) # get overlay here qim = ImageQt(self.map_image) self.map_pixmap = QtGui.QPixmap.fromImage(qim)