Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12313] trunk
|
From: <hez...@us...> - 2013-05-01 01:12:25
|
Revision: 12313
http://sourceforge.net/p/plplot/code/12313
Author: hezekiahcarty
Date: 2013-05-01 01:12:18 +0000 (Wed, 01 May 2013)
Log Message:
-----------
Propagate floating point line width API changes to the OCaml bindings
Clean output comparison vs C on my system except for the colorbar
additions to example 16 which have not been added to the OCaml version yet.
Modified Paths:
--------------
trunk/bindings/ocaml/plplot.ml
trunk/bindings/ocaml/plplot.mli
trunk/bindings/ocaml/plplot_core.idl
trunk/bindings/ocaml/plplot_h
trunk/bindings/ocaml/plplot_impl.c
trunk/examples/ocaml/x04.ml
trunk/examples/ocaml/x15.ml
trunk/examples/ocaml/x16.ml
trunk/examples/ocaml/x21.ml
trunk/examples/ocaml/x26.ml
trunk/examples/ocaml/x33.ml
Modified: trunk/bindings/ocaml/plplot.ml
===================================================================
--- trunk/bindings/ocaml/plplot.ml 2013-05-01 01:11:41 UTC (rev 12312)
+++ trunk/bindings/ocaml/plplot.ml 2013-05-01 01:12:18 UTC (rev 12313)
@@ -187,7 +187,7 @@
(string option * color_t * float array * float array * string * float)
| Polygon of (color_t * float array * float array * bool)
| Shades of (
- int * color_t * int * bool * float * float * float * float * float array
+ float * color_t * float * bool * float * float * float * float * float array
array * float array
)
| Text of (color_t * string * float * float * float * float * float)
@@ -550,10 +550,10 @@
let shades ?fill_width ?contour ?(rect = true)
(x0, y0) (x1, y1) contours data =
let cont_color, cont_width =
- contour |? (Index_color 0, 0)
+ contour |? (Index_color 0, 0.0)
in
Shades (
- fill_width |? 1, cont_color, cont_width, rect, x0, y0, x1, y1,
+ fill_width |? 1.0, cont_color, cont_width, rect, x0, y0, x1, y1,
data, contours
)
@@ -625,8 +625,8 @@
type legend_entry_t =
| No_legend (** An empty entry *)
- | Box_legend of (int * int * float * int * int * string)
- | Line_legend of (int * int * int * int * string)
+ | Box_legend of (int * int * float * float * int * string)
+ | Line_legend of (int * int * float * int * string)
| Symbol_legend of (int * float * int * string * int * string)
let opt_of_entry = function
@@ -641,13 +641,13 @@
let no_legend = No_legend
- let box_legend ?(pattern = 0) ?(scale = 1.0) ?(line_width = 1)
+ let box_legend ?(pattern = 0) ?(scale = 1.0) ?(line_width = 1.0)
?(label_color = Black) ~label color =
let label_color = int_of_color label_color in
let color = int_of_color color in
Box_legend (color, pattern, scale, line_width, label_color, label)
- let line_legend ?(style = 1) ?(width = 1) ?(label_color = Black) ~label color =
+ let line_legend ?(style = 1) ?(width = 1.0) ?(label_color = Black) ~label color =
let label_color = int_of_color label_color in
let color = int_of_color color in
Line_legend (color, style, width, label_color, label)
@@ -787,10 +787,10 @@
let box_colors = Array.make n_entries 0 in
let box_patterns = Array.make n_entries 0 in
let box_scales = Array.make n_entries 0.0 in
- let box_line_widths = Array.make n_entries 0 in
+ let box_line_widths = Array.make n_entries 0.0 in
let line_colors = Array.make n_entries 0 in
let line_styles = Array.make n_entries 0 in
- let line_widths = Array.make n_entries 0 in
+ let line_widths = Array.make n_entries 0.0 in
let symbol_colors = Array.make n_entries 0 in
let symbol_scales = Array.make n_entries 0.0 in
let symbol_numbers = Array.make n_entries 0 in
@@ -882,7 +882,7 @@
(* Contours *)
let cont_color, cont_width =
match contour with
- | None -> 0, 0
+ | None -> 0, 0.0
| Some (col, wid) -> int_of_color col, wid
in
(* Orientation *)
Modified: trunk/bindings/ocaml/plplot.mli
===================================================================
--- trunk/bindings/ocaml/plplot.mli 2013-05-01 01:11:41 UTC (rev 12312)
+++ trunk/bindings/ocaml/plplot.mli 2013-05-01 01:12:18 UTC (rev 12313)
@@ -319,8 +319,8 @@
(** [shades ?fill_width ?contour ?rect (x0, y0) (x1, y1) contours data] *)
val shades :
- ?fill_width:int ->
- ?contour:color_t * int ->
+ ?fill_width:float ->
+ ?contour:color_t * float ->
?rect:bool ->
float * float -> float * float ->
float array -> float array array -> plot_t
@@ -413,13 +413,13 @@
val box_legend :
?pattern:int ->
?scale:float ->
- ?line_width:int ->
+ ?line_width:float ->
?label_color:color_t -> label:string -> color_t -> legend_entry_t
(** Line legend entry *)
val line_legend :
?style:int ->
- ?width:int ->
+ ?width:float ->
?label_color:color_t -> label:string -> color_t -> legend_entry_t
(** Symbol/point legend entry *)
@@ -486,7 +486,7 @@
?bg:color_t ->
?bb:color_t * line_style_t ->
?cap:float option * float option ->
- ?contour:color_t * int ->
+ ?contour:color_t * float ->
?orient:(float * float) plot_side_t ->
?axis:colorbar_axis_t list ->
?label:string plot_side_t list ->
@@ -777,7 +777,7 @@
= "camlidl_plplot_core_c_pllab"
external plcolorbar : plplot_colorbar_opt -> plplot_position_opt -> float ->
float -> float -> float -> int -> int -> int -> float -> float -> int ->
- int -> plplot_colorbar_opt array -> string array ->
+ float -> plplot_colorbar_opt array -> string array ->
string array -> float array -> int array -> float array array ->
float * float
= "ml_plcolorbar_byte" "ml_plcolorbar"
@@ -785,7 +785,7 @@
float -> float -> float -> int -> int -> int -> int -> int ->
plplot_legend_opt array -> float -> float ->
float -> float -> int array -> string array -> int array -> int array ->
- float array -> int array -> int array -> int array -> int array ->
+ float array -> float array -> int array -> int array -> float array ->
int array -> float array -> int array -> string array -> float * float
= "ml_pllegend_byte" "ml_pllegend"
external pllightsource : float -> float -> float -> unit
@@ -975,13 +975,13 @@
float ->
float ->
float ->
- float -> int -> float -> int -> int -> int -> int -> int -> bool -> unit
+ float -> int -> float -> float -> int -> float -> int -> float -> bool -> unit
= "camlidl_plplot_core_ml_plshade_bytecode"
"camlidl_plplot_core_ml_plshade"
external plshades :
float array array ->
float ->
- float -> float -> float -> float array -> int -> int -> int -> bool -> unit
+ float -> float -> float -> float array -> float -> int -> float -> bool -> unit
= "camlidl_plplot_core_ml_plshades_bytecode"
"camlidl_plplot_core_ml_plshades"
external plimagefr :
Modified: trunk/bindings/ocaml/plplot_core.idl
===================================================================
--- trunk/bindings/ocaml/plplot_core.idl 2013-05-01 01:11:41 UTC (rev 12312)
+++ trunk/bindings/ocaml/plplot_core.idl 2013-05-01 01:12:18 UTC (rev 12313)
@@ -159,16 +159,16 @@
[size_is(nx,ny)] PLFLT **a, PLINT nx, PLINT ny,
PLFLT left, PLFLT right, PLFLT bottom, PLFLT top,
PLFLT shade_min, PLFLT shade_max,
- PLINT sh_cmap, PLFLT sh_color, PLINT sh_width,
- PLINT min_color, PLINT min_width,
- PLINT max_color, PLINT max_width,
+ PLINT sh_cmap, PLFLT sh_color, PLFLT sh_width,
+ PLINT min_color, PLFLT min_width,
+ PLINT max_color, PLFLT max_width,
PLBOOL rectangular);
[mlname(plshades)] void ml_plshades(
[size_is(nx,ny)] PLFLT **a, PLINT nx, PLINT ny,
PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
- [size_is(nlevel)] PLFLT *clevel, PLINT nlevel, PLINT fill_width,
- PLINT cont_color, PLINT cont_width,
+ [size_is(nlevel)] PLFLT *clevel, PLINT nlevel, PLFLT fill_width,
+ PLINT cont_color, PLFLT cont_width,
PLBOOL rectangular);
[mlname(plimagefr)] void ml_plimagefr(
@@ -200,9 +200,9 @@
// XXX The following are non-standard functions which help retrieve some extra
// information from PLplot.
int plg_current_col0(void);
-float plg_current_col1(void);
-float plgwidth(void);
-float plgchrht(void);
+PLFLT plg_current_col1(void);
+PLFLT plgwidth(void);
+PLFLT plgchrht(void);
#define QUOTEME(x) #x
#define RAW_ML(x) quote(mlmli, QUOTEME(x));
@@ -329,6 +329,6 @@
RAW_ML(external plgriddata : float array -> float array -> float array -> float array -> float array -> plplot_grid_method_type -> float -> float array array = "ml_plgriddata_bytecode" "ml_plgriddata")
RAW_ML(external plparseopts : string array -> plplot_parse_method_type list -> unit = "ml_plparseopts")
-RAW_ML(external pllegend : plplot_legend_opt -> plplot_position_opt -> float -> float -> float -> int -> int -> int -> int -> int -> plplot_legend_opt array -> float -> float -> float -> float -> int array -> string array -> int array -> int array -> float array -> int array -> int array -> int array -> int array -> int array -> float array -> int array -> string array -> float * float = "ml_pllegend_byte" "ml_pllegend")
-RAW_ML(external plcolorbar : plplot_colorbar_opt -> plplot_position_opt -> float -> float -> float -> float -> int -> int -> int -> float -> float -> int -> int -> plplot_colorbar_opt array -> string array -> string array -> float array -> int array -> float array array -> float * float = "ml_plcolorbar_byte" "ml_plcolorbar")
+RAW_ML(external pllegend : plplot_legend_opt -> plplot_position_opt -> float -> float -> float -> int -> int -> int -> int -> int -> plplot_legend_opt array -> float -> float -> float -> float -> int array -> string array -> int array -> int array -> float array -> float array -> int array -> int array -> float array -> int array -> float array -> int array -> string array -> float * float = "ml_pllegend_byte" "ml_pllegend")
+RAW_ML(external plcolorbar : plplot_colorbar_opt -> plplot_position_opt -> float -> float -> float -> float -> int -> int -> int -> float -> float -> int -> float -> plplot_colorbar_opt array -> string array -> string array -> float array -> int array -> float array array -> float * float = "ml_plcolorbar_byte" "ml_plcolorbar")
Modified: trunk/bindings/ocaml/plplot_h
===================================================================
--- trunk/bindings/ocaml/plplot_h 2013-05-01 01:11:41 UTC (rev 12312)
+++ trunk/bindings/ocaml/plplot_h 2013-05-01 01:12:18 UTC (rev 12313)
@@ -254,9 +254,9 @@
PLFLT text_justification,
const PLINT *text_colors, const char **text,
const PLINT *box_colors, const PLINT *box_patterns,
- const PLFLT *box_scales, const PLINT *box_line_widths,
+ const PLFLT *box_scales, const PLFLT *box_line_widths,
const PLINT *line_colors, const PLINT *line_styles,
- const PLINT *line_widths,
+ const PLFLT *line_widths,
const PLINT *symbol_colors, const PLFLT *symbol_scales,
const PLINT *symbol_numbers, const char **symbols );
@@ -266,7 +266,7 @@
PLFLT x_length, PLFLT y_length,
PLINT bg_color, PLINT bb_color, PLINT bb_style,
PLFLT low_cap_color, PLFLT high_cap_color,
- PLINT cont_color, PLINT cont_width,
+ PLINT cont_color, PLFLT cont_width,
PLFLT ticks, PLINT sub_ticks,
const char *axis_opts, const char *label,
PLINT n_values, const PLFLT *values );
@@ -483,9 +483,9 @@
c_plshade(PLFLT **a, PLINT nx, PLINT ny, PLINT (*defined) (PLFLT, PLFLT),
PLFLT left, PLFLT right, PLFLT bottom, PLFLT top,
PLFLT shade_min, PLFLT shade_max,
- PLINT sh_cmap, PLFLT sh_color, PLINT sh_width,
- PLINT min_color, PLINT min_width,
- PLINT max_color, PLINT max_width,
+ PLINT sh_cmap, PLFLT sh_color, PLFLT sh_width,
+ PLINT min_color, PLFLT min_width,
+ PLINT max_color, PLFLT max_width,
void (*fill) (PLINT, PLFLT *, PLFLT *), PLBOOL rectangular,
void (*pltr) (PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer),
PLPointer pltr_data);
@@ -494,9 +494,9 @@
c_plshade1(PLFLT *a, PLINT nx, PLINT ny, PLINT (*defined) (PLFLT, PLFLT),
PLFLT left, PLFLT right, PLFLT bottom, PLFLT top,
PLFLT shade_min, PLFLT shade_max,
- PLINT sh_cmap, PLFLT sh_color, PLINT sh_width,
- PLINT min_color, PLINT min_width,
- PLINT max_color, PLINT max_width,
+ PLINT sh_cmap, PLFLT sh_color, PLFLT sh_width,
+ PLINT min_color, PLFLT min_width,
+ PLINT max_color, PLFLT max_width,
void (*fill) (PLINT, PLFLT *, PLFLT *), PLBOOL rectangular,
void (*pltr) (PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer),
PLPointer pltr_data);
@@ -504,8 +504,8 @@
void
c_plshades( PLFLT **a, PLINT nx, PLINT ny, PLINT (*defined) (PLFLT, PLFLT),
PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
- PLFLT *clevel, PLINT nlevel, PLINT fill_width,
- PLINT cont_color, PLINT cont_width,
+ PLFLT *clevel, PLINT nlevel, PLFLT fill_width,
+ PLINT cont_color, PLFLT cont_width,
void (*fill) (PLINT, PLFLT *, PLFLT *), PLBOOL rectangular,
void (*pltr) (PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer),
PLPointer pltr_data);
@@ -514,8 +514,8 @@
plfshades( PLF2OPS zops, PLPointer zp, PLINT nx, PLINT ny,
PLINT ( *defined )( PLFLT, PLFLT ),
PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
- PLFLT *clevel, PLINT nlevel, PLINT fill_width,
- PLINT cont_color, PLINT cont_width,
+ PLFLT *clevel, PLINT nlevel, PLFLT fill_width,
+ PLINT cont_color, PLFLT cont_width,
void ( *fill )( PLINT, PLFLT *, PLFLT * ), PLINT rectangular,
void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ),
PLPointer pltr_data );
@@ -528,9 +528,9 @@
PLINT nx, PLINT ny,
PLFLT left, PLFLT right, PLFLT bottom, PLFLT top,
PLFLT shade_min, PLFLT shade_max,
- PLINT sh_cmap, PLFLT sh_color, PLINT sh_width,
- PLINT min_color, PLINT min_width,
- PLINT max_color, PLINT max_width,
+ PLINT sh_cmap, PLFLT sh_color, PLFLT sh_width,
+ PLINT min_color, PLFLT min_width,
+ PLINT max_color, PLFLT max_width,
void (*fill) (PLINT, PLFLT *, PLFLT *), PLBOOL rectangular,
void (*pltr) (PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer),
PLPointer pltr_data);
@@ -540,9 +540,9 @@
PLINT ( *defined )( PLFLT, PLFLT ),
PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
PLFLT shade_min, PLFLT shade_max,
- PLINT sh_cmap, PLFLT sh_color, PLINT sh_width,
- PLINT min_color, PLINT min_width,
- PLINT max_color, PLINT max_width,
+ PLINT sh_cmap, PLFLT sh_color, PLFLT sh_width,
+ PLINT min_color, PLFLT min_width,
+ PLINT max_color, PLFLT max_width,
void ( *fill )( PLINT, PLFLT *, PLFLT * ), PLINT rectangular,
void ( *pltr )( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ),
PLPointer pltr_data );
Modified: trunk/bindings/ocaml/plplot_impl.c
===================================================================
--- trunk/bindings/ocaml/plplot_impl.c 2013-05-01 01:11:41 UTC (rev 12312)
+++ trunk/bindings/ocaml/plplot_impl.c 2013-05-01 01:12:18 UTC (rev 12313)
@@ -410,9 +410,9 @@
void ml_plshade( const PLFLT **a, PLINT nx, PLINT ny,
PLFLT left, PLFLT right, PLFLT bottom, PLFLT top,
PLFLT shade_min, PLFLT shade_max,
- PLINT sh_cmap, PLFLT sh_color, PLINT sh_width,
- PLINT min_color, PLINT min_width,
- PLINT max_color, PLINT max_width,
+ PLINT sh_cmap, PLFLT sh_color, PLFLT sh_width,
+ PLINT min_color, PLFLT min_width,
+ PLINT max_color, PLFLT max_width,
PLBOOL rectangular )
{
c_plshade( a, nx, ny,
@@ -449,7 +449,7 @@
//
void ml_plshades( const PLFLT **a, PLINT nx, PLINT ny,
PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
- PLFLT *clevel, PLINT nlevel, PLINT fill_width,
+ PLFLT *clevel, PLINT nlevel, PLFLT fill_width,
PLINT cont_color, PLINT cont_width,
PLBOOL rectangular )
{
@@ -848,10 +848,8 @@
INIT_INT_ARRAY( text_colors )
INIT_INT_ARRAY( box_colors )
INIT_INT_ARRAY( box_patterns )
- INIT_INT_ARRAY( box_line_widths )
INIT_INT_ARRAY( line_colors )
INIT_INT_ARRAY( line_styles )
- INIT_INT_ARRAY( line_widths )
INIT_INT_ARRAY( symbol_colors )
INIT_INT_ARRAY( symbol_numbers )
INIT_STRING_ARRAY( symbols )
@@ -879,8 +877,8 @@
Double_val( text_justification ),
c_text_colors, c_text,
c_box_colors, c_box_patterns, (double *) box_scales,
- c_box_line_widths,
- c_line_colors, c_line_styles, c_line_widths,
+ (double *) box_line_widths,
+ c_line_colors, c_line_styles, (double *) line_widths,
c_symbol_colors, (double *) symbol_scales, c_symbol_numbers,
c_symbols );
@@ -967,7 +965,7 @@
Double_val( x_length ), Double_val( y_length ),
Int_val( bg_color ), Int_val( bb_color ), Int_val( bb_style ),
Double_val( low_cap_color ), Double_val( high_cap_color ),
- Int_val( cont_color ), Int_val( cont_width ),
+ Int_val( cont_color ), Double_val( cont_width ),
n_labels, c_label_opts, c_label,
n_axes, c_axis_opts,
(double *)ticks, c_sub_ticks,
@@ -1075,14 +1073,14 @@
}
// Get the current color map 1 color index
-float plg_current_col1( void )
+PLFLT plg_current_col1( void )
{
return plsc->icol1;
}
// Get the current pen width. TODO: Remove this, as I think this information
// can be retrieved from another proper PLplot function.
-float plgwidth( void )
+PLFLT plgwidth( void )
{
return plsc->width;
}
@@ -1090,7 +1088,7 @@
// Get the current character (text) height in mm. TODO: Remove this, as I
// think this information can be retrieved from another proper PLplot
// function
-float plgchrht( void )
+PLFLT plgchrht( void )
{
return plsc->chrht;
}
Modified: trunk/examples/ocaml/x04.ml
===================================================================
--- trunk/examples/ocaml/x04.ml 2013-05-01 01:11:41 UTC (rev 12312)
+++ trunk/examples/ocaml/x04.ml 2013-05-01 01:12:18 UTC (rev 12313)
@@ -74,7 +74,7 @@
let text = [| "Amplitude"; "Phase shift" |] in
let line_colors = [| 2; 3 |] in
let line_styles = [| 1; 1 |] in
- let line_widths = [| 1; 1 |] in
+ let line_widths = [| 1.0; 1.0 |] in
(* note from the above opt_array the first symbol (and box) indices
do not matter *)
@@ -108,7 +108,7 @@
let text = [| "Amplitude" |] in
let line_colors = [| 2 |] in
let line_styles = [| 1 |] in
- let line_widths = [| 1 |] in
+ let line_widths = [| 1.0 |] in
(* note from the above opt_array the first symbol (and box) indices
do not matter *)
Modified: trunk/examples/ocaml/x15.ml
===================================================================
--- trunk/examples/ocaml/x15.ml 2013-05-01 01:11:41 UTC (rev 12312)
+++ trunk/examples/ocaml/x15.ml 2013-05-01 01:12:18 UTC (rev 12313)
@@ -57,11 +57,11 @@
let shade_min = zmin +. (zmax -. zmin) *. 0.4 in
let shade_max = zmin +. (zmax -. zmin) *. 0.6 in
let sh_color = 7.0 in
- let sh_width = 2 in
+ let sh_width = 2.0 in
let min_color = 9 in
let max_color = 2 in
- let min_width = 2 in
- let max_width = 2 in
+ let min_width = 2.0 in
+ let max_width = 2.0 in
plpsty 8;
plshade
@@ -86,10 +86,10 @@
let plot2 z zmin zmax =
let sh_cmap = 0 in
let min_color = 0 in
- let min_width = 0 in
+ let min_width = 0.0 in
let max_color = 0 in
- let max_width = 0 in
- let sh_width = 2 in
+ let max_width = 0.0 in
+ let sh_width = 2.0 in
let inc =
[|
Modified: trunk/examples/ocaml/x16.ml
===================================================================
--- trunk/examples/ocaml/x16.ml 2013-05-01 01:11:41 UTC (rev 12312)
+++ trunk/examples/ocaml/x16.ml 2013-05-01 01:12:18 UTC (rev 12313)
@@ -51,9 +51,9 @@
* Does several shade plots using different coordinate mappings.
\*--------------------------------------------------------------------------*)
let () =
- let fill_width = 2 in
+ let fill_width = 2.0 in
let cont_color = 0 in
- let cont_width = 0 in
+ let cont_width = 0.0 in
(* Parse and process command line arguments *)
plparseopts Sys.argv [PL_PARSE_FULL];
@@ -193,7 +193,7 @@
plpsty 0;
- plshades z (-1.0) 1.0 (-1.) 1.0 shedge fill_width 2 3 false;
+ plshades z (-1.0) 1.0 (-1.) 1.0 shedge fill_width 2 3.0 false;
plcol0 1;
plbox "bcnst" 0.0 0 "bcnstv" 0.0 0;
Modified: trunk/examples/ocaml/x21.ml
===================================================================
--- trunk/examples/ocaml/x21.ml 2013-05-01 01:11:41 UTC (rev 12312)
+++ trunk/examples/ocaml/x21.ml 2013-05-01 01:12:18 UTC (rev 12313)
@@ -214,7 +214,7 @@
plenv0 xm xM ym yM 2 0;
plcol0 15;
pllab "X" "Y" title.(alg - 1);
- plshades zg xm xM ym yM clev 1 0 1 true;
+ plshades zg xm xM ym yM clev 1.0 0 1.0 true;
plcol0 2;
)
else (
Modified: trunk/examples/ocaml/x26.ml
===================================================================
--- trunk/examples/ocaml/x26.ml 2013-05-01 01:11:41 UTC (rev 12312)
+++ trunk/examples/ocaml/x26.ml 2013-05-01 01:12:18 UTC (rev 12313)
@@ -169,7 +169,7 @@
let text_colors = [| 2; 3 |] in
let line_colors = [| 2; 3 |] in
let line_styles = [| 1; 1 |] in
- let line_widths = [| 1; 1 |] in
+ let line_widths = [| 1.0; 1.0 |] in
(* note from the above opt_array the first symbol (and box) indices
do not matter *)
Modified: trunk/examples/ocaml/x33.ml
===================================================================
--- trunk/examples/ocaml/x33.ml 2013-05-01 01:11:41 UTC (rev 12312)
+++ trunk/examples/ocaml/x33.ml 2013-05-01 01:12:18 UTC (rev 12313)
@@ -70,10 +70,10 @@
let box_colors = Array.make max_nlegend 0 in
let box_patterns = Array.make max_nlegend 0 in
let box_scales = Array.make max_nlegend 0.0 in
- let box_line_widths = Array.make max_nlegend 0 in
+ let box_line_widths = Array.make max_nlegend 0.0 in
let line_colors = Array.make max_nlegend 0 in
let line_styles = Array.make max_nlegend 0 in
- let line_widths = Array.make max_nlegend 0 in
+ let line_widths = Array.make max_nlegend 0.0 in
let symbol_numbers = Array.make max_nlegend 0 in
let symbol_colors = Array.make max_nlegend 0 in
let symbol_scales = Array.make max_nlegend 0.0 in
@@ -102,7 +102,7 @@
let opt_base = [PL_LEGEND_BACKGROUND; PL_LEGEND_BOUNDING_BOX] in
opt_array.(0) <- [PL_LEGEND_LINE; PL_LEGEND_SYMBOL];
line_styles.(0) <- 1;
- line_widths.(0) <- 1;
+ line_widths.(0) <- 1.0;
symbol_scales.(0) <- 1.;
symbol_numbers.(0) <- 4;
symbols.(0) <- "*";
@@ -149,7 +149,7 @@
for k = 0 to nlegend - 1 do
opt_array.(k) <- [PL_LEGEND_LINE; PL_LEGEND_SYMBOL];
line_styles.(k) <- 1;
- line_widths.(k) <- 1;
+ line_widths.(k) <- 1.0;
symbol_scales.(k) <- 1.0;
symbol_numbers.(k) <- 2;
symbols.(k) <- "*";
@@ -308,7 +308,7 @@
for k = 0 to !nlegend - 1 do
opt_array.(k) <- [PL_LEGEND_LINE; PL_LEGEND_SYMBOL];
line_styles.(k) <- 1;
- line_widths.(k) <- 1;
+ line_widths.(k) <- 1.0;
symbol_scales.(k) <- 1.;
symbol_numbers.(k) <- 2;
symbols.(k) <- "*";
@@ -377,14 +377,14 @@
box_colors.(1) <- 2;
box_patterns.(1) <- 0;
box_scales.(1) <- 0.8;
- box_line_widths.(1) <- 1;
+ box_line_widths.(1) <- 1.0;
opt_array.(2) <- [PL_LEGEND_LINE];
text.(2) <- sprintf "%s" "Line";
text_colors.(2) <- 3;
line_colors.(2) <- 3;
line_styles.(2) <- 1;
- line_widths.(2) <- 1;
+ line_widths.(2) <- 1.0;
opt_array.(3) <- [PL_LEGEND_SYMBOL];
text.(3) <- sprintf "%s" "Symbol";
@@ -399,7 +399,7 @@
text_colors.(4) <- 5;
line_colors.(4) <- 5;
line_styles.(4) <- 1;
- line_widths.(4) <- 1;
+ line_widths.(4) <- 1.0;
symbol_colors.(4) <- 5;
symbol_scales.(4) <- text_scale;
symbol_numbers.(4) <- 4;
@@ -482,7 +482,7 @@
box_colors.(i) <- i + 1;
box_patterns.(i) <- 0;
box_scales.(i) <- 0.8;
- box_line_widths.(i) <- 1;
+ box_line_widths.(i) <- 1.0;
done;
let opt = opt_base in
@@ -512,7 +512,7 @@
box_colors.(i) <- 2;
box_patterns.(i) <- i;
box_scales.(i) <- 0.8;
- box_line_widths.(i) <- 1;
+ box_line_widths.(i) <- 1.0;
done;
let opt = opt_base in
@@ -539,7 +539,7 @@
box_colors.(i) <- 2;
box_patterns.(i) <- 3;
box_scales.(i) <- 0.8;
- box_line_widths.(i) <- i + 1;
+ box_line_widths.(i) <- float i +. 1.0;
done;
let opt = opt_base in
@@ -565,7 +565,7 @@
text_colors.(i) <- i + 1;
line_colors.(i) <- i + 1;
line_styles.(i) <- 1;
- line_widths.(i) <- 1;
+ line_widths.(i) <- 1.0;
done;
let opt = opt_base in
@@ -594,7 +594,7 @@
text_colors.(i) <- 2;
line_colors.(i) <- 2;
line_styles.(i) <- i + 1;
- line_widths.(i) <- 1;
+ line_widths.(i) <- 1.0;
done;
let opt = opt_base in
@@ -620,7 +620,7 @@
text_colors.(i) <- 2;
line_colors.(i) <- 2;
line_styles.(i) <- 1;
- line_widths.(i) <- i + 1;
+ line_widths.(i) <- float i +. 1.0;
done;
let opt = opt_base in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
