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

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

Revision: 11313
          http://plplot.svn.sourceforge.net/plplot/?rev=11313&view=rev
Author:   airwin
Date:     2010-11-10 04:28:54 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
Finish propagating plstring (but not pllegend) to Java and Lua binding.

Update examples 4 and 26 to use plstring (but not pllegend) for
Java and Lua.  These examples give the same results for Java and Lua,
but will need further updating to agree with the corresponding
C examples once pllegend is propagated to Java and Lua.

Modified Paths:
--------------
    trunk/bindings/java/PLStream.java
    trunk/bindings/lua/plplotluac.i
    trunk/examples/java/x04.java
    trunk/examples/java/x26.java
    trunk/examples/lua/x04.lua
    trunk/examples/lua/x26.lua

Modified: trunk/bindings/java/PLStream.java
===================================================================
--- trunk/bindings/java/PLStream.java	2010-11-10 02:12:35 UTC (rev 11312)
+++ trunk/bindings/java/PLStream.java	2010-11-10 04:28:54 UTC (rev 11313)
@@ -995,6 +995,12 @@
         plplotjavac.plstransform( coordTrans, data );
     }
 
+    public void string( double[] x, double[] y, String string )
+    {
+        if ( set_stream() == -1 ) return;
+        plplotjavac.plstring( x, y, string );
+    }
+
     public void stripa( int id, int pen, double x, double y )
     {
         if ( set_stream() == -1 ) return;

Modified: trunk/bindings/lua/plplotluac.i
===================================================================
--- trunk/bindings/lua/plplotluac.i	2010-11-10 02:12:35 UTC (rev 11312)
+++ trunk/bindings/lua/plplotluac.i	2010-11-10 04:28:54 UTC (rev 11313)
@@ -1128,6 +1128,7 @@
 %rename(ssym) plssym;
 %rename(star) plstar;
 %rename(start) plstart;
+%rename(string) plstring;
 %rename(stripa) plstripa;
 %rename(stripc) plstripc;
 %rename(stripd) plstripd;

Modified: trunk/examples/java/x04.java
===================================================================
--- trunk/examples/java/x04.java	2010-11-10 02:12:35 UTC (rev 11312)
+++ trunk/examples/java/x04.java	2010-11-10 04:28:54 UTC (rev 11313)
@@ -124,6 +124,7 @@
             pls.box( "", 0.0, 0, "cmstv", 30.0, 3 );
             pls.col0( 3 );
             pls.line( freql, phase );
+            pls.string( freql, phase, "*" );
             pls.col0( 3 );
             pls.mtex( "r", 5.0, 0.5, 0.5, "Phase shift (degrees)" );
         }

Modified: trunk/examples/java/x26.java
===================================================================
--- trunk/examples/java/x26.java	2010-11-10 02:12:35 UTC (rev 11312)
+++ trunk/examples/java/x26.java	2010-11-10 04:28:54 UTC (rev 11313)
@@ -198,6 +198,7 @@
             pls.box( "", 0.0, 0, "cmstv", 30.0, 3 );
             pls.col0( 3 );
             pls.line( freql, phase );
+            pls.string( freql, phase, "*" );
             pls.col0( 3 );
             pls.mtex( "r", 5.0, 0.5, 0.5, alty_label );
         }

Modified: trunk/examples/lua/x04.lua
===================================================================
--- trunk/examples/lua/x04.lua	2010-11-10 02:12:35 UTC (rev 11312)
+++ trunk/examples/lua/x04.lua	2010-11-10 04:28:54 UTC (rev 11313)
@@ -80,6 +80,7 @@
     pl.box("", 0, 0, "cmstv", 30, 3)
     pl.col0(3)
     pl.line(freql, phase)
+    pl.string(freql, phase, "*")
     pl.col0(3)
     pl.mtex("r", 5, 0.5, 0.5, "Phase shift (degrees)")
   end

Modified: trunk/examples/lua/x26.lua
===================================================================
--- trunk/examples/lua/x26.lua	2010-11-10 02:12:35 UTC (rev 11312)
+++ trunk/examples/lua/x26.lua	2010-11-10 04:28:54 UTC (rev 11313)
@@ -124,6 +124,7 @@
     pl.box("", 0, 0, "cmstv", 30, 3)
     pl.col0(3)
     pl.line(freql, phase)
+    pl.string(freql, phase, "*")
     pl.col0(3)
     pl.mtex("r", 5, 0.5, 0.5, alty_label)
   end


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