[Plplot-cvs] SF.net SVN: plplot:[11425] trunk

[<ai...@us...>]

Revision: 11425
          http://plplot.svn.sourceforge.net/plplot/?rev=11425&view=rev
Author:   airwin
Date:     2011-01-02 01:38:58 +0000 (Sun, 02 Jan 2011)

Log Message:
-----------
Add plot3d-related wrappers which allow example 8 to work and give
consistent results with the corresponding C example.

Modified Paths:
--------------
    trunk/bindings/octave/plplot_octave.i
    trunk/plplot_test/test_octave.sh.in

Modified: trunk/bindings/octave/plplot_octave.i
===================================================================
--- trunk/bindings/octave/plplot_octave.i	2011-01-02 01:37:55 UTC (rev 11424)
+++ trunk/bindings/octave/plplot_octave.i	2011-01-02 01:38:58 UTC (rev 11425)
@@ -769,11 +769,26 @@
 void my_plot3dc( PLFLT *ArrayX, PLFLT *ArrayY, PLFLT *MatrixCk,
          PLINT nx, PLINT ny, PLINT opt, PLFLT *Array, PLINT n );
 
+// plsurf3d-related wrappings:
+%ignore plsurf3d;
+%rename(plsurf3d) my_plsurf3d;
+%ignore plsurf3dl;
+//unimplemented: %rename(plsurf3d) my_plsurf3d;
 
+%{
+void my_plsurf3d( PLFLT *x, PLFLT *y, PLFLT *z,
+                  PLINT nx, PLINT ny, PLINT opt, PLFLT *clevel, PLINT nlevel )
+{
+    f2c( z, zz, nx, ny )
+    c_plsurf3d( x, y, zz, nx, ny, opt, clevel, nlevel );
+}
+%}
+
+void my_plsurf3d( PLFLT *ArrayX, PLFLT *ArrayY, PLFLT *MatrixCk,
+          PLINT nx, PLINT ny, PLINT opt, PLFLT *Array, PLINT n );
+
 // Deal with these later.
 %ignore pllegend;
-%ignore plsurf3d;
-%ignore plsurf3dl;
 %ignore plshade;
 %ignore plshades;
 %ignore plvect;

Modified: trunk/plplot_test/test_octave.sh.in
===================================================================
--- trunk/plplot_test/test_octave.sh.in	2011-01-02 01:37:55 UTC (rev 11424)
+++ trunk/plplot_test/test_octave.sh.in	2011-01-02 01:38:58 UTC (rev 11425)
@@ -78,7 +78,7 @@
 # 21: plgriddata and 3D plots
 # 22: plvector related wrappers.
 # until typemaps for swig-generated interface are done.
-@swig_octave_comment@for i=[1:7 9:14 17 18 23:31] ;
+@swig_octave_comment@for i=[1:14 17 18 23:31] ;
 @matwrap_octave_comment@for i=[1:18 20:31 ] ;
     ofile = sprintf("${OUTPUT_DIR}/x%.2d${lang}_${dsuffix}.txt",i);
     strm = fopen(ofile,"w");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.