|
14 | 14 | from MAVProxy.modules.lib import mp_module |
15 | 15 | from MAVProxy.modules.lib.mp_menu import * |
16 | 16 | from pymavlink import mavutil |
| 17 | +from PIL import ImageColor |
17 | 18 |
|
18 | 19 | class MapModule(mp_module.MPModule): |
19 | 20 | def __init__(self, mpstate): |
@@ -63,8 +64,9 @@ def __init__(self, mpstate): |
63 | 64 | ('circle_linewidth', int, 1), |
64 | 65 | ('showdirection', bool, False), |
65 | 66 | ('setpos_accuracy', float, 50), |
| 67 | + ('mission_color', str, "white"), |
66 | 68 | ('font_size', float, 0.5) ]) |
67 | | - |
| 69 | + |
68 | 70 | service='MicrosoftHyb' |
69 | 71 | if 'MAP_SERVICE' in os.environ: |
70 | 72 | service = os.environ['MAP_SERVICE'] |
@@ -427,7 +429,7 @@ def display_waypoints(self): |
427 | 429 | if len(p) > 1: |
428 | 430 | popup = MPMenuSubMenu('Popup', items) |
429 | 431 | self.map.add_object(mp_slipmap.SlipPolygon('mission %u' % i, p, |
430 | | - layer='Mission', linewidth=2, colour=(255,255,255), |
| 432 | + layer='Mission', linewidth=2, colour=ImageColor.getrgb(self.map_settings.mission_color), |
431 | 433 | arrow = self.map_settings.showdirection, popup_menu=popup)) |
432 | 434 | labeled_wps = {} |
433 | 435 | self.map.add_object(mp_slipmap.SlipClearLayer('LoiterCircles')) |
|
0 commit comments