Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-31 03:57:45 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[gcs] change GCS icon size on zoom change event

Browse Source
This commit is contained in:
Gautier Hattenberger
2014-04-14 10:44:51 +02:00
parent d97ef3a89a
commit 90a47320c1
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ground_segment/cockpit/live.ml
+16 -9
View File
@@ -1049,13 +1049,24 @@ module GCS_icon = struct
let timeout = 10000 (* ms : time before changing to outdated color *) let timeout = 10000 (* ms : time before changing to outdated color *)
let display = fun (geomap:G.widget) vs -> let display = fun (geomap:G.widget) vs ->
let lat = Pprz.float_assoc "lat" vs
and lon = Pprz.float_assoc "long" vs in
let wgs84 = LL.make_geo_deg lat lon in
let item = let item =
match !status with match !status with
None -> (* First call, create the graphical object *) None -> (* First call, create the graphical object *)
GnoCanvas.ellipse ~fill_color ~props:[`WIDTH_PIXELS 2] let item = GnoCanvas.ellipse ~fill_color ~props:[`WIDTH_PIXELS 2]
~x1: ~-.radius ~y1: ~-.radius ~x2:radius ~y2:radius ~x1: ~-.radius ~y1: ~-.radius ~x2:radius ~y2:radius
geomap#canvas#root geomap#canvas#root in
| Some (item, timeout_handle) -> (* Remove the timeouted color modification *) (* connect callback on zoom change *)
ignore(geomap#zoom_adj#connect#value_changed (fun () ->
match !status with
| None -> ()
| Some (item, _, wgs84) -> geomap#move_item ~z:geomap#current_zoom item wgs84
));
item
| Some (item, timeout_handle, _) -> (* Remove the timeouted color modification *)
Glib.Timeout.remove timeout_handle; Glib.Timeout.remove timeout_handle;
item in item in
@@ -1063,12 +1074,8 @@ module GCS_icon = struct
let change_color_if_not_updated = let change_color_if_not_updated =
Glib.Timeout.add 10000 (fun () -> item#set [`OUTLINE_COLOR outdated_color]; false) in Glib.Timeout.add 10000 (fun () -> item#set [`OUTLINE_COLOR outdated_color]; false) in
(* Store the object and the timeout to change its color *) (* Store the object, the position and the timeout to change its color *)
status := Some (item, change_color_if_not_updated); status := Some (item, change_color_if_not_updated, wgs84);
let lat = Pprz.float_assoc "lat" vs
and lon = Pprz.float_assoc "long" vs in
let wgs84 = LL.make_geo_deg lat lon in
geomap#move_item ~z:geomap#current_zoom item wgs84 geomap#move_item ~z:geomap#current_zoom item wgs84
end (* module GCS_icon *) end (* module GCS_icon *)