caperren/osurc_mars_rover_2017_2018
1
0
Fork 0
mirror of https://github.com/OSURoboticsClub/Rover_2017_2018.git synced 2025-11-08 10:11:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Created square indicator for ez of rotation

Browse Source
This commit is contained in:
Chris Pham
2018-03-15 09:44:49 -07:00
parent eaaaf6f7f9
commit fdffd0d3e4
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
software/ros_packages/ground_station/src/Framework/MapSystems/RoverMap.py
View File

@@ -406,26 +406,27 @@ class OverlayImage(object):
return int(x), int(y) return int(x), int(y)
def update_new_location(self, latitude, longitude, compass): def update_new_location(self, latitude, longitude, compass):
self._draw_rover(latitude, longitude, 10, compass) self._draw_rover(latitude, longitude, compass)
self.update() self.update()
return self.display_image return self.display_image
def generate_dot_and_hat(self): def generate_dot_and_hat(self):
self.indicator = self.helper.new_image(25, 50, True) self.indicator = self.helper.new_image(100, 100, True)
draw = PIL.ImageDraw.Draw(self.indicator) draw = PIL.ImageDraw.Draw(self.indicator)
draw.ellipse((0, 25, 25, 50), fill="red") draw.ellipse((50-12, 50-12, 50+12, 50+12), fill="red")
draw.line((0, 24, 13, 1), fill="red", width=5) draw.line((25, 40, 50, 12), fill="red", width=7)
draw.line((13, 1, 24, 24), fill="red", width=5) draw.line((50, 12, 75, 40), fill="red", width=7)
def _draw_rover(self, lat, lon, size, scaler): def _draw_rover(self, lat, lon, angle=0):
x, y = self._get_cartesian(lat, lon) x, y = self._get_cartesian(lat, lon)
# Center of the circle on the indicator is (12.5, 37.5) # Center of the circle on the indicator is (12.5, 37.5)
x = x - 12 x = x - 50
y = y - 37 y = y - 50
rotated = self.indicator.copy()
rotated = rotated.rotate(angle, expand=True)
self.display_image.paste(self.indicator, (x, y)) self.display_image.paste(self.indicator, (x, y))
# self.display_image.save("Something.png")
self.display_image.save("Something.png")
def update(self): def update(self):
self.display_image.paste(self.big_image, (-self.left_x, -self.upper_y)) self.display_image.paste(self.big_image, (-self.left_x, -self.upper_y))