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

intergrate mapping overlay

Browse Source
This commit is contained in:
Chris Pham
2018-02-24 15:32:23 -08:00
parent 71408a1148
commit 1a220a0de3
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ class RoverMapCoordinator(QtCore.QThread):
self.google_maps_object = None self.google_maps_object = None
self.map_image = None self.map_image = None
self.overlay_image = None self.overlay_image = None
self.overlay_image_object = None
self.map_pixmap = None self.map_pixmap = None
@@ -71,9 +72,17 @@ class RoverMapCoordinator(QtCore.QThread):
18, 18,
'terrain', 'terrain',
None, 20) 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): def _get_map_image(self):
self.map_image = self.google_maps_object.display_image self.map_image = self.google_maps_object.display_image
self.map_image.paste(self.overlay_image_object.display_image)
# get overlay here # get overlay here
qim = ImageQt(self.map_image) qim = ImageQt(self.map_image)
self.map_pixmap = QtGui.QPixmap.fromImage(qim) self.map_pixmap = QtGui.QPixmap.fromImage(qim)