Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-30 11:37:06 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

Altitude buttons removed if "flight_altitude" is not available from the settings.

Browse Source 
Warning issued.
This commit is contained in:
Pascal Brisset
2007-08-26 14:42:39 +00:00
parent d7f83afb93
commit 868c3415e6
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ground_segment/cockpit/live.ml
+7 -6
View File
@@ -508,14 +508,15 @@ let create_ac = fun alert (geomap:G.widget) (acs_notebook:GPack.notebook) (ac_id
begin
match dl_settings_page with
Some settings_tab ->
let flight_altitude_id, _flight_altitude_label =
begin
try
settings_tab#assoc "flight_altitude"
let flight_altitude_id, _flight_altitude_label =
settings_tab#assoc "flight_altitude" in
strip#connect_shift_alt
(fun x ->dl_setting_callback flight_altitude_id (ac.target_alt+.x))
with Not_found ->
failwith "flight_altitude not setable" in
strip#connect_shift_alt
(fun x ->
dl_setting_callback flight_altitude_id (ac.target_alt +. x));
prerr_endline "Warning: Flight_altitude not setable from GCS strip (i.e. not listed in the xml settings file)"
end
| None -> ()
end
sw/ground_segment/cockpit/strip.ml
+7 -4
View File
@@ -227,9 +227,9 @@ let add config color center_ac mark =
let b = GButton.button ~label:"Mark" ~packing:hbox#add () in
ignore (b#connect#clicked ~callback:mark);
let minus5 = GButton.button ~label:"-5m" ~packing:hbox#add ()
and plus5 = GButton.button ~label:"+5m" ~packing:hbox#add ()
and plus30 = GButton.button ~label:"+30m" ~packing:hbox#add () in
let minus5 = GButton.button ~label:"-5m" ~packing:hbox#add ~show:false ()
and plus5 = GButton.button ~label:"+5m" ~packing:hbox#add ~show:false ()
and plus30 = GButton.button ~label:"+30m" ~packing:hbox#add ~show:false () in
ignore (b#connect#clicked ~callback:mark);
(* User buttons *)
@@ -244,7 +244,10 @@ let add config color center_ac mark =
method connect_shift_alt callback =
ignore (plus5#connect#clicked (fun () -> callback 5.));
ignore (plus30#connect#clicked (fun () -> callback 30.));
ignore (minus5#connect#clicked (fun () -> callback (-5.)))
ignore (minus5#connect#clicked (fun () -> callback (-5.)));
minus5#misc#show ();
plus5#misc#show ();
plus30#misc#show ();
method hide_buttons () = hbox#misc#hide (); user_hbox#misc#hide ()
method show_buttons () = hbox#misc#show (); user_hbox#misc#show ()
method connect = fun (select: unit -> unit) ->