[paparazzi-commits] [4824] remove dead code

[Pascal Brisset]

Revision: 4824
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4824
Author:   hecto
Date:     2010-04-20 11:18:30 +0000 (Tue, 20 Apr 2010)
Log Message:
-----------
 remove dead code

Modified Paths:
--------------
    paparazzi3/trunk/sw/ground_segment/cockpit/live.ml
    paparazzi3/trunk/sw/ground_segment/cockpit/live.mli
    paparazzi3/trunk/sw/lib/ocaml/mapWaypoints.ml
    paparazzi3/trunk/sw/lib/ocaml/mapWaypoints.mli

Modified: paparazzi3/trunk/sw/ground_segment/cockpit/live.ml
===================================================================
--- paparazzi3/trunk/sw/ground_segment/cockpit/live.ml  2010-04-20 11:08:01 UTC 
(rev 4823)
+++ paparazzi3/trunk/sw/ground_segment/cockpit/live.ml  2010-04-20 11:18:30 UTC 
(rev 4824)
@@ -1021,7 +1021,7 @@
       end else if agl > 25. then
        ac.ground_prox <- false;
       try
-       draw_altgraph alt_graph geomap aircrafts;
+       draw_altgraph alt_graph geomap aircrafts
       with _ -> ()
 
   in
@@ -1178,7 +1178,7 @@
 
     try
       let w = ac.fp_group#get_wp wp_id in
-      w#set ~if_not_moved:true ~altitude ~update:true geo
+      w#set ~altitude ~update:true geo
     with
       Not_found -> () (* Silently ignore unknown waypoints *)
   in

Modified: paparazzi3/trunk/sw/ground_segment/cockpit/live.mli
===================================================================
--- paparazzi3/trunk/sw/ground_segment/cockpit/live.mli 2010-04-20 11:08:01 UTC 
(rev 4823)
+++ paparazzi3/trunk/sw/ground_segment/cockpit/live.mli 2010-04-20 11:18:30 UTC 
(rev 4824)
@@ -71,7 +71,7 @@
 (** Default length for A/C tracks on the 2D view *)
 
 val listen_acs_and_msgs : MapCanvas.widget -> GPack.notebook -> Pages.alert -> 
bool -> Gtk_tools.pixmap_in_drawin_area -> unit
-(** [listen_acs_and_msgs geomap aircraft_notebook alert_page 
auto_center_new_ac] *)
+(** [listen_acs_and_msgs geomap aircraft_notebook alert_page 
auto_center_new_ac alt_graph] *)
 
 val jump_to_block : string -> int -> unit
 (** [jump_to_block ac_id block_id] Sends a JUMP_TO_BLOCK message *)

Modified: paparazzi3/trunk/sw/lib/ocaml/mapWaypoints.ml
===================================================================
--- paparazzi3/trunk/sw/lib/ocaml/mapWaypoints.ml       2010-04-20 11:08:01 UTC 
(rev 4823)
+++ paparazzi3/trunk/sw/lib/ocaml/mapWaypoints.ml       2010-04-20 11:18:30 UTC 
(rev 4824)
@@ -29,7 +29,6 @@
 open LL
 
 let s = 6.
-let losange = [|s;0.; 0.;s; -.s;0.; 0.;-.s|]
 
 class group = fun ?(color="red") ?(editable=true) ?(show_moved=false) 
(geomap:MapCanvas.widget) ->
   let g = GnoCanvas.group geomap#canvas#root in
@@ -259,7 +258,7 @@
     method deleted = deleted
     method item = item
     method pos = geomap#of_world self#xy
-    method set ?(if_not_moved = false) ?altitude ?(update=false) wgs84 = 
+    method set ?altitude ?(update=false) wgs84 = 
       let (xw, yw) = geomap#world_of wgs84
       and (xw0, yw0) = self#xy
       and z = geomap#zoom_adj#value in
@@ -278,7 +277,7 @@
          alt <- alt+.dz;
          if update then updated ()
       | (None, false) | (Some _, true) -> ()
-      | Some x, false -> self#reset_moved ()
+      | Some _, false -> self#reset_moved ()
     method delete () =
       deleted <- true; (* BOF *)
       wpt_group#destroy ()

Modified: paparazzi3/trunk/sw/lib/ocaml/mapWaypoints.mli
===================================================================
--- paparazzi3/trunk/sw/lib/ocaml/mapWaypoints.mli      2010-04-20 11:08:01 UTC 
(rev 4823)
+++ paparazzi3/trunk/sw/lib/ocaml/mapWaypoints.mli      2010-04-20 11:18:30 UTC 
(rev 4824)
@@ -53,7 +53,7 @@
     method label : GnoCanvas.text
     method move : float -> float -> unit
     method name : string
-    method set : ?if_not_moved:bool -> ?altitude:float -> ?update:bool -> 
Latlong.geographic -> unit
+    method set : ?altitude:float -> ?update:bool -> Latlong.geographic -> unit
     method set_name : string -> unit
     method xy : float * float
     method zoom : float -> unit