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

[<and...@us...>]

Revision: 10253
          http://plplot.svn.sourceforge.net/plplot/?rev=10253&view=rev
Author:   andrewross
Date:     2009-08-14 21:30:58 +0000 (Fri, 14 Aug 2009)

Log Message:
-----------
Fix java support for plspal0 and plspal1. 

Enable callback for plotting custom labels. This does not work with openjdk 6 for me (a bug? - it crashes with an erro) but does work with the gcj compiler. Further testing appreciated.

Update examples 16 and 19 consistent with C version.

Modified Paths:
--------------
    trunk/bindings/java/PLStream.java
    trunk/bindings/java/plplotjavac.i
    trunk/examples/java/x16.java
    trunk/examples/java/x19.java

Modified: trunk/bindings/java/PLStream.java
===================================================================
--- trunk/bindings/java/PLStream.java	2009-08-14 20:49:51 UTC (rev 10252)
+++ trunk/bindings/java/PLStream.java	2009-08-14 21:30:58 UTC (rev 10253)
@@ -779,6 +779,16 @@
     plplotjavac.plspage(xp, yp, xleng, yleng, xoff, yoff);
 }
 
+public void spal0(String filename) {
+    if (set_stream() == -1) return;
+    plplotjavac.plspal0(filename);
+}
+
+public void spal1(String filename) {
+    if (set_stream() == -1) return;
+    plplotjavac.plspal1(filename);
+}
+
 public void spause(boolean pause) {
     if (set_stream() == -1) return;
     plplotjavac.plspause(pause);

Modified: trunk/bindings/java/plplotjavac.i
===================================================================
--- trunk/bindings/java/plplotjavac.i	2009-08-14 20:49:51 UTC (rev 10252)
+++ trunk/bindings/java/plplotjavac.i	2009-08-14 21:30:58 UTC (rev 10253)
@@ -1198,11 +1198,11 @@
 	
 	jaxis = (jint) axis;
 	jvalue = (jdouble) value;
-        /* javaString = (jstring)(*cbenv)->CallObjectMethod(cbenv,labelClass, labelID, jaxis, jvalue);
+        javaString = (jstring)(*cbenv)->CallObjectMethod(cbenv,labelClass, labelID, jaxis, jvalue);
 	nativeString = (*cbenv)->GetStringUTFChars(cbenv,javaString,0);
 	strncpy(string,nativeString,len);
-	(*cbenv)->ReleaseStringUTFChars(cbenv,javaString,nativeString);*/
-	strncpy(string,"",len);
+	(*cbenv)->ReleaseStringUTFChars(cbenv,javaString,nativeString);
+	/*strncpy(string,"",len);*/
    }
 %}
 

Modified: trunk/examples/java/x16.java
===================================================================
--- trunk/examples/java/x16.java	2009-08-14 20:49:51 UTC (rev 10252)
+++ trunk/examples/java/x16.java	2009-08-14 21:30:58 UTC (rev 10253)
@@ -92,6 +92,9 @@
 	// Parse and process command line arguments.
 	pls.parseopts( args, PLStream.PL_PARSE_FULL | PLStream.PL_PARSE_NOPROGRAM );
 
+	// Load colour palettes
+	pls.spal0("cmap0_black_on_white.pal");
+	pls.spal1("cmap1_gray.pal");
 	// Reduce colors in cmap 0 so that cmap 1 is useful on a 
 	//16-color display
 	pls.scmap0n(3);
@@ -166,6 +169,13 @@
 
 	// Plot using 1d coordinate transform
     
+	// Load colour palettes
+	pls.spal0("cmap0_black_on_white.pal");
+	pls.spal1("cmap1_blue_yellow.pal");
+	// Reduce colors in cmap 0 so that cmap 1 is useful on a 
+	//16-color display
+	pls.scmap0n(3);
+
 	pls.adv(0);
 	pls.vpor(0.1, 0.9, 0.1, 0.9);
 	pls.wind(-1.0, 1.0, -1.0, 1.0);
@@ -185,6 +195,13 @@
 
 	// Plot using 2d coordinate transform
 
+	// Load colour palettes
+	pls.spal0("cmap0_black_on_white.pal");
+	pls.spal1("cmap1_blue_red.pal");
+	// Reduce colors in cmap 0 so that cmap 1 is useful on a 
+	//16-color display
+	pls.scmap0n(3);
+
 	pls.adv(0);
 	pls.vpor(0.1, 0.9, 0.1, 0.9);
 	pls.wind(-1.0, 1.0, -1.0, 1.0);
@@ -205,6 +222,13 @@
 
 	// Plot using 2d coordinate transform
 
+	// Load colour palettes
+	pls.spal0("");
+	pls.spal1("");
+	// Reduce colors in cmap 0 so that cmap 1 is useful on a 
+	//16-color display
+	pls.scmap0n(3);
+
 	pls.adv(0);
 	pls.vpor(0.1, 0.9, 0.1, 0.9);
 	pls.wind(-1.0, 1.0, -1.0, 1.0);
@@ -228,6 +252,13 @@
 
 	//Example with polar coordinates.
 
+	// Load colour palettes
+	pls.spal0("cmap0_black_on_white.pal");
+	pls.spal1("cmap1_gray.pal");
+	// Reduce colors in cmap 0 so that cmap 1 is useful on a 
+	//16-color display
+	pls.scmap0n(3);
+
 	pls.adv(0);
 	pls.vpor( .1, .9, .1, .9 );
 	pls.wind( -1., 1., -1., 1. );

Modified: trunk/examples/java/x19.java
===================================================================
--- trunk/examples/java/x19.java	2009-08-14 20:49:51 UTC (rev 10252)
+++ trunk/examples/java/x19.java	2009-08-14 21:30:58 UTC (rev 10253)
@@ -57,7 +57,6 @@
 	String direction_label = "";
 	double label_val = 0.0;
 
-	System.err.println("Entered callback function");
 	if (axis == PLStream.PL_Y_AXIS) {
 	    label_val = value;
 	    if (label_val > 0.0) {


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