[paparazzi-commits] [4793] fix color index in Curves menu

[Pascal Brisset]

Revision: 4793
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4793
Author:   hecto
Date:     2010-04-09 16:07:26 +0000 (Fri, 09 Apr 2010)
Log Message:
-----------
 fix color index in Curves menu

Modified Paths:
--------------
    paparazzi3/trunk/sw/logalizer/plot.ml

Modified: paparazzi3/trunk/sw/logalizer/plot.ml
===================================================================
--- paparazzi3/trunk/sw/logalizer/plot.ml       2010-04-08 18:33:01 UTC (rev 
4792)
+++ paparazzi3/trunk/sw/logalizer/plot.ml       2010-04-09 16:07:26 UTC (rev 
4793)
@@ -624,7 +624,7 @@
       let menu = menu_fact#add_submenu (double__ msg_name) in
       let menu_fact = new GMenu.factory menu in
       (* Build the field menus *)
-      List.iter
+      List.iter (* forall fields *)
        (fun (f, values) ->
          let callback = fun _ ->
            (* Remove the . for an array field name *)
@@ -638,7 +638,8 @@
            let values = Array.map (fun (t,v) -> (t, v*.a+.b)) values in
            let curve = plot#add_curve name values in
            let eb = GBin.event_box ~width:10 ~height:10 () in
-           eb#coerce#misc#modify_bg [`NORMAL, `RGB curve.color];
+           let (r, g, b) = curve.color in
+           eb#coerce#misc#modify_bg [`NORMAL, `RGB (256*r,256*g,256*b)];
            let item = curves_menu_fact#add_image_item ~image:eb#coerce 
~label:name () in
            
            let delete = fun () ->
@@ -840,8 +841,10 @@
   ignore (file_menu_fact#add_separator ());
   ignore (file_menu_fact#add_item "Close" ~key:GdkKeysyms._W ~callback:close);
   ignore (file_menu_fact#add_item "Quit" ~key:GdkKeysyms._Q ~callback:quit);
+
   let curves_menu = factory#add_submenu "Curves" in
   let curves_menu_fact = new GMenu.factory curves_menu in
+  tooltips#set_tip curves_menu#coerce ~text:"Delete";
 
   ignore (plotter#connect#destroy ~callback:close);