Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

mavproxy_map: fix mouse-over information behaviour #1324

Merged
merged 1 commit into from
Feb 23, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions MAVProxy/modules/mavproxy_map/mp_slipmap_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -489,16 +489,23 @@ def update_position(self):
newtext += ' SRTM Downloading '
newtext += '\n'

self.update_click_position_text()
cpt = self.click_position_text()
if cpt is not None:
newtext += cpt

def update_click_position_text(self):
if newtext != self.state.oldtext:
self.position.Clear()
self.position.WriteText(newtext)
self.state.oldtext = newtext

def click_position_text(self):
if self.click_pos is None:
return
return None
if self.click_pos == self.last_click_pos:
return
return self.last_click_position_text

if self.click_pos == self.last_click_pos_used_for_text:
return
return self.last_click_position_text

terrain_height = None
terrain_height_str = "?"
Expand Down Expand Up @@ -531,13 +538,11 @@ def update_click_position_text(self):
delta = terrain_height - self.last_terrain_height
newtext += " (height %f)" % (delta, )
self.last_terrain_height = terrain_height
self.last_click_pos_used_for_text = self.click_pos

if newtext != self.state.oldtext:
self.position.Clear()
self.position.WriteText(newtext)
self.state.oldtext = newtext
self.last_click_position_text = newtext

self.last_click_pos_used_for_text = self.click_pos
return newtext

def pixel_coords(self, latlon, reverse=False):
'''return pixel coordinates in the map image for a (lat,lon)
Expand Down
Loading