Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[8861] trunk
|
From: <ai...@us...> - 2008-10-07 02:18:01
|
Revision: 8861
http://plplot.svn.sourceforge.net/plplot/?rev=8861&view=rev
Author: airwin
Date: 2008-10-07 02:17:38 +0000 (Tue, 07 Oct 2008)
Log Message:
-----------
AWI for Hezekiah M. Carty. Map the PLBOOL type to the OCaml bool type
(rather than the previous integer type) in both the bindings and examples.
Modified Paths:
--------------
trunk/bindings/ocaml/plplot_h
trunk/bindings/ocaml/plplot_h.inc
trunk/examples/ocaml/x08.ml
trunk/examples/ocaml/x11.ml
trunk/examples/ocaml/x15.ml
trunk/examples/ocaml/x20.ml
trunk/examples/ocaml/x21.ml
trunk/examples/ocaml/x22.ml
trunk/examples/ocaml/x30.ml
Modified: trunk/bindings/ocaml/plplot_h
===================================================================
--- trunk/bindings/ocaml/plplot_h 2008-10-06 18:40:40 UTC (rev 8860)
+++ trunk/bindings/ocaml/plplot_h 2008-10-07 02:17:38 UTC (rev 8861)
@@ -7,7 +7,7 @@
#define PLINT int
//typedef PLINT PLBOOL;
-#define PLBOOL int
+#define PLBOOL boolean
void
c_pl_setcontlabelformat(PLINT lexp, PLINT sigdig);
Modified: trunk/bindings/ocaml/plplot_h.inc
===================================================================
--- trunk/bindings/ocaml/plplot_h.inc 2008-10-06 18:40:40 UTC (rev 8860)
+++ trunk/bindings/ocaml/plplot_h.inc 2008-10-07 02:17:38 UTC (rev 8861)
@@ -1,7 +1,7 @@
[mlname(pl_setcontlabelformat)] void c_pl_setcontlabelformat(int lexp, int sigdig);
[mlname(pl_setcontlabelparam)] void c_pl_setcontlabelparam ( double offset, double size, double spacing, int active );
[mlname(pladv)] void c_pladv ( int page );
-[mlname(plsvect)] void c_plsvect ( [in, size_is(npts)] double * arrowx, [in, size_is(npts)] double * arrowy, int npts, int fill );
+[mlname(plsvect)] void c_plsvect ( [in, size_is(npts)] double * arrowx, [in, size_is(npts)] double * arrowy, int npts, boolean fill );
[mlname(plaxes)] void c_plaxes ( double x0, double y0, [string] const char * xopt, double xtick, int nxsub, [string] const char * yopt, double ytick, int nysub );
[mlname(plbin)] void c_plbin ( int nbin, [in, size_is(nbin)] double * x, [in, size_is(nbin)] double * y, int opt );
[mlname(plbop)] void c_plbop ( void );
@@ -11,7 +11,7 @@
[mlname(plclear)] void c_plclear ( void );
[mlname(plcol0)] void c_plcol0 ( int icol0 );
[mlname(plcol1)] void c_plcol1 ( double col1 );
-[mlname(plcpstrm)] void c_plcpstrm ( int iplsr, int flags );
+[mlname(plcpstrm)] void c_plcpstrm ( int iplsr, boolean flags );
[mlname(plend)] void c_plend ( void );
[mlname(plend1)] void c_plend1 ( void );
[mlname(plenv)] void c_plenv ( double xmin, double xmax, double ymin, double ymax, int just, int axis );
@@ -65,7 +65,7 @@
[mlname(plmkstrm)] void c_plmkstrm ( [out] int * p_strm );
[mlname(plmtex)] void c_plmtex ( [string] const char * side, double disp, double pos, double just, [string] const char * text );
[mlname(plmtex3)] void c_plmtex3 ( [string] const char * side, double disp, double pos, double just, [string] const char * text );
-[mlname(plot3d)] void c_plot3d ( [size_is(nx), in] double * x, [size_is(ny), in] double * y, [size_is(nx, ny), in] double ** z, int nx, int ny, int opt, int side );
+[mlname(plot3d)] void c_plot3d ( [size_is(nx), in] double * x, [size_is(ny), in] double * y, [size_is(nx, ny), in] double ** z, int nx, int ny, int opt, boolean side );
[mlname(plot3dc)] void c_plot3dc ( [size_is(nx), in] double * x, [size_is(ny), in] double * y, [size_is(nx, ny), in] double ** z, int nx, int ny, int opt, [size_is(nlevel), in] double * clevel, int nlevel );
[mlname(plpat)] void c_plpat ( int nlin, [in, size_is(nlin)] int * inc, [in, size_is(nlin)] int * del );
[mlname(plpoin)] void c_plpoin ( int n, [in, size_is(n)] double * x, [in, size_is(n)] double * y, int code );
@@ -84,8 +84,8 @@
[mlname(plscmap0n)] void c_plscmap0n ( int ncol0 );
[mlname(plscmap1)] void c_plscmap1 ( [size_is(ncol1), in] int * r, [size_is(ncol1), in] int * g, [size_is(ncol1), in] int * b, int ncol1 );
[mlname(plscmap1a)] void c_plscmap1a ( [size_is(ncol1), in] int * r, [size_is(ncol1), in] int * g, [size_is(ncol1), in] int * b, [size_is(ncol1), in] double * a, int ncol1 );
-[mlname(plscmap1l)] void c_plscmap1l ( int itype, int npts, [size_is(npts), in, size_is(npts)] double * intensity, [size_is(npts), in, size_is(npts)] double * coord1, [size_is(npts), in, size_is(npts)] double * coord2, [size_is(npts), in, size_is(npts)] double * coord3, [in, size_is(npts), in, size_is(npts), unique] int * rev );
-[mlname(plscmap1la)] void c_plscmap1la ( int itype, int npts, [size_is(npts), in, size_is(npts)] double * intensity, [size_is(npts), in, size_is(npts)] double * coord1, [size_is(npts), in, size_is(npts)] double * coord2, [size_is(npts), in, size_is(npts)] double * coord3, [size_is(npts), in, size_is(npts)] double * a, [in, size_is(npts), in, size_is(npts), unique] int * rev );
+[mlname(plscmap1l)] void c_plscmap1l ( boolean itype, int npts, [size_is(npts), in, size_is(npts)] double * intensity, [size_is(npts), in, size_is(npts)] double * coord1, [size_is(npts), in, size_is(npts)] double * coord2, [size_is(npts), in, size_is(npts)] double * coord3, [in, size_is(npts), in, size_is(npts), unique] boolean * rev );
+[mlname(plscmap1la)] void c_plscmap1la ( boolean itype, int npts, [size_is(npts), in, size_is(npts)] double * intensity, [size_is(npts), in, size_is(npts)] double * coord1, [size_is(npts), in, size_is(npts)] double * coord2, [size_is(npts), in, size_is(npts)] double * coord3, [size_is(npts), in, size_is(npts)] double * a, [in, size_is(npts), in, size_is(npts), unique] boolean * rev );
[mlname(plscmap1n)] void c_plscmap1n ( int ncol1 );
[mlname(plscol0)] void c_plscol0 ( int icol0, int r, int g, int b );
[mlname(plscol0a)] void c_plscol0a ( int icol0, int r, int g, int b, double a );
@@ -108,7 +108,7 @@
[mlname(plsmin)] void c_plsmin ( double def, double scale );
[mlname(plsori)] void c_plsori ( int ori );
[mlname(plspage)] void c_plspage ( double xp, double yp, int xleng, int yleng, int xoff, int yoff );
-[mlname(plspause)] void c_plspause ( int pause );
+[mlname(plspause)] void c_plspause ( boolean pause );
[mlname(plsstrm)] void c_plsstrm ( int strm );
[mlname(plssub)] void c_plssub ( int nx, int ny );
[mlname(plssym)] void c_plssym ( double def, double scale );
@@ -134,7 +134,7 @@
[mlname(plw3d)] void c_plw3d ( double basex, double basey, double height, double xmin0, double xmax0, double ymin0, double ymax0, double zmin0, double zmax0, double alt, double az );
[mlname(plwid)] void c_plwid ( int width );
[mlname(plwind)] void c_plwind ( double xmin, double xmax, double ymin, double ymax );
-[mlname(plxormod)] void c_plxormod ( int mode, [out] int * status );
+[mlname(plxormod)] void c_plxormod ( boolean mode, [out] boolean * status );
[mlname(plseed)] void c_plseed ( [int64] unsigned int s );
[mlname(plrandd)] double c_plrandd ( void );
[mlname(plsetopt)] int c_plsetopt ( [string] const char * opt, [string] const char * optarg );
Modified: trunk/examples/ocaml/x08.ml
===================================================================
--- trunk/examples/ocaml/x08.ml 2008-10-06 18:40:40 UTC (rev 8860)
+++ trunk/examples/ocaml/x08.ml 2008-10-07 02:17:38 UTC (rev 8861)
@@ -71,7 +71,7 @@
in
plscmap1n 256;
- plscmap1l 0 i h l s None;
+ plscmap1l false i h l s None;
()
let levels = 10
Modified: trunk/examples/ocaml/x11.ml
===================================================================
--- trunk/examples/ocaml/x11.ml 2008-10-06 18:40:40 UTC (rev 8860)
+++ trunk/examples/ocaml/x11.ml 2008-10-07 02:17:38 UTC (rev 8861)
@@ -48,7 +48,7 @@
let s = [|0.8; 0.8|] in
plscmap1n 256;
(* TODO: The first argument to plscmap1l should be a boolean value *)
- plscmap1l 0 i h l s None;
+ plscmap1l false i h l s None;
()
(*--------------------------------------------------------------------------*\
@@ -122,7 +122,7 @@
plmesh x y z (opt.(k) lor 4)
| 2 ->
(* magnitude colored wireframe plot with sides *)
- plot3d x y z (opt.(k) lor 4) 1
+ plot3d x y z (opt.(k) lor 4) true
| 3 ->
(* magnitude colored wireframe plot with base contour *)
plmeshc x y z (opt.(k) lor 4 lor 8) clevel
Modified: trunk/examples/ocaml/x15.ml
===================================================================
--- trunk/examples/ocaml/x15.ml 2008-10-06 18:40:40 UTC (rev 8860)
+++ trunk/examples/ocaml/x15.ml 2008-10-07 02:17:38 UTC (rev 8861)
@@ -23,7 +23,7 @@
let h = [|260.0; 260.0; 20.0; 20.0|] in
let l = [|0.5; 0.0; 0.0; 0.5|] in
let s = [|1.0; 1.0; 1.0; 1.0|] in
- plscmap1l 0 i h l s None;
+ plscmap1l false i h l s None;
()
(*--------------------------------------------------------------------------*\
@@ -37,7 +37,7 @@
let h = [|260.0; 260.0; 20.0; 20.0|] in
let l = [|0.6; 0.0; 0.0; 0.6|] in
let s = [|1.0; 0.5; 0.5; 1.0|] in
- plscmap1l 0 i h l s None;
+ plscmap1l false i h l s None;
()
(*--------------------------------------------------------------------------*\
Modified: trunk/examples/ocaml/x20.ml
===================================================================
--- trunk/examples/ocaml/x20.ml 2008-10-06 18:40:40 UTC (rev 8860)
+++ trunk/examples/ocaml/x20.ml 2008-10-07 02:17:38 UTC (rev 8861)
@@ -86,7 +86,7 @@
plsdev "psc"; (* new device type. Use a known existing driver *)
plsfnam fname; (* file name *)
- plcpstrm cur_strm 0; (* copy old stream parameters to new stream *)
+ plcpstrm cur_strm false; (* copy old stream parameters to new stream *)
plreplot (); (* do the save *)
plend1 (); (* close new device *)
@@ -100,7 +100,7 @@
let b = [|0.0; 1.0|] in
let pos = [|0.0; 1.0|] in
plscmap1n num_col;
- plscmap1l 1 pos r g b None;
+ plscmap1l true pos r g b None;
()
let () =
@@ -183,13 +183,13 @@
let yi = 280.0 in
let ye = 220.0 in
- plspause 0;
+ plspause false;
pladv 0;
(* display selection only *)
plimage img_f 1.0 width 1.0 height 0.0 0.0 xi xe ye yi;
- plspause 1;
+ plspause true;
(* zoom in selection *)
plenv xi xe ye yi 1 (-1);
Modified: trunk/examples/ocaml/x21.ml
===================================================================
--- trunk/examples/ocaml/x21.ml 2008-10-06 18:40:40 UTC (rev 8860)
+++ trunk/examples/ocaml/x21.ml 2008-10-07 02:17:38 UTC (rev 8861)
@@ -52,7 +52,7 @@
let l = [|0.6; 0.6|] in
let s = [|0.8; 0.8|] in
plscmap1n 256;
- plscmap1l 0 i h l s None;
+ plscmap1l false i h l s None;
()
let create_grid px py =
Modified: trunk/examples/ocaml/x22.ml
===================================================================
--- trunk/examples/ocaml/x22.ml 2008-10-06 18:40:40 UTC (rev 8860)
+++ trunk/examples/ocaml/x22.ml 2008-10-07 02:17:38 UTC (rev 8861)
@@ -241,7 +241,7 @@
circulation ();
- let fill = 0 in
+ let fill = false in
(* Set arrow style using arrow_x and arrow_y then
plot using these arrows. *)
@@ -250,7 +250,7 @@
(* Set arrow style using arrow2_x and arrow2_y then
plot using these filled arrows. *)
- let fill = 1 in
+ let fill = true in
plsvect arrow2_x arrow2_y fill;
constriction ();
Modified: trunk/examples/ocaml/x30.ml
===================================================================
--- trunk/examples/ocaml/x30.ml 2008-10-06 18:40:40 UTC (rev 8860)
+++ trunk/examples/ocaml/x30.ml 2008-10-07 02:17:38 UTC (rev 8861)
@@ -40,7 +40,7 @@
let gcoord = [|0.0; 0.0|]
let bcoord = [|0.0; 0.0|]
let acoord = [|0.0; 1.0|]
-let rev = [|0; 0|]
+let rev = [|false; false|]
let () =
ignore (plparseopts Sys.argv [|PL_PARSE_FULL|]);
@@ -120,7 +120,7 @@
(* Create the color map with 128 colors and use plscmap1la to initialize
the color values with a linear varying transparency (or alpha) *)
plscmap1n 128;
- plscmap1la 1 pos rcoord gcoord bcoord acoord (Some rev);
+ plscmap1la true pos rcoord gcoord bcoord acoord (Some rev);
(* Create a 2 x 2 array that contains the z values (0.0 to 1.0) that will
used for the shade plot. plshades will use linear interpolation to
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
